From 7f3f3361bbf06e4b6008fd83008ad3b7cd6d8665 Mon Sep 17 00:00:00 2001 From: Buuz135 Date: Wed, 5 Jan 2022 22:34:48 +0100 Subject: [PATCH] Added ender drawer recipe --- src/generated/resources/.cache/cache | 5 ++- .../recipes/ender_drawer.json | 40 +++++++++++++++++++ .../functionalstorage/tags/items/drawer.json | 18 ++++----- .../minecraft/tags/blocks/mineable/axe.json | 18 ++++----- .../functionalstorage/FunctionalStorage.java | 7 ++++ 5 files changed, 68 insertions(+), 20 deletions(-) create mode 100644 src/generated/resources/data/functionalstorage/recipes/ender_drawer.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 57f26c2..044f112 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -109,6 +109,7 @@ ea3bf44b8e70ee71f488c62cc674839ede650a04 data/functionalstorage/recipes/crimson_ 9a466a0d3da5f628c200cfe7a41d39e4740e228f data/functionalstorage/recipes/dark_oak_2.json c9927a4a2a6c435615cac88249885706fa22f4a1 data/functionalstorage/recipes/dark_oak_4.json cbcf3ee5994888e92e713e4fb5ab310ddea0fdb6 data/functionalstorage/recipes/diamond_upgrade.json +82c0f23b4e5ab1a345e6f4a39b2e6edfa820a082 data/functionalstorage/recipes/ender_drawer.json 706bd944808746f993913f563279021c651c7ec5 data/functionalstorage/recipes/gold_upgrade.json 839587568a4163215b2b83d4e148e687d22e43f4 data/functionalstorage/recipes/iron_downgrade.json b01f9c03f49dc1a13acbb1f1099e9cad2aa1a3ad data/functionalstorage/recipes/jungle_1.json @@ -129,7 +130,7 @@ d6b02c345edd356b8e4b7421bdd453f454c6ed7f data/functionalstorage/recipes/storage_ bcb281904eac23183c45786e3d703d24bba92be6 data/functionalstorage/recipes/warped_1.json 8fc3f76a2c57eb4d80ce86947fabebe48fa6f692 data/functionalstorage/recipes/warped_2.json 7510a8ca1f1e3bb63f4c4f4add0bb6b713feaa0b data/functionalstorage/recipes/warped_4.json -db0122948639b122cb0c1df7530996e9784356b0 data/functionalstorage/tags/items/drawer.json +c90035bcbbce8f048618fbdd442779eb16c37cc0 data/functionalstorage/tags/items/drawer.json 12ec935226bf5a6a1493d353ef6dc6c224c256dd data/functionalstorage/tags/items/ignore_crafting_check.json -db0122948639b122cb0c1df7530996e9784356b0 data/minecraft/tags/blocks/mineable/axe.json +c90035bcbbce8f048618fbdd442779eb16c37cc0 data/minecraft/tags/blocks/mineable/axe.json 2c1ca62408eae8963178024550b0771101e01d53 data/minecraft/tags/blocks/mineable/pickaxe.json diff --git a/src/generated/resources/data/functionalstorage/recipes/ender_drawer.json b/src/generated/resources/data/functionalstorage/recipes/ender_drawer.json new file mode 100644 index 0000000..7b7c63e --- /dev/null +++ b/src/generated/resources/data/functionalstorage/recipes/ender_drawer.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "values": [ + { + "item": "functionalstorage:ender_drawer", + "type": "forge:item_exists" + } + ], + "type": "forge:and" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "PPP", + "LCL", + "PPP" + ], + "key": { + "P": { + "tag": "minecraft:planks" + }, + "C": { + "tag": "forge:chests/ender" + }, + "L": { + "tag": "functionalstorage:drawer" + } + }, + "result": { + "item": "functionalstorage:ender_drawer" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/functionalstorage/tags/items/drawer.json b/src/generated/resources/data/functionalstorage/tags/items/drawer.json index 6dff867..56bc599 100644 --- a/src/generated/resources/data/functionalstorage/tags/items/drawer.json +++ b/src/generated/resources/data/functionalstorage/tags/items/drawer.json @@ -1,6 +1,14 @@ { "replace": false, "values": [ + "functionalstorage:oak_2", + "functionalstorage:spruce_2", + "functionalstorage:birch_2", + "functionalstorage:jungle_2", + "functionalstorage:acacia_2", + "functionalstorage:dark_oak_2", + "functionalstorage:crimson_2", + "functionalstorage:warped_2", "functionalstorage:oak_1", "functionalstorage:spruce_1", "functionalstorage:birch_1", @@ -16,14 +24,6 @@ "functionalstorage:acacia_4", "functionalstorage:dark_oak_4", "functionalstorage:crimson_4", - "functionalstorage:warped_4", - "functionalstorage:oak_2", - "functionalstorage:spruce_2", - "functionalstorage:birch_2", - "functionalstorage:jungle_2", - "functionalstorage:acacia_2", - "functionalstorage:dark_oak_2", - "functionalstorage:crimson_2", - "functionalstorage:warped_2" + "functionalstorage:warped_4" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index 6dff867..56bc599 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -1,6 +1,14 @@ { "replace": false, "values": [ + "functionalstorage:oak_2", + "functionalstorage:spruce_2", + "functionalstorage:birch_2", + "functionalstorage:jungle_2", + "functionalstorage:acacia_2", + "functionalstorage:dark_oak_2", + "functionalstorage:crimson_2", + "functionalstorage:warped_2", "functionalstorage:oak_1", "functionalstorage:spruce_1", "functionalstorage:birch_1", @@ -16,14 +24,6 @@ "functionalstorage:acacia_4", "functionalstorage:dark_oak_4", "functionalstorage:crimson_4", - "functionalstorage:warped_4", - "functionalstorage:oak_2", - "functionalstorage:spruce_2", - "functionalstorage:birch_2", - "functionalstorage:jungle_2", - "functionalstorage:acacia_2", - "functionalstorage:dark_oak_2", - "functionalstorage:crimson_2", - "functionalstorage:warped_2" + "functionalstorage:warped_4" ] } \ No newline at end of file diff --git a/src/main/java/com/buuz135/functionalstorage/FunctionalStorage.java b/src/main/java/com/buuz135/functionalstorage/FunctionalStorage.java index efee52f..bd3a770 100644 --- a/src/main/java/com/buuz135/functionalstorage/FunctionalStorage.java +++ b/src/main/java/com/buuz135/functionalstorage/FunctionalStorage.java @@ -34,6 +34,7 @@ import net.minecraft.data.recipes.UpgradeRecipeBuilder; import net.minecraft.data.tags.BlockTagsProvider; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.ItemTags; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -303,6 +304,12 @@ public class FunctionalStorage extends ModuleController { .define('R', Tags.Items.DUSTS_REDSTONE) .define('D', StorageTags.DRAWER) .save(consumer); + TitaniumShapedRecipeBuilder.shapedRecipe(ENDER_DRAWER.get()) + .pattern("PPP").pattern("LCL").pattern("PPP") + .define('P', ItemTags.PLANKS) + .define('C', Tags.Items.CHESTS_ENDER) + .define('L', StorageTags.DRAWER) + .save(consumer); } }); event.getGenerator().addProvider(new FunctionalStorageItemTagsProvider(event.getGenerator(), new BlockTagsProvider(event.getGenerator()), MOD_ID, event.getExistingFileHelper()));