diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index 35d127498..208c15dcc 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -585,7 +585,7 @@ public class TRContent { public enum Dusts implements ItemConvertible { ALMANDINE, ALUMINUM, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, BRASS, BRONZE, CALCITE, CHARCOAL, CHROME, CINNABAR, CLAY, COAL, COPPER, DARK_ASHES, DIAMOND, DIORITE, ELECTRUM, EMERALD, ENDER_EYE, ENDER_PEARL, ENDSTONE, - FLINT, GALENA, GOLD, GRANITE, GROSSULAR, INVAR, IRON, LAZURITE, LEAD, MAGNESIUM, MANGANESE, MARBLE, NETHERRACK, + FLINT, GALENA, GOLD, GRANITE, GROSSULAR, INVAR, LAZURITE, LEAD, MAGNESIUM, MANGANESE, MARBLE, NETHERRACK, NICKEL, OBSIDIAN, OLIVINE, PERIDOT, PHOSPHOROUS, PLATINUM, PYRITE, PYROPE, QUARTZ, RED_GARNET, RUBY, SALTPETER, SAPPHIRE, SAW, SILVER, SODALITE, SPESSARTINE, SPHALERITE, STEEL, SULFUR, TIN, TITANIUM, TUNGSTEN, UVAROVITE, YELLOW_GARNET, ZINC; diff --git a/src/main/resources/data/c/tags/items/iron_dusts.json b/src/main/resources/data/c/tags/items/iron_dusts.json deleted file mode 100644 index 0766e272c..000000000 --- a/src/main/resources/data/c/tags/items/iron_dusts.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "techreborn:iron_dust" - ] -} \ 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 index 0bef5211c..1030e8e30 100644 --- 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 @@ -5,7 +5,7 @@ "ingredients": [ { "count": 2, - "tag": "c:iron_dusts" + "item": "minecraft:raw_iron" }, { "item": "techreborn:nickel_dust" 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 index 9a3c0af0e..31db09d94 100644 --- 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 @@ -5,7 +5,7 @@ "ingredients": [ { "count": 2, - "tag": "c:iron_dusts" + "item": "minecraft:raw_iron" }, { "tag": "c:nickel_ingots" diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/iron_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/raw_iron.json similarity index 87% rename from src/main/resources/data/techreborn/recipes/centrifuge/iron_dust.json rename to src/main/resources/data/techreborn/recipes/centrifuge/raw_iron.json index c5552abc0..b9d9ea9c2 100644 --- a/src/main/resources/data/techreborn/recipes/centrifuge/iron_dust.json +++ b/src/main/resources/data/techreborn/recipes/centrifuge/raw_iron.json @@ -5,7 +5,7 @@ "ingredients": [ { "count": 2, - "tag": "c:iron_dusts" + "item": "minecraft:raw_iron" } ], "results": [ diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/dust/iron_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/dust/raw_iron.json similarity index 89% rename from src/main/resources/data/techreborn/recipes/crafting_table/dust/iron_dust.json rename to src/main/resources/data/techreborn/recipes/crafting_table/dust/raw_iron.json index 5ff88d73c..30ed93e69 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/dust/iron_dust.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/dust/raw_iron.json @@ -15,6 +15,6 @@ } ], "result": { - "item": "techreborn:iron_dust" + "item": "minecraft:raw_iron" } } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/small_dust/iron_small_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/small_dust/iron_small_dust.json index 8479714ef..2de844be6 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/small_dust/iron_small_dust.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/small_dust/iron_small_dust.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "c:iron_dusts" + "item": "minecraft:raw_iron" } ], "result": { diff --git a/src/main/resources/data/techreborn/recipes/grinder/iron_dust_from_ingot.json b/src/main/resources/data/techreborn/recipes/grinder/raw_iron_from_ingot.json similarity index 81% rename from src/main/resources/data/techreborn/recipes/grinder/iron_dust_from_ingot.json rename to src/main/resources/data/techreborn/recipes/grinder/raw_iron_from_ingot.json index 343929738..a72c1bab5 100644 --- a/src/main/resources/data/techreborn/recipes/grinder/iron_dust_from_ingot.json +++ b/src/main/resources/data/techreborn/recipes/grinder/raw_iron_from_ingot.json @@ -9,7 +9,7 @@ ], "results": [ { - "item": "techreborn:iron_dust" + "item": "minecraft:raw_iron" } ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/iron_dust_from_ore.json b/src/main/resources/data/techreborn/recipes/grinder/raw_iron_from_ore.json similarity index 81% rename from src/main/resources/data/techreborn/recipes/grinder/iron_dust_from_ore.json rename to src/main/resources/data/techreborn/recipes/grinder/raw_iron_from_ore.json index b786e1dfd..5fa87b428 100644 --- a/src/main/resources/data/techreborn/recipes/grinder/iron_dust_from_ore.json +++ b/src/main/resources/data/techreborn/recipes/grinder/raw_iron_from_ore.json @@ -9,7 +9,7 @@ ], "results": [ { - "item": "techreborn:iron_dust", + "item": "minecraft:raw_iron", "count": 2 } ] diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/almandine_dust.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/almandine_dust.json index d5eecfd4c..113beeded 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/almandine_dust.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/almandine_dust.json @@ -15,7 +15,7 @@ ], "results": [ { - "item": "techreborn:iron_dust", + "item": "minecraft:raw_iron", "count": 3 }, { diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/andradite_dust.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/andradite_dust.json index cb4f01c1f..a96729688 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/andradite_dust.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/andradite_dust.json @@ -22,7 +22,7 @@ } }, { - "item": "techreborn:iron_dust", + "item": "minecraft:raw_iron", "count": 2 }, { diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/peridot_dust.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/peridot_dust.json index 161dc01b2..0525813f2 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/peridot_dust.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/peridot_dust.json @@ -19,7 +19,7 @@ "count": 2 }, { - "item": "techreborn:iron_dust", + "item": "minecraft:raw_iron", "count": 2 }, { diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/pyrite_dust.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/pyrite_dust.json index 8bfd2be9b..11bac1c51 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/pyrite_dust.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/pyrite_dust.json @@ -10,7 +10,7 @@ ], "results": [ { - "item": "techreborn:iron_dust" + "item": "minecraft:raw_iron" }, { "item": "techreborn:sulfur_dust", diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/iron_ore.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/iron_ore.json index ffbdf12a7..701bf448b 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/iron_ore.json +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/iron_ore.json @@ -13,7 +13,7 @@ ], "results": [ { - "item": "techreborn:iron_dust", + "item": "minecraft:raw_iron", "count": 2 }, { diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/tin_ore_with_sodiumpersulfate.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/tin_ore_with_sodiumpersulfate.json index 2cfb10a58..cbfb2dca3 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/tin_ore_with_sodiumpersulfate.json +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/tin_ore_with_sodiumpersulfate.json @@ -17,7 +17,7 @@ "count": 2 }, { - "item": "techreborn:iron_dust" + "item": "minecraft:raw_iron" }, { "item": "techreborn:zinc_dust" diff --git a/src/main/resources/data/techreborn/recipes/scrapbox/auto/iron_dust.json b/src/main/resources/data/techreborn/recipes/scrapbox/auto/raw_iron.json similarity index 82% rename from src/main/resources/data/techreborn/recipes/scrapbox/auto/iron_dust.json rename to src/main/resources/data/techreborn/recipes/scrapbox/auto/raw_iron.json index 54425d953..70c575b10 100644 --- a/src/main/resources/data/techreborn/recipes/scrapbox/auto/iron_dust.json +++ b/src/main/resources/data/techreborn/recipes/scrapbox/auto/raw_iron.json @@ -8,7 +8,7 @@ ], "results": [ { - "item": "techreborn:iron_dust" + "item": "minecraft:raw_iron" } ], "type": "techreborn:scrapbox" diff --git a/src/main/resources/data/techreborn/recipes/smelting/iron_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/smelting/iron_ingot_from_dust.json deleted file mode 100644 index b2d6fa8f6..000000000 --- a/src/main/resources/data/techreborn/recipes/smelting/iron_ingot_from_dust.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "tag": "c:iron_dusts" - }, - "result": "minecraft:iron_ingot", - "experience": 0.5, - "cookingtime": 200 -} \ No newline at end of file