Flattened dusts.

src/main/java/techreborn/blocks/BlockOre.java

@@ -50,6 +50,7 @@ import reborncore.common.util.OreDrop;
 import reborncore.common.util.StringUtils;
 import techreborn.events.TRRecipeHandler;
 import techreborn.init.ModBlocks;
+import techreborn.init.ModDusts;
 import techreborn.init.ModGems;
 import techreborn.items.ItemDusts;
 import techreborn.lib.ModInfo;
@@ -149,16 +150,16 @@ public class BlockOre extends Block implements IOreNameProvider {
 			OreDrop sapphire = new OreDrop(ModGems.SAPPHIRE.getStack(sapphireMinQuantity), sapphireMaxQuantity);
 			drops.add(sapphire.getDrops(fortune, random));
 		} else if (variant.equalsIgnoreCase("Pyrite")) {
-			OreDrop pyriteDust = new OreDrop(ItemDusts.getDustByName("pyrite", pyriteMinQuatity), pyriteMaxQuantity);
+			OreDrop pyriteDust = new OreDrop(ModDusts.PYRITE.getStack(pyriteMinQuatity), pyriteMaxQuantity);
 			drops.add(pyriteDust.getDrops(fortune, random));
 		} else if (variant.equalsIgnoreCase("Sodalite")) {
-			OreDrop sodalite = new OreDrop(ItemDusts.getDustByName("sodalite", sodaliteMinQuatity), sodaliteMaxQuantity);
+			OreDrop sodalite = new OreDrop(ModDusts.SODALITE.getStack(sodaliteMinQuatity), sodaliteMaxQuantity);
 			drops.add(sodalite.getDrops(fortune, random));
 		} else if (variant.equalsIgnoreCase("Cinnabar")) {
-			OreDrop cinnabar = new OreDrop(ItemDusts.getDustByName("cinnabar", cinnabarMinQuatity), cinnabarMaxQuantity);
+			OreDrop cinnabar = new OreDrop(ModDusts.CINNABAR.getStack(cinnabarMinQuatity), cinnabarMaxQuantity);
 			drops.add(cinnabar.getDrops(fortune, random));
 		} else if (variant.equalsIgnoreCase("Sphalerite")) {
-			OreDrop sphalerite = new OreDrop(ItemDusts.getDustByName("sphalerite", sphaleriteMinQuatity), sphaleriteMaxQuantity);
+			OreDrop sphalerite = new OreDrop(ModDusts.SPHALERITE.getStack(sphaleriteMinQuatity), sphaleriteMaxQuantity);
 			drops.add(sphalerite.getDrops(fortune, random));
 		} else {
 			drops.add(new ItemStack(Item.getItemFromBlock(this), 1, meta));

src/main/java/techreborn/client/RegisterItemJsons.java

@@ -37,6 +37,7 @@ import techreborn.blocks.cable.BlockCable;
 import techreborn.blocks.cable.EnumCableType;
 import techreborn.config.ConfigTechReborn;
 import techreborn.init.ModBlocks;
+import techreborn.init.ModDusts;
 import techreborn.init.ModGems;
 import techreborn.init.ModIngots;
 import techreborn.init.ModItems;
@@ -130,13 +131,10 @@ public class RegisterItemJsons {
 		ModGems.registerModel();
 		ModPlates.registerModel();
 		ModNuggets.registerModel();
+		ModDusts.registerModel();
 
-		String[] name = ItemDusts.types.clone();
-		for (int i = 0; i < ItemDusts.types.length; ++i) {
-			registerBlockstate(ModItems.DUSTS, i, name[i], "items/materials/");
-		}
 
-		name = ItemDustsSmall.types.clone();
+		String[] name = ItemDustsSmall.types.clone();
 		for (int i = 0; i < ItemDustsSmall.types.length; ++i) {
 			registerBlockstate(ModItems.SMALL_DUSTS, i, name[i], "items/materials/");
 		}

src/main/java/techreborn/events/BlockBreakHandler.java

@@ -36,6 +36,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import reborncore.common.registration.RebornRegistry;
 import reborncore.common.registration.impl.ConfigRegistry;
 import reborncore.common.util.OreDrop;
+import techreborn.init.ModDusts;
 import techreborn.init.ModGems;
 import techreborn.init.ModItems;
 import techreborn.items.ItemDusts;
@@ -76,7 +77,7 @@ public class BlockBreakHandler {
 				drops.add(peridot.getDrops(event.getFortuneLevel(), random));
 			}
 			else if (OreDictUtils.isOre(state, "oreSodalite")) {
-				OreDrop aluminium = new OreDrop(ItemDusts.getDustByName("aluminum"), aluminiumDropChance, 1);
+				OreDrop aluminium = new OreDrop(ModDusts.ALUMINUM.getStack(), aluminiumDropChance, 1);
 				drops.add(aluminium.getDrops(event.getFortuneLevel(), random));
 			}
 			else if (OreDictUtils.isOre(state, "oreCinnabar")) {

src/main/java/techreborn/init/ModDusts.java

@@ -0,0 +1,88 @@
+/*
+ * This file is part of TechReborn, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) 2018 TechReborn
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package techreborn.init;
+
+import java.util.Arrays;
+
+import com.google.common.base.CaseFormat;
+
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import reborncore.RebornRegistry;
+import techreborn.items.ItemDusts;
+import techreborn.lib.ModInfo;
+
+/**
+ * @author drcrazy
+ *
+ */
+public enum ModDusts implements IStringSerializable {
+	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,
+	NICKEL, OBSIDIAN, OLIVINE, PERIDOT, PHOSPHOROUS, PLATINUM, PYRITE, PYROPE, RED_GARNET, RUBY, SALTPETER, SAPPHIRE,
+	SAW, SILVER, SODALITE, SPESSARTINE, SPHALERITE, STEEL, SULFUR, TIN, TITANIUM, TUNGSTEN, UVAROVITE,
+	YELLOW_GARNET, ZINC;
+
+	public final String name;
+	public final Item item;
+
+	private ModDusts() {
+		name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "DUST_" + this.toString());
+		item = new ItemDusts();
+		item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
+		item.setTranslationKey(ModInfo.MOD_ID + "." + name);
+	}
+
+	public ItemStack getStack() {
+		return new ItemStack(item);
+	}
+
+	public ItemStack getStack(int amount) {
+		return new ItemStack(item, amount);
+	}
+
+	public static void register() {
+		Arrays.stream(ModDusts.values()).forEach(dust -> RebornRegistry.registerItem(dust.item));
+	}
+
+	@SideOnly(Side.CLIENT)
+	public static void registerModel() {
+		ResourceLocation blockstateJson = new ResourceLocation(ModInfo.MOD_ID, "items/materials/dusts");
+		Arrays.stream(ModDusts.values()).forEach(dust -> ModelLoader.setCustomModelResourceLocation(dust.item, 0,
+				new ModelResourceLocation(blockstateJson, "type=" + dust.name)));
+	}
+
+	@Override
+	public String getName() {
+		return name;
+	}
+
+}

src/main/java/techreborn/init/ModItems.java

@@ -45,7 +45,6 @@ import javax.annotation.Nullable;
 
 public class ModItems {
 
-	public static Item DUSTS;
 	public static Item SMALL_DUSTS;
 	public static Item PARTS;
 	public static Item ROCK_CUTTER;
@@ -154,11 +153,10 @@ public class ModItems {
 
 	public static void init() {
 
-		DUSTS = new ItemDusts();
-		registerItem(DUSTS, "dust");
 		SMALL_DUSTS = new ItemDustsSmall();
 		registerItem(SMALL_DUSTS, "smallDust");
 
+		ModDusts.register();
 		ModIngots.register();
 		ModGems.register();
 		ModPlates.register();

src/main/java/techreborn/init/OreDict.java

@@ -81,8 +81,8 @@ public class OreDict {
 		OreUtil.registerOre("materialResin", ItemParts.getPartByName("rubberSap"));
 		OreUtil.registerOre("materialRubber", ItemParts.getPartByName("rubber"));
 		OreUtil.registerOre("itemRubber", ItemParts.getPartByName("rubber"));
-		OreUtil.registerOre("pulpWood", ItemDusts.getDustByName("saw_dust"));
+//		OreUtil.registerOre("pulpWood", ItemDusts.getDustByName("saw_dust"));
-		OreUtil.registerOre("dustAsh", ItemDusts.getDustByName("ashes"));
+//		OreUtil.registerOre("dustAsh", ItemDusts.getDustByName("ashes"));
 
 //		TODO: fix recipe		
 //		for (String type : ItemGems.types) {

src/main/java/techreborn/init/SubItemRetriever.java

@@ -46,22 +46,26 @@ public class SubItemRetriever implements ISubItemRetriever {
 
 	@Override
 	public ItemStack getDustByName(String name) {
-		return ItemDusts.getDustByName(name);
+//		return ItemDusts.getDustByName(name);
+		return null;
 	}
 
 	@Override
 	public ItemStack getDustByName(String name, int count) {
-		return ItemDusts.getDustByName(name, count);
+//		return ItemDusts.getDustByName(name, count);
+		return null;
 	}
 
 	@Override
 	public ItemStack getSmallDustByName(String name) {
-		return ItemDustsSmall.getSmallDustByName(name);
+//		return ItemDustsSmall.getSmallDustByName(name);
+		return null;
 	}
 
 	@Override
 	public ItemStack getSmallDustByName(String name, int count) {
-		return ItemDustsSmall.getSmallDustByName(name, count);
+//		return ItemDustsSmall.getSmallDustByName(name, count);
+		return null;
 	}
 
 	@Override

src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java

@@ -40,7 +40,7 @@ import reborncore.common.registration.impl.ConfigRegistry;
 import reborncore.common.util.ItemUtils;
 import techreborn.api.Reference;
 import techreborn.api.recipe.machines.IndustrialSawmillRecipe;
-import techreborn.items.ItemDusts;
+import techreborn.init.ModDusts;
 import techreborn.lib.ModInfo;
 
 import javax.annotation.Nonnull;
@@ -116,7 +116,7 @@ public class IndustrialSawmillRecipes extends RecipeMethods {
 
 	public static void addRecipe(ItemStack log, ItemStack plank) {
 		plank.setCount(plankCount);
-		register(log, WATER, 100, 128, plank, ItemDusts.getDustByName("sawDust", 3), getStack(Items.PAPER, 1));
+		register(log, WATER, 100, 128, plank, ModDusts.SAW.getStack(3), getStack(Items.PAPER, 1));
 	}
 
 	static void register(ItemStack input1, FluidStack fluid, int ticks, int euPerTick, ItemStack... outputs) {

src/main/java/techreborn/items/ItemDusts.java

@@ -24,88 +24,45 @@
 
 package techreborn.items;
 
-import com.google.common.base.CaseFormat;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
 import techreborn.events.TRRecipeHandler;
-import techreborn.init.ModItems;
-import techreborn.utils.TechRebornCreativeTab;
-
-import java.security.InvalidParameterException;
 
 public class ItemDusts extends ItemTR {
-	public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt",
-		"bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper",
-		"dark_ashes", "diamond", "electrum", "emerald", "ender_eye", "ender_pearl", "endstone", "flint", "galena",
-		"gold", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack",
-		"nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "red_garnet",
-		"ruby", "saltpeter", "sapphire", "saw_dust", "silver", "sodalite", "spessartine", "sphalerite", "steel",
-		"sulfur", "tin", "titanium", "tungsten", "uvarovite", "yellow_garnet", "zinc",
-		"andesite", "diorite", "granite" };
 
 	public ItemDusts() {
-		setTranslationKey("techreborn.dust");
-		//setHasSubtypes(true);
-		setCreativeTab(TechRebornCreativeTab.instance);
 		TRRecipeHandler.hideEntry(this);
 	}
 
-	public static ItemStack getDustByName(String name, int count) {
+//	public static ItemStack getDustByName(String name, int count) {
-		name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name);
+//		name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name);
-		for (int i = 0; i < types.length; i++) {
+//		for (int i = 0; i < types.length; i++) {
-			if (types[i].equalsIgnoreCase(name)) {
+//			if (types[i].equalsIgnoreCase(name)) {
-				return new ItemStack(ModItems.DUSTS, count, i);
+//				return new ItemStack(ModItems.DUSTS, count, i);
-			}
+//			}
-		}
+//		}
-
+//
-		if (name.equalsIgnoreCase("glowstone")) {
+//		if (name.equalsIgnoreCase("glowstone")) {
-			return new ItemStack(Items.GLOWSTONE_DUST, count);
+//			return new ItemStack(Items.GLOWSTONE_DUST, count);
-		}
+//		}
-		if (name.equalsIgnoreCase("redstone")) {
+//		if (name.equalsIgnoreCase("redstone")) {
-			return new ItemStack(Items.REDSTONE, count);
+//			return new ItemStack(Items.REDSTONE, count);
-		}
+//		}
-		if (name.equalsIgnoreCase("gunpowder")) {
+//		if (name.equalsIgnoreCase("gunpowder")) {
-			return new ItemStack(Items.GUNPOWDER, count);
+//			return new ItemStack(Items.GUNPOWDER, count);
-		}
+//		}
-		throw new InvalidParameterException("The dust " + name + " could not be found.");
+//		throw new InvalidParameterException("The dust " + name + " could not be found.");
-	}
+//	}
-
+//
-	public static ItemStack getDustByName(String name) {
+//	public static ItemStack getDustByName(String name) {
-		return getDustByName(name, 1);
+//		return getDustByName(name, 1);
-	}
+//	}
-
+//
-	public static boolean hasDust(String name){
+//	public static boolean hasDust(String name){
-		for(String type : types){
+//		for(String type : types){
-			if(type.equals(name)){
+//			if(type.equals(name)){
-				return true;
+//				return true;
-			}
+//			}
-		}
+//		}
-		return false;
+//		return false;
-	}
+//	}
-
-
-/*	@Override
-	// gets Unlocalized Name depending on meta data
-	public String getTranslationKey(ItemStack itemStack) {
-		int meta = itemStack.getItemDamage();
-		if (meta < 0 || meta >= types.length) {
-			meta = 0;
-		}
-
-		return super.getTranslationKey() + "." + types[meta];
-	}*/
-
-/*	// Adds Dusts SubItems To Creative Tab
-	@Override
-	public void getSubItems(CreativeTabs creativeTabs, NonNullList<ItemStack> list) {
-		if (!isInCreativeTab(creativeTabs)) {
-			return;
-		}
-		for (int meta = 0; meta < types.length; ++meta) {
-			list.add(new ItemStack(this, 1, meta));
-		}
-	}*/
 
 }

src/main/resources/assets/techreborn/blockstates/items/materials/dusts.json

@@ -6,315 +6,315 @@
   },
   "variants": {
     "type": {
-      "almandine": {
+      "dustalmandine": {
         "textures": {
           "layer0": "techreborn:items/dust/almandine_dust"
         }
       },
-      "aluminum": {
+      "dustaluminum": {
         "textures": {
           "layer0": "techreborn:items/dust/aluminum_dust"
         }
       },
-      "andradite": {
+      "dustandesite": {
+        "textures": {
+          "layer0": "techreborn:items/dust/andesite_dust"
+        }
+      },      
+      "dustandradite": {
         "textures": {
           "layer0": "techreborn:items/dust/andradite_dust"
         }
       },
-      "ashes": {
+      "dustashes": {
         "textures": {
           "layer0": "techreborn:items/dust/ashes_dust"
         }
       },
-      "basalt": {
+      "dustbasalt": {
         "textures": {
           "layer0": "techreborn:items/dust/basalt_dust"
         }
       },
-      "bauxite": {
+      "dustbauxite": {
         "textures": {
           "layer0": "techreborn:items/dust/bauxite_dust"
         }
       },
-      "brass": {
+      "dustbrass": {
         "textures": {
           "layer0": "techreborn:items/dust/brass_dust"
         }
       },
-      "bronze": {
+      "dustbronze": {
         "textures": {
           "layer0": "techreborn:items/dust/bronze_dust"
         }
       },
-      "calcite": {
+      "dustcalcite": {
         "textures": {
           "layer0": "techreborn:items/dust/calcite_dust"
         }
       },
-      "charcoal": {
+      "dustcharcoal": {
         "textures": {
           "layer0": "techreborn:items/dust/charcoal_dust"
         }
       },
-      "chrome": {
+      "dustchrome": {
         "textures": {
           "layer0": "techreborn:items/dust/chrome_dust"
         }
       },
-      "cinnabar": {
+      "dustcinnabar": {
         "textures": {
           "layer0": "techreborn:items/dust/cinnabar_dust"
         }
       },
-      "clay": {
+      "dustclay": {
         "textures": {
           "layer0": "techreborn:items/dust/clay_dust"
         }
       },
-      "coal": {
+      "dustcoal": {
         "textures": {
           "layer0": "techreborn:items/dust/coal_dust"
         }
       },
-      "copper": {
+      "dustcopper": {
         "textures": {
           "layer0": "techreborn:items/dust/copper_dust"
         }
       },
-      "dark_ashes": {
+      "dustdarkashes": {
         "textures": {
           "layer0": "techreborn:items/dust/dark_ashes_dust"
         }
       },
-      "diamond": {
+      "dustdiamond": {
         "textures": {
           "layer0": "techreborn:items/dust/diamond_dust"
         }
       },
-      "electrum": {
+      "dustdiorite": {
+        "textures": {
+          "layer0": "techreborn:items/dust/diorite_dust"
+        }
+      },      
+      "dustelectrum": {
         "textures": {
           "layer0": "techreborn:items/dust/electrum_dust"
         }
       },
-      "emerald": {
+      "dustemerald": {
         "textures": {
           "layer0": "techreborn:items/dust/emerald_dust"
         }
       },
-      "ender_eye": {
+      "dustendereye": {
         "textures": {
           "layer0": "techreborn:items/dust/ender_eye_dust"
         }
       },
-      "ender_pearl": {
+      "dustenderpearl": {
         "textures": {
           "layer0": "techreborn:items/dust/ender_pearl_dust"
         }
       },
-      "endstone": {
+      "dustendstone": {
         "textures": {
           "layer0": "techreborn:items/dust/endstone_dust"
         }
       },
-      "flint": {
+      "dustflint": {
         "textures": {
           "layer0": "techreborn:items/dust/flint_dust"
         }
       },
-      "galena": {
+      "dustgalena": {
         "textures": {
           "layer0": "techreborn:items/dust/galena_dust"
         }
       },
-      "gold": {
+      "dustgold": {
         "textures": {
           "layer0": "techreborn:items/dust/gold_dust"
         }
       },
-      "grossular": {
+      "dustgranite": {
+        "textures": {
+          "layer0": "techreborn:items/dust/granite_dust"
+        }
+      },      
+      "dustgrossular": {
         "textures": {
           "layer0": "techreborn:items/dust/grossular_dust"
         }
       },
-      "invar": {
+      "dustinvar": {
         "textures": {
           "layer0": "techreborn:items/dust/invar_dust"
         }
       },
-      "iron": {
+      "dustiron": {
         "textures": {
           "layer0": "techreborn:items/dust/iron_dust"
         }
       },
-      "lazurite": {
+      "dustlazurite": {
         "textures": {
           "layer0": "techreborn:items/dust/lazurite_dust"
         }
       },
-      "lead": {
+      "dustlead": {
         "textures": {
           "layer0": "techreborn:items/dust/lead_dust"
         }
       },
-      "magnesium": {
+      "dustmagnesium": {
         "textures": {
           "layer0": "techreborn:items/dust/magnesium_dust"
         }
       },
-      "manganese": {
+      "dustmanganese": {
         "textures": {
           "layer0": "techreborn:items/dust/manganese_dust"
         }
       },
-      "marble": {
+      "dustmarble": {
         "textures": {
           "layer0": "techreborn:items/dust/marble_dust"
         }
       },
-      "netherrack": {
+      "dustnetherrack": {
         "textures": {
           "layer0": "techreborn:items/dust/netherrack_dust"
         }
       },
-      "nickel": {
+      "dustnickel": {
         "textures": {
           "layer0": "techreborn:items/dust/nickel_dust"
         }
       },
-      "obsidian": {
+      "dustobsidian": {
         "textures": {
           "layer0": "techreborn:items/dust/obsidian_dust"
         }
       },
-      "peridot": {
+      "dustolivine": {
+        "textures": {
+          "layer0": "techreborn:items/dust/olivine_dust"
+        }
+      },      
+      "dustperidot": {
         "textures": {
           "layer0": "techreborn:items/dust/peridot_dust"
         }
       },
-      "phosphorous": {
+      "dustphosphorous": {
         "textures": {
           "layer0": "techreborn:items/dust/phosphorous_dust"
         }
       },
-      "platinum": {
+      "dustplatinum": {
         "textures": {
           "layer0": "techreborn:items/dust/platinum_dust"
         }
       },
-      "pyrite": {
+      "dustpyrite": {
         "textures": {
           "layer0": "techreborn:items/dust/pyrite_dust"
         }
       },
-      "pyrope": {
+      "dustpyrope": {
         "textures": {
           "layer0": "techreborn:items/dust/pyrope_dust"
         }
       },
-      "red_garnet": {
+      "dustredgarnet": {
         "textures": {
           "layer0": "techreborn:items/dust/red_garnet_dust"
         }
       },
-      "ruby": {
+      "dustruby": {
         "textures": {
           "layer0": "techreborn:items/dust/ruby_dust"
         }
       },
-      "saltpeter": {
+      "dustsaltpeter": {
         "textures": {
           "layer0": "techreborn:items/dust/saltpeter_dust"
         }
       },
-      "sapphire": {
+      "dustsapphire": {
         "textures": {
           "layer0": "techreborn:items/dust/sapphire_dust"
         }
       },
-      "saw_dust": {
+      "dustsaw": {
         "textures": {
           "layer0": "techreborn:items/dust/saw_dust_dust"
         }
       },
-      "silver": {
+      "dustsilver": {
         "textures": {
           "layer0": "techreborn:items/dust/silver_dust"
         }
       },
-      "sodalite": {
+      "dustsodalite": {
         "textures": {
           "layer0": "techreborn:items/dust/sodalite_dust"
         }
       },
-      "spessartine": {
+      "dustspessartine": {
         "textures": {
           "layer0": "techreborn:items/dust/spessartine_dust"
         }
       },
-      "sphalerite": {
+      "dustsphalerite": {
         "textures": {
           "layer0": "techreborn:items/dust/sphalerite_dust"
         }
       },
-      "steel": {
+      "duststeel": {
         "textures": {
           "layer0": "techreborn:items/dust/steel_dust"
         }
       },
-      "sulfur": {
+      "dustsulfur": {
         "textures": {
           "layer0": "techreborn:items/dust/sulfur_dust"
         }
       },
-      "tin": {
+      "dusttin": {
         "textures": {
           "layer0": "techreborn:items/dust/tin_dust"
         }
       },
-      "titanium": {
+      "dusttitanium": {
         "textures": {
           "layer0": "techreborn:items/dust/titanium_dust"
         }
       },
-      "tungsten": {
+      "dusttungsten": {
         "textures": {
           "layer0": "techreborn:items/dust/tungsten_dust"
         }
       },
-      "uvarovite": {
+      "dustuvarovite": {
         "textures": {
           "layer0": "techreborn:items/dust/uvarovite_dust"
         }
       },
-      "yellow_garnet": {
+      "dustyellowgarnet": {
         "textures": {
           "layer0": "techreborn:items/dust/yellow_garnet_dust"
         }
       },
-      "zinc": {
+      "dustzinc": {
         "textures": {
           "layer0": "techreborn:items/dust/zinc_dust"
         }
-      },
-      "olivine": {
-        "textures": {
-          "layer0": "techreborn:items/dust/olivine_dust"
-        }
-      },
-      "andesite": {
-        "textures": {
-          "layer0": "techreborn:items/dust/andesite_dust"
-        }
-      },
-      "diorite": {
-        "textures": {
-          "layer0": "techreborn:items/dust/diorite_dust"
-        }
-      },
-      "granite": {
-        "textures": {
-          "layer0": "techreborn:items/dust/granite_dust"
-        }
       }
     }
   }

src/main/resources/assets/techreborn/lang/en_us.lang

@@ -213,88 +213,68 @@ fluid.invar.name=Molten Invar
 fluid.tungsten.name=Molten Tungsten
 
 #Dusts
-item.techreborn.dust.almandine.name=Almandine Dust
+item.techreborn.dustAlmandine.name=Almandine Dust
-item.techreborn.dust.aluminumBrass.name=Aluminium Brass Dust
+item.techreborn.dustAluminum.name=Aluminium Dust
-item.techreborn.dust.aluminum.name=Aluminium Dust
+item.techreborn.dustAndesite.name=Andesite Dust
-item.techreborn.dust.alumite.name=Alumite Dust
+item.techreborn.dustAndradite.name=Andradite Dust
-item.techreborn.dust.andradite.name=Andradite Dust
+item.techreborn.dustAshes.name=Ashes
-item.techreborn.dust.antimony.name=Antimony Dust
+item.techreborn.dustBasalt.name=Basalt Dust
-item.techreborn.dust.ardite.name=Ardite Dust
+item.techreborn.dustBauxite.name=Bauxite Dust
-item.techreborn.dust.ashes.name=Ashes
+item.techreborn.dustBrass.name=Brass Dust
-item.techreborn.dust.basalt.name=Basalt Dust
+item.techreborn.dustBronze.name=Bronze Dust
-item.techreborn.dust.bauxite.name=Bauxite Dust
+item.techreborn.dustCalcite.name=Calcite Dust
-item.techreborn.dust.biotite.name=Biotite Dust
+item.techreborn.dustCharcoal.name=Charcoal Dust
-item.techreborn.dust.brass.name=Brass Dust
+item.techreborn.dustChrome.name=Chrome Dust
-item.techreborn.dust.bronze.name=Bronze Dust
+item.techreborn.dustCinnabar.name=Cinnabar Dust
-item.techreborn.dust.cadmium.name=Cadmium Dust
+item.techreborn.dustClay.name=Clay Dust
-item.techreborn.dust.calcite.name=Calcite Dust
+item.techreborn.dustCoal.name=Coal Dust
-item.techreborn.dust.charcoal.name=Charcoal Dust
+item.techreborn.dustCopper.name=Copper Dust
-item.techreborn.dust.chrome.name=Chrome Dust
+item.techreborn.dustDarkAshes.name=Dark Ashes
-item.techreborn.dust.cinnabar.name=Cinnabar Dust
+item.techreborn.dustDiamond.name=Diamond Dust
-item.techreborn.dust.clay.name=Clay Dust
+item.techreborn.dustDiorite.name=Diorite Dust
-item.techreborn.dust.coal.name=Coal Dust
+item.techreborn.dustElectrum.name=Electrum Dust
-item.techreborn.dust.cobalt.name=Cobalt Dust
+item.techreborn.dustEmerald.name=Emerald Dust
-item.techreborn.dust.copper.name=Copper Dust
+item.techreborn.dustEnderEye.name=Ender Eye Dust
-item.techreborn.dust.cupronickel.name=Cupronickel Dust
+item.techreborn.dustEnderPearl.name=Ender Pearl Dust
-item.techreborn.dust.dark_ashes.name=Dark Ashes
+item.techreborn.dustEndstone.name=Endstone Dust
-item.techreborn.dust.darkIron.name=Dark Iron Dust
+item.techreborn.dustFlint.name=Flint Dust
-item.techreborn.dust.diamond.name=Diamond Dust
+item.techreborn.dustGalena.name=Galena Dust
-item.techreborn.dust.electrum.name=Electrum Dust
+item.techreborn.dustGold.name=Gold Dust
-item.techreborn.dust.emerald.name=Emerald Dust
+item.techreborn.dustGranite.name=Granite Dust
-item.techreborn.dust.ender_eye.name=Ender Eye Dust
+item.techreborn.dustGrossular.name=Grossular Dust
-item.techreborn.dust.ender_pearl.name=Ender Pearl Dust
+item.techreborn.dustInvar.name=Invar Dust
-item.techreborn.dust.endstone.name=Endstone Dust
+item.techreborn.dustIron.name=Iron Dust
-item.techreborn.dust.flint.name=Flint Dust
+item.techreborn.dustLazurite.name=Lazurite Dust
-item.techreborn.dust.gold.name=Gold Dust
+item.techreborn.dustLead.name=Lead Dust
-item.techreborn.dust.graphite.name=Graphite Dust
+item.techreborn.dustMagnesium.name=Magnesium Dust
-item.techreborn.dust.grossular.name=Grossular Dust
+item.techreborn.dustManganese.name=Manganese Dust
-item.techreborn.dust.indium.name=Indium Dust
+item.techreborn.dustMarble.name=Marble Dust
-item.techreborn.dust.invar.name=Invar Dust
+item.techreborn.dustNetherrack.name=Netherrack Dust
-item.techreborn.dust.iridium.name=Iridium Dust
+item.techreborn.dustNickel.name=Nickel Dust
-item.techreborn.dust.iron.name=Iron Dust
+item.techreborn.dustObsidian.name=Obsidian Dust
-item.techreborn.dust.lazurite.name=Lazurite Dust
+item.techreborn.dustOlivine.name=Olivine Dust
-item.techreborn.dust.lead.name=Lead Dust
+item.techreborn.dustPeridot.name=Peridot Dust
-item.techreborn.dust.magnesium.name=Magnesium Dust
+item.techreborn.dustPhosphorous.name=Phosphorous Dust
-item.techreborn.dust.manganese.name=Manganese Dust
+item.techreborn.dustPlatinum.name=Platinum Dust
-item.techreborn.dust.marble.name=Marble Dust
+item.techreborn.dustPyrite.name=Pyrite Dust
-item.techreborn.dust.netherrack.name=Netherrack Dust
+item.techreborn.dustPyrope.name=Pyrope Dust
-item.techreborn.dust.nickel.name=Nickel Dust
+item.techreborn.dustRedGarnet.name=Red Garnet Dust
-item.techreborn.dust.obsidian.name=Obsidian Dust
+item.techreborn.dustRuby.name=Ruby Dust
-item.techreborn.dust.osmium.name=Osmium Dust
+item.techreborn.dustSaltpeter.name=Saltpeter Dust
-item.techreborn.dust.peridot.name=Peridot Dust
+item.techreborn.dustSapphire.name=Sapphire Dust
-item.techreborn.dust.phosphorous.name=Phosphorous Dust
+item.techreborn.dustSaw.name=Saw Dust
-item.techreborn.dust.platinum.name=Platinum Dust
+item.techreborn.dustSilver.name=Silver Dust
-item.techreborn.dust.potassiumFeldspar.name=Potassium Feldspar Dust
+item.techreborn.dustSodalite.name=Sodalite Dust
-item.techreborn.dust.pyrite.name=Pyrite Dust
+item.techreborn.dustSpessartine.name=Spessartine Dust
-item.techreborn.dust.pyrope.name=Pyrope Dust
+item.techreborn.dustSphalerite.name=Sphalerite Dust
-item.techreborn.dust.red_garnet.name=Red Garnet Dust
+item.techreborn.dustSteel.name=Steel Dust
-item.techreborn.dust.ruby.name=Ruby Dust
+item.techreborn.dustSulfur.name=Sulfur Dust
-item.techreborn.dust.saltpeter.name=Saltpeter Dust
+item.techreborn.dustTin.name=Tin Dust
-item.techreborn.dust.sapphire.name=Sapphire Dust
+item.techreborn.dustTitanium.name=Titanium Dust
-item.techreborn.dust.silicon.name=Silicon Dust
+item.techreborn.dustTungsten.name=Tungsten Dust
-item.techreborn.dust.silver.name=Silver Dust
+item.techreborn.dustUvarovite.name=Uvarovite Dust
-item.techreborn.dust.sodalite.name=Sodalite Dust
+item.techreborn.dustYellowGarnet.name=Yellow Garnet Dust
-item.techreborn.dust.spessartine.name=Spessartine Dust
+item.techreborn.dustZinc.name=Zinc Dust
-item.techreborn.dust.sphalerite.name=Sphalerite Dust
-item.techreborn.dust.steel.name=Steel Dust
-item.techreborn.dust.sulfur.name=Sulfur Dust
-item.techreborn.dust.tellurium.name=Tellurium Dust
-item.techreborn.dust.teslatite.name=Teslatite Dust
-item.techreborn.dust.tetrahedrite.name=Tetrahedrite Dust
-item.techreborn.dust.tin.name=Tin Dust
-item.techreborn.dust.titanium.name=Titanium Dust
-item.techreborn.dust.tungsten.name=Tungsten Dust
-item.techreborn.dust.uvarovite.name=Uvarovite Dust
-item.techreborn.dust.vinteum.name=Vinteum Dust
-item.techreborn.dust.voidstone.name=Voidstone Dust
-item.techreborn.dust.yellow_garnet.name=Yellow Garnet Dust
-item.techreborn.dust.zinc.name=Zinc Dust
-item.techreborn.dust.galena.name=Galena Dust
-item.techreborn.dust.saw_dust.name=Saw Dust
-item.techreborn.dust.olivine.name=Olivine Dust
-item.techreborn.dust.andesite.name=Andesite Dust
-item.techreborn.dust.diorite.name=Diorite Dust
-item.techreborn.dust.granite.name=Granite Dust
 
 #Small Dusts
 item.techreborn.dustsmall.almandine.name=Small Pile of Almandine Dust

src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json

@@ -9,7 +9,7 @@
 			"entries": [
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotbronze",
 					"entryName": "bronze_ingot",
 					"weight": 10,
 					"functions": [
@@ -19,16 +19,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 2
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotcopper",
 					"entryName": "copper_ingot",
 					"weight": 10,
 					"functions": [
@@ -38,16 +34,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 4
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotlead",
 					"entryName": "lead_ingot",
 					"weight": 10,
 					"functions": [
@@ -57,16 +49,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 8
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotsilver",
 					"entryName": "silver_ingot",
 					"weight": 10,
 					"functions": [
@@ -76,16 +64,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 11
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingottin",
 					"entryName": "tin_ingot",
 					"weight": 10,
 					"functions": [
@@ -95,16 +79,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 13
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotrefinediron",
 					"entryName": "refined_iron_ingot",
 					"weight": 10,
 					"functions": [
@@ -114,16 +94,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 19
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotadvancedalloy",
 					"entryName": "advanced_alloy_ingot",
 					"weight": 10,
 					"functions": [
@@ -133,29 +109,6 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 20
-						}
-					]
-				},
-				{
-					"type": "item",
-					"name": "techreborn:ingot",
-					"entryName": "mixed_metal_ingot",
-					"weight": 10,
-					"functions": [
-						{
-							"function": "set_count",
-							"count": {
-								"min": 1,
-								"max": 2
-							}
-						},
-						{
-							"function": "set_data",
-							"data": 21
 						}
 					]
 				},								

src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json

@@ -9,7 +9,7 @@
 			"entries": [
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotbronze",
 					"entryName": "bronze_ingot",
 					"weight": 10,
 					"functions": [
@@ -19,16 +19,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 2
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotcopper",
 					"entryName": "copper_ingot",
 					"weight": 10,
 					"functions": [
@@ -38,16 +34,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 4
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotlead",
 					"entryName": "lead_ingot",
 					"weight": 10,
 					"functions": [
@@ -57,16 +49,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 8
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotsilver",
 					"entryName": "silver_ingot",
 					"weight": 10,
 					"functions": [
@@ -76,16 +64,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 11
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingottin",
 					"entryName": "tin_ingot",
 					"weight": 10,
 					"functions": [
@@ -95,16 +79,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 13
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotrefinediron",
 					"entryName": "refined_iron_ingot",
 					"weight": 10,
 					"functions": [
@@ -114,16 +94,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 19
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotadvancedalloy",
 					"entryName": "advanced_alloy_ingot",
 					"weight": 10,
 					"functions": [
@@ -133,29 +109,6 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 20
-						}
-					]
-				},
-				{
-					"type": "item",
-					"name": "techreborn:ingot",
-					"entryName": "mixed_metal_ingot",
-					"weight": 10,
-					"functions": [
-						{
-							"function": "set_count",
-							"count": {
-								"min": 1,
-								"max": 2
-							}
-						},
-						{
-							"function": "set_data",
-							"data": 21
 						}
 					]
 				},								

src/main/resources/assets/techreborn/loot_tables/chests/end_city_treasure.json

@@ -9,7 +9,7 @@
 			"entries": [
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotchrome",
 					"entryName": "chrome_ingot",
 					"weight": 10,
 					"functions": [
@@ -19,16 +19,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 3
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotiridium",
 					"entryName": "iridium_ingot",
 					"weight": 10,
 					"functions": [
@@ -38,16 +34,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 7
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotplatinum",
 					"entryName": "platinum_ingot",
 					"weight": 10,
 					"functions": [
@@ -57,16 +49,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 10
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingottitanium",
 					"entryName": "titanium_ingot",
 					"weight": 10,
 					"functions": [
@@ -76,16 +64,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 14
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingottungsten",
 					"entryName": "tungsten_ingot",
 					"weight": 10,
 					"functions": [
@@ -95,35 +79,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 15
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingottungstensteel",
-					"entryName": "hot_tungstensteel_iron_ingot",
-					"weight": 10,
-					"functions": [
-						{
-							"function": "set_count",
-							"count": {
-								"min": 1,
-								"max": 2
-							}
-						},
-						{
-							"function": "set_data",
-							"data": 16
-						}
-					]
-				},
-				{
-					"type": "item",
-					"name": "techreborn:ingot",
 					"entryName": "tungstensteel_ingot",
 					"weight": 10,
 					"functions": [
@@ -133,29 +94,6 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 17
-						}
-					]
-				},
-				{
-					"type": "item",
-					"name": "techreborn:ingot",
-					"entryName": "iridium_alloy_ingot",
-					"weight": 10,
-					"functions": [
-						{
-							"function": "set_count",
-							"count": {
-								"min": 1,
-								"max": 2
-							}
-						},
-						{
-							"function": "set_data",
-							"data": 22
 						}
 					]
 				},								

src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json

@@ -9,7 +9,7 @@
 			"entries": [
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotbronze",
 					"entryName": "bronze_ingot",
 					"weight": 10,
 					"functions": [
@@ -19,16 +19,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 2
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotcopper",
 					"entryName": "copper_ingot",
 					"weight": 10,
 					"functions": [
@@ -38,16 +34,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 4
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotlead",
 					"entryName": "lead_ingot",
 					"weight": 10,
 					"functions": [
@@ -57,16 +49,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 8
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotsilver",
 					"entryName": "silver_ingot",
 					"weight": 10,
 					"functions": [
@@ -76,16 +64,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 11
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingottin",
 					"entryName": "tin_ingot",
 					"weight": 10,
 					"functions": [
@@ -95,16 +79,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 13
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotrefinediron",
 					"entryName": "refined_iron_ingot",
 					"weight": 10,
 					"functions": [
@@ -114,16 +94,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 19
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotadvancedalloy",
 					"entryName": "advanced_alloy_ingot",
 					"weight": 10,
 					"functions": [
@@ -133,29 +109,6 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 20
-						}
-					]
-				},
-				{
-					"type": "item",
-					"name": "techreborn:ingot",
-					"entryName": "mixed_metal_ingot",
-					"weight": 10,
-					"functions": [
-						{
-							"function": "set_count",
-							"count": {
-								"min": 1,
-								"max": 2
-							}
-						},
-						{
-							"function": "set_data",
-							"data": 21
 						}
 					]
 				},								

src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json

@@ -9,7 +9,7 @@
 			"entries": [
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotbronze",
 					"entryName": "bronze_ingot",
 					"weight": 10,
 					"functions": [
@@ -19,16 +19,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 2
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotcopper",
 					"entryName": "copper_ingot",
 					"weight": 10,
 					"functions": [
@@ -38,16 +34,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 4
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotlead",
 					"entryName": "lead_ingot",
 					"weight": 10,
 					"functions": [
@@ -57,16 +49,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 8
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotsilver",
 					"entryName": "silver_ingot",
 					"weight": 10,
 					"functions": [
@@ -76,16 +64,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 11
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingottin",
 					"entryName": "tin_ingot",
 					"weight": 10,
 					"functions": [
@@ -95,16 +79,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 13
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotrefinediron",
 					"entryName": "refined_iron_ingot",
 					"weight": 10,
 					"functions": [
@@ -114,16 +94,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 19
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotadvancedalloy",
 					"entryName": "advanced_alloy_ingot",
 					"weight": 10,
 					"functions": [
@@ -133,29 +109,6 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 20
-						}
-					]
-				},
-				{
-					"type": "item",
-					"name": "techreborn:ingot",
-					"entryName": "mixed_metal_ingot",
-					"weight": 10,
-					"functions": [
-						{
-							"function": "set_count",
-							"count": {
-								"min": 1,
-								"max": 2
-							}
-						},
-						{
-							"function": "set_data",
-							"data": 21
 						}
 					]
 				},								

src/main/resources/assets/techreborn/loot_tables/chests/nether_bridge.json

@@ -9,7 +9,7 @@
 			"entries": [
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotaluminum",
 					"entryName": "aluminium_ingot",
 					"weight": 10,
 					"functions": [
@@ -19,16 +19,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 0
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotbrass",
 					"entryName": "brass_ingot",
 					"weight": 10,
 					"functions": [
@@ -38,16 +34,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 1
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotelectrum",
 					"entryName": "electrum_ingot",
 					"weight": 10,
 					"functions": [
@@ -57,16 +49,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 5
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotinvar",
 					"entryName": "invar_ingot",
 					"weight": 10,
 					"functions": [
@@ -76,16 +64,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 6
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotnickel",
 					"entryName": "nickel_ingot",
 					"weight": 10,
 					"functions": [
@@ -95,16 +79,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 9
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotsteel",
 					"entryName": "steel_ingot",
 					"weight": 10,
 					"functions": [
@@ -114,16 +94,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 12
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotzinc",
 					"entryName": "zinc_ingot",
 					"weight": 10,
 					"functions": [
@@ -133,10 +109,6 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 18
 						}
 					]
 				},								

src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json

@@ -9,7 +9,7 @@
 			"entries": [
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotbronze",
 					"entryName": "bronze_ingot",
 					"weight": 10,
 					"functions": [
@@ -19,16 +19,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 2
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotcopper",
 					"entryName": "copper_ingot",
 					"weight": 10,
 					"functions": [
@@ -38,16 +34,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 4
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotlead",
 					"entryName": "lead_ingot",
 					"weight": 10,
 					"functions": [
@@ -57,16 +49,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 8
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotsilver",
 					"entryName": "silver_ingot",
 					"weight": 10,
 					"functions": [
@@ -76,16 +64,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 11
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingottin",
 					"entryName": "tin_ingot",
 					"weight": 10,
 					"functions": [
@@ -95,16 +79,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 13
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotrefinediron",
 					"entryName": "refined_iron_ingot",
 					"weight": 10,
 					"functions": [
@@ -114,16 +94,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 19
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotadvancedalloy",
 					"entryName": "advanced_alloy_ingot",
 					"weight": 10,
 					"functions": [
@@ -133,29 +109,6 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 20
-						}
-					]
-				},
-				{
-					"type": "item",
-					"name": "techreborn:ingot",
-					"entryName": "mixed_metal_ingot",
-					"weight": 10,
-					"functions": [
-						{
-							"function": "set_count",
-							"count": {
-								"min": 1,
-								"max": 2
-							}
-						},
-						{
-							"function": "set_data",
-							"data": 21
 						}
 					]
 				},								

src/main/resources/assets/techreborn/loot_tables/chests/stronghold_corridor.json

@@ -9,7 +9,7 @@
 			"entries": [
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotaluminum",
 					"entryName": "aluminium_ingot",
 					"weight": 10,
 					"functions": [
@@ -19,16 +19,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 0
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotbrass",
 					"entryName": "brass_ingot",
 					"weight": 10,
 					"functions": [
@@ -38,16 +34,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 1
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotelectrum",
 					"entryName": "electrum_ingot",
 					"weight": 10,
 					"functions": [
@@ -57,16 +49,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 5
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotinvar",
 					"entryName": "invar_ingot",
 					"weight": 10,
 					"functions": [
@@ -76,16 +64,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 6
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotnickel",
 					"entryName": "nickel_ingot",
 					"weight": 10,
 					"functions": [
@@ -95,16 +79,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 9
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotsteel",
 					"entryName": "steel_ingot",
 					"weight": 10,
 					"functions": [
@@ -114,16 +94,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 12
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotzinc",
 					"entryName": "zinc_ingot",
 					"weight": 10,
 					"functions": [
@@ -133,10 +109,6 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 18
 						}
 					]
 				},								

src/main/resources/assets/techreborn/loot_tables/chests/stronghold_crossing.json

@@ -9,7 +9,7 @@
 			"entries": [
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotaluminum",
 					"entryName": "aluminium_ingot",
 					"weight": 10,
 					"functions": [
@@ -19,16 +19,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 0
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotbrass",
 					"entryName": "brass_ingot",
 					"weight": 10,
 					"functions": [
@@ -38,16 +34,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 1
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotelectrum",
 					"entryName": "electrum_ingot",
 					"weight": 10,
 					"functions": [
@@ -57,16 +49,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 5
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotinvar",
 					"entryName": "invar_ingot",
 					"weight": 10,
 					"functions": [
@@ -76,16 +64,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 6
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotnickel",
 					"entryName": "nickel_ingot",
 					"weight": 10,
 					"functions": [
@@ -95,16 +79,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 9
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotsteel",
 					"entryName": "steel_ingot",
 					"weight": 10,
 					"functions": [
@@ -114,16 +94,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 12
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotzinc",
 					"entryName": "zinc_ingot",
 					"weight": 10,
 					"functions": [
@@ -133,10 +109,6 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 18
 						}
 					]
 				},								

src/main/resources/assets/techreborn/loot_tables/chests/stronghold_library.json

@@ -9,7 +9,7 @@
 			"entries": [
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotaluminum",
 					"entryName": "aluminium_ingot",
 					"weight": 10,
 					"functions": [
@@ -19,16 +19,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 0
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotbrass",
 					"entryName": "brass_ingot",
 					"weight": 10,
 					"functions": [
@@ -38,16 +34,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 1
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotelectrum",
 					"entryName": "electrum_ingot",
 					"weight": 10,
 					"functions": [
@@ -57,16 +49,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 5
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotinvar",
 					"entryName": "invar_ingot",
 					"weight": 10,
 					"functions": [
@@ -76,16 +64,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 6
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotnickel",
 					"entryName": "nickel_ingot",
 					"weight": 10,
 					"functions": [
@@ -95,16 +79,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 9
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotsteel",
 					"entryName": "steel_ingot",
 					"weight": 10,
 					"functions": [
@@ -114,16 +94,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 12
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotzinc",
 					"entryName": "zinc_ingot",
 					"weight": 10,
 					"functions": [
@@ -133,10 +109,6 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 18
 						}
 					]
 				},								

src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json

@@ -9,7 +9,7 @@
 			"entries": [
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotbronze",
 					"entryName": "bronze_ingot",
 					"weight": 10,
 					"functions": [
@@ -19,16 +19,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 2
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotcopper",
 					"entryName": "copper_ingot",
 					"weight": 10,
 					"functions": [
@@ -38,16 +34,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 4
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotlead",
 					"entryName": "lead_ingot",
 					"weight": 10,
 					"functions": [
@@ -57,16 +49,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 8
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotsilver",
 					"entryName": "silver_ingot",
 					"weight": 10,
 					"functions": [
@@ -76,16 +64,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 11
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingottin",
 					"entryName": "tin_ingot",
 					"weight": 10,
 					"functions": [
@@ -95,16 +79,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 13
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotrefinediron",
 					"entryName": "refined_iron_ingot",
 					"weight": 10,
 					"functions": [
@@ -114,16 +94,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 19
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotadvancedalloy",
 					"entryName": "advanced_alloy_ingot",
 					"weight": 10,
 					"functions": [
@@ -133,29 +109,6 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 20
-						}
-					]
-				},
-				{
-					"type": "item",
-					"name": "techreborn:ingot",
-					"entryName": "mixed_metal_ingot",
-					"weight": 10,
-					"functions": [
-						{
-							"function": "set_count",
-							"count": {
-								"min": 1,
-								"max": 2
-							}
-						},
-						{
-							"function": "set_data",
-							"data": 21
 						}
 					]
 				},								

src/main/resources/assets/techreborn/loot_tables/chests/woodland_mansion.json

@@ -9,7 +9,7 @@
 			"entries": [
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotchrome",
 					"entryName": "chrome_ingot",
 					"weight": 10,
 					"functions": [
@@ -19,16 +19,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 3
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotiridium",
 					"entryName": "iridium_ingot",
 					"weight": 10,
 					"functions": [
@@ -38,16 +34,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 7
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingotplatinum",
 					"entryName": "platinum_ingot",
 					"weight": 10,
 					"functions": [
@@ -57,16 +49,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 10
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingottitanium",
 					"entryName": "titanium_ingot",
 					"weight": 10,
 					"functions": [
@@ -76,16 +64,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 14
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingottungsten",
 					"entryName": "tungsten_ingot",
 					"weight": 10,
 					"functions": [
@@ -95,35 +79,12 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 15
 						}
 					]
 				},
 				{
 					"type": "item",
-					"name": "techreborn:ingot",
+					"name": "techreborn:ingottungstensteel",
-					"entryName": "hot_tungstensteel_iron_ingot",
-					"weight": 10,
-					"functions": [
-						{
-							"function": "set_count",
-							"count": {
-								"min": 1,
-								"max": 2
-							}
-						},
-						{
-							"function": "set_data",
-							"data": 16
-						}
-					]
-				},
-				{
-					"type": "item",
-					"name": "techreborn:ingot",
 					"entryName": "tungstensteel_ingot",
 					"weight": 10,
 					"functions": [
@@ -133,29 +94,6 @@
 								"min": 1,
 								"max": 2
 							}
-						},
-						{
-							"function": "set_data",
-							"data": 17
-						}
-					]
-				},
-				{
-					"type": "item",
-					"name": "techreborn:ingot",
-					"entryName": "iridium_alloy_ingot",
-					"weight": 10,
-					"functions": [
-						{
-							"function": "set_count",
-							"count": {
-								"min": 1,
-								"max": 2
-							}
-						},
-						{
-							"function": "set_data",
-							"data": 22
 						}
 					]
 				},