From 62cd96047b4f94d32af946c8af16458d8d09c7b8 Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Sun, 12 Jun 2022 22:17:40 +0100 Subject: [PATCH] Updated data gens & fixed #279 --- .../75bcd4dba6ca7d365462b0ec45e291d1056349c4 | 3 + .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 45 +++++++++++++++ src/generated/resources/.cache/cache | 44 --------------- .../ironchest/chests/copper_iron_chest.json | 40 ++++++------- .../chests/diamond_crystal_chest.json | 20 +++---- .../chests/diamond_obsidian_chest.json | 20 +++---- .../ironchest/chests/gold_diamond_chest.json | 20 +++---- .../ironchest/chests/iron_gold_chest.json | 20 +++---- .../chests/trapped_copper_chest.json | 28 +++++----- .../chests/trapped_crystal_chest.json | 28 +++++----- .../chests/trapped_diamond_chest.json | 28 +++++----- .../ironchest/chests/trapped_dirt_chest.json | 28 +++++----- .../ironchest/chests/trapped_gold_chest.json | 28 +++++----- .../ironchest/chests/trapped_iron_chest.json | 28 +++++----- .../chests/trapped_obsidian_chest.json | 28 +++++----- .../chests/vanilla_copper_chest.json | 40 ++++++------- .../ironchest/chests/vanilla_dirt_chest.json | 20 +++---- .../ironchest/chests/vanilla_iron_chest.json | 56 +++++++++---------- .../copper_to_iron_chest_upgrade.json | 40 ++++++------- .../diamond_to_crystal_chest_upgrade.json | 20 +++---- .../diamond_to_obsidian_chest_upgrade.json | 20 +++---- .../gold_to_diamond_chest_upgrade.json | 20 +++---- .../upgrades/iron_to_gold_chest_upgrade.json | 20 +++---- .../wood_to_copper_chest_upgrade.json | 40 ++++++------- .../upgrades/wood_to_iron_chest_upgrade.json | 20 +++---- .../recipes/chests/copper_iron_chest.json | 24 ++++---- .../recipes/chests/diamond_crystal_chest.json | 10 ++-- .../chests/diamond_obsidian_chest.json | 10 ++-- .../recipes/chests/gold_diamond_chest.json | 16 +++--- .../recipes/chests/iron_gold_chest.json | 10 ++-- .../recipes/chests/vanilla_copper_chest.json | 18 +++--- .../recipes/chests/vanilla_dirt_chest.json | 10 ++-- .../recipes/chests/vanilla_iron_chest.json | 10 ++-- .../copper_to_iron_chest_upgrade.json | 24 ++++---- .../diamond_to_crystal_chest_upgrade.json | 16 +++--- .../diamond_to_obsidian_chest_upgrade.json | 16 +++--- .../gold_to_diamond_chest_upgrade.json | 16 +++--- .../upgrades/iron_to_gold_chest_upgrade.json | 16 +++--- .../wood_to_copper_chest_upgrade.json | 18 +++--- .../upgrades/wood_to_iron_chest_upgrade.json | 10 ++-- .../tags/blocks/mineable/pickaxe.json | 16 ++++++ .../tags/blocks/mineable/shovel.json | 6 ++ .../com/progwml6/ironchest/IronChests.java | 9 ++- .../common/data/IronChestsBlockTags.java | 38 +++++++++++++ 44 files changed, 533 insertions(+), 464 deletions(-) create mode 100644 src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 create mode 100644 src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e delete mode 100644 src/generated/resources/.cache/cache create mode 100644 src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json create mode 100644 src/main/java/com/progwml6/ironchest/common/data/IronChestsBlockTags.java diff --git a/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 b/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 new file mode 100644 index 00000000..5d0a6ef5 --- /dev/null +++ b/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 @@ -0,0 +1,3 @@ +// 1.19 2022-06-12T22:14:14.7910364 Tags for minecraft:block +9d9739e029d3448f4948a70f64e2ee83f71c7eea data/minecraft/tags/blocks/mineable/pickaxe.json +1b0c9b763a2ad4ff1ccd8d407afcc11cb074e1aa data/minecraft/tags/blocks/mineable/shovel.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e new file mode 100644 index 00000000..784a4fbb --- /dev/null +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -0,0 +1,45 @@ +// 1.19 2022-06-12T22:10:41.4681226 Recipes +828a8718cb1062e977c053eec6411f0dbccfeb9f data/ironchest/advancements/recipes/ironchest/chests/copper_iron_chest.json +edf69f8c7d9bce7dfad0bd06797b3685b12fcdc0 data/ironchest/advancements/recipes/ironchest/chests/diamond_crystal_chest.json +e334b7dc9373378df20ff491b435a61f6f5c85f9 data/ironchest/advancements/recipes/ironchest/chests/diamond_obsidian_chest.json +f238d613285763659fc4036355553187ee01710c data/ironchest/advancements/recipes/ironchest/chests/gold_diamond_chest.json +14b19de2dddf7b98cb296ad2f89382dadd88d89f data/ironchest/advancements/recipes/ironchest/chests/iron_gold_chest.json +6a193f798ad018fdb9fdc3cc0cd5fc4873526406 data/ironchest/advancements/recipes/ironchest/chests/trapped_copper_chest.json +67a1af1f834b3cac53db835618759f56cb22490f data/ironchest/advancements/recipes/ironchest/chests/trapped_crystal_chest.json +1792451c1ccfa09024ee6fad4b48302a70c73e69 data/ironchest/advancements/recipes/ironchest/chests/trapped_diamond_chest.json +d2c078ab12c2cc508c6f80e6b905337981f517df data/ironchest/advancements/recipes/ironchest/chests/trapped_dirt_chest.json +ffe44081bb67f46d8206f68091a794b6fb9d0646 data/ironchest/advancements/recipes/ironchest/chests/trapped_gold_chest.json +fa3b453000e8f5be2282d13e08bd4d794cb12bc9 data/ironchest/advancements/recipes/ironchest/chests/trapped_iron_chest.json +e236d8c60c01125ebe345f5f0cf7d8a458647fdb data/ironchest/advancements/recipes/ironchest/chests/trapped_obsidian_chest.json +b83d2ea18ebf819f2e924adc6391663cd0fb7868 data/ironchest/advancements/recipes/ironchest/chests/vanilla_copper_chest.json +a60ca3f09b4d7b1fa92763c98f30fdb182f49ed4 data/ironchest/advancements/recipes/ironchest/chests/vanilla_dirt_chest.json +aae8d9d5059ebf715234affa06257bdd845e8d4b data/ironchest/advancements/recipes/ironchest/chests/vanilla_iron_chest.json +c4783d1950718c8f4f94d59add5715763a7f3cb1 data/ironchest/advancements/recipes/ironchest/upgrades/copper_to_iron_chest_upgrade.json +6c582d667f39d52b0f03862e6f43191a671e724e data/ironchest/advancements/recipes/ironchest/upgrades/diamond_to_crystal_chest_upgrade.json +f879a09e469319c33d3b3dad9dce933084f21301 data/ironchest/advancements/recipes/ironchest/upgrades/diamond_to_obsidian_chest_upgrade.json +3b3fc542e2adf79c57cb51dae6445c096d8e86c4 data/ironchest/advancements/recipes/ironchest/upgrades/gold_to_diamond_chest_upgrade.json +7cceb02cc8d8976286769cb167e5eeb05d0100f6 data/ironchest/advancements/recipes/ironchest/upgrades/iron_to_gold_chest_upgrade.json +b1c3f91993a693a0ebfc4acee49ad8210108bef5 data/ironchest/advancements/recipes/ironchest/upgrades/wood_to_copper_chest_upgrade.json +c0f8a6f89658e8708c952c766f834a334d6b72f5 data/ironchest/advancements/recipes/ironchest/upgrades/wood_to_iron_chest_upgrade.json +04386e6092031c5f2fc17a90c6254569f5722ef9 data/ironchest/recipes/chests/copper_iron_chest.json +2102b9bd6d3b6a64d6176d64a9d86ab14841160e data/ironchest/recipes/chests/diamond_crystal_chest.json +e89d7ce8c7613de1d5f6ff5d7ffbec25ac59170f data/ironchest/recipes/chests/diamond_obsidian_chest.json +f67aa062d6ae4d21b6855d7b6ac37c8c6426b1e2 data/ironchest/recipes/chests/gold_diamond_chest.json +57e7a69dee6beb4dc777b649e84ea5864d3721f8 data/ironchest/recipes/chests/iron_gold_chest.json +73512493abe99f98e8a10b6c52b65facdcd71887 data/ironchest/recipes/chests/trapped_copper_chest.json +c2cade410df7374d165aa60584fc1d1d61d542ec data/ironchest/recipes/chests/trapped_crystal_chest.json +7c50d33dffe2c9b3b98175275ac21075ee3bb657 data/ironchest/recipes/chests/trapped_diamond_chest.json +1b9737b0ad1c75dc940ca1de8dad7ccc67da2997 data/ironchest/recipes/chests/trapped_dirt_chest.json +d96fdc30fc732fade3d533cfd8c0330cdad4568c data/ironchest/recipes/chests/trapped_gold_chest.json +bda1a423ba51748c3e573fec470a3d088b5aecf5 data/ironchest/recipes/chests/trapped_iron_chest.json +5b11ff6757705137a6f8f9124b9ac096f41f24a1 data/ironchest/recipes/chests/trapped_obsidian_chest.json +00af0d56b4818c59c7f233cf2aba1e1dd8ef17f1 data/ironchest/recipes/chests/vanilla_copper_chest.json +ff788a5ed9a2c49e8279a74d824629fc5e5a7e6b data/ironchest/recipes/chests/vanilla_dirt_chest.json +6c0beebf1fe9e0b807d7971cb2470ec79733753b data/ironchest/recipes/chests/vanilla_iron_chest.json +9de312d4b9f8c4234db49ea230081f01bf970180 data/ironchest/recipes/upgrades/copper_to_iron_chest_upgrade.json +dd74795de9f23f96e43f76d0437e3fb3daecb58a data/ironchest/recipes/upgrades/diamond_to_crystal_chest_upgrade.json +ec23ca5dc31586cd92503eae3f9d97a4b642a4e4 data/ironchest/recipes/upgrades/diamond_to_obsidian_chest_upgrade.json +7bfca1fcb78faf7ce30cb17770ff177d2bd5033f data/ironchest/recipes/upgrades/gold_to_diamond_chest_upgrade.json +2728c67c36cd13edd082b7dfc0327fdd81cbb8e5 data/ironchest/recipes/upgrades/iron_to_gold_chest_upgrade.json +ace9cbf8c1871c5e599fde8d128809fd6742bf97 data/ironchest/recipes/upgrades/wood_to_copper_chest_upgrade.json +52ee5ccd6416d61c3b008575907969546d08412d data/ironchest/recipes/upgrades/wood_to_iron_chest_upgrade.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache deleted file mode 100644 index 3fb754cf..00000000 --- a/src/generated/resources/.cache/cache +++ /dev/null @@ -1,44 +0,0 @@ -7296cff6a6eca7b425e197d3fb7888e6fa3cd5dd data/ironchest/advancements/recipes/ironchest/chests/copper_iron_chest.json -365d1d3c70e95c535001aa21e2f0d28480c976e2 data/ironchest/advancements/recipes/ironchest/chests/diamond_crystal_chest.json -14cfaa8fa7e949d583f5f0cd1babf9bc572d52f1 data/ironchest/advancements/recipes/ironchest/chests/diamond_obsidian_chest.json -82f46e3026d29292107f3508efe9f51ccd04dd9f data/ironchest/advancements/recipes/ironchest/chests/gold_diamond_chest.json -b5137f5fe7c01b7d17e8fdb6e3566259495b6e9e data/ironchest/advancements/recipes/ironchest/chests/iron_gold_chest.json -7d082e5fba21b16e47a2b18a056c3dd5f23446f7 data/ironchest/advancements/recipes/ironchest/chests/trapped_copper_chest.json -142c7602ee97d7ff8d90be8a079c9194399823ba data/ironchest/advancements/recipes/ironchest/chests/trapped_crystal_chest.json -647b32ea931ab295e543ff2c9764c54f8d7c60bc data/ironchest/advancements/recipes/ironchest/chests/trapped_diamond_chest.json -face9559d8ebe33ba328907c7972008500a0e479 data/ironchest/advancements/recipes/ironchest/chests/trapped_dirt_chest.json -5daf3624699118447c3e0a5301d2867e1316d496 data/ironchest/advancements/recipes/ironchest/chests/trapped_gold_chest.json -672915e6909fab99e26a279cc0fb602194ee0fbd data/ironchest/advancements/recipes/ironchest/chests/trapped_iron_chest.json -a18efb9a37526e310f8fd0c416afe5b9e0cdb60a data/ironchest/advancements/recipes/ironchest/chests/trapped_obsidian_chest.json -9af9bbe7112085d5bf3506ff5382bca94583ba87 data/ironchest/advancements/recipes/ironchest/chests/vanilla_copper_chest.json -fe5a597181eb84fdb45abedc4acc1e3851408fd5 data/ironchest/advancements/recipes/ironchest/chests/vanilla_dirt_chest.json -2b35db8b04b0d148e17560f71ca159acdda5d44c data/ironchest/advancements/recipes/ironchest/chests/vanilla_iron_chest.json -5f8f57815f58b45b193e9a660a13824ca545ad7b data/ironchest/advancements/recipes/ironchest/upgrades/copper_to_iron_chest_upgrade.json -321e75477afceb6f187f15cf1f7568c6d31d6c87 data/ironchest/advancements/recipes/ironchest/upgrades/diamond_to_crystal_chest_upgrade.json -17ed7dbb2c69090dacd0efea29dbaf949a4e876d data/ironchest/advancements/recipes/ironchest/upgrades/diamond_to_obsidian_chest_upgrade.json -13c40784d2a492f1ea186962d08fc2fb74250cba data/ironchest/advancements/recipes/ironchest/upgrades/gold_to_diamond_chest_upgrade.json -9a594bfd16844d98c31e3b15932142d335cff104 data/ironchest/advancements/recipes/ironchest/upgrades/iron_to_gold_chest_upgrade.json -160649754eab1cf0e5c51bb0fb86e7da3591aa04 data/ironchest/advancements/recipes/ironchest/upgrades/wood_to_copper_chest_upgrade.json -6045f50aafba06668e0f221d3e7d62827a3ed368 data/ironchest/advancements/recipes/ironchest/upgrades/wood_to_iron_chest_upgrade.json -db1c86a602b40793abc52cebf70fad24cf6409d9 data/ironchest/recipes/chests/copper_iron_chest.json -5b6d438390722b031bb97e4c5501449c18c4bbca data/ironchest/recipes/chests/diamond_crystal_chest.json -9f141ad7e75e7ac70b175129c058180da5e04ab7 data/ironchest/recipes/chests/diamond_obsidian_chest.json -00cad996bebebe268e2e0a4c59c024127c6f4a06 data/ironchest/recipes/chests/gold_diamond_chest.json -401d6ab7ffb4e815dc1a6562dd70bc7bd1f6d524 data/ironchest/recipes/chests/iron_gold_chest.json -75b39983c0c9f2ca8218d92944d7a7f4690836cc data/ironchest/recipes/chests/trapped_copper_chest.json -bea47276cee81c561d994e74676c8c395d2beb16 data/ironchest/recipes/chests/trapped_crystal_chest.json -455756f75eb3c1461f8b9b18685ca9c9b85b7715 data/ironchest/recipes/chests/trapped_diamond_chest.json -1025e3d03c72c912241eac954cd1fe73b3afe32d data/ironchest/recipes/chests/trapped_dirt_chest.json -be5121a75023e6b3498c1f5f70a10d0018462933 data/ironchest/recipes/chests/trapped_gold_chest.json -66d6b68613ec306bde252f802d46373c4df540c9 data/ironchest/recipes/chests/trapped_iron_chest.json -20846ca266bf0374f5abe21c4957566f5e065b6e data/ironchest/recipes/chests/trapped_obsidian_chest.json -c4ce3a2d83ee91bc30b7f88fef054b6331f71d8d data/ironchest/recipes/chests/vanilla_copper_chest.json -6a2a1c0af03d5d3ea12ee4ee2f9ccebbb4f86196 data/ironchest/recipes/chests/vanilla_dirt_chest.json -12878399ae3ea231cd4b73f5883cd741938bbd5f data/ironchest/recipes/chests/vanilla_iron_chest.json -4511348163faf1009f48d5f7fa0f158aab35a971 data/ironchest/recipes/upgrades/copper_to_iron_chest_upgrade.json -780bbb21db7e8c0ca51e366eb1ef9846b046a612 data/ironchest/recipes/upgrades/diamond_to_crystal_chest_upgrade.json -8f49486d68aa7f56c740d8e9008db5fd2f53fd6e data/ironchest/recipes/upgrades/diamond_to_obsidian_chest_upgrade.json -793e25f4ae9a93636292036ceb9b0aaa821d299b data/ironchest/recipes/upgrades/gold_to_diamond_chest_upgrade.json -1b70eef2a303cf31300a5a5bc20780f9cea7e444 data/ironchest/recipes/upgrades/iron_to_gold_chest_upgrade.json -058c4081d18ddcff952f218a1e1e31ea1c26fa04 data/ironchest/recipes/upgrades/wood_to_copper_chest_upgrade.json -1098d6ebd2e6e1065324fd6314481fe40df132e7 data/ironchest/recipes/upgrades/wood_to_iron_chest_upgrade.json diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/copper_iron_chest.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/copper_iron_chest.json index 9b6345bf..75c4c5af 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/copper_iron_chest.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/copper_iron_chest.json @@ -1,38 +1,24 @@ { "advancements": [ { - "conditions": [ - { - "value": { - "tag": "forge:ingots/copper", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ], "advancement": { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:chests/copper_iron_chest" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "forge:ingots/iron" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "ironchest:chests/copper_iron_chest" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -40,8 +26,22 @@ "has_item", "has_the_recipe" ] - ] - } + ], + "rewards": { + "recipes": [ + "ironchest:chests/copper_iron_chest" + ] + } + }, + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ingots/copper" + } + } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/diamond_crystal_chest.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/diamond_crystal_chest.json index 8c0c138b..6a7eb0a8 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/diamond_crystal_chest.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/diamond_crystal_chest.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:chests/diamond_crystal_chest" - ] - }, "criteria": { "has_glass": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "forge:glass" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "ironchest:chests/diamond_crystal_chest" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_glass", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "ironchest:chests/diamond_crystal_chest" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/diamond_obsidian_chest.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/diamond_obsidian_chest.json index 4ca5fcec..9e11c327 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/diamond_obsidian_chest.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/diamond_obsidian_chest.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:chests/diamond_obsidian_chest" - ] - }, "criteria": { "has_obsidian": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "ironchest:chests/diamond_obsidian_chest" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_obsidian", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "ironchest:chests/diamond_obsidian_chest" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/gold_diamond_chest.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/gold_diamond_chest.json index d1ad345c..aa6e15db 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/gold_diamond_chest.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/gold_diamond_chest.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:chests/gold_diamond_chest" - ] - }, "criteria": { "has_diamonds": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "forge:gems/diamond" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "ironchest:chests/gold_diamond_chest" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_diamonds", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "ironchest:chests/gold_diamond_chest" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/iron_gold_chest.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/iron_gold_chest.json index 764165a1..c4c8f8ac 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/iron_gold_chest.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/iron_gold_chest.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:chests/iron_gold_chest" - ] - }, "criteria": { "has_gold_ingot": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "forge:ingots/gold" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "ironchest:chests/iron_gold_chest" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_gold_ingot", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "ironchest:chests/iron_gold_chest" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_copper_chest.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_copper_chest.json index 6884468c..01e9c054 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_copper_chest.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_copper_chest.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:chests/trapped_copper_chest" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "ironchest:chests/trapped_copper_chest" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_tripwire_hook": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "ironchest:chests/trapped_copper_chest" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_tripwire_hook", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "ironchest:chests/trapped_copper_chest" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_crystal_chest.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_crystal_chest.json index 62a6388f..660e6d56 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_crystal_chest.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_crystal_chest.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:chests/trapped_crystal_chest" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "ironchest:chests/trapped_crystal_chest" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_tripwire_hook": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "ironchest:chests/trapped_crystal_chest" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_tripwire_hook", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "ironchest:chests/trapped_crystal_chest" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_diamond_chest.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_diamond_chest.json index b2d1960a..f977d624 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_diamond_chest.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_diamond_chest.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:chests/trapped_diamond_chest" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "ironchest:chests/trapped_diamond_chest" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_tripwire_hook": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "ironchest:chests/trapped_diamond_chest" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_tripwire_hook", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "ironchest:chests/trapped_diamond_chest" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_dirt_chest.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_dirt_chest.json index 0e08fe8d..364a9919 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_dirt_chest.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_dirt_chest.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:chests/trapped_dirt_chest" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "ironchest:chests/trapped_dirt_chest" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_tripwire_hook": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "ironchest:chests/trapped_dirt_chest" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_tripwire_hook", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "ironchest:chests/trapped_dirt_chest" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_gold_chest.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_gold_chest.json index 361f2c00..6be95616 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_gold_chest.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_gold_chest.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:chests/trapped_gold_chest" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "ironchest:chests/trapped_gold_chest" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_tripwire_hook": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "ironchest:chests/trapped_gold_chest" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_tripwire_hook", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "ironchest:chests/trapped_gold_chest" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_iron_chest.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_iron_chest.json index 319b25b8..ff8009f1 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_iron_chest.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_iron_chest.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:chests/trapped_iron_chest" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "ironchest:chests/trapped_iron_chest" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_tripwire_hook": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "ironchest:chests/trapped_iron_chest" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_tripwire_hook", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "ironchest:chests/trapped_iron_chest" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_obsidian_chest.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_obsidian_chest.json index 94f0cf3b..6349cd52 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_obsidian_chest.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/trapped_obsidian_chest.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:chests/trapped_obsidian_chest" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "ironchest:chests/trapped_obsidian_chest" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_tripwire_hook": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "ironchest:chests/trapped_obsidian_chest" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_tripwire_hook", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "ironchest:chests/trapped_obsidian_chest" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/vanilla_copper_chest.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/vanilla_copper_chest.json index 76653d0a..f6a843c2 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/vanilla_copper_chest.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/vanilla_copper_chest.json @@ -1,38 +1,24 @@ { "advancements": [ { - "conditions": [ - { - "value": { - "tag": "forge:ingots/copper", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ], "advancement": { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:chests/vanilla_copper_chest" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "forge:ingots/copper" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "ironchest:chests/vanilla_copper_chest" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -40,8 +26,22 @@ "has_item", "has_the_recipe" ] - ] - } + ], + "rewards": { + "recipes": [ + "ironchest:chests/vanilla_copper_chest" + ] + } + }, + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ingots/copper" + } + } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/vanilla_dirt_chest.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/vanilla_dirt_chest.json index 449660e0..f12144d6 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/vanilla_dirt_chest.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/vanilla_dirt_chest.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:chests/vanilla_dirt_chest" - ] - }, "criteria": { "has_iron_ingot": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "ironchest:chests/vanilla_dirt_chest" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_iron_ingot", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "ironchest:chests/vanilla_dirt_chest" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/vanilla_iron_chest.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/vanilla_iron_chest.json index 33a91da1..d5db6949 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/vanilla_iron_chest.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/chests/vanilla_iron_chest.json @@ -1,32 +1,32 @@ { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:chests/vanilla_iron_chest" + "parent": "minecraft:recipes/root", + "criteria": { + "has_iron_ingot": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } ] + }, + "trigger": "minecraft:inventory_changed" }, - "criteria": { - "has_iron_ingot": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "forge:ingots/iron" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "ironchest:chests/vanilla_iron_chest" - } - } - }, - "requirements": [ - [ - "has_iron_ingot", - "has_the_recipe" - ] + "has_the_recipe": { + "conditions": { + "recipe": "ironchest:chests/vanilla_iron_chest" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_iron_ingot", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "ironchest:chests/vanilla_iron_chest" ] -} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/copper_to_iron_chest_upgrade.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/copper_to_iron_chest_upgrade.json index ee4d0bf1..f791ce94 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/copper_to_iron_chest_upgrade.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/copper_to_iron_chest_upgrade.json @@ -1,38 +1,24 @@ { "advancements": [ { - "conditions": [ - { - "value": { - "tag": "forge:ingots/copper", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ], "advancement": { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:upgrades/copper_to_iron_chest_upgrade" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "forge:glass" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "ironchest:upgrades/copper_to_iron_chest_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -40,8 +26,22 @@ "has_item", "has_the_recipe" ] - ] - } + ], + "rewards": { + "recipes": [ + "ironchest:upgrades/copper_to_iron_chest_upgrade" + ] + } + }, + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ingots/copper" + } + } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/diamond_to_crystal_chest_upgrade.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/diamond_to_crystal_chest_upgrade.json index 55bff4c4..678a8221 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/diamond_to_crystal_chest_upgrade.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/diamond_to_crystal_chest_upgrade.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:upgrades/diamond_to_crystal_chest_upgrade" - ] - }, "criteria": { "has_glass": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "forge:glass" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "ironchest:upgrades/diamond_to_crystal_chest_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_glass", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "ironchest:upgrades/diamond_to_crystal_chest_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/diamond_to_obsidian_chest_upgrade.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/diamond_to_obsidian_chest_upgrade.json index 24cabae0..9117fa98 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/diamond_to_obsidian_chest_upgrade.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/diamond_to_obsidian_chest_upgrade.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:upgrades/diamond_to_obsidian_chest_upgrade" - ] - }, "criteria": { "has_glass": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "forge:glass" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "ironchest:upgrades/diamond_to_obsidian_chest_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_glass", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "ironchest:upgrades/diamond_to_obsidian_chest_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/gold_to_diamond_chest_upgrade.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/gold_to_diamond_chest_upgrade.json index 9a4c89b7..bcd46a57 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/gold_to_diamond_chest_upgrade.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/gold_to_diamond_chest_upgrade.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:upgrades/gold_to_diamond_chest_upgrade" - ] - }, "criteria": { "has_glass": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "forge:glass" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "ironchest:upgrades/gold_to_diamond_chest_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_glass", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "ironchest:upgrades/gold_to_diamond_chest_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/iron_to_gold_chest_upgrade.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/iron_to_gold_chest_upgrade.json index 0afe9f6b..1853d089 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/iron_to_gold_chest_upgrade.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/iron_to_gold_chest_upgrade.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:upgrades/iron_to_gold_chest_upgrade" - ] - }, "criteria": { "has_iron_ingot": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "forge:ingots/iron" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "ironchest:upgrades/iron_to_gold_chest_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_iron_ingot", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "ironchest:upgrades/iron_to_gold_chest_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/wood_to_copper_chest_upgrade.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/wood_to_copper_chest_upgrade.json index 47d88c78..c135d97f 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/wood_to_copper_chest_upgrade.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/wood_to_copper_chest_upgrade.json @@ -1,38 +1,24 @@ { "advancements": [ { - "conditions": [ - { - "value": { - "tag": "forge:ingots/copper", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ], "advancement": { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:upgrades/wood_to_copper_chest_upgrade" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "minecraft:planks" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "ironchest:upgrades/wood_to_copper_chest_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -40,8 +26,22 @@ "has_item", "has_the_recipe" ] - ] - } + ], + "rewards": { + "recipes": [ + "ironchest:upgrades/wood_to_copper_chest_upgrade" + ] + } + }, + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ingots/copper" + } + } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/wood_to_iron_chest_upgrade.json b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/wood_to_iron_chest_upgrade.json index b5874878..09552172 100644 --- a/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/wood_to_iron_chest_upgrade.json +++ b/src/generated/resources/data/ironchest/advancements/recipes/ironchest/upgrades/wood_to_iron_chest_upgrade.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "ironchest:upgrades/wood_to_iron_chest_upgrade" - ] - }, "criteria": { "has_iron_ingot": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "forge:ingots/iron" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "ironchest:upgrades/wood_to_iron_chest_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_iron_ingot", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "ironchest:upgrades/wood_to_iron_chest_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/ironchest/recipes/chests/copper_iron_chest.json b/src/generated/resources/data/ironchest/recipes/chests/copper_iron_chest.json index 48c691c0..104ad3ee 100644 --- a/src/generated/resources/data/ironchest/recipes/chests/copper_iron_chest.json +++ b/src/generated/resources/data/ironchest/recipes/chests/copper_iron_chest.json @@ -4,31 +4,31 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/copper", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/copper" + } } ], "recipe": { "type": "minecraft:crafting_shaped", - "pattern": [ - "MGM", - "GSG", - "MGM" - ], "key": { + "G": { + "tag": "forge:glass" + }, "M": { "tag": "forge:ingots/iron" }, "S": { "item": "ironchest:copper_chest" - }, - "G": { - "tag": "forge:glass" } }, + "pattern": [ + "MGM", + "GSG", + "MGM" + ], "result": { "item": "ironchest:iron_chest" } diff --git a/src/generated/resources/data/ironchest/recipes/chests/diamond_crystal_chest.json b/src/generated/resources/data/ironchest/recipes/chests/diamond_crystal_chest.json index ecaed6f4..89c6c4c1 100644 --- a/src/generated/resources/data/ironchest/recipes/chests/diamond_crystal_chest.json +++ b/src/generated/resources/data/ironchest/recipes/chests/diamond_crystal_chest.json @@ -1,10 +1,5 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "GGG", - "GSG", - "GGG" - ], "key": { "G": { "tag": "forge:glass" @@ -13,6 +8,11 @@ "item": "ironchest:diamond_chest" } }, + "pattern": [ + "GGG", + "GSG", + "GGG" + ], "result": { "item": "ironchest:crystal_chest" } diff --git a/src/generated/resources/data/ironchest/recipes/chests/diamond_obsidian_chest.json b/src/generated/resources/data/ironchest/recipes/chests/diamond_obsidian_chest.json index 8e218b31..49fa0f3c 100644 --- a/src/generated/resources/data/ironchest/recipes/chests/diamond_obsidian_chest.json +++ b/src/generated/resources/data/ironchest/recipes/chests/diamond_obsidian_chest.json @@ -1,10 +1,5 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "MMM", - "MSM", - "MMM" - ], "key": { "M": { "item": "minecraft:obsidian" @@ -13,6 +8,11 @@ "item": "ironchest:diamond_chest" } }, + "pattern": [ + "MMM", + "MSM", + "MMM" + ], "result": { "item": "ironchest:obsidian_chest" } diff --git a/src/generated/resources/data/ironchest/recipes/chests/gold_diamond_chest.json b/src/generated/resources/data/ironchest/recipes/chests/gold_diamond_chest.json index 62fbeedb..e5b53841 100644 --- a/src/generated/resources/data/ironchest/recipes/chests/gold_diamond_chest.json +++ b/src/generated/resources/data/ironchest/recipes/chests/gold_diamond_chest.json @@ -1,21 +1,21 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "GGG", - "MSM", - "GGG" - ], "key": { + "G": { + "tag": "forge:glass" + }, "M": { "tag": "forge:gems/diamond" }, "S": { "item": "ironchest:gold_chest" - }, - "G": { - "tag": "forge:glass" } }, + "pattern": [ + "GGG", + "MSM", + "GGG" + ], "result": { "item": "ironchest:diamond_chest" } diff --git a/src/generated/resources/data/ironchest/recipes/chests/iron_gold_chest.json b/src/generated/resources/data/ironchest/recipes/chests/iron_gold_chest.json index 3e5f00a2..8c3576b8 100644 --- a/src/generated/resources/data/ironchest/recipes/chests/iron_gold_chest.json +++ b/src/generated/resources/data/ironchest/recipes/chests/iron_gold_chest.json @@ -1,10 +1,5 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "MMM", - "MSM", - "MMM" - ], "key": { "M": { "tag": "forge:ingots/gold" @@ -13,6 +8,11 @@ "item": "ironchest:iron_chest" } }, + "pattern": [ + "MMM", + "MSM", + "MMM" + ], "result": { "item": "ironchest:gold_chest" } diff --git a/src/generated/resources/data/ironchest/recipes/chests/vanilla_copper_chest.json b/src/generated/resources/data/ironchest/recipes/chests/vanilla_copper_chest.json index 34144308..ad63f8f7 100644 --- a/src/generated/resources/data/ironchest/recipes/chests/vanilla_copper_chest.json +++ b/src/generated/resources/data/ironchest/recipes/chests/vanilla_copper_chest.json @@ -4,20 +4,15 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/copper", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/copper" + } } ], "recipe": { "type": "minecraft:crafting_shaped", - "pattern": [ - "MMM", - "MSM", - "MMM" - ], "key": { "M": { "tag": "forge:ingots/copper" @@ -26,6 +21,11 @@ "tag": "forge:chests/wooden" } }, + "pattern": [ + "MMM", + "MSM", + "MMM" + ], "result": { "item": "ironchest:copper_chest" } diff --git a/src/generated/resources/data/ironchest/recipes/chests/vanilla_dirt_chest.json b/src/generated/resources/data/ironchest/recipes/chests/vanilla_dirt_chest.json index 0e730eeb..6ddca14f 100644 --- a/src/generated/resources/data/ironchest/recipes/chests/vanilla_dirt_chest.json +++ b/src/generated/resources/data/ironchest/recipes/chests/vanilla_dirt_chest.json @@ -1,10 +1,5 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "MMM", - "MSM", - "MMM" - ], "key": { "M": [ { @@ -21,6 +16,11 @@ "tag": "forge:chests/wooden" } }, + "pattern": [ + "MMM", + "MSM", + "MMM" + ], "result": { "item": "ironchest:dirt_chest" } diff --git a/src/generated/resources/data/ironchest/recipes/chests/vanilla_iron_chest.json b/src/generated/resources/data/ironchest/recipes/chests/vanilla_iron_chest.json index c10a999d..66652008 100644 --- a/src/generated/resources/data/ironchest/recipes/chests/vanilla_iron_chest.json +++ b/src/generated/resources/data/ironchest/recipes/chests/vanilla_iron_chest.json @@ -1,10 +1,5 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "MMM", - "MSM", - "MMM" - ], "key": { "M": { "tag": "forge:ingots/iron" @@ -13,6 +8,11 @@ "tag": "forge:chests/wooden" } }, + "pattern": [ + "MMM", + "MSM", + "MMM" + ], "result": { "item": "ironchest:iron_chest" } diff --git a/src/generated/resources/data/ironchest/recipes/upgrades/copper_to_iron_chest_upgrade.json b/src/generated/resources/data/ironchest/recipes/upgrades/copper_to_iron_chest_upgrade.json index 535c42b8..e149cf74 100644 --- a/src/generated/resources/data/ironchest/recipes/upgrades/copper_to_iron_chest_upgrade.json +++ b/src/generated/resources/data/ironchest/recipes/upgrades/copper_to_iron_chest_upgrade.json @@ -4,31 +4,31 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/copper", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/copper" + } } ], "recipe": { "type": "minecraft:crafting_shaped", - "pattern": [ - "MGM", - "GSG", - "MGM" - ], "key": { + "G": { + "tag": "forge:glass" + }, "M": { "tag": "forge:ingots/iron" }, "S": { "tag": "forge:ingots/copper" - }, - "G": { - "tag": "forge:glass" } }, + "pattern": [ + "MGM", + "GSG", + "MGM" + ], "result": { "item": "ironchest:copper_to_iron_chest_upgrade" } diff --git a/src/generated/resources/data/ironchest/recipes/upgrades/diamond_to_crystal_chest_upgrade.json b/src/generated/resources/data/ironchest/recipes/upgrades/diamond_to_crystal_chest_upgrade.json index 7a3f770d..ff323db4 100644 --- a/src/generated/resources/data/ironchest/recipes/upgrades/diamond_to_crystal_chest_upgrade.json +++ b/src/generated/resources/data/ironchest/recipes/upgrades/diamond_to_crystal_chest_upgrade.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "GGG", - "GMG", - "GGG" - ], "key": { - "M": { - "item": "minecraft:obsidian" - }, "G": { "tag": "forge:glass" + }, + "M": { + "item": "minecraft:obsidian" } }, + "pattern": [ + "GGG", + "GMG", + "GGG" + ], "result": { "item": "ironchest:diamond_to_crystal_chest_upgrade" } diff --git a/src/generated/resources/data/ironchest/recipes/upgrades/diamond_to_obsidian_chest_upgrade.json b/src/generated/resources/data/ironchest/recipes/upgrades/diamond_to_obsidian_chest_upgrade.json index 960d7c49..737fe5c3 100644 --- a/src/generated/resources/data/ironchest/recipes/upgrades/diamond_to_obsidian_chest_upgrade.json +++ b/src/generated/resources/data/ironchest/recipes/upgrades/diamond_to_obsidian_chest_upgrade.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "MMM", - "MGM", - "MMM" - ], "key": { - "M": { - "item": "minecraft:obsidian" - }, "G": { "tag": "forge:glass" + }, + "M": { + "item": "minecraft:obsidian" } }, + "pattern": [ + "MMM", + "MGM", + "MMM" + ], "result": { "item": "ironchest:diamond_to_obsidian_chest_upgrade" } diff --git a/src/generated/resources/data/ironchest/recipes/upgrades/gold_to_diamond_chest_upgrade.json b/src/generated/resources/data/ironchest/recipes/upgrades/gold_to_diamond_chest_upgrade.json index a4395bed..fac8109c 100644 --- a/src/generated/resources/data/ironchest/recipes/upgrades/gold_to_diamond_chest_upgrade.json +++ b/src/generated/resources/data/ironchest/recipes/upgrades/gold_to_diamond_chest_upgrade.json @@ -1,21 +1,21 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "GGG", - "MSM", - "GGG" - ], "key": { + "G": { + "tag": "forge:glass" + }, "M": { "tag": "forge:gems/diamond" }, "S": { "tag": "forge:ingots/gold" - }, - "G": { - "tag": "forge:glass" } }, + "pattern": [ + "GGG", + "MSM", + "GGG" + ], "result": { "item": "ironchest:gold_to_diamond_chest_upgrade" } diff --git a/src/generated/resources/data/ironchest/recipes/upgrades/iron_to_gold_chest_upgrade.json b/src/generated/resources/data/ironchest/recipes/upgrades/iron_to_gold_chest_upgrade.json index 918ed2f0..258c44dd 100644 --- a/src/generated/resources/data/ironchest/recipes/upgrades/iron_to_gold_chest_upgrade.json +++ b/src/generated/resources/data/ironchest/recipes/upgrades/iron_to_gold_chest_upgrade.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "GGG", - "GIG", - "GGG" - ], "key": { - "I": { - "tag": "forge:ingots/iron" - }, "G": { "tag": "forge:ingots/gold" + }, + "I": { + "tag": "forge:ingots/iron" } }, + "pattern": [ + "GGG", + "GIG", + "GGG" + ], "result": { "item": "ironchest:iron_to_gold_chest_upgrade" } diff --git a/src/generated/resources/data/ironchest/recipes/upgrades/wood_to_copper_chest_upgrade.json b/src/generated/resources/data/ironchest/recipes/upgrades/wood_to_copper_chest_upgrade.json index 70e4b9b1..73b5c714 100644 --- a/src/generated/resources/data/ironchest/recipes/upgrades/wood_to_copper_chest_upgrade.json +++ b/src/generated/resources/data/ironchest/recipes/upgrades/wood_to_copper_chest_upgrade.json @@ -4,20 +4,15 @@ { "conditions": [ { + "type": "forge:not", "value": { - "tag": "forge:ingots/copper", - "type": "forge:tag_empty" - }, - "type": "forge:not" + "type": "forge:tag_empty", + "tag": "forge:ingots/copper" + } } ], "recipe": { "type": "minecraft:crafting_shaped", - "pattern": [ - "MMM", - "MSM", - "MMM" - ], "key": { "M": { "tag": "forge:ingots/copper" @@ -26,6 +21,11 @@ "tag": "minecraft:planks" } }, + "pattern": [ + "MMM", + "MSM", + "MMM" + ], "result": { "item": "ironchest:wood_to_copper_chest_upgrade" } diff --git a/src/generated/resources/data/ironchest/recipes/upgrades/wood_to_iron_chest_upgrade.json b/src/generated/resources/data/ironchest/recipes/upgrades/wood_to_iron_chest_upgrade.json index 95dc28dc..54bb0335 100644 --- a/src/generated/resources/data/ironchest/recipes/upgrades/wood_to_iron_chest_upgrade.json +++ b/src/generated/resources/data/ironchest/recipes/upgrades/wood_to_iron_chest_upgrade.json @@ -1,10 +1,5 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "MMM", - "MPM", - "MMM" - ], "key": { "M": { "tag": "forge:ingots/iron" @@ -13,6 +8,11 @@ "tag": "minecraft:planks" } }, + "pattern": [ + "MMM", + "MPM", + "MMM" + ], "result": { "item": "ironchest:wood_to_iron_chest_upgrade" } diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json new file mode 100644 index 00000000..341c8f8a --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -0,0 +1,16 @@ +{ + "values": [ + "ironchest:iron_chest", + "ironchest:gold_chest", + "ironchest:diamond_chest", + "ironchest:copper_chest", + "ironchest:crystal_chest", + "ironchest:obsidian_chest", + "ironchest:trapped_iron_chest", + "ironchest:trapped_gold_chest", + "ironchest:trapped_diamond_chest", + "ironchest:trapped_copper_chest", + "ironchest:trapped_crystal_chest", + "ironchest:trapped_obsidian_chest" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json new file mode 100644 index 00000000..80d5a679 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json @@ -0,0 +1,6 @@ +{ + "values": [ + "ironchest:dirt_chest", + "ironchest:trapped_dirt_chest" + ] +} \ No newline at end of file diff --git a/src/main/java/com/progwml6/ironchest/IronChests.java b/src/main/java/com/progwml6/ironchest/IronChests.java index cf497dfb..2afd07b6 100644 --- a/src/main/java/com/progwml6/ironchest/IronChests.java +++ b/src/main/java/com/progwml6/ironchest/IronChests.java @@ -1,9 +1,10 @@ package com.progwml6.ironchest; -import com.progwml6.ironchest.client.screen.IronChestScreen; import com.progwml6.ironchest.client.render.IronChestRenderer; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; +import com.progwml6.ironchest.client.screen.IronChestScreen; import com.progwml6.ironchest.common.block.IronChestsBlocks; +import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; +import com.progwml6.ironchest.common.data.IronChestsBlockTags; import com.progwml6.ironchest.common.data.IronChestsRecipeProvider; import com.progwml6.ironchest.common.inventory.IronChestsContainerTypes; import com.progwml6.ironchest.common.item.IronChestsItems; @@ -94,5 +95,9 @@ private void gatherData(GatherDataEvent event) { if (event.includeServer()) { datagenerator.addProvider(true, new IronChestsRecipeProvider(datagenerator)); } + + if (event.includeClient()) { + datagenerator.addProvider(true, new IronChestsBlockTags(datagenerator, event.getExistingFileHelper())); + } } } diff --git a/src/main/java/com/progwml6/ironchest/common/data/IronChestsBlockTags.java b/src/main/java/com/progwml6/ironchest/common/data/IronChestsBlockTags.java new file mode 100644 index 00000000..f6610ee3 --- /dev/null +++ b/src/main/java/com/progwml6/ironchest/common/data/IronChestsBlockTags.java @@ -0,0 +1,38 @@ +package com.progwml6.ironchest.common.data; + +import com.progwml6.ironchest.IronChests; +import com.progwml6.ironchest.common.block.IronChestsBlocks; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.tags.BlockTagsProvider; +import net.minecraft.tags.BlockTags; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; + +public class IronChestsBlockTags extends BlockTagsProvider { + public IronChestsBlockTags(DataGenerator generator, @Nullable ExistingFileHelper existingFileHelper) { + super(generator, IronChests.MOD_ID, existingFileHelper); + } + + @Override + protected void addTags() { + tag(BlockTags.MINEABLE_WITH_SHOVEL).add( + IronChestsBlocks.DIRT_CHEST.get(), + IronChestsBlocks.TRAPPED_DIRT_CHEST.get() + ); + + tag(BlockTags.MINEABLE_WITH_PICKAXE).add( + IronChestsBlocks.IRON_CHEST.get(), + IronChestsBlocks.GOLD_CHEST.get(), + IronChestsBlocks.DIAMOND_CHEST.get(), + IronChestsBlocks.COPPER_CHEST.get(), + IronChestsBlocks.CRYSTAL_CHEST.get(), + IronChestsBlocks.OBSIDIAN_CHEST.get(), + IronChestsBlocks.TRAPPED_IRON_CHEST.get(), + IronChestsBlocks.TRAPPED_GOLD_CHEST.get(), + IronChestsBlocks.TRAPPED_DIAMOND_CHEST.get(), + IronChestsBlocks.TRAPPED_COPPER_CHEST.get(), + IronChestsBlocks.TRAPPED_CRYSTAL_CHEST.get(), + IronChestsBlocks.TRAPPED_OBSIDIAN_CHEST.get() + ); + } +}