diff options
Diffstat (limited to 'main')
61 files changed, 1700 insertions, 1781 deletions
diff --git a/main/java/gregtech/GT_Mod.java b/main/java/gregtech/GT_Mod.java index 2e20c83a53..e0b255a50f 100644 --- a/main/java/gregtech/GT_Mod.java +++ b/main/java/gregtech/GT_Mod.java @@ -1,5 +1,4 @@ /* 1: */ package gregtech;
-/* 2: */
/* 3: */ import cpw.mods.fml.common.FMLLog;
/* 4: */ import cpw.mods.fml.common.LoadController;
/* 5: */ import cpw.mods.fml.common.Loader;
@@ -106,6 +105,7 @@ import gregtech.api.enums.*; /* 110: */ import net.minecraft.world.World;
/* 111: */ import net.minecraft.world.biome.BiomeGenBase;
/* 112: */ import net.minecraftforge.common.ChestGenHooks;
+import net.minecraftforge.common.ForgeVersion;
/* 113: */ import net.minecraftforge.common.config.Configuration;
/* 114: */ import net.minecraftforge.common.config.Property;
/* 115: */ import net.minecraftforge.fluids.FluidContainerRegistry;
diff --git a/main/java/gregtech/api/enums/ItemList.java b/main/java/gregtech/api/enums/ItemList.java index f93f543b1c..6a24834939 100644 --- a/main/java/gregtech/api/enums/ItemList.java +++ b/main/java/gregtech/api/enums/ItemList.java @@ -645,7 +645,7 @@ public enum ItemList implements IItemContainer { Energy_LapotronicOrb2, ZPM2, Quantum_Tank_LV,Quantum_Tank_MV,Quantum_Tank_HV,Quantum_Tank_EV,Quantum_Tank_IV, Quantum_Chest_LV, Quantum_Chest_MV, Quantum_Chest_HV, Quantum_Chest_EV, Quantum_Chest_IV, - NULL, Cover_RedstoneTransmitterExternal,Cover_RedstoneTransmitterInternal,Cover_RedstoneReceiverExternal,Cover_RedstoneReceiverInternal; + NULL, Cover_RedstoneTransmitterExternal,Cover_RedstoneTransmitterInternal,Cover_RedstoneReceiverExternal,Cover_RedstoneReceiverInternal, LargeTurbine, Ingot_Heavy1,Ingot_Heavy2,Ingot_Heavy3, Pump_LV, Pump_MV, Pump_HV, Pump_EV, Pump_IV, Teleporter; public static final ItemList[] DYE_ONLY_ITEMS = {Color_00, Color_01, Color_02, Color_03, Color_04, Color_05, Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15} diff --git a/main/java/gregtech/api/enums/Materials.java b/main/java/gregtech/api/enums/Materials.java index 3fda89be40..642c6818ea 100644 --- a/main/java/gregtech/api/enums/Materials.java +++ b/main/java/gregtech/api/enums/Materials.java @@ -198,8 +198,10 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Fairy ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Fairy" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), Ludicrite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Ludicrite" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), Pokefennium ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Pokefennium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), - Draconium ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Draconium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), - DraconiumAwakened ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Awakened Draconium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), + Draconium ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Draconium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), + DraconiumAwakened ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Awakened Draconium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), + PurpleAlloy ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 100, 180, 255, 0, "Purple Alloy" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), + InfusedTeslatite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 100, 180, 255, 0, "Infused Teslatite" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), /** * Unknown Material Components. Dead End Section. diff --git a/main/java/gregtech/api/enums/OrePrefixes.java b/main/java/gregtech/api/enums/OrePrefixes.java index c30623a4f5..ad2231a6e4 100644 --- a/main/java/gregtech/api/enums/OrePrefixes.java +++ b/main/java/gregtech/api/enums/OrePrefixes.java @@ -133,7 +133,7 @@ public enum OrePrefixes { compressedDirt ("9^X Compressed Dirt" , "" , "" ,F,F,F,F,F,F,F,F,F,F, 0 , -1, 64, -1), compressedGravel ("9^X Compressed Gravel" , "" , "" ,F,F,F,F,F,F,F,F,F,F, 0 , -1, 64, -1), compressedSand ("9^X Compressed Sand" , "" , "" ,F,F,F,F,F,F,F,F,F,F, 0 , -1, 64, -1), - compressed ("Compressed Materials" , "Compressed " , "" ,T,T,F,F,F,F,T,F,F,F, 0 , M * 1 , 64, -1), // Compressed Material, worth 1 Unit. Introduced by Galacticraft + compressed ("Compressed Materials" , "Compressed " , "" ,T,T,F,F,F,F,T,F,F,F, 0 , M * 2 , 64, -1), // Compressed Material, worth 1 Unit. Introduced by Galacticraft glass ("Glasses" , "" , "" ,F,F,T,F,T,F,F,F,F,F, 0 , -1, 64, -1), paneGlass ("Glass Panes" , "" , "" ,F,F,T,F,F,T,F,F,F,F, 0 , -1, 64, -1), blockGlass ("Glass Blocks" , "" , "" ,F,F,T,F,F,T,F,F,F,F, 0 , -1, 64, -1), diff --git a/main/java/gregtech/api/enums/Textures.java b/main/java/gregtech/api/enums/Textures.java index a0bbce7049..f7278f0d8a 100644 --- a/main/java/gregtech/api/enums/Textures.java +++ b/main/java/gregtech/api/enums/Textures.java @@ -62,7 +62,7 @@ public class Textures { , OVERLAY_TOP_POTIONBREWER_ACTIVE, OVERLAY_TOP_REPLICATOR_ACTIVE, OVERLAY_TOP_MASSFAB_ACTIVE, OVERLAY_TOP_STEAM_HAMMER_ACTIVE, OVERLAY_TOP_STEAM_FURNACE_ACTIVE, OVERLAY_TOP_STEAM_ALLOY_SMELTER_ACTIVE, OVERLAY_TOP_STEAM_MACERATOR_ACTIVE, OVERLAY_TOP_STEAM_COMPRESSOR_ACTIVE, OVERLAY_TOP_STEAM_EXTRACTOR_ACTIVE, OVERLAY_TOP_DISASSEMBLER_ACTIVE, OVERLAY_TOP_BOXINATOR_ACTIVE, OVERLAY_TOP_ROCK_BREAKER_ACTIVE, OVERLAY_TOP_SCANNER_ACTIVE , OVERLAY_FRONT_POTIONBREWER_ACTIVE, OVERLAY_FRONT_REPLICATOR_ACTIVE, OVERLAY_FRONT_MASSFAB_ACTIVE, OVERLAY_FRONT_STEAM_HAMMER_ACTIVE, OVERLAY_FRONT_STEAM_FURNACE_ACTIVE, OVERLAY_FRONT_STEAM_ALLOY_SMELTER_ACTIVE, OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE, OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE, OVERLAY_FRONT_STEAM_EXTRACTOR_ACTIVE, OVERLAY_FRONT_DISASSEMBLER_ACTIVE, OVERLAY_FRONT_BOXINATOR_ACTIVE, OVERLAY_FRONT_ROCK_BREAKER_ACTIVE, OVERLAY_FRONT_SCANNER_ACTIVE , OVERLAY_BOTTOM_POTIONBREWER_ACTIVE, OVERLAY_BOTTOM_REPLICATOR_ACTIVE, OVERLAY_BOTTOM_MASSFAB_ACTIVE, OVERLAY_BOTTOM_STEAM_HAMMER_ACTIVE, OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE, OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER_ACTIVE, OVERLAY_BOTTOM_STEAM_MACERATOR_ACTIVE, OVERLAY_BOTTOM_STEAM_COMPRESSOR_ACTIVE, OVERLAY_BOTTOM_STEAM_EXTRACTOR_ACTIVE, OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE, OVERLAY_BOTTOM_BOXINATOR_ACTIVE, OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE, OVERLAY_BOTTOM_SCANNER_ACTIVE - , OVERLAY_SIDE_POTIONBREWER_ACTIVE, OVERLAY_SIDE_REPLICATOR_ACTIVE, OVERLAY_SIDE_MASSFAB_ACTIVE, OVERLAY_SIDE_STEAM_HAMMER_ACTIVE, OVERLAY_SIDE_STEAM_FURNACE_ACTIVE, OVERLAY_SIDE_STEAM_ALLOY_SMELTER_ACTIVE, OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE, OVERLAY_SIDE_STEAM_COMPRESSOR_ACTIVE, OVERLAY_SIDE_STEAM_EXTRACTOR_ACTIVE, OVERLAY_SIDE_DISASSEMBLER_ACTIVE, OVERLAY_SIDE_BOXINATOR_ACTIVE, OVERLAY_SIDE_ROCK_BREAKER_ACTIVE, OVERLAY_SIDE_SCANNER_ACTIVE + , OVERLAY_SIDE_POTIONBREWER_ACTIVE, OVERLAY_SIDE_REPLICATOR_ACTIVE, OVERLAY_SIDE_MASSFAB_ACTIVE, OVERLAY_SIDE_STEAM_HAMMER_ACTIVE, OVERLAY_SIDE_STEAM_FURNACE_ACTIVE, OVERLAY_SIDE_STEAM_ALLOY_SMELTER_ACTIVE, OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE, OVERLAY_SIDE_STEAM_COMPRESSOR_ACTIVE, OVERLAY_SIDE_STEAM_EXTRACTOR_ACTIVE, OVERLAY_SIDE_DISASSEMBLER_ACTIVE, OVERLAY_SIDE_BOXINATOR_ACTIVE, OVERLAY_SIDE_ROCK_BREAKER_ACTIVE, OVERLAY_SIDE_SCANNER_ACTIVE, OVERLAY_ADV_PUMP, OVERLAY_TELEPORTER,OVERLAY_TELEPORTER_ACTIVE ; protected IIcon mIcon; diff --git a/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java b/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java index 8f1f6d8f9f..a8cc213072 100644 --- a/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java +++ b/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java @@ -75,7 +75,7 @@ public class GT_RadioactiveCell_Item tNBT = new NBTTagCompound(); aStack.setTagCompound(tNBT); } - return tNBT.getInteger("durability"); + return tNBT.getInteger("advDmg"); } public int getMaxNuclearDurability() @@ -156,6 +156,6 @@ public class GT_RadioactiveCell_Item { super.addAdditionalToolTips(aList, aStack); //aList.add("Time left: " + (this.maxDelay - getDurabilityOfStack(aStack)) + " secs"); - aList.add("Durability: "+(this.maxDmg - this.dura)+"/"+this.maxDmg); + aList.add("Durability: "+(this.maxDmg - getDurabilityOfStack(aStack))+"/"+this.maxDmg); } } diff --git a/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index 94c47923d6..a7d92915f5 100644 --- a/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -393,7 +393,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE mRunningThroughTick = false; return; } - if (GregTech_API.sMachineThunderExplosions && worldObj.isThundering() && getRandomNumber(3) == 0) { + if (GregTech_API.sMachineThunderExplosions && worldObj.isThundering() && getBiome().rainfall > 0 && getRandomNumber(3) == 0) { doEnergyExplosion(); } } @@ -651,7 +651,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE @Override public boolean isActive() {return mActive;} @Override public void setActive(boolean aActive) {mActive = aActive;} @Override public long getTimer() {return mTickTimer;} - @Override public boolean decreaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooLessEnergy) {if (!canAccessData()) return false; return mHasEnoughEnergy = decreaseStoredSteam(aEnergy, false) || decreaseStoredEU(aEnergy, aIgnoreTooLessEnergy) || (aIgnoreTooLessEnergy && (decreaseStoredSteam(aEnergy, true)));} + @Override public boolean decreaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooLessEnergy) {if (!canAccessData()) return false; return mHasEnoughEnergy = decreaseStoredEU(aEnergy, aIgnoreTooLessEnergy) || decreaseStoredSteam(aEnergy, false) || (aIgnoreTooLessEnergy && (decreaseStoredSteam(aEnergy, true)));} @Override public boolean increaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooMuchEnergy) {if (!canAccessData()) return false; if (getStoredEU() < getEUCapacity() || aIgnoreTooMuchEnergy) {setStoredEU(mMetaTileEntity.getEUVar() + aEnergy); return true;} return false;} @Override public boolean inputEnergyFrom(byte aSide) {if (aSide == 6) return true; if (isServerSide()) return (aSide>=0&&aSide<6?mActiveEUInputs [aSide]:false)&&!mReleaseEnergy; return isEnergyInputSide (aSide);} @Override public boolean outputsEnergyTo(byte aSide) {if (aSide == 6) return true; if (isServerSide()) return (aSide>=0&&aSide<6?mActiveEUOutputs[aSide]:false)|| mReleaseEnergy; return isEnergyOutputSide(aSide);} @@ -678,7 +678,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE public boolean setStoredEU (long aEnergy) {if (!canAccessData()) return false; if (aEnergy < 0) aEnergy = 0; mMetaTileEntity.setEUVar (aEnergy); return true;} public boolean setStoredSteam (long aEnergy) {if (!canAccessData()) return false; if (aEnergy < 0) aEnergy = 0; mMetaTileEntity.setSteamVar (aEnergy); return true;} - public boolean decreaseStoredEU (long aEnergy, boolean aIgnoreTooLessEnergy) {if (!canAccessData()) return false; if (mMetaTileEntity.getEUVar() - aEnergy >= 0 || aIgnoreTooLessEnergy) {setStoredEU(mMetaTileEntity.getEUVar() - aEnergy); if (mMetaTileEntity.getEUVar() < 0) {setStoredEU (0); return false;} return true;} return false;} + public boolean decreaseStoredEU (long aEnergy, boolean aIgnoreTooLessEnergy) {if (!canAccessData()) {return false;} if (mMetaTileEntity.getEUVar() - aEnergy >= 0 || aIgnoreTooLessEnergy) {setStoredEU(mMetaTileEntity.getEUVar() - aEnergy); if (mMetaTileEntity.getEUVar() < 0) {setStoredEU (0); return false;} return true;} return false;} public boolean decreaseStoredSteam (long aEnergy, boolean aIgnoreTooLessEnergy) {if (!canAccessData()) return false; if (mMetaTileEntity.getSteamVar() - aEnergy >= 0 || aIgnoreTooLessEnergy) {setStoredSteam(mMetaTileEntity.getSteamVar() - aEnergy); if (mMetaTileEntity.getSteamVar() < 0) {setStoredSteam(0); return false;} return true;} return false;} public boolean playerOwnsThis(EntityPlayer aPlayer, boolean aCheckPrecicely) {if (!canAccessData()) return false; if (aCheckPrecicely || privateAccess() || mOwnerName.equals("")) if (mOwnerName.equals("")&&isServerSide()) setOwnerName(aPlayer.getDisplayName()); else if (privateAccess() && !aPlayer.getDisplayName().equals("Player") && !mOwnerName.equals("Player") && !mOwnerName.equals(aPlayer.getDisplayName())) return false; return true;} diff --git a/main/java/gregtech/api/objects/GT_FluidStack.java b/main/java/gregtech/api/objects/GT_FluidStack.java index 12735101ca..ac54003d35 100644 --- a/main/java/gregtech/api/objects/GT_FluidStack.java +++ b/main/java/gregtech/api/objects/GT_FluidStack.java @@ -8,6 +8,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Map; +import net.minecraftforge.common.ForgeVersion; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -17,6 +18,7 @@ import net.minecraftforge.fluids.FluidStack; public class GT_FluidStack extends FluidStack { private static final Collection<GT_FluidStack> sAllFluidStacks = new ArrayList<GT_FluidStack>(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<Fluid, ?> tMap : GregTech_API.sFluidMappings) try {GT_Utility.reMap(tMap);} catch(Throwable e) {e.printStackTrace(GT_Log.err);} + lock=false;} } public void fixFluidIDForFucksSake() { - int fluidID = this.getFluid().getID(); - try {fluidID = mFluid.getID();} catch(Throwable e) {fluidID = -1;} + if(ForgeVersion.getBuildVersion()<1355){ + int fluidID; + try {fluidID = this.getFluid().getID();} catch(Throwable e){System.err.println(e);} + try {fluidID = mFluid.getID();} catch(Throwable e) {fluidID = -1;}} } @Override public FluidStack copy() { - fixFluidIDForFucksSake(); + if(ForgeVersion.getBuildVersion()<1355){ + fixFluidIDForFucksSake();} return new GT_FluidStack(this); } }
\ No newline at end of file diff --git a/main/java/gregtech/api/util/GT_Utility.java b/main/java/gregtech/api/util/GT_Utility.java index 85a92c32aa..2bfae10fee 100644 --- a/main/java/gregtech/api/util/GT_Utility.java +++ b/main/java/gregtech/api/util/GT_Utility.java @@ -963,6 +963,7 @@ public class GT_Utility { public static boolean addSimpleIC2MachineRecipe(ItemStack aInput, Map<IRecipeInput, RecipeOutput> 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<aOutput.length;i++){if(aOutput[i]==null){System.out.println("EmptyIC2Output!"+aInput.getUnlocalizedName());return F;}} if (tOreName != null) { aRecipeList.put(new RecipeInputOreDict(tOreName.toString(), aInput.stackSize), new RecipeOutput(aNBT, GT_OreDictUnificator.getStackArray(T, aOutput))); } else { diff --git a/main/java/gregtech/common/GT_Proxy.java b/main/java/gregtech/common/GT_Proxy.java index 2294f243e6..781c60fd7a 100644 --- a/main/java/gregtech/common/GT_Proxy.java +++ b/main/java/gregtech/common/GT_Proxy.java @@ -160,13 +160,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { public final Materials mMaterial; public final String mModID; - public OreDictEventContainer(OreDictionary.OreRegisterEvent aEvent, - OrePrefixes aPrefix, Materials aMaterial, String aModID) { + public OreDictEventContainer(OreDictionary.OreRegisterEvent aEvent, OrePrefixes aPrefix, Materials aMaterial, String aModID) { this.mEvent = aEvent; this.mPrefix = aPrefix; this.mMaterial = aMaterial; - this.mModID = ((aModID == null) || (aModID.equals("UNKNOWN")) ? null - : aModID); + this.mModID = ((aModID == null) || (aModID.equals("UNKNOWN")) ? null : aModID); } } @@ -174,125 +172,61 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { private boolean isFirstServerWorldTick = true; private boolean mOreDictActivated = false; private final Collection<OreDictEventContainer> mEvents = new HashSet(); - private final Collection<String> 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<String> 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<String> 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<String> 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<String> 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", "nightGe |