diff --git a/API.jar b/API.jar new file mode 100644 index 00000000..5f421b80 Binary files /dev/null and b/API.jar differ diff --git a/main/java/gregtech/GT_Mod.java b/main/java/gregtech/GT_Mod.java index 2e20c83a..e0b255a5 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 f93f543b..6a248349 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 3fda89be..642c6818 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 c30623a4..ad2231a6 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 a0bbce70..f7278f0d 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 8f1f6d8f..a8cc2130 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 94c47923..a7d92915 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 12735101..ac54003d 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 85a92c32..2bfae10f 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.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.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.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.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.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_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_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.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_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]); + 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.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.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.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.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.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)); + 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)); + 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"); + 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"); } public void onLoad() { GT_Log.out.println("GT_Mod: Beginning Load-Phase."); GT_Log.ore.println("GT_Mod: Beginning Load-Phase."); - GT_OreDictUnificator.registerOre("cropChilipepper", GT_ModHandler - .getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 2)); - GT_OreDictUnificator.registerOre("cropTomato", GT_ModHandler - .getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 8)); - GT_OreDictUnificator.registerOre("cropGrape", GT_ModHandler.getModItem( - "magicalcrops", "magicalcrops_CropProduce", 1L, 4)); - GT_OreDictUnificator.registerOre("cropTea", - GT_ModHandler.getModItem("ganyssurface", "teaLeaves", 1L, 0)); + GT_OreDictUnificator.registerOre("cropChilipepper", GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 2)); + GT_OreDictUnificator.registerOre("cropTomato", GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 8)); + GT_OreDictUnificator.registerOre("cropGrape", GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 4)); + GT_OreDictUnificator.registerOre("cropTea", GT_ModHandler.getModItem("ganyssurface", "teaLeaves", 1L, 0)); GregTech_API.sLoadStarted = true; - 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; } @@ -768,16 +502,13 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { new Thread(new GT_PlayerActivityLogger()).start(); } GregTech_API.sPostloadStarted = true; - 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: Adding Configs specific for MetaTileEntities"); + GT_Log.out.println("GT_Mod: Adding Configs specific for MetaTileEntities"); for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) { try { for (; i < GregTech_API.METATILEENTITIES.length; i++) { @@ -789,635 +520,227 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { e.printStackTrace(GT_Log.err); } } - GT_Log.out - .println("GT_Mod: Adding Tool Usage Crafting Recipes for OreDict Items."); - long tBits = GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED - | GT_ModHandler.RecipeBits.ONLY_ADD_IF_RESULT_IS_NOT_NULL - | GT_ModHandler.RecipeBits.NOT_REMOVABLE; + GT_Log.out.println("GT_Mod: Adding Tool Usage Crafting Recipes for OreDict Items."); + long tBits = GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED + | GT_ModHandler.RecipeBits.ONLY_ADD_IF_RESULT_IS_NOT_NULL | GT_ModHandler.RecipeBits.NOT_REMOVABLE; for (Materials aMaterial : Materials.VALUES) { - if ((aMaterial.mUnificatable) - && (aMaterial.mMaterialInto == aMaterial)) { + if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)) { if (!aMaterial.contains(SubTag.NO_SMASHING)) { - if (GregTech_API.sRecipeFile.get( - ConfigCategories.Tools.hammerplating, - aMaterial.toString(), true)) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, - aMaterial, 1L), - tBits, - new Object[] { "h", "X", "X", - Character.valueOf('X'), + if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.hammerplating, aMaterial.toString(), true)) { + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), tBits, new Object[] { "h", "X", "X", + Character.valueOf('X'), OrePrefixes.ingot.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), tBits, + new Object[] { "h", "X", Character.valueOf('X'), OrePrefixes.gem.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), tBits, + new Object[] { "H", "X", Character.valueOf('H'), ToolDictNames.craftingToolForgeHammer, Character.valueOf('X'), OrePrefixes.ingot.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, - aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), tBits, - new Object[] { "h", "X", - Character.valueOf('X'), + new Object[] { "H", "X", Character.valueOf('H'), ToolDictNames.craftingToolForgeHammer, Character.valueOf('X'), OrePrefixes.gem.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator - .get(OrePrefixes.plate, aMaterial, 1L), tBits, - new Object[] { "H", "X", - Character.valueOf('H'), - ToolDictNames.craftingToolForgeHammer, - Character.valueOf('X'), - OrePrefixes.ingot.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, - aMaterial, 1L), - tBits, - new Object[] { "H", "X", - Character.valueOf('H'), - ToolDictNames.craftingToolForgeHammer, - Character.valueOf('X'), - OrePrefixes.gem.get(aMaterial) }); - GT_ModHandler - .addCraftingRecipe( - GT_OreDictUnificator.get( - OrePrefixes.plate, aMaterial, - 1L), - tBits, - new Object[] { - "h", - "X", - Character.valueOf('X'), - OrePrefixes.ingotDouble - .get(aMaterial) }); - GT_ModHandler - .addCraftingRecipe( - GT_OreDictUnificator.get( - OrePrefixes.plate, aMaterial, - 2L), - tBits, - new Object[] { - "H", - "X", - Character.valueOf('H'), - ToolDictNames.craftingToolForgeHammer, - Character.valueOf('X'), - OrePrefixes.ingotDouble - .get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), tBits, + new Object[] { "h", "X", Character.valueOf('X'), OrePrefixes.ingotDouble.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), tBits, + new Object[] { "H", "X", Character.valueOf('H'), ToolDictNames.craftingToolForgeHammer, Character.valueOf('X'), + OrePrefixes.ingotDouble.get(aMaterial) }); } - if (GregTech_API.sRecipeFile.get( - ConfigCategories.Tools.hammermultiingot, - aMaterial.toString(), true)) { + if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.ingotDouble, aMaterial, 1L), tBits, new Object[] { "I", "I", "h", + Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.ingotTriple, aMaterial, 1L), tBits, new Object[] { "I", "B", "h", + Character.valueOf('I'), OrePrefixes.ingotDouble.get(aMaterial), Character.valueOf('B'), OrePrefixes.ingot.get(aMaterial) }); GT_ModHandler - .addCraftingRecipe( - GT_OreDictUnificator.get( - OrePrefixes.ingotDouble, - aMaterial, 1L), - tBits, - new Object[] { - "I", - "I", - "h", - Character.valueOf('I'), - OrePrefixes.ingot - .get(aMaterial) }); - GT_ModHandler - .addCraftingRecipe( - GT_OreDictUnificator.get( - OrePrefixes.ingotTriple, - aMaterial, 1L), - tBits, - new Object[] { - "I", - "B", - "h", - Character.valueOf('I'), - OrePrefixes.ingotDouble - .get(aMaterial), - Character.valueOf('B'), - OrePrefixes.ingot - .get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get( - OrePrefixes.ingotQuadruple, aMaterial, - 1L), tBits, new Object[] { "I", "B", - "h", Character.valueOf('I'), - OrePrefixes.ingotTriple.get(aMaterial), - Character.valueOf('B'), - OrePrefixes.ingot.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get( - OrePrefixes.ingotQuintuple, aMaterial, - 1L), - tBits, - new Object[] { - "I", - "B", - "h", - Character.valueOf('I'), - OrePrefixes.ingotQuadruple - .get(aMaterial), - Character.valueOf('B'), + .addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.ingotQuadruple, aMaterial, 1L), tBits, + new Object[] { "I", "B", "h", Character.valueOf('I'), OrePrefixes.ingotTriple.get(aMaterial), Character.valueOf('B'), + OrePrefixes.ingot.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.ingotQuintuple, aMaterial, 1L), tBits, + new Object[] { "I", "B", "h", Character.valueOf('I'), OrePrefixes.ingotQuadruple.get(aMaterial), Character.valueOf('B'), OrePrefixes.ingot.get(aMaterial) }); } + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), tBits, new Object[] { "PIh", "P ", + "f ", Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), tBits, new Object[] { "II ", "IIh", + "II ", Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), tBits, new Object[] { "PIh", "f ", + Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), tBits, new Object[] { "PII", "f h", + Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), tBits, new Object[] { "PP", "PP", "hf", + Character.valueOf('P'), OrePrefixes.plate.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), tBits, new Object[] { "PP ", "fh ", + Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), tBits, new Object[] { "PPI", "hf ", + Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, - aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), tBits, - new Object[] { "PIh", "P ", "f ", - Character.valueOf('P'), - OrePrefixes.plate.get(aMaterial), - Character.valueOf('I'), + new Object[] { "fPh", Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get( - OrePrefixes.toolHeadHammer, aMaterial, 1L), - tBits, - new Object[] { "II ", "IIh", "II ", - Character.valueOf('P'), - OrePrefixes.plate.get(aMaterial), - Character.valueOf('I'), - OrePrefixes.ingot.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, - aMaterial, 1L), - tBits, - new Object[] { "PIh", "f ", - Character.valueOf('P'), - OrePrefixes.plate.get(aMaterial), - Character.valueOf('I'), - OrePrefixes.ingot.get(aMaterial) }); - GT_ModHandler - .addCraftingRecipe( - GT_OreDictUnificator.get( - OrePrefixes.toolHeadPickaxe, - aMaterial, 1L), - tBits, - new Object[] { "PII", "f h", - Character.valueOf('P'), - OrePrefixes.plate.get(aMaterial), - Character.valueOf('I'), - OrePrefixes.ingot.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, - aMaterial, 1L), - tBits, - new Object[] { "PP", "PP", "hf", - Character.valueOf('P'), - OrePrefixes.plate.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, - aMaterial, 1L), - tBits, - new Object[] { "PP ", "fh ", - Character.valueOf('P'), - OrePrefixes.plate.get(aMaterial), - Character.valueOf('I'), - OrePrefixes.ingot.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, - aMaterial, 1L), - tBits, - new Object[] { "PPI", "hf ", - Character.valueOf('P'), - OrePrefixes.plate.get(aMaterial), - Character.valueOf('I'), - OrePrefixes.ingot.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get( - OrePrefixes.toolHeadShovel, aMaterial, 1L), - tBits, - new Object[] { "fPh", Character.valueOf('P'), - OrePrefixes.plate.get(aMaterial), - Character.valueOf('I'), - OrePrefixes.ingot.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, - aMaterial, 1L), - tBits, - new Object[] { " P ", "fPh", - Character.valueOf('P'), - OrePrefixes.plate.get(aMaterial), - Character.valueOf('I'), - OrePrefixes.ingot.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.ring, aMaterial, 1L), tBits, - new Object[] { "h ", " X", Character.valueOf('X'), - OrePrefixes.stick.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.stickLong, aMaterial, 1L), tBits, - new Object[] { "ShS", Character.valueOf('S'), - OrePrefixes.stick.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), tBits, new Object[] { " P ", "fPh", + Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), tBits, + new Object[] { "h ", " X", Character.valueOf('X'), OrePrefixes.stick.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), tBits, + new Object[] { "ShS", Character.valueOf('S'), OrePrefixes.stick.get(aMaterial) }); } if (!aMaterial.contains(SubTag.NO_WORKING)) { - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.stick, aMaterial, 2L), tBits, - new Object[] { "s", "X", Character.valueOf('X'), - OrePrefixes.stickLong.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.stick, aMaterial, 1L), tBits, - new Object[] { "f ", " X", Character.valueOf('X'), - OrePrefixes.ingot.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.bolt, aMaterial, 2L), tBits, - new Object[] { "s ", " X", Character.valueOf('X'), - OrePrefixes.stick.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.screw, aMaterial, 1L), tBits, - new Object[] { "fX", "X ", Character.valueOf('X'), - OrePrefixes.bolt.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.round, aMaterial, 1L), tBits, - new Object[] { "fX", "X ", Character.valueOf('X'), - OrePrefixes.nugget.get(aMaterial) }); - GT_ModHandler - .addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.rotor, - aMaterial, 1L), - tBits, - new Object[] { - "PhP", - "SRf", - "PdP", - Character.valueOf('P'), - aMaterial == Materials.Wood ? OrePrefixes.plank - .get(aMaterial) - : OrePrefixes.plate - .get(aMaterial), - Character.valueOf('R'), - OrePrefixes.ring.get(aMaterial), - Character.valueOf('S'), - OrePrefixes.screw.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.stickLong, aMaterial, 1L), tBits, - new Object[] { "sf", "G ", Character.valueOf('G'), - OrePrefixes.gemFlawless.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.stickLong, aMaterial, 2L), tBits, - new Object[] { "sf", "G ", Character.valueOf('G'), - OrePrefixes.gemExquisite.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.wireGt01, aMaterial, 1L), tBits, - new Object[] { "Xx", Character.valueOf('X'), - OrePrefixes.plate.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.wireFine, aMaterial, 1L), tBits, - new Object[] { "Xx", Character.valueOf('X'), - OrePrefixes.foil.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L), tBits, + new Object[] { "s", "X", Character.valueOf('X'), OrePrefixes.stickLong.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), tBits, + new Object[] { "f ", " X", Character.valueOf('X'), OrePrefixes.ingot.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 2L), tBits, + new Object[] { "s ", " X", Character.valueOf('X'), OrePrefixes.stick.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), tBits, + new Object[] { "fX", "X ", Character.valueOf('X'), OrePrefixes.bolt.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), tBits, + new Object[] { "fX", "X ", Character.valueOf('X'), OrePrefixes.nugget.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), tBits, new Object[] { "PhP", "SRf", "PdP", + Character.valueOf('P'), aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) : OrePrefixes.plate.get(aMaterial), + Character.valueOf('R'), OrePrefixes.ring.get(aMaterial), Character.valueOf('S'), OrePrefixes.screw.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), tBits, + new Object[] { "sf", "G ", Character.valueOf('G'), OrePrefixes.gemFlawless.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 2L), tBits, + new Object[] { "sf", "G ", Character.valueOf('G'), OrePrefixes.gemExquisite.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L), tBits, + new Object[] { "Xx", Character.valueOf('X'), OrePrefixes.plate.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 1L), tBits, + new Object[] { "Xx", Character.valueOf('X'), OrePrefixes.foil.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, - aMaterial, 1L), - tBits, - new Object[] { " A", " S ", "F ", - Character.valueOf('S'), - OrePrefixes.stick.get(Materials.Wood), - Character.valueOf('F'), - OreDictNames.craftingFeather, - Character.valueOf('A'), - OrePrefixes.toolHeadArrow.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get( - OrePrefixes.arrowGtPlastic, aMaterial, 1L), - tBits, - new Object[] { " A", " S ", "F ", - Character.valueOf('S'), - OrePrefixes.stick.get(Materials.Plastic), - Character.valueOf('F'), - OreDictNames.craftingFeather, - Character.valueOf('A'), - OrePrefixes.toolHeadArrow.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.toolHeadArrow, aMaterial, 1L), tBits, - new Object[] { "Xf", Character.valueOf('X'), - OrePrefixes.gemChipped.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadArrow, - aMaterial, 3L), - tBits, - new Object[] { - (aMaterial.contains(SubTag.WOOD) ? 115 - : 'x') + "Pf", - Character.valueOf('P'), - OrePrefixes.plate.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, - aMaterial, 1L), - tBits, - new Object[] { "GG ", "G ", "f ", - Character.valueOf('G'), - OrePrefixes.gem.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, - aMaterial, 1L), - tBits, - new Object[] { "GG ", "f ", " ", - Character.valueOf('G'), - OrePrefixes.gem.get(aMaterial) }); - GT_ModHandler - .addCraftingRecipe( - GT_OreDictUnificator.get( - OrePrefixes.toolHeadPickaxe, - aMaterial, 1L), - tBits, - new Object[] { "GGG", "f ", - Character.valueOf('G'), - OrePrefixes.gem.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, - aMaterial, 1L), - tBits, - new Object[] { "GG", "GG", " f", - Character.valueOf('G'), - OrePrefixes.gem.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.toolHeadSaw, aMaterial, 1L), tBits, - new Object[] { "GGf", Character.valueOf('G'), - OrePrefixes.gem.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, - aMaterial, 1L), - tBits, - new Object[] { "GGG", " f ", " ", - Character.valueOf('G'), - OrePrefixes.gem.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.toolHeadShovel, aMaterial, 1L), tBits, - new Object[] { "fG", Character.valueOf('G'), - OrePrefixes.gem.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.toolHeadSword, aMaterial, 1L), tBits, - new Object[] { " G", "fG", Character.valueOf('G'), - OrePrefixes.gem.get(aMaterial) }); - GT_ModHandler - .addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.toolHeadUniversalSpade, - aMaterial, 1L), tBits, new Object[] { "fX", - Character.valueOf('X'), - OrePrefixes.toolHeadShovel.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, aMaterial, 1L), tBits, new Object[] { " A", " S ", + "F ", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), OreDictNames.craftingFeather, + Character.valueOf('A'), OrePrefixes.toolHeadArrow.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.arrowGtPlastic, aMaterial, 1L), tBits, new Object[] { " A", " S ", + "F ", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Plastic), Character.valueOf('F'), OreDictNames.craftingFeather, + Character.valueOf('A'), OrePrefixes.toolHeadArrow.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadArrow, aMaterial, 1L), tBits, + new Object[] { "Xf", Character.valueOf('X'), OrePrefixes.gemChipped.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadArrow, aMaterial, 3L), tBits, + new Object[] { (aMaterial.contains(SubTag.WOOD) ? 115 : 'x') + "Pf", Character.valueOf('P'), OrePrefixes.plate.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), tBits, new Object[] { "GG ", "G ", + "f ", Character.valueOf('G'), OrePrefixes.gem.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), tBits, new Object[] { "GG ", "f ", + " ", Character.valueOf('G'), OrePrefixes.gem.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), tBits, new Object[] { "GGG", "f ", + Character.valueOf('G'), OrePrefixes.gem.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), tBits, new Object[] { "GG", "GG", " f", + Character.valueOf('G'), OrePrefixes.gem.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), tBits, + new Object[] { "GGf", Character.valueOf('G'), OrePrefixes.gem.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), tBits, new Object[] { "GGG", " f ", + " ", Character.valueOf('G'), OrePrefixes.gem.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), tBits, + new Object[] { "fG", Character.valueOf('G'), OrePrefixes.gem.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), tBits, new Object[] { " G", "fG", + Character.valueOf('G'), OrePrefixes.gem.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), tBits, new Object[] { "fX", + Character.valueOf('X'), OrePrefixes.toolHeadShovel.get(aMaterial) }); - GT_ModHandler - .addCraftingRecipe( - GT_OreDictUnificator.get( - OrePrefixes.toolHeadBuzzSaw, - aMaterial, 1L), tBits, - new Object[] { "wXh", "X X", "fXx", - Character.valueOf('X'), - OrePrefixes.plate.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get( - OrePrefixes.toolHeadWrench, aMaterial, 1L), - tBits, - new Object[] { "hXW", "XRX", "WXd", - Character.valueOf('X'), - OrePrefixes.plate.get(aMaterial), - Character.valueOf('S'), - OrePrefixes.plate.get(Materials.Steel), - Character.valueOf('R'), - OrePrefixes.ring.get(Materials.Steel), - Character.valueOf('W'), - OrePrefixes.screw.get(Materials.Steel) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator - .get(OrePrefixes.toolHeadChainsaw, - aMaterial, 1L), - tBits, - new Object[] { "SRS", "XhX", "SRS", - Character.valueOf('X'), - OrePrefixes.plate.get(aMaterial), - Character.valueOf('S'), - OrePrefixes.plate.get(Materials.Steel), - Character.valueOf('R'), - OrePrefixes.ring.get(Materials.Steel) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, - aMaterial, 1L), - tBits, - new Object[] { "XSX", "XSX", "ShS", - Character.valueOf('X'), - OrePrefixes.plate.get(aMaterial), - Character.valueOf('S'), - OrePrefixes.plate.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadBuzzSaw, aMaterial, 1L), tBits, new Object[] { "wXh", "X X", + "fXx", Character.valueOf('X'), OrePrefixes.plate.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadWrench, aMaterial, 1L), tBits, new Object[] { "hXW", "XRX", + "WXd", Character.valueOf('X'), OrePrefixes.plate.get(aMaterial), Character.valueOf('S'), OrePrefixes.plate.get(Materials.Steel), + Character.valueOf('R'), OrePrefixes.ring.get(Materials.Steel), Character.valueOf('W'), OrePrefixes.screw.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadChainsaw, aMaterial, 1L), tBits, new Object[] { "SRS", "XhX", + "SRS", Character.valueOf('X'), OrePrefixes.plate.get(aMaterial), Character.valueOf('S'), OrePrefixes.plate.get(Materials.Steel), + Character.valueOf('R'), OrePrefixes.ring.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L), tBits, new Object[] { "XSX", "XSX", + "ShS", Character.valueOf('X'), OrePrefixes.plate.get(aMaterial), Character.valueOf('S'), OrePrefixes.plate.get(Materials.Steel) }); switch (aMaterial) { case Wood: - GT_ModHandler - .addCraftingRecipe( - GT_OreDictUnificator.get( - OrePrefixes.gearGtSmall, - aMaterial, 1L), - tBits, - new Object[] { - "P ", - " s", - Character.valueOf('P'), - OrePrefixes.plank - .get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), tBits, new Object[] { "P ", " s", + Character.valueOf('P'), OrePrefixes.plank.get(aMaterial) }); break; case Stone: - GT_ModHandler - .addCraftingRecipe( - GT_OreDictUnificator.get( - OrePrefixes.gearGtSmall, - aMaterial, 1L), - tBits, - new Object[] { "P ", " f", - Character.valueOf('P'), - OrePrefixes.stoneSmooth }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), tBits, new Object[] { "P ", " f", + Character.valueOf('P'), OrePrefixes.stoneSmooth }); break; default: - GT_ModHandler - .addCraftingRecipe( - GT_OreDictUnificator.get( - OrePrefixes.gearGtSmall, - aMaterial, 1L), - tBits, - new Object[] { - "P ", - aMaterial.contains(SubTag.WOOD) ? " s" - : " h", - Character.valueOf('P'), - OrePrefixes.plate - .get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), tBits, + new Object[] { "P ", aMaterial.contains(SubTag.WOOD) ? " s" : " h", Character.valueOf('P'), OrePrefixes.plate.get(aMaterial) }); } switch (aMaterial) { case Wood: - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGt, - aMaterial, 1L), - tBits, - new Object[] { "SPS", "PsP", "SPS", - Character.valueOf('P'), - OrePrefixes.plank.get(aMaterial), - Character.valueOf('S'), - OrePrefixes.stick.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), tBits, new Object[] { "SPS", "PsP", "SPS", + Character.valueOf('P'), OrePrefixes.plank.get(aMaterial), Character.valueOf('S'), OrePrefixes.stick.get(aMaterial) }); break; case Stone: - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGt, - aMaterial, 1L), - tBits, - new Object[] { - "SPS", - "PfP", - "SPS", - Character.valueOf('P'), - OrePrefixes.stoneSmooth, - Character.valueOf('S'), - new ItemStack(Blocks.stone_button, 1, - 32767) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), tBits, new Object[] { "SPS", "PfP", "SPS", + Character.valueOf('P'), OrePrefixes.stoneSmooth, Character.valueOf('S'), new ItemStack(Blocks.stone_button, 1, 32767) }); break; default: - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGt, - aMaterial, 1L), - tBits, - new Object[] { "SPS", "PwP", "SPS", - Character.valueOf('P'), - OrePrefixes.plate.get(aMaterial), - Character.valueOf('S'), - OrePrefixes.stick.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), tBits, new Object[] { "SPS", "PwP", "SPS", + Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), Character.valueOf('S'), OrePrefixes.stick.get(aMaterial) }); } } if (aMaterial.contains(SubTag.SMELTING_TO_GEM)) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gem, - aMaterial, 1L), - tBits, - new Object[] { "XXX", "XXX", "XXX", - Character.valueOf('X'), - OrePrefixes.nugget.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), tBits, new Object[] { "XXX", "XXX", "XXX", + Character.valueOf('X'), OrePrefixes.nugget.get(aMaterial) }); } else { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingot, - aMaterial, 1L), - tBits, - new Object[] { "XXX", "XXX", "XXX", - Character.valueOf('X'), - OrePrefixes.nugget.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), tBits, new Object[] { "XXX", "XXX", "XXX", + Character.valueOf('X'), OrePrefixes.nugget.get(aMaterial) }); } - GT_ModHandler - .addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, - aMaterial.mMacerateInto, 1L), - tBits, - new Object[] { - "h", - "X", - Character.valueOf('X'), - OrePrefixes.crushedCentrifuged - .get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dust, aMaterial.mMacerateInto, 1L), tBits, - new Object[] { "h", "X", Character.valueOf('X'), - OrePrefixes.crystalline.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dust, aMaterial.mMacerateInto, 1L), tBits, - new Object[] { "h", "X", Character.valueOf('X'), - OrePrefixes.crystal.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L), - tBits, new Object[] { "h", "X", Character.valueOf('X'), - OrePrefixes.crushedPurified.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L), - tBits, new Object[] { "h", "X", Character.valueOf('X'), - OrePrefixes.cleanGravel.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L), - tBits, new Object[] { "h", "X", Character.valueOf('X'), - OrePrefixes.reduced.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L), - tBits, new Object[] { "h", "X", Character.valueOf('X'), - OrePrefixes.clump.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L), - tBits, new Object[] { "h", "X", Character.valueOf('X'), - OrePrefixes.shard.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L), - tBits, new Object[] { "h", "X", Character.valueOf('X'), - OrePrefixes.crushed.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L), - tBits, new Object[] { "h", "X", Character.valueOf('X'), - OrePrefixes.dirtyGravel.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), tBits, new Object[] { "h", "X", + Character.valueOf('X'), OrePrefixes.crushedCentrifuged.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), tBits, new Object[] { "h", "X", + Character.valueOf('X'), OrePrefixes.crystalline.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), tBits, new Object[] { "h", "X", + Character.valueOf('X'), OrePrefixes.crystal.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L), tBits, new Object[] { "h", "X", + Character.valueOf('X'), OrePrefixes.crushedPurified.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L), tBits, new Object[] { "h", "X", + Character.valueOf('X'), OrePrefixes.cleanGravel.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L), tBits, new Object[] { "h", "X", + Character.valueOf('X'), OrePrefixes.reduced.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L), tBits, new Object[] { "h", "X", + Character.valueOf('X'), OrePrefixes.clump.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L), tBits, new Object[] { "h", "X", + Character.valueOf('X'), OrePrefixes.shard.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L), tBits, new Object[] { "h", "X", + Character.valueOf('X'), OrePrefixes.crushed.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L), tBits, new Object[] { "h", "X", + Character.valueOf('X'), OrePrefixes.dirtyGravel.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dustSmall, aMaterial, 4L), tBits, - new Object[] { " X", " ", Character.valueOf('X'), - OrePrefixes.dust.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dustTiny, aMaterial, 9L), tBits, - new Object[] { "X ", " ", Character.valueOf('X'), - OrePrefixes.dust.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dust, aMaterial, 1L), tBits, new Object[] { - "XX", "XX", Character.valueOf('X'), - OrePrefixes.dustSmall.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dust, aMaterial, 1L), tBits, new Object[] { - "XXX", "XXX", "XXX", Character.valueOf('X'), - OrePrefixes.dustTiny.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dust, aMaterial, 16L), tBits, - new Object[] { "Xc", Character.valueOf('X'), - OrePrefixes.crateGtDust.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.gem, aMaterial, 16L), tBits, - new Object[] { "Xc", Character.valueOf('X'), - OrePrefixes.crateGtGem.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.ingot, aMaterial, 16L), tBits, - new Object[] { "Xc", Character.valueOf('X'), - OrePrefixes.crateGtIngot.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.plate, aMaterial, 16L), tBits, - new Object[] { "Xc", Character.valueOf('X'), - OrePrefixes.crateGtPlate.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 4L), tBits, + new Object[] { " X", " ", Character.valueOf('X'), OrePrefixes.dust.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 9L), tBits, + new Object[] { "X ", " ", Character.valueOf('X'), OrePrefixes.dust.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), tBits, + new Object[] { "XX", "XX", Character.valueOf('X'), OrePrefixes.dustSmall.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), tBits, + new Object[] { "XXX", "XXX", "XXX", Character.valueOf('X'), OrePrefixes.dustTiny.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), tBits, new Object[] { "Xc", Character.valueOf('X'), + OrePrefixes.crateGtDust.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L), tBits, new Object[] { "Xc", Character.valueOf('X'), + OrePrefixes.crateGtGem.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L), tBits, new Object[] { "Xc", + Character.valueOf('X'), OrePrefixes.crateGtIngot.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L), tBits, new Object[] { "Xc", + Character.valueOf('X'), OrePrefixes.crateGtPlate.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.gemChipped, aMaterial, 2L), tBits, - new Object[] { "h", "X", Character.valueOf('X'), - OrePrefixes.gemFlawed.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.gemFlawed, aMaterial, 2L), tBits, - new Object[] { "h", "X", Character.valueOf('X'), - OrePrefixes.gem.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.gem, aMaterial, 2L), tBits, new Object[] { - "h", "X", Character.valueOf('X'), - OrePrefixes.gemFlawless.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.gemFlawless, aMaterial, 2L), tBits, - new Object[] { "h", "X", Character.valueOf('X'), - OrePrefixes.gemExquisite.get(aMaterial) }); - if ((aMaterial.contains(SubTag.MORTAR_GRINDABLE)) - && (GregTech_API.sRecipeFile.get( - ConfigCategories.Tools.mortar, - aMaterial.name(), true))) { - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dustSmall, aMaterial, 1L), tBits, - new Object[] { "X", "m", Character.valueOf('X'), - OrePrefixes.gemChipped.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dustSmall, aMaterial, 2L), tBits, - new Object[] { "X", "m", Character.valueOf('X'), - OrePrefixes.gemFlawed.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dust, aMaterial, 1L), tBits, - new Object[] { "X", "m", Character.valueOf('X'), - OrePrefixes.gem.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dust, aMaterial, 2L), tBits, - new Object[] { "X", "m", Character.valueOf('X'), - OrePrefixes.gemFlawless.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dust, aMaterial, 4L), tBits, - new Object[] { "X", "m", Character.valueOf('X'), - OrePrefixes.gemExquisite.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dust, aMaterial, 1L), tBits, - new Object[] { "X", "m", Character.valueOf('X'), - OrePrefixes.ingot.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get( - OrePrefixes.dust, aMaterial, 1L), tBits, - new Object[] { "X", "m", Character.valueOf('X'), - OrePrefixes.plate.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L), tBits, + new Object[] { "h", "X", Character.valueOf('X'), OrePrefixes.gemFlawed.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L), tBits, + new Object[] { "h", "X", Character.valueOf('X'), OrePrefixes.gem.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L), tBits, + new Object[] { "h", "X", Character.valueOf('X'), OrePrefixes.gemFlawless.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L), tBits, + new Object[] { "h", "X", Character.valueOf('X'), OrePrefixes.gemExquisite.get(aMaterial) }); + if ((aMaterial.contains(SubTag.MORTAR_GRINDABLE)) && (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, aMaterial.name(), true))) { + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), tBits, + new Object[] { "X", "m", Character.valueOf('X'), OrePrefixes.gemChipped.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L), tBits, + new Object[] { "X", "m", Character.valueOf('X'), OrePrefixes.gemFlawed.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), tBits, + new Object[] { "X", "m", Character.valueOf('X'), OrePrefixes.gem.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), tBits, + new Object[] { "X", "m", Character.valueOf('X'), OrePrefixes.gemFlawless.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 4L), tBits, + new Object[] { "X", "m", Character.valueOf('X'), OrePrefixes.gemExquisite.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), tBits, + new Object[] { "X", "m", Character.valueOf('X'), OrePrefixes.ingot.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), tBits, + new Object[] { "X", "m", Character.valueOf('X'), OrePrefixes.plate.get(aMaterial) }); } } } @@ -1429,10 +752,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { this.mUniverse = null; this.isFirstServerWorldTick = true; - 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; } @@ -1454,24 +775,19 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { GregTech_API.sWirelessRedstone.clear(); GT_FluidStack.fixAllThoseFuckingFluidIDs(); - GT_Log.out - .println("GT_Mod: Cleaning up all OreDict Crafting Recipes, which have an empty List in them, since they are never meeting any Condition."); + GT_Log.out.println("GT_Mod: Cleaning up all OreDict Crafting Recipes, which have an empty List in them, since they are never meeting any Condition."); List tList = CraftingManager.getInstance().getRecipeList(); for (int i = 0; i < tList.size(); i++) { if ((tList.get(i) instanceof ShapedOreRecipe)) { - for (Object tObject : ((ShapedOreRecipe) tList.get(i)) - .getInput()) { - if (((tObject instanceof List)) - && (((List) tObject).isEmpty())) { + for (Object tObject : ((ShapedOreRecipe) tList.get(i)).getInput()) { + if (((tObject instanceof List)) && (((List) tObject).isEmpty())) { tList.remove(i--); break; } } } else if ((tList.get(i) instanceof ShapelessOreRecipe)) { - for (Object tObject : ((ShapelessOreRecipe) tList.get(i)) - .getInput()) { - if (((tObject instanceof List)) - && (((List) tObject).isEmpty())) { + for (Object tObject : ((ShapelessOreRecipe) tList.get(i)).getInput()) { + if (((tObject instanceof List)) && (((List) tObject).isEmpty())) { tList.remove(i--); break; } @@ -1488,8 +804,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { try { for (; i < GregTech_API.METATILEENTITIES.length; i++) { if (GregTech_API.METATILEENTITIES[i] != null) { - GregTech_API.METATILEENTITIES[i] - .onWorldSave(tSaveDirectory); + GregTech_API.METATILEENTITIES[i].onWorldSave(tSaveDirectory); } } } catch (Throwable e) { @@ -1501,29 +816,22 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } @SubscribeEvent - public void onClientConnectedToServerEvent( - FMLNetworkEvent.ClientConnectedToServerEvent aEvent) { + public void onClientConnectedToServerEvent(FMLNetworkEvent.ClientConnectedToServerEvent aEvent) { } @SubscribeEvent public void onArrowNockEvent(ArrowNockEvent aEvent) { - if ((!aEvent.isCanceled()) - && (GT_Utility.isStackValid(aEvent.result)) - && (GT_Utility.getProjectile(SubTag.PROJECTILE_ARROW, - aEvent.entityPlayer.inventory) != null)) { - aEvent.entityPlayer.setItemInUse(aEvent.result, aEvent.result - .getItem().getMaxItemUseDuration(aEvent.result)); + if ((!aEvent.isCanceled()) && (GT_Utility.isStackValid(aEvent.result)) + && (GT_Utility.getProjectile(SubTag.PROJECTILE_ARROW, aEvent.entityPlayer.inventory) != null)) { + aEvent.entityPlayer.setItemInUse(aEvent.result, aEvent.result.getItem().getMaxItemUseDuration(aEvent.result)); aEvent.setCanceled(true); } } @SubscribeEvent public void onArrowLooseEvent(ArrowLooseEvent aEvent) { - ItemStack aArrow = GT_Utility.getProjectile(SubTag.PROJECTILE_ARROW, - aEvent.entityPlayer.inventory); - if ((!aEvent.isCanceled()) && (GT_Utility.isStackValid(aEvent.bow)) - && (aArrow != null) - && ((aEvent.bow.getItem() instanceof ItemBow))) { + ItemStack aArrow = GT_Utility.getProjectile(SubTag.PROJECTILE_ARROW, aEvent.entityPlayer.inventory); + if ((!aEvent.isCanceled()) && (GT_Utility.isStackValid(aEvent.bow)) && (aArrow != null) && ((aEvent.bow.getItem() instanceof ItemBow))) { float tSpeed = aEvent.charge / 20.0F; tSpeed = (tSpeed * tSpeed + tSpeed * 2.0F) / 3.0F; if (tSpeed < 0.1D) { @@ -1532,43 +840,34 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { if (tSpeed > 1.0D) { tSpeed = 1.0F; } - EntityArrow tArrowEntity = ((IProjectileItem) aArrow.getItem()) - .getProjectile(SubTag.PROJECTILE_ARROW, aArrow, - aEvent.entityPlayer.worldObj, aEvent.entityPlayer, - tSpeed * 2.0F); + EntityArrow tArrowEntity = ((IProjectileItem) aArrow.getItem()).getProjectile(SubTag.PROJECTILE_ARROW, aArrow, aEvent.entityPlayer.worldObj, + aEvent.entityPlayer, tSpeed * 2.0F); if (tSpeed >= 1.0F) { tArrowEntity.setIsCritical(true); } - int tLevel = EnchantmentHelper.getEnchantmentLevel( - Enchantment.power.effectId, aEvent.bow); + int tLevel = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, aEvent.bow); if (tLevel > 0) { - tArrowEntity.setDamage(tArrowEntity.getDamage() + tLevel * 0.5D - + 0.5D); + tArrowEntity.setDamage(tArrowEntity.getDamage() + tLevel * 0.5D + 0.5D); } - tLevel = EnchantmentHelper.getEnchantmentLevel( - Enchantment.punch.effectId, aEvent.bow); + tLevel = EnchantmentHelper.getEnchantmentLevel(Enchantment.punch.effectId, aEvent.bow); if (tLevel > 0) { tArrowEntity.setKnockbackStrength(tLevel); } - tLevel = EnchantmentHelper.getEnchantmentLevel( - Enchantment.flame.effectId, aEvent.bow); + tLevel = EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, aEvent.bow); if (tLevel > 0) { tArrowEntity.setFire(tLevel * 100); } aEvent.bow.damageItem(1, aEvent.entityPlayer); aEvent.bow.getItem(); - aEvent.entityPlayer.worldObj.playSoundAtEntity(aEvent.entityPlayer, - "random.bow", 1.0F, 1.0F - / (new Random().nextFloat() * 0.4F + 1.2F) + tSpeed - * 0.5F); + aEvent.entityPlayer.worldObj.playSoundAtEntity(aEvent.entityPlayer, "random.bow", 1.0F, 1.0F / (new Random().nextFloat() * 0.4F + 1.2F) + tSpeed + * 0.5F); tArrowEntity.canBePickedUp = 1; if (!aEvent.entityPlayer.capabilities.isCreativeMode) { aArrow.stackSize -= 1; } if (aArrow.stackSize == 0) { - GT_Utility - .removeNullStacksFromInventory(aEvent.entityPlayer.inventory); + GT_Utility.removeNullStacksFromInventory(aEvent.entityPlayer.inventory); } if (!aEvent.entityPlayer.worldObj.isRemote) { aEvent.entityPlayer.worldObj.spawnEntityInWorld(tArrowEntity); @@ -1579,8 +878,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { @SubscribeEvent public void onEndermanTeleportEvent(EnderTeleportEvent aEvent) { - if (((aEvent.entityLiving instanceof EntityEnderman)) - && (aEvent.entityLiving.getActivePotionEffect(Potion.weakness) != null)) { + if (((aEvent.entityLiving instanceof EntityEnderman)) && (aEvent.entityLiving.getActivePotionEffect(Potion.weakness) != null)) { aEvent.setCanceled(true); } } @@ -1589,42 +887,26 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { public void onEntitySpawningEvent(EntityJoinWorldEvent aEvent) { if ((aEvent.entity != null) && (!aEvent.entity.worldObj.isRemote)) { if ((aEvent.entity instanceof EntityItem)) { - ((EntityItem) aEvent.entity) - .setEntityItemStack(GT_OreDictUnificator - .get(((EntityItem) aEvent.entity) - .getEntityItem())); + ((EntityItem) aEvent.entity).setEntityItemStack(GT_OreDictUnificator.get(((EntityItem) aEvent.entity).getEntityItem())); } - if ((this.mSkeletonsShootGTArrows > 0) - && (aEvent.entity.getClass() == EntityArrow.class) - && (aEvent.entity.worldObj.rand - .nextInt(this.mSkeletonsShootGTArrows) == 0) + if ((this.mSkeletonsShootGTArrows > 0) && (aEvent.entity.getClass() == EntityArrow.class) + && (aEvent.entity.worldObj.rand.nextInt(this.mSkeletonsShootGTArrows) == 0) && ((((EntityArrow) aEvent.entity).shootingEntity instanceof EntitySkeleton))) { - aEvent.entity.worldObj - .spawnEntityInWorld(new GT_Entity_Arrow( - (EntityArrow) aEvent.entity, - (ItemStack) OrePrefixes.arrowGtWood.mPrefixedItems.get(aEvent.entity.worldObj.rand - .nextInt(OrePrefixes.arrowGtWood.mPrefixedItems - .size())))); + aEvent.entity.worldObj.spawnEntityInWorld(new GT_Entity_Arrow((EntityArrow) aEvent.entity, (ItemStack) OrePrefixes.arrowGtWood.mPrefixedItems + .get(aEvent.entity.worldObj.rand.nextInt(OrePrefixes.arrowGtWood.mPrefixedItems.size())))); aEvent.entity.setDead(); } } } - private static final EnumSet PREVENTED_ORES = EnumSet - .of(OreGenEvent.GenerateMinable.EventType.COAL, - new OreGenEvent.GenerateMinable.EventType[] { - OreGenEvent.GenerateMinable.EventType.IRON, - OreGenEvent.GenerateMinable.EventType.GOLD, - OreGenEvent.GenerateMinable.EventType.DIAMOND, - OreGenEvent.GenerateMinable.EventType.REDSTONE, - OreGenEvent.GenerateMinable.EventType.LAPIS, - OreGenEvent.GenerateMinable.EventType.QUARTZ }); + private static final EnumSet PREVENTED_ORES = EnumSet.of(OreGenEvent.GenerateMinable.EventType.COAL, + new OreGenEvent.GenerateMinable.EventType[] { OreGenEvent.GenerateMinable.EventType.IRON, OreGenEvent.GenerateMinable.EventType.GOLD, + OreGenEvent.GenerateMinable.EventType.DIAMOND, OreGenEvent.GenerateMinable.EventType.REDSTONE, OreGenEvent.GenerateMinable.EventType.LAPIS, + OreGenEvent.GenerateMinable.EventType.QUARTZ }); @SubscribeEvent public void onOreGenEvent(OreGenEvent.GenerateMinable aGenerator) { - if ((this.mDisableVanillaOres) - && ((aGenerator.generator instanceof WorldGenMinable)) - && (PREVENTED_ORES.contains(aGenerator.type))) { + if ((this.mDisableVanillaOres) && ((aGenerator.generator instanceof WorldGenMinable)) && (PREVENTED_ORES.contains(aGenerator.type))) { aGenerator.setResult(Result.DENY); } } @@ -1637,37 +919,25 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { @SubscribeEvent public void onPlayerInteraction(PlayerInteractEvent aEvent) { - if ((aEvent.entityPlayer == null) - || (aEvent.entityPlayer.worldObj == null) - || (aEvent.action == null) || (aEvent.world.provider == null)) { + if ((aEvent.entityPlayer == null) || (aEvent.entityPlayer.worldObj == null) || (aEvent.action == null) || (aEvent.world.provider == null)) { return; } - if ((!aEvent.entityPlayer.worldObj.isRemote) - && (aEvent.action != null) - && (aEvent.action != PlayerInteractEvent.Action.RIGHT_CLICK_AIR) + if ((!aEvent.entityPlayer.worldObj.isRemote) && (aEvent.action != null) && (aEvent.action != PlayerInteractEvent.Action.RIGHT_CLICK_AIR) && (GT_Log.pal != null)) { - this.mBufferedPlayerActivity.add(getDataAndTime() + ";" - + aEvent.action.name() + ";" - + aEvent.entityPlayer.getDisplayName() + ";DIM:" - + aEvent.world.provider.dimensionId + ";" + aEvent.x + ";" - + aEvent.y + ";" + aEvent.z + ";|;" + aEvent.x / 10 + ";" - + aEvent.y / 10 + ";" + aEvent.z / 10); + this.mBufferedPlayerActivity.add(getDataAndTime() + ";" + aEvent.action.name() + ";" + aEvent.entityPlayer.getDisplayName() + ";DIM:" + + aEvent.world.provider.dimensionId + ";" + aEvent.x + ";" + aEvent.y + ";" + aEvent.z + ";|;" + aEvent.x / 10 + ";" + aEvent.y / 10 + ";" + + aEvent.z / 10); } ItemStack aStack = aEvent.entityPlayer.getCurrentEquippedItem(); - if ((aStack != null) - && (aEvent.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) - && (aStack.getItem() == Items.flint_and_steel)) { - if ((!aEvent.world.isRemote) - && (!aEvent.entityPlayer.capabilities.isCreativeMode) - && (aEvent.world.rand.nextInt(100) >= this.mFlintChance)) { + if ((aStack != null) && (aEvent.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) && (aStack.getItem() == Items.flint_and_steel)) { + if ((!aEvent.world.isRemote) && (!aEvent.entityPlayer.capabilities.isCreativeMode) && (aEvent.world.rand.nextInt(100) >= this.mFlintChance)) { aEvent.setCanceled(true); aStack.damageItem(1, aEvent.entityPlayer); if (aStack.getItemDamage() >= aStack.getMaxDamage()) { aStack.stackSize -= 1; } if (aStack.stackSize <= 0) { - ForgeEventFactory.onPlayerDestroyItem(aEvent.entityPlayer, - aStack); + ForgeEventFactory.onPlayerDestroyItem(aEvent.entityPlayer, aStack); } } return; @@ -1678,29 +948,19 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { public void onBlockHarvestingEvent(BlockEvent.HarvestDropsEvent aEvent) { if (aEvent.harvester != null) { if ((!aEvent.world.isRemote) && (GT_Log.pal != null)) { - this.mBufferedPlayerActivity.add(getDataAndTime() - + ";HARVEST_BLOCK;" + aEvent.harvester.getDisplayName() - + ";DIM:" + aEvent.world.provider.dimensionId + ";" - + aEvent.x + ";" + aEvent.y + ";" + aEvent.z + ";|;" - + aEvent.x / 10 + ";" + aEvent.y / 10 + ";" + aEvent.z - / 10); + this.mBufferedPlayerActivity.add(getDataAndTime() + ";HARVEST_BLOCK;" + aEvent.harvester.getDisplayName() + ";DIM:" + + aEvent.world.provider.dimensionId + ";" + aEvent.x + ";" + aEvent.y + ";" + aEvent.z + ";|;" + aEvent.x / 10 + ";" + aEvent.y / 10 + + ";" + aEvent.z / 10); } ItemStack aStack = aEvent.harvester.getCurrentEquippedItem(); if (aStack != null) { if ((aStack.getItem() instanceof GT_MetaGenerated_Tool)) { - ((GT_MetaGenerated_Tool) aStack.getItem()) - .onHarvestBlockEvent(aEvent.drops, aStack, - aEvent.harvester, aEvent.block, aEvent.x, - aEvent.y, aEvent.z, - (byte) aEvent.blockMetadata, - aEvent.fortuneLevel, aEvent.isSilkTouching, - aEvent); + ((GT_MetaGenerated_Tool) aStack.getItem()).onHarvestBlockEvent(aEvent.drops, aStack, aEvent.harvester, aEvent.block, aEvent.x, aEvent.y, + aEvent.z, (byte) aEvent.blockMetadata, aEvent.fortuneLevel, aEvent.isSilkTouching, aEvent); } - if (EnchantmentHelper.getEnchantmentLevel( - Enchantment.fireAspect.effectId, aStack) > 2) { + if (EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, aStack) > 2) { for (ItemStack tDrop : aEvent.drops) { - ItemStack tSmeltingOutput = GT_ModHandler - .getSmeltingOutput(tDrop, false, null); + ItemStack tSmeltingOutput = GT_ModHandler.getSmeltingOutput(tDrop, false, null); if (tSmeltingOutput != null) { tDrop.stackSize *= tSmeltingOutput.stackSize; tSmeltingOutput.stackSize = tDrop.stackSize; @@ -1722,13 +982,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } else if (aMod.equals("gregtech")) { aMod = "UNKNOWN"; } - if ((aEvent == null) - || (aEvent.Ore == null) - || (aEvent.Ore.getItem() == null) - || (aEvent.Name == null) - || (aEvent.Name.isEmpty()) - || (aEvent.Name.replaceAll("_", "").length() - - aEvent.Name.length() == 9)) { + if ((aEvent == null) || (aEvent.Ore == null) || (aEvent.Ore.getItem() == null) || (aEvent.Name == null) || (aEvent.Name.isEmpty()) + || (aEvent.Name.replaceAll("_", "").length() - aEvent.Name.length() == 9)) { if (aOriginalMod.equals("gregtech")) { aOriginalMod = "UNKNOWN"; } @@ -1741,42 +996,33 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } try { aEvent.Ore.stackSize = 1; - if ((aOriginalMod.toLowerCase().contains("xycraft")) - || (aOriginalMod.toLowerCase().contains("tconstruct")) - || ((aOriginalMod.toLowerCase().contains("natura")) && (!aOriginalMod - .toLowerCase().contains("natural")))) { + if ((aOriginalMod.toLowerCase().contains("xycraft")) || (aOriginalMod.toLowerCase().contains("tconstruct")) + || ((aOriginalMod.toLowerCase().contains("natura")) && (!aOriginalMod.toLowerCase().contains("natural")))) { if (GT_Values.D1) { - GT_Log.ore.println(aMod + " -> " + aEvent.Name - + " is getting ignored, because of racism. :P"); + GT_Log.ore.println(aMod + " -> " + aEvent.Name + " is getting ignored, because of racism. :P"); } return; } String tModToName = aMod + " -> " + aEvent.Name; - if ((this.mOreDictActivated) || (GregTech_API.sPostloadStarted) - || ((this.mSortToTheEnd) && (GregTech_API.sLoadFinished))) { + if ((this.mOreDictActivated) || (GregTech_API.sPostloadStarted) || ((this.mSortToTheEnd) && (GregTech_API.sLoadFinished))) { tModToName = aOriginalMod + " --Late--> " + aEvent.Name; } - if (((aEvent.Ore.getItem() instanceof ItemBlock)) - || (GT_Utility.getBlockFromStack(aEvent.Ore) != Blocks.air)) { + if (((aEvent.Ore.getItem() instanceof ItemBlock)) || (GT_Utility.getBlockFromStack(aEvent.Ore) != Blocks.air)) { GT_OreDictUnificator.addToBlacklist(aEvent.Ore); } this.mRegisteredOres.add(aEvent.Ore); - if ((aEvent.Name.startsWith("item")) - && (this.mIgnoredItems.contains(aEvent.Name))) { + if ((aEvent.Name.startsWith("item")) && (this.mIgnoredItems.contains(aEvent.Name))) { GT_Log.ore.println(tModToName); if (aEvent.Name.equals("itemCopperWire")) { - GT_OreDictUnificator.registerOre( - OreDictNames.craftingWireCopper, aEvent.Ore); + GT_OreDictUnificator.registerOre(OreDictNames.craftingWireCopper, aEvent.Ore); } if (aEvent.Name.equals("itemRubber")) { - GT_OreDictUnificator.registerOre(OrePrefixes.ingot, - Materials.Rubber, aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Rubber, aEvent.Ore); } return; } if (this.mIgnoredNames.contains(aEvent.Name)) { - GT_Log.ore.println(tModToName - + " is getting ignored via hardcode."); + GT_Log.ore.println(tModToName + " is getting ignored via hardcode."); return; } if (aEvent.Name.equals("stone")) { @@ -1787,217 +1033,150 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { GT_OreDictUnificator.registerOre("stoneCobble", aEvent.Ore); return; } - if ((aEvent.Name.contains("|")) || (aEvent.Name.contains("*")) - || (aEvent.Name.contains(":")) - || (aEvent.Name.contains(".")) + if ((aEvent.Name.contains("|")) || (aEvent.Name.contains("*")) || (aEvent.Name.contains(":")) || (aEvent.Name.contains(".")) || (aEvent.Name.contains("$"))) { - GT_Log.ore - .println(tModToName - + " is using a private Prefix and is therefor getting ignored properly."); + GT_Log.ore.println(tModToName + " is using a private Prefix and is therefor getting ignored properly."); return; } if (aEvent.Name.equals("copperWire")) { - GT_OreDictUnificator.registerOre( - OreDictNames.craftingWireCopper, aEvent.Ore); + GT_OreDictUnificator.registerOre(OreDictNames.craftingWireCopper, aEvent.Ore); } if (aEvent.Name.equals("sheetPlastic")) { - GT_OreDictUnificator.registerOre(OrePrefixes.plate, - Materials.Plastic, aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Plastic, aEvent.Ore); } if (aEvent.Name.equals("shardAir")) { - GT_OreDictUnificator.registerOre(OrePrefixes.gem, - Materials.InfusedAir, aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedAir, aEvent.Ore); return; } if (aEvent.Name.equals("shardWater")) { - GT_OreDictUnificator.registerOre(OrePrefixes.gem, - Materials.InfusedWater, aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedWater, aEvent.Ore); return; } if (aEvent.Name.equals("shardFire")) { - GT_OreDictUnificator.registerOre(OrePrefixes.gem, - Materials.InfusedFire, aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedFire, aEvent.Ore); return; } if (aEvent.Name.equals("shardEarth")) { - GT_OreDictUnificator.registerOre(OrePrefixes.gem, - Materials.InfusedEarth, aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedEarth, aEvent.Ore); return; } if (aEvent.Name.equals("shardOrder")) { - GT_OreDictUnificator.registerOre(OrePrefixes.gem, - Materials.InfusedOrder, aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedOrder, aEvent.Ore); return; } if (aEvent.Name.equals("shardEntropy")) { - GT_OreDictUnificator.registerOre(OrePrefixes.gem, - Materials.InfusedEntropy, aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedEntropy, aEvent.Ore); return; } if (aEvent.Name.equals("fieryIngot")) { - GT_OreDictUnificator.registerOre(OrePrefixes.ingot, - Materials.FierySteel, aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.FierySteel, aEvent.Ore); return; } if (aEvent.Name.equals("ironwood")) { - GT_OreDictUnificator.registerOre(OrePrefixes.ingot, - Materials.IronWood, aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.IronWood, aEvent.Ore); return; } if (aEvent.Name.equals("steeleaf")) { - GT_OreDictUnificator.registerOre(OrePrefixes.ingot, - Materials.Steeleaf, aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Steeleaf, aEvent.Ore); return; } if (aEvent.Name.equals("knightmetal")) { - GT_OreDictUnificator.registerOre(OrePrefixes.ingot, - Materials.Knightmetal, aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Knightmetal, aEvent.Ore); return; } if (aEvent.Name.contains(" ")) { - GT_Log.ore - .println(tModToName - + " is getting re-registered because the OreDict Name containing invalid spaces."); - GT_OreDictUnificator.registerOre( - aEvent.Name.replaceAll(" ", ""), - GT_Utility.copyAmount(1L, new Object[] { aEvent.Ore })); + GT_Log.ore.println(tModToName + " is getting re-registered because the OreDict Name containing invalid spaces."); + GT_OreDictUnificator.registerOre(aEvent.Name.replaceAll(" ", ""), GT_Utility.copyAmount(1L, new Object[] { aEvent.Ore })); aEvent.Ore.setStackDisplayName("Invalid OreDictionary Tag"); return; } if (this.mInvalidNames.contains(aEvent.Name)) { - GT_Log.ore - .println(tModToName - + " is wrongly registered and therefor getting ignored."); + GT_Log.ore.println(tModToName + " is wrongly registered and therefor getting ignored."); return; } OrePrefixes aPrefix = OrePrefixes.getOrePrefix(aEvent.Name); Materials aMaterial = Materials._NULL; - if ((aPrefix == OrePrefixes.nugget) - && (aMod.equals("Thaumcraft")) - && (aEvent.Ore.getItem().getUnlocalizedName() - .contains("ItemResource"))) { + if ((aPrefix == OrePrefixes.nugget) && (aMod.equals("Thaumcraft")) && (aEvent.Ore.getItem().getUnlocalizedName().contains("ItemResource"))) { return; } if (aPrefix == null) { if (aEvent.Name.toLowerCase().equals(aEvent.Name)) { - GT_Log.ore.println(tModToName - + " is invalid due to being solely lowercased."); + GT_Log.ore.println(tModToName + " is invalid due to being solely lowercased."); return; } if (aEvent.Name.toUpperCase().equals(aEvent.Name)) { - GT_Log.ore.println(tModToName - + " is invalid due to being solely uppercased."); + GT_Log.ore.println(tModToName + " is invalid due to being solely uppercased."); return; } - if (GT_Values.CU.contains(Character.valueOf(aEvent.Name - .charAt(0)))) { - GT_Log.ore - .println(tModToName - + " is invalid due to the first character being uppercased."); + if (GT_Values.CU.contains(Character.valueOf(aEvent.Name.charAt(0)))) { + GT_Log.ore.println(tModToName + " is invalid due to the first character being uppercased."); } } else { if (aPrefix.mDontUnificateActively) { GT_OreDictUnificator.addToBlacklist(aEvent.Ore); } if (aPrefix != aPrefix.mPrefixInto) { - String tNewName = aEvent.Name.replaceFirst( - aPrefix.toString(), aPrefix.mPrefixInto.toString()); + String tNewName = aEvent.Name.replaceFirst(aPrefix.toString(), aPrefix.mPrefixInto.toString()); if (!GT_OreDictUnificator.isRegisteringOres()) { - GT_Log.ore - .println(tModToName - + " uses a depricated Prefix, and is getting re-registered as " - + tNewName); + GT_Log.ore.println(tModToName + " uses a depricated Prefix, and is getting re-registered as " + tNewName); } GT_OreDictUnificator.registerOre(tNewName, aEvent.Ore); return; } String tName = aEvent.Name.replaceFirst(aPrefix.toString(), ""); if (tName.length() > 0) { - if ((GT_Values.CU.contains(Character.valueOf(tName - .charAt(0)))) - || (GT_Values.CN.contains(Character.valueOf(tName - .charAt(0)))) || (tName.charAt(0) == '_')) { + if ((GT_Values.CU.contains(Character.valueOf(tName.charAt(0)))) || (GT_Values.CN.contains(Character.valueOf(tName.charAt(0)))) + || (tName.charAt(0) == '_')) { if (aPrefix.mIsMaterialBased) { aMaterial = Materials.get(tName); if (aMaterial != aMaterial.mMaterialInto) { - GT_OreDictUnificator.registerOre(aPrefix, - aMaterial.mMaterialInto, aEvent.Ore); + GT_OreDictUnificator.registerOre(aPrefix, aMaterial.mMaterialInto, aEvent.Ore); if (!GT_OreDictUnificator.isRegisteringOres()) { - GT_Log.ore - .println(tModToName - + " uses a deprecated Material and is getting re-registered as " - + aPrefix - .get(aMaterial.mMaterialInto)); + GT_Log.ore.println(tModToName + " uses a deprecated Material and is getting re-registered as " + + aPrefix.get(aMaterial.mMaterialInto)); } return; } if (!aPrefix.isIgnored(aMaterial)) { - aPrefix.add(GT_Utility.copyAmount(1L, - new Object[] { aEvent.Ore })); + aPrefix.add(GT_Utility.copyAmount(1L, new Object[] { aEvent.Ore })); } if (aMaterial != Materials._NULL) { Materials tReRegisteredMaterial; - for (Iterator i$ = aMaterial.mOreReRegistrations - .iterator(); i$.hasNext(); GT_OreDictUnificator - .registerOre(aPrefix, - tReRegisteredMaterial, - aEvent.Ore)) { - tReRegisteredMaterial = (Materials) i$ - .next(); + for (Iterator i$ = aMaterial.mOreReRegistrations.iterator(); i$.hasNext(); GT_OreDictUnificator.registerOre(aPrefix, + tReRegisteredMaterial, aEvent.Ore)) { + tReRegisteredMaterial = (Materials) i$.next(); } - aMaterial.add(GT_Utility.copyAmount(1L, - new Object[] { aEvent.Ore })); - if ((GregTech_API.sThaumcraftCompat != null) - && (aPrefix.doGenerateItem(aMaterial)) - && (!aPrefix.isIgnored(aMaterial))) { - long tAmount = aPrefix.mMaterialAmount < 0L ? 3628800L - : aPrefix.mMaterialAmount; + aMaterial.add(GT_Utility.copyAmount(1L, new Object[] { aEvent.Ore })); + if ((GregTech_API.sThaumcraftCompat != null) && (aPrefix.doGenerateItem(aMaterial)) && (!aPrefix.isIgnored(aMaterial))) { + long tAmount = aPrefix.mMaterialAmount < 0L ? 3628800L : aPrefix.mMaterialAmount; List tAspects = new ArrayList(); TC_Aspects.TC_AspectStack tAspect; - for (Iterator i$ = aPrefix.mAspects - .iterator(); i$.hasNext(); tAspect - .addToAspectList(tAspects)) { - tAspect = (TC_Aspects.TC_AspectStack) i$ - .next(); + for (Iterator i$ = aPrefix.mAspects.iterator(); i$.hasNext(); tAspect.addToAspectList(tAspects)) { + tAspect = (TC_Aspects.TC_AspectStack) i$.next(); } tAspect = null; - for (Iterator i$ = aMaterial.mAspects - .iterator(); i$.hasNext(); tAspect - .copy(tAspect.mAmount * tAmount - / 3628800L) + for (Iterator i$ = aMaterial.mAspects.iterator(); i$.hasNext(); tAspect.copy(tAspect.mAmount * tAmount / 3628800L) .addToAspectList(tAspects)) { - tAspect = (TC_Aspects.TC_AspectStack) i$ - .next(); + tAspect = (TC_Aspects.TC_AspectStack) i$.next(); } - GregTech_API.sThaumcraftCompat - .registerThaumcraftAspectsToItem( - GT_Utility - .copyAmount( - 1L, - new Object[] { aEvent.Ore }), - tAspects, aEvent.Name); + GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(GT_Utility.copyAmount(1L, new Object[] { aEvent.Ore }), + tAspects, aEvent.Name); } switch (aPrefix) { case crystal: - if ((aMaterial == Materials.CertusQuartz) - || (aMaterial == Materials.NetherQuartz) - || (aMaterial == Materials.Fluix)) { - GT_OreDictUnificator.registerOre( - OrePrefixes.gem, aMaterial, - aEvent.Ore); + if ((aMaterial == Materials.CertusQuartz) || (aMaterial == Materials.NetherQuartz) || (aMaterial == Materials.Fluix)) { + GT_OreDictUnificator.registerOre(OrePrefixes.gem, aMaterial, aEvent.Ore); } break; case gem: switch (aMaterial) { case Lapis: case Sodalite: - GT_OreDictUnificator.registerOre( - Dyes.dyeBlue, aEvent.Ore); + GT_OreDictUnificator.registerOre(Dyes.dyeBlue, aEvent.Ore); break; case Lazurite: - GT_OreDictUnificator.registerOre( - Dyes.dyeCyan, aEvent.Ore); + GT_OreDictUnificator.registerOre(Dyes.dyeCyan, aEvent.Ore); break; case InfusedAir: case InfusedWater: @@ -2005,275 +1184,169 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { case InfusedEarth: case InfusedOrder: case InfusedEntropy: - GT_OreDictUnificator.registerOre( - aMaterial.name().replaceFirst( - "Infused", "shard"), - aEvent.Ore); + GT_OreDictUnificator.registerOre(aMaterial.name().replaceFirst("Infused", "shard"), aEvent.Ore); break; case Chocolate: - GT_OreDictUnificator.registerOre( - Dyes.dyeBrown, aEvent.Ore); + GT_OreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore); break; case CertusQuartz: case NetherQuartz: - GT_OreDictUnificator - .registerOre(OrePrefixes.item - .get(aMaterial), - aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.item.get(aMaterial), aEvent.Ore); case Fluix: case Quartz: case Quartzite: - GT_OreDictUnificator.registerOre( - OrePrefixes.crystal, aMaterial, - aEvent.Ore); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingQuartz, - aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.crystal, aMaterial, aEvent.Ore); + GT_OreDictUnificator.registerOre(OreDictNames.craftingQuartz, aEvent.Ore); default: break; } break; case cableGt01: if (aMaterial == Materials.Tin) { - GT_OreDictUnificator.registerOre( - OreDictNames.craftingWireTin, - aEvent.Ore); + GT_OreDictUnificator.registerOre(OreDictNames.craftingWireTin, aEvent.Ore); } if (aMaterial == Materials.AnyCopper) { - GT_OreDictUnificator - .registerOre( - OreDictNames.craftingWireCopper, - aEvent.Ore); + GT_OreDictUnificator.registerOre(OreDictNames.craftingWireCopper, aEvent.Ore); } if (aMaterial == Materials.Gold) { - GT_OreDictUnificator.registerOre( - OreDictNames.craftingWireGold, - aEvent.Ore); + GT_OreDictUnificator.registerOre(OreDictNames.craftingWireGold, aEvent.Ore); } if (aMaterial == Materials.AnyIron) { - GT_OreDictUnificator.registerOre( - OreDictNames.craftingWireIron, - aEvent.Ore); + GT_OreDictUnificator.registerOre(OreDictNames.craftingWireIron, aEvent.Ore); } break; case lens: - if ((aMaterial.contains(SubTag.TRANSPARENT)) - && (aMaterial.mColor != Dyes._NULL)) { - GT_OreDictUnificator.registerOre( - "craftingLens" - + aMaterial.mColor - .toString() - .replaceFirst( - "dye", - ""), - aEvent.Ore); + if ((aMaterial.contains(SubTag.TRANSPARENT)) && (aMaterial.mColor != Dyes._NULL)) { + GT_OreDictUnificator.registerOre("craftingLens" + aMaterial.mColor.toString().replaceFirst("dye", ""), aEvent.Ore); } break; case plate: - if ((aMaterial == Materials.Plastic) - || (aMaterial == Materials.Rubber)) { - GT_OreDictUnificator.registerOre( - OrePrefixes.sheet, aMaterial, - aEvent.Ore); + if ((aMaterial == Materials.Plastic) || (aMaterial == Materials.Rubber)) { + GT_OreDictUnificator.registerOre(OrePrefixes.sheet, aMaterial, aEvent.Ore); } if (aMaterial == Materials.Silicon) { - GT_OreDictUnificator.registerOre( - OrePrefixes.item, aMaterial, - aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.item, aMaterial, aEvent.Ore); } if (aMaterial == Materials.Wood) { - GT_OreDictUnificator - .addToBlacklist(aEvent.Ore); - GT_OreDictUnificator.registerOre( - OrePrefixes.plank, aMaterial, - aEvent.Ore); + GT_OreDictUnificator.addToBlacklist(aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.plank, aMaterial, aEvent.Ore); } break; case cell: if (aMaterial == Materials.Empty) { - GT_OreDictUnificator - .addToBlacklist(aEvent.Ore); + GT_OreDictUnificator.addToBlacklist(aEvent.Ore); } break; case gearGt: - GT_OreDictUnificator.registerOre( - OrePrefixes.gear, aMaterial, - aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.gear, aMaterial, aEvent.Ore); break; case stick: - if (!GT_RecipeRegistrator.sRodMaterialList - .contains(aMaterial)) { - GT_RecipeRegistrator.sRodMaterialList - .add(aMaterial); + if (!GT_RecipeRegistrator.sRodMaterialList.contains(aMaterial)) { + GT_RecipeRegistrator.sRodMaterialList.add(aMaterial); } if (aMaterial == Materials.Wood) { - GT_OreDictUnificator - .addToBlacklist(aEvent.Ore); + GT_OreDictUnificator.addToBlacklist(aEvent.Ore); } - if ((aMaterial == Materials.Tin) - || (aMaterial == Materials.Lead) - || (aMaterial == Materials.SolderingAlloy)) { - GT_OreDictUnificator - .registerOre( - ToolDictNames.craftingToolSolderingMetal, - aEvent.Ore); + if ((aMaterial == Materials.Tin) || (aMaterial == Materials.Lead) || (aMaterial == Materials.SolderingAlloy)) { + GT_OreDictUnificator.registerOre(ToolDictNames.craftingToolSolderingMetal, aEvent.Ore); } break; case dust: if (aMaterial == Materials.Salt) { - GT_OreDictUnificator.registerOre( - "itemSalt", aEvent.Ore); + GT_OreDictUnificator.registerOre("itemSalt", aEvent.Ore); } if (aMaterial == Materials.Wood) { - GT_OreDictUnificator.registerOre( - "pulpWood", aEvent.Ore); + GT_OreDictUnificator.registerOre("pulpWood", aEvent.Ore); } if (aMaterial == Materials.Wheat) { - GT_OreDictUnificator.registerOre( - "foodFlour", aEvent.Ore); + GT_OreDictUnificator.registerOre("foodFlour", aEvent.Ore); } if (aMaterial == Materials.Lapis) { - GT_OreDictUnificator.registerOre( - Dyes.dyeBlue, aEvent.Ore); + GT_OreDictUnificator.registerOre(Dyes.dyeBlue, aEvent.Ore); } if (aMaterial == Materials.Lazurite) { - GT_OreDictUnificator.registerOre( - Dyes.dyeCyan, aEvent.Ore); + GT_OreDictUnificator.registerOre(Dyes.dyeCyan, aEvent.Ore); } if (aMaterial == Materials.Sodalite) { - GT_OreDictUnificator.registerOre( - Dyes.dyeBlue, aEvent.Ore); + GT_OreDictUnificator.registerOre(Dyes.dyeBlue, aEvent.Ore); } if (aMaterial == Materials.Cocoa) { - GT_OreDictUnificator.registerOre( - Dyes.dyeBrown, aEvent.Ore); - GT_OreDictUnificator.registerOre( - "foodCocoapowder", aEvent.Ore); + GT_OreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore); + GT_OreDictUnificator.registerOre("foodCocoapowder", aEvent.Ore); } if (aMaterial == Materials.Coffee) { - GT_OreDictUnificator.registerOre( - Dyes.dyeBrown, aEvent.Ore); + GT_OreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore); } if (aMaterial == Materials.BrownLimonite) { - GT_OreDictUnificator.registerOre( - Dyes.dyeBrown, aEvent.Ore); + GT_OreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore); } if (aMaterial == Materials.YellowLimonite) { - GT_OreDictUnificator.registerOre( - Dyes.dyeYellow, aEvent.Ore); + GT_OreDictUnificator.registerOre(Dyes.dyeYellow, aEvent.Ore); } break; case ingot: if (aMaterial == Materials.Rubber) { - GT_OreDictUnificator.registerOre( - "itemRubber", aEvent.Ore); + GT_OreDictUnificator.registerOre("itemRubber", aEvent.Ore); } if (aMaterial == Materials.FierySteel) { - GT_OreDictUnificator.registerOre( - "fieryIngot", aEvent.Ore); + GT_OreDictUnificator.registerOre("fieryIngot", aEvent.Ore); } if (aMaterial == Materials.IronWood) { - GT_OreDictUnificator.registerOre( - "ironwood", aEvent.Ore); + GT_OreDictUnificator.registerOre("ironwood", aEvent.Ore); } if (aMaterial == Materials.Steeleaf) { - GT_OreDictUnificator.registerOre( - "steeleaf", aEvent.Ore); + GT_OreDictUnificator.registerOre("steeleaf", aEvent.Ore); } if (aMaterial == Materials.Knightmetal) { - GT_OreDictUnificator.registerOre( - "knightmetal", aEvent.Ore); + GT_OreDictUnificator.registerOre("knightmetal", aEvent.Ore); } - if ((aMaterial == Materials.Brass) - && (aEvent.Ore.getItemDamage() == 2) - && (aEvent.Ore.getUnlocalizedName() - .equals("item.ingotBrass")) - && (new ItemStack( - aEvent.Ore.getItem(), 1, 0) - .getUnlocalizedName() - .contains("red"))) { - GT_OreDictUnificator.set( - OrePrefixes.ingot, - Materials.RedAlloy, - new ItemStack(aEvent.Ore - .getItem(), 1, 0)); - GT_OreDictUnificator.set( - OrePrefixes.ingot, - Materials.BlueAlloy, - new ItemStack(aEvent.Ore - .getItem(), 1, 1)); - GT_OreDictUnificator.set( - OrePrefixes.ingot, - Materials.Brass, new ItemStack( - aEvent.Ore.getItem(), - 1, 2)); + if ((aMaterial == Materials.Brass) && (aEvent.Ore.getItemDamage() == 2) + && (aEvent.Ore.getUnlocalizedName().equals("item.ingotBrass")) + && (new ItemStack(aEvent.Ore.getItem(), 1, 0).getUnlocalizedName().contains("red"))) { + GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.RedAlloy, new ItemStack(aEvent.Ore.getItem(), 1, 0)); + GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.BlueAlloy, new ItemStack(aEvent.Ore.getItem(), 1, 1)); + GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Brass, new ItemStack(aEvent.Ore.getItem(), 1, 2)); - GT_Values.RA.addWiremillRecipe( - GT_ModHandler.getIC2Item( - "copperCableItem", 3L), - new ItemStack(aEvent.Ore - .getItem(), 1, 8), 400, - 1); - GT_Values.RA.addWiremillRecipe( - GT_ModHandler.getIC2Item( - "ironCableItem", 6L), - new ItemStack(aEvent.Ore - .getItem(), 1, 9), 400, - 2); - GT_Values.RA.addCutterRecipe( - new ItemStack(aEvent.Ore - .getItem(), 1, 3), - new ItemStack(aEvent.Ore - .getItem(), 16, 4), + GT_Values.RA.addWiremillRecipe(GT_ModHandler.getIC2Item("copperCableItem", 3L), new ItemStack(aEvent.Ore.getItem(), 1, + 8), 400, 1); + GT_Values.RA.addWiremillRecipe(GT_ModHandler.getIC2Item("ironCableItem", 6L), + new ItemStack(aEvent.Ore.getItem(), 1, 9), 400, 2); + GT_Values.RA.addCutterRecipe(new ItemStack(aEvent.Ore.getItem(), 1, 3), new ItemStack(aEvent.Ore.getItem(), 16, 4), null, 400, 8); } break; default: break; } - if ((!aPrefix.mIsUnificatable) - || (aMaterial.mUnificatable)) { + if ((!aPrefix.mIsUnificatable) || (aMaterial.mUnificatable)) { } } else { for (Dyes tDye : Dyes.VALUES) { - if (aEvent.Name.endsWith(tDye.name() - .replaceFirst("dye", ""))) { - GT_OreDictUnificator - .addToBlacklist(aEvent.Ore); - GT_Log.ore - .println(tModToName - + " Oh man, why the fuck would anyone need a OreDictified Color for this, that is even too much for GregTech... do not report this, this is just a random Comment about how ridiculous this is."); + if (aEvent.Name.endsWith(tDye.name().replaceFirst("dye", ""))) { + GT_OreDictUnificator.addToBlacklist(aEvent.Ore); + GT_Log.ore.println(tModToName+ " Oh man, why the fuck would anyone need a OreDictified Color for this, that is even too much for GregTech... do not report this, this is just a random Comment about how ridiculous this is."); return; } } - System.out - .println("Material Name: " - + aEvent.Name - + " !!!Unknown Material detected!!! Please report to GregTech Intergalactical for additional compatiblity. This is not an Error, an Issue nor a Lag Source, it is just an Information, which you should pass to me."); - GT_Log.ore - .println(tModToName - + " uses an unknown Material. Report this to GregTech."); + System.out.println("Material Name: "+aEvent.Name+ " !!!Unknown Material detected!!! Please report to GregTech Intergalactical for additional compatiblity. This is not an Error, an Issue nor a Lag Source, it is just an Information, which you should pass to me."); + GT_Log.ore.println(tModToName + " uses an unknown Material. Report this to GregTech."); + return; } } else { - aPrefix.add(GT_Utility.copyAmount(1L, - new Object[] { aEvent.Ore })); + aPrefix.add(GT_Utility.copyAmount(1L, new Object[] { aEvent.Ore })); } } } else if (aPrefix.mIsSelfReferencing) { - aPrefix.add(GT_Utility.copyAmount(1L, - new Object[] { aEvent.Ore })); + aPrefix.add(GT_Utility.copyAmount(1L, new Object[] { aEvent.Ore })); } else { - GT_Log.ore - .println(tModToName - + " uses a Prefix as full OreDict Name, and is therefor invalid."); + GT_Log.ore.println(tModToName + " uses a Prefix as full OreDict Name, and is therefor invalid."); aEvent.Ore.setStackDisplayName("Invalid OreDictionary Tag"); return; } switch (aPrefix) { case dye: if (GT_Utility.isStringValid(tName)) { - GT_OreDictUnificator.registerOre(OrePrefixes.dye, - aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.dye, aEvent.Ore); } break; case stoneSmooth: @@ -2284,26 +1357,20 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { break; case plank: if (tName.equals("Wood")) { - GT_OreDictUnificator.addItemData(aEvent.Ore, - new ItemData(Materials.Wood, 3628800L, - new MaterialStack[0])); + GT_OreDictUnificator.addItemData(aEvent.Ore, new ItemData(Materials.Wood, 3628800L, new MaterialStack[0])); } break; case slab: if (tName.equals("Wood")) { - GT_OreDictUnificator.addItemData(aEvent.Ore, - new ItemData(Materials.Wood, 1814400L, - new MaterialStack[0])); + GT_OreDictUnificator.addItemData(aEvent.Ore, new ItemData(Materials.Wood, 1814400L, new MaterialStack[0])); } break; case sheet: if (tName.equals("Plastic")) { - GT_OreDictUnificator.registerOre(OrePrefixes.plate, - Materials.Plastic, aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Plastic, aEvent.Ore); } if (tName.equals("Rubber")) { - GT_OreDictUnificator.registerOre(OrePrefixes.plate, - Materials.Rubber, aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Rubber, aEvent.Ore); } break; case crafting: @@ -2314,20 +1381,17 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { GT_OreDictUnificator.addToBlacklist(aEvent.Ore); } if (tName.equals("WireCopper")) { - GT_OreDictUnificator.registerOre(OrePrefixes.wire, - Materials.Copper, aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.wire, Materials.Copper, aEvent.Ore); } break; case wood: if (tName.equals("Rubber")) { - GT_OreDictUnificator.registerOre("logRubber", - aEvent.Ore); + GT_OreDictUnificator.registerOre("logRubber", aEvent.Ore); } break; case food: if (tName.equals("Cocoapowder")) { - GT_OreDictUnificator.registerOre(OrePrefixes.dust, - Materials.Cocoa, aEvent.Ore); + GT_OreDictUnificator.registerOre(OrePrefixes.dust, Materials.Cocoa, aEvent.Ore); } break; default: @@ -2336,10 +1400,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } GT_Log.ore.println(tModToName); - OreDictEventContainer tOre = new OreDictEventContainer(aEvent, - aPrefix, aMaterial, aMod); - if ((!this.mOreDictActivated) - || (!GregTech_API.sUnificationEntriesRegistered)) { + OreDictEventContainer tOre = new OreDictEventContainer(aEvent, aPrefix, aMaterial, aMod); + if ((!this.mOreDictActivated) || (!GregTech_API.sUnificationEntriesRegistered)) { this.mEvents.add(tOre); } else { this.mEvents.clear(); @@ -2353,10 +1415,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } @SubscribeEvent - public void onFluidContainerRegistration( - FluidContainerRegistry.FluidContainerRegisterEvent aFluidEvent) { - if ((aFluidEvent.data.filledContainer.getItem() == Items.potionitem) - && (aFluidEvent.data.filledContainer.getItemDamage() == 0)) { + public void onFluidContainerRegistration(FluidContainerRegistry.FluidContainerRegisterEvent aFluidEvent) { + if ((aFluidEvent.data.filledContainer.getItem() == Items.potionitem) && (aFluidEvent.data.filledContainer.getItemDamage() == 0)) { aFluidEvent.data.fluid.amount = 0; } GT_OreDictUnificator.addToBlacklist(aFluidEvent.data.emptyContainer); @@ -2389,42 +1449,27 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } } } - if ((aEvent.world.getTotalWorldTime() % 100L == 0L) - && ((this.mItemDespawnTime != 6000) || (this.mMaxEqualEntitiesAtOneSpot > 0))) { + if ((aEvent.world.getTotalWorldTime() % 100L == 0L) && ((this.mItemDespawnTime != 6000) || (this.mMaxEqualEntitiesAtOneSpot > 0))) { for (int i = 0; i < aEvent.world.loadedEntityList.size(); i++) { if ((aEvent.world.loadedEntityList.get(i) instanceof Entity)) { - Entity tEntity = (Entity) aEvent.world.loadedEntityList - .get(i); - if (((tEntity instanceof EntityItem)) - && (this.mItemDespawnTime != 6000) - && (((EntityItem) tEntity).lifespan == 6000)) { + Entity tEntity = (Entity) aEvent.world.loadedEntityList.get(i); + if (((tEntity instanceof EntityItem)) && (this.mItemDespawnTime != 6000) && (((EntityItem) tEntity).lifespan == 6000)) { ((EntityItem) tEntity).lifespan = this.mItemDespawnTime; - } else if (((tEntity instanceof EntityLivingBase)) - && (this.mMaxEqualEntitiesAtOneSpot > 0) - && (!(tEntity instanceof EntityPlayer)) - && (((EntityLivingBase) tEntity).canBePushed()) - && (((EntityLivingBase) tEntity).getHealth() > 0.0F)) { - List tList = tEntity.worldObj - .getEntitiesWithinAABBExcludingEntity( - tEntity, - tEntity.boundingBox.expand( - 0.20000000298023224D, 0.0D, - 0.20000000298023224D)); + } else if (((tEntity instanceof EntityLivingBase)) && (this.mMaxEqualEntitiesAtOneSpot > 0) && (!(tEntity instanceof EntityPlayer)) + && (((EntityLivingBase) tEntity).canBePushed()) && (((EntityLivingBase) tEntity).getHealth() > 0.0F)) { + List tList = tEntity.worldObj.getEntitiesWithinAABBExcludingEntity(tEntity, + tEntity.boundingBox.expand(0.20000000298023224D, 0.0D, 0.20000000298023224D)); Class tClass = tEntity.getClass(); int tEntityCount = 1; if (tList != null) { for (int j = 0; j < tList.size(); j++) { - if ((tList.get(j) != null) - && (tList.get(j).getClass() == tClass)) { + if ((tList.get(j) != null) && (tList.get(j).getClass() == tClass)) { tEntityCount++; } } } if (tEntityCount > this.mMaxEqualEntitiesAtOneSpot) { - tEntity.attackEntityFrom( - DamageSource.inWall, - tEntityCount - - this.mMaxEqualEntitiesAtOneSpot); + tEntity.attackEntityFrom(DamageSource.inWall, tEntityCount - this.mMaxEqualEntitiesAtOneSpot); } } } @@ -2435,51 +1480,36 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { @SubscribeEvent public void onPlayerTickEventServer(TickEvent.PlayerTickEvent aEvent) { - if ((!aEvent.player.isDead) && (aEvent.phase == TickEvent.Phase.END) - && (aEvent.side.isServer())) { - if ((aEvent.player.ticksExisted % 200 == 0) - && (aEvent.player.capabilities.allowEdit) - && (!aEvent.player.capabilities.isCreativeMode) + if ((!aEvent.player.isDead) && (aEvent.phase == TickEvent.Phase.END) && (aEvent.side.isServer())) { + if ((aEvent.player.ticksExisted % 200 == 0) && (aEvent.player.capabilities.allowEdit) && (!aEvent.player.capabilities.isCreativeMode) && (this.mSurvivalIntoAdventure)) { aEvent.player.setGameType(GameType.ADVENTURE); aEvent.player.capabilities.allowEdit = false; if (this.mAxeWhenAdventure) { - GT_Utility.sendChatToPlayer(aEvent.player, - "It's dangerous to go alone! Take this."); - aEvent.player.worldObj.spawnEntityInWorld(new EntityItem( - aEvent.player.worldObj, aEvent.player.posX, - aEvent.player.posY, aEvent.player.posZ, - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(6, 1, Materials.Flint, - Materials.Wood, null))); + GT_Utility.sendChatToPlayer(aEvent.player, "It's dangerous to go alone! Take this."); + aEvent.player.worldObj.spawnEntityInWorld(new EntityItem(aEvent.player.worldObj, aEvent.player.posX, aEvent.player.posY, + aEvent.player.posZ, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(6, 1, Materials.Flint, Materials.Wood, null))); } } - boolean tHungerEffect = (this.mHungerEffect) - && (aEvent.player.ticksExisted % 2400 == 1200); + boolean tHungerEffect = (this.mHungerEffect) && (aEvent.player.ticksExisted % 2400 == 1200); if (aEvent.player.ticksExisted % 120 == 0) { int tCount = 64; for (int i = 0; i < 36; i++) { ItemStack tStack; if ((tStack = aEvent.player.inventory.getStackInSlot(i)) != null) { if (!aEvent.player.capabilities.isCreativeMode) { - GT_Utility.applyRadioactivity(aEvent.player, - GT_Utility.getRadioactivityLevel(tStack), - tStack.stackSize); - float tHeat = GT_Utility - .getHeatDamageFromItem(tStack); + GT_Utility.applyRadioactivity(aEvent.player, GT_Utility.getRadioactivityLevel(tStack), tStack.stackSize); + float tHeat = GT_Utility.getHeatDamageFromItem(tStack); if (tHeat != 0.0F) { if (tHeat > 0.0F) { - GT_Utility.applyHeatDamage(aEvent.player, - tHeat); + GT_Utility.applyHeatDamage(aEvent.player, tHeat); } else { - GT_Utility.applyFrostDamage(aEvent.player, - -tHeat); + GT_Utility.applyFrostDamage(aEvent.player, -tHeat); } } } if (tHungerEffect) { - tCount += tStack.stackSize * 64 - / Math.max(1, tStack.getMaxStackSize()); + tCount += tStack.stackSize * 64 / Math.max(1, tStack.getMaxStackSize()); } if (this.mInventoryUnification) { GT_OreDictUnificator.setStack(true, tStack); @@ -2490,18 +1520,13 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { ItemStack tStack; if ((tStack = aEvent.player.inventory.armorInventory[i]) != null) { if (!aEvent.player.capabilities.isCreativeMode) { - GT_Utility.applyRadioactivity(aEvent.player, - GT_Utility.getRadioactivityLevel(tStack), - tStack.stackSize); - float tHeat = GT_Utility - .getHeatDamageFromItem(tStack); + GT_Utility.applyRadioactivity(aEvent.player, GT_Utility.getRadioactivityLevel(tStack), tStack.stackSize); + float tHeat = GT_Utility.getHeatDamageFromItem(tStack); if (tHeat != 0.0F) { if (tHeat > 0.0F) { - GT_Utility.applyHeatDamage(aEvent.player, - tHeat); + GT_Utility.applyHeatDamage(aEvent.player, tHeat); } else { - GT_Utility.applyFrostDamage(aEvent.player, - -tHeat); + GT_Utility.applyFrostDamage(aEvent.player, -tHeat); } } } @@ -2511,36 +1536,29 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } } if (tHungerEffect) { - aEvent.player - .addExhaustion(Math.max(1.0F, tCount / 666.6F)); + aEvent.player.addExhaustion(Math.max(1.0F, tCount / 666.6F)); } } } } - public Object getServerGuiElement(int aID, EntityPlayer aPlayer, - World aWorld, int aX, int aY, int aZ) { + public Object getServerGuiElement(int aID, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if ((tTileEntity instanceof IGregTechTileEntity)) { - IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) tTileEntity) - .getMetaTileEntity(); + IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity(); if (tMetaTileEntity != null) { - return tMetaTileEntity.getServerGUI(aID, aPlayer.inventory, - (IGregTechTileEntity) tTileEntity); + return tMetaTileEntity.getServerGUI(aID, aPlayer.inventory, (IGregTechTileEntity) tTileEntity); } } return null; } - public Object getClientGuiElement(int aID, EntityPlayer aPlayer, - World aWorld, int aX, int aY, int aZ) { + public Object getClientGuiElement(int aID, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if ((tTileEntity instanceof IGregTechTileEntity)) { - IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) tTileEntity) - .getMetaTileEntity(); + IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity(); if (tMetaTileEntity != null) { - return tMetaTileEntity.getClientGUI(aID, aPlayer.inventory, - (IGregTechTileEntity) tTileEntity); + return tMetaTileEntity.getClientGUI(aID, aPlayer.inventory, (IGregTechTileEntity) tTileEntity); } } return null; @@ -2552,11 +1570,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } short rFuelValue = 0; if ((aFuel.getItem() instanceof GT_MetaGenerated_Item)) { - Short tFuelValue = (Short) ((GT_MetaGenerated_Item) aFuel.getItem()).mBurnValues - .get(Short.valueOf((short) aFuel.getItemDamage())); + Short tFuelValue = (Short) ((GT_MetaGenerated_Item) aFuel.getItem()).mBurnValues.get(Short.valueOf((short) aFuel.getItemDamage())); if (tFuelValue != null) { - rFuelValue = (short) Math.max(rFuelValue, - tFuelValue.shortValue()); + rFuelValue = (short) Math.max(rFuelValue, tFuelValue.shortValue()); } } NBTTagCompound tNBT = aFuel.getTagCompound(); @@ -2570,15 +1586,13 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedSodium")) { rFuelValue = (short) Math.max(rFuelValue, 4000); } - if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, - "dustImpureSodium")) { + if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustImpureSodium")) { rFuelValue = (short) Math.max(rFuelValue, 4000); } if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSodium")) { rFuelValue = (short) Math.max(rFuelValue, 4000); } - if (GT_OreDictUnificator - .isItemStackInstanceOf(aFuel, "dustSmallSodium")) { + if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallSodium")) { rFuelValue = (short) Math.max(rFuelValue, 1000); } if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinySodium")) { @@ -2590,19 +1604,16 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedLithium")) { rFuelValue = (short) Math.max(rFuelValue, 6000); } - if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, - "dustImpureLithium")) { + if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustImpureLithium")) { rFuelValue = (short) Math.max(rFuelValue, 6000); } if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustLithium")) { rFuelValue = (short) Math.max(rFuelValue, 6000); } - if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, - "dustSmallLithium")) { + if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallLithium")) { rFuelValue = (short) Math.max(rFuelValue, 2000); } - if (GT_OreDictUnificator - .isItemStackInstanceOf(aFuel, "dustTinyLithium")) { + if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyLithium")) { rFuelValue = (short) Math.max(rFuelValue, 888); } if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemLignite")) { @@ -2611,19 +1622,16 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedLignite")) { rFuelValue = (short) Math.max(rFuelValue, 300); } - if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, - "dustImpureLignite")) { + if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustImpureLignite")) { rFuelValue = (short) Math.max(rFuelValue, 300); } if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustLignite")) { rFuelValue = (short) Math.max(rFuelValue, 300); } - if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, - "dustSmallLignite")) { + if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallLignite")) { rFuelValue = (short) Math.max(rFuelValue, 75); } - if (GT_OreDictUnificator - .isItemStackInstanceOf(aFuel, "dustTinyLignite")) { + if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyLignite")) { rFuelValue = (short) Math.max(rFuelValue, 33); } if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemCoal")) { @@ -2647,23 +1655,19 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemCharcoal")) { rFuelValue = (short) Math.max(rFuelValue, 1600); } - if (GT_OreDictUnificator - .isItemStackInstanceOf(aFuel, "crushedCharcoal")) { + if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedCharcoal")) { rFuelValue = (short) Math.max(rFuelValue, 1600); } - if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, - "dustImpureCharcoal")) { + if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustImpureCharcoal")) { rFuelValue = (short) Math.max(rFuelValue, 1600); } if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustCharcoal")) { rFuelValue = (short) Math.max(rFuelValue, 1600); } - if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, - "dustSmallCharcoal")) { + if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallCharcoal")) { rFuelValue = (short) Math.max(rFuelValue, 400); } - if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, - "dustTinyCharcoal")) { + if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyCharcoal")) { rFuelValue = (short) Math.max(rFuelValue, 177); } if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustWood")) { @@ -2675,8 +1679,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyWood")) { rFuelValue = (short) Math.max(rFuelValue, 11); } - if (GT_Utility.areStacksEqual(aFuel, new ItemStack( - Blocks.wooden_button, 1))) { + if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Blocks.wooden_button, 1))) { rFuelValue = (short) Math.max(rFuelValue, 150); } if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Blocks.ladder, 1))) { @@ -2685,42 +1688,37 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Items.sign, 1))) { rFuelValue = (short) Math.max(rFuelValue, 600); } - if (GT_Utility.areStacksEqual(aFuel, - new ItemStack(Items.wooden_door, 1))) { + if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Items.wooden_door, 1))) { rFuelValue = (short) Math.max(rFuelValue, 600); } return rFuelValue; } public Fluid addAutogeneratedMoltenFluid(Materials aMaterial) { - return addFluid("molten." + aMaterial.name().toLowerCase(),"molten.autogenerated","Molten " + aMaterial.mDefaultLocalName, aMaterial,aMaterial.mMoltenRGBa, 4, aMaterial.mMeltingPoint <= 0 ? 1000: aMaterial.mMeltingPoint, null, null, 0); + return addFluid("molten." + aMaterial.name().toLowerCase(), "molten.autogenerated", "Molten " + aMaterial.mDefaultLocalName, aMaterial, + aMaterial.mMoltenRGBa, 4, aMaterial.mMeltingPoint <= 0 ? 1000 : aMaterial.mMeltingPoint, null, null, 0); } - + public Fluid addAutogeneratedPlasmaFluid(Materials aMaterial) { - return addFluid("plasma." + aMaterial.name().toLowerCase(),"plasma.autogenerated",aMaterial.mDefaultLocalName+" Plasma", aMaterial,aMaterial.mMoltenRGBa, 3, 10000, GT_OreDictUnificator.get(OrePrefixes.cellPlasma, aMaterial, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); + return addFluid("plasma." + aMaterial.name().toLowerCase(), "plasma.autogenerated", aMaterial.mDefaultLocalName + " Plasma", aMaterial, + aMaterial.mMoltenRGBa, 3, 10000, GT_OreDictUnificator.get(OrePrefixes.cellPlasma, aMaterial, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), + 1000); } - public Fluid addFluid(String aName, String aLocalized, Materials aMaterial, - int aState, int aTemperatureK) { - return addFluid(aName, aLocalized, aMaterial, aState, aTemperatureK, - null, null, 0); + public Fluid addFluid(String aName, String aLocalized, Materials aMaterial, int aState, int aTemperatureK) { + return addFluid(aName, aLocalized, aMaterial, aState, aTemperatureK, null, null, 0); } - public Fluid addFluid(String aName, String aLocalized, Materials aMaterial, - int aState, int aTemperatureK, ItemStack aFullContainer, + public Fluid addFluid(String aName, String aLocalized, Materials aMaterial, int aState, int aTemperatureK, ItemStack aFullContainer, ItemStack aEmptyContainer, int aFluidAmount) { - return addFluid(aName, aName.toLowerCase(), aLocalized, aMaterial, - null, aState, aTemperatureK, aFullContainer, aEmptyContainer, - aFluidAmount); + return addFluid(aName, aName.toLowerCase(), aLocalized, aMaterial, null, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount); } - public Fluid addFluid(String aName, String aTexture, String aLocalized, - Materials aMaterial, short[] aRGBa, int aState, int aTemperatureK,ItemStack aFullContainer, ItemStack aEmptyContainer,int aFluidAmount) { + public Fluid addFluid(String aName, String aTexture, String aLocalized, Materials aMaterial, short[] aRGBa, int aState, int aTemperatureK, + ItemStack aFullContainer, ItemStack aEmptyContainer, int aFluidAmount) { aName = aName.toLowerCase(); - Fluid rFluid = new GT_Fluid(aName, aTexture, aRGBa != null ? aRGBa - : Dyes._NULL.getRGBA()); - GT_LanguageManager.addStringLocalization(rFluid.getUnlocalizedName(), - aLocalized == null ? aName : aLocalized); + Fluid rFluid = new GT_Fluid(aName, aTexture, aRGBa != null ? aRGBa : Dyes._NULL.getRGBA()); + GT_LanguageManager.addStringLocalization(rFluid.getUnlocalizedName(), aLocalized == null ? aName : aLocalized); if (FluidRegistry.registerFluid(rFluid)) { switch (aState) { case 0: @@ -2767,15 +1765,15 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { aMaterial.mStandardMoltenFluid = rFluid; } } - if ((aFullContainer != null) && (aEmptyContainer != null) && (!FluidContainerRegistry.registerFluidContainer( new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer))) { - GT_Values.RA.addFluidCannerRecipe(aFullContainer, GT_Utility.getContainerItem(aFullContainer, false), null, new FluidStack(rFluid, aFluidAmount)); + if ((aFullContainer != null) && (aEmptyContainer != null) + && (!FluidContainerRegistry.registerFluidContainer(new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer))) { + GT_Values.RA.addFluidCannerRecipe(aFullContainer, GT_Utility.getContainerItem(aFullContainer, false), null, new FluidStack(rFluid, aFluidAmount)); } return rFluid; } public File getSaveDirectory() { - return this.mUniverse == null ? null : this.mUniverse.getSaveHandler() - .getWorldDirectory(); + return this.mUniverse == null ? null : this.mUniverse.getSaveHandler().getWorldDirectory(); } public void registerUnificationEntries() { @@ -2783,48 +1781,30 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { GregTech_API.sUnification.mConfig.load(); GT_OreDictUnificator.resetUnificationEntries(); for (OreDictEventContainer tOre : this.mEvents) { - if ((!(tOre.mEvent.Ore.getItem() instanceof GT_MetaGenerated_Item)) - && (tOre.mPrefix != null) && (tOre.mPrefix.mIsUnificatable) + if ((!(tOre.mEvent.Ore.getItem() instanceof GT_MetaGenerated_Item)) && (tOre.mPrefix != null) && (tOre.mPrefix.mIsUnificatable) && (tOre.mMaterial != null)) { if (GT_OreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) { - GT_OreDictUnificator.addAssociation(tOre.mPrefix, - tOre.mMaterial, tOre.mEvent.Ore, true); + GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, true); } else { - GT_OreDictUnificator.addAssociation(tOre.mPrefix, - tOre.mMaterial, tOre.mEvent.Ore, false); - GT_OreDictUnificator - .set(tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (tOre.mModID != null) - && (GregTech_API.sUnification - .get(ConfigCategories.specialunificationtargets - + "." + tOre.mModID, - tOre.mEvent.Name, - false)), true); + GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); + GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, false)), true); } } } for (OreDictEventContainer tOre : this.mEvents) { - if (((tOre.mEvent.Ore.getItem() instanceof GT_MetaGenerated_Item)) - && (tOre.mPrefix != null) && (tOre.mPrefix.mIsUnificatable) + if (((tOre.mEvent.Ore.getItem() instanceof GT_MetaGenerated_Item)) && (tOre.mPrefix != null) && (tOre.mPrefix.mIsUnificatable) && (tOre.mMaterial != null)) { if (GT_OreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) { - GT_OreDictUnificator.addAssociation(tOre.mPrefix, - tOre.mMaterial, tOre.mEvent.Ore, true); + GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, true); } else { - GT_OreDictUnificator.addAssociation(tOre.mPrefix, - tOre.mMaterial, tOre.mEvent.Ore, false); + GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); GT_OreDictUnificator .set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (tOre.mModID != null) - && (GregTech_API.sUnification - .get(ConfigCategories.specialunificationtargets - + "." + tOre.mModID, - tOre.mEvent.Name, - false)), true); + && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, + false)), true); } } } @@ -2850,11 +1830,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } if (aOre.mPrefix != null) { if (!aOre.mPrefix.isIgnored(aOre.mMaterial)) { - aOre.mPrefix.processOre( - aOre.mMaterial == null ? Materials._NULL - : aOre.mMaterial, aOre.mEvent.Name, - aOre.mModID, GT_Utility.copyAmount(1L, - new Object[] { aOre.mEvent.Ore })); + aOre.mPrefix.processOre(aOre.mMaterial == null ? Materials._NULL : aOre.mMaterial, aOre.mEvent.Name, aOre.mModID, + GT_Utility.copyAmount(1L, new Object[] { aOre.mEvent.Ore })); } } else { System.out diff --git a/main/java/gregtech/common/GT_RecipeAdder.java b/main/java/gregtech/common/GT_RecipeAdder.java index 7bcb3f16..dc88c2b9 100644 --- a/main/java/gregtech/common/GT_RecipeAdder.java +++ b/main/java/gregtech/common/GT_RecipeAdder.java @@ -299,7 +299,7 @@ if((aDuration = GregTech_API.sRecipeFile.get("distillation", aInput.getUnlocalizedName(), aDuration))<=0){ return false; } - GT_Recipe.GT_Recipe_Map.sDistillationRecipes.addRecipe(true, null,new ItemStack[]{ aOutput2}, null, new FluidStack[]{ aInput}, aOutputs, Math.min(aDuration,16), Math.max(1, aEUt), 0); + GT_Recipe.GT_Recipe_Map.sDistillationRecipes.addRecipe(false, null,new ItemStack[]{ aOutput2}, null, new FluidStack[]{ aInput}, aOutputs, Math.max(1, aDuration), Math.max(1, aEUt), 0); return false; } /* 293: */ diff --git a/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index d51d4255..2a924713 100644 --- a/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -62,6 +62,7 @@ import gregtech.common.covers.GT_Cover_RedstoneTransmitterInternal; /* 54: */ import java.util.List; +import cpw.mods.fml.common.Loader; /* 55: */ import net.minecraft.block.Block; /* 56: */ import net.minecraft.enchantment.Enchantment; /* 57: */ import net.minecraft.entity.item.EntityItem; @@ -72,6 +73,7 @@ import gregtech.common.covers.GT_Cover_RedstoneTransmitterInternal; /* 62: */ import net.minecraft.potion.Potion; /* 63: */ import net.minecraft.util.MathHelper; /* 64: */ import net.minecraft.world.World; +import net.minecraftforge.common.ForgeModContainer; /* 65: */ /* 66: */ public class GT_MetaGenerated_Item_01 /* 67: */ extends GT_MetaGenerated_Item_X32 @@ -369,6 +371,18 @@ import gregtech.common.covers.GT_Cover_RedstoneTransmitterInternal; /* 359: */ /* 360:328 */ GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Platinum, 2L), new ItemStack(Items.flint, 1), ItemList.Tool_Lighter_Platinum_Empty.get(1L, new Object[0]), 256, 256); /* 361: */ + if(Loader.isModLoaded("GalacticraftMars")){ + ItemList.Ingot_Heavy1.set(addItem(tLastID = 462, "Heavy Duty Alloy Ingot", "Used to make Heavy Duty Plates", new Object[0])); + ItemList.Ingot_Heavy2.set(addItem(tLastID = 463, "Heavy Duty Alloy Ingot T2", "Used to make Heavy Duty Plates T2", new Object[0])); + ItemList.Ingot_Heavy3.set(addItem(tLastID = 464, "Heavy Duty Alloy Ingot T3", "Used to make Heavy Duty Plates T3", new Object[0])); + + GT_ModHandler.addCraftingRecipe(ItemList.Ingot_Heavy1.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "BhB", "CAS", "B B", 'B', OrePrefixes.bolt.get(Materials.StainlessSteel), 'C', OrePrefixes.compressed.get(Materials.Bronze), 'A', OrePrefixes.compressed.get(Materials.Aluminium), 'S', OrePrefixes.compressed.get(Materials.Steel) }); + GT_Values.RA.addImplosionRecipe(ItemList.Ingot_Heavy1.get(1L, new Object[0]), 8, GT_ModHandler.getModItem("GalacticraftCore", "item.heavyPlating", 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.StainlessSteel, 2L)); + GT_ModHandler.addCraftingRecipe(ItemList.Ingot_Heavy2.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " BB", "hPC", " BB", 'B', OrePrefixes.bolt.get(Materials.Tungsten), 'C', OrePrefixes.compressed.get(Materials.MeteoricIron), 'P', GT_ModHandler.getModItem("GalacticraftCore", "item.heavyPlating", 1L)}); + GT_Values.RA.addImplosionRecipe(ItemList.Ingot_Heavy2.get(1L, new Object[0]), 8, GT_ModHandler.getModItem("GalacticraftMars", "item.null", 1L,3), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tungsten, 2L)); + GT_ModHandler.addCraftingRecipe(ItemList.Ingot_Heavy3.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " BB", "hPC", " BB", 'B', OrePrefixes.bolt.get(Materials.TungstenSteel), 'C', OrePrefixes.compressed.get(Materials.Desh), 'P', GT_ModHandler.getModItem("GalacticraftMars", "item.null", 1L,3)}); + GT_Values.RA.addImplosionRecipe(ItemList.Ingot_Heavy3.get(1L, new Object[0]), 8, GT_ModHandler.getModItem("GalacticraftMars", "item.itemBasicAsteroids", 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.TungstenSteel, 2L)); + } /* 362:330 */ ItemList.Ingot_IridiumAlloy.set(addItem(tLastID = 480, "Iridium Alloy Ingot", "Used to make Iridium Plates", new Object[] { new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L) })); /* 363: */ /* 364:332 */ GT_ModHandler.addRollingMachineRecipe(ItemList.Ingot_IridiumAlloy.get(1L, new Object[0]), new Object[] { "IAI", "ADA", "IAI", Character.valueOf('D'), GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "iridiumplate", true) ? OreDictNames.craftingIndustrialDiamond : OrePrefixes.dust.get(Materials.Diamond), Character.valueOf('A'), OrePrefixes.plateAlloy.get("Advanced"), Character.valueOf('I'), OrePrefixes.plate.get(Materials.Iridium) }); diff --git a/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java b/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java index c74c04cd..6bf553a0 100644 --- a/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java +++ b/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java @@ -9,6 +9,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.item.EntityEnderCrystal; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.world.World; import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.Textures; @@ -95,12 +96,16 @@ import gregtech.api.util.GT_Utility; //Energyzed node if(isThaumcraftLoaded){ try{ - int fire = VisNetHandler.drainVis(this.getBaseMetaTileEntity().getWorld(), this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord(), Aspect.FIRE, 1000); - int earth = VisNetHandler.drainVis(this.getBaseMetaTileEntity().getWorld(), this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord(), Aspect.EARTH, 1000); - int air = VisNetHandler.drainVis(this.getBaseMetaTileEntity().getWorld(), this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord(), Aspect.AIR, 1000); - int destruction = VisNetHandler.drainVis(this.getBaseMetaTileEntity().getWorld(), this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord(), Aspect.ENTROPY, 1000); - int order = VisNetHandler.drainVis(this.getBaseMetaTileEntity().getWorld(), this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord(), Aspect.ORDER, 1000); - int water = VisNetHandler.drainVis(this.getBaseMetaTileEntity().getWorld(), this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord(), Aspect.WATER, 1000); + World tmpWorld = this.getBaseMetaTileEntity().getWorld(); + int tmpX = this.getBaseMetaTileEntity().getXCoord(); + int tmpY = this.getBaseMetaTileEntity().getYCoord(); + int tmpZ = this.getBaseMetaTileEntity().getZCoord(); + int fire = VisNetHandler.drainVis(tmpWorld, tmpX, tmpY, tmpZ, Aspect.FIRE, 1000); + int earth = VisNetHandler.drainVis(tmpWorld, tmpX, tmpY, tmpZ, Aspect.EARTH, 1000); + int air = VisNetHandler.drainVis(tmpWorld, tmpX, tmpY, tmpZ, Aspect.AIR, 1000); + int destruction = VisNetHandler.drainVis(tmpWorld, tmpX, tmpY, tmpZ, Aspect.ENTROPY, 1000); + int order = VisNetHandler.drainVis(tmpWorld, tmpX, tmpY, tmpZ, Aspect.ORDER, 1000); + int water = VisNetHandler.drainVis(tmpWorld, tmpX, tmpY, tmpZ, Aspect.WATER, 1000); int visEU = (int) (Math.pow(fire, 4)+Math.pow(earth, 4)+Math.pow(air, 4)+Math.pow(destruction, 4)+Math.pow(order, 4)+Math.pow(water, 4)); getBaseMetaTileEntity().increaseStoredEnergyUnits(Math.min(maxEUOutput(), visEU*getEfficiency()/this.sEnergyFromVis), false); }catch (Throwable e){} @@ -121,7 +126,9 @@ import gregtech.api.util.GT_Utility; public boolean hasEgg() { - return Blocks.dragon_egg == getBaseMetaTileEntity().getBlockOffset(0, 1, 0); + Block above = getBaseMetaTileEntity().getBlockOffset(0, 1, 0); + if(above==null||Blocks.air==above){return false;} + return Blocks.dragon_egg == above || above.getUnlocalizedName().equals("tile.dragonEgg"); } /* 43: */ /* 44: */ public int getEfficiency() diff --git a/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java b/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java index 8d05b6e5..cb00b859 100644 --- a/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java +++ b/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java @@ -1,6 +1,7 @@ /* 1: */ package gregtech.common.tileentities.machines.basic; /* 2: */ -/* 3: */ import gregtech.api.enums.ItemList; +/* 3: */ import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; import gregtech.api.enums.Textures; /* 4: */ import gregtech.api.enums.Textures.BlockIcons; /* 5: */ import gregtech.api.interfaces.ITexture; @@ -91,15 +92,17 @@ import gregtech.api.util.GT_Recipe; /* 89:71 */ return 0; /* 90: */ } /* 91: */ -/* 92: */ public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) -/* 93: */ { -/* 94:76 */ if (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) -/* 95: */ { -/* 96:76 */ if (((getInputSlot() == aIndex) || (!ItemList.Crate_Empty.isStackEqual(aStack))) && (!ItemList.Schematic_1by1.isStackEqual(getInputAt(1))) && (!ItemList.Schematic_2by2.isStackEqual(getInputAt(1))) && (!ItemList.Schematic_3by3.isStackEqual(getInputAt(1)))) {} -/* 97:76 */ return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.findRecipe(getBaseMetaTileEntity(), true, gregtech.api.enums.GT_Values.V[this.mTier], null, new ItemStack[] { GT_Utility.copyAmount(64L, new Object[] { aStack }), getInputAt(1) }) != null; -/* 98: */ } -/* 99:77 */ return false; -/* :0: */ } +public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) +{ + if(super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) + return getInputSlot() != aIndex && ItemList.Crate_Empty.isStackEqual(aStack) || ItemList.Schematic_1by1.isStackEqual(getInputAt(1)) || ItemList.Schematic_2by2.isStackEqual(getInputAt(1)) || ItemList.Schematic_3by3.isStackEqual(getInputAt(1)) || gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.findRecipe(getBaseMetaTileEntity(), true, GT_Values.V[mTier], null, new ItemStack[] { + GT_Utility.copyAmount(64L, new Object[] { + aStack + }), getInputAt(1) + }) != null; + else + return false; +} /* :1: */ } diff --git a/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java new file mode 100644 index 00000000..5abb3be3 --- /dev/null +++ b/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java @@ -0,0 +1,374 @@ +package gregtech.common.tileentities.machines.basic; + +import static gregtech.api.enums.GT_Values.V; + +import java.util.ArrayList; +import java.util.Iterator; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.ChunkPosition; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidBlock; +import gregtech.api.enums.Textures; +import gregtech.api.gui.GT_Container_BasicTank; +import gregtech.api.gui.GT_GUIContainer_BasicTank; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.BaseTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Utility; + +public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch { + + public ArrayList mPumpList = new ArrayList(); + public int mPumpTimer = 0; + public int mPumpCountBelow = 0; + public Block mPumpedBlock1 = null; + public Block mPumpedBlock2 = null; + + public GT_MetaTileEntity_Pump(int aID, String aName, String aNameRegional, int aTier) { + super(aID, aName, aNameRegional, aTier, 3, "The best way of emptying Oceans!"); + } + + public GT_MetaTileEntity_Pump(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + super(aName, aTier, 3, aDescription,aTextures); + } + + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_Pump(this.mName, this.mTier, this.mDescription, this.mTextures); + } + + public void saveNBTData(NBTTagCompound aNBT) { + super.saveNBTData(aNBT); + aNBT.setString("mPumpedBlock1", this.mPumpedBlock1 == null ? "" : this.mPumpedBlock1.getUnlocalizedName()); + aNBT.setString("mPumpedBlock2", this.mPumpedBlock2 == null ? "" : this.mPumpedBlock2.getUnlocalizedName()); + } + + public void loadNBTData(NBTTagCompound aNBT) { + super.loadNBTData(aNBT); + this.mPumpedBlock1 = Block.getBlockFromName(aNBT.getString("mPumpedBlock1")); + this.mPumpedBlock2 = Block.getBlockFromName(aNBT.getString("mPumpedBlock2")); + } + + @Override + public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { + return new GT_Container_BasicTank(aPlayerInventory, aBaseMetaTileEntity); + } + + @Override + public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { + return new GT_GUIContainer_BasicTank(aPlayerInventory, aBaseMetaTileEntity, getLocalName()); + } + @Override + public boolean doesFillContainers() { + return true; + } + @Override + public boolean doesEmptyContainers() { + return false; + } + @Override + public boolean canTankBeFilled() { + return false; + } + @Override + public boolean canTankBeEmptied() { + return true; + } + @Override + public boolean displaysItemStack() { + return true; + } + @Override + public boolean displaysStackSize() { + return false; + } + + @Override + public boolean isFluidInputAllowed(FluidStack aFluid) { + return false; + } + + @Override + public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { + super.onPostTick(aBaseMetaTileEntity, aTick); + if (getBaseMetaTileEntity().isServerSide()) { + this.mPumpTimer -= 1; + if ((getBaseMetaTileEntity() instanceof BaseTileEntity)) { + ((BaseTileEntity) getBaseMetaTileEntity()).ignoreUnloadedChunks = false; + } + this.doTickProfilingInThisTick = true; + this.mPumpCountBelow = 0; + IGregTechTileEntity tTileEntity; + for (int i = 1; (i < 21) && ((tTileEntity = getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance((byte) 0, i)) != null) + && (tTileEntity.getMetaTileEntity() != null) && ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Pump)); i++) { + getBaseMetaTileEntity().setActive(tTileEntity.isActive()); + this.mPumpCountBelow += 1; + ((GT_MetaTileEntity_Pump) tTileEntity.getMetaTileEntity()).mPumpTimer -= 1; + } + if (this.mPumpCountBelow <= 0) { + if ((getBaseMetaTileEntity().isAllowedToWork()) && (getBaseMetaTileEntity().isUniversalEnergyStored(16*((int)Math.pow(4, this.mTier)))) + && ((this.mFluid == null) || (this.mFluid.amount + 1000 <= getCapacity()))) { + boolean tMovedOneDown = false; + if ((this.mPumpList.isEmpty()) && (getBaseMetaTileEntity().getTimer() % 100L == 0L)) { + tMovedOneDown = moveOneDown(); + } + if ((GT_Utility.isBlockInvalid(this.mPumpedBlock1)) || (GT_Utility.isBlockInvalid(this.mPumpedBlock2))) { + getFluidAt(getBaseMetaTileEntity().getXCoord(), getYOfPumpHead() - 1, getBaseMetaTileEntity().getZCoord()); + if ((GT_Utility.isBlockInvalid(this.mPumpedBlock1)) || (GT_Utility.isBlockInvalid(this.mPumpedBlock2))) { + getFluidAt(getBaseMetaTileEntity().getXCoord(), getYOfPumpHead(), getBaseMetaTileEntity().getZCoord() + 1); + } + if ((GT_Utility.isBlockInvalid(this.mPumpedBlock1)) || (GT_Utility.isBlockInvalid(this.mPumpedBlock2))) { + getFluidAt(getBaseMetaTileEntity().getXCoord(), getYOfPumpHead(), getBaseMetaTileEntity().getZCoord() - 1); + } + if ((GT_Utility.isBlockInvalid(this.mPumpedBlock1)) || (GT_Utility.isBlockInvalid(this.mPumpedBlock2))) { + getFluidAt(getBaseMetaTileEntity().getXCoord() + 1, getYOfPumpHead(), getBaseMetaTileEntity().getZCoord()); + } + if ((GT_Utility.isBlockInvalid(this.mPumpedBlock1)) || (GT_Utility.isBlockInvalid(this.mPumpedBlock2))) { + getFluidAt(getBaseMetaTileEntity().getXCoord() - 1, getYOfPumpHead(), getBaseMetaTileEntity().getZCoord()); + } + } else if (getYOfPumpHead() < getBaseMetaTileEntity().getYCoord()) { + if ((tMovedOneDown) || ((this.mPumpList.isEmpty()) && (getBaseMetaTileEntity().getTimer() % 200L == 100L)) || (getBaseMetaTileEntity().getTimer() % 72000L == 100L)) { + this.mPumpList.clear(); + int y = getBaseMetaTileEntity().getYCoord() - 1; + for (int yHead = getYOfPumpHead(); (this.mPumpList.isEmpty()) && (y >= yHead); y--) { + scanForFluid(getBaseMetaTileEntity().getXCoord(), y, getBaseMetaTileEntity().getZCoord(), this.mPumpList, getBaseMetaTileEntity().getXCoord(), getBaseMetaTileEntity().getZCoord(), 8*((int)Math.pow(2, this.mTier))); + } + } + if ((!tMovedOneDown) && (this.mPumpTimer <= 0)) { + while ((!this.mPumpList.isEmpty()) + && (!consumeFluid(((ChunkPosition) this.mPumpList.get(this.mPumpList.size() - 1)).chunkPosX, + ((ChunkPosition) this.mPumpList.get(this.mPumpList.size() - 1)).chunkPosY, + ((ChunkPosition) this.mPumpList.remove(this.mPumpList.size() - 1)).chunkPosZ))) { + } + this.mPumpTimer = 160/((int)Math.pow(2, this.mTier)); + } + } + } + getBaseMetaTileEntity().setActive(!this.mPumpList.isEmpty()); + } + } + } + + private boolean moveOneDown() { + if ((this.mInventory[0] == null) || (this.mInventory[0].stackSize < 1) + || (!GT_Utility.areStacksEqual(this.mInventory[0], GT_ModHandler.getIC2Item("miningPipe", 1L)))) { + return false; + } + int yHead = getYOfPumpHead(); + if (yHead <= 0) { + return false; + } + if ((!consumeFluid(getBaseMetaTileEntity().getXCoord(), yHead - 1, getBaseMetaTileEntity().getZCoord())) + && (!getBaseMetaTileEntity().getAir(getBaseMetaTileEntity().getXCoord(), yHead - 1, getBaseMetaTileEntity().getZCoord()))) { + return false; + } + if (!(getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord(), yHead - 1, getBaseMetaTileEntity().getZCoord(),GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))))) { + return false; + } + if (yHead != getBaseMetaTileEntity().getYCoord()) { + getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord(), yHead, getBaseMetaTileEntity().getZCoord(),GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipe", 1L))); + } + getBaseMetaTileEntity().decrStackSize(0, 1); + return true; + } + + private int getYOfPumpHead() { + int y = getBaseMetaTileEntity().getYCoord() - 1; + while (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord(), y, getBaseMetaTileEntity().getZCoord()) == GT_Utility + .getBlockFromStack(GT_ModHandler.getIC2Item("miningPipe", 1L))) { + y--; + } + if (y == getBaseMetaTileEntity().getYCoord() - 1) { + if (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord(), y, getBaseMetaTileEntity().getZCoord()) != GT_Utility + .getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))) { + return y + 1; + } + } else if (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord(), y, getBaseMetaTileEntity().getZCoord()) != GT_Utility + .getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))) { + getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord(), y, getBaseMetaTileEntity().getZCoord(), + GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))); + } + return y; + } + + private void scanForFluid(int aX, int aY, int aZ, ArrayList aList, int mX, int mZ, int mDist) { + doTickProfilingInThisTick = false; + ArrayList tList1 = new ArrayList(); + ArrayList tList2 = new ArrayList(); + tList1.add(new ChunkPosition(aX, aY, aZ)); + while(!tList1.isEmpty()) + { + Iterator i$ = tList1.iterator(); + do + { + if(!i$.hasNext()) + break; + ChunkPosition tPos = (ChunkPosition)i$.next(); + if(tPos.chunkPosX < mX + mDist) + addToFirstListIfFluidAndNotAlreadyAddedToAnyOfTheLists(tPos.chunkPosX + 1, tPos.chunkPosY, tPos.chunkPosZ, tList2, aList); + if(tPos.chunkPosX > mX - mDist) + addToFirstListIfFluidAndNotAlreadyAddedToAnyOfTheLists(tPos.chunkPosX - 1, tPos.chunkPosY, tPos.chunkPosZ, tList2, aList); + if(tPos.chunkPosZ < mZ + mDist) + addToFirstListIfFluidAndNotAlreadyAddedToAnyOfTheLists(tPos.chunkPosX, tPos.chunkPosY, tPos.chunkPosZ + 1, tList2, aList); + if(tPos.chunkPosZ > mZ - mDist) + addToFirstListIfFluidAndNotAlreadyAddedToAnyOfTheLists(tPos.chunkPosX, tPos.chunkPosY, tPos.chunkPosZ - 1, tList2, aList); + addToFirstListIfFluidAndNotAlreadyAddedToAnyOfTheLists(tPos.chunkPosX, tPos.chunkPosY + 1, tPos.chunkPosZ, tList2, aList); + ChunkPosition tCoordinate = new ChunkPosition(aX, aY + 1, aZ); + if(tPos.chunkPosX == mX && tPos.chunkPosZ == mZ && tPos.chunkPosY < getBaseMetaTileEntity().getYCoord() && !aList.contains(tCoordinate) && !tList2.contains(tCoordinate)) + tList2.add(tCoordinate); + } while(true); + aList.addAll(tList2); + tList1 = tList2; + tList2 = new ArrayList(); + } + for(int y = getBaseMetaTileEntity().getYCoord(); y >= aY; y--) + aList.remove(new ChunkPosition(aX, y, aZ)); + } + + private boolean addToFirstListIfFluidAndNotAlreadyAddedToAnyOfTheLists(int aX, int aY, int aZ, ArrayList aList1, + ArrayList aList2) { + ChunkPosition tCoordinate = new ChunkPosition(aX, aY, aZ); + if ((!aList1.contains(tCoordinate)) && (!aList2.contains(tCoordinate))) { + Block aBlock = getBaseMetaTileEntity().getBlock(aX, aY, aZ); + if ((this.mPumpedBlock1 == aBlock) || (this.mPumpedBlock2 == aBlock)) { + aList1.add(tCoordinate); + return true; + } + } + return false; + } + + private void getFluidAt(int aX, int aY, int aZ) { + Block aBlock = getBaseMetaTileEntity().getBlock(aX, aY, aZ); + if (GT_Utility.isBlockValid(aBlock)) { + if ((aBlock == Blocks.water) || (aBlock == Blocks.flowing_water)) { + this.mPumpedBlock1 = Blocks.water; + this.mPumpedBlock2 = Blocks.flowing_water; + return; + } + if ((aBlock == Blocks.lava) || (aBlock == Blocks.flowing_lava)) { + this.mPumpedBlock1 = Blocks.lava; + this.mPumpedBlock2 = Blocks.flowing_lava; + return; + } + if ((aBlock instanceof IFluidBlock)) { + this.mPumpedBlock1 = aBlock; + this.mPumpedBlock2 = aBlock; + return; + } + } + this.mPumpedBlock1 = null; + this.mPumpedBlock2 = null; + } + + private boolean consumeFluid(int aX, int aY, int aZ) { + Block aBlock = getBaseMetaTileEntity().getBlock(aX, aY, aZ); + int aMeta = getBaseMetaTileEntity().getMetaID(aX, aY, aZ); + if ((GT_Utility.isBlockValid(aBlock)) && ((this.mPumpedBlock1 == aBlock) || (this.mPumpedBlock2 == aBlock))) { + if ((aBlock == Blocks.water) || (aBlock == Blocks.flowing_water)) { + if (aMeta == 0) { + if (this.mFluid == null) { + getBaseMetaTileEntity().decreaseStoredEnergyUnits(16*((int)Math.pow(4, this.mTier)), true); + this.mFluid = GT_ModHandler.getWater(1000L); + } else if (GT_ModHandler.isWater(this.mFluid)) { + getBaseMetaTileEntity().decreaseStoredEnergyUnits(16*((int)Math.pow(4, this.mTier)), true); + this.mFluid.amount += 1000; + } else { + return false; + } + } else { + getBaseMetaTileEntity().decreaseStoredEnergyUnits(4*((int)Math.pow(4, this.mTier)), true); + } + } + if ((aBlock == Blocks.lava) || (aBlock == Blocks.flowing_lava)) { + if (aMeta == 0) { + if (this.mFluid == null) { + getBaseMetaTileEntity().decreaseStoredEnergyUnits(16*((int)Math.pow(4, this.mTier)), true); + this.mFluid = GT_ModHandler.getLava(1000L); + } else if (GT_ModHandler.isLava(this.mFluid)) { + getBaseMetaTileEntity().decreaseStoredEnergyUnits(16*((int)Math.pow(4, this.mTier)), true); + this.mFluid.amount += 1000; + } else { + return false; + } + } else { + getBaseMetaTileEntity().decreaseStoredEnergyUnits(4*((int)Math.pow(4, this.mTier)), true); + } + } + if ((aBlock instanceof IFluidBlock)) { + if (this.mFluid == null) { + this.mFluid = ((IFluidBlock) aBlock).drain(getBaseMetaTileEntity().getWorld(), aX, aY, aZ, true); + getBaseMetaTileEntity().decreaseStoredEnergyUnits(this.mFluid == null ? 1000 : this.mFluid.amount, true); + } else { + return false; + } + } + getBaseMetaTileEntity().getWorld().setBlock(aX, aY, aZ,Blocks.air,0,2); + return true; + } + return false; + } + + @Override + public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { + if (aBaseMetaTileEntity.isClientSide()) return true; + aBaseMetaTileEntity.openGUI(aPlayer); + return true; + } + + + @Override public boolean isSimpleMachine() {return false;} + @Override public boolean isOverclockerUpgradable() {return false;} + @Override public boolean isTransformerUpgradable() {return false;} + @Override public boolean isElectric() {return true;} + @Override public boolean isFacingValid(byte aFacing) {return true;} + @Override public boolean isEnetInput() {return true;} + @Override public boolean isInputFacing(byte aSide) {return true;} + @Override public boolean isOutputFacing(byte aSide) {return false;} + @Override public boolean isTeleporterCompatible() {return false;} + @Override public long getMinimumStoredEU() {return V[mTier]*16;} + @Override public long maxEUStore() {return V[mTier]*64;} + @Override public long maxEUInput() {return V[mTier];} + @Override public long maxSteamStore() {return maxEUStore();} + @Override public long maxAmperesIn() {return 2;} + @Override public int getStackDisplaySlot() {return 2;} + @Override public boolean isAccessAllowed(EntityPlayer aPlayer) {return true;} + + + @Override + public int getCapacity() { + return 16000*this.mTier; + } + @Override + public int getTankPressure() { + return 100; + } + + @Override + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { + return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1], (aSide == 0||aSide ==1) ? null : new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ADV_PUMP) }; + } + + @Override + public ITexture[] getTexturesActive(ITexture aBaseTexture) { + return getTexturesInactive(aBaseTexture); + } + + @Override + public ITexture[] getTexturesInactive(ITexture aBaseTexture) { + return new ITexture[] { + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ADV_PUMP),new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ADV_PUMP), + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ADV_PUMP),new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ADV_PUMP),}; + } +} diff --git a/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java new file mode 100644 index 00000000..9102bd71 --- /dev/null +++ b/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java @@ -0,0 +1,301 @@ +package gregtech.common.tileentities.machines.basic; + +import static gregtech.api.enums.GT_Values.V; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityHanging; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.boss.EntityDragonPart; +import net.minecraft.entity.effect.EntityWeatherEffect; +import net.minecraft.entity.item.EntityBoat; +import net.minecraft.entity.item.EntityEnderCrystal; +import net.minecraft.entity.item.EntityEnderEye; +import net.minecraft.entity.item.EntityFireworkRocket; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.item.EntityMinecart; +import net.minecraft.entity.item.EntityTNTPrimed; +import net.minecraft.entity.item.EntityXPOrb; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.entity.projectile.EntityFireball; +import net.minecraft.entity.projectile.EntityFishHook; +import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.init.Blocks; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.AxisAlignedBB; +import gregtech.api.enums.ConfigCategories; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GT_Config; +import gregtech.api.util.GT_Utility; + +public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_Hatch{ + + public int mTargetX = 0; + public int mTargetY = 0; + public int mTargetZ = 0; + public int mTargetD = 0; + public int mCharge = 0; + public boolean mDebug = false; + public boolean hasEgg = false; + public static boolean sInterDimensionalTeleportAllowed = true; + + public GT_MetaTileEntity_Teleporter(int aID, String aName, String aNameRegional, int aTier) { + super(aID, aName, aNameRegional, aTier, 3, "Teleport long distances with this little device."); + } + + public GT_MetaTileEntity_Teleporter(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + super(aName, aTier, 3, aDescription,aTextures); + } + + @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {return true;} + + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_Teleporter(this.mName, this.mTier, this.mDescription, this.mTextures); + } + + public String[] getInfoData() + { + return new String[] { "Charge:", this.mCharge + " EU", "Coordinates:", "X: " + this.mTargetX, "Y: " + this.mTargetY, "Z: " + this.mTargetZ, "Dimension: " + this.mTargetD }; + } + + @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) {return null;} + @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) {return null;} + @Override + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { + return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1], (aSide !=1) ? null : aActive ? new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE) : new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER) }; + } + + + public void saveNBTData(NBTTagCompound aNBT) + { + aNBT.setInteger("mTargetX", this.mTargetX); + aNBT.setInteger("mTargetY", this.mTargetY); + aNBT.setInteger("mTargetZ", this.mTargetZ); + aNBT.setInteger("mTargetD", this.mTargetD); + aNBT.setInteger("mCharge", this.mCharge); + aNBT.setBoolean("mDebug", this.mDebug); + } + + public void loadNBTData(NBTTagCompound aNBT) + { + this.mTargetX = aNBT.getInteger("mTargetX"); + this.mTargetY = aNBT.getInteger("mTargetY"); + this.mTargetZ = aNBT.getInteger("mTargetZ"); + this.mTargetD = aNBT.getInteger("mTargetD"); + this.mCharge = aNBT.getInteger("mCharge"); + this.mDebug = aNBT.getBoolean("mDebug"); + } + + public void onConfigLoad(GT_Config aConfig) + { + sInterDimensionalTeleportAllowed = aConfig.get(ConfigCategories.machineconfig, "Teleporter.Interdimensional", true); + } + + public void onFirstTick() + { + if (getBaseMetaTileEntity().isServerSide()) + { + if ((this.mTargetX == 0) && (this.mTargetY == 0) && (this.mTargetZ == 0) && (this.mTargetD == 0)) + { + this.mTargetX = getBaseMetaTileEntity().getXCoord(); + this.mTargetY = getBaseMetaTileEntity().getYCoord(); + this.mTargetZ = getBaseMetaTileEntity().getZCoord(); + this.mTargetD = getBaseMetaTileEntity().getWorld().provider.dimensionId; + } + this.hasEgg = checkForEgg(); + } + } + + public boolean checkForEgg() + { + for (byte i = -5; i <= 5; i = (byte)(i + 1)) { + for (byte j = -5; j <= 5; j = (byte)(j + 1)) { + for (byte k = -5; k <= 5; k = (byte)(k + 1)) { + if (getBaseMetaTileEntity().getBlockOffset(i, j, k) == Blocks.dragon_egg) { + return true; + } + } + } + } + return false; + } + + public boolean hasDimensionalTeleportCapability() + { + return (this.mDebug) || (this.hasEgg); + } + + public boolean isDimensionalTeleportAvailable() + { + return (this.mDebug) || ((hasDimensionalTeleportCapability()) && (GT_Utility.isRealDimension(this.mTargetD)) && (GT_Utility.isRealDimension(getBaseMetaTileEntity().getWorld().provider.dimensionId))); + } + + public void onPostTick() + { + if (getBaseMetaTileEntity().isServerSide()) + { + if (getBaseMetaTileEntity().getTimer() % 100L == 50L) { + this.hasEgg = checkForEgg(); + } + if ((getBaseMetaTileEntity().isAllowedToWork()) && (getBaseMetaTileEntity().getRedstone())) + { + this.mCharge -= 8192; + if (this.mCharge < 0) { + this.mCharge = 0; + } + int tDistance = distanceCalculation();int tCost = 0; + for (Object tObject : getBaseMetaTileEntity().getWorld().getEntitiesWithinAABB(Entity.class, AxisAlignedBB.getBoundingBox(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 2) + 2, getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 2) + 2, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 2) + 2))) { + if (((tObject instanceof Entity)) && (!((Entity)tObject).isDead)) + { + Entity tEntity = (Entity)tObject; + if (((this.mCharge >= (tCost = (int)(tDistance * tDistance * weightCalculation(tEntity)))) && (tCost >= 0)) || (this.mDebug)) + { + if (!this.mDebug) { + this.mCharge -= tCost; + } + if (tEntity.ridingEntity != null) { + tEntity.mountEntity(null); + } + if (tEntity.riddenByEntity != null) { + tEntity.riddenByEntity.mountEntity(null); + } + if ((this.mTargetD == getBaseMetaTileEntity().getWorld().provider.dimensionId) || (!isDimensionalTeleportAvailable()) || (!GT_Utility.moveEntityToDimensionAtCoords(tEntity, this.mTargetD, this.mTargetX + 0.5D, this.mTargetY + 0.5D, this.mTargetZ + 0.5D))) { + if ((tEntity instanceof EntityLivingBase)) { + ((EntityLivingBase)tEntity).setPosition(this.mTargetX + 0.5D, this.mTargetY + 0.5D, this.mTargetZ + 0.5D); + } else { + tEntity.setPosition(this.mTargetX + 0.5D, this.mTargetY + 0.5D, this.mTargetZ + 0.5D); + } + } + } + else + { + long tCharge = getBaseMetaTileEntity().getUniversalEnergyStored(); + if ((tCharge > 0) && (this.mCharge + tCharge > 0)) + { + this.mCharge += tCharge; + getBaseMetaTileEntity().decreaseStoredEnergyUnits(tCharge, true); + } + } + } + } + getBaseMetaTileEntity().setActive(true); + } + else + { + getBaseMetaTileEntity().setActive(false); + } + } + } + + private int distanceCalculation() + { + return Math.abs(((this.mTargetD != getBaseMetaTileEntity().getWorld().provider.dimensionId) && (isDimensionalTeleportAvailable()) ? 100 : 1) * (int)Math.sqrt(Math.pow(getBaseMetaTileEntity().getXCoord() - this.mTargetX, 2.0D) + Math.pow(getBaseMetaTileEntity().getYCoord() - this.mTargetY, 2.0D) + Math.pow(getBaseMetaTileEntity().getZCoord() - this.mTargetZ, 2.0D))); + } + + private static float weightCalculation(Entity aEntity) + { + try + { + if ((aEntity instanceof EntityFX)) { + return -1.0F; + } + } + catch (Throwable e) {} + if ((aEntity instanceof EntityFishHook)) { + return -1.0F; + } + if ((aEntity instanceof EntityDragonPart)) { + return -1.0F; + } + if ((aEntity instanceof EntityWeatherEffect)) { + return -1.0F; + } + if ((aEntity instanceof EntityPlayer)) + { + EntityPlayer tPlayer = (EntityPlayer)aEntity; + int tCount = 64; + for (int i = 0; i < 36; i++) { + if (tPlayer.inventory.getStackInSlot(i) != null) { + tCount += (tPlayer.inventory.getStackInSlot(i).getMaxStackSize() > 1 ? tPlayer.inventory.getStackInSlot(i).stackSize : 64); + } + } + for (int i = 0; i < 4; i++) { + if (tPlayer.inventory.armorInventory[i] != null) { + tCount += 256; + } + } + return Math.min(5.0F, tCount / 666.6F); + } + if (GT_Utility.getClassName(aEntity).equals("EntityItnt")) { + return 5.0F; + } + if (GT_Utility.getClassName(aEntity).equals("EntityNuke")) { + return 50.0F; + } + if ((aEntity instanceof EntityArrow)) { + return 0.001F; + } + if ((aEntity instanceof EntityBoat)) { + return 0.1F; + } + if ((aEntity instanceof EntityEnderCrystal)) { + return 2.0F; + } + if ((aEntity instanceof EntityEnderEye)) { + return 0.001F; + } + if ((aEntity instanceof EntityFireball)) { + return 0.001F; + } + if ((aEntity instanceof EntityFireworkRocket)) { + return 0.001F; + } + if ((aEntity instanceof EntityHanging)) { + return 0.005F; + } + if ((aEntity instanceof EntityItem)) { + return 0.001F; + } + if ((aEntity instanceof EntityLiving)) { + return 0.5F; + } + if ((aEntity instanceof EntityMinecart)) { + return 0.1F; + } + if ((aEntity instanceof EntityThrowable)) { + return 0.001F; + } + if ((aEntity instanceof EntityTNTPrimed)) { + return 5.0F; + } + if ((aEntity instanceof EntityXPOrb)) { + return 0.001F; + } + return -1.0F; + } + + @Override public boolean isSimpleMachine() {return false;} + @Override public boolean isOverclockerUpgradable() {return false;} + @Override public boolean isTransformerUpgradable() {return false;} + @Override public boolean isElectric() {return true;} + @Override public boolean isFacingValid(byte aFacing) {return true;} + @Override public boolean isEnetInput() {return true;} + @Override public boolean isInputFacing(byte aSide) {return true;} + @Override public boolean isOutputFacing(byte aSide) {return false;} + @Override public boolean isTeleporterCompatible() {return false;} + @Override public long getMinimumStoredEU() {return V[mTier]*16;} + @Override public long maxEUStore() {return 100000000;} + @Override public long maxEUInput() {return V[mTier];} + @Override public long maxSteamStore() {return maxEUStore();} + @Override public long maxAmperesIn() {return 2;} + @Override public int getStackDisplaySlot() {return 2;} + @Override public boolean isAccessAllowed(EntityPlayer aPlayer) {return true;} + +} diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index bdfb51d5..975089e6 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -249,10 +249,8 @@ public boolean checkRecipe(ItemStack aStack) { if(tInput2.mFluid!=null&& tInput2.mFluid!=null&&tInput2.mFluid.getFluid().getID()==this.mLastRecipe.mFluidInputs[1].getFluid().getID()&&tInput2.mFluid.amount>=this.mLastRecipe.mFluidInputs[1].amount&&getMaxInputVoltage()>=this.mLastRecipe.mEUt){ tInput.drain(this.mLastRecipe.mFluidInputs[0].amount, true); tInput2.drain(this.mLastRecipe.mFluidInputs[1].amount, true); - - this.mEUt = -(this.mLastRecipe.mEUt*overclock(this.mLastRecipe.mEUt)); + this.mEUt = (this.mLastRecipe.mEUt*overclock(this.mLastRecipe.mEUt)); this.mMaxProgresstime = this.mLastRecipe.mDuration/overclock(this.mLastRecipe.mEUt); - this.mEfficiencyIncrease = 10000; this.mOutputFluids = this.mLastRecipe.mFluidOutputs; turnCasingActive(true); @@ -268,16 +266,16 @@ public boolean checkRecipe(ItemStack aStack) { FluidStack tFluid = tRecipe.mFluidInputs[0]; if(tFluid!=null){ for(GT_MetaTileEntity_Hatch_Input tInput : this.mInputHatches){ - if(tFluid.fluid !=null&& tInput.getFluid()!=null && tFluid.fluid.getID()==tInput.getFluid().getFluid().getID()&&tFluid.amount<=tInput.getFluid().amount){ + if(tFluid.getFluid() !=null&& tInput.getFluid()!=null && tFluid.getFluid().getID()==tInput.getFluid().getFluid().getID()&&tFluid.amount<=tInput.getFluid().amount){ FluidStack tFluid2 = tRecipe.mFluidInputs[1]; if(tFluid2!=null){ for(GT_MetaTileEntity_Hatch_Input tInput2 : this.mInputHatches){ - if(tFluid2.fluid !=null&& tInput2.getFluid()!=null&&tFluid2.fluid.getID()==tInput2.getFluid().getFluid().getID()&&tFluid2.amount<=tInput2.getFluid().amount&&getMaxInputVoltage()>=tRecipe.mEUt&&this.mEUStore>=tRecipe.mSpecialValue){ + if(tFluid2.getFluid() !=null&& tInput2.getFluid()!=null&&tFluid2.getFluid().getID()==tInput2.getFluid().getFluid().getID()&&tFluid2.amount<=tInput2.getFluid().amount&&getMaxInputVoltage()>=tRecipe.mEUt&&this.mEUStore>=tRecipe.mSpecialValue){ tInput.drain(tFluid.amount, true); tInput2.drain(tFluid2.amount, true); this.mLastRecipe=tRecipe; - this.mEUt = -(tRecipe.mEUt*overclock(this.mLastRecipe.mEUt)); + this.mEUt = (tRecipe.mEUt*overclock(this.mLastRecipe.mEUt)); this.mMaxProgresstime = tRecipe.mDuration/overclock(this.mLastRecipe.mEUt); this.mEfficiencyIncrease = 10000; @@ -355,11 +353,7 @@ public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { } if (getRepairStatus() > 0) { if (mMaxProgresstime > 0 && doRandomMaintenanceDamage()) { - if (aBaseMetaTileEntity.decreaseStoredEnergyUnits(mEUt, false)) { - if (!polluteEnvironment(getPollutionPerTick(mInventory[1]))) { - stopMachine(); - } - + this.getBaseMetaTileEntity().decreaseStoredEnergyUnits(mEUt, true); if (mMaxProgresstime > 0 && ++mProgresstime>=mMaxProgresstime) { if (mOutputItems != null) for (ItemStack tStack : mOutputItems) if (tStack != null) addOutput(tStack); if (mOutputFluids != null) for (FluidStack tStack : mOutputFluids) if (tStack != null) addOutput(tStack); @@ -371,7 +365,6 @@ public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { this.mEUStore=(int) aBaseMetaTileEntity.getStoredEU(); if (aBaseMetaTileEntity.isAllowedToWork()) checkRecipe(mInventory[1]); } - } } else { if (aTick % 100 == 0 || aBaseMetaTileEntity.hasWorkJustBeenEnabled() || aBaseMetaTileEntity.hasInventoryBeenModified()) { turnCasingActive(mMaxProgresstime>0); @@ -385,10 +378,12 @@ public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { } } } else { + this.mLastRecipe=null; stopMachine(); } } else { turnCasingActive(false); + this.mLastRecipe=null; stopMachine(); } } @@ -401,6 +396,7 @@ public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { public boolean onRunningTick(ItemStack aStack) { if (mEUt < 0) { if (!drainEnergyInput(((long)-mEUt * 10000) / Math.max(1000, mEfficiency))) { + this.mLastRecipe=null; stopMachine(); return false; } diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java new file mode 100644 index 00000000..9d15000b --- /dev/null +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java @@ -0,0 +1,179 @@ +package gregtech.common.tileentities.machines.multi; + +import net.minecraft.item.ItemStack; +import gregtech.api.GregTech_API; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Utility; + +public class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_MultiBlockBase{ + + public GT_MetaTileEntity_LargeTurbine(int aID, String aName, String aNameRegional){super(aID, aName, aNameRegional);} + public GT_MetaTileEntity_LargeTurbine(String aName){super(aName);} + + @Override + public String[] getDescription() { + return new String[]{"Consumes 1600 Liters of Steam per Tick"}; + } + + @Override + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { + return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex+1],new GT_RenderedTexture(Textures.BlockIcons.STEAM_TURBINE_SIDE)}; + } + + @Override + public boolean isCorrectMachinePart(ItemStack aStack) { + return getMaxEfficiency(aStack) > 0; + } + + @Override + public boolean checkRecipe(ItemStack aStack) { + + if (depleteInput(GT_ModHandler.getSteam(1600L))) + { + this.mEUt = 800; + this.mMaxProgresstime = 1; + if (ItemList.Component_Turbine_Bronze.isStackEqual(aStack, true, true)) { + this.mEfficiencyIncrease = (this.mMaxProgresstime * 10); + } else if (ItemList.Component_Turbine_Steel.isStackEqual(aStack, true, true)) { + this.mEfficiencyIncrease = (this.mMaxProgresstime * 20); + } else if (ItemList.Component_Turbine_Magnalium.isStackEqual(aStack, true, true)) { + this.mEfficiencyIncrease = (this.mMaxProgresstime * 50); + } else if (ItemList.Component_Turbine_TungstenSteel.isStackEqual(aStack, true, true)) { + this.mEfficiencyIncrease = (this.mMaxProgresstime * 15); + } else if (ItemList.Component_Turbine_Carbon.isStackEqual(aStack, true, true)) { + this.mEfficiencyIncrease = (this.mMaxProgresstime * 100); + } else { + this.mEfficiencyIncrease = (this.mMaxProgresstime * 20); + } + addOutput(GT_ModHandler.getWater(10L)); + return true; + } + return false; + } + + @Override + public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { + + byte tSide = getBaseMetaTileEntity().getBackFacing(); + if ((getBaseMetaTileEntity().getAirAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 1)) && (getBaseMetaTileEntity().getAirAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 2))) + { + int tAirCount = 0; + for (byte i = -1; i < 2; i = (byte)(i + 1)) { + for (byte j = -1; j < 2; j = (byte)(j + 1)) { + for (byte k = -1; k < 2; k = (byte)(k + 1)) { + if (getBaseMetaTileEntity().getAirOffset(i, j, k)) { + tAirCount++; + } + } + } + } + if (tAirCount != 10) { + return false; + } + for (byte i = 2; i < 6; i = (byte)(i + 1)) + { + IGregTechTileEntity tTileEntity; + if ((null != (tTileEntity = getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance(i, 2))) && + (tTileEntity.getFrontFacing() == getBaseMetaTileEntity().getFrontFacing()) && (tTileEntity.getMetaTileEntity() != null) && + ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine))) { + return false; + } + } + int tX = getBaseMetaTileEntity().getXCoord();int tY = getBaseMetaTileEntity().getYCoord();int tZ = getBaseMetaTileEntity().getZCoord(); + for (byte i = -1; i < 2; i = (byte)(i + 1)) { + for (byte j = -1; j < 2; j = (byte)(j + 1)) { + if ((i != 0) || (j != 0)) { + for (byte k = 0; k < 4; k = (byte)(k + 1)) { + if (((i == 0) || (j == 0)) && ((k == 1) || (k == 2))) + { + if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == GregTech_API.sBlockCasings4) + { + if (getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == 13) {} + } + else if (!addToMachineList(getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)))) { + return false; + } + } + else if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == GregTech_API.sBlockCasings4) + { + if (getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == 13) {} + } + else { + return false; + } + } + } + } + } + this.mDynamoHatches.clear(); + IGregTechTileEntity tTileEntity = getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 3); + if ((tTileEntity != null) && (tTileEntity.getMetaTileEntity() != null)) { + if ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Dynamo)) { + this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo)tTileEntity.getMetaTileEntity()); + } else { + return false; + } + } + } + else + { + return false; + } + return true; + } + + private boolean addToMachineList(IGregTechTileEntity tTileEntity){ + return ((!addMaintenanceToMachineList(tTileEntity, 11)) && (!addInputToMachineList(tTileEntity, 11)) && (!addOutputToMachineList(tTileEntity, 11))); + } + + @Override + public int getDamageToComponent(ItemStack aStack) { + return GT_Utility.areStacksEqual(GT_ModHandler.getModItem("Railcraft","part.turbine.rotor", 1L, 32767), aStack) ? 2 : 1; + } + + + public int getMaxEfficiency(ItemStack aStack) + { + if (GT_Utility.isStackInvalid(aStack)) { + return 0; + } + if (ItemList.Component_Turbine_Bronze.isStackEqual(aStack, true, true)) { + return 6000; + } + if (ItemList.Component_Turbine_Steel.isStackEqual(aStack, true, true)) { + return 8000; + } + if (ItemList.Component_Turbine_Magnalium.isStackEqual(aStack, true, true)) { + return 10000; + } + if (ItemList.Component_Turbine_TungstenSteel.isStackEqual(aStack, true, true)) { + return 9000; + } + if (ItemList.Component_Turbine_Carbon.isStackEqual(aStack, true, true)) { + return 12500; + } + if (GT_Utility.areStacksEqual(aStack, GT_ModHandler.getModItem("Railcraft","part.turbine.rotor", 1L, 32767))) { + return 8000; + } + return 0; + } + + + @Override + public int getPollutionPerTick(ItemStack aStack) {return 0;} + @Override + public int getAmountOfOutputs() {return 0;} + @Override + public boolean explodesOnComponentBreak(ItemStack aStack) {return true;} + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {return new GT_MetaTileEntity_LargeTurbine(mName);} + +} diff --git a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java index 708fe4b1..3249ea45 100644 --- a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java +++ b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java @@ -117,9 +117,9 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach } if (this.mItemStack == null&&this.mInventory[0]!=null) { - this.mItemStack = new ItemStack(mInventory[0].getItem()); + this.mItemStack = mInventory[0].copy(); } - if ((this.mInventory[0]!=null)&&(this.mItemCount < getMaxItemCount()) && (this.mInventory[0].getItem() == this.mItemStack.getItem())) + if ((this.mInventory[0]!=null)&&(this.mItemCount < getMaxItemCount()) && GT_Utility.areStacksEqual(this.mInventory[0],this.mItemStack)) { this.mItemCount += this.mInventory[0].stackSize; if (this.mItemCount > getMaxItemCount()) @@ -134,17 +134,18 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach } if (this.mInventory[1] == null) { - this.mInventory[1] = new ItemStack(mItemStack.getItem(),Math.min(mItemStack.getMaxStackSize(), this.mItemCount)); + this.mInventory[1] = mItemStack.copy(); + this.mInventory[1].stackSize = Math.min(mItemStack.getMaxStackSize(), this.mItemCount); this.mItemCount -= this.mInventory[1].stackSize; } - else if ((this.mItemCount > 0) && (this.mInventory[1].getItem() == this.mItemStack.getItem())&&this.mInventory[1].getMaxStackSize()>this.mInventory[1].stackSize) + else if ((this.mItemCount > 0) && GT_Utility.areStacksEqual(this.mInventory[1],this.mItemStack)&&this.mInventory[1].getMaxStackSize()>this.mInventory[1].stackSize) { int tmp = Math.min(this.mItemCount, this.mInventory[1].getMaxStackSize()-this.mInventory[1].stackSize); this.mInventory[1].stackSize += tmp; this.mItemCount -= tmp; } if(this.mItemStack!=null){ - this.mInventory[2]= new ItemStack(this.mItemStack.getItem()); + this.mInventory[2]= this.mItemStack.copy(); }else{this.mInventory[2]=null;} } } diff --git a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java index 56b06add..1fb314d5 100644 --- a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java +++ b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java @@ -14,7 +14,7 @@ public class GT_MetaTileEntity_QuantumTank extends GT_MetaTileEntity_BasicTank { public GT_MetaTileEntity_QuantumTank(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 3, "Stores "+((int)(Math.pow(6, aTier)*270000))+"L of fluid"); + super(aID, aName, aNameRegional, aTier, 3, "Stores "+((int)(Math.pow(6, aTier)*267000))+"L of fluid"); } public GT_MetaTileEntity_QuantumTank(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { @@ -28,7 +28,7 @@ public class GT_MetaTileEntity_QuantumTank @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - return aSide ==1 ? new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1],new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SCREEN)} :new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]};//aSide != aFacing ? mMachineBlock != 0 ? new ITexture[] {Textures.BlockIcons.CASING_BLOCKS[mMachineBlock]} : new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]} : mMachineBlock != 0 ? aActive ? getTexturesActive(Textures.BlockIcons.CASING_BLOCKS[mMachineBlock]) : getTexturesInactive(Textures.BlockIcons.CASING_BLOCKS[mMachineBlock]) : aActive ? getTexturesActive(Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]) : getTexturesInactive(Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]); + return aSide ==1 ? new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1],new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SCREEN)} :new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]}; } @Override @@ -79,7 +79,7 @@ public class GT_MetaTileEntity_QuantumTank @Override public boolean displaysItemStack() { - return false; + return true; } @Override @@ -94,7 +94,7 @@ public class GT_MetaTileEntity_QuantumTank @Override public int getCapacity() { - return (int) (Math.pow(6, mTier)*270000); + return (int) (Math.pow(6, mTier)*267000); } @Override diff --git a/main/java/gregtech/loaders/oreprocessing/ProcessingPlate1.java b/main/java/gregtech/loaders/oreprocessing/ProcessingPlate1.java index 80e01f68..4bb94dc3 100644 --- a/main/java/gregtech/loaders/oreprocessing/ProcessingPlate1.java +++ b/main/java/gregtech/loaders/oreprocessing/ProcessingPlate1.java @@ -51,7 +51,7 @@ /* */ /* 52 */ if (aMaterial.mFuelPower > 0) GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, new Object[] { aStack }), null, aMaterial.mFuelPower, aMaterial.mFuelType); /* 53 */ GT_Utility.removeSimpleIC2MachineRecipe(GT_Utility.copyAmount(9L, new Object[] { aStack }), GT_ModHandler.getCompressorRecipeList(), GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)); -/* 54 */ GT_ModHandler.addCompressionRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L)); +/* 54 */ GT_Values.RA.addImplosionRecipe(GT_Utility.copyAmount(2L, new Object[] { aStack }), 2 , GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.DarkAsh,1L)); /* 55 */ if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_WORKING)) { GT_Values.RA.addLatheRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), (int)Math.max(aMaterial.getMass() / 2L, 1L), 16); /* */ } /* 57 */ if (aMaterial == Materials.Paper) GT_ModHandler.addCraftingRecipe(GT_Utility.copyAmount(GregTech_API.sRecipeFile.get(gregtech.api.enums.ConfigCategories.Recipes.harderrecipes, aStack, true) ? 2L : 3L, new Object[] { aStack }), new Object[] { "XXX", Character.valueOf('X'), new ItemStack(net.minecraft.init.Items.reeds, 1, 32767) }); diff --git a/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index e5776ddb..a619e9c1 100644 --- a/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -388,6 +388,9 @@ public class GT_CraftingRecipeLoader GT_ModHandler.addCraftingRecipe(GT_ModHandler.getModItem("Railcraft", "machine.alpha", 1L, 10), tBitMask, new Object[] { " I ", "RTR", " D ", Character.valueOf('I'), new ItemStack(Blocks.iron_bars, 1, 32767), Character.valueOf('T'), GT_ModHandler.getModItem("Railcraft", "machine.beta", 1L, 4), Character.valueOf('D'), new ItemStack(Blocks.dispenser, 1, 32767), Character.valueOf('R'), OrePrefixes.dust.get(Materials.Redstone) }); GT_ModHandler.addCraftingRecipe(GT_ModHandler.getModItem("Railcraft", "machine.alpha", 1L, 10), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "RTR", Character.valueOf('T'), GT_ModHandler.getModItem("Railcraft", "machine.alpha", 1L, 9), Character.valueOf('R'), OrePrefixes.dust.get(Materials.Redstone) }); GT_ModHandler.addCraftingRecipe(GT_ModHandler.getModItem("Railcraft", "machine.alpha", 1L, 11), tBitMask, new Object[] { "PCP", "CSC", "PCP", Character.valueOf('P'), OrePrefixes.plank.get(Materials.Wood), Character.valueOf('S'), OrePrefixes.plate.get(Materials.Steel), Character.valueOf('C'), new ItemStack(Items.golden_carrot, 1, 0) }); + if(GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "DisableRCBlastFurnace", false)){ + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getModItem("Railcraft", "machine.alpha", 4L,12)); + } GT_ModHandler.addCraftingRecipe(GT_ModHandler.getModItem("Railcraft", "machine.alpha", 1L, 13), tBitMask, new Object[] { "TSB", "SCS", "PSP", Character.valueOf('P'), OreDictNames.craftingPiston, Character.valueOf('S'), OrePrefixes.plate.get(Materials.Steel), Character.valueOf('B'), OreDictNames.craftingBook, Character.valueOf('C'), new ItemStack(Blocks.crafting_table, 1, 32767), Character.valueOf('T'), new ItemStack(Items.diamond_pickaxe, 1, 0) }); GT_ModHandler.addCraftingRecipe(GT_ModHandler.getModItem("Railcraft", "machine.alpha", 6L, 14), tBitMask, new Object[] { "PPP", "ISI", "PPP", Character.valueOf('P'), OrePrefixes.plank.get(Materials.Wood), Character.valueOf('I'), tIngot.get(Materials.AnyIron), Character.valueOf('S'), "slimeball" }); GT_ModHandler.addCraftingRecipe(GT_ModHandler.getModItem("Railcraft", "machine.alpha", 4L, 15), tBitMask, new Object[] { "PDP", "DBD", "PDP", Character.valueOf('P'), OreDictNames.craftingPiston, Character.valueOf('B'), OrePrefixes.block.get(Materials.Steel), Character.valueOf('D'), OrePrefixes.gem.get(Materials.Diamond) }); diff --git a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index ac544145..e1a21303 100644 --- a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -407,6 +407,15 @@ public class GT_MachineRecipeLoader GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 3L, new Object[0]), Materials.Oil.getFluid(16L), Materials.Methane.getGas(15L), 32, 16, false); GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), Materials.Oil.getFluid(16L), Materials.Lubricant.getFluid(16L), 32, 16, false); GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 6L, new Object[0]), Materials.Oil.getFluid(16L), Materials.SulfuricAcid.getFluid(16L), 32, 16, false); + if(FluidRegistry.getFluid("oilgc") != null){ + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L, new Object[0]), new FluidStack(FluidRegistry.getFluid("oilgc"), 16), Materials.Fuel.getFluid(16L), 32, 16, false); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 2L, new Object[0]), new FluidStack(FluidRegistry.getFluid("oilgc"), 16), Materials.Glyceryl.getFluid(1L), 32, 16, false); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 3L, new Object[0]), new FluidStack(FluidRegistry.getFluid("oilgc"), 16), Materials.Methane.getGas(15L), 32, 16, false); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), new FluidStack(FluidRegistry.getFluid("oilgc"), 16), Materials.Lubricant.getFluid(16L), 32, 16, false); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 6L, new Object[0]), new FluidStack(FluidRegistry.getFluid("oilgc"), 16), Materials.SulfuricAcid.getFluid(16L), 32, 16, false); + GT_Values.RA.addDistillationTowerRecipe(new FluidStack(FluidRegistry.getFluid("oilgc"), 64), new FluidStack[]{Materials.Lubricant.getFluid(16L) , Materials.Fuel.getFluid(64L), Materials.SulfuricAcid.getFluid(64L), Materials.Glyceryl.getFluid(4L), Materials.Methane.getGas(60L)},null, 16, 64); + } + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L, new Object[0]), new FluidStack(ItemList.sOilLight, 32), Materials.Fuel.getFluid(16L), 32, 16, false); GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 2L, new Object[0]), new FluidStack(ItemList.sOilLight, 32), Materials.Glyceryl.getFluid(1L), 32, 16, false); GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 3L, new Object[0]), new FluidStack(ItemList.sOilLight, 32), Materials.Methane.getGas(15L), 32, 16, false); @@ -680,7 +689,7 @@ public class GT_MachineRecipeLoader GT_Values.RA.addFusionReactorRecipe(Materials.Plutonium.getMolten(9), Materials.Thorium.getMolten(9), Materials.Naquadah.getMolten(9), 64, 32768, 300000000); GT_Values.RA.addFusionReactorRecipe(Materials.Americium.getMolten(16), Materials.Naquadria.getMolten(16), Materials.Neutronium.getMolten(1), 1200, 98304, 600000000); GT_Values.RA.addFusionReactorRecipe(Materials.Beryllium.getMolten(9), Materials.Deuterium.getGas(375), Materials.Nitrogen.getPlasma(125), 16, 16384, 180000000); - + GT_ModHandler.removeRecipeByOutput(ItemList.IC2_Fertilizer.get(1L, new Object[0])); GT_Values.RA.addImplosionRecipe(ItemList.IC2_Compressed_Coal_Chunk.get(1L, new Object[0]), 8, ItemList.IC2_Industrial_Diamond.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 4L)); // GT_Values.RA.addDistillationRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 16L), 32, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 16L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 16L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glyceryl, 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Methane, 15L), 4000, 64); @@ -696,7 +705,8 @@ public class GT_MachineRecipeLoader GT_Values.RA.addDistillationTowerRecipe(Materials.FishOil.getFluid(24L), new FluidStack[]{Materials.Lubricant.getFluid(12L)}, null, 16, 96); GT_Values.RA.addDistillationTowerRecipe(Materials.Biomass.getFluid(150L), new FluidStack[]{Materials.Ethanol.getFluid(60L),Materials.Water.getFluid(60L)}, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1L), 25, 64); GT_Values.RA.addDistillationTowerRecipe(Materials.Water.getFluid(288L), new FluidStack[]{GT_ModHandler.getDistilledWater(260L)}, null, 16, 64); - + GT_Values.RA.addDistillationTowerRecipe(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 250), new FluidStack[]{new FluidStack(FluidRegistry.getFluid("ic2biogas"), 8000),Materials.Water.getFluid(125L)}, ItemList.IC2_Fertilizer.get(1, new Object[0]), 150, 512); + GT_Values.RA.addFuel(GT_ModHandler.getIC2Item("biogasCell", 1L), null, 32, 1); GT_Values.RA.addElectrolyzerRecipe(GT_Values.NI, ItemList.Cell_Empty.get(1L, new Object[0]), Materials.Water.getFluid(3000L), Materials.Hydrogen.getGas(2000L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 1500, 30); GT_Values.RA.addElectrolyzerRecipe(GT_Values.NI, ItemList.Cell_Empty.get(1L, new Object[0]), GT_ModHandler.getDistilledWater(3000L), Materials.Hydrogen.getGas(2000L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 1500, 30); @@ -705,7 +715,7 @@ public class GT_MachineRecipeLoader GT_Values.RA.addElectrolyzerRecipe(ItemList.Dye_Bonemeal.get(3L, new Object[0]), 0, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, 98, 26); GT_Values.RA.addElectrolyzerRecipe(new ItemStack(Blocks.sand, 8), 0, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, 500, 25); - GT_ModHandler.removeRecipeByOutput(ItemList.IC2_Fertilizer.get(1L, new Object[0])); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 3L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), Materials.Water.getFluid(1000L), GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 3L), 500); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 3L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), Materials.Water.getFluid(1000L), GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 3L), 500); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 3L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), Materials.Water.getFluid(1000L), GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Quartzite, 3L), 500); diff --git a/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 8993bf42..464bdb84 100644 --- a/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -5,6 +5,7 @@ /* 5: */ import cpw.mods.fml.common.registry.GameRegistry; /* 6: */ import gregtech.GT_Mod; /* 7: */ import gregtech.api.GregTech_API; +import gregtech.api.enums.ConfigCategories; /* 8: */ import gregtech.api.enums.Dyes; /* 9: */ import gregtech.api.enums.GT_Values; /* 10: */ import gregtech.api.enums.ItemList; @@ -456,10 +457,30 @@ import ic2.core.item.ItemRadioactive; /* 406:419 */ GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Mercury, GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 3)); /* 407:420 */ GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Amber, GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 6)); /* 408:421 */ GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Firestone, GT_ModHandler.getModItem("Railcraft", "firestone.raw", 1L)); -/* 409:422 */ GT_OreDictUnificator.set(OrePrefixes.plate, Materials.Iron, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 0)); -/* 410:423 */ GT_OreDictUnificator.set(OrePrefixes.plate, Materials.Steel, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 1)); -/* 411:424 */ GT_OreDictUnificator.set(OrePrefixes.plate, Materials.TinAlloy, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 2)); -/* 412:425 */ GT_OreDictUnificator.set(OrePrefixes.plate, Materials.Copper, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 3)); + + if(GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + "railcraft", "plateIron", true)){ +/* 409:422 */ GT_OreDictUnificator.set(OrePrefixes.plate, Materials.Iron, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 0));}else{ +/* 409:422 */ GT_OreDictUnificator.set(OrePrefixes.plate, Materials.Iron, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 0),false,false);} + + if(GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + "railcraft", "plateSteel", true)){ +/* 410:423 */ GT_OreDictUnificator.set(OrePrefixes.plate, Materials.Steel, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 1));}else{ + GT_OreDictUnificator.set(OrePrefixes.plate, Materials.Steel, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 1),false,false);} + + if(GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + "railcraft", "plateTinAlloy", true)){ +/* 411:424 */ GT_OreDictUnificator.set(OrePrefixes.plate, Materials.TinAlloy, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 2));}else{ + GT_OreDictUnificator.set(OrePrefixes.plate, Materials.TinAlloy, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 2),false,false);} + + + if(GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + "railcraft", "plateCopper", true)){ +/* 412:425 */ GT_OreDictUnificator.set(OrePrefixes.plate, Materials.Copper, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 3));}else{ + GT_OreDictUnificator.set(OrePrefixes.plate, Materials.Copper, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 3),false,false);} + + + +/* 410:423 */ +/* 411:424 */ +/* 412:425 */ + /* 413:426 */ GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Cocoa, GT_ModHandler.getModItem("harvestcraft", "cocoapowderItem", 1L, 0)); /* 414:427 */ GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Coffee, ItemList.IC2_CoffeePowder.get(1L, new Object[0])); /* 415: */ } diff --git a/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index 6444c8f4..1f5a3464 100644 --- a/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -59,9 +59,11 @@ import gregtech.common.tileentities.generators.GT_MetaTileEntity_PlasmaGenerator /* 54: */ import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Disassembler; /* 55: */ import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Massfabricator; /* 56: */ import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_PotionBrewer; +import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Pump; /* 57: */ import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Replicator; /* 58: */ import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_RockBreaker; /* 59: */ import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Scanner; +import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Teleporter; import gregtech.common.tileentities.machines.multi.*; /* 69: */ import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_AlloySmelter_Bronze; /* 70: */ import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_AlloySmelter_Steel; @@ -978,6 +980,25 @@ import net.minecraftforge.oredict.OreDictionary; ItemList.Distillation_Tower.set(new GT_MetaTileEntity_DistillationTower(1126, "multimachine.distillationtower", "Distillation Tower").getStackForm(1L)); GT_ModHandler.addCraftingRecipe(ItemList.Distillation_Tower.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CBC", "FMF", "CBC", 'M', ItemList.Hull_EV, 'B', OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.Master), 'F', ItemList.Electric_Pump_EV}); + ItemList.LargeTurbine.set(new GT_MetaTileEntity_LargeTurbine(1131, "multimachine.largeturbine", "Large Turbine").getStackForm(1L)); + + + + ItemList.Pump_LV.set(new GT_MetaTileEntity_Pump(1140, "basicmachine.pump.tier.01", "Basic Pump",1).getStackForm(1L)); + ItemList.Pump_MV.set(new GT_MetaTileEntity_Pump(1141, "basicmachine.pump.tier.02", "Advanced Pump",2).getStackForm(1L)); + ItemList.Pump_HV.set(new GT_MetaTileEntity_Pump(1142, "basicmachine.pump.tier.03", "Advanced Pump II",3).getStackForm(1L)); + ItemList.Pump_EV.set(new GT_MetaTileEntity_Pump(1143, "basicmachine.pump.tier.04", "Advanced Pump III",4).getStackForm(1L)); + ItemList.Pump_IV.set(new GT_MetaTileEntity_Pump(1144, "basicmachine.pump.tier.05", "Advanced Pump IV",5).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe(ItemList.Pump_LV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CPC", "PMP", "BPB", 'M', ItemList.Hull_LV, 'B', OrePrefixes.pipeLarge.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.Basic), 'P', ItemList.Electric_Pump_LV}); + GT_ModHandler.addCraftingRecipe(ItemList.Pump_MV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CPC", "PMP", "BPB", 'M', ItemList.Hull_MV, 'B', OrePrefixes.pipeLarge.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.Good), 'P', ItemList.Electric_Pump_MV}); + GT_ModHandler.addCraftingRecipe(ItemList.Pump_HV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CPC", "PMP", "BPB", 'M', ItemList.Hull_HV, 'B', OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'P', ItemList.Electric_Pump_HV}); + GT_ModHandler.addCraftingRecipe(ItemList.Pump_EV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CPC", "PMP", "BPB", 'M', ItemList.Hull_EV, 'B', OrePrefixes.pipeLarge.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.Data), 'P', ItemList.Electric_Pump_EV}); + GT_ModHandler.addCraftingRecipe(ItemList.Pump_IV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CPC", "PMP", "BPB", 'M', ItemList.Hull_IV, 'B', OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.Elite), 'P', ItemList.Electric_Pump_IV}); + + ItemList.Teleporter.set(new GT_MetaTileEntity_Teleporter(1145, "basicmachine.teleporter", "Teleporter",6).getStackForm(1L)); +// GT_ModHandler.addCraftingRecipe(ItemList.Teleporter.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CPC", "PMP", "BPB", 'M', ItemList.Hull_LuV, 'B', OrePrefixes.pipeLarge.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.Basic), 'P', ItemList.Electric_Pump_LV}); + } /* 981: */ /* 982: */ private static void run4() diff --git a/main/resources/assets/gregtech/textures/blocks/fluids/Thumbs.db b/main/resources/assets/gregtech/textures/blocks/fluids/Thumbs.db index d92f682b..60d41236 100644 Binary files a/main/resources/assets/gregtech/textures/blocks/fluids/Thumbs.db and b/main/resources/assets/gregtech/textures/blocks/fluids/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ADV_PUMP.png b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ADV_PUMP.png new file mode 100644 index 00000000..1b2db20a Binary files /dev/null and b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ADV_PUMP.png differ diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER.png b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER.png new file mode 100644 index 00000000..7aa22a90 Binary files /dev/null and b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER.png differ diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_ACTIVE.png b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_ACTIVE.png new file mode 100644 index 00000000..b94b3aac Binary files /dev/null and b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_ACTIVE.png differ diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/Thumbs.db b/main/resources/assets/gregtech/textures/blocks/iconsets/Thumbs.db index 83c61278..2cf166fd 100644 Binary files a/main/resources/assets/gregtech/textures/blocks/iconsets/Thumbs.db and b/main/resources/assets/gregtech/textures/blocks/iconsets/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/entity/Thumbs.db b/main/resources/assets/gregtech/textures/entity/Thumbs.db index 87a14aa9..ee9662e5 100644 Binary files a/main/resources/assets/gregtech/textures/entity/Thumbs.db and b/main/resources/assets/gregtech/textures/entity/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/Thumbs.db b/main/resources/assets/gregtech/textures/items/Thumbs.db index b7645dc3..55455290 100644 Binary files a/main/resources/assets/gregtech/textures/items/Thumbs.db and b/main/resources/assets/gregtech/textures/items/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/462.png b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/462.png new file mode 100644 index 00000000..44407a7a Binary files /dev/null and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/462.png differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/463.png b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/463.png new file mode 100644 index 00000000..713c2f53 Binary files /dev/null and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/463.png differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/464.png b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/464.png new file mode 100644 index 00000000..bce98432 Binary files /dev/null and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/464.png differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/510/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/510/Thumbs.db index e026fac7..c309bea4 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/510/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/510/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/511/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/511/Thumbs.db index 12900e86..f8c74cdd 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/511/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/511/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/517/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/517/Thumbs.db index 4342ef09..da3c8353 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/517/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/517/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/518/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/518/Thumbs.db index 690fc137..d7273406 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/518/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/518/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/519/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/519/Thumbs.db index 3daf3a88..d56122b6 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/519/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/519/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/520/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/520/Thumbs.db index 46e16b8e..548c092e 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/520/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/520/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/521/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/521/Thumbs.db index f82cf8e5..cf87ee6b 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/521/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/521/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/527/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/527/Thumbs.db index bb7eb92a..d6e9f2bb 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/527/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/527/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/528/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/528/Thumbs.db index 21df6697..256ddfc3 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/528/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/528/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/529/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/529/Thumbs.db index 0be796fd..987eac05 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/529/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/529/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/530/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/530/Thumbs.db index c9b7a25c..4a87f538 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/530/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/530/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/531/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/531/Thumbs.db index 5092ecf1..2bf989c1 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/531/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/531/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/537/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/537/Thumbs.db index e88e6359..9f5b2b76 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/537/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/537/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/538/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/538/Thumbs.db index 52a873fb..405ace21 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/538/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/538/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/539/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/539/Thumbs.db index 8e29d5ac..2a5fe86d 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/539/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/539/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/Thumbs.db index 438ab79e..35b14940 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/598/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/598/Thumbs.db index 9a6d9911..29e0c533 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/598/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/598/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/599/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/599/Thumbs.db index da805403..000e8482 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/599/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/599/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/605/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/605/Thumbs.db index 3cb95637..51cfd333 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/605/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/605/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/741.png b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/741.png new file mode 100644 index 00000000..c986ab73 Binary files /dev/null and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/741.png differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/742.png b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/742.png new file mode 100644 index 00000000..c7b141b3 Binary files /dev/null and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/742.png differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/746.png b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/746.png new file mode 100644 index 00000000..14feeb89 Binary files /dev/null and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/746.png differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/747.png b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/747.png new file mode 100644 index 00000000..7f8b3fcb Binary files /dev/null and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/747.png differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/Thumbs.db index eba08d2c..35cb7fca 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.02/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.02/Thumbs.db index 742af119..f42eaf50 100644 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.02/Thumbs.db and b/main/resources/assets/gregtech/textures/items/gt.metaitem.02/Thumbs.db differ diff --git a/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db b/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db index 95147e49..0cae027c 100644 Binary files a/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db and b/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db differ