Skip to content

Commit adabe0b

Browse files
ElenteriusElenterius
committed
feat: add Overweight Farming compat
1 parent 538ab42 commit adabe0b

File tree

73 files changed

+2507
-20
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+2507
-20
lines changed

‎build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,8 @@ dependencies {
230230
datagenImplementation fg.deobf("maven.modrinth:farmers-delight:1.20.1-1.2.5")
231231
datagenImplementation fg.deobf("curse.maven:alexs-delight-556448:5028450")
232232

233-
// implementation fg.deobf("maven.modrinth:overweight-farming:1.20.1-2.1.0-forge")
233+
implementation fg.deobf("maven.modrinth:overweight-farming:1.20.1-2.1.0-forge")
234+
datagenImplementation fg.deobf("maven.modrinth:overweight-farming:1.20.1-2.1.0-forge")
234235

235236
datagenImplementation sourceSets.main.output
236237
}

‎src/datagen/java/com/github/elenterius/biomancy/datagen/recipes/DecomposingRecipeProvider.java

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
import net.minecraft.world.item.Items;
3232
import net.minecraftforge.common.Tags;
3333
import net.minecraftforge.registries.RegistryObject;
34+
import net.orcinus.overweightfarming.OverweightFarming;
35+
import net.orcinus.overweightfarming.init.OFBlocks;
36+
import net.orcinus.overweightfarming.init.OFItems;
3437
import vectorwing.farmersdelight.FarmersDelight;
3538

3639
import java.util.List;
@@ -54,6 +57,7 @@ protected void buildRecipes(Consumer<FinishedRecipe> consumer) {
5457
buildBiomesOPlentyRecipes(consumer);
5558

5659
buildFarmersDelightRecipes(consumer);
60+
buildOverweightFarmingRecipes(consumer);
5761

5862
buildAlexsMobsRecipes(consumer);
5963
buildAlexsDelightRecipes(consumer);
@@ -424,6 +428,10 @@ private DecomposingRecipeBuilder farmersDelightRecipe() {
424428
return DecomposingRecipeBuilder.create().ifModLoaded(FarmersDelight.MODID);
425429
}
426430

431+
private DecomposingRecipeBuilder overweightFarmingRecipe() {
432+
return DecomposingRecipeBuilder.create().ifModLoaded(OverweightFarming.MODID);
433+
}
434+
427435
private DecomposingRecipeBuilder alexsMobsRecipe() {
428436
return DecomposingRecipeBuilder.create().ifModLoaded(AlexsMobs.MODID);
429437
}
@@ -461,6 +469,70 @@ class FarmersDelightItems extends vectorwing.farmersdelight.common.registry.ModI
461469
.unlockedBy(FarmersDelightItems.HAM).save(consumer);
462470
}
463471

472+
private void buildOverweightFarmingRecipes(Consumer<FinishedRecipe> consumer) {
473+
overweightFarmingRecipe()
474+
.setIngredient(OFItems.VEGETABLE_PEELS.get())
475+
.addOutput(ModItems.ORGANIC_MATTER.get(), 2, 4)
476+
.unlockedBy(OFItems.VEGETABLE_PEELS.get()).save(consumer);
477+
478+
overweightFarmingRecipe()
479+
.setIngredient(OFBlocks.OVERWEIGHT_COCOA.get())
480+
.addOutput(ModItems.ORGANIC_MATTER.get(), 2 * 10, 4 * 10)
481+
.unlockedBy(OFBlocks.OVERWEIGHT_COCOA.get()).save(consumer);
482+
483+
overweightFarmingRecipe()
484+
.setIngredient(OFBlocks.PEELED_OVERWEIGHT_COCOA.get())
485+
.addOutput(ModItems.ORGANIC_MATTER.get(), 2 * 10 - 2, 4 * 10 - 4)
486+
.unlockedBy(OFBlocks.OVERWEIGHT_COCOA.get()).save(consumer);
487+
488+
overweightFarmingRecipe()
489+
.setIngredient(OFBlocks.OVERWEIGHT_APPLE.get())
490+
.addOutput(ModItems.ORGANIC_MATTER.get(), 10, 2 * 10)
491+
.unlockedBy(OFBlocks.OVERWEIGHT_APPLE.get()).save(consumer);
492+
493+
overweightFarmingRecipe()
494+
.setIngredient(OFBlocks.OVERWEIGHT_BEETROOT.get())
495+
.addOutput(ModItems.ORGANIC_MATTER.get(), 2 * 10, 4 * 10)
496+
.unlockedBy(OFBlocks.OVERWEIGHT_BEETROOT.get()).save(consumer);
497+
498+
overweightFarmingRecipe()
499+
.setIngredient(OFBlocks.OVERWEIGHT_CARROT.get())
500+
.addOutput(ModItems.ORGANIC_MATTER.get(), 10, 2 * 10)
501+
.unlockedBy(OFBlocks.OVERWEIGHT_CARROT.get()).save(consumer);
502+
503+
overweightFarmingRecipe()
504+
.setIngredient(OFBlocks.OVERWEIGHT_POTATO.get())
505+
.addOutput(ModItems.ORGANIC_MATTER.get(), 10, 2 * 10)
506+
.unlockedBy(OFBlocks.OVERWEIGHT_POTATO.get()).save(consumer);
507+
508+
overweightFarmingRecipe()
509+
.setIngredient(OFBlocks.OVERWEIGHT_POISONOUS_POTATO.get())
510+
.addOutput(ModItems.TOXIN_EXTRACT.get(), 2 * 10, 4 * 10)
511+
.addOutput(ModItems.ORGANIC_MATTER.get(), 10, 3 * 10)
512+
.unlockedBy(OFBlocks.OVERWEIGHT_POISONOUS_POTATO.get()).save(consumer);
513+
514+
overweightFarmingRecipe()
515+
.setIngredient(OFBlocks.OVERWEIGHT_BAKED_POTATO.get())
516+
.addOutput(ModItems.ORGANIC_MATTER.get(), 2 * 10, 5 * 10)
517+
.unlockedBy(OFBlocks.OVERWEIGHT_BAKED_POTATO.get()).save(consumer);
518+
519+
overweightFarmingRecipe()
520+
.setIngredient(OFBlocks.OVERWEIGHT_NETHER_WART.get())
521+
.addOutput(ModItems.ORGANIC_MATTER.get(), 10, 2 * 10)
522+
.addOutput(ModItems.EXOTIC_DUST.get(), 4, 10)
523+
.unlockedBy(OFBlocks.OVERWEIGHT_NETHER_WART.get()).save(consumer);
524+
525+
overweightFarmingRecipe().ifModLoaded(FarmersDelight.MODID)
526+
.setIngredient(OFBlocks.OVERWEIGHT_CABBAGE.get())
527+
.addOutput(ModItems.ORGANIC_MATTER.get(), 10, 2 * 10)
528+
.unlockedBy(OFBlocks.OVERWEIGHT_CABBAGE.get()).save(consumer);
529+
530+
overweightFarmingRecipe().ifModLoaded(FarmersDelight.MODID)
531+
.setIngredient(OFBlocks.OVERWEIGHT_ONION.get())
532+
.addOutput(ModItems.ORGANIC_MATTER.get(), 10, 2 * 10)
533+
.unlockedBy(OFBlocks.OVERWEIGHT_ONION.get()).save(consumer);
534+
}
535+
464536
private void buildAlexsMobsRecipes(Consumer<FinishedRecipe> consumer) {
465537
alexsMobsRecipe()
466538
.setIngredient(AMItemRegistry.BEAR_FUR)

‎src/datagen/java/com/github/elenterius/biomancy/datagen/recipes/DigestingRecipeProvider.java

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@
2222
import net.minecraftforge.common.Tags;
2323
import net.minecraftforge.registries.ForgeRegistries;
2424
import net.minecraftforge.registries.RegistryObject;
25+
import net.orcinus.overweightfarming.OverweightFarming;
26+
import net.orcinus.overweightfarming.init.OFBlocks;
27+
import net.orcinus.overweightfarming.init.OFItems;
2528
import vectorwing.farmersdelight.FarmersDelight;
29+
import vectorwing.farmersdelight.common.FoodValues;
2630

2731
import java.util.List;
2832
import java.util.function.Consumer;
@@ -64,6 +68,7 @@ protected void buildRecipes(Consumer<FinishedRecipe> consumer) {
6468
buildFromOrganicRecipes(consumer);
6569

6670
buildFarmersDelightRecipes(consumer);
71+
buildOverweightFarmingRecipes(consumer);
6772

6873
buildAlexsMobsRecipes(consumer);
6974
buildAlexsCavesRecipes(consumer);
@@ -155,6 +160,10 @@ private DigesterRecipeBuilder farmersDelightRecipe(int count, ItemLike ingredien
155160
return nutrientPasteRecipe(count, ingredient).ifModLoaded(FarmersDelight.MODID);
156161
}
157162

163+
private DigesterRecipeBuilder overweightFarmingRecipe(int count, ItemLike ingredient) {
164+
return nutrientPasteRecipe(count, ingredient).ifModLoaded(OverweightFarming.MODID);
165+
}
166+
158167
private DigesterRecipeBuilder alexsMobsRecipe(int count, ItemLike ingredient) {
159168
return nutrientPasteRecipe(count, ingredient).ifModLoaded(AlexsMobs.MODID);
160169
}
@@ -181,6 +190,50 @@ class FarmersDelightItems extends vectorwing.farmersdelight.common.registry.ModI
181190
farmersDelightRecipe(4 * 2 + 2, FarmersDelightItems.HOT_COCOA.get()).setCraftingCost(3).addCraftingTimeModifier(30).save(consumer);
182191
}
183192

193+
private void buildOverweightFarmingRecipes(Consumer<FinishedRecipe> consumer) {
194+
int peelNutrition = 1;
195+
overweightFarmingRecipe(peelNutrition, OFItems.VEGETABLE_PEELS.get()).save(consumer);
196+
197+
int seedNutrition = 1;
198+
overweightFarmingRecipe(7 * Foods.MELON_SLICE.getNutrition() - peelNutrition, OFBlocks.SEEDED_PEELED_MELON.get()).setCraftingCost(3).addCraftingTimeModifier(25).save(consumer);
199+
overweightFarmingRecipe(7 * Foods.MELON_SLICE.getNutrition() - peelNutrition - seedNutrition, OFBlocks.HALF_SEEDED_PEELED_MELON.get()).setCraftingCost(3).addCraftingTimeModifier(20).save(consumer);
200+
overweightFarmingRecipe(7 * Foods.MELON_SLICE.getNutrition() - peelNutrition - seedNutrition * 2, OFBlocks.SEEDLESS_PEELED_MELON.get()).setCraftingCost(3).addCraftingTimeModifier(15).save(consumer);
201+
202+
overweightFarmingRecipe(Foods.CARROT.getNutrition() * 10, OFBlocks.OVERWEIGHT_CARROT.get()).setCraftingCost(3).addCraftingTimeModifier(30).save(consumer);
203+
overweightFarmingRecipe(Foods.BEETROOT.getNutrition() * 10, OFBlocks.OVERWEIGHT_BEETROOT.get()).setCraftingCost(3).addCraftingTimeModifier(30).save(consumer);
204+
overweightFarmingRecipe(Foods.POTATO.getNutrition() * 10, OFBlocks.OVERWEIGHT_POTATO.get()).setCraftingCost(3).addCraftingTimeModifier(30).save(consumer);
205+
overweightFarmingRecipe(Foods.POISONOUS_POTATO.getNutrition() * 10, OFBlocks.OVERWEIGHT_POISONOUS_POTATO.get()).setCraftingCost(3).addCraftingTimeModifier(30).save(consumer);
206+
overweightFarmingRecipe(Foods.BAKED_POTATO.getNutrition() * 10, OFBlocks.OVERWEIGHT_BAKED_POTATO.get()).setCraftingCost(3).addCraftingTimeModifier(30).save(consumer);
207+
208+
overweightFarmingRecipe(4 * 10, OFBlocks.OVERWEIGHT_COCOA.get()).setCraftingCost(3).addCraftingTimeModifier(60).save(consumer);
209+
overweightFarmingRecipe(4 * 10 - peelNutrition, OFBlocks.PEELED_OVERWEIGHT_COCOA.get()).setCraftingCost(3).addCraftingTimeModifier(45).save(consumer);
210+
overweightFarmingRecipe(2 * 10, OFBlocks.OVERWEIGHT_NETHER_WART.get()).setCraftingCost(2 * 10 - 2).addCraftingTimeModifier(30).save(consumer);
211+
212+
overweightFarmingRecipe(Foods.APPLE.getNutrition() * 10, OFBlocks.OVERWEIGHT_APPLE.get()).setCraftingCost(3).addCraftingTimeModifier(30).save(consumer);
213+
overweightFarmingRecipe(Foods.GOLDEN_APPLE.getNutrition() * 10, OFBlocks.OVERWEIGHT_GOLDEN_APPLE.get()).setCraftingCost(3).addCraftingTimeModifier(60).save(consumer);
214+
215+
overweightFarmingRecipe(FoodValues.ONION.getNutrition() * 10, OFBlocks.OVERWEIGHT_ONION.get()).ifModLoaded(FarmersDelight.MODID)
216+
.setCraftingCost(3).addCraftingTimeModifier(30)
217+
.save(consumer);
218+
overweightFarmingRecipe(FoodValues.CABBAGE.getNutrition() * 10, OFBlocks.OVERWEIGHT_CABBAGE.get()).ifModLoaded(FarmersDelight.MODID)
219+
.setCraftingCost(3).addCraftingTimeModifier(30)
220+
.save(consumer);
221+
222+
overweightFarmingRecipe(10, OFBlocks.OVERWEIGHT_KIWI.get()).ifModLoaded("hedgehog")
223+
.setCraftingCost(3).addCraftingTimeModifier(30)
224+
.save(consumer);
225+
overweightFarmingRecipe(10 - peelNutrition, OFBlocks.PEELED_OVERWEIGHT_KIWI.get()).ifModLoaded("hedgehog")
226+
.setCraftingCost(3).addCraftingTimeModifier(20)
227+
.save(consumer);
228+
229+
overweightFarmingRecipe(10, OFBlocks.OVERWEIGHT_GINGER.get()).ifModLoaded("snowyspirit")
230+
.setCraftingCost(3).addCraftingTimeModifier(30)
231+
.save(consumer);
232+
overweightFarmingRecipe(10 - peelNutrition, OFBlocks.PEELED_OVERWEIGHT_GINGER.get()).ifModLoaded("snowyspirit")
233+
.setCraftingCost(3).addCraftingTimeModifier(25)
234+
.save(consumer);
235+
}
236+
184237
private void buildAlexsMobsRecipes(Consumer<FinishedRecipe> consumer) {
185238
alexsMobsRecipe(1, AMBlockRegistry.CAIMAN_EGG.get()).save(consumer);
186239
alexsMobsRecipe(1, AMBlockRegistry.CROCODILE_EGG.get()).save(consumer);

‎src/generated/resources/data/biomancy/advancements/recipes/biomancy/decomposing/overweight_apple_block.json

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"advancements": [
3+
{
4+
"advancement": {
5+
"parent": "minecraft:recipes/root",
6+
"criteria": {
7+
"has_overweight_apple_block": {
8+
"conditions": {
9+
"items": [
10+
{
11+
"items": [
12+
"overweight_farming:overweight_apple_block"
13+
]
14+
}
15+
]
16+
},
17+
"trigger": "minecraft:inventory_changed"
18+
},
19+
"has_the_recipe": {
20+
"conditions": {
21+
"recipe": "biomancy:decomposing/overweight_apple_block"
22+
},
23+
"trigger": "minecraft:recipe_unlocked"
24+
}
25+
},
26+
"requirements": [
27+
[
28+
"has_overweight_apple_block",
29+
"has_the_recipe"
30+
]
31+
],
32+
"rewards": {
33+
"recipes": [
34+
"biomancy:decomposing/overweight_apple_block"
35+
]
36+
},
37+
"sends_telemetry_event": false
38+
},
39+
"conditions": [
40+
{
41+
"type": "forge:mod_loaded",
42+
"modid": "overweight_farming"
43+
}
44+
]
45+
}
46+
]
47+
}

‎src/generated/resources/data/biomancy/advancements/recipes/biomancy/decomposing/overweight_baked_potato_block.json

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"advancements": [
3+
{
4+
"advancement": {
5+
"parent": "minecraft:recipes/root",
6+
"criteria": {
7+
"has_overweight_baked_potato_block": {
8+
"conditions": {
9+
"items": [
10+
{
11+
"items": [
12+
"overweight_farming:overweight_baked_potato_block"
13+
]
14+
}
15+
]
16+
},
17+
"trigger": "minecraft:inventory_changed"
18+
},
19+
"has_the_recipe": {
20+
"conditions": {
21+
"recipe": "biomancy:decomposing/overweight_baked_potato_block"
22+
},
23+
"trigger": "minecraft:recipe_unlocked"
24+
}
25+
},
26+
"requirements": [
27+
[
28+
"has_overweight_baked_potato_block",
29+
"has_the_recipe"
30+
]
31+
],
32+
"rewards": {
33+
"recipes": [
34+
"biomancy:decomposing/overweight_baked_potato_block"
35+
]
36+
},
37+
"sends_telemetry_event": false
38+
},
39+
"conditions": [
40+
{
41+
"type": "forge:mod_loaded",
42+
"modid": "overweight_farming"
43+
}
44+
]
45+
}
46+
]
47+
}

‎src/generated/resources/data/biomancy/advancements/recipes/biomancy/decomposing/overweight_beetroot_block.json

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"advancements": [
3+
{
4+
"advancement": {
5+
"parent": "minecraft:recipes/root",
6+
"criteria": {
7+
"has_overweight_beetroot_block": {
8+
"conditions": {
9+
"items": [
10+
{
11+
"items": [
12+
"overweight_farming:overweight_beetroot_block"
13+
]
14+
}
15+
]
16+
},
17+
"trigger": "minecraft:inventory_changed"
18+
},
19+
"has_the_recipe": {
20+
"conditions": {
21+
"recipe": "biomancy:decomposing/overweight_beetroot_block"
22+
},
23+
"trigger": "minecraft:recipe_unlocked"
24+
}
25+
},
26+
"requirements": [
27+
[
28+
"has_overweight_beetroot_block",
29+
"has_the_recipe"
30+
]
31+
],
32+
"rewards": {
33+
"recipes": [
34+
"biomancy:decomposing/overweight_beetroot_block"
35+
]
36+
},
37+
"sends_telemetry_event": false
38+
},
39+
"conditions": [
40+
{
41+
"type": "forge:mod_loaded",
42+
"modid": "overweight_farming"
43+
}
44+
]
45+
}
46+
]
47+
}

‎src/generated/resources/data/biomancy/advancements/recipes/biomancy/decomposing/overweight_cabbage_block.json

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"advancements": [
3+
{
4+
"advancement": {
5+
"parent": "minecraft:recipes/root",
6+
"criteria": {
7+
"has_overweight_cabbage_block": {
8+
"conditions": {
9+
"items": [
10+
{
11+
"items": [
12+
"overweight_farming:overweight_cabbage_block"
13+
]
14+
}
15+
]
16+
},
17+
"trigger": "minecraft:inventory_changed"
18+
},
19+
"has_the_recipe": {
20+
"conditions": {
21+
"recipe": "biomancy:decomposing/overweight_cabbage_block"
22+
},
23+
"trigger": "minecraft:recipe_unlocked"
24+
}
25+
},
26+
"requirements": [
27+
[
28+
"has_overweight_cabbage_block",
29+
"has_the_recipe"
30+
]
31+
],
32+
"rewards": {
33+
"recipes": [
34+
"biomancy:decomposing/overweight_cabbage_block"
35+
]
36+
},
37+
"sends_telemetry_event": false
38+
},
39+
"conditions": [
40+
{
41+
"type": "forge:mod_loaded",
42+
"modid": "overweight_farming"
43+
},
44+
{
45+
"type": "forge:mod_loaded",
46+
"modid": "farmersdelight"
47+
}
48+
]
49+
}
50+
]
51+
}

0 commit comments

Comments
 (0)