diff --git a/src/main/resources/data/c/tags/items/raw_iridium_ores.json b/src/main/resources/data/c/tags/items/raw_iridium_ores.json new file mode 100644 index 000000000..95018a452 --- /dev/null +++ b/src/main/resources/data/c/tags/items/raw_iridium_ores.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "techreborn:raw_iridium" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/raw_lead_ores.json b/src/main/resources/data/c/tags/items/raw_lead_ores.json new file mode 100644 index 000000000..39cce45a1 --- /dev/null +++ b/src/main/resources/data/c/tags/items/raw_lead_ores.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "techreborn:raw_lead" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/raw_silver_ores.json b/src/main/resources/data/c/tags/items/raw_silver_ores.json new file mode 100644 index 000000000..2c0cf3d9d --- /dev/null +++ b/src/main/resources/data/c/tags/items/raw_silver_ores.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "techreborn:raw_silver" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/raw_tin_ores.json b/src/main/resources/data/c/tags/items/raw_tin_ores.json new file mode 100644 index 000000000..645762403 --- /dev/null +++ b/src/main/resources/data/c/tags/items/raw_tin_ores.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "techreborn:raw_tin" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/raw_tungsten_ores.json b/src/main/resources/data/c/tags/items/raw_tungsten_ores.json new file mode 100644 index 000000000..c25e7edaf --- /dev/null +++ b/src/main/resources/data/c/tags/items/raw_tungsten_ores.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "techreborn:raw_tungsten" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot_from_dust.json deleted file mode 100644 index caeb7df64..000000000 --- a/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot_from_dust.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "techreborn:alloy_smelter", - "power": 6, - "time": 200, - "ingredients": [ - { - "count": 3, - "item": "minecraft:raw_copper" - }, - { - "tag": "c:zinc_dusts" - } - ], - "results": [ - { - "item": "techreborn:brass_ingot", - "count": 4 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot_from_dust_alt.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot_from_dust_alt.json deleted file mode 100644 index 697e9bfa9..000000000 --- a/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot_from_dust_alt.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "techreborn:alloy_smelter", - "power": 6, - "time": 200, - "ingredients": [ - { - "count": 3, - "item": "minecraft:copper_ingot" - }, - { - "tag": "c:zinc_dusts" - } - ], - "results": [ - { - "item": "techreborn:brass_ingot", - "count": 4 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot_from_dust_alt_alt.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot_from_dust_alt_alt.json deleted file mode 100644 index a1583d5fe..000000000 --- a/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot_from_dust_alt_alt.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "techreborn:alloy_smelter", - "power": 6, - "time": 200, - "ingredients": [ - { - "count": 3, - "item": "minecraft:raw_copper" - }, - { - "tag": "c:zinc_ingots" - } - ], - "results": [ - { - "item": "techreborn:brass_ingot", - "count": 4 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/bronze_ingot_from_dust_alt_alt.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/bronze_ingot_from_dust_alt_alt.json deleted file mode 100644 index 80ade2430..000000000 --- a/src/main/resources/data/techreborn/recipes/alloy_smelter/bronze_ingot_from_dust_alt_alt.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "techreborn:alloy_smelter", - "power": 6, - "time": 200, - "ingredients": [ - { - "tag": "c:tin_ingots" - }, - { - "count": 3, - "item": "minecraft:raw_copper" - } - ], - "results": [ - { - "item": "techreborn:bronze_ingot", - "count": 4 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/bronze_ingot_from_raw.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/bronze_ingot_from_raw.json deleted file mode 100644 index f0d2019b6..000000000 --- a/src/main/resources/data/techreborn/recipes/alloy_smelter/bronze_ingot_from_raw.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "techreborn:alloy_smelter", - "power": 6, - "time": 200, - "ingredients": [ - { - "item": "techreborn:raw_tin" - }, - { - "count": 3, - "item": "minecraft:raw_copper" - } - ], - "results": [ - { - "item": "techreborn:bronze_ingot", - "count": 4 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/bronze_ingot_from_raw_alt.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/bronze_ingot_from_raw_alt.json deleted file mode 100644 index 79f8889ae..000000000 --- a/src/main/resources/data/techreborn/recipes/alloy_smelter/bronze_ingot_from_raw_alt.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "techreborn:alloy_smelter", - "power": 6, - "time": 200, - "ingredients": [ - { - "item": "techreborn:raw_tin" - }, - { - "count": 3, - "item": "minecraft:copper_ingot" - } - ], - "results": [ - { - "item": "techreborn:bronze_ingot", - "count": 4 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_raw.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_raw.json deleted file mode 100644 index 2049f201a..000000000 --- a/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_raw.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "techreborn:alloy_smelter", - "power": 6, - "time": 200, - "ingredients": [ - { - "item": "minecraft:raw_gold" - }, - { - "item": "techreborn:raw_silver" - } - ], - "results": [ - { - "item": "techreborn:electrum_ingot", - "count": 2 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_raw_alt.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_raw_alt.json deleted file mode 100644 index 0ba7c224e..000000000 --- a/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_raw_alt.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "techreborn:alloy_smelter", - "power": 6, - "time": 200, - "ingredients": [ - { - "item": "minecraft:gold_ingot" - }, - { - "item": "techreborn:raw_silver" - } - ], - "results": [ - { - "item": "techreborn:electrum_ingot", - "count": 2 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_raw_alt_alt.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_raw_alt_alt.json deleted file mode 100644 index 0cec029ea..000000000 --- a/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_raw_alt_alt.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "techreborn:alloy_smelter", - "power": 6, - "time": 200, - "ingredients": [ - { - "item": "minecraft:raw_gold" - }, - { - "tag": "c:silver_ingots" - } - ], - "results": [ - { - "item": "techreborn:electrum_ingot", - "count": 2 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust.json deleted file mode 100644 index 1030e8e30..000000000 --- a/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "techreborn:alloy_smelter", - "power": 6, - "time": 200, - "ingredients": [ - { - "count": 2, - "item": "minecraft:raw_iron" - }, - { - "item": "techreborn:nickel_dust" - } - ], - "results": [ - { - "item": "techreborn:invar_ingot", - "count": 3 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust_alt.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust_alt.json deleted file mode 100644 index 273e0e23a..000000000 --- a/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust_alt.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "techreborn:alloy_smelter", - "power": 6, - "time": 200, - "ingredients" : [ - { - "item": "minecraft:iron_ingot", - "count": 2 - }, - { - "item": "techreborn:nickel_dust" - } - ], - "results" : [ - { - "item": "techreborn:invar_ingot", - "count": 3 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust_alt_alt.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust_alt_alt.json deleted file mode 100644 index 31db09d94..000000000 --- a/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust_alt_alt.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "techreborn:alloy_smelter", - "power": 6, - "time": 200, - "ingredients": [ - { - "count": 2, - "item": "minecraft:raw_iron" - }, - { - "tag": "c:nickel_ingots" - } - ], - "results": [ - { - "item": "techreborn:invar_ingot", - "count": 3 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/blast_furnace/tungsten_ingot.json b/src/main/resources/data/techreborn/recipes/blast_furnace/tungsten_ingot.json index 245be39b6..d37c581a9 100644 --- a/src/main/resources/data/techreborn/recipes/blast_furnace/tungsten_ingot.json +++ b/src/main/resources/data/techreborn/recipes/blast_furnace/tungsten_ingot.json @@ -5,7 +5,7 @@ "heat": 2500, "ingredients": [ { - "item": "techreborn:raw_tungsten" + "tag": "c:raw_tungsten_ores" } ], "results": [ diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/raw_lead.json b/src/main/resources/data/techreborn/recipes/centrifuge/raw_lead.json index a9350bb7f..6049e0abb 100644 --- a/src/main/resources/data/techreborn/recipes/centrifuge/raw_lead.json +++ b/src/main/resources/data/techreborn/recipes/centrifuge/raw_lead.json @@ -5,7 +5,7 @@ "ingredients": [ { "count": 2, - "item": "techreborn:raw_lead" + "tag": "c:raw_lead_ores" } ], "results": [ diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/raw_silver.json b/src/main/resources/data/techreborn/recipes/centrifuge/raw_silver.json index fd0b51476..b21198230 100644 --- a/src/main/resources/data/techreborn/recipes/centrifuge/raw_silver.json +++ b/src/main/resources/data/techreborn/recipes/centrifuge/raw_silver.json @@ -5,7 +5,7 @@ "ingredients": [ { "count": 2, - "item": "techreborn:raw_silver" + "tag": "c:raw_silver_ores" } ], "results": [ diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/raw_tin.json b/src/main/resources/data/techreborn/recipes/centrifuge/raw_tin.json index e477d0fd3..87df07736 100644 --- a/src/main/resources/data/techreborn/recipes/centrifuge/raw_tin.json +++ b/src/main/resources/data/techreborn/recipes/centrifuge/raw_tin.json @@ -5,7 +5,7 @@ "ingredients": [ { "count": 2, - "item": "techreborn:raw_tin" + "tag": "c:raw_tin_ores" } ], "results": [ diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/parts/neutron_reflector.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/neutron_reflector.json index 3f3f0970c..c91182519 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/parts/neutron_reflector.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/parts/neutron_reflector.json @@ -13,7 +13,7 @@ "tag": "c:coal_dusts" }, "T": { - "item": "techreborn:raw_tin" + "tag": "c:tin_plates" } }, "result": { diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/raw_tungsten.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/raw_tungsten.json index 30efa2c7b..56672842c 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/raw_tungsten.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/raw_tungsten.json @@ -4,7 +4,7 @@ "time": 1200, "ingredients": [ { - "item": "techreborn:raw_tungsten" + "tag": "c:raw_tungsten_ores" }, { "item": "techreborn:cell", diff --git a/src/main/resources/data/techreborn/recipes/smelting/lead_ingot_from_raw.json b/src/main/resources/data/techreborn/recipes/smelting/lead_ingot_from_raw.json index 25b225606..f37a5afc3 100644 --- a/src/main/resources/data/techreborn/recipes/smelting/lead_ingot_from_raw.json +++ b/src/main/resources/data/techreborn/recipes/smelting/lead_ingot_from_raw.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "ingredient": { - "item": "techreborn:raw_lead" + "tag": "c:raw_lead_ores" }, "result": "techreborn:lead_ingot", "experience": 0.5, diff --git a/src/main/resources/data/techreborn/recipes/smelting/silver_ingot_from_raw.json b/src/main/resources/data/techreborn/recipes/smelting/silver_ingot_from_raw.json index 317662d4b..4596ca6c0 100644 --- a/src/main/resources/data/techreborn/recipes/smelting/silver_ingot_from_raw.json +++ b/src/main/resources/data/techreborn/recipes/smelting/silver_ingot_from_raw.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "ingredient": { - "item": "techreborn:raw_silver" + "tag": "c:raw_silver_ores" }, "result": "techreborn:silver_ingot", "experience": 0.5, diff --git a/src/main/resources/data/techreborn/recipes/smelting/tin_ingot_from_raw.json b/src/main/resources/data/techreborn/recipes/smelting/tin_ingot_from_raw.json index e8e9eaf69..62a29ad27 100644 --- a/src/main/resources/data/techreborn/recipes/smelting/tin_ingot_from_raw.json +++ b/src/main/resources/data/techreborn/recipes/smelting/tin_ingot_from_raw.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "ingredient": { - "item": "techreborn:raw_tin" + "tag": "c:raw_tin_ores" }, "result": "techreborn:tin_ingot", "experience": 0.5,