Implemented Lightning Rod, improved ore dictionary integration for dusts, nuggets and plates. Plates now registers automatically for every gem and ingot in TR. (#673)

This commit is contained in:
Dragon2488 2016-07-16 16:44:54 +07:00 committed by Modmuss50
parent ddb96d58ec
commit 33df1d3319
16 changed files with 288 additions and 368 deletions

View file

@ -307,8 +307,6 @@ public class ModItems
Core.logHelper.info("TechReborns Items Loaded");
registerOreDict();
BlockMachineBase.advancedMachineStack = BlockMachineFrame.getFrameByName("advancedMachine", 1);
BlockMachineBase.machineStack = BlockMachineFrame.getFrameByName("machine", 1);
}
@ -318,255 +316,4 @@ public class ModItems
GameRegistry.register(item);
}
public static void registerOreDict()
{
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
OreUnifier.registerOre("dustAlmandine", ItemDusts.getDustByName("almandine"));
OreUnifier.registerOre("dustAluminum", ItemDusts.getDustByName("aluminum"));
OreUnifier.registerOre("dustAluminium", ItemDusts.getDustByName("aluminum"));
OreUnifier.registerOre("dustAndesite", ItemDusts.getDustByName("andesite"));
OreUnifier.registerOre("dustAndradite", ItemDusts.getDustByName("andradite"));
OreUnifier.registerOre("dustAsh", ItemDusts.getDustByName("ashes"));
OreUnifier.registerOre("dustBasalt", ItemDusts.getDustByName("basalt"));
OreUnifier.registerOre("dustBauxite", ItemDusts.getDustByName("bauxite"));
OreUnifier.registerOre("dustBrass", ItemDusts.getDustByName("brass"));
OreUnifier.registerOre("dustBronze", ItemDusts.getDustByName("bronze"));
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("dustCopper", ItemDusts.getDustByName("copper"));
OreUnifier.registerOre("dustDarkAsh", ItemDusts.getDustByName("darkAshes"));
OreUnifier.registerOre("dustDiamond", ItemDusts.getDustByName("diamond"));
OreUnifier.registerOre("dustDiorite", ItemDusts.getDustByName("diorite"));
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("dustGranite", ItemDusts.getDustByName("granite"));
OreUnifier.registerOre("dustGrossular", ItemDusts.getDustByName("grossular"));
OreUnifier.registerOre("dustInvar", ItemDusts.getDustByName("invar"));
OreUnifier.registerOre("dustIron", ItemDusts.getDustByName("iron"));
OreUnifier.registerOre("dustLapis", ItemDusts.getDustByName("lazurite"));
OreUnifier.registerOre("dustLazurite", ItemDusts.getDustByName("lazurite"));
OreUnifier.registerOre("dustLead", ItemDusts.getDustByName("lead"));
OreUnifier.registerOre("dustMagnesium", ItemDusts.getDustByName("magnesium"));
OreUnifier.registerOre("dustManganese", ItemDusts.getDustByName("manganese"));
OreUnifier.registerOre("dustMarble", ItemDusts.getDustByName("marble"));
OreUnifier.registerOre("dustNetherrack", ItemDusts.getDustByName("netherrack"));
OreUnifier.registerOre("dustNickel", ItemDusts.getDustByName("nickel"));
OreUnifier.registerOre("dustObsidian", ItemDusts.getDustByName("obsidian"));
OreUnifier.registerOre("dustPeridot", ItemDusts.getDustByName("peridot"));
OreUnifier.registerOre("dustPhosphorous", ItemDusts.getDustByName("phosphorous"));
OreUnifier.registerOre("dustPlatinum", ItemDusts.getDustByName("platinum"));
OreUnifier.registerOre("dustPyrite", ItemDusts.getDustByName("pyrite"));
OreUnifier.registerOre("dustPyrope", ItemDusts.getDustByName("pyrope"));
OreUnifier.registerOre("dustRedGarnet", ItemDusts.getDustByName("redGarnet"));
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("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("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("dustYellowGarnet", ItemDusts.getDustByName("yellowGarnet"));
OreUnifier.registerOre("dustZinc", ItemDusts.getDustByName("zinc"));
OreUnifier.registerOre("dustOlivine", ItemDusts.getDustByName("olivine"));
OreUnifier.registerOre("dustWood", ItemDusts.getDustByName("sawDust"));
OreUnifier.registerOre("pulpWood", ItemDusts.getDustByName("sawDust"));
// Small Dusts
OreUnifier.registerOre("dustAlmandine", ItemDusts.getDustByName("almandine"));
OreUnifier.registerOre("dustAluminum", ItemDusts.getDustByName("aluminum"));
OreUnifier.registerOre("dustAluminium", ItemDusts.getDustByName("aluminum"));
OreUnifier.registerOre("dustAndesite", ItemDusts.getDustByName("andesite"));
OreUnifier.registerOre("dustAndradite", ItemDusts.getDustByName("andradite"));
OreUnifier.registerOre("dustAsh", ItemDusts.getDustByName("ashes"));
OreUnifier.registerOre("dustBasalt", ItemDusts.getDustByName("basalt"));
OreUnifier.registerOre("dustBauxite", ItemDusts.getDustByName("bauxite"));
OreUnifier.registerOre("dustBrass", ItemDusts.getDustByName("brass"));
OreUnifier.registerOre("dustBronze", ItemDusts.getDustByName("bronze"));
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("dustCopper", ItemDusts.getDustByName("copper"));
OreUnifier.registerOre("dustDarkAsh", ItemDusts.getDustByName("darkAshes"));
OreUnifier.registerOre("dustDiamond", ItemDusts.getDustByName("diamond"));
OreUnifier.registerOre("dustDiorite", ItemDusts.getDustByName("diorite"));
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("dustGranite", ItemDusts.getDustByName("granite"));
OreUnifier.registerOre("dustGrossular", ItemDusts.getDustByName("grossular"));
OreUnifier.registerOre("dustInvar", ItemDusts.getDustByName("invar"));
OreUnifier.registerOre("dustIron", ItemDusts.getDustByName("iron"));
OreUnifier.registerOre("dustLapis", ItemDusts.getDustByName("lazurite"));
OreUnifier.registerOre("dustLazurite", ItemDusts.getDustByName("lazurite"));
OreUnifier.registerOre("dustLead", ItemDusts.getDustByName("lead"));
OreUnifier.registerOre("dustMagnesium", ItemDusts.getDustByName("magnesium"));
OreUnifier.registerOre("dustManganese", ItemDusts.getDustByName("manganese"));
OreUnifier.registerOre("dustMarble", ItemDusts.getDustByName("marble"));
OreUnifier.registerOre("dustNetherrack", ItemDusts.getDustByName("netherrack"));
OreUnifier.registerOre("dustNickel", ItemDusts.getDustByName("nickel"));
OreUnifier.registerOre("dustObsidian", ItemDusts.getDustByName("obsidian"));
OreUnifier.registerOre("dustPeridot", ItemDusts.getDustByName("peridot"));
OreUnifier.registerOre("dustPhosphorous", ItemDusts.getDustByName("phosphorous"));
OreUnifier.registerOre("dustPlatinum", ItemDusts.getDustByName("platinum"));
OreUnifier.registerOre("dustPyrite", ItemDusts.getDustByName("pyrite"));
OreUnifier.registerOre("dustPyrope", ItemDusts.getDustByName("pyrope"));
OreUnifier.registerOre("dustRedGarnet", ItemDusts.getDustByName("redGarnet"));
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("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("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("dustYellowGarnet", ItemDusts.getDustByName("yellowGarnet"));
OreUnifier.registerOre("dustZinc", ItemDusts.getDustByName("zinc"));
OreUnifier.registerOre("dustOlivine", ItemDusts.getDustByName("olivine"));
OreUnifier.registerOre("pulpWood", ItemDusts.getDustByName("sawDust"));
// Ingots
OreUnifier.registerOre("ingotAluminum", ItemIngots.getIngotByName("aluminum"));
OreUnifier.registerOre("ingotAluminium", ItemIngots.getIngotByName("aluminum"));
OreUnifier.registerOre("ingotBrass", ItemIngots.getIngotByName("brass"));
OreUnifier.registerOre("ingotBronze", ItemIngots.getIngotByName("bronze"));
OreUnifier.registerOre("ingotChrome", ItemIngots.getIngotByName("chrome"));
OreUnifier.registerOre("ingotCopper", ItemIngots.getIngotByName("copper"));
OreUnifier.registerOre("ingotElectrum", ItemIngots.getIngotByName("electrum"));
OreUnifier.registerOre("ingotInvar", ItemIngots.getIngotByName("invar"));
OreUnifier.registerOre("ingotIridium", ItemIngots.getIngotByName("iridium"));
OreUnifier.registerOre("ingotLead", ItemIngots.getIngotByName("lead"));
OreUnifier.registerOre("ingotNickel", ItemIngots.getIngotByName("nickel"));
OreUnifier.registerOre("ingotPlatinum", ItemIngots.getIngotByName("platinum"));
OreUnifier.registerOre("ingotSilver", ItemIngots.getIngotByName("silver"));
OreUnifier.registerOre("ingotSteel", ItemIngots.getIngotByName("steel"));
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"));
OreUnifier.registerOre("ingotRefinedIron", ItemIngots.getIngotByName("refinedIron"));
OreUnifier.registerOre("ingotCopper", ItemIngots.getIngotByName("copper"));
// Nuggets
OreUnifier.registerOre("nuggetAluminum", ItemNuggets.getNuggetByName("aluminum"));
OreUnifier.registerOre("nuggetAluminium", ItemNuggets.getNuggetByName("aluminum"));
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("nuggetLead", ItemNuggets.getNuggetByName("lead"));
OreUnifier.registerOre("nuggetNickel", ItemNuggets.getNuggetByName("nickel"));
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("nuggetTungstensteel", ItemNuggets.getNuggetByName("tungstensteel"));
OreUnifier.registerOre("nuggetHotTungstenSteel", ItemNuggets.getNuggetByName("hotTungstensteel"));
OreUnifier.registerOre("nuggetZinc", ItemNuggets.getNuggetByName("zinc"));
OreUnifier.registerOre("nuggetRefinedIron", ItemNuggets.getNuggetByName("refinedIron"));
OreUnifier.registerOre("nuggetCopper", ItemNuggets.getNuggetByName("copper"));
OreUnifier.registerOre("nuggetIron", ItemNuggets.getNuggetByName("iron"));
// Plates
OreUnifier.registerOre("plateAluminum", ItemPlates.getPlateByName("aluminum"));
OreUnifier.registerOre("plateAluminium", ItemPlates.getPlateByName("aluminum"));
OreUnifier.registerOre("plateBrass", ItemPlates.getPlateByName("brass"));
OreUnifier.registerOre("plateBronze", ItemPlates.getPlateByName("bronze"));
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("platePeridot", ItemPlates.getPlateByName("peridot"));
OreUnifier.registerOre("platePlatinum", ItemPlates.getPlateByName("platinum"));
OreUnifier.registerOre("plateRedGarnet", ItemPlates.getPlateByName("redGarnet"));
OreUnifier.registerOre("plateRedstone", 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("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"));
OreUnifier.registerOre("blockLapis", ItemPlates.getPlateByName("lazurite"));
OreUnifier.registerOre("diamondTR", ItemDusts.getDustByName("Diamond"));
OreUnifier.registerOre("diamondTR", Items.DIAMOND);
OreUnifier.registerOre("craftingGrinder", ItemParts.getPartByName("diamondGrindingHead"));
OreUnifier.registerOre("craftingGrinder", ItemParts.getPartByName("tungstenGrindingHead"));
OreUnifier.registerOre("circuitElite", ItemParts.getPartByName("dataControlCircuit"));
OreUnifier.registerOre("circuitData", ItemParts.getPartByName("dataStorageCircuit"));
OreUnifier.registerOre("craftingSuperconductor", ItemParts.getPartByName("superconductor"));
OreUnifier.registerOre("batteryUltimate", ItemParts.getPartByName("diamondGrindingHead"));
//Buggy.
//OreUnifier.registerOre("containerWater", ItemCells.getCellByName("water"));
//OreUnifier.registerOre("containerWater", Items.WATER_BUCKET);
OreUnifier.registerOre("materialResin", ItemParts.getPartByName("rubberSap"));
OreUnifier.registerOre("materialRubber", ItemParts.getPartByName("rubber"));
OreUnifier.registerOre("circuitBasic", ItemParts.getPartByName("electronicCircuit"));
OreUnifier.registerOre("circuitAdvanced", ItemParts.getPartByName("advancedCircuit"));
}
}