diff --git a/build.gradle b/build.gradle index c5317a761..26a59a51a 100644 --- a/build.gradle +++ b/build.gradle @@ -99,6 +99,11 @@ dependencies { localRuntime "curse.maven:jade-324717:5803666" localRuntime "curse.maven:mekanism-268560:5680395" + // Immersive Engineering, mainly for compat datagen + implementation "curse.maven:ie-231951:5828000" + implementation "blusunrize.immersiveengineering:ImmersiveEngineering:1.21.1-12.0.0-182.77:datagen" + implementation "blusunrize.immersiveengineering:ImmersiveEngineering:1.21.1-12.0.0-182.77:api" + implementation "top.theillusivec4.curios:curios-neoforge:${curios_version}" } diff --git a/gradle.properties b/gradle.properties index 803485a05..72c446dd9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # Actually Additions -mod_version=1.3.6 +mod_version=1.3.7 # Forge game_version=1.21.1 diff --git a/src/generated/resources/.cache/ac8a02941a4e34649db8b388fb528d3ed610c50f b/src/generated/resources/.cache/ac8a02941a4e34649db8b388fb528d3ed610c50f index cf242875a..4d63a4b78 100644 --- a/src/generated/resources/.cache/ac8a02941a4e34649db8b388fb528d3ed610c50f +++ b/src/generated/resources/.cache/ac8a02941a4e34649db8b388fb528d3ed610c50f @@ -1,3 +1,7 @@ -// 1.21.1 2024-08-11T19:30:01.8123206 Misc Recipes +// 1.21.1 2024-10-24T15:58:31.7869255 Misc Recipes +426ef39628bee0e5fa5478e8490b9661a302bc5b data/actuallyadditions/recipe/compat/cloche_canola.json +86384eda7472a193965aec7c58a1e97178bd901b data/actuallyadditions/recipe/compat/cloche_coffee.json +f60e89093717ab73b5ec4760a4a2a2502ad92b21 data/actuallyadditions/recipe/compat/cloche_flax.json +c2a9c355543d601b810a4ffc581bdeaf00077358 data/actuallyadditions/recipe/compat/cloche_rice.json 11e0dd08e85ab0f073a06a447be5e57949849180 data/actuallyadditions/recipe/fermenting/refined_canola.json 3b226a682d7de7ffff4b91818057c740b4e7bcd7 data/actuallyadditions/recipe/pressing/canola.json diff --git a/src/generated/resources/data/actuallyadditions/recipe/compat/cloche_canola.json b/src/generated/resources/data/actuallyadditions/recipe/compat/cloche_canola.json new file mode 100644 index 000000000..b7d909df6 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/compat/cloche_canola.json @@ -0,0 +1,25 @@ +{ + "type": "immersiveengineering:cloche", + "input": { + "item": "actuallyadditions:canola_seeds" + }, + "render": { + "type": "immersiveengineering:crop", + "block": "actuallyadditions:canola" + }, + "results": [ + { + "basePredicate": { + "item": "actuallyadditions:canola" + }, + "count": 2 + }, + { + "item": "actuallyadditions:canola_seeds" + } + ], + "soil": { + "tag": "minecraft:dirt" + }, + "time": 800 +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/compat/cloche_coffee.json b/src/generated/resources/data/actuallyadditions/recipe/compat/cloche_coffee.json new file mode 100644 index 000000000..522a2c67c --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/compat/cloche_coffee.json @@ -0,0 +1,25 @@ +{ + "type": "immersiveengineering:cloche", + "input": { + "item": "actuallyadditions:coffee_beans" + }, + "render": { + "type": "immersiveengineering:crop", + "block": "actuallyadditions:coffee" + }, + "results": [ + { + "basePredicate": { + "item": "actuallyadditions:coffee_beans" + }, + "count": 2 + }, + { + "item": "actuallyadditions:coffee_beans" + } + ], + "soil": { + "tag": "minecraft:dirt" + }, + "time": 800 +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/compat/cloche_flax.json b/src/generated/resources/data/actuallyadditions/recipe/compat/cloche_flax.json new file mode 100644 index 000000000..c0832b0fd --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/compat/cloche_flax.json @@ -0,0 +1,25 @@ +{ + "type": "immersiveengineering:cloche", + "input": { + "item": "actuallyadditions:flax_seeds" + }, + "render": { + "type": "immersiveengineering:crop", + "block": "actuallyadditions:flax" + }, + "results": [ + { + "basePredicate": { + "item": "minecraft:string" + }, + "count": 2 + }, + { + "item": "actuallyadditions:flax_seeds" + } + ], + "soil": { + "tag": "minecraft:dirt" + }, + "time": 800 +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/compat/cloche_rice.json b/src/generated/resources/data/actuallyadditions/recipe/compat/cloche_rice.json new file mode 100644 index 000000000..b17119506 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/compat/cloche_rice.json @@ -0,0 +1,25 @@ +{ + "type": "immersiveengineering:cloche", + "input": { + "item": "actuallyadditions:rice_seeds" + }, + "render": { + "type": "immersiveengineering:crop", + "block": "actuallyadditions:rice" + }, + "results": [ + { + "basePredicate": { + "item": "actuallyadditions:rice" + }, + "count": 2 + }, + { + "item": "actuallyadditions:rice_seeds" + } + ], + "soil": { + "tag": "minecraft:dirt" + }, + "time": 800 +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/MiscMachineRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/MiscMachineRecipeGenerator.java index 79f6b41bb..2661adbd3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/MiscMachineRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/MiscMachineRecipeGenerator.java @@ -1,5 +1,6 @@ package de.ellpeck.actuallyadditions.data; +import de.ellpeck.actuallyadditions.data.compat.ClocheRecipes; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.crafting.FermentingRecipe; import de.ellpeck.actuallyadditions.mod.crafting.PressingRecipe; @@ -36,6 +37,8 @@ public class MiscMachineRecipeGenerator extends RecipeProvider { recipeOutput.accept(folderRecipe("fermenting", "refined_canola"), new FermentingRecipe( new FluidStack(InitFluids.CANOLA_OIL.get(), 80), new FluidStack(InitFluids.REFINED_CANOLA_OIL.get(), 80), 100), null); + + ClocheRecipes.buildRecipes(recipeOutput); } // private String getItemName(ItemLike item) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/compat/ClocheRecipes.java b/src/main/java/de/ellpeck/actuallyadditions/data/compat/ClocheRecipes.java new file mode 100644 index 000000000..45e9636e7 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/data/compat/ClocheRecipes.java @@ -0,0 +1,51 @@ +package de.ellpeck.actuallyadditions.data.compat; + +import blusunrize.immersiveengineering.client.utils.ClocheRenderFunctions; +import blusunrize.immersiveengineering.data.recipes.builder.ClocheRecipeBuilder; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks; +import de.ellpeck.actuallyadditions.mod.items.ActuallyItems; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.ItemTags; +import net.minecraft.world.item.Items; + +public class ClocheRecipes { + public static void buildRecipes(RecipeOutput output) { + ClocheRecipeBuilder.builder() + .output(ActuallyItems.CANOLA, 2) + .output(ActuallyItems.CANOLA_SEEDS) + .seed(ActuallyItems.CANOLA_SEEDS) + .soil(ItemTags.DIRT) + .setTime(800) + .setRender(new ClocheRenderFunctions.RenderFunctionCrop(ActuallyBlocks.CANOLA.get())) + .build(output, ResourceLocation.fromNamespaceAndPath(ActuallyAdditions.MODID, "compat/cloche_canola")); + + ClocheRecipeBuilder.builder() + .output(Items.STRING, 2) + .output(ActuallyItems.FLAX_SEEDS) + .seed(ActuallyItems.FLAX_SEEDS) + .soil(ItemTags.DIRT) + .setTime(800) + .setRender(new ClocheRenderFunctions.RenderFunctionCrop(ActuallyBlocks.FLAX.get())) + .build(output, ResourceLocation.fromNamespaceAndPath(ActuallyAdditions.MODID, "compat/cloche_flax")); + + ClocheRecipeBuilder.builder() + .output(ActuallyItems.COFFEE_BEANS, 2) + .output(ActuallyItems.COFFEE_BEANS) + .seed(ActuallyItems.COFFEE_BEANS) + .soil(ItemTags.DIRT) + .setTime(800) + .setRender(new ClocheRenderFunctions.RenderFunctionCrop(ActuallyBlocks.COFFEE.get())) + .build(output, ResourceLocation.fromNamespaceAndPath(ActuallyAdditions.MODID, "compat/cloche_coffee")); + + ClocheRecipeBuilder.builder() + .output(ActuallyItems.RICE, 2) + .output(ActuallyItems.RICE_SEEDS) + .seed(ActuallyItems.RICE_SEEDS) + .soil(ItemTags.DIRT) + .setTime(800) + .setRender(new ClocheRenderFunctions.RenderFunctionCrop(ActuallyBlocks.RICE.get())) + .build(output, ResourceLocation.fromNamespaceAndPath(ActuallyAdditions.MODID, "compat/cloche_rice")); + } +} diff --git a/update/changelog.md b/update/changelog.md index 8846c2c5f..d2d4caa03 100644 --- a/update/changelog.md +++ b/update/changelog.md @@ -1,3 +1,6 @@ +# 1.3.6+mc1.21.1 +* Added recipes for AA crops in the IE cloche. + # 1.3.6+mc1.21.1 * Add the ability to open the Crafting Table On A Stick while inside a Curios slot * Add missing XP Solidifier recipe