From 1d802999d843e54dfef3ea294e420fd9d8557aa5 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Sun, 10 May 2015 11:23:53 +0200 Subject: More updates. Many bugfixes + 5 Tier Pump + API.jar --- main/java/gregtech/GT_Mod.java | 2 +- main/java/gregtech/api/enums/ItemList.java | 2 +- main/java/gregtech/api/enums/Materials.java | 6 +- main/java/gregtech/api/enums/OrePrefixes.java | 2 +- main/java/gregtech/api/enums/Textures.java | 2 +- .../api/items/GT_RadioactiveCell_Item.java | 4 +- .../api/metatileentity/BaseMetaTileEntity.java | 6 +- main/java/gregtech/api/objects/GT_FluidStack.java | 15 +- main/java/gregtech/api/util/GT_Utility.java | 1 + main/java/gregtech/common/GT_Proxy.java | 2417 ++++++-------------- main/java/gregtech/common/GT_RecipeAdder.java | 2 +- .../common/items/GT_MetaGenerated_Item_01.java | 14 + .../GT_MetaTileEntity_MagicalEnergyAbsorber.java | 21 +- .../basic/GT_MetaTileEntity_Boxinator.java | 23 +- .../machines/basic/GT_MetaTileEntity_Pump.java | 374 +++ .../basic/GT_MetaTileEntity_Teleporter.java | 301 +++ .../multi/GT_MetaTileEntity_FusionComputer.java | 20 +- .../multi/GT_MetaTileEntity_LargeTurbine.java | 179 ++ .../storage/GT_MetaTileEntity_QuantumChest.java | 11 +- .../storage/GT_MetaTileEntity_QuantumTank.java | 8 +- .../loaders/oreprocessing/ProcessingPlate1.java | 2 +- .../loaders/postload/GT_CraftingRecipeLoader.java | 3 + .../loaders/postload/GT_MachineRecipeLoader.java | 16 +- .../preload/GT_Loader_Item_Block_And_Fluid.java | 29 +- .../preload/GT_Loader_MetaTileEntities.java | 21 + 25 files changed, 1700 insertions(+), 1781 deletions(-) create mode 100644 main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java create mode 100644 main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java create mode 100644 main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java (limited to 'main/java') diff --git a/main/java/gregtech/GT_Mod.java b/main/java/gregtech/GT_Mod.java index 2e20c83a53..e0b255a50f 100644 --- a/main/java/gregtech/GT_Mod.java +++ b/main/java/gregtech/GT_Mod.java @@ -1,5 +1,4 @@ /* 1: */ package gregtech; -/* 2: */ /* 3: */ import cpw.mods.fml.common.FMLLog; /* 4: */ import cpw.mods.fml.common.LoadController; /* 5: */ import cpw.mods.fml.common.Loader; @@ -106,6 +105,7 @@ import gregtech.api.enums.*; /* 110: */ import net.minecraft.world.World; /* 111: */ import net.minecraft.world.biome.BiomeGenBase; /* 112: */ import net.minecraftforge.common.ChestGenHooks; +import net.minecraftforge.common.ForgeVersion; /* 113: */ import net.minecraftforge.common.config.Configuration; /* 114: */ import net.minecraftforge.common.config.Property; /* 115: */ import net.minecraftforge.fluids.FluidContainerRegistry; diff --git a/main/java/gregtech/api/enums/ItemList.java b/main/java/gregtech/api/enums/ItemList.java index f93f543b1c..6a24834939 100644 --- a/main/java/gregtech/api/enums/ItemList.java +++ b/main/java/gregtech/api/enums/ItemList.java @@ -645,7 +645,7 @@ public enum ItemList implements IItemContainer { Energy_LapotronicOrb2, ZPM2, Quantum_Tank_LV,Quantum_Tank_MV,Quantum_Tank_HV,Quantum_Tank_EV,Quantum_Tank_IV, Quantum_Chest_LV, Quantum_Chest_MV, Quantum_Chest_HV, Quantum_Chest_EV, Quantum_Chest_IV, - NULL, Cover_RedstoneTransmitterExternal,Cover_RedstoneTransmitterInternal,Cover_RedstoneReceiverExternal,Cover_RedstoneReceiverInternal; + NULL, Cover_RedstoneTransmitterExternal,Cover_RedstoneTransmitterInternal,Cover_RedstoneReceiverExternal,Cover_RedstoneReceiverInternal, LargeTurbine, Ingot_Heavy1,Ingot_Heavy2,Ingot_Heavy3, Pump_LV, Pump_MV, Pump_HV, Pump_EV, Pump_IV, Teleporter; public static final ItemList[] DYE_ONLY_ITEMS = {Color_00, Color_01, Color_02, Color_03, Color_04, Color_05, Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15} diff --git a/main/java/gregtech/api/enums/Materials.java b/main/java/gregtech/api/enums/Materials.java index 3fda89be40..642c6818ea 100644 --- a/main/java/gregtech/api/enums/Materials.java +++ b/main/java/gregtech/api/enums/Materials.java @@ -198,8 +198,10 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Fairy ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Fairy" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), Ludicrite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Ludicrite" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), Pokefennium ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Pokefennium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), - Draconium ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Draconium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), - DraconiumAwakened ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Awakened Draconium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), + Draconium ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Draconium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), + DraconiumAwakened ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Awakened Draconium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), + PurpleAlloy ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 100, 180, 255, 0, "Purple Alloy" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), + InfusedTeslatite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 100, 180, 255, 0, "Infused Teslatite" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), /** * Unknown Material Components. Dead End Section. diff --git a/main/java/gregtech/api/enums/OrePrefixes.java b/main/java/gregtech/api/enums/OrePrefixes.java index c30623a4f5..ad2231a6e4 100644 --- a/main/java/gregtech/api/enums/OrePrefixes.java +++ b/main/java/gregtech/api/enums/OrePrefixes.java @@ -133,7 +133,7 @@ public enum OrePrefixes { compressedDirt ("9^X Compressed Dirt" , "" , "" ,F,F,F,F,F,F,F,F,F,F, 0 , -1, 64, -1), compressedGravel ("9^X Compressed Gravel" , "" , "" ,F,F,F,F,F,F,F,F,F,F, 0 , -1, 64, -1), compressedSand ("9^X Compressed Sand" , "" , "" ,F,F,F,F,F,F,F,F,F,F, 0 , -1, 64, -1), - compressed ("Compressed Materials" , "Compressed " , "" ,T,T,F,F,F,F,T,F,F,F, 0 , M * 1 , 64, -1), // Compressed Material, worth 1 Unit. Introduced by Galacticraft + compressed ("Compressed Materials" , "Compressed " , "" ,T,T,F,F,F,F,T,F,F,F, 0 , M * 2 , 64, -1), // Compressed Material, worth 1 Unit. Introduced by Galacticraft glass ("Glasses" , "" , "" ,F,F,T,F,T,F,F,F,F,F, 0 , -1, 64, -1), paneGlass ("Glass Panes" , "" , "" ,F,F,T,F,F,T,F,F,F,F, 0 , -1, 64, -1), blockGlass ("Glass Blocks" , "" , "" ,F,F,T,F,F,T,F,F,F,F, 0 , -1, 64, -1), diff --git a/main/java/gregtech/api/enums/Textures.java b/main/java/gregtech/api/enums/Textures.java index a0bbce7049..f7278f0d8a 100644 --- a/main/java/gregtech/api/enums/Textures.java +++ b/main/java/gregtech/api/enums/Textures.java @@ -62,7 +62,7 @@ public class Textures { , OVERLAY_TOP_POTIONBREWER_ACTIVE, OVERLAY_TOP_REPLICATOR_ACTIVE, OVERLAY_TOP_MASSFAB_ACTIVE, OVERLAY_TOP_STEAM_HAMMER_ACTIVE, OVERLAY_TOP_STEAM_FURNACE_ACTIVE, OVERLAY_TOP_STEAM_ALLOY_SMELTER_ACTIVE, OVERLAY_TOP_STEAM_MACERATOR_ACTIVE, OVERLAY_TOP_STEAM_COMPRESSOR_ACTIVE, OVERLAY_TOP_STEAM_EXTRACTOR_ACTIVE, OVERLAY_TOP_DISASSEMBLER_ACTIVE, OVERLAY_TOP_BOXINATOR_ACTIVE, OVERLAY_TOP_ROCK_BREAKER_ACTIVE, OVERLAY_TOP_SCANNER_ACTIVE , OVERLAY_FRONT_POTIONBREWER_ACTIVE, OVERLAY_FRONT_REPLICATOR_ACTIVE, OVERLAY_FRONT_MASSFAB_ACTIVE, OVERLAY_FRONT_STEAM_HAMMER_ACTIVE, OVERLAY_FRONT_STEAM_FURNACE_ACTIVE, OVERLAY_FRONT_STEAM_ALLOY_SMELTER_ACTIVE, OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE, OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE, OVERLAY_FRONT_STEAM_EXTRACTOR_ACTIVE, OVERLAY_FRONT_DISASSEMBLER_ACTIVE, OVERLAY_FRONT_BOXINATOR_ACTIVE, OVERLAY_FRONT_ROCK_BREAKER_ACTIVE, OVERLAY_FRONT_SCANNER_ACTIVE , OVERLAY_BOTTOM_POTIONBREWER_ACTIVE, OVERLAY_BOTTOM_REPLICATOR_ACTIVE, OVERLAY_BOTTOM_MASSFAB_ACTIVE, OVERLAY_BOTTOM_STEAM_HAMMER_ACTIVE, OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE, OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER_ACTIVE, OVERLAY_BOTTOM_STEAM_MACERATOR_ACTIVE, OVERLAY_BOTTOM_STEAM_COMPRESSOR_ACTIVE, OVERLAY_BOTTOM_STEAM_EXTRACTOR_ACTIVE, OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE, OVERLAY_BOTTOM_BOXINATOR_ACTIVE, OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE, OVERLAY_BOTTOM_SCANNER_ACTIVE - , OVERLAY_SIDE_POTIONBREWER_ACTIVE, OVERLAY_SIDE_REPLICATOR_ACTIVE, OVERLAY_SIDE_MASSFAB_ACTIVE, OVERLAY_SIDE_STEAM_HAMMER_ACTIVE, OVERLAY_SIDE_STEAM_FURNACE_ACTIVE, OVERLAY_SIDE_STEAM_ALLOY_SMELTER_ACTIVE, OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE, OVERLAY_SIDE_STEAM_COMPRESSOR_ACTIVE, OVERLAY_SIDE_STEAM_EXTRACTOR_ACTIVE, OVERLAY_SIDE_DISASSEMBLER_ACTIVE, OVERLAY_SIDE_BOXINATOR_ACTIVE, OVERLAY_SIDE_ROCK_BREAKER_ACTIVE, OVERLAY_SIDE_SCANNER_ACTIVE + , OVERLAY_SIDE_POTIONBREWER_ACTIVE, OVERLAY_SIDE_REPLICATOR_ACTIVE, OVERLAY_SIDE_MASSFAB_ACTIVE, OVERLAY_SIDE_STEAM_HAMMER_ACTIVE, OVERLAY_SIDE_STEAM_FURNACE_ACTIVE, OVERLAY_SIDE_STEAM_ALLOY_SMELTER_ACTIVE, OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE, OVERLAY_SIDE_STEAM_COMPRESSOR_ACTIVE, OVERLAY_SIDE_STEAM_EXTRACTOR_ACTIVE, OVERLAY_SIDE_DISASSEMBLER_ACTIVE, OVERLAY_SIDE_BOXINATOR_ACTIVE, OVERLAY_SIDE_ROCK_BREAKER_ACTIVE, OVERLAY_SIDE_SCANNER_ACTIVE, OVERLAY_ADV_PUMP, OVERLAY_TELEPORTER,OVERLAY_TELEPORTER_ACTIVE ; protected IIcon mIcon; diff --git a/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java b/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java index 8f1f6d8f9f..a8cc213072 100644 --- a/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java +++ b/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java @@ -75,7 +75,7 @@ public class GT_RadioactiveCell_Item tNBT = new NBTTagCompound(); aStack.setTagCompound(tNBT); } - return tNBT.getInteger("durability"); + return tNBT.getInteger("advDmg"); } public int getMaxNuclearDurability() @@ -156,6 +156,6 @@ public class GT_RadioactiveCell_Item { super.addAdditionalToolTips(aList, aStack); //aList.add("Time left: " + (this.maxDelay - getDurabilityOfStack(aStack)) + " secs"); - aList.add("Durability: "+(this.maxDmg - this.dura)+"/"+this.maxDmg); + aList.add("Durability: "+(this.maxDmg - getDurabilityOfStack(aStack))+"/"+this.maxDmg); } } diff --git a/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index 94c47923d6..a7d92915f5 100644 --- a/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -393,7 +393,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE mRunningThroughTick = false; return; } - if (GregTech_API.sMachineThunderExplosions && worldObj.isThundering() && getRandomNumber(3) == 0) { + if (GregTech_API.sMachineThunderExplosions && worldObj.isThundering() && getBiome().rainfall > 0 && getRandomNumber(3) == 0) { doEnergyExplosion(); } } @@ -651,7 +651,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE @Override public boolean isActive() {return mActive;} @Override public void setActive(boolean aActive) {mActive = aActive;} @Override public long getTimer() {return mTickTimer;} - @Override public boolean decreaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooLessEnergy) {if (!canAccessData()) return false; return mHasEnoughEnergy = decreaseStoredSteam(aEnergy, false) || decreaseStoredEU(aEnergy, aIgnoreTooLessEnergy) || (aIgnoreTooLessEnergy && (decreaseStoredSteam(aEnergy, true)));} + @Override public boolean decreaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooLessEnergy) {if (!canAccessData()) return false; return mHasEnoughEnergy = decreaseStoredEU(aEnergy, aIgnoreTooLessEnergy) || decreaseStoredSteam(aEnergy, false) || (aIgnoreTooLessEnergy && (decreaseStoredSteam(aEnergy, true)));} @Override public boolean increaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooMuchEnergy) {if (!canAccessData()) return false; if (getStoredEU() < getEUCapacity() || aIgnoreTooMuchEnergy) {setStoredEU(mMetaTileEntity.getEUVar() + aEnergy); return true;} return false;} @Override public boolean inputEnergyFrom(byte aSide) {if (aSide == 6) return true; if (isServerSide()) return (aSide>=0&&aSide<6?mActiveEUInputs [aSide]:false)&&!mReleaseEnergy; return isEnergyInputSide (aSide);} @Override public boolean outputsEnergyTo(byte aSide) {if (aSide == 6) return true; if (isServerSide()) return (aSide>=0&&aSide<6?mActiveEUOutputs[aSide]:false)|| mReleaseEnergy; return isEnergyOutputSide(aSide);} @@ -678,7 +678,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE public boolean setStoredEU (long aEnergy) {if (!canAccessData()) return false; if (aEnergy < 0) aEnergy = 0; mMetaTileEntity.setEUVar (aEnergy); return true;} public boolean setStoredSteam (long aEnergy) {if (!canAccessData()) return false; if (aEnergy < 0) aEnergy = 0; mMetaTileEntity.setSteamVar (aEnergy); return true;} - public boolean decreaseStoredEU (long aEnergy, boolean aIgnoreTooLessEnergy) {if (!canAccessData()) return false; if (mMetaTileEntity.getEUVar() - aEnergy >= 0 || aIgnoreTooLessEnergy) {setStoredEU(mMetaTileEntity.getEUVar() - aEnergy); if (mMetaTileEntity.getEUVar() < 0) {setStoredEU (0); return false;} return true;} return false;} + public boolean decreaseStoredEU (long aEnergy, boolean aIgnoreTooLessEnergy) {if (!canAccessData()) {return false;} if (mMetaTileEntity.getEUVar() - aEnergy >= 0 || aIgnoreTooLessEnergy) {setStoredEU(mMetaTileEntity.getEUVar() - aEnergy); if (mMetaTileEntity.getEUVar() < 0) {setStoredEU (0); return false;} return true;} return false;} public boolean decreaseStoredSteam (long aEnergy, boolean aIgnoreTooLessEnergy) {if (!canAccessData()) return false; if (mMetaTileEntity.getSteamVar() - aEnergy >= 0 || aIgnoreTooLessEnergy) {setStoredSteam(mMetaTileEntity.getSteamVar() - aEnergy); if (mMetaTileEntity.getSteamVar() < 0) {setStoredSteam(0); return false;} return true;} return false;} public boolean playerOwnsThis(EntityPlayer aPlayer, boolean aCheckPrecicely) {if (!canAccessData()) return false; if (aCheckPrecicely || privateAccess() || mOwnerName.equals("")) if (mOwnerName.equals("")&&isServerSide()) setOwnerName(aPlayer.getDisplayName()); else if (privateAccess() && !aPlayer.getDisplayName().equals("Player") && !mOwnerName.equals("Player") && !mOwnerName.equals(aPlayer.getDisplayName())) return false; return true;} diff --git a/main/java/gregtech/api/objects/GT_FluidStack.java b/main/java/gregtech/api/objects/GT_FluidStack.java index 12735101ca..ac54003d35 100644 --- a/main/java/gregtech/api/objects/GT_FluidStack.java +++ b/main/java/gregtech/api/objects/GT_FluidStack.java @@ -8,6 +8,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Map; +import net.minecraftforge.common.ForgeVersion; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -17,6 +18,7 @@ import net.minecraftforge.fluids.FluidStack; public class GT_FluidStack extends FluidStack { private static final Collection sAllFluidStacks = new ArrayList(5000); private Fluid mFluid; + private static boolean lock=false; public GT_FluidStack(Fluid aFluid, int aAmount) { super(aFluid, aAmount); @@ -29,18 +31,25 @@ public class GT_FluidStack extends FluidStack { } public static void fixAllThoseFuckingFluidIDs() { + if(ForgeVersion.getBuildVersion()<1355){ + while(lock){try {Thread.sleep(1);} catch (InterruptedException e) {}} + lock=true; for (GT_FluidStack tFluid : sAllFluidStacks) tFluid.fixFluidIDForFucksSake(); for (Map tMap : GregTech_API.sFluidMappings) try {GT_Utility.reMap(tMap);} catch(Throwable e) {e.printStackTrace(GT_Log.err);} + lock=false;} } public void fixFluidIDForFucksSake() { - int fluidID = this.getFluid().getID(); - try {fluidID = mFluid.getID();} catch(Throwable e) {fluidID = -1;} + if(ForgeVersion.getBuildVersion()<1355){ + int fluidID; + try {fluidID = this.getFluid().getID();} catch(Throwable e){System.err.println(e);} + try {fluidID = mFluid.getID();} catch(Throwable e) {fluidID = -1;}} } @Override public FluidStack copy() { - fixFluidIDForFucksSake(); + if(ForgeVersion.getBuildVersion()<1355){ + fixFluidIDForFucksSake();} return new GT_FluidStack(this); } } \ No newline at end of file diff --git a/main/java/gregtech/api/util/GT_Utility.java b/main/java/gregtech/api/util/GT_Utility.java index 85a92c32aa..2bfae10fee 100644 --- a/main/java/gregtech/api/util/GT_Utility.java +++ b/main/java/gregtech/api/util/GT_Utility.java @@ -963,6 +963,7 @@ public class GT_Utility { public static boolean addSimpleIC2MachineRecipe(ItemStack aInput, Map aRecipeList, NBTTagCompound aNBT, Object... aOutput) { if (isStackInvalid(aInput) || aOutput.length == 0 || aRecipeList == null) return F; ItemData tOreName = GT_OreDictUnificator.getAssociation(aInput); + for(int i = 0;i mEvents = new HashSet(); - private final Collection mIgnoredItems = new HashSet( - Arrays.asList(new String[] { "itemGhastTear", "itemFlint", - "itemClay", "itemBucketSaltWater", "itemBucketFreshWater", - "itemBucketWater", "itemRock", "itemReed", "itemArrow", - "itemSaw", "itemKnife", "itemHammer", "itemChisel", - "itemRubber", "itemEssence", "itemIlluminatedPanel", - "itemSkull", "itemRawRubber", "itemBacon", - "itemJetpackAccelerator", "itemLazurite", "itemIridium", - "itemTear", "itemClaw", "itemFertilizer", "itemTar", - "itemSlimeball", "itemCoke", "itemBeeswax", "itemBeeQueen", - "itemForcicium", "itemForcillium", "itemRoyalJelly", - "itemHoneydew", "itemHoney", "itemPollen", "itemReedTypha", - "itemSulfuricAcid", "itemPotash", "itemCompressedCarbon", - "itemBitumen", "itemBioFuel", "itemCokeSugar", - "itemCokeCactus", "itemCharcoalSugar", - "itemCharcoalCactus", "itemSludge", "itemEnrichedAlloy", - "itemQuicksilver", "itemMercury", "itemOsmium", - "itemUltimateCircuit", "itemEnergizedStar", - "itemAntimatterMolecule", "itemAntimatterGlob", "itemCoal", - "itemBoat", "itemHerbalMedicineCake", "itemCakeSponge", - "itemFishandPumpkinCakeSponge", "itemSoulCleaver", - "itemInstantCake", "itemWhippingCream", - "itemGlisteningWhippingCream", "itemCleaver", - "itemHerbalMedicineWhippingCream", - "itemStrangeWhippingCream", "itemBlazeCleaver", - "itemBakedCakeSponge", "itemMagmaCake", - "itemGlisteningCake", "itemOgreCleaver", - "itemFishandPumpkinCake", "itemMagmaWhippingCream", - "itemMultimeter", "itemSuperconductor" })); - private final Collection mIgnoredNames = new HashSet( - Arrays.asList(new String[] { "grubBee", "chainLink", "candyCane", - "bRedString", "bVial", "bFlask", "anorthositeSmooth", - "migmatiteSmooth", "slateSmooth", "travertineSmooth", - "limestoneSmooth", "orthogneissSmooth", "marbleSmooth", - "honeyDrop", "lumpClay", "honeyEqualssugar", - "flourEqualswheat", "bluestoneInsulated", - "blockWaterstone", "blockSand", "blockTorch", - "blockPumpkin", "blockClothRock", - "blockStainedHardenedClay", "blockQuartzPillar", - "blockQuartzChiselled", "blockSpawner", "blockCloth", - "mobHead", "mobEgg", "enderFlower", "enderChest", - "clayHardened", "dayGemMaterial", "nightGemMaterial", - "snowLayer", "bPlaceholder", "hardenedClay", - "eternalLifeEssence", "sandstone", "wheatRice", - "transdimBlock", "bambooBasket", "lexicaBotania", - "livingwoodTwig", "redstoneCrystal", "pestleAndMortar", - "glowstone", "whiteStone", "stoneSlab", "transdimBlock", - "clayBowl", "clayPlate", "ceramicBowl", "ceramicPlate", - "ovenRack", "clayCup", "ceramicCup", "batteryBox", - "transmutationStone", "torchRedstoneActive", "coal", - "charcoal", "cloth", "cobblestoneSlab", "stoneBrickSlab", - "cobblestoneWall", "stoneBrickWall", "cobblestoneStair", - "stoneBrickStair", "blockCloud", "blockDirt", - "blockTyrian", "blockCarpet", "blockFft", "blockLavastone", - "blockHolystone", "blockConcrete", "sunnariumPart", - "brSmallMachineCyaniteProcessor", "meteoriteCoal", - "blockCobble", "pressOreProcessor", "crusherOreProcessor", - "grinderOreProcessor", "blockRubber", "blockHoney", - "blockHoneydew", "blockPeat", "blockRadioactive", - "blockSlime", "blockCocoa", "blockSugarCane", - "blockLeather", "blockClayBrick", "solarPanelHV", - "cableRedNet", "stoneBowl", "crafterWood", "taintedSoil", - "brickXyEngineering", "breederUranium", "wireMill", - "chunkLazurite", "aluminumNatural", "aluminiumNatural", - "naturalAluminum", "naturalAluminium", - "antimatterMilligram", "antimatterGram", "strangeMatter", - "coalGenerator", "electricFurnace", "unfinishedTank", - "valvePart", "aquaRegia", "leatherSeal", - "leatherSlimeSeal", "hambone", "slimeball", "clay", - "enrichedUranium", "camoPaste" })); - private final Collection mInvalidNames = new HashSet( - Arrays.asList(new String[] { "diamondShard", "redstoneRoot", - "obsidianStick", "bloodstoneOre", "universalCable", - "bronzeTube", "ironTube", "netherTube", "obbyTube", - "infiniteBattery", "eliteBattery", "advancedBattery", - "10kEUStore", "blueDye", "MonazitOre", "quartzCrystal", - "whiteLuminiteCrystal", "darkStoneIngot", "invisiumIngot", - "demoniteOrb", "enderGem", "starconiumGem", - "osmoniumIngot", "tapaziteGem", "zectiumIngot", - "foolsRubyGem", "rubyGem", "meteoriteGem", "adamiteShard", - "sapphireGem", "copperIngot", "ironStick", "goldStick", - "diamondStick", "reinforcedStick", "draconicStick", - "emeraldStick", "copperStick", "tinStick", "silverStick", - "bronzeStick", "steelStick", "leadStick", "manyullynStick", - "arditeStick", "cobaltStick", "aluminiumStick", - "alumiteStick", "oilsandsOre", "copperWire", - "superconductorWire", "sulfuricAcid", "conveyorBelt", - "ironWire", "aluminumWire", "aluminiumWire", "silverWire", - "tinWire", "dustSiliconSmall", "AluminumOre", - "plateHeavyT2", "blockWool", "alloyPlateEnergizedHardened", - "gasWood", "alloyPlateEnergized", "SilverOre", "LeadOre", - "TinOre", "CopperOre", "silverOre", "leadOre", "tinOre", - "copperOre", "bauxiteOre", "HSLivingmetalIngot", - "oilMoving", "oilStill", "oilBucket", "petroleumOre", - "dieselFuel", "diamondNugget", "planks", "wood", "stick", - "sticks", "naquadah", "obsidianRod", "stoneRod", - "thaumiumRod", "steelRod", "netherrackRod", "woodRod", - "ironRod", "cactusRod", "flintRod", "copperRod", - "cobaltRod", "alumiteRod", "blueslimeRod", "arditeRod", - "manyullynRod", "bronzeRod", "boneRod", "slimeRod" })); + private final Collection mIgnoredItems = new HashSet(Arrays.asList(new String[] { "itemGhastTear", "itemFlint", "itemClay", "itemBucketSaltWater", + "itemBucketFreshWater", "itemBucketWater", "itemRock", "itemReed", "itemArrow", "itemSaw", "itemKnife", "itemHammer", "itemChisel", "itemRubber", + "itemEssence", "itemIlluminatedPanel", "itemSkull", "itemRawRubber", "itemBacon", "itemJetpackAccelerator", "itemLazurite", "itemIridium", + "itemTear", "itemClaw", "itemFertilizer", "itemTar", "itemSlimeball", "itemCoke", "itemBeeswax", "itemBeeQueen", "itemForcicium", "itemForcillium", + "itemRoyalJelly", "itemHoneydew", "itemHoney", "itemPollen", "itemReedTypha", "itemSulfuricAcid", "itemPotash", "itemCompressedCarbon", + "itemBitumen", "itemBioFuel", "itemCokeSugar", "itemCokeCactus", "itemCharcoalSugar", "itemCharcoalCactus", "itemSludge", "itemEnrichedAlloy", + "itemQuicksilver", "itemMercury", "itemOsmium", "itemUltimateCircuit", "itemEnergizedStar", "itemAntimatterMolecule", "itemAntimatterGlob", + "itemCoal", "itemBoat", "itemHerbalMedicineCake", "itemCakeSponge", "itemFishandPumpkinCakeSponge", "itemSoulCleaver", "itemInstantCake", + "itemWhippingCream", "itemGlisteningWhippingCream", "itemCleaver", "itemHerbalMedicineWhippingCream", "itemStrangeWhippingCream", + "itemBlazeCleaver", "itemBakedCakeSponge", "itemMagmaCake", "itemGlisteningCake", "itemOgreCleaver", "itemFishandPumpkinCake", + "itemMagmaWhippingCream", "itemMultimeter", "itemSuperconductor" })); + private final Collection mIgnoredNames = new HashSet(Arrays.asList(new String[] { "grubBee", "chainLink", "candyCane", "bRedString", "bVial", + "bFlask", "anorthositeSmooth", "migmatiteSmooth", "slateSmooth", "travertineSmooth", "limestoneSmooth", "orthogneissSmooth", "marbleSmooth", + "honeyDrop", "lumpClay", "honeyEqualssugar", "flourEqualswheat", "bluestoneInsulated", "blockWaterstone", "blockSand", "blockTorch", + "blockPumpkin", "blockClothRock", "blockStainedHardenedClay", "blockQuartzPillar", "blockQuartzChiselled", "blockSpawner", "blockCloth", "mobHead", + "mobEgg", "enderFlower", "enderChest", "clayHardened", "dayGemMaterial", "nightGemMaterial", "snowLayer", "bPlaceholder", "hardenedClay", + "eternalLifeEssence", "sandstone", "wheatRice", "transdimBlock", "bambooBasket", "lexicaBotania", "livingwoodTwig", "redstoneCrystal", + "pestleAndMortar", "glowstone", "whiteStone", "stoneSlab", "transdimBlock", "clayBowl", "clayPlate", "ceramicBowl", "ceramicPlate", "ovenRack", + "clayCup", "ceramicCup", "batteryBox", "transmutationStone", "torchRedstoneActive", "coal", "charcoal", "cloth", "cobblestoneSlab", + "stoneBrickSlab", "cobblestoneWall", "stoneBrickWall", "cobblestoneStair", "stoneBrickStair", "blockCloud", "blockDirt", "blockTyrian", + "blockCarpet", "blockFft", "blockLavastone", "blockHolystone", "blockConcrete", "sunnariumPart", "brSmallMachineCyaniteProcessor", "meteoriteCoal", + "blockCobble", "pressOreProcessor", "crusherOreProcessor", "grinderOreProcessor", "blockRubber", "blockHoney", "blockHoneydew", "blockPeat", + "blockRadioactive", "blockSlime", "blockCocoa", "blockSugarCane", "blockLeather", "blockClayBrick", "solarPanelHV", "cableRedNet", "stoneBowl", + "crafterWood", "taintedSoil", "brickXyEngineering", "breederUranium", "wireMill", "chunkLazurite", "aluminumNatural", "aluminiumNatural", + "naturalAluminum", "naturalAluminium", "antimatterMilligram", "antimatterGram", "strangeMatter", "coalGenerator", "electricFurnace", + "unfinishedTank", "valvePart", "aquaRegia", "leatherSeal", "leatherSlimeSeal", "hambone", "slimeball", "clay", "enrichedUranium", "camoPaste", + "antiBlock", "burntQuartz", "salmonRaw","blockHopper" ,"blockEnderObsidian","blockIcestone","blockMagicWood","blockEnderCore","blockHeeEndium", + "oreHeeEndium","oreHeeEndPowder","oreHeeStardust","oreHeeIgneousRock","oreHeeInstabilityOrb","crystalPureFluix","shardNether","gemFluorite"})); + private final Collection mInvalidNames = new HashSet(Arrays.asList(new String[] { "diamondShard", "redstoneRoot", "obsidianStick", "bloodstoneOre", + "universalCable", "bronzeTube", "ironTube", "netherTube", "obbyTube", "infiniteBattery", "eliteBattery", "advancedBattery", "10kEUStore", + "blueDye", "MonazitOre", "quartzCrystal", "whiteLuminiteCrystal", "darkStoneIngot", "invisiumIngot", "demoniteOrb", "enderGem", "starconiumGem", + "osmoniumIngot", "tapaziteGem", "zectiumIngot", "foolsRubyGem", "rubyGem", "meteoriteGem", "adamiteShard", "sapphireGem", "copperIngot", + "ironStick", "goldStick", "diamondStick", "reinforcedStick", "draconicStick", "emeraldStick", "copperStick", "tinStick", "silverStick", + "bronzeStick", "steelStick", "leadStick", "manyullynStick", "arditeStick", "cobaltStick", "aluminiumStick", "alumiteStick", "oilsandsOre", + "copperWire", "superconductorWire", "sulfuricAcid", "conveyorBelt", "ironWire", "aluminumWire", "aluminiumWire", "silverWire", "tinWire", + "dustSiliconSmall", "AluminumOre", "plateHeavyT2", "blockWool", "alloyPlateEnergizedHardened", "gasWood", "alloyPlateEnergized", "SilverOre", + "LeadOre", "TinOre", "CopperOre", "silverOre", "leadOre", "tinOre", "copperOre", "bauxiteOre", "HSLivingmetalIngot", "oilMoving", "oilStill", + "oilBucket", "petroleumOre", "dieselFuel", "diamondNugget", "planks", "wood", "stick", "sticks", "naquadah", "obsidianRod", "stoneRod", + "thaumiumRod", "steelRod", "netherrackRod", "woodRod", "ironRod", "cactusRod", "flintRod", "copperRod", "cobaltRod", "alumiteRod", "blueslimeRod", + "arditeRod", "manyullynRod", "bronzeRod", "boneRod", "slimeRod", "redalloyBundled", "bluestoneBundled", "infusedteslatiteInsulated", + "redalloyInsulated", "infusedteslatiteBundled" })); public GT_Proxy() { GameRegistry.registerFuelHandler(this); MinecraftForge.EVENT_BUS.register(this); MinecraftForge.ORE_GEN_BUS.register(this); FMLCommonHandler.instance().bus().register(this); - GregTech_API.sThaumcraftCompat = (IThaumcraftCompat) GT_Utility - .callConstructor("gregtech.common.GT_ThaumcraftCompat", 0, - null, GT_Values.D1, new Object[0]); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { - onFluidContainerRegistration(new FluidContainerRegistry.FluidContainerRegisterEvent( - tData)); + GregTech_API.sThaumcraftCompat = (IThaumcraftCompat) GT_Utility.callConstructor("gregtech.common.GT_ThaumcraftCompat", 0, null, GT_Values.D1, + new Object[0]); + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { + onFluidContainerRegistration(new FluidContainerRegistry.FluidContainerRegisterEvent(tData)); } for (String tOreName : OreDictionary.getOreNames()) { ItemStack tOreStack; - for (Iterator i$ = OreDictionary.getOres(tOreName).iterator(); i$ - .hasNext(); registerOre(new OreDictionary.OreRegisterEvent( - tOreName, tOreStack))) { + for (Iterator i$ = OreDictionary.getOres(tOreName).iterator(); i$.hasNext(); registerOre(new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) { tOreStack = (ItemStack) i$.next(); } } @@ -304,229 +238,131 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { GregTech_API.sPreloadStarted = true; NetworkRegistry.INSTANCE.registerGuiHandler(GT_Values.GT, this); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { - if ((tData.filledContainer.getItem() == Items.potionitem) - && (tData.filledContainer.getItemDamage() == 0)) { + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { + if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) { tData.fluid.amount = 0; break; } } GT_Log.out.println("GT_Mod: Getting required Items of other Mods."); - ItemList.TE_Slag.set(GT_ModHandler.getModItem("ThermalExpansion", - "slag", 1L)); - ItemList.TE_Slag_Rich.set(GT_ModHandler.getModItem("ThermalExpansion", - "slagRich", 1L)); - ItemList.TE_Rockwool.set(GT_ModHandler.getModItem("ThermalExpansion", - "rockwool", 1L)); - ItemList.TE_Hardened_Glass.set(GT_ModHandler.getModItem( - "ThermalExpansion", "glassHardened", 1L)); - - ItemList.RC_ShuntingWire.set(GT_ModHandler.getModItem("Railcraft", - "tile.railcraft.machine.delta", 1L, 0)); - ItemList.RC_ShuntingWireFrame.set(GT_ModHandler.getModItem("Railcraft", - "tile.railcraft.frame", 1L, 0)); - ItemList.RC_Rail_Standard.set(GT_ModHandler.getModItem("Railcraft", - "part.rail", 1L, 0)); - ItemList.RC_Rail_Adv.set(GT_ModHandler.getModItem("Railcraft", - "part.rail", 1L, 1)); - ItemList.RC_Rail_Wooden.set(GT_ModHandler.getModItem("Railcraft", - "part.rail", 1L, 2)); - ItemList.RC_Rail_HS.set(GT_ModHandler.getModItem("Railcraft", - "part.rail", 1L, 3)); - ItemList.RC_Rail_Reinforced.set(GT_ModHandler.getModItem("Railcraft", - "part.rail", 1L, 4)); - ItemList.RC_Rail_Electric.set(GT_ModHandler.getModItem("Railcraft", - "part.rail", 1L, 5)); - ItemList.RC_Tie_Wood.set(GT_ModHandler.getModItem("Railcraft", - "part.tie", 1L, 0)); - ItemList.RC_Tie_Stone.set(GT_ModHandler.getModItem("Railcraft", - "part.tie", 1L, 1)); - ItemList.RC_Bed_Wood.set(GT_ModHandler.getModItem("Railcraft", - "part.railbed", 1L, 0)); - ItemList.RC_Bed_Stone.set(GT_ModHandler.getModItem("Railcraft", - "part.railbed", 1L, 1)); - ItemList.RC_Rebar.set(GT_ModHandler.getModItem("Railcraft", - "part.rebar", 1L)); - ItemList.Tool_Sword_Steel.set(GT_ModHandler.getModItem("Railcraft", - "tool.steel.sword", 1L)); - ItemList.Tool_Pickaxe_Steel.set(GT_ModHandler.getModItem("Railcraft", - "tool.steel.pickaxe", 1L)); - ItemList.Tool_Shovel_Steel.set(GT_ModHandler.getModItem("Railcraft", - "tool.steel.shovel", 1L)); - ItemList.Tool_Axe_Steel.set(GT_ModHandler.getModItem("Railcraft", - "tool.steel.axe", 1L)); - ItemList.Tool_Hoe_Steel.set(GT_ModHandler.getModItem("Railcraft", - "tool.steel.hoe", 1L)); - - ItemList.TF_LiveRoot.set(GT_ModHandler.getModItem("TwilightForest", - "item.liveRoot", 1L, 0)); - ItemList.TF_Vial_FieryBlood.set(GT_ModHandler.getModItem( - "TwilightForest", "item.fieryBlood", 1L)); - ItemList.TF_Vial_FieryTears.set(GT_ModHandler.getModItem( - "TwilightForest", "item.fieryTears", 1L)); - - ItemList.FR_Lemon.set(GT_ModHandler.getModItem("Forestry", "fruits", - 1L, 3)); - ItemList.FR_Mulch - .set(GT_ModHandler.getModItem("Forestry", "mulch", 1L)); - ItemList.FR_Fertilizer.set(GT_ModHandler.getModItem("Forestry", - "fertilizerCompound", 1L)); - ItemList.FR_Compost.set(GT_ModHandler.getModItem("Forestry", - "fertilizerBio", 1L)); - ItemList.FR_Silk.set(GT_ModHandler.getModItem("Forestry", - "craftingMaterial", 1L, 2)); - ItemList.FR_Wax - .set(GT_ModHandler.getModItem("Forestry", "beeswax", 1L)); - ItemList.FR_WaxCapsule.set(GT_ModHandler.getModItem("Forestry", - "waxCapsule", 1L)); - ItemList.FR_RefractoryWax.set(GT_ModHandler.getModItem("Forestry", - "refractoryWax", 1L)); - ItemList.FR_RefractoryCapsule.set(GT_ModHandler.getModItem("Forestry", - "refractoryEmpty", 1L)); - ItemList.FR_Bee_Drone.set(GT_ModHandler.getModItem("Forestry", - "beeDroneGE", 1L)); - ItemList.FR_Bee_Princess.set(GT_ModHandler.getModItem("Forestry", - "beePrincessGE", 1L)); - ItemList.FR_Bee_Queen.set(GT_ModHandler.getModItem("Forestry", - "beeQueenGE", 1L)); - ItemList.FR_Tree_Sapling.set(GT_ModHandler.getModItem("Forestry", - "sapling", 1L, - GT_ModHandler.getModItem("Forestry", "saplingGE", 1L))); - ItemList.FR_Butterfly.set(GT_ModHandler.getModItem("Forestry", - "butterflyGE", 1L)); - ItemList.FR_Larvae.set(GT_ModHandler.getModItem("Forestry", - "beeLarvaeGE", 1L)); - ItemList.FR_Serum.set(GT_ModHandler.getModItem("Forestry", "serumGE", - 1L)); - ItemList.FR_Caterpillar.set(GT_ModHandler.getModItem("Forestry", - "caterpillarGE", 1L)); - ItemList.FR_PollenFertile.set(GT_ModHandler.getModItem("Forestry", - "pollenFertile", 1L)); - ItemList.FR_Stick.set(GT_ModHandler.getModItem("Forestry", "oakStick", - 1L)); - ItemList.FR_Casing_Impregnated.set(GT_ModHandler.getModItem("Forestry", - "impregnatedCasing", 1L)); - ItemList.FR_Casing_Sturdy.set(GT_ModHandler.getModItem("Forestry", - "sturdyMachine", 1L)); - ItemList.FR_Casing_Hardened.set(GT_ModHandler.getModItem("Forestry", - "hardenedMachine", 1L)); + ItemList.TE_Slag.set(GT_ModHandler.getModItem("ThermalExpansion", "slag", 1L)); + ItemList.TE_Slag_Rich.set(GT_ModHandler.getModItem("ThermalExpansion", "slagRich", 1L)); + ItemList.TE_Rockwool.set(GT_ModHandler.getModItem("ThermalExpansion", "rockwool", 1L)); + ItemList.TE_Hardened_Glass.set(GT_ModHandler.getModItem("ThermalExpansion", "glassHardened", 1L)); + + ItemList.RC_ShuntingWire.set(GT_ModHandler.getModItem("Railcraft", "tile.railcraft.machine.delta", 1L, 0)); + ItemList.RC_ShuntingWireFrame.set(GT_ModHandler.getModItem("Railcraft", "tile.railcraft.frame", 1L, 0)); + ItemList.RC_Rail_Standard.set(GT_ModHandler.getModItem("Railcraft", "part.rail", 1L, 0)); + ItemList.RC_Rail_Adv.set(GT_ModHandler.getModItem("Railcraft", "part.rail", 1L, 1)); + ItemList.RC_Rail_Wooden.set(GT_ModHandler.getModItem("Railcraft", "part.rail", 1L, 2)); + ItemList.RC_Rail_HS.set(GT_ModHandler.getModItem("Railcraft", "part.rail", 1L, 3)); + ItemList.RC_Rail_Reinforced.set(GT_ModHandler.getModItem("Railcraft", "part.rail", 1L, 4)); + ItemList.RC_Rail_Electric.set(GT_ModHandler.getModItem("Railcraft", "part.rail", 1L, 5)); + ItemList.RC_Tie_Wood.set(GT_ModHandler.getModItem("Railcraft", "part.tie", 1L, 0)); + ItemList.RC_Tie_Stone.set(GT_ModHandler.getModItem("Railcraft", "part.tie", 1L, 1)); + ItemList.RC_Bed_Wood.set(GT_ModHandler.getModItem("Railcraft", "part.railbed", 1L, 0)); + ItemList.RC_Bed_Stone.set(GT_ModHandler.getModItem("Railcraft", "part.railbed", 1L, 1)); + ItemList.RC_Rebar.set(GT_ModHandler.getModItem("Railcraft", "part.rebar", 1L)); + ItemList.Tool_Sword_Steel.set(GT_ModHandler.getModItem("Railcraft", "tool.steel.sword", 1L)); + ItemList.Tool_Pickaxe_Steel.set(GT_ModHandler.getModItem("Railcraft", "tool.steel.pickaxe", 1L)); + ItemList.Tool_Shovel_Steel.set(GT_ModHandler.getModItem("Railcraft", "tool.steel.shovel", 1L)); + ItemList.Tool_Axe_Steel.set(GT_ModHandler.getModItem("Railcraft", "tool.steel.axe", 1L)); + ItemList.Tool_Hoe_Steel.set(GT_ModHandler.getModItem("Railcraft", "tool.steel.hoe", 1L)); + + ItemList.TF_LiveRoot.set(GT_ModHandler.getModItem("TwilightForest", "item.liveRoot", 1L, 0)); + ItemList.TF_Vial_FieryBlood.set(GT_ModHandler.getModItem("TwilightForest", "item.fieryBlood", 1L)); + ItemList.TF_Vial_FieryTears.set(GT_ModHandler.getModItem("TwilightForest", "item.fieryTears", 1L)); + + ItemList.FR_Lemon.set(GT_ModHandler.getModItem("Forestry", "fruits", 1L, 3)); + ItemList.FR_Mulch.set(GT_ModHandler.getModItem("Forestry", "mulch", 1L)); + ItemList.FR_Fertilizer.set(GT_ModHandler.getModItem("Forestry", "fertilizerCompound", 1L)); + ItemList.FR_Compost.set(GT_ModHandler.getModItem("Forestry", "fertilizerBio", 1L)); + ItemList.FR_Silk.set(GT_ModHandler.getModItem("Forestry", "craftingMaterial", 1L, 2)); + ItemList.FR_Wax.set(GT_ModHandler.getModItem("Forestry", "beeswax", 1L)); + ItemList.FR_WaxCapsule.set(GT_ModHandler.getModItem("Forestry", "waxCapsule", 1L)); + ItemList.FR_RefractoryWax.set(GT_ModHandler.getModItem("Forestry", "refractoryWax", 1L)); + ItemList.FR_RefractoryCapsule.set(GT_ModHandler.getModItem("Forestry", "refractoryEmpty", 1L)); + ItemList.FR_Bee_Drone.set(GT_ModHandler.getModItem("Forestry", "beeDroneGE", 1L)); + ItemList.FR_Bee_Princess.set(GT_ModHandler.getModItem("Forestry", "beePrincessGE", 1L)); + ItemList.FR_Bee_Queen.set(GT_ModHandler.getModItem("Forestry", "beeQueenGE", 1L)); + ItemList.FR_Tree_Sapling.set(GT_ModHandler.getModItem("Forestry", "sapling", 1L, GT_ModHandler.getModItem("Forestry", "saplingGE", 1L))); + ItemList.FR_Butterfly.set(GT_ModHandler.getModItem("Forestry", "butterflyGE", 1L)); + ItemList.FR_Larvae.set(GT_ModHandler.getModItem("Forestry", "beeLarvaeGE", 1L)); + ItemList.FR_Serum.set(GT_ModHandler.getModItem("Forestry", "serumGE", 1L)); + ItemList.FR_Caterpillar.set(GT_ModHandler.getModItem("Forestry", "caterpillarGE", 1L)); + ItemList.FR_PollenFertile.set(GT_ModHandler.getModItem("Forestry", "pollenFertile", 1L)); + ItemList.FR_Stick.set(GT_ModHandler.getModItem("Forestry", "oakStick", 1L)); + ItemList.FR_Casing_Impregnated.set(GT_ModHandler.getModItem("Forestry", "impregnatedCasing", 1L)); + ItemList.FR_Casing_Sturdy.set(GT_ModHandler.getModItem("Forestry", "sturdyMachine", 1L)); + ItemList.FR_Casing_Hardened.set(GT_ModHandler.getModItem("Forestry", "hardenedMachine", 1L)); ItemList.Bottle_Empty.set(new ItemStack(Items.glass_bottle, 1)); - ItemList.Cell_Universal_Fluid.set(GT_ModHandler.getIC2Item("FluidCell", - 1L)); - ItemList.Cell_Empty.set(GT_ModHandler.getIC2Item( - "cell", - 1L, - GT_ModHandler.getIC2Item("cellEmpty", 1L, - GT_ModHandler.getIC2Item("emptyCell", 1L)))); - ItemList.Cell_Water.set(GT_ModHandler.getIC2Item("waterCell", 1L, - GT_ModHandler.getIC2Item("cellWater", 1L))); - ItemList.Cell_Lava.set(GT_ModHandler.getIC2Item("lavaCell", 1L, - GT_ModHandler.getIC2Item("cellLava", 1L))); - ItemList.Cell_Air.set(GT_ModHandler.getIC2Item( - "airCell", - 1L, - GT_ModHandler.getIC2Item("cellAir", 1L, - GT_ModHandler.getIC2Item("cellOxygen", 1L)))); - - ItemList.IC2_Item_Casing_Iron.set(GT_ModHandler.getIC2Item( - "casingiron", 1L)); - ItemList.IC2_Item_Casing_Gold.set(GT_ModHandler.getIC2Item( - "casinggold", 1L)); - ItemList.IC2_Item_Casing_Bronze.set(GT_ModHandler.getIC2Item( - "casingbronze", 1L)); - ItemList.IC2_Item_Casing_Copper.set(GT_ModHandler.getIC2Item( - "casingcopper", 1L)); - ItemList.IC2_Item_Casing_Tin.set(GT_ModHandler.getIC2Item("casingtin", - 1L)); - ItemList.IC2_Item_Casing_Lead.set(GT_ModHandler.getIC2Item( - "casinglead", 1L)); - ItemList.IC2_Item_Casing_Steel.set(GT_ModHandler.getIC2Item( - "casingadviron", 1L)); + ItemList.Cell_Universal_Fluid.set(GT_ModHandler.getIC2Item("FluidCell", 1L)); + ItemList.Cell_Empty.set(GT_ModHandler.getIC2Item("cell", 1L, GT_ModHandler.getIC2Item("cellEmpty", 1L, GT_ModHandler.getIC2Item("emptyCell", 1L)))); + ItemList.Cell_Water.set(GT_ModHandler.getIC2Item("waterCell", 1L, GT_ModHandler.getIC2Item("cellWater", 1L))); + ItemList.Cell_Lava.set(GT_ModHandler.getIC2Item("lavaCell", 1L, GT_ModHandler.getIC2Item("cellLava", 1L))); + ItemList.Cell_Air.set(GT_ModHandler.getIC2Item("airCell", 1L, GT_ModHandler.getIC2Item("cellAir", 1L, GT_ModHandler.getIC2Item("cellOxygen", 1L)))); + + ItemList.IC2_Item_Casing_Iron.set(GT_ModHandler.getIC2Item("casingiron", 1L)); + ItemList.IC2_Item_Casing_Gold.set(GT_ModHandler.getIC2Item("casinggold", 1L)); + ItemList.IC2_Item_Casing_Bronze.set(GT_ModHandler.getIC2Item("casingbronze", 1L)); + ItemList.IC2_Item_Casing_Copper.set(GT_ModHandler.getIC2Item("casingcopper", 1L)); + ItemList.IC2_Item_Casing_Tin.set(GT_ModHandler.getIC2Item("casingtin", 1L)); + ItemList.IC2_Item_Casing_Lead.set(GT_ModHandler.getIC2Item("casinglead", 1L)); + ItemList.IC2_Item_Casing_Steel.set(GT_ModHandler.getIC2Item("casingadviron", 1L)); ItemList.IC2_Spray_WeedEx.set(GT_ModHandler.getIC2Item("weedEx", 1L)); - ItemList.IC2_Fuel_Can_Empty.set(GT_ModHandler.getIC2Item( - "fuelCan", - 1L, - GT_ModHandler.getIC2Item("fuelCanEmpty", 1L, - GT_ModHandler.getIC2Item("emptyFuelCan", 1L)))); - ItemList.IC2_Fuel_Can_Filled.set(GT_ModHandler.getIC2Item( - "filledFuelCan", 1L)); - ItemList.IC2_Mixed_Metal_Ingot.set(GT_ModHandler.getIC2Item( - "mixedMetalIngot", 1L)); + ItemList.IC2_Fuel_Can_Empty.set(GT_ModHandler.getIC2Item("fuelCan", 1L, + GT_ModHandler.getIC2Item("fuelCanEmpty", 1L, GT_ModHandler.getIC2Item("emptyFuelCan", 1L)))); + ItemList.IC2_Fuel_Can_Filled.set(GT_ModHandler.getIC2Item("filledFuelCan", 1L)); + ItemList.IC2_Mixed_Metal_Ingot.set(GT_ModHandler.getIC2Item("mixedMetalIngot", 1L)); ItemList.IC2_Fertilizer.set(GT_ModHandler.getIC2Item("fertilizer", 1L)); - ItemList.IC2_CoffeeBeans.set(GT_ModHandler - .getIC2Item("coffeeBeans", 1L)); - ItemList.IC2_CoffeePowder.set(GT_ModHandler.getIC2Item("coffeePowder", - 1L)); + ItemList.IC2_CoffeeBeans.set(GT_ModHandler.getIC2Item("coffeeBeans", 1L)); + ItemList.IC2_CoffeePowder.set(GT_ModHandler.getIC2Item("coffeePowder", 1L)); ItemList.IC2_Hops.set(GT_ModHandler.getIC2Item("hops", 1L)); ItemList.IC2_Resin.set(GT_ModHandler.getIC2Item("resin", 1L)); ItemList.IC2_Plantball.set(GT_ModHandler.getIC2Item("plantBall", 1L)); - ItemList.IC2_PlantballCompressed.set(GT_ModHandler.getIC2Item( - "compressedPlantBall", 1L, - ItemList.IC2_Plantball.get(1L, new Object[0]))); + ItemList.IC2_PlantballCompressed.set(GT_ModHandler.getIC2Item("compressedPlantBall", 1L, ItemList.IC2_Plantball.get(1L, new Object[0]))); ItemList.IC2_Crop_Seeds.set(GT_ModHandler.getIC2Item("cropSeed", 1L)); - ItemList.IC2_Grin_Powder - .set(GT_ModHandler.getIC2Item("grinPowder", 1L)); - ItemList.IC2_Energium_Dust.set(GT_ModHandler.getIC2Item("energiumDust", - 1L)); + ItemList.IC2_Grin_Powder.set(GT_ModHandler.getIC2Item("grinPowder", 1L)); + ItemList.IC2_Energium_Dust.set(GT_ModHandler.getIC2Item("energiumDust", 1L)); ItemList.IC2_Scrap.set(GT_ModHandler.getIC2Item("scrap", 1L)); ItemList.IC2_Scrapbox.set(GT_ModHandler.getIC2Item("scrapBox", 1L)); - ItemList.IC2_Fuel_Rod_Empty - .set(GT_ModHandler.getIC2Item("fuelRod", 1L)); + ItemList.IC2_Fuel_Rod_Empty.set(GT_ModHandler.getIC2Item("fuelRod", 1L)); ItemList.IC2_Food_Can_Empty.set(GT_ModHandler.getIC2Item("tinCan", 1L)); - ItemList.IC2_Food_Can_Filled.set(GT_ModHandler.getIC2Item( - "filledTinCan", 1L, 0)); - ItemList.IC2_Food_Can_Spoiled.set(GT_ModHandler.getIC2Item( - "filledTinCan", 1L, 1)); - ItemList.IC2_Industrial_Diamond.set(GT_ModHandler.getIC2Item( - "industrialDiamond", 1L, new ItemStack(Items.diamond, 1))); - ItemList.IC2_Compressed_Coal_Ball.set(GT_ModHandler.getIC2Item( - "compressedCoalBall", 1L)); - ItemList.IC2_Compressed_Coal_Chunk.set(GT_ModHandler.getIC2Item( - "coalChunk", 1L)); + ItemList.IC2_Food_Can_Filled.set(GT_ModHandler.getIC2Item("filledTinCan", 1L, 0)); + ItemList.IC2_Food_Can_Spoiled.set(GT_ModHandler.getIC2Item("filledTinCan", 1L, 1)); + ItemList.IC2_Industrial_Diamond.set(GT_ModHandler.getIC2Item("industrialDiamond", 1L, new ItemStack(Items.diamond, 1))); + ItemList.IC2_Compressed_Coal_Ball.set(GT_ModHandler.getIC2Item("compressedCoalBall", 1L)); + ItemList.IC2_Compressed_Coal_Chunk.set(GT_ModHandler.getIC2Item("coalChunk", 1L)); ItemList.IC2_ShaftIron.set(GT_ModHandler.getIC2Item("ironshaft", 1L)); ItemList.IC2_ShaftSteel.set(GT_ModHandler.getIC2Item("steelshaft", 1L)); ItemList.IC2_SuBattery.set(GT_ModHandler.getIC2Item("suBattery", 1L)); ItemList.IC2_ReBattery.set(GT_ModHandler.getIC2Item("reBattery", 1L)); ItemList.IC2_AdvBattery.set(GT_ModHandler.getIC2Item("advBattery", 1L)); - ItemList.IC2_EnergyCrystal.set(GT_ModHandler.getIC2Item( - "energyCrystal", 1L)); - ItemList.IC2_LapotronCrystal.set(GT_ModHandler.getIC2Item( - "lapotronCrystal", 1L)); - - ItemList.IC2_LapotronCrystal.set(GT_ModHandler.getIC2Item( - "lapotronCrystal", 1L)); - ItemList.IC2_LapotronCrystal.set(GT_ModHandler.getIC2Item( - "lapotronCrystal", 1L)); - ItemList.IC2_LapotronCrystal.set(GT_ModHandler.getIC2Item( - "lapotronCrystal", 1L)); - - ItemList.Tool_Sword_Bronze.set(GT_ModHandler.getIC2Item("bronzeSword", - 1L)); - ItemList.Tool_Pickaxe_Bronze.set(GT_ModHandler.getIC2Item( - "bronzePickaxe", 1L)); - ItemList.Tool_Shovel_Bronze.set(GT_ModHandler.getIC2Item( - "bronzeShovel", 1L)); + ItemList.IC2_EnergyCrystal.set(GT_ModHandler.getIC2Item("energyCrystal", 1L)); + ItemList.IC2_LapotronCrystal.set(GT_ModHandler.getIC2Item("lapotronCrystal", 1L)); + + ItemList.IC2_LapotronCrystal.set(GT_ModHandler.getIC2Item("lapotronCrystal", 1L)); + ItemList.IC2_LapotronCrystal.set(GT_ModHandler.getIC2Item("lapotronCrystal", 1L)); + ItemList.IC2_LapotronCrystal.set(GT_ModHandler.getIC2Item("lapotronCrystal", 1L)); + + ItemList.Tool_Sword_Bronze.set(GT_ModHandler.getIC2Item("bronzeSword", 1L)); + ItemList.Tool_Pickaxe_Bronze.set(GT_ModHandler.getIC2Item("bronzePickaxe", 1L)); + ItemList.Tool_Shovel_Bronze.set(GT_ModHandler.getIC2Item("bronzeShovel", 1L)); ItemList.Tool_Axe_Bronze.set(GT_ModHandler.getIC2Item("bronzeAxe", 1L)); ItemList.Tool_Hoe_Bronze.set(GT_ModHandler.getIC2Item("bronzeHoe", 1L)); - ItemList.IC2_ForgeHammer.set(GT_ModHandler - .getIC2Item("ForgeHammer", 1L)); + ItemList.IC2_ForgeHammer.set(GT_ModHandler.getIC2Item("ForgeHammer", 1L)); ItemList.IC2_WireCutter.set(GT_ModHandler.getIC2Item("cutter", 1L)); ItemList.Credit_Iron.set(GT_ModHandler.getIC2Item("coin", 1L)); - ItemList.Circuit_Basic.set(GT_ModHandler.getIC2Item( - "electronicCircuit", 1L)); - ItemList.Circuit_Advanced.set(GT_ModHandler.getIC2Item( - "advancedCircuit", 1L)); + ItemList.Circuit_Basic.set(GT_ModHandler.getIC2Item("electronicCircuit", 1L)); + ItemList.Circuit_Advanced.set(GT_ModHandler.getIC2Item("advancedCircuit", 1L)); - ItemList.Upgrade_Overclocker.set(GT_ModHandler.getIC2Item( - "overclockerUpgrade", 1L)); - ItemList.Upgrade_Battery.set(GT_ModHandler.getIC2Item( - "energyStorageUpgrade", 1L)); + ItemList.Upgrade_Overclocker.set(GT_ModHandler.getIC2Item("overclockerUpgrade", 1L)); + ItemList.Upgrade_Battery.set(GT_ModHandler.getIC2Item("energyStorageUpgrade", 1L)); ItemList.Dye_Bonemeal.set(new ItemStack(Items.dye, 1, 15)); ItemList.Dye_SquidInk.set(new ItemStack(Items.dye, 1, 0)); @@ -537,224 +373,122 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { ItemList.Food_Baked_Bread.set(new ItemStack(Items.bread, 1, 0)); ItemList.Food_Raw_Potato.set(new ItemStack(Items.potato, 1, 0)); ItemList.Food_Baked_Potato.set(new ItemStack(Items.baked_potato, 1, 0)); - ItemList.Food_Poisonous_Potato.set(new ItemStack( - Items.poisonous_potato, 1, 0)); + ItemList.Food_Poisonous_Potato.set(new ItemStack(Items.poisonous_potato, 1, 0)); - OrePrefixes.bottle.mContainerItem = ItemList.Bottle_Empty.get(1L, - new Object[0]); + OrePrefixes.bottle.mContainerItem = ItemList.Bottle_Empty.get(1L, new Object[0]); OrePrefixes.bucket.mContainerItem = new ItemStack(Items.bucket, 1); - OrePrefixes.cellPlasma.mContainerItem = ItemList.Cell_Empty.get(1L, - new Object[0]); - OrePrefixes.cell.mContainerItem = ItemList.Cell_Empty.get(1L, - new Object[0]); - - GregTech_API.sFrostHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatHelmet", 1L, 32767)); - GregTech_API.sFrostHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatChestplate", 1L, 32767)); - GregTech_API.sFrostHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatLeggings", 1L, 32767)); - GregTech_API.sFrostHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatBoots", 1L, 32767)); - - GregTech_API.sHeatHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatHelmet", 1L, 32767)); - GregTech_API.sHeatHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatChestplate", 1L, 32767)); - GregTech_API.sHeatHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatLeggings", 1L, 32767)); - GregTech_API.sHeatHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatBoots", 1L, 32767)); - - GregTech_API.sBioHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatHelmet", 1L, 32767)); - GregTech_API.sBioHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatChestplate", 1L, 32767)); - GregTech_API.sBioHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatLeggings", 1L, 32767)); - GregTech_API.sBioHazmatList.add(GT_ModHandler.getIC2Item("hazmatBoots", - 1L, 32767)); - - GregTech_API.sGasHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatHelmet", 1L, 32767)); - GregTech_API.sGasHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatChestplate", 1L, 32767)); - GregTech_API.sGasHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatLeggings", 1L, 32767)); - GregTech_API.sGasHazmatList.add(GT_ModHandler.getIC2Item("hazmatBoots", - 1L, 32767)); - - GregTech_API.sRadioHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatHelmet", 1L, 32767)); - GregTech_API.sRadioHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatChestplate", 1L, 32767)); - GregTech_API.sRadioHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatLeggings", 1L, 32767)); - GregTech_API.sRadioHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatBoots", 1L, 32767)); - - GregTech_API.sElectroHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatHelmet", 1L, 32767)); - GregTech_API.sElectroHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatChestplate", 1L, 32767)); - GregTech_API.sElectroHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatLeggings", 1L, 32767)); - GregTech_API.sElectroHazmatList.add(GT_ModHandler.getIC2Item( - "hazmatBoots", 1L, 32767)); - GregTech_API.sElectroHazmatList.add(new ItemStack( - Items.chainmail_helmet, 1, 32767)); - GregTech_API.sElectroHazmatList.add(new ItemStack( - Items.chainmail_chestplate, 1, 32767)); - GregTech_API.sElectroHazmatList.add(new ItemStack( - Items.chainmail_leggings, 1, 32767)); - GregTech_API.sElectroHazmatList.add(new ItemStack( - Items.chainmail_boots, 1, 32767)); - - GT_ModHandler.sNonReplaceableItems.add(new ItemStack(Items.bow, 1, - 32767)); - GT_ModHandler.sNonReplaceableItems.add(new ItemStack(Items.fishing_rod, - 1, 32767)); - GT_ModHandler.sNonReplaceableItems.add(ItemList.IC2_ForgeHammer - .getWithDamage(1L, 32767L, new Object[0])); - GT_ModHandler.sNonReplaceableItems.add(ItemList.IC2_WireCutter - .getWithDamage(1L, 32767L, new Object[0])); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "painter", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "blackPainter", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "redPainter", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "greenPainter", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "brownPainter", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "bluePainter", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "purplePainter", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "cyanPainter", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "lightGreyPainter", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "darkGreyPainter", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "pinkPainter", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "limePainter", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "yellowPainter", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "cloudPainter", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "magentaPainter", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "orangePainter", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "whitePainter", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "cfPack", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "jetpack", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "treetap", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "weedEx", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "staticBoots", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "compositeArmor", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "hazmatHelmet", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "hazmatChestplate", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "hazmatLeggings", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item( - "hazmatBoots", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "Railcraft", "part.turbine.disk", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "Railcraft", "part.turbine.blade", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "Railcraft", "part.turbine.rotor", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "Railcraft", "borehead.diamond", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "Railcraft", "borehead.steel", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "Railcraft", "borehead.iron", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "TwilightForest", "item.plateNaga", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "TwilightForest", "item.legsNaga", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "TwilightForest", "item.arcticHelm", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "TwilightForest", "item.arcticPlate", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "TwilightForest", "item.arcticLegs", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "TwilightForest", "item.arcticBoots", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "TwilightForest", "item.yetiHelm", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "TwilightForest", "item.yetiPlate", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "TwilightForest", "item.yetiLegs", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "TwilightForest", "item.yetiBoots", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "appliedenergistics2", "item.ToolCertusQuartzCuttingKnife", 1L, - 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "appliedenergistics2", "item.ToolNetherQuartzCuttingKnife", 1L, - 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "Forestry", "apiaristHelmet", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "Forestry", "apiaristChest", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "Forestry", "apiaristLegs", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "Forestry", "apiaristBoots", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "Forestry", "frameUntreated", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "Forestry", "frameImpregnated", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "Forestry", "frameProven", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "Forestry", "waxCast", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "GalacticraftCore", "item.sensorGlasses", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem( - "IC2NuclearControl", "ItemToolThermometer", 1L, 32767)); - - RecipeSorter.register("gregtech:shaped", GT_Shaped_Recipe.class, - RecipeSorter.Category.SHAPED, - "after:minecraft:shaped before:minecraft:shapeless"); - RecipeSorter.register("gregtech:shapeless", GT_Shapeless_Recipe.class, - RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless"); + OrePrefixes.cellPlasma.mContainerItem = ItemList.Cell_Empty.get(1L, new Object[0]); + OrePrefixes.cell.mContainerItem = ItemList.Cell_Empty.get(1L, new Object[0]); + + GregTech_API.sFrostHazmatList.add(GT_ModHandler.getIC2Item("hazmatHelmet", 1L, 32767)); + GregTech_API.sFrostHazmatList.add(GT_ModHandler.getIC2Item("hazmatChestplate", 1L, 32767)); + GregTech_API.sFrostHazmatList.add(GT_ModHandler.getIC2Item("hazmatLeggings", 1L, 32767)); + GregTech_API.sFrostHazmatList.add(GT_ModHandler.getIC2Item("hazmatBoots", 1L, 32767)); + + GregTech_API.sHeatHazmatList.add(GT_ModHandler.getIC2Item("hazmatHelmet", 1L, 32767)); + GregTech_API.sHeatHazmatList.add(GT_ModHandler.getIC2Item("hazmatChestplate", 1L, 32767)); + GregTech_API.sHeatHazmatList.add(GT_ModHandler.getIC2Item("hazmatLeggings", 1L, 32767)); + GregTech_API.sHeatHazmatList.add(GT_ModHandler.getIC2Item("hazmatBoots", 1L, 32767)); + + GregTech_API.sBioHazmatList.add(GT_ModHandler.getIC2Item("hazmatHelmet", 1L, 32767)); + GregTech_API.sBioHazmatList.add(GT_ModHandler.getIC2Item("hazmatChestplate", 1L, 32767)); + GregTech_API.sBioHazmatList.add(GT_ModHandler.getIC2Item("hazmatLeggings", 1L, 32767)); + GregTech_API.sBioHazmatList.add(GT_ModHandler.getIC2Item("hazmatBoots", 1L, 32767)); + + GregTech_API.sGasHazmatList.add(GT_ModHandler.getIC2Item("hazmatHelmet", 1L, 32767)); + GregTech_API.sGasHazmatList.add(GT_ModHandler.getIC2Item("hazmatChestplate", 1L, 32767)); + GregTech_API.sGasHazmatList.add(GT_ModHandler.getIC2Item("hazmatLeggings", 1L, 32767)); + GregTech_API.sGasHazmatList.add(GT_ModHandler.getIC2Item("hazmatBoots", 1L, 32767)); + + GregTech_API.sRadioHazmatList.add(GT_ModHandler.getIC2Item("hazmatHelmet", 1L, 32767)); + GregTech_API.sRadioHazmatList.add(GT_ModHandler.getIC2Item("hazmatChestplate", 1L, 32767)); + GregTech_API.sRadioHazmatList.add(GT_ModHandler.getIC2Item("hazmatLeggings", 1L, 32767)); + GregTech_API.sRadioHazmatList.add(GT_ModHandler.getIC2Item("hazmatBoots", 1L, 32767)); + + GregTech_API.sElectroHazmatList.add(GT_ModHandler.getIC2Item("hazmatHelmet", 1L, 32767)); + GregTech_API.sElectroHazmatList.add(GT_ModHandler.getIC2Item("hazmatChestplate", 1L, 32767)); + GregTech_API.sElectroHazmatList.add(GT_ModHandler.getIC2Item("hazmatLeggings", 1L, 32767)); + GregTech_API.sElectroHazmatList.add(GT_ModHandler.getIC2Item("hazmatBoots", 1L, 32767)); + GregTech_API.sElectroHazmatList.add(new ItemSta