From 5390cbfe2e679323f38c120a0cd80e7c94e1bcea Mon Sep 17 00:00:00 2001 From: drcrazy Date: Fri, 25 Jun 2021 10:01:15 +0300 Subject: [PATCH] Prevent easy dupe introduced by IR --- .../grinder/raw_copper_from_ingot.json | 15 --------------- .../recipes/grinder/raw_gold_from_ingot.json | 15 --------------- .../recipes/grinder/raw_iron_from_ingot.json | 15 --------------- .../recipes/grinder/raw_lead_from_ingot.json | 15 --------------- .../grinder/raw_silver_from_ingot.json | 15 --------------- .../recipes/grinder/raw_tin_from_ingot.json | 15 --------------- .../grinder/raw_tungsten_from_ingot.json | 15 --------------- .../copper_ingot_with_mercury.json | 19 +++++++++++++++++++ .../gold_ingot_with_mercury.json | 19 +++++++++++++++++++ .../iridium_ingot_with_mercury.json | 19 +++++++++++++++++++ .../iron_ingot_with_mercury.json | 19 +++++++++++++++++++ .../lead_ingot_with_mercury.json | 19 +++++++++++++++++++ .../silver_ingot_with_mercury.json | 19 +++++++++++++++++++ .../tin_ingot_with_mercury.json | 19 +++++++++++++++++++ .../tungsten_ingot_with_mercury.json | 19 +++++++++++++++++++ 15 files changed, 152 insertions(+), 105 deletions(-) delete mode 100644 src/main/resources/data/techreborn/recipes/grinder/raw_copper_from_ingot.json delete mode 100644 src/main/resources/data/techreborn/recipes/grinder/raw_gold_from_ingot.json delete mode 100644 src/main/resources/data/techreborn/recipes/grinder/raw_iron_from_ingot.json delete mode 100644 src/main/resources/data/techreborn/recipes/grinder/raw_lead_from_ingot.json delete mode 100644 src/main/resources/data/techreborn/recipes/grinder/raw_silver_from_ingot.json delete mode 100644 src/main/resources/data/techreborn/recipes/grinder/raw_tin_from_ingot.json delete mode 100644 src/main/resources/data/techreborn/recipes/grinder/raw_tungsten_from_ingot.json create mode 100644 src/main/resources/data/techreborn/recipes/industrial_grinder/copper_ingot_with_mercury.json create mode 100644 src/main/resources/data/techreborn/recipes/industrial_grinder/gold_ingot_with_mercury.json create mode 100644 src/main/resources/data/techreborn/recipes/industrial_grinder/iridium_ingot_with_mercury.json create mode 100644 src/main/resources/data/techreborn/recipes/industrial_grinder/iron_ingot_with_mercury.json create mode 100644 src/main/resources/data/techreborn/recipes/industrial_grinder/lead_ingot_with_mercury.json create mode 100644 src/main/resources/data/techreborn/recipes/industrial_grinder/silver_ingot_with_mercury.json create mode 100644 src/main/resources/data/techreborn/recipes/industrial_grinder/tin_ingot_with_mercury.json create mode 100644 src/main/resources/data/techreborn/recipes/industrial_grinder/tungsten_ingot_with_mercury.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/raw_copper_from_ingot.json b/src/main/resources/data/techreborn/recipes/grinder/raw_copper_from_ingot.json deleted file mode 100644 index 70bb9b3a9..000000000 --- a/src/main/resources/data/techreborn/recipes/grinder/raw_copper_from_ingot.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:grinder", - "power": 2, - "time": 200, - "ingredients": [ - { - "item": "minecraft:copper_ingot" - } - ], - "results": [ - { - "item": "minecraft:raw_copper" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/raw_gold_from_ingot.json b/src/main/resources/data/techreborn/recipes/grinder/raw_gold_from_ingot.json deleted file mode 100644 index 572b1f274..000000000 --- a/src/main/resources/data/techreborn/recipes/grinder/raw_gold_from_ingot.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:grinder", - "power": 2, - "time": 200, - "ingredients": [ - { - "item": "minecraft:gold_ingot" - } - ], - "results": [ - { - "item": "minecraft:raw_gold" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/raw_iron_from_ingot.json b/src/main/resources/data/techreborn/recipes/grinder/raw_iron_from_ingot.json deleted file mode 100644 index a72c1bab5..000000000 --- a/src/main/resources/data/techreborn/recipes/grinder/raw_iron_from_ingot.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:grinder", - "power": 2, - "time": 200, - "ingredients": [ - { - "item": "minecraft:iron_ingot" - } - ], - "results": [ - { - "item": "minecraft:raw_iron" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/raw_lead_from_ingot.json b/src/main/resources/data/techreborn/recipes/grinder/raw_lead_from_ingot.json deleted file mode 100644 index f509ac215..000000000 --- a/src/main/resources/data/techreborn/recipes/grinder/raw_lead_from_ingot.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:grinder", - "power": 4, - "time": 200, - "ingredients": [ - { - "tag": "c:lead_ingots" - } - ], - "results": [ - { - "item": "techreborn:raw_lead" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/raw_silver_from_ingot.json b/src/main/resources/data/techreborn/recipes/grinder/raw_silver_from_ingot.json deleted file mode 100644 index 26b610fea..000000000 --- a/src/main/resources/data/techreborn/recipes/grinder/raw_silver_from_ingot.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:grinder", - "power": 2, - "time": 200, - "ingredients": [ - { - "tag": "c:silver_ingots" - } - ], - "results": [ - { - "item": "techreborn:raw_silver" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/raw_tin_from_ingot.json b/src/main/resources/data/techreborn/recipes/grinder/raw_tin_from_ingot.json deleted file mode 100644 index 9cd743264..000000000 --- a/src/main/resources/data/techreborn/recipes/grinder/raw_tin_from_ingot.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:grinder", - "power": 2, - "time": 200, - "ingredients": [ - { - "tag": "c:tin_ingots" - } - ], - "results": [ - { - "item": "techreborn:raw_tin" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/raw_tungsten_from_ingot.json b/src/main/resources/data/techreborn/recipes/grinder/raw_tungsten_from_ingot.json deleted file mode 100644 index 27de60c9d..000000000 --- a/src/main/resources/data/techreborn/recipes/grinder/raw_tungsten_from_ingot.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:grinder", - "power": 4, - "time": 220, - "ingredients": [ - { - "tag": "c:tungsten_ingots" - } - ], - "results": [ - { - "item": "techreborn:raw_tungsten" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/copper_ingot_with_mercury.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/copper_ingot_with_mercury.json new file mode 100644 index 000000000..a8f4ed951 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/copper_ingot_with_mercury.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:industrial_grinder", + "power": 16, + "time": 40, + "tank": { + "fluid": "techreborn:mercury", + "amount": 1000 + }, + "ingredients": [ + { + "item": "minecraft:copper_ingot" + } + ], + "results": [ + { + "item": "minecraft:raw_copper" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/gold_ingot_with_mercury.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/gold_ingot_with_mercury.json new file mode 100644 index 000000000..c5946ad7d --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/gold_ingot_with_mercury.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:industrial_grinder", + "power": 16, + "time": 40, + "tank": { + "fluid": "techreborn:mercury", + "amount": 1000 + }, + "ingredients": [ + { + "item": "minecraft:gold_ingot" + } + ], + "results": [ + { + "item": "minecraft:raw_gold" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/iridium_ingot_with_mercury.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/iridium_ingot_with_mercury.json new file mode 100644 index 000000000..063ee5fbf --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/iridium_ingot_with_mercury.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:industrial_grinder", + "power": 16, + "time": 40, + "tank": { + "fluid": "techreborn:mercury", + "amount": 1000 + }, + "ingredients": [ + { + "tag": "c:iridium_ingots" + } + ], + "results": [ + { + "item": "techreborn:raw_iridium" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/iron_ingot_with_mercury.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/iron_ingot_with_mercury.json new file mode 100644 index 000000000..74e92f768 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/iron_ingot_with_mercury.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:industrial_grinder", + "power": 16, + "time": 40, + "tank": { + "fluid": "techreborn:mercury", + "amount": 1000 + }, + "ingredients": [ + { + "item": "minecraft:iron_ingot" + } + ], + "results": [ + { + "item": "minecraft:raw_iron" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/lead_ingot_with_mercury.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/lead_ingot_with_mercury.json new file mode 100644 index 000000000..87bd9cc92 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/lead_ingot_with_mercury.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:industrial_grinder", + "power": 16, + "time": 40, + "tank": { + "fluid": "techreborn:mercury", + "amount": 1000 + }, + "ingredients": [ + { + "tag": "c:lead_ingots" + } + ], + "results": [ + { + "item": "techreborn:raw_lead" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/silver_ingot_with_mercury.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/silver_ingot_with_mercury.json new file mode 100644 index 000000000..1dd242d5e --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/silver_ingot_with_mercury.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:industrial_grinder", + "power": 16, + "time": 40, + "tank": { + "fluid": "techreborn:mercury", + "amount": 1000 + }, + "ingredients": [ + { + "tag": "c:silver_ingots" + } + ], + "results": [ + { + "item": "techreborn:raw_silver" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/tin_ingot_with_mercury.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/tin_ingot_with_mercury.json new file mode 100644 index 000000000..a0c21d3f4 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/tin_ingot_with_mercury.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:industrial_grinder", + "power": 16, + "time": 40, + "tank": { + "fluid": "techreborn:mercury", + "amount": 1000 + }, + "ingredients": [ + { + "tag": "c:tin_ingots" + } + ], + "results": [ + { + "item": "techreborn:raw_tin" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/tungsten_ingot_with_mercury.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/tungsten_ingot_with_mercury.json new file mode 100644 index 000000000..48a3c01b3 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/tungsten_ingot_with_mercury.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:industrial_grinder", + "power": 16, + "time": 40, + "tank": { + "fluid": "techreborn:mercury", + "amount": 1000 + }, + "ingredients": [ + { + "tag": "c:tungsten_ingots" + } + ], + "results": [ + { + "item": "techreborn:raw_tungsten" + } + ] +}