diff --git a/src/main/java/gregtechmod/GT_Mod.java b/src/main/java/gregtechmod/GT_Mod.java index 0d87565..7748877 100644 --- a/src/main/java/gregtechmod/GT_Mod.java +++ b/src/main/java/gregtechmod/GT_Mod.java @@ -32,6 +32,8 @@ import gregtechmod.common.items.GT_MetaMachine_Item; import gregtechmod.common.items.GT_MetaOre_Item; import gregtechmod.common.items.GT_MetaStone1_Item; import gregtechmod.common.render.GT_Block_Renderer; +import gregtechmod.loaders.load.GT_DictRegistratorPreItem; +import gregtechmod.loaders.load.GT_ItemLoader; import gregtechmod.loaders.misc.GT_CoverLoader; import gregtechmod.loaders.misc.GT_TooEasyModeLoader; import gregtechmod.loaders.preload.GT_InitHardCodedCapeList; @@ -477,12 +479,12 @@ public class GT_Mod implements IGT_Mod, IGT_RecipeAdder { GameRegistry.registerBlock(GregTech_API.sBlockList[3] = new GT_Block_LightSource (), ItemBlock.class , "GT_TransparentTileEntity" ); GameRegistry.registerBlock(GregTech_API.sBlockList[5] = new GT_BlockMetaID_Stone1 (), GT_MetaStone1_Item.class , GT_LanguageManager.mNameList4[0]); -// LanguageRegistry.addName(GregTech_API.sBlockList[0], GT_LanguageManager.mRegionalNameList0[0]); +// LanguageRegistry.addName(GregTech_API.sBlockList[0], GT_LanguageManager.mRegionalNameList0[0]); // FIXME localization // LanguageRegistry.addName(GregTech_API.sBlockList[1], GT_LanguageManager.mRegionalNameList1[0]); // LanguageRegistry.addName(GregTech_API.sBlockList[2], GT_LanguageManager.mRegionalNameList2[0]); // LanguageRegistry.addName(GregTech_API.sBlockList[4], GT_LanguageManager.mRegionalNameList3[0]); // LanguageRegistry.addName(GregTech_API.sBlockList[5], GT_LanguageManager.mRegionalNameList4[0]); -// + // for (int i=0;i<16;i++) { // GT_LanguageManager.addStringLocalization("tile.BlockMetaID_Block." + GT_LanguageManager.mNameList0[i] + ".name", GT_LanguageManager.mRegionalNameList0[i]); // GT_LanguageManager.addStringLocalization("tile.BlockMetaID_Machine." + GT_LanguageManager.mNameList1[i] + ".name", GT_LanguageManager.mRegionalNameList1[i]); @@ -512,8 +514,8 @@ public class GT_Mod implements IGT_Mod, IGT_RecipeAdder { // } // // new GT_MetaTileEntityLoader().run(); -// new GT_DictRegistratorPreItem().run(); -// new GT_ItemLoader().run(); + new GT_DictRegistratorPreItem().run(); + new GT_ItemLoader().run(); // new GT_DictRegistratorPostItem().run(); // new GT_CircuitBehaviorLoad().run(); // @@ -525,35 +527,35 @@ public class GT_Mod implements IGT_Mod, IGT_RecipeAdder { // } catch(Throwable e) { // e.printStackTrace(GT_Log.err); // } -// -// GregTech_API.sLoadFinished = true; -// GT_Log.out.println("GT_Mod: Load-Phase finished!"); -// for (Runnable tRunnable : GregTech_API.sAfterGTLoad) { -// try { -// tRunnable.run(); -// } catch(Throwable e) { -// e.printStackTrace(GT_Log.err); -// } -// } + + GregTech_API.sLoadFinished = true; + GT_Log.log.info("GT_Mod: Load-Phase finished!"); + for (Runnable tRunnable : GregTech_API.sAfterGTLoad) { + try { + tRunnable.run(); + } catch(Throwable e) { + GT_Log.log.catching(e); + } + } } @EventHandler public void postload(FMLPostInitializationEvent aEvent) { -// if (mDoNotInit) return; -// -// for (Runnable tRunnable : GregTech_API.sBeforeGTPostload) { -// try { -// tRunnable.run(); -// } catch(Throwable e) { -// e.printStackTrace(GT_Log.err); -// } -// } -// + if (mDoNotInit) return; + + for (Runnable tRunnable : GregTech_API.sBeforeGTPostload) { + try { + tRunnable.run(); + } catch(Throwable e) { + GT_Log.log.catching(e); + } + } + // checkVersions(); -// -// GT_Log.out.println("GT_Mod: Beginning PostLoad-Phase."); -// GregTech_API.sPostloadStarted = true; -// + + GT_Log.log.info("GT_Mod: Beginning PostLoad-Phase."); + GregTech_API.sPostloadStarted = true; + // GT_Log.out.println("GT_Mod: Checking if Items got overloaded."); // for (int i = 0; i < GregTech_API.sItemList.length; i++) { // if (GregTech_API.sItemList[i] != null && Item.itemsList[GregTech_API.sItemList[i].itemID] != GregTech_API.sItemList[i]) { @@ -767,25 +769,25 @@ public class GT_Mod implements IGT_Mod, IGT_RecipeAdder { // e.printStackTrace(GT_Log.err); // } // } -// -// for (Runnable tRunnable : GregTech_API.sAfterGTPostload) { -// try { -// tRunnable.run(); -// } catch(Throwable e) { -// e.printStackTrace(GT_Log.err); -// } -// } -// -// GT_Log.out.println("GT_Mod: Loading finished, deallocating temporary Init Variables."); -// sItemIDs = null; -// sBlockIDs = null; -// -// GregTech_API.sBeforeGTPreload = null; -// GregTech_API.sAfterGTPreload = null; -// GregTech_API.sBeforeGTLoad = null; -// GregTech_API.sAfterGTLoad = null; -// GregTech_API.sBeforeGTPostload = null; -// GregTech_API.sAfterGTPostload = null; + + for (Runnable tRunnable : GregTech_API.sAfterGTPostload) { + try { + tRunnable.run(); + } catch(Throwable e) { + GT_Log.log.catching(e); + } + } + + GT_Log.log.info("GT_Mod: Loading finished, deallocating temporary Init Variables."); + sItemIDs = null; + sBlockIDs = null; + + GregTech_API.sBeforeGTPreload = null; + GregTech_API.sAfterGTPreload = null; + GregTech_API.sBeforeGTLoad = null; + GregTech_API.sAfterGTLoad = null; + GregTech_API.sBeforeGTPostload = null; + GregTech_API.sAfterGTPostload = null; } /* @EventHandler diff --git a/src/main/java/gregtechmod/api/GregTech_API.java b/src/main/java/gregtechmod/api/GregTech_API.java index 65eaab8..a69c48e 100644 --- a/src/main/java/gregtechmod/api/GregTech_API.java +++ b/src/main/java/gregtechmod/api/GregTech_API.java @@ -314,14 +314,14 @@ public class GregTech_API { /** * Creates a new Coolant Cell Item for your Nuclear Reactor */ - public static Item constructCoolantCellItem(int aID, String aName, int aMaxStore, int aCellCount) { + public static Item constructCoolantCellItem(String aName, int aMaxStore, int aCellCount) { try { - return (Item)Class.forName("gregtechmod.api.items.GT_CoolantCellIC_Item").getConstructors()[0].newInstance(aID, aName, aMaxStore, aCellCount); + return (Item)Class.forName("gregtechmod.api.items.GT_CoolantCellIC_Item").getConstructors()[0].newInstance(aName, aMaxStore, aCellCount); } catch(Throwable e) {} try { - return (Item)Class.forName("gregtechmod.api.items.GT_CoolantCell_Item").getConstructors()[0].newInstance(aID, aName, aMaxStore, aCellCount); + return (Item)Class.forName("gregtechmod.api.items.GT_CoolantCell_Item").getConstructors()[0].newInstance(aName, aMaxStore, aCellCount); } catch(Throwable e) {} - return new gregtechmod.api.items.GT_Generic_Item(aID, aName, "Doesn't work as intended, this is a Bug", false); + return new gregtechmod.api.items.GT_Generic_Item(aName, "Doesn't work as intended, this is a Bug", false); } /** @@ -331,132 +331,132 @@ public class GregTech_API { * @param aPower power in EU per pulse (Uranium == 5) will be at least 1 in any case * @param aDepleted the Depletedcell-Item of this Cell (amount will get multiplied by Cellcount for Double-/Quadcells) */ - public static Item constructRadioactiveCellItem(int aID, String aName, int aMaxDelay, int aCellcount, int aPulseRate, ItemStack aDepleted) { + public static Item constructRadioactiveCellItem(String aName, int aMaxDelay, int aCellcount, int aPulseRate, ItemStack aDepleted) { try { - return (Item)Class.forName("gregtechmod.api.items.GT_RadioactiveCellIC_Item").getConstructors()[0].newInstance(aID, aName, aMaxDelay, aCellcount, aPulseRate, aDepleted); + return (Item)Class.forName("gregtechmod.api.items.GT_RadioactiveCellIC_Item").getConstructors()[0].newInstance(aName, aMaxDelay, aCellcount, aPulseRate, aDepleted); } catch(Throwable e) {} try { - return (Item)Class.forName("gregtechmod.api.items.GT_RadioactiveCell_Item").getConstructors()[0].newInstance(aID, aName, aMaxDelay, aCellcount, aPulseRate, aDepleted); + return (Item)Class.forName("gregtechmod.api.items.GT_RadioactiveCell_Item").getConstructors()[0].newInstance(aName, aMaxDelay, aCellcount, aPulseRate, aDepleted); } catch(Throwable e) {} - return new gregtechmod.api.items.GT_Generic_Item(aID, aName, "Doesn't work as intended, this is a Bug", false); + return new gregtechmod.api.items.GT_Generic_Item(aName, "Doesn't work as intended, this is a Bug", false); } /** * Creates a new Energy Armor Item */ - public static Item constructElectricArmorItem(int aID, String aName, int aCharge, int aTransfer, int aTier, int aDamageEnergyCost, int aSpecials, double aArmorAbsorbtionPercentage, boolean aChargeProvider, int aType, int aArmorIndex) { + public static Item constructElectricArmorItem(String aName, int aCharge, int aTransfer, int aTier, int aDamageEnergyCost, int aSpecials, double aArmorAbsorbtionPercentage, boolean aChargeProvider, int aType, int aArmorIndex) { try { - return (Item)Class.forName("gregtechmod.api.items.GT_EnergyArmorIC_Item").getConstructors()[0].newInstance(aID, aName, aCharge, aTransfer, aTier, aDamageEnergyCost, aSpecials, aArmorAbsorbtionPercentage, aChargeProvider, aType, aArmorIndex); + return (Item)Class.forName("gregtechmod.api.items.GT_EnergyArmorIC_Item").getConstructors()[0].newInstance(aName, aCharge, aTransfer, aTier, aDamageEnergyCost, aSpecials, aArmorAbsorbtionPercentage, aChargeProvider, aType, aArmorIndex); } catch(Throwable e) {} try { - return (Item)Class.forName("gregtechmod.api.items.GT_EnergyArmor_Item").getConstructors()[0].newInstance(aID, aName, aCharge, aTransfer, aTier, aDamageEnergyCost, aSpecials, aArmorAbsorbtionPercentage, aChargeProvider, aType, aArmorIndex); + return (Item)Class.forName("gregtechmod.api.items.GT_EnergyArmor_Item").getConstructors()[0].newInstance(aName, aCharge, aTransfer, aTier, aDamageEnergyCost, aSpecials, aArmorAbsorbtionPercentage, aChargeProvider, aType, aArmorIndex); } catch(Throwable e) {} - return new gregtechmod.api.items.GT_Generic_Item(aID, aName, "Doesn't work as intended, this is a Bug", false); + return new gregtechmod.api.items.GT_Generic_Item(aName, "Doesn't work as intended, this is a Bug", false); } /** * Creates a new Energy Battery Item */ - public static Item constructElectricEnergyStorageItem(int aID, String aName, int aCharge, int aTransfer, int aTier, int aEmptyID, int aFullID) { + public static Item constructElectricEnergyStorageItem(String aName, int aCharge, int aTransfer, int aTier, int aEmptyID, int aFullID) { try { - return (Item)Class.forName("gregtechmod.api.items.GT_EnergyStoreIC_Item").getConstructors()[0].newInstance(aID, aName, aCharge, aTransfer, aTier, aEmptyID, aFullID); + return (Item)Class.forName("gregtechmod.api.items.GT_EnergyStoreIC_Item").getConstructors()[0].newInstance(aName, aCharge, aTransfer, aTier, aEmptyID, aFullID); } catch(Throwable e) {} try { - return (Item)Class.forName("gregtechmod.api.items.GT_EnergyStore_Item").getConstructors()[0].newInstance(aID, aName, aCharge, aTransfer, aTier, aEmptyID, aFullID); + return (Item)Class.forName("gregtechmod.api.items.GT_EnergyStore_Item").getConstructors()[0].newInstance(aName, aCharge, aTransfer, aTier, aEmptyID, aFullID); } catch(Throwable e) {} - return new gregtechmod.api.items.GT_Generic_Item(aID, aName, "Doesn't work as intended, this is a Bug", false); + return new gregtechmod.api.items.GT_Generic_Item(aName, "Doesn't work as intended, this is a Bug", false); } /** * Creates a new Hard Hammer Item */ - public static GT_Tool_Item constructHardHammerItem(int aID, String aName, int aMaxDamage, int aEntityDamage) { + public static GT_Tool_Item constructHardHammerItem(String aName, int aMaxDamage, int aEntityDamage) { try { - return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_HardHammerMFR_Item").getConstructors()[0].newInstance(aID, aName, aMaxDamage, aEntityDamage); + return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_HardHammerMFR_Item").getConstructors()[0].newInstance(aName, aMaxDamage, aEntityDamage); } catch(Throwable e) {} try { - return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_HardHammer_Item").getConstructors()[0].newInstance(aID, aName, aMaxDamage, aEntityDamage); + return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_HardHammer_Item").getConstructors()[0].newInstance(aName, aMaxDamage, aEntityDamage); } catch(Throwable e) {} - return new gregtechmod.api.items.GT_Tool_Item(aID, aName, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage); + return new gregtechmod.api.items.GT_Tool_Item(aName, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage); } /** * Creates a new Crowbar Item */ - public static GT_Tool_Item constructCrowbarItem(int aID, String aName, int aMaxDamage, int aEntityDamage) { + public static GT_Tool_Item constructCrowbarItem(String aName, int aMaxDamage, int aEntityDamage) { try { - return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_CrowbarRC_Item").getConstructors()[0].newInstance(aID, aName, aMaxDamage, aEntityDamage); + return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_CrowbarRC_Item").getConstructors()[0].newInstance(aName, aMaxDamage, aEntityDamage); } catch(Throwable e) {} try { - return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_Crowbar_Item").getConstructors()[0].newInstance(aID, aName, aMaxDamage, aEntityDamage); + return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_Crowbar_Item").getConstructors()[0].newInstance(aName, aMaxDamage, aEntityDamage); } catch(Throwable e) {} - return new gregtechmod.api.items.GT_Tool_Item(aID, aName, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage); + return new gregtechmod.api.items.GT_Tool_Item(aName, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage); } /** * Creates a new Wrench Item */ - public static GT_Tool_Item constructWrenchItem(int aID, String aName, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { + public static GT_Tool_Item constructWrenchItem(String aName, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { try { - return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_WrenchBC_Item").getConstructors()[0].newInstance(aID, aName, aMaxDamage, aEntityDamage, aDisChargedGTID); + return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_WrenchBC_Item").getConstructors()[0].newInstance(aName, aMaxDamage, aEntityDamage, aDisChargedGTID); } catch(Throwable e) {} try { - return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_Wrench_Item").getConstructors()[0].newInstance(aID, aName, aMaxDamage, aEntityDamage, aDisChargedGTID); + return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_Wrench_Item").getConstructors()[0].newInstance(aName, aMaxDamage, aEntityDamage, aDisChargedGTID); } catch(Throwable e) {} - return new gregtechmod.api.items.GT_Tool_Item(aID, aName, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage); + return new gregtechmod.api.items.GT_Tool_Item(aName, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage); } /** * Creates a new electric Wrench Item */ - public static GT_Tool_Item constructElectricWrenchItem(int aID, String aName, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { + public static GT_Tool_Item constructElectricWrenchItem(String aName, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { try { - return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_WrenchICBC_Item").getConstructors()[0].newInstance(aID, aName, aMaxDamage, aEntityDamage, aDisChargedGTID); + return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_WrenchICBC_Item").getConstructors()[0].newInstance(aName, aMaxDamage, aEntityDamage, aDisChargedGTID); } catch(Throwable e) {} try { - return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_WrenchIC_Item").getConstructors()[0].newInstance(aID, aName, aMaxDamage, aEntityDamage, aDisChargedGTID); + return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_WrenchIC_Item").getConstructors()[0].newInstance(aName, aMaxDamage, aEntityDamage, aDisChargedGTID); } catch(Throwable e) {} - return new gregtechmod.api.items.GT_Tool_Item(aID, aName, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage); + return new gregtechmod.api.items.GT_Tool_Item(aName, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage); } /** * Creates a new electric Saw Item */ - public static GT_Tool_Item constructElectricSawItem(int aID, String aName, int aMaxDamage, int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) { + public static GT_Tool_Item constructElectricSawItem(String aName, int aMaxDamage, int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) { try { - return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_SawIC_Item").getConstructors()[0].newInstance(aID, aName, aMaxDamage, aEntityDamage, aToolQuality, aToolStrength, aEnergyConsumptionPerBlockBreak, aDisChargedGTID); + return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_SawIC_Item").getConstructors()[0].newInstance(aName, aMaxDamage, aEntityDamage, aToolQuality, aToolStrength, aEnergyConsumptionPerBlockBreak, aDisChargedGTID); } catch(Throwable e) {} - return new gregtechmod.api.items.GT_Tool_Item(aID, aName, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage); + return new gregtechmod.api.items.GT_Tool_Item(aName, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage); } /** * Creates a new electric Drill Item */ - public static GT_Tool_Item constructElectricDrillItem(int aID, String aName, int aMaxDamage, int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) { + public static GT_Tool_Item constructElectricDrillItem(String aName, int aMaxDamage, int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) { try { - return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_DrillIC_Item").getConstructors()[0].newInstance(aID, aName, aMaxDamage, aEntityDamage, aToolQuality, aToolStrength, aEnergyConsumptionPerBlockBreak, aDisChargedGTID); + return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_DrillIC_Item").getConstructors()[0].newInstance(aName, aMaxDamage, aEntityDamage, aToolQuality, aToolStrength, aEnergyConsumptionPerBlockBreak, aDisChargedGTID); } catch(Throwable e) {} - return new gregtechmod.api.items.GT_Tool_Item(aID, aName, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage); + return new gregtechmod.api.items.GT_Tool_Item(aName, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage); } /** * Creates a new electric Soldering Tool */ - public static GT_Tool_Item constructElectricSolderingToolItem(int aID, String aName, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { + public static GT_Tool_Item constructElectricSolderingToolItem(String aName, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { try { - return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_SolderingToolIC_Item").getConstructors()[0].newInstance(aID, aName, aMaxDamage, aEntityDamage, aDisChargedGTID); + return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_SolderingToolIC_Item").getConstructors()[0].newInstance(aName, aMaxDamage, aEntityDamage, aDisChargedGTID); } catch(Throwable e) {} - return new gregtechmod.api.items.GT_Tool_Item(aID, aName, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage); + return new gregtechmod.api.items.GT_Tool_Item(aName, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage); } /** * Creates a new empty electric Tool */ - public static GT_Tool_Item constructEmptyElectricToolItem(int aID, String aName, int aMaxDamage, int aChargedGTID) { + public static GT_Tool_Item constructEmptyElectricToolItem(String aName, int aMaxDamage, int aChargedGTID) { try { - return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_EmptyToolIC_Item").getConstructors()[0].newInstance(aID, aName, aMaxDamage, aChargedGTID); + return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_EmptyToolIC_Item").getConstructors()[0].newInstance(aName, aMaxDamage, aChargedGTID); } catch(Throwable e) {} - return new gregtechmod.api.items.GT_Tool_Item(aID, aName, "Doesn't work as intended, this is a Bug", aMaxDamage, 0); + return new gregtechmod.api.items.GT_Tool_Item(aName, "Doesn't work as intended, this is a Bug", aMaxDamage, 0); } private static Class sBaseMetaTileEntityClass = null; diff --git a/src/main/java/gregtechmod/api/interfaces/IBCTileEntity.java b/src/main/java/gregtechmod/api/interfaces/IBCTileEntity.java deleted file mode 100644 index e398450..0000000 --- a/src/main/java/gregtechmod/api/interfaces/IBCTileEntity.java +++ /dev/null @@ -1,10 +0,0 @@ -package gregtechmod.api.interfaces; - -import buildcraft.api.power.IPowerReceptor; - -/** - * A simple compound Interface for generic BuildCraft Code. - */ -public interface IBCTileEntity extends IPowerReceptor { - -} \ No newline at end of file diff --git a/src/main/java/gregtechmod/api/interfaces/IUETileEntity.java b/src/main/java/gregtechmod/api/interfaces/IUETileEntity.java deleted file mode 100644 index 6b949f2..0000000 --- a/src/main/java/gregtechmod/api/interfaces/IUETileEntity.java +++ /dev/null @@ -1,8 +0,0 @@ -package gregtechmod.api.interfaces; - -import universalelectricity.core.block.IElectrical; -import universalelectricity.core.block.IElectricalStorage; - -public interface IUETileEntity extends IElectricalStorage, IElectrical { - -} \ No newline at end of file diff --git a/src/main/java/gregtechmod/api/items/GT_Generic_Item.java b/src/main/java/gregtechmod/api/items/GT_Generic_Item.java index c5a6a15..eceefc9 100644 --- a/src/main/java/gregtechmod/api/items/GT_Generic_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_Generic_Item.java @@ -1,17 +1,18 @@ package gregtechmod.api.items; import gregtechmod.api.GregTech_API; +import gregtechmod.api.util.GT_Config; import gregtechmod.api.util.GT_LanguageManager; import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_OreDictUnificator; import java.util.List; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -20,16 +21,16 @@ import cpw.mods.fml.relauncher.SideOnly; */ public class GT_Generic_Item extends Item { - public Icon mIcon; + public IIcon mIcon; private final String mTooltip; - public GT_Generic_Item(int aID, String aName, String aTooltip) { - this(aID, aName, aTooltip, true); + public GT_Generic_Item(String aName, String aTooltip) { + this(aName, aTooltip, true); } - public GT_Generic_Item(int aID, String aName, String aTooltip, boolean aTranslateToolTip) { - super(aID); + public GT_Generic_Item(String aName, String aTooltip, boolean aTranslateToolTip) { + super(); setUnlocalizedName(aName); setCreativeTab(GregTech_API.TAB_GREGTECH); mTooltip = aTooltip == null || aTooltip.equals("") ? "" : aTranslateToolTip ? GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_main", aTooltip) : aTooltip; @@ -42,12 +43,12 @@ public class GT_Generic_Item extends Item { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister aIconRegister) { - mIcon = aIconRegister.registerIcon(GregTech_API.TEXTURE_PATH_ITEM + (GregTech_API.sConfiguration.system?"troll":getUnlocalizedName())); + public void registerIcons(IIconRegister aIconRegister) { + mIcon = aIconRegister.registerIcon(GregTech_API.TEXTURE_PATH_ITEM + (GT_Config.system ? "troll" : getUnlocalizedName())); } @Override - public Icon getIconFromDamage(int par1) { + public IIcon getIconFromDamage(int par1) { return mIcon; } @@ -55,6 +56,7 @@ public class GT_Generic_Item extends Item { return 0; } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public final void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { if (getMaxDamage() > 0 && !getHasSubtypes()) aList.add((aStack.getMaxDamage() - aStack.getItemDamage()) + " / " + aStack.getMaxDamage()); @@ -63,6 +65,7 @@ public class GT_Generic_Item extends Item { addAdditionalToolTips(aList, aStack); } + @SuppressWarnings("rawtypes") public void addAdditionalToolTips(List aList, ItemStack aStack) { } diff --git a/src/main/java/gregtechmod/api/items/GT_Tool_Item.java b/src/main/java/gregtechmod/api/items/GT_Tool_Item.java index faa52e5..e87a118 100644 --- a/src/main/java/gregtechmod/api/items/GT_Tool_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_Tool_Item.java @@ -46,16 +46,16 @@ public class GT_Tool_Item extends GT_Generic_Item { private String mToolClass1, mToolClass2, mToolClass3, mCraftingSound, mBreakingSound, mBlockBreakSound, mEntityHitSound; private float mCraftingSoundStrength = 1, mBreakingSoundStrength = 1, mBlockBreakSoundStrength = 1, mEntityHitSoundStrength = 1; - public GT_Tool_Item(int aID, String aName, String aTooltip, int aMaxDamage, int aEntityDamage) { - this(aID, aName, aTooltip, aMaxDamage, aEntityDamage, -1, -1); + public GT_Tool_Item(String aName, String aTooltip, int aMaxDamage, int aEntityDamage) { + this(aName, aTooltip, aMaxDamage, aEntityDamage, -1, -1); } - public GT_Tool_Item(int aID, String aName, String aTooltip, int aMaxDamage, int aEntityDamage, int aChargedGTID, int aDisChargedGTID) { - this(aID, aName, aTooltip, aMaxDamage, aEntityDamage, aChargedGTID, aDisChargedGTID, 0, 0.0F); + public GT_Tool_Item(String aName, String aTooltip, int aMaxDamage, int aEntityDamage, int aChargedGTID, int aDisChargedGTID) { + this(aName, aTooltip, aMaxDamage, aEntityDamage, aChargedGTID, aDisChargedGTID, 0, 0.0F); } - public GT_Tool_Item(int aID, String aName, String aTooltip, int aMaxDamage, int aEntityDamage, int aChargedGTID, int aDisChargedGTID, int aToolQuality, float aToolStrength) { - super(aID, aName, aTooltip, aTooltip != null && !aTooltip.equals("Doesn't work as intended, this is a Bug")); + public GT_Tool_Item(String aName, String aTooltip, int aMaxDamage, int aEntityDamage, int aChargedGTID, int aDisChargedGTID, int aToolQuality, float aToolStrength) { + super(aName, aTooltip, aTooltip != null && !aTooltip.equals("Doesn't work as intended, this is a Bug")); mEntityDamage = aEntityDamage; mDisChargedGTID = aDisChargedGTID; mChargedGTID = aChargedGTID; diff --git a/src/main/java/gregtechmod/api/util/GT_CreativeTab.java b/src/main/java/gregtechmod/api/util/GT_CreativeTab.java index 3904311..31f39d9 100644 --- a/src/main/java/gregtechmod/api/util/GT_CreativeTab.java +++ b/src/main/java/gregtechmod/api/util/GT_CreativeTab.java @@ -8,18 +8,18 @@ import net.minecraft.item.ItemStack; import cpw.mods.fml.common.registry.LanguageRegistry; public class GT_CreativeTab extends CreativeTabs { - + public static ItemStack icon; + @SuppressWarnings("deprecation") public GT_CreativeTab() { super("GregTech"); - LanguageRegistry.instance().addStringLocalization("itemGroup.GregTech", "GregTech Intergalactical"); + LanguageRegistry.instance().addStringLocalization("itemGroup.GregTech", "GregTech Intergalactical"); // FIXME: LANG } @Override public ItemStack getIconItemStack() { - ItemStack rStack = GregTech_API.getGregTechItem(55, 1, 0); - if (rStack == null) rStack = new ItemStack(Blocks.iron_block, 1); - return rStack; + + return icon != null ? icon = GregTech_API.getGregTechItem(55, 1, 0) : new ItemStack(Blocks.iron_block, 1); } @Override diff --git a/src/main/java/gregtechmod/api/util/GT_ItsNotMyFaultException.java b/src/main/java/gregtechmod/api/util/GT_ItsNotMyFaultException.java index 4b80627..18ba387 100644 --- a/src/main/java/gregtechmod/api/util/GT_ItsNotMyFaultException.java +++ b/src/main/java/gregtechmod/api/util/GT_ItsNotMyFaultException.java @@ -2,6 +2,10 @@ package gregtechmod.api.util; public class GT_ItsNotMyFaultException extends RuntimeException { + /** + * + */ + private static final long serialVersionUID = -8752778866486460495L; private String mError; public GT_ItsNotMyFaultException(String aError) { diff --git a/src/main/java/gregtechmod/api/util/GT_OreDictUnificator.java b/src/main/java/gregtechmod/api/util/GT_OreDictUnificator.java index 1cefd52..5cf1dde 100644 --- a/src/main/java/gregtechmod/api/util/GT_OreDictUnificator.java +++ b/src/main/java/gregtechmod/api/util/GT_OreDictUnificator.java @@ -26,7 +26,7 @@ public class GT_OreDictUnificator { private static final HashMap sName2OreMap = new HashMap(); private static final HashMap sItemhash2NameMap = new HashMap(); - private static final HashMap sItemhash2MaterialMap = new HashMap(); +// private static final HashMap sItemhash2MaterialMap = new HashMap(); private static final ArrayList sBlackList = new ArrayList(); private static int isRegisteringOre = 0; @@ -102,7 +102,7 @@ public class GT_OreDictUnificator { public static ItemStack get(String aOreDictName, ItemStack aReplacement, int aAmount, boolean aMentionPossibleTypos, boolean aNoInvalidAmounts) { if (aNoInvalidAmounts && aAmount < 1) return null; - if (!sName2OreMap.containsKey(aOreDictName) && aMentionPossibleTypos) GT_Log.err.println("Unknown Key for Unification, Typo? " + aOreDictName); + if (!sName2OreMap.containsKey(aOreDictName) && aMentionPossibleTypos) GT_Log.log.error("Unknown Key for Unification, Typo? " + aOreDictName); return GT_Utility.copy(aAmount, sName2OreMap.get(aOreDictName), aReplacement); } @@ -113,7 +113,7 @@ public class GT_OreDictUnificator { public static ItemStack setStack(boolean aUseBlackList, ItemStack aOreStack) { if (aOreStack == null) return null; ItemStack tStack = get(true, aOreStack); - aOreStack.itemID = tStack.itemID; + aOreStack.func_150996_a(tStack.getItem()); aOreStack.setItemDamage(tStack.getItemDamage()); return aOreStack; } diff --git a/src/main/java/gregtechmod/common/items/GT_Destructopack_Item.java b/src/main/java/gregtechmod/common/items/GT_Destructopack_Item.java index 7c31f26..d7fcf45 100644 --- a/src/main/java/gregtechmod/common/items/GT_Destructopack_Item.java +++ b/src/main/java/gregtechmod/common/items/GT_Destructopack_Item.java @@ -8,8 +8,8 @@ import net.minecraft.world.World; public class GT_Destructopack_Item extends GT_Generic_Item { - public GT_Destructopack_Item(int aID, String aName) { - super(aID, aName, "Mobile Trash Bin"); + public GT_Destructopack_Item(String aName) { + super(aName, "Mobile Trash Bin"); setMaxStackSize(1); setNoRepair(); } diff --git a/src/main/java/gregtechmod/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtechmod/common/items/GT_FluidDisplayItem.java index 016c1f2..d7a9cba 100644 --- a/src/main/java/gregtechmod/common/items/GT_FluidDisplayItem.java +++ b/src/main/java/gregtechmod/common/items/GT_FluidDisplayItem.java @@ -6,28 +6,29 @@ import gregtechmod.api.util.GT_Utility; import java.util.List; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class GT_FluidDisplayItem extends GT_Generic_Item { - public GT_FluidDisplayItem(int aID, String aName) { - super(aID, aName, null); + public GT_FluidDisplayItem(String aName) { + super(aName, null); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister aIconRegister) { + public void registerIcons(IIconRegister aIconRegister) { } @Override - public Icon getIconFromDamage(int aMeta) { + public IIcon getIconFromDamage(int aMeta) { Fluid tFluid = FluidRegistry.getFluid(aMeta); if (tFluid != null) { return tFluid.getStillIcon(); @@ -56,10 +57,8 @@ public class GT_FluidDisplayItem extends GT_Generic_Item { return getUnlocalizedName(aStack); } - @Override - public String getItemDisplayName(ItemStack aStack) { - return getUnlocalizedName(aStack); - } - - @Override @SideOnly(Side.CLIENT) public void getSubItems(int var1, CreativeTabs aTab, List aList) {} + @SuppressWarnings("rawtypes") + @SideOnly(Side.CLIENT) + @Override + public void getSubItems(Item var1, CreativeTabs aTab, List aList) {} } \ No newline at end of file diff --git a/src/main/java/gregtechmod/common/items/GT_MetaItem_Abstract.java b/src/main/java/gregtechmod/common/items/GT_MetaItem_Abstract.java index 487c77c..68933d9 100644 --- a/src/main/java/gregtechmod/common/items/GT_MetaItem_Abstract.java +++ b/src/main/java/gregtechmod/common/items/GT_MetaItem_Abstract.java @@ -1,18 +1,19 @@ package gregtechmod.common.items; import gregtechmod.api.GregTech_API; +import gregtechmod.api.util.GT_Config; import gregtechmod.api.util.GT_OreDictUnificator; import gregtechmod.api.util.GT_Utility; import java.util.Arrays; import java.util.List; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -22,10 +23,10 @@ public class GT_MetaItem_Abstract extends Item { public String[] mToolTipList = new String[MAXIMUM_META_IDS]; public ItemStack[] mStackList = new ItemStack[MAXIMUM_META_IDS]; public boolean[] mGlowList = new boolean[MAXIMUM_META_IDS]; - public Icon[] mIconList = new Icon[MAXIMUM_META_IDS]; + public IIcon[] mIconList = new IIcon[MAXIMUM_META_IDS]; - public GT_MetaItem_Abstract(int aID, String aName) { - super(aID); + public GT_MetaItem_Abstract(String aName) { + super(); setCreativeTab(GregTech_API.TAB_GREGTECH); setMaxDamage(0); setHasSubtypes(true); @@ -36,14 +37,14 @@ public class GT_MetaItem_Abstract extends Item { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister par1IconRegister) { + public void registerIcons(IIconRegister par1IconRegister) { for (int i = 0; i < MAXIMUM_META_IDS; i++) if (mStackList[i] != null) { - mIconList[i] = par1IconRegister.registerIcon(GregTech_API.TEXTURE_PATH_ITEM + (GregTech_API.sConfiguration.system?"troll":getUnlocalizedName() + "/" + i)); + mIconList[i] = par1IconRegister.registerIcon(GregTech_API.TEXTURE_PATH_ITEM + (GT_Config.system ? "troll" : getUnlocalizedName() + "/" + i)); } } @Override - public Icon getIconFromDamage(int aIndex) { + public IIcon getIconFromDamage(int aIndex) { return mIconList[aIndex]; } @@ -52,6 +53,7 @@ public class GT_MetaItem_Abstract extends Item { return aIndex; } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { if (aStack.getItemDamage() >= 0 && aStack.getItemDamage() < MAXIMUM_META_IDS && !mToolTipList[aStack.getItemDamage()].equals("")) aList.add(mToolTipList[aStack.getItemDamage()]); @@ -62,9 +64,10 @@ public class GT_MetaItem_Abstract extends Item { return getUnlocalizedName() + "." + aStack.getItemDamage(); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override @SideOnly(Side.CLIENT) - public void getSubItems(int var1, CreativeTabs var2, List var3) { + public void getSubItems(Item var1, CreativeTabs var2, List var3) { for (int i = 0; i < MAXIMUM_META_IDS; i++) if (mStackList[i] != null) { var3.add(getUnunifiedStack(i, 1)); } @@ -72,7 +75,7 @@ public class GT_MetaItem_Abstract extends Item { @Override public boolean hasEffect(ItemStack aStack) { - return (aStack.getItemDamage() >= 0 && aStack.getItemDamage() < MAXIMUM_META_IDS && mGlowList[aStack.getItemDamage()]) || super.hasEffect(aStack); + return (aStack.getItemDamage() >= 0 && aStack.getItemDamage() < MAXIMUM_META_IDS && mGlowList[aStack.getItemDamage()]) || aStack.isItemEnchanted(); } public static ItemStack[] getStackList() { diff --git a/src/main/java/gregtechmod/common/items/GT_MetaItem_Cell.java b/src/main/java/gregtechmod/common/items/GT_MetaItem_Cell.java index 087eab7..28d2521 100644 --- a/src/main/java/gregtechmod/common/items/GT_MetaItem_Cell.java +++ b/src/main/java/gregtechmod/common/items/GT_MetaItem_Cell.java @@ -13,8 +13,8 @@ public class GT_MetaItem_Cell extends GT_MetaItem_Abstract implements ICapsuleCe public static GT_MetaItem_Abstract instance; - public GT_MetaItem_Cell(int aID, String aName) { - super(aID, aName); + public GT_MetaItem_Cell(String aName) { + super(aName); instance = this; } diff --git a/src/main/java/gregtechmod/common/items/GT_MetaItem_Component.java b/src/main/java/gregtechmod/common/items/GT_MetaItem_Component.java index 950b7b4..98e5c90 100644 --- a/src/main/java/gregtechmod/common/items/GT_MetaItem_Component.java +++ b/src/main/java/gregtechmod/common/items/GT_MetaItem_Component.java @@ -8,8 +8,8 @@ public class GT_MetaItem_Component extends GT_MetaItem_Abstract { public static GT_MetaItem_Abstract instance; - public GT_MetaItem_Component(int aID, String aName) { - super(aID, aName); + public GT_MetaItem_Component(String aName) { + super(aName); instance = this; } diff --git a/src/main/java/gregtechmod/common/items/GT_MetaItem_DirtyDust.java b/src/main/java/gregtechmod/common/items/GT_MetaItem_DirtyDust.java index dac3075..e3987f6 100644 --- a/src/main/java/gregtechmod/common/items/GT_MetaItem_DirtyDust.java +++ b/src/main/java/gregtechmod/common/items/GT_MetaItem_DirtyDust.java @@ -11,8 +11,8 @@ public class GT_MetaItem_DirtyDust extends GT_MetaItem_Abstract { public static GT_MetaItem_Abstract instance; - public GT_MetaItem_DirtyDust(int aID, String aName) { - super(aID, aName); + public GT_MetaItem_DirtyDust(String aName) { + super(aName); instance = this; } @@ -20,6 +20,7 @@ public class GT_MetaItem_DirtyDust extends GT_MetaItem_Abstract { return instance.mStackList; } + @SuppressWarnings("deprecation") public static ItemStack addItem(int aMeta, String aName, Materials aMaterial, boolean aGlow) { GT_LanguageManager.addStringLocalization(instance.getUnlocalizedName() + "." + aMeta + ".name", "Dirty Pile of " + aName); diff --git a/src/main/java/gregtechmod/common/items/GT_MetaItem_Dust.java b/src/main/java/gregtechmod/common/items/GT_MetaItem_Dust.java index 48d1be4..6d33caa 100644 --- a/src/main/java/gregtechmod/common/items/GT_MetaItem_Dust.java +++ b/src/main/java/gregtechmod/common/items/GT_MetaItem_Dust.java @@ -11,8 +11,8 @@ public class GT_MetaItem_Dust extends GT_MetaItem_Abstract { public static GT_MetaItem_Abstract instance; - public GT_MetaItem_Dust(int aID, String aName) { - super(aID, aName); + public GT_MetaItem_Dust(String aName) { + super(aName); instance = this; } diff --git a/src/main/java/gregtechmod/common/items/GT_MetaItem_Material.java b/src/main/java/gregtechmod/common/items/GT_MetaItem_Material.java index 23b2670..c0cbb28 100644 --- a/src/main/java/gregtechmod/common/items/GT_MetaItem_Material.java +++ b/src/main/java/gregtechmod/common/items/GT_MetaItem_Material.java @@ -12,8 +12,8 @@ public class GT_MetaItem_Material extends GT_MetaItem_Abstract { public static GT_MetaItem_Abstract instance; - public GT_MetaItem_Material(int aID, String aName) { - super(aID, aName); + public GT_MetaItem_Material(String aName) { + super(aName); instance = this; } diff --git a/src/main/java/gregtechmod/common/items/GT_MetaItem_Nugget.java b/src/main/java/gregtechmod/common/items/GT_MetaItem_Nugget.java index 1fc6f44..84174c4 100644 --- a/src/main/java/gregtechmod/common/items/GT_MetaItem_Nugget.java +++ b/src/main/java/gregtechmod/common/items/GT_MetaItem_Nugget.java @@ -11,8 +11,8 @@ public class GT_MetaItem_Nugget extends GT_MetaItem_Abstract { public static GT_MetaItem_Abstract instance; - public GT_MetaItem_Nugget(int aID, String aName) { - super(aID, aName); + public GT_MetaItem_Nugget(String aName) { + super(aName); instance = this; } diff --git a/src/main/java/gregtechmod/common/items/GT_MetaItem_SmallDust.java b/src/main/java/gregtechmod/common/items/GT_MetaItem_SmallDust.java index 0395d7f..000c8b7 100644 --- a/src/main/java/gregtechmod/common/items/GT_MetaItem_SmallDust.java +++ b/src/main/java/gregtechmod/common/items/GT_MetaItem_SmallDust.java @@ -11,8 +11,8 @@ public class GT_MetaItem_SmallDust extends GT_MetaItem_Abstract { public static GT_MetaItem_Abstract instance; - public GT_MetaItem_SmallDust(int aID, String aName) { - super(aID, aName); + public GT_MetaItem_SmallDust(String aName) { + super(aName); instance = this; } diff --git a/src/main/java/gregtechmod/common/items/GT_MetaItem_TinyDust.java b/src/main/java/gregtechmod/common/items/GT_MetaItem_TinyDust.java index 2d9507b..6cd3252 100644 --- a/src/main/java/gregtechmod/common/items/GT_MetaItem_TinyDust.java +++ b/src/main/java/gregtechmod/common/items/GT_MetaItem_TinyDust.java @@ -11,8 +11,8 @@ public class GT_MetaItem_TinyDust extends GT_MetaItem_Abstract { public static GT_MetaItem_Abstract instance; - public GT_MetaItem_TinyDust(int aID, String aName) { - super(aID, aName); + public GT_MetaItem_TinyDust(String aName) { + super(aName); instance = this; } diff --git a/src/main/java/gregtechmod/common/items/GT_Mortar_Item.java b/src/main/java/gregtechmod/common/items/GT_Mortar_Item.java index 4b027f6..c6d7837 100644 --- a/src/main/java/gregtechmod/common/items/GT_Mortar_Item.java +++ b/src/main/java/gregtechmod/common/items/GT_Mortar_Item.java @@ -8,8 +8,8 @@ public class GT_Mortar_Item extends GT_Generic_Item { ItemStack mBrokenItem; - public GT_Mortar_Item(int aID, String aName, int aMaxDamage, ItemStack aBrokenItem) { - super(aID, aName, "Used to turn Ingots into Dust"); + public GT_Mortar_Item(String aName, int aMaxDamage, ItemStack aBrokenItem) { + super(aName, "Used to turn Ingots into Dust"); setMaxDamage(aMaxDamage-1); setMaxStackSize(1); setNoRepair(); diff --git a/src/main/java/gregtechmod/common/items/GT_SensorCard_Item.java b/src/main/java/gregtechmod/common/items/GT_SensorCard_Item.java index 81453c8..7bfcbb3 100644 --- a/src/main/java/gregtechmod/common/items/GT_SensorCard_Item.java +++ b/src/main/java/gregtechmod/common/items/GT_SensorCard_Item.java @@ -30,8 +30,8 @@ public class GT_SensorCard_Item extends GT_Generic_Item implements IRemoteSensor public static final UUID CARD_TYPE = new UUID(0, 41); - public GT_SensorCard_Item(int aID, String aName) { - super(aID, aName, "Insert into Display Panel"); + public GT_SensorCard_Item(String aName) { + super(aName, "Insert into Display Panel"); setMaxStackSize(1); } @@ -43,6 +43,7 @@ public class GT_SensorCard_Item extends GT_Generic_Item implements IRemoteSensor return null; } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addAdditionalToolTips(List aList, ItemStack aStack) { super.addAdditionalToolTips(aList, aStack); diff --git a/src/main/java/gregtechmod/common/items/GT_SensorKit_Item.java b/src/main/java/gregtechmod/common/items/GT_SensorKit_Item.java index 7169737..7faca0c 100644 --- a/src/main/java/gregtechmod/common/items/GT_SensorKit_Item.java +++ b/src/main/java/gregtechmod/common/items/GT_SensorKit_Item.java @@ -13,14 +13,14 @@ import net.minecraft.world.World; public class GT_SensorKit_Item extends GT_Generic_Item { - public GT_SensorKit_Item(int aID, String aName) { - super(aID, aName, "Attach to GregTech Machines"); + public GT_SensorKit_Item(String aName) { + super(aName, "Attach to GregTech Machines"); setCreativeTab(GregTech_API.TAB_GREGTECH); setMaxStackSize(1); } protected ChunkCoordinates getTargetCoordinates(World world, int x, int y, int z, ItemStack stack) { - TileEntity tTileEntity = world.getBlockTileEntity(x, y, z); + TileEntity tTileEntity = world.getTileEntity(x, y, z); if (tTileEntity != null && tTileEntity instanceof IGregTechDeviceInformation && ((IGregTechDeviceInformation)tTileEntity).isGivingInformation()) { ChunkCoordinates coordinates = new ChunkCoordinates(); coordinates.posX = x; diff --git a/src/main/java/gregtechmod/common/items/GT_Sonictron_Item.java b/src/main/java/gregtechmod/common/items/GT_Sonictron_Item.java index a7e16ea..6c11cb2 100644 --- a/src/main/java/gregtechmod/common/items/GT_Sonictron_Item.java +++ b/src/main/java/gregtechmod/common/items/GT_Sonictron_Item.java @@ -13,8 +13,8 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; public class GT_Sonictron_Item extends GT_Generic_Item { - public GT_Sonictron_Item(int par1, String aName) { - super(par1, aName, null); + public GT_Sonictron_Item(String aName) { + super(aName, null); setMaxStackSize(1); setNoRepair(); } diff --git a/src/main/java/gregtechmod/loaders/load/GT_DictRegistratorPreItem.java b/src/main/java/gregtechmod/loaders/load/GT_DictRegistratorPreItem.java index 548467b..52a28c4 100644 --- a/src/main/java/gregtechmod/loaders/load/GT_DictRegistratorPreItem.java +++ b/src/main/java/gregtechmod/loaders/load/GT_DictRegistratorPreItem.java @@ -7,17 +7,17 @@ import gregtechmod.api.enums.OrePrefixes; import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_OreDictUnificator; -import net.minecraft.block.Block; -import net.minecraft.item.Item; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; public class GT_DictRegistratorPreItem implements Runnable { @Override public void run() { - GT_Log.out.println("GT_Mod: Adding certain Items to the Unification Blacklist."); + GT_Log.log.info("GT_Mod: Adding certain Items to the Unification Blacklist."); GT_OreDictUnificator.addToBlacklist(GT_ModHandler.getIC2Item("industrialDiamond", 1)); - GT_Log.out.println("GT_Mod: Register OreDict Entries of Non-GT-Items."); + GT_Log.log.info("GT_Mod: Register OreDict Entries of Non-GT-Items."); GT_OreDictUnificator.registerOre("molecule_2o" , GT_ModHandler.getAirCell(1)); GT_OreDictUnificator.registerOre("molecule_2o" , GT_ModHandler.getIC2Item("airCell", 1)); GT_OreDictUnificator.add(OrePrefixes.cell , Materials.Empty , GT_ModHandler.getEmptyCell(1)); @@ -38,19 +38,19 @@ public class GT_DictRegistratorPreItem implements Runnable { GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.Diamond , GT_ModHandler.getIC2Item("industrialDiamond", 1)); GT_OreDictUnificator.registerOre("craftingIndustrialDiamond" , GT_ModHandler.getIC2Item("industrialDiamond", 1)); - GT_OreDictUnificator.registerOre("stoneObsidian" , new ItemStack(Block.obsidian , 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); - GT_OreDictUnificator.registerOre("stoneMossy" , new ItemStack(Block.cobblestoneMossy , 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); - GT_OreDictUnificator.registerOre("stoneCobble" , new ItemStack(Block.cobblestoneMossy , 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); - GT_OreDictUnificator.registerOre("stoneCobble" , new ItemStack(Block.cobblestone , 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); - GT_OreDictUnificator.registerOre("stoneSmooth" , new ItemStack(Block.stone , 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); - GT_OreDictUnificator.registerOre("stoneBricks" , new ItemStack(Block.stoneBrick , 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); - GT_OreDictUnificator.registerOre("stoneMossy" , new ItemStack(Block.stoneBrick , 1, 1)); - GT_OreDictUnificator.registerOre("stoneCracked" , new ItemStack(Block.stoneBrick , 1, 2)); - GT_OreDictUnificator.registerOre("stoneChiseled" , new ItemStack(Block.stoneBrick , 1, 3)); - GT_OreDictUnificator.registerOre("stoneSand" , new ItemStack(Block.sandStone , 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); - GT_OreDictUnificator.registerOre("stoneNetherrack" , new ItemStack(Block.netherrack , 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); - GT_OreDictUnificator.registerOre("stoneNetherBrick" , new ItemStack(Block.netherBrick , 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); - GT_OreDictUnificator.registerOre("stoneEndstone" , new ItemStack(Block.whiteStone , 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); + GT_OreDictUnificator.registerOre("stoneObsidian" , new ItemStack(Blocks.obsidian , 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); + GT_OreDictUnificator.registerOre("stoneMossy" , new ItemStack(Blocks.mossy_cobblestone, 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); + GT_OreDictUnificator.registerOre("stoneCobble" , new ItemStack(Blocks.mossy_cobblestone, 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); + GT_OreDictUnificator.registerOre("stoneCobble" , new ItemStack(Blocks.cobblestone , 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); + GT_OreDictUnificator.registerOre("stoneSmooth" , new ItemStack(Blocks.stone , 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); + GT_OreDictUnificator.registerOre("stoneBricks" , new ItemStack(Blocks.stonebrick , 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); + GT_OreDictUnificator.registerOre("stoneMossy" , new ItemStack(Blocks.stonebrick , 1, 1)); + GT_OreDictUnificator.registerOre("stoneCracked" , new ItemStack(Blocks.stonebrick , 1, 2)); + GT_OreDictUnificator.registerOre("stoneChiseled" , new ItemStack(Blocks.stonebrick , 1, 3)); + GT_OreDictUnificator.registerOre("stoneSand" , new ItemStack(Blocks.sandstone , 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); + GT_OreDictUnificator.registerOre("stoneNetherrack" , new ItemStack(Blocks.netherrack , 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); + GT_OreDictUnificator.registerOre("stoneNetherBrick" , new ItemStack(Blocks.nether_brick , 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); + GT_OreDictUnificator.registerOre("stoneEndstone" , new ItemStack(Blocks.end_stone , 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); GT_OreDictUnificator.registerOre("stoneAbyssal" , GT_ModHandler.getRCItem("cube.stone.abyssal", 1)); GT_OreDictUnificator.registerOre("stoneQuarried" , GT_ModHandler.getRCItem("cube.stone.quarried", 1)); @@ -69,36 +69,35 @@ public class GT_DictRegistratorPreItem implements Runnable { GT_OreDictUnificator.add("plateDenseLapis" , GT_ModHandler.getIC2Item("denseplatelapi", 1, GT_ModHandler.getIC2Item("denseplatelapis", 1))); GT_OreDictUnificator.add("plateDenseObsidian" , GT_ModHandler.getIC2Item("denseplateobsidian", 1)); - GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Item.record13, 1)); - GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Item.recordCat, 1)); - GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Item.recordBlocks, 1)); - GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Item.recordStrad, 1)); - GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Item.recordStal, 1)); - GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Item.recordFar, 1)); - GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Item.recordMall, 1)); - GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Item.recordMellohi, 1)); - GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Item.recordWard, 1)); - GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Item.recordChirp, 1)); - GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Item.record11, 1)); - GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Item.recordWait, 1)); + GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Items.record_13, 1)); + GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Items.record_cat, 1)); + GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Items.record_blocks, 1)); + GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Items.record_strad, 1)); + GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Items.record_stal, 1)); + GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Items.record_far, 1)); + GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Items.record_mall, 1)); + GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Items.record_mellohi, 1)); + GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Items.record_ward, 1)); + GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Items.record_chirp, 1)); + GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Items.record_11, 1)); + GT_OreDictUnificator.registerOre("itemRecord" , new ItemStack(Items.record_wait, 1)); - if (Block.enderChest != null) - GT_OreDictUnificator.registerOre("craftingEnderChest" , new ItemStack(Block.enderChest, 1)); + if (Blocks.ender_chest != null) + GT_OreDictUnificator.registerOre("craftingEnderChest" , new ItemStack(Blocks.ender_chest, 1)); GT_OreDictUnificator.registerOre("glassReinforced" , GT_ModHandler.getIC2Item("reinforcedGlass", 1)); GT_OreDictUnificator.registerOre("glassReinforced" , GT_ModHandler.getTEItem("hardenedGlass", 1)); - GT_Log.out.println("GT_Mod: Register Unification Entries"); + GT_Log.log.info("GT_Mod: Register Unification Entries"); - GT_OreDictUnificator.add("oreCoal" , new ItemStack(Block.oreCoal, 1)); - GT_OreDictUnificator.add("oreIron" , new ItemStack(Block.oreIron, 1)); - GT_OreDictUnificator.add("oreLapis" , new ItemStack(Block.oreLapis, 1)); - GT_OreDictUnificator.add("oreRedstone" , new ItemStack(Block.oreRedstone, 1)); - GT_OreDictUnificator.add("oreRedstone" , new ItemStack(Block.oreRedstoneGlowing, 1)); - GT_OreDictUnificator.add("oreGold" , new ItemStack(Block.oreGold, 1)); - GT_OreDictUnificator.add("oreDiamond" , new ItemStack(Block.oreDiamond, 1)); - GT_OreDictUnificator.add("oreEmerald" , new ItemStack(Block.oreEmerald, 1)); - GT_OreDictUnificator.add("oreNetherQuartz" , new ItemStack(Block.oreNetherQuartz, 1)); + GT_OreDictUnificator.add("oreCoal" , new ItemStack(Blocks.coal_ore, 1)); + GT_OreDictUnificator.add("oreIron" , new ItemStack(Blocks.iron_ore, 1)); + GT_OreDictUnificator.add("oreLapis" , new ItemStack(Blocks.lapis_ore, 1)); + GT_OreDictUnificator.add("oreRedstone" , new ItemStack(Blocks.redstone_ore, 1)); + GT_OreDictUnificator.add("oreGold" , new ItemStack(Blocks.gold_ore, 1)); + GT_OreDictUnificator.add("oreDiamond" , new ItemStack(Blocks.diamond_ore, 1)); + GT_OreDictUnificator.add("oreEmerald" , new ItemStack(Blocks.emerald_ore, 1)); + GT_OreDictUnificator.add("oreNetherQuartz" , new ItemStack(Blocks.quartz_ore, 1)); GT_OreDictUnificator.add("oreGalena" , new ItemStack(GregTech_API.sBlockList[2], 1, 1)); GT_OreDictUnificator.add("oreIridium" , new ItemStack(GregTech_API.sBlockList[2], 1, 2)); @@ -139,37 +138,37 @@ public class GT_DictRegistratorPreItem implements Runnable { GT_OreDictUnificator.add("itemRubber" , GT_ModHandler.getIC2Item("rubber", 1)); GT_OreDictUnificator.add("gemIridium" , GT_ModHandler.getIC2Item("iridiumOre", 1)); - GT_OreDictUnificator.add("gemEnderEye" , new ItemStack(Item.eyeOfEnder, 1)); - GT_OreDictUnificator.add("gemEnderPearl" , new ItemStack(Item.enderPearl, 1)); - GT_OreDictUnificator.add("gemDiamond" , new ItemStack(Item.diamond, 1)); - GT_OreDictUnificator.add("gemEmerald" , new ItemStack(Item.emerald, 1)); - GT_OreDictUnificator.add("gemCoal" , new ItemStack(Item.coal, 1, 0)); - GT_OreDictUnificator.add("gemCharcoal" , new ItemStack(Item.coal, 1, 1)); - GT_OreDictUnificator.add("gemLapis" , new ItemStack(Item.dyePowder, 1, 4)); - GT_OreDictUnificator.add("gemNetherQuartz" , new ItemStack(Item.netherQuartz, 1)); - GT_OreDictUnificator.add("gemNetherStar" , new ItemStack(Item.netherStar, 1)); - GT_OreDictUnificator.add(OrePrefixes.nugget , Materials.Gold , new ItemStack(Item.goldNugget, 1)); - GT_OreDictUnificator.add(OrePrefixes.ingot , Materials.Gold , new ItemStack(Item.ingotGold, 1)); - GT_OreDictUnificator.add(OrePrefixes.ingot , Materials.Iron , new ItemStack(Item.ingotIron, 1)); - GT_OreDictUnificator.add(OrePrefixes.dust , Materials.Sugar , new ItemStack(Item.sugar, 1)); - GT_OreDictUnificator.add(OrePrefixes.stick , Materials.Wood , new ItemStack(Item.stick, 1)); + GT_OreDictUnificator.add("gemEnderEye" , new ItemStack(Items.ender_eye, 1)); + GT_OreDictUnificator.add("gemEnderPearl" , new ItemStack(Items.ender_pearl, 1)); + GT_OreDictUnificator.add("gemDiamond" , new ItemStack(Items.diamond, 1)); + GT_OreDictUnificator.add("gemEmerald" , new ItemStack(Items.emerald, 1)); + GT_OreDictUnificator.add("gemCoal" , new ItemStack(Items.coal, 1, 0)); + GT_OreDictUnificator.add("gemCharcoal" , new ItemStack(Items.coal, 1, 1)); + GT_OreDictUnificator.add("gemLapis" , new ItemStack(Items.dye, 1, 4)); + GT_OreDictUnificator.add("gemNetherQuartz" , new ItemStack(Items.quartz, 1)); + GT_OreDictUnificator.add("gemNetherStar" , new ItemStack(Items.nether_star, 1)); + GT_OreDictUnificator.add(OrePrefixes.nugget , Materials.Gold , new ItemStack(Items.gold_nugget, 1)); + GT_OreDictUnificator.add(OrePrefixes.ingot , Materials.Gold , new ItemStack(Items.gold_ingot, 1)); + GT_OreDictUnificator.add(OrePrefixes.ingot , Materials.Iron , new ItemStack(Items.iron_ingot, 1)); + GT_OreDictUnificator.add(OrePrefixes.dust , Materials.Sugar , new ItemStack(Items.sugar, 1)); + GT_OreDictUnificator.add(OrePrefixes.stick , Materials.Wood , new ItemStack(Items.stick, 1)); GT_OreDictUnificator.add(OrePrefixes.ingot , Materials.Tin , GT_ModHandler.getIC2Item("tinIngot", 1)); GT_OreDictUnificator.add(OrePrefixes.ingot , Materials.Copper , GT_ModHandler.getIC2Item("copperIngot", 1)); GT_OreDictUnificator.add(OrePrefixes.ingot , Materials.Bronze , GT_ModHandler.getIC2Item("bronzeIngot", 1)); GT_OreDictUnificator.add(OrePrefixes.dust , Materials.HydratedCoal , GT_ModHandler.getIC2Item("hydratedCoalDust", 1)); - GT_OreDictUnificator.add(OrePrefixes.dust , Materials.Redstone , new ItemStack(Item.redstone, 1)); - GT_OreDictUnificator.add(OrePrefixes.dust , Materials.Gunpowder , new ItemStack(Item.gunpowder, 1)); - GT_OreDictUnificator.add(OrePrefixes.dust , Materials.Glowstone , new ItemStack(Item.glowstone, 1)); - GT_OreDictUnificator.add(OrePrefixes.dust , Materials.Blaze , new ItemStack(Item.blazePowder, 1)); - GT_OreDictUnificator.add(OrePrefixes.stick , Materials.Blaze , new ItemStack(Item.blazeRod, 1)); - GT_OreDictUnificator.add(OrePrefixes.block , Materials.Iron , new ItemStack(Block.blockIron, 1, 0)); - GT_OreDictUnificator.add(OrePrefixes.block , Materials.Gold , new ItemStack(Block.blockGold, 1, 0)); - GT_OreDictUnificator.add(OrePrefixes.block , Materials.Diamond , new ItemStack(Block.blockDiamond, 1, 0)); - GT_OreDictUnificator.add(OrePrefixes.block , Materials.Emerald , new ItemStack(Block.blockEmerald, 1, 0)); - GT_OreDictUnificator.add(OrePrefixes.block , Materials.Lapis , new ItemStack(Block.blockLapis, 1, 0)); - GT_OreDictUnificator.add(OrePrefixes.block , Materials.Coal , new ItemStack(Block.coalBlock, 1, 0)); - GT_OreDictUnificator.add(OrePrefixes.block , Materials.Redstone , new ItemStack(Block.blockRedstone, 1, 0)); + GT_OreDictUnificator.add(OrePrefixes.dust , Materials.Redstone , new ItemStack(Items.redstone, 1)); + GT_OreDictUnificator.add(OrePrefixes.dust , Materials.Gunpowder , new ItemStack(Items.gunpowder, 1)); + GT_OreDictUnificator.add(OrePrefixes.dust , Materials.Glowstone , new ItemStack(Items.glowstone_dust, 1)); + GT_OreDictUnificator.add(OrePrefixes.dust , Materials.Blaze , new ItemStack(Items.blaze_powder, 1)); + GT_OreDictUnificator.add(OrePrefixes.stick , Materials.Blaze , new ItemStack(Items.blaze_rod, 1)); + GT_OreDictUnificator.add(OrePrefixes.block , Materials.Iron , new ItemStack(Blocks.iron_block, 1, 0)); + GT_OreDictUnificator.add(OrePrefixes.block , Materials.Gold , new ItemStack(Blocks.gold_block, 1, 0)); + GT_OreDictUnificator.add(OrePrefixes.block , Materials.Diamond , new ItemStack(Blocks.diamond_block, 1, 0)); + GT_OreDictUnificator.add(OrePrefixes.block , Materials.Emerald , new ItemStack(Blocks.emerald_block, 1, 0)); + GT_OreDictUnificator.add(OrePrefixes.block , Materials.Lapis , new ItemStack(Blocks.lapis_block, 1, 0)); + GT_OreDictUnificator.add(OrePrefixes.block , Materials.Coal , new ItemStack(Blocks.coal_block, 1, 0)); + GT_OreDictUnificator.add(OrePrefixes.block , Materials.Redstone , new ItemStack(Blocks.redstone_block, 1, 0)); GT_OreDictUnificator.add(OrePrefixes.block , Materials.Copper , GT_ModHandler.getIC2Item("copperBlock", 1)); GT_OreDictUnificator.add(OrePrefixes.block , Materials.Tin , GT_ModHandler.getIC2Item("tinBlock", 1)); GT_OreDictUnificator.add(OrePrefixes.block , Materials.Bronze , GT_ModHandler.getIC2Item("bronzeBlock", 1)); @@ -196,7 +195,7 @@ public class GT_DictRegistratorPreItem implements Runnable { GT_OreDictUnificator.add(OrePrefixes.block , Materials.GarnetYellow , new ItemStack(GregTech_API.sBlockList[4], 1,14)); GT_OreDictUnificator.add(OrePrefixes.block , Materials.GarnetRed , new ItemStack(GregTech_API.sBlockList[4], 1,15)); - GT_Log.out.println("GT_Mod: Register other Mods Unification Targets."); + GT_Log.log.info("GT_Mod: Register other Mods Unification Targets."); if (GT_Mod.sUnificatorFR) { GT_OreDictUnificator.override("ingotCopper" , GT_ModHandler.getFRItem("ingotCopper", 1)); GT_OreDictUnificator.override("ingotTin" , GT_ModHandler.getFRItem("ingotTin", 1)); diff --git a/src/main/java/gregtechmod/loaders/load/GT_ItemLoader.java b/src/main/java/gregtechmod/loaders/load/GT_ItemLoader.java index a1b12dd..72abe79 100644 --- a/src/main/java/gregtechmod/loaders/load/GT_ItemLoader.java +++ b/src/main/java/gregtechmod/loaders/load/GT_ItemLoader.java @@ -47,24 +47,25 @@ import gregtechmod.common.items.GT_Vanilla_Pickaxe; import gregtechmod.common.items.GT_Vanilla_Shovel; import gregtechmod.common.items.GT_Vanilla_Sword; import net.minecraft.block.material.Material; +import net.minecraft.item.ItemStack; public class GT_ItemLoader implements Runnable { @Override public void run() { - GT_Log.out.println("GT_Mod: Register Armor Textures."); + GT_Log.log.info("GT_Mod: Register Armor Textures."); int tArmorID1 = GT_Mod.gregtechproxy.addArmor("lapotronpack"), tArmorID2 = GT_Mod.gregtechproxy.addArmor("lithiumbatpack"), tArmorID3 = GT_Mod.gregtechproxy.addArmor("cloakingdevice"); - GT_Log.out.println("GT_Mod: Register Meta-ID Items."); - GregTech_API.sItemList[ 0] = new GT_MetaItem_Material (GT_Mod.sItemIDs[ 0], "GT_Materials"); - GregTech_API.sItemList[ 1] = new GT_MetaItem_Dust (GT_Mod.sItemIDs[ 1], "GT_Dusts"); - GregTech_API.sItemList[ 2] = new GT_MetaItem_Cell (GT_Mod.sItemIDs[ 2], "GT_Cells"); - GregTech_API.sItemList[ 3] = new GT_MetaItem_Component (GT_Mod.sItemIDs[ 3], "GT_Components"); - GregTech_API.sItemList[ 4] = new GT_MetaItem_SmallDust (GT_Mod.sItemIDs[ 4], "GT_SmallDusts"); - GregTech_API.sItemList[ 5] = new GT_MetaItem_Nugget (GT_Mod.sItemIDs[ 5], "GT_Nuggets"); - GregTech_API.sItemList[ 6] = new GT_MetaItem_DirtyDust (GT_Mod.sItemIDs[ 6], "GT_DirtyDusts"); - GregTech_API.sItemList[ 7] = new GT_MetaItem_TinyDust (GT_Mod.sItemIDs[ 7], "GT_TinyDusts"); + GT_Log.log.info("GT_Mod: Register Meta-ID Items."); + GregTech_API.sItemList[ 0] = new GT_MetaItem_Material ("GT_Materials"); + GregTech_API.sItemList[ 1] = new GT_MetaItem_Dust ("GT_Dusts"); + GregTech_API.sItemList[ 2] = new GT_MetaItem_Cell ("GT_Cells"); + GregTech_API.sItemList[ 3] = new GT_MetaItem_Component ("GT_Components"); + GregTech_API.sItemList[ 4] = new GT_MetaItem_SmallDust ("GT_SmallDusts"); + GregTech_API.sItemList[ 5] = new GT_MetaItem_Nugget ("GT_Nuggets"); + GregTech_API.sItemList[ 6] = new GT_MetaItem_DirtyDust ("GT_DirtyDusts"); + GregTech_API.sItemList[ 7] = new GT_MetaItem_TinyDust ("GT_TinyDusts"); - GT_Log.out.println("GT_Mod: Adding All Sub-Items with their OreDict and LiquidDict Entries."); + GT_Log.log.info("GT_Mod: Adding All Sub-Items with their OreDict and LiquidDict Entries."); GT_MetaItem_Material.addItem( 0, "Copper Credit" , null, "0.125 Credits", false); GT_MetaItem_Material.addItem( 1, "Silver Credit" , null, "8 Credits", false); GT_MetaItem_Material.addItem( 2, "Gold Credit" , null, "64 Credits", false); @@ -488,144 +489,144 @@ public class GT_ItemLoader implements Runnable { GT_MetaItem_Component.addItem(102, "Stainless Steel Gear" , "gearStainlessSteel" , "A Stainless Steel Gear"); GT_OreDictUnificator.registerOre("craftingGearTier02" , GT_MetaItem_Component.instance.getUnunifiedStack(102, 1)); - GT_Log.out.println("GT_Mod: Register Regular Items."); + GT_Log.log.info("GT_Mod: Register Regular Items."); - GregTech_API.sItemList[ 15] = new GT_FluidDisplayItem (GT_Mod.sItemIDs[ 15], GT_LanguageManager.mNameListItem[ 15]); + GregTech_API.sItemList[ 15] = new GT_FluidDisplayItem (GT_LanguageManager.mNameListItem[ 15]); try { Class.forName("shedar.mods.ic2.nuclearcontrol.api.IRemoteSensor"); - GregTech_API.sItemList[ 16] = new GT_SensorCard_Item (GT_Mod.sItemIDs[ 16], GT_LanguageManager.mNameListItem[ 16]); - GregTech_API.sItemList[ 17] = new GT_SensorKit_Item (GT_Mod.sItemIDs[ 17], GT_LanguageManager.mNameListItem[ 17]); + GregTech_API.sItemList[ 16] = new GT_SensorCard_Item (GT_LanguageManager.mNameListItem[ 16]); + GregTech_API.sItemList[ 17] = new GT_SensorKit_Item (GT_LanguageManager.mNameListItem[ 17]); } catch (Throwable e) { - GregTech_API.sItemList[ 16] = new GT_Generic_Item (GT_Mod.sItemIDs[ 16], GT_LanguageManager.mNameListItem[ 16], "Nuclear Control not installed", false); - GregTech_API.sItemList[ 17] = new GT_Generic_Item (GT_Mod.sItemIDs[ 17], GT_LanguageManager.mNameListItem[ 17], "Nuclear Control not installed", false); + GregTech_API.sItemList[ 16] = new GT_Generic_Item (GT_LanguageManager.mNameListItem[ 16], "Nuclear Control not installed", false); + GregTech_API.sItemList[ 17] = new GT_Generic_Item (GT_LanguageManager.mNameListItem[ 17], "Nuclear Control not installed", false); } - GregTech_API.sItemList[ 18] = GregTech_API.constructElectricArmorItem (GT_Mod.sItemIDs[ 18], GT_LanguageManager.mNameListItem[ 18], 1000000000, Integer.MAX_VALUE, 1, 10, -1, 100.0D, true, 1, tArmorID1); + GregTech_API.sItemList[ 18] = GregTech_API.constructElectricArmorItem (GT_LanguageManager.mNameListItem[ 18], 1000000000, Integer.MAX_VALUE, 1, 10, -1, 100.0D, true, 1, tArmorID1); - GregTech_API.sItemList[ 30] = new GT_Mortar_Item (GT_Mod.sItemIDs[ 30], GT_LanguageManager.mNameListItem[ 30], 64, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1)); - GregTech_API.sItemList[ 31] = new GT_Generic_Item (GT_Mod.sItemIDs[ 31], GT_LanguageManager.mNameListItem[ 31], "Used to turn Ingots into Dust"); - GregTech_API.sItemList[ 32] = new GT_Sonictron_Item (GT_Mod.sItemIDs[ 32], GT_LanguageManager.mNameListItem[ 32]); - GregTech_API.sItemList[ 33] = new GT_Destructopack_Item (GT_Mod.sItemIDs[ 33], GT_LanguageManager.mNameListItem[ 33]); - GregTech_API.sItemList[ 34] = GregTech_API.constructCoolantCellItem (GT_Mod.sItemIDs[ 34], GT_LanguageManager.mNameListItem[ 34], 60000, 1); - GregTech_API.sItemList[ 35] = GregTech_API.constructCoolantCellItem (GT_Mod.sItemIDs[ 35], GT_LanguageManager.mNameListItem[ 35], 180000, 3); - GregTech_API.sItemList[ 36] = GregTech_API.constructCoolantCellItem (GT_Mod.sItemIDs[ 36], GT_LanguageManager.mNameListItem[ 36], 360000, 6); - GregTech_API.sItemList[ 37] = GregTech_API.constructElectricEnergyStorageItem (GT_Mod.sItemIDs[ 37], GT_LanguageManager.mNameListItem[ 37],100000000, 8192, 5, 37, 37); - GregTech_API.sItemList[ 38] = GregTech_API.constructElectricArmorItem (GT_Mod.sItemIDs[ 38], GT_LanguageManager.mNameListItem[ 38],100000000, 8192, 5, 0, 512, 0.0D, false, 1, tArmorID3); - GregTech_API.sItemList[ 39] = GregTech_API.constructElectricDrillItem (GT_Mod.sItemIDs[ 39], GT_LanguageManager.mNameListItem[ 39], 10, 0, 2, 7.5F, 50, -1).setElectricTier(1).setBlockBreakSound(GregTech_API.sSoundList.get(107)).setEntityHitSound(GregTech_API.sSoundList.get(107)); - try {GregTech_API.sItemList[ 40] = new GT_NeutronReflector_Item (GT_Mod.sItemIDs[ 40], GT_LanguageManager.mNameListItem[ 40], 0); } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) e.printStackTrace(GT_Log.err);} - GregTech_API.sItemList[ 41] = GregTech_API.constructElectricDrillItem (GT_Mod.sItemIDs[ 41], GT_LanguageManager.mNameListItem[ 41], 10, 0, 2, 15.0F, 100, -1).setElectricTier(1).setBlockBreakSound(GregTech_API.sSoundList.get(107)).setEntityHitSound(GregTech_API.sSoundList.get(107)); - GregTech_API.sItemList[ 42] = GregTech_API.constructElectricDrillItem (GT_Mod.sItemIDs[ 42], GT_LanguageManager.mNameListItem[ 42], 100, 0, 3, 45.0F, 250, -1).setElectricTier(2).setBlockBreakSound(GregTech_API.sSoundList.get(107)).setEntityHitSound(GregTech_API.sSoundList.get(107)); - GregTech_API.sItemList[ 43] = new GT_Dataorb_Item (GT_Mod.sItemIDs[ 43], GT_LanguageManager.mNameListItem[ 43]); - GregTech_API.sItemList[ 44] = GregTech_API.constructElectricArmorItem (GT_Mod.sItemIDs[ 44], GT_LanguageManager.mNameListItem[ 44], 10000, 32, 1, 0, 16|32, 0.0D, false, 0, tArmorID1); - GregTech_API.sItemList[ 45] = GregTech_API.constructElectricArmorItem (GT_Mod.sItemIDs[ 45], GT_LanguageManager.mNameListItem[ 45],100000000, 8192, 5, 0, 0, 0.0D, true, 1, tArmorID1); - GregTech_API.sItemList[ 46] = GregTech_API.constructElectricDrillItem (GT_Mod.sItemIDs[ 46], GT_LanguageManager.mNameListItem[ 46], 10, 0, 5, 3.0F, 1000, -1).setElectricTier(1).addToMaterialList(Material.anvil).addToMaterialList(Material.iron).addToMaterialList(Material.rock).setPrimaryToolClass("pickaxe").setSilkyness(3); - try {GregTech_API.sItemList[ 47] = new GT_Teslastaff_Item (GT_Mod.sItemIDs[ 47], GT_LanguageManager.mNameListItem[ 47]); } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) e.printStackTrace(GT_Log.err);} - GregTech_API.sItemList[ 48] = GregTech_API.constructRadioactiveCellItem (GT_Mod.sItemIDs[ 48], GT_LanguageManager.mNameListItem[ 48], 25000, 1, -5, null); - GregTech_API.sItemList[ 49] = GregTech_API.constructRadioactiveCellItem (GT_Mod.sItemIDs[ 49], GT_LanguageManager.mNameListItem[ 49], 25000, 2, -5, null); - GregTech_API.sItemList[ 50] = GregTech_API.constructRadioactiveCellItem (GT_Mod.sItemIDs[ 50], GT_LanguageManager.mNameListItem[ 50], 25000, 4, -5, null); - GregTech_API.sItemList[ 51] = GregTech_API.constructRadioactiveCellItem (GT_Mod.sItemIDs[ 51], GT_LanguageManager.mNameListItem[ 51], 20000, 1, 2, GT_ModHandler.getIC2Item("nearDepletedUraniumCell", 4)); - GregTech_API.sItemList[ 52] = GregTech_API.constructRadioactiveCellItem (GT_Mod.sItemIDs[ 52], GT_LanguageManager.mNameListItem[ 52], 20000, 2, 2, GT_ModHandler.getIC2Item("nearDepletedUraniumCell", 4)); - GregTech_API.sItemList[ 53] = GregTech_API.constructRadioactiveCellItem (GT_Mod.sItemIDs[ 53], GT_LanguageManager.mNameListItem[ 53], 20000, 4, 2, GT_ModHandler.getIC2Item("nearDepletedUraniumCell", 4)); - //GregTech_API.sItemList[ 54] = GregTech_API.constructRadioactiveCellItem (GT_Mod.sItemIDs[ 54], GT_LanguageManager.mNameListItem[ 54], 200, 1, 0, GT_MetaItem_Cell.instance.getUnunifiedStack(2, 1)); - try {GregTech_API.sItemList[ 55] = new GT_Debug_Item (GT_Mod.sItemIDs[ 55], GT_LanguageManager.mNameListItem[ 55]); } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) e.printStackTrace(GT_Log.err);} - GregTech_API.sItemList[ 56] = GregTech_API.constructElectricEnergyStorageItem (GT_Mod.sItemIDs[ 56], GT_LanguageManager.mNameListItem[ 56], 100000, 128, 1, 56, 57).setMaxStackSize(16).setMaxDamage(0); - GregTech_API.sItemList[ 57] = GregTech_API.constructElectricEnergyStorageItem (GT_Mod.sItemIDs[ 57], GT_LanguageManager.mNameListItem[ 57], 100000, 128, 1, 56, 57); - GregTech_API.sItemList[ 58] = GregTech_API.constructElectricArmorItem (GT_Mod.sItemIDs[ 58], GT_LanguageManager.mNameListItem[ 58], 600000, 128, 1, 0, 0, 0.0D, true, 1, tArmorID2); - //try {GregTech_API.sItemList[ 59] = Shield } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) e.printStackTrace(GT_Log.err);} - GregTech_API.sItemList[ 60] = GregTech_API.constructCoolantCellItem (GT_Mod.sItemIDs[ 60], GT_LanguageManager.mNameListItem[ 60], 60000, 1); - GregTech_API.sItemList[ 61] = GregTech_API.constructCoolantCellItem (GT_Mod.sItemIDs[ 61], GT_LanguageManager.mNameListItem[ 61], 180000, 3); - GregTech_API.sItemList[ 62] = GregTech_API.constructCoolantCellItem (GT_Mod.sItemIDs[ 62], GT_LanguageManager.mNameListItem[ 62], 360000, 6); - try {GregTech_API.sItemList[ 63] = new GT_Scanner_Item (GT_Mod.sItemIDs[ 63], GT_LanguageManager.mNameListItem[ 63]); } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) e.printStackTrace(GT_Log.err);} - GregTech_API.sItemList[ 64] = GregTech_API.constructCrowbarItem (GT_Mod.sItemIDs[ 64], GT_LanguageManager.mNameListItem[ 64], 256, 6); - GregTech_API.sItemList[ 65] = new GT_Screwdriver_Item (GT_Mod.sItemIDs[ 65], GT_LanguageManager.mNameListItem[ 65], 256, 4, -1); - GregTech_API.sItemList[ 66] = GregTech_API.constructWrenchItem (GT_Mod.sItemIDs[ 66], GT_LanguageManager.mNameListItem[ 66], 1280, 8, -1); - GregTech_API.sItemList[ 67] = GregTech_API.constructWrenchItem (GT_Mod.sItemIDs[ 67], GT_LanguageManager.mNameListItem[ 67], 128, 4, -1); - GregTech_API.sItemList[ 68] = GregTech_API.constructWrenchItem (GT_Mod.sItemIDs[ 68], GT_LanguageManager.mNameListItem[ 68], 5120, 10, -1); - GregTech_API.sItemList[ 69] = GregTech_API.constructWrenchItem (GT_Mod.sItemIDs[ 69], GT_LanguageManager.mNameListItem[ 69], 256, 6, -1); - GregTech_API.sItemList[ 70] = GregTech_API.constructElectricWrenchItem (GT_Mod.sItemIDs[ 70], GT_LanguageManager.mNameListItem[ 70], 16, 0, 112); - GregTech_API.sItemList[ 71] = GregTech_API.constructElectricWrenchItem (GT_Mod.sItemIDs[ 71], GT_LanguageManager.mNameListItem[ 71], 128, 0, 113); - GregTech_API.sItemList[ 72] = new GT_SoftHammer_Item (GT_Mod.sItemIDs[ 72], GT_LanguageManager.mNameListItem[ 72], 128, 4); - GregTech_API.sItemList[ 73] = GregTech_API.constructHardHammerItem (GT_Mod.sItemIDs[ 73], GT_LanguageManager.mNameListItem[ 73], 128, 4); - GregTech_API.sItemList[ 74] = GregTech_API.constructHardHammerItem (GT_Mod.sItemIDs[ 74], GT_LanguageManager.mNameListItem[ 74], 256, 6); - GregTech_API.sItemList[ 75] = GregTech_API.constructHardHammerItem (GT_Mod.sItemIDs[ 75], GT_LanguageManager.mNameListItem[ 75], 1280, 8); - GregTech_API.sItemList[ 76] = GregTech_API.constructHardHammerItem (GT_Mod.sItemIDs[ 76], GT_LanguageManager.mNameListItem[ 76], 5120, 10); - GregTech_API.sItemList[ 77] = GregTech_API.constructElectricSolderingToolItem (GT_Mod.sItemIDs[ 77], GT_LanguageManager.mNameListItem[ 77], 10, 0, 114); - GregTech_API.sItemList[ 78] = new GT_SolderingMetal_Item (GT_Mod.sItemIDs[ 78], GT_LanguageManager.mNameListItem[ 78], 50, 0); - GregTech_API.sItemList[ 79] = new GT_SolderingMetal_Item (GT_Mod.sItemIDs[ 79], GT_LanguageManager.mNameListItem[ 79], 10, 0); - GregTech_API.sItemList[ 80] = new GT_Durable_Item (GT_Mod.sItemIDs[ 80], GT_LanguageManager.mNameListItem[ 80], "Turbine Efficiency: 60%" , 15000); - GregTech_API.sItemList[ 81] = new GT_Durable_Item (GT_Mod.sItemIDs[ 81], GT_LanguageManager.mNameListItem[ 81], "Turbine Efficiency: 80%" , 10000); - GregTech_API.sItemList[ 82] = new GT_Durable_Item (GT_Mod.sItemIDs[ 82], GT_LanguageManager.mNameListItem[ 82], "Turbine Efficiency: 100%" , 10000); - GregTech_API.sItemList[ 83] = new GT_Durable_Item (GT_Mod.sItemIDs[ 83], GT_LanguageManager.mNameListItem[ 83], "Turbine Efficiency: 90%" , 30000); - GregTech_API.sItemList[ 84] = new GT_Durable_Item (GT_Mod.sItemIDs[ 84], GT_LanguageManager.mNameListItem[ 84], "Turbine Efficiency: 125%" , 2500); - GregTech_API.sItemList[ 85] = new GT_Durable_Item (GT_Mod.sItemIDs[ 85], GT_LanguageManager.mNameListItem[ 85], "Filters Lava in Thermal Boilers" , 100); - GregTech_API.sItemList[ 86] = new GT_File_Item (GT_Mod.sItemIDs[ 86], GT_LanguageManager.mNameListItem[ 86], 128, 2); - GregTech_API.sItemList[ 87] = new GT_File_Item (GT_Mod.sItemIDs[ 87], GT_LanguageManager.mNameListItem[ 87], 256, 3); - GregTech_API.sItemList[ 88] = new GT_File_Item (GT_Mod.sItemIDs[ 88], GT_LanguageManager.mNameListItem[ 88], 1280, 3); - GregTech_API.sItemList[ 89] = new GT_File_Item (GT_Mod.sItemIDs[ 89], GT_LanguageManager.mNameListItem[ 89], 5120, 4); - GregTech_API.sItemList[ 90] = new GT_Spray_Bug_Item (GT_Mod.sItemIDs[ 90], GT_LanguageManager.mNameListItem[ 90], 128, 2); - GregTech_API.sItemList[ 91] = new GT_Spray_Ice_Item (GT_Mod.sItemIDs[ 91], GT_LanguageManager.mNameListItem[ 91], 512, 4); - GregTech_API.sItemList[ 92] = new GT_Spray_Hardener_Item (GT_Mod.sItemIDs[ 92], GT_LanguageManager.mNameListItem[ 92], 256, 0); - GregTech_API.sItemList[ 93] = new GT_Spray_Foam_Item (GT_Mod.sItemIDs[ 93], GT_LanguageManager.mNameListItem[ 93], 400, 0); - GregTech_API.sItemList[ 94] = new GT_Spray_Pepper_Item (GT_Mod.sItemIDs[ 94], GT_LanguageManager.mNameListItem[ 94], 128, 2); - GregTech_API.sItemList[ 95] = new GT_Spray_Hydration_Item (GT_Mod.sItemIDs[ 95], GT_LanguageManager.mNameListItem[ 95], 2560, 0); - GregTech_API.sItemList[ 96] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[ 96], GT_LanguageManager.mNameListItem[ 96], 2048, 0, (byte) 0); - GregTech_API.sItemList[ 97] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[ 97], GT_LanguageManager.mNameListItem[ 97], 2048, 0, (byte) 1); - GregTech_API.sItemList[ 98] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[ 98], GT_LanguageManager.mNameListItem[ 98], 2048, 0, (byte) 2); - GregTech_API.sItemList[ 99] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[ 99], GT_LanguageManager.mNameListItem[ 99], 2048, 0, (byte) 3); - GregTech_API.sItemList[100] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[100], GT_LanguageManager.mNameListItem[100], 2048, 0, (byte) 4); - GregTech_API.sItemList[101] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[101], GT_LanguageManager.mNameListItem[101], 2048, 0, (byte) 5); - GregTech_API.sItemList[102] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[102], GT_LanguageManager.mNameListItem[102], 2048, 0, (byte) 6); - GregTech_API.sItemList[103] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[103], GT_LanguageManager.mNameListItem[103], 2048, 0, (byte) 7); - GregTech_API.sItemList[104] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[104], GT_LanguageManager.mNameListItem[104], 2048, 0, (byte) 8); - GregTech_API.sItemList[105] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[105], GT_LanguageManager.mNameListItem[105], 2048, 0, (byte) 9); - GregTech_API.sItemList[106] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[106], GT_LanguageManager.mNameListItem[106], 2048, 0, (byte)10); - GregTech_API.sItemList[107] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[107], GT_LanguageManager.mNameListItem[107], 2048, 0, (byte)11); - GregTech_API.sItemList[108] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[108], GT_LanguageManager.mNameListItem[108], 2048, 0, (byte)12); - GregTech_API.sItemList[109] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[109], GT_LanguageManager.mNameListItem[109], 2048, 0, (byte)13); - GregTech_API.sItemList[110] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[110], GT_LanguageManager.mNameListItem[110], 2048, 0, (byte)14); - GregTech_API.sItemList[111] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[111], GT_LanguageManager.mNameListItem[111], 2048, 0, (byte)15); - GregTech_API.sItemList[112] = GregTech_API.constructEmptyElectricToolItem (GT_Mod.sItemIDs[112], GT_LanguageManager.mNameListItem[112], 16, 70); - GregTech_API.sItemList[113] = GregTech_API.constructEmptyElectricToolItem (GT_Mod.sItemIDs[113], GT_LanguageManager.mNameListItem[113], 128, 71); - GregTech_API.sItemList[114] = GregTech_API.constructEmptyElectricToolItem (GT_Mod.sItemIDs[114], GT_LanguageManager.mNameListItem[114], 10, 77); - GregTech_API.sItemList[115] = new GT_Saw_Item (GT_Mod.sItemIDs[115], GT_LanguageManager.mNameListItem[115], 128, 2, 2, 3.0F, 0, -1); - GregTech_API.sItemList[116] = new GT_Saw_Item (GT_Mod.sItemIDs[116], GT_LanguageManager.mNameListItem[116], 256, 3, 2, 4.0F, 0, -1); - GregTech_API.sItemList[117] = new GT_Saw_Item (GT_Mod.sItemIDs[117], GT_LanguageManager.mNameListItem[117], 1280, 4, 3, 6.0F, 0, -1); - GregTech_API.sItemList[118] = new GT_Saw_Item (GT_Mod.sItemIDs[118], GT_LanguageManager.mNameListItem[118], 5120, 5, 4, 8.0F, 0, -1); - GregTech_API.sItemList[119] = GregTech_API.constructElectricSawItem (GT_Mod.sItemIDs[119], GT_LanguageManager.mNameListItem[119], 16, 9, 3,10.0F, 100, 121).setCraftingSound(GregTech_API.sSoundList.get(104)).setBreakingSound(GregTech_API.sSoundList.get(104)).setBlockBreakSound(GregTech_API.sSoundList.get(104)).setEntityHitSound(GregTech_API.sSoundList.get(105)); - GregTech_API.sItemList[120] = GregTech_API.constructElectricSawItem (GT_Mod.sItemIDs[120], GT_LanguageManager.mNameListItem[120], 128,12, 4,12.0F, 200, 122).setCraftingSound(GregTech_API.sSoundList.get(104)).setBreakingSound(GregTech_API.sSoundList.get(104)).setBlockBreakSound(GregTech_API.sSoundList.get(104)).setEntityHitSound(GregTech_API.sSoundList.get(105)); - GregTech_API.sItemList[121] = GregTech_API.constructEmptyElectricToolItem (GT_Mod.sItemIDs[121], GT_LanguageManager.mNameListItem[121], 10, 119); - GregTech_API.sItemList[122] = GregTech_API.constructEmptyElectricToolItem (GT_Mod.sItemIDs[122], GT_LanguageManager.mNameListItem[122], 10, 120); - GregTech_API.sItemList[123] = GregTech_API.constructElectricDrillItem (GT_Mod.sItemIDs[123], GT_LanguageManager.mNameListItem[123], 128, 8, 5,35.0F, 250, -1).addToMaterialList(Material.anvil).addToMaterialList(Material.iron).addToMaterialList(Material.rock).setPrimaryToolClass("pickaxe").setSecondaryToolClass("shovel").setBlockBreakSound(GregTech_API.sSoundList.get(106)).setEntityHitSound(GregTech_API.sSoundList.get(106)); - GregTech_API.sItemList[124] = new GT_Vanilla_Sword (GT_Mod.sItemIDs[124], GT_LanguageManager.mNameListItem[124], "Flint" , 1, 5, GT_Mod.sNerfedStoneTools?128:256 , 4.0F, 1.0F); - GregTech_API.sItemList[125] = new GT_Vanilla_Pickaxe (GT_Mod.sItemIDs[125], GT_LanguageManager.mNameListItem[125], "Flint" , 1, 5, GT_Mod.sNerfedStoneTools?128:256 , 4.0F, 1.0F); - GregTech_API.sItemList[126] = new GT_Vanilla_Shovel (GT_Mod.sItemIDs[126], GT_LanguageManager.mNameListItem[126], "Flint" , 1, 5, GT_Mod.sNerfedStoneTools?128:256 , 4.0F, 1.0F); - GregTech_API.sItemList[127] = new GT_Vanilla_Axe (GT_Mod.sItemIDs[127], GT_LanguageManager.mNameListItem[127], "Flint" , 1, 5, GT_Mod.sNerfedStoneTools?128:256 , 4.0F, 1.0F); - GregTech_API.sItemList[128] = new GT_Vanilla_Hoe (GT_Mod.sItemIDs[128], GT_LanguageManager.mNameListItem[128], "Flint" , 1, 5, GT_Mod.sNerfedStoneTools?128:256 , 4.0F, 1.0F); - GregTech_API.sItemList[129] = new GT_Vanilla_Sword (GT_Mod.sItemIDs[129], GT_LanguageManager.mNameListItem[129], "Steel" , 2, 14, 1280 , 8.0F, 2.0F); - GregTech_API.sItemList[130] = new GT_Vanilla_Pickaxe (GT_Mod.sItemIDs[130], GT_LanguageManager.mNameListItem[130], "Steel" , 2, 14, 1280 , 8.0F, 2.0F); - GregTech_API.sItemList[131] = new GT_Vanilla_Shovel (GT_Mod.sItemIDs[131], GT_LanguageManager.mNameListItem[131], "Steel" , 2, 14, 1280 , 8.0F, 2.0F); - GregTech_API.sItemList[132] = new GT_Vanilla_Axe (GT_Mod.sItemIDs[132], GT_LanguageManager.mNameListItem[132], "Steel" , 2, 14, 1280 , 8.0F, 2.0F); - GregTech_API.sItemList[133] = new GT_Vanilla_Hoe (GT_Mod.sItemIDs[133], GT_LanguageManager.mNameListItem[133], "Steel" , 2, 14, 1280 , 8.0F, 2.0F); - GregTech_API.sItemList[134] = new GT_Vanilla_Sword (GT_Mod.sItemIDs[134], GT_LanguageManager.mNameListItem[134], "TungstenSteel" , 4, 5, 5120 , 12.0F, 3.0F); - GregTech_API.sItemList[135] = new GT_Vanilla_Pickaxe (GT_Mod.sItemIDs[135], GT_LanguageManager.mNameListItem[135], "TungstenSteel" , 4, 5, 5120 , 12.0F, 3.0F); - GregTech_API.sItemList[136] = new GT_Vanilla_Shovel (GT_Mod.sItemIDs[136], GT_LanguageManager.mNameListItem[136], "TungstenSteel" , 4, 5, 5120 , 12.0F, 3.0F); - GregTech_API.sItemList[137] = new GT_Vanilla_Axe (GT_Mod.sItemIDs[137], GT_LanguageManager.mNameListItem[137], "TungstenSteel" , 4, 5, 5120 , 12.0F, 3.0F); - GregTech_API.sItemList[138] = new GT_Vanilla_Hoe (GT_Mod.sItemIDs[138], GT_LanguageManager.mNameListItem[138], "TungstenSteel" , 4, 5, 5120 , 12.0F, 3.0F); + GregTech_API.sItemList[ 30] = new GT_Mortar_Item (GT_LanguageManager.mNameListItem[ 30], 64, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1)); + GregTech_API.sItemList[ 31] = new GT_Generic_Item (GT_LanguageManager.mNameListItem[ 31], "Used to turn Ingots into Dust"); + GregTech_API.sItemList[ 32] = new GT_Sonictron_Item (GT_LanguageManager.mNameListItem[ 32]); + GregTech_API.sItemList[ 33] = new GT_Destructopack_Item (GT_LanguageManager.mNameListItem[ 33]); +// GregTech_API.sItemList[ 34] = GregTech_API.constructCoolantCellItem (GT_LanguageManager.mNameListItem[ 34], 60000, 1); +// GregTech_API.sItemList[ 35] = GregTech_API.constructCoolantCellItem (GT_Mod.sItemIDs[ 35], GT_LanguageManager.mNameListItem[ 35], 180000, 3); +// GregTech_API.sItemList[ 36] = GregTech_API.constructCoolantCellItem (GT_Mod.sItemIDs[ 36], GT_LanguageManager.mNameListItem[ 36], 360000, 6); +// GregTech_API.sItemList[ 37] = GregTech_API.constructElectricEnergyStorageItem (GT_Mod.sItemIDs[ 37], GT_LanguageManager.mNameListItem[ 37],100000000, 8192, 5, 37, 37); +// GregTech_API.sItemList[ 38] = GregTech_API.constructElectricArmorItem (GT_Mod.sItemIDs[ 38], GT_LanguageManager.mNameListItem[ 38],100000000, 8192, 5, 0, 512, 0.0D, false, 1, tArmorID3); +// GregTech_API.sItemList[ 39] = GregTech_API.constructElectricDrillItem (GT_Mod.sItemIDs[ 39], GT_LanguageManager.mNameListItem[ 39], 10, 0, 2, 7.5F, 50, -1).setElectricTier(1).setBlockBreakSound(GregTech_API.sSoundList.get(107)).setEntityHitSound(GregTech_API.sSoundList.get(107)); +// try {GregTech_API.sItemList[ 40] = new GT_NeutronReflector_Item (GT_Mod.sItemIDs[ 40], GT_LanguageManager.mNameListItem[ 40], 0); } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) GT_Log.log.catching(e);} +// GregTech_API.sItemList[ 41] = GregTech_API.constructElectricDrillItem (GT_Mod.sItemIDs[ 41], GT_LanguageManager.mNameListItem[ 41], 10, 0, 2, 15.0F, 100, -1).setElectricTier(1).setBlockBreakSound(GregTech_API.sSoundList.get(107)).setEntityHitSound(GregTech_API.sSoundList.get(107)); +// GregTech_API.sItemList[ 42] = GregTech_API.constructElectricDrillItem (GT_Mod.sItemIDs[ 42], GT_LanguageManager.mNameListItem[ 42], 100, 0, 3, 45.0F, 250, -1).setElectricTier(2).setBlockBreakSound(GregTech_API.sSoundList.get(107)).setEntityHitSound(GregTech_API.sSoundList.get(107)); +// GregTech_API.sItemList[ 43] = new GT_Dataorb_Item (GT_Mod.sItemIDs[ 43], GT_LanguageManager.mNameListItem[ 43]); +// GregTech_API.sItemList[ 44] = GregTech_API.constructElectricArmorItem (GT_Mod.sItemIDs[ 44], GT_LanguageManager.mNameListItem[ 44], 10000, 32, 1, 0, 16|32, 0.0D, false, 0, tArmorID1); +// GregTech_API.sItemList[ 45] = GregTech_API.constructElectricArmorItem (GT_Mod.sItemIDs[ 45], GT_LanguageManager.mNameListItem[ 45],100000000, 8192, 5, 0, 0, 0.0D, true, 1, tArmorID1); +// GregTech_API.sItemList[ 46] = GregTech_API.constructElectricDrillItem (GT_Mod.sItemIDs[ 46], GT_LanguageManager.mNameListItem[ 46], 10, 0, 5, 3.0F, 1000, -1).setElectricTier(1).addToMaterialList(Material.anvil).addToMaterialList(Material.iron).addToMaterialList(Material.rock).setPrimaryToolClass("pickaxe").setSilkyness(3); +// try {GregTech_API.sItemList[ 47] = new GT_Teslastaff_Item (GT_Mod.sItemIDs[ 47], GT_LanguageManager.mNameListItem[ 47]); } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) GT_Log.log.catching(e);} +// GregTech_API.sItemList[ 48] = GregTech_API.constructRadioactiveCellItem (GT_Mod.sItemIDs[ 48], GT_LanguageManager.mNameListItem[ 48], 25000, 1, -5, null); +// GregTech_API.sItemList[ 49] = GregTech_API.constructRadioactiveCellItem (GT_Mod.sItemIDs[ 49], GT_LanguageManager.mNameListItem[ 49], 25000, 2, -5, null); +// GregTech_API.sItemList[ 50] = GregTech_API.constructRadioactiveCellItem (GT_Mod.sItemIDs[ 50], GT_LanguageManager.mNameListItem[ 50], 25000, 4, -5, null); +// GregTech_API.sItemList[ 51] = GregTech_API.constructRadioactiveCellItem (GT_Mod.sItemIDs[ 51], GT_LanguageManager.mNameListItem[ 51], 20000, 1, 2, GT_ModHandler.getIC2Item("nearDepletedUraniumCell", 4)); +// GregTech_API.sItemList[ 52] = GregTech_API.constructRadioactiveCellItem (GT_Mod.sItemIDs[ 52], GT_LanguageManager.mNameListItem[ 52], 20000, 2, 2, GT_ModHandler.getIC2Item("nearDepletedUraniumCell", 4)); +// GregTech_API.sItemList[ 53] = GregTech_API.constructRadioactiveCellItem (GT_Mod.sItemIDs[ 53], GT_LanguageManager.mNameListItem[ 53], 20000, 4, 2, GT_ModHandler.getIC2Item("nearDepletedUraniumCell", 4)); +// //GregTech_API.sItemList[ 54] = GregTech_API.constructRadioactiveCellItem (GT_Mod.sItemIDs[ 54], GT_LanguageManager.mNameListItem[ 54], 200, 1, 0, GT_MetaItem_Cell.instance.getUnunifiedStack(2, 1)); +// try {GregTech_API.sItemList[ 55] = new GT_Debug_Item (GT_Mod.sItemIDs[ 55], GT_LanguageManager.mNameListItem[ 55]); } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) GT_Log.log.catching(e);} +// GregTech_API.sItemList[ 56] = GregTech_API.constructElectricEnergyStorageItem (GT_Mod.sItemIDs[ 56], GT_LanguageManager.mNameListItem[ 56], 100000, 128, 1, 56, 57).setMaxStackSize(16).setMaxDamage(0); +// GregTech_API.sItemList[ 57] = GregTech_API.constructElectricEnergyStorageItem (GT_Mod.sItemIDs[ 57], GT_LanguageManager.mNameListItem[ 57], 100000, 128, 1, 56, 57); +// GregTech_API.sItemList[ 58] = GregTech_API.constructElectricArmorItem (GT_Mod.sItemIDs[ 58], GT_LanguageManager.mNameListItem[ 58], 600000, 128, 1, 0, 0, 0.0D, true, 1, tArmorID2); +// //try {GregTech_API.sItemList[ 59] = Shield } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) e.printStackTrace(GT_Log.err);} +// GregTech_API.sItemList[ 60] = GregTech_API.constructCoolantCellItem (GT_Mod.sItemIDs[ 60], GT_LanguageManager.mNameListItem[ 60], 60000, 1); +// GregTech_API.sItemList[ 61] = GregTech_API.constructCoolantCellItem (GT_Mod.sItemIDs[ 61], GT_LanguageManager.mNameListItem[ 61], 180000, 3); +// GregTech_API.sItemList[ 62] = GregTech_API.constructCoolantCellItem (GT_Mod.sItemIDs[ 62], GT_LanguageManager.mNameListItem[ 62], 360000, 6); +// try {GregTech_API.sItemList[ 63] = new GT_Scanner_Item (GT_Mod.sItemIDs[ 63], GT_LanguageManager.mNameListItem[ 63]); } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) GT_Log.log.catching(e);} +// GregTech_API.sItemList[ 64] = GregTech_API.constructCrowbarItem (GT_Mod.sItemIDs[ 64], GT_LanguageManager.mNameListItem[ 64], 256, 6); +// GregTech_API.sItemList[ 65] = new GT_Screwdriver_Item (GT_Mod.sItemIDs[ 65], GT_LanguageManager.mNameListItem[ 65], 256, 4, -1); +// GregTech_API.sItemList[ 66] = GregTech_API.constructWrenchItem (GT_Mod.sItemIDs[ 66], GT_LanguageManager.mNameListItem[ 66], 1280, 8, -1); +// GregTech_API.sItemList[ 67] = GregTech_API.constructWrenchItem (GT_Mod.sItemIDs[ 67], GT_LanguageManager.mNameListItem[ 67], 128, 4, -1); +// GregTech_API.sItemList[ 68] = GregTech_API.constructWrenchItem (GT_Mod.sItemIDs[ 68], GT_LanguageManager.mNameListItem[ 68], 5120, 10, -1); +// GregTech_API.sItemList[ 69] = GregTech_API.constructWrenchItem (GT_Mod.sItemIDs[ 69], GT_LanguageManager.mNameListItem[ 69], 256, 6, -1); +// GregTech_API.sItemList[ 70] = GregTech_API.constructElectricWrenchItem (GT_Mod.sItemIDs[ 70], GT_LanguageManager.mNameListItem[ 70], 16, 0, 112); +// GregTech_API.sItemList[ 71] = GregTech_API.constructElectricWrenchItem (GT_Mod.sItemIDs[ 71], GT_LanguageManager.mNameListItem[ 71], 128, 0, 113); +// GregTech_API.sItemList[ 72] = new GT_SoftHammer_Item (GT_Mod.sItemIDs[ 72], GT_LanguageManager.mNameListItem[ 72], 128, 4); +// GregTech_API.sItemList[ 73] = GregTech_API.constructHardHammerItem (GT_Mod.sItemIDs[ 73], GT_LanguageManager.mNameListItem[ 73], 128, 4); +// GregTech_API.sItemList[ 74] = GregTech_API.constructHardHammerItem (GT_Mod.sItemIDs[ 74], GT_LanguageManager.mNameListItem[ 74], 256, 6); +// GregTech_API.sItemList[ 75] = GregTech_API.constructHardHammerItem (GT_Mod.sItemIDs[ 75], GT_LanguageManager.mNameListItem[ 75], 1280, 8); +// GregTech_API.sItemList[ 76] = GregTech_API.constructHardHammerItem (GT_Mod.sItemIDs[ 76], GT_LanguageManager.mNameListItem[ 76], 5120, 10); +// GregTech_API.sItemList[ 77] = GregTech_API.constructElectricSolderingToolItem (GT_Mod.sItemIDs[ 77], GT_LanguageManager.mNameListItem[ 77], 10, 0, 114); +// GregTech_API.sItemList[ 78] = new GT_SolderingMetal_Item (GT_Mod.sItemIDs[ 78], GT_LanguageManager.mNameListItem[ 78], 50, 0); +// GregTech_API.sItemList[ 79] = new GT_SolderingMetal_Item (GT_Mod.sItemIDs[ 79], GT_LanguageManager.mNameListItem[ 79], 10, 0); +// GregTech_API.sItemList[ 80] = new GT_Durable_Item (GT_Mod.sItemIDs[ 80], GT_LanguageManager.mNameListItem[ 80], "Turbine Efficiency: 60%" , 15000); +// GregTech_API.sItemList[ 81] = new GT_Durable_Item (GT_Mod.sItemIDs[ 81], GT_LanguageManager.mNameListItem[ 81], "Turbine Efficiency: 80%" , 10000); +// GregTech_API.sItemList[ 82] = new GT_Durable_Item (GT_Mod.sItemIDs[ 82], GT_LanguageManager.mNameListItem[ 82], "Turbine Efficiency: 100%" , 10000); +// GregTech_API.sItemList[ 83] = new GT_Durable_Item (GT_Mod.sItemIDs[ 83], GT_LanguageManager.mNameListItem[ 83], "Turbine Efficiency: 90%" , 30000); +// GregTech_API.sItemList[ 84] = new GT_Durable_Item (GT_Mod.sItemIDs[ 84], GT_LanguageManager.mNameListItem[ 84], "Turbine Efficiency: 125%" , 2500); +// GregTech_API.sItemList[ 85] = new GT_Durable_Item (GT_Mod.sItemIDs[ 85], GT_LanguageManager.mNameListItem[ 85], "Filters Lava in Thermal Boilers" , 100); +// GregTech_API.sItemList[ 86] = new GT_File_Item (GT_Mod.sItemIDs[ 86], GT_LanguageManager.mNameListItem[ 86], 128, 2); +// GregTech_API.sItemList[ 87] = new GT_File_Item (GT_Mod.sItemIDs[ 87], GT_LanguageManager.mNameListItem[ 87], 256, 3); +// GregTech_API.sItemList[ 88] = new GT_File_Item (GT_Mod.sItemIDs[ 88], GT_LanguageManager.mNameListItem[ 88], 1280, 3); +// GregTech_API.sItemList[ 89] = new GT_File_Item (GT_Mod.sItemIDs[ 89], GT_LanguageManager.mNameListItem[ 89], 5120, 4); +// GregTech_API.sItemList[ 90] = new GT_Spray_Bug_Item (GT_Mod.sItemIDs[ 90], GT_LanguageManager.mNameListItem[ 90], 128, 2); +// GregTech_API.sItemList[ 91] = new GT_Spray_Ice_Item (GT_Mod.sItemIDs[ 91], GT_LanguageManager.mNameListItem[ 91], 512, 4); +// GregTech_API.sItemList[ 92] = new GT_Spray_Hardener_Item (GT_Mod.sItemIDs[ 92], GT_LanguageManager.mNameListItem[ 92], 256, 0); +// GregTech_API.sItemList[ 93] = new GT_Spray_Foam_Item (GT_Mod.sItemIDs[ 93], GT_LanguageManager.mNameListItem[ 93], 400, 0); +// GregTech_API.sItemList[ 94] = new GT_Spray_Pepper_Item (GT_Mod.sItemIDs[ 94], GT_LanguageManager.mNameListItem[ 94], 128, 2); +// GregTech_API.sItemList[ 95] = new GT_Spray_Hydration_Item (GT_Mod.sItemIDs[ 95], GT_LanguageManager.mNameListItem[ 95], 2560, 0); +// GregTech_API.sItemList[ 96] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[ 96], GT_LanguageManager.mNameListItem[ 96], 2048, 0, (byte) 0); +// GregTech_API.sItemList[ 97] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[ 97], GT_LanguageManager.mNameListItem[ 97], 2048, 0, (byte) 1); +// GregTech_API.sItemList[ 98] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[ 98], GT_LanguageManager.mNameListItem[ 98], 2048, 0, (byte) 2); +// GregTech_API.sItemList[ 99] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[ 99], GT_LanguageManager.mNameListItem[ 99], 2048, 0, (byte) 3); +// GregTech_API.sItemList[100] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[100], GT_LanguageManager.mNameListItem[100], 2048, 0, (byte) 4); +// GregTech_API.sItemList[101] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[101], GT_LanguageManager.mNameListItem[101], 2048, 0, (byte) 5); +// GregTech_API.sItemList[102] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[102], GT_LanguageManager.mNameListItem[102], 2048, 0, (byte) 6); +// GregTech_API.sItemList[103] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[103], GT_LanguageManager.mNameListItem[103], 2048, 0, (byte) 7); +// GregTech_API.sItemList[104] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[104], GT_LanguageManager.mNameListItem[104], 2048, 0, (byte) 8); +// GregTech_API.sItemList[105] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[105], GT_LanguageManager.mNameListItem[105], 2048, 0, (byte) 9); +// GregTech_API.sItemList[106] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[106], GT_LanguageManager.mNameListItem[106], 2048, 0, (byte)10); +// GregTech_API.sItemList[107] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[107], GT_LanguageManager.mNameListItem[107], 2048, 0, (byte)11); +// GregTech_API.sItemList[108] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[108], GT_LanguageManager.mNameListItem[108], 2048, 0, (byte)12); +// GregTech_API.sItemList[109] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[109], GT_LanguageManager.mNameListItem[109], 2048, 0, (byte)13); +// GregTech_API.sItemList[110] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[110], GT_LanguageManager.mNameListItem[110], 2048, 0, (byte)14); +// GregTech_API.sItemList[111] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[111], GT_LanguageManager.mNameListItem[111], 2048, 0, (byte)15); +// GregTech_API.sItemList[112] = GregTech_API.constructEmptyElectricToolItem (GT_Mod.sItemIDs[112], GT_LanguageManager.mNameListItem[112], 16, 70); +// GregTech_API.sItemList[113] = GregTech_API.constructEmptyElectricToolItem (GT_Mod.sItemIDs[113], GT_LanguageManager.mNameListItem[113], 128, 71); +// GregTech_API.sItemList[114] = GregTech_API.constructEmptyElectricToolItem (GT_Mod.sItemIDs[114], GT_LanguageManager.mNameListItem[114], 10, 77); +// GregTech_API.sItemList[115] = new GT_Saw_Item (GT_Mod.sItemIDs[115], GT_LanguageManager.mNameListItem[115], 128, 2, 2, 3.0F, 0, -1); +// GregTech_API.sItemList[116] = new GT_Saw_Item (GT_Mod.sItemIDs[116], GT_LanguageManager.mNameListItem[116], 256, 3, 2, 4.0F, 0, -1); +// GregTech_API.sItemList[117] = new GT_Saw_Item (GT_Mod.sItemIDs[117], GT_LanguageManager.mNameListItem[117], 1280, 4, 3, 6.0F, 0, -1); +// GregTech_API.sItemList[118] = new GT_Saw_Item (GT_Mod.sItemIDs[118], GT_LanguageManager.mNameListItem[118], 5120, 5, 4, 8.0F, 0, -1); +// GregTech_API.sItemList[119] = GregTech_API.constructElectricSawItem (GT_Mod.sItemIDs[119], GT_LanguageManager.mNameListItem[119], 16, 9, 3,10.0F, 100, 121).setCraftingSound(GregTech_API.sSoundList.get(104)).setBreakingSound(GregTech_API.sSoundList.get(104)).setBlockBreakSound(GregTech_API.sSoundList.get(104)).setEntityHitSound(GregTech_API.sSoundList.get(105)); +// GregTech_API.sItemList[120] = GregTech_API.constructElectricSawItem (GT_Mod.sItemIDs[120], GT_LanguageManager.mNameListItem[120], 128,12, 4,12.0F, 200, 122).setCraftingSound(GregTech_API.sSoundList.get(104)).setBreakingSound(GregTech_API.sSoundList.get(104)).setBlockBreakSound(GregTech_API.sSoundList.get(104)).setEntityHitSound(GregTech_API.sSoundList.get(105)); +// GregTech_API.sItemList[121] = GregTech_API.constructEmptyElectricToolItem (GT_Mod.sItemIDs[121], GT_LanguageManager.mNameListItem[121], 10, 119); +// GregTech_API.sItemList[122] = GregTech_API.constructEmptyElectricToolItem (GT_Mod.sItemIDs[122], GT_LanguageManager.mNameListItem[122], 10, 120); +// GregTech_API.sItemList[123] = GregTech_API.constructElectricDrillItem (GT_Mod.sItemIDs[123], GT_LanguageManager.mNameListItem[123], 128, 8, 5,35.0F, 250, -1).addToMaterialList(Material.anvil).addToMaterialList(Material.iron).addToMaterialList(Material.rock).setPrimaryToolClass("pickaxe").setSecondaryToolClass("shovel").setBlockBreakSound(GregTech_API.sSoundList.get(106)).setEntityHitSound(GregTech_API.sSoundList.get(106)); +// GregTech_API.sItemList[124] = new GT_Vanilla_Sword (GT_Mod.sItemIDs[124], GT_LanguageManager.mNameListItem[124], "Flint" , 1, 5, GT_Mod.sNerfedStoneTools?128:256 , 4.0F, 1.0F); +// GregTech_API.sItemList[125] = new GT_Vanilla_Pickaxe (GT_Mod.sItemIDs[125], GT_LanguageManager.mNameListItem[125], "Flint" , 1, 5, GT_Mod.sNerfedStoneTools?128:256 , 4.0F, 1.0F); +// GregTech_API.sItemList[126] = new GT_Vanilla_Shovel (GT_Mod.sItemIDs[126], GT_LanguageManager.mNameListItem[126], "Flint" , 1, 5, GT_Mod.sNerfedStoneTools?128:256 , 4.0F, 1.0F); +// GregTech_API.sItemList[127] = new GT_Vanilla_Axe (GT_Mod.sItemIDs[127], GT_LanguageManager.mNameListItem[127], "Flint" , 1, 5, GT_Mod.sNerfedStoneTools?128:256 , 4.0F, 1.0F); +// GregTech_API.sItemList[128] = new GT_Vanilla_Hoe (GT_Mod.sItemIDs[128], GT_LanguageManager.mNameListItem[128], "Flint" , 1, 5, GT_Mod.sNerfedStoneTools?128:256 , 4.0F, 1.0F); +// GregTech_API.sItemList[129] = new GT_Vanilla_Sword (GT_Mod.sItemIDs[129], GT_LanguageManager.mNameListItem[129], "Steel" , 2, 14, 1280 , 8.0F, 2.0F); +// GregTech_API.sItemList[130] = new GT_Vanilla_Pickaxe (GT_Mod.sItemIDs[130], GT_LanguageManager.mNameListItem[130], "Steel" , 2, 14, 1280 , 8.0F, 2.0F); +// GregTech_API.sItemList[131] = new GT_Vanilla_Shovel (GT_Mod.sItemIDs[131], GT_LanguageManager.mNameListItem[131], "Steel" , 2, 14, 1280 , 8.0F, 2.0F); +// GregTech_API.sItemList[132] = new GT_Vanilla_Axe (GT_Mod.sItemIDs[132], GT_LanguageManager.mNameListItem[132], "Steel" , 2, 14, 1280 , 8.0F, 2.0F); +// GregTech_API.sItemList[133] = new GT_Vanilla_Hoe (GT_Mod.sItemIDs[133], GT_LanguageManager.mNameListItem[133], "Steel" , 2, 14, 1280 , 8.0F, 2.0F); +// GregTech_API.sItemList[134] = new GT_Vanilla_Sword (GT_Mod.sItemIDs[134], GT_LanguageManager.mNameListItem[134], "TungstenSteel" , 4, 5, 5120 , 12.0F, 3.0F); +// GregTech_API.sItemList[135] = new GT_Vanilla_Pickaxe (GT_Mod.sItemIDs[135], GT_LanguageManager.mNameListItem[135], "TungstenSteel" , 4, 5, 5120 , 12.0F, 3.0F); +// GregTech_API.sItemList[136] = new GT_Vanilla_Shovel (GT_Mod.sItemIDs[136], GT_LanguageManager.mNameListItem[136], "TungstenSteel" , 4, 5, 5120 , 12.0F, 3.0F); +// GregTech_API.sItemList[137] = new GT_Vanilla_Axe (GT_Mod.sItemIDs[137], GT_LanguageManager.mNameListItem[137], "TungstenSteel" , 4, 5, 5120 , 12.0F, 3.0F); +// GregTech_API.sItemList[138] = new GT_Vanilla_Hoe (GT_Mod.sItemIDs[138], GT_LanguageManager.mNameListItem[138], "TungstenSteel" , 4, 5, 5120 , 12.0F, 3.0F); - GT_Log.out.println("GT_Mod: Hiding certain Items from NEI."); + GT_Log.log.info("GT_Mod: Hiding certain Items from NEI."); try { Class.forName("codechicken.nei.api.API"); - codechicken.nei.api.API.hideItem(GregTech_API.sBlockList[3].blockID); - codechicken.nei.api.API.hideItem(GregTech_API.sItemList[ 4].itemID); - codechicken.nei.api.API.hideItem(GregTech_API.sItemList[ 7].itemID); - codechicken.nei.api.API.hideItem(GregTech_API.sItemList[15].itemID); - codechicken.nei.api.API.hideItem(GregTech_API.sItemList[16].itemID); - codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("wrench", 1).itemID); - codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("electricWrench", 1).itemID); - codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("chainsaw", 1).itemID); - } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) e.printStackTrace(GT_Log.err);} + codechicken.nei.api.API.hideItem(new ItemStack(GregTech_API.sBlockList[3])); + codechicken.nei.api.API.hideItem(new ItemStack(GregTech_API.sItemList[ 4])); + codechicken.nei.api.API.hideItem(new ItemStack(GregTech_API.sItemList[ 7])); + codechicken.nei.api.API.hideItem(new ItemStack(GregTech_API.sItemList[15])); + codechicken.nei.api.API.hideItem(new ItemStack(GregTech_API.sItemList[16])); + codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("wrench", 1)); + codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("electricWrench", 1)); + codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("chainsaw", 1)); + } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) GT_Log.log.catching(e);} - GT_Log.out.println("GT_Mod: Register regular Item Names."); + GT_Log.log.info("GT_Mod: Register regular Item Names."); for (int i = 16; i < GregTech_API.sItemList.length; i++) { if (GregTech_API.sItemList[i] != null) { GT_LanguageManager.addStringLocalization(GregTech_API.sItemList[i].getUnlocalizedName() + ".name", GT_LanguageManager.mRegionalNameListItem[i]); diff --git a/src/main/java/gregtechmod/loaders/preload/GT_InitHardCodedCapeList.java b/src/main/java/gregtechmod/loaders/preload/GT_InitHardCodedCapeList.java index 5cd5a86..ff4162f 100644 --- a/src/main/java/gregtechmod/loaders/preload/GT_InitHardCodedCapeList.java +++ b/src/main/java/gregtechmod/loaders/preload/GT_InitHardCodedCapeList.java @@ -3,6 +3,7 @@ package gregtechmod.loaders.preload; import gregtechmod.GT_Mod; public class GT_InitHardCodedCapeList implements Runnable { + @SuppressWarnings("static-access") @Override public void run() { GT_Mod.instance.mGregTechCapeList.add("bsaa".toLowerCase());