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:
parent
ddb96d58ec
commit
33df1d3319
16 changed files with 288 additions and 368 deletions
|
@ -72,16 +72,7 @@ import techreborn.itemblocks.ItemBlockStorage;
|
|||
import techreborn.itemblocks.ItemBlockStorage2;
|
||||
import techreborn.tiles.*;
|
||||
import techreborn.tiles.fusionReactor.TileEntityFusionController;
|
||||
import techreborn.tiles.generator.TileDieselGenerator;
|
||||
import techreborn.tiles.generator.TileDragonEggSiphoner;
|
||||
import techreborn.tiles.generator.TileGasTurbine;
|
||||
import techreborn.tiles.generator.TileGenerator;
|
||||
import techreborn.tiles.generator.TileHeatGenerator;
|
||||
import techreborn.tiles.generator.TileSemifluidGenerator;
|
||||
import techreborn.tiles.generator.TileSolarPanel;
|
||||
import techreborn.tiles.generator.TileThermalGenerator;
|
||||
import techreborn.tiles.generator.TileWaterMill;
|
||||
import techreborn.tiles.generator.TileWindMill;
|
||||
import techreborn.tiles.generator.*;
|
||||
import techreborn.tiles.idsu.TileIDSU;
|
||||
import techreborn.tiles.lesu.TileLesu;
|
||||
import techreborn.tiles.lesu.TileLesuStorage;
|
||||
|
@ -334,6 +325,7 @@ public class ModBlocks
|
|||
|
||||
LightningRod = new BlockLightningRod(Material.ROCK);
|
||||
registerBlock(LightningRod, "lightningrod");
|
||||
GameRegistry.registerTileEntity(TileLightningRod.class, "TileLightningRodTR");
|
||||
|
||||
heatGenerator = new BlockHeatGenerator(Material.ROCK);
|
||||
registerBlock(heatGenerator, "heatgenerator");
|
||||
|
|
|
@ -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"));
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1,9 +1,12 @@
|
|||
package techreborn.init;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import ic2.core.block.BlockIC2Fence;
|
||||
import ic2.core.block.BlockTexGlass;
|
||||
import ic2.core.block.type.ResourceBlock;
|
||||
import ic2.core.block.wiring.CableType;
|
||||
import ic2.core.item.type.*;
|
||||
import ic2.core.item.type.CraftingItemType;
|
||||
import ic2.core.item.type.MiscResourceType;
|
||||
import ic2.core.item.type.NuclearResourceType;
|
||||
import ic2.core.ref.BlockName;
|
||||
import ic2.core.ref.ItemName;
|
||||
import ic2.core.ref.TeBlock;
|
||||
|
@ -12,65 +15,92 @@ import net.minecraft.init.Items;
|
|||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fml.common.Loader;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import techreborn.Core;
|
||||
import techreborn.blocks.BlockMachineFrame;
|
||||
import techreborn.items.ItemIngots;
|
||||
import techreborn.items.ItemParts;
|
||||
import techreborn.items.ItemPlates;
|
||||
import techreborn.items.*;
|
||||
import techreborn.parts.powerCables.ItemStandaloneCables;
|
||||
import techreborn.utils.OreDictUtils;
|
||||
|
||||
public class OreDict {
|
||||
|
||||
private static final ImmutableList<String> plateGenIgnores = ImmutableList.of(
|
||||
"hot", //Hot ingots
|
||||
"mixedMetal", //Mixed metal has own version of plate
|
||||
"iridiumAlloy", //Iridium alloy is plate itself
|
||||
ModItems.META_PLACEHOLDER //...
|
||||
);
|
||||
|
||||
public static void init() {
|
||||
if(Loader.isModLoaded("IC2")) {
|
||||
OreDictionary.registerOre("reBattery", ItemName.re_battery.getItemStack());
|
||||
Core.logHelper.info("IC2 installed, enabling integration");
|
||||
try {
|
||||
CraftingItemType.circuit.getName();
|
||||
|
||||
OreDictionary.registerOre("circuitBasic", ItemName.crafting.getItemStack(CraftingItemType.circuit));
|
||||
OreDictionary.registerOre("circuitAdvanced", ItemName.crafting.getItemStack(CraftingItemType.advanced_circuit));
|
||||
OreDictionary.registerOre("reBattery", ItemName.re_battery.getItemStack());
|
||||
|
||||
OreDictionary.registerOre("circuitBasic", ItemName.crafting.getItemStack(CraftingItemType.circuit));
|
||||
OreDictionary.registerOre("circuitAdvanced", ItemName.crafting.getItemStack(CraftingItemType.advanced_circuit));
|
||||
|
||||
|
||||
OreDictionary.registerOre("machineBlockBasic", BlockName.resource.getItemStack(ResourceBlock.machine));
|
||||
OreDictionary.registerOre("machineBlockAdvanced", BlockName.resource.getItemStack(ResourceBlock.advanced_machine));
|
||||
OreDictionary.registerOre("machineBlockBasic", BlockName.resource.getItemStack(ResourceBlock.machine));
|
||||
OreDictionary.registerOre("machineBlockAdvanced", BlockName.resource.getItemStack(ResourceBlock.advanced_machine));
|
||||
|
||||
OreDictionary.registerOre("lapotronCrystal", ItemName.lapotron_crystal.getItemStack());
|
||||
OreDictionary.registerOre("energyCrystal", ItemName.lapotron_crystal.getItemStack());
|
||||
OreDictionary.registerOre("lapotronCrystal", ItemName.lapotron_crystal.getItemStack());
|
||||
OreDictionary.registerOre("energyCrystal", ItemName.lapotron_crystal.getItemStack());
|
||||
|
||||
OreDictionary.registerOre("drillBasic", ItemName.drill.getItemStack());
|
||||
OreDictionary.registerOre("drillDiamond", ItemName.diamond_drill.getItemStack());
|
||||
OreDictionary.registerOre("drillAdvanced", ItemName.iridium_drill.getItemStack());
|
||||
OreDictionary.registerOre("drillBasic", ItemName.drill.getItemStack());
|
||||
OreDictionary.registerOre("drillDiamond", ItemName.diamond_drill.getItemStack());
|
||||
OreDictionary.registerOre("drillAdvanced", ItemName.iridium_drill.getItemStack());
|
||||
|
||||
ItemStack industrialTnt = BlockName.te.getItemStack(TeBlock.itnt);
|
||||
industrialTnt.setItemDamage(1);
|
||||
OreDictionary.registerOre("industrialTnt", industrialTnt);
|
||||
ItemStack industrialTnt = BlockName.te.getItemStack(TeBlock.itnt);
|
||||
industrialTnt.setItemDamage(1);
|
||||
OreDictionary.registerOre("industrialTnt", industrialTnt);
|
||||
|
||||
OreDictionary.registerOre("craftingIndustrialDiamond", ItemName.crafting.getItemStack(CraftingItemType.industrial_diamond));
|
||||
OreDictionary.registerOre("fertilizer", ItemName.crafting.getItemStack(CraftingItemType.bio_chaff));
|
||||
OreDictionary.registerOre("hvTransformer", BlockName.te.getItemStack(TeBlock.hv_transformer));
|
||||
OreDictionary.registerOre("craftingIndustrialDiamond", ItemName.crafting.getItemStack(CraftingItemType.industrial_diamond));
|
||||
OreDictionary.registerOre("fertilizer", ItemName.crafting.getItemStack(CraftingItemType.bio_chaff));
|
||||
OreDictionary.registerOre("hvTransformer", BlockName.te.getItemStack(TeBlock.hv_transformer));
|
||||
|
||||
//TODO:
|
||||
//TODO:
|
||||
|
||||
//OreDictionary.registerOre("insulatedGoldCableItem", BlockName.te.getItemStack(CableType.gold));
|
||||
//OreDictionary.registerOre("insulatedGoldCableItem", BlockName.te.getItemStack(CableType.gold));
|
||||
|
||||
//OreDictionary.registerOre("ic2Generator", ModBlocks.Generator);
|
||||
//OreDictionary.registerOre("ic2SolarPanel", ModBlocks.solarPanel);
|
||||
//OreDictionary.registerOre("ic2Macerator", ModBlocks.Grinder);
|
||||
//OreDictionary.registerOre("ic2Extractor", ModBlocks.Extractor);
|
||||
//OreDictionary.registerOre("ic2Windmill", ModBlocks.windMill);
|
||||
//OreDictionary.registerOre("ic2Watermill", ModBlocks.waterMill);
|
||||
//OreDictionary.registerOre("ic2Generator", ModBlocks.Generator);
|
||||
//OreDictionary.registerOre("ic2SolarPanel", ModBlocks.solarPanel);
|
||||
//OreDictionary.registerOre("ic2Macerator", ModBlocks.Grinder);
|
||||
//OreDictionary.registerOre("ic2Extractor", ModBlocks.Extractor);
|
||||
//OreDictionary.registerOre("ic2Windmill", ModBlocks.windMill);
|
||||
//OreDictionary.registerOre("ic2Watermill", ModBlocks.waterMill);
|
||||
|
||||
OreDictionary.registerOre("uran235", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_235));
|
||||
OreDictionary.registerOre("uran238", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_238));
|
||||
OreDictionary.registerOre("smallUran238", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_238));
|
||||
OreDictionary.registerOre("smallUran235", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_235));
|
||||
OreDictionary.registerOre("uran235", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_235));
|
||||
OreDictionary.registerOre("uran238", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_238));
|
||||
OreDictionary.registerOre("smallUran238", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_238));
|
||||
OreDictionary.registerOre("smallUran235", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_235));
|
||||
|
||||
OreDictionary.registerOre("rubberWood", BlockName.rubber_wood.getItemStack());
|
||||
OreDictionary.registerOre("glassReinforced", BlockName.glass.getItemStack(BlockTexGlass.GlassType.reinforced));
|
||||
OreDictionary.registerOre("oreIridium", ItemName.misc_resource.getItemStack(MiscResourceType.iridium_ore));
|
||||
OreDictionary.registerOre("fenceIron", BlockName.fence.getItemStack(BlockIC2Fence.IC2FenceType.iron));
|
||||
OreDictionary.registerOre("rubberWood", BlockName.rubber_wood.getItemStack());
|
||||
OreDictionary.registerOre("glassReinforced", BlockName.glass.getItemStack(BlockTexGlass.GlassType.reinforced));
|
||||
|
||||
OreDictionary.registerOre("oreIridium", ItemName.misc_resource.getItemStack(MiscResourceType.iridium_ore));
|
||||
} catch (NoClassDefFoundError notFound) {
|
||||
Core.logHelper.warn(
|
||||
"Can't enable integration: IC2 installed but cannot be hooked\n" +
|
||||
"Do you use incompatible IC2 version?\n" +
|
||||
"Please create issue on github and provide FULL LOG and mod list");
|
||||
} catch (Throwable error) {
|
||||
Core.logHelper.warn(
|
||||
"Exception thrown during IC2 integration init\n" +
|
||||
"Do you use incompatible IC2 version?\n" +
|
||||
"Please create issue on github and provide FULL LOG and mod list.\n" +
|
||||
"Error stack trace: ");
|
||||
error.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
OreDictionary.registerOre("reBattery", ModItems.reBattery);
|
||||
|
||||
OreDictionary.registerOre("circuitBasic", ItemParts.getPartByName("electronicCircuit"));
|
||||
OreDictionary.registerOre("circuitAdvanced", ItemParts.getPartByName("advancedCircuit"));
|
||||
OreDictionary.registerOre("circuitStorage", ItemParts.getPartByName("dataStorageCircuit"));
|
||||
OreDictionary.registerOre("circuitElite", ItemParts.getPartByName("dataControlCircuit"));
|
||||
OreDictionary.registerOre("circuitMaster", ItemParts.getPartByName("energyFlowCircuit"));
|
||||
|
||||
|
@ -96,26 +126,69 @@ public class OreDict {
|
|||
OreDictionary.registerOre("ic2Windmill", ModBlocks.windMill);
|
||||
OreDictionary.registerOre("ic2Watermill", ModBlocks.waterMill);
|
||||
|
||||
//OreDictionary.registerOre("uran235", );
|
||||
//OreDictionary.registerOre("uran238", );
|
||||
//OreDictionary.registerOre("smallUran235", );
|
||||
//OreDictionary.registerOre("uran235", nothing);
|
||||
//OreDictionary.registerOre("uran238", nothing);
|
||||
//OreDictionary.registerOre("smallUran235", nothing);
|
||||
|
||||
OreDictionary.registerOre("fenceIron", ModBlocks.ironFence);
|
||||
OreDictionary.registerOre("woodRubber", ModBlocks.rubberLog);
|
||||
OreDictionary.registerOre("glassReinforced", ModBlocks.reinforcedglass);
|
||||
|
||||
OreDictionary.registerOre("diamondTR", ItemDusts.getDustByName("Diamond"));
|
||||
OreDictionary.registerOre("diamondTR", Items.DIAMOND);
|
||||
|
||||
OreDictionary.registerOre("craftingGrinder", ItemParts.getPartByName("diamondGrindingHead"));
|
||||
OreDictionary.registerOre("craftingGrinder", ItemParts.getPartByName("tungstenGrindingHead"));
|
||||
OreDictionary.registerOre("craftingSuperconductor", ItemParts.getPartByName("superconductor"));
|
||||
OreDictionary.registerOre("batteryUltimate", ItemParts.getPartByName("diamondGrindingHead"));
|
||||
|
||||
OreDictionary.registerOre("materialResin", ItemParts.getPartByName("rubberSap"));
|
||||
OreDictionary.registerOre("materialRubber", ItemParts.getPartByName("rubber"));
|
||||
OreDictionary.registerOre("pulpWood", ItemDusts.getDustByName("sawDust"));
|
||||
|
||||
//Gems registration
|
||||
for(String type : ItemGems.types) {
|
||||
if(type.equals(ModItems.META_PLACEHOLDER)) continue; //Aware of placeholders!
|
||||
String upper = OreDictUtils.toFirstUpper(type);
|
||||
OreDictionary.registerOre("gem" + upper, ItemGems.getGemByName(type));
|
||||
boolean ignoreIt = false;
|
||||
for(String ignore : plateGenIgnores)
|
||||
if(type.startsWith(ignore)) ignoreIt = true;
|
||||
if(!ignoreIt) ItemPlates.registerType(upper);
|
||||
}
|
||||
|
||||
//Ingots registration
|
||||
for(String type : ItemIngots.types) {
|
||||
if(type.equals(ModItems.META_PLACEHOLDER)) continue; //Aware of placeholders!
|
||||
String upperName = OreDictUtils.toFirstUpper(type);
|
||||
OreDictionary.registerOre("ingot" + upperName, ItemIngots.getIngotByName(type));
|
||||
boolean ignoreIt = false;
|
||||
for(String ignore : plateGenIgnores)
|
||||
if(type.startsWith(ignore)) ignoreIt = true;
|
||||
if(!ignoreIt) ItemPlates.registerType(type);
|
||||
}
|
||||
|
||||
|
||||
//Dusts, nuggets and plates auto-registration
|
||||
|
||||
for(String type : ItemPlates.types) {
|
||||
String oreDictName = "plate" + Character.toUpperCase(type.charAt(0)) + type.substring(1);
|
||||
System.out.println(oreDictName);
|
||||
if(type.equals(ModItems.META_PLACEHOLDER)) continue; //Aware of placeholders!
|
||||
String oreDictName = "plate" + OreDictUtils.toFirstUpper(type);
|
||||
OreDictionary.registerOre(oreDictName, ItemPlates.getPlateByName(type));
|
||||
}
|
||||
|
||||
for(String type : ItemIngots.types) {
|
||||
String oreDictName = "ingot" + Character.toUpperCase(type.charAt(0)) + type.substring(1);
|
||||
System.out.println(oreDictName);
|
||||
OreDictionary.registerOre(oreDictName, ItemIngots.getIngotByName(type));
|
||||
|
||||
for(String type : ItemDusts.types) {
|
||||
if(type.equals(ModItems.META_PLACEHOLDER)) continue; //Aware of placeholders!
|
||||
String oreDictName = "dust" + OreDictUtils.toFirstUpper(type);
|
||||
OreDictionary.registerOre(oreDictName, ItemDusts.getDustByName(type));
|
||||
}
|
||||
|
||||
|
||||
|
||||
for(String type : ItemNuggets.types) {
|
||||
if(type.equals(ModItems.META_PLACEHOLDER)) continue; //Aware of placeholders!
|
||||
String oreDictName = "nugget" + OreDictUtils.toFirstUpper(type);
|
||||
OreDictionary.registerOre(oreDictName, ItemNuggets.getNuggetByName(type));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue