diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index 65896c903..e79d706c0 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -638,7 +638,7 @@ public class TRContent { public enum SmallDusts 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, GLOWSTONE, GOLD, GRANITE, GROSSULAR, INVAR, LAZURITE, LEAD, MAGNESIUM, MANGANESE, MARBLE, + FLINT, GALENA, GLOWSTONE, GRANITE, GROSSULAR, INVAR, LAZURITE, LEAD, MAGNESIUM, MANGANESE, MARBLE, NETHERRACK, NICKEL, OBSIDIAN, OLIVINE, PERIDOT, PHOSPHOROUS, PLATINUM, PYRITE, PYROPE, QUARTZ, REDSTONE, 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/assets/techreborn/lang/en_us.json b/src/main/resources/assets/techreborn/lang/en_us.json index 637e614b0..7f024a194 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.json +++ b/src/main/resources/assets/techreborn/lang/en_us.json @@ -446,7 +446,6 @@ "item.techreborn.flint_small_dust": "Small Pile of Flint Dust", "item.techreborn.galena_small_dust": "Small Pile of Galena Dust", "item.techreborn.glowstone_small_dust": "Small Pile of Glowstone Dust", - "item.techreborn.gold_small_dust": "Small Pile of Gold Dust", "item.techreborn.granite_small_dust": "Small Pile of Granite Dust", "item.techreborn.grossular_small_dust": "Small Pile of Grossular Dust", "item.techreborn.invar_small_dust": "Small Pile of Invar Dust", diff --git a/src/main/resources/assets/techreborn/models/item/gold_dust.json b/src/main/resources/assets/techreborn/models/item/gold_dust.json deleted file mode 100644 index 534568878..000000000 --- a/src/main/resources/assets/techreborn/models/item/gold_dust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "techreborn:item/dust/gold_dust" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/gold_small_dust.json b/src/main/resources/assets/techreborn/models/item/gold_small_dust.json deleted file mode 100644 index 4b1402fc0..000000000 --- a/src/main/resources/assets/techreborn/models/item/gold_small_dust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "techreborn:item/smalldust/gold_small_dust" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/iron_dust.json b/src/main/resources/assets/techreborn/models/item/iron_dust.json deleted file mode 100644 index 1983653ba..000000000 --- a/src/main/resources/assets/techreborn/models/item/iron_dust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "techreborn:item/dust/iron_dust" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/iron_small_dust.json b/src/main/resources/assets/techreborn/models/item/iron_small_dust.json deleted file mode 100644 index 659f9db0f..000000000 --- a/src/main/resources/assets/techreborn/models/item/iron_small_dust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "techreborn:item/smalldust/iron_small_dust" - } -} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/gold_small_dusts.json b/src/main/resources/data/c/tags/items/gold_small_dusts.json deleted file mode 100644 index 9b1458218..000000000 --- a/src/main/resources/data/c/tags/items/gold_small_dusts.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "techreborn:gold_small_dust" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/electrum_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/electrum_dust.json index cf58d3091..0d4691cbb 100644 --- a/src/main/resources/data/techreborn/recipes/centrifuge/electrum_dust.json +++ b/src/main/resources/data/techreborn/recipes/centrifuge/electrum_dust.json @@ -9,12 +9,12 @@ ], "results": [ { - "item": "techreborn:gold_small_dust", - "count": 2 + "item": "minecraft:gold_nugget", + "count": 5 }, { - "item": "techreborn:silver_small_dust", - "count": 2 + "item": "techreborn:silver_nugget", + "count": 5 } ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/raw_copper.json b/src/main/resources/data/techreborn/recipes/centrifuge/raw_copper.json index 2824aeafe..2d91720f4 100644 --- a/src/main/resources/data/techreborn/recipes/centrifuge/raw_copper.json +++ b/src/main/resources/data/techreborn/recipes/centrifuge/raw_copper.json @@ -4,16 +4,15 @@ "time": 2400, "ingredients": [ { - "count": 3, "item": "minecraft:raw_copper" } ], "results": [ { - "item": "techreborn:gold_small_dust" + "item": "minecraft:gold_nugget" }, { - "item": "techreborn:nickel_small_dust" + "item": "techreborn:nickel_nugget" } ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/raw_gold.json b/src/main/resources/data/techreborn/recipes/centrifuge/raw_gold.json index 72952ebdd..9247bf76d 100644 --- a/src/main/resources/data/techreborn/recipes/centrifuge/raw_gold.json +++ b/src/main/resources/data/techreborn/recipes/centrifuge/raw_gold.json @@ -4,16 +4,15 @@ "time": 2400, "ingredients": [ { - "count": 3, "item": "minecraft:raw_gold" } ], "results": [ { - "item": "techreborn:copper_small_dust" + "item": "techreborn:copper_nugget" }, { - "item": "techreborn:nickel_small_dust" + "item": "techreborn:nickel_nugget" } ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/raw_iron.json b/src/main/resources/data/techreborn/recipes/centrifuge/raw_iron.json index b9d9ea9c2..e46d42b5d 100644 --- a/src/main/resources/data/techreborn/recipes/centrifuge/raw_iron.json +++ b/src/main/resources/data/techreborn/recipes/centrifuge/raw_iron.json @@ -10,10 +10,12 @@ ], "results": [ { - "item": "techreborn:tin_small_dust" + "item": "techreborn:tin_nugget", + "count": 3 }, { - "item": "techreborn:nickel_small_dust" + "item": "techreborn:nickel_nugget", + "count": 3 } ] } \ No newline at end of file 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 4f6b4be33..a9350bb7f 100644 --- a/src/main/resources/data/techreborn/recipes/centrifuge/raw_lead.json +++ b/src/main/resources/data/techreborn/recipes/centrifuge/raw_lead.json @@ -10,7 +10,8 @@ ], "results": [ { - "item": "techreborn:silver_small_dust" + "item": "techreborn:silver_nugget", + "count": 3 } ] } \ No newline at end of file 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 67db6087b..fd0b51476 100644 --- a/src/main/resources/data/techreborn/recipes/centrifuge/raw_silver.json +++ b/src/main/resources/data/techreborn/recipes/centrifuge/raw_silver.json @@ -10,7 +10,8 @@ ], "results": [ { - "item": "techreborn:lead_small_dust" + "item": "techreborn:lead_nugget", + "count": 3 } ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/dust/raw_gold.json b/src/main/resources/data/techreborn/recipes/crafting_table/dust/raw_gold.json deleted file mode 100644 index 1c7ec1d15..000000000 --- a/src/main/resources/data/techreborn/recipes/crafting_table/dust/raw_gold.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "techreborn:gold_small_dust" - }, - { - "item": "techreborn:gold_small_dust" - }, - { - "item": "techreborn:gold_small_dust" - }, - { - "item": "techreborn:gold_small_dust" - } - ], - "result": { - "item": "minecraft:raw_gold" - } -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/small_dust/gold_small_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/small_dust/gold_small_dust.json deleted file mode 100644 index 9aa477558..000000000 --- a/src/main/resources/data/techreborn/recipes/crafting_table/small_dust/gold_small_dust.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:raw_gold" - } - ], - "result": { - "item": "techreborn:gold_small_dust", - "count": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/ancient_debris_with_mercury.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/ancient_debris_with_mercury.json index 3261084c6..83069c9ce 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/ancient_debris_with_mercury.json +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/ancient_debris_with_mercury.json @@ -17,7 +17,8 @@ "count": 3 }, { - "item": "techreborn:gold_small_dust" + "item": "minecraft:gold_nugget", + "count": 3 } ] } diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/ancient_debris_with_water.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/ancient_debris_with_water.json index f2cc4549f..8a5338c55 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/ancient_debris_with_water.json +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/ancient_debris_with_water.json @@ -17,8 +17,8 @@ "count": 2 }, { - "item": "techreborn:gold_small_dust", - "count": 2 + "item": "minecraft:gold_nugget", + "count": 5 } ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/copper_ore_with_mercury.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/copper_ore_with_mercury.json index 39e676dde..f579ff4fe 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/copper_ore_with_mercury.json +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/copper_ore_with_mercury.json @@ -17,7 +17,8 @@ "count": 3 }, { - "item": "techreborn:gold_small_dust" + "item": "minecraft:gold_nugget", + "count": 3 } ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/copper_ore_with_water.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/copper_ore_with_water.json index 0a8df5061..256418438 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/copper_ore_with_water.json +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/copper_ore_with_water.json @@ -17,10 +17,12 @@ "count": 2 }, { - "item": "techreborn:gold_small_dust" + "item": "minecraft:gold_nugget", + "count": 3 }, { - "item": "techreborn:nickel_small_dust" + "item": "techreborn:nickel_nugget", + "count": 3 } ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/scrapbox/auto/gold_nugget_1.json b/src/main/resources/data/techreborn/recipes/scrapbox/auto/gold_nugget_1.json deleted file mode 100644 index 4fff5cd81..000000000 --- a/src/main/resources/data/techreborn/recipes/scrapbox/auto/gold_nugget_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "power": 10, - "time": 20, - "ingredients": [ - { - "item": "techreborn:scrap_box" - } - ], - "results": [ - { - "item": "minecraft:gold_nugget" - } - ], - "type": "techreborn:scrapbox" -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/scrapbox/auto/gold_small_dust.json b/src/main/resources/data/techreborn/recipes/scrapbox/auto/gold_small_dust.json deleted file mode 100644 index 230f0abbd..000000000 --- a/src/main/resources/data/techreborn/recipes/scrapbox/auto/gold_small_dust.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "power": 10, - "time": 20, - "ingredients": [ - { - "item": "techreborn:scrap_box" - } - ], - "results": [ - { - "item": "techreborn:gold_small_dust" - } - ], - "type": "techreborn:scrapbox" -} \ No newline at end of file