From 8d2c181b176550d6ba1050f3146f6f6d25232933 Mon Sep 17 00:00:00 2001 From: Ayutac Date: Fri, 17 Dec 2021 19:53:26 +0100 Subject: [PATCH] Simplified centrifuging meat with tags (#2651). Thanks to Ayutac * Simplified centrifuging meat with tags * Fixed Recipe File Name Typo --- .../data/c/tags/items/cooked_meat.json | 12 ++++++++++ .../resources/data/c/tags/items/raw_meat.json | 12 ++++++++++ .../techreborn/recipes/centrifuge/beef.json | 23 ------------------- .../recipes/centrifuge/chicken.json | 23 ------------------- .../recipes/centrifuge/cooked_beef.json | 23 ------------------- .../recipes/centrifuge/cooked_chicken.json | 23 ------------------- .../{cooked_cod.json => cooked_meat.json} | 2 +- .../recipes/centrifuge/cooked_mutton.json | 23 ------------------- .../recipes/centrifuge/cooked_porkchop.json | 23 ------------------- .../recipes/centrifuge/cooked_rabbit.json | 23 ------------------- .../recipes/centrifuge/cooked_salmon.json | 23 ------------------- .../techreborn/recipes/centrifuge/mutton.json | 23 ------------------- .../recipes/centrifuge/porkchop.json | 23 ------------------- .../techreborn/recipes/centrifuge/rabbit.json | 23 ------------------- .../centrifuge/{cod.json => raw_meat.json} | 2 +- .../techreborn/recipes/centrifuge/salmon.json | 23 ------------------- ...ion_block.json => refined_iron_block.json} | 0 17 files changed, 26 insertions(+), 278 deletions(-) create mode 100644 src/main/resources/data/c/tags/items/cooked_meat.json create mode 100644 src/main/resources/data/c/tags/items/raw_meat.json delete mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/beef.json delete mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/chicken.json delete mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/cooked_beef.json delete mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/cooked_chicken.json rename src/main/resources/data/techreborn/recipes/centrifuge/{cooked_cod.json => cooked_meat.json} (89%) delete mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/cooked_mutton.json delete mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/cooked_porkchop.json delete mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/cooked_rabbit.json delete mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/cooked_salmon.json delete mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/mutton.json delete mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/porkchop.json delete mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/rabbit.json rename src/main/resources/data/techreborn/recipes/centrifuge/{cod.json => raw_meat.json} (90%) delete mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/salmon.json rename src/main/resources/data/techreborn/recipes/smelting/{refined_rion_block.json => refined_iron_block.json} (100%) diff --git a/src/main/resources/data/c/tags/items/cooked_meat.json b/src/main/resources/data/c/tags/items/cooked_meat.json new file mode 100644 index 000000000..1cb7cc97b --- /dev/null +++ b/src/main/resources/data/c/tags/items/cooked_meat.json @@ -0,0 +1,12 @@ +{ + "replace": false, + "values": [ + "minecraft:cooked_beef", + "minecraft:cooked_chicken", + "minecraft:cooked_cod", + "minecraft:cooked_mutton", + "minecraft:cooked_porkchop", + "minecraft:cooked_rabbit", + "minecraft:cooked_salmon" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/raw_meat.json b/src/main/resources/data/c/tags/items/raw_meat.json new file mode 100644 index 000000000..88ec9d593 --- /dev/null +++ b/src/main/resources/data/c/tags/items/raw_meat.json @@ -0,0 +1,12 @@ +{ + "replace": false, + "values": [ + "minecraft:beef", + "minecraft:chicken", + "minecraft:cod", + "minecraft:mutton", + "minecraft:porkchop", + "minecraft:rabbit", + "minecraft:salmon" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/beef.json b/src/main/resources/data/techreborn/recipes/centrifuge/beef.json deleted file mode 100644 index 03d1a7fb2..000000000 --- a/src/main/resources/data/techreborn/recipes/centrifuge/beef.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "techreborn:centrifuge", - "power": 5, - "time": 5000, - "ingredients": [ - { - "item": "minecraft:beef", - "count": 12 - }, - { - "item": "techreborn:cell", - "nbt": "null" - } - ], - "results": [ - { - "item": "techreborn:cell", - "nbt": { - "fluid": "techreborn:methane" - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/chicken.json b/src/main/resources/data/techreborn/recipes/centrifuge/chicken.json deleted file mode 100644 index d7713a7da..000000000 --- a/src/main/resources/data/techreborn/recipes/centrifuge/chicken.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "techreborn:centrifuge", - "power": 5, - "time": 5000, - "ingredients": [ - { - "item": "minecraft:chicken", - "count": 12 - }, - { - "item": "techreborn:cell", - "nbt": "null" - } - ], - "results": [ - { - "item": "techreborn:cell", - "nbt": { - "fluid": "techreborn:methane" - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/cooked_beef.json b/src/main/resources/data/techreborn/recipes/centrifuge/cooked_beef.json deleted file mode 100644 index 5111173fc..000000000 --- a/src/main/resources/data/techreborn/recipes/centrifuge/cooked_beef.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "techreborn:centrifuge", - "power": 5, - "time": 5000, - "ingredients": [ - { - "item": "minecraft:cooked_beef", - "count": 16 - }, - { - "item": "techreborn:cell", - "nbt": "null" - } - ], - "results": [ - { - "item": "techreborn:cell", - "nbt": { - "fluid": "techreborn:methane" - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/cooked_chicken.json b/src/main/resources/data/techreborn/recipes/centrifuge/cooked_chicken.json deleted file mode 100644 index d94540a9f..000000000 --- a/src/main/resources/data/techreborn/recipes/centrifuge/cooked_chicken.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "techreborn:centrifuge", - "power": 5, - "time": 5000, - "ingredients": [ - { - "item": "minecraft:cooked_chicken", - "count": 16 - }, - { - "item": "techreborn:cell", - "nbt": "null" - } - ], - "results": [ - { - "item": "techreborn:cell", - "nbt": { - "fluid": "techreborn:methane" - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/cooked_cod.json b/src/main/resources/data/techreborn/recipes/centrifuge/cooked_meat.json similarity index 89% rename from src/main/resources/data/techreborn/recipes/centrifuge/cooked_cod.json rename to src/main/resources/data/techreborn/recipes/centrifuge/cooked_meat.json index 026f296ae..398047d19 100644 --- a/src/main/resources/data/techreborn/recipes/centrifuge/cooked_cod.json +++ b/src/main/resources/data/techreborn/recipes/centrifuge/cooked_meat.json @@ -4,7 +4,7 @@ "time": 5000, "ingredients": [ { - "item": "minecraft:cooked_cod", + "tag": "c:cooked_meat", "count": 16 }, { diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/cooked_mutton.json b/src/main/resources/data/techreborn/recipes/centrifuge/cooked_mutton.json deleted file mode 100644 index 7849243ae..000000000 --- a/src/main/resources/data/techreborn/recipes/centrifuge/cooked_mutton.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "techreborn:centrifuge", - "power": 5, - "time": 5000, - "ingredients": [ - { - "item": "minecraft:cooked_mutton", - "count": 16 - }, - { - "item": "techreborn:cell", - "nbt": "null" - } - ], - "results": [ - { - "item": "techreborn:cell", - "nbt": { - "fluid": "techreborn:methane" - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/cooked_porkchop.json b/src/main/resources/data/techreborn/recipes/centrifuge/cooked_porkchop.json deleted file mode 100644 index 0916043dc..000000000 --- a/src/main/resources/data/techreborn/recipes/centrifuge/cooked_porkchop.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "techreborn:centrifuge", - "power": 5, - "time": 5000, - "ingredients": [ - { - "item": "minecraft:cooked_porkchop", - "count": 16 - }, - { - "item": "techreborn:cell", - "nbt": "null" - } - ], - "results": [ - { - "item": "techreborn:cell", - "nbt": { - "fluid": "techreborn:methane" - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/cooked_rabbit.json b/src/main/resources/data/techreborn/recipes/centrifuge/cooked_rabbit.json deleted file mode 100644 index a423039b1..000000000 --- a/src/main/resources/data/techreborn/recipes/centrifuge/cooked_rabbit.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "techreborn:centrifuge", - "power": 5, - "time": 5000, - "ingredients": [ - { - "item": "minecraft:cooked_rabbit", - "count": 16 - }, - { - "item": "techreborn:cell", - "nbt": "null" - } - ], - "results": [ - { - "item": "techreborn:cell", - "nbt": { - "fluid": "techreborn:methane" - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/cooked_salmon.json b/src/main/resources/data/techreborn/recipes/centrifuge/cooked_salmon.json deleted file mode 100644 index cfef4745e..000000000 --- a/src/main/resources/data/techreborn/recipes/centrifuge/cooked_salmon.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "techreborn:centrifuge", - "power": 5, - "time": 5000, - "ingredients": [ - { - "item": "minecraft:cooked_salmon", - "count": 16 - }, - { - "item": "techreborn:cell", - "nbt": "null" - } - ], - "results": [ - { - "item": "techreborn:cell", - "nbt": { - "fluid": "techreborn:methane" - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/mutton.json b/src/main/resources/data/techreborn/recipes/centrifuge/mutton.json deleted file mode 100644 index f809fa07e..000000000 --- a/src/main/resources/data/techreborn/recipes/centrifuge/mutton.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "techreborn:centrifuge", - "power": 5, - "time": 5000, - "ingredients": [ - { - "item": "minecraft:mutton", - "count": 12 - }, - { - "item": "techreborn:cell", - "nbt": "null" - } - ], - "results": [ - { - "item": "techreborn:cell", - "nbt": { - "fluid": "techreborn:methane" - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/porkchop.json b/src/main/resources/data/techreborn/recipes/centrifuge/porkchop.json deleted file mode 100644 index d40b409be..000000000 --- a/src/main/resources/data/techreborn/recipes/centrifuge/porkchop.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "techreborn:centrifuge", - "power": 5, - "time": 5000, - "ingredients": [ - { - "item": "minecraft:porkchop", - "count": 12 - }, - { - "item": "techreborn:cell", - "nbt": "null" - } - ], - "results": [ - { - "item": "techreborn:cell", - "nbt": { - "fluid": "techreborn:methane" - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/rabbit.json b/src/main/resources/data/techreborn/recipes/centrifuge/rabbit.json deleted file mode 100644 index a074b00f0..000000000 --- a/src/main/resources/data/techreborn/recipes/centrifuge/rabbit.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "techreborn:centrifuge", - "power": 5, - "time": 5000, - "ingredients": [ - { - "item": "minecraft:rabbit", - "count": 12 - }, - { - "item": "techreborn:cell", - "nbt": "null" - } - ], - "results": [ - { - "item": "techreborn:cell", - "nbt": { - "fluid": "techreborn:methane" - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/cod.json b/src/main/resources/data/techreborn/recipes/centrifuge/raw_meat.json similarity index 90% rename from src/main/resources/data/techreborn/recipes/centrifuge/cod.json rename to src/main/resources/data/techreborn/recipes/centrifuge/raw_meat.json index 24b7188f5..9de09805b 100644 --- a/src/main/resources/data/techreborn/recipes/centrifuge/cod.json +++ b/src/main/resources/data/techreborn/recipes/centrifuge/raw_meat.json @@ -4,7 +4,7 @@ "time": 5000, "ingredients": [ { - "item": "minecraft:cod", + "tag": "c:raw_meat", "count": 12 }, { diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/salmon.json b/src/main/resources/data/techreborn/recipes/centrifuge/salmon.json deleted file mode 100644 index c96911b75..000000000 --- a/src/main/resources/data/techreborn/recipes/centrifuge/salmon.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "techreborn:centrifuge", - "power": 5, - "time": 5000, - "ingredients": [ - { - "item": "minecraft:salmon", - "count": 12 - }, - { - "item": "techreborn:cell", - "nbt": "null" - } - ], - "results": [ - { - "item": "techreborn:cell", - "nbt": { - "fluid": "techreborn:methane" - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/smelting/refined_rion_block.json b/src/main/resources/data/techreborn/recipes/smelting/refined_iron_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/smelting/refined_rion_block.json rename to src/main/resources/data/techreborn/recipes/smelting/refined_iron_block.json