diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index ee6464dd3..e8827b1cc 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -638,9 +638,9 @@ public class TRContent { public enum SmallDusts implements ItemConvertible { ALMANDINE, ALUMINUM, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, BRASS, BRONZE, CALCITE, CHARCOAL, CHROME, CINNABAR, CLAY, COAL, DARK_ASHES, DIAMOND, DIORITE, ELECTRUM, EMERALD, ENDER_EYE, ENDER_PEARL, ENDSTONE, - FLINT, GALENA, GLOWSTONE, GRANITE, GROSSULAR, INVAR, LAZURITE, LEAD, MAGNESIUM, MANGANESE, MARBLE, + FLINT, GALENA, GLOWSTONE, GRANITE, GROSSULAR, INVAR, LAZURITE, 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, TITANIUM, + RUBY, SALTPETER, SAPPHIRE, SAW, SODALITE, SPESSARTINE, SPHALERITE, STEEL, SULFUR, TITANIUM, TUNGSTEN, UVAROVITE, YELLOW_GARNET, ZINC; public final String name; diff --git a/src/main/resources/assets/techreborn/models/item/lead_small_dust.json b/src/main/resources/assets/techreborn/models/item/lead_small_dust.json deleted file mode 100644 index c598de5c9..000000000 --- a/src/main/resources/assets/techreborn/models/item/lead_small_dust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "techreborn:item/smalldust/lead_small_dust" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/silver_small_dust.json b/src/main/resources/assets/techreborn/models/item/silver_small_dust.json deleted file mode 100644 index 647ebd024..000000000 --- a/src/main/resources/assets/techreborn/models/item/silver_small_dust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "techreborn:item/smalldust/silver_small_dust" - } -} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/lead_small_dusts.json b/src/main/resources/data/c/tags/items/lead_small_dusts.json deleted file mode 100644 index b9982c524..000000000 --- a/src/main/resources/data/c/tags/items/lead_small_dusts.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "techreborn:lead_small_dust" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/silver_small_dusts.json b/src/main/resources/data/c/tags/items/silver_small_dusts.json deleted file mode 100644 index eb7fde595..000000000 --- a/src/main/resources/data/c/tags/items/silver_small_dusts.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "techreborn:silver_small_dust" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/dust/raw_lead.json b/src/main/resources/data/techreborn/recipes/crafting_table/dust/raw_lead.json deleted file mode 100644 index ecf6a749a..000000000 --- a/src/main/resources/data/techreborn/recipes/crafting_table/dust/raw_lead.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "techreborn:lead_small_dust" - }, - { - "item": "techreborn:lead_small_dust" - }, - { - "item": "techreborn:lead_small_dust" - }, - { - "item": "techreborn:lead_small_dust" - } - ], - "result": { - "item": "techreborn:raw_lead" - } -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/dust/raw_silver.json b/src/main/resources/data/techreborn/recipes/crafting_table/dust/raw_silver.json deleted file mode 100644 index a42390d84..000000000 --- a/src/main/resources/data/techreborn/recipes/crafting_table/dust/raw_silver.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "techreborn:silver_small_dust" - }, - { - "item": "techreborn:silver_small_dust" - }, - { - "item": "techreborn:silver_small_dust" - }, - { - "item": "techreborn:silver_small_dust" - } - ], - "result": { - "item": "techreborn:raw_silver" - } -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/small_dust/lead_small_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/small_dust/lead_small_dust.json deleted file mode 100644 index bec9c824f..000000000 --- a/src/main/resources/data/techreborn/recipes/crafting_table/small_dust/lead_small_dust.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "techreborn:raw_lead" - } - ], - "result": { - "item": "techreborn:lead_small_dust", - "count": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/small_dust/silver_small_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/small_dust/silver_small_dust.json deleted file mode 100644 index 9c2568651..000000000 --- a/src/main/resources/data/techreborn/recipes/crafting_table/small_dust/silver_small_dust.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "techreborn:raw_silver" - } - ], - "result": { - "item": "techreborn:silver_small_dust", - "count": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/galena_dust.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/galena_dust.json index 039d6a066..cf3eb9cb0 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/galena_dust.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/galena_dust.json @@ -10,12 +10,12 @@ ], "results": [ { - "item": "techreborn:silver_small_dust", - "count": 3 + "item": "techreborn:silver_nugget", + "count": 6 }, { - "item": "techreborn:lead_small_dust", - "count": 3 + "item": "techreborn:lead_nugget", + "count": 6 }, { "item": "techreborn:sulfur_small_dust", diff --git a/src/main/resources/data/techreborn/recipes/scrapbox/auto/lead_small_dust.json b/src/main/resources/data/techreborn/recipes/scrapbox/auto/lead_small_dust.json deleted file mode 100644 index e278e4a01..000000000 --- a/src/main/resources/data/techreborn/recipes/scrapbox/auto/lead_small_dust.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "power": 10, - "time": 20, - "ingredients": [ - { - "item": "techreborn:scrap_box" - } - ], - "results": [ - { - "item": "techreborn:lead_small_dust" - } - ], - "type": "techreborn:scrapbox" -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/scrapbox/auto/silver_small_dust.json b/src/main/resources/data/techreborn/recipes/scrapbox/auto/silver_small_dust.json deleted file mode 100644 index 12ab00a98..000000000 --- a/src/main/resources/data/techreborn/recipes/scrapbox/auto/silver_small_dust.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "power": 10, - "time": 20, - "ingredients": [ - { - "item": "techreborn:scrap_box" - } - ], - "results": [ - { - "item": "techreborn:silver_small_dust" - } - ], - "type": "techreborn:scrapbox" -} \ No newline at end of file