From a622e497b30ae3320ff363367aee2c2f75f55967 Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Fri, 8 Mar 2024 16:52:25 -0600 Subject: [PATCH] Removed recipes for things that dont work yet. --- .../9cf54cdf67e16111ec482a2a3b607e8fd75a4246 | 5 +--- .../recipes/handheld_filler.json | 29 ------------------- .../recipes/ring_of_growth.json | 23 --------------- .../actuallyadditions/recipes/void_sack.json | 21 -------------- .../data/ItemRecipeGenerator.java | 16 +++++----- 5 files changed, 9 insertions(+), 85 deletions(-) delete mode 100644 src/generated/resources/data/actuallyadditions/recipes/handheld_filler.json delete mode 100644 src/generated/resources/data/actuallyadditions/recipes/ring_of_growth.json delete mode 100644 src/generated/resources/data/actuallyadditions/recipes/void_sack.json diff --git a/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 b/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 index 83cf9b237..c83ba9fff 100644 --- a/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 +++ b/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 @@ -1,4 +1,4 @@ -// 1.20.4 2024-03-08T16:41:19.1616554 Item Recipes +// 1.20.4 2024-03-08T16:52:06.2354947 Item Recipes d374edde9294d1a224b4b5610b50117a11328c00 data/actuallyadditions/recipes/advanced_coil.json f67629e45d152c96f3467a90a67520f78ecf9f07 data/actuallyadditions/recipes/advanced_leaf_blower.json d65e5a70232fa2f0e74d2a67c1cd4b0e87124242 data/actuallyadditions/recipes/basic_coil.json @@ -62,7 +62,6 @@ ffa7a52a39d9261b9c90c62709183a1f2d8f8352 data/actuallyadditions/recipes/drill_up 17d778888263c745217e8f1f7322b2245b99875d data/actuallyadditions/recipes/engineers_goggles_advanced.json 86ebb8d24b81682bf376f6cba628bcb13d62ed41 data/actuallyadditions/recipes/filter.json 811730c9a8496dd65e208a36d015b0671e86df1b data/actuallyadditions/recipes/gold_aiot.json -8b2ce2abfa8f78f7903c22347a54cdcf018d03eb data/actuallyadditions/recipes/handheld_filler.json a4e0e3bb72d472302f2ab4e5d282cbc7fd6882a6 data/actuallyadditions/recipes/iron_aiot.json 5615f6ad2e28e9c105491acb965e763dfe8cacab data/actuallyadditions/recipes/laser_upgrade_invisibility.json 38f744e92f1a5ff6a64e37cdfbb646422f741b3c data/actuallyadditions/recipes/laser_upgrade_range.json @@ -85,7 +84,6 @@ bc69015bae99ad4bb1a613a7367469d4401f83ae data/actuallyadditions/recipes/rice_dou f6c73cb2e41a8a21e2fda888b28bf52672b33d2e data/actuallyadditions/recipes/rice_slime.json 319b2d0423b79497837f5a3f940011b3bccf09f3 data/actuallyadditions/recipes/rice_slime_potion.json 2bd92dcc8b63d8577d804d172321d3a47c4b001d data/actuallyadditions/recipes/ring.json -dd9f1f6cf00985f75ef5deee8e138c533e81db1a data/actuallyadditions/recipes/ring_of_growth.json 764d4f63e1d978d02419d30d2ad845b914e594c0 data/actuallyadditions/recipes/ring_of_magnetizing.json fc0a5281fc77edde16f22165e164f73dd28d7fcd data/actuallyadditions/recipes/single_battery.json cb0454ccb8e918d506a1dd488187453678f82751 data/actuallyadditions/recipes/stone_aiot.json @@ -94,6 +92,5 @@ b4aa29ef0d47b557f354a23cb6ee8ef60d273de3 data/actuallyadditions/recipes/teleport 5745a05f877fce254a1990f1e89f80e91846e270 data/actuallyadditions/recipes/tiny_to_coal.json 91bebb02fc416a650eea26c2d87049de91866cf0 data/actuallyadditions/recipes/travelers_sack.json 89c9512eeb746befb1bdc31037baa9bd86220f74 data/actuallyadditions/recipes/triple_battery.json -babb9a9e8a18d124c235df9214265c84738b0c1d data/actuallyadditions/recipes/void_sack.json 0737014abee48f688982412297e04e994aa6f9a6 data/actuallyadditions/recipes/wings_of_the_bats.json c80073fcade3cdcb15f28c4a1cb12df4ae6cf4ec data/actuallyadditions/recipes/wooden_aiot.json diff --git a/src/generated/resources/data/actuallyadditions/recipes/handheld_filler.json b/src/generated/resources/data/actuallyadditions/recipes/handheld_filler.json deleted file mode 100644 index 0ae25ac13..000000000 --- a/src/generated/resources/data/actuallyadditions/recipes/handheld_filler.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "B": { - "item": "actuallyadditions:triple_battery" - }, - "C": { - "item": "actuallyadditions:advanced_coil" - }, - "D": { - "item": "actuallyadditions:diamatine_crystal" - }, - "I": { - "item": "actuallyadditions:empowered_enori_crystal" - }, - "P": { - "item": "actuallyadditions:palis_crystal" - } - }, - "pattern": [ - "IPI", - "DCD", - " B " - ], - "result": { - "item": "actuallyadditions:handheld_filler" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/ring_of_growth.json b/src/generated/resources/data/actuallyadditions/recipes/ring_of_growth.json deleted file mode 100644 index 9f3b7ecdd..000000000 --- a/src/generated/resources/data/actuallyadditions/recipes/ring_of_growth.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "I": { - "item": "actuallyadditions:empowered_enori_crystal" - }, - "O": { - "item": "actuallyadditions:ring" - }, - "S": { - "tag": "forge:seeds" - } - }, - "pattern": [ - "SIS", - "IOI", - "SIS" - ], - "result": { - "item": "actuallyadditions:ring_of_growth" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/void_sack.json b/src/generated/resources/data/actuallyadditions/recipes/void_sack.json deleted file mode 100644 index c36c396d8..000000000 --- a/src/generated/resources/data/actuallyadditions/recipes/void_sack.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "item": "actuallyadditions:travelers_sack" - }, - { - "tag": "forge:ender_pearls" - }, - { - "tag": "forge:obsidian" - }, - { - "item": "actuallyadditions:void_crystal_block" - } - ], - "result": { - "item": "actuallyadditions:void_sack" - } -} \ 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 a496c22b6..e97682d9f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java @@ -41,7 +41,7 @@ public class ItemRecipeGenerator extends RecipeProvider { protected void buildRecipes(@Nonnull RecipeOutput output) { var recipeOutput = new NoAdvRecipeOutput(output); - generatePaxels(recipeOutput); + generateAOIT(recipeOutput); //Goggles Recipe.shaped(ActuallyItems.ENGINEERS_GOGGLES.get()) @@ -79,7 +79,7 @@ public class ItemRecipeGenerator extends RecipeProvider { .define('C', ActuallyItems.ADVANCED_COIL.get()).save(recipeOutput); //Filling Wand - Recipe.shaped(ActuallyItems.HANDHELD_FILLER.get()) +/* Recipe.shaped(ActuallyItems.HANDHELD_FILLER.get()) .pattern("IPI") .pattern("DCD") .pattern(" B ") @@ -87,7 +87,7 @@ public class ItemRecipeGenerator extends RecipeProvider { .define('P', ActuallyItems.PALIS_CRYSTAL.get()) .define('C', ActuallyItems.ADVANCED_COIL.get()) .define('D', ActuallyItems.DIAMATINE_CRYSTAL.get()) - .define('B', ActuallyItems.TRIPLE_BATTERY.get()).save(recipeOutput); + .define('B', ActuallyItems.TRIPLE_BATTERY.get()).save(recipeOutput);*/ //TODO not done yet //Bag Recipe.shaped(ActuallyItems.TRAVELERS_SACK.get()) @@ -100,12 +100,12 @@ public class ItemRecipeGenerator extends RecipeProvider { .define('V', ActuallyBlocks.VOID_CRYSTAL.getItem()).save(recipeOutput); //Void Bag - Recipe.shapeless(ActuallyItems.VOID_SACK.get()) +/* Recipe.shapeless(ActuallyItems.VOID_SACK.get()) .requires(ActuallyItems.TRAVELERS_SACK.get()) .requires(Tags.Items.ENDER_PEARLS) .requires(Tags.Items.OBSIDIAN) .requires(ActuallyBlocks.VOID_CRYSTAL.getItem()) - .save(recipeOutput); + .save(recipeOutput);*/ //TODO not done yet //Lens Recipe.shaped(ActuallyItems.LENS.get()) @@ -419,12 +419,12 @@ public class ItemRecipeGenerator extends RecipeProvider { .save(recipeOutput); //Growth Ring - Recipe.shaped(ActuallyItems.RING_OF_GROWTH.get()) +/* Recipe.shaped(ActuallyItems.RING_OF_GROWTH.get()) .pattern("SIS", "IOI", "SIS") .define('S', Tags.Items.SEEDS) .define('I', ActuallyItems.EMPOWERED_ENORI_CRYSTAL.get()) .define('O', ActuallyItems.RING.get()) - .save(recipeOutput); + .save(recipeOutput);*/ //TODO not done yet Recipe.shapeless(ActuallyItems.CRAFTER_ON_A_STICK.get()).requires(Items.CRAFTING_TABLE).requires(ItemTags.SIGNS).save(recipeOutput); @@ -532,7 +532,7 @@ public class ItemRecipeGenerator extends RecipeProvider { .save(recipeOutput, new ResourceLocation(ActuallyAdditions.MODID, "rice_dough_smelting")); } - protected void generatePaxels(RecipeOutput consumer) { + protected void generateAOIT(RecipeOutput consumer) { addPaxel(consumer, ActuallyItems.WOODEN_AIOT, Items.WOODEN_AXE, Items.WOODEN_PICKAXE, Items.WOODEN_SWORD, Items.WOODEN_SHOVEL, Items.WOODEN_HOE); addPaxel(consumer, ActuallyItems.STONE_AIOT, Items.STONE_AXE, Items.STONE_PICKAXE, Items.STONE_SWORD, Items.STONE_SHOVEL, Items.STONE_HOE); addPaxel(consumer, ActuallyItems.IRON_AIOT, Items.IRON_AXE, Items.IRON_PICKAXE, Items.IRON_SWORD, Items.IRON_SHOVEL, Items.IRON_HOE);