From 009fff88e5e71a5d9d5c7d506dd39ec15940b3a0 Mon Sep 17 00:00:00 2001 From: Ayutac Date: Thu, 10 Feb 2022 09:04:35 +0100 Subject: [PATCH] Simplified calcite related recipes --- .../techreborn/recipes/grinder/calcite_dust.json | 2 +- .../grinder/calcite_dust_from_coral_blocks.json | 15 --------------- .../calcite_dust_from_dripstone_block.json | 15 --------------- ...m_coral_plant.json => calcite_small_dust.json} | 2 +- .../calcite_small_dust_from_bone_meal.json | 15 --------------- .../calcite_small_dust_from_coral_fan.json | 15 --------------- .../calcite_small_dust_from_nautilus_shell.json | 15 --------------- ...calcite_small_dust_from_pointed_dripstone.json | 15 --------------- .../tags/items/calcite_dust_material.json | 8 ++++++++ .../tags/items/calcite_small_dust_material.json | 10 ++++++++++ 10 files changed, 20 insertions(+), 92 deletions(-) delete mode 100644 src/main/resources/data/techreborn/recipes/grinder/calcite_dust_from_coral_blocks.json delete mode 100644 src/main/resources/data/techreborn/recipes/grinder/calcite_dust_from_dripstone_block.json rename src/main/resources/data/techreborn/recipes/grinder/{calcite_small_dust_from_coral_plant.json => calcite_small_dust.json} (76%) delete mode 100644 src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_bone_meal.json delete mode 100644 src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_coral_fan.json delete mode 100644 src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_nautilus_shell.json delete mode 100644 src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_pointed_dripstone.json create mode 100644 src/main/resources/data/techreborn/tags/items/calcite_dust_material.json create mode 100644 src/main/resources/data/techreborn/tags/items/calcite_small_dust_material.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/calcite_dust.json b/src/main/resources/data/techreborn/recipes/grinder/calcite_dust.json index f3897fa64..54bee4e39 100644 --- a/src/main/resources/data/techreborn/recipes/grinder/calcite_dust.json +++ b/src/main/resources/data/techreborn/recipes/grinder/calcite_dust.json @@ -4,7 +4,7 @@ "time": 400, "ingredients" : [ { - "item": "minecraft:calcite" + "tag": "techreborn:calcite_dust_material" } ], "results" : [ diff --git a/src/main/resources/data/techreborn/recipes/grinder/calcite_dust_from_coral_blocks.json b/src/main/resources/data/techreborn/recipes/grinder/calcite_dust_from_coral_blocks.json deleted file mode 100644 index c68d5ea64..000000000 --- a/src/main/resources/data/techreborn/recipes/grinder/calcite_dust_from_coral_blocks.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:grinder", - "power": 2, - "time": 400, - "ingredients" : [ - { - "tag": "c:coral_blocks" - } - ], - "results" : [ - { - "item": "techreborn:calcite_dust" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/calcite_dust_from_dripstone_block.json b/src/main/resources/data/techreborn/recipes/grinder/calcite_dust_from_dripstone_block.json deleted file mode 100644 index e034498c2..000000000 --- a/src/main/resources/data/techreborn/recipes/grinder/calcite_dust_from_dripstone_block.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:grinder", - "power": 2, - "time": 400, - "ingredients" : [ - { - "item": "minecraft:dripstone_block" - } - ], - "results" : [ - { - "item": "techreborn:calcite_dust" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_coral_plant.json b/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust.json similarity index 76% rename from src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_coral_plant.json rename to src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust.json index 3c10915d7..a1141ea0c 100644 --- a/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_coral_plant.json +++ b/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust.json @@ -4,7 +4,7 @@ "time": 100, "ingredients" : [ { - "tag": "c:coral_plants" + "tag": "techreborn:calcite_small_dust_material" } ], "results" : [ diff --git a/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_bone_meal.json b/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_bone_meal.json deleted file mode 100644 index d7d511c12..000000000 --- a/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_bone_meal.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:grinder", - "power": 2, - "time": 100, - "ingredients" : [ - { - "item": "minecraft:bone_meal" - } - ], - "results" : [ - { - "item": "techreborn:calcite_small_dust" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_coral_fan.json b/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_coral_fan.json deleted file mode 100644 index 8de6c3f68..000000000 --- a/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_coral_fan.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:grinder", - "power": 2, - "time": 100, - "ingredients" : [ - { - "tag": "c:coral_fans" - } - ], - "results" : [ - { - "item": "techreborn:calcite_small_dust" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_nautilus_shell.json b/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_nautilus_shell.json deleted file mode 100644 index ddc3de7e9..000000000 --- a/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_nautilus_shell.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:grinder", - "power": 2, - "time": 100, - "ingredients" : [ - { - "item": "minecraft:nautilus_shell" - } - ], - "results" : [ - { - "item": "techreborn:calcite_small_dust" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_pointed_dripstone.json b/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_pointed_dripstone.json deleted file mode 100644 index 7ef38b7d9..000000000 --- a/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_pointed_dripstone.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:grinder", - "power": 2, - "time": 100, - "ingredients" : [ - { - "item": "minecraft:pointed_dripstone" - } - ], - "results" : [ - { - "item": "techreborn:calcite_small_dust" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/tags/items/calcite_dust_material.json b/src/main/resources/data/techreborn/tags/items/calcite_dust_material.json new file mode 100644 index 000000000..59f902b7d --- /dev/null +++ b/src/main/resources/data/techreborn/tags/items/calcite_dust_material.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "minecraft:calcite", + "#c:coral_blocks", + "minecraft:dripstone_block" + ] +} diff --git a/src/main/resources/data/techreborn/tags/items/calcite_small_dust_material.json b/src/main/resources/data/techreborn/tags/items/calcite_small_dust_material.json new file mode 100644 index 000000000..eccb6aa0f --- /dev/null +++ b/src/main/resources/data/techreborn/tags/items/calcite_small_dust_material.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:bone_meal", + "#c:coral_fans", + "#c:coral_plants", + "minecraft:pointed_dripstone", + "minecraft:nautilus_shell" + ] +}