From a8c9b71e470c42003bd890e864755c9e15d08b50 Mon Sep 17 00:00:00 2001 From: Modmuss50 Date: Sat, 7 Nov 2015 09:12:44 +0000 Subject: [PATCH] Some work on the ore Unifier, for #225 --- .../java/techreborn/events/OreUnifier.java | 44 ++ src/main/java/techreborn/init/ModItems.java | 643 +++++++++--------- 2 files changed, 366 insertions(+), 321 deletions(-) create mode 100644 src/main/java/techreborn/events/OreUnifier.java diff --git a/src/main/java/techreborn/events/OreUnifier.java b/src/main/java/techreborn/events/OreUnifier.java new file mode 100644 index 000000000..9119ef60e --- /dev/null +++ b/src/main/java/techreborn/events/OreUnifier.java @@ -0,0 +1,44 @@ +package techreborn.events; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.event.entity.player.PlayerUseItemEvent; +import net.minecraftforge.oredict.OreDictionary; +import techreborn.util.ItemUtils; + +import java.util.HashMap; + +public class OreUnifier { + + public static HashMap oreHash = new HashMap(); + + @SubscribeEvent + public void itemTick(PlayerUseItemEvent.Tick event) { + int[] oreIds = OreDictionary.getOreIDs(event.item); + for(int id : oreIds){ + String oreName = OreDictionary.getOreName(id); + if(oreHash.containsKey(oreName)){ + if(ItemUtils.isItemEqual(event.item, oreHash.get(oreName), true, true, true) && !ItemUtils.isItemEqual(event.item, oreHash.get(oreName), true, true, false)){ + //TODO set new item + } + } + } + } + + public static void registerOre(String name, ItemStack ore) { + oreHash.put(name, ore); + OreDictionary.registerOre(name, ore); + } + + public static void registerOre(String name, Item ore) { + registerOre(name, new ItemStack(ore)); + } + + public static void registerOre(String name, Block ore) { + registerOre(name, new ItemStack(ore)); + } + + +} diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index a450cf24b..49a927554 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -10,6 +10,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.oredict.OreDictionary; +import techreborn.events.OreUnifier; import techreborn.items.*; import techreborn.items.armor.ItemLapotronPack; import techreborn.items.armor.ItemLithiumBatpack; @@ -268,343 +269,343 @@ public class ModItems { public static void registerOreDict() { - OreDictionary.registerOre("gemRuby", ItemGems.getGemByName("ruby")); - OreDictionary.registerOre("gemSapphire", ItemGems.getGemByName("sapphire")); - OreDictionary.registerOre("gemPeridot", ItemGems.getGemByName("peridot")); - OreDictionary.registerOre("gemRedGarnet", ItemGems.getGemByName("redGarnet")); - OreDictionary.registerOre("gemYellowGarnet", ItemGems.getGemByName("yellowGarnet")); + OreUnifier.registerOre("gemRuby", ItemGems.getGemByName("ruby")); + OreUnifier.registerOre("gemSapphire", ItemGems.getGemByName("sapphire")); + OreUnifier.registerOre("gemPeridot", ItemGems.getGemByName("peridot")); + OreUnifier.registerOre("gemRedGarnet", ItemGems.getGemByName("redGarnet")); + OreUnifier.registerOre("gemYellowGarnet", ItemGems.getGemByName("yellowGarnet")); // Dusts - OreDictionary.registerOre("dustAlmandine", ItemDusts.getDustByName("almandine")); - OreDictionary.registerOre("dustAluminumBrass", ItemDusts.getDustByName("aluminumBrass")); - OreDictionary.registerOre("dustAluminum", ItemDusts.getDustByName("aluminum")); - OreDictionary.registerOre("dustAluminium", ItemDusts.getDustByName("aluminum")); - OreDictionary.registerOre("dustAlumite", ItemDusts.getDustByName("alumite")); - OreDictionary.registerOre("dustAndradite", ItemDusts.getDustByName("andradite")); - OreDictionary.registerOre("dustAntimony", ItemDusts.getDustByName("antimony")); - OreDictionary.registerOre("dustArdite", ItemDusts.getDustByName("ardite")); - OreDictionary.registerOre("dustAsh", ItemDusts.getDustByName("ashes")); - OreDictionary.registerOre("dustBasalt", ItemDusts.getDustByName("basalt")); - OreDictionary.registerOre("dustBauxite", ItemDusts.getDustByName("bauxite")); - OreDictionary.registerOre("dustBiotite", ItemDusts.getDustByName("biotite")); - OreDictionary.registerOre("dustBrass", ItemDusts.getDustByName("brass")); - OreDictionary.registerOre("dustBronze", ItemDusts.getDustByName("bronze")); - OreDictionary.registerOre("dustCadmium", ItemDusts.getDustByName("cadmium")); - OreDictionary.registerOre("dustCalcite", ItemDusts.getDustByName("calcite")); - OreDictionary.registerOre("dustCharcoal", ItemDusts.getDustByName("charcoal")); - OreDictionary.registerOre("dustChrome", ItemDusts.getDustByName("chrome")); - OreDictionary.registerOre("dustCinnabar", ItemDusts.getDustByName("cinnabar")); - OreDictionary.registerOre("dustClay", ItemDusts.getDustByName("clay")); - OreDictionary.registerOre("dustCoal", ItemDusts.getDustByName("coal")); - OreDictionary.registerOre("dustCobalt", ItemDusts.getDustByName("cobalt")); - OreDictionary.registerOre("dustCopper", ItemDusts.getDustByName("copper")); - OreDictionary.registerOre("dustCupronickel", ItemDusts.getDustByName("cupronickel")); - OreDictionary.registerOre("dustDarkAsh", ItemDusts.getDustByName("darkAshes")); - OreDictionary.registerOre("dustDarkIron", ItemDusts.getDustByName("darkIron")); - OreDictionary.registerOre("dustDiamond", ItemDusts.getDustByName("diamond")); - OreDictionary.registerOre("dustElectrum", ItemDusts.getDustByName("electrum")); - OreDictionary.registerOre("dustEmerald", ItemDusts.getDustByName("emerald")); - OreDictionary.registerOre("dustEnderEye", ItemDusts.getDustByName("enderEye")); - OreDictionary.registerOre("dustEnderPearl", ItemDusts.getDustByName("enderPearl")); - OreDictionary.registerOre("dustEndstone", ItemDusts.getDustByName("endstone")); - OreDictionary.registerOre("dustFlint", ItemDusts.getDustByName("flint")); - OreDictionary.registerOre("dustGalena", ItemDusts.getDustByName("galena")); - OreDictionary.registerOre("dustGold", ItemDusts.getDustByName("gold")); - OreDictionary.registerOre("dustGraphite", ItemDusts.getDustByName("graphite")); - OreDictionary.registerOre("dustGrossular", ItemDusts.getDustByName("grossular")); - OreDictionary.registerOre("dustIndium", ItemDusts.getDustByName("indium")); - OreDictionary.registerOre("dustInvar", ItemDusts.getDustByName("invar")); - OreDictionary.registerOre("dustIridium", ItemDusts.getDustByName("iridium")); - OreDictionary.registerOre("dustIron", ItemDusts.getDustByName("iron")); - OreDictionary.registerOre("dustKanthal", ItemDusts.getDustByName("kanthal")); - OreDictionary.registerOre("dustLapis", ItemDusts.getDustByName("lapis")); - OreDictionary.registerOre("dustLazurite", ItemDusts.getDustByName("lazurite")); - OreDictionary.registerOre("dustLead", ItemDusts.getDustByName("lead")); - OreDictionary.registerOre("dustLimestone", ItemDusts.getDustByName("limestone")); - OreDictionary.registerOre("dustLodestone", ItemDusts.getDustByName("lodestone")); - OreDictionary.registerOre("dustMagnesium", ItemDusts.getDustByName("magnesium")); - OreDictionary.registerOre("dustMagnetite", ItemDusts.getDustByName("magnetite")); - OreDictionary.registerOre("dustManganese", ItemDusts.getDustByName("manganese")); - OreDictionary.registerOre("dustManyullyn", ItemDusts.getDustByName("manyullyn")); - OreDictionary.registerOre("dustMarble", ItemDusts.getDustByName("marble")); - OreDictionary.registerOre("dustMithril", ItemDusts.getDustByName("mithril")); - OreDictionary.registerOre("dustNetherrack", ItemDusts.getDustByName("netherrack")); - OreDictionary.registerOre("dustNichrome", ItemDusts.getDustByName("nichrome")); - OreDictionary.registerOre("dustNickel", ItemDusts.getDustByName("nickel")); - OreDictionary.registerOre("dustObsidian", ItemDusts.getDustByName("obsidian")); - OreDictionary.registerOre("dustOsmium", ItemDusts.getDustByName("osmium")); - OreDictionary.registerOre("dustPeridot", ItemDusts.getDustByName("peridot")); - OreDictionary.registerOre("dustPhosphorous", ItemDusts.getDustByName("phosphorous")); - OreDictionary.registerOre("dustPlatinum", ItemDusts.getDustByName("platinum")); - OreDictionary.registerOre("dustPotassiumFeldspar", ItemDusts.getDustByName("potassiumFeldspar")); - OreDictionary.registerOre("dustPyrite", ItemDusts.getDustByName("pyrite")); - OreDictionary.registerOre("dustPyrope", ItemDusts.getDustByName("pyrope")); - OreDictionary.registerOre("dustRedGarnet", ItemDusts.getDustByName("redGarnet")); - OreDictionary.registerOre("dustRedrock", ItemDusts.getDustByName("redrock")); - OreDictionary.registerOre("dustRuby", ItemDusts.getDustByName("ruby")); - OreDictionary.registerOre("dustSaltpeter", ItemDusts.getDustByName("saltpeter")); - OreDictionary.registerOre("dustSapphire", ItemDusts.getDustByName("sapphire")); - OreDictionary.registerOre("dustSilver", ItemDusts.getDustByName("silver")); - OreDictionary.registerOre("dustSilicon", ItemDusts.getDustByName("silicon")); - OreDictionary.registerOre("dustSodalite", ItemDusts.getDustByName("sodalite")); - OreDictionary.registerOre("dustSpessartine", ItemDusts.getDustByName("spessartine")); - OreDictionary.registerOre("dustSphalerite", ItemDusts.getDustByName("sphalerite")); - OreDictionary.registerOre("dustSteel", ItemDusts.getDustByName("steel")); - OreDictionary.registerOre("dustSulfur", ItemDusts.getDustByName("sulfur")); - OreDictionary.registerOre("dustTellurium", ItemDusts.getDustByName("tellurium")); - OreDictionary.registerOre("dustTeslatite", ItemDusts.getDustByName("teslatite")); - OreDictionary.registerOre("dustTetrahedrite", ItemDusts.getDustByName("tetrahedrite")); - OreDictionary.registerOre("dustCopper", ItemDusts.getDustByName("copper")); - OreDictionary.registerOre("dustTin", ItemDusts.getDustByName("tin")); - OreDictionary.registerOre("dustTitanium", ItemDusts.getDustByName("titanium")); - OreDictionary.registerOre("dustTungsten", ItemDusts.getDustByName("tungsten")); - OreDictionary.registerOre("dustUvarovite", ItemDusts.getDustByName("uvarovite")); - OreDictionary.registerOre("dustVinteum", ItemDusts.getDustByName("vinteum")); - OreDictionary.registerOre("dustVoidstone", ItemDusts.getDustByName("voidstone")); - OreDictionary.registerOre("dustYellowGarnet", ItemDusts.getDustByName("yellowGarnet")); - OreDictionary.registerOre("dustZinc", ItemDusts.getDustByName("zinc")); - OreDictionary.registerOre("pulpWood", ItemDusts.getDustByName("sawDust")); + OreUnifier.registerOre("dustAlmandine", ItemDusts.getDustByName("almandine")); + OreUnifier.registerOre("dustAluminumBrass", ItemDusts.getDustByName("aluminumBrass")); + OreUnifier.registerOre("dustAluminum", ItemDusts.getDustByName("aluminum")); + OreUnifier.registerOre("dustAluminium", ItemDusts.getDustByName("aluminum")); + OreUnifier.registerOre("dustAlumite", ItemDusts.getDustByName("alumite")); + OreUnifier.registerOre("dustAndradite", ItemDusts.getDustByName("andradite")); + OreUnifier.registerOre("dustAntimony", ItemDusts.getDustByName("antimony")); + OreUnifier.registerOre("dustArdite", ItemDusts.getDustByName("ardite")); + OreUnifier.registerOre("dustAsh", ItemDusts.getDustByName("ashes")); + OreUnifier.registerOre("dustBasalt", ItemDusts.getDustByName("basalt")); + OreUnifier.registerOre("dustBauxite", ItemDusts.getDustByName("bauxite")); + OreUnifier.registerOre("dustBiotite", ItemDusts.getDustByName("biotite")); + OreUnifier.registerOre("dustBrass", ItemDusts.getDustByName("brass")); + OreUnifier.registerOre("dustBronze", ItemDusts.getDustByName("bronze")); + OreUnifier.registerOre("dustCadmium", ItemDusts.getDustByName("cadmium")); + OreUnifier.registerOre("dustCalcite", ItemDusts.getDustByName("calcite")); + OreUnifier.registerOre("dustCharcoal", ItemDusts.getDustByName("charcoal")); + OreUnifier.registerOre("dustChrome", ItemDusts.getDustByName("chrome")); + OreUnifier.registerOre("dustCinnabar", ItemDusts.getDustByName("cinnabar")); + OreUnifier.registerOre("dustClay", ItemDusts.getDustByName("clay")); + OreUnifier.registerOre("dustCoal", ItemDusts.getDustByName("coal")); + OreUnifier.registerOre("dustCobalt", ItemDusts.getDustByName("cobalt")); + OreUnifier.registerOre("dustCopper", ItemDusts.getDustByName("copper")); + OreUnifier.registerOre("dustCupronickel", ItemDusts.getDustByName("cupronickel")); + OreUnifier.registerOre("dustDarkAsh", ItemDusts.getDustByName("darkAshes")); + OreUnifier.registerOre("dustDarkIron", ItemDusts.getDustByName("darkIron")); + OreUnifier.registerOre("dustDiamond", ItemDusts.getDustByName("diamond")); + OreUnifier.registerOre("dustElectrum", ItemDusts.getDustByName("electrum")); + OreUnifier.registerOre("dustEmerald", ItemDusts.getDustByName("emerald")); + OreUnifier.registerOre("dustEnderEye", ItemDusts.getDustByName("enderEye")); + OreUnifier.registerOre("dustEnderPearl", ItemDusts.getDustByName("enderPearl")); + OreUnifier.registerOre("dustEndstone", ItemDusts.getDustByName("endstone")); + OreUnifier.registerOre("dustFlint", ItemDusts.getDustByName("flint")); + OreUnifier.registerOre("dustGalena", ItemDusts.getDustByName("galena")); + OreUnifier.registerOre("dustGold", ItemDusts.getDustByName("gold")); + OreUnifier.registerOre("dustGraphite", ItemDusts.getDustByName("graphite")); + OreUnifier.registerOre("dustGrossular", ItemDusts.getDustByName("grossular")); + OreUnifier.registerOre("dustIndium", ItemDusts.getDustByName("indium")); + OreUnifier.registerOre("dustInvar", ItemDusts.getDustByName("invar")); + OreUnifier.registerOre("dustIridium", ItemDusts.getDustByName("iridium")); + OreUnifier.registerOre("dustIron", ItemDusts.getDustByName("iron")); + OreUnifier.registerOre("dustKanthal", ItemDusts.getDustByName("kanthal")); + OreUnifier.registerOre("dustLapis", ItemDusts.getDustByName("lapis")); + OreUnifier.registerOre("dustLazurite", ItemDusts.getDustByName("lazurite")); + OreUnifier.registerOre("dustLead", ItemDusts.getDustByName("lead")); + OreUnifier.registerOre("dustLimestone", ItemDusts.getDustByName("limestone")); + OreUnifier.registerOre("dustLodestone", ItemDusts.getDustByName("lodestone")); + OreUnifier.registerOre("dustMagnesium", ItemDusts.getDustByName("magnesium")); + OreUnifier.registerOre("dustMagnetite", ItemDusts.getDustByName("magnetite")); + OreUnifier.registerOre("dustManganese", ItemDusts.getDustByName("manganese")); + OreUnifier.registerOre("dustManyullyn", ItemDusts.getDustByName("manyullyn")); + OreUnifier.registerOre("dustMarble", ItemDusts.getDustByName("marble")); + OreUnifier.registerOre("dustMithril", ItemDusts.getDustByName("mithril")); + OreUnifier.registerOre("dustNetherrack", ItemDusts.getDustByName("netherrack")); + OreUnifier.registerOre("dustNichrome", ItemDusts.getDustByName("nichrome")); + OreUnifier.registerOre("dustNickel", ItemDusts.getDustByName("nickel")); + OreUnifier.registerOre("dustObsidian", ItemDusts.getDustByName("obsidian")); + OreUnifier.registerOre("dustOsmium", ItemDusts.getDustByName("osmium")); + OreUnifier.registerOre("dustPeridot", ItemDusts.getDustByName("peridot")); + OreUnifier.registerOre("dustPhosphorous", ItemDusts.getDustByName("phosphorous")); + OreUnifier.registerOre("dustPlatinum", ItemDusts.getDustByName("platinum")); + OreUnifier.registerOre("dustPotassiumFeldspar", ItemDusts.getDustByName("potassiumFeldspar")); + OreUnifier.registerOre("dustPyrite", ItemDusts.getDustByName("pyrite")); + OreUnifier.registerOre("dustPyrope", ItemDusts.getDustByName("pyrope")); + OreUnifier.registerOre("dustRedGarnet", ItemDusts.getDustByName("redGarnet")); + OreUnifier.registerOre("dustRedrock", ItemDusts.getDustByName("redrock")); + OreUnifier.registerOre("dustRuby", ItemDusts.getDustByName("ruby")); + OreUnifier.registerOre("dustSaltpeter", ItemDusts.getDustByName("saltpeter")); + OreUnifier.registerOre("dustSapphire", ItemDusts.getDustByName("sapphire")); + OreUnifier.registerOre("dustSilver", ItemDusts.getDustByName("silver")); + OreUnifier.registerOre("dustSilicon", ItemDusts.getDustByName("silicon")); + OreUnifier.registerOre("dustSodalite", ItemDusts.getDustByName("sodalite")); + OreUnifier.registerOre("dustSpessartine", ItemDusts.getDustByName("spessartine")); + OreUnifier.registerOre("dustSphalerite", ItemDusts.getDustByName("sphalerite")); + OreUnifier.registerOre("dustSteel", ItemDusts.getDustByName("steel")); + OreUnifier.registerOre("dustSulfur", ItemDusts.getDustByName("sulfur")); + OreUnifier.registerOre("dustTellurium", ItemDusts.getDustByName("tellurium")); + OreUnifier.registerOre("dustTeslatite", ItemDusts.getDustByName("teslatite")); + OreUnifier.registerOre("dustTetrahedrite", ItemDusts.getDustByName("tetrahedrite")); + OreUnifier.registerOre("dustCopper", ItemDusts.getDustByName("copper")); + OreUnifier.registerOre("dustTin", ItemDusts.getDustByName("tin")); + OreUnifier.registerOre("dustTitanium", ItemDusts.getDustByName("titanium")); + OreUnifier.registerOre("dustTungsten", ItemDusts.getDustByName("tungsten")); + OreUnifier.registerOre("dustUvarovite", ItemDusts.getDustByName("uvarovite")); + OreUnifier.registerOre("dustVinteum", ItemDusts.getDustByName("vinteum")); + OreUnifier.registerOre("dustVoidstone", ItemDusts.getDustByName("voidstone")); + OreUnifier.registerOre("dustYellowGarnet", ItemDusts.getDustByName("yellowGarnet")); + OreUnifier.registerOre("dustZinc", ItemDusts.getDustByName("zinc")); + OreUnifier.registerOre("pulpWood", ItemDusts.getDustByName("sawDust")); // Small Dusts - OreDictionary.registerOre("dustSmallAlmandine", ItemDustsSmall.getSmallDustByName("Almandine")); - OreDictionary.registerOre("dustSmallAluminumBrass", ItemDustsSmall.getSmallDustByName("AluminumBrass")); - OreDictionary.registerOre("dustSmallAluminum", ItemDustsSmall.getSmallDustByName("Aluminum")); - OreDictionary.registerOre("dustSmallAluminium", ItemDustsSmall.getSmallDustByName("Aluminum")); - OreDictionary.registerOre("dustSmallAlumite", ItemDustsSmall.getSmallDustByName("Alumite")); - OreDictionary.registerOre("dustSmallAndradite", ItemDustsSmall.getSmallDustByName("Andradite")); - OreDictionary.registerOre("dustSmallAntimony", ItemDustsSmall.getSmallDustByName("Antimony")); - OreDictionary.registerOre("dustSmallArdite", ItemDustsSmall.getSmallDustByName("Ardite")); - OreDictionary.registerOre("dustSmallAsh", ItemDustsSmall.getSmallDustByName("Ashes")); - OreDictionary.registerOre("dustSmallBasalt", ItemDustsSmall.getSmallDustByName("Basalt")); - OreDictionary.registerOre("dustSmallBauxite", ItemDustsSmall.getSmallDustByName("Bauxite")); - OreDictionary.registerOre("dustSmallBiotite", ItemDustsSmall.getSmallDustByName("Biotite")); - OreDictionary.registerOre("dustSmallBrass", ItemDustsSmall.getSmallDustByName("Brass")); - OreDictionary.registerOre("dustSmallBronze", ItemDustsSmall.getSmallDustByName("Bronze")); - OreDictionary.registerOre("dustSmallCadmium", ItemDustsSmall.getSmallDustByName("Cadmium")); - OreDictionary.registerOre("dustSmallCalcite", ItemDustsSmall.getSmallDustByName("Calcite")); - OreDictionary.registerOre("dustSmallCharcoal", ItemDustsSmall.getSmallDustByName("Charcoal")); - OreDictionary.registerOre("dustSmallChrome", ItemDustsSmall.getSmallDustByName("Chrome")); - OreDictionary.registerOre("dustSmallCinnabar", ItemDustsSmall.getSmallDustByName("Cinnabar")); - OreDictionary.registerOre("dustSmallClay", ItemDustsSmall.getSmallDustByName("Clay")); - OreDictionary.registerOre("dustSmallCoal", ItemDustsSmall.getSmallDustByName("Coal")); - OreDictionary.registerOre("dustSmallCobalt", ItemDustsSmall.getSmallDustByName("Cobalt")); - OreDictionary.registerOre("dustSmallCopper", ItemDustsSmall.getSmallDustByName("Copper")); - OreDictionary.registerOre("dustSmallCupronickel", ItemDustsSmall.getSmallDustByName("Cupronickel")); - OreDictionary.registerOre("dustSmallDarkAsh", ItemDustsSmall.getSmallDustByName("DarkAshes")); - OreDictionary.registerOre("dustSmallDarkIron", ItemDustsSmall.getSmallDustByName("DarkIron")); - OreDictionary.registerOre("dustSmallDiamond", ItemDustsSmall.getSmallDustByName("Diamond")); - OreDictionary.registerOre("dustSmallElectrum", ItemDustsSmall.getSmallDustByName("Electrum")); - OreDictionary.registerOre("dustSmallEmerald", ItemDustsSmall.getSmallDustByName("Emerald")); - OreDictionary.registerOre("dustSmallEnderEye", ItemDustsSmall.getSmallDustByName("EnderEye")); - OreDictionary.registerOre("dustSmallEnderPearl", ItemDustsSmall.getSmallDustByName("EnderPearl")); - OreDictionary.registerOre("dustSmallEndstone", ItemDustsSmall.getSmallDustByName("Endstone")); - OreDictionary.registerOre("dustSmallFlint", ItemDustsSmall.getSmallDustByName("Flint")); - OreDictionary.registerOre("dustSmallGalena", ItemDustsSmall.getSmallDustByName("Galena")); - OreDictionary.registerOre("dustSmallGlowstone", ItemDustsSmall.getSmallDustByName("Glowstone")); - OreDictionary.registerOre("dustSmallGold", ItemDustsSmall.getSmallDustByName("Gold")); - OreDictionary.registerOre("dustSmallGraphite", ItemDustsSmall.getSmallDustByName("Graphite")); - OreDictionary.registerOre("dustSmallGrossular", ItemDustsSmall.getSmallDustByName("Grossular")); - OreDictionary.registerOre("dustSmallGunpowder", ItemDustsSmall.getSmallDustByName("Gunpowder")); - OreDictionary.registerOre("dustSmallIndium", ItemDustsSmall.getSmallDustByName("Indium")); - OreDictionary.registerOre("dustSmallInvar", ItemDustsSmall.getSmallDustByName("Invar")); - OreDictionary.registerOre("dustSmallIridium", ItemDustsSmall.getSmallDustByName("Iridium")); - OreDictionary.registerOre("dustSmallIron", ItemDustsSmall.getSmallDustByName("Iron")); - OreDictionary.registerOre("dustSmallKanthal", ItemDustsSmall.getSmallDustByName("Kanthal")); - OreDictionary.registerOre("dustSmallLapis", ItemDustsSmall.getSmallDustByName("Lapis")); - OreDictionary.registerOre("dustSmallLazurite", ItemDustsSmall.getSmallDustByName("Lazurite")); - OreDictionary.registerOre("dustSmallLead", ItemDustsSmall.getSmallDustByName("Lead")); - OreDictionary.registerOre("dustSmallLimestone", ItemDustsSmall.getSmallDustByName("Limestone")); - OreDictionary.registerOre("dustSmallLodestone", ItemDustsSmall.getSmallDustByName("Lodestone")); - OreDictionary.registerOre("dustSmallMagnesium", ItemDustsSmall.getSmallDustByName("Magnesium")); - OreDictionary.registerOre("dustSmallMagnetite", ItemDustsSmall.getSmallDustByName("Magnetite")); - OreDictionary.registerOre("dustSmallManganese", ItemDustsSmall.getSmallDustByName("Manganese")); - OreDictionary.registerOre("dustSmallManyullyn", ItemDustsSmall.getSmallDustByName("Manyullyn")); - OreDictionary.registerOre("dustSmallMarble", ItemDustsSmall.getSmallDustByName("Marble")); - OreDictionary.registerOre("dustSmallMithril", ItemDustsSmall.getSmallDustByName("Mithril")); - OreDictionary.registerOre("dustSmallNetherrack", ItemDustsSmall.getSmallDustByName("Netherrack")); - OreDictionary.registerOre("dustSmallNichrome", ItemDustsSmall.getSmallDustByName("Nichrome")); - OreDictionary.registerOre("dustSmallNickel", ItemDustsSmall.getSmallDustByName("Nickel")); - OreDictionary.registerOre("dustSmallObsidian", ItemDustsSmall.getSmallDustByName("Obsidian")); - OreDictionary.registerOre("dustSmallOsmium", ItemDustsSmall.getSmallDustByName("Osmium")); - OreDictionary.registerOre("dustSmallPeridot", ItemDustsSmall.getSmallDustByName("Peridot")); - OreDictionary.registerOre("dustSmallPhosphorous", ItemDustsSmall.getSmallDustByName("Phosphorous")); - OreDictionary.registerOre("dustSmallPlatinum", ItemDustsSmall.getSmallDustByName("Platinum")); - OreDictionary.registerOre("dustSmallPotassiumFeldspar", ItemDustsSmall.getSmallDustByName("PotassiumFeldspar")); - OreDictionary.registerOre("dustSmallPyrite", ItemDustsSmall.getSmallDustByName("Pyrite")); - OreDictionary.registerOre("dustSmallPyrope", ItemDustsSmall.getSmallDustByName("Pyrope")); - OreDictionary.registerOre("dustSmallRedGarnet", ItemDustsSmall.getSmallDustByName("RedGarnet")); - OreDictionary.registerOre("dustSmallRedrock", ItemDustsSmall.getSmallDustByName("Redrock")); - OreDictionary.registerOre("dustSmallRedstone", ItemDustsSmall.getSmallDustByName("Redstone")); - OreDictionary.registerOre("dustSmallRuby", ItemDustsSmall.getSmallDustByName("Ruby")); - OreDictionary.registerOre("dustSmallSaltpeter", ItemDustsSmall.getSmallDustByName("Saltpeter")); - OreDictionary.registerOre("dustSmallSapphire", ItemDustsSmall.getSmallDustByName("Sapphire")); - OreDictionary.registerOre("dustSmallSilver", ItemDustsSmall.getSmallDustByName("Silver")); - OreDictionary.registerOre("dustSmallSilicon", ItemDustsSmall.getSmallDustByName("Silicon")); - OreDictionary.registerOre("dustSmallSodalite", ItemDustsSmall.getSmallDustByName("Sodalite")); - OreDictionary.registerOre("dustSmallSpessartine", ItemDustsSmall.getSmallDustByName("Spessartine")); - OreDictionary.registerOre("dustSmallSphalerite", ItemDustsSmall.getSmallDustByName("Sphalerite")); - OreDictionary.registerOre("dustSmallSteel", ItemDustsSmall.getSmallDustByName("Steel")); - OreDictionary.registerOre("dustSmallSulfur", ItemDustsSmall.getSmallDustByName("Sulfur")); - OreDictionary.registerOre("dustSmallTellurium", ItemDustsSmall.getSmallDustByName("Tellurium")); - OreDictionary.registerOre("dustSmallTeslatite", ItemDustsSmall.getSmallDustByName("Teslatite")); - OreDictionary.registerOre("dustSmallTetrahedrite", ItemDustsSmall.getSmallDustByName("Tetrahedrite")); - OreDictionary.registerOre("dustSmallCopper", ItemDustsSmall.getSmallDustByName("Copper")); - OreDictionary.registerOre("dustSmallTin", ItemDustsSmall.getSmallDustByName("Tin")); - OreDictionary.registerOre("dustSmallTitanium", ItemDustsSmall.getSmallDustByName("Titanium")); - OreDictionary.registerOre("dustSmallTungsten", ItemDustsSmall.getSmallDustByName("Tungsten")); - OreDictionary.registerOre("dustSmallUvarovite", ItemDustsSmall.getSmallDustByName("Uvarovite")); - OreDictionary.registerOre("dustSmallVinteum", ItemDustsSmall.getSmallDustByName("Vinteum")); - OreDictionary.registerOre("dustSmallVoidstone", ItemDustsSmall.getSmallDustByName("Voidstone")); - OreDictionary.registerOre("dustSmallYellowGarnet", ItemDustsSmall.getSmallDustByName("YellowGarnet")); - OreDictionary.registerOre("dustSmallZinc", ItemDustsSmall.getSmallDustByName("Zinc")); + OreUnifier.registerOre("dustSmallAlmandine", ItemDustsSmall.getSmallDustByName("Almandine")); + OreUnifier.registerOre("dustSmallAluminumBrass", ItemDustsSmall.getSmallDustByName("AluminumBrass")); + OreUnifier.registerOre("dustSmallAluminum", ItemDustsSmall.getSmallDustByName("Aluminum")); + OreUnifier.registerOre("dustSmallAluminium", ItemDustsSmall.getSmallDustByName("Aluminum")); + OreUnifier.registerOre("dustSmallAlumite", ItemDustsSmall.getSmallDustByName("Alumite")); + OreUnifier.registerOre("dustSmallAndradite", ItemDustsSmall.getSmallDustByName("Andradite")); + OreUnifier.registerOre("dustSmallAntimony", ItemDustsSmall.getSmallDustByName("Antimony")); + OreUnifier.registerOre("dustSmallArdite", ItemDustsSmall.getSmallDustByName("Ardite")); + OreUnifier.registerOre("dustSmallAsh", ItemDustsSmall.getSmallDustByName("Ashes")); + OreUnifier.registerOre("dustSmallBasalt", ItemDustsSmall.getSmallDustByName("Basalt")); + OreUnifier.registerOre("dustSmallBauxite", ItemDustsSmall.getSmallDustByName("Bauxite")); + OreUnifier.registerOre("dustSmallBiotite", ItemDustsSmall.getSmallDustByName("Biotite")); + OreUnifier.registerOre("dustSmallBrass", ItemDustsSmall.getSmallDustByName("Brass")); + OreUnifier.registerOre("dustSmallBronze", ItemDustsSmall.getSmallDustByName("Bronze")); + OreUnifier.registerOre("dustSmallCadmium", ItemDustsSmall.getSmallDustByName("Cadmium")); + OreUnifier.registerOre("dustSmallCalcite", ItemDustsSmall.getSmallDustByName("Calcite")); + OreUnifier.registerOre("dustSmallCharcoal", ItemDustsSmall.getSmallDustByName("Charcoal")); + OreUnifier.registerOre("dustSmallChrome", ItemDustsSmall.getSmallDustByName("Chrome")); + OreUnifier.registerOre("dustSmallCinnabar", ItemDustsSmall.getSmallDustByName("Cinnabar")); + OreUnifier.registerOre("dustSmallClay", ItemDustsSmall.getSmallDustByName("Clay")); + OreUnifier.registerOre("dustSmallCoal", ItemDustsSmall.getSmallDustByName("Coal")); + OreUnifier.registerOre("dustSmallCobalt", ItemDustsSmall.getSmallDustByName("Cobalt")); + OreUnifier.registerOre("dustSmallCopper", ItemDustsSmall.getSmallDustByName("Copper")); + OreUnifier.registerOre("dustSmallCupronickel", ItemDustsSmall.getSmallDustByName("Cupronickel")); + OreUnifier.registerOre("dustSmallDarkAsh", ItemDustsSmall.getSmallDustByName("DarkAshes")); + OreUnifier.registerOre("dustSmallDarkIron", ItemDustsSmall.getSmallDustByName("DarkIron")); + OreUnifier.registerOre("dustSmallDiamond", ItemDustsSmall.getSmallDustByName("Diamond")); + OreUnifier.registerOre("dustSmallElectrum", ItemDustsSmall.getSmallDustByName("Electrum")); + OreUnifier.registerOre("dustSmallEmerald", ItemDustsSmall.getSmallDustByName("Emerald")); + OreUnifier.registerOre("dustSmallEnderEye", ItemDustsSmall.getSmallDustByName("EnderEye")); + OreUnifier.registerOre("dustSmallEnderPearl", ItemDustsSmall.getSmallDustByName("EnderPearl")); + OreUnifier.registerOre("dustSmallEndstone", ItemDustsSmall.getSmallDustByName("Endstone")); + OreUnifier.registerOre("dustSmallFlint", ItemDustsSmall.getSmallDustByName("Flint")); + OreUnifier.registerOre("dustSmallGalena", ItemDustsSmall.getSmallDustByName("Galena")); + OreUnifier.registerOre("dustSmallGlowstone", ItemDustsSmall.getSmallDustByName("Glowstone")); + OreUnifier.registerOre("dustSmallGold", ItemDustsSmall.getSmallDustByName("Gold")); + OreUnifier.registerOre("dustSmallGraphite", ItemDustsSmall.getSmallDustByName("Graphite")); + OreUnifier.registerOre("dustSmallGrossular", ItemDustsSmall.getSmallDustByName("Grossular")); + OreUnifier.registerOre("dustSmallGunpowder", ItemDustsSmall.getSmallDustByName("Gunpowder")); + OreUnifier.registerOre("dustSmallIndium", ItemDustsSmall.getSmallDustByName("Indium")); + OreUnifier.registerOre("dustSmallInvar", ItemDustsSmall.getSmallDustByName("Invar")); + OreUnifier.registerOre("dustSmallIridium", ItemDustsSmall.getSmallDustByName("Iridium")); + OreUnifier.registerOre("dustSmallIron", ItemDustsSmall.getSmallDustByName("Iron")); + OreUnifier.registerOre("dustSmallKanthal", ItemDustsSmall.getSmallDustByName("Kanthal")); + OreUnifier.registerOre("dustSmallLapis", ItemDustsSmall.getSmallDustByName("Lapis")); + OreUnifier.registerOre("dustSmallLazurite", ItemDustsSmall.getSmallDustByName("Lazurite")); + OreUnifier.registerOre("dustSmallLead", ItemDustsSmall.getSmallDustByName("Lead")); + OreUnifier.registerOre("dustSmallLimestone", ItemDustsSmall.getSmallDustByName("Limestone")); + OreUnifier.registerOre("dustSmallLodestone", ItemDustsSmall.getSmallDustByName("Lodestone")); + OreUnifier.registerOre("dustSmallMagnesium", ItemDustsSmall.getSmallDustByName("Magnesium")); + OreUnifier.registerOre("dustSmallMagnetite", ItemDustsSmall.getSmallDustByName("Magnetite")); + OreUnifier.registerOre("dustSmallManganese", ItemDustsSmall.getSmallDustByName("Manganese")); + OreUnifier.registerOre("dustSmallManyullyn", ItemDustsSmall.getSmallDustByName("Manyullyn")); + OreUnifier.registerOre("dustSmallMarble", ItemDustsSmall.getSmallDustByName("Marble")); + OreUnifier.registerOre("dustSmallMithril", ItemDustsSmall.getSmallDustByName("Mithril")); + OreUnifier.registerOre("dustSmallNetherrack", ItemDustsSmall.getSmallDustByName("Netherrack")); + OreUnifier.registerOre("dustSmallNichrome", ItemDustsSmall.getSmallDustByName("Nichrome")); + OreUnifier.registerOre("dustSmallNickel", ItemDustsSmall.getSmallDustByName("Nickel")); + OreUnifier.registerOre("dustSmallObsidian", ItemDustsSmall.getSmallDustByName("Obsidian")); + OreUnifier.registerOre("dustSmallOsmium", ItemDustsSmall.getSmallDustByName("Osmium")); + OreUnifier.registerOre("dustSmallPeridot", ItemDustsSmall.getSmallDustByName("Peridot")); + OreUnifier.registerOre("dustSmallPhosphorous", ItemDustsSmall.getSmallDustByName("Phosphorous")); + OreUnifier.registerOre("dustSmallPlatinum", ItemDustsSmall.getSmallDustByName("Platinum")); + OreUnifier.registerOre("dustSmallPotassiumFeldspar", ItemDustsSmall.getSmallDustByName("PotassiumFeldspar")); + OreUnifier.registerOre("dustSmallPyrite", ItemDustsSmall.getSmallDustByName("Pyrite")); + OreUnifier.registerOre("dustSmallPyrope", ItemDustsSmall.getSmallDustByName("Pyrope")); + OreUnifier.registerOre("dustSmallRedGarnet", ItemDustsSmall.getSmallDustByName("RedGarnet")); + OreUnifier.registerOre("dustSmallRedrock", ItemDustsSmall.getSmallDustByName("Redrock")); + OreUnifier.registerOre("dustSmallRedstone", ItemDustsSmall.getSmallDustByName("Redstone")); + OreUnifier.registerOre("dustSmallRuby", ItemDustsSmall.getSmallDustByName("Ruby")); + OreUnifier.registerOre("dustSmallSaltpeter", ItemDustsSmall.getSmallDustByName("Saltpeter")); + OreUnifier.registerOre("dustSmallSapphire", ItemDustsSmall.getSmallDustByName("Sapphire")); + OreUnifier.registerOre("dustSmallSilver", ItemDustsSmall.getSmallDustByName("Silver")); + OreUnifier.registerOre("dustSmallSilicon", ItemDustsSmall.getSmallDustByName("Silicon")); + OreUnifier.registerOre("dustSmallSodalite", ItemDustsSmall.getSmallDustByName("Sodalite")); + OreUnifier.registerOre("dustSmallSpessartine", ItemDustsSmall.getSmallDustByName("Spessartine")); + OreUnifier.registerOre("dustSmallSphalerite", ItemDustsSmall.getSmallDustByName("Sphalerite")); + OreUnifier.registerOre("dustSmallSteel", ItemDustsSmall.getSmallDustByName("Steel")); + OreUnifier.registerOre("dustSmallSulfur", ItemDustsSmall.getSmallDustByName("Sulfur")); + OreUnifier.registerOre("dustSmallTellurium", ItemDustsSmall.getSmallDustByName("Tellurium")); + OreUnifier.registerOre("dustSmallTeslatite", ItemDustsSmall.getSmallDustByName("Teslatite")); + OreUnifier.registerOre("dustSmallTetrahedrite", ItemDustsSmall.getSmallDustByName("Tetrahedrite")); + OreUnifier.registerOre("dustSmallCopper", ItemDustsSmall.getSmallDustByName("Copper")); + OreUnifier.registerOre("dustSmallTin", ItemDustsSmall.getSmallDustByName("Tin")); + OreUnifier.registerOre("dustSmallTitanium", ItemDustsSmall.getSmallDustByName("Titanium")); + OreUnifier.registerOre("dustSmallTungsten", ItemDustsSmall.getSmallDustByName("Tungsten")); + OreUnifier.registerOre("dustSmallUvarovite", ItemDustsSmall.getSmallDustByName("Uvarovite")); + OreUnifier.registerOre("dustSmallVinteum", ItemDustsSmall.getSmallDustByName("Vinteum")); + OreUnifier.registerOre("dustSmallVoidstone", ItemDustsSmall.getSmallDustByName("Voidstone")); + OreUnifier.registerOre("dustSmallYellowGarnet", ItemDustsSmall.getSmallDustByName("YellowGarnet")); + OreUnifier.registerOre("dustSmallZinc", ItemDustsSmall.getSmallDustByName("Zinc")); // Ingots - OreDictionary.registerOre("ingotAluminum", ItemIngots.getIngotByName("aluminum")); - OreDictionary.registerOre("ingotAluminium", ItemIngots.getIngotByName("aluminum")); - OreDictionary.registerOre("ingotAntimony", ItemIngots.getIngotByName("antimony")); - OreDictionary.registerOre("ingotBatteryAlloy", ItemIngots.getIngotByName("batteryAlloy")); - OreDictionary.registerOre("ingotBlueAlloy", ItemIngots.getIngotByName("blueAlloy")); - OreDictionary.registerOre("ingotBrass", ItemIngots.getIngotByName("brass")); - OreDictionary.registerOre("ingotBronze", ItemIngots.getIngotByName("bronze")); - OreDictionary.registerOre("ingotCadmium", ItemIngots.getIngotByName("cadmium")); - OreDictionary.registerOre("ingotChrome", ItemIngots.getIngotByName("chrome")); - OreDictionary.registerOre("ingotCopper", ItemIngots.getIngotByName("copper")); - OreDictionary.registerOre("ingotCupronickel", ItemIngots.getIngotByName("cupronickel")); - OreDictionary.registerOre("ingotElectrum", ItemIngots.getIngotByName("electrum")); - OreDictionary.registerOre("ingotIndium", ItemIngots.getIngotByName("indium")); - OreDictionary.registerOre("ingotInvar", ItemIngots.getIngotByName("invar")); - OreDictionary.registerOre("ingotIridium", ItemIngots.getIngotByName("iridium")); - OreDictionary.registerOre("ingotKanthal", ItemIngots.getIngotByName("kanthal")); - OreDictionary.registerOre("ingotLead", ItemIngots.getIngotByName("lead")); - OreDictionary.registerOre("ingotLodestone", ItemIngots.getIngotByName("lodestone")); - OreDictionary.registerOre("ingotMagnalium", ItemIngots.getIngotByName("magnalium")); - OreDictionary.registerOre("ingotNichrome", ItemIngots.getIngotByName("nichrome")); - OreDictionary.registerOre("ingotNickel", ItemIngots.getIngotByName("nickel")); - OreDictionary.registerOre("ingotOsmium", ItemIngots.getIngotByName("osmium")); - OreDictionary.registerOre("ingotPlatinum", ItemIngots.getIngotByName("platinum")); - OreDictionary.registerOre("ingotRedAlloy", ItemIngots.getIngotByName("redAlloy")); - OreDictionary.registerOre("ingotSilver", ItemIngots.getIngotByName("silver")); - OreDictionary.registerOre("ingotSteel", ItemIngots.getIngotByName("steel")); - OreDictionary.registerOre("ingotTellurium", ItemIngots.getIngotByName("tellurium")); - OreDictionary.registerOre("ingotTin", ItemIngots.getIngotByName("tin")); - OreDictionary.registerOre("ingotTitanium", ItemIngots.getIngotByName("titanium")); - OreDictionary.registerOre("ingotTungsten", ItemIngots.getIngotByName("tungsten")); - OreDictionary.registerOre("ingotTungstensteel", ItemIngots.getIngotByName("tungstensteel")); - OreDictionary.registerOre("ingotHotTungstenSteel", ItemIngots.getIngotByName("hotTungstensteel")); - OreDictionary.registerOre("ingotZinc", ItemIngots.getIngotByName("zinc")); + OreUnifier.registerOre("ingotAluminum", ItemIngots.getIngotByName("aluminum")); + OreUnifier.registerOre("ingotAluminium", ItemIngots.getIngotByName("aluminum")); + OreUnifier.registerOre("ingotAntimony", ItemIngots.getIngotByName("antimony")); + OreUnifier.registerOre("ingotBatteryAlloy", ItemIngots.getIngotByName("batteryAlloy")); + OreUnifier.registerOre("ingotBlueAlloy", ItemIngots.getIngotByName("blueAlloy")); + OreUnifier.registerOre("ingotBrass", ItemIngots.getIngotByName("brass")); + OreUnifier.registerOre("ingotBronze", ItemIngots.getIngotByName("bronze")); + OreUnifier.registerOre("ingotCadmium", ItemIngots.getIngotByName("cadmium")); + OreUnifier.registerOre("ingotChrome", ItemIngots.getIngotByName("chrome")); + OreUnifier.registerOre("ingotCopper", ItemIngots.getIngotByName("copper")); + OreUnifier.registerOre("ingotCupronickel", ItemIngots.getIngotByName("cupronickel")); + OreUnifier.registerOre("ingotElectrum", ItemIngots.getIngotByName("electrum")); + OreUnifier.registerOre("ingotIndium", ItemIngots.getIngotByName("indium")); + OreUnifier.registerOre("ingotInvar", ItemIngots.getIngotByName("invar")); + OreUnifier.registerOre("ingotIridium", ItemIngots.getIngotByName("iridium")); + OreUnifier.registerOre("ingotKanthal", ItemIngots.getIngotByName("kanthal")); + OreUnifier.registerOre("ingotLead", ItemIngots.getIngotByName("lead")); + OreUnifier.registerOre("ingotLodestone", ItemIngots.getIngotByName("lodestone")); + OreUnifier.registerOre("ingotMagnalium", ItemIngots.getIngotByName("magnalium")); + OreUnifier.registerOre("ingotNichrome", ItemIngots.getIngotByName("nichrome")); + OreUnifier.registerOre("ingotNickel", ItemIngots.getIngotByName("nickel")); + OreUnifier.registerOre("ingotOsmium", ItemIngots.getIngotByName("osmium")); + OreUnifier.registerOre("ingotPlatinum", ItemIngots.getIngotByName("platinum")); + OreUnifier.registerOre("ingotRedAlloy", ItemIngots.getIngotByName("redAlloy")); + OreUnifier.registerOre("ingotSilver", ItemIngots.getIngotByName("silver")); + OreUnifier.registerOre("ingotSteel", ItemIngots.getIngotByName("steel")); + OreUnifier.registerOre("ingotTellurium", ItemIngots.getIngotByName("tellurium")); + OreUnifier.registerOre("ingotTin", ItemIngots.getIngotByName("tin")); + OreUnifier.registerOre("ingotTitanium", ItemIngots.getIngotByName("titanium")); + OreUnifier.registerOre("ingotTungsten", ItemIngots.getIngotByName("tungsten")); + OreUnifier.registerOre("ingotTungstensteel", ItemIngots.getIngotByName("tungstensteel")); + OreUnifier.registerOre("ingotHotTungstenSteel", ItemIngots.getIngotByName("hotTungstensteel")); + OreUnifier.registerOre("ingotZinc", ItemIngots.getIngotByName("zinc")); // Nuggets - OreDictionary.registerOre("nuggetAluminum", ItemNuggets.getNuggetByName("aluminum")); - OreDictionary.registerOre("nuggetAluminium", ItemNuggets.getNuggetByName("aluminum")); - OreDictionary.registerOre("nuggetAntimony", ItemNuggets.getNuggetByName("antimony")); - OreDictionary.registerOre("nuggetBrass", ItemNuggets.getNuggetByName("brass")); - OreDictionary.registerOre("nuggetBronze", ItemNuggets.getNuggetByName("bronze")); - OreDictionary.registerOre("nuggetChrome", ItemNuggets.getNuggetByName("chrome")); - OreDictionary.registerOre("nuggetCopper", ItemNuggets.getNuggetByName("copper")); - OreDictionary.registerOre("nuggetElectrum", ItemNuggets.getNuggetByName("electrum")); - OreDictionary.registerOre("nuggetInvar", ItemNuggets.getNuggetByName("invar")); - OreDictionary.registerOre("nuggetIridium", ItemNuggets.getNuggetByName("iridium")); - OreDictionary.registerOre("nuggetIron", ItemNuggets.getNuggetByName("iron")); - OreDictionary.registerOre("nuggetLead", ItemNuggets.getNuggetByName("lead")); - OreDictionary.registerOre("nuggetNickel", ItemNuggets.getNuggetByName("nickel")); - OreDictionary.registerOre("nuggetOsmium", ItemNuggets.getNuggetByName("osmium")); - OreDictionary.registerOre("nuggetPlatinum", ItemNuggets.getNuggetByName("platinum")); - OreDictionary.registerOre("nuggetSilver", ItemNuggets.getNuggetByName("silver")); - OreDictionary.registerOre("nuggetSteel", ItemNuggets.getNuggetByName("steel")); - OreDictionary.registerOre("nuggetTin", ItemNuggets.getNuggetByName("tin")); - OreDictionary.registerOre("nuggetTitanium", ItemNuggets.getNuggetByName("titanium")); - OreDictionary.registerOre("nuggetTungsten", ItemNuggets.getNuggetByName("tungsten")); - OreDictionary.registerOre("nuggetZinc", ItemNuggets.getNuggetByName("zinc")); + OreUnifier.registerOre("nuggetAluminum", ItemNuggets.getNuggetByName("aluminum")); + OreUnifier.registerOre("nuggetAluminium", ItemNuggets.getNuggetByName("aluminum")); + OreUnifier.registerOre("nuggetAntimony", ItemNuggets.getNuggetByName("antimony")); + OreUnifier.registerOre("nuggetBrass", ItemNuggets.getNuggetByName("brass")); + OreUnifier.registerOre("nuggetBronze", ItemNuggets.getNuggetByName("bronze")); + OreUnifier.registerOre("nuggetChrome", ItemNuggets.getNuggetByName("chrome")); + OreUnifier.registerOre("nuggetCopper", ItemNuggets.getNuggetByName("copper")); + OreUnifier.registerOre("nuggetElectrum", ItemNuggets.getNuggetByName("electrum")); + OreUnifier.registerOre("nuggetInvar", ItemNuggets.getNuggetByName("invar")); + OreUnifier.registerOre("nuggetIridium", ItemNuggets.getNuggetByName("iridium")); + OreUnifier.registerOre("nuggetIron", ItemNuggets.getNuggetByName("iron")); + OreUnifier.registerOre("nuggetLead", ItemNuggets.getNuggetByName("lead")); + OreUnifier.registerOre("nuggetNickel", ItemNuggets.getNuggetByName("nickel")); + OreUnifier.registerOre("nuggetOsmium", ItemNuggets.getNuggetByName("osmium")); + OreUnifier.registerOre("nuggetPlatinum", ItemNuggets.getNuggetByName("platinum")); + OreUnifier.registerOre("nuggetSilver", ItemNuggets.getNuggetByName("silver")); + OreUnifier.registerOre("nuggetSteel", ItemNuggets.getNuggetByName("steel")); + OreUnifier.registerOre("nuggetTin", ItemNuggets.getNuggetByName("tin")); + OreUnifier.registerOre("nuggetTitanium", ItemNuggets.getNuggetByName("titanium")); + OreUnifier.registerOre("nuggetTungsten", ItemNuggets.getNuggetByName("tungsten")); + OreUnifier.registerOre("nuggetZinc", ItemNuggets.getNuggetByName("zinc")); // Plates - OreDictionary.registerOre("plateAluminum", ItemPlates.getPlateByName("aluminum")); - OreDictionary.registerOre("plateAluminium", ItemPlates.getPlateByName("aluminum")); - OreDictionary.registerOre("plateBatteryAlloy", ItemPlates.getPlateByName("batteryAlloy")); - OreDictionary.registerOre("plateBrass", ItemPlates.getPlateByName("brass")); - OreDictionary.registerOre("plateBronze", ItemPlates.getPlateByName("bronze")); - OreDictionary.registerOre("plateCoal", ItemPlates.getPlateByName("coal")); - OreDictionary.registerOre("plateChrome", ItemPlates.getPlateByName("chrome")); - OreDictionary.registerOre("plateCopper", ItemPlates.getPlateByName("copper")); - OreDictionary.registerOre("plateDiamond", ItemPlates.getPlateByName("diamond")); - OreDictionary.registerOre("plateElectrum", ItemPlates.getPlateByName("electrum")); - OreDictionary.registerOre("plateEmerald", ItemPlates.getPlateByName("emerald")); - OreDictionary.registerOre("plateGold", ItemPlates.getPlateByName("gold")); - OreDictionary.registerOre("plateInvar", ItemPlates.getPlateByName("invar")); - OreDictionary.registerOre("plateIridium", ItemPlates.getPlateByName("iridium")); - OreDictionary.registerOre("plateIron", ItemPlates.getPlateByName("iron")); - OreDictionary.registerOre("plateLapis", ItemPlates.getPlateByName("lapis")); - OreDictionary.registerOre("plateLead", ItemPlates.getPlateByName("lead")); - OreDictionary.registerOre("plateMagnalium", ItemPlates.getPlateByName("magnalium")); - OreDictionary.registerOre("plateNickel", ItemPlates.getPlateByName("nickel")); - OreDictionary.registerOre("plateObsidian", ItemPlates.getPlateByName("obsidian")); - OreDictionary.registerOre("plateOsmium", ItemPlates.getPlateByName("osmium")); - OreDictionary.registerOre("platePeridot", ItemPlates.getPlateByName("peridot")); - OreDictionary.registerOre("platePlatinum", ItemPlates.getPlateByName("platinum")); - OreDictionary.registerOre("plateRedGarnet", ItemPlates.getPlateByName("redGarnet")); - OreDictionary.registerOre("plateRedstone", ItemPlates.getPlateByName("redstone")); - OreDictionary.registerOre("plateRedstoneAlloy", ItemPlates.getPlateByName("redstone")); - OreDictionary.registerOre("plateRuby", ItemPlates.getPlateByName("ruby")); - OreDictionary.registerOre("plateSapphire", ItemPlates.getPlateByName("sapphire")); - OreDictionary.registerOre("plateSilicon", ItemPlates.getPlateByName("silicon")); - OreDictionary.registerOre("plateSilver", ItemPlates.getPlateByName("silver")); - OreDictionary.registerOre("plateSteel", ItemPlates.getPlateByName("steel")); - OreDictionary.registerOre("plateTeslatite", ItemPlates.getPlateByName("teslatite")); - OreDictionary.registerOre("plateTin", ItemPlates.getPlateByName("tin")); - OreDictionary.registerOre("plateTitanium", ItemPlates.getPlateByName("titanium")); - OreDictionary.registerOre("plateTungsten", ItemPlates.getPlateByName("tungsten")); - OreDictionary.registerOre("plateTungstensteel", ItemPlates.getPlateByName("tungstensteel")); - OreDictionary.registerOre("plateYellowGarnet", ItemPlates.getPlateByName("yellowGarnet")); - OreDictionary.registerOre("plateZinc", ItemPlates.getPlateByName("zinc")); + OreUnifier.registerOre("plateAluminum", ItemPlates.getPlateByName("aluminum")); + OreUnifier.registerOre("plateAluminium", ItemPlates.getPlateByName("aluminum")); + OreUnifier.registerOre("plateBatteryAlloy", ItemPlates.getPlateByName("batteryAlloy")); + OreUnifier.registerOre("plateBrass", ItemPlates.getPlateByName("brass")); + OreUnifier.registerOre("plateBronze", ItemPlates.getPlateByName("bronze")); + OreUnifier.registerOre("plateCoal", ItemPlates.getPlateByName("coal")); + OreUnifier.registerOre("plateChrome", ItemPlates.getPlateByName("chrome")); + OreUnifier.registerOre("plateCopper", ItemPlates.getPlateByName("copper")); + OreUnifier.registerOre("plateDiamond", ItemPlates.getPlateByName("diamond")); + OreUnifier.registerOre("plateElectrum", ItemPlates.getPlateByName("electrum")); + OreUnifier.registerOre("plateEmerald", ItemPlates.getPlateByName("emerald")); + OreUnifier.registerOre("plateGold", ItemPlates.getPlateByName("gold")); + OreUnifier.registerOre("plateInvar", ItemPlates.getPlateByName("invar")); + OreUnifier.registerOre("plateIridium", ItemPlates.getPlateByName("iridium")); + OreUnifier.registerOre("plateIron", ItemPlates.getPlateByName("iron")); + OreUnifier.registerOre("plateLapis", ItemPlates.getPlateByName("lapis")); + OreUnifier.registerOre("plateLead", ItemPlates.getPlateByName("lead")); + OreUnifier.registerOre("plateMagnalium", ItemPlates.getPlateByName("magnalium")); + OreUnifier.registerOre("plateNickel", ItemPlates.getPlateByName("nickel")); + OreUnifier.registerOre("plateObsidian", ItemPlates.getPlateByName("obsidian")); + OreUnifier.registerOre("plateOsmium", ItemPlates.getPlateByName("osmium")); + OreUnifier.registerOre("platePeridot", ItemPlates.getPlateByName("peridot")); + OreUnifier.registerOre("platePlatinum", ItemPlates.getPlateByName("platinum")); + OreUnifier.registerOre("plateRedGarnet", ItemPlates.getPlateByName("redGarnet")); + OreUnifier.registerOre("plateRedstone", ItemPlates.getPlateByName("redstone")); + OreUnifier.registerOre("plateRedstoneAlloy", ItemPlates.getPlateByName("redstone")); + OreUnifier.registerOre("plateRuby", ItemPlates.getPlateByName("ruby")); + OreUnifier.registerOre("plateSapphire", ItemPlates.getPlateByName("sapphire")); + OreUnifier.registerOre("plateSilicon", ItemPlates.getPlateByName("silicon")); + OreUnifier.registerOre("plateSilver", ItemPlates.getPlateByName("silver")); + OreUnifier.registerOre("plateSteel", ItemPlates.getPlateByName("steel")); + OreUnifier.registerOre("plateTeslatite", ItemPlates.getPlateByName("teslatite")); + OreUnifier.registerOre("plateTin", ItemPlates.getPlateByName("tin")); + OreUnifier.registerOre("plateTitanium", ItemPlates.getPlateByName("titanium")); + OreUnifier.registerOre("plateTungsten", ItemPlates.getPlateByName("tungsten")); + OreUnifier.registerOre("plateTungstensteel", ItemPlates.getPlateByName("tungstensteel")); + OreUnifier.registerOre("plateYellowGarnet", ItemPlates.getPlateByName("yellowGarnet")); + OreUnifier.registerOre("plateZinc", ItemPlates.getPlateByName("zinc")); // Crushed Ore - OreDictionary.registerOre("crushedAluminum", ItemCrushedOre.getCrushedOreByName("Aluminum")); - OreDictionary.registerOre("crushedAluminium", ItemCrushedOre.getCrushedOreByName("Aluminum")); - OreDictionary.registerOre("crushedArdite", ItemCrushedOre.getCrushedOreByName("Ardite")); - OreDictionary.registerOre("crushedBauxite", ItemCrushedOre.getCrushedOreByName("Bauxite")); - OreDictionary.registerOre("crushedCadmium", ItemCrushedOre.getCrushedOreByName("Cadmium")); - OreDictionary.registerOre("crushedCinnabar", ItemCrushedOre.getCrushedOreByName("Cinnabar")); - OreDictionary.registerOre("crushedCobalt", ItemCrushedOre.getCrushedOreByName("Cobalt")); - OreDictionary.registerOre("crushedDarkIron", ItemCrushedOre.getCrushedOreByName("DarkIron")); - OreDictionary.registerOre("crushedGalena", ItemCrushedOre.getCrushedOreByName("Galena")); - OreDictionary.registerOre("crushedIndium", ItemCrushedOre.getCrushedOreByName("Indium")); - OreDictionary.registerOre("crushedIridium", ItemCrushedOre.getCrushedOreByName("Iridium")); - OreDictionary.registerOre("crushedNickel", ItemCrushedOre.getCrushedOreByName("Nickel")); - OreDictionary.registerOre("crushedOsmium", ItemCrushedOre.getCrushedOreByName("Osmium")); - OreDictionary.registerOre("crushedPlatinum", ItemCrushedOre.getCrushedOreByName("Platinum")); - OreDictionary.registerOre("crushedPyrite", ItemCrushedOre.getCrushedOreByName("Pyrite")); - OreDictionary.registerOre("crushedSphalerite", ItemCrushedOre.getCrushedOreByName("Sphalerite")); - OreDictionary.registerOre("crushedTetrahedrite", ItemCrushedOre.getCrushedOreByName("Tetrahedrite")); - OreDictionary.registerOre("crushedTungsten", ItemCrushedOre.getCrushedOreByName("Tungsten")); + OreUnifier.registerOre("crushedAluminum", ItemCrushedOre.getCrushedOreByName("Aluminum")); + OreUnifier.registerOre("crushedAluminium", ItemCrushedOre.getCrushedOreByName("Aluminum")); + OreUnifier.registerOre("crushedArdite", ItemCrushedOre.getCrushedOreByName("Ardite")); + OreUnifier.registerOre("crushedBauxite", ItemCrushedOre.getCrushedOreByName("Bauxite")); + OreUnifier.registerOre("crushedCadmium", ItemCrushedOre.getCrushedOreByName("Cadmium")); + OreUnifier.registerOre("crushedCinnabar", ItemCrushedOre.getCrushedOreByName("Cinnabar")); + OreUnifier.registerOre("crushedCobalt", ItemCrushedOre.getCrushedOreByName("Cobalt")); + OreUnifier.registerOre("crushedDarkIron", ItemCrushedOre.getCrushedOreByName("DarkIron")); + OreUnifier.registerOre("crushedGalena", ItemCrushedOre.getCrushedOreByName("Galena")); + OreUnifier.registerOre("crushedIndium", ItemCrushedOre.getCrushedOreByName("Indium")); + OreUnifier.registerOre("crushedIridium", ItemCrushedOre.getCrushedOreByName("Iridium")); + OreUnifier.registerOre("crushedNickel", ItemCrushedOre.getCrushedOreByName("Nickel")); + OreUnifier.registerOre("crushedOsmium", ItemCrushedOre.getCrushedOreByName("Osmium")); + OreUnifier.registerOre("crushedPlatinum", ItemCrushedOre.getCrushedOreByName("Platinum")); + OreUnifier.registerOre("crushedPyrite", ItemCrushedOre.getCrushedOreByName("Pyrite")); + OreUnifier.registerOre("crushedSphalerite", ItemCrushedOre.getCrushedOreByName("Sphalerite")); + OreUnifier.registerOre("crushedTetrahedrite", ItemCrushedOre.getCrushedOreByName("Tetrahedrite")); + OreUnifier.registerOre("crushedTungsten", ItemCrushedOre.getCrushedOreByName("Tungsten")); // Purified Crushed Ore - OreDictionary.registerOre("crushedPurifiedAluminum", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Aluminum")); - OreDictionary.registerOre("crushedPurifiedAluminium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Aluminum")); - OreDictionary.registerOre("crushedPurifiedArdite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Ardite")); - OreDictionary.registerOre("crushedPurifiedBauxite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Bauxite")); - OreDictionary.registerOre("crushedPurifiedCadmium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cadmium")); - OreDictionary.registerOre("crushedPurifiedCinnabar", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cinnabar")); - OreDictionary.registerOre("crushedPurifiedCobalt", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cobalt")); - OreDictionary.registerOre("crushedPurifiedDarkIron", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("DarkIron")); - OreDictionary.registerOre("crushedPurifiedGalena", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Galena")); - OreDictionary.registerOre("crushedPurifiedIndium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Indium")); - OreDictionary.registerOre("crushedPurifiedIridium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Iridium")); - OreDictionary.registerOre("crushedPurifiedNickel", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Nickel")); - OreDictionary.registerOre("crushedPurifiedOsmium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Osmium")); - OreDictionary.registerOre("crushedPurifiedPlatinum", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Platinum")); - OreDictionary.registerOre("crushedPurifiedPyrite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Pyrite")); - OreDictionary.registerOre("crushedPurifiedSphalerite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Sphalerite")); - OreDictionary.registerOre("crushedPurifiedTetrahedrite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tetrahedrite")); - OreDictionary.registerOre("crushedPurifiedTungsten", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tungsten")); + OreUnifier.registerOre("crushedPurifiedAluminum", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Aluminum")); + OreUnifier.registerOre("crushedPurifiedAluminium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Aluminum")); + OreUnifier.registerOre("crushedPurifiedArdite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Ardite")); + OreUnifier.registerOre("crushedPurifiedBauxite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Bauxite")); + OreUnifier.registerOre("crushedPurifiedCadmium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cadmium")); + OreUnifier.registerOre("crushedPurifiedCinnabar", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cinnabar")); + OreUnifier.registerOre("crushedPurifiedCobalt", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cobalt")); + OreUnifier.registerOre("crushedPurifiedDarkIron", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("DarkIron")); + OreUnifier.registerOre("crushedPurifiedGalena", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Galena")); + OreUnifier.registerOre("crushedPurifiedIndium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Indium")); + OreUnifier.registerOre("crushedPurifiedIridium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Iridium")); + OreUnifier.registerOre("crushedPurifiedNickel", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Nickel")); + OreUnifier.registerOre("crushedPurifiedOsmium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Osmium")); + OreUnifier.registerOre("crushedPurifiedPlatinum", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Platinum")); + OreUnifier.registerOre("crushedPurifiedPyrite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Pyrite")); + OreUnifier.registerOre("crushedPurifiedSphalerite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Sphalerite")); + OreUnifier.registerOre("crushedPurifiedTetrahedrite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tetrahedrite")); + OreUnifier.registerOre("crushedPurifiedTungsten", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tungsten")); - OreDictionary.registerOre("craftingGrinder", ItemParts.getPartByName("diamondGrindingHead")); - OreDictionary.registerOre("craftingGrinder", ItemParts.getPartByName("tungstenGrindingHead")); - OreDictionary.registerOre("circuitMaster", ItemParts.getPartByName("energyFlowCircuit")); - OreDictionary.registerOre("circuitElite", ItemParts.getPartByName("dataControlCircuit")); - OreDictionary.registerOre("circuitData", ItemParts.getPartByName("dataStorageCircuit")); - OreDictionary.registerOre("craftingSuperconductor", ItemParts.getPartByName("superconductor")); - OreDictionary.registerOre("batteryUltimate", ItemParts.getPartByName("diamondGrindingHead")); - OreDictionary.registerOre("blockLapis", ItemParts.getPartByName("lazuriteChunk")); + OreUnifier.registerOre("craftingGrinder", ItemParts.getPartByName("diamondGrindingHead")); + OreUnifier.registerOre("craftingGrinder", ItemParts.getPartByName("tungstenGrindingHead")); + OreUnifier.registerOre("circuitMaster", ItemParts.getPartByName("energyFlowCircuit")); + OreUnifier.registerOre("circuitElite", ItemParts.getPartByName("dataControlCircuit")); + OreUnifier.registerOre("circuitData", ItemParts.getPartByName("dataStorageCircuit")); + OreUnifier.registerOre("craftingSuperconductor", ItemParts.getPartByName("superconductor")); + OreUnifier.registerOre("batteryUltimate", ItemParts.getPartByName("diamondGrindingHead")); + OreUnifier.registerOre("blockLapis", ItemParts.getPartByName("lazuriteChunk")); }