From a85dcdc0f84763537eed63b705fe293ea2a48ac8 Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Thu, 7 Nov 2024 17:57:28 -0600 Subject: [PATCH] Added reset recipes for machines that retain contents. --- .../9cf54cdf67e16111ec482a2a3b607e8fd75a4246 | 19 ++++++++++++- .../recipe/reset/atomic_reconstructor.json | 13 +++++++++ .../recipe/reset/breaker.json | 13 +++++++++ .../recipe/reset/canola_press.json | 13 +++++++++ .../recipe/reset/coal_generator.json | 13 +++++++++ .../recipe/reset/coffee_machine.json | 13 +++++++++ .../recipe/reset/crusher.json | 13 +++++++++ .../recipe/reset/crusher_double.json | 13 +++++++++ .../recipe/reset/display_stand.json | 13 +++++++++ .../recipe/reset/dropper.json | 13 +++++++++ .../recipe/reset/farmer.json | 13 +++++++++ .../recipe/reset/fermenting_barrel.json | 13 +++++++++ .../recipe/reset/fluid_collector.json | 13 +++++++++ .../recipe/reset/fluid_placer.json | 13 +++++++++ .../recipe/reset/leaf_generator.json | 13 +++++++++ .../recipe/reset/oil_generator.json | 13 +++++++++ .../recipe/reset/placer.json | 13 +++++++++ .../recipe/reset/powered_furnace.json | 13 +++++++++ .../data/ItemRecipeGenerator.java | 28 +++++++++++++++++++ .../registration/AABlockReg.java | 2 +- 20 files changed, 268 insertions(+), 2 deletions(-) create mode 100644 src/generated/resources/data/actuallyadditions/recipe/reset/atomic_reconstructor.json create mode 100644 src/generated/resources/data/actuallyadditions/recipe/reset/breaker.json create mode 100644 src/generated/resources/data/actuallyadditions/recipe/reset/canola_press.json create mode 100644 src/generated/resources/data/actuallyadditions/recipe/reset/coal_generator.json create mode 100644 src/generated/resources/data/actuallyadditions/recipe/reset/coffee_machine.json create mode 100644 src/generated/resources/data/actuallyadditions/recipe/reset/crusher.json create mode 100644 src/generated/resources/data/actuallyadditions/recipe/reset/crusher_double.json create mode 100644 src/generated/resources/data/actuallyadditions/recipe/reset/display_stand.json create mode 100644 src/generated/resources/data/actuallyadditions/recipe/reset/dropper.json create mode 100644 src/generated/resources/data/actuallyadditions/recipe/reset/farmer.json create mode 100644 src/generated/resources/data/actuallyadditions/recipe/reset/fermenting_barrel.json create mode 100644 src/generated/resources/data/actuallyadditions/recipe/reset/fluid_collector.json create mode 100644 src/generated/resources/data/actuallyadditions/recipe/reset/fluid_placer.json create mode 100644 src/generated/resources/data/actuallyadditions/recipe/reset/leaf_generator.json create mode 100644 src/generated/resources/data/actuallyadditions/recipe/reset/oil_generator.json create mode 100644 src/generated/resources/data/actuallyadditions/recipe/reset/placer.json create mode 100644 src/generated/resources/data/actuallyadditions/recipe/reset/powered_furnace.json diff --git a/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 b/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 index a7a44f50b..2cfc6a4d9 100644 --- a/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 +++ b/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 @@ -1,4 +1,4 @@ -// 1.21.1 2024-10-16T22:05:14.5301488 Item Recipes +// 1.21.1 2024-11-07T15:26:09.7156836 Item Recipes 14bd5bc2ee3e84b6f3a3181c0e0efd40df5f1d84 data/actuallyadditions/recipe/advanced_coil.json 955aad6c1def123a6adbaeabb13faa6eedce847f data/actuallyadditions/recipe/advanced_leaf_blower.json 97e7ba64f5054b030f4e49615dc4212a28ca9be1 data/actuallyadditions/recipe/basic_coil.json @@ -102,6 +102,23 @@ a87ce0c47d97dffb4aae7b22d014007a6c9594a5 data/actuallyadditions/recipe/phantom_c f471f62cce2a66b1abcb20ac2f04a721cb502c82 data/actuallyadditions/recipe/player_probe.json a63510c304f5b5d0f814f75210b99b02e643fde5 data/actuallyadditions/recipe/quadruple_battery.json 27a066dffb4934fada9191452dcc1865670d7785 data/actuallyadditions/recipe/quintuple_battery.json +766aa4277b3d9f3013e91099bbd0cc93701d0c1c data/actuallyadditions/recipe/reset/atomic_reconstructor.json +f0fcec31dbca65ab1f7debcd4c36cb55b24fac7c data/actuallyadditions/recipe/reset/breaker.json +41ef3599fc2a94c3b99975aed88d5299ffaca8d3 data/actuallyadditions/recipe/reset/canola_press.json +3d9137796f2b14541b61814a380e2077bd1d3e98 data/actuallyadditions/recipe/reset/coal_generator.json +70be7544916763f74297a29017d41b4aef913bd4 data/actuallyadditions/recipe/reset/coffee_machine.json +1e98eab64a166305639d9bc9bec90e7ac18e4c9e data/actuallyadditions/recipe/reset/crusher.json +665029d430d9e4212c3e19d6e9e631bfa01c927a data/actuallyadditions/recipe/reset/crusher_double.json +0477029ac0df30077cdb7326756ec6629f10a71c data/actuallyadditions/recipe/reset/display_stand.json +64c43e0d73c4da97adc81381278fd60412e82e42 data/actuallyadditions/recipe/reset/dropper.json +52b180afdc6ca7ece2e290fde3bbd8ff1c474710 data/actuallyadditions/recipe/reset/farmer.json +5c6766ddac0b09c138471ff9f06f8044c0bfe992 data/actuallyadditions/recipe/reset/fermenting_barrel.json +e53a990694951b5b47fa52c0d52842de7649cedb data/actuallyadditions/recipe/reset/fluid_collector.json +35b80e07e40060af13a8666e753356918ee1978d data/actuallyadditions/recipe/reset/fluid_placer.json +8a570904919955a7d133a858ca19c6211b265036 data/actuallyadditions/recipe/reset/leaf_generator.json +92f9bb62415383f6e00bdb4f1641ed1f83554ef8 data/actuallyadditions/recipe/reset/oil_generator.json +f90b544db04bbb20664268451738cf907d06c4a6 data/actuallyadditions/recipe/reset/placer.json +a97b7e4418bb22002914b1e2d4283a4394356607 data/actuallyadditions/recipe/reset/powered_furnace.json f4390d29692bc7255e4f71dd8c7a1889a08472a0 data/actuallyadditions/recipe/rice_dough.json 8387752b39fe9b367e409e4ee1d70227830a4720 data/actuallyadditions/recipe/rice_dough_smelting.json f7b4a51bf6bcaee860b68bfd2dc40a6b0bfff6bc data/actuallyadditions/recipe/rice_paper.json diff --git a/src/generated/resources/data/actuallyadditions/recipe/reset/atomic_reconstructor.json b/src/generated/resources/data/actuallyadditions/recipe/reset/atomic_reconstructor.json new file mode 100644 index 000000000..f4e59866d --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/reset/atomic_reconstructor.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "actuallyadditions:atomic_reconstructor" + } + ], + "result": { + "count": 1, + "id": "actuallyadditions:atomic_reconstructor" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/reset/breaker.json b/src/generated/resources/data/actuallyadditions/recipe/reset/breaker.json new file mode 100644 index 000000000..0ce7b86c0 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/reset/breaker.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "actuallyadditions:breaker" + } + ], + "result": { + "count": 1, + "id": "actuallyadditions:breaker" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/reset/canola_press.json b/src/generated/resources/data/actuallyadditions/recipe/reset/canola_press.json new file mode 100644 index 000000000..0dc41174a --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/reset/canola_press.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "actuallyadditions:canola_press" + } + ], + "result": { + "count": 1, + "id": "actuallyadditions:canola_press" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/reset/coal_generator.json b/src/generated/resources/data/actuallyadditions/recipe/reset/coal_generator.json new file mode 100644 index 000000000..6a91229f2 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/reset/coal_generator.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "actuallyadditions:coal_generator" + } + ], + "result": { + "count": 1, + "id": "actuallyadditions:coal_generator" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/reset/coffee_machine.json b/src/generated/resources/data/actuallyadditions/recipe/reset/coffee_machine.json new file mode 100644 index 000000000..a509bbcf7 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/reset/coffee_machine.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "actuallyadditions:coffee_machine" + } + ], + "result": { + "count": 1, + "id": "actuallyadditions:coffee_machine" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/reset/crusher.json b/src/generated/resources/data/actuallyadditions/recipe/reset/crusher.json new file mode 100644 index 000000000..905c356a3 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/reset/crusher.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "actuallyadditions:crusher" + } + ], + "result": { + "count": 1, + "id": "actuallyadditions:crusher" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/reset/crusher_double.json b/src/generated/resources/data/actuallyadditions/recipe/reset/crusher_double.json new file mode 100644 index 000000000..9a2e5a4e0 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/reset/crusher_double.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "actuallyadditions:crusher_double" + } + ], + "result": { + "count": 1, + "id": "actuallyadditions:crusher_double" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/reset/display_stand.json b/src/generated/resources/data/actuallyadditions/recipe/reset/display_stand.json new file mode 100644 index 000000000..071be5013 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/reset/display_stand.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "actuallyadditions:display_stand" + } + ], + "result": { + "count": 1, + "id": "actuallyadditions:display_stand" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/reset/dropper.json b/src/generated/resources/data/actuallyadditions/recipe/reset/dropper.json new file mode 100644 index 000000000..8481b4d6e --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/reset/dropper.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "actuallyadditions:dropper" + } + ], + "result": { + "count": 1, + "id": "actuallyadditions:dropper" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/reset/farmer.json b/src/generated/resources/data/actuallyadditions/recipe/reset/farmer.json new file mode 100644 index 000000000..801185bc7 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/reset/farmer.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "actuallyadditions:farmer" + } + ], + "result": { + "count": 1, + "id": "actuallyadditions:farmer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/reset/fermenting_barrel.json b/src/generated/resources/data/actuallyadditions/recipe/reset/fermenting_barrel.json new file mode 100644 index 000000000..06ebef064 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/reset/fermenting_barrel.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "actuallyadditions:fermenting_barrel" + } + ], + "result": { + "count": 1, + "id": "actuallyadditions:fermenting_barrel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/reset/fluid_collector.json b/src/generated/resources/data/actuallyadditions/recipe/reset/fluid_collector.json new file mode 100644 index 000000000..a79c34f45 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/reset/fluid_collector.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "actuallyadditions:fluid_collector" + } + ], + "result": { + "count": 1, + "id": "actuallyadditions:fluid_collector" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/reset/fluid_placer.json b/src/generated/resources/data/actuallyadditions/recipe/reset/fluid_placer.json new file mode 100644 index 000000000..df98541a5 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/reset/fluid_placer.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "actuallyadditions:fluid_placer" + } + ], + "result": { + "count": 1, + "id": "actuallyadditions:fluid_placer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/reset/leaf_generator.json b/src/generated/resources/data/actuallyadditions/recipe/reset/leaf_generator.json new file mode 100644 index 000000000..bb467dc23 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/reset/leaf_generator.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "actuallyadditions:leaf_generator" + } + ], + "result": { + "count": 1, + "id": "actuallyadditions:leaf_generator" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/reset/oil_generator.json b/src/generated/resources/data/actuallyadditions/recipe/reset/oil_generator.json new file mode 100644 index 000000000..209977839 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/reset/oil_generator.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "actuallyadditions:oil_generator" + } + ], + "result": { + "count": 1, + "id": "actuallyadditions:oil_generator" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/reset/placer.json b/src/generated/resources/data/actuallyadditions/recipe/reset/placer.json new file mode 100644 index 000000000..3b319d0f6 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/reset/placer.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "actuallyadditions:placer" + } + ], + "result": { + "count": 1, + "id": "actuallyadditions:placer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/reset/powered_furnace.json b/src/generated/resources/data/actuallyadditions/recipe/reset/powered_furnace.json new file mode 100644 index 000000000..c5ecb264b --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipe/reset/powered_furnace.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "actuallyadditions:powered_furnace" + } + ], + "result": { + "count": 1, + "id": "actuallyadditions:powered_furnace" + } +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java index c4a8307d0..2483724e7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java @@ -10,6 +10,7 @@ import de.ellpeck.actuallyadditions.mod.crafting.TargetNBTIngredient; import de.ellpeck.actuallyadditions.mod.items.ActuallyItems; import de.ellpeck.actuallyadditions.mod.util.NoAdvRecipeOutput; import de.ellpeck.actuallyadditions.mod.util.RecipeInjector; +import de.ellpeck.actuallyadditions.registration.AABlockReg; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; @@ -609,6 +610,33 @@ public class ItemRecipeGenerator extends RecipeProvider { .requires(ActuallyItems.ITEM_BOOKLET.get()) .requires(Items.PAPER) .save(recipeOutput); + + // Reset Recipes + generateReset(ActuallyBlocks.OIL_GENERATOR, recipeOutput); + generateReset(ActuallyBlocks.COAL_GENERATOR, recipeOutput); + generateReset(ActuallyBlocks.LEAF_GENERATOR, recipeOutput); + generateReset(ActuallyBlocks.POWERED_FURNACE, recipeOutput); + generateReset(ActuallyBlocks.CRUSHER, recipeOutput); + generateReset(ActuallyBlocks.CRUSHER_DOUBLE, recipeOutput); + generateReset(ActuallyBlocks.DISPLAY_STAND, recipeOutput); + generateReset(ActuallyBlocks.ATOMIC_RECONSTRUCTOR, recipeOutput); + generateReset(ActuallyBlocks.FARMER, recipeOutput); + generateReset(ActuallyBlocks.DROPPER, recipeOutput); + generateReset(ActuallyBlocks.PLACER, recipeOutput); + generateReset(ActuallyBlocks.BREAKER, recipeOutput); + generateReset(ActuallyBlocks.FLUID_COLLECTOR, recipeOutput); + generateReset(ActuallyBlocks.FLUID_PLACER, recipeOutput); + generateReset(ActuallyBlocks.COFFEE_MACHINE, recipeOutput); + generateReset(ActuallyBlocks.CANOLA_PRESS, recipeOutput); + generateReset(ActuallyBlocks.FERMENTING_BARREL, recipeOutput); + + } + + protected void generateReset(@Nonnull AABlockReg item, @Nonnull RecipeOutput consumer) { + Recipe.shapeless(item.getItem()) + .ingredients(item.getItem()) + .name(ActuallyAdditions.modLoc("reset/" + item.getName())) + .save(consumer); } protected void generateAOIT(RecipeOutput consumer) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/registration/AABlockReg.java b/src/main/java/de/ellpeck/actuallyadditions/registration/AABlockReg.java index 9dddacd8a..89ef60ebe 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/registration/AABlockReg.java +++ b/src/main/java/de/ellpeck/actuallyadditions/registration/AABlockReg.java @@ -44,7 +44,7 @@ public class AABlockReg */ - public String getName() {return name;} + public String getName() { return name; } @Override public Block get() {