diff options
Diffstat (limited to 'src/main/java')
230 files changed, 12 insertions, 21912 deletions
diff --git a/src/main/java/Ic2ExpReactorPlanner/BigintStorage.java b/src/main/java/Ic2ExpReactorPlanner/BigintStorage.java deleted file mode 100644 index d9d4d62c3c..0000000000 --- a/src/main/java/Ic2ExpReactorPlanner/BigintStorage.java +++ /dev/null @@ -1,64 +0,0 @@ -package Ic2ExpReactorPlanner; - -import java.math.BigInteger; -import java.util.Base64; - -/** - * Stores numbers of varying size inside a BigInteger, expecting each to have a defined limit (which need not be an - * exact power of 2). Numbers are to be extracted in reverse order they were stored, and special values can be used to - * make certain values optional for inclusion (the calling class is responsible for handling this logic, though). - * - * @author Brian McCloud - */ -public class BigintStorage { - - private BigInteger storedValue = BigInteger.ZERO; - - /** - * Stores the specified value. Requires that 0 <= value <= max. - * - * @param value the value to store. - * @param max the expected maximum for the value. - */ - public void store(int value, int max) { - if (value < 0 || value > max) { - throw new IllegalArgumentException(); - } - storedValue = storedValue.multiply(BigInteger.valueOf(max + 1)).add(BigInteger.valueOf(value)); - } - - /** - * Extracts a value based on the specified maximum. - * - * @param max the expected maximum for the value. - * @return the extracted value. - */ - public int extract(int max) { - BigInteger[] values = storedValue.divideAndRemainder(BigInteger.valueOf(max + 1)); - storedValue = values[0]; - return values[1].intValue(); - } - - /** - * Takes input of a Base64 string, and converts it to a BigintStorage. - * - * @param code the Base64-encoded string (presumed to be from @outputBase64) - * @return the converted storage object. - */ - public static BigintStorage inputBase64(String code) { - BigintStorage result = new BigintStorage(); - byte[] temp = Base64.getDecoder().decode(code); - result.storedValue = new BigInteger(temp); - return result; - } - - /** - * Outputs the current value of this BigintStorage as a Base64-encoded string. - * - * @return the Base64-encoded string. - */ - public String outputBase64() { - byte[] temp = storedValue.toByteArray(); - return Base64.getEncoder().encodeToString(temp); - } -} diff --git a/src/main/java/Ic2ExpReactorPlanner/TaloniusDecoder.java b/src/main/java/Ic2ExpReactorPlanner/TaloniusDecoder.java deleted file mode 100644 index 1927275485..0000000000 --- a/src/main/java/Ic2ExpReactorPlanner/TaloniusDecoder.java +++ /dev/null @@ -1,27 +0,0 @@ -package Ic2ExpReactorPlanner; - -import java.math.BigInteger; - -/** - * Pulls values out of codes from Talonius's old reactor planner. - * - * @author Brian McCloud - */ -public class TaloniusDecoder { - - private BigInteger dataStack = null; - - public TaloniusDecoder(final String dataCode) { - dataStack = new BigInteger(dataCode, 36); - } - - public int readInt(final int bits) { - return readBigInteger(bits).intValue(); - } - - private BigInteger readBigInteger(final int bits) { - BigInteger data = dataStack.and(BigInteger.ONE.shiftLeft(bits).subtract(BigInteger.ONE)); - dataStack = dataStack.shiftRight(bits); - return data; - } -} diff --git a/src/main/java/gregtech/api/util/EmptyRecipeMap.java b/src/main/java/gregtech/api/util/EmptyRecipeMap.java deleted file mode 100644 index 6a6e786610..0000000000 --- a/src/main/java/gregtech/api/util/EmptyRecipeMap.java +++ /dev/null @@ -1,68 +0,0 @@ -package gregtech.api.util; - -import java.util.Collection; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; - -public class EmptyRecipeMap extends GT_Recipe_Map { - - public EmptyRecipeMap(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName, - String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, int aMinimalInputItems, - int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, int aNEISpecialValueMultiplier, - String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) { - super( - aRecipeList, - aUnlocalizedName, - aLocalName, - aNEIName, - aNEIGUIPath, - aUsualInputCount, - aUsualOutputCount, - aMinimalInputItems, - aMinimalInputFluids, - aAmperage, - aNEISpecialValuePre, - aNEISpecialValueMultiplier, - aNEISpecialValuePost, - aShowVoltageAmperageInNEI, - aNEIAllowed); - } - - @Override - public GT_Recipe addRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, - int[] aOutputChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, - int aSpecialValue) { - return null; - } - - @Override - public GT_Recipe addRecipe(int[] aOutputChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, - int aDuration, int aEUt, int aSpecialValue) { - return null; - } - - @Override - public GT_Recipe addRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, - FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) { - return null; - } - - @Override - public GT_Recipe addRecipe(GT_Recipe aRecipe) { - return null; - } - - @Override - protected GT_Recipe addRecipe(GT_Recipe aRecipe, boolean aCheckForCollisions, boolean aFakeRecipe, - boolean aHidden) { - return null; - } - - @Override - public GT_Recipe add(GT_Recipe aRecipe) { - return null; - } -} diff --git a/src/main/java/gregtech/api/util/GTPP_Recipe.java b/src/main/java/gregtech/api/util/GTPP_Recipe.java index 653c0f0930..c58401a04c 100644 --- a/src/main/java/gregtech/api/util/GTPP_Recipe.java +++ b/src/main/java/gregtech/api/util/GTPP_Recipe.java @@ -23,7 +23,6 @@ import gregtech.api.gui.modularui.GT_UITextures; import gregtech.common.gui.modularui.UIHelper; import gregtech.nei.GT_NEI_DefaultHandler.FixedPositionedStack; import gregtech.nei.NEIRecipeInfo; -import gtPlusPlus.api.interfaces.IComparableRecipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.util.math.MathUtils; @@ -36,7 +35,7 @@ import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; * @author Alkalus * */ -public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { +public class GTPP_Recipe extends GT_Recipe { public GTPP_Recipe(final boolean aOptimize, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecialItems, final int[] aChances, final FluidStack[] aFluidInputs, diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java index 9dfe9356e9..4383c31c3d 100644 --- a/src/main/java/gtPlusPlus/GTplusplus.java +++ b/src/main/java/gtPlusPlus/GTplusplus.java @@ -219,7 +219,6 @@ public class GTplusplus implements ActionListener { BookHandler.runLater(); Meta_GT_Proxy.postInit(); Core_Manager.postInit(); - // SprinklerHandler.registerModFerts(); ItemGiantEgg.postInit(ModItems.itemBigEgg); BlockEventHandler.init(); diff --git a/src/main/java/gtPlusPlus/api/enums/ParticleNames.java b/src/main/java/gtPlusPlus/api/enums/ParticleNames.java deleted file mode 100644 index 335442dbc7..0000000000 --- a/src/main/java/gtPlusPlus/api/enums/ParticleNames.java +++ /dev/null @@ -1,35 +0,0 @@ -package gtPlusPlus.api.enums; - -public enum ParticleNames { - explode, - largeexplode, - hugeexplosion, - bubble, - splash, - suspended, - depthsuspend, - crit, - magicCrit, - smoke, - largesmoke, - spell, - instantSpell, - mobSpell, - dripWater, - dripLava, - townaura, - note, - portal, - enchantmenttable, - flame, - lava, - footstep, - cloud, - reddust, - snowballpoof, - snowshovel, - slime, - heart, - iconcrack_, - tilecrack_; -} diff --git a/src/main/java/gtPlusPlus/api/enums/Quality.java b/src/main/java/gtPlusPlus/api/enums/Quality.java deleted file mode 100644 index efcf2a015f..0000000000 --- a/src/main/java/gtPlusPlus/api/enums/Quality.java +++ /dev/null @@ -1,66 +0,0 @@ -package gtPlusPlus.api.enums; - -import net.minecraft.util.EnumChatFormatting; - -import gtPlusPlus.core.util.math.MathUtils; - -public enum Quality { - - // Magic Blue - // Rare Yellow - // Set Green - // Unique Gold/Purple - // Trade-off Brown - - POOR("Poor", EnumChatFormatting.GRAY), - COMMON("Common", EnumChatFormatting.WHITE), - UNCOMMON("Uncommon", EnumChatFormatting.DARK_GREEN), - MAGIC("Magic", EnumChatFormatting.BLUE), - RARE("Rare", EnumChatFormatting.YELLOW), - UNIQUE("Unique", EnumChatFormatting.GOLD), - ARTIFACT("Artifact", EnumChatFormatting.AQUA), - SET("Set Piece", EnumChatFormatting.GREEN), - TRADEOFF("Trade-off", EnumChatFormatting.DARK_RED), - EPIC("Epic", EnumChatFormatting.LIGHT_PURPLE); - - private String LOOT; - private EnumChatFormatting COLOUR; - - private Quality(final String lootTier, final EnumChatFormatting tooltipColour) { - this.LOOT = lootTier; - this.COLOUR = tooltipColour; - } - - public String getQuality() { - return this.LOOT; - } - - protected EnumChatFormatting getColour() { - return this.COLOUR; - } - - public String formatted() { - return this.COLOUR + this.LOOT; - } - - public static Quality getRandomQuality() { - final int lootChance = MathUtils.randInt(0, 100); - if (lootChance <= 10) { - return Quality.POOR; - } else if (lootChance <= 45) { - return Quality.COMMON; - } else if (lootChance <= 65) { - return Quality.UNCOMMON; - } else if (lootChance <= 82) { - return Quality.MAGIC; - } else if (lootChance <= 92) { - return Quality.EPIC; - } else if (lootChance <= 97) { - return Quality.RARE; - } else if (lootChance <= 99) { - return Quality.ARTIFACT; - } else { - return null; - } - } -} diff --git a/src/main/java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java b/src/main/java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java index a85bd42213..24d2da3134 100644 --- a/src/main/java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java +++ b/src/main/java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java @@ -2,26 +2,13 @@ package gtPlusPlus.api.helpers; import java.util.HashMap; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.WeightedCollection; import gtPlusPlus.api.objects.minecraft.multi.SpecialMultiBehaviour; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy_RTG; import gtPlusPlus.xmod.gregtech.api.util.SpecialBehaviourTooltipHandler; public class GregtechPlusPlus_API { - public static class MolecularTransformer_API { - - public static boolean addRecipe(ItemStack aInput, ItemStack aOutput, int aDuration, int aEU) { - return CORE.RA.addMolecularTransformerRecipe(aInput, aOutput, aDuration, aEU, 1); - } - } - public static class Multiblock_API { private static final HashMap<String, SpecialMultiBehaviour> mSpecialBehaviourItemMap = new HashMap<String, SpecialMultiBehaviour>(); @@ -50,166 +37,5 @@ public class GregtechPlusPlus_API { public static final HashMap<String, SpecialMultiBehaviour> getSpecialBehaviourItemMap() { return mSpecialBehaviourItemMap; } - - /** - * Allows RTG Fuel pellets from other mods to be used in the RTG hatch. - * - * @param aStack - The Pellet Stack, sanitsed after passing through. - * @param aFuelValue - The Fuel Value of the Pellet to be added to the energy storage. - * @return - Did register? - */ - public static boolean registerPelletForRtgHatch(ItemStack aStack, long aFuelValue) { - return GT_MetaTileEntity_Hatch_Energy_RTG.registerPelletForHatch(aStack, aFuelValue); - } - } - - public static class VoidMiner_API { - - private static final HashMap<Integer, HashMap<String, WeightedCollection<Block>>> mMinerLootCache; - - static { - mMinerLootCache = new HashMap<Integer, HashMap<String, WeightedCollection<Block>>>(); - } - - /** - * - * Registers an ore block for a dimension. Uses a default weight of 100. - * - * @param aDim - The Dimension ID - * @param aOredictName - The OreDict name of the Ore to be mined. - * @return - If there was a valid Block found in the OreDict for the provided name. - */ - public static boolean registerOreForVoidMiner(int aDim, String aOredictName) { - return registerOreForVoidMiner(aDim, aOredictName, 100); - } - - /** - * - * Registers an ore block for a dimension. Uses a default weight of 100. - * - * @param aDim - The Dimension ID - * @param aOredictName - The OreDict name of the Ore to be mined. - * @param aWeight - The weight of this ore Block. - * @return - If there was a valid Block found in the OreDict for the provided name. - */ - public static boolean registerOreForVoidMiner(int aDim, String aOredictName, int aWeight) { - Block b = null; - ItemStack[] aValidItems = ItemUtils.validItemsForOreDict(aOredictName); - for (ItemStack g : aValidItems) { - if (g != null) { - b = Block.getBlockFromItem(g.getItem()); - if (b != null) { - break; - } - } - } - if (b != null) { - registerOreForVoidMiner(aDim, b, aWeight); - return true; - } - return false; - } - - /** - * Registers an ore block for a dimension. Uses a default weight of 100. - * - * @param aDim - The Dimension ID - * @param aOreBlock - The Ore Block to be mined. - */ - public static void registerOreForVoidMiner(int aDim, Block aOreBlock) { - registerOreForVoidMiner(aDim, aOreBlock, 100); - } - - /** - * Registers an ore block for a dimension. - * - * @param aDim - The Dimension ID - * @param aOreBlock - The Ore Block to be mined. - * @param aWeight - The weight of this ore Block. - */ - public static void registerOreForVoidMiner(int aDim, Block aOreBlock, int aWeight) { - GregtechPlusPlus_API_Internal.writeBlockToDimensionInCache(aDim, 0, aOreBlock, aWeight); - } - - /** - * Registers a surface block for a dimension. Uses a default weight of 100. - * - * @param aDim - The Dimension ID - * @param aDirtBlock - The Dirt/Grass Block to be mined. - */ - public static void registerEarthSurfaceForVoidMiner(int aDim, Block aDirtBlock) { - registerEarthSurfaceForVoidMiner(aDim, aDirtBlock, 100); - } - - /** - * Registers a surface block for a dimension. - * - * @param aDim - The Dimension ID - * @param aDirtBlock - The Dirt/Grass Block to be mined. - * @param aWeight - The weight of this Dirt/Grass Block. - */ - public static void registerEarthSurfaceForVoidMiner(int aDim, Block aDirtBlock, int aWeight) { - GregtechPlusPlus_API_Internal.writeBlockToDimensionInCache(aDim, 0, aDirtBlock, aWeight); - } - - /** - * Registers a stone block for a dimension. Uses a default weight of 100. - * - * @param aDim - The Dimension ID - * @param aStoneBlock - The Stone Block to be mined. - */ - public static void registerEarthStoneForVoidMiner(int aDim, Block aStoneBlock) { - registerEarthStoneForVoidMiner(aDim, aStoneBlock, 100); - } - - /** - * Registers a stone block for a dimension. - * - * @param aDim - The Dimension ID - * @param aStoneBlock - The Stone Block to be mined. - * @param aWeight - The weight of this Stone Block. - */ - public static void registerEarthStoneForVoidMiner(int aDim, Block aStoneBlock, int aWeight) { - GregtechPlusPlus_API_Internal.writeBlockToDimensionInCache(aDim, 0, aStoneBlock, aWeight); - } - - public static WeightedCollection<Block> getAllRegisteredOresForDimension(int aDim) { - return mMinerLootCache.get(aDim).get("ore"); - } - - public static WeightedCollection<Block> getAllRegisteredDirtTypesForDimension(int aDim) { - return mMinerLootCache.get(aDim).get("dirt"); - } - - public static WeightedCollection<Block> getAllRegisteredStoneTypesForDimension(int aDim) { - return mMinerLootCache.get(aDim).get("stone"); - } - - public static final HashMap<Integer, HashMap<String, WeightedCollection<Block>>> getVoidMinerLootCache() { - return mMinerLootCache; - } - } - - private static class GregtechPlusPlus_API_Internal { - - private static void writeBlockToDimensionInCache(int aDim, int aType, Block aBlock, int aWeight) { - HashMap<String, WeightedCollection<Block>> aDimMap = VoidMiner_API.mMinerLootCache.get(aDim); - if (aDimMap == null) { - aDimMap = new HashMap<String, WeightedCollection<Block>>(); - } - WeightedCollection<Block> aMappedBlocks = getBlockMap(aType, aDimMap); - aMappedBlocks.put(aWeight, aBlock); - } - - private static WeightedCollection<Block> getBlockMap(int aType, - HashMap<String, WeightedCollection<Block>> aDimMap) { - WeightedCollection<Block> aMappedBlocks; - String aTypeName = ((aType == 0) ? "ore" : (aType == 1) ? "dirt" : (aType == 2) ? "stone" : "error"); - aMappedBlocks = aDimMap.get(aTypeName); - if (aMappedBlocks == null) { - aMappedBlocks = new WeightedCollection<Block>(); - } - return aMappedBlocks; - } } } diff --git a/src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java b/src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java deleted file mode 100644 index cec4d12716..0000000000 --- a/src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java +++ /dev/null @@ -1,32 +0,0 @@ -package gtPlusPlus.api.interfaces; - -import java.util.Set; - -import net.minecraft.world.ChunkCoordIntPair; - -public interface IChunkLoader { - - public long getTicksRemaining(); - - public void setTicksRemaining(long aTicks); - - public ChunkCoordIntPair getResidingChunk(); - - public void setResidingChunk(ChunkCoordIntPair aCurrentChunk); - - public boolean getChunkLoadingActive(); - - public void setChunkLoadingActive(boolean aActive); - - public boolean getDoesWorkChunkNeedReload(); - - public void setDoesWorkChunkNeedReload(boolean aActive); - - public boolean addChunkToLoadedList(ChunkCoordIntPair aActiveChunk); - - public boolean removeChunkFromLoadedList(ChunkCoordIntPair aActiveChunk); - - public Set<ChunkCoordIntPair> getManagedChunks(); - - public int getChunkloaderTier(); -} diff --git a/src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java b/src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java deleted file mode 100644 index 06727167bf..0000000000 --- a/src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java +++ /dev/null @@ -1,6 +0,0 @@ -package gtPlusPlus.api.interfaces; - -import gregtech.api.util.GT_Recipe; - -public interface IComparableRecipe extends Comparable<GT_Recipe> { -} diff --git a/src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java b/src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java deleted file mode 100644 index 95cd46e443..0000000000 --- a/src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java +++ /dev/null @@ -1,18 +0,0 @@ -package gtPlusPlus.api.interfaces; - -import java.util.Random; - -import net.minecraft.world.World; - -public abstract interface IGeneratorWorld { - - public abstract boolean generate(World paramWorld, Random paramRandom, int paramInt1, int paramInt2); - - public abstract void initiate(); - - public abstract int getExtentX(); - - public abstract int getExtentZ(); - - public abstract int getRange(); -} diff --git a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java deleted file mode 100644 index 4a41e47a7b..0000000000 --- a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java +++ /dev/null @@ -1,12 +0,0 @@ -package gtPlusPlus.api.interfaces; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -public interface IGregtechPacketEntity { - - public void writePacketData(DataOutputStream data) throws IOException; - - public void readPacketData(DataInputStream data) throws IOException; -} diff --git a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java deleted file mode 100644 index f121926005..0000000000 --- a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java +++ /dev/null @@ -1,142 +0,0 @@ -package gtPlusPlus.api.interfaces; - -import net.minecraft.block.Block; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import gregtech.api.interfaces.IDescribable; -import gregtech.api.interfaces.tileentity.IBasicEnergyContainer; -import gregtech.api.interfaces.tileentity.IGearEnergyTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation; -import gregtech.api.interfaces.tileentity.ITurnable; - -public abstract interface IGregtechPower - extends IGearEnergyTileEntity, ITurnable, IGregTechDeviceInformation, IDescribable, IBasicEnergyContainer { - - @Override - public String[] getDescription(); - - @Override - default boolean isUniversalEnergyStored(long p0) { - return false; - } - - @Override - public long getOutputAmperage(); - - @Override - public long getOutputVoltage(); - - @Override - public long getInputAmperage(); - - @Override - public long getInputVoltage(); - - @Override - public boolean decreaseStoredEnergyUnits(long p0, boolean p1); - - @Override - public boolean increaseStoredEnergyUnits(long p0, boolean p1); - - @Override - public boolean drainEnergyUnits(ForgeDirection side, long p1, long p2); - - @Override - public long getAverageElectricInput(); - - @Override - public long getAverageElectricOutput(); - - @Override - public long getStoredEU(); - - @Override - public long getEUCapacity(); - - @Override - public long getStoredSteam(); - - @Override - public long getSteamCapacity(); - - @Override - public boolean increaseStoredSteam(long p0, boolean p1); - - @Override - public Block getBlockAtSide(ForgeDirection side); - - @Override - public Block getBlockAtSideAndDistance(ForgeDirection side, int p1); - - @Override - public Block getBlockOffset(int p0, int p1, int p2); - - @Override - public TileEntity getTileEntity(int p0, int p1, int p2); - - @Override - public TileEntity getTileEntityAtSide(ForgeDirection side); - - @Override - public TileEntity getTileEntityAtSideAndDistance(ForgeDirection side, int p1); - - @Override - public TileEntity getTileEntityOffset(int p0, int p1, int p2); - - @Override - public World getWorld(); - - @Override - public int getXCoord(); - - @Override - public short getYCoord(); - - @Override - public int getZCoord(); - - @Override - public boolean isClientSide(); - - @Override - public boolean isDead(); - - @Override - public boolean isInvalidTileEntity(); - - @Override - public boolean isServerSide(); - - @Override - public void readFromNBT(NBTTagCompound p0); - - @Override - public void writeToNBT(NBTTagCompound p0); - - @Override - public boolean acceptsRotationalEnergy(ForgeDirection side); - - @Override - public boolean injectRotationalEnergy(ForgeDirection side, long p1, long p2); - - @Override - public long injectEnergyUnits(ForgeDirection side, long p1, long p2); - - @Override - public boolean inputEnergyFrom(ForgeDirection side); - - @Override - public boolean outputsEnergyTo(ForgeDirection side); - - @Override - public String[] getInfoData(); - - @Override - public default boolean isGivingInformation() { - return true; - } - -} diff --git a/src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java b/src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java deleted file mode 100644 index ddb4d4d2f1..0000000000 --- a/src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2005, Nick Galbreath -- nickg [at] modp [dot] com All rights reserved. Redistribution and use in source and - * binary forms, with or without modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following - * disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the - * following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of - * the modp.com nor the names of its contributors may be used to endorse or promote products derived from this software - * without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. This is the standard "new" BSD license: - * http://www.opensource.org/licenses/bsd-license.php - */ - -package gtPlusPlus.api.interfaces; - -/** - * Simplified interface for random number generation - * - * @author Nick Galbreath -- nickg [at] modp [dot] com - * @version 1 -- 06-Jul-2005 - */ -public interface IRandomGenerator { - - /** - * Returns N random bits - * - * See also java.util.Random#next - * - * @param numBits - * @return and int with the LSB being random - */ - public int next(int numBits); -} diff --git a/src/main/java/gtPlusPlus/api/objects/data/ObjMap.java b/src/main/java/gtPlusPlus/api/objects/data/ObjMap.java deleted file mode 100644 index eff314f9ae..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/data/ObjMap.java +++ /dev/null @@ -1,243 +0,0 @@ -package gtPlusPlus.api.objects.data; - -import java.util.Arrays; - -/** - * Object-2-object map based on IntIntMap4a - */ -public class ObjMap<K, V> { - - private static final Object FREE_KEY = new Object(); - private static final Object REMOVED_KEY = new Object(); - - /** Keys and values */ - private Object[] m_data; - - /** Value for the null key (if inserted into a map) */ - private Object m_nullValue; - - private boolean m_hasNull; - - /** Fill factor, must be between (0 and 1) */ - private final float m_fillFactor; - /** We will resize a map once it reaches this size */ - private int m_threshold; - /** Current map size */ - private int m_size; - /** Mask to calculate the original position */ - private int m_mask; - /** Mask to wrap the actual array pointer */ - private int m_mask2; - - public ObjMap(final int size, final float fillFactor) { - if (fillFactor <= 0 || fillFactor >= 1) throw new IllegalArgumentException("FillFactor must be in (0, 1)"); - if (size <= 0) throw new IllegalArgumentException("Size must be positive!"); - final int capacity = arraySize(size, fillFactor); - m_mask = capacity - 1; - m_mask2 = capacity * 2 - 1; - m_fillFactor = fillFactor; - - m_data = new Object[capacity * 2]; - Arrays.fill(m_data, FREE_KEY); - - m_threshold = (int) (capacity * fillFactor); - } - - @SuppressWarnings("unchecked") - public V get(final K key) { - if (key == null) return (V) m_nullValue; // we null it on remove, so safe not to check a flag here - - int ptr = (key.hashCode() & m_mask) << 1; - Object k = m_data[ptr]; - - if (k == FREE_KEY) return null; // end of chain already - if (k.equals(key)) // we check FREE and REMOVED prior to this call - return (V) m_data[ptr + 1]; - while (true) { - ptr = (ptr + 2) & m_mask2; // that's next index - k = m_data[ptr]; - if (k == FREE_KEY) return null; - if (k.equals(key)) return (V) m_data[ptr + 1]; - } - } - - @SuppressWarnings("unchecked") - public V put(final K key, final V value) { - if (key == null) return insertNullKey(value); - - int ptr = getStartIndex(key) << 1; - Object k = m_data[ptr]; - - if (k == FREE_KEY) // end of chain already - { - m_data[ptr] = key; - m_data[ptr + 1] = value; - if (m_size >= m_threshold) rehash(m_data.length * 2); // size is set inside - else++m_size; - return null; - } else if (k.equals(key)) // we check FREE and REMOVED prior to this call - { - final Object ret = m_data[ptr + 1]; - m_data[ptr + 1] = value; - return (V) ret; - } - - int firstRemoved = -1; - if (k == REMOVED_KEY) firstRemoved = ptr; // we may find a key later - - while (true) { - ptr = (ptr + 2) & m_mask2; // that's next index calculation - k = m_data[ptr]; - if (k == FREE_KEY) { - if (firstRemoved != -1) ptr = firstRemoved; - m_data[ptr] = key; - m_data[ptr + 1] = value; - if (m_size >= m_threshold) rehash(m_data.length * 2); // size is set inside - else++m_size; - return null; - } else if (k.equals(key)) { - final Object ret = m_data[ptr + 1]; - m_data[ptr + 1] = value; - return (V) ret; - } else if (k == REMOVED_KEY) { - if (firstRemoved == -1) firstRemoved = ptr; - } - } - } - - @SuppressWarnings("unchecked") - public V remove(final K key) { - if (key == null) return removeNullKey(); - - int ptr = getStartIndex(key) << 1; - Object k = m_data[ptr]; - if (k == FREE_KEY) return null; // end of chain already - else if (k.equals(key)) // we check FREE and REMOVED prior to this call - { - --m_size; - if (m_data[(ptr + 2) & m_mask2] == FREE_KEY) m_data[ptr] = FREE_KEY; - else m_data[ptr] = REMOVED_KEY; - final V ret = (V) m_data[ptr + 1]; - m_data[ptr + 1] = null; - return ret; - } - while (true) { - ptr = (ptr + 2) & m_mask2; // that's next index calculation - k = m_data[ptr]; - if (k == FREE_KEY) return null; - else if (k.equals(key)) { - --m_size; - if (m_data[(ptr + 2) & m_mask2] == FREE_KEY) m_data[ptr] = FREE_KEY; - else m_data[ptr] = REMOVED_KEY; - final V ret = (V) m_data[ptr + 1]; - m_data[ptr + 1] = null; - return ret; - } - } - } - - @SuppressWarnings("unchecked") - private V insertNullKey(final V value) { - if (m_hasNull) { - final Object ret = m_nullValue; - m_nullValue = value; - return (V) ret; - } else { - m_nullValue = value; - ++m_size; - return null; - } - } - - @SuppressWarnings("unchecked") - private V removeNullKey() { - if (m_hasNull) { - final Object ret = m_nullValue; - m_nullValue = null; - m_hasNull = false; - --m_size; - return (V) ret; - } else { - return null; - } - } - - public int size() { - return m_size; - } - - @SuppressWarnings("unchecked") - private void rehash(final int newCapacity) { - m_threshold = (int) (newCapacity / 2 * m_fillFactor); - m_mask = newCapacity / 2 - 1; - m_mask2 = newCapacity - 1; - - final int oldCapacity = m_data.length; - final Object[] oldData = m_data; - - m_data = new Object[newCapacity]; - Arrays.fill(m_data, FREE_KEY); - - m_size = m_hasNull ? 1 : 0; - - for (int i = 0; i < oldCapacity; i += 2) { - final Object oldKey = oldData[i]; - if (oldKey != FREE_KEY && oldKey != REMOVED_KEY) put((K) oldKey, (V) oldData[i + 1]); - } - } - - public int getStartIndex(final Object key) { - // key is not null here - return key.hashCode() & m_mask; - } - - public Object[] values() { - return m_data; - } - - /** Taken from FastUtil implementation */ - - /** - * Return the least power of two greater than or equal to the specified value. - * - * <p> - * Note that this function will return 1 when the argument is 0. - * - * @param x a long integer smaller than or equal to 2<sup>62</sup>. - * @return the least power of two greater than or equal to the specified value. - */ - public static long nextPowerOfTwo(long x) { - if (x == 0) return 1; - x--; - x |= x >> 1; - x |= x >> 2; - x |= x >> 4; - x |= x >> 8; - x |= x >> 16; - return (x | x >> 32) + 1; - } - - /** - * Returns the least power of two smaller than or equal to 2<sup>30</sup> and larger than or equal to - * <code>Math.ceil( expected / f )</code>. - * - * @param expected the expected number of elements in a hash table. - * @param f the load factor. - * @return the minimum possible size for a backing array. - * @throws IllegalArgumentException if the necessary size is larger than 2<sup>30</sup>. - */ - public static int arraySize(final int expected, final float f) { - final long s = Math.max(2, nextPowerOfTwo((long) Math.ceil(expected / f))); - if (s > (1 << 30)) throw new IllegalArgumentException( - "Too large (" + expected + " expected elements with load factor " + f + ")"); - return (int) s; - } - - // taken from FastUtil - private static final int INT_PHI = 0x9E3779B9; - - public static int phiMix(final int x) { - final int h = x * INT_PHI; - return h ^ (h >> 16); - } -} diff --git a/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java deleted file mode 100644 index 275dad9d42..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java +++ /dev/null @@ -1,176 +0,0 @@ -package gtPlusPlus.api.objects.data; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -public class ReverseAutoMap<N> extends AutoMap<N> { - - /** - * The Internal Map - */ - private Map<N, Integer> mInternalMapReverseLookup = new HashMap<N, Integer>(); - - /** - * The Internal ID - */ - private int mInternalID = 0; - - private static final long serialVersionUID = 3771412318075131790L; - - @Override - public Iterator<N> iterator() { - return values().iterator(); - } - - @Override - public synchronized boolean setValue(N object) { - int mOriginalID = this.mInternalID; - put(object); - if (this.mInternalMap.get(mOriginalID).equals(object) || mOriginalID > this.mInternalID) { - return true; - } else { - return false; - } - } - - @Override - public synchronized N put(N object) { - return set(object); - } - - @Override - public synchronized N set(N object) { - int newID = getNextFreeMapID(); - mInternalMapReverseLookup.put(object, newID); - return mInternalMap.put(newID, object); - } - - public synchronized int putToInternalMap(N object) { - return setInternalMap(object); - } - - public synchronized int setInternalMap(N object) { - int newID = getNextFreeMapID(); - mInternalMap.put(newID, object); - mInternalMapReverseLookup.put(object, newID); - return newID; - } - - public synchronized boolean injectCleanDataToAutoMap(Integer g, N object) { - if (!mInternalMap.containsKey(g) && !mInternalMapReverseLookup.containsKey(object)) { - int a1 = 0, a2 = 0, a11 = 0, a22 = 0; - a1 = mInternalMap.size(); - a2 = mInternalMapReverseLookup.size(); - a11 = a1; - a22 = a2; - mInternalMap.put(g, object); - a1 = mInternalMap.size(); - mInternalMapReverseLookup.put(object, g); - a2 = mInternalMapReverseLookup.size(); - if (a1 > a11 && a2 > a22) return true; - } - return false; - } - - public synchronized boolean injectDataToAutoMap(Integer g, N object) { - int a1 = 0, a2 = 0, a11 = 0, a22 = 0; - a1 = mInternalMap.size(); - a2 = mInternalMapReverseLookup.size(); - a11 = a1; - a22 = a2; - mInternalMap.put(g, object); - a1 = mInternalMap.size(); - mInternalMapReverseLookup.put(object, g); - a2 = mInternalMapReverseLookup.size(); - if (a1 > a11 && a2 > a22) return true; - return false; - } - - private boolean raiseInternalID() { - int mOld = mInternalID; - mInternalID++; - return mInternalID > mOld; - } - - public synchronized int getNextFreeMapID() { - if (raiseInternalID()) { - return mInternalID; - } - return Short.MIN_VALUE; - } - - @Override - public synchronized N get(int id) { - return mInternalMap.get(id); - } - - public synchronized int get(N key) { - return mInternalMapReverseLookup.get(key); - } - - @Override - public synchronized Collection<N> values() { - return mInternalMap.values(); - } - - public synchronized Collection<Integer> keys() { - return mInternalMapReverseLookup.values(); - } - - @Override - public synchronized int size() { - return mInternalMap.size(); - } - - @Override - public synchronized int hashCode() { - return mInternalMap.hashCode() + mInternalMapReverseLookup.hashCode(); - } - - @Override - public synchronized boolean containsKey(int key) { - return mInternalMap.containsKey(key); - } - - @Override - public synchronized boolean containsValue(N value) { - return mInternalMap.containsValue(value); - } - - public synchronized boolean containsKey(N key) { - return mInternalMapReverseLookup.containsKey(key); - } - - public synchronized boolean containsValue(int value) { - return mInternalMapReverseLookup.containsValue(value); - } - - @Override - public synchronized boolean isEmpty() { - return mInternalMap.isEmpty() && mInternalMapReverseLookup.isEmpty(); - } - - @Override - public synchronized void clear() { - this.mInternalID = 0; - this.mInternalMap.clear(); - this.mInternalMapReverseLookup.clear(); - return; - } - - @Override - public synchronized N[] toArray() { - Collection<N> col = this.mInternalMap.values(); - @SuppressWarnings("unchecked") - N[] val = (N[]) col.toArray(); - return val; - } - - public synchronized Integer[] toArrayInternalMap() { - Collection<Integer> col = this.mInternalMapReverseLookup.values(); - Integer[] val = col.toArray(new Integer[col.size()]); - return val; - } -} diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java deleted file mode 100644 index 6748b58537..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java +++ /dev/null @@ -1,50 +0,0 @@ -package gtPlusPlus.api.objects.minecraft; - -import net.minecraft.client.Minecraft; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; - -public class DimChunkPos { - - public final int dimension; - public final int xPos; - public final int zPos; - public final Chunk mainChunk; - - public DimChunkPos(World world, BlockPos block) { - this.dimension = world.provider.dimensionId; - this.mainChunk = world.getChunkFromBlockCoords(block.xPos, block.zPos); - this.xPos = this.mainChunk.xPosition; - this.zPos = this.mainChunk.zPosition; - } - - public DimChunkPos(TileEntity tile) { - this.dimension = tile.getWorldObj().provider.dimensionId; - this.mainChunk = tile.getWorldObj().getChunkFromBlockCoords(tile.xCoord, tile.zCoord); - this.xPos = this.mainChunk.xPosition; - this.zPos = this.mainChunk.zPosition; - } - - public DimChunkPos(int dim, int x, int z) { - this.dimension = dim; - this.xPos = x; - this.zPos = z; - Chunk h = Minecraft.getMinecraft().getIntegratedServer().worldServerForDimension(dim) - .getChunkFromChunkCoords(xPos, zPos); - if (h == null) { - this.mainChunk = null; - } else { - this.mainChunk = h; - } - } - - public Chunk getChunk() { - if (this.mainChunk != null) { - return this.mainChunk; - } - Chunk h = Minecraft.getMinecraft().getIntegratedServer().worldServerForDimension(this.dimension) - .getChunkFromChunkCoords(xPos, zPos); - return h; - } -} diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/GenericStack.java b/src/main/java/gtPlusPlus/api/objects/minecraft/GenericStack.java deleted file mode 100644 index b49114e610..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/GenericStack.java +++ /dev/null @@ -1,41 +0,0 @@ -package gtPlusPlus.api.objects.minecraft; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -public class GenericStack { - - private ItemStack mItemStack; - private FluidStack mFluidStack; - - public GenericStack(ItemStack s) { - this.mItemStack = s; - this.mFluidStack = null; - } - - public GenericStack(FluidStack f) { - this.mItemStack = null; - this.mFluidStack = f; - } - - public GenericStack() { - this.mItemStack = null; - this.mFluidStack = null; - } - - public final synchronized FluidStack getFluidStack() { - return mFluidStack; - } - - public final synchronized ItemStack getItemStack() { - return mItemStack; - } - - public final synchronized void setItemStack(ItemStack mItemStack) { - this.mItemStack = mItemStack; - } - - public final synchronized void setFluidStack(FluidStack mFluidStack) { - this.mFluidStack = mFluidStack; - } -} diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java b/src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java deleted file mode 100644 index df48c24c06..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java +++ /dev/null @@ -1,122 +0,0 @@ -package gtPlusPlus.api.objects.minecraft; - -import java.util.Collection; -import java.util.Iterator; - -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.util.GT_Recipe; -import gtPlusPlus.api.objects.data.AutoMap; - -public class NoConflictGTRecipeMap implements Collection<GT_Recipe> { - - private AutoMap<GT_Recipe> mRecipeCache = new AutoMap<GT_Recipe>(); - private final IGregTechTileEntity mMachineType; - - public NoConflictGTRecipeMap() { - this(null); - } - - public NoConflictGTRecipeMap(IGregTechTileEntity tile0) { - this.mMachineType = tile0; - } - - public boolean put(GT_Recipe recipe) { - return add(recipe); - } - - @Override - public boolean add(GT_Recipe recipe) { - return mRecipeCache.setValue(recipe); - } - - public Collection<GT_Recipe> getRecipeMap() { - return mRecipeCache.values(); - } - - public boolean isMapValidForMachine(IGregTechTileEntity tile) { - return tile == mMachineType; - } - - @Override - public boolean addAll(Collection<? extends GT_Recipe> arg0) { - int a = 0; - for (Object v : arg0) { - if (!this.mRecipeCache.containsValue((GT_Recipe) v)) { - this.mRecipeCache.put((GT_Recipe) v); - a++; - } - } - return a > 0; - } - - @Override - public void clear() { - mRecipeCache.clear(); - } - - @Override - public boolean contains(Object arg0) { - return mRecipeCache.containsValue((GT_Recipe) arg0); - } - - @Override - public boolean containsAll(Collection<?> arg0) { - int a = 0; - for (Object v : arg0) { - if (this.mRecipeCache.containsValue((GT_Recipe) v)) { - a++; - } - } - return a == arg0.size(); - } - - @Override - public boolean isEmpty() { - return mRecipeCache.isEmpty(); - } - - @Override - public Iterator<GT_Recipe> iterator() { - return mRecipeCache.iterator(); - } - - @Override - public boolean remove(Object arg0) { - return mRecipeCache.remove((GT_Recipe) arg0); - } - - @Override - public boolean removeAll(Collection<?> arg0) { - int a = 0; - for (Object v : arg0) { - if (this.mRecipeCache.containsValue((GT_Recipe) v)) { - this.mRecipeCache.remove((GT_Recipe) v); - a++; - } - } - return a > 0; - } - - @Override - public boolean retainAll(Collection<?> arg0) { - int mStartSize = this.mRecipeCache.size(); - this.mRecipeCache = (AutoMap<GT_Recipe>) arg0; - int mEndsize = this.mRecipeCache.size(); - return mStartSize != mEndsize; - } - - @Override - public int size() { - return this.mRecipeCache.size(); - } - - @Override - public Object[] toArray() { - return this.mRecipeCache.toArray(); - } - - @Override - public <T> T[] toArray(T[] arg0) { - return (T[]) this.mRecipeCache.toArray(); - } -} diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/TexturePackage.java b/src/main/java/gtPlusPlus/api/objects/minecraft/TexturePackage.java deleted file mode 100644 index 4e4e0e9780..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/TexturePackage.java +++ /dev/null @@ -1,54 +0,0 @@ -package gtPlusPlus.api.objects.minecraft; - -import java.util.LinkedHashMap; -import java.util.Set; - -import net.minecraft.util.IIcon; - -import gtPlusPlus.api.objects.data.AutoMap; - -public class TexturePackage { - - private AutoMap<IIcon> mAnimationArray = new AutoMap<IIcon>(); - - public IIcon getFrame(int aFrame) { - if (aFrame < 0 || aFrame >= mAnimationArray.size()) { - return mAnimationArray.get(0); - } - return mAnimationArray.get(aFrame); - } - - public boolean addFrame(IIcon aFrame) { - if (aFrame != null) { - return mAnimationArray.add(aFrame); - } - return false; - } - - public boolean addFrames(AutoMap<IIcon> aFrames) { - for (IIcon h : aFrames) { - if (!addFrame(h)) { - return false; - } - } - return true; - } - - public boolean addFrames(LinkedHashMap<?, IIcon> aFrames) { - for (IIcon h : aFrames.values()) { - if (!addFrame(h)) { - return false; - } - } - return true; - } - - public boolean addFrames(Set<IIcon> aFrames) { - for (IIcon h : aFrames) { - if (!addFrame(h)) { - return false; - } - } - return true; - } -} diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java deleted file mode 100644 index f38a960044..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java +++ /dev/null @@ -1,108 +0,0 @@ -package gtPlusPlus.api.objects.minecraft; - -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; - -import net.minecraft.entity.passive.EntityAnimal; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; - -import gtPlusPlus.GTplusplus; -import gtPlusPlus.GTplusplus.INIT_PHASE; -import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector; -import gtPlusPlus.core.util.Utils; - -public class ThreadPooCollector extends Thread { - - public boolean canRun = true; - public boolean isRunning = false; - - private static final long INIT_TIME; - private static long internalTickCounter = 0; - - private static final ThreadPooCollector mThread; - private static final HashMap<String, Pair<BlockPos, TileEntityPooCollector>> mPooCollectors = new LinkedHashMap<String, Pair<BlockPos, TileEntityPooCollector>>(); - - static { - mThread = new ThreadPooCollector(); - INIT_TIME = (System.currentTimeMillis()); - } - - public ThreadPooCollector() { - setName("gtpp.handler.poop"); - start(); - } - - public static ThreadPooCollector getInstance() { - return mThread; - } - - public static void addTask(TileEntityPooCollector aTile) { - BlockPos aTempPos = new BlockPos(aTile); - mPooCollectors.put(aTempPos.getUniqueIdentifier(), new Pair<BlockPos, TileEntityPooCollector>(aTempPos, aTile)); - } - - public static void stopThread() { - mThread.canRun = false; - } - - @Override - public void run() { - - if (!isRunning) { - isRunning = true; - } else { - return; - } - - while (canRun) { - if (mPooCollectors.isEmpty() || GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.STARTED) { - continue; - } else { - internalTickCounter = Utils.getTicksFromSeconds( - Utils.getSecondsFromMillis(Utils.getMillisSince(INIT_TIME, System.currentTimeMillis()))); - if (internalTickCounter % 100 == 0) { - for (Pair<BlockPos, TileEntityPooCollector> pair : mPooCollectors.values()) { - if (pair != null) { - BlockPos p = pair.getKey(); - if (p != null) { - if (p.world != null) { - World w = p.world; - if (w == null) { - continue; - } - Chunk c = w.getChunkFromBlockCoords(p.xPos, p.zPos); - if (c != null) { - if (c.isChunkLoaded) { - int startX = p.xPos - 2; - int startY = p.yPos; - int startZ = p.zPos - 2; - int endX = p.xPos + 3; - int endY = p.yPos + 5; - int endZ = p.zPos + 3; - AxisAlignedBB box = AxisAlignedBB - .getBoundingBox(startX, startY, startZ, endX, endY, endZ); - if (box != null) { - @SuppressWarnings("unchecked") - List<EntityAnimal> animals = w - .getEntitiesWithinAABB(EntityAnimal.class, box); - if (animals != null && !animals.isEmpty()) { - pair.getValue().onPostTick(animals); - } - } else { - continue; - } - } - } - } - } - } - } - } - } - } - } -} diff --git a/src/main/java/gtPlusPlus/api/objects/random/CSPRNG_DO_NOT_USE.java b/src/main/java/gtPlusPlus/api/objects/random/CSPRNG_DO_NOT_USE.java deleted file mode 100644 index 07c8c3609b..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/random/CSPRNG_DO_NOT_USE.java +++ /dev/null @@ -1,236 +0,0 @@ -/* - * Copyright 2005, Nick Galbreath -- nickg [at] modp [dot] com All rights reserved. Redistribution and use in source and - * binary forms, with or without modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following - * disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the - * following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of - * the modp.com nor the names of its contributors may be used to endorse or promote products derived from this software - * without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. This is the standard "new" BSD license: - * http://www.opensource.org/licenses/bsd-license.php - */ - -package gtPlusPlus.api.objects.random; - -import java.math.BigInteger; -import java.security.SecureRandom; -import java.util.Random; - -import gtPlusPlus.api.interfaces.IRandomGenerator; -import gtPlusPlus.core.util.Utils; - -/** - * The Blum-Blum-Shub random number generator. - * - * <p> - * The Blum-Blum-Shub is a "cryptographically secure" random number generator. It has been proven that predicting the - * ouput is equivalent to factoring <i>n</i>, a large integer generated from two prime numbers. - * </p> - * - * <p> - * The Algorithm: - * </p> - * <ol> - * <li>(setup) generate two secret prime numbers <i>p</i>, <i>q</i> such that <i>p</i> ≠ <i>q</i>, <i>p</i> ≡ 3 - * mod 4, <i>q</i> ≡ 3 mod 4.</li> - * <li>(setup) compute <i>n</i> = <i>pq</i>. <i>n</i> can be re-used, but <i>p</i>, and <i>q</i> are secret and should - * be disposed of.</li> - * <li>Generate a (secure) random seed <i>s</i> in the range [1, <i>n</i> -1] such that gcd(<i>s</i>, <i>n</i>) = 1. - * <li>Compute <i>x</i> = <i>s</i><sup>2</sup> mod <i>n</i></li> - * <li>Compute a single random bit with: - * <ol> - * <li><i>x</i> = <i>x</i><sup>2</sup> mod <i>n</i></li> - * <li>return Least-Significant-Bit(<i>x</i>) (i.e. <i>x</i> & 1)</li> - * </ol> - * Repeat as necessary.</li> - * </ol> - * - * <p> - * The code originally appeared in <a href="http://modp.com/cida/"><i>Cryptography for Internet and Database - * Applications </i>, Chapter 4, pages 174-177</a> - * </p> - * <p> - * More details are in the <a href="http://www.cacr.math.uwaterloo.ca/hac/"><i>Handbook of Applied Cryptography</i></a>, - * <a href="http://www.cacr.math.uwaterloo.ca/hac/about/chap5.pdf">Section 5.5.2</a> - * </p> - * - * @author Nick Galbreath -- nickg [at] modp [dot] com - * @version 3 -- 06-Jul-2005 - * - */ -public class CSPRNG_DO_NOT_USE extends Random implements IRandomGenerator { - - // pre-compute a few values - private static final BigInteger two = BigInteger.valueOf(2L); - - private static final BigInteger three = BigInteger.valueOf(3L); - - private static final BigInteger four = BigInteger.valueOf(4L); - - /** - * main parameter - */ - private BigInteger n; - - private BigInteger state; - - /** - * Generate appropriate prime number for use in Blum-Blum-Shub. - * - * This generates the appropriate primes (p = 3 mod 4) needed to compute the "n-value" for Blum-Blum-Shub. - * - * @param bits Number of bits in prime - * @param rand A source of randomness - */ - private static BigInteger getPrime(int bits, Random rand) { - BigInteger p; - while (true) { - p = new BigInteger(bits, 100, rand); - if (p.mod(four).equals(three)) break; - } - return p; - } - - /** - * This generates the "n value" -- the multiplication of two equally sized random prime numbers -- for use in the - * Blum-Blum-Shub algorithm. - * - * @param bits The number of bits of security - * @param rand A random instance to aid in generating primes - * @return A BigInteger, the <i>n</i>. - */ - public static BigInteger generateN(int bits, Random rand) { - BigInteger p = getPrime(bits / 2, rand); - BigInteger q = getPrime(bits / 2, rand); - - // make sure p != q (almost always true, but just in case, check) - while (p.equals(q)) { - q = getPrime(bits, rand); - } - return p.multiply(q); - } - - /** - * Constructor, specifing bits for <i>n</i> - * - * @param bits number of bits - */ - public CSPRNG_DO_NOT_USE(int bits) { - this(bits, new Random()); - } - - /** - * Constructor, generates prime and seed - * - * @param bits - * @param rand - */ - public CSPRNG_DO_NOT_USE(int bits, Random rand) { - this(generateN(bits, rand)); - } - - /** - * A constructor to specify the "n-value" to the Blum-Blum-Shub algorithm. The inital seed is computed using Java's - * internal "true" random number generator. - * - * @param n The n-value. - */ - public CSPRNG_DO_NOT_USE(BigInteger n) { - this(n, SecureRandom.getSeed(n.bitLength() / 8)); - } - - /** - * A constructor to specify both the n-value and the seed to the Blum-Blum-Shub algorithm. - * - * @param n The n-value using a BigInteger - * @param seed The seed value using a byte[] array. - */ - public CSPRNG_DO_NOT_USE(BigInteger n, byte[] seed) { - this.n = n; - setSeed(seed); - } - - /** - * Sets or resets the seed value and internal state - * - * @param seedBytes The new seed. - */ - public void setSeed(byte[] seedBytes) { - // ADD: use hardwired default for n - BigInteger seed = new BigInteger(1, seedBytes); - state = seed.mod(n); - } - - /** - * Returns up to numBit random bits - * - * @return int - */ - @Override - public int next(int numBits) { - // TODO: find out how many LSB one can extract per cycle. - // it is more than one. - int result = 0; - for (int i = numBits; i != 0; --i) { - state = state.modPow(two, n); - result = (result << 1) | (state.testBit(0) == true ? 1 : 0); - } - return result; - } - - public static CSPRNG_DO_NOT_USE generate() { - return generate(512); - } - - /** - * @return CSPRNG_DO_NOT_USE - * @Author Draknyte1/Alkalus - */ - public static CSPRNG_DO_NOT_USE generate(int bitsize) { - // First use the internal, stock "true" random number - // generator to get a "true random seed" - SecureRandom r = Utils.generateSecureRandom(); - r.nextInt(); // need to do something for SR to be triggered. - // Use this seed to generate a n-value for Blum-Blum-Shub - // This value can be re-used if desired. - BigInteger nval = CSPRNG_DO_NOT_USE.generateN(bitsize, r); - // now get a seed - byte[] seed = new byte[bitsize / 8]; - r.nextBytes(seed); - // now create an instance of BlumBlumShub - CSPRNG_DO_NOT_USE bbs = new CSPRNG_DO_NOT_USE(nval, seed); - return bbs; - } - - /** - * @return CSPRNG_DO_NOT_USE - * @Author Draknyte1/Alkalus - */ - public static CSPRNG_DO_NOT_USE generate(Random aRandom) { - return generate(512, aRandom); - } - - /** - * @return CSPRNG_DO_NOT_USE - * @Author Draknyte1/Alkalus - */ - public static CSPRNG_DO_NOT_USE generate(int aBitSize, Random aRandom) { - // First use the internal, stock "true" random number - // generator to get a "true random seed" - SecureRandom r = Utils.generateSecureRandom(); - r.nextInt(); // need to do something for SR to be triggered. - // Use this seed to generate a n-value for Blum-Blum-Shub - // This value can be re-used if desired. - int bitsize = aBitSize; - // now create an instance of BlumBlumShub - // do everything almost automatically - CSPRNG_DO_NOT_USE bbs = new CSPRNG_DO_NOT_USE(bitsize, aRandom); - return bbs; - } -} diff --git a/src/main/java/gtPlusPlus/api/objects/random/UUIDGenerator.java b/src/main/java/gtPlusPlus/api/objects/random/UUIDGenerator.java deleted file mode 100644 index bfed0ce346..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/random/UUIDGenerator.java +++ /dev/null @@ -1,436 +0,0 @@ -package gtPlusPlus.api.objects.random; - -import java.io.IOException; -import java.net.InetAddress; -import java.util.Random; -import java.util.UUID; - -/** - * - * Implement modified version of Apache's OpenJPA UUID generator. This UUID generator is paired with a Blum-Blum-Shub - * random number generator which in itself is seeded by custom SecureRandom. - * - * The UUID generator class has been converted from a static factory to an instanced factory. - * - */ - -// ========================================= APACHE BLOCK ========================================= - -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE - * file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by - * applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ - -/** - * UUID value generator. Type 1 generator is based on the time-based generator in the Apache Commons Id project: - * http://jakarta.apache.org/commons/sandbox /id/uuid.html The type 4 generator uses the standard Java UUID generator. - * - * The type 1 code has been vastly simplified and modified to replace the ethernet address of the host machine with the - * IP, since we do not want to require native libs and Java cannot access the MAC address directly. - * - * In spirit, implements the IETF UUID draft specification, found here:<br /> - * http://www1.ics.uci.edu/~ejw/authoring/uuid-guid/draft-leach-uuids-guids-01 .txt - * - * @author Abe White, Kevin Sutter - * @since 0.3.3 - */ -public class UUIDGenerator { - - // supported UUID types - public static final int TYPE1 = 1; - public static final int TYPE4 = 4; - // indexes within the uuid array for certain boundaries - private static final byte IDX_TIME_HI = 6; - private static final byte IDX_TYPE = 6; // multiplexed - private static final byte IDX_TIME_MID = 4; - private static final byte IDX_TIME_LO = 0; - private static final byte IDX_TIME_SEQ = 8; - private static final byte IDX_VARIATION = 8; // multiplexed - // indexes and lengths within the timestamp for certain boundaries - private static final byte TS_TIME_LO_IDX = 4; - private static final byte TS_TIME_LO_LEN = 4; - private static final byte TS_TIME_MID_IDX = 2; - private static final byte TS_TIME_MID_LEN = 2; - private static final byte TS_TIME_HI_IDX = 0; - private static final byte TS_TIME_HI_LEN = 2; - // offset to move from 1/1/1970, which is 0-time for Java, to gregorian - // 0-time 10/15/1582, and multiplier to go from 100nsec to msec units - private static final long GREG_OFFSET = 0xB1D069B5400L; - private static final long MILLI_MULT = 10000L; - // type of UUID -- time based - private static final byte TYPE_TIME_BASED = 0x10; - // random number generator used to reduce conflicts with other JVMs, and - // hasher for strings. - private Random RANDOM; - // 4-byte IP address + 2 random bytes to compensate for the fact that - // the MAC address is usually 6 bytes - private byte[] IP; - // counter is initialized to 0 and is incremented for each uuid request - // within the same timestamp window. - private int _counter; - // current timestamp (used to detect multiple uuid requests within same - // timestamp) - private long _currentMillis; - // last used millis time, and a semi-random sequence that gets reset - // when it overflows - private long _lastMillis = 0L; - private static final int MAX_14BIT = 0x3FFF; - private short _seq = 0; - private boolean type1Initialized = false; /* - * Initializer for type 1 UUIDs. Creates random generator and genenerates - * the node portion of the UUID using the IP address. - */ - - private synchronized void initializeForType1() { - if (type1Initialized == true) { - return; - } - // note that secure random is very slow the first time - // it is used; consider switching to a standard random - RANDOM = CSPRNG_DO_NOT_USE.generate(); - _seq = (short) RANDOM.nextInt(MAX_14BIT); - - byte[] ip = null; - try { - ip = InetAddress.getLocalHost().getAddress(); - } catch (IOException ioe) { - throw new RuntimeException(ioe); - } - IP = new byte[6]; - RANDOM.nextBytes(IP); - // OPENJPA-2055: account for the fact that 'getAddress' - // may return an IPv6 address which is 16 bytes wide. - for (int i = 0; i < ip.length; ++i) { - IP[2 + (i % 4)] ^= ip[i]; - } - type1Initialized = true; - } - - /** - * Return a unique UUID value. - */ - public byte[] next(int type) { - if (type == TYPE4) { - return createType4(); - } - return createType1(); - } - - /* - * Creates a type 1 UUID - */ - public byte[] createType1() { - if (type1Initialized == false) { - initializeForType1(); - } - // set ip addr - byte[] uuid = new byte[16]; - System.arraycopy(IP, 0, uuid, 10, IP.length); - // Set time info. Have to do this processing within a synchronized - // block because of the statics... - long now = 0; - synchronized (UUIDGenerator.class) { - // Get the time to use for this uuid. This method has the side - // effect of modifying the clock sequence, as well. - now = getTime(); - // Insert the resulting clock sequence into the uuid - uuid[IDX_TIME_SEQ] = (byte) ((_seq & 0x3F00) >>> 8); - uuid[IDX_VARIATION] |= 0x80; - uuid[IDX_TIME_SEQ + 1] = (byte) (_seq & 0xFF); - } - // have to break up time because bytes are spread through uuid - byte[] timeBytes = Bytes.toBytes(now); - // Copy time low - System.arraycopy(timeBytes, TS_TIME_LO_IDX, uuid, IDX_TIME_LO, TS_TIME_LO_LEN); - // Copy time mid - System.arraycopy(timeBytes, TS_TIME_MID_IDX, uuid, IDX_TIME_MID, TS_TIME_MID_LEN); - // Copy time hi - System.arraycopy(timeBytes, TS_TIME_HI_IDX, uuid, IDX_TIME_HI, TS_TIME_HI_LEN); - // Set version (time-based) - uuid[IDX_TYPE] |= TYPE_TIME_BASED; // 0001 0000 - return uuid; - } - - /* - * Creates a type 4 UUID - */ - private byte[] createType4() { - UUID type4 = UUID.randomUUID(); - byte[] uuid = new byte[16]; - longToBytes(type4.getMostSignificantBits(), uuid, 0); - longToBytes(type4.getLeastSignificantBits(), uuid, 8); - return uuid; - } - - /* - * Converts a long to byte values, setting them in a byte array at a given starting position. - */ - private void longToBytes(long longVal, byte[] buf, int sPos) { - sPos += 7; - for (int i = 0; i < 8; i++) buf[sPos - i] = (byte) (longVal >>> (i * 8)); - } - - /** - * Return the next unique uuid value as a 16-character string. - */ - public String nextString(int type) { - byte[] bytes = next(type); - try { - return new String(bytes, "ISO-8859-1"); - } catch (Exception e) { - return new String(bytes); - } - } - - /** - * Return the next unique uuid value as a 32-character hex string. - */ - public String nextHex(int type) { - return Base16Encoder.encode(next(type)); - } - - /** - * Get the timestamp to be used for this uuid. Must be called from a synchronized block. - * - * @return long timestamp - */ - // package-visibility for testing - private long getTime() { - if (RANDOM == null) initializeForType1(); - long newTime = getUUIDTime(); - if (newTime <= _lastMillis) { - incrementSequence(); - newTime = getUUIDTime(); - } - _lastMillis = newTime; - return newTime; - } - - /** - * Gets the appropriately modified timestamep for the UUID. Must be called from a synchronized block. - * - * @return long timestamp in 100ns intervals since the Gregorian change offset - */ - private long getUUIDTime() { - if (_currentMillis != System.currentTimeMillis()) { - _currentMillis = System.currentTimeMillis(); - _counter = 0; // reset counter - } - // check to see if we have created too many uuid's for this timestamp - if (_counter + 1 >= MILLI_MULT) { - // Original algorithm threw exception. Seemed like overkill. - // Let's just increment the timestamp instead and start over... - _currentMillis++; - _counter = 0; - } - // calculate time as current millis plus offset times 100 ns ticks - long currentTime = (_currentMillis + GREG_OFFSET) * MILLI_MULT; - // return the uuid time plus the artificial tick counter incremented - return currentTime + _counter++; - } - - /** - * Increments the clock sequence for this uuid. Must be called from a synchronized block. - */ - private void incrementSequence() { - // increment, but if it's greater than its 14-bits, reset it - if (++_seq > MAX_14BIT) { - _seq = (short) RANDOM.nextInt(MAX_14BIT); // semi-random - } - } - - // Add Dependant classes internally - - /** - * This class came from the Apache Commons Id sandbox project in support of the UUIDGenerator implementation. - * - * <p> - * Static methods for managing byte arrays (all methods follow Big Endian order where most significant bits are in - * front). - * </p> - */ - public static final class Bytes { - - /** - * <p> - * Hide constructor in utility class. - * </p> - */ - private Bytes() {} - - /** - * Appends two bytes array into one. - * - * @param a A byte[]. - * @param b A byte[]. - * @return A byte[]. - */ - public static byte[] append(byte[] a, byte[] b) { - byte[] z = new byte[a.length + b.length]; - System.arraycopy(a, 0, z, 0, a.length); - System.arraycopy(b, 0, z, a.length, b.length); - return z; - } - - /** - * Returns a 8-byte array built from a long. - * - * @param n The number to convert. - * @return A byte[]. - */ - public static byte[] toBytes(long n) { - return toBytes(n, new byte[8]); - } - - /** - * Build a 8-byte array from a long. No check is performed on the array length. - * - * @param n The number to convert. - * @param b The array to fill. - * @return A byte[]. - */ - public static byte[] toBytes(long n, byte[] b) { - b[7] = (byte) (n); - n >>>= 8; - b[6] = (byte) (n); - n >>>= 8; - b[5] = (byte) (n); - n >>>= 8; - b[4] = (byte) (n); - n >>>= 8; - b[3] = (byte) (n); - n >>>= 8; - b[2] = (byte) (n); - n >>>= 8; - b[1] = (byte) (n); - n >>>= 8; - b[0] = (byte) (n); - - return b; - } - - /** - * Build a long from first 8 bytes of the array. - * - * @param b The byte[] to convert. - * @return A long. - */ - public static long toLong(byte[] b) { - return ((((long) b[7]) & 0xFF) + ((((long) b[6]) & 0xFF) << 8) - + ((((long) b[5]) & 0xFF) << 16) - + ((((long) b[4]) & 0xFF) << 24) - + ((((long) b[3]) & 0xFF) << 32) - + ((((long) b[2]) & 0xFF) << 40) - + ((((long) b[1]) & 0xFF) << 48) - + ((((long) b[0]) & 0xFF) << 56)); - } - - /** - * Compares two byte arrays for equality. - * - * @param a A byte[]. - * @param b A byte[]. - * @return True if the arrays have identical contents. - */ - public static boolean areEqual(byte[] a, byte[] b) { - int aLength = a.length; - if (aLength != b.length) { - return false; - } - for (int i = 0; i < aLength; i++) { - if (a[i] != b[i]) { - return false; - } - } - return true; - } - - /** - * <p> - * Compares two byte arrays as specified by <code>Comparable</code>. - * - * @param lhs - left hand value in the comparison operation. - * @param rhs - right hand value in the comparison operation. - * @return a negative integer, zero, or a positive integer as <code>lhs</code> is less than, equal to, or - * greater than <code>rhs</code>. - */ - public static int compareTo(byte[] lhs, byte[] rhs) { - if (lhs == rhs) { - return 0; - } - if (lhs == null) { - return -1; - } - if (rhs == null) { - return +1; - } - if (lhs.length != rhs.length) { - return ((lhs.length < rhs.length) ? -1 : +1); - } - for (int i = 0; i < lhs.length; i++) { - if (lhs[i] < rhs[i]) { - return -1; - } else if (lhs[i] > rhs[i]) { - return 1; - } - } - return 0; - } - - /** - * Build a short from first 2 bytes of the array. - * - * @param b The byte[] to convert. - * @return A short. - */ - public static short toShort(byte[] b) { - return (short) ((b[1] & 0xFF) + ((b[0] & 0xFF) << 8)); - } - } - - /** - * Base 16 encoder. - * - * @author Marc Prud'hommeaux - */ - public static final class Base16Encoder { - - private static final char[] HEX = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', - 'D', 'E', 'F' }; - - /** - * Convert bytes to a base16 string. - */ - public static String encode(byte[] byteArray) { - StringBuilder hexBuffer = new StringBuilder(byteArray.length * 2); - for (int i = 0; i < byteArray.length; i++) - for (int j = 1; j >= 0; j--) hexBuffer.append(HEX[(byteArray[i] >> (j * 4)) & 0xF]); - return hexBuffer.toString(); - } - - /** - * Convert a base16 string into a byte array. - */ - public static byte[] decode(String s) { - int len = s.length(); - byte[] r = new byte[len / 2]; - for (int i = 0; i < r.length; i++) { - int digit1 = s.charAt(i * 2), digit2 = s.charAt(i * 2 + 1); - if (digit1 >= '0' && digit1 <= '9') digit1 -= '0'; - else if (digit1 >= 'A' && digit1 <= 'F') digit1 -= 'A' - 10; - if (digit2 >= '0' && digit2 <= '9') digit2 -= '0'; - else if (digit2 >= 'A' && digit2 <= 'F') digit2 -= 'A' - 10; - - r[i] = (byte) ((digit1 << 4) + digit2); - } - return r; - } - } -} - -// ========================================= APACHE BLOCK ========================================= diff --git a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalConnection.java b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalConnection.java deleted file mode 100644 index fce4ad7c55..0000000000 --- a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalConnection.java +++ /dev/null @@ -1,8 +0,0 @@ -package gtPlusPlus.api.thermal.energy; - -import net.minecraftforge.common.util.ForgeDirection; - -public interface IThermalConnection { - - boolean canConnectThermalEnergy(ForgeDirection arg0); -} diff --git a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalContainerItem.java b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalContainerItem.java deleted file mode 100644 index 14f566c1a7..0000000000 --- a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalContainerItem.java +++ /dev/null @@ -1,14 +0,0 @@ -package gtPlusPlus.api.thermal.energy; - -import net.minecraft.item.ItemStack; - -public interface IThermalContainerItem { - - int receiveThermalEnergy(ItemStack arg0, int arg1, boolean arg2); - - int extractThermalEnergy(ItemStack arg0, int arg1, boolean arg2); - - int getThermalEnergyStored(ItemStack arg0); - - int getMaxThermalEnergyStored(ItemStack arg0); -} diff --git a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java deleted file mode 100644 index e50ae45003..0000000000 --- a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java +++ /dev/null @@ -1,18 +0,0 @@ -package gtPlusPlus.api.thermal.energy; - -import net.minecraftforge.common.util.ForgeDirection; - -public interface IThermalHandler extends IThermalProvider, IThermalReceiver { - - @Override - int receiveThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2); - - @Override - int extractThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2); - - @Override - int getThermalEnergyStored(ForgeDirection arg0); - - @Override - int getMaxThermalEnergyStored(ForgeDirection arg0); -} diff --git a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalProvider.java b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalProvider.java deleted file mode 100644 index a13a041176..0000000000 --- a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalProvider.java +++ /dev/null @@ -1,12 +0,0 @@ -package gtPlusPlus.api.thermal.energy; - -import net.minecraftforge.common.util.ForgeDirection; - -public interface IThermalProvider extends IThermalConnection { - - int extractThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2); - - int getThermalEnergyStored(ForgeDirection arg0); - - int getMaxThermalEnergyStored(ForgeDirection arg0); -} diff --git a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalReceiver.java b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalReceiver.java deleted file mode 100644 index 85be402658..0000000000 --- a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalReceiver.java +++ /dev/null @@ -1,12 +0,0 @@ -package gtPlusPlus.api.thermal.energy; - -import net.minecraftforge.common.util.ForgeDirection; - -public interface IThermalReceiver extends IThermalConnection { - - int receiveThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2); - - int getThermalEnergyStored(ForgeDirection arg0); - - int getMaxThermalEnergyStored(ForgeDirection arg0); -} diff --git a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalStorage.java b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalStorage.java deleted file mode 100644 index 43d76b73ec..0000000000 --- a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalStorage.java +++ /dev/null @@ -1,12 +0,0 @@ -package gtPlusPlus.api.thermal.energy; - -public interface IThermalStorage { - - int receiveThermalEnergy(int arg0, boolean arg1); - - int extractThermalEnergy(int arg0, boolean arg1); - - int getThermalEnergyStored(); - - int getMaxThermalEnergyStored(); -} diff --git a/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java b/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java deleted file mode 100644 index a2c29ba76a..0000000000 --- a/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java +++ /dev/null @@ -1,117 +0,0 @@ -package gtPlusPlus.api.thermal.energy; - -import net.minecraft.nbt.NBTTagCompound; - -public class ThermalStorage implements IThermalStorage { - - protected int thermal_energy; - protected int capacity; - protected int maxReceive; - protected int maxExtract; - - public ThermalStorage(int arg0) { - this(arg0, arg0, arg0); - } - - public ThermalStorage(int arg0, int arg1) { - this(arg0, arg1, arg1); - } - - public ThermalStorage(int arg0, int arg1, int arg2) { - this.capacity = arg0; - this.maxReceive = arg1; - this.maxExtract = arg2; - } - - public ThermalStorage readFromNBT(NBTTagCompound arg0) { - this.thermal_energy = arg0.getInteger("ThermalEnergy"); - if (this.thermal_energy > this.capacity) { - this.thermal_energy = this.capacity; - } - return this; - } - - public NBTTagCompound writeToNBT(NBTTagCompound arg0) { - if (this.thermal_energy < 0) { - this.thermal_energy = 0; - } - arg0.setInteger("ThermalEnergy", this.thermal_energy); - return arg0; - } - - public void setCapacity(int arg0) { - this.capacity = arg0; - if (this.thermal_energy > arg0) { - this.thermal_energy = arg0; - } - } - - public void setMaxTransfer(int arg0) { - this.setMaxReceive(arg0); - this.setMaxExtract(arg0); - } - - public void setMaxReceive(int arg0) { - this.maxReceive = arg0; - } - - public void setMaxExtract(int arg0) { - this.maxExtract = arg0; - } - - public int getMaxReceive() { - return this.maxReceive; - } - - public int getMaxExtract() { - return this.maxExtract; - } - - public void setEnergyStored(int arg0) { - this.thermal_energy = arg0; - if (this.thermal_energy > this.capacity) { - this.thermal_energy = this.capacity; - } else if (this.thermal_energy < 0) { - this.thermal_energy = 0; - } - } - - public void modifyEnergyStored(int arg0) { - this.thermal_energy += arg0; - if (this.thermal_energy > this.capacity) { - this.thermal_energy = this.capacity; - } else if (this.thermal_energy < 0) { - this.thermal_energy = 0; - } - } - - @Override - public int receiveThermalEnergy(int arg0, boolean arg1) { - int arg2 = Math.min(this.capacity - this.thermal_energy, Math.min(this.maxReceive, arg0)); - if (!arg1) { - this.thermal_energy += arg2; - } - - return arg2; - } - - @Override - public int extractThermalEnergy(int arg0, boolean arg1) { - int arg2 = Math.min(this.thermal_energy, Math.min(this.maxExtract, arg0)); - if (!arg1) { - this.thermal_energy -= arg2; - } - - return arg2; - } - - @Override - public int getThermalEnergyStored() { - return this.thermal_energy; - } - - @Override - public int getMaxThermalEnergyStored() { - return this.capacity; - } -} diff --git a/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorageAdv.java b/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorageAdv.java deleted file mode 100644 index 54fa147efe..0000000000 --- a/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorageAdv.java +++ /dev/null @@ -1,34 +0,0 @@ -package gtPlusPlus.api.thermal.energy; - -public class ThermalStorageAdv extends ThermalStorage { - - public ThermalStorageAdv(int arg0) { - this(arg0, arg0, arg0); - } - - public ThermalStorageAdv(int arg0, int arg1) { - this(arg0, arg1, arg1); - } - - public ThermalStorageAdv(int arg0, int arg1, int arg2) { - super(arg0, arg1, arg2); - } - - public int receiveEnergyNoLimit(int arg0, boolean arg1) { - int arg2 = Math.min(super.capacity - super.thermal_energy, arg0); - if (!arg1) { - super.thermal_energy += arg2; - } - - return arg2; - } - - public int extractEnergyNoLimit(int arg0, boolean arg1) { - int arg2 = Math.min(super.thermal_energy, arg0); - if (!arg1) { - super.thermal_energy -= arg2; - } - - return arg2; - } -} diff --git a/src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java b/src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java deleted file mode 100644 index ff0cf06188..0000000000 --- a/src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java +++ /dev/null @@ -1,89 +0,0 @@ -package gtPlusPlus.api.thermal.sample; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import gtPlusPlus.api.thermal.energy.IThermalContainerItem; - -public class ItemThermalContainer extends Item implements IThermalContainerItem { - - protected int capacity; - protected int maxReceive; - protected int maxExtract; - - public ItemThermalContainer() {} - - public ItemThermalContainer(int arg0) { - this(arg0, arg0, arg0); - } - - public ItemThermalContainer(int arg0, int arg1) { - this(arg0, arg1, arg1); - } - - public ItemThermalContainer(int arg0, int arg1, int arg2) { - this.capacity = arg0; - this.maxReceive = arg1; - this.maxExtract = arg2; - } - - public ItemThermalContainer setCapacity(int arg0) { - this.capacity = arg0; - return this; - } - - public void setMaxTransfer(int arg0) { - this.setMaxReceive(arg0); - this.setMaxExtract(arg0); - } - - public void setMaxReceive(int arg0) { - this.maxReceive = arg0; - } - - public void setMaxExtract(int arg0) { - this.maxExtract = arg0; - } - - @Override - public int receiveThermalEnergy(ItemStack arg0, int arg1, boolean arg2) { - if (arg0.getTagCompound() == null) { - arg0.stackTagCompound = new NBTTagCompound(); - } - int arg3 = arg0.stackTagCompound.getInteger("ThermalEnergy"); - int arg4 = Math.min(this.capacity - arg3, Math.min(this.maxReceive, arg1)); - if (!arg2) { - arg3 += arg4; - arg0.stackTagCompound.setInteger("ThermalEnergy", arg3); - } - return arg4; - } - - @Override - public int extractThermalEnergy(ItemStack arg0, int arg1, boolean arg2) { - if (arg0.stackTagCompound != null && arg0.stackTagCompound.hasKey("ThermalEnergy")) { - int arg3 = arg0.stackTagCompound.getInteger("ThermalEnergy"); - int arg4 = Math.min(arg3, Math.min(this.maxExtract, arg1)); - if (!arg2) { - arg3 -= arg4; - arg0.stackTagCompound.setInteger("ThermalEnergy", arg3); - } - return arg4; - } else { - return 0; - } - } - - @Override - public int getThermalEnergyStored(ItemStack arg0) { - return arg0.stackTagCompound != null && arg0.stackTagCompound.hasKey("ThermalEnergy") - ? arg0.stackTagCompound.getInteger("ThermalEnergy") - : 0; - } - - @Override - public int getMaxThermalEnergyStored(ItemStack arg0) { - return this.capacity; - } -} diff --git a/src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java b/src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java deleted file mode 100644 index a41b6428cb..0000000000 --- a/src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java +++ /dev/null @@ -1,50 +0,0 @@ -package gtPlusPlus.api.thermal.sample; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - -import gtPlusPlus.api.thermal.energy.IThermalHandler; -import gtPlusPlus.api.thermal.energy.ThermalStorage; - -public class TileThermalHandler extends TileEntity implements IThermalHandler { - - protected ThermalStorage storage = new ThermalStorage(32000); - - @Override - public void readFromNBT(NBTTagCompound arg0) { - super.readFromNBT(arg0); - this.storage.readFromNBT(arg0); - } - - @Override - public void writeToNBT(NBTTagCompound arg0) { - super.writeToNBT(arg0); - this.storage.writeToNBT(arg0); - } - - @Override - public boolean canConnectThermalEnergy(ForgeDirection arg0) { - return true; - } - - @Override - public int receiveThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2) { - return this.storage.receiveThermalEnergy(arg1, arg2); - } - - @Override - public int extractThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2) { - return this.storage.extractThermalEnergy(arg1, arg2); - } - - @Override - public int getThermalEnergyStored(ForgeDirection arg0) { - return this.storage.getThermalEnergyStored(); - } - - @Override - public int getMaxThermalEnergyStored(ForgeDirection arg0) { - return this.storage.getMaxThermalEnergyStored(); - } -} diff --git a/src/main/java/gtPlusPlus/api/thermal/tileentity/IThermalInfo.java b/src/main/java/gtPlusPlus/api/thermal/tileentity/IThermalInfo.java deleted file mode 100644 index 2172ff385b..0000000000 --- a/src/main/java/gtPlusPlus/api/thermal/tileentity/IThermalInfo.java +++ /dev/null @@ -1,12 +0,0 @@ -package gtPlusPlus.api.thermal.tileentity; - -public interface IThermalInfo { - - int getInfoEnergyPerTick(); - - int getInfoMaxEnergyPerTick(); - - int getInfoEnergyStored(); - - int getInfoMaxEnergyStored(); -} diff --git a/src/main/java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java index d5dd4958da..9957ae3f92 100644 --- a/src/main/java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/main/java/gtPlusPlus/core/block/ModBlocks.java @@ -107,8 +107,6 @@ public final class ModBlocks { public static void init() { Logger.INFO("Initializing Blocks."); - // blockGriefSaver = new - // TowerDevice().setBlockName("blockGriefSaver").setCreativeTab(AddToCreativeTab.tabBlock).setBlockTextureName("blockDefault"); registerBlocks(); } @@ -126,8 +124,6 @@ public final class ModBlocks { blockFirePit = new FirePit(); blockFishTrap = new FishTrap(); blockInfiniteFLuidTank = new FluidTankInfinite(); - // blockOreFluorite = new BlockBaseOre.oldOreBlock("oreFluorite", "Fluorite", Material.rock, BlockTypes.ORE, - // Utils.rgbtoHexValue(120, 120, 30), 3); blockMiningExplosive = new MiningExplosives(); blockHellfire = new HellFire(); blockProjectTable = new Machine_ProjectTable(); diff --git a/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java b/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java deleted file mode 100644 index 932fe7b48d..0000000000 --- a/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java +++ /dev/null @@ -1,41 +0,0 @@ -package gtPlusPlus.core.block.base; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -public class AdvancedBlock extends Block { - - protected AdvancedBlock(final String unlocalizedName, final Material material, final CreativeTabs x, - final float blockHardness, final float blockResistance, final float blockLightLevel, - final String blockHarvestTool, final int blockHarvestLevel, final SoundType BlockSound) { - super(material); - this.setBlockName(unlocalizedName); - this.setBlockTextureName(GTPlusPlus.ID + ":" + unlocalizedName); - this.setCreativeTab(x); - this.setHardness(blockHardness); // block Hardness - this.setResistance(blockResistance); - this.setLightLevel(blockLightLevel); - this.setHarvestLevel(blockHarvestTool, blockHarvestLevel); - this.setStepSound(BlockSound); - } - - @Override - public boolean onBlockActivated(final World p_149727_1_, final int p_149727_2_, final int p_149727_3_, - final int p_149727_4_, final EntityPlayer p_149727_5_, final int p_149727_6_, final float p_149727_7_, - final float p_149727_8_, final float p_149727_9_) { - return false; - } - - @Override - public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, - final int z) { - return false; - } -} diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java index c7d8866ec5..208838859b 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -130,78 +130,4 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { @Override public void registerBlockIcons(IIconRegister p_149651_1_) {} - public static class oldOreBlock extends BlockBaseModular implements ITexturedBlock { - - public oldOreBlock(final String unlocalizedName, final String blockMaterial, final BlockTypes blockType, - final int colour) { - this(unlocalizedName, blockMaterial, net.minecraft.block.material.Material.iron, blockType, colour, 2); - } - - public oldOreBlock(final String unlocalizedName, final String blockMaterial, - final net.minecraft.block.material.Material vanillaMaterial, final BlockTypes blockType, - final int colour, final int miningLevel) { - super(unlocalizedName, blockMaterial, vanillaMaterial, blockType, colour, miningLevel); - } - - @Override - public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, - final int z) { - return false; - } - - @Override - public int getRenderType() { - if (CustomOreBlockRenderer.INSTANCE != null) { - return CustomOreBlockRenderer.INSTANCE.mRenderID; - } - return super.getRenderType(); - } - - @Override - public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int ordinalSide) { - return Blocks.stone.getIcon(0, 0); - } - - @Override - public IIcon getIcon(int ordinalSide, int aMeta) { - return Blocks.stone.getIcon(0, 0); - } - - /** - * GT Texture Handler - */ - - // .08 compat - IIconContainer[] hiddenTextureArray; - - @Override - public ITexture[] getTexture(ForgeDirection side) { - return getTexture(null, side); - } - - @Override - public ITexture[] getTexture(Block block, ForgeDirection side) { - if (this.blockMaterial != null) { - GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture( - blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], - this.blockMaterial.getRGBA()); - return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet }; - } - - if (hiddenTextureArray == null) { - try { - Field o = ReflectionUtils.getField(Textures.BlockIcons.class, "STONES"); - if (o != null) { - hiddenTextureArray = (IIconContainer[]) o.get(Textures.BlockIcons.class); - } - if (hiddenTextureArray == null) { - hiddenTextureArray = new IIconContainer[6]; - } - } catch (IllegalArgumentException | IllegalAccessException e) { - hiddenTextureArray = new IIconContainer[6]; - } - } - return new ITexture[] { new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) }; - } - } } diff --git a/src/main/java/gtPlusPlus/core/block/base/MetaBlock.java b/src/main/java/gtPlusPlus/core/block/base/MetaBlock.java deleted file mode 100644 index 5995fb7d49..0000000000 --- a/src/main/java/gtPlusPlus/core/block/base/MetaBlock.java +++ /dev/null @@ -1,35 +0,0 @@ -package gtPlusPlus.core.block.base; - -import java.util.List; - -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.IBlockAccess; - -public class MetaBlock extends MultiTextureBlock { - - protected MetaBlock(final String unlocalizedName, final Material material, final SoundType soundType) { - super(unlocalizedName, material, soundType); - } - - @Override - public int damageDropped(final int meta) { - return meta; - } - - @Override - public void getSubBlocks(final Item item, final CreativeTabs tab, final List list) { - for (int i = 0; i < 6; i++) { - list.add(new ItemStack(item, 1, i)); - } - } - - @Override - public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, - final int z) { - return false; - } -} diff --git a/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java b/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java deleted file mode 100644 index bb6aee18d5..0000000000 --- a/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java +++ /dev/null @@ -1,37 +0,0 @@ -package gtPlusPlus.core.block.base; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; - -import gtPlusPlus.core.creative.AddToCreativeTab; - -public class MultiTextureBlock extends Block { - - public IIcon[] icons = new IIcon[6]; - - protected MultiTextureBlock(final String unlocalizedName, final Material material, final SoundType blockSound) { - super(material); - this.setBlockName(unlocalizedName); - this.setBlockTextureName(GTPlusPlus.ID + ":" + unlocalizedName); - this.setCreativeTab(AddToCreativeTab.tabBlock); - this.setHardness(2.0F); - this.setResistance(6.0F); - this.setStepSound(blockSound); - } - - @Override - public void registerBlockIcons(final IIconRegister reg) { - for (int i = 0; i < 6; i++) { - this.icons[i] = reg.registerIcon(this.textureName + "_" + i); - } - } - - @Override - public IIcon getIcon(final int side, final int meta) { - return this.icons[side]; - } -} diff --git a/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java deleted file mode 100644 index 58fbced6c3..0000000000 --- a/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java +++ /dev/null @@ -1,260 +0,0 @@ -package gtPlusPlus.core.block.general.antigrief; - -import static gregtech.api.enums.Mods.GTPlusPlus; -import static gtPlusPlus.core.block.ModBlocks.blockGriefSaver; - -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.tileentities.general.TileEntityReverter; - -public class TowerDevice extends Block { - - private static IIcon TEX_ANTIBUILDER; - public static final int META_ANTIBUILDER = 9; - private boolean bUnbreakable; - - public TowerDevice() { - super(Material.wood); - this.setHardness(10.0F); - this.setResistance(35.0F); - this.setStepSound(Block.soundTypeWood); - this.setCreativeTab(AddToCreativeTab.tabMachines); - } - - public int tickRate() { - return 15; - } - - public void saveNBTData(final NBTTagCompound aNBT) { - aNBT.setBoolean("bUnbreakable", this.bUnbreakable); - } - - public void loadNBTData(final NBTTagCompound aNBT) { - this.bUnbreakable = aNBT.getBoolean("bUnbreakable"); - } - - @Override - public IIcon getIcon(final int side, final int meta) { - return TEX_ANTIBUILDER; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(final IIconRegister par1IconRegister) { - TEX_ANTIBUILDER = par1IconRegister.registerIcon(GTPlusPlus.ID + ":" + "blockAntiGrief"); - } - - @Override - public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) { - par3List.add(new ItemStack(par1, 1, 9)); - } - - @Override - public boolean onBlockActivated(final World par1World, final int x, final int y, final int z, - final EntityPlayer par5EntityPlayer, final int par6, final float par7, final float par8, final float par9) { - final int meta = par1World.getBlockMetadata(x, y, z); - return false; - } - - @Override - public float getExplosionResistance(final Entity par1Entity, final World world, final int x, final int y, - final int z, final double explosionX, final double explosionY, final double explosionZ) { - final int meta = world.getBlockMetadata(x, y, z); - return super.getExplosionResistance(par1Entity, world, x, y, z, explosionX, explosionY, explosionZ); - } - - @Override - public float getBlockHardness(final World world, final int x, final int y, final int z) { - final int meta = world.getBlockMetadata(x, y, z); - return super.getBlockHardness(world, x, y, z); - } - - public static boolean areNearbyLockBlocks(final World world, final int x, final int y, final int z) { - boolean locked = false; - for (int dx = x - 2; dx <= (x + 2); dx++) { - for (int dy = y - 2; dy <= (y + 2); dy++) { - for (int dz = z - 2; dz <= (z + 2); dz++) { - if ((world.getBlock(dx, dy, dz) == blockGriefSaver) && (world.getBlockMetadata(dx, dy, dz) == 4)) { - locked = true; - } - } - } - } - return locked; - } - - public static void unlockBlock(final World par1World, final int x, final int y, final int z) { - final Block thereBlockID = par1World.getBlock(x, y, z); - final int thereBlockMeta = par1World.getBlockMetadata(x, y, z); - if ((thereBlockID == blockGriefSaver) || (thereBlockMeta == 4)) { - changeToBlockMeta(par1World, x, y, z, 5); - par1World.playSoundEffect(x + 0.5D, y + 0.5D, z + 0.5D, "random.click", 0.3F, 0.6F); - } - } - - private static void changeToBlockMeta(final World par1World, final int x, final int y, final int z, - final int meta) { - final Block thereBlockID = par1World.getBlock(x, y, z); - if ((thereBlockID == blockGriefSaver)) { - par1World.setBlock(x, y, z, thereBlockID, meta, 3); - par1World.markBlockRangeForRenderUpdate(x, y, z, x, y, z); - par1World.notifyBlocksOfNeighborChange(x, y, z, thereBlockID); - } - } - - @Override - public void onBlockAdded(final World par1World, final int x, final int y, final int z) { - final int meta = par1World.getBlockMetadata(x, y, z); - if (!par1World.isRemote) {} - } - - @Override - public void onNeighborBlockChange(final World par1World, final int x, final int y, final int z, - final Block myBlockID) { - final int meta = par1World.getBlockMetadata(x, y, z); - if (!par1World.isRemote) {} - } - - @Override - public void updateTick(final World par1World, final int x, final int y, final int z, final Random par5Random) { - if (!par1World.isRemote) { - final int meta = par1World.getBlockMetadata(x, y, z); - } - } - - private void letsBuild(final World par1World, final int x, final int y, final int z) {} - - private boolean isInactiveTrapCharged(final World par1World, final int x, final int y, final int z) { - return false; - } - - private boolean isReactorReady(final World world, final int x, final int y, final int z) { - if ((world.getBlock(x, y + 1, z) != Blocks.redstone_block) - || (world.getBlock(x, y - 1, z) != Blocks.redstone_block) - || (world.getBlock(x + 1, y, z) != Blocks.redstone_block) - || (world.getBlock(x - 1, y, z) != Blocks.redstone_block) - || (world.getBlock(x, y, z + 1) != Blocks.redstone_block) - || (world.getBlock(x, y, z - 1) != Blocks.redstone_block)) { - return false; - } - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(final World par1World, final int x, final int y, final int z, - final Random par5Random) { - final int meta = par1World.getBlockMetadata(x, y, z); - if ((meta == 3) || (meta == 1) || (meta == 9)) { - for (int i = 0; i < 1; i++) { - this.sparkle(par1World, x, y, z, par5Random); - } - } - } - - public void sparkle(final World world, final int x, final int y, final int z, final Random rand) { - final double offset = 0.0625D; - for (int ordinalSide = 0; ordinalSide < 6; ordinalSide++) { - double rx = x + rand.nextFloat(); - double ry = y + rand.nextFloat(); - double rz = z + rand.nextFloat(); - if ((ordinalSide == 0) && (!world.getBlock(x, y + 1, z).isOpaqueCube())) { - ry = y + 1 + offset; - } - if ((ordinalSide == 1) && (!world.getBlock(x, y - 1, z).isOpaqueCube())) { - ry = (y + 0) - offset; - } - if ((ordinalSide == 2) && (!world.getBlock(x, y, z + 1).isOpaqueCube())) { - rz = z + 1 + offset; - } - if ((ordinalSide == 3) && (!world.getBlock(x, y, z - 1).isOpaqueCube())) { - rz = (z + 0) - offset; - } - if ((ordinalSide == 4) && (!world.getBlock(x + 1, y, z).isOpaqueCube())) { - rx = x + 1 + offset; - } - if ((ordinalSide == 5) && (!world.getBlock(x - 1, y, z).isOpaqueCube())) { - rx = (x + 0) - offset; - } - if ((rx < x) || (rx > (x + 1)) || (ry < 0.0D) || (ry > (y + 1)) || (rz < z) || (rz > (z + 1))) { - world.spawnParticle("reddust", rx, ry, rz, 0.0D, 0.0D, 0.0D); - } - } - } - - public static void checkAndActivateVanishBlock(final World world, final int x, final int y, final int z) { - final Block thereID = world.getBlock(x, y, z); - final int thereMeta = world.getBlockMetadata(x, y, z); - } - - public static void changeToActiveVanishBlock(final World par1World, final int x, final int y, final int z, - final int meta) { - changeToBlockMeta(par1World, x, y, z, meta); - par1World.playSoundEffect(x + 0.5D, y + 0.5D, z + 0.5D, "random.pop", 0.3F, 0.6F); - - final Block thereBlockID = par1World.getBlock(x, y, z); - par1World.scheduleBlockUpdate(x, y, z, thereBlockID, getTickRateFor(thereBlockID, meta, par1World.rand)); - } - - private static int getTickRateFor(final Block thereBlockID, final int meta, final Random rand) { - return 15; - } - - @Override - public int getLightValue(final IBlockAccess world, final int x, final int y, final int z) { - final Block blockID = world.getBlock(x, y, z); - final int meta = world.getBlockMetadata(x, y, z); - if (blockID != this) { - return 0; - } - return 10; - } - - @Override - public boolean hasTileEntity(final int metadata) { - return (metadata == 0); - } - - @Override - public TileEntity createTileEntity(final World world, final int metadata) { - if (metadata == 0) { - Logger.INFO("I have been created. [Antigriefer]" + this.getLocalizedName()); - return new TileEntityReverter(); - } - return null; - } - - @Override - public Item getItemDropped(final int meta, final Random par2Random, final int par3) { - switch (meta) { - case 0: - return null; - } - return Item.getItemFromBlock(this); - } - - @Override - public int damageDropped(final int meta) { - return meta; - } -} diff --git a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java deleted file mode 100644 index fd5b996160..0000000000 --- a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java +++ /dev/null @@ -1,4 +0,0 @@ -package gtPlusPlus.core.block.general.redstone; - -public class BlockGenericRedstoneEmitter { -} diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java b/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java deleted file mode 100644 index fa28ef38f9..0000000000 --- a/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java +++ /dev/null @@ -1,41 +0,0 @@ -package gtPlusPlus.core.block.machine; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.block.material.Material; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.world.IBlockAccess; - -import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; -import gtPlusPlus.core.block.base.MetaBlock; - -public class BlockGtFrameBox extends MetaBlock { - - private int[] colours; - private int totalColours; - - public BlockGtFrameBox(final String unlocalizedName, final Material material, final BlockTypes blockTypeENUM, - final boolean recolour, final int... colour) { - super(unlocalizedName, material, blockTypeENUM.getBlockSoundType()); - this.setBlockTextureName(GTPlusPlus.ID + ":" + "blockGtFrame"); - this.setHarvestLevel(blockTypeENUM.getHarvestTool(), 2); - if (recolour && ((colour != null) && (colour.length > 0))) { - this.colours = colour; - this.totalColours = this.colours.length; - } - } - - @Override - public int colorMultiplier(final IBlockAccess p_149720_1_, final int p_149720_2_, final int p_149720_3_, - final int p_149720_4_) { - for (final int i : this.colours) {} - - return super.colorMultiplier(p_149720_1_, p_149720_2_, p_149720_3_, p_149720_4_); - } - - @Override - public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, - final int z) { - return false; - } -} diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_WireiusDeletus.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_WireiusDeletus.java deleted file mode 100644 index 688dfbb742..0000000000 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_WireiusDeletus.java +++ /dev/null @@ -1,4 +0,0 @@ -package gtPlusPlus.core.block.machine; - -public class Machine_WireiusDeletus { // A Block that removes GT Cable and Wire from it's inventory. -} diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java b/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java deleted file mode 100644 index 49a0878678..0000000000 --- a/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java +++ /dev/null @@ -1,68 +0,0 @@ -package gtPlusPlus.core.client.model; - -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.client.model.tabula.ModelTabulaBase; -import gtPlusPlus.core.client.renderer.tabula.RenderTabulaBase; -import gtPlusPlus.core.tileentities.general.TileEntityEggBox; - -/** - * ModelEggBox - Alkalus Created using Tabula 4.1.1 - */ -public class ModelEggBox extends ModelTabulaBase { - - private final AutoMap<Pair<ModelRenderer, Float>> mParts = new AutoMap<Pair<ModelRenderer, Float>>(); - - private static RenderTabulaBase mRendererInstance; - - public ModelRenderer bottom; - // EggBox_full.png - - public ModelEggBox() { - super(64, 64); - this.textureWidth = 64; - this.textureHeight = 64; - - this.bottom = new ModelRenderer(this, 0, 19); - this.bottom.setRotationPoint(1.0F, 6.0F, 1.0F); - this.bottom.addBox(0.0F, 0.0F, 0.0F, 14, 10, 14, 0.0F); - mParts.add(new Pair<ModelRenderer, Float>(bottom, 0f)); - } - - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - // Logger.INFO("Rendering EggBox"); - this.bottom.render(f5); - } - - /** - * This is a helper function from Tabula to set the rotation of model parts - */ - @Override - public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } - - @Override - protected AutoMap<Pair<ModelRenderer, Float>> getModelParts() { - AutoMap<Pair<ModelRenderer, Float>> aParts = new AutoMap<Pair<ModelRenderer, Float>>(); - aParts.add(new Pair<ModelRenderer, Float>(bottom, 0.0625F)); - return aParts; - // return mParts; - } - - public static RenderTabulaBase getRenderer() { - if (mRendererInstance == null) { - mRendererInstance = new RenderTabulaBase( - new ModelEggBox(), - "textures/blocks/TileEntities/EggBox_full.png", - TileEntityEggBox.class); - } - return mRendererInstance; - } -} diff --git a/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java b/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java deleted file mode 100644 index 3c13c83391..0000000000 --- a/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java +++ /dev/null @@ -1,36 +0,0 @@ -package gtPlusPlus.core.client.model.tabula; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; - -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.data.Pair; - -/** - * ModelEggBox - Alkalus Created using Tabula 4.1.1 - */ -public abstract class ModelTabulaBase extends ModelBase { - - public ModelTabulaBase(int aTexWidth, int aTexHeight) { - this.textureWidth = aTexWidth; - this.textureHeight = aTexHeight; - } - - protected abstract AutoMap<Pair<ModelRenderer, Float>> getModelParts(); - - public void renderAll() { - for (Pair<ModelRenderer, Float> part : getModelParts()) { - // Logger.INFO("Rendering EggBox"); - part.getKey().render(part.getValue()); - } - } - - /** - * This is a helper function from Tabula to set the rotation of model parts - */ - public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } -} diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java deleted file mode 100644 index 0f962df641..0000000000 --- a/src/main/java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java +++ /dev/null @@ -1,98 +0,0 @@ -package gtPlusPlus.core.client.renderer; - -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.Entity; -import net.minecraft.entity.projectile.EntityPotion; -import net.minecraft.item.Item; -import net.minecraft.item.ItemPotion; -import net.minecraft.potion.PotionHelper; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class RenderPotionthrow extends Render { - - private Item mRenderItem; - private int mDamage; - - public RenderPotionthrow(Item p_i1259_1_, int p_i1259_2_) { - this.mRenderItem = p_i1259_1_; - this.mDamage = p_i1259_2_; - } - - public RenderPotionthrow(Item p_i1260_1_) { - this(p_i1260_1_, 0); - } - - /** - * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then - * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic - * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1, - * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that. - */ - @Override - public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, - float p_76986_9_) { - IIcon iicon = this.mRenderItem.getIconFromDamage(this.mDamage); - - if (iicon != null) { - GL11.glPushMatrix(); - GL11.glTranslatef((float) p_76986_2_, (float) p_76986_4_, (float) p_76986_6_); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glScalef(0.5F, 0.5F, 0.5F); - this.bindEntityTexture(p_76986_1_); - Tessellator tessellator = Tessellator.instance; - - if (iicon == ItemPotion.func_94589_d("bottle_splash")) { - int i = PotionHelper.func_77915_a(((EntityPotion) p_76986_1_).getPotionDamage(), false); - float f2 = (i >> 16 & 255) / 255.0F; - float f3 = (i >> 8 & 255) / 255.0F; - float f4 = (i & 255) / 255.0F; - GL11.glColor3f(f2, f3, f4); - GL11.glPushMatrix(); - this.func_77026_a(tessellator, ItemPotion.func_94589_d("overlay")); - GL11.glPopMatrix(); - GL11.glColor3f(1.0F, 1.0F, 1.0F); - } - - this.func_77026_a(tessellator, iicon); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); - } - } - - /** - * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture. - */ - @Override - protected ResourceLocation getEntityTexture(Entity p_110775_1_) { - return TextureMap.locationItemsTexture; - } - - private void func_77026_a(Tessellator p_77026_1_, IIcon p_77026_2_) { - float f = p_77026_2_.getMinU(); - float f1 = p_77026_2_.getMaxU(); - float f2 = p_77026_2_.getMinV(); - float f3 = p_77026_2_.getMaxV(); - float f4 = 1.0F; - float f5 = 0.5F; - float f6 = 0.25F; - GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); - p_77026_1_.startDrawingQuads(); - p_77026_1_.setNormal(0.0F, 1.0F, 0.0F); - p_77026_1_.addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); - p_77026_1_.addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); - p_77026_1_.addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); - p_77026_1_.addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); - p_77026_1_.draw(); - } -} diff --git a/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java b/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java deleted file mode 100644 index ed3808e815..0000000000 --- a/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java +++ /dev/null @@ -1,50 +0,0 @@ -package gtPlusPlus.core.client.renderer.tabula; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; - -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.client.model.tabula.ModelTabulaBase; - -@SideOnly(Side.CLIENT) -public class RenderTabulaBase extends TileEntitySpecialRenderer { - - private final ModelTabulaBase mModel; - private final ResourceLocation mTexture; - private final Class mTileClass; - - public final int mRenderID; - public final RenderTabulaBase mInstance; - - public RenderTabulaBase(ModelTabulaBase aModel, String aTexturePath, Class aTileClass) { - mModel = aModel; - mTexture = new ResourceLocation(GTPlusPlus.ID, aTexturePath); - mTileClass = aTileClass; - this.mRenderID = RenderingRegistry.getNextAvailableRenderId(); - mInstance = this; - } - - public void renderTileEntityAt(Object aTile, double p_147500_2_, double p_147500_4_, double p_147500_6_, - float p_147500_8_) { - if (mTileClass.isInstance(aTile)) { - // Logger.INFO("Rendering EggBox"); - this.bindTexture(mTexture); - mModel.renderAll(); - } - } - - @Override - public void renderTileEntityAt(TileEntity aTile, double p_147500_2_, double p_147500_4_, double p_147500_6_, - float p_147500_8_) { - if (mTileClass != null && aTile != null) { - if (mTileClass.isInstance(aTile)) { - this.renderTileEntityAt((Object) aTile, p_147500_2_, p_147500_4_, p_147500_6_, p_147500_8_); - } - } - } -} diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java index d97cb80ba6..b5652af595 100644 --- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java @@ -47,7 +47,6 @@ import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.tileentities.ModTileEntities; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.debug.DEBUG_INIT; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.player.PlayerCache; @@ -104,11 +103,6 @@ public class CommonProxy { } public void init(final FMLInitializationEvent e) { - // Debug Loading - if (CORE_Preloader.DEBUG_MODE) { - DEBUG_INIT.registerHandlers(); - } - registerCustomItemsForMaterials(); ModBlocks.blockCustomMobSpawner = new BlockGenericSpawner(); CI.init(); diff --git a/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java index a960ec618a..1a01f47ef5 100644 --- a/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java +++ b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java @@ -16,13 +16,6 @@ public class AddToCreativeTab { public static void initialiseTabs() { // GT_CreativeTab - /* - * tabBlock = new MiscUtilCreativeTabBlock("MiscUtilBlockTab"); tabMisc = new - * MiscUtilCreativeTabMisc("MiscUtilMiscTab"); tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab"); - * tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab"); tabOther = new - * MiscUtilCreativeTabOther("MiscUtilOtherTab"); tabBOP = new MiscUtilsBOPTab("MiscUtilBOP"); - */ - tabBlock = new GT_CreativeTab("GTPP_BLOCKS", "GT++ Blocks"); tabMisc = new GT_CreativeTab("GTPP_MISC", "GT++ Misc"); tabTools = new GT_CreativeTab("GTPP_TOOLS", "GT++ Tools"); diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java deleted file mode 100644 index f7b2477398..0000000000 --- a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java +++ /dev/null @@ -1,26 +0,0 @@ -package gtPlusPlus.core.creative.tabs; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class MiscUtilCreativeTabBlock extends CreativeTabs { - - public MiscUtilCreativeTabBlock(final String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return Item.getItemFromBlock(Blocks.bedrock); - } - - @SideOnly(Side.CLIENT) - @Override - public int func_151243_f() { - return 0; - } -} diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java deleted file mode 100644 index 57fb663d40..0000000000 --- a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java +++ /dev/null @@ -1,17 +0,0 @@ -package gtPlusPlus.core.creative.tabs; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Items; -import net.minecraft.item.Item; - -public class MiscUtilCreativeTabMachines extends CreativeTabs { - - public MiscUtilCreativeTabMachines(final String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return Items.netherbrick; - } -} diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java deleted file mode 100644 index 397474065f..0000000000 --- a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java +++ /dev/null @@ -1,17 +0,0 @@ -package gtPlusPlus.core.creative.tabs; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Items; -import net.minecraft.item.Item; - -public class MiscUtilCreativeTabMisc extends CreativeTabs { - - public MiscUtilCreativeTabMisc(final String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return Items.painting; - } -} diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java deleted file mode 100644 index 7fb99db6f0..0000000000 --- a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java +++ /dev/null @@ -1,17 +0,0 @@ -package gtPlusPlus.core.creative.tabs; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Items; -import net.minecraft.item.Item; - -public class MiscUtilCreativeTabOther extends CreativeTabs { - - public MiscUtilCreativeTabOther(final String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return Items.repeater; - } -} diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java deleted file mode 100644 index 1c81c6b952..0000000000 --- a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java +++ /dev/null @@ -1,17 +0,0 @@ -package gtPlusPlus.core.creative.tabs; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Items; -import net.minecraft.item.Item; - -public class MiscUtilCreativeTabTools extends CreativeTabs { - - public MiscUtilCreativeTabTools(final String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return Items.diamond_pickaxe; - } -} diff --git a/src/main/java/gtPlusPlus/core/entity/EntityTeleportFX.java b/src/main/java/gtPlusPlus/core/entity/EntityTeleportFX.java deleted file mode 100644 index d010624b8c..0000000000 --- a/src/main/java/gtPlusPlus/core/entity/EntityTeleportFX.java +++ /dev/null @@ -1,242 +0,0 @@ -package gtPlusPlus.core.entity; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class EntityTeleportFX extends Entity { - - /** 'x' location the eye should float towards. */ - private double targetX; - /** 'y' location the eye should float towards. */ - private double targetY; - /** 'z' location the eye should float towards. */ - private double targetZ; - - private int despawnTimer; - private boolean shatterOrDrop; - - public EntityTeleportFX(final World p_i1757_1_) { - super(p_i1757_1_); - this.setSize(0.25F, 0.25F); - } - - @Override - protected void entityInit() {} - - /** - * Checks if the entity is in range to render by using the past in distance and comparing it to its average edge - * length * 64 * renderDistanceWeight Args: distance - */ - @Override - @SideOnly(Side.CLIENT) - public boolean isInRangeToRenderDist(final double p_70112_1_) { - double d1 = this.boundingBox.getAverageEdgeLength() * 4.0D; - d1 *= 64.0D; - return p_70112_1_ < (d1 * d1); - } - - public EntityTeleportFX(final World p_i1758_1_, final double p_i1758_2_, final double p_i1758_4_, - final double p_i1758_6_) { - super(p_i1758_1_); - this.despawnTimer = 0; - this.setSize(0.25F, 0.25F); - this.setPosition(p_i1758_2_, p_i1758_4_, p_i1758_6_); - this.yOffset = 0.0F; - } - - /** - * The location the eye should float/move towards. Currently used for moving towards the nearest stronghold. Args: - * strongholdX, strongholdY, strongholdZ - */ - public void moveTowards(final double p_70220_1_, final int p_70220_3_, final double p_70220_4_) { - final double d2 = p_70220_1_ - this.posX; - final double d3 = p_70220_4_ - this.posZ; - final float f = MathHelper.sqrt_double((d2 * d2) + (d3 * d3)); - - if (f > 12.0F) { - this.targetX = this.posX + ((d2 / f) * 12.0D); - this.targetZ = this.posZ + ((d3 / f) * 12.0D); - this.targetY = this.posY + 8.0D; - } else { - this.targetX = p_70220_1_; - this.targetY = p_70220_3_; - this.targetZ = p_70220_4_; - } - - this.despawnTimer = 0; - this.shatterOrDrop = this.rand.nextInt(5) > 0; - } - - /** - * Sets the velocity to the args. Args: x, y, z - */ - @Override - @SideOnly(Side.CLIENT) - public void setVelocity(final double p_70016_1_, final double p_70016_3_, final double p_70016_5_) { - this.motionX = p_70016_1_; - this.motionY = p_70016_3_; - this.motionZ = p_70016_5_; - - if ((this.prevRotationPitch == 0.0F) && (this.prevRotationYaw == 0.0F)) { - final float f = MathHelper.sqrt_double((p_70016_1_ * p_70016_1_) + (p_70016_5_ * p_70016_5_)); - this.prevRotationYaw = this.rotationYaw = (float) ((Math.atan2(p_70016_1_, p_70016_5_) * 180.0D) / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float) ((Math.atan2(p_70016_3_, f) * 180.0D) / Math.PI); - } - } - - /** - * Called to update the entity's position/logic. - */ - @Override - public void onUpdate() { - this.lastTickPosX = this.posX; - this.lastTickPosY = this.posY; - this.lastTickPosZ = this.posZ; - super.onUpdate(); - this.posX += this.motionX; - this.posY += this.motionY; - this.posZ += this.motionZ; - final float f = MathHelper.sqrt_double((this.motionX * this.motionX) + (this.motionZ * this.motionZ)); - this.rotationYaw = (float) ((Math.atan2(this.motionX, this.motionZ) * 180.0D) / Math.PI); - - for (this.rotationPitch = (float) ((Math.atan2(this.motionY, f) * 180.0D) / Math.PI); (this.rotationPitch - - this.prevRotationPitch) < -180.0F; this.prevRotationPitch -= 360.0F) { - ; - } - - while ((this.rotationPitch - this.prevRotationPitch) >= 180.0F) { - this.prevRotationPitch += 360.0F; - } - - while ((this.rotationYaw - this.prevRotationYaw) < -180.0F) { - this.prevRotationYaw -= 360.0F; - } - - while ((this.rotationYaw - this.prevRotationYaw) >= 180.0F) { - this.prevRotationYaw += 360.0F; - } - - this.rotationPitch = this.prevRotationPitch + ((this.rotationPitch - this.prevRotationPitch) * 0.2F); - this.rotationYaw = this.prevRotationYaw + ((this.rotationYaw - this.prevRotationYaw) * 0.2F); - - if (!this.worldObj.isRemote) { - final double d0 = this.targetX - this.posX; - final double d1 = this.targetZ - this.posZ; - final float f1 = (float) Math.sqrt((d0 * d0) + (d1 * d1)); - final float f2 = (float) Math.atan2(d1, d0); - double d2 = f + ((f1 - f) * 0.0025D); - - if (f1 < 1.0F) { - d2 *= 0.8D; - this.motionY *= 0.8D; - } - - this.motionX = Math.cos(f2) * d2; - this.motionZ = Math.sin(f2) * d2; - - if (this.posY < this.targetY) { - this.motionY += (1.0D - this.motionY) * 0.014999999664723873D; - } else { - this.motionY += (-1.0D - this.motionY) * 0.014999999664723873D; - } - } - - final float f3 = 0.25F; - - if (this.isInWater()) { - for (int i = 0; i < 4; ++i) { - this.worldObj.spawnParticle( - "bubble", - this.posX - (this.motionX * f3), - this.posY - (this.motionY * f3), - this.posZ - (this.motionZ * f3), - this.motionX, - this.motionY, - this.motionZ); - } - } else { - this.worldObj.spawnParticle( - "portal", - ((this.posX - (this.motionX * f3)) + (this.rand.nextDouble() * 0.6D)) - 0.3D, - this.posY - (this.motionY * f3) - 0.5D, - ((this.posZ - (this.motionZ * f3)) + (this.rand.nextDouble() * 0.6D)) - 0.3D, - this.motionX, - this.motionY, - this.motionZ); - } - - if (!this.worldObj.isRemote) { - this.setPosition(this.posX, this.posY, this.posZ); - ++this.despawnTimer; - - if ((this.despawnTimer > 80) && !this.worldObj.isRemote) { - this.setDead(); - - if (this.shatterOrDrop) { - this.worldObj.spawnEntityInWorld( - new EntityItem( - this.worldObj, - this.posX, - this.posY, - this.posZ, - new ItemStack(Items.ender_eye))); - } else { - this.worldObj.playAuxSFX( - 2003, - (int) Math.round(this.posX), - (int) Math.round(this.posY), - (int) Math.round(this.posZ), - 0); - } - } - } - } - - /** - * (abstract) Protected helper method to write subclass entity data to NBT. - */ - @Override - public void writeEntityToNBT(final NBTTagCompound p_70014_1_) {} - - /** - * (abstract) Protected helper method to read subclass entity data from NBT. - */ - @Override - public void readEntityFromNBT(final NBTTagCompound p_70037_1_) {} - - @Override - @SideOnly(Side.CLIENT) - public float getShadowSize() { - return 0.0F; - } - - /** - * Gets how bright this entity is. - */ - @Override - public float getBrightness(final float p_70013_1_) { - return 1.0F; - } - - @Override - @SideOnly(Side.CLIENT) - public int getBrightnessForRender(final float p_70070_1_) { - return 15728880; - } - - /** - * If returns false, the item will not inflict any damage against entities. - */ - @Override - public boolean canAttackWithItem() { - return false; - } -} diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java deleted file mode 100644 index b4a945ad7e..0000000000 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java +++ /dev/null @@ -1,220 +0,0 @@ -package gtPlusPlus.core.gui.machine; - -import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiOptionButton; -import net.minecraft.client.gui.GuiResourcePackAvailable; -import net.minecraft.client.gui.GuiResourcePackSelected; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.resources.I18n; -import net.minecraft.client.resources.ResourcePackListEntry; -import net.minecraft.client.resources.ResourcePackListEntryFound; -import net.minecraft.client.resources.ResourcePackRepository; -import net.minecraft.client.resources.ResourcePackRepository.Entry; -import net.minecraft.util.Util; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.lwjgl.Sys; - -import com.google.common.collect.Lists; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.util.reflect.ReflectionUtils; - -@SideOnly(Side.CLIENT) -public class GUI_ScrollTest extends GuiScreen { - - private static final Logger logger = LogManager.getLogger(); - private GuiScreen aThisGUIScreen; - private List<?> field_146966_g; - private List<?> field_146969_h; - private GuiResourcePackAvailable MapOfFreeResourcePacks; - private GuiResourcePackSelected MapOfActiveResourcePacks; - - public GUI_ScrollTest(GuiScreen p_i45050_1_) { - this.aThisGUIScreen = p_i45050_1_; - } - - /** - * Adds the buttons (and other controls) to the screen in question. - */ - @Override - @SuppressWarnings("unchecked") - public void initGui() { - this.buttonList.add( - new GuiOptionButton( - 2, - this.width / 2 - 154, - this.height - 48, - I18n.format("resourcePack.openFolder", new Object[0]))); - this.buttonList.add( - new GuiOptionButton(1, this.width / 2 + 4, this.height - 48, I18n.format("gui.done", new Object[0]))); - this.field_146966_g = new ArrayList<Object>(); - this.field_146969_h = new ArrayList<Entry>(); - ResourcePackRepository resourcepackrepository = this.mc.getResourcePackRepository(); - resourcepackrepository.updateRepositoryEntriesAll(); - ArrayList<?> arraylist = Lists.newArrayList(resourcepackrepository.getRepositoryEntriesAll()); - arraylist.removeAll(resourcepackrepository.getRepositoryEntries()); - Iterator<?> iterator = arraylist.iterator(); - ResourcePackRepository.Entry entry; - - while (iterator.hasNext()) { - entry = (ResourcePackRepository.Entry) iterator.next(); - // this.field_146966_g.add(new ResourcePackListEntryFound(this, entry)); - } - - iterator = Lists.reverse(resourcepackrepository.getRepositoryEntries()).iterator(); - - while (iterator.hasNext()) { - entry = (ResourcePackRepository.Entry) iterator.next(); - // this.field_146969_h.add(new ResourcePackListEntryFound(this, entry)); - } - - // this.field_146969_h.add(new ResourcePackListEntryDefault(this)); - this.MapOfFreeResourcePacks = new GuiResourcePackAvailable(this.mc, 200, this.height, this.field_146966_g); - this.MapOfFreeResourcePacks.setSlotXBoundsFromLeft(this.width / 2 - 4 - 200); - this.MapOfFreeResourcePacks.registerScrollButtons(7, 8); - this.MapOfActiveResourcePacks = new GuiResourcePackSelected(this.mc, 200, this.height, this.field_146969_h); - this.MapOfActiveResourcePacks.setSlotXBoundsFromLeft(this.width / 2 + 4); - this.MapOfActiveResourcePacks.registerScrollButtons(7, 8); - } - - public boolean func_146961_a(ResourcePackListEntry p_146961_1_) { - return this.field_146969_h.contains(p_146961_1_); - } - - public List<?> func_146962_b(ResourcePackListEntry p_146962_1_) { - return this.func_146961_a(p_146962_1_) ? this.field_146969_h : this.field_146966_g; - } - - public List<?> func_146964_g() { - return this.field_146966_g; - } - - public List<?> func_146963_h() { - return this.field_146969_h; - } - - @Override - protected void actionPerformed(GuiButton p_146284_1_) { - if (p_146284_1_.enabled) { - if (p_146284_1_.id == 2) { - File file1 = this.mc.getResourcePackRepository().getDirResourcepacks(); - String s = file1.getAbsolutePath(); - - if (Util.getOSType() == Util.EnumOS.OSX) { - try { - logger.info(s); - Runtime.getRuntime().exec(new String[] { "/usr/bin/open", s }); - return; - } catch (IOException ioexception1) { - logger.error("Couldn\'t open file", ioexception1); - } - } else if (Util.getOSType() == Util.EnumOS.WINDOWS) { - String s1 = String.format("cmd.exe /C start \"Open file\" \"%s\"", new Object[] { s }); - - try { - Runtime.getRuntime().exec(s1); - return; - } catch (IOException ioexception) { - logger.error("Couldn\'t open file", ioexception); - } - } - - boolean flag = false; - - try { - Class<?> oclass = ReflectionUtils.getClass("java.awt.Desktop"); - Object object = ReflectionUtils.getMethod(oclass, "getDesktop", new Class[0]) - .invoke((Object) null, new Object[0]); - ReflectionUtils.getMethod(oclass, "browse", new Class[] { URI.class }) - .invoke(object, new Object[] { file1.toURI() }); - } catch (Throwable throwable) { - logger.error("Couldn\'t open link", throwable); - flag = true; - } - - if (flag) { - logger.info("Opening via system class!"); - Sys.openURL("file://" + s); - } - } else if (p_146284_1_.id == 1) { - ArrayList<Entry> arraylist = Lists.newArrayList(); - Iterator<?> iterator = this.field_146969_h.iterator(); - - while (iterator.hasNext()) { - ResourcePackListEntry resourcepacklistentry = (ResourcePackListEntry) iterator.next(); - - if (resourcepacklistentry instanceof ResourcePackListEntryFound) { - arraylist.add(((ResourcePackListEntryFound) resourcepacklistentry).func_148318_i()); - } - } - - Collections.reverse(arraylist); - this.mc.getResourcePackRepository().func_148527_a(arraylist); - this.mc.gameSettings.resourcePacks.clear(); - iterator = arraylist.iterator(); - - while (iterator.hasNext()) { - ResourcePackRepository.Entry entry = (ResourcePackRepository.Entry) iterator.next(); - this.mc.gameSettings.resourcePacks.add(entry.getResourcePackName()); - } - - this.mc.gameSettings.saveOptions(); - this.mc.refreshResources(); - this.mc.displayGuiScreen(this.aThisGUIScreen); - } - } - } - - /** - * Called when the mouse is clicked. - */ - @Override - protected void mouseClicked(int p_73864_1_, int p_73864_2_, int p_73864_3_) { - super.mouseClicked(p_73864_1_, p_73864_2_, p_73864_3_); - this.MapOfFreeResourcePacks.func_148179_a(p_73864_1_, p_73864_2_, p_73864_3_); - this.MapOfActiveResourcePacks.func_148179_a(p_73864_1_, p_73864_2_, p_73864_3_); - } - - /** - * Called when the mouse is moved or a mouse button is released. Signature: (mouseX, mouseY, which) which==-1 is - * mouseMove, which==0 or which==1 is mouseUp - */ - @Override - protected void mouseMovedOrUp(int p_146286_1_, int p_146286_2_, int p_146286_3_) { - super.mouseMovedOrUp(p_146286_1_, p_146286_2_, p_146286_3_); - } - - /** - * Draws the screen and all the components in it. - */ - @Override - public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_) { - this.drawBackground(0); - this.MapOfFreeResourcePacks.drawScreen(p_73863_1_, p_73863_2_, p_73863_3_); - this.MapOfActiveResourcePacks.drawScreen(p_73863_1_, p_73863_2_, p_73863_3_); - this.drawCenteredString( - this.fontRendererObj, - I18n.format("resourcePack.title", new Object[0]), - this.width / 2, - 16, - 16777215); - this.drawCenteredString( - this.fontRendererObj, - I18n.format("resourcePack.folderInfo", new Object[0]), - this.width / 2 - 77, - this.height - 26, - 8421504); - super.drawScreen(p_73863_1_, p_73863_2_, p_73863_3_); - } -} diff --git a/src/main/java/gtPlusPlus/core/handler/CraftingManager.java b/src/main/java/gtPlusPlus/core/handler/CraftingManager.java deleted file mode 100644 index 7c7069b631..0000000000 --- a/src/main/java/gtPlusPlus/core/handler/CraftingManager.java +++ /dev/null @@ -1,13 +0,0 @@ -package gtPlusPlus.core.handler; - -public class CraftingManager { - - public static void mainRegistry() { - addCraftingRecipies(); - addSmeltingRecipies(); - } - - public static void addCraftingRecipies() {} - - public static void addSmeltingRecipies() {} -} diff --git a/src/main/java/gtPlusPlus/core/handler/events/PlayerTickHandler.java b/src/main/java/gtPlusPlus/core/handler/events/PlayerTickHandler.java deleted file mode 100644 index 14d791bf54..0000000000 --- a/src/main/java/gtPlusPlus/core/handler/events/PlayerTickHandler.java +++ /dev/null @@ -1,15 +0,0 @@ -package gtPlusPlus.core.handler.events; - -import net.minecraft.entity.player.EntityPlayer; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - -public class PlayerTickHandler { - - @SubscribeEvent - public void onPlayerTick(net.minecraftforge.event.entity.player.PlayerOpenContainerEvent e) { - if (e.entity instanceof EntityPlayer) { - if (e.entityPlayer.openContainer != null) {} - } - } -} diff --git a/src/main/java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java b/src/main/java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java deleted file mode 100644 index a5cf61b066..0000000000 --- a/src/main/java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java +++ /dev/null @@ -1,123 +0,0 @@ -package gtPlusPlus.core.handler.events; - -import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.metatileentity.BaseMetaPipeEntity; -import gregtech.api.metatileentity.BaseMetaTileEntity; -import gregtech.api.metatileentity.BaseTileEntity; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaSafeBlock; - -public class UnbreakableBlockManager { - - private static boolean hasRun = false; - - public final BaseMetaTileEntity getmTileEntity() { - return mTileEntity; - } - - public final void setmTileEntity(final BaseMetaTileEntity mTileEntity /* , EntityPlayer aPlayer */) { - UnbreakableBlockManager.mTileEntity = mTileEntity; - if (!hasRun) { - hasRun = true; - this.makeIndestructible(/* aPlayer */ ); - } else { - Logger.WARNING("Why do you run twice?"); - } - } - - // BaseMetaTileEntity - // GregtechMetaSafeBlock - private static BaseMetaTileEntity mTileEntity = null; - - private void makeIndestructible(/* EntityPlayer aPlayer */ ) { - - Logger.WARNING("Initializing the code to set this TE to -1 hardness and make it indestructible."); - final int X = mTileEntity.xCoord; // (GregtechMetaSafeBlock) this.mTileEntity.getXCoord(); - final int Y = mTileEntity.yCoord; - final int Z = mTileEntity.zCoord; - Logger.WARNING("Grabbing TileEntity @ [x,y,z] |" + X + "|" + Y + "|" + Z + "|"); - - try { - final GregtechMetaSafeBlock MetaSafeBlock = ((GregtechMetaSafeBlock) UnbreakableBlockManager.mTileEntity - .getMetaTileEntity()); - final TileEntity BaseMetaTileEntity = mTileEntity.getTileEntity(X, Y, Z); - // MetaSafeBlockBase. - final World TE_WORLD = MetaSafeBlock.getBaseMetaTileEntity().getWorld(); - Logger.WARNING("Checking new State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); - final TileEntity entity = BaseMetaTileEntity; - innerInvincible(MetaSafeBlock, entity, TE_WORLD, /* aPlayer, */ X, Y, Z); - } catch (final NullPointerException e) { - System.out.print("Caught a NullPointerException involving Safe Blocks. Cause: "); - e.printStackTrace(); - } - } - - private static void innerInvincible(final GregtechMetaSafeBlock MetaSafeBlock, final TileEntity entity, - final World TE_WORLD, /* EntityPlayer aPlayer, */ - final int X, final int Y, final int Z) { - if (entity != null) { - Logger.WARNING("Checking new State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); - Logger.WARNING("Grabbed TE: " + entity.toString()); - - if ((entity instanceof BaseTileEntity) && !(entity instanceof BaseMetaPipeEntity)) { - final IMetaTileEntity I = ((BaseMetaTileEntity) entity).getMetaTileEntity(); - Logger.WARNING("Checking State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); - Logger.WARNING( - "I Details: " + I.getMetaName() + " | " + I.getTileEntityBaseType() + " | " + I.toString()); - - if (I instanceof GregtechMetaSafeBlock) { - Logger.WARNING("Checking State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); - - final Block ThisBlock = I.getBaseMetaTileEntity().getBlock(X, Y, Z); - Logger.WARNING("Block Details: " + ThisBlock.toString()); - - if (((GregtechMetaSafeBlock) I).bUnbreakable) { - ThisBlock.setHardness(Integer.MAX_VALUE); - // ThisBlock.setResistance(18000000.0F); - ThisBlock.setResistance(-1); - ThisBlock.setBlockUnbreakable(); - Logger.WARNING( - "Changing State of Flag. Old Value=" + MetaSafeBlock.bUnbreakable - + " Expected Value=true"); - MetaSafeBlock.bUnbreakable = true; - // entity.markDirty(); - Logger.WARNING("Checking new State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); - Logger.ERROR("New Indestructible Flag enabled."); - // GT_Utility.sendChatToPlayer(aPlayer, "Block is now unbreakable."); - } else { - ThisBlock.setHardness(1); - ThisBlock.setResistance(1.0F); - Logger.WARNING( - "Changing State of Flag. Old Value=" + MetaSafeBlock.bUnbreakable - + " Expected Value=false"); - MetaSafeBlock.bUnbreakable = false; - // entity.markDirty(); - Logger.WARNING("Checking new State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); - Logger.ERROR("New Indestructible Flag disabled."); - // GT_Utility.sendChatToPlayer(aPlayer, "Block is now breakable."); - } - - // entity.markDirty(); - - Logger.WARNING("Block Hardness: " + ThisBlock.getBlockHardness(TE_WORLD, X, Y, Z)); - Logger.WARNING("Checking State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); - hasRun = false; - - } else { - Logger.WARNING("I is not an instanceof MetaSafeBlockBase"); - Logger.WARNING("Checking State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); - } - } else { - Logger.WARNING("TE is not an instanceof BaseTileEntity or may be a pipe."); - Logger.WARNING("Checking State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); - } - } else { - Logger.WARNING("Did not grab a TE instance to make a block instance from."); - Logger.WARNING("Checking State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable); - } - } -} diff --git a/src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java b/src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java deleted file mode 100644 index 26d944c96d..0000000000 --- a/src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java +++ /dev/null @@ -1,115 +0,0 @@ -package gtPlusPlus.core.handler.render; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import java.util.Collection; - -import net.minecraft.client.entity.AbstractClientPlayer; -import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.entity.RenderPlayer; -import net.minecraft.potion.Potion; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.RenderPlayerEvent; - -import org.lwjgl.opengl.GL11; - -import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; - -public class CapeHandler extends RenderPlayer { - - private final ResourceLocation[] mCapes = { new ResourceLocation(GTPlusPlus.ID + ":textures/TesterCape.png"), - new ResourceLocation(GTPlusPlus.ID + ":textures/Draknyte1.png"), - new ResourceLocation("gregtech:textures/GregoriusCape.png") }; - private final Collection<String> mCapeList; - - public CapeHandler(final Collection<String> aCapeList) { - this.mCapeList = aCapeList; - this.setRenderManager(RenderManager.instance); - } - - public void receiveRenderSpecialsEvent(final RenderPlayerEvent.Specials.Pre aEvent) { - final AbstractClientPlayer aPlayer = (AbstractClientPlayer) aEvent.entityPlayer; - if (GT_Utility.getFullInvisibility(aPlayer)) { - aEvent.setCanceled(true); - return; - } - final float aPartialTicks = aEvent.partialRenderTick; - if (aPlayer.isInvisible()) { - return; - } - if (GT_Utility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id).intValue())) { - return; - } - try { - ResourceLocation tResource = null; - if (aPlayer.getDisplayName().equalsIgnoreCase("XW3B")) { - tResource = this.mCapes[0]; - } - if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase())) { - tResource = this.mCapes[0]; - } - if (aPlayer.getDisplayName().equalsIgnoreCase("Draknyte1")) { - tResource = this.mCapes[1]; - } - if (aPlayer.getDisplayName().equalsIgnoreCase("GregoriusT")) { - tResource = this.mCapes[2]; - } - if ((tResource != null) && (!(aPlayer.getHideCape()))) { - this.bindTexture(tResource); - GL11.glPushMatrix(); - GL11.glTranslatef(0.0F, 0.0F, 0.125F); - final double d0 = (aPlayer.field_71091_bM - + ((aPlayer.field_71094_bP - aPlayer.field_71091_bM) * aPartialTicks)) - - (aPlayer.prevPosX + ((aPlayer.posX - aPlayer.prevPosX) * aPartialTicks)); - final double d1 = (aPlayer.field_71096_bN - + ((aPlayer.field_71095_bQ - aPlayer.field_71096_bN) * aPartialTicks)) - - (aPlayer.prevPosY + ((aPlayer.posY - aPlayer.prevPosY) * aPartialTicks)); - final double d2 = (aPlayer.field_71097_bO - + ((aPlayer.field_71085_bR - aPlayer.field_71097_bO) * aPartialTicks)) - - (aPlayer.prevPosZ + ((aPlayer.posZ - aPlayer.prevPosZ) * aPartialTicks)); - final float f6 = aPlayer.prevRenderYawOffset - + ((aPlayer.renderYawOffset - aPlayer.prevRenderYawOffset) * aPartialTicks); - final double d3 = MathHelper.sin((f6 * CORE.PI) / 180.0F); - final double d4 = -MathHelper.cos((f6 * CORE.PI) / 180.0F); - float f7 = (float) d1 * 10.0F; - float f8 = (float) ((d0 * d3) + (d2 * d4)) * 100.0F; - final float f9 = (float) ((d0 * d4) - (d2 * d3)) * 100.0F; - if (f7 < -6.0F) { - f7 = -6.0F; - } - if (f7 > 32.0F) { - f7 = 32.0F; - } - if (f8 < 0.0F) { - f8 = 0.0F; - } - final float f10 = aPlayer.prevCameraYaw + ((aPlayer.cameraYaw - aPlayer.prevCameraYaw) * aPartialTicks); - f7 += MathHelper.sin( - (aPlayer.prevDistanceWalkedModified - + ((aPlayer.distanceWalkedModified - aPlayer.prevDistanceWalkedModified) - * aPartialTicks)) - * 6.0F) - * 32.0F - * f10; - if (aPlayer.isSneaking()) { - f7 += 25.0F; - } - GL11.glRotatef(6.0F + (f8 / 2.0F) + f7, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(f9 / 2.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(-f9 / 2.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); - ((ModelBiped) this.mainModel).renderCloak(0.0625F); - GL11.glPopMatrix(); - } - } catch (final Throwable e) { - if (GT_Values.D1) { - e.printStackTrace(GT_Log.err); - } - } - } -} diff --git a/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java b/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java deleted file mode 100644 index 964aaf2bf7..0000000000 --- a/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java +++ /dev/null @@ -1,37 +0,0 @@ -package gtPlusPlus.core.handler.workbench; - -import java.util.Comparator; - -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.item.crafting.ShapelessRecipes; - -public class Workbench_RecipeSorter implements Comparator<Object> { - - final Workbench_CraftingHandler CraftingManagerCrafter; - - Workbench_RecipeSorter(final Workbench_CraftingHandler par1CraftingManager) { - this.CraftingManagerCrafter = par1CraftingManager; - } - - public int compareRecipes(final IRecipe par1IRecipe, final IRecipe par2IRecipe) { - if ((par1IRecipe instanceof ShapelessRecipes) && (par2IRecipe instanceof ShapedRecipes)) { - return 1; - } - - if ((par2IRecipe instanceof ShapelessRecipes) && (par1IRecipe instanceof ShapedRecipes)) { - return -1; - } - - if (par2IRecipe.getRecipeSize() < par1IRecipe.getRecipeSize()) { - return -1; - } - - return par2IRecipe.getRecipeSize() <= par1IRecipe.getRecipeSize() ? 0 : 1; - } - - @Override - public int compare(final Object par1Obj, final Object par2Obj) { - return this.compareRecipes((IRecipe) par1Obj, (IRecipe) par2Obj); - } -} diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchChest.java b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchChest.java deleted file mode 100644 index 08e238241c..0000000000 --- a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchChest.java +++ /dev/null @@ -1,160 +0,0 @@ -package gtPlusPlus.core.inventories; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - -public class InventoryWorkbenchChest implements IInventory { - - private final String name = "Inventory Chest"; - - /** Defining your inventory size this way is handy */ - public static final int INV_SIZE = 16; - - /** Inventory's size must be same as number of slots you add to the Container class */ - private ItemStack[] inventory = new ItemStack[INV_SIZE]; - - /** - * @param itemstack - the ItemStack to which this inventory belongs - */ - public InventoryWorkbenchChest() {} - - public void readFromNBT(final NBTTagCompound nbt) { - final NBTTagList list = nbt.getTagList("Items", 10); - this.inventory = new ItemStack[INV_SIZE]; - for (int i = 0; i < list.tagCount(); i++) { - final NBTTagCompound data = list.getCompoundTagAt(i); - final int slot = data.getInteger("Slot"); - if ((slot >= 0) && (slot < INV_SIZE)) { - this.inventory[slot] = ItemStack.loadItemStackFromNBT(data); - } - } - } - - public void writeToNBT(final NBTTagCompound nbt) { - final NBTTagList list = new NBTTagList(); - for (int i = 0; i < INV_SIZE; i++) { - final ItemStack stack = this.inventory[i]; - if (stack != null) { - final NBTTagCompound data = new NBTTagCompound(); - stack.writeToNBT(data); - data.setInteger("Slot", i); - list.appendTag(data); - } - } - nbt.setTag("Items", list); - } - - @Override - public int getSizeInventory() { - return this.inventory.length; - } - - public ItemStack[] getInventory() { - return this.inventory; - } - - @Override - public ItemStack getStackInSlot(final int slot) { - return this.inventory[slot]; - } - - @Override - public ItemStack decrStackSize(final int slot, final int amount) { - ItemStack stack = this.getStackInSlot(slot); - if (stack != null) { - if (stack.stackSize > amount) { - stack = stack.splitStack(amount); - // Don't forget this line or your inventory will not be saved! - this.markDirty(); - } else { - // this method also calls markDirty, so we don't need to call it again - this.setInventorySlotContents(slot, null); - } - } - return stack; - } - - @Override - public ItemStack getStackInSlotOnClosing(final int slot) { - final ItemStack stack = this.getStackInSlot(slot); - this.setInventorySlotContents(slot, null); - return stack; - } - - @Override - public void setInventorySlotContents(final int slot, final ItemStack stack) { - this.inventory[slot] = stack; - - if ((stack != null) && (stack.stackSize > this.getInventoryStackLimit())) { - stack.stackSize = this.getInventoryStackLimit(); - } - - // Don't forget this line or your inventory will not be saved! - this.markDirty(); - } - - // 1.7.2+ renamed to getInventoryName - @Override - public String getInventoryName() { - return this.name; - } - - // 1.7.2+ renamed to hasCustomInventoryName - @Override - public boolean hasCustomInventoryName() { - return this.name.length() > 0; - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - /** - * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime - * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change - * things in your inventory without ever opening a Gui, if you want. - */ - // 1.7.2+ renamed to markDirty - @Override - public void markDirty() { - for (int i = 0; i < this.getSizeInventory(); ++i) { - final ItemStack temp = this.getStackInSlot(i); - if (temp != null) { - // Utils.LOG_INFO("Slot "+i+" contains "+temp.getDisplayName()+" x"+temp.stackSize); - } - - if ((temp != null) && (temp.stackSize == 0)) { - this.inventory[i] = null; - } - } - } - - @Override - public boolean isUseableByPlayer(final EntityPlayer entityplayer) { - return true; - } - - // 1.7.2+ renamed to openInventory(EntityPlayer player) - @Override - public void openInventory() {} - - // 1.7.2+ renamed to closeInventory(EntityPlayer player) - @Override - public void closeInventory() {} - - /** - * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the - * inventory even when this returns false - */ - @Override - public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) { - // Don't want to be able to store the inventory item within itself - // Bad things will happen, like losing your inventory - // Actually, this needs a custom Slot to work - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java deleted file mode 100644 index 2dd44c9ea7..0000000000 --- a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java +++ /dev/null @@ -1,177 +0,0 @@ -package gtPlusPlus.core.inventories; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - -public class InventoryWorkbenchCrafting implements IInventory { - - private final String name = "Inventory Crafting"; - - /** Defining your inventory size this way is handy */ - public static final int INV_SIZE = 9; - - /** Inventory's size must be same as number of slots you add to the Container class */ - private ItemStack[] inventory = new ItemStack[INV_SIZE]; - - public final InventoryCrafting craftMatrix; - public final Container parentContainer; - - public InventoryCrafting getCrafting() { - return this.craftMatrix; - } - - /** - * @param itemstack - the ItemStack to which this inventory belongs - */ - public InventoryWorkbenchCrafting(final Container containerR) { - this.parentContainer = containerR; - this.craftMatrix = new InventoryCrafting(this.parentContainer, 3, 3); - } - - private ItemStack[] getArrayOfCraftingItems() { - final ItemStack[] array = new ItemStack[9]; - for (int i = 0; i < this.craftMatrix.getSizeInventory(); i++) { - if (this.craftMatrix.getStackInSlot(i) != null) { - array[i] = this.craftMatrix.getStackInSlot(i); - } - } - return array; - } - - public void readFromNBT(final NBTTagCompound nbt) { - final NBTTagList list = nbt.getTagList("Items", 10); - this.inventory = new ItemStack[INV_SIZE]; - for (int i = 0; i < list.tagCount(); i++) { - final NBTTagCompound data = list.getCompoundTagAt(i); - final int slot = data.getInteger("Slot"); - if ((slot >= 0) && (slot < INV_SIZE)) { - this.getInventory()[slot] = ItemStack.loadItemStackFromNBT(data); - } - } - } - - public void writeToNBT(final NBTTagCompound nbt) { - final NBTTagList list = new NBTTagList(); - for (int i = 0; i < INV_SIZE; i++) { - final ItemStack stack = this.getInventory()[i]; - if (stack != null) { - final NBTTagCompound data = new NBTTagCompound(); - stack.writeToNBT(data); - data.setInteger("Slot", i); - list.appendTag(data); - } - } - nbt.setTag("Items", list); - } - - @Override - public int getSizeInventory() { - return this.getInventory().length; - } - - public ItemStack[] getInventory() { - return this.getArrayOfCraftingItems(); - } - - @Override - public ItemStack getStackInSlot(final int slot) { - return this.getInventory()[slot]; - } - - @Override - public ItemStack decrStackSize(final int slot, final int amount) { - ItemStack stack = this.getStackInSlot(slot); - if (stack != null) { - if (stack.stackSize > amount) { - stack = stack.splitStack(amount); - // Don't forget this line or your inventory will not be saved! - this.markDirty(); - } else { - // this method also calls markDirty, so we don't need to call it again - this.setInventorySlotContents(slot, null); - } - } - return stack; - } - - @Override - public ItemStack getStackInSlotOnClosing(final int slot) { - final ItemStack stack = this.getStackInSlot(slot); - this.setInventorySlotContents(slot, null); - return stack; - } - - @Override - public void setInventorySlotContents(final int slot, final ItemStack stack) { - this.getInventory()[slot] = stack; - - if ((stack != null) && (stack.stackSize > this.getInventoryStackLimit())) { - stack.stackSize = this.getInventoryStackLimit(); - } - - // Don't forget this line or your inventory will not be saved! - this.markDirty(); - } - - // 1.7.2+ renamed to getInventoryName - @Override - public String getInventoryName() { - return this.name; - } - - // 1.7.2+ renamed to hasCustomInventoryName - @Override - public boolean hasCustomInventoryName() { - return this.name.length() > 0; - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - /** - * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime - * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change - * things in your inventory without ever opening a Gui, if you want. - */ - // 1.7.2+ renamed to markDirty - @Override - public void markDirty() { - for (int i = 0; i < this.getSizeInventory(); ++i) { - if ((this.getStackInSlot(i) != null) && (this.getStackInSlot(i).stackSize == 0)) { - this.getInventory()[i] = null; - } - } - } - - @Override - public boolean isUseableByPlayer(final EntityPlayer entityplayer) { - return true; - } - - // 1.7.2+ renamed to openInventory(EntityPlayer player) - @Override - public void openInventory() {} - - // 1.7.2+ renamed to closeInventory(EntityPlayer player) - @Override - public void closeInventory() {} - - /** - * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the - * inventory even when this returns false - */ - @Override - public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) { - // Don't want to be able to store the inventory item within itself - // Bad things will happen, like losing your inventory - // Actually, this needs a custom Slot to work - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java deleted file mode 100644 index 0c1a9bf5f0..0000000000 --- a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java +++ /dev/null @@ -1,120 +0,0 @@ -package gtPlusPlus.core.inventories; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; - -public class InventoryWorkbenchHoloCrafting implements IInventory { - - private final String name = "Inventory Crafting"; - - /** Defining your inventory size this way is handy */ - public static final int INV_SIZE = 9; - - /** Inventory's size must be same as number of slots you add to the Container class */ - private final ItemStack[] inventory = new ItemStack[INV_SIZE]; - - /** - * @param itemstack - the ItemStack to which this inventory belongs - */ - public InventoryWorkbenchHoloCrafting() {} - - /* - * public void readFromNBT(NBTTagCompound nbt) { NBTTagList list = nbt.getTagList("Items", 10); inventory = new - * ItemStack[INV_SIZE]; for(int i = 0;i<list.tagCount();i++) { NBTTagCompound data = list.getCompoundTagAt(i); int - * slot = data.getInteger("Slot"); if(slot >= 0 && slot < INV_SIZE) { inventory[slot] = - * ItemStack.loadItemStackFromNBT(data); } } } public void writeToNBT(NBTTagCompound nbt) { NBTTagList list = new - * NBTTagList(); for(int i = 0;i<INV_SIZE;i++) { ItemStack stack = inventory[i]; if(stack != null) { NBTTagCompound - * data = new NBTTagCompound(); stack.writeToNBT(data); data.setInteger("Slot", i); list.appendTag(data); } } - * nbt.setTag("Items", list); } - */ - - @Override - public int getSizeInventory() { - return this.inventory.length; - } - - public ItemStack[] getInventory() { - return this.inventory; - } - - @Override - public ItemStack getStackInSlot(final int slot) { - return this.inventory[slot]; - } - - @Override - public ItemStack decrStackSize(final int slot, final int amount) { - ItemStack stack = this.getStackInSlot(slot); - if (stack != null) { - if (stack.stackSize > amount) { - stack = stack.splitStack(amount); - this.markDirty(); - } else { - this.setInventorySlotContents(slot, null); - } - } - return stack; - } - - @Override - public ItemStack getStackInSlotOnClosing(final int slot) { - final ItemStack stack = this.getStackInSlot(slot); - this.setInventorySlotContents(slot, null); - return stack; - } - - @Override - public void setInventorySlotContents(final int slot, final ItemStack stack) { - this.inventory[slot] = stack; - if ((stack != null) && (stack.stackSize > this.getInventoryStackLimit())) { - stack.stackSize = this.getInventoryStackLimit(); - } - this.markDirty(); - } - - @Override - public String getInventoryName() { - return this.name; - } - - @Override - public boolean hasCustomInventoryName() { - return this.name.length() > 0; - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public void markDirty() { - for (int i = 0; i < this.getSizeInventory(); ++i) { - final ItemStack temp = this.getStackInSlot(i); - if (temp != null) { - // Utils.LOG_INFO("Slot "+i+" contains "+temp.getDisplayName()+" x"+temp.stackSize); - } - - if ((temp != null) && (temp.stackSize == 0)) { - this.inventory[i] = null; - } - } - } - - @Override - public boolean isUseableByPlayer(final EntityPlayer entityplayer) { - return true; - } - - @Override - public void openInventory() {} - - @Override - public void closeInventory() {} - - @Override - public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) { - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java deleted file mode 100644 index 36ad85052f..0000000000 --- a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java +++ /dev/null @@ -1,206 +0,0 @@ -package gtPlusPlus.core.inventories; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryCraftResult; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - -import gtPlusPlus.api.objects.Logger; - -public class InventoryWorkbenchHoloSlots implements IInventory { - - private final String name = "Inventory Holo"; - - // Output Slot - public IInventory craftResult = new InventoryCraftResult(); - - /** Defining your inventory size this way is handy */ - public static final int INV_SIZE = 6; - - /** Inventory's size must be same as number of slots you add to the Container class */ - private ItemStack[] inventory = new ItemStack[INV_SIZE]; - - /** - * @param itemstack - the ItemStack to which this inventory belongs - */ - public InventoryWorkbenchHoloSlots() {} - - public void readFromNBT(final NBTTagCompound nbt) { - final NBTTagList list = nbt.getTagList("Items", 10); - this.inventory = new ItemStack[INV_SIZE]; - for (int i = 0; i < list.tagCount(); i++) { - final NBTTagCompound data = list.getCompoundTagAt(i); - final int slot = data.getInteger("Slot"); - if ((slot >= 1) && (slot < INV_SIZE)) { - this.inventory[slot] = ItemStack.loadItemStackFromNBT(data); - } - } - } - - public void writeToNBT(final NBTTagCompound nbt) { - final NBTTagList list = new NBTTagList(); - for (int i = 0; i < INV_SIZE; i++) { - final ItemStack stack = this.inventory[i]; - if ((stack != null) && (i != 0)) { - final NBTTagCompound data = new NBTTagCompound(); - stack.writeToNBT(data); - data.setInteger("Slot", i); - list.appendTag(data); - } - } - nbt.setTag("Items", list); - } - - @Override - public int getSizeInventory() { - return this.inventory.length; - } - - public ItemStack[] getInventory() { - return this.inventory; - } - - @Override - public ItemStack getStackInSlot(final int slot) { - return this.inventory[slot]; - } - - @Override - public void setInventorySlotContents(final int slot, final ItemStack stack) { - this.inventory[slot] = stack; - - if ((stack != null) && (stack.stackSize > this.getInventoryStackLimit())) { - stack.stackSize = this.getInventoryStackLimit(); - } - - // Don't forget this line or your inventory will not be saved! - this.markDirty(); - } - - // 1.7.2+ renamed to getInventoryName - @Override - public String getInventoryName() { - return this.name; - } - - // 1.7.2+ renamed to hasCustomInventoryName - @Override - public boolean hasCustomInventoryName() { - return this.name.length() > 0; - } - - @Override - public int getInventoryStackLimit() { - return 1; - } - - /** - * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime - * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change - * things in your inventory without ever opening a Gui, if you want. - */ - // 1.7.2+ renamed to markDirty - @Override - public void markDirty() { - for (int i = 0; i < this.getSizeInventory(); ++i) { - if ((this.getStackInSlot(i) != null) && (this.getStackInSlot(i).stackSize == 0)) { - this.inventory[i] = null; - } - } - } - - @Override - public boolean isUseableByPlayer(final EntityPlayer entityplayer) { - return true; - } - - // 1.7.2+ renamed to openInventory(EntityPlayer player) - @Override - public void openInventory() {} - - // 1.7.2+ renamed to closeInventory(EntityPlayer player) - @Override - public void closeInventory() {} - - /** - * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the - * inventory even when this returns false - */ - @Override - public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) { - return false; - } - - /** A list of one item containing the result of the crafting formula */ - private final ItemStack[] stackResult = new ItemStack[1]; - - /** - * Removes from an inventory slot (first arg) up to a specified number (second arg) of items and returns them in a - * new stack. - */ - /* - * @Override public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) { ItemStack stack = getStackInSlot(0); - * if (this.stackResult[0] != null) { ItemStack itemstack = this.stackResult[0]; this.stackResult[0] = null; return - * itemstack; } if(stack != null) { if(stack.stackSize > p_70298_2_) { stack = stack.splitStack(p_70298_2_); // - * Don't forget this line or your inventory will not be saved! markDirty(); } else { // this method also calls - * markDirty, so we don't need to call it again setInventorySlotContents(p_70298_1_, null); } } return stack; } - */ - @Override - public ItemStack decrStackSize(final int p_70298_1_, final int p_70298_2_) { - if (this.getStackInSlot(0) != null) { - Logger.INFO("getStackInSlot(0) contains " + this.getStackInSlot(0).getDisplayName()); - if (this.stackResult[0] == null) { - Logger.INFO("this.stackResult[0] == null"); - this.stackResult[0] = this.getStackInSlot(0); - } else if (this.stackResult[0] != null) { - Logger.INFO("this.stackResult[0] != null"); - if (this.stackResult[0].getDisplayName().toLowerCase() - .equals(this.getStackInSlot(0).getDisplayName().toLowerCase())) { - Logger.INFO("Items are the same?"); - } else { - Logger.INFO("Items are not the same."); - } - } - } - - if (this.stackResult[0] != null) { - Logger.INFO( - "this.stackResult[0] != null - Really never should be though. - Returning " - + this.stackResult[0].getDisplayName()); - final ItemStack itemstack = this.stackResult[0]; - this.stackResult[0] = null; - return itemstack; - } - return null; - } - - /** - * When some containers are closed they call this on each slot, then drop whatever it returns as an EntityItem - - * like when you close a workbench GUI. - */ - @Override - public ItemStack getStackInSlotOnClosing(final int p_70304_1_) { - if (this.stackResult[0] != null) { - final ItemStack itemstack = this.stackResult[0]; - this.stackResult[0] = null; - return itemstack; - } - return null; - } -} - -// Default Behaviour -/* - * @Override public ItemStack decrStackSize(int slot, int amount) { if(stack != null) { if(stack.stackSize > amount) { - * stack = stack.splitStack(amount); // Don't forget this line or your inventory will not be saved! markDirty(); } else - * { // this method also calls markDirty, so we don't need to call it again setInventorySlotContents(slot, null); } } - * return stack; } - */ - -// Default Behaviour -/* - * @Override public ItemStack getStackInSlotOnClosing(int slot) { ItemStack stack = getStackInSlot(slot); - * setInventorySlotContents(slot, null); return stack; } - */ diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java deleted file mode 100644 index a15527f935..0000000000 --- a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java +++ /dev/null @@ -1,160 +0,0 @@ -package gtPlusPlus.core.inventories; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - -import gregtech.api.items.GT_MetaGenerated_Tool; - -public class InventoryWorkbenchTools implements IInventory { - - private final String name = "Inventory Tools"; - - /** Defining your inventory size this way is handy */ - public static final int INV_SIZE = 5; - - /** Inventory's size must be same as number of slots you add to the Container class */ - private ItemStack[] inventory = new ItemStack[INV_SIZE]; - - /** - * @param itemstack - the ItemStack to which this inventory belongs - */ - public InventoryWorkbenchTools() {} - - public void readFromNBT(final NBTTagCompound nbt) { - final NBTTagList list = nbt.getTagList("Items", 10); - this.inventory = new ItemStack[INV_SIZE]; - for (int i = 0; i < list.tagCount(); i++) { - final NBTTagCompound data = list.getCompoundTagAt(i); - final int slot = data.getInteger("Slot"); - if ((slot >= 0) && (slot < INV_SIZE)) { - this.inventory[slot] = ItemStack.loadItemStackFromNBT(data); - } - } - } - - public void writeToNBT(final NBTTagCompound nbt) { - final NBTTagList list = new NBTTagList(); - for (int i = 0; i < INV_SIZE; i++) { - final ItemStack stack = this.inventory[i]; - if (stack != null) { - final NBTTagCompound data = new NBTTagCompound(); - stack.writeToNBT(data); - data.setInteger("Slot", i); - list.appendTag(data); - } - } - nbt.setTag("Items", list); - } - - @Override - public int getSizeInventory() { - return this.inventory.length; - } - - public ItemStack[] getInventory() { - return this.inventory; - } - - @Override - public ItemStack getStackInSlot(final int slot) { - return this.inventory[slot]; - } - - @Override - public ItemStack decrStackSize(final int slot, final int amount) { - ItemStack stack = this.getStackInSlot(slot); - if (stack != null) { - if (stack.stackSize > amount) { - stack = stack.splitStack(amount); - // Don't forget this line or your inventory will not be saved! - this.markDirty(); - } else { - // this method also calls markDirty, so we don't need to call it again - this.setInventorySlotContents(slot, null); - } - } - return stack; - } - - @Override - public ItemStack getStackInSlotOnClosing(final int slot) { - final ItemStack stack = this.getStackInSlot(slot); - this.setInventorySlotContents(slot, null); - return stack; - } - - @Override - public void setInventorySlotContents(final int slot, final ItemStack stack) { - this.inventory[slot] = stack; - - if ((stack != null) && (stack.stackSize > this.getInventoryStackLimit())) { - stack.stackSize = this.getInventoryStackLimit(); - } - - // Don't forget this line or your inventory will not be saved! - this.markDirty(); - } - - // 1.7.2+ renamed to getInventoryName - @Override - public String getInventoryName() { - return this.name; - } - - // 1.7.2+ renamed to hasCustomInventoryName - @Override - public boolean hasCustomInventoryName() { - return this.name.length() > 0; - } - - @Override - public int getInventoryStackLimit() { - return 1; - } - - /** - * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime - * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change - * things in your inventory without ever opening a Gui, if you want. - */ - // 1.7.2+ renamed to markDirty - @Override - public void markDirty() { - for (int i = 0; i < this.getSizeInventory(); ++i) { - if ((this.getStackInSlot(i) != null) && (this.getStackInSlot(i).stackSize == 0)) { - this.inventory[i] = null; - } - } - } - - @Override - public boolean isUseableByPlayer(final EntityPlayer entityplayer) { - return true; - } - - // 1.7.2+ renamed to openInventory(EntityPlayer player) - @Override - public void openInventory() {} - - // 1.7.2+ renamed to closeInventory(EntityPlayer player) - @Override - public void closeInventory() {} - - /** - * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the - * inventory even when this returns false - */ - @Override - public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) { - // Don't want to be able to store the inventory item within itself - // Bad things will happen, like losing your inventory - // Actually, this needs a custom Slot to work - if (itemstack.getItem() instanceof GT_MetaGenerated_Tool) { - return true; - } - return false; - } -} diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java deleted file mode 100644 index 91965f4826..0000000000 --- a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java +++ /dev/null @@ -1,165 +0,0 @@ -package gtPlusPlus.core.inventories; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - -import gregtech.api.items.GT_MetaGenerated_Tool; -import gtPlusPlus.core.slots.SlotGtToolElectric; -import ic2.api.item.IElectricItem; - -public class InventoryWorkbenchToolsElectric implements IInventory { - - private final String name = "Inventory Tools"; - - /** Defining your inventory size this way is handy */ - public static final int INV_SIZE = 5; - - /** Inventory's size must be same as number of slots you add to the Container class */ - private ItemStack[] inventory = new ItemStack[INV_SIZE]; - - private final Slot[] toolSlots = new SlotGtToolElectric[INV_SIZE]; // TODO - - /** - * @param itemstack - the ItemStack to which this inventory belongs - */ - public InventoryWorkbenchToolsElectric() {} - - public void readFromNBT(final NBTTagCompound nbt) { - final NBTTagList list = nbt.getTagList("Items", 10); - this.inventory = new ItemStack[INV_SIZE]; - for (int i = 0; i < list.tagCount(); i++) { - final NBTTagCompound data = list.getCompoundTagAt(i); - final int slot = data.getInteger("Slot"); - if ((slot >= 0) && (slot < INV_SIZE)) { - this.inventory[slot] = ItemStack.loadItemStackFromNBT(data); - } - } - } - - public void writeToNBT(final NBTTagCompound nbt) { - final NBTTagList list = new NBTTagList(); - for (int i = 0; i < INV_SIZE; i++) { - final ItemStack stack = this.inventory[i]; - if (stack != null) { - final NBTTagCompound data = new NBTTagCompound(); - stack.writeToNBT(data); - data.setInteger("Slot", i); - list.appendTag(data); - } - } - nbt.setTag("Items", list); - } - - @Override - public int getSizeInventory() { - return this.inventory.length; - } - - public ItemStack[] getInventory() { - return this.inventory; - } - - @Override - public ItemStack getStackInSlot(final int slot) { - return this.inventory[slot]; - } - - @Override - public ItemStack decrStackSize(final int slot, final int amount) { - ItemStack stack = this.getStackInSlot(slot); - if (stack != null) { - if (stack.stackSize > amount) { - stack = stack.splitStack(amount); - // Don't forget this line or your inventory will not be saved! - this.markDirty(); - } else { - // this method also calls markDirty, so we don't need to call it again - this.setInventorySlotContents(slot, null); - } - } - return stack; - } - - @Override - public ItemStack getStackInSlotOnClosing(final int slot) { - final ItemStack stack = this.getStackInSlot(slot); - this.setInventorySlotContents(slot, null); - return stack; - } - - @Override - public void setInventorySlotContents(final int slot, final ItemStack stack) { - this.inventory[slot] = stack; - - if ((stack != null) && (stack.stackSize > this.getInventoryStackLimit())) { - stack.stackSize = this.getInventoryStackLimit(); - } - - // Don't forget this line or your inventory will not be saved! - this.markDirty(); - } - - // 1.7.2+ renamed to getInventoryName - @Override - public String getInventoryName() { - return this.name; - } - - // 1.7.2+ renamed to hasCustomInventoryName - @Override - public boolean hasCustomInventoryName() { - return this.name.length() > 0; - } - - @Override - public int getInventoryStackLimit() { - return 1; - } - - /** - * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime - * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change - * things in your inventory without ever opening a Gui, if you want. - */ - // 1.7.2+ renamed to markDirty - @Override - public void markDirty() { - for (int i = 0; i < this.getSizeInventory(); ++i) { - if ((this.getStackInSlot(i) != null) && (this.getStackInSlot(i).stackSize == 0)) { - this.inventory[i] = null; - } - } - } - - @Override - public boolean isUseableByPlayer(final EntityPlayer entityplayer) { - return true; - } - - // 1.7.2+ renamed to openInventory(EntityPlayer player) - @Override - public void openInventory() {} - - // 1.7.2+ renamed to closeInventory(EntityPlayer player) - @Override - public void closeInventory() {} - - /** - * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the - * inventory even when this returns false - */ - @Override - public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) { - // Don't want to be able to store the inventory item within itself - // Bad things will happen, like losing your inventory - // Actually, this needs a custom Slot to work - if ((itemstack.getItem() instanceof GT_MetaGenerated_Tool) || (itemstack.getItem() instanceof IElectricItem)) { - return true; - } - return false; - } -} diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index dd07d2b138..060285f551 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -113,13 +113,11 @@ import gtPlusPlus.core.material.nuclear.NUCLIDE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.StringUtils; -import gtPlusPlus.core.util.debug.DEBUG_INIT; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.everglades.GTplusplus_Everglades; -import gtPlusPlus.preloader.CORE_Preloader; import gtPlusPlus.xmod.cofh.HANDLER_COFH; import gtPlusPlus.xmod.eio.material.MaterialEIO; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -429,11 +427,6 @@ public final class ModItems { itemDummyResearch = new ItemDummyResearch(); itemCustomSpawnEgg = new ItemCustomSpawnEgg(); - // Debug Loading - if (CORE_Preloader.DEBUG_MODE) { - DEBUG_INIT.registerItems(); - } - itemDebugAreaClear = new ItemAreaClear(); // Register meta item, because we need them for everything. @@ -1025,9 +1018,6 @@ public final class ModItems { toolGregtechPump.registerPumpType(2, "Super Hand Pump", 128000, 2); toolGregtechPump.registerPumpType(3, "Ultimate Hand Pump", 512000, 3); - // Create Multi-tools - // ItemsMultiTools.load(); - // Xp Fluids - Dev if (!FluidRegistry.isFluidRegistered("mobessence")) { FluidUtils.generateFluidNoPrefix("mobessence", "mobessence", 0, new short[] { 125, 175, 125, 100 }); @@ -1153,11 +1143,6 @@ public final class ModItems { itemDetCable.setTextureName("string"); itemBomb = new ItemThrowableBomb(); - // Only used for debugging. - /* - * if (CORE.DEVENV) { new ConnectedBlockFinder(); } - */ - // Misc Items @SuppressWarnings("unused") Item tI; diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemBrain.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBrain.java deleted file mode 100644 index cdf98b9547..0000000000 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemBrain.java +++ /dev/null @@ -1,94 +0,0 @@ -package gtPlusPlus.core.item.base; - -import java.util.List; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StatCollector; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -/* - * Key Point: You can access the NBT compound data from the Item class (in those methods that pass an ItemStack), but - * the NBT compound can only be set on an ItemStack. The steps to add NBT data to an ItemStack: Create or otherwise get - * an ItemStack of the desired item Create an NBTTagCompound and fill it with the appropriate data Call - * ItemStack#setTagCompound() method to set it. - */ - -public class BaseItemBrain extends Item { - - // This is an array of all the types I am going to be adding. - String[] brainTypes = { "dead", "preserved", "fresh", "tasty" }; - - // This method allows us to have different language translation keys for - // each item we add. - @Override - public String getUnlocalizedName(final ItemStack stack) { - // This makes sure that the stack has a tag compound. This is how data - // is stored on items. - if (stack.hasTagCompound()) { - // This is the object holding all of the item data. - final NBTTagCompound itemData = stack.getTagCompound(); - // This checks to see if the item has data stored under the - // brainType key. - if (itemData.hasKey("brainType")) { - // This retrieves data from the brainType key and uses it in - // the return value - return "item." + itemData.getString("brainType"); - } - } - // This will be used if the item is obtained without nbt data on it. - return "item.nullBrain"; - } - - // This is a fun method which allows us to run some code when our item is - // shown in a creative tab. I am going to use it to add all the brain - // types. - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(final Item item, final CreativeTabs tab, final List itemList) { - // This creates a loop with a counter. It will go through once for - // every listing in brainTypes, and gives us a number associated - // with each listing. - for (int pos = 0; pos < this.brainTypes.length; pos++) { - // This creates a new ItemStack instance. The item parameter - // supplied is this item. - final ItemStack brainStack = new ItemStack(item); - // By default, a new ItemStack does not have any nbt compound data. - // We need to give it some. - brainStack.setTagCompound(new NBTTagCompound()); - // Now we set the type of the item, brainType is the key, and - // brainTypes[pos] is grabbing a - // entry from the brainTypes array. - brainStack.getTagCompound().setString("brainType", this.brainTypes[pos]); - // And this adds it to the itemList, which is a list of all items - // in the creative tab. - itemList.add(brainStack); - } - } - - // This code will allow us to tell the items apart in game. You can change - @SuppressWarnings({ "rawtypes", "unchecked" }) - // texture based on nbt data, but I won't be covering that. - @Override - @SideOnly(Side.CLIENT) - public void addInformation(final ItemStack stack, final EntityPlayer player, final List tooltip, - final boolean isAdvanced) { - if (stack.hasTagCompound() && stack.getTagCompound().hasKey("brainType")) { - // StatCollector is a class which allows us to handle string - // language translation. This requires that you fill out the - // translation in you language class. - tooltip.add( - StatCollector.translateToLocal( - "tooltip.yourmod." + stack.getTagCompound().getString("brainType") + ".desc")); - } else // If the brain does not have valid tag data, a default message - { - tooltip.add(StatCollector.translateToLocal("tooltip.yourmod.nullbrain.desc")); - } - } -} diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java deleted file mode 100644 index eb75c1fe5d..0000000000 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java +++ /dev/null @@ -1,27 +0,0 @@ -package gtPlusPlus.core.item.base; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import java.util.List; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class BaseItemGeneric extends Item { - - public BaseItemGeneric(final String unlocalizedName, final CreativeTabs c, final int stackSize, final int maxDmg) { - this.setUnlocalizedName(GTPlusPlus.ID + "_" + unlocalizedName); - this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); - this.setCreativeTab(c); - this.setMaxStackSize(stackSize); - this.setMaxDamage(maxDmg); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - super.addInformation(stack, aPlayer, list, bool); - } -} diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java deleted file mode 100644 index 5f4795689d..0000000000 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java +++ /dev/null @@ -1,105 +0,0 @@ -package gtPlusPlus.core.item.base; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import java.util.List; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import gregtech.api.enums.Materials; -import gtPlusPlus.api.enums.Quality; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class BaseItemLoot extends Item { - - private final String materialName; - private final String unlocalName; - private final LootTypes lootTypes; - private Quality lootQuality; - private final Materials lootMaterial; - - public BaseItemLoot(final LootTypes lootType, final Materials material) { - this.lootTypes = lootType; - this.lootMaterial = material; - this.materialName = material.mDefaultLocalName; - this.unlocalName = "item" + lootType.LOOT_TYPE + this.materialName; - this.setUnlocalizedName(this.unlocalName); - this.setMaxStackSize(1); - this.setTextureName(GTPlusPlus.ID + ":" + "item" + lootType.LOOT_TYPE); - } - - public ItemStack generateLootStack() { - this.lootQuality = Quality.getRandomQuality(); - return ItemUtils.getSimpleStack(this, 1); - } - - @Override - public String getItemStackDisplayName(final ItemStack p_77653_1_) { - return (this.materialName + this.lootTypes.DISPLAY_SUFFIX); - } - - public final String getMaterialName() { - return this.materialName; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - list.add(this.lootQuality.getQuality()); - - /* - * if (componentMaterial.isRadioactive){ list.add(CORE.GT_Tooltip_Radioactive.get()); } - */ - - super.addInformation(stack, aPlayer, list, bool); - } - - @Override - public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) { - final short[] temp = this.lootMaterial.mRGBa; - return Utils.rgbtoHexValue(temp[0], temp[1], temp[2]); - } - - @Override - public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, - final boolean p_77663_5_) { - // EntityUtils.applyRadiationDamageToEntity(lootQuality.vRadioationLevel, world, entityHolding); - } - - public static enum LootTypes { - - Sword("Sword", " Longsword", "sword"), - Shortsword("Sword", " Short Blade", "blade"), - Helmet("Helmet", " Medium Helm", "helmet"), - Chestplate("Platebody", " Chestplate", "platebody"), - Leggings("Platelegs", " Platelegs", "platelegs"), - Boots("Boots", " Boots", "boots"); - - private String LOOT_TYPE; - private String DISPLAY_SUFFIX; - private String OREDICT_NAME; - - private LootTypes(final String LocalName, final String DisplayName, final String OreDictName) { - this.LOOT_TYPE = LocalName; - this.DISPLAY_SUFFIX = DisplayName; - this.OREDICT_NAME = OreDictName; - } - - public String getLootType() { - return this.LOOT_TYPE; - } - - public String getName() { - return this.DISPLAY_SUFFIX; - } - - public String getOreDictName() { - return this.OREDICT_NAME; - } - } -} diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java deleted file mode 100644 index a056b57852..0000000000 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java +++ /dev/null @@ -1,67 +0,0 @@ -package gtPlusPlus.core.item.base; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import java.util.List; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; - -import gtPlusPlus.core.creative.AddToCreativeTab; - -public class BaseItemWithCharge extends Item { - - public int int_Charge = 0; - public int int_Max_Charge = 0; - - public BaseItemWithCharge(final String unlocalizedName, final int constructor_Charge, - final int constructor_Max_Charge) { - this.setUnlocalizedName(unlocalizedName); - this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); - this.setMaxStackSize(1); - this.setCreativeTab(AddToCreativeTab.tabMachines); - this.int_Charge = constructor_Charge; - this.int_Max_Charge = constructor_Max_Charge; - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - int NBT_Charge = this.int_Charge; - int NBT_Max_Charge = this.int_Max_Charge; - if (stack.stackTagCompound != null) { - NBT_Charge = stack.stackTagCompound.getInteger("charge_Current"); - NBT_Max_Charge = stack.stackTagCompound.getInteger("charge_Max"); - final String tempX = String.valueOf(NBT_Charge); - final String tempY = String.valueOf(NBT_Max_Charge); - final String formattedX = EnumChatFormatting.RED + tempX + EnumChatFormatting.GRAY; - final String formattedY = EnumChatFormatting.DARK_RED + tempY + EnumChatFormatting.GRAY; - list.add(EnumChatFormatting.GRAY + "Charge:" + formattedX + "/" + formattedY + "."); - super.addInformation(stack, aPlayer, list, bool); - } - } - - // Ticking and NBT Handling - /* - * Called each tick as long the item is on a player inventory. Uses by maps to check if is on a player hand and - * update it's contents. public int fuelRemaining = 0; public int maximumFuel = 0; public String fuelType = ""; - * public float heat = 0; public float maxHeat = 5000; - */ - @Override - public void onCreated(final ItemStack itemStack, final World world, final EntityPlayer player) {} - - @Override - public void onUpdate(final ItemStack itemStack, final World par2World, final Entity par3Entity, final int par4, - final boolean par5) {} - - @Override - public ItemStack onItemRightClick(final ItemStack itemStack, final World world, final EntityPlayer par3Entity) { - itemStack.stackTagCompound = new NBTTagCompound(); - return super.onItemRightClick(itemStack, world, par3Entity); - } -} diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/OilChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/OilChem.java deleted file mode 100644 index b3c0842327..0000000000 --- a/src/main/java/gtPlusPlus/core/item/chemistry/OilChem.java +++ /dev/null @@ -1,35 +0,0 @@ -package gtPlusPlus.core.item.chemistry; - -import gtPlusPlus.api.objects.minecraft.ItemPackage; - -public class OilChem extends ItemPackage { - - /** - * Fluids - */ - - /** - * Items - */ - @Override - public void items() {} - - @Override - public void blocks() { - // None yet - } - - @Override - public void fluids() {} - - @Override - public String errorMessage() { - return "Failed to generate recipes for OilChem."; - } - - @Override - public boolean generateRecipes() { - - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/item/effects/RarityEffect.java b/src/main/java/gtPlusPlus/core/item/effects/RarityEffect.java deleted file mode 100644 index ac51c20a18..0000000000 --- a/src/main/java/gtPlusPlus/core/item/effects/RarityEffect.java +++ /dev/null @@ -1,37 +0,0 @@ -package gtPlusPlus.core.item.effects; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -/* - * This determines the name colour. EnumRarity can be: EnumRarity.common - the standard white colour. - * EnumRarity.uncommon - a yellow colour. EnumRarity.rare - a light blue colour. This is used for enchanted items. - * EnumRarity.epic - the purple colour used on the Golden Apple. - * @SideOnly is an FML annotation. It marks the method below it for existing only on one side. Possible values are: - * Side.CLIENT is probably the most common one. This marks the method as existing only on the client side. Side.SERVER - * marks the method as existing only on the server side. - */ - -public class RarityEffect extends Item { - - public RarityEffect(final int par1) { - super(); - this.setCreativeTab(CreativeTabs.tabMaterials); - } - - @Override - @SideOnly(Side.CLIENT) - public EnumRarity getRarity(final ItemStack par1ItemStack) { - return EnumRarity.common; - } - - @Override - public boolean hasEffect(final ItemStack par1ItemStack) { - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/item/effects/RarityEpic.java b/src/main/java/gtPlusPlus/core/item/effects/RarityEpic.java deleted file mode 100644 index a8081615d7..0000000000 --- a/src/main/java/gtPlusPlus/core/item/effects/RarityEpic.java +++ /dev/null @@ -1,28 +0,0 @@ -package gtPlusPlus.core.item.effects; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class RarityEpic extends Item { - - public RarityEpic(final int par1) { - super(); - this.setCreativeTab(CreativeTabs.tabMaterials); - } - - @Override - @SideOnly(Side.CLIENT) - public EnumRarity getRarity(final ItemStack par1ItemStack) { - return EnumRarity.epic; - } - - @Override - public boolean hasEffect(final ItemStack par1ItemStack) { - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/item/effects/RarityRare.java b/src/main/java/gtPlusPlus/core/item/effects/RarityRare.java deleted file mode 100644 index e448cfafe7..0000000000 --- a/src/main/java/gtPlusPlus/core/item/effects/RarityRare.java +++ /dev/null @@ -1,28 +0,0 @@ -package gtPlusPlus.core.item.effects; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class RarityRare extends Item { - - public RarityRare() { - super(); - this.setCreativeTab(CreativeTabs.tabMaterials); - } - - @Override - @SideOnly(Side.CLIENT) - public EnumRarity getRarity(final ItemStack par1ItemStack) { - return EnumRarity.rare; - } - - @Override - public boolean hasEffect(final ItemStack par1ItemStack) { - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/item/effects/RarityUncommon.java b/src/main/java/gtPlusPlus/core/item/effects/RarityUncommon.java deleted file mode 100644 index 89764a718f..0000000000 --- a/src/main/java/gtPlusPlus/core/item/effects/RarityUncommon.java +++ /dev/null @@ -1,22 +0,0 @@ -package gtPlusPlus.core.item.effects; - -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class RarityUncommon extends Item { - - @Override - @SideOnly(Side.CLIENT) - public EnumRarity getRarity(final ItemStack par1ItemStack) { - return EnumRarity.uncommon; - } - - @Override - public boolean hasEffect(final ItemStack par1ItemStack) { - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java b/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java deleted file mode 100644 index 099347eb76..0000000000 --- a/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java +++ /dev/null @@ -1,95 +0,0 @@ -package gtPlusPlus.core.item.general; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import java.util.List; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; - -import gtPlusPlus.core.creative.AddToCreativeTab; - -public class BedLocator_Base extends Item { - - public int bed_X = 0; - public int bed_Y = 0; - public int bed_Z = 0; - - public BedLocator_Base(final String unlocalizedName) { - this.setUnlocalizedName(unlocalizedName); - this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); - this.setMaxStackSize(1); - this.setCreativeTab(AddToCreativeTab.tabMachines); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - - int NBT_X = this.bed_X; - int NBT_Y = this.bed_Y; - int NBT_Z = this.bed_Z; - - if (stack.stackTagCompound != null) { - NBT_X = stack.stackTagCompound.getInteger("pos_x"); - NBT_Y = stack.stackTagCompound.getInteger("pos_y"); - NBT_Z = stack.stackTagCompound.getInteger("pos_z"); - - final String tempX = String.valueOf(NBT_X); - final String tempY = String.valueOf(NBT_Y); - final String tempZ = String.valueOf(NBT_Z); - final String formattedX = EnumChatFormatting.DARK_RED + tempX + EnumChatFormatting.GRAY; - final String formattedY = EnumChatFormatting.RED + tempY + EnumChatFormatting.GRAY; - final String formattedZ = EnumChatFormatting.RED + tempZ + EnumChatFormatting.GRAY; - - list.add(EnumChatFormatting.GRAY + "X: " + formattedX + "."); - list.add(EnumChatFormatting.GRAY + "Y: " + formattedY + "."); - list.add(EnumChatFormatting.GRAY + "Z: " + formattedZ + "."); - super.addInformation(stack, aPlayer, list, bool); - } - } - - // Ticking and NBT Handling - /* - * Called each tick as long the item is on a player inventory. Uses by maps to check if is on a player hand and - * update it's contents. public int fuelRemaining = 0; public int maximumFuel = 0; public String fuelType = ""; - * public float heat = 0; public float maxHeat = 5000; - */ - @Override - public void onCreated(final ItemStack itemStack, final World world, final EntityPlayer player) { - itemStack.stackTagCompound = new NBTTagCompound(); - this.bed_X = 0; - this.bed_Y = 0; - this.bed_Z = 0; - itemStack.stackTagCompound.setInteger("pos_x", this.bed_X); - itemStack.stackTagCompound.setInteger("pos_y", this.bed_Y); - itemStack.stackTagCompound.setInteger("pos_z", this.bed_Z); - } - - @Override - public void onUpdate(final ItemStack itemStack, final World par2World, final Entity par3Entity, final int par4, - final boolean par5) {} - - @Override - public ItemStack onItemRightClick(final ItemStack itemStack, final World world, final EntityPlayer par3Entity) { - itemStack.stackTagCompound = new NBTTagCompound(); - if (par3Entity.getBedLocation() != null) { - this.bed_X = par3Entity.getBedLocation().posX; - this.bed_Y = par3Entity.getBedLocation().posY; - this.bed_Z = par3Entity.getBedLocation().posZ; - } else { - this.bed_X = 0; - this.bed_Y = 0; - this.bed_Z = 0; - } - itemStack.stackTagCompound.setInteger("pos_x", this.bed_X); - itemStack.stackTagCompound.setInteger("pos_y", this.bed_Y); - itemStack.stackTagCompound.setInteger("pos_z", this.bed_Z); - return super.onItemRightClick(itemStack, world, par3Entity); - } -} diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java b/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java deleted file mode 100644 index 6decd29b06..0000000000 --- a/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java +++ /dev/null @@ -1,60 +0,0 @@ -package gtPlusPlus.core.item.general; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.GregTech_API; - -public class ItemCreativeTab extends Item { - - public IIcon[] icons = new IIcon[10]; - - public ItemCreativeTab() { - super(); - this.setHasSubtypes(true); - String unlocalizedName = "itemCreativeTabs"; - this.setUnlocalizedName(unlocalizedName); - this.setCreativeTab(GregTech_API.TAB_GREGTECH); - GameRegistry.registerItem(this, unlocalizedName); - } - - @Override - public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_0"); - this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_1"); - this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_2"); - this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_3"); - this.icons[4] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_4"); - this.icons[5] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_5"); - this.icons[6] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_6"); - this.icons[7] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_7"); - this.icons[8] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_8"); - this.icons[9] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_9"); - } - - @Override - public IIcon getIconFromDamage(int meta) { - return this.icons[meta]; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { - for (int i = 0; i < 10; i++) { - list.add(new ItemStack(item, 1, i)); - } - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return this.getUnlocalizedName() + "_" + stack.getItemDamage(); - } -} diff --git a/src/main/java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java b/src/main/java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java deleted file mode 100644 index 92a5fafe20..0000000000 --- a/src/main/java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java +++ /dev/null @@ -1,188 +0,0 @@ -package gtPlusPlus.core.item.general; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.FillBucketEvent; - -import cpw.mods.fml.common.eventhandler.Event; - -public class NuclearFuelRodBase extends Item { - - /** field for checking if the bucket has been filled. */ - private final Block isFull; - - public NuclearFuelRodBase(final Block p_i45331_1_) { - this.maxStackSize = 1; - this.isFull = p_i45331_1_; - this.setCreativeTab(CreativeTabs.tabMisc); - } - - /** - * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer - */ - @Override - public ItemStack onItemRightClick(final ItemStack p_77659_1_, final World p_77659_2_, - final EntityPlayer p_77659_3_) { - final boolean flag = this.isFull == Blocks.air; - final MovingObjectPosition movingobjectposition = this - .getMovingObjectPositionFromPlayer(p_77659_2_, p_77659_3_, flag); - - if (movingobjectposition == null) { - return p_77659_1_; - } - final FillBucketEvent event = new FillBucketEvent(p_77659_3_, p_77659_1_, p_77659_2_, movingobjectposition); - if (MinecraftForge.EVENT_BUS.post(event)) { - return p_77659_1_; - } - - if (event.getResult() == Event.Result.ALLOW) { - if (p_77659_3_.capabilities.isCreativeMode) { - return p_77659_1_; - } - - if (--p_77659_1_.stackSize <= 0) { - return event.result; - } - - if (!p_77659_3_.inventory.addItemStackToInventory(event.result)) { - p_77659_3_.dropPlayerItemWithRandomChoice(event.result, false); - } - - return p_77659_1_; - } - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { - int i = movingobjectposition.blockX; - int j = movingobjectposition.blockY; - int k = movingobjectposition.blockZ; - - if (!p_77659_2_.canMineBlock(p_77659_3_, i, j, k)) { - return p_77659_1_; - } - - if (flag) { - if (!p_77659_3_.canPlayerEdit(i, j, k, movingobjectposition.sideHit, p_77659_1_)) { - return p_77659_1_; - } - - final Material material = p_77659_2_.getBlock(i, j, k).getMaterial(); - final int l = p_77659_2_.getBlockMetadata(i, j, k); - - if ((material == Material.water) && (l == 0)) { - p_77659_2_.setBlockToAir(i, j, k); - return this.func_150910_a(p_77659_1_, p_77659_3_, Items.water_bucket); - } - - if ((material == Material.lava) && (l == 0)) { - p_77659_2_.setBlockToAir(i, j, k); - return this.func_150910_a(p_77659_1_, p_77659_3_, Items.lava_bucket); - } - } else { - if (this.isFull == Blocks.air) { - return new ItemStack(Items.bucket); - } - - if (movingobjectposition.sideHit == 0) { - --j; - } - - if (movingobjectposition.sideHit == 1) { - ++j; - } - - if (movingobjectposition.sideHit == 2) { - --k; - } - - if (movingobjectposition.sideHit == 3) { - ++k; - } - - if (movingobjectposition.sideHit == 4) { - --i; - } - - if (movingobjectposition.sideHit == 5) { - ++i; - } - - if (!p_77659_3_.canPlayerEdit(i, j, k, movingobjectposition.sideHit, p_77659_1_)) { - return p_77659_1_; - } - - if (this.tryPlaceContainedLiquid(p_77659_2_, i, j, k) && !p_77659_3_.capabilities.isCreativeMode) { - return new ItemStack(Items.bucket); - } - } - } - - return p_77659_1_; - } - - private ItemStack func_150910_a(final ItemStack p_150910_1_, final EntityPlayer p_150910_2_, - final Item p_150910_3_) { - if (p_150910_2_.capabilities.isCreativeMode) { - return p_150910_1_; - } else if (--p_150910_1_.stackSize <= 0) { - return new ItemStack(p_150910_3_); - } else { - if (!p_150910_2_.inventory.addItemStackToInventory(new ItemStack(p_150910_3_))) { - p_150910_2_.dropPlayerItemWithRandomChoice(new ItemStack(p_150910_3_, 1, 0), false); - } - - return p_150910_1_; - } - } - - /** - * Attempts to place the liquid contained inside the bucket. - */ - public boolean tryPlaceContainedLiquid(final World p_77875_1_, final int p_77875_2_, final int p_77875_3_, - final int p_77875_4_) { - if (this.isFull == Blocks.air) { - return false; - } - final Material material = p_77875_1_.getBlock(p_77875_2_, p_77875_3_, p_77875_4_).getMaterial(); - final boolean flag = !material.isSolid(); - - if (!p_77875_1_.isAirBlock(p_77875_2_, p_77875_3_, p_77875_4_) && !flag) { - return false; - } - if (p_77875_1_.provider.isHellWorld && (this.isFull == Blocks.flowing_water)) { - p_77875_1_.playSoundEffect( - p_77875_2_ + 0.5F, - p_77875_3_ + 0.5F, - p_77875_4_ + 0.5F, - "random.fizz", - 0.5F, - 2.6F + ((p_77875_1_.rand.nextFloat() - p_77875_1_.rand.nextFloat()) * 0.8F)); - - for (int l = 0; l < 8; ++l) { - p_77875_1_.spawnParticle( - "largesmoke", - p_77875_2_ + Math.random(), - p_77875_3_ + Math.random(), - p_77875_4_ + Math.random(), - 0.0D, - 0.0D, - 0.0D); - } - } else { - if (!p_77875_1_.isRemote && flag && !material.isLiquid()) { - p_77875_1_.func_147480_a(p_77875_2_, p_77875_3_, p_77875_4_, true); - } - - p_77875_1_.setBlock(p_77875_2_, p_77875_3_, p_77875_4_, this.isFull, 0, 3); - } - - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java b/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java deleted file mode 100644 index ff0b923ca4..0000000000 --- a/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java +++ /dev/null @@ -1,205 +0,0 @@ -package gtPlusPlus.core.item.general.fuelrods; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import java.util.List; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; - -import gtPlusPlus.core.creative.AddToCreativeTab; - -public class FuelRod_Base extends Item { - - public int fuelRemaining = 0; - public int maximumFuel = 0; - public String fuelType = ""; - public float heat = 0; - public float maxHeat = this.getMaxHeat(); - - public FuelRod_Base(final String unlocalizedName, final String type, final int fuelLeft, final int maxFuel) { - this.setUnlocalizedName(unlocalizedName); - this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); - this.setMaxStackSize(1); - this.setMaxDamage(maxFuel); - this.maximumFuel = maxFuel; - this.fuelRemaining = fuelLeft; - this.fuelType = type; - this.setCreativeTab(AddToCreativeTab.tabMachines); - } - - private float getMaxHeat() { - float tempvar; - if (this.fuelType == "Thorium") { - tempvar = 2500; - } else if (this.fuelType == "Uranium") { - tempvar = 5000; - } else if (this.fuelType == "Plutonium") { - tempvar = 10000; - } else { - tempvar = 5000; - } - return tempvar; - } - - private void updateVars(final ItemStack stack) { - if (stack.stackTagCompound != null) { - this.heat = stack.stackTagCompound.getFloat("heat"); - this.fuelRemaining = stack.stackTagCompound.getInteger("fuelRemaining"); - } - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - - Float NBT_Heat = this.heat; - Float NBT_MaxHeat = this.maxHeat; - int NBT_Fuel = this.fuelRemaining; - String NBT_Type = this.fuelType; - - if (stack.stackTagCompound != null) { - NBT_Heat = stack.stackTagCompound.getFloat("heat"); - NBT_MaxHeat = stack.stackTagCompound.getFloat("maxHeat"); - NBT_Fuel = stack.stackTagCompound.getInteger("fuelRemaining"); - NBT_Type = stack.stackTagCompound.getString("fuelType"); - } - - final String tempHeat = String.valueOf(NBT_Heat); - final String tempMaxHeat = String.valueOf(NBT_MaxHeat); - final String tempFuel = String.valueOf(NBT_Fuel); - final String formattedType = EnumChatFormatting.DARK_RED + NBT_Type + EnumChatFormatting.GRAY; - String formattedHeat = EnumChatFormatting.RED + tempHeat + EnumChatFormatting.GRAY; - final String formattedMaxHeat = EnumChatFormatting.RED + tempMaxHeat + EnumChatFormatting.GRAY; - String formattedFuelLeft = tempFuel + EnumChatFormatting.GRAY; - - final int tempMax = this.maximumFuel; - final float tempCurrentHeat = this.heat; - final int tempFuelLeft = this.fuelRemaining; - - // Fuel Usage Formatting - if (tempFuelLeft <= (this.maximumFuel / 3)) { - formattedFuelLeft = EnumChatFormatting.RED + tempFuel + EnumChatFormatting.GRAY; - } else if ((tempFuelLeft >= (this.maximumFuel / 3)) && (tempFuelLeft <= ((this.maximumFuel / 3) * 2))) { - formattedFuelLeft = EnumChatFormatting.YELLOW + tempFuel + EnumChatFormatting.GRAY; - } else if ((tempFuelLeft >= ((this.maximumFuel / 3) * 2)) && (tempFuelLeft <= this.maximumFuel)) { - formattedFuelLeft = EnumChatFormatting.GREEN + tempFuel + EnumChatFormatting.GRAY; - } else { - formattedFuelLeft = EnumChatFormatting.GRAY + tempFuel + EnumChatFormatting.GRAY; - } - - // Heat Formatting - if ((tempCurrentHeat <= 200) && (tempCurrentHeat >= 0)) { - formattedHeat = EnumChatFormatting.GRAY + tempHeat + EnumChatFormatting.GRAY; - } else if ((tempCurrentHeat <= (this.maxHeat / 3)) && (tempCurrentHeat > 200)) { - formattedHeat = EnumChatFormatting.YELLOW + tempHeat + EnumChatFormatting.GRAY; - } else if ((tempCurrentHeat >= (this.maxHeat / 3)) && (tempMax < ((this.maxHeat / 3) * 2)) - && (tempCurrentHeat != 0)) { - formattedHeat = EnumChatFormatting.GOLD + tempHeat + EnumChatFormatting.GRAY; - } else - if ((tempCurrentHeat >= ((this.maxHeat / 3) * 2)) && (tempMax <= this.maxHeat) && (tempCurrentHeat != 0)) { - formattedHeat = EnumChatFormatting.RED + tempHeat + EnumChatFormatting.GRAY; - } else { - formattedHeat = EnumChatFormatting.BLUE + tempHeat + EnumChatFormatting.GRAY; - } - list.add(EnumChatFormatting.GRAY + "A " + formattedType + " Fuel Rod."); - list.add(EnumChatFormatting.GRAY + "Running at " + formattedHeat + "/" + formattedMaxHeat + " Kelvin."); - list.add(EnumChatFormatting.GRAY + "Fuel Remaining: " + formattedFuelLeft + "L."); - super.addInformation(stack, aPlayer, list, bool); - } - - public String getType(final ItemStack stack) { - if (stack.stackTagCompound != null) { - return stack.stackTagCompound.getString("fuelType"); - } - return this.fuelType; - } - - public int getFuelRemaining(final ItemStack stack) { - if (stack.stackTagCompound != null) { - return stack.stackTagCompound.getInteger("fuelRemaining"); - } - return 0; - } - - public int getMaxFuel() { - return this.maximumFuel; - } - - public int getFuel(final ItemStack stack) { - if (stack != null) { - final int i = stack.getItemDamage(); - final int r = this.maximumFuel - i; - return r; - } - return 0; - } - - public boolean setFuelRemainingExplicitly(final int i) { - final int tempFuel = this.fuelRemaining; - this.fuelRemaining = i; - if (i != tempFuel) { - return true; - } - return false; - } - - public boolean addFuel(final int i) { - final int tempFuel = this.fuelRemaining; - this.fuelRemaining = tempFuel + i; - if (this.fuelRemaining != tempFuel) { - return true; - } - return false; - } - - public float getHeat(final ItemStack value) { - if (value.stackTagCompound != null) { - return value.stackTagCompound.getFloat("heat"); - } - return 0f; - } - - public boolean addHeat(final float i) { - final float tempFuel = this.heat; - this.heat = tempFuel + i; - if (this.heat != tempFuel) { - return true; - } - return false; - } - - // Ticking and NBT Handling - /* - * Called each tick as long the item is on a player inventory. Uses by maps to check if is on a player hand and - * update it's contents. public int fuelRemaining = 0; public int maximumFuel = 0; public String fuelType = ""; - * public float heat = 0; public float maxHeat = 5000; - */ - @Override - public void onCreated(final ItemStack itemStack, final World world, final EntityPlayer player) { - itemStack.stackTagCompound = new NBTTagCompound(); - itemStack.stackTagCompound.setInteger("fuelRemaining", this.getFuelRemaining(itemStack)); - itemStack.stackTagCompound.setInteger("maximumFuel", this.maximumFuel); - itemStack.stackTagCompound.setFloat("heat", this.getHeat(itemStack)); - itemStack.stackTagCompound.setFloat("maxHeat", this.getMaxHeat()); - itemStack.stackTagCompound.setString("fuelType", this.getType(itemStack)); - this.updateVars(itemStack); - } - - @Override - public void onUpdate(final ItemStack itemStack, final World par2World, final Entity par3Entity, final int par4, - final boolean par5) { - itemStack.stackTagCompound = new NBTTagCompound(); - itemStack.stackTagCompound.setInteger("fuelRemaining", this.getFuelRemaining(itemStack)); - itemStack.stackTagCompound.setInteger("maximumFuel", this.maximumFuel); - itemStack.stackTagCompound.setFloat("heat", this.getHeat(itemStack)); - itemStack.stackTagCompound.setFloat("maxHeat", this.getMaxHeat()); - itemStack.stackTagCompound.setString("fuelType", this.getType(itemStack)); - this.updateVars(itemStack); - } -} diff --git a/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java b/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java deleted file mode 100644 index 4b25d0ae8b..0000000000 --- a/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java +++ /dev/null @@ -1,12 +0,0 @@ -package gtPlusPlus.core.item.general.fuelrods; - -public class FuelRod_Thorium extends FuelRod_Base { - - public FuelRod_Thorium(final String unlocalizedName, final String type, final int fuelLeft, final int maxFuel) { - super(unlocalizedName, type, fuelLeft, maxFuel); - this.setMaxDamage(maxFuel); - this.maximumFuel = maxFuel; - this.fuelRemaining = fuelLeft; - this.fuelType = type; - } -} diff --git a/src/main/java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java b/src/main/java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java deleted file mode 100644 index 90dc554165..0000000000 --- a/src/main/java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java +++ /dev/null @@ -1,107 +0,0 @@ -package gtPlusPlus.core.item.general.rfchargingpack; - -import java.util.List; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; - -import cofh.api.energy.ItemEnergyContainer; -import gtPlusPlus.core.util.math.MathUtils; - -public class ChargingPackBase extends ItemEnergyContainer { - - protected final int mCapacityMax; - protected final byte mTier; - - public ChargingPackBase(byte tier) { - this( - tier, - (tier == 1 ? 4000000 : tier == 2 ? 8000000 : tier == 3 ? 16000000 : tier == 4 ? 32000000 : 64000000)); - } - - private ChargingPackBase(byte tier, int maxStorage) { - super(maxStorage); - mTier = tier; - mCapacityMax = maxStorage; - } - - public int getMaxEnergyInput(ItemStack container) { - return this.maxReceive; - } - - public int getMaxEnergyExtracted(ItemStack container) { - return this.maxExtract; - } - - @Override - public void onUpdate(ItemStack aStack, World aWorld, Entity aEnt, int p_77663_4_, boolean p_77663_5_) { - super.onUpdate(aStack, aWorld, aEnt, p_77663_4_, p_77663_5_); - - ItemEnergyContainer current = this; - int currentStored = 0; - if (current != null) { - currentStored = current.getEnergyStored(aStack); - } - if (currentStored > 0) { - if (aEnt instanceof EntityPlayer) { - if (((EntityPlayer) aEnt).inventory != null) { - for (ItemStack invStack : ((EntityPlayer) aEnt).inventory.mainInventory) { - if (invStack != null) { - if (invStack.getItem() instanceof ItemEnergyContainer) { - if (current != null) { - currentStored = current.getEnergyStored(aStack); - if (currentStored > 0) { - int mTransLimit; - int mMaxStorage; - int mCurrent; - mTransLimit = getMaxEnergyInput(invStack); - mMaxStorage = current.getMaxEnergyStored(invStack); - mCurrent = current.getEnergyStored(invStack); - if (mCurrent + mTransLimit <= mMaxStorage) { - current.extractEnergy( - aStack, - current.receiveEnergy(invStack, mTransLimit, false), - false); - } - } - } - } - } - } - } - } - } - } - - @Override - public void addInformation(ItemStack stack, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { - list.add(EnumChatFormatting.RED + "RF Information"); - list.add( - EnumChatFormatting.GRAY + "Extraction Rate: [" - + EnumChatFormatting.RED - + this.maxExtract - + EnumChatFormatting.GRAY - + "Rf/t]" - + " Insert Rate: [" - + EnumChatFormatting.RED - + this.maxReceive - + EnumChatFormatting.GRAY - + "Rf/t]"); - list.add( - EnumChatFormatting.GRAY + "Current Charge: [" - + EnumChatFormatting.RED - + this.getEnergyStored(stack) - + EnumChatFormatting.GRAY - + "Rf / " - + this.getMaxEnergyStored(stack) - + "Rf] " - + EnumChatFormatting.RED - + MathUtils.findPercentage(this.getEnergyStored(stack), this.getMaxEnergyStored(stack)) - + EnumChatFormatting.GRAY - + "%"); - super.addInformation(stack, p_77624_2_, list, p_77624_4_); - } -} diff --git a/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java b/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java deleted file mode 100644 index e8e4807747..0000000000 --- a/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java +++ /dev/null @@ -1,66 +0,0 @@ -package gtPlusPlus.core.item.init; - -import gregtech.api.enums.Materials; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class ItemsMultiTools { - - public static void load() { - run(); - } - - private static void run() { - - // Load Multitools - if (CORE.ConfigSwitches.enableMultiSizeTools) { - - // GT Materials - final Materials[] rm = Materials.values(); - for (final Materials m : rm) { - toolFactoryGT(m); - } - - // GT++ Materials - toolFactory(ALLOY.HASTELLOY_C276); - toolFactory(ALLOY.HASTELLOY_N); - toolFactory(ALLOY.HASTELLOY_W); - toolFactory(ALLOY.HASTELLOY_X); - toolFactory(ALLOY.INCOLOY_020); - toolFactory(ALLOY.INCOLOY_DS); - toolFactory(ALLOY.INCOLOY_MA956); - toolFactory(ALLOY.INCONEL_625); - toolFactory(ALLOY.INCONEL_690); - toolFactory(ALLOY.INCONEL_792); - toolFactory(ALLOY.LEAGRISIUM); - toolFactory(ALLOY.TANTALLOY_60); - toolFactory(ALLOY.TANTALLOY_61); - toolFactory(ALLOY.STABALLOY); - toolFactory(ALLOY.QUANTUM); - // toolFactory(ALLOY.BEDROCKIUM); - toolFactory(ALLOY.POTIN); - toolFactory(ALLOY.TUMBAGA); - toolFactory(ALLOY.TALONITE); - toolFactory(ALLOY.STELLITE); - toolFactory(ALLOY.TUNGSTEN_CARBIDE); - toolFactory(ALLOY.TANTALUM_CARBIDE); - } - } - - private static boolean toolFactoryGT(final Materials m) { - ModItems.MP_GTMATERIAL = ItemUtils.generateMultiPick(true, m); - ModItems.MS_GTMATERIAL = ItemUtils.generateMultiShovel(true, m); - return true; - } - - private static boolean toolFactory(final Material m) { - Logger.WARNING("Generating Multi-Tools for " + m.getLocalizedName()); - ModItems.MP_GTMATERIAL = ItemUtils.generateMultiPick(m); - ModItems.MS_GTMATERIAL = ItemUtils.generateMultiShovel(m); - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/item/materials/MaterialHandler.java b/src/main/java/gtPlusPlus/core/item/materials/MaterialHandler.java deleted file mode 100644 index 74c9115c3b..0000000000 --- a/src/main/java/gtPlusPlus/core/item/materials/MaterialHandler.java +++ /dev/null @@ -1,7 +0,0 @@ -package gtPlusPlus.core.item.materials; - -public class MaterialHandler { - - @SuppressWarnings("unused") - private String Staballoy; -} diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java b/src/main/java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java deleted file mode 100644 index 95dc7822c2..0000000000 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java +++ /dev/null @@ -1,127 +0,0 @@ -package gtPlusPlus.core.item.tool.misc; - -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.api.objects.minecraft.BlockPos; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.BaseItemWithDamageValue; - -public class ConnectedBlockFinder extends BaseItemWithDamageValue { - - public ConnectedBlockFinder() { - super("item.test.connector"); - this.setTextureName("stick"); - this.setMaxStackSize(1); - this.setMaxDamage(10000); - setCreativeTab(AddToCreativeTab.tabTools); - GameRegistry.registerItem(this, getUnlocalizedName()); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - list.add(EnumChatFormatting.GRAY + "Finds connected blocks, turns them to Glass once found."); - super.addInformation(stack, aPlayer, list, bool); - } - - @Override - public boolean doesContainerItemLeaveCraftingGrid(final ItemStack itemStack) { - return false; - } - - @Override - public boolean getShareTag() { - return true; - } - - @Override - public boolean hasContainerItem(final ItemStack itemStack) { - return true; - } - - @Override - public ItemStack getContainerItem(final ItemStack itemStack) { - return itemStack; - } - - @Override - @SideOnly(Side.CLIENT) - public EnumRarity getRarity(final ItemStack par1ItemStack) { - return EnumRarity.uncommon; - } - - @Override - public boolean hasEffect(final ItemStack par1ItemStack) { - return false; - } - - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, - float hitX, float hitY, float hitZ) { - - BlockPos mStartPoint = new BlockPos(x, y, z, world); - Block mBlockType = world.getBlock(x, y, z); - int mBlockMeta = mBlockType.getDamageValue(world, x, y, z); - - // Return if Air. - if (world.isAirBlock(x, y, z)) { - return false; - } - - int breaker = 0; - Set<BlockPos> mTotalIndex = new HashSet<BlockPos>(); - - Set<BlockPos> mFirstSearch = new HashSet<BlockPos>(); - Set<BlockPos> mSearch_A = new HashSet<BlockPos>(); - - Set<BlockPos> mSearch_B = new HashSet<BlockPos>(); - Set<BlockPos> mSearch_C = new HashSet<BlockPos>(); - Set<BlockPos> mSearch_D = new HashSet<BlockPos>(); - - mFirstSearch.add(mStartPoint); - mTotalIndex.add(mStartPoint); - - for (BlockPos G : mSearch_D) { - if (!world.isAirBlock(G.xPos, G.yPos, G.zPos)) { - world.setBlock(G.xPos, G.yPos, G.zPos, Blocks.diamond_ore); - } - } - - return super.onItemUse(stack, player, world, x, y, z, side, hitX, hitY, hitZ); - } - - public Set<BlockPos> getValidNeighboursForSet(Set<BlockPos> set) { - Set<BlockPos> results = set; - for (BlockPos F : set) { - results.addAll(F.getValidNeighboursAndSelf()); - } - return results; - } - - public Set<BlockPos> getExtraNeighboursForSet(Set<BlockPos> set) { - Set<BlockPos> results = set; - for (BlockPos F : set) { - results.addAll(F.getValidNeighboursAndSelf()); - } - return results; - } - - @Override - public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - // TODO Auto-generated method stub - return super.onItemRightClick(p_77659_1_, p_77659_2_, p_77659_3_); - } -} diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java b/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java deleted file mode 100644 index 3c7a131a1e..0000000000 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java +++ /dev/null @@ -1,73 +0,0 @@ -package gtPlusPlus.core.item.tool.misc; - -import static gregtech.api.enums.Mods.GregTech; - -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import gregtech.api.enums.Materials; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.util.Utils; - -public class FakeGregtechTool extends CoreItem { - - public final int componentColour; - public Object extraData; - - protected IIcon base[] = new IIcon[6]; - protected IIcon overlay[] = new IIcon[6]; - - public FakeGregtechTool() { - super("GregeriousT's Display Tool", AddToCreativeTab.tabTools, 1); - short[] tempCol = Materials.TungstenSteel.getRGBA(); - this.componentColour = Utils.rgbtoHexValue(tempCol[0], tempCol[1], tempCol[2]); - } - - @Override - public void registerIcons(final IIconRegister i) { - // ScrewDriver - this.base[0] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "toolHeadScrewdriver"); - this.overlay[0] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "HANDLE_SCREWDRIVER"); - // Soldering iron - this.base[1] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "toolHeadSoldering"); - this.overlay[1] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "HANDLE_SOLDERING"); - // Mallet - this.base[2] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "handleMallet"); - this.overlay[2] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "toolHeadMallet"); - // Hammer - this.base[3] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "stick"); - this.overlay[3] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "toolHeadHammer"); - // Wrench - this.base[4] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "WRENCH"); - this.overlay[4] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "WRENCH_OVERLAY"); - // Crowbar - this.base[5] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "CROWBAR"); - this.overlay[5] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "CROWBAR_OVERLAY"); - } - - @Override - public int getColorFromItemStack(final ItemStack stack, final int renderPass) { - if (renderPass == 1) { - return Utils.rgbtoHexValue(230, 230, 230); - } - return this.componentColour; - } - - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { - for (int i = 0; i < 6; i++) { - list.add(new ItemStack(item, 1, i)); - } - } -} diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourBoots.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourBoots.java deleted file mode 100644 index 5191f9393c..0000000000 --- a/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourBoots.java +++ /dev/null @@ -1,9 +0,0 @@ -package gtPlusPlus.core.item.wearable.armour.base; - -public abstract class BaseArmourBoots extends BaseArmour { - - public BaseArmourBoots(ArmorMaterial material, int renderIndex) { - super(material, renderIndex, 3); - // TODO Auto-generated constructor stub - } -} diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourChest.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourChest.java deleted file mode 100644 index eb55637ee4..0000000000 --- a/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourChest.java +++ /dev/null @@ -1,9 +0,0 @@ -package gtPlusPlus.core.item.wearable.armour.base; - -public abstract class BaseArmourChest extends BaseArmour { - - public BaseArmourChest(ArmorMaterial material, int renderIndex) { - super(material, renderIndex, 1); - // TODO Auto-generated constructor stub - } -} diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourLegs.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourLegs.java deleted file mode 100644 index b376610427..0000000000 --- a/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourLegs.java +++ /dev/null @@ -1,9 +0,0 @@ -package gtPlusPlus.core.item.wearable.armour.base; - -public abstract class BaseArmourLegs extends BaseArmour { - - public BaseArmourLegs(ArmorMaterial material, int renderIndex) { - super(material, renderIndex, 2); - // TODO Auto-generated constructor stub - } -} diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java deleted file mode 100644 index f3972fb400..0000000000 --- a/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java +++ /dev/null @@ -1,119 +0,0 @@ -package gtPlusPlus.core.item.wearable.armour.hazmat; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.item.wearable.armour.ArmourLoader; -import gtPlusPlus.core.item.wearable.armour.base.BaseArmourHelm; - -public class ArmourHazmat extends BaseArmourHelm { - - public IIcon iconHelm; - - public ArmourHazmat() { - super(ArmourLoader.TinFoilArmour, 0); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister ir) { - this.iconHelm = ir.registerIcon(GTPlusPlus.ID + ":itemHatTinFoil"); - } - - @Override - public int getRenderIndex() { - return 0; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int par1) { - return this.iconHelm; - } - - @Override - public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return GTPlusPlus.ID + ":textures/models/TinFoil.png"; - } - - @Override - public EnumRarity getRarity(ItemStack itemstack) { - return EnumRarity.rare; - } - - @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return false; - } - - @Override - public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { - return super.getArmorDisplay(player, armor, slot); - } - - @Override - public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {} - - @SuppressWarnings({ "unchecked" }) - @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) { - aList.add("DoomSquirter's protection against cosmic radiation!"); - aList.add("General paranoia makes the wearer unable to collect xp"); - aList.add("Movement speed is also reduced, to keep you safe"); - aList.add("This hat may also have other strange powers"); - } - - @Override - public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, - int slot) { - return new ArmorProperties(0, 0, 0); - } - - @Override - public boolean isDamageable() { - return false; - } - - @Override - public boolean itemInteractionForEntity(ItemStack p_111207_1_, EntityPlayer p_111207_2_, - EntityLivingBase p_111207_3_) { - return super.itemInteractionForEntity(p_111207_1_, p_111207_2_, p_111207_3_); - } - - @Override - public void onUpdate(ItemStack aStack, World aWorld, Entity aEntity, int p_77663_4_, boolean p_77663_5_) { - super.onUpdate(aStack, aWorld, aEntity, p_77663_4_, p_77663_5_); - } - - @Override - public boolean onEntityItemUpdate(EntityItem entityItem) { - return super.onEntityItemUpdate(entityItem); - } - - @Override - public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { - if (itemStack != null && player != null && world != null && !world.isRemote) { - if (player instanceof EntityPlayer) {} - } - super.onArmorTick(world, player, itemStack); - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return false; - } -} diff --git a/src/main/java/gtPlusPlus/core/material/Ion.java b/src/main/java/gtPlusPlus/core/material/Ion.java deleted file mode 100644 index 37dc59f642..0000000000 --- a/src/main/java/gtPlusPlus/core/material/Ion.java +++ /dev/null @@ -1,30 +0,0 @@ -package gtPlusPlus.core.material; - -public class Ion { - - private final Material mElement; - private final boolean mContainsPositiveCharge; - private final int mTotalIonization; - - public Ion(Material aMat, int chargeAmount) { - mElement = aMat; - mContainsPositiveCharge = (chargeAmount >= 0); - mTotalIonization = chargeAmount; - } - - public final synchronized Material getElement() { - return mElement; - } - - public final synchronized boolean containsPositiveCharge() { - return mContainsPositiveCharge; - } - - public final synchronized int getTotalIonization() { - return mTotalIonization; - } - - public final boolean isNeutral() { - return mTotalIonization == 0; - } -} diff --git a/src/main/java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java b/src/main/java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java deleted file mode 100644 index 0530436ca2..0000000000 --- a/src/main/java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java +++ /dev/null @@ -1,39 +0,0 @@ -package gtPlusPlus.core.material.gregtech; - -public class CustomGTMaterials { - - // public static Materials Fireclay = new MaterialBuilder(626, TextureSet.SET_ROUGH, - // "Fireclay").addDustItems().setRGB(173, 160, 155).setColor(Dyes.dyeBrown).setMaterialList(new MaterialStack(Brick, - // 1)).constructMaterial(); - - /** - * int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aDurability, int aToolQuality, boolean - * aUnificatable, String aName, String aDefaultLocalName, String aConfigSection, boolean aCustomOre, String - * aCustomID) { - * - **/ - - /* - * public static List<Materials> Custom_GT_Materials = new ArrayList<Materials>(); public static Materials Zirconium - * = materialBuilder_Element(1232, TextureSet.SET_METALLIC, 6.0F, 256, 2, 1|2|8|32|64|128, 200, 200, 200, 0, - * "Zirconium", "Zirconium", 0, 0, 1811, 0, false, false, 3, 1, 1, Dyes.dyeLightGray, Element.Zr, Arrays.asList(new - * TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3))); public static Materials Geikielite = materialBuilder(1234, - * TextureSet.SET_SHINY, new int[]{1,2,3}, "Geikielite", Dyes.dyeBlack, Arrays.asList(new MaterialStack(Titanium, - * 1), new MaterialStack(Magnesium, 1), new MaterialStack(Oxygen, 3))); public static Materials Zirconolite = - * materialBuilder(1235, TextureSet.SET_METALLIC, new int[]{1,2,3}, "Zirconolite", Dyes.dyeBlack, Arrays.asList(new - * MaterialStack(Calcium, 1), new MaterialStack(Zirconium, 1), new MaterialStack(Titanium, 2), new - * MaterialStack(Oxygen, 7))); public static final void run(){ - * Utils.LOG_INFO("[Custom] Trying to initialise custom materials."); } private final static boolean - * registerMaterial(Materials r){ Custom_GT_Materials.add(r); - * Utils.LOG_INFO("[Custom] Registered new Gregtech material - "+r.mName); return true; } public final static - * Materials materialBuilder(int ID, TextureSet texture, int[] rgb, String materialName, Dyes dyeColour, - * List<MaterialStack> composition){ Materials newMat = new Materials( ID, texture, 1.0F, 0, 2, 1 |8 , rgb[0], - * rgb[1], rgb[2], 0, materialName, materialName, 0, 0, -1, 0, false, false, 3, 1, 1, dyeColour, 1, composition ); - * registerMaterial(newMat); return newMat; } public final static Materials materialBuilder_Element( int ID, - * TextureSet texture, float a, int b, int c, int d, int r2, int g2, int b2, int a2, String materialName, String e, - * int f, int g, int h, int i, boolean j, boolean k, int l, int m, int n, Dyes dyeColour, Element o, - * List<TC_AspectStack> aspects){ Materials newMat = new Materials( ID, texture, a, b, c, d, r2, g2, b2, a2, - * materialName, e, f, g, h, i, j, k, l, m, n, dyeColour, o, aspects ); registerMaterial(newMat); return newMat; } - */ - -} diff --git a/src/main/java/gtPlusPlus/core/proxy/ServerProxy.java b/src/main/java/gtPlusPlus/core/proxy/ServerProxy.java index ed1674cb3a..73b027af10 100644 --- a/src/main/java/gtPlusPlus/core/proxy/ServerProxy.java +++ b/src/main/java/gtPlusPlus/core/proxy/ServerProxy.java @@ -5,6 +5,7 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import gtPlusPlus.core.common.CommonProxy; +@SuppressWarnings("unused") public class ServerProxy extends CommonProxy { @Override diff --git a/src/main/java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java b/src/main/java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java deleted file mode 100644 index 0b2b452e43..0000000000 --- a/src/main/java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java +++ /dev/null @@ -1,86 +0,0 @@ -package gtPlusPlus.core.recipe; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_ModHandler; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class Gregtech_Recipe_Adder { - - private static int euT; - private static int ticks; - private static ItemStack inputStack1; - private static ItemStack inputStack2; - private static ItemStack outputStack1; - private static ItemStack outputStack2; - - public static void addRecipe(final Item maceratorInput, final int maceratorInputAmount1, final Item maceratorOutput, - final int maceratorOutputAmount1, final Item compressorInput, final int compressorInputAmount1, - final Item compressorOutput, final int compressorOutputAmount1, final Item blastFurnaceInput, - final int blastFurnaceInputAmount1, final Item blastFurnaceOutput, final int blastFurnaceOutputAmount1, - final Item blastFurnaceInput2, final int blastFurnaceInputAmount2, final Item blastFurnaceOutput2, - final int blastFurnaceOutputAmount2, final Item smeltingInput, final int smeltingInputAmount1, - final Item smeltingOutput, final int smeltingOutputAmount1, final int euPerTick, final int timeInTicks, - final boolean addMaceratorRecipe, final boolean addCompressorRecipe, final boolean addBlastFurnaceRecipe, - final int blastFurnaceTemp, final boolean addSmeltingRecipe, final boolean addMixerRecipe) { - euT = euPerTick; - ticks = timeInTicks; - - resetVars(); - if (addMaceratorRecipe) { - inputStack1 = ItemUtils.getSimpleStack(maceratorInput, maceratorInputAmount1); - outputStack1 = ItemUtils.getSimpleStack(maceratorOutput, maceratorOutputAmount1); - addMaceratorRecipe(inputStack1, outputStack1); - } - resetVars(); - if (addCompressorRecipe) { - inputStack1 = ItemUtils.getSimpleStack(compressorInput, compressorInputAmount1); - outputStack1 = ItemUtils.getSimpleStack(compressorOutput, compressorOutputAmount1); - addCompressorRecipe(inputStack1, outputStack1); - } - resetVars(); - if (addBlastFurnaceRecipe) { - inputStack1 = ItemUtils.getSimpleStack(blastFurnaceInput, blastFurnaceInputAmount1); - inputStack2 = ItemUtils.getSimpleStack(blastFurnaceInput2, blastFurnaceInputAmount2); - outputStack1 = ItemUtils.getSimpleStack(blastFurnaceOutput, blastFurnaceOutputAmount1); - outputStack2 = ItemUtils.getSimpleStack(blastFurnaceOutput2, blastFurnaceOutputAmount2); - addBlastFurnaceRecipe(inputStack1, inputStack2, outputStack1, outputStack2, blastFurnaceTemp); - } - resetVars(); - if (addSmeltingRecipe) { - inputStack1 = ItemUtils.getSimpleStack(smeltingInput, smeltingInputAmount1); - outputStack1 = ItemUtils.getSimpleStack(smeltingOutput, smeltingOutputAmount1); - addSmeltingRecipe(inputStack1, outputStack1); - } - resetVars(); - } - - private static void resetVars() { - inputStack1 = null; - inputStack2 = null; - outputStack1 = null; - outputStack2 = null; - } - - private static void addMaceratorRecipe(final ItemStack input1, final ItemStack output1) { - GT_ModHandler.addPulverisationRecipe(input1, output1); - } - - private static void addCompressorRecipe(final ItemStack input1, final ItemStack output1) { - GT_ModHandler.addCompressionRecipe(input1, output1); - } - - private static void addBlastFurnaceRecipe(final ItemStack input1, final ItemStack input2, final ItemStack output1, - final ItemStack output2, final int tempRequired) { - Logger.INFO("Registering Blast Furnace Recipes."); - GT_Values.RA - .addBlastRecipe(input1, input2, GT_Values.NF, GT_Values.NF, output1, output2, ticks, euT, tempRequired); - } - - private static void addSmeltingRecipe(final ItemStack input1, final ItemStack output1) { - GT_ModHandler.addSmeltingRecipe(input1, output1); - } -} diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java deleted file mode 100644 index ec23017166..0000000000 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java +++ /dev/null @@ -1,15 +0,0 @@ -package gtPlusPlus.core.recipe; - -public class RECIPES_MTWRAPPER { - - public static int MT_RECIPES_LOADED = 0; - public static int MT_RECIPES_FAILED = 0; - - public static void run() {} - - public static void addShaped(final Object item_Output, final Object item_1, final Object item_2, - final Object item_3, final Object item_4, final Object item_5, final Object item_6, final Object item_7, - final Object item_8, final Object item_9) {} - - public static void addShapeless() {} -} diff --git a/src/main/java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java b/src/main/java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java deleted file mode 100644 index 246e7f7495..0000000000 --- a/src/main/java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java +++ /dev/null @@ -1,45 +0,0 @@ -package gtPlusPlus.core.slots; - -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; - -import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; -import gregtech.api.util.GT_Recipe; - -public class SlotChemicalPlantInput extends Slot { - - public SlotChemicalPlantInput(final IInventory inventory, final int index, final int x, final int y) { - super(inventory, index, x, y); - } - - @Override - public boolean isItemValid(final ItemStack itemstack) { - return isItemValidForChemicalPlantSlot(itemstack); - } - - public static boolean isItemValidForChemicalPlantSlot(ItemStack aStack) { - boolean validItem = GTPP_Recipe_Map.sChemicalPlantRecipes.containsInput(aStack); - if (!validItem) { - for (GT_Recipe f : GTPP_Recipe_Map.sChemicalPlantRecipes.mRecipeList) { - if (f.mFluidInputs.length > 0) { - for (FluidStack g : f.mFluidInputs) { - if (g != null) { - if (FluidContainerRegistry.containsFluid(aStack, g)) { - return true; - } - } - } - } - } - } - return validItem; - } - - @Override - public int getSlotStackLimit() { - return 64; - } -} diff --git a/src/main/java/gtPlusPlus/core/slots/SlotFrame.java b/src/main/java/gtPlusPlus/core/slots/SlotFrame.java deleted file mode 100644 index 9ee2a0d341..0000000000 --- a/src/main/java/gtPlusPlus/core/slots/SlotFrame.java +++ /dev/null @@ -1,24 +0,0 @@ -package gtPlusPlus.core.slots; - -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -import forestry.api.apiculture.IHiveFrame; - -public class SlotFrame extends Slot { - - public SlotFrame(final IInventory inventory, final int x, final int y, final int z) { - super(inventory, x, y, z); - } - - @Override - public boolean isItemValid(final ItemStack itemstack) { - return itemstack.getItem() instanceof IHiveFrame; - } - - @Override - public int getSlotStackLimit() { - return 1; - } -} diff --git a/src/main/java/gtPlusPlus/core/slots/SlotGtToolElectric.java b/src/main/java/gtPlusPlus/core/slots/SlotGtToolElectric.java deleted file mode 100644 index 8b57926193..0000000000 --- a/src/main/java/gtPlusPlus/core/slots/SlotGtToolElectric.java +++ /dev/null @@ -1,92 +0,0 @@ -package gtPlusPlus.core.slots; - -import net.minecraft.init.Items; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; - -import gregtech.api.items.GT_MetaGenerated_Tool; -import gtPlusPlus.api.objects.Logger; -import ic2.api.info.Info; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; - -public class SlotGtToolElectric extends SlotGtTool { - - public int tier; - private ItemStack content; - - public SlotGtToolElectric(final IInventory base, final int x, final int y, final int z, final int tier, - final boolean allowRedstoneDust) { - super(base, x, y, z); - this.tier = tier; - this.allowRedstoneDust = allowRedstoneDust; - } - - public boolean accepts(final ItemStack stack) { - if (stack == null) { - return false; - } - if ((stack.getItem() == Items.redstone) && (!this.allowRedstoneDust)) { - return false; - } - return (Info.itemEnergy.getEnergyValue(stack) > 0.0D) - || (ElectricItem.manager.discharge(stack, (1.0D / 0.0D), this.tier, true, true, true) > 0.0D); - } - - public double discharge(final double amount, final boolean ignoreLimit) { - if (amount <= 0.0D) { - throw new IllegalArgumentException("Amount must be > 0."); - } - final ItemStack stack = this.get(0); - if (stack == null) { - return 0.0D; - } - double realAmount = ElectricItem.manager.discharge(stack, amount, this.tier, ignoreLimit, true, false); - if (realAmount <= 0.0D) { - realAmount = Info.itemEnergy.getEnergyValue(stack); - if (realAmount <= 0.0D) { - return 0.0D; - } - stack.stackSize -= 1; - if (stack.stackSize <= 0) { - this.put(0, null); - } - } - return realAmount; - } - - public void setTier(final int tier1) { - this.tier = tier1; - } - - public boolean allowRedstoneDust = true; - - public ItemStack get() { - return this.get(0); - } - - public ItemStack get(final int index) { - return this.content; - } - - public void put(final ItemStack content) { - this.put(0, content); - } - - public void put(final int index, final ItemStack content) { - this.content = content; - this.onChanged(); - } - - public void onChanged() {} - - @Override - public boolean isItemValid(final ItemStack itemstack) { - if ((itemstack.getItem() instanceof GT_MetaGenerated_Tool) || (itemstack.getItem() instanceof IElectricItem)) { - Logger.WARNING(itemstack.getDisplayName() + " is a valid Tool."); - return true; - } - Logger.WARNING(itemstack.getDisplayName() + " is not a valid Tool."); - return false; - } -} diff --git a/src/main/java/gtPlusPlus/core/slots/SlotOutput.java b/src/main/java/gtPlusPlus/core/slots/SlotOutput.java deleted file mode 100644 index 1948b9aa17..0000000000 --- a/src/main/java/gtPlusPlus/core/slots/SlotOutput.java +++ /dev/null @@ -1,92 +0,0 @@ -package gtPlusPlus.core.slots; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; - -import cpw.mods.fml.common.FMLCommonHandler; - -public class SlotOutput extends SlotCrafting { - - private final IInventory craftMatrix; - private final EntityPlayer thePlayer; - private int amountCrafted; - - public SlotOutput(final EntityPlayer player, final InventoryCrafting craftingInventory, - final IInventory p_i45790_3_, final int slotIndex, final int xPosition, final int yPosition) { - super(player, craftingInventory, p_i45790_3_, slotIndex, xPosition, yPosition); - this.thePlayer = player; - this.craftMatrix = craftingInventory; - } - - /** - * Check if the stack is a valid item for this slot. Always true beside for the armor slots. - */ - @Override - public boolean isItemValid(final ItemStack par1ItemStack) { - return false; - } - - /** - * Decrease the size of the stack in slot (first int arg) by the amount of the second int arg. Returns the new - * stack. - */ - @Override - public ItemStack decrStackSize(final int par1) { - if (this.getHasStack()) { - this.amountCrafted += Math.min(par1, this.getStack().stackSize); - } - return super.decrStackSize(par1); - } - - /** - * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. Typically increases an - * internal count then calls onCrafting(item). - */ - @Override - protected void onCrafting(final ItemStack par1ItemStack, final int par2) { - this.amountCrafted += par2; - this.onCrafting(par1ItemStack); - } - - /** - * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. - */ - @Override - protected void onCrafting(final ItemStack stack) { - stack.onCrafting(this.thePlayer.worldObj, this.thePlayer, this.amountCrafted); - this.amountCrafted = 0; - } - - @Override - public void onPickupFromSlot(final EntityPlayer playerIn, final ItemStack stack) { - { - FMLCommonHandler.instance().firePlayerCraftingEvent(playerIn, stack, this.craftMatrix); - this.onCrafting(stack); - for (int i = 0; i < this.craftMatrix.getSizeInventory(); ++i) { - final ItemStack itemstack1 = this.craftMatrix.getStackInSlot(i); - if (itemstack1 != null) { - this.craftMatrix.decrStackSize(i, 1); - if (itemstack1.getItem().hasContainerItem(itemstack1)) { - ItemStack itemstack2 = itemstack1.getItem().getContainerItem(itemstack1); - if (itemstack2.isItemStackDamageable() - && (itemstack2.getItemDamage() > itemstack2.getMaxDamage())) { - MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(this.thePlayer, itemstack2)); - itemstack2 = null; - } - if (!this.thePlayer.inventory.addItemStackToInventory(itemstack2)) { - if (this.craftMatrix.getStackInSlot(i) == null) { - this.craftMatrix.setInventorySlotContents(i, itemstack2); - } else { - this.thePlayer.dropPlayerItemWithRandomChoice(itemstack2, false); - } - } - } - } - } - } - } -} diff --git a/src/main/java/gtPlusPlus/core/slots/SlotRTG.java b/src/main/java/gtPlusPlus/core/slots/SlotRTG.java deleted file mode 100644 index ef226e99ca..0000000000 --- a/src/main/java/gtPlusPlus/core/slots/SlotRTG.java +++ /dev/null @@ -1,24 +0,0 @@ -package gtPlusPlus.core.slots; - -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -import ic2.core.Ic2Items; - -public class SlotRTG extends Slot { - - public SlotRTG(final IInventory inventory, final int x, final int y, final int z) { - super(inventory, x, y, z); - } - - @Override - public boolean isItemValid(final ItemStack itemstack) { - return itemstack.getItem().getClass() == Ic2Items.RTGPellets.getItem().getClass(); - } - - @Override - public int getSlotStackLimit() { - return 1; - } -} diff --git a/src/main/java/gtPlusPlus/core/tileentities/base/TILE_ENTITY_BASE.java b/src/main/java/gtPlusPlus/core/tileentities/base/TILE_ENTITY_BASE.java deleted file mode 100644 index ff1484a984..0000000000 --- a/src/main/java/gtPlusPlus/core/tileentities/base/TILE_ENTITY_BASE.java +++ /dev/null @@ -1,39 +0,0 @@ -package gtPlusPlus.core.tileentities.base; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; - -public class TILE_ENTITY_BASE extends TileEntity { - - @Override - public void writeToNBT(final NBTTagCompound tag) { - super.writeToNBT(tag); - this.writeCustomNBT(tag); - } - - @Override - public void readFromNBT(final NBTTagCompound tag) { - super.readFromNBT(tag); - this.readCustomNBT(tag); - } - - public void writeCustomNBT(final NBTTagCompound tag) {} - - public void readCustomNBT(final NBTTagCompound tag) {} - - @Override - public Packet getDescriptionPacket() { - final NBTTagCompound tag = new NBTTagCompound(); - this.writeCustomNBT(tag); - return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, -999, tag); - } - - @Override - public void onDataPacket(final NetworkManager net, final S35PacketUpdateTileEntity packet) { - super.onDataPacket(net, packet); - this.readCustomNBT(packet.func_148857_g()); - } -} diff --git a/src/main/java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java b/src/main/java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java deleted file mode 100644 index 49be958022..0000000000 --- a/src/main/java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java +++ /dev/null @@ -1,289 +0,0 @@ -/* - * package gtPlusPlus.core.tileentities.base; public abstract class TilePoweredGT extends TileEntityBase implements - * IGregtechPower { public static AutoMap<TilePoweredGT> mPoweredEntities = new AutoMap<TilePoweredGT>(); //Base Tile - * Fields public boolean ignoreUnloadedChunks; public boolean isDead; //Meta Tile Fields private long mAcceptedAmperes; - * private boolean[] mActiveEUInputs; private boolean[] mActiveEUOutputs; protected int[] mAverageEUInput; protected int - * mAverageEUInputIndex; protected int[] mAverageEUOutput; protected int mAverageEUOutputIndex; private final - * TileEntity[] mBufferedTileEntities; private byte mFacing = 0; private boolean mHasEnoughEnergy; private boolean - * mNeedsUpdate; private boolean mNeedsBlockUpdate; private boolean mRunningThroughTick; private boolean - * mSendClientData; protected boolean mReleaseEnergy; private long mTickTimer; protected long mStoredEnergy; protected - * long mStoredSteam; public TilePoweredGT() { super(); this.mBufferedTileEntities = new TileEntity[6]; - * this.ignoreUnloadedChunks = true; this.isDead = false; mPoweredEntities.put(this); } - * @Override public boolean acceptsRotationalEnergy(byte p0) { return false; } private boolean canAccessData() { return - * this.isInvalid() ? false : true; } private final void clearNullMarkersFromTileEntityBuffer() { for (int i = 0; i < - * this.mBufferedTileEntities.length; ++i) { if (this.mBufferedTileEntities[i] == this) { this.mBufferedTileEntities[i] - * = null; } } } protected final void clearTileEntityBuffer() { for (int i = 0; i < this.mBufferedTileEntities.length; - * ++i) { this.mBufferedTileEntities[i] = null; } } private boolean crossedChunkBorder(final int aX, final int aZ) { - * return aX >> 4 != this.xCoord >> 4 || aZ >> 4 != this.zCoord >> 4; } - * @Override public boolean decreaseStoredEnergyUnits(final long aEnergy, final boolean aIgnoreTooLessEnergy) { return - * this.canAccessData() && (this.mHasEnoughEnergy = (this.decreaseStoredEU(aEnergy, aIgnoreTooLessEnergy) || - * this.decreaseStoredSteam(aEnergy, false) || (aIgnoreTooLessEnergy && this.decreaseStoredSteam(aEnergy, true)))); } - * public boolean decreaseStoredEU(final long aEnergy, final boolean aIgnoreTooLessEnergy) { if (!this.canAccessData()) - * { return false; } if (this.getEUVar() - aEnergy < 0L && !aIgnoreTooLessEnergy) { return false; } - * this.setStoredEU(this.getEUVar() - aEnergy); if (this.getEUVar() < 0L) { this.setStoredEU(0L); return false; } return - * true; } public boolean decreaseStoredSteam(final long aEnergy, final boolean aIgnoreTooLessEnergy) { if - * (!this.canAccessData()) { return false; } if (this.getSteamVar() - aEnergy < 0L && !aIgnoreTooLessEnergy) { return - * false; } this.setStoredSteam(this.getSteamVar() - aEnergy); if (this.getSteamVar() < 0L) { this.setStoredSteam(0L); - * return false; } return true; } public void doExplosion(final long aExplosionPower) { final float tStrength = - * (aExplosionPower < GT_Values.V[0]) ? 1.0f : ((aExplosionPower < GT_Values.V[1]) ? 2.0f : ((aExplosionPower < - * GT_Values.V[2]) ? 3.0f : ((aExplosionPower < GT_Values.V[3]) ? 4.0f : ((aExplosionPower < GT_Values.V[4]) ? 5.0f : - * ((aExplosionPower < GT_Values.V[4] * 2L) ? 6.0f : ((aExplosionPower < GT_Values.V[5]) ? 7.0f : ((aExplosionPower < - * GT_Values.V[6]) ? 8.0f : ((aExplosionPower < GT_Values.V[7]) ? 9.0f : 10.0f)))))))); final int tX = this.getXCoord(); - * final int tY = this.getYCoord(); final int tZ = this.getZCoord(); final World tWorld = this.getWorld(); - * GT_Utility.sendSoundToPlayers(tWorld, (String) GregTech_API.sSoundList.get(209), 1.0f, -1.0f, tX, tY, tZ); - * tWorld.setBlock(tX, tY, tZ, Blocks.air); if (GregTech_API.sMachineExplosions) { tWorld.createExplosion((Entity) null, - * tX + 0.5, tY + 0.5, tZ + 0.5, tStrength, true); } } public boolean drainEnergyUnits(final byte aSide, final long - * aVoltage, final long aAmperage) { if (!this.canAccessData() || !this.isElectric() || !this.outputsEnergyTo(aSide) || - * this.getStoredEU() - aVoltage * aAmperage < this.getMinimumStoredEU()) { return false; } if - * (this.decreaseStoredEU(aVoltage * aAmperage, false)) { final int[] mAverageEUOutput = this.mAverageEUOutput; final - * int mAverageEUOutputIndex = this.mAverageEUOutputIndex; mAverageEUOutput[mAverageEUOutputIndex] += (int) (aVoltage * - * aAmperage); return true; } return false; } - * @Override public final boolean getAir(final int aX, final int aY, final int aZ) { return (this.ignoreUnloadedChunks - * && this.crossedChunkBorder(aX, aZ) && !this.worldObj.blockExists(aX, aY, aZ)) || GT_Utility.isBlockAir(this.worldObj, - * aX, aY, aZ); } - * @Override public final boolean getAirAtSide(final byte aSide) { return this.getAirAtSideAndDistance(aSide, 1); } - * @Override public final boolean getAirAtSideAndDistance(final byte aSide, final int aDistance) { return - * this.getAir(this.getOffsetX(aSide, aDistance), this.getOffsetY(aSide, aDistance), this.getOffsetZ(aSide, aDistance)); - * } - * @Override public final boolean getAirOffset(final int aX, final int aY, final int aZ) { return - * this.getAir(this.xCoord + aX, this.yCoord + aY, this.zCoord + aZ); } - * @Override public long getAverageElectricInput() { int rEU = 0; for (int i = 0; i < this.mAverageEUInput.length; ++i) - * { if (i != this.mAverageEUInputIndex) { rEU += this.mAverageEUInput[i]; } } return rEU / (this.mAverageEUInput.length - * - 1); } public long getAverageElectricOutput() { int rEU = 0; for (int i = 0; i < this.mAverageEUOutput.length; ++i) - * { if (i != this.mAverageEUOutputIndex) { rEU += this.mAverageEUOutput[i]; } } return rEU / - * (this.mAverageEUOutput.length - 1); } - * @Override public byte getBackFacing() { return GT_Utility.getOppositeSide((int) this.mFacing); } - * @Override public final Block getBlock(final int aX, final int aY, final int aZ) { if (this.ignoreUnloadedChunks && - * this.crossedChunkBorder(aX, aZ) && !this.worldObj.blockExists(aX, aY, aZ)) { return Blocks.air; } return - * this.worldObj.getBlock(aX, aY, aZ); } - * @Override public final Block getBlockAtSide(final byte aSide) { return this.getBlockAtSideAndDistance(aSide, 1); } - * @Override public final Block getBlockAtSideAndDistance(final byte aSide, final int aDistance) { return - * this.getBlock(this.getOffsetX(aSide, aDistance), this.getOffsetY(aSide, aDistance), this.getOffsetZ(aSide, - * aDistance)); } - * @Override public final Block getBlockOffset(final int aX, final int aY, final int aZ) { return - * this.getBlock(this.xCoord + aX, this.yCoord + aY, this.zCoord + aZ); } - * @Override public String[] getDescription() { // TODO Auto-generated method stub return null; } - * @Override public long getEUCapacity() { if (this.canAccessData()) { return this.maxEUStore(); } return 0L; } public - * long getEUVar() { return mStoredEnergy; } - * @Override public byte getFrontFacing() { return this.mFacing; } - * @Override public final IGregTechTileEntity getIGregTechTileEntity(final int aX, final int aY, final int aZ) { final - * TileEntity tTileEntity = this.getTileEntity(aX, aY, aZ); if (tTileEntity instanceof IGregTechTileEntity) { return - * (IGregTechTileEntity) tTileEntity; } return null; } - * @Override public final IGregTechTileEntity getIGregTechTileEntityAtSide(final byte aSide) { final TileEntity - * tTileEntity = this.getTileEntityAtSide(aSide); if (tTileEntity instanceof IGregTechTileEntity) { return - * (IGregTechTileEntity) tTileEntity; } return null; } - * @Override public final IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(final byte aSide, final int - * aDistance) { final TileEntity tTileEntity = this.getTileEntityAtSideAndDistance(aSide, aDistance); if (tTileEntity - * instanceof IGregTechTileEntity) { return (IGregTechTileEntity) tTileEntity; } return null; } - * @Override public final IGregTechTileEntity getIGregTechTileEntityOffset(final int aX, final int aY, final int aZ) { - * final TileEntity tTileEntity = this.getTileEntityOffset(aX, aY, aZ); if (tTileEntity instanceof IGregTechTileEntity) - * { return (IGregTechTileEntity) tTileEntity; } return null; } - * @Override public final IInventory getIInventory(final int aX, final int aY, final int aZ) { final TileEntity - * tTileEntity = this.getTileEntity(aX, aY, aZ); if (tTileEntity instanceof IInventory) { return (IInventory) - * tTileEntity; } return null; } - * @Override public final IInventory getIInventoryAtSide(final byte aSide) { final TileEntity tTileEntity = - * this.getTileEntityAtSide(aSide); if (tTileEntity instanceof IInventory) { return (IInventory) tTileEntity; } return - * null; } - * @Override public final IInventory getIInventoryAtSideAndDistance(final byte aSide, final int aDistance) { final - * TileEntity tTileEntity = this.getTileEntityAtSideAndDistance(aSide, aDistance); if (tTileEntity instanceof - * IInventory) { return (IInventory) tTileEntity; } return null; } - * @Override public final IInventory getIInventoryOffset(final int aX, final int aY, final int aZ) { final TileEntity - * tTileEntity = this.getTileEntityOffset(aX, aY, aZ); if (tTileEntity instanceof IInventory) { return (IInventory) - * tTileEntity; } return null; } - * @Override public String[] getInfoData() { // TODO Auto-generated method stub return null; } - * @Override public long getInputAmperage() { if (this.canAccessData() && this.isElectric()) { return - * this.maxAmperesIn(); } return 0L; } public long getInputTier() { return GT_Utility.getTier(this.getInputVoltage()); } - * @Override public long getInputVoltage() { if (this.canAccessData() && this.isElectric()) { return this.maxEUInput(); - * } return 2147483647L; } private long getMinimumStoredEU() { return 0; } - * @Override public final int getOffsetX(final byte aSide, final int aMultiplier) { return this.xCoord + - * ForgeDirection.getOrientation((int) aSide).offsetX * aMultiplier; } public final short getOffsetY(final byte aSide, - * final int aMultiplier) { return (short) (this.yCoord + ForgeDirection.getOrientation((int) aSide).offsetY * - * aMultiplier); } public final int getOffsetZ(final byte aSide, final int aMultiplier) { return this.zCoord + - * ForgeDirection.getOrientation((int) aSide).offsetZ * aMultiplier; } - * @Override public long getOutputAmperage() { if (this.canAccessData() && this.isElectric()) { return - * this.maxAmperesOut(); } return 0L; } public long getOutputTier() { return - * GT_Utility.getTier(this.getOutputVoltage()); } - * @Override public long getOutputVoltage() { if (this.canAccessData() && this.isElectric() && this.isEnetOutput()) { - * return this.maxEUOutput(); } return 0L; } - * @Override public int getRandomNumber(int p0) { return CORE.RANDOM.nextInt(); } - * @Override public long getSteamCapacity() { if (this.canAccessData()) { return this.maxSteamStore(); } return 0L; } - * public long getSteamVar() { return mStoredSteam; } - * @Override public long getStoredEU() { if (this.canAccessData()) { return Math.min(this.getEUVar(), - * this.getEUCapacity()); } return 0L; } - * @Override public long getStoredSteam() { if (this.canAccessData()) { return Math.min(this.getSteamVar(), - * this.getSteamCapacity()); } return 0L; } - * @Override public final TileEntity getTileEntity(final int aX, final int aY, final int aZ) { if - * (this.ignoreUnloadedChunks && this.crossedChunkBorder(aX, aZ) && !this.worldObj.blockExists(aX, aY, aZ)) { return - * null; } return this.worldObj.getTileEntity(aX, aY, aZ); } public final TileEntity getTileEntityAtSide(final byte - * aSide) { if (aSide < 0 || aSide >= 6 || this.mBufferedTileEntities[aSide] == this) { return null; } final int tX = - * this.getOffsetX(aSide, 1); final int tY = this.getOffsetY(aSide, 1); final int tZ = this.getOffsetZ(aSide, 1); if - * (this.crossedChunkBorder(tX, tZ)) { this.mBufferedTileEntities[aSide] = null; if (this.ignoreUnloadedChunks && - * !this.worldObj.blockExists(tX, tY, tZ)) { return null; } } if (this.mBufferedTileEntities[aSide] == null) { - * this.mBufferedTileEntities[aSide] = this.worldObj.getTileEntity(tX, tY, tZ); if (this.mBufferedTileEntities[aSide] == - * null) { this.mBufferedTileEntities[aSide] = this; return null; } return this.mBufferedTileEntities[aSide]; } else { - * if (this.mBufferedTileEntities[aSide].isInvalid()) { this.mBufferedTileEntities[aSide] = null; return - * this.getTileEntityAtSide(aSide); } if (this.mBufferedTileEntities[aSide].xCoord == tX && - * this.mBufferedTileEntities[aSide].yCoord == tY && this.mBufferedTileEntities[aSide].zCoord == tZ) { return - * this.mBufferedTileEntities[aSide]; } return null; } } - * @Override public final TileEntity getTileEntityAtSideAndDistance(final byte aSide, final int aDistance) { if - * (aDistance == 1) { return this.getTileEntityAtSide(aSide); } return this.getTileEntity(this.getOffsetX(aSide, - * aDistance), this.getOffsetY(aSide, aDistance), this.getOffsetZ(aSide, aDistance)); } - * @Override public final TileEntity getTileEntityOffset(final int aX, final int aY, final int aZ) { return - * this.getTileEntity(this.xCoord + aX, this.yCoord + aY, this.zCoord + aZ); } - * @Override public long getUniversalEnergyCapacity() { return 0; } - * @Override public long getUniversalEnergyStored() { return 0; } - * @Override public World getWorld() { return this.getWorldObj(); } - * @Override public int getXCoord() { return this.xCoord; } - * @Override public short getYCoord() { return (short) this.yCoord; } - * @Override public int getZCoord() { return this.zCoord; } public boolean hasEnoughEnergy() { return - * (this.getStoredEU() > 0 ? (mHasEnoughEnergy = true) : (mHasEnoughEnergy = false)); } - * @Override public boolean increaseStoredEnergyUnits(final long aEnergy, final boolean aIgnoreTooMuchEnergy) { if - * (!this.canAccessData()) { return false; } if (this.getStoredEU() < this.getEUCapacity() || aIgnoreTooMuchEnergy) { - * this.setStoredEU(this.getEUVar() + aEnergy); return true; } return false; } - * @Override public boolean increaseStoredSteam(final long aEnergy, final boolean aIgnoreTooMuchEnergy) { if - * (!this.canAccessData()) { return false; } if (this.getSteamVar() < this.getSteamCapacity() || aIgnoreTooMuchEnergy) { - * this.setStoredSteam(this.getSteamVar() + aEnergy); return true; } return false; } public long injectEnergyUnits(final - * byte aSide, final long aVoltage, long aAmperage) { if (!this.canAccessData() || !this.isElectric() || - * !this.inputEnergyFrom(aSide) || aAmperage <= 0L || aVoltage <= 0L || this.getStoredEU() >= this.getEUCapacity() || - * this.maxAmperesIn() <= this.mAcceptedAmperes) { return 0L; } if (aVoltage > this.getInputVoltage()) { - * this.doExplosion(aVoltage); return 0L; } if (this.increaseStoredEnergyUnits(aVoltage (aAmperage = Math.min(aAmperage, - * Math.min(this.maxAmperesIn() - this.mAcceptedAmperes, 1L + (this.getEUCapacity() - this.getStoredEU()) / aVoltage))), - * true)) { final int[] mAverageEUInput = this.mAverageEUInput; final int mAverageEUInputIndex = - * this.mAverageEUInputIndex; mAverageEUInput[mAverageEUInputIndex] += (int) (aVoltage * aAmperage); - * this.mAcceptedAmperes += aAmperage; return aAmperage; } return 0L; } - * @Override public boolean injectRotationalEnergy(byte p0, long p1, long p2) { return false; } - * @Override public boolean inputEnergyFrom(final byte aSide) { if (aSide == 6) { return true; } if - * (this.isServerSide()) { return aSide >= 0 && aSide < 6 && this.mActiveEUInputs[aSide] && !this.mReleaseEnergy; } - * return this.isEnergyInputSide(aSide); } public final boolean isClientSide() { return this.worldObj.isRemote; } - * @Override public boolean isDead() { return this.isDead; } private boolean isElectric() { return true; } private - * boolean isEnergyInputSide(final byte aSide) { if (aSide >= 0 && aSide < 6) { if (this.isInvalid() || - * this.mReleaseEnergy) { return false; } if (this.canAccessData() && this.isElectric() && this.isEnetInput()) { return - * this.isInputFacing(aSide); } } return false; } private boolean isEnergyOutputSide(final byte aSide) { if (aSide >= 0 - * && aSide < 6) { if (this.isInvalid() || this.mReleaseEnergy) { return this.mReleaseEnergy; } if (this.canAccessData() - * && this.isElectric() && this.isEnetOutput()) { return this.isOutputFacing(side); } } return false; } public boolean - * isEnetInput() { return false; } public boolean isEnetOutput() { return false; } - * @Override public boolean isGivingInformation() { return this.canAccessData() && this.isGivingInformation(); } public - * boolean isInputFacing(final byte aSide) { return false; } - * @Override public boolean isInvalidTileEntity() { return isDead() ? true : false; } public boolean - * isOutputFacing(final byte aSide) { return false; } public final boolean isServerSide() { return - * !this.worldObj.isRemote; } public boolean isUniversalEnergyStored(final long aEnergyAmount) { return - * this.getUniversalEnergyStored() >= aEnergyAmount || (this.mHasEnoughEnergy = false); } - * @Override public boolean isValidFacing(final byte aSide) { return this.canAccessData(); } public long maxAmperesIn() - * { return 1L; } public long maxAmperesOut() { return 1L; } public long maxEUInput() { return 0L; } public long - * maxEUOutput() { return 0L; } public long maxEUStore() { return 0L; } public long maxSteamStore() { return 256000L; } - * public final void onAdjacentBlockChange(final int aX, final int aY, final int aZ) { - * this.clearNullMarkersFromTileEntityBuffer(); } - * @Override public boolean outputsEnergyTo(final byte aSide) { if (aSide == 6) { return true; } if - * (this.isServerSide()) { if (aSide < 0 || aSide >= 6 || !this.mActiveEUOutputs[aSide]) { if (!this.mReleaseEnergy) { - * return false; } } return true; } return this.isEnergyOutputSide(aSide); } public final void sendBlockEvent(final byte - * aID, final byte aValue) { GT_Values.NW.sendPacketToAllPlayersInRange(this.worldObj, (GT_Packet) new - * GT_Packet_Block_Event(this.xCoord, (short) this.yCoord, this.zCoord, aID, aValue), this.xCoord, this.zCoord); } - * public void setEUVar(final long aEnergy) { mStoredEnergy = aEnergy; } - * @Override public void setFrontFacing(byte aFacing) { if (this.isValidFacing(aFacing)) { this.mFacing = aFacing; - * //this.onFacingChange(); //this.onMachineBlockUpdate(); } } public void setSteamVar(final long aSteam) { mStoredSteam - * = aSteam; } public boolean setStoredEU(long aEnergy) { if (!this.canAccessData()) { return false; } if (aEnergy < 0L) - * { aEnergy = 0L; } this.setEUVar(aEnergy); return true; } public boolean setStoredSteam(long aEnergy) { if - * (!this.canAccessData()) { return false; } if (aEnergy < 0L) { aEnergy = 0L; } this.setSteamVar(aEnergy); return true; - * } - * @Override public void writeToNBT(NBTTagCompound nbt) { // TODO Auto-generated method stub super.writeToNBT(nbt); } - * @Override public void readFromNBT(NBTTagCompound nbt) { // TODO Auto-generated method stub super.readFromNBT(nbt); } - * @Override public boolean onPreTick(long aTick) { return onPreTick(this, this.mTickTimer); } - * @Override public boolean onTick(long aTick) { return onTick(this, this.mTickTimer); } - * @Override public boolean onPostTick(long aTick) { return onPostTick(this, this.mTickTimer); } - * @Override public boolean onPreTick(TilePoweredGT tilePoweredGT, long mTickTimer2) { return - * super.onPreTick(mTickTimer2); } - * @Override public boolean onTick(TilePoweredGT iGregTechTileEntity, long mTickTimer2) { return - * super.onTick(mTickTimer2); } - * @Override public boolean onPostTick(TilePoweredGT iGregTechTileEntity, long mTickTimer2) { return - * super.onPostTick(mTickTimer2); } - * @Override public void markDirty() { super.markDirty(); } - * @Override public boolean receiveClientEvent(int p_145842_1_, int p_145842_2_) { // TODO Auto-generated method stub - * return super.receiveClientEvent(p_145842_1_, p_145842_2_); } - * @Override public void onChunkUnload() { this.clearNullMarkersFromTileEntityBuffer(); super.onChunkUnload(); - * this.isDead = true; } public void updateEntity() { super.updateEntity(); this.isDead = false; - * this.mRunningThroughTick = true; long tTime = System.currentTimeMillis(); int tCode = 0; final boolean aSideServer = - * this.isServerSide(); final boolean aSideClient = this.isClientSide(); try { for (tCode = 0; - * this.hasValidMetaTileEntity() && tCode >= 0; tCode = -1) { Label_1743 : { switch (tCode) { case 0 : { ++tCode; if - * (this.mTickTimer++ != 0L) { break Label_1743; } this.oX = this.xCoord; this.oY = this.yCoord; this.oZ = this.zCoord; - * this.worldObj.markTileEntityChunkModified(this.xCoord, this.yCoord, this.zCoord, (TileEntity) this); - * this.onFirstTick(this); if (!this.hasValidMetaTileEntity()) { this.mRunningThroughTick = false; return; } break - * Label_1743; } case 1 : { ++tCode; if (!aSideClient) { break Label_1743; } if (this.mNeedsUpdate) { - * this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); this.mNeedsUpdate = false; } break - * Label_1743; } case 2 : case 3 : case 4 : case 5 : case 6 : case 7 : { if (aSideServer && this.mTickTimer > 10L) { for - * (byte i = (byte) (tCode - 2); i < 6; ++i) { } } } case 8 : { tCode = 9; if (aSideServer) { if - * (++this.mAverageEUInputIndex >= this.mAverageEUInput.length) { this.mAverageEUInputIndex = 0; } if - * (++this.mAverageEUOutputIndex >= this.mAverageEUOutput.length) { this.mAverageEUOutputIndex = 0; } - * this.mAverageEUInput[this.mAverageEUInputIndex] = 0; this.mAverageEUOutput[this.mAverageEUOutputIndex] = 0; } } case - * 9 : { ++tCode; this.onPreTick(this, this.mTickTimer); if (!this.hasValidMetaTileEntity()) { this.mRunningThroughTick - * = false; return; } } case 10 : { ++tCode; if (!aSideServer) { break Label_1743; } if (this.xCoord != this.oX || - * this.yCoord != this.oY || this.zCoord != this.oZ) { this.oX = this.xCoord; this.oY = this.yCoord; this.oZ = - * this.zCoord; this.issueClientUpdate(); this.clearTileEntityBuffer(); } if (this.mFacing != this.oFacing) { - * this.oFacing = this.mFacing; this.issueBlockUpdate(); } if (this.mTickTimer > 20L && this.isElectric()) { - * this.mAcceptedAmperes = 0L; if (this.getOutputVoltage() != this.oOutput) { this.oOutput = this.getOutputVoltage(); } - * if (this.isEnetOutput() || this.isEnetInput()) { for (byte i = 0; i < 6; ++i) { boolean temp = - * this.isEnergyInputSide(i); if (temp != this.mActiveEUInputs[i]) { this.mActiveEUInputs[i] = temp; } temp = - * this.isEnergyOutputSide(i); if (temp != this.mActiveEUOutputs[i]) { this.mActiveEUOutputs[i] = temp; } } } if - * (this.isEnetOutput() && this.oOutput > 0L) { final long tOutputVoltage = Math.max(this.oOutput, this.oOutput + (1 << - * GT_Utility.getTier(this.oOutput))); final long tUsableAmperage = Math.min(this.getOutputAmperage(), - * (this.getStoredEU() - this.getMinimumStoredEU()) / tOutputVoltage); if (tUsableAmperage > 0L) { final long tEU = - * tOutputVoltage * IEnergyConnected.Util.emitEnergyToNetwork( this.oOutput, tUsableAmperage, (IEnergyConnected) this); - * final int[] mAverageEUOutput = this.mAverageEUOutput; final int mAverageEUOutputIndex = this.mAverageEUOutputIndex; - * mAverageEUOutput[mAverageEUOutputIndex] += (int) tEU; this.decreaseStoredEU(tEU, true); } } if (this.getEUCapacity() - * > 0L) { if (GregTech_API.sMachineFireExplosions && this.getRandomNumber(1000) == 0) { final Block tBlock = - * this.getBlockAtSide((byte) this.getRandomNumber(6)); if (tBlock instanceof BlockFire) { this.doEnergyExplosion(); } } - * if (!this.hasValidMetaTileEntity()) { this.mRunningThroughTick = false; return; } } } if - * (!this.hasValidMetaTileEntity()) { this.mRunningThroughTick = false; return; } break Label_1743; } case 13 : { - * ++tCode; this.updateStatus(); if (!this.hasValidMetaTileEntity()) { this.mRunningThroughTick = false; return; } } - * case 14 : { ++tCode; this.onPostTick((IGregTechTileEntity) this, this.mTickTimer); if - * (!this.hasValidMetaTileEntity()) { this.mRunningThroughTick = false; return; } } case 15 : { ++tCode; if - * (!aSideServer) { break; } if (this.mTickTimer % 10L == 0L && this.mSendClientData) { final IGT_NetworkHandler nw = - * GT_Values.NW; final World worldObj = this.worldObj; final int xCoord = this.xCoord; final short n = (short) - * this.yCoord; final int zCoord = this.zCoord; final short mid = this.mID; final int n2 = this.mCoverSides[0]; final - * int n3 = this.mCoverSides[1]; final int n4 = this.mCoverSides[2]; final int n5 = this.mCoverSides[3]; final int n6 = - * this.mCoverSides[4]; final int n7 = this.mCoverSides[5]; final byte oTextureData = (byte) ((this.mFacing & 0x7) | - * (this.mActive ? 8 : 0) | (this.mRedstone ? 16 : 0) | (this.mLockUpgrade ? 32 : 0)); this.oTextureData = oTextureData; - * final byte oTexturePage = (byte) ((this.hasValidMetaTileEntity() && this.mMetaTileEntity instanceof - * GT_MetaTileEntity_Hatch) ? ((GT_MetaTileEntity_Hatch) this.mMetaTileEntity).getTexturePage() : 0); this.oTexturePage - * = oTexturePage; final byte oUpdateData = (byte) (this.hasValidMetaTileEntity() ? this.mMetaTileEntity.getUpdateData() - * : 0); this.oUpdateData = oUpdateData; final byte oRedstoneData = (byte) (((this.mSidedRedstone[0] > 0) ? 1 : 0) | - * ((this.mSidedRedstone[1] > 0) ? 2 : 0) | ((this.mSidedRedstone[2] > 0) ? 4 : 0) | ((this.mSidedRedstone[3] > 0) ? 8 : - * 0) | ((this.mSidedRedstone[4] > 0) ? 16 : 0) | ((this.mSidedRedstone[5] > 0) ? 32 : 0)); this.oRedstoneData = - * oRedstoneData; final byte mColor = this.mColor; this.oColor = mColor; nw.sendPacketToAllPlayersInRange(worldObj, - * (GT_Packet) new GT_Packet_TileEntity(xCoord, n, zCoord, mid, n2, n3, n4, n5, n6, n7, oTextureData, oTexturePage, - * oUpdateData, oRedstoneData, mColor), this.xCoord, this.zCoord); this.mSendClientData = false; } if (this.mTickTimer > - * 10L) { byte tData = (byte) ((this.mFacing & 0x7) | (this.mActive ? 8 : 0) | (this.mRedstone ? 16 : 0) | - * (this.mLockUpgrade ? 32 : 0)); if (tData != this.oTextureData) { this.sendBlockEvent((byte) 0, this.oTextureData = - * tData); } tData = this.mMetaTileEntity.getUpdateData(); if (tData != this.oUpdateData) { this.sendBlockEvent((byte) - * 1, this.oUpdateData = tData); } if (this.mMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { tData = - * ((GT_MetaTileEntity_Hatch) this.mMetaTileEntity).getTexturePage(); if (tData != this.oTexturePage) { final byte b = - * 1; final byte oTexturePage2 = tData; this.oTexturePage = oTexturePage2; this.sendBlockEvent(b, (byte) (oTexturePage2 - * | 0x80)); } } if (this.mColor != this.oColor) { this.sendBlockEvent((byte) 2, this.oColor = this.mColor); } tData = - * (byte) (((this.mSidedRedstone[0] > 0) ? 1 : 0) | ((this.mSidedRedstone[1] > 0) ? 2 : 0) | ((this.mSidedRedstone[2] > - * 0) ? 4 : 0) | ((this.mSidedRedstone[3] > 0) ? 8 : 0) | ((this.mSidedRedstone[4] > 0) ? 16 : 0) | - * ((this.mSidedRedstone[5] > 0) ? 32 : 0)); if (tData != this.oRedstoneData) { this.sendBlockEvent((byte) 3, - * this.oRedstoneData = tData); } if (this.mLightValue != this.oLightValue) { - * this.worldObj.setLightValue(EnumSkyBlock.Block, this.xCoord, this.yCoord, this.zCoord, (int) this.mLightValue); - * this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord, this.yCoord, this.zCoord); - * this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord + 1, this.yCoord, this.zCoord); - * this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord - 1, this.yCoord, this.zCoord); - * this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord, this.yCoord + 1, this.zCoord); - * this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord, this.yCoord - 1, this.zCoord); - * this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord, this.yCoord, this.zCoord + 1); - * this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord, this.yCoord, this.zCoord - 1); - * this.issueTextureUpdate(); this.sendBlockEvent((byte) 7, this.oLightValue = this.mLightValue); } } if - * (this.mNeedsBlockUpdate) { this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, - * this.getBlockOffset(0, 0, 0)); this.mNeedsBlockUpdate = false; break; } break; } } } } } catch (Throwable e) { - * e.printStackTrace(GT_Log.err); } if (aSideServer && this.hasValidMetaTileEntity()) { tTime = - * System.currentTimeMillis() - tTime; if (this.mTimeStatistics.length > 0) { - * this.mTimeStatistics[this.mTimeStatisticsIndex = (this.mTimeStatisticsIndex + 1) % this.mTimeStatistics.length] = - * (int) tTime; } if (tTime > 0L && tTime > GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING && this.mTickTimer > - * 1000L && this.getMetaTileEntity().doTickProfilingMessageDuringThisTick() && this.mLagWarningCount++ < 10) { - * System.out.println("WARNING: Possible Lag Source at [" + this.xCoord + ", " + this.yCoord + ", " + this.zCoord + - * "] in Dimension " + this.worldObj.provider.dimensionId + " with " + tTime + "ms caused by an instance of " + - * this.getMetaTileEntity().getClass()); } } final boolean mWorkUpdate = false; this.mRunningThroughTick = mWorkUpdate; - * this.mInventoryChanged = mWorkUpdate; this.mWorkUpdate = mWorkUpdate; } private void onFirstTick(TilePoweredGT - * tilePoweredGT) { // TODO Auto-generated method stub } private boolean hasValidMetaTileEntity() { return - * Utils.invertBoolean(isDead()); } public void issueBlockUpdate() { this.mNeedsBlockUpdate = true; } public void - * issueClientUpdate() { this.mSendClientData = true; } public Packet getDescriptionPacket() { this.issueClientUpdate(); - * return null; } } - */ diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java deleted file mode 100644 index afc7ee130c..0000000000 --- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java +++ /dev/null @@ -1,288 +0,0 @@ -package gtPlusPlus.core.tileentities.general; - -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.tileentity.TileEntity; - -import gtPlusPlus.core.block.ModBlocks; - -public class TileEntityReverter extends TileEntity { - - private static final int REVERT_CHANCE = 10; - public int radius = 16; - public int diameter = (8 * this.radius) + 4; - public double requiredPlayerRange = 64.0D; - public Random rand = new Random(); - private int tickCount; - private boolean slowScan; - private int ticksSinceChange; - private Block[] blockData; - private byte[] metaData; - - @Override - public boolean canUpdate() { - return true; - } - - @Override - public void updateEntity() { - if (this.anyPlayerInRange()) { - this.tickCount += 1; - if (this.worldObj.isRemote) { - final double var1 = this.xCoord + this.worldObj.rand.nextFloat(); - final double var3 = this.yCoord + this.worldObj.rand.nextFloat(); - final double var5 = this.zCoord + this.worldObj.rand.nextFloat(); - - this.worldObj.spawnParticle("enchantmenttable", var1, var3, var5, 0.0D, 0.0D, 0.0D); - if (this.rand.nextInt(5) == 0) { - this.makeRandomOutline(); - this.makeRandomOutline(); - this.makeRandomOutline(); - } - } else { - if ((this.blockData == null) || (this.metaData == null)) { - this.captureBlockData(); - this.slowScan = true; - } - if ((!this.slowScan) || ((this.tickCount % 20) == 0)) { - if (this.scanAndRevertChanges()) { - this.slowScan = false; - this.ticksSinceChange = 0; - } else { - this.ticksSinceChange += 1; - if (this.ticksSinceChange > 20) { - this.slowScan = true; - } - } - } - } - } else { - this.blockData = null; - this.metaData = null; - - this.tickCount = 0; - } - } - - private void makeRandomOutline() { - this.makeOutline(this.rand.nextInt(12)); - } - - private void makeOutline(final int outline) { - double sx = this.xCoord; - double sy = this.yCoord; - double sz = this.zCoord; - - double dx = this.xCoord; - double dy = this.yCoord; - double dz = this.zCoord; - switch (outline) { - case 0: - sx -= this.radius; - dx -= this.radius; - sz -= this.radius; - dz += this.radius + 1; - case 8: - sx -= this.radius; - dx += this.radius + 1; - sz -= this.radius; - dz -= this.radius; - break; - case 1: - case 9: - sx -= this.radius; - dx -= this.radius; - sz -= this.radius; - dz += this.radius + 1; - break; - case 2: - case 10: - sx -= this.radius; - dx += this.radius + 1; - sz += this.radius + 1; - dz += this.radius + 1; - break; - case 3: - case 11: - sx += this.radius + 1; - dx += this.radius + 1; - sz -= this.radius; - dz += this.radius + 1; - break; - case 4: - sx -= this.radius; - dx -= this.radius; - sz -= this.radius; - dz -= this.radius; - break; - case 5: - sx += this.radius + 1; - dx += this.radius + 1; - sz -= this.radius; - dz -= this.radius; - break; - case 6: - sx += this.radius + 1; - dx += this.radius + 1; - sz += this.radius + 1; - dz += this.radius + 1; - break; - case 7: - sx -= this.radius; - dx -= this.radius; - sz += this.radius + 1; - dz += this.radius + 1; - } - switch (outline) { - case 0: - case 1: - case 2: - case 3: - sy += this.radius + 1; - dy += this.radius + 1; - break; - case 4: - case 5: - case 6: - case 7: - sy -= this.radius; - dy += this.radius + 1; - break; - case 8: - case 9: - case 10: - case 11: - sy -= this.radius; - dy -= this.radius; - } - if (this.rand.nextBoolean()) { - this.drawParticleLine(this.xCoord + 0.5D, this.yCoord + 0.5D, this.zCoord + 0.5D, dx, dy, dz); - } else { - this.drawParticleLine(sx, sy, sz, this.xCoord + 0.5D, this.yCoord + 0.5D, this.zCoord + 0.5D); - } - this.drawParticleLine(sx, sy, sz, dx, dy, dz); - } - - protected void drawParticleLine(final double srcX, final double srcY, final double srcZ, final double destX, - final double destY, final double destZ) { - final int particles = 16; - for (int i = 0; i < particles; i++) { - final double trailFactor = i / (particles - 1.0D); - - final double tx = srcX + ((destX - srcX) * trailFactor) + (this.rand.nextFloat() * 0.005D); - final double ty = srcY + ((destY - srcY) * trailFactor) + (this.rand.nextFloat() * 0.005D); - final double tz = srcZ + ((destZ - srcZ) * trailFactor) + (this.rand.nextFloat() * 0.005D); - this.worldObj.spawnParticle("portal", tx, ty, tz, 0.0D, 0.0D, 0.0D); - } - } - - private boolean scanAndRevertChanges() { - int index = 0; - boolean reverted = false; - for (int x = -this.radius; x <= this.radius; x++) { - for (int y = -this.radius; y <= this.radius; y++) { - for (int z = -this.radius; z <= this.radius; z++) { - final Block blockID = this.worldObj.getBlock(this.xCoord + x, this.yCoord + y, this.zCoord + z); - final byte meta = (byte) this.worldObj - .getBlockMetadata(this.xCoord + x, this.yCoord + y, this.zCoord + z); - if (this.blockData[index] != blockID) { - if (this.revertBlock( - this.xCoord + x, - this.yCoord + y, - this.zCoord + z, - blockID, - meta, - this.blockData[index], - this.metaData[index])) { - reverted = true; - } else { - this.blockData[index] = blockID; - this.metaData[index] = meta; - } - } - index++; - } - } - } - return reverted; - } - - private boolean revertBlock(final int x, final int y, final int z, final Block thereBlockID, final byte thereMeta, - final Block replaceBlockID, byte replaceMeta) { - /* - * if ((thereBlockID == Blocks.air) && (!replaceBlockID.getMaterial().blocksMovement())) { - * System.out.println("Not replacing block " + replaceBlockID + " because it doesn't block movement"); return - * false; } - */ - if (this.isUnrevertable(thereBlockID, thereMeta, replaceBlockID, replaceMeta)) { - return false; - } - if (this.rand.nextInt(5) == 0) { - if (replaceBlockID != Blocks.air) { - // replaceBlockID = null; - replaceMeta = 4; - } - this.worldObj.setBlock(x, y, z, replaceBlockID, replaceMeta, 2); - if (thereBlockID == Blocks.air) { - this.worldObj.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(replaceBlockID) + (replaceMeta << 12)); - } else if (replaceBlockID == Blocks.air) { - this.worldObj.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(thereBlockID) + (thereMeta << 12)); - thereBlockID.dropBlockAsItem(this.worldObj, x, y, z, thereMeta, 0); - } - } - return true; - } - - private boolean isUnrevertable(final Block thereBlockID, final byte thereMeta, final Block replaceBlockID, - final byte replaceMeta) { - if ((thereBlockID == ModBlocks.blockGriefSaver) || (replaceBlockID == ModBlocks.blockGriefSaver)) { - return true; - } - /* - * if (((thereBlockID == towerTranslucent) && (thereMeta != 4)) || ((replaceBlockID == towerTranslucent) && - * (replaceMeta != 4))) { return true; } - */ - if ((thereBlockID == Blocks.redstone_lamp) && (replaceBlockID == Blocks.lit_redstone_lamp)) { - return true; - } - if ((thereBlockID == Blocks.lit_redstone_lamp) && (replaceBlockID == Blocks.redstone_lamp)) { - return true; - } - /* - * if ((thereBlockID == Blocks.water) || (replaceBlockID == Blocks.flowing_water)) { return true; } if - * ((thereBlockID == Blocks.flowing_water) || (replaceBlockID == Blocks.water)) { return true; } - */ - if (replaceBlockID == Blocks.tnt) { - return true; - } - return false; - } - - private void captureBlockData() { - this.blockData = new Block[this.diameter * this.diameter * this.diameter]; - this.metaData = new byte[this.diameter * this.diameter * this.diameter]; - - int index = 0; - for (int x = -this.radius; x <= this.radius; x++) { - for (int y = -this.radius; y <= this.radius; y++) { - for (int z = -this.radius; z <= this.radius; z++) { - final Block blockID = this.worldObj.getBlock(this.xCoord + x, this.yCoord + y, this.zCoord + z); - final int meta = this.worldObj.getBlockMetadata(this.xCoord + x, this.yCoord + y, this.zCoord + z); - - this.blockData[index] = blockID; - this.metaData[index] = ((byte) meta); - - index++; - } - } - } - } - - public boolean anyPlayerInRange() { - return this.worldObj - .getClosestPlayer(this.xCoord + 0.5D, this.yCoord + 0.5D, this.zCoord + 0.5D, this.requiredPlayerRange) - != null; - } -} diff --git a/src/main/java/gtPlusPlus/core/util/data/EnumUtils.java b/src/main/java/gtPlusPlus/core/util/data/EnumUtils.java deleted file mode 100644 index 71d0c16e14..0000000000 --- a/src/main/java/gtPlusPlus/core/util/data/EnumUtils.java +++ /dev/null @@ -1,45 +0,0 @@ -package gtPlusPlus.core.util.data; - -import com.google.common.base.Enums; -import com.google.common.base.Optional; - -public class EnumUtils { - - /** - * Returns the value of an Enum if it exists. If value is not found, case-insensitive search will occur. If value - * still not found, an IllegalArgumentException is thrown. - **/ - public static <T extends Enum<T>> T getValue(Class<T> enumeration, String name) { - Optional<T> j = Enums.getIfPresent(enumeration, name); - T VALUE; - if (j == null || !j.isPresent()) { - VALUE = valueOfIgnoreCase(enumeration, name); - } else { - VALUE = j.get(); - } - return VALUE; - } - - /** - * Finds the value of the given enumeration by name, case-insensitive. Throws an IllegalArgumentException if no - * match is found. - **/ - private static <T extends Enum<T>> T valueOfIgnoreCase(Class<T> enumeration, String name) { - - for (T enumValue : enumeration.getEnumConstants()) { - if (enumValue.name().equalsIgnoreCase(name)) { - return enumValue; - } - } - - throw new IllegalArgumentException( - String.format("There is no value with name '%s' in Enum %s", name, enumeration.getName())); - } - - public static Object getValue(Class class1, String materialName, boolean bool) { - if (Enum.class.isInstance(class1)) { - return getValue(class1, materialName); - } - return null; - } -} diff --git a/src/main/java/gtPlusPlus/core/util/data/LoggingUtils.java b/src/main/java/gtPlusPlus/core/util/data/LoggingUtils.java deleted file mode 100644 index 5332c82bf7..0000000000 --- a/src/main/java/gtPlusPlus/core/util/data/LoggingUtils.java +++ /dev/null @@ -1,50 +0,0 @@ -package gtPlusPlus.core.util.data; - -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.util.Date; - -public class LoggingUtils { - - public static void profileLog(final Object o) { - try { - String content; - final File file = new File("GregtechTimingsTC.txt"); - // if file doesnt exists, then create it - if (!file.exists()) { - file.createNewFile(); - final FileWriter fw = new FileWriter(file.getAbsoluteFile(), true); - final BufferedWriter bw = new BufferedWriter(fw); - bw.write("============================================================"); - bw.write(System.lineSeparator()); - bw.close(); - } - if (o instanceof String) { - content = (String) o; - } else { - content = o.toString(); - } - final FileWriter fw = new FileWriter(file.getAbsoluteFile(), true); - final BufferedWriter bw = new BufferedWriter(fw); - bw.write(content); - bw.write(System.lineSeparator()); - bw.close(); - System.out.println("Data Logged."); - - } catch (final IOException e) { - System.out.println("Data logging failed."); - } - } - - public static boolean logCurrentSystemTime(final String message) { - final Date date = new Date(System.currentTimeMillis()); - try { - profileLog(message + " | " + date.toString()); - return true; - } catch (final Throwable r) { - return false; - } - } -} diff --git a/src/main/java/gtPlusPlus/core/util/data/UUIDUtils.java b/src/main/java/gtPlusPlus/core/util/data/UUIDUtils.java deleted file mode 100644 index 71634b3af7..0000000000 --- a/src/main/java/gtPlusPlus/core/util/data/UUIDUtils.java +++ /dev/null @@ -1,24 +0,0 @@ -package gtPlusPlus.core.util.data; - -import java.nio.ByteBuffer; -import java.util.UUID; - -public class UUIDUtils { - - // UUID Methods below created by https://gist.github.com/jeffjohnson9046 - // https://gist.github.com/jeffjohnson9046/c663dd22bbe6bb0b3f5e - - public static byte[] getBytesFromUUID(UUID uuid) { - ByteBuffer bb = ByteBuffer.wrap(new byte[16]); - bb.putLong(uuid.getMostSignificantBits()); - bb.putLong(uuid.getLeastSignificantBits()); - return bb.array(); - } - - public static UUID getUUIDFromBytes(byte[] bytes) { - ByteBuffer byteBuffer = ByteBuffer.wrap(bytes); - Long high = byteBuffer.getLong(); - Long low = byteBuffer.getLong(); - return new UUID(high, low); - } -} diff --git a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_INIT.java b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_INIT.java deleted file mode 100644 index 56c93d4a4d..0000000000 --- a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_INIT.java +++ /dev/null @@ -1,30 +0,0 @@ -package gtPlusPlus.core.util.debug; - -import gtPlusPlus.preloader.CORE_Preloader; - -public class DEBUG_INIT { - - public static void registerBlocks() { - // Debug Loading - if (CORE_Preloader.DEBUG_MODE) {} - } - - public static void registerItems() { - /* - * ModItems.itemDebugShapeSpawner = new DEBUG_ITEM_ShapeSpawner("itemDebugShapeSpawner", - * AddToCreativeTab.tabMisc, 1, 500); GameRegistry.registerItem(ModItems.itemDebugShapeSpawner, - * "itemDebugShapeSpawner"); ModItems.itemBedLocator_Base = new BedLocator_Base("itemBedLocator_Base"); - * GameRegistry.registerItem(ModItems.itemBedLocator_Base, "itemBedLocator_Base"); - * ModItems.itemBaseItemWithCharge = new BaseItemWithCharge("itemBaseItemWithCharge", 0, 1000); - * GameRegistry.registerItem(ModItems.itemBaseItemWithCharge, "itemBaseItemWithCharge"); - */ - } - - public static void registerTEs() {} - - public static void registerMisc() {} - - public static void registerHandlers() { - // MinecraftForge.EVENT_BUS.register(new DEBUG_ScreenOverlay()); - } -} diff --git a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java deleted file mode 100644 index 07f8d6385a..0000000000 --- a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java +++ /dev/null @@ -1,53 +0,0 @@ -package gtPlusPlus.core.util.debug; - -import static net.minecraftforge.event.entity.player.PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK; - -import java.util.List; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.BaseItemGeneric; - -public class DEBUG_ITEM_ShapeSpawner extends BaseItemGeneric { - - public DEBUG_ITEM_ShapeSpawner(String s, CreativeTabs c, int stackSize, int maxDmg) { - super(s, c, stackSize, maxDmg); - s = "itemDebugShapeSpawner"; - c = AddToCreativeTab.tabMisc; - stackSize = 1; - maxDmg = 500; - } - - @Override - public ItemStack onItemRightClick(final ItemStack stack, final World world, final EntityPlayer player) { - - if (!world.isRemote) { - Logger.INFO("Constructing the shape for the " + "VACUUM FREEZER"); - final Thread thread = new Thread(new DEBUG_TimerThread(world, player)); - thread.start(); - } - return stack; - } - - @SubscribeEvent - public void playerInteractEventHandler(final PlayerInteractEvent event) { - if (event.isCanceled() || event.world.isRemote || (event.action != RIGHT_CLICK_BLOCK)) { - return; - } - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - list.add(EnumChatFormatting.GOLD + "For Testing Gregtech Shapes!"); - super.addInformation(stack, aPlayer, list, bool); - } -} diff --git a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java deleted file mode 100644 index 0df691624f..0000000000 --- a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java +++ /dev/null @@ -1,953 +0,0 @@ -package gtPlusPlus.core.util.debug; - -import static gregtech.api.enums.GT_Values.V; - -import java.util.ArrayList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; - -import gregtech.GT_Mod; -import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.gui.modularui.GT_UIInfos; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -import gregtech.api.util.GT_Utility; -import gregtech.common.items.GT_MetaGenerated_Tool_01; - -public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity { - - public static boolean disableMaintenance; - public boolean mMachine = false, mWrench = false, mScrewdriver = false, mSoftHammer = false, mHardHammer = false, - mSolderingTool = false, mCrowbar = false, mRunningOnLoad = false; - public int mPollution = 0, mProgresstime = 0, mMaxProgresstime = 0, mEUt = 0, mEfficiencyIncrease = 0, mUpdate = 0, - mStartUpCheck = 100, mRuntime = 0, mEfficiency = 0; - public ItemStack[] mOutputItems = null; - public FluidStack[] mOutputFluids = null; - public ArrayList<GT_MetaTileEntity_Hatch_Input> mInputHatches = new ArrayList<>(); - public ArrayList<GT_MetaTileEntity_Hatch_Output> mOutputHatches = new ArrayList<>(); - public ArrayList<GT_MetaTileEntity_Hatch_InputBus> mInputBusses = new ArrayList<>(); - public ArrayList<GT_MetaTileEntity_Hatch_OutputBus> mOutputBusses = new ArrayList<>(); - public ArrayList<GT_MetaTileEntity_Hatch_Dynamo> mDynamoHatches = new ArrayList<>(); - public ArrayList<GT_MetaTileEntity_Hatch_Muffler> mMufflerHatches = new ArrayList<>(); - public ArrayList<GT_MetaTileEntity_Hatch_Energy> mEnergyHatches = new ArrayList<>(); - public ArrayList<GT_MetaTileEntity_Hatch_Maintenance> mMaintenanceHatches = new ArrayList<>(); - - public DEBUG_MULTIBLOCK_ShapeSpawner(final int aID, final String aName, final String aNameRegional) { - super(aID, aName, aNameRegional, 2); - DEBUG_MULTIBLOCK_ShapeSpawner.disableMaintenance = GregTech_API.sMachineFile - .get(ConfigCategories.machineconfig, "MultiBlockMachines.disableMaintenance", false); - } - - public DEBUG_MULTIBLOCK_ShapeSpawner(final String aName) { - super(aName, 2); - DEBUG_MULTIBLOCK_ShapeSpawner.disableMaintenance = GregTech_API.sMachineFile - .get(ConfigCategories.machineconfig, "MultiBlockMachines.disableMaintenance", false); - } - - public static boolean isValidMetaTileEntity(final MetaTileEntity aMetaTileEntity) { - return (aMetaTileEntity.getBaseMetaTileEntity() != null) - && (aMetaTileEntity.getBaseMetaTileEntity().getMetaTileEntity() == aMetaTileEntity) - && !aMetaTileEntity.getBaseMetaTileEntity().isDead(); - } - - @Override - public boolean allowCoverOnSide(final ForgeDirection side, final GT_ItemStack aCoverID) { - return side != this.getBaseMetaTileEntity().getFrontFacing(); - } - - @Override - public boolean isSimpleMachine() { - return false; - } - - @Override - public boolean isFacingValid(final ForgeDirection facing) { - return true; - } - - @Override - public boolean isAccessAllowed(final EntityPlayer aPlayer) { - return true; - } - - @Override - public boolean isValidSlot(final int aIndex) { - return aIndex > 0; - } - - @Override - public int getProgresstime() { - return this.mProgresstime; - } - - @Override - public int maxProgresstime() { - return this.mMaxProgresstime; - } - - @Override - public int increaseProgress(final int aProgress) { - return aProgress; - } - - @Override - public void saveNBTData(final NBTTagCompound aNBT) { - aNBT.setInteger("mEUt", this.mEUt); - aNBT.setInteger("mProgresstime", this.mProgresstime); - aNBT.setInteger("mMaxProgresstime", this.mMaxProgresstime); - aNBT.setInteger("mEfficiencyIncrease", this.mEfficiencyIncrease); - aNBT.setInteger("mEfficiency", this.mEfficiency); - aNBT.setInteger("mPollution", this.mPollution); - aNBT.setInteger("mRuntime", this.mRuntime); - - if (this.mOutputItems != null) { - for (int i = 0; i < this.mOutputItems.length; i++) { - if (this.mOutputItems[i] != null) { - final NBTTagCompound tNBT = new NBTTagCompound(); - this.mOutputItems[i].writeToNBT(tNBT); - aNBT.setTag("mOutputItem" + i, tNBT); - } - } - } - if (this.mOutputFluids != null) { - for (int i = 0; i < this.mOutputFluids.length; i++) { - if (this.mOutputFluids[i] != null) { - final NBTTagCompound tNBT = new NBTTagCompound(); - this.mOutputFluids[i].writeToNBT(tNBT); - aNBT.setTag("mOutputFluids" + i, tNBT); - } - } - } - - aNBT.setBoolean("mWrench", this.mWrench); - aNBT.setBoolean("mScrewdriver", this.mScrewdriver); - aNBT.setBoolean("mSoftHammer", this.mSoftHammer); - aNBT.setBoolean("mHardHammer", this.mHardHammer); - aNBT.setBoolean("mSolderingTool", this.mSolderingTool); - aNBT.setBoolean("mCrowbar", this.mCrowbar); - } - - @Override - public void loadNBTData(final NBTTagCompound aNBT) { - this.mEUt = aNBT.getInteger("mEUt"); - this.mProgresstime = aNBT.getInteger("mProgresstime"); - this.mMaxProgresstime = aNBT.getInteger("mMaxProgresstime"); - if (this.mMaxProgresstime > 0) { - this.mRunningOnLoad = true; - } - this.mEfficiencyIncrease = aNBT.getInteger("mEfficiencyIncrease"); - this.mEfficiency = aNBT.getInteger("mEfficiency"); - this.mPollution = aNBT.getInteger("mPollution"); - this.mRuntime = aNBT.getInteger("mRuntime"); - this.mOutputItems = new ItemStack[this.getAmountOfOutputs()]; - for (int i = 0; i < this.mOutputItems.length; i++) { - this.mOutputItems[i] = GT_Utility.loadItem(aNBT, "mOutputItem" + i); - } - this.mOutputFluids = new FluidStack[this.getAmountOfOutputs()]; - for (int i = 0; i < this.mOutputFluids.length; i++) { - this.mOutputFluids[i] = GT_Utility.loadFluid(aNBT, "mOutputFluids" + i); - } - this.mWrench = aNBT.getBoolean("mWrench"); - this.mScrewdriver = aNBT.getBoolean("mScrewdriver"); - this.mSoftHammer = aNBT.getBoolean("mSoftHammer"); - this.mHardHammer = aNBT.getBoolean("mHardHammer"); - this.mSolderingTool = aNBT.getBoolean("mSolderingTool"); - this.mCrowbar = aNBT.getBoolean("mCrowbar"); - } - - @Override - public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); - return true; - } - - @Override - public byte getTileEntityBaseType() { - return 2; - } - - @Override - public void onMachineBlockUpdate() { - this.mUpdate = 50; - } - - @Override - public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) { - if (aBaseMetaTileEntity.isServerSide()) { - if (this.mEfficiency < 0) { - this.mEfficiency = 0; - } - if ((--this.mUpdate == 0) || (--this.mStartUpCheck == 0)) { - this.mInputHatches.clear(); - this.mInputBusses.clear(); - this.mOutputHatches.clear(); - this.mOutputBusses.clear(); - this.mDynamoHatches.clear(); - this.mEnergyHatches.clear(); - this.mMufflerHatches.clear(); - this.mMaintenanceHatches.clear(); - this.mMachine = this.checkMachine(aBaseMetaTileEntity, this.mInventory[1]); - } - if (this.mStartUpCheck < 0) { - if (this.mMachine) { - for (final GT_MetaTileEntity_Hatch_Maintenance tHatch : this.mMaintenanceHatches) { - if (isValidMetaTileEntity(tHatch)) { - if (!DEBUG_MULTIBLOCK_ShapeSpawner.disableMaintenance) { - if (tHatch.mWrench) { - this.mWrench = true; - } - if (tHatch.mScrewdriver) { - this.mScrewdriver = true; - } - if (tHatch.mSoftHammer) { - this.mSoftHammer = true; - } - if (tHatch.mHardHammer) { - this.mHardHammer = true; - } - if (tHatch.mSolderingTool) { - this.mSolderingTool = true; - } - if (tHatch.mCrowbar) { - this.mCrowbar = true; - } - } else { - this.mWrench = true; - this.mScrewdriver = true; - this.mSoftHammer = true; - this.mHardHammer = true; - this.mSolderingTool = true; - this.mCrowbar = true; - } - - tHatch.mWrench = false; - tHatch.mScrewdriver = false; - tHatch.mSoftHammer = false; - tHatch.mHardHammer = false; - tHatch.mSolderingTool = false; - tHatch.mCrowbar = false; - } - } - if (this.getRepairStatus() > 0) { - if ((this.mMaxProgresstime > 0) && this.doRandomMaintenanceDamage()) { - if (this.onRunningTick(this.mInventory[1])) { - if (!this.polluteEnvironment(this.getPollutionPerTick(this.mInventory[1]))) { - this.stopMachine(); - } - if ((this.mMaxProgresstime > 0) && (++this.mProgresstime >= this.mMaxProgresstime)) { - if (this.mOutputItems != null) { - for (final ItemStack tStack : this.mOutputItems) { - if (tStack != null) { - try { - GT_Mod.achievements.issueAchivementHatch( - aBaseMetaTileEntity.getWorld().getPlayerEntityByName( - aBaseMetaTileEntity.getOwnerName()), - tStack); - } catch (final Exception e) {} - this.addOutput(tStack); - } - } - } - if ((this.mOutputFluids != null) && (this.mOutputFluids.length == 1)) { - for (final FluidStack tStack : this.mOutputFluids) { - if (tStack != null) { - this.addOutput(tStack); - } - } - } else if ((this.mOutputFluids != null) && (this.mOutputFluids.length > 1)) { - this.addFluidOutputs(this.mOutputFluids); - } - this.mEfficiency = Math.max( - 0, - Math.min( - this.mEfficiency + this.mEfficiencyIncrease, - this.getMaxEfficiency(this.mInventory[1]) - - ((this.getIdealStatus() - this.getRepairStatus()) - * 1000))); - this.mOutputItems = null; - this.mProgresstime = 0; - this.mMaxProgresstime = 0; - this.mEfficiencyIncrease = 0; - if (aBaseMetaTileEntity.isAllowedToWork()) { - this.checkRecipe(this.mInventory[1]); - } - if ((this.mOutputFluids != null) && (this.mOutputFluids.length > 0)) { - if (this.mOutputFluids.length > 1) { - GT_Mod.achievements.issueAchievement( - aBaseMetaTileEntity.getWorld() - .getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), - "oilplant"); - } - } - } - } - } else { - if (((aTick % 100) == 0) || aBaseMetaTileEntity.hasWorkJustBeenEnabled() - || aBaseMetaTileEntity.hasInventoryBeenModified()) { - - if (aBaseMetaTileEntity.isAllowedToWork()) { - this.checkRecipe(this.mInventory[1]); - } - if (this.mMaxProgresstime <= 0) { - this.mEfficiency = Math.max(0, this.mEfficiency - 1000); - } - } - } - } else { - this.stopMachine(); - } - } else { - this.stopMachine(); - } - } - aBaseMetaTileEntity.setErrorDisplayID( - (aBaseMetaTileEntity.getErrorDisplayID() & ~127) | (this.mWrench ? 0 : 1) - | (this.mScrewdriver ? 0 : 2) - | (this.mSoftHammer ? 0 : 4) - | (this.mHardHammer ? 0 : 8) - | (this.mSolderingTool ? 0 : 16) - | (this.mCrowbar ? 0 : 32) - | (this.mMachine ? 0 : 64)); - aBaseMetaTileEntity.setActive(this.mMaxProgresstime > 0); - } - } - - public boolean polluteEnvironment(final int aPollutionLevel) { - this.mPollution += aPollutionLevel; - for (final GT_MetaTileEntity_Hatch_Muffler tHatch : this.mMufflerHatches) { - if (isValidMetaTileEntity(tHatch)) { - if (this.mPollution >= 10000) { - if (tHatch.polluteEnvironment()) { - this.mPollution -= 10000; - } - } else { - break; - } - } - } - return this.mPollution < 10000; - } - - /** - * Called every tick the Machine runs - */ - public boolean onRunningTick(final ItemStack aStack) { - if (this.mEUt > 0) { - this.addEnergyOutput(((long) this.mEUt * this.mEfficiency) / 10000); - return true; - } - if (this.mEUt < 0) { - if (!this.drainEnergyInput(((long) -this.mEUt * 10000) / Math.max(1000, this.mEfficiency))) { - this.stopMachine(); - return false; - } - } - return true; - } - - /** - * Checks if this is a Correct Machine Part for this kind of Machine (Turbine Rotor for example) - */ - public abstract boolean isCorrectMachinePart(ItemStack aStack); - - /** - * Checks the Recipe - */ - public abstract boolean checkRecipe(ItemStack aStack); - - /** - * Checks the Machine. You have to assign the MetaTileEntities for the Hatches here. - */ - public abstract boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack); - - /** - * Gets the maximum Efficiency that spare Part can get (0 - 10000) - */ - public abstract int getMaxEfficiency(ItemStack aStack); - - /** - * Gets the pollution this Device outputs to a Muffler per tick (10000 = one Pullution Block) - */ - public abstract int getPollutionPerTick(ItemStack aStack); - - /** - * Gets the damage to the ItemStack, usually 0 or 1. - */ - public abstract int getDamageToComponent(ItemStack aStack); - - /** - * Gets the Amount of possibly outputted Items for loading the Output Stack Array from NBT. This should be the - * largest Amount that can ever happen legitimately. - */ - public abstract int getAmountOfOutputs(); - - /** - * If it explodes when the Component has to be replaced. - */ - public abstract boolean explodesOnComponentBreak(ItemStack aStack); - - public void stopMachine() { - this.mOutputItems = null; - this.mEUt = 0; - this.mEfficiency = 0; - this.mProgresstime = 0; - this.mMaxProgresstime = 0; - this.mEfficiencyIncrease = 0; - this.getBaseMetaTileEntity().disableWorking(); - } - - public int getRepairStatus() { - return (this.mWrench ? 1 : 0) + (this.mScrewdriver ? 1 : 0) - + (this.mSoftHammer ? 1 : 0) - + (this.mHardHammer ? 1 : 0) - + (this.mSolderingTool ? 1 : 0) - + (this.mCrowbar ? 1 : 0); - } - - public int getIdealStatus() { - return 6; - } - - public boolean doRandomMaintenanceDamage() { - if (!this.isCorrectMachinePart(this.mInventory[1]) || (this.getRepairStatus() == 0)) { - this.stopMachine(); - return false; - } - if (this.mRuntime++ > 1000) { - this.mRuntime = 0; - if (this.getBaseMetaTileEntity().getRandomNumber(6000) == 0) { - switch (this.getBaseMetaTileEntity().getRandomNumber(6)) { - case 0: - this.mWrench = false; - break; - case 1: - this.mScrewdriver = false; - break; - case 2: - this.mSoftHammer = false; - break; - case 3: - this.mHardHammer = false; - break; - case 4: - this.mSolderingTool = false; - break; - case 5: - this.mCrowbar = false; - break; - } - } - if ((this.mInventory[1] != null) && (this.getBaseMetaTileEntity().getRandomNumber(2) == 0) - && !this.mInventory[1].getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.")) { - if (this.mInventory[1].getItem() instanceof GT_MetaGenerated_Tool_01) { - final NBTTagCompound tNBT = this.mInventory[1].getTagCompound(); - if (tNBT != null) { - NBTTagCompound tNBT2 = tNBT.getCompoundTag("GT.CraftingComponents"); - if (!tNBT.getBoolean("mDis")) { - tNBT2 = new NBTTagCompound(); - final Materials tMaterial = GT_MetaGenerated_Tool.getPrimaryMaterial(this.mInventory[1]); - final ItemStack tTurbine = GT_OreDictUnificator.get(OrePrefixes.turbineBlade, tMaterial, 1); - final int i = this.mInventory[1].getItemDamage(); - if (i == 170) { - ItemStack tStack = GT_Utility.copyAmount(1, tTurbine); - tNBT2.setTag("Ingredient.0", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.1", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.2", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.3", tStack.writeToNBT(new NBTTagCompound())); - tStack = GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Magnalium, 1); - tNBT2.setTag("Ingredient.4", tStack.writeToNBT(new NBTTagCompound())); - } else if (i == 172) { - ItemStack tStack = GT_Utility.copyAmount(1, tTurbine); - tNBT2.setTag("Ingredient.0", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.1", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.2", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.3", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.5", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.6", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.7", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.8", tStack.writeToNBT(new NBTTagCompound())); - tStack = GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Titanium, 1); - tNBT2.setTag("Ingredient.4", tStack.writeToNBT(new NBTTagCompound())); - } else if (i == 174) { - ItemStack tStack = GT_Utility.copyAmount(2, tTurbine); - tNBT2.setTag("Ingredient.0", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.1", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.2", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.3", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.5", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.6", tStack.writeToNBT(new NBTTagCompound())); - tStack = GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 1); - tNBT2.setTag("Ingredient.4", tStack.writeToNBT(new NBTTagCompound())); - } else if (i == 176) { - ItemStack tStack = GT_Utility.copyAmount(2, tTurbine); - tNBT2.setTag("Ingredient.0", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.1", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.2", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.3", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.5", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.6", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.7", tStack.writeToNBT(new NBTTagCompound())); - tNBT2.setTag("Ingredient.8", tStack.writeToNBT(new NBTTagCompound())); - tStack = GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Americium, 1); - tNBT2.setTag("Ingredient.4", tStack.writeToNBT(new NBTTagCompound())); - } - tNBT.setTag("GT.CraftingComponents", tNBT2); - tNBT.setBoolean("mDis", true); - this.mInventory[1].setTagCompound(tNBT); - } - } - - ((GT_MetaGenerated_Tool) this.mInventory[1].getItem()) - .doDamage(this.mInventory[1], (long) Math.min(this.mEUt / 5, Math.pow(this.mEUt, 0.7))); - if (this.mInventory[1].stackSize == 0) { - this.mInventory[1] = null; - } - } - } - } - return true; - } - - public void explodeMultiblock() { - this.mInventory[1] = null; - for (final MetaTileEntity tTileEntity : this.mInputBusses) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]); - } - for (final MetaTileEntity tTileEntity : this.mOutputBusses) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]); - } - for (final MetaTileEntity tTileEntity : this.mInputHatches) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]); - } - for (final MetaTileEntity tTileEntity : this.mOutputHatches) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]); - } - for (final MetaTileEntity tTileEntity : this.mDynamoHatches) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]); - } - for (final MetaTileEntity tTileEntity : this.mMufflerHatches) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]); - } - for (final MetaTileEntity tTileEntity : this.mEnergyHatches) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]); - } - for (final MetaTileEntity tTileEntity : this.mMaintenanceHatches) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]); - } - this.getBaseMetaTileEntity().doExplosion(V[8]); - } - - public boolean addEnergyOutput(final long aEU) { - if (aEU <= 0) { - return true; - } - for (final GT_MetaTileEntity_Hatch_Dynamo tHatch : this.mDynamoHatches) { - if (isValidMetaTileEntity(tHatch)) { - if (tHatch.getBaseMetaTileEntity().increaseStoredEnergyUnits(aEU, false)) { - return true; - } - } - } - return false; - } - - public long getMaxInputVoltage() { - long rVoltage = 0; - for (final GT_MetaTileEntity_Hatch_Energy tHatch : this.mEnergyHatches) { - if (isValidMetaTileEntity(tHatch)) { - rVoltage += tHatch.getBaseMetaTileEntity().getInputVoltage(); - } - } - return rVoltage; - } - - public boolean drainEnergyInput(final long aEU) { - if (aEU <= 0) { - return true; - } - for (final GT_MetaTileEntity_Hatch_Energy tHatch : this.mEnergyHatches) { - if (isValidMetaTileEntity(tHatch)) { - if (tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(aEU, false)) { - return true; - } - } - } - return false; - } - - public boolean addOutput(final FluidStack aLiquid) { - if (aLiquid == null) { - return false; - } - final FluidStack tLiquid = aLiquid.copy(); - for (final GT_MetaTileEntity_Hatch_Output tHatch : this.mOutputHatches) { - if (isValidMetaTileEntity(tHatch) && GT_ModHandler.isSteam(aLiquid) ? tHatch.outputsSteam() - : tHatch.outputsLiquids()) { - final int tAmount = tHatch.fill(tLiquid, false); - if (tAmount >= tLiquid.amount) { - return tHatch.fill(tLiquid, true) >= tLiquid.amount; - } else if (tAmount > 0) { - tLiquid.amount = tLiquid.amount - tHatch.fill(tLiquid, true); - } - } - } - return false; - } - - private void addFluidOutputs(final FluidStack[] mOutputFluids2) { - for (int i = 0; i < mOutputFluids2.length; i++) { - if ((this.mOutputHatches.size() > i) && (this.mOutputHatches.get(i) != null) - && (mOutputFluids2[i] != null) - && isValidMetaTileEntity(this.mOutputHatches.get(i))) { - this.mOutputHatches.get(i).fill(mOutputFluids2[i], true); - } - } - } - - public boolean depleteInput(final FluidStack aLiquid) { - if (aLiquid == null) { - return false; - } - for (final GT_MetaTileEntity_Hatch_Input tHatch : this.mInputHatches) { - tHatch.mRecipeMap = this.getRecipeMap(); - if (isValidMetaTileEntity(tHatch)) { - FluidStack tLiquid = tHatch.getFluid(); - if ((tLiquid != null) && tLiquid.isFluidEqual(aLiquid)) { - tLiquid = tHatch.drain(aLiquid.amount, false); - if ((tLiquid != null) && (tLiquid.amount >= aLiquid.amount)) { - tLiquid = tHatch.drain(aLiquid.amount, true); - return (tLiquid != null) && (tLiquid.amount >= aLiquid.amount); - } - } - } - } - return false; - } - - public boolean addOutput(ItemStack aStack) { - if (GT_Utility.isStackInvalid(aStack)) { - return false; - } - aStack = GT_Utility.copy(aStack); - // FluidStack aLiquid = GT_Utility.getFluidForFilledItem(aStack, true); - // if (aLiquid == null) { - for (final GT_MetaTileEntity_Hatch_OutputBus tHatch : this.mOutputBusses) { - if (isValidMetaTileEntity(tHatch)) { - for (int i = tHatch.getSizeInventory() - 1; i >= 0; i--) { - if (tHatch.getBaseMetaTileEntity().addStackToSlot(i, aStack)) { - return true; - } - } - } - } - for (final GT_MetaTileEntity_Hatch_Output tHatch : this.mOutputHatches) { - if (isValidMetaTileEntity(tHatch) && tHatch.outputsItems()) { - if (tHatch.getBaseMetaTileEntity().addStackToSlot(1, aStack)) { - return true; - } - } - } - // }else { - // for (GT_MetaTileEntity_Hatch_Output tHatch : mOutputHatches) { - // if (isValidMetaTileEntity(tHatch) && - // GT_ModHandler.isSteam(aLiquid)?tHatch.outputsSteam():tHatch.outputsLiquids()) { - // int tAmount = tHatch.fill(aLiquid, false); - // if (tAmount >= aLiquid.amount) { - // return tHatch.fill(aLiquid, true) >= aLiquid.amount; - // } - // } - // } - // } - return false; - } - - public boolean depleteInput(final ItemStack aStack) { - if (GT_Utility.isStackInvalid(aStack)) { - return false; - } - final FluidStack aLiquid = GT_Utility.getFluidForFilledItem(aStack, true); - if (aLiquid != null) { - return this.depleteInput(aLiquid); - } - for (final GT_MetaTileEntity_Hatch_Input tHatch : this.mInputHatches) { - tHatch.mRecipeMap = this.getRecipeMap(); - if (isValidMetaTileEntity(tHatch)) { - if (GT_Utility.areStacksEqual(aStack, tHatch.getBaseMetaTileEntity().getStackInSlot(0))) { - if (tHatch.getBaseMetaTileEntity().getStackInSlot(0).stackSize >= aStack.stackSize) { - tHatch.getBaseMetaTileEntity().decrStackSize(0, aStack.stackSize); - return true; - } - } - } - } - for (final GT_MetaTileEntity_Hatch_InputBus tHatch : this.mInputBusses) { - tHatch.mRecipeMap = this.getRecipeMap(); - if (isValidMetaTileEntity(tHatch)) { - for (int i = tHatch.getBaseMetaTileEntity().getSizeInventory() - 1; i >= 0; i--) { - if (GT_Utility.areStacksEqual(aStack, tHatch.getBaseMetaTileEntity().getStackInSlot(i))) { - if (tHatch.getBaseMetaTileEntity().getStackInSlot(0).stackSize >= aStack.stackSize) { - tHatch.getBaseMetaTileEntity().decrStackSize(0, aStack.stackSize); - return true; - } - } - } - } - } - return false; - } - - public ArrayList<ItemStack> getStoredOutputs() { - final ArrayList<ItemStack> rList = new ArrayList<>(); - for (final GT_MetaTileEntity_Hatch_Output tHatch : this.mOutputHatches) { - if (isValidMetaTileEntity(tHatch)) { - rList.add(tHatch.getBaseMetaTileEntity().getStackInSlot(1)); - } - } - for (final GT_MetaTileEntity_Hatch_OutputBus tHatch : this.mOutputBusses) { - if (isValidMetaTileEntity(tHatch)) { - for (int i = tHatch.getBaseMetaTileEntity().getSizeInventory() - 1; i >= 0; i--) { - rList.add(tHatch.getBaseMetaTileEntity().getStackInSlot(i)); - } - } - } - return rList; - } - - public ArrayList<FluidStack> getStoredFluids() { - final ArrayList<FluidStack> rList = new ArrayList<>(); - for (final GT_MetaTileEntity_Hatch_Input tHatch : this.mInputHatches) { - tHatch.mRecipeMap = this.getRecipeMap(); - if (isValidMetaTileEntity(tHatch) && (tHatch.getFillableStack() != null)) { - rList.add(tHatch.getFillableStack()); - } - } - return rList; - } - - public ArrayList<ItemStack> getStoredInputs() { - final ArrayList<ItemStack> rList = new ArrayList<>(); - for (final GT_MetaTileEntity_Hatch_Input tHatch : this.mInputHatches) { - tHatch.mRecipeMap = this.getRecipeMap(); - if (isValidMetaTileEntity(tHatch) && (tHatch.getBaseMetaTileEntity().getStackInSlot(0) != null)) { - rList.add(tHatch.getBaseMetaTileEntity().getStackInSlot(0)); - } - } - for (final GT_MetaTileEntity_Hatch_InputBus tHatch : this.mInputBusses) { - tHatch.mRecipeMap = this.getRecipeMap(); - if (isValidMetaTileEntity(tHatch)) { - for (int i = tHatch.getBaseMetaTileEntity().getSizeInventory() - 1; i >= 0; i--) { - if (tHatch.getBaseMetaTileEntity().getStackInSlot(i) != null) { - rList.add(tHatch.getBaseMetaTileEntity().getStackInSlot(i)); - } - } - } - } - return rList; - } - - public GT_Recipe_Map getRecipeMap() { - return null; - } - - public void updateSlots() { - for (final GT_MetaTileEntity_Hatch_Input tHatch : this.mInputHatches) { - if (isValidMetaTileEntity(tHatch)) { - tHatch.updateSlots(); - } - } - for (final GT_MetaTileEntity_Hatch_InputBus tHatch : this.mInputBusses) { - if (isValidMetaTileEntity(tHatch)) { - tHatch.updateSlots(); - } - } - } - - public boolean addToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) { - if (aTileEntity == null) { - return false; - } - final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - return false; - } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).mMachineBlock = (byte) aBaseCasingIndex; - } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); - } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) { - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity); - } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); - } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); - } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) { - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity); - } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) { - return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity); - } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) aMetaTileEntity); - } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); - } - return false; - } - - public boolean addMaintenanceToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) { - if (aTileEntity == null) { - return false; - } - final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - return false; - } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).mMachineBlock = (byte) aBaseCasingIndex; - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) aMetaTileEntity); - } - return false; - } - - public boolean addEnergyInputToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) { - if (aTileEntity == null) { - return false; - } - final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - return false; - } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).mMachineBlock = (byte) aBaseCasingIndex; - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity); - } - return false; - } - - public boolean addDynamoToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) { - if (aTileEntity == null) { - return false; - } - final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - return false; - } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).mMachineBlock = (byte) aBaseCasingIndex; - return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity); - } - return false; - } - - public boolean addMufflerToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) { - if (aTileEntity == null) { - return false; - } - final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - return false; - } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).mMachineBlock = (byte) aBaseCasingIndex; - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); - } - return false; - } - - public boolean addInputToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) { - if (aTileEntity == null) { - return false; - } - final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - return false; - } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).mMachineBlock = (byte) aBaseCasingIndex; - ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mRecipeMap = this.getRecipeMap(); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); - } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).mMachineBlock = (byte) aBaseCasingIndex; - ((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mRecipeMap = this.getRecipeMap(); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity); - } - return false; - } - - public boolean addOutputToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) { - if (aTileEntity == null) { - return false; - } - final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - return false; - } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).mMachineBlock = (byte) aBaseCasingIndex; - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); - } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).mMachineBlock = (byte) aBaseCasingIndex; - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); - } - return false; - } - - @Override - public String[] getInfoData() { - return new String[] { "Progress:", (this.mProgresstime / 20) + "secs", (this.mMaxProgresstime / 20) + "secs", - "Efficiency:", (this.mEfficiency / 100.0F) + "%", "Problems:", - "" + (this.getIdealStatus() - this.getRepairStatus()) }; - } - - @Override - public boolean isGivingInformation() { - return true; - } - - @Override - public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, - final ForgeDirection side, final ItemStack aStack) { - return false; - } - - @Override - public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, - final ForgeDirection side, final ItemStack aStack) { - return false; - } - - @Override - public boolean useModularUI() { - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java deleted file mode 100644 index 16b6979dcb..0000000000 --- a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java +++ /dev/null @@ -1,45 +0,0 @@ -package gtPlusPlus.core.util.debug; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.item.Item; -import net.minecraftforge.client.event.RenderGameOverlayEvent; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - -public class DEBUG_ScreenOverlay extends Gui { - - int width, height; - Minecraft mc = Minecraft.getMinecraft(); - - @SubscribeEvent - public void eventHandler(final RenderGameOverlayEvent.Text event) { - - // if (mc.thePlayer.getHeldItem().equals(ModItems.itemStaballoyPickaxe)){ - final ScaledResolution res = new ScaledResolution(this.mc, this.mc.displayWidth, this.mc.displayHeight); - final FontRenderer fontRender = this.mc.fontRenderer; - this.width = res.getScaledWidth(); - this.height = res.getScaledHeight(); - Minecraft.getMinecraft().entityRenderer.setupOverlayRendering(); - final String str = "Words"; - Item heldItem = null; - - try { - heldItem = this.mc.thePlayer.getHeldItem().getItem(); - - if (heldItem != null) { - /* - * if (heldItem instanceof StaballoyPickaxe){ int dmg =((StaballoyPickaxe) - * heldItem).getDamage(((StaballoyPickaxe) heldItem).thisPickaxe); ((StaballoyPickaxe) - * heldItem).checkFacing(((StaballoyPickaxe) heldItem).localWorld); str = "DAMAGE: "+ dmg - * +" | FACING: "+((StaballoyPickaxe) heldItem).FACING+" | FACING_HORIZONTAL: "+((StaballoyPickaxe) - * heldItem).FACING_HORIZONTAL+" | LOOKING DIRECTION: "+((StaballoyPickaxe) heldItem).lookingDirection; - * drawString(fontRender, str, (this.width - fontRender.getStringWidth(str)) / 2, this.height / 10, - * 0xFFAA00); } - */ - } - } catch (final NullPointerException e) {} - } -} diff --git a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java deleted file mode 100644 index fa53c290fc..0000000000 --- a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java +++ /dev/null @@ -1,84 +0,0 @@ -package gtPlusPlus.core.util.debug; - -import java.util.concurrent.TimeUnit; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import gtPlusPlus.api.objects.Logger; - -public class DEBUG_TimerThread implements Runnable { - - private final World world; - private final EntityPlayer player; - - public DEBUG_TimerThread(final World WORLD, final EntityPlayer PLAYER) { - this.world = WORLD; - this.player = PLAYER; - } - - @Override - public void run() { - int xDir = ForgeDirection.getOrientation(this.player.getPlayerCoordinates().posX).offsetX; - int zDir = ForgeDirection.getOrientation(this.player.getPlayerCoordinates().posZ).offsetZ; - - final int stepX = Minecraft.getMinecraft().objectMouseOver.blockX; - final int stepY = Minecraft.getMinecraft().objectMouseOver.blockY; - final int stepZ = Minecraft.getMinecraft().objectMouseOver.blockZ; - Logger.INFO( - "Clicked on a Block @ " + "[X:" - + stepX - + "][Y:" - + stepY - + "][Z:" - + stepZ - + "]" - + " with xDir:" - + xDir - + " zDir:" - + zDir); - this.world.setBlock(stepX, stepY, stepZ, Blocks.bedrock, 0, 3); - Logger.INFO("Makng it Bedrock for future investment."); - // for (int i = -1; i <= 1; i++) { - // stepX = stepX+i; - for (int i = stepX - 1; i <= (stepX + 1); i++) { - for (int j = stepZ - 1; j <= (stepZ + 1); j++) { - for (int h = stepY - 1; h <= (stepY + 1); h++) { - - xDir = ForgeDirection.getOrientation(this.player.getPlayerCoordinates().posX).offsetX; - zDir = ForgeDirection.getOrientation(this.player.getPlayerCoordinates().posZ).offsetZ; - - // for (int j = -1; j <= 1; j++) { - // stepZ = stepZ+j; - // for (int h = -1; h <= 1; h++) { - // stepY = stepY+h; - Logger.INFO( - "Placing Block @ " + "[X:" - + i - + "][Y:" - + h - + "][Z:" - + j - + "]" - + " with xDir:" - + xDir - + " zDir:" - + zDir); - if ((h != 0) || ((((xDir + i) != 0) || ((zDir + j) != 0)) && ((i != 0) || (j != 0)))) { - this.world.setBlock(i, h, j, Blocks.stone, 0, 3); - } else { - Logger.INFO("Not even sure what this is for, but I got here."); - } - try { - TimeUnit.MILLISECONDS.sleep(500); - } catch (final InterruptedException e1) { - e1.printStackTrace(); - } - } - } - } - } -} diff --git a/src/main/java/gtPlusPlus/core/util/debug/UtilityGL11Debug.java b/src/main/java/gtPlusPlus/core/util/debug/UtilityGL11Debug.java deleted file mode 100644 index e774824fbf..0000000000 --- a/src/main/java/gtPlusPlus/core/util/debug/UtilityGL11Debug.java +++ /dev/null @@ -1,1338 +0,0 @@ -package gtPlusPlus.core.util.debug; - -import java.nio.ByteBuffer; - -import org.lwjgl.BufferUtils; -import org.lwjgl.opengl.GL11; - -/** - * User: The Grey Ghost Date: 9/02/14 - */ -public class UtilityGL11Debug { - - public class GLproperty { - - public GLproperty(final int init_gLconstant, final String init_name, final String init_description, - final String init_category, final String init_fetchCommand) { - this.gLconstant = init_gLconstant; - this.name = init_name; - this.description = init_description; - this.category = init_category; - this.fetchCommand = init_fetchCommand; - } - - public int gLconstant; - public String name; - public String description; - public String category; - public String fetchCommand; - } - - public static UtilityGL11Debug instance = new UtilityGL11Debug(); - - public GLproperty[] propertyList = { - new GLproperty(GL11.GL_CURRENT_COLOR, "GL_CURRENT_COLOR", "Current color", "current", "glGetFloatv()"), - new GLproperty( - GL11.GL_CURRENT_INDEX, - "GL_CURRENT_INDEX", - "Current color index", - "current", - "glGetFloatv()"), - new GLproperty( - GL11.GL_CURRENT_TEXTURE_COORDS, - "GL_CURRENT_TEXTURE_COORDS", - "Current texture coordinates", - "current", - "glGetFloatv()"), - new GLproperty(GL11.GL_CURRENT_NORMAL, "GL_CURRENT_NORMAL", "Current normal", "current", "glGetFloatv()"), - new GLproperty( - GL11.GL_CURRENT_RASTER_POSITION, - "GL_CURRENT_RASTER_POSITION", - "Current raster position", - "current", - "glGetFloatv()"), - new GLproperty( - GL11.GL_CURRENT_RASTER_DISTANCE, - "GL_CURRENT_RASTER_DISTANCE", - "Current raster distance", - "current", - "glGetFloatv()"), - new GLproperty( - GL11.GL_CURRENT_RASTER_COLOR, - "GL_CURRENT_RASTER_COLOR", - "Color associated with raster position", - "current", - "glGetFloatv()"), - new GLproperty( - GL11.GL_CURRENT_RASTER_INDEX, - "GL_CURRENT_RASTER_INDEX", - "Color index associated with raster position", - "current", - "glGetFloatv()"), - new GLproperty( - GL11.GL_CURRENT_RASTER_TEXTURE_COORDS, - "GL_CURRENT_RASTER_TEXTURE_COORDS", - "Texture coordinates associated with raster position", - "current", - "glGetFloatv()"), - new GLproperty( - GL11.GL_CURRENT_RASTER_POSITION_VALID, - "GL_CURRENT_RASTER_POSITION_VALID", - "Raster position valid bit", - "current", - "glGetBooleanv()"), - new GLproperty(GL11.GL_EDGE_FLAG, "GL_EDGE_FLAG", "Edge flag", "current", "glGetBooleanv()"), - new GLproperty( - GL11.GL_VERTEX_ARRAY, - "GL_VERTEX_ARRAY", - "Vertex array enable", - "vertex-array", - "glIsEnabled()"), - new GLproperty( - GL11.GL_VERTEX_ARRAY_SIZE, - "GL_VERTEX_ARRAY_SIZE", - "Coordinates per vertex", - "vertex-array", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_VERTEX_ARRAY_TYPE, - "GL_VERTEX_ARRAY_TYPE", - "Type of vertex coordinates", - "vertex-array", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_VERTEX_ARRAY_STRIDE, - "GL_VERTEX_ARRAY_STRIDE", - "Stride between vertices", - "vertex-array", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_VERTEX_ARRAY_POINTER, - "GL_VERTEX_ARRAY_POINTER", - "Pointer to the vertex array", - "vertex-array", - "glGetPointerv()"), - new GLproperty( - GL11.GL_NORMAL_ARRAY, - "GL_NORMAL_ARRAY", - "Normal array enable", - "vertex-array", - "glIsEnabled()"), - new GLproperty( - GL11.GL_NORMAL_ARRAY_TYPE, - "GL_NORMAL_ARRAY_TYPE", - "Type of normal coordinates", - "vertex-array", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_NORMAL_ARRAY_STRIDE, - "GL_NORMAL_ARRAY_STRIDE", - "Stride between normals", - "vertex-array", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_NORMAL_ARRAY_POINTER, - "GL_NORMAL_ARRAY_POINTER", - "Pointer to the normal array", - "vertex-array", - "glGetPointerv()"), - new GLproperty( - GL11.GL_COLOR_ARRAY, - "GL_COLOR_ARRAY", - "RGBA color array enable", - "vertex-array", - "glIsEnabled()"), - new GLproperty( - GL11.GL_COLOR_ARRAY_SIZE, - "GL_COLOR_ARRAY_SIZE", - "Colors per vertex", - "vertex-array", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_COLOR_ARRAY_TYPE, - "GL_COLOR_ARRAY_TYPE", - "Type of color components", - "vertex-array", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_COLOR_ARRAY_STRIDE, - "GL_COLOR_ARRAY_STRIDE", - "Stride between colors", - "vertex-array", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_COLOR_ARRAY_POINTER, - "GL_COLOR_ARRAY_POINTER", - "Pointer to the color array", - "vertex-array", - "glGetPointerv()"), - new GLproperty( - GL11.GL_INDEX_ARRAY, - "GL_INDEX_ARRAY", - "Color-index array enable", - "vertex-array", - "glIsEnabled()"), - new GLproperty( - GL11.GL_INDEX_ARRAY_TYPE, - "GL_INDEX_ARRAY_TYPE", - "Type of color indices", - "vertex-array", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_INDEX_ARRAY_STRIDE, - "GL_INDEX_ARRAY_STRIDE", - "Stride between color indices", - "vertex-array", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_INDEX_ARRAY_POINTER, - "GL_INDEX_ARRAY_POINTER", - "Pointer to the index array", - "vertex-array", - "glGetPointerv()"), - new GLproperty( - GL11.GL_TEXTURE_COORD_ARRAY, - "GL_TEXTURE_COORD_ARRAY", - "Texture coordinate array enable", - "vertex-array", - "glIsEnabled()"), - new GLproperty( - GL11.GL_TEXTURE_COORD_ARRAY_SIZE, - "GL_TEXTURE_COORD_ARRAY_SIZE", - "Texture coordinates per element", - "vertex-array", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_TEXTURE_COORD_ARRAY_TYPE, - "GL_TEXTURE_COORD_ARRAY_TYPE", - "Type of texture coordinates", - "vertex-array", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_TEXTURE_COORD_ARRAY_STRIDE, - "GL_TEXTURE_COORD_ARRAY_STRIDE", - "Stride between texture coordinates", - "vertex-array", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_TEXTURE_COORD_ARRAY_POINTER, - "GL_TEXTURE_COORD_ARRAY_POINTER", - "Pointer to the texture coordinate array", - "vertex-array", - "glGetPointerv()"), - new GLproperty( - GL11.GL_EDGE_FLAG_ARRAY, - "GL_EDGE_FLAG_ARRAY", - "Edge flag array enable", - "vertex-array", - "glIsEnabled()"), - new GLproperty( - GL11.GL_EDGE_FLAG_ARRAY_STRIDE, - "GL_EDGE_FLAG_ARRAY_STRIDE", - "Stride between edge flags", - "vertex-array", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_EDGE_FLAG_ARRAY_POINTER, - "GL_EDGE_FLAG_ARRAY_POINTER", - "Pointer to the edge flag array", - "vertex-array", - "glGetPointerv()"), - new GLproperty( - GL11.GL_MODELVIEW_MATRIX, - "GL_MODELVIEW_MATRIX", - "Modelview matrix stack", - "matrix", - "glGetFloatv()"), - new GLproperty( - GL11.GL_PROJECTION_MATRIX, - "GL_PROJECTION_MATRIX", - "Projection matrix stack", - "matrix", - "glGetFloatv()"), - new GLproperty( - GL11.GL_TEXTURE_MATRIX, - "GL_TEXTURE_MATRIX", - "Texture matrix stack", - "matrix", - "glGetFloatv()"), - new GLproperty( - GL11.GL_VIEWPORT, - "GL_VIEWPORT", - "Viewport origin and extent", - "viewport", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_DEPTH_RANGE, - "GL_DEPTH_RANGE", - "Depth range near and far", - "viewport", - "glGetFloatv()"), - new GLproperty( - GL11.GL_MODELVIEW_STACK_DEPTH, - "GL_MODELVIEW_STACK_DEPTH", - "Modelview matrix stack pointer", - "matrix", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_PROJECTION_STACK_DEPTH, - "GL_PROJECTION_STACK_DEPTH", - "Projection matrix stack pointer", - "matrix", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_TEXTURE_STACK_DEPTH, - "GL_TEXTURE_STACK_DEPTH", - "Texture matrix stack pointer", - "matrix", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_MATRIX_MODE, - "GL_MATRIX_MODE", - "Current matrix mode", - "transform", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_NORMALIZE, - "GL_NORMALIZE", - "Current normal normalization on/off", - "transform/ enable", - "glIsEnabled()"), - new GLproperty(GL11.GL_FOG_COLOR, "GL_FOG_COLOR", "Fog color", "fog", "glGetFloatv()"), - new GLproperty(GL11.GL_FOG_INDEX, "GL_FOG_INDEX", "Fog index", "fog", "glGetFloatv()"), - new GLproperty(GL11.GL_FOG_DENSITY, "GL_FOG_DENSITY", "Exponential fog density", "fog", "glGetFloatv()"), - new GLproperty(GL11.GL_FOG_START, "GL_FOG_START", "Linear fog start", "fog", "glGetFloatv()"), - new GLproperty(GL11.GL_FOG_END, "GL_FOG_END", "Linear fog end", "fog", "glGetFloatv()"), - new GLproperty(GL11.GL_FOG_MODE, "GL_FOG_MODE", "Fog mode", "fog", "glGetIntegerv()"), - new GLproperty(GL11.GL_FOG, "GL_FOG", "True if fog enabled", "fog/enable", "glIsEnabled()"), - new GLproperty( - GL11.GL_SHADE_MODEL, - "GL_SHADE_MODEL", - "glShadeModel() setting", - "lighting", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_LIGHTING, - "GL_LIGHTING", - "True if lighting is enabled", - "lighting/e nable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_COLOR_MATERIAL, - "GL_COLOR_MATERIAL", - "True if color tracking is enabled", - "lighting", - "glIsEnabled()"), - new GLproperty( - GL11.GL_COLOR_MATERIAL_PARAMETER, - "GL_COLOR_MATERIAL_PARAMETER", - "Material properties tracking current color", - "lighting", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_COLOR_MATERIAL_FACE, - "GL_COLOR_MATERIAL_FACE", - "Face(s) affected by color tracking", - "lighting", - "glGetIntegerv()"), - new GLproperty(GL11.GL_AMBIENT, "GL_AMBIENT", "Ambient material color", "lighting", "glGetMaterialfv()"), - new GLproperty(GL11.GL_DIFFUSE, "GL_DIFFUSE", "Diffuse material color", "lighting", "glGetMaterialfv()"), - new GLproperty(GL11.GL_SPECULAR, "GL_SPECULAR", "Specular material color", "lighting", "glGetMaterialfv()"), - new GLproperty(GL11.GL_EMISSION, "GL_EMISSION", "Emissive material color", "lighting", "glGetMaterialfv()"), - new GLproperty( - GL11.GL_SHININESS, - "GL_SHININESS", - "Specular exponent of material", - "lighting", - "glGetMaterialfv()"), - new GLproperty( - GL11.GL_LIGHT_MODEL_AMBIENT, - "GL_LIGHT_MODEL_AMBIENT", - "Ambient scene color", - "lighting", - "glGetFloatv()"), - new GLproperty( - GL11.GL_LIGHT_MODEL_LOCAL_VIEWER, - "GL_LIGHT_MODEL_LOCAL_VIEWER", - "Viewer is local", - "lighting", - "glGetBooleanv()"), - new GLproperty( - GL11.GL_LIGHT_MODEL_TWO_SIDE, - "GL_LIGHT_MODEL_TWO_SIDE", - "Use two-sided lighting", - "lighting", - "glGetBooleanv()"), - new GLproperty(GL11.GL_AMBIENT, "GL_AMBIENT", "Ambient intensity of light i", "lighting", "glGetLightfv()"), - new GLproperty(GL11.GL_DIFFUSE, "GL_DIFFUSE", "Diffuse intensity of light i", "lighting", "glGetLightfv()"), - new GLproperty( - GL11.GL_SPECULAR, - "GL_SPECULAR", - "Specular intensity of light i", - "lighting", - "glGetLightfv()"), - new GLproperty(GL11.GL_POSITION, "GL_POSITION", "Position of light i", "lighting", "glGetLightfv()"), - new GLproperty( - GL11.GL_CONSTANT_ATTENUATION, - "GL_CONSTANT_ATTENUATION", - "Constant attenuation factor", - "lighting", - "glGetLightfv()"), - new GLproperty( - GL11.GL_LINEAR_ATTENUATION, - "GL_LINEAR_ATTENUATION", - "Linear attenuation factor", - "lighting", - "glGetLightfv()"), - new GLproperty( - GL11.GL_QUADRATIC_ATTENUATION, - "GL_QUADRATIC_ATTENUATION", - "Quadratic attenuation factor", - "lighting", - "glGetLightfv()"), - new GLproperty( - GL11.GL_SPOT_DIRECTION, - "GL_SPOT_DIRECTION", - "Spotlight direction of light i", - "lighting", - "glGetLightfv()"), - new GLproperty( - GL11.GL_SPOT_EXPONENT, - "GL_SPOT_EXPONENT", - "Spotlight exponent of light i", - "lighting", - "glGetLightfv()"), - new GLproperty( - GL11.GL_SPOT_CUTOFF, - "GL_SPOT_CUTOFF", - "Spotlight angle of light i", - "lighting", - "glGetLightfv()"), - new GLproperty(GL11.GL_LIGHT0, "GL_LIGHT0", "True if light 0 enabled", "lighting/enable", "glIsEnabled()"), - new GLproperty(GL11.GL_LIGHT1, "GL_LIGHT1", "True if light 1 enabled", "lighting/enable", "glIsEnabled()"), - new GLproperty(GL11.GL_LIGHT2, "GL_LIGHT2", "True if light 2 enabled", "lighting/enable", "glIsEnabled()"), - new GLproperty(GL11.GL_LIGHT3, "GL_LIGHT3", "True if light 3 enabled", "lighting/enable", "glIsEnabled()"), - new GLproperty(GL11.GL_LIGHT4, "GL_LIGHT4", "True if light 4 enabled", "lighting/enable", "glIsEnabled()"), - new GLproperty(GL11.GL_LIGHT5, "GL_LIGHT5", "True if light 5 enabled", "lighting/enable", "glIsEnabled()"), - new GLproperty(GL11.GL_LIGHT6, "GL_LIGHT6", "True if light 6 enabled", "lighting/enable", "glIsEnabled()"), - new GLproperty(GL11.GL_LIGHT7, "GL_LIGHT7", "True if light 7 enabled", "lighting/enable", "glIsEnabled()"), - new GLproperty( - GL11.GL_COLOR_INDEXES, - "GL_COLOR_INDEXES", - "ca, cd, and cs for color-index lighting", - "lighting/e nable", - "glGetMaterialfv()"), - new GLproperty(GL11.GL_POINT_SIZE, "GL_POINT_SIZE", "Point size", "point", "glGetFloatv()"), - new GLproperty( - GL11.GL_POINT_SMOOTH, - "GL_POINT_SMOOTH", - "Point antialiasing on", - "point/enable", - "glIsEnabled()"), - new GLproperty(GL11.GL_LINE_WIDTH, "GL_LINE_WIDTH", "Line width", "line", "glGetFloatv()"), - new GLproperty( - GL11.GL_LINE_SMOOTH, - "GL_LINE_SMOOTH", - "Line antialiasing on", - "line/enable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_LINE_STIPPLE_PATTERN, - "GL_LINE_STIPPLE_PATTERN", - "Line stipple", - "line", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_LINE_STIPPLE_REPEAT, - "GL_LINE_STIPPLE_REPEAT", - "Line stipple repeat", - "line", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_LINE_STIPPLE, - "GL_LINE_STIPPLE", - "Line stipple enable", - "line/enable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_CULL_FACE, - "GL_CULL_FACE", - "Polygon culling enabled", - "polygon/enable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_CULL_FACE_MODE, - "GL_CULL_FACE_MODE", - "Cull front-/back-facing polygons", - "polygon", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_FRONT_FACE, - "GL_FRONT_FACE", - "Polygon front-face CW/CCW indicator", - "polygon", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_POLYGON_SMOOTH, - "GL_POLYGON_SMOOTH", - "Polygon antialiasing on", - "polygon/enable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_POLYGON_MODE, - "GL_POLYGON_MODE", - "Polygon rasterization mode (front and back)", - "polygon", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_POLYGON_OFFSET_FACTOR, - "GL_POLYGON_OFFSET_FACTOR", - "Polygon offset factor", - "polygon", - "glGetFloatv()"), - new GLproperty( - GL11.GL_POLYGON_OFFSET_POINT, - "GL_POLYGON_OFFSET_POINT", - "Polygon offset enable for GL_POINT mode rasterization", - "polygon/enable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_POLYGON_OFFSET_LINE, - "GL_POLYGON_OFFSET_LINE", - "Polygon offset enable for GL_LINE mode rasterization", - "polygon/enable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_POLYGON_OFFSET_FILL, - "GL_POLYGON_OFFSET_FILL", - "Polygon offset enable for GL_FILL mode rasterization", - "polygon/enable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_POLYGON_STIPPLE, - "GL_POLYGON_STIPPLE", - "Polygon stipple enable", - "polygon/enable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_TEXTURE_1D, - "GL_TEXTURE_1D", - "True if 1-D texturing enabled ", - "texture/enable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_TEXTURE_2D, - "GL_TEXTURE_2D", - "True if 2-D texturing enabled ", - "texture/enable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_TEXTURE_BINDING_1D, - "GL_TEXTURE_BINDING_1D", - "Texture object bound to GL_TEXTURE_1D", - "texture", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_TEXTURE_BINDING_2D, - "GL_TEXTURE_BINDING_2D", - "Texture object bound to GL_TEXTURE_2D", - "texture", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_TEXTURE, - "GL_TEXTURE", - "x-D texture image at level of detail i", - "UNUSED", - "glGetTexImage()"), - new GLproperty( - GL11.GL_TEXTURE_WIDTH, - "GL_TEXTURE_WIDTH", - "x-D texture image i's width", - "UNUSED", - "glGetTexLevelParameter*()"), - new GLproperty( - GL11.GL_TEXTURE_HEIGHT, - "GL_TEXTURE_HEIGHT", - "x-D texture image i's height", - "UNUSED", - "glGetTexLevelParameter*()"), - new GLproperty( - GL11.GL_TEXTURE_BORDER, - "GL_TEXTURE_BORDER", - "x-D texture image i's border width", - "UNUSED", - "glGetTexLevelParameter*()"), - new GLproperty( - GL11.GL_TEXTURE_RED_SIZE, - "GL_TEXTURE_RED_SIZE", - "x-D texture image i's red resolution", - "UNUSED", - "glGetTexLevelParameter*()"), - new GLproperty( - GL11.GL_TEXTURE_GREEN_SIZE, - "GL_TEXTURE_GREEN_SIZE", - "x-D texture image i's green resolution", - "UNUSED", - "glGetTexLevelParameter*()"), - new GLproperty( - GL11.GL_TEXTURE_BLUE_SIZE, - "GL_TEXTURE_BLUE_SIZE", - "x-D texture image i's blue resolution", - "UNUSED", - "glGetTexLevelParameter*()"), - new GLproperty( - GL11.GL_TEXTURE_ALPHA_SIZE, - "GL_TEXTURE_ALPHA_SIZE", - "x-D texture image i's alpha resolution", - "UNUSED", - "glGetTexLevelParameter*()"), - new GLproperty( - GL11.GL_TEXTURE_LUMINANCE_SIZE, - "GL_TEXTURE_LUMINANCE_SIZE", - "x-D texture image i's luminance resolution", - "UNUSED", - "glGetTexLevelParameter*()"), - new GLproperty( - GL11.GL_TEXTURE_INTENSITY_SIZE, - "GL_TEXTURE_INTENSITY_SIZE", - "x-D texture image i's intensity resolution", - "UNUSED", - "glGetTexLevelParameter*()"), - new GLproperty( - GL11.GL_TEXTURE_BORDER_COLOR, - "GL_TEXTURE_BORDER_COLOR", - "Texture border color", - "texture", - "glGetTexParameter*()"), - new GLproperty( - GL11.GL_TEXTURE_MIN_FILTER, - "GL_TEXTURE_MIN_FILTER", - "Texture minification function", - "texture", - "glGetTexParameter*()"), - new GLproperty( - GL11.GL_TEXTURE_MAG_FILTER, - "GL_TEXTURE_MAG_FILTER", - "Texture magnification function", - "texture", - "glGetTexParameter*()"), - new GLproperty( - GL11.GL_TEXTURE_WRAP_S, - "GL_TEXTURE_WRAP_S", - "Texture wrap mode (x is S or T)", - "texture", - "glGetTexParameter*()"), - new GLproperty( - GL11.GL_TEXTURE_WRAP_T, - "GL_TEXTURE_WRAP_T", - "Texture wrap mode (x is S or T)", - "texture", - "glGetTexParameter*()"), - new GLproperty( - GL11.GL_TEXTURE_PRIORITY, - "GL_TEXTURE_PRIORITY", - "Texture object priority", - "texture", - "glGetTexParameter*()"), - new GLproperty( - GL11.GL_TEXTURE_ENV_MODE, - "GL_TEXTURE_ENV_MODE", - "Texture application function", - "texture", - "glGetTexEnviv()"), - new GLproperty( - GL11.GL_TEXTURE_ENV_COLOR, - "GL_TEXTURE_ENV_COLOR", - "Texture environment color", - "texture", - "glGetTexEnvfv()"), - new GLproperty( - GL11.GL_TEXTURE_GEN_S, - "GL_TEXTURE_GEN_S", - "Texgen enabled (x is S, T, R, or Q)", - "texture/enable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_TEXTURE_GEN_T, - "GL_TEXTURE_GEN_T", - "Texgen enabled (x is S, T, R, or Q)", - "texture/enable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_TEXTURE_GEN_R, - "GL_TEXTURE_GEN_R", - "Texgen enabled (x is S, T, R, or Q)", - "texture/enable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_TEXTURE_GEN_Q, - "GL_TEXTURE_GEN_Q", - "Texgen enabled (x is S, T, R, or Q)", - "texture/enable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_EYE_PLANE, - "GL_EYE_PLANE", - "Texgen plane equation coefficients", - "texture", - "glGetTexGenfv()"), - new GLproperty( - GL11.GL_OBJECT_PLANE, - "GL_OBJECT_PLANE", - "Texgen object linear coefficients", - "texture", - "glGetTexGenfv()"), - new GLproperty( - GL11.GL_TEXTURE_GEN_MODE, - "GL_TEXTURE_GEN_MODE", - "Function used for texgen", - "texture", - "glGetTexGeniv()"), - new GLproperty( - GL11.GL_SCISSOR_TEST, - "GL_SCISSOR_TEST", - "Scissoring enabled", - "scissor/enable", - "glIsEnabled()"), - new GLproperty(GL11.GL_SCISSOR_BOX, "GL_SCISSOR_BOX", "Scissor box", "scissor", "glGetIntegerv()"), - new GLproperty( - GL11.GL_ALPHA_TEST, - "GL_ALPHA_TEST", - "Alpha test enabled", - "color-buffer/enable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_ALPHA_TEST_FUNC, - "GL_ALPHA_TEST_FUNC", - "Alpha test function", - "color-buffer", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_ALPHA_TEST_REF, - "GL_ALPHA_TEST_REF", - "Alpha test reference value", - "color-buffer", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_STENCIL_TEST, - "GL_STENCIL_TEST", - "Stenciling enabled", - "stencil-buffer/enable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_STENCIL_FUNC, - "GL_STENCIL_FUNC", - "Stencil function", - "stencil-buffer", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_STENCIL_VALUE_MASK, - "GL_STENCIL_VALUE_MASK", - "Stencil mask", - "stencil-buffer", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_STENCIL_REF, - "GL_STENCIL_REF", - "Stencil reference value", - "stencil-buffer", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_STENCIL_FAIL, - "GL_STENCIL_FAIL", - "Stencil fail action", - "stencil-buffer", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_STENCIL_PASS_DEPTH_FAIL, - "GL_STENCIL_PASS_DEPTH_FAIL", - "Stencil depth buffer fail action", - "stencil-buffer", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_STENCIL_PASS_DEPTH_PASS, - "GL_STENCIL_PASS_DEPTH_PASS", - "Stencil depth buffer pass action", - "stencil-buffer", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_DEPTH_TEST, - "GL_DEPTH_TEST", - "Depth buffer enabled", - "depth-buffer/ena ble", - "glIsEnabled()"), - new GLproperty( - GL11.GL_DEPTH_FUNC, - "GL_DEPTH_FUNC", - "Depth buffer test function", - "depth-buffer", - "glGetIntegerv()"), - new GLproperty(GL11.GL_BLEND, "GL_BLEND", "Blending enabled", "color-buffer/enable", "glIsEnabled()"), - new GLproperty( - GL11.GL_BLEND_SRC, - "GL_BLEND_SRC", - "Blending source function", - "color-buffer", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_BLEND_DST, - "GL_BLEND_DST", - "Blending destination function", - "color-buffer", - "glGetIntegerv()"), - new GLproperty(GL11.GL_DITHER, "GL_DITHER", "Dithering enabled", "color-buffer/enable", "glIsEnabled()"), - new GLproperty( - GL11.GL_INDEX_LOGIC_OP, - "GL_INDEX_LOGIC_OP", - "Color index logical operation enabled", - "color-buffer/enable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_COLOR_LOGIC_OP, - "GL_COLOR_LOGIC_OP", - "RGBA color logical operation enabled", - "color-buffer/enable", - "glIsEnabled()"), - new GLproperty( - GL11.GL_LOGIC_OP_MODE, - "GL_LOGIC_OP_MODE", - "Logical operation function", - "color-buffer", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_DRAW_BUFFER, - "GL_DRAW_BUFFER", - "Buffers selected for drawing", - "color-buffer", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_INDEX_WRITEMASK, - "GL_INDEX_WRITEMASK", - "Color-index writemask", - "color-buffer", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_COLOR_WRITEMASK, - "GL_COLOR_WRITEMASK", - "Color write enables; R, G, B, or A", - "color-buffer", - "glGetBooleanv()"), - new GLproperty( - GL11.GL_DEPTH_WRITEMASK, - "GL_DEPTH_WRITEMASK", - "Depth buffer enabled for writing", - "depth-buffer", - "glGetBooleanv()"), - new GLproperty( - GL11.GL_STENCIL_WRITEMASK, - "GL_STENCIL_WRITEMASK", - "Stencil-buffer writemask", - "stencil-buffer", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_COLOR_CLEAR_VALUE, - "GL_COLOR_CLEAR_VALUE", - "Color-buffer clear value (RGBA mode)", - "color-buffer", - "glGetFloatv()"), - new GLproperty( - GL11.GL_INDEX_CLEAR_VALUE, - "GL_INDEX_CLEAR_VALUE", - "Color-buffer clear value (color-index mode)", - "color-buffer", - "glGetFloatv()"), - new GLproperty( - GL11.GL_DEPTH_CLEAR_VALUE, - "GL_DEPTH_CLEAR_VALUE", - "Depth-buffer clear value", - "depth-buffer", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_STENCIL_CLEAR_VALUE, - "GL_STENCIL_CLEAR_VALUE", - "Stencil-buffer clear value", - "stencil-buffer", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_ACCUM_CLEAR_VALUE, - "GL_ACCUM_CLEAR_VALUE", - "Accumulation-buffer clear value", - "accum-buffer", - "glGetFloatv()"), - new GLproperty( - GL11.GL_UNPACK_SWAP_BYTES, - "GL_UNPACK_SWAP_BYTES", - "Value of GL_UNPACK_SWAP_BYTES", - "pixel-store", - "glGetBooleanv()"), - new GLproperty( - GL11.GL_UNPACK_LSB_FIRST, - "GL_UNPACK_LSB_FIRST", - "Value of GL_UNPACK_LSB_FIRST", - "pixel-store", - "glGetBooleanv()"), - new GLproperty( - GL11.GL_UNPACK_ROW_LENGTH, - "GL_UNPACK_ROW_LENGTH", - "Value of GL_UNPACK_ROW_LENGTH", - "pixel-store", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_UNPACK_SKIP_ROWS, - "GL_UNPACK_SKIP_ROWS", - "Value of GL_UNPACK_SKIP_ROWS", - "pixel-store", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_UNPACK_SKIP_PIXELS, - "GL_UNPACK_SKIP_PIXELS", - "Value of GL_UNPACK_SKIP_PIXELS", - "pixel-store", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_UNPACK_ALIGNMENT, - "GL_UNPACK_ALIGNMENT", - "Value of GL_UNPACK_ALIGNMENT", - "pixel-store", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_PACK_SWAP_BYTES, - "GL_PACK_SWAP_BYTES", - "Value of GL_PACK_SWAP_BYTES", - "pixel-store", - "glGetBooleanv()"), - new GLproperty( - GL11.GL_PACK_LSB_FIRST, - "GL_PACK_LSB_FIRST", - "Value of GL_PACK_LSB_FIRST", - "pixel-store", - "glGetBooleanv()"), - new GLproperty( - GL11.GL_PACK_ROW_LENGTH, - "GL_PACK_ROW_LENGTH", - "Value of GL_PACK_ROW_LENGTH", - "pixel-store", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_PACK_SKIP_ROWS, - "GL_PACK_SKIP_ROWS", - "Value of GL_PACK_SKIP_ROWS", - "pixel-store", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_PACK_SKIP_PIXELS, - "GL_PACK_SKIP_PIXELS", - "Value of GL_PACK_SKIP_PIXELS", - "pixel-store", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_PACK_ALIGNMENT, - "GL_PACK_ALIGNMENT", - "Value of GL_PACK_ALIGNMENT", - "pixel-store", - "glGetIntegerv()"), - new GLproperty(GL11.GL_MAP_COLOR, "GL_MAP_COLOR", "True if colors are mapped", "pixel", "glGetBooleanv()"), - new GLproperty( - GL11.GL_MAP_STENCIL, - "GL_MAP_STENCIL", - "True if stencil values are mapped", - "pixel", - "glGetBooleanv()"), - new GLproperty( - GL11.GL_INDEX_SHIFT, - "GL_INDEX_SHIFT", - "Value of GL_INDEX_SHIFT", - "pixel", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_INDEX_OFFSET, - "GL_INDEX_OFFSET", - "Value of GL_INDEX_OFFSET", - "pixel", - "glGetIntegerv()"), - new GLproperty(GL11.GL_ZOOM_X, "GL_ZOOM_X", "x zoom factor", "pixel", "glGetFloatv()"), - new GLproperty(GL11.GL_ZOOM_Y, "GL_ZOOM_Y", "y zoom factor", "pixel", "glGetFloatv()"), - new GLproperty(GL11.GL_READ_BUFFER, "GL_READ_BUFFER", "Read source buffer", "pixel", "glGetIntegerv()"), - new GLproperty(GL11.GL_ORDER, "GL_ORDER", "1D map order", "capability", "glGetMapiv()"), - new GLproperty(GL11.GL_ORDER, "GL_ORDER", "2D map orders", "capability", "glGetMapiv()"), - new GLproperty(GL11.GL_COEFF, "GL_COEFF", "1D control points", "capability", "glGetMapfv()"), - new GLproperty(GL11.GL_COEFF, "GL_COEFF", "2D control points", "capability", "glGetMapfv()"), - new GLproperty(GL11.GL_DOMAIN, "GL_DOMAIN", "1D domain endpoints", "capability", "glGetMapfv()"), - new GLproperty(GL11.GL_DOMAIN, "GL_DOMAIN", "2D domain endpoints", "capability", "glGetMapfv()"), - new GLproperty( - GL11.GL_MAP1_GRID_DOMAIN, - "GL_MAP1_GRID_DOMAIN", - "1D grid endpoints", - "eval", - "glGetFloatv()"), - new GLproperty( - GL11.GL_MAP2_GRID_DOMAIN, - "GL_MAP2_GRID_DOMAIN", - "2D grid endpoints", - "eval", - "glGetFloatv()"), - new GLproperty( - GL11.GL_MAP1_GRID_SEGMENTS, - "GL_MAP1_GRID_SEGMENTS", - "1D grid divisions", - "eval", - "glGetFloatv()"), - new GLproperty( - GL11.GL_MAP2_GRID_SEGMENTS, - "GL_MAP2_GRID_SEGMENTS", - "2D grid divisions", - "eval", - "glGetFloatv()"), - new GLproperty( - GL11.GL_AUTO_NORMAL, - "GL_AUTO_NORMAL", - "True if automatic normal generation enabled", - "eval", - "glIsEnabled()"), - new GLproperty( - GL11.GL_PERSPECTIVE_CORRECTION_HINT, - "GL_PERSPECTIVE_CORRECTION_HINT", - "Perspective correction hint", - "hint", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_POINT_SMOOTH_HINT, - "GL_POINT_SMOOTH_HINT", - "Point smooth hint", - "hint", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_LINE_SMOOTH_HINT, - "GL_LINE_SMOOTH_HINT", - "Line smooth hint", - "hint", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_POLYGON_SMOOTH_HINT, - "GL_POLYGON_SMOOTH_HINT", - "Polygon smooth hint", - "hint", - "glGetIntegerv()"), - new GLproperty(GL11.GL_FOG_HINT, "GL_FOG_HINT", "Fog hint", "hint", "glGetIntegerv()"), - new GLproperty( - GL11.GL_MAX_LIGHTS, - "GL_MAX_LIGHTS", - "Maximum number of lights", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_MAX_CLIP_PLANES, - "GL_MAX_CLIP_PLANES", - "Maximum number of user clipping planes", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_MAX_MODELVIEW_STACK_DEPTH, - "GL_MAX_MODELVIEW_STACK_DEPTH", - "Maximum modelview-matrix stack depth", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_MAX_PROJECTION_STACK_DEPTH, - "GL_MAX_PROJECTION_STACK_DEPTH", - "Maximum projection-matrix stack depth", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_MAX_TEXTURE_STACK_DEPTH, - "GL_MAX_TEXTURE_STACK_DEPTH", - "Maximum depth of texture matrix stack", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_SUBPIXEL_BITS, - "GL_SUBPIXEL_BITS", - "Number of bits of subpixel precision in x and y", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_MAX_TEXTURE_SIZE, - "GL_MAX_TEXTURE_SIZE", - "See discussion in Texture Proxy in Chapter 9", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_MAX_PIXEL_MAP_TABLE, - "GL_MAX_PIXEL_MAP_TABLE", - "Maximum size of a glPixelMap() translation table", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_MAX_NAME_STACK_DEPTH, - "GL_MAX_NAME_STACK_DEPTH", - "Maximum selection-name stack depth", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_MAX_LIST_NESTING, - "GL_MAX_LIST_NESTING", - "Maximum display-list call nesting", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_MAX_EVAL_ORDER, - "GL_MAX_EVAL_ORDER", - "Maximum evaluator polynomial order", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_MAX_VIEWPORT_DIMS, - "GL_MAX_VIEWPORT_DIMS", - "Maximum viewport dimensions", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_MAX_ATTRIB_STACK_DEPTH, - "GL_MAX_ATTRIB_STACK_DEPTH", - "Maximum depth of the attribute stack", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_MAX_CLIENT_ATTRIB_STACK_DEPTH, - "GL_MAX_CLIENT_ATTRIB_STACK_DEPTH", - "Maximum depth of the client attribute stack", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_AUX_BUFFERS, - "GL_AUX_BUFFERS", - "Number of auxiliary buffers", - "capability", - "glGetBooleanv()"), - new GLproperty( - GL11.GL_RGBA_MODE, - "GL_RGBA_MODE", - "True if color buffers store RGBA", - "capability", - "glGetBooleanv()"), - new GLproperty( - GL11.GL_INDEX_MODE, - "GL_INDEX_MODE", - "True if color buffers store indices", - "capability", - "glGetBooleanv()"), - new GLproperty( - GL11.GL_DOUBLEBUFFER, - "GL_DOUBLEBUFFER", - "True if front and back buffers exist", - "capability", - "glGetBooleanv()"), - new GLproperty( - GL11.GL_STEREO, - "GL_STEREO", - "True if left and right buffers exist", - "capability", - "glGetBooleanv()"), - new GLproperty( - GL11.GL_POINT_SIZE_RANGE, - "GL_POINT_SIZE_RANGE", - "Range (low to high) of antialiased point sizes", - "capability", - "glGetFloatv()"), - new GLproperty( - GL11.GL_POINT_SIZE_GRANULARITY, - "GL_POINT_SIZE_GRANULARITY", - "Antialiased point-size granularity", - "capability", - "glGetFloatv()"), - new GLproperty( - GL11.GL_LINE_WIDTH_RANGE, - "GL_LINE_WIDTH_RANGE", - "Range (low to high) of antialiased line widths", - "capability", - "glGetFloatv()"), - new GLproperty( - GL11.GL_LINE_WIDTH_GRANULARITY, - "GL_LINE_WIDTH_GRANULARITY", - "Antialiased line-width granularity", - "capability", - "glGetFloatv()"), - new GLproperty( - GL11.GL_RED_BITS, - "GL_RED_BITS", - "Number of bits per red component in color buffers", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_GREEN_BITS, - "GL_GREEN_BITS", - "Number of bits per green component in color buffers", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_BLUE_BITS, - "GL_BLUE_BITS", - "Number of bits per blue component in color buffers", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_ALPHA_BITS, - "GL_ALPHA_BITS", - "Number of bits per alpha component in color buffers", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_INDEX_BITS, - "GL_INDEX_BITS", - "Number of bits per index in color buffers", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_DEPTH_BITS, - "GL_DEPTH_BITS", - "Number of depth-buffer bitplanes", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_STENCIL_BITS, - "GL_STENCIL_BITS", - "Number of stencil bitplanes", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_ACCUM_RED_BITS, - "GL_ACCUM_RED_BITS", - "Number of bits per red component in the accumulation buffer", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_ACCUM_GREEN_BITS, - "GL_ACCUM_GREEN_BITS", - "Number of bits per green component in the accumulation buffer", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_ACCUM_BLUE_BITS, - "GL_ACCUM_BLUE_BITS", - "Number of bits per blue component in the accumulation buffer", - "capability", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_ACCUM_ALPHA_BITS, - "GL_ACCUM_ALPHA_BITS", - "Number of bits per alpha component in the accumulation buffer", - "capability", - "glGetIntegerv()"), - new GLproperty(GL11.GL_LIST_BASE, "GL_LIST_BASE", "Setting of glListBase()", "list", "glGetIntegerv()"), - new GLproperty( - GL11.GL_LIST_INDEX, - "GL_LIST_INDEX", - "Number of display list under construction; 0 if none", - "current", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_LIST_MODE, - "GL_LIST_MODE", - "Mode of display list under construction; undefined if none", - "current", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_ATTRIB_STACK_DEPTH, - "GL_ATTRIB_STACK_DEPTH", - "Attribute stack pointer", - "current", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_CLIENT_ATTRIB_STACK_DEPTH, - "GL_CLIENT_ATTRIB_STACK_DEPTH", - "Client attribute stack pointer", - "current", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_NAME_STACK_DEPTH, - "GL_NAME_STACK_DEPTH", - "Name stack depth", - "current", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_RENDER_MODE, - "GL_RENDER_MODE", - "glRenderMode() setting", - "current", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_SELECTION_BUFFER_POINTER, - "GL_SELECTION_BUFFER_POINTER", - "Pointer to selection buffer", - "select", - "glGetPointerv()"), - new GLproperty( - GL11.GL_SELECTION_BUFFER_SIZE, - "GL_SELECTION_BUFFER_SIZE", - "Size of selection buffer", - "select", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_FEEDBACK_BUFFER_POINTER, - "GL_FEEDBACK_BUFFER_POINTER", - "Pointer to feedback buffer", - "feedback", - "glGetPointerv()"), - new GLproperty( - GL11.GL_FEEDBACK_BUFFER_SIZE, - "GL_FEEDBACK_BUFFER_SIZE", - "Size of feedback buffer", - "feedback", - "glGetIntegerv()"), - new GLproperty( - GL11.GL_FEEDBACK_BUFFER_TYPE, - "GL_FEEDBACK_BUFFER_TYPE", - "Type of feedback buffer", - "feedback", - "glGetIntegerv()"), }; - - public static void dumpOpenGLstate() {} - - public static void dumpAllIsEnabled() // Call This - { - for (int i = 0; i < instance.propertyList.length; ++i) { - - if (instance.propertyList[i].fetchCommand == "glIsEnabled()") { - - System.out.print(instance.propertyList[i].name + ":"); - System.out.print(GL11.glIsEnabled(instance.propertyList[i].gLconstant)); - System.out.println(" (" + instance.propertyList[i].description + ")"); - } - } - } - - public static void dumpAllType(final String type) { - - for (int i = 0; i < instance.propertyList.length; ++i) { - - if (instance.propertyList[i].category.equals(type)) { - - System.out.print(instance.propertyList[i].name + ":"); - System.out.println(getPropertyAsString(i)); - System.out.println(" (" + instance.propertyList[i].description + ")"); - } - } - } - - private static String getPropertyAsString(final int propertyListIndex) { - final int gLconstant = instance.propertyList[propertyListIndex].gLconstant; - if (instance.propertyList[propertyListIndex].fetchCommand.equals("glIsEnabled()")) { - return "" + GL11.glIsEnabled(gLconstant); - } - - if (instance.propertyList[propertyListIndex].fetchCommand == "glGetBooleanv()") { - - final ByteBuffer params = BufferUtils.createByteBuffer(16); - - GL11.glGetBoolean(gLconstant, params); - String out = ""; - for (int i = 0; i < params.capacity(); ++i) { - - out += (i == 0 ? "" : ", ") + params.get(i); - } - return out; - } - - return ""; - } -} diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ClientUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ClientUtils.java deleted file mode 100644 index ce14c07489..0000000000 --- a/src/main/java/gtPlusPlus/core/util/minecraft/ClientUtils.java +++ /dev/null @@ -1,17 +0,0 @@ -package gtPlusPlus.core.util.minecraft; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; - -public class ClientUtils { - - static { - if (FMLCommonHandler.instance().getSide() == Side.SERVER) { - Logger.ERROR("Something tried to access the ClientUtils class from the Server Side."); - Logger.ERROR("Soft crashing to prevent data corruption."); - CORE.crash(); - } - } -} diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/EnergyUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/EnergyUtils.java deleted file mode 100644 index 1d86a7482f..0000000000 --- a/src/main/java/gtPlusPlus/core/util/minecraft/EnergyUtils.java +++ /dev/null @@ -1,125 +0,0 @@ -package gtPlusPlus.core.util.minecraft; - -import net.minecraft.item.ItemRedstone; -import net.minecraft.item.ItemStack; - -import gregtech.api.util.GT_ModHandler; -import ic2.api.item.IElectricItem; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; - -public class EnergyUtils { - - public static class EU { - - public static boolean isElectricItem(ItemStack aStack) { - if (aStack == null || aStack.getItem() == null || aStack.getItem() instanceof ItemRedstone) { - return false; - } - if (aStack.getItem() instanceof ISpecialElectricItem) { - return true; - } else if (aStack.getItem() instanceof IElectricItem) { - return true; - } else if (aStack.getItem() instanceof IElectricItemManager) { - return true; - } else { - return GT_ModHandler.isElectricItem(aStack); - } - } - - public static boolean isChargerItem(ItemStack aStack) { - return GT_ModHandler.isChargerItem(aStack); - } - - public static boolean charge(ItemStack aStack, int aEnergyToInsert, int aTier) { - return 0 != GT_ModHandler.chargeElectricItem(aStack, aEnergyToInsert, aTier, true, false); - } - - public static boolean discharge(ItemStack aStack, int aEnergyToDrain, int aTier) { - if (isElectricItem(aStack)) { - int tTier = ((IElectricItem) aStack.getItem()).getTier(aStack); - int aDischargeValue = GT_ModHandler - .dischargeElectricItem(aStack, aEnergyToDrain, tTier, true, false, false); - // Logger.INFO("Trying to drain "+aDischargeValue); - return aDischargeValue > 0; - } else { - return false; - } - } - - public static long getMaxStorage(ItemStack aStack) { - if (isElectricItem(aStack)) { - if (aStack.getItem() instanceof ISpecialElectricItem) { - ISpecialElectricItem bStack = (ISpecialElectricItem) aStack.getItem(); - return (long) bStack.getMaxCharge(aStack); - } - if (aStack.getItem() instanceof IElectricItem) { - IElectricItem bStack = (IElectricItem) aStack.getItem(); - return (long) bStack.getMaxCharge(aStack); - } - if (aStack.getItem() instanceof IElectricItemManager) { - IElectricItemManager bStack = (IElectricItemManager) aStack.getItem(); - return (long) bStack.getCharge(aStack); - } - } else { - return 0; - } - return 0; - } - - public static long getCharge(ItemStack aStack) { - if (isElectricItem(aStack)) { - if (aStack.getItem() instanceof ISpecialElectricItem) { - ISpecialElectricItem bStack = (ISpecialElectricItem) aStack.getItem(); - return (long) bStack.getManager(aStack).getCharge(aStack); - } - if (aStack.getItem() instanceof IElectricItemManager) { - IElectricItemManager bStack = (IElectricItemManager) aStack.getItem(); - return (long) bStack.getCharge(aStack); - } - } else { - return 0; - } - return 0; - } - - public static boolean hasCharge(ItemStack aStack) { - if (isElectricItem(aStack)) { - if (aStack.getItem() instanceof ISpecialElectricItem) { - ISpecialElectricItem bStack = (ISpecialElectricItem) aStack.getItem(); - return bStack.canProvideEnergy(aStack); - } - if (aStack.getItem() instanceof IElectricItem) { - IElectricItem bStack = (IElectricItem) aStack.getItem(); - return bStack.canProvideEnergy(aStack); - } - if (aStack.getItem() instanceof IElectricItemManager) { - IElectricItemManager bStack = (IElectricItemManager) aStack.getItem(); - return bStack.getCharge(aStack) > 0; - } - } else { - return false; - } - return false; - } - - public static int getTier(ItemStack aStack) { - if (isElectricItem(aStack)) { - if (aStack.getItem() instanceof ISpecialElectricItem) { - ISpecialElectricItem bStack = (ISpecialElectricItem) aStack.getItem(); - return bStack.getTier(aStack); - } - if (aStack.getItem() instanceof IElectricItem) { - IElectricItem bStack = (IElectricItem) aStack.getItem(); - return bStack.getTier(aStack); - } - } else { - return 0; - } - return 0; - } - } - - public static class RF { - } -} diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/material/MaterialBuilder.java b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/material/MaterialBuilder.java deleted file mode 100644 index ecabeaa294..0000000000 --- a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/material/MaterialBuilder.java +++ /dev/null @@ -1,55 +0,0 @@ -package gtPlusPlus.core.util.minecraft.gregtech.material; - -public class MaterialBuilder { - /* - * public static final int DIESEL = 0, GAS = 1, THERMAL = 2, SEMIFLUID = 3, PLASMA = 4, MAGIC = 5; private int - * metaItemSubID; private TextureSet iconSet; private float toolSpeed = 1.0f; private int durability = 0; private - * int toolQuality = 0; private int types = 0; private int r = 255, g = 255, b = 255, a = 0; private String name; - * private String defaultLocalName; private int fuelType = 0; private int fuelPower = 0; private int meltingPoint = - * 0; private int blastFurnaceTemp = 0; private boolean blastFurnaceRequired = false; private boolean transparent = - * false; private int oreValue = 1; private int densityMultiplier = 1; private int densityDivider = 1; private Dyes - * color = Dyes._NULL; private int extraData = 0; private List<MaterialStack> materialList = new - * ArrayList<MaterialStack>(); private List<TC_Aspects.TC_AspectStack> aspects = new - * ArrayList<TC_Aspects.TC_AspectStack>(); private boolean canBeCracked = false; private int liquidTemperature = - * 300; private int gasTemperature = 300; public MaterialBuilder(int metaItemSubID, TextureSet iconSet, String - * defaultLocalName) { this.metaItemSubID = metaItemSubID; this.iconSet = iconSet; this.name = - * defaultLocalName.replace(" ", "").replace("-", ""); this.defaultLocalName = defaultLocalName; } public Materials - * constructMaterial() { return new Materials( metaItemSubID, iconSet, toolSpeed, durability, toolQuality, types, r, - * g, b, a, name, defaultLocalName, fuelType, fuelPower, meltingPoint, blastFurnaceTemp, blastFurnaceRequired, - * transparent, oreValue, densityMultiplier, densityDivider, color, extraData, materialList, aspects); } public - * MaterialBuilder setName(String name){ this.name = name; return this; } public MaterialBuilder setTypes(int - * types){ this.types = types; return this; } public MaterialBuilder addDustItems(){ types = types | 1; return this; - * } public MaterialBuilder addMetalItems(){ types = types | 2; return this; } public MaterialBuilder addGemItems(){ - * types = types | 4; return this; } public MaterialBuilder addOreItems(){ types = types | 8; return this; } public - * MaterialBuilder addCell(){ types = types | 16; return this; } public MaterialBuilder addPlasma(){ types = types | - * 32; return this; } public MaterialBuilder addToolHeadItems(){ types = types | 64; return this; } public - * MaterialBuilder addGearItems(){ types = types | 128; return this; } public MaterialBuilder addFluid(){ return - * this; } public MaterialBuilder addGas(){ return this; } public MaterialBuilder setRGBA(int r, int g, int b, int - * a){ this.r = r; this.g = g; this.b = b; this.a = a; return this; } public MaterialBuilder setRGB(int r, int g, - * int b){ this.r = r; this.g = g; this.b = b; return this; } public MaterialBuilder setTransparent(boolean - * transparent){ this.transparent = transparent; return this; } public MaterialBuilder setColor(Dyes color){ - * this.color = color; return this; } public MaterialBuilder setToolSpeed(float toolSpeed) { this.toolSpeed = - * toolSpeed; return this; } public MaterialBuilder setDurability(int durability) { this.durability = durability; - * return this; } public MaterialBuilder setToolQuality(int toolQuality) { this.toolQuality = toolQuality; return - * this; } public MaterialBuilder setFuelType(int fuelType) { this.fuelType = fuelType; return this; } public - * MaterialBuilder setFuelPower(int fuelPower) { this.fuelPower = fuelPower; return this; } public MaterialBuilder - * setMeltingPoint(int meltingPoint) { this.meltingPoint = meltingPoint; return this; } public MaterialBuilder - * setBlastFurnaceTemp(int blastFurnaceTemp) { this.blastFurnaceTemp = blastFurnaceTemp; return this; } public - * MaterialBuilder setBlastFurnaceRequired(boolean blastFurnaceRequired) { this.blastFurnaceRequired = - * blastFurnaceRequired; return this; } public MaterialBuilder setOreValue(int oreValue) { this.oreValue = oreValue; - * return this; } public MaterialBuilder setDensityMultiplier(int densityMultiplier) { this.densityMultiplier = - * densityMultiplier; return this; } public MaterialBuilder setDensityDivider(int densityDivider) { - * this.densityDivider = densityDivider; return this; } public MaterialBuilder setExtraData(int extraData) { - * this.extraData = extraData; return this; } public MaterialBuilder addElectrolyzerRecipe(){ extraData = extraData - * | 1; return this; } public MaterialBuilder addCentrifugeRecipe(){ extraData = extraData | 2; return this; } - * public MaterialBuilder setMaterialList(List<MaterialStack> materialList) { this.materialList = materialList; - * return this; } public MaterialBuilder setMaterialList(MaterialStack ... materials) { this.materialList = - * Arrays.asList(materials); return this; } public MaterialBuilder setAspects(List<TC_Aspects.TC_AspectStack> - * aspects) { this.aspects = aspects; return this; } public int getLiquidTemperature() { return liquidTemperature; } - * public MaterialBuilder setLiquidTemperature(int liquidTemperature) { this.liquidTemperature = liquidTemperature; - * return this; } public int getGasTemperature() { return gasTemperature; } public MaterialBuilder - * setGasTemperature(int gasTemperature) { this.gasTemperature = gasTemperature; return this; } public boolean - * canBeCracked() { return canBeCracked; } public MaterialBuilder setCanBeCracked(boolean canBeCracked) { - * this.canBeCracked = canBeCracked; return this; } - */ -} diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java deleted file mode 100644 index 58045150f1..0000000000 --- a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java +++ /dev/null @@ -1,4 +0,0 @@ -package gtPlusPlus.core.util.minecraft.gregtech.recipehandlers; - -public final class GregtechRecipe { -} diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java b/src/main/java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java deleted file mode 100644 index 5a9721204c..0000000000 --- a/src/main/java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java +++ /dev/null @@ -1,41 +0,0 @@ -package gtPlusPlus.core.util.minecraft.network; - -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import cpw.mods.fml.common.network.internal.FMLProxyPacket; -import io.netty.buffer.Unpooled; -import mods.railcraft.common.util.misc.Game; - -public abstract class CustomPacket { - - public static final String CHANNEL_NAME = "GTPP"; - - public enum PacketType { - TILE_ENTITY, - } - - public FMLProxyPacket getPacket() { - ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - DataOutputStream data = new DataOutputStream(bytes); - try { - data.writeByte(this.getID()); - this.writeData(data); - } catch (IOException var4) { - Game.logThrowable("Error constructing packet: {0}", var4, new Object[] { this.getClass() }); - } - return new FMLProxyPacket(Unpooled.wrappedBuffer(bytes.toByteArray()), "GTPP"); - } - - public abstract void writeData(DataOutputStream var1) throws IOException; - - public abstract void readData(DataInputStream var1) throws IOException; - - public abstract int getID(); - - public String toString() { - return this.getClass().getSimpleName(); - } -} diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketBuilder.java b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketBuilder.java deleted file mode 100644 index d9b565591c..0000000000 --- a/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketBuilder.java +++ /dev/null @@ -1,25 +0,0 @@ -package gtPlusPlus.core.util.minecraft.network; - -import net.minecraft.world.WorldServer; - -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; - -public class PacketBuilder { - - private static PacketBuilder instance; - - public static PacketBuilder instance() { - if (instance == null) { - instance = new PacketBuilder(); - } - return instance; - } - - public void sendTileEntityPacket(IGregTechTileEntity tile) { - if (tile.getWorld() instanceof WorldServer) { - WorldServer world = (WorldServer) tile.getWorld(); - PacketTileEntity pkt = new PacketTileEntity(tile); - PacketDispatcher.sendToWatchers(pkt, world, tile.getXCoord(), tile.getZCoord()); - } - } -} diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketDispatcher.java b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketDispatcher.java deleted file mode 100644 index 69d94a4f13..0000000000 --- a/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketDispatcher.java +++ /dev/null @@ -1,99 +0,0 @@ -package gtPlusPlus.core.util.minecraft.network; - -import java.lang.reflect.Method; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.network.Packet; -import net.minecraft.server.management.PlayerManager; -import net.minecraft.world.WorldServer; - -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; -import cpw.mods.fml.relauncher.ReflectionHelper; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.preloader.DevHelper; - -@SuppressWarnings("unchecked") -public class PacketDispatcher { - - private static final Class playerInstanceClass; - private static final Method getOrCreateChunkWatcher; - private static final Method sendToAllPlayersWatchingChunk; - - public static void sendToServer(CustomPacket packet) { - PacketHandler.INSTANCE.channel.sendToServer(packet.getPacket()); - } - - public static void sendToPlayer(CustomPacket packet, EntityPlayerMP player) { - PacketHandler.INSTANCE.channel.sendTo(packet.getPacket(), player); - } - - public static void sendToAll(CustomPacket packet) { - PacketHandler.INSTANCE.channel.sendToAll(packet.getPacket()); - } - - public static void sendToAllAround(CustomPacket packet, TargetPoint zone) { - PacketHandler.INSTANCE.channel.sendToAllAround(packet.getPacket(), zone); - } - - public static void sendToDimension(CustomPacket packet, int dimensionId) { - PacketHandler.INSTANCE.channel.sendToDimension(packet.getPacket(), dimensionId); - } - - public static void sendToWatchers(CustomPacket packet, WorldServer world, int worldX, int worldZ) { - try { - Object playerInstance = getOrCreateChunkWatcher - .invoke(world.getPlayerManager(), worldX >> 4, worldZ >> 4, false); - if (playerInstance != null) { - sendToAllPlayersWatchingChunk.invoke(playerInstance, packet.getPacket()); - } - - } catch (Exception var5) { - Logger.ERROR( - "Reflection Failure in PacketDispatcher.sendToWatchers() {0} {1}" + 20 - + var5 - + new Object[] { - getOrCreateChunkWatcher.getName() + sendToAllPlayersWatchingChunk.getName() }); - throw new RuntimeException(var5); - } - } - - static { - try { - playerInstanceClass = PlayerManager.class.getDeclaredClasses()[0]; - - Method a, b; - - try { - a = DevHelper.getForgeMethod( - PlayerManager.class, - "getOrCreateChunkWatcher", - int.class, - int.class, - boolean.class); - } catch (Throwable t) { - a = ReflectionHelper.findMethod( - playerInstanceClass, - (Object) null, - new String[] { "func_72690_a", "getOrCreateChunkWatcher" }, - new Class[] { Integer.TYPE, Integer.TYPE, Boolean.TYPE }); - } - try { - b = DevHelper.getForgeMethod(PlayerManager.class, "sendToAllPlayersWatchingChunk", Packet.class); - } catch (Throwable t) { - b = ReflectionHelper.findMethod( - playerInstanceClass, - (Object) null, - new String[] { "func_151251_a", "sendToAllPlayersWatchingChunk" }, - new Class[] { Packet.class }); - } - - getOrCreateChunkWatcher = a; - sendToAllPlayersWatchingChunk = b; - getOrCreateChunkWatcher.setAccessible(true); - sendToAllPlayersWatchingChunk.setAccessible(true); - } catch (Exception var1) { - Logger.ERROR("Reflection Failure in PacketDispatcher initalization {0} {1}" + var1); - throw new RuntimeException(var1); - } - } -} diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketHandler.java b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketHandler.java deleted file mode 100644 index 535c192bbe..0000000000 --- a/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketHandler.java +++ /dev/null @@ -1,73 +0,0 @@ -package gtPlusPlus.core.util.minecraft.network; - -import java.io.ByteArrayInputStream; -import java.io.DataInputStream; -import java.io.IOException; -import java.util.Arrays; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.network.NetHandlerPlayServer; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.network.FMLEventChannel; -import cpw.mods.fml.common.network.FMLNetworkEvent.ClientCustomPacketEvent; -import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent; -import cpw.mods.fml.common.network.NetworkRegistry; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.util.minecraft.network.CustomPacket.PacketType; - -public class PacketHandler { - - public static final PacketHandler INSTANCE = new PacketHandler(); - private static final PacketType[] packetTypes = PacketType.values(); - final FMLEventChannel channel; - - private PacketHandler() { - this.channel = NetworkRegistry.INSTANCE.newEventDrivenChannel("GTPP"); - this.channel.register(this); - } - - public static void init() {} - - @SubscribeEvent - public void onPacket(ServerCustomPacketEvent event) { - byte[] data = new byte[event.packet.payload().readableBytes()]; - event.packet.payload().readBytes(data); - this.onPacketData(data, ((NetHandlerPlayServer) event.handler).playerEntity); - } - - @SubscribeEvent - public void onPacket(ClientCustomPacketEvent event) { - byte[] data = new byte[event.packet.payload().readableBytes()]; - event.packet.payload().readBytes(data); - this.onPacketData(data, (EntityPlayerMP) null); - } - - public void onPacketData(byte[] bData, EntityPlayerMP player) { - DataInputStream data = new DataInputStream(new ByteArrayInputStream(bData)); - - try { - byte packetID = data.readByte(); - if (packetID < 0) { - return; - } - PacketType type = packetTypes[packetID]; - Object pkt; - - switch (type.ordinal()) { - case 0: - pkt = new PacketTileEntity(); - break; - default: - return; - } - - if (pkt != null) { - ((CustomPacket) pkt).readData(data); - } - } catch (IOException var7) { - Logger.ERROR( - "Exception in PacketHandler.onPacketData: {0}" + var7 + new Object[] { Arrays.toString(bData) }); - } - } -} diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java deleted file mode 100644 index 91dba8798d..0000000000 --- a/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java +++ /dev/null @@ -1,83 +0,0 @@ -package gtPlusPlus.core.util.minecraft.network; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import net.minecraft.client.Minecraft; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gtPlusPlus.api.interfaces.IGregtechPacketEntity; -import mods.railcraft.common.util.misc.Game; - -public class PacketTileEntity extends CustomPacket { - - private IGregTechTileEntity tile; - private IGregtechPacketEntity ptile; - - public PacketTileEntity() {} - - public PacketTileEntity(IGregTechTileEntity tile) { - this.tile = tile; - if (tile instanceof IGregtechPacketEntity) { - ptile = (IGregtechPacketEntity) tile; - } - } - - @Override - public void writeData(DataOutputStream data) throws IOException { - if (ptile != null) { - data.writeInt(this.tile.getXCoord()); - data.writeInt(this.tile.getYCoord()); - data.writeInt(this.tile.getZCoord()); - data.writeShort(this.tile.getMetaTileID()); - this.ptile.writePacketData(data); - } - } - - @Override - @SideOnly(Side.CLIENT) - public void readData(DataInputStream data) throws IOException { - Minecraft mc = FMLClientHandler.instance().getClient(); - World world = mc != null ? mc.theWorld : null; - if (world != null) { - int x = data.readInt(); - int y = data.readInt(); - int z = data.readInt(); - short id = data.readShort(); - if (id >= 0 && y >= 0 && world.blockExists(x, y, z)) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof IGregTechTileEntity) { - this.tile = (IGregTechTileEntity) te; - if (this.tile.getMetaTileID() != id) { - this.tile = null; - } - } else { - this.tile = null; - } - if (this.tile != null) { - if (tile instanceof IGregtechPacketEntity) { - ptile = (IGregtechPacketEntity) tile; - try { - this.ptile.readPacketData(data); - } catch (IOException var10) { - throw var10; - } catch (RuntimeException var11) { - Game.logThrowable("Exception in PacketTileEntity.readData:", var11, new Object[0]); - } - } - } - } - } - } - - @Override - public int getID() { - return 0; - } -} diff --git a/src/main/java/gtPlusPlus/core/util/sys/Log.java b/src/main/java/gtPlusPlus/core/util/sys/Log.java deleted file mode 100644 index d9ffd5fa42..0000000000 --- a/src/main/java/gtPlusPlus/core/util/sys/Log.java +++ /dev/null @@ -1,25 +0,0 @@ -package gtPlusPlus.core.util.sys; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public final class Log { - - public static final Logger LOGGER = LogManager.getLogger("MiscUtils"); - - public static void warn(final String msg) { - LOGGER.warn(msg); - } - - public static void error(final String msg) { - LOGGER.error(msg); - } - - public static void info(final String msg) { - LOGGER.info(msg); - } - - public static void debug(final String msg) { - LOGGER.debug(msg); - } -} diff --git a/src/main/java/gtPlusPlus/everglades/object/BoxedQuad.java b/src/main/java/gtPlusPlus/everglades/object/BoxedQuad.java deleted file mode 100644 index 115697d3af..0000000000 --- a/src/main/java/gtPlusPlus/everglades/object/BoxedQuad.java +++ /dev/null @@ -1,51 +0,0 @@ -package gtPlusPlus.everglades.object; - -import net.minecraft.block.Block; - -import gtPlusPlus.api.objects.data.Pair; - -public class BoxedQuad<K, V, C, R> { - - private final Pair<Block, Integer> key; - private final Pair<Block, Integer> value; - private final Pair<Block, Integer> value2; - private final Pair<Block, Integer> value3; - private final Pair<Block, Integer>[] mInternalPairArray; - - public BoxedQuad(final Pair<Block, Integer> key, final Pair<Block, Integer> value, - final Pair<Block, Integer> value2, final Pair<Block, Integer> value3) { - this.key = key; - this.value = value; - this.value2 = value2; - this.value3 = value3; - mInternalPairArray = new Pair[] { key, value, value2, value3 }; - } - - public final Pair<Block, Integer> getKey() { - return this.key; - } - - public final Pair<Block, Integer> getValue_1() { - return this.value; - } - - public final Pair<Block, Integer> getValue_2() { - return this.value2; - } - - public final Pair<Block, Integer> getValue_3() { - return this.value3; - } - - final synchronized Pair<Block, Integer> unbox(int pos) { - return this.mInternalPairArray[pos]; - } - - final synchronized Block getBlock(int pos) { - return this.mInternalPairArray[pos].getKey(); - } - - final synchronized int getMeta(int pos) { - return this.mInternalPairArray[pos].getValue(); - } -} diff --git a/src/main/java/gtPlusPlus/everglades/world/CustomWorldType.java b/src/main/java/gtPlusPlus/everglades/world/CustomWorldType.java deleted file mode 100644 index 1c0cfb8301..0000000000 --- a/src/main/java/gtPlusPlus/everglades/world/CustomWorldType.java +++ /dev/null @@ -1,57 +0,0 @@ -package gtPlusPlus.everglades.world; - -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import net.minecraft.world.WorldType; - -public class CustomWorldType extends WorldType { - - public CustomWorldType(String name) { - super(name); - } - - public CustomWorldType(int p_i1959_1_, String p_i1959_2_) { - this("test"); - try { - // System.out.println(Arrays.toString(getClass().getSuperclass().getMethods())); - Method m = getClass().getSuperclass().getDeclaredMethod("WorldType", new Class<?>[] {}); - m.setAccessible(true); - m.invoke(this, p_i1959_1_, p_i1959_2_, 0); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public CustomWorldType(int p_i1960_1_, String p_i1960_2_, int p_i1960_3_) { - this("test2"); - try { - // System.out.println(Arrays.toString(getClass().getSuperclass().getMethods())); - Method m = getClass().getSuperclass().getDeclaredMethod("WorldType", new Class<?>[] {}); - m.setAccessible(true); - m.invoke(this, p_i1960_1_, p_i1960_2_, p_i1960_3_); - } catch (Exception e) { - e.printStackTrace(); - } - } - - private WorldType getMC() { - try { - Constructor<WorldType> c = WorldType.class.getDeclaredConstructor(); - c.setAccessible(true); // solution - return c.newInstance(); - - // production code should handle these exceptions more gracefully - } catch (InvocationTargetException x) { - x.printStackTrace(); - } catch (NoSuchMethodException x) { - x.printStackTrace(); - } catch (InstantiationException x) { - x.printStackTrace(); - } catch (IllegalAccessException x) { - x.printStackTrace(); - } - return null; - } -} diff --git a/src/main/java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java b/src/main/java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java deleted file mode 100644 index 21c48ea17d..0000000000 --- a/src/main/java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java +++ /dev/null @@ -1,15 +0,0 @@ -package gtPlusPlus.everglades.world; - -import net.minecraft.util.ChunkCoordinates; - -public class EvergladesPortalPosition extends ChunkCoordinates { - - public long field_85087_d; - final TeleporterDimensionMod field_85088_e; - - public EvergladesPortalPosition(TeleporterDimensionMod gladesTeleporter, int par2, int par3, int par4, long par5) { - super(par2, par3, par4); - this.field_85088_e = gladesTeleporter; - this.field_85087_d = par5; - } -} diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java b/src/main/java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java index 923f1698d1..42f3587b0d 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java @@ -5,6 +5,8 @@ import gtPlusPlus.plugin.agrichem.block.AgrichemFluids; import gtPlusPlus.plugin.agrichem.fluids.FluidLoader; import gtPlusPlus.plugin.manager.Core_Manager; +// Called by Core_Manager#veryEarlyInit +@SuppressWarnings("unused") public class Core_Agrichem implements IPlugin { static final Core_Agrichem mInstance; diff --git a/src/main/java/gtPlusPlus/plugin/fishing/Core_Fishing.java b/src/main/java/gtPlusPlus/plugin/fishing/Core_Fishing.java deleted file mode 100644 index 78c2f9d3a7..0000000000 --- a/src/main/java/gtPlusPlus/plugin/fishing/Core_Fishing.java +++ /dev/null @@ -1,53 +0,0 @@ -package gtPlusPlus.plugin.fishing; - -import gtPlusPlus.api.interfaces.IPlugin; -import gtPlusPlus.plugin.manager.Core_Manager; - -public class Core_Fishing implements IPlugin { - - static final Core_Fishing mInstance; - - static { - mInstance = new Core_Fishing(); - mInstance.log("Preparing " + mInstance.getPluginName() + " for use."); - } - - Core_Fishing() { - Core_Manager.registerPlugin(this); - } - - @Override - public boolean preInit() { - return false; - } - - @Override - public boolean init() { - return false; - } - - @Override - public boolean postInit() { - return false; - } - - @Override - public boolean serverStart() { - return false; - } - - @Override - public boolean serverStop() { - return false; - } - - @Override - public String getPluginName() { - return "GT++ Fishing Module"; - } - - @Override - public String getPluginAbbreviation() { - return "Fish"; - } -} diff --git a/src/main/java/gtPlusPlus/plugin/fishing/block/BlockFishEggs.java b/src/main/java/gtPlusPlus/plugin/fishing/block/BlockFishEggs.java deleted file mode 100644 index 238c6813bc..0000000000 --- a/src/main/java/gtPlusPlus/plugin/fishing/block/BlockFishEggs.java +++ /dev/null @@ -1,11 +0,0 @@ -package gtPlusPlus.plugin.fishing.block; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; - -public class BlockFishEggs extends Block { - - protected BlockFishEggs() { - super(Material.water); - } -} diff --git a/src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java b/src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java deleted file mode 100644 index 845358829d..0000000000 --- a/src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java +++ /dev/null @@ -1,117 +0,0 @@ -package gtPlusPlus.plugin.fishing.item; - -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemFood; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.potion.PotionHelper; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.plugin.fishing.misc.BaseFishTypes; - -public class BaseFish extends ItemFood { - - private final boolean isCooked; - - public BaseFish(boolean cooked) { - super(0, 0.0F, false); - this.isCooked = cooked; - } - - @Override - public int func_150905_g(ItemStack p_150905_1_) { - BaseFishTypes fishtype = BaseFishTypes.getFishTypeFromStackDamage(p_150905_1_); - return this.isCooked && fishtype.isCooked() ? fishtype.func_150970_e() : fishtype.func_150975_c(); - } - - @Override - public float func_150906_h(ItemStack p_150906_1_) { - BaseFishTypes fishtype = BaseFishTypes.getFishTypeFromStackDamage(p_150906_1_); - return this.isCooked && fishtype.isCooked() ? fishtype.func_150977_f() : fishtype.func_150967_d(); - } - - /** - * Returns a string representing what this item does to a potion. - */ - @Override - public String getPotionEffect(ItemStack p_150896_1_) { - return BaseFishTypes.getFishTypeFromStackDamage(p_150896_1_) == BaseFishTypes.PUFFERFISH - ? PotionHelper.field_151423_m - : null; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister p_94581_1_) { - BaseFishTypes[] afishtype = BaseFishTypes.values(); - int i = afishtype.length; - - for (int j = 0; j < i; ++j) { - BaseFishTypes fishtype = afishtype[j]; - fishtype.func_150968_a(p_94581_1_); - } - } - - @Override - protected void onFoodEaten(ItemStack fish, World world, EntityPlayer player) { - BaseFishTypes fishtype = BaseFishTypes.getFishTypeFromStackDamage(fish); - - if (fishtype == BaseFishTypes.PUFFERFISH) { - player.addPotionEffect(new PotionEffect(Potion.poison.id, 1200, 3)); - player.addPotionEffect(new PotionEffect(Potion.hunger.id, 300, 2)); - player.addPotionEffect(new PotionEffect(Potion.confusion.id, 300, 1)); - } - - super.onFoodEaten(fish, world, player); - } - - /** - * Gets an icon index based on an item's damage value - */ - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int dmg) { - BaseFishTypes fishtype = BaseFishTypes.getFishTypeFromDamageValue(dmg); - return this.isCooked && fishtype.isCooked() ? fishtype.func_150979_h() : fishtype.func_150971_g(); - } - - /** - * returns a list of items with the same ID, but different meta (eg: dye returns 16 items) - */ - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_) { - BaseFishTypes[] afishtype = BaseFishTypes.values(); - int i = afishtype.length; - - for (int j = 0; j < i; ++j) { - BaseFishTypes fishtype = afishtype[j]; - - if (!this.isCooked || fishtype.isCooked()) { - p_150895_3_.add(new ItemStack(this, 1, fishtype.getFishID())); - } - } - } - - /** - * Returns the unlocalized name of this item. This version accepts an ItemStack so different stacks can have - * different names based on their damage or NBT. - */ - @Override - public String getUnlocalizedName(ItemStack p_77667_1_) { - BaseFishTypes fishtype = BaseFishTypes.getFishTypeFromStackDamage(p_77667_1_); - return this.getUnlocalizedName() + "." - + fishtype.getFishName() - + "." - + (this.isCooked && fishtype.isCooked() ? "cooked" : "raw"); - } -} diff --git a/src/main/java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java b/src/main/java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java deleted file mode 100644 index 04e57e639b..0000000000 --- a/src/main/java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java +++ /dev/null @@ -1,124 +0,0 @@ -package gtPlusPlus.plugin.fishing.misc; - -import java.util.Map; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import com.google.common.collect.Maps; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.plugin.fishing.item.BaseFish; - -public enum BaseFishTypes { - - COD(0, "cod", 2, 0.1F, 5, 0.6F), - SALMON(1, "salmon", 2, 0.1F, 6, 0.8F), - CLOWNFISH(2, "clownfish", 1, 0.1F), - PUFFERFISH(3, "pufferfish", 1, 0.1F); - - private static final Map<Integer, BaseFishTypes> mFishMap = Maps.newHashMap(); - private final int mID; - private final String mFishName; - - @SideOnly(Side.CLIENT) - private IIcon iicon; - - @SideOnly(Side.CLIENT) - private IIcon iicon2; - - private final int field_150991_j; - private final float field_150992_k; - private final int field_150989_l; - private final float field_150990_m; - private boolean isCooked = false; - - private BaseFishTypes(int p_i45336_3_, String p_i45336_4_, int p_i45336_5_, float p_i45336_6_, int p_i45336_7_, - float p_i45336_8_) { - this.mID = p_i45336_3_; - this.mFishName = p_i45336_4_; - this.field_150991_j = p_i45336_5_; - this.field_150992_k = p_i45336_6_; - this.field_150989_l = p_i45336_7_; - this.field_150990_m = p_i45336_8_; - this.isCooked = true; - } - - private BaseFishTypes(int p_i45337_3_, String p_i45337_4_, int p_i45337_5_, float p_i45337_6_) { - this.mID = p_i45337_3_; - this.mFishName = p_i45337_4_; - this.field_150991_j = p_i45337_5_; - this.field_150992_k = p_i45337_6_; - this.field_150989_l = 0; - this.field_150990_m = 0.0F; - this.isCooked = false; - } - - public int getFishID() { - return this.mID; - } - - public String getFishName() { - return this.mFishName; - } - - public int func_150975_c() { - return this.field_150991_j; - } - - public float func_150967_d() { - return this.field_150992_k; - } - - public int func_150970_e() { - return this.field_150989_l; - } - - public float func_150977_f() { - return this.field_150990_m; - } - - @SideOnly(Side.CLIENT) - public void func_150968_a(IIconRegister p_150968_1_) { - this.iicon = p_150968_1_.registerIcon("fish_" + this.mFishName + "_raw"); - - if (this.isCooked) { - this.iicon2 = p_150968_1_.registerIcon("fish_" + this.mFishName + "_cooked"); - } - } - - @SideOnly(Side.CLIENT) - public IIcon func_150971_g() { - return this.iicon; - } - - @SideOnly(Side.CLIENT) - public IIcon func_150979_h() { - return this.iicon2; - } - - public boolean isCooked() { - return this.isCooked; - } - - public static BaseFishTypes getFishTypeFromDamageValue(int dmg) { - BaseFishTypes fishtype = (BaseFishTypes) mFishMap.get(Integer.valueOf(dmg)); - return fishtype == null ? COD : fishtype; - } - - public static BaseFishTypes getFishTypeFromStackDamage(ItemStack fish) { - return fish.getItem() instanceof BaseFish ? getFishTypeFromDamageValue(fish.getItemDamage()) : COD; - } - - static { - BaseFishTypes[] var0 = values(); - int var1 = var0.length; - - for (int var2 = 0; var2 < var1; ++var2) { - BaseFishTypes var3 = var0[var2]; - mFishMap.put(Integer.valueOf(var3.getFishID()), var3); - } - } -} diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java index eed695108b..6d53f973bf 100644 --- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java +++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java @@ -8,6 +8,8 @@ import gtPlusPlus.api.interfaces.IPlugin; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.plugin.manager.Core_Manager; +// Called by Core_Manager#veryEarlyInit +@SuppressWarnings("unused") public class Core_VanillaFixes implements IPlugin { static final Core_VanillaFixes mInstance; diff --git a/src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java b/src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java index c1c47119e1..80ab91a542 100644 --- a/src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java +++ b/src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java @@ -15,6 +15,8 @@ import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.plugin.manager.Core_Manager; import gtPlusPlus.preloader.CORE_Preloader; +// Called by Core_Manager#veryEarlyInit +@SuppressWarnings("unused") public class Core_SulfuricChemistry implements IPlugin { static final Core_SulfuricChemistry mInstance; diff --git a/src/main/java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java b/src/main/java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java index 9436337d16..1ea7bc02ba 100644 --- a/src/main/java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java @@ -17,6 +17,8 @@ import gtPlusPlus.plugin.villagers.trade.TradeHandlerBanker; import gtPlusPlus.plugin.villagers.trade.TradeHandlerTechnician; import gtPlusPlus.plugin.villagers.trade.TradeHandlerTrader; +// Called by Core_Manager#veryEarlyInit +@SuppressWarnings("unused") public class Core_VillagerAdditions implements IPlugin { public static final Core_VillagerAdditions mInstance; diff --git a/src/main/java/gtPlusPlus/plugin/villagers/NameLists.java b/src/main/java/gtPlusPlus/plugin/villagers/NameLists.java deleted file mode 100644 index a5973701a6..0000000000 --- a/src/main/java/gtPlusPlus/plugin/villagers/NameLists.java +++ /dev/null @@ -1,1028 +0,0 @@ -package gtPlusPlus.plugin.villagers; - -import org.apache.commons.lang3.StringUtils; - -import gtPlusPlus.core.util.math.MathUtils; - -public class NameLists { - - public static final String[] mFirstNames; - public static final String[] mLastNames; - public static final String[] mScottishFirstNames; - - static { - mFirstNames = generateFirstNames(); - mLastNames = generateLastNames(); - mScottishFirstNames = generateScottishFirstNames(); - } - - private static final String[] generateScottishFirstNames() { - return new String[] { "Aadam", "Aadit", "Aahron", "Aaran", "Aaren", "Aarez", "Aarman", "Aaron", "Aaron-James", - "Aarron", "Aaryan", "Aaryn", "Aayan", "Aazaan", "Abaan", "Abbas", "Abdallah", "Abdalroof", "Abdihakim", - "Abdirahman", "Abdisalam", "Abdul", "Abdul-Aziz", "Abdulbasir", "Abdulkadir", "Abdulkarem", - "Abdulkhader", "Abdullah", "Abdul-Majeed", "Abdulmalik", "Abdul-Rehman", "Abdur", "Abdurraheem", - "Abdur-Rahman", "Abdur-Rehmaan", "Abel", "Abhinav", "Abhisumant", "Abid", "Abir", "Abraham", "Abu", - "Abubakar", "Ace", "Adain", "Adam", "Adam-James", "Addison", "Addisson", "Adegbola", "Adegbolahan", - "Aden", "Adenn", "Adie", "Adil", "Aditya", "Adnan", "Adrian", "Adrien", "Aedan", "Aedin", "Aedyn", - "Aeron", "Afonso", "Ahmad", "Ahmed", "Ahmed-Aziz", "Ahoua", "Ahtasham", "Aiadan", "Aidan", "Aiden", - "Aiden-Jack", "Aiden-Vee", "Aidian", "Aidy", "Ailin", "Aiman", "Ainsley", "Ainslie", "Airen", "Airidas", - "Airlie", "AJ", "Ajay", "A-Jay", "Ajayraj", "Akan", "Akram", "Al", "Ala'", "Alan", "Alanas", "Alasdair", - "Alastair", "Alber", "Albert", "Albie", "Aldred", "Alec", "Aled", "Aleem", "Aleksandar", "Aleksander", - "Aleksandr", "Aleksandrs", "Alekzander", "Alessandro", "Alessio", "Alex", "Alexander", "Alexei", - "Alexx", "Alexzander", "Alf", "Alfee", "Alfie", "Alfred", "Alfy", "Alhaji", "Al-Hassan", "Ali", - "Aliekber", "Alieu", "Alihaider", "Alisdair", "Alishan", "Alistair", "Alistar", "Alister", "Aliyaan", - "Allan", "Allan-Laiton", "Allen", "Allesandro", "Allister", "Ally", "Alphonse", "Altyiab", "Alum", - "Alvern", "Alvin", "Alyas", "Amaan", "Aman", "Amani", "Ambanimoh", "Ameer", "Amgad", "Ami", "Amin", - "Amir", "Ammaar", "Ammar", "Ammer", "Amolpreet", "Amos", "Amrinder", "Amrit", "Amro", "Anay", "Andrea", - "Andreas", "Andrei", "Andrejs", "Andrew", "Andy", "Anees", "Anesu", "Angel", "Angelo", "Angus", "Anir", - "Anis", "Anish", "Anmolpreet", "Annan", "Anndra", "Anselm", "Anthony", "Anthony-John", "Antoine", - "Anton", "Antoni", "Antonio", "Antony", "Antonyo", "Anubhav", "Aodhan", "Aon", "Aonghus", "Apisai", - "Arafat", "Aran", "Arandeep", "Arann", "Aray", "Arayan", "Archibald", "Archie", "Arda", "Ardal", - "Ardeshir", "Areeb", "Areez", "Aref", "Arfin", "Argyle", "Argyll", "Ari", "Aria", "Arian", "Arihant", - "Aristomenis", "Aristotelis", "Arjuna", "Arlo", "Armaan", "Arman", "Armen", "Arnab", "Arnav", "Arnold", - "Aron", "Aronas", "Arran", "Arrham", "Arron", "Arryn", "Arsalan", "Artem", "Arthur", "Artur", "Arturo", - "Arun", "Arunas", "Arved", "Arya", "Aryan", "Aryankhan", "Aryian", "Aryn", "Asa", "Asfhan", "Ash", - "Ashlee-jay", "Ashley", "Ashton", "Ashton-Lloyd", "Ashtyn", "Ashwin", "Asif", "Asim", "Aslam", "Asrar", - "Ata", "Atal", "Atapattu", "Ateeq", "Athol", "Athon", "Athos-Carlos", "Atli", "Atom", "Attila", "Aulay", - "Aun", "Austen", "Austin", "Avani", "Averon", "Avi", "Avinash", "Avraham", "Awais", "Awwal", "Axel", - "Ayaan", "Ayan", "Aydan", "Ayden", "Aydin", "Aydon", "Ayman", "Ayomide", "Ayren", "Ayrton", "Aytug", - "Ayub", "Ayyub", "Azaan", "Azedine", "Azeem", "Azim", "Aziz", "Azlan", "Azzam", "Azzedine", - "Babatunmise", "Babur", "Bader", "Badr", "Badsha", "Bailee", "Bailey", "Bailie", "Bailley", "Baillie", - "Baley", "Balian", "Banan", "Barath", "Barkley", "Barney", "Baron", "Barrie", "Barry", "Bartlomiej", - "Bartosz", "Basher", "Basile", "Baxter", "Baye", "Bayley", "Beau", "Beinn", "Bekim", "Believe", "Ben", - "Bendeguz", "Benedict", "Benjamin", "Benjamyn", "Benji", "Benn", "Bennett", "Benny", "Benoit", - "Bentley", "Berkay", "Bernard", "Bertie", "Bevin", "Bezalel", "Bhaaldeen", "Bharath", "Bilal", "Bill", - "Billy", "Binod", "Bjorn", "Blaike", "Blaine", "Blair", "Blaire", "Blake", "Blazej", "Blazey", - "Blessing", "Blue", "Blyth", "Bo", "Boab", "Bob", "Bobby", "Bobby-Lee", "Bodhan", "Boedyn", "Bogdan", - "Bohbi", "Bony", "Bowen", "Bowie", "Boyd", "Bracken", "Brad", "Bradan", "Braden", "Bradley", "Bradlie", - "Bradly", "Brady", "Bradyn", "Braeden", "Braiden", "Brajan", "Brandan", "Branden", "Brandon", - "Brandonlee", "Brandon-Lee", "Brandyn", "Brannan", "Brayden", "Braydon", "Braydyn", "Breandan", - "Brehme", "Brendan", "Brendon", "Brendyn", "Breogan", "Bret", "Brett", "Briaddon", "Brian", "Brodi", - "Brodie", "Brody", "Brogan", "Broghan", "Brooke", "Brooklin", "Brooklyn", "Bruce", "Bruin", "Bruno", - "Brunon", "Bryan", "Bryce", "Bryden", "Brydon", "Brydon-Craig", "Bryn", "Brynmor", "Bryson", "Buddy", - "Bully", "Burak", "Burhan", "Butali", "Butchi", "Byron", "Cabhan", "Cadan", "Cade", "Caden", "Cadon", - "Cadyn", "Caedan", "Caedyn", "Cael", "Caelan", "Caelen", "Caethan", "Cahl", "Cahlum", "Cai", "Caidan", - "Caiden", "Caiden-Paul", "Caidyn", "Caie", "Cailaen", "Cailean", "Caileb-John", "Cailin", "Cain", - "Caine", "Cairn", "Cal", "Calan", "Calder", "Cale", "Calean", "Caleb", "Calen", "Caley", "Calib", - "Calin", "Callahan", "Callan", "Callan-Adam", "Calley", "Callie", "Callin", "Callum", "Callun", - "Callyn", "Calum", "Calum-James", "Calvin", "Cambell", "Camerin", "Cameron", "Campbel", "Campbell", - "Camron", "Caolain", "Caolan", "Carl", "Carlo", "Carlos", "Carrich", "Carrick", "Carson", "Carter", - "Carwyn", "Casey", "Casper", "Cassy", "Cathal", "Cator", "Cavan", "Cayden", "Cayden-Robert", - "Cayden-Tiamo", "Ceejay", "Ceilan", "Ceiran", "Ceirin", "Ceiron", "Cejay", "Celik", "Cephas", "Cesar", - "Cesare", "Chad", "Chaitanya", "Chang-Ha", "Charles", "Charley", "Charlie", "Charly", "Chase", "Che", - "Chester", "Chevy", "Chi", "Chibudom", "Chidera", "Chimsom", "Chin", "Chintu", "Chiqal", "Chiron", - "Chris", "Chris-Daniel", "Chrismedi", "Christian", "Christie", "Christoph", "Christopher", - "Christopher-Lee", "Christy", "Chu", "Chukwuemeka", "Cian", "Ciann", "Ciar", "Ciaran", "Ciarian", - "Cieran", "Cillian", "Cillin", "Cinar", "CJ", "C-Jay", "Clark", "Clarke", "Clayton", "Clement", - "Clifford", "Clyde", "Cobain", "Coban", "Coben", "Cobi", "Cobie", "Coby", "Codey", "Codi", "Codie", - "Cody", "Cody-Lee", "Coel", "Cohan", "Cohen", "Colby", "Cole", "Colin", "Coll", "Colm", "Colt", - "Colton", "Colum", "Colvin", "Comghan", "Conal", "Conall", "Conan", "Conar", "Conghaile", "Conlan", - "Conley", "Conli", "Conlin", "Conlly", "Conlon", "Conlyn", "Connal", "Connall", "Connan", "Connar", - "Connel", "Connell", "Conner", "Connolly", "Connor", "Connor-David", "Conor", "Conrad", "Cooper", - "Copeland", "Coray", "Corben", "Corbin", "Corey", "Corey-James", "Corey-Jay", "Cori", "Corie", "Corin", - "Cormac", "Cormack", "Cormak", "Corran", "Corrie", "Cory", "Cosmo", "Coupar", "Craig", "Craig-James", - "Crawford", "Creag", "Crispin", "Cristian", "Crombie", "Cruiz", "Cruz", "Cuillin", "Cullen", "Cullin", - "Curtis", "Cyrus", "Daanyaal", "Daegan", "Daegyu", "Dafydd", "Dagon", "Dailey", "Daimhin", "Daithi", - "Dakota", "Daksh", "Dale", "Dalong", "Dalton", "Damian", "Damien", "Damon", "Dan", "Danar", "Dane", - "Danial", "Daniel", "Daniele", "Daniel-James", "Daniels", "Daniil", "Danish", "Daniyal", "Danniel", - "Danny", "Dante", "Danyal", "Danyil", "Danys", "Daood", "Dara", "Darach", "Daragh", "Darcy", "D'arcy", - "Dareh", "Daren", "Darien", "Darius", "Darl", "Darn", "Darrach", "Darragh", "Darrel", "Darrell", - "Darren", "Darrie", "Darrius", "Darroch", "Darryl", "Darryn", "Darwyn", "Daryl", "Daryn", "Daud", - "Daumantas", "Davi", "David", "David-Jay", "David-Lee", "Davie", "Davis", "Davy", "Dawid", "Dawson", - "Dawud", "Dayem", "Daymian", "Deacon", "Deagan", "Dean", "Deano", "Decklan", "Declain", "Declan", - "Declyan", "Declyn", "Dedeniseoluwa", "Deecan", "Deegan", "Deelan", "Deklain-Jaimes", "Del", - "Demetrius", "Denis", "Deniss", "Dennan", "Dennin", "Dennis", "Denny", "Dennys", "Denon", "Denton", - "Denver", "Denzel", "Deon", "Derek", "Derick", "Derin", "Dermot", "Derren", "Derrie", "Derrin", - "Derron", "Derry", "Derryn", "Deryn", "Deshawn", "Desmond", "Dev", "Devan", "Devin", "Devlin", "Devlyn", - "Devon", "Devrin", "Devyn", "Dex", "Dexter", "Dhani", "Dharam", "Dhavid", "Dhyia", "Diarmaid", - "Diarmid", "Diarmuid", "Didier", "Diego", "Diesel", "Diesil", "Digby", "Dilan", "Dilano", "Dillan", - "Dillon", "Dilraj", "Dimitri", "Dinaras", "Dion", "Dissanayake", "Dmitri", "Doire", "Dolan", "Domanic", - "Domenico", "Domhnall", "Dominic", "Dominick", "Dominik", "Donald", "Donnacha", "Donnie", "Dorian", - "Dougal", "Douglas", "Dougray", "Drakeo", "Dre", "Dregan", "Drew", "Dugald", "Duncan", "Duriel", - "Dustin", "Dylan", "Dylan-Jack", "Dylan-James", "Dylan-John", "Dylan-Patrick", "Dylin", "Dyllan", - "Dyllan-James", "Dyllon", "Eadie", "Eagann", "Eamon", "Eamonn", "Eason", "Eassan", "Easton", "Ebow", - "Ed", "Eddie", "Eden", "Ediomi", "Edison", "Eduardo", "Eduards", "Edward", "Edwin", "Edwyn", "Eesa", - "Efan", "Efe", "Ege", "Ehsan", "Ehsen", "Eiddon", "Eidhan", "Eihli", "Eimantas", "Eisa", "Eli", "Elias", - "Elijah", "Eliot", "Elisau", "Eljay", "Eljon", "Elliot", "Elliott", "Ellis", "Ellisandro", "Elshan", - "Elvin", "Elyan", "Emanuel", "Emerson", "Emil", "Emile", "Emir", "Emlyn", "Emmanuel", "Emmet", "Eng", - "Eniola", "Enis", "Ennis", "Enrico", "Enrique", "Enzo", "Eoghain", "Eoghan", "Eoin", "Eonan", "Erdehan", - "Eren", "Erencem", "Eric", "Ericlee", "Erik", "Eriz", "Ernie-Jacks", "Eroni", "Eryk", "Eshan", "Essa", - "Esteban", "Ethan", "Etienne", "Etinosa", "Euan", "Eugene", "Evan", "Evann", "Ewan", "Ewen", "Ewing", - "Exodi", "Ezekiel", "Ezra", "Fabian", "Fahad", "Faheem", "Faisal", "Faizaan", "Famara", "Fares", - "Farhaan", "Farhan", "Farren", "Farzad", "Fauzaan", "Favour", "Fawaz", "Fawkes", "Faysal", "Fearghus", - "Feden", "Felix", "Fergal", "Fergie", "Fergus", "Ferre", "Fezaan", "Fiachra", "Fikret", "Filip", - "Filippo", "Finan", "Findlay", "Findlay-James", "Findlie", "Finlay", "Finley", "Finn", "Finnan", - "Finnean", "Finnen", "Finnlay", "Finnley", "Fintan", "Fionn", "Firaaz", "Fletcher", "Flint", "Florin", - "Flyn", "Flynn", "Fodeba", "Folarinwa", "Forbes", "Forgan", "Forrest", "Fox", "Francesco", "Francis", - "Francisco", "Franciszek", "Franco", "Frank", "Frankie", "Franklin", "Franko", "Fraser", "Frazer", - "Fred", "Freddie", "Frederick", "Fruin", "Fyfe", "Fyn", "Fynlay", "Fynn", "Gabriel", "Gallagher", - "Gareth", "Garren", "Garrett", "Garry", "Gary", "Gavin", "Gavin-Lee", "Gene", "Geoff", "Geoffrey", - "Geomer", "Geordan", "Geordie", "George", "Georgia", "Georgy", "Gerard", "Ghyll", "Giacomo", "Gian", - "Giancarlo", "Gianluca", "Gianmarco", "Gideon", "Gil", "Gio", "Girijan", "Girius", "Gjan", "Glascott", - "Glen", "Glenn", "Gordon", "Grady", "Graeme", "Graham", "Grahame", "Grant", "Grayson", "Greg", "Gregor", - "Gregory", "Greig", "Griffin", "Griffyn", "Grzegorz", "Guang", "Guerin", "Guillaume", "Gurardass", - "Gurdeep", "Gursees", "Gurthar", "Gurveer", "Gurwinder", "Gus", "Gustav", "Guthrie", "Guy", "Gytis", - "Habeeb", "Hadji", "Hadyn", "Hagun", "Haiden", "Haider", "Hamad", "Hamid", "Hamish", "Hamza", "Hamzah", - "Han", "Hansen", "Hao", "Hareem", "Hari", "Harikrishna", "Haris", "Harish", "Harjeevan", "Harjyot", - "Harlee", "Harleigh", "Harley", "Harman", "Harnek", "Harold", "Haroon", "Harper", "Harri", "Harrington", - "Harris", "Harrison", "Harry", "Harvey", "Harvie", "Harvinder", "Hasan", "Haseeb", "Hashem", "Hashim", - "Hassan", "Hassanali", "Hately", "Havila", "Hayden", "Haydn", "Haydon", "Haydyn", "Hcen", "Hector", - "Heddle", "Heidar", "Heini", "Hendri", "Henri", "Henry", "Herbert", "Heyden", "Hiro", "Hirvaansh", - "Hishaam", "Hogan", "Honey", "Hong", "Hope", "Hopkin", "Hosea", "Howard", "Howie", "Hristomir", - "Hubert", "Hugh", "Hugo", "Humza", "Hunter", "Husnain", "Hussain", "Hussan", "Hussnain", "Hussnan", - "Hyden", "I", "Iagan", "Iain", "Ian", "Ibraheem", "Ibrahim", "Idahosa", "Idrees", "Idris", "Iestyn", - "Ieuan", "Igor", "Ihtisham", "Ijay", "Ikechukwu", "Ikemsinachukwu", "Ilyaas", "Ilyas", "Iman", - "Immanuel", "Inan", "Indy", "Ines", "Innes", "Ioannis", "Ireayomide", "Ireoluwa", "Irvin", "Irvine", - "Isa", "Isaa", "Isaac", "Isaiah", "Isak", "Isher", "Ishwar", "Isimeli", "Isira", "Ismaeel", "Ismail", - "Israel", "Issiaka", "Ivan", "Ivar", "Izaak", "J", "Jaay", "Jac", "Jace", "Jack", "Jacki", "Jackie", - "Jack-James", "Jackson", "Jacky", "Jacob", "Jacques", "Jad", "Jaden", "Jadon", "Jadyn", "Jae", "Jagat", - "Jago", "Jaheim", "Jahid", "Jahy", "Jai", "Jaida", "Jaiden", "Jaidyn", "Jaii", "Jaime", "Jai-Rajaram", - "Jaise", "Jak", "Jake", "Jakey", "Jakob", "Jaksyn", "Jakub", "Jamaal", "Jamal", "Jameel", "Jameil", - "James", "James-Paul", "Jamey", "Jamie", "Jan", "Jaosha", "Jardine", "Jared", "Jarell", "Jarl", "Jarno", - "Jarred", "Jarvi", "Jasey-Jay", "Jasim", "Jaskaran", "Jason", "Jasper", "Jaxon", "Jaxson", "Jay", - "Jaydan", "Jayden", "Jayden-James", "Jayden-Lee", "Jayden-Paul", "Jayden-Thomas", "Jaydn", "Jaydon", - "Jaydyn", "Jayhan", "Jay-Jay", "Jayke", "Jaymie", "Jayse", "Jayson", "Jaz", "Jazeb", "Jazib", "Jazz", - "Jean", "Jean-Lewis", "Jean-Pierre", "Jebadiah", "Jed", "Jedd", "Jedidiah", "Jeemie", "Jeevan", - "Jeffrey", "Jensen", "Jenson", "Jensyn", "Jeremy", "Jerome", "Jeronimo", "Jerrick", "Jerry", "Jesse", - "Jesuseun", "Jeswin", "Jevan", "Jeyun", "Jez", "Jia", "Jian", "Jiao", "Jimmy", "Jincheng", "JJ", - "Joaquin", "Joash", "Jock", "Jody", "Joe", "Joeddy", "Joel", "Joey", "Joey-Jack", "Johann", "Johannes", - "Johansson", "John", "Johnathan", "Johndean", "Johnjay", "John-Michael", "Johnnie", "Johnny", - "Johnpaul", "John-Paul", "John-Scott", "Johnson", "Jole", "Jomuel", "Jon", "Jonah", "Jonatan", - "Jonathan", "Jonathon", "Jonny", "Jonothan", "Jon-Paul", "Jonson", "Joojo", "Jordan", "Jordi", "Jordon", - "Jordy", "Jordyn", "Jorge", "Joris", "Jorryn", "Josan", "Josef", "Joseph", "Josese", "Josh", "Joshiah", - "Joshua", "Josiah", "Joss", "Jostelle", "Joynul", "Juan", "Jubin", "Judah", "Jude", "Jules", "Julian", - "Julien", "Jun", "Junior", "Jura", "Justan", "Justin", "Justinas", "Kaan", "Kabeer", "Kabir", "Kacey", - "Kacper", "Kade", "Kaden", "Kadin", "Kadyn", "Kaeden", "Kael", "Kaelan", "Kaelin", "Kaelum", "Kai", - "Kaid", "Kaidan", "Kaiden", "Kaidinn", "Kaidyn", "Kaileb", "Kailin", "Kain", "Kaine", "Kainin", - "Kainui", "Kairn", "Kaison", "Kaiwen", "Kajally", "Kajetan", "Kalani", "Kale", "Kaleb", "Kaleem", - "Kal-el", "Kalen", "Kalin", "Kallan", "Kallin", "Kalum", "Kalvin", "Kalvyn", "Kameron", "Kames", - "Kamil", "Kamran", "Kamron", "Kane", "Karam", "Karamvir", "Karandeep", "Kareem", "Karim", "Karimas", - "Karl", "Karol", "Karson", "Karsyn", "Karthikeya", "Kasey", "Kash", "Kashif", "Kasim", "Kasper", - "Kasra", "Kavin", "Kayam", "Kaydan", "Kayden", "Kaydin", "Kaydn", "Kaydyn", "Kaydyne", "Kayleb", - "Kaylem", "Kaylum", "Kayne", "Kaywan", "Kealan", "Kealon", "Kean", "Keane", "Kearney", "Keatin", - "Keaton", "Keavan", "Keayn", "Kedrick", "Keegan", "Keelan", "Keelin", "Keeman", "Keenan", "Keenan-Lee", - "Keeton", "Kehinde", "Keigan", "Keilan", "Keir", "Keiran", "Keiren", "Keiron", "Keiryn", "Keison", - "Keith", "Keivlin", "Kelam", "Kelan", "Kellan", "Kellen", "Kelso", "Kelum", "Kelvan", "Kelvin", "Ken", - "Kenan", "Kendall", "Kendyn", "Kenlin", "Kenneth", "Kensey", "Kenton", "Kenyon", "Kenzeigh", "Kenzi", - "Kenzie", "Kenzo", "Kenzy", "Keo", "Ker", "Kern", "Kerr", "Kevan", "Kevin", "Kevyn", "Kez", "Khai", - "Khalan", "Khaleel", "Khaya", "Khevien", "Khizar", "Khizer", "Kia", "Kian", "Kian-James", "Kiaran", - "Kiarash", "Kie", "Kiefer", "Kiegan", "Kienan", "Kier", "Kieran", "Kieran-Scott", "Kieren", "Kierin", - "Kiern", "Kieron", "Kieryn", "Kile", "Killian", "Kimi", "Kingston", "Kinneil", "Kinnon", "Kinsey", - "Kiran", "Kirk", "Kirwin", "Kit", "Kiya", "Kiyonari", "Kjae", "Klein", "Klevis", "Kobe", "Kobi", "Koby", - "Koddi", "Koden", "Kodi", "Kodie", "Kody", "Kofi", "Kogan", "Kohen", "Kole", "Konan", "Konar", "Konnor", - "Konrad", "Koray", "Korben", "Korbyn", "Korey", "Kori", "Korrin", "Kory", "Koushik", "Kris", "Krish", - "Krishan", "Kriss", "Kristian", "Kristin", "Kristofer", "Kristoffer", "Kristopher", "Kruz", "Krzysiek", - "Krzysztof", "Ksawery", "Ksawier", "Kuba", "Kurt", "Kurtis", "Kurtis-Jae", "Kyaan", "Kyan", "Kyde", - "Kyden", "Kye", "Kyel", "Kyhran", "Kyie", "Kylan", "Kylar", "Kyle", "Kyle-Derek", "Kylian", "Kym", - "Kynan", "Kyral", "Kyran", "Kyren", "Kyrillos", "Kyro", "Kyron", "Kyrran", "Lachlainn", "Lachlan", - "Lachlann", "Lael", "Lagan", "Laird", "Laison", "Lakshya", "Lance", "Lancelot", "Landon", "Lang", - "Lasse", "Latif", "Lauchlan", "Lauchlin", "Laughlan", "Lauren", "Laurence", "Laurie", "Lawlyn", - "Lawrence", "Lawrie", "Lawson", "Layne", "Layton", "Lee", "Leigh", "Leigham", "Leighton", "Leilan", - "Leiten", "Leithen", "Leland", "Lenin", "Lennan", "Lennen", "Lennex", "Lennon", "Lennox", "Lenny", - "Leno", "Lenon", "Lenyn", "Leo", "Leon", "Leonard", "Leonardas", "Leonardo", "Lepeng", "Leroy", "Leven", - "Levi", "Levon", "Levy", "Lewie", "Lewin", "Lewis", "Lex", "Leydon", "Leyland", "Leylann", "Leyton", - "Liall", "Liam", "Liam-Stephen", "Limo", "Lincoln", "Lincoln-John", "Lincon", "Linden", "Linton", - "Lionel", "Lisandro", "Litrell", "Liyonela-Elam", "LLeyton", "Lliam", "Lloyd", "Lloyde", "Loche", - "Lochlan", "Lochlann", "Lochlan-Oliver", "Lock", "Lockey", "Logan", "Logann", "Logan-Rhys", "Loghan", - "Lokesh", "Loki", "Lomond", "Lorcan", "Lorenz", "Lorenzo", "Lorne", "Loudon", "Loui", "Louie", "Louis", - "Loukas", "Lovell", "Luc", "Luca", "Lucais", "Lucas", "Lucca", "Lucian", "Luciano", "Lucien", "Lucus", - "Luic", "Luis", "Luk", "Luka", "Lukas", "Lukasz", "Luke", "Lukmaan", "Luqman", "Lyall", "Lyle", - "Lyndsay", "Lysander", "Maanav", "Maaz", "Mac", "Macallum", "Macaulay", "Macauley", "Macaully", - "Machlan", "Maciej", "Mack", "Mackenzie", "Mackenzy", "Mackie", "Macsen", "Macy", "Madaki", "Maddison", - "Maddox", "Madison", "Madison-Jake", "Madox", "Mael", "Magnus", "Mahan", "Mahdi", "Mahmoud", "Maias", - "Maison", "Maisum", "Maitlind", "Majid", "Makensie", "Makenzie", "Makin", "Maksim", "Maksymilian", - "Malachai", "Malachi", "Malachy", "Malakai", "Malakhy", "Malcolm", "Malik", "Malikye", "Malo", - "Ma'moon", "Manas", "Maneet", "Manmohan", "Manolo", "Manson", "Mantej", "Manuel", "Manus", "Marc", - "Marc-Anthony", "Marcel", "Marcello", "Marcin", "Marco", "Marcos", "Marcous", "Marcquis", "Marcus", - "Mario", "Marios", "Marius", "Mark", "Marko", "Markus", "Marley", "Marlin", "Marlon", "Maros", - "Marshall", "Martin", "Marty", "Martyn", "Marvellous", "Marvin", "Marwan", "Maryk", "Marzuq", - "Mashhood", "Mason", "Mason-Jay", "Masood", "Masson", "Matas", "Matej", "Mateusz", "Mathew", "Mathias", - "Mathu", "Mathuyan", "Mati", "Matt", "Matteo", "Matthew", "Matthew-William", "Matthias", "Max", "Maxim", - "Maximilian", "Maximillian", "Maximus", "Maxwell", "Maxx", "Mayeul", "Mayson", "Mazin", "Mcbride", - "McCaulley", "McKade", "McKauley", "McKay", "McKenzie", "McLay", "Meftah", "Mehmet", "Mehraz", "Meko", - "Melville", "Meshach", "Meyzhward", "Micah", "Michael", "Michael-Alexander", "Michael-James", "Michal", - "Michat", "Micheal", "Michee", "Mickey", "Miguel", "Mika", "Mikael", "Mi'kael", "Mikee", "Mikey", - "Mikhail", "Mikolaj", "Miles", "Millar", "Miller", "Milo", "Milos", "Milosz", "Mir", "Mirza", "Mitch", - "Mitchel", "Mitchell", "Moad", "Moayd", "Mobeen", "Modoulamin", "Modu", "Mohamad", "Mohamed", - "Mohammad", "Mohammad-Bilal", "Mohammed", "Mohanad", "Mohd", "Momin", "Momooreoluwa", "Montague", - "Montgomery", "Monty", "Moore", "Moosa", "Moray", "Morgan", "Morgyn", "Morris", "Morton", "Moshy", - "Motade", "Moyes", "Msughter", "Mueez", "Muhamadjavad", "Muhammad", "Muhammed", "Muhsin", "Muir", - "Munachi", "Muneeb", "Mungo", "Munir", "Munmair", "Munro", "Murdo", "Murray", "Murrough", "Murry", - "Musa", "Musse", "Mustafa", "Mustapha", "Muzammil", "Muzzammil", "Mykie", "Myles", "Mylo", "Nabeel", - "Nadeem", "Nader", "Nagib", "Naif", "Nairn", "Narvic", "Nash", "Nasser", "Nassir", "Natan", "Nate", - "Nathan", "Nathanael", "Nathanial", "Nathaniel", "Nathan-Rae", "Nawfal", "Nayan", "Neco", "Neil", - "Nelson", "Neo", "Neshawn", "Nevan", "Nevin", "Ngonidzashe", "Nial", "Niall", "Nicholas", "Nick", - "Nickhill", "Nicki", "Nickson", "Nicky", "Nico", "Nicodemus", "Nicol", "Nicolae", "Nicolas", "Nidhish", - "Nihaal", "Nihal", "Nikash", "Nikhil", "Niki", "Nikita", "Nikodem", "Nikolai", "Nikos", "Nilav", - "Niraj", "Niro", "Niven", "Noah", "Noel", "Nolan", "Noor", "Norman", "Norrie", "Nuada", "Nyah", - "Oakley", "Oban", "Obieluem", "Obosa", "Odhran", "Odin", "Odynn", "Ogheneochuko", "Ogheneruno", "Ohran", - "Oilibhear", "Oisin", "Ojima-Ojo", "Okeoghene", "Olaf", "Ola-Oluwa", "Olaoluwapolorimi", "Ole", "Olie", - "Oliver", "Olivier", "Oliwier", "Ollie", "Olurotimi", "Oluwadamilare", "Oluwadamiloju", "Oluwafemi", - "Oluwafikunayomi", "Oluwalayomi", "Oluwatobiloba", "Oluwatoni", "Omar", "Omri", "Oran", "Orin", - "Orlando", "Orley", "Orran", "Orrick", "Orrin", "Orson", "Oryn", "Oscar", "Osesenagha", "Oskar", - "Ossian", "Oswald", "Otto", "Owain", "Owais", "Owen", "Owyn", "Oz", "Ozzy", "Pablo", "Pacey", "Padraig", - "Paolo", "Pardeepraj", "Parkash", "Parker", "Pascoe", "Pasquale", "Patrick", "Patrick-John", "Patrikas", - "Patryk", "Paul", "Pavit", "Pawel", "Pawlo", "Pearce", "Pearse", "Pearsen", "Pedram", "Pedro", "Peirce", - "Peiyan", "Pele", "Peni", "Peregrine", "Peter", "Phani", "Philip", "Philippos", "Phinehas", "Phoenix", - "Phoevos", "Pierce", "Pierre-Antoine", "Pieter", "Pietro", "Piotr", "Porter", "Prabhjoit", "Prabodhan", - "Praise", "Pranav", "Pravin", "Precious", "Prentice", "Presley", "Preston", "Preston-Jay", "Prinay", - "Prince", "Prithvi", "Promise", "Puneetpaul", "Pushkar", "Qasim", "Qirui", "Quinlan", "Quinn", - "Radmiras", "Raees", "Raegan", "Rafael", "Rafal", "Rafferty", "Rafi", "Raheem", "Rahil", "Rahim", - "Rahman", "Raith", "Raithin", "Raja", "Rajab-Ali", "Rajan", "Ralfs", "Ralph", "Ramanas", "Ramit", - "Ramone", "Ramsay", "Ramsey", "Rana", "Ranolph", "Raphael", "Rasmus", "Rasul", "Raul", "Raunaq", - "Ravin", "Ray", "Rayaan", "Rayan", "Rayane", "Rayden", "Rayhan", "Raymond", "Rayne", "Rayyan", "Raza", - "Reace", "Reagan", "Reean", "Reece", "Reed", "Reegan", "Rees", "Reese", "Reeve", "Regan", "Regean", - "Reggie", "Rehaan", "Rehan", "Reice", "Reid", "Reigan", "Reilly", "Reily", "Reis", "Reiss", "Remigiusz", - "Remo", "Remy", "Ren", "Renars", "Reng", "Rennie", "Reno", "Reo", "Reuben", "Rexford", "Reynold", - "Rhein", "Rheo", "Rhett", "Rheyden", "Rhian", "Rhoan", "Rholmark", "Rhoridh", "Rhuairidh", "Rhuan", - "Rhuaridh", "Rhudi", "Rhy", "Rhyan", "Rhyley", "Rhyon", "Rhys", "Rhys-Bernard", "Rhyse", "Riach", - "Rian", "Ricards", "Riccardo", "Ricco", "Rice", "Richard", "Richey", "Richie", "Ricky", "Rico", - "Ridley", "Ridwan", "Rihab", "Rihan", "Rihards", "Rihonn", "Rikki", "Riley", "Rio", "Rioden", "Rishi", - "Ritchie", "Rivan", "Riyadh", "Riyaj", "Roan", "Roark", "Roary", "Rob", "Robbi", "Robbie", "Robbie-lee", - "Robby", "Robert", "Robert-Gordon", "Robertjohn", "Robi", "Robin", "Rocco", "Roddy", "Roderick", - "Rodrigo", "Roen", "Rogan", "Roger", "Rohaan", "Rohan", "Rohin", "Rohit", "Rokas", "Roman", "Ronald", - "Ronan", "Ronan-Benedict", "Ronin", "Ronnie", "Rooke", "Roray", "Rori", "Rorie", "Rory", "Roshan", - "Ross", "Ross-Andrew", "Rossi", "Rowan", "Rowen", "Roy", "Ruadhan", "Ruaidhri", "Ruairi", "Ruairidh", - "Ruan", "Ruaraidh", "Ruari", "Ruaridh", "Ruben", "Rubhan", "Rubin", "Rubyn", "Rudi", "Rudy", "Rufus", - "Rui", "Ruo", "Rupert", "Ruslan", "Russel", "Russell", "Ryaan", "Ryan", "Ryan-Lee", "Ryden", "Ryder", - "Ryese", "Ryhs", "Rylan", "Rylay", "Rylee", "Ryleigh", "Ryley", "Rylie", "Ryo", "Ryszard", "Saad", - "Sabeen", "Sachkirat", "Saffi", "Saghun", "Sahaib", "Sahbian", "Sahil", "Saif", "Saifaddine", "Saim", - "Sajid", "Sajjad", "Salahudin", "Salman", "Salter", "Salvador", "Sam", "Saman", "Samar", "Samarjit", - "Samatar", "Sambrid", "Sameer", "Sami", "Samir", "Sami-Ullah", "Samual", "Samuel", "Samuela", "Samy", - "Sanaullah", "Sandro", "Sandy", "Sanfur", "Sanjay", "Santiago", "Santino", "Satveer", "Saul", - "Saunders", "Savin", "Sayad", "Sayeed", "Sayf", "Scot", "Scott", "Scott-Alexander", "Seaan", "Seamas", - "Seamus", "Sean", "Seane", "Sean-James", "Sean-Paul", "Sean-Ray", "Seb", "Sebastian", "Sebastien", - "Selasi", "Seonaidh", "Sephiroth", "Sergei", "Sergio", "Seth", "Sethu", "Seumas", "Shaarvin", "Shadow", - "Shae", "Shahmir", "Shai", "Shane", "Shannon", "Sharland", "Sharoz", "Shaughn", "Shaun", "Shaunpaul", - "Shaun-Paul", "Shaun-Thomas", "Shaurya", "Shaw", "Shawn", "Shawnpaul", "Shay", "Shayaan", "Shayan", - "Shaye", "Shayne", "Shazil", "Shea", "Sheafan", "Sheigh", "Shenuk", "Sher", "Shergo", "Sheriff", - "Sherwyn", "Shiloh", "Shiraz", "Shreeram", "Shreyas", "Shyam", "Siddhant", "Siddharth", "Sidharth", - "Sidney", "Siergiej", "Silas", "Simon", "Sinai", "Skye", "Sofian", "Sohaib", "Sohail", "Soham", "Sohan", - "Sol", "Solomon", "Sonneey", "Sonni", "Sonny", "Sorley", "Soul", "Spencer", "Spondon", "Stanislaw", - "Stanley", "Stefan", "Stefano", "Stefin", "Stephen", "Stephenjunior", "Steve", "Steven", "Steven-lee", - "Stevie", "Stewart", "Stewarty", "Strachan", "Struan", "Stuart", "Su", "Subhaan", "Sudais", "Suheyb", - "Suilven", "Sukhi", "Sukhpal", "Sukhvir", "Sulayman", "Sullivan", "Sultan", "Sung", "Sunny", "Suraj", - "Surien", "Sweyn", "Syed", "Sylvain", "Symon", "Szymon", "Tadd", "Taddy", "Tadhg", "Taegan", "Taegen", - "Tai", "Tait", "Taiwo", "Talha", "Taliesin", "Talon", "Talorcan", "Tamar", "Tamiem", "Tammam", "Tanay", - "Tane", "Tanner", "Tanvir", "Tanzeel", "Taonga", "Tarik", "Tariq-Jay", "Tate", "Taylan", "Taylar", - "Tayler", "Taylor", "Taylor-Jay", "Taylor-Lee", "Tayo", "Tayyab", "Tayye", "Tayyib", "Teagan", "Tee", - "Teejay", "Tee-jay", "Tegan", "Teighen", "Teiyib", "Te-Jay", "Temba", "Teo", "Teodor", "Teos", "Terry", - "Teydren", "Theo", "Theodore", "Thiago", "Thierry", "Thom", "Thomas", "Thomas-Jay", "Thomson", - "Thorben", "Thorfinn", "Thrinei", "Thumbiko", "Tiago", "Tian", "Tiarnan", "Tibet", "Tieran", "Tiernan", - "Timothy", "Timucin", "Tiree", "Tisloh", "Titi", "Titus", "Tiylar", "TJ", "Tjay", "T'jay", "T-Jay", - "Tobey", "Tobi", "Tobias", "Tobie", "Toby", "Todd", "Tokinaga", "Toluwalase", "Tom", "Tomas", "Tomasz", - "Tommi-Lee", "Tommy", "Tomson", "Tony", "Torin", "Torquil", "Torran", "Torrin", "Torsten", "Trafford", - "Trai", "Travis", "Tre", "Trent", "Trey", "Tristain", "Tristan", "Troy", "Tubagus", "Turki", "Turner", - "Ty", "Ty-Alexander", "Tye", "Tyelor", "Tylar", "Tyler", "Tyler-James", "Tyler-Jay", "Tyllor", "Tylor", - "Tymom", "Tymon", "Tymoteusz", "Tyra", "Tyree", "Tyrnan", "Tyrone", "Tyson", "Ubaid", "Ubayd", - "Uchenna", "Uilleam", "Umair", "Umar", "Umer", "Umut", "Urban", "Uri", "Usman", "Uzair", "Uzayr", - "Valen", "Valentin", "Valentino", "Valery", "Valo", "Vasyl", "Vedantsinh", "Veeran", "Victor", - "Victory", "Vinay", "Vince", "Vincent", "Vincenzo", "Vinh", "Vinnie", "Vithujan", "Vladimir", - "Vladislav", "Vrishin", "Vuyolwethu", "Wabuya", "Wai", "Walid", "Wallace", "Walter", "Waqaas", - "Warkhas", "Warren", "Warrick", "Wasif", "Wayde", "Wayne", "Wei", "Wen", "Wesley", "Wesley-Scott", - "Wiktor", "Wilkie", "Will", "William", "William-John", "Willum", "Wilson", "Windsor", "Wojciech", - "Woyenbrakemi", "Wyatt", "Wylie", "Wynn", "Xabier", "Xander", "Xavier", "Xiao", "Xida", "Xin", "Xue", - "Yadgor", "Yago", "Yahya", "Yakup", "Yang", "Yanick", "Yann", "Yannick", "Yaseen", "Yasin", "Yasir", - "Yassin", "Yoji", "Yong", "Yoolgeun", "Yorgos", "Youcef", "Yousif", "Youssef", "Yu", "Yuanyu", "Yuri", - "Yusef", "Yusuf", "Yves", "Zaaine", "Zaak", "Zac", "Zach", "Zachariah", "Zacharias", "Zacharie", - "Zacharius", "Zachariya", "Zachary", "Zachary-Marc", "Zachery", "Zack", "Zackary", "Zaid", "Zain", - "Zaine", "Zaineddine", "Zainedin", "Zak", "Zakaria", "Zakariya", "Zakary", "Zaki", "Zakir", "Zakk", - "Zamaar", "Zander", "Zane", "Zarran", "Zayd", "Zayn", "Zayne", "Ze", "Zechariah", "Zeek", "Zeeshan", - "Zeid", "Zein", "Zen", "Zendel", "Zenith", "Zennon", "Zeph", "Zerah", "Zhen", "Zhi", "Zhong", "Zhuo", - "Zi", "Zidane", "Zijie", "Zinedine", "Zion", "Zishan", "Ziya", "Ziyaan", "Zohaib", "Zohair", "Zoubaeir", - "Zubair", "Zubayr", "Zuriel", "Jaime", "Jayden", "Josie", "Juliet", "Karys", "Kathleen", "Kendra", - "Keri", "Keris", "Kirstin", "Klaudia", "Luisa", "Lydia", "Maeve", "Marnie", "Miah", "Mirrin", "Nancy", - "Nia", "Nikki", "Oliwia", "Paris", "Piper", "Pippa", "Polly", "Rhona", "Safa", "Saira", "Sarah-Louise", - "Shona", "Sorcha", "Stacey", "Tessa", "Tiffany", "Verity", "Zarah", "Zoya", "Alexandria", "Alina", - "Alison", "Angela", "Arianna", "Chanel", "Chelsey", "Coral", "Corinne", "Danni", "Darci", "Dionne", - "Eliza", "Elsie", "Fatima", "Freyja", "Holli", "Jane", "Joanne", "Karina", "Katrina", "Kaylah", - "Kaylee", "Lori", "Mila", "Nikita", "Penny", "Sylvie", "Tammy", "Alexa", "Brooklyn", "Caragh", "Codie", - "Constance", "Dana", "Demi-Lee", "Emilie", "Esther", "Frankie", "Isabelle", "Jamie-Leigh", "Jessie", - "Josephine", "Kady", "Kaila", "Kerri", "Kirstie", "Lyla", "Macey", "Maisy", "Margaret", "Marie", - "Maryam", "Mercedes", "Mischa", "Rosa", "Serena", "Sian", "Tamzin", "Vanessa", "Violet", "Yasmine", - "Aisha", "Aleisha", "Ana", "Daniella", "Elsa", "Jodi", "Karly", "Leigha", "Lila", "Melanie", "Miriam", - "Regan", "Sally", "Saskia", "Simone", "Tess", "Thea", "Zainab", "Arwen", "Bonnie", "Eloise", - "Emma-Louise", "Halle", "Hana", "Honey", "Jamie-Lee", "Karla", "Leia", "Leila", "Madeline", "Neave", - "Orlaith", "Rhea", "Sarah-Jane", "Tara", "Adele", "Alannah", "Alesha", "Annabelle", "Ayla", "Becca", - "Darcie", "Ebony", "Erica", "Georgie", "Hanna", "Julie", "Kadie", "Kelly", "Kiara", "Lillie", "Mariam", - "Mikayla", "Monica", "Roisin", "Savannah", "Sky", "Zahra", "Alanna", "Caoimhe", "Chanelle", "Elisha", - "Emilia", "Iris", "Kacie", "Lia", "Maja", "Mary", "Michelle", "Tyler", "Willow", "Yasmin", "Becky", - "Billie", "Clara", "Claudia", "Cody", "Elena", "Eryn", "Georgina", "Kayley", "Kimberley", "Kira", - "Laila", "Lauryn", "Murron", "Natalia", "Ruth", "Siobhan", "Tiana", "Bethan", "Brodie", "Cameron", - "Cassie", "Harriet", "Helen", "Kathryn", "Kyra", "Mairi", "Mckenzie", "Tilly", "Zuzanna", "April", - "Christina", "Claire", "Darcey", "Fern", "Fiona", "Joanna", "Lucia", "Charli", "Jamie", "Karis", - "Mackenzie", "Marissa", "Rihanna", "Teagan", "Tiegan", "Kaitlin", "Keeley", "Leigh", "Nadia", "Alix", - "Callie", "Carrie", "Eden", "Esme", "Hazel", "Miya", "Nieve", "Sadie", "Sasha", "Sinead", "Stella", - "Ashleigh", "Jade", "Jemma", "Michaela", "Alexis", "Aoife", "Francesca", "Lisa", "Matilda", "Annabel", - "Carmen", "Eleanor", "Faye", "Kaci", "Kasey", "Kerry", "Louisa", "Macy", "Mhairi", "Rebekah", "Teigan", - "Amie", "Brogan", "Catriona", "Scarlett", "Connie", "Katelyn", "Kenzie", "Lexi", "Nicola", "Sienna", - "Abbi", "Angel", "Martha", "Anya", "Toni", "Chantelle", "Gabriella", "Lexie", "Abbey", "Bailey", - "Isobel", "Kelsie", "Maia", "Nina", "Darcy", "Lacey", "Lana", "Sofia", "Stephanie", "Ellen", "Alicia", - "Gabrielle", "Heidi", "Jorja", "Kyla", "Rhiannon", "Tegan", "Maddison", "Madeleine", "Morven", "Rowan", - "Lucie", "Milly", "Annie", "Ashley", "Ellis", "Hope", "Mirren", "Rose", "Alexandra", "Jodie", "Kacey", - "Phoebe", "Tia", "Ailsa", "Alana", "Kirsten", "Charlie", "Katy", "Lilly", "Alyssa", "Maria", "Naomi", - "Alisha", "Danielle", "Lola", "Ciara", "Elle", "Faith", "Natasha", "Katherine", "Lois", "Mollie", - "Carla", "Catherine", "Cerys", "Maisie", "Victoria", "Amelie", "Demi", "Gracie", "Carys", "Isabella", - "Leona", "Alex", "Hollie", "Sara", "Caitlyn", "Kiera", "Lara", "Kate", "Louise", "Libby", "Rhianna", - "Rosie", "Alice", "Julia", "Maya", "Natalie", "Chelsea", "Layla", "Samantha", "Heather", "Kirsty", - "Rachael", "Charley", "Imogen", "Elise", "Hayley", "Kelsey", "Kara", "Orla", "Abi", "Gemma", "Laura", - "Mya", "Bethany", "Jasmine", "Melissa", "Poppy", "Casey", "Elizabeth", "Kaitlyn", "Carly", "Abby", - "Neve", "Courtney", "Jennifer", "Sophia", "Shannon", "Georgia", "Amber", "Robyn", "Beth", "Zara", - "Amelia", "Taylor", "Daisy", "Paige", "Kayleigh", "Summer", "Madison", "Jenna", "Morgan", "Evie", - "Nicole", "Ella", "Cara", "Iona", "Eve", "Zoe", "Kayla", "Molly", "Abigail", "Charlotte", "Millie", - "Holly", "Leah", "Keira", "Lily", "Freya", "Caitlin", "Lauren", "Rachel", "Anna", "Sarah", "Ruby", - "Aimee", "Mia", "Skye", "Abbie", "Eva", "Eilidh", "Niamh", "Megan", "Brooke", "Isla", "Rebecca", "Ava", - "Grace", "Jessica", "Hannah", "Olivia", "Chloe", "Emily", "Amy", "Ellie", "Erin", "Katie", "Lucy", - "Emma", "Sophie" }; - } - - private static final String[] generateFirstNames() { - return new String[] { "AARON", "ABBIE", "ABBY", "ABEL", "ABIGAIL", "ABRAHAM", "ADA", "ADAM", "ADAN", "ADDIE", - "ADELA", "ADELAIDE", "ADELE", "ADELINE", "ADOLFO", "ADOLPH", "ADRIAN", "ADRIANA", "ADRIENNE", "AGNES", - "AGUSTIN", "AIDA", "AILEEN", "AIMEE", "AISHA", "AL", "ALAN", "ALANA", "ALBA", "ALBERT", "ALBERTA", - "ALBERTO", "ALEJANDRA", "ALEJANDRO", "ALEX", "ALEXANDER", "ALEXANDRA", "ALEXANDRIA", "ALEXIS", - "ALFONSO", "ALFRED", "ALFREDA", "ALFREDO", "ALI", "ALICE", "ALICIA", "ALINE", "ALISA", "ALISHA", - "ALISON", "ALISSA", "ALLAN", "ALLEN", "ALLENE", "ALLIE", "ALLISON", "ALLYSON", "ALMA", "ALONZO", - "ALPHONSO", "ALTA", "ALTHEA", "ALTON", "ALVARO", "ALVIN", "ALYCE", "ALYSON", "ALYSSA", "AMALIA", - "AMANDA", "AMBER", "AMELIA", "AMIE", "AMOS", "AMPARO", "AMY", "ANA", "ANASTASIA", "ANDRE", "ANDREA", - "ANDRES", "ANDREW", "ANDY", "ANGEL", "ANGELA", "ANGELIA", "ANGELICA", "ANGELINA", "ANGELINE", - "ANGELIQUE", "ANGELITA", "ANGELO", "ANGIE", "ANITA", "ANN", "ANNA", "ANNABELLE", "ANNE", "ANNETTE", - "ANNIE", "ANNMARIE", "ANTHONY", "ANTIONETTE", "ANTOINE", "ANTOINETTE", "ANTON", "ANTONIA", "ANTONIO", - "ANTONY", "APRIL", "ARACELI", "ARCHIE", "ARLENE", "ARLINE", "ARMAND", "ARMANDO", "ARNOLD", "ARRON", - "ART", "ARTHUR", "ARTURO", "ASHLEE", "ASHLEIGH", "ASHLEY", "AUBREY", "AUDRA", "AUDREY", "AUGUST", - "AUGUSTA", "AURELIA", "AURELIO", "AURORA", "AUSTIN", "AUTUMN", "AVA", "AVERY", "AVIS", "BARBARA", - "BARBRA", "BARNEY", "BARRY", "BART", "BASIL", "BEATRICE", "BEATRIZ", "BEAU", "BECKY", "BELINDA", "BEN", - "BENITA", "BENITO", "BENJAMIN", "BENNETT", "BENNIE", "BENNY", "BERNADETTE", "BERNADINE", "BERNARD", - "BERNARDO", "BERNICE", "BERNIE", "BERT", "BERTA", "BERTHA", "BERTIE", "BERYL", "BESSIE", "BETH", - "BETHANY", "BETSY", "BETTE", "BETTIE", "BETTY", "BETTYE", "BEULAH", "BEVERLEY", "BEVERLY", "BIANCA", - "BILL", "BILLIE", "BILLY", "BLAINE", "BLAIR", "BLAKE", "BLANCA", "BLANCHE", "BOB", "BOBBI", "BOBBIE", - "BOBBY", "BONITA", "BONNIE", "BOOKER", "BOYD", "BRAD", "BRADFORD", "BRADLEY", "BRADY", "BRAIN", - "BRANDEN", "BRANDI", "BRANDIE", "BRANDON", "BRANDY", "BRENDA", "BRENDAN", "BRENT", "BRET", "BRETT", - "BRIAN", "BRIANA", "BRIANNA", "BRIDGET", "BRIDGETT", "BRIDGETTE", "BRIGITTE", "BRITNEY", "BRITTANY", - "BRITTNEY", "BROCK", "BROOKE", "BRUCE", "BRUNO", "BRYAN", "BRYANT", "BRYCE", "BRYON", "BUDDY", "BUFORD", - "BURTON", "BYRON", "CAITLIN", "CALEB", "CALLIE", "CALVIN", "CAMERON", "CAMILLA", "CAMILLE", "CANDACE", - "CANDICE", "CANDY", "CARA", "CAREY", "CARISSA", "CARL", "CARLA", "CARLENE", "CARLO", "CARLOS", - "CARLTON", "CARLY", "CARMELA", "CARMELLA", "CARMELO", "CARMEN", "CAROL", "CAROLE", "CAROLINA", - "CAROLINE", "CAROLYN", "CARRIE", "CARROLL", "CARSON", "CARTER", "CARY", "CARYN", "CASANDRA", "CASEY", - "CASSANDRA", "CASSIE", "CATALINA", "CATHERINE", "CATHLEEN", "CATHRYN", "CATHY", "CECELIA", "CECIL", - "CECILE", "CECILIA", "CEDRIC", "CELESTE", "CELIA", "CELINA", "CESAR", "CHAD", "CHANDRA", "CHARITY", - "CHARLENE", "CHARLES", "CHARLEY", "CHARLIE", "CHARLOTTE", "CHARMAINE", "CHASE", "CHASITY", "CHELSEA", - "CHELSEY", "CHERI", "CHERIE", "CHERRY", "CHERYL", "CHESTER", "CHRIS", "CHRISTA", "CHRISTI", "CHRISTIAN", - "CHRISTIE", "CHRISTINA", "CHRISTINE", "CHRISTOPHER", "CHRISTY", "CHRYSTAL", "CHUCK", "CINDY", "CLAIR", - "CLAIRE", "CLARA", "CLARE", "CLARENCE", "CLARICE", "CLARISSA", "CLARK", "CLAUDE", "CLAUDETTE", - "CLAUDIA", "CLAUDINE", "CLAY", "CLAYTON", "CLEMENT", "CLEO", "CLEVELAND", "CLIFF", "CLIFFORD", - "CLIFTON", "CLINT", "CLINTON", "CLYDE", "CODY", "COLBY", "COLE", "COLEEN", "COLETTE", "COLIN", - "COLLEEN", "COLLIN", "CONCEPCION", "CONCETTA", "CONNIE", "CONRAD", "CONSTANCE", "CONSUELO", "CORA", - "COREY", "CORINA", "CORINE", "CORINNE", "CORNELIA", "CORNELIUS", "CORNELL", "CORRINE", "CORTNEY", - "CORY", "COURTNEY", "COY", "CRAIG", "CRISTINA", "CRUZ", "CRYSTAL", "CURT", "CURTIS", "CYNTHIA", "DAISY", - "DALE", "DALLAS", "DALTON", "DAMIAN", "DAMIEN", "DAMON", "DAN", "DANA", "DANE", "DANIAL", "DANIEL", - "DANIELLE", "DANNY", "DANTE", "DAPHNE", "DARCY", "DAREN", "DARIN", "DARIUS", "DARLA", "DARLENE", - "DARNELL", "DARREL", "DARRELL", "DARREN", "DARRIN", "DARRYL", "DARWIN", "DARYL", "DAVE", "DAVID", - "DAVIS", "DAWN", "DAYNA", "DEAN", "DEANA", "DEANN", "DEANNA", "DEANNE", "DEBBIE", "DEBORA", "DEBORAH", - "DEBRA", "DEE", "DEENA", "DEIDRA", "DEIDRE", "DEIRDRE", "DELBERT", "DELIA", "DELLA", "DELMAR", - "DELORES", "DELORIS", "DEMETRIUS", "DENA", "DENICE", "DENIS", "DENISE", "DENNIS", "DENNY", "DENVER", - "DEREK", "DERICK", "DERRICK", "DESIREE", "DESMOND", "DESSIE", "DEVIN", "DEVON", "DEWAYNE", "DEWEY", - "DEXTER", "DIANA", "DIANE", "DIANN", "DIANNA", "DIANNE", "DICK", "DIEGO", "DINA", "DION", "DIONNE", - "DIRK", "DIXIE", "DOLLIE", "DOLLY", "DOLORES", "DOMINGO", "DOMINIC", "DOMINICK", "DOMINIQUE", "DON", - "DONA", "DONALD", "DONNA", "DONNELL", "DONNIE", "DONNY", "DONOVAN", "DORA", "DOREEN", "DORETHA", - "DORIS", "DOROTHEA", "DOROTHY", "DORTHY", "DOUG", "DOUGLAS", "DOYLE", "DREW", "DUANE", "DUDLEY", - "DUSTIN", "DWAYNE", "DWIGHT", "DYLAN", "EARL", "EARLENE", "EARLINE", "EARNEST", "EARNESTINE", "EBONY", - "ED", "EDDIE", "EDDY", "EDGAR", "EDITH", "EDMOND", "EDMUND", "EDNA", "EDUARDO", "EDWARD", "EDWARDO", - "EDWIN", "EDWINA", "EDYTHE", "EFFIE", "EFRAIN", "EILEEN", "ELAINE", "ELBA", "ELBERT", "ELDA", "ELDON", - "ELEANOR", "ELENA", "ELI", "ELIAS", "ELIJAH", "ELINOR", "ELISA", "ELISABETH", "ELISE", "ELISHA", - "ELIZA", "ELIZABETH", "ELLA", "ELLEN", "ELLIOT", "ELLIOTT", "ELLIS", "ELMA", "ELMER", "ELNORA", - "ELOISE", "ELSA", "ELSIE", "ELTON", "ELVA", "ELVIA", "ELVIN", "ELVIRA", "ELVIS", "ELWOOD", "EMANUEL", - "EMERSON", "EMERY", "EMIL", "EMILIA", "EMILIE", "EMILIO", "EMILY", "EMMA", "EMMANUEL", "EMMETT", - "EMORY", "ENID", "ENRIQUE", "ERIC", "ERICA", "ERICK", "ERICKA", "ERIK", "ERIKA", "ERIN", "ERMA", "ERNA", - "ERNEST", "ERNESTINE", "ERNESTO", "ERNIE", "ERROL", "ERVIN", "ERWIN", "ESMERALDA", "ESPERANZA", "ESSIE", - "ESTEBAN", "ESTELA", "ESTELLA", "ESTELLE", "ESTER", "ESTHER", "ETHAN", "ETHEL", "ETTA", "EUGENE", - "EUGENIA", "EULA", "EUNICE", "EVA", "EVAN", "EVANGELINA", "EVANGELINE", "EVE", "EVELYN", "EVERETT", - "FABIAN", "FAITH", "FANNIE", "FANNY", "FAY", "FAYE", "FEDERICO", "FELECIA", "FELICIA", "FELIPE", - "FELIX", "FERN", "FERNANDO", "FIDEL", "FLETCHER", "FLORA", "FLORENCE", "FLORINE", "FLOSSIE", "FLOYD", - "FORREST", "FRAN", "FRANCES", "FRANCESCA", "FRANCINE", "FRANCIS", "FRANCISCA", "FRANCISCO", "FRANK", - "FRANKIE", "FRANKLIN", "FRED", "FREDA", "FREDDIE", "FREDDY", "FREDERIC", "FREDERICK", "FREDRICK", - "FREIDA", "FRIEDA", "GABRIEL", "GABRIELA", "GABRIELLE", "GAIL", "GALE", "GALEN", "GARLAND", "GARRETT", - "GARRY", "GARY", "GAVIN", "GAY", "GAYLA", "GAYLE", "GENA", "GENARO", "GENE", "GENEVA", "GENEVIEVE", - "GEOFFREY", "GEORGE", "GEORGETTE", "GEORGIA", "GEORGINA", "GERALD", "GERALDINE", "GERARD", "GERARDO", - "GERI", "GERMAINE", "GERMAN", "GERRY", "GERTRUDE", "GILBERT", "GILBERTO", "GILDA", "GINA", "GINGER", - "GLADYS", "GLEN", "GLENDA", "GLENN", "GLENNA", "GLORIA", "GOLDIE", "GONZALO", "GORDON", "GRACE", - "GRACIE", "GRACIELA", "GRADY", "GRAHAM", "GRANT", "GREG", "GREGG", "GREGORIO", "GREGORY", "GRETA", - "GRETCHEN", "GROVER", "GUADALUPE", "GUILLERMO", "GUS", "GUSSIE", "GUSTAVO", "GUY", "GWEN", "GWENDOLYN", - "HAL", "HALEY", "HALLIE", "HANNAH", "HANS", "HARLAN", "HARLEY", "HAROLD", "HARRIET", "HARRIETT", - "HARRIS", "HARRISON", "HARRY", "HARVEY", "HATTIE", "HAZEL", "HEATH", "HEATHER", "HECTOR", "HEIDI", - "HELEN", "HELENA", "HELENE", "HELGA", "HENRIETTA", "HENRY", "HERBERT", "HERIBERTO", "HERMAN", - "HERMINIA", "HESTER", "HILARY", "HILDA", "HILLARY", "HIRAM", "HOLLIE", "HOLLIS", "HOLLY", "HOMER", - "HOPE", "HORACE", "HOUSTON", "HOWARD", "HUBERT", "HUGH", "HUGO", "HUMBERTO", "HUNG", "HUNTER", "IAN", - "IDA", "IGNACIO", "ILA", "ILENE", "IMELDA", "IMOGENE", "INA", "INES", "INEZ", "INGRID", "IRA", "IRENE", - "IRIS", "IRMA", "IRVIN", "IRVING", "IRWIN", "ISAAC", "ISABEL", "ISABELLA", "ISABELLE", "ISAIAH", - "ISIDRO", "ISMAEL", "ISRAEL", "ISSAC", "IVA", "IVAN", "IVY", "JACK", "JACKIE", "JACKLYN", "JACKSON", - "JACLYN", "JACOB", "JACQUELINE", "JACQUELYN", "JACQUES", "JADE", "JAIME", "JAKE", "JAMAL", "JAME", - "JAMES", "JAMI", "JAMIE", "JAN", "JANA", "JANE", "JANELL", "JANELLE", "JANET", "JANETTE", "JANICE", - "JANIE", "JANINE", "JANIS", "JANNA", "JANNIE", "JARED", "JARROD", "JARVIS", "JASMIN", "JASMINE", - "JASON", "JASPER", "JAVIER", "JAY", "JAYNE", "JAYSON", "JEAN", "JEANETTE", "JEANIE", "JEANINE", - "JEANNE", "JEANNETTE", "JEANNIE", "JEANNINE", "JEFF", "JEFFERSON", "JEFFERY", "JEFFREY", "JEFFRY", - "JENIFER", "JENNA", "JENNIE", "JENNIFER", "JENNY", "JERALD", "JEREMIAH", "JEREMY", "JERI", "JERMAINE", - "JEROME", "JERRI", "JERRY", "JESS", "JESSE", "JESSICA", "JESSIE", "JESUS", "JEWEL", "JEWELL", "JILL", - "JILLIAN", "JIM", "JIMMIE", "JIMMY", "JO", "JOAN", "JOANN", "JOANNA", "JOANNE", "JOAQUIN", "JOCELYN", - "JODI", "JODIE", "JODY", "JOE", "JOEL", "JOESPH", "JOEY", "JOHANNA", "JOHN", "JOHNATHAN", "JOHNATHON", - "JOHNNIE", "JOHNNY", "JOLENE", "JON", "JONATHAN", "JONATHON", "JONI", "JORDAN", "JORGE", "JOSE", - "JOSEFA", "JOSEFINA", "JOSEPH", "JOSEPHINE", "JOSH", "JOSHUA", "JOSIE", "JOSUE", "JOY", "JOYCE", "JUAN", - "JUANA", "JUANITA", "JUDI", "JUDITH", "JUDY", "JULIA", "JULIAN", "JULIANA", "JULIANNE", "JULIE", - "JULIET", "JULIETTE", "JULIO", "JULIUS", "JUNE", "JUNIOR", "JUSTIN", "JUSTINA", "JUSTINE", "KAITLIN", - "KAITLYN", "KARA", "KAREN", "KARI", "KARIN", "KARINA", "KARL", "KARLA", "KARYN", "KASEY", "KATE", - "KATELYN", "KATHARINE", "KATHERINE", "KATHERYN", "KATHI", "KATHIE", "KATHLEEN", "KATHRINE", "KATHRYN", - "KATHY", "KATIE", "KATINA", "KATRINA", "KATY", "KAY", "KAYE", "KAYLA", "KEISHA", "KEITH", "KELLEY", - "KELLI", "KELLIE", "KELLY", "KELSEY", "KELVIN", "KEN", "KENDALL", "KENDRA", "KENDRICK", "KENNETH", - "KENNY", "KENT", "KENYA", "KERI", "KERMIT", "KERRI", "KERRY", "KEVIN", "KIM", "KIMBERLEE", "KIMBERLEY", - "KIMBERLY", "KIRBY", "KIRK", "KIRSTEN", "KITTY", "KRIS", "KRISTA", "KRISTEN", "KRISTI", "KRISTIE", - "KRISTIN", "KRISTINA", "KRISTINE", "KRISTOPHER", "KRISTY", "KRYSTAL", "KURT", "KURTIS", "KYLE", "LACEY", - "LACY", "LADONNA", "LAKEISHA", "LAKESHA", "LAKISHA", "LAMAR", "LAMONT", "LANA", "LANCE", "LANDON", - "LANE", "LARA", "LARRY", "LASHONDA", "LATANYA", "LATASHA", "LATISHA", "LATONYA", "LATOYA", "LAURA", - "LAUREL", "LAUREN", "LAURENCE", "LAURI", "LAURIE", "LAVERNE", "LAVONNE", "LAWANDA", "LAWRENCE", "LEA", - "LEAH", "LEANN", "LEANNA", "LEANNE", "LEE", "LEEANN", "LEIGH", "LEILA", "LELA", "LELAND", "LELIA", - "LENA", "LENORA", "LENORE", "LEO", "LEOLA", "LEON", "LEONA", "LEONARD", "LEONARDO", "LEONEL", "LEONOR", - "LEROY", "LESA", "LESLEY", "LESLIE", "LESSIE", "LESTER", "LETA", "LETHA", "LETICIA", "LETITIA", "LEVI", - "LEWIS", "LIBBY", "LIDIA", "LILA", "LILIA", "LILIAN", "LILIANA", "LILLIAN", "LILLIE", "LILLY", "LILY", - "LINA", "LINCOLN", "LINDA", "LINDSAY", "LINDSEY", "LINWOOD", "LIONEL", "LISA", "LIZ", "LIZA", "LIZZIE", - "LLOYD", "LOGAN", "LOIS", "LOLA", "LOLITA", "LONNIE", "LORA", "LORAINE", "LOREN", "LORENA", "LORENE", - "LORENZO", "LORETTA", "LORI", "LORIE", "LORNA", "LORRAINE", "LORRIE", "LOTTIE", "LOU", "LOUELLA", - "LOUIE", "LOUIS", "LOUISA", "LOUISE", "LOURDES", "LOWELL", "LOYD", "LUANN", "LUCAS", "LUCIA", "LUCILE", - "LUCILLE", "LUCINDA", "LUCY", "LUELLA", "LUIS", "LUISA", "LUKE", "LULA", "LUPE", "LUTHER", "LUZ", - "LYDIA", "LYLE", "LYNDA", "LYNETTE", "LYNN", "LYNNE", "LYNNETTE", "MA", "MABEL", "MABLE", "MACK", - "MADELEINE", "MADELINE", "MADELYN", "MADGE", "MAE", "MAGDALENA", "MAGGIE", "MAI", "MALCOLM", "MALINDA", - "MALLORY", "MAMIE", "MANDY", "MANUEL", "MANUELA", "MARA", "MARC", "MARCEL", "MARCELINO", "MARCELLA", - "MARCI", "MARCIA", "MARCIE", "MARCO", "MARCOS", "MARCUS", "MARCY", "MARGARET", "MARGARITA", "MARGERY", - "MARGIE", "MARGO", "MARGOT", "MARGRET", "MARGUERITE", "MARI", "MARIA", "MARIAN", "MARIANA", "MARIANNE", - "MARIANO", "MARIBEL", "MARICELA", "MARIE", "MARIETTA", "MARILYN", "MARINA", "MARIO", "MARION", "MARISA", - "MARISOL", "MARISSA", "MARITZA", "MARJORIE", "MARK", "MARLA", "MARLENE", "MARLIN", "MARLON", "MARQUITA", - "MARSHA", "MARSHALL", "MARTA", "MARTHA", "MARTIN", "MARTINA", "MARTY", "MARVA", "MARVIN", "MARY", - "MARYANN", "MARYANNE", "MARYELLEN", "MARYLOU", "MASON", "MATHEW", "MATILDA", "MATT", "MATTHEW", - "MATTIE", "MAUDE", "MAURA", "MAUREEN", "MAURICE", "MAURICIO", "MAVIS", "MAX", "MAXINE", "MAXWELL", - "MAY", "MAYNARD", "MAYRA", "MEAGAN", "MEGAN", "MEGHAN", "MELANIE", "MELBA", "MELINDA", "MELISA", - "MELISSA", "MELLISA", "MELODY", "MELVA", "MELVIN", "MERCEDES", "MEREDITH", "MERLE", "MERLIN", "MERRILL", - "MIA", "MICAH", "MICHAEL", "MICHAELA", "MICHEAL", "MICHEL", "MICHELE", "MICHELL", "MICHELLE", "MICKEY", - "MIGUEL", "MIKE", "MILAGROS", "MILDRED", "MILES", "MILLARD", "MILLICENT", "MILLIE", "MILTON", "MINA", - "MINDY", "MINERVA", "MINNIE", "MIRANDA", "MIRIAM", "MISTY", "MITCHELL", "MITZI", "MOHAMMAD", "MOISES", - "MOLLIE", "MOLLY", "MONA", "MONICA", "MONIKA", "MONIQUE", "MONROE", "MONTE", "MONTY", "MORGAN", - "MORRIS", "MOSES", "MURIEL", "MURRAY", "MYRA", "MYRNA", "MYRON", "MYRTLE", "NADIA", "NADINE", "NAN", - "NANCY", "NANETTE", "NANNIE", "NAOMI", "NATALIA", "NATALIE", "NATASHA", "NATHAN", "NATHANIEL", "NEAL", - "NED", "NEIL", "NELDA", "NELL", "NELLIE", "NELLY", "NELSON", "NESTOR", "NETTIE", "NEVA", "NICHOLAS", - "NICHOLE", "NICK", "NICKOLAS", "NICOLAS", "NICOLE", "NIKKI", "NINA", "NITA", "NOAH", "NOE", "NOEL", - "NOELLE", "NOEMI", "NOLA", "NOLAN", "NONA", "NORA", "NORBERT", "NOREEN", "NORMA", "NORMAN", "NORRIS", - "NUMBERS", "OCTAVIA", "OCTAVIO", "ODELL", "ODESSA", "OFELIA", "OLA", "OLGA", "OLIVE", "OLIVER", - "OLIVIA", "OLLIE", "OMAR", "OPAL", "OPHELIA", "ORA", "ORLANDO", "ORVILLE", "OSCAR", "OTIS", "OTTO", - "OWEN", "PABLO", "PAIGE", "PAM", "PAMALA", "PAMELA", "PANSY", "PASQUALE", "PAT", "PATRICA", "PATRICE", - "PATRICIA", "PATRICK", "PATSY", "PATTI", "PATTY", "PAUL", "PAULA", "PAULETTE", "PAULINE", "PEARL", - "PEARLIE", "PEDRO", "PEGGY", "PENELOPE", "PENNY", "PERCY", "PERRY", "PETE", "PETER", "PETRA", "PHIL", - "PHILIP", "PHILLIP", "PHOEBE", "PHYLLIS", "PIERRE", "POLLY", "PRESTON", "PRISCILLA", "QUEEN", "QUENTIN", - "QUINCY", "QUINTON", "RACHAEL", "RACHEL", "RACHELLE", "RAE", "RAFAEL", "RALPH", "RAMIRO", "RAMON", - "RAMONA", "RANDAL", "RANDALL", "RANDI", "RANDOLPH", "RANDY", "RAPHAEL", "RAQUEL", "RAUL", "RAY", - "RAYMOND", "RAYMUNDO", "REBA", "REBECCA", "REBEKAH", "REED", "REGGIE", "REGINA", "REGINALD", "RENA", - "RENAE", "RENE", "RENEE", "REUBEN", "REVA", "REX", "REYNA", "REYNALDO", "RHEA", "RHODA", "RHONDA", - "RICARDO", "RICHARD", "RICK", "RICKEY", "RICKIE", "RICKY", "RIGOBERTO", "RILEY", "RITA", "ROB", - "ROBBIE", "ROBBY", "ROBERT", "ROBERTA", "ROBERTO", "ROBIN", "ROBYN", "ROCCO", "ROCHELLE", "ROCIO", - "ROCKY", "ROD", "RODERICK", "RODGER", "RODNEY", "RODOLFO", "RODRIGO", "ROGELIO", "ROGER", "ROLAND", - "ROLANDO", "ROMAN", "ROMEO", "RON", "RONALD", "RONDA", "RONNIE", "ROOSEVELT", "RORY", "ROSA", "ROSALIA", - "ROSALIE", "ROSALIND", "ROSALINDA", "ROSALYN", "ROSANNA", "ROSANNE", "ROSARIO", "ROSCOE", "ROSE", - "ROSEANN", "ROSELLA", "ROSEMARIE", "ROSEMARY", "ROSETTA", "ROSIE", "ROSLYN", "ROSS", "ROWENA", - "ROXANNE", "ROXIE", "ROY", "ROYCE", "RUBEN", "RUBY", "RUDOLPH", "RUDY", "RUFUS", "RUSSEL", "RUSSELL", - "RUSTY", "RUTH", "RUTHIE", "RYAN", "SABRINA", "SADIE", "SALLIE", "SALLY", "SALVADOR", "SALVATORE", - "SAM", "SAMANTHA", "SAMMIE", "SAMMY", "SAMUEL", "SANDRA", "SANDY", "SANFORD", "SANTIAGO", "SANTOS", - "SARA", "SARAH", "SASHA", "SAUL", "SAUNDRA", "SAVANNAH", "SCOT", "SCOTT", "SCOTTY", "SEAN", "SEBASTIAN", - "SELENA", "SELINA", "SELMA", "SERENA", "SERGIO", "SETH", "SHANA", "SHANE", "SHANNA", "SHANNON", "SHARI", - "SHARLENE", "SHARON", "SHARRON", "SHAUN", "SHAUNA", "SHAWN", "SHAWNA", "SHEENA", "SHEILA", "SHELBY", - "SHELDON", "SHELIA", "SHELLEY", "SHELLY", "SHELTON", "SHEREE", "SHERI", "SHERMAN", "SHERRI", "SHERRIE", - "SHERRY", "SHERYL", "SHIRLEY", "SIDNEY", "SIERRA", "SILAS", "SILVIA", "SIMON", "SIMONE", "SOCORRO", - "SOFIA", "SOLOMON", "SON", "SONDRA", "SONIA", "SONJA", "SONNY", "SONYA", "SOPHIA", "SOPHIE", "SPENCER", - "STACEY", "STACI", "STACIE", "STACY", "STAN", "STANLEY", "STEFAN", "STEFANIE", "STELLA", "STEPHAN", - "STEPHANIE", "STEPHEN", "STERLING", "STEVE", "STEVEN", "STEWART", "STUART", "SUE", "SUMMER", "SUSAN", - "SUSANA", "SUSANNA", "SUSANNE", "SUSIE", "SUZANNE", "SUZETTE", "SYBIL", "SYDNEY", "SYLVESTER", "SYLVIA", - "TABATHA", "TABITHA", "TAMARA", "TAMEKA", "TAMERA", "TAMI", "TAMIKA", "TAMMI", "TAMMIE", "TAMMY", - "TAMRA", "TANIA", "TANISHA", "TANYA", "TARA", "TASHA", "TAYLOR", "TED", "TEDDY", "TERENCE", "TERESA", - "TERI", "TERRA", "TERRANCE", "TERRELL", "TERRENCE", "TERRI", "TERRIE", "TERRY", "TESSA", "THADDEUS", - "THELMA", "THEODORE", "THERESA", "THERESE", "THERON", "THOMAS", "THURMAN", "TIA", "TIFFANY", "TIM", - "TIMMY", "TIMOTHY", "TINA", "TISHA", "TOBY", "TODD", "TOM", "TOMAS", "TOMMIE", "TOMMY", "TONI", "TONIA", - "TONY", "TONYA", "TORI", "TRACEY", "TRACI", "TRACIE", "TRACY", "TRAVIS", "TRENT", "TRENTON", "TREVOR", - "TRICIA", "TRINA", "TRISHA", "TRISTAN", "TROY", "TRUDY", "TRUMAN", "TWILA", "TY", "TYLER", "TYRONE", - "TYSON", "ULYSSES", "URSULA", "VALARIE", "VALERIA", "VALERIE", "VAN", "VANCE", "VANESSA", "VAUGHN", - "VELMA", "VERA", "VERN", "VERNA", "VERNON", "VERONICA", "VICENTE", "VICKI", "VICKIE", "VICKY", "VICTOR", - "VICTORIA", "VILMA", "VINCE", "VINCENT", "VIOLA", "VIOLET", "VIRGIE", "VIRGIL", "VIRGINIA", "VITO", - "VIVIAN", "VONDA", "WADE", "WALLACE", "WALTER", "WANDA", "WARD", "WARREN", "WAYNE", "WELDON", "WENDELL", - "WENDI", "WENDY", "WESLEY", "WHITNEY", "WILBERT", "WILBUR", "WILDA", "WILEY", "WILFORD", "WILFRED", - "WILFREDO", "WILL", "WILLA", "WILLARD", "WILLIAM", "WILLIAMS", "WILLIE", "WILLIS", "WILMA", "WILMER", - "WILSON", "WINFRED", "WINIFRED", "WINNIE", "WINSTON", "WM", "WOODROW", "XAVIER", "YESENIA", "YOLANDA", - "YOUNG", "YVETTE", "YVONNE", "ZACHARY", "ZACHERY", "ZELDA", "ZELMA" }; - } - - private static final String[] generateLastNames() { - return new String[] { "AARON", "ABBOTT", "ABEL", "ABELL", "ABERNATHY", "ABNER", "ABNEY", "ABRAHAM", "ABRAMS", - "ABREU", "ACEVEDO", "ACKER", "ACKERMAN", "ACKLEY", "ACOSTA", "ACUNA", "ADAIR", "ADAM", "ADAME", "ADAMS", - "ADAMSON", "ADCOCK", "ADDISON", "ADKINS", "ADLER", "AGEE", "AGNEW", "AGUAYO", "AGUIAR", "AGUILAR", - "AGUILERA", "AGUIRRE", "AHERN", "AHMAD", "AHMED", "AHRENS", "AIELLO", "AIKEN", "AINSWORTH", "AKERS", - "AKIN", "AKINS", "ALANIZ", "ALARCON", "ALBA", "ALBERS", "ALBERT", "ALBERTSON", "ALBRECHT", "ALBRIGHT", - "ALCALA", "ALCORN", "ALDERMAN", "ALDRICH", "ALDRIDGE", "ALEMAN", "ALEXANDER", "ALFARO", "ALFONSO", - "ALFORD", "ALFRED", "ALGER", "ALI", "ALICEA", "ALLAN", "ALLARD", "ALLEN", "ALLEY", "ALLISON", "ALLMAN", - "ALLRED", "ALMANZA", "ALMEIDA", "ALMOND", "ALONSO", "ALONZO", "ALSTON", "ALTMAN", "ALVARADO", "ALVAREZ", - "ALVES", "AMADOR", "AMARAL", "AMATO", "AMAYA", "AMBROSE", "AMES", "AMMONS", "AMOS", "AMUNDSON", "ANAYA", - "ANDERS", "ANDERSEN", "ANDERSON", "ANDRADE", "ANDRE", "ANDRES", "ANDREW", "ANDREWS", "ANDRUS", "ANGEL", - "ANGELO", "ANGLIN", "ANGULO", "ANTHONY", "ANTOINE", "ANTONIO", "APODACA", "APONTE", "APPEL", "APPLE", - "APPLEGATE", "APPLETON", "AQUINO", "ARAGON", "ARANDA", "ARAUJO", "ARCE", "ARCHER", "ARCHIBALD", - "ARCHIE", "ARCHULETA", "ARELLANO", "AREVALO", "ARIAS", "ARMENTA", "ARMIJO", "ARMSTEAD", "ARMSTRONG", - "ARNDT", "ARNETT", "ARNOLD", "ARREDONDO", "ARREOLA", "ARRIAGA", "ARRINGTON", "ARROYO", "ARSENAULT", - "ARTEAGA", "ARTHUR", "ARTIS", "ASBURY", "ASH", "ASHBY", "ASHCRAFT", "ASHE", "ASHER", "ASHFORD", - "ASHLEY", "ASHMORE", "ASHTON", "ASHWORTH", "ASKEW", "ATCHISON", "ATHERTON", "ATKINS", "ATKINSON", - "ATWELL", "ATWOOD", "AUGUST", "AUGUSTINE", "AULT", "AUSTIN", "AUTRY", "AVALOS", "AVERY", "AVILA", - "AVILES", "AYALA", "AYERS", "AYRES", "BABB", "BABCOCK", "BABIN", "BACA", "BACH", "BACHMAN", "BACK", - "BACON", "BADER", "BADGER", "BADILLO", "BAER", "BAEZ", "BAGGETT", "BAGLEY", "BAGWELL", "BAILEY", "BAIN", - "BAINES", "BAIR", "BAIRD", "BAKER", "BALDERAS", "BALDWIN", "BALES", "BALL", "BALLARD", "BANDA", "BANDY", - "BANKS", "BANKSTON", "BANNISTER", "BANUELOS", "BAPTISTE", "BARAJAS", "BARBA", "BARBEE", "BARBER", - "BARBOSA", "BARBOUR", "BARCLAY", "BARDEN", "BARELA", "BARFIELD", "BARGER", "BARHAM", "BARKER", - "BARKLEY", "BARKSDALE", "BARLOW", "BARNARD", "BARNES", "BARNETT", "BARNETTE", "BARNEY", "BARNHART", - "BARNHILL", "BARON", "BARONE", "BARR", "BARRAZA", "BARRERA", "BARRETO", "BARRETT", "BARRIENTOS", - "BARRIOS", "BARRON", "BARROW", "BARROWS", "BARRY", "BARTELS", "BARTH", "BARTHOLOMEW", "BARTLETT", - "BARTLEY", "BARTON", "BASHAM", "BASKIN", "BASS", "BASSETT", "BATCHELOR", "BATEMAN", "BATES", "BATISTA", - "BATISTE", "BATSON", "BATTAGLIA", "BATTEN", "BATTLE", "BATTLES", "BATTS", "BAUER", "BAUGH", "BAUGHMAN", - "BAUM", "BAUMAN", "BAUMANN", "BAUMGARDNER", "BAUMGARTNER", "BAUTISTA", "BAXLEY", "BAXTER", "BAYER", - "BAYLOR", "BAYNE", "BAYS", "BEACH", "BEAL", "BEALE", "BEALL", "BEALS", "BEAM", "BEAMON", "BEAN", - "BEANE", "BEAR", "BEARD", "BEARDEN", "BEASLEY", "BEATTIE", "BEATTY", "BEATY", "BEAUCHAMP", "BEAUDOIN", - "BEAULIEU", "BEAUREGARD", "BEAVER", "BEAVERS", "BECERRA", "BECK", "BECKER", "BECKETT", "BECKHAM", - "BECKMAN", "BECKWITH", "BECNEL", "BEDARD", "BEDFORD", "BEEBE", "BEELER", "BEERS", "BEESON", "BEGAY", - "BEGLEY", "BEHRENS", "BELANGER", "BELCHER", "BELL", "BELLAMY", "BELLO", "BELT", "BELTON", "BELTRAN", - "BENAVIDES", "BENAVIDEZ", "BENDER", "BENEDICT", "BENEFIELD", "BENITEZ", "BENJAMIN", "BENNER", "BENNETT", - "BENOIT", "BENSON", "BENTLEY", "BENTON", "BERG", "BERGER", "BERGERON", "BERGMAN", "BERGSTROM", "BERLIN", - "BERMAN", "BERMUDEZ", "BERNAL", "BERNARD", "BERNHARDT", "BERNIER", "BERNSTEIN", "BERRIOS", "BERRY", - "BERRYMAN", "BERTRAM", "BERTRAND", "BERUBE", "BESS", "BEST", "BETANCOURT", "BETHEA", "BETHEL", "BETTS", - "BETZ", "BEVERLY", "BEVINS", "BEYER", "BIBLE", "BICKFORD", "BIDDLE", "BIGELOW", "BIGGS", "BILLINGS", - "BILLINGSLEY", "BILLIOT", "BILLS", "BILLUPS", "BILODEAU", "BINDER", "BINGHAM", "BINKLEY", "BIRCH", - "BIRD", "BISHOP", "BISSON", "BITTNER", "BIVENS", "BIVINS", "BLACK", "BLACKBURN", "BLACKMAN", "BLACKMON", - "BLACKWELL", "BLACKWOOD", "BLAINE", "BLAIR", "BLAIS", "BLAKE", "BLAKELY", "BLALOCK", "BLANCHARD", - "BLANCHETTE", "BLANCO", "BLAND", "BLANK", "BLANKENSHIP", "BLANTON", "BLAYLOCK", "BLEDSOE", "BLEVINS", - "BLISS", "BLOCK", "BLOCKER", "BLODGETT", "BLOOM", "BLOUNT", "BLUE", "BLUM", "BLUNT", "BLYTHE", - "BOATRIGHT", "BOATWRIGHT", "BOBBITT", "BOBO", "BOCK", "BOEHM", "BOETTCHER", "BOGAN", "BOGGS", - "BOHANNON", "BOHN", "BOISVERT", "BOLAND", "BOLDEN", "BOLDUC", "BOLEN", "BOLES", "BOLIN", "BOLING", - "BOLLING", "BOLLINGER", "BOLT", "BOLTON", "BOND", "BONDS", "BONE", "BONILLA", "BONNER", "BOOKER", - "BOONE", "BOOTH", "BOOTHE", "BORDELON", "BORDEN", "BORDERS", "BOREN", "BORGES", "BORREGO", "BOSS", - "BOSTIC", "BOSTICK", "BOSTON", "BOSWELL", "BOTTOMS", "BOUCHARD", "BOUCHER", "BOUDREAU", "BOUDREAUX", - "BOUNDS", "BOURGEOIS", "BOURNE", "BOURQUE", "BOWDEN", "BOWEN", "BOWENS", "BOWER", "BOWERS", "BOWIE", - "BOWLES", "BOWLIN", "BOWLING", "BOWMAN", "BOWSER", "BOX", "BOYCE", "BOYD", "BOYER", "BOYKIN", "BOYLE", - "BOYLES", "BOYNTON", "BOZEMAN", "BRACKEN", "BRACKETT", "BRADBURY", "BRADEN", "BRADFORD", "BRADLEY", - "BRADSHAW", "BRADY", "BRAGG", "BRANCH", "BRAND", "BRANDENBURG", "BRANDON", "BRANDT", "BRANHAM", - "BRANNON", "BRANSON", "BRANT", "BRANTLEY", "BRASWELL", "BRATCHER", "BRATTON", "BRAUN", "BRAVO", - "BRAXTON", "BRAY", "BRAZIL", "BREAUX", "BREEDEN", "BREEDLOVE", "BREEN", "BRENNAN", "BRENNER", "BRENT", - "BREWER", "BREWSTER", "BRICE", "BRIDGES", "BRIGGS", "BRIGHT", "BRILEY", "BRILL", "BRIM", "BRINK", - "BRINKLEY", "BRINKMAN", "BRINSON", "BRIONES", "BRISCOE", "BRISENO", "BRITO", "BRITT", "BRITTAIN", - "BRITTON", "BROADNAX", "BROADWAY", "BROCK", "BROCKMAN", "BRODERICK", "BRODY", "BROGAN", "BRONSON", - "BROOKINS", "BROOKS", "BROOME", "BROTHERS", "BROUGHTON", "BROUSSARD", "BROWDER", "BROWER", "BROWN", - "BROWNE", "BROWNELL", "BROWNING", "BROWNLEE", "BROYLES", "BRUBAKER", "BRUCE", "BRUMFIELD", "BRUNER", - "BRUNNER", "BRUNO", "BRUNS", "BRUNSON", "BRUTON", "BRYAN", "BRYANT", "BRYSON", "BUCHANAN", "BUCHER", - "BUCK", "BUCKINGHAM", "BUCKLEY", "BUCKNER", "BUENO", "BUFFINGTON", "BUFORD", "BUI", "BULL", "BULLARD", - "BULLOCK", "BUMGARNER", "BUNCH", "BUNDY", "BUNKER", "BUNN", "BUNNELL", "BUNTING", "BURCH", "BURCHETT", - "BURCHFIELD", "BURDEN", "BURDETTE", "BURDICK", "BURGE", "BURGER", "BURGESS", "BURGOS", "BURK", "BURKE", - "BURKETT", "BURKHART", "BURKHOLDER", "BURKS", "BURLESON", "BURLEY", "BURNETT", "BURNETTE", "BURNEY", - "BURNHAM", "BURNS", "BURNSIDE", "BURR", "BURRELL", "BURRIS", "BURROUGHS", "BURROW", "BURROWS", "BURT", - "BURTON", "BUSBY", "BUSCH", "BUSH", "BUSS", "BUSSEY", "BUSTAMANTE", "BUSTOS", "BUTCHER", "BUTLER", - "BUTTERFIELD", "BUTTON", "BUTTS", "BUXTON", "BYARS", "BYERS", "BYNUM", "BYRD", "BYRNE", "BYRNES", - "CABALLERO", "CABAN", "CABLE", "CABRAL", "CABRERA", "CADE", "CADY", "CAGLE", "CAHILL", "CAIN", - "CALABRESE", "CALDERON", "CALDWELL", "CALHOUN", "CALKINS", "CALL", "CALLAGHAN", "CALLAHAN", "CALLAWAY", - "CALLENDER", "CALLOWAY", "CALVERT", "CALVIN", "CAMACHO", "CAMARILLO", "CAMBELL", "CAMERON", "CAMP", - "CAMPBELL", "CAMPOS", "CANADA", "CANADY", "CANALES", "CANDELARIA", "CANFIELD", "CANNON", "CANO", - "CANTRELL", "CANTU", "CANTWELL", "CANTY", "CAPPS", "CARABALLO", "CARAWAY", "CARBAJAL", "CARBONE", - "CARD", "CARDEN", "CARDENAS", "CARDER", "CARDONA", "CARDOZA", "CARDWELL", "CAREY", "CARL", "CARLIN", - "CARLISLE", "CARLOS", "CARLSON", "CARLTON", "CARMAN", "CARMICHAEL", "CARMONA", "CARNAHAN", "CARNES", - "CARNEY", "CARO", "CARON", "CARPENTER", "CARR", "CARRANZA", "CARRASCO", "CARRERA", "CARRICO", "CARRIER", - "CARRILLO", "CARRINGTON", "CARRION", "CARROLL", "CARSON", "CARSWELL", "CARTER", "CARTWRIGHT", "CARUSO", - "CARVALHO", "CARVER", "CARY", "CASAS", "CASE", "CASEY", "CASH", "CASILLAS", "CASKEY", "CASON", "CASPER", - "CASS", "CASSELL", "CASSIDY", "CASTANEDA", "CASTEEL", "CASTELLANO", "CASTELLANOS", "CASTILLO", "CASTLE", - "CASTLEBERRY", "CASTRO", "CASWELL", "CATALANO", "CATES", "CATHEY", "CATO", "CATRON", "CAUDILL", - "CAUDLE", "CAUSEY", "CAVANAUGH", "CAVAZOS", "CAVE", "CECIL", "CENTENO", "CERDA", "CERVANTES", "CHACON", - "CHADWICK", "CHAFFIN", "CHALMERS", "CHAMBERLAIN", "CHAMBERLIN", "CHAMBERS", "CHAMBLISS", "CHAMPAGNE", - "CHAMPION", "CHAN", "CHANCE", "CHANDLER", "CHANEY", "CHANG", "CHAPA", "CHAPIN", "CHAPMAN", "CHAPPELL", - "CHARLES", "CHARLTON", "CHASE", "CHASTAIN", "CHATMAN", "CHAU", "CHAVARRIA", "CHAVES", "CHAVEZ", - "CHAVIS", "CHEATHAM", "CHEEK", "CHEN", "CHENEY", "CHENG", "CHERRY", "CHESSER", "CHESTER", "CHESTNUT", - "CHEUNG", "CHEW", "CHILD", "CHILDERS", "CHILDRESS", "CHILDS", "CHILTON", "CHIN", "CHISHOLM", "CHISM", - "CHISOLM", "CHITWOOD", "CHO", "CHOATE", "CHOI", "CHONG", "CHOW", "CHRISTENSEN", "CHRISTENSON", - "CHRISTIAN", "CHRISTIANSEN", "CHRISTIANSON", "CHRISTIE", "CHRISTMAN", "CHRISTMAS", "CHRISTOPHER", - "CHRISTY", "CHU", "CHUN", "CHUNG", "CHURCH", "CHURCHILL", "CINTRON", "CISNEROS", "CLANCY", "CLANTON", - "CLAPP", "CLARK", "CLARKE", "CLARKSON", "CLARY", "CLAUSEN", "CLAWSON", "CLAY", "CLAYTON", "CLEARY", - "CLEGG", "CLEM", "CLEMENS", "CLEMENT", "CLEMENTS", "CLEMMONS", "CLEMONS", "CLEVELAND", "CLEVENGER", - "CLICK", "CLIFFORD", "CLIFTON", "CLINE", "CLINTON", "CLOSE", "CLOUD", "CLOUGH", "CLOUTIER", "COATES", - "COATS", "COBB", "COBBS", "COBLE", "COBURN", "COCHRAN", "COCHRANE", "COCKRELL", "CODY", "COE", "COFFEY", - "COFFIN", "COFFMAN", "COGGINS", "COHEN", "COHN", "COKER", "COLBERT", "COLBURN", "COLBY", "COLE", - "COLEMAN", "COLES", "COLEY", "COLLADO", "COLLAZO", "COLLEY", "COLLIER", "COLLINS", "COLON", "COLSON", - "COLVIN", "COLWELL", "COMBS", "COMEAUX", "COMER", "COMPTON", "COMSTOCK", "CONAWAY", "CONCEPCION", - "CONDON", "CONE", "CONGER", "CONKLIN", "CONLEY", "CONN", "CONNELL", "CONNELLY", "CONNER", "CONNERS", - "CONNOLLY", "CONNOR", "CONNORS", "CONOVER", "CONRAD", "CONROY", "CONTE", "CONTI", "CONTRERAS", "CONWAY", - "CONYERS", "COOK", "COOKE", "COOKS", "COOKSEY", "COOLEY", "COOMBS", "COON", "COONEY", "COONS", "COOPER", - "COPE", "COPELAND", "COPLEY", "COPPOLA", "CORBETT", "CORBIN", "CORBITT", "CORCORAN", "CORDELL", - "CORDERO", "CORDOVA", "COREY", "CORLEY", "CORMIER", "CORNELIUS", "CORNELL", "CORNETT", "CORNISH", - "CORNWELL", "CORONA", "CORONADO", "CORRAL", "CORREA", "CORREIA", "CORRIGAN", "CORTES", "CORTEZ", - "CORWIN", "COSBY", "COSGROVE", "COSTA", "COSTELLO", "COTA", "COTE", "COTHRAN", "COTTER", "COTTON", - "COTTRELL", "COUCH", "COUGHLIN", "COULTER", "COUNCIL", "COUNTS", "COURTNEY", "COUSINS", "COUTURE", - "COVERT", "COVEY", "COVINGTON", "COWAN", "COWARD", "COWART", "COWELL", "COWLES", "COWLEY", "COX", "COY", - "COYLE", "COYNE", "CRABTREE", "CRADDOCK", "CRAFT", "CRAIG", "CRAIN", "CRAMER", "CRANDALL", "CRANE", - "CRANFORD", "CRAVEN", "CRAWFORD", "CRAWLEY", "CRAYTON", "CREAMER", "CREECH", "CREEL", "CREIGHTON", - "CRENSHAW", "CRESPO", "CREWS", "CRIDER", "CRISP", "CRIST", "CRISWELL", "CRITTENDEN", "CROCKER", - "CROCKETT", "CROFT", "CROMER", "CROMWELL", "CRONIN", "CROOK", "CROOKS", "CROSBY", "CROSS", "CROTEAU", - "CROUCH", "CROUSE", "CROW", "CROWDER", "CROWE", "CROWELL", "CROWLEY", "CRUM", "CRUMP", "CRUSE", - "CRUTCHER", "CRUTCHFIELD", "CRUZ", "CUELLAR", "CUEVAS", "CULBERTSON", "CULLEN", "CULP", "CULPEPPER", - "CULVER", "CUMMINGS", "CUMMINS", "CUNNINGHAM", "CUPP", "CURLEY", "CURRAN", "CURRIE", "CURRIER", "CURRY", - "CURTIN", "CURTIS", "CUSHMAN", "CUSTER", "CUTLER", "CYR", "DABNEY", "DAHL", "DAIGLE", "DAILEY", "DAILY", - "DALE", "DALEY", "DALLAS", "DALTON", "DALY", "DAMICO", "DAMON", "DAMRON", "DANCY", "DANG", "DANGELO", - "DANIEL", "DANIELS", "DANIELSON", "DANNER", "DARBY", "DARDEN", "DARLING", "DARNELL", "DASILVA", - "DAUGHERTY", "DAUGHTRY", "DAVENPORT", "DAVID", "DAVIDSON", "DAVIES", "DAVILA", "DAVIS", "DAVISON", - "DAWKINS", "DAWSON", "DAY", "DAYTON", "DEAL", "DEAN", "DEATON", "DEBERRY", "DECKER", "DEES", "DEHART", - "DEJESUS", "DELACRUZ", "DELAGARZA", "DELANEY", "DELAROSA", "DELATORRE", "DELEON", "DELGADILLO", - "DELGADO", "DELL", "DELLINGER", "DELOACH", "DELONG", "DELOSSANTOS", "DELUCA", "DELVALLE", "DEMARCO", - "DEMERS", "DEMPSEY", "DENHAM", "DENNEY", "DENNING", "DENNIS", "DENNISON", "DENNY", "DENSON", "DENT", - "DENTON", "DEROSA", "DERR", "DERRICK", "DESANTIS", "DESIMONE", "DEVINE", "DEVITO", "DEVLIN", "DEVORE", - "DEVRIES", "DEW", "DEWEY", "DEWITT", "DEXTER", "DIAL", "DIAMOND", "DIAS", "DIAZ", "DICK", "DICKENS", - "DICKERSON", "DICKEY", "DICKINSON", "DICKSON", "DIEHL", "DIETRICH", "DIETZ", "DIGGS", "DILL", "DILLARD", - "DILLON", "DINKINS", "DION", "DIX", "DIXON", "DO", "DOAN", "DOBBINS", "DOBBS", "DOBSON", "DOCKERY", - "DODD", "DODDS", "DODGE", "DODSON", "DOE", "DOHERTY", "DOLAN", "DOLL", "DOLLAR", "DOMINGO", "DOMINGUEZ", - "DOMINQUEZ", "DONAHUE", "DONALD", "DONALDSON", "DONATO", "DONNELL", "DONNELLY", "DONOHUE", "DONOVAN", - "DOOLEY", "DOOLITTLE", "DORAN", "DORMAN", "DORN", "DORRIS", "DORSEY", "DORTCH", "DOSS", "DOTSON", - "DOTY", "DOUCETTE", "DOUGHERTY", "DOUGHTY", "DOUGLAS", "DOUGLASS", "DOVE", "DOVER", "DOW", "DOWD", - "DOWDY", "DOWELL", "DOWLING", "DOWNEY", "DOWNING", "DOWNS", "DOYLE", "DOZIER", "DRAKE", "DRAPER", - "DRAYTON", "DREW", "DRISCOLL", "DRIVER", "DRUMMOND", "DRURY", "DUARTE", "DUBE", "DUBOIS", "DUBOSE", - "DUCKETT", "DUCKWORTH", "DUDLEY", "DUFF", "DUFFY", "DUGAN", "DUGAS", "DUGGAN", "DUGGER", "DUKE", - "DUKES", "DUMAS", "DUMONT", "DUNAWAY", "DUNBAR", "DUNCAN", "DUNHAM", "DUNLAP", "DUNN", "DUNNE", - "DUNNING", "DUONG", "DUPONT", "DUPRE", "DUPREE", "DUPUIS", "DURAN", "DURAND", "DURANT", "DURBIN", - "DURDEN", "DURHAM", "DURKIN", "DURR", "DUTTON", "DUVAL", "DUVALL", "DWYER", "DYE", "DYER", "DYKES", - "DYSON", "EAGLE", "EARL", "EARLE", "EARLEY", "EARLS", "EARLY", "EARNEST", "EASLEY", "EASON", "EAST", - "EASTER", "EASTERLING", "EASTMAN", "EASTON", "EATON", "EAVES", "EBERT", "ECHEVARRIA", "ECHOLS", - "ECKERT", "EDDY", "EDGAR", "EDGE", "EDMOND", "EDMONDS", "EDMONDSON", "EDWARD", "EDWARDS", "EGAN", - "EGGLESTON", "ELAM", "ELDER", "ELDRIDGE", "ELIAS", "ELIZONDO", "ELKINS", "ELLER", "ELLINGTON", "ELLIOT", - "ELLIOTT", "ELLIS", "ELLISON", "ELLSWORTH", "ELMORE", "ELROD", "ELSTON", "ELY", "EMANUEL", "EMBRY", - "EMERSON", "EMERY", "EMMONS", "ENG", "ENGEL", "ENGLAND", "ENGLE", "ENGLISH", "ENNIS", "ENOS", "ENRIGHT", - "ENRIQUEZ", "EPPERSON", "EPPS", "EPSTEIN", "ERDMANN", "ERICKSON", "ERNST", "ERVIN", "ERWIN", - "ESCALANTE", "ESCAMILLA", "ESCOBAR", "ESCOBEDO", "ESPARZA", "ESPINAL", "ESPINO", "ESPINOSA", "ESPINOZA", - "ESPOSITO", "ESQUIVEL", "ESTEP", "ESTES", "ESTRADA", "ESTRELLA", "ETHERIDGE", "ETHRIDGE", "EUBANKS", - "EVANS", "EVERETT", "EVERHART", "EVERS", "EVERSON", "EWING", "EZELL", "FABER", "FABIAN", "FAGAN", - "FAHEY", "FAIN", "FAIR", "FAIRBANKS", "FAIRCHILD", "FAIRLEY", "FAISON", "FAJARDO", "FALCON", "FALK", - "FALLON", "FALLS", "FANNING", "FARIAS", "FARLEY", "FARMER", "FARNSWORTH", "FARR", "FARRAR", "FARRELL", - "FARRINGTON", "FARRIS", "FARROW", "FAULK", "FAULKNER", "FAUST", "FAY", "FEENEY", "FELDER", "FELDMAN", - "FELICIANO", "FELIX", "FELLOWS", "FELTON", "FELTS", "FENNELL", "FENNER", "FENTON", "FERGUSON", - "FERNANDES", "FERNANDEZ", "FERRARA", "FERRARI", "FERRARO", "FERREIRA", "FERRELL", "FERRER", "FERRIS", - "FERRY", "FIELD", "FIELDER", "FIELDS", "FIERRO", "FIFE", "FIGUEROA", "FINCH", "FINCHER", "FINDLEY", - "FINE", "FINK", "FINLEY", "FINN", "FINNEGAN", "FINNEY", "FIORE", "FISCHER", "FISH", "FISHER", "FISHMAN", - "FISK", "FITCH", "FITE", "FITTS", "FITZGERALD", "FITZPATRICK", "FITZSIMMONS", "FLAGG", "FLAHERTY", - "FLANAGAN", "FLANDERS", "FLANIGAN", "FLANNERY", "FLECK", "FLEMING", "FLEMMING", "FLETCHER", "FLINT", - "FLOOD", "FLORA", "FLORENCE", "FLORES", "FLOREZ", "FLOURNOY", "FLOWERS", "FLOYD", "FLYNN", "FOGARTY", - "FOGG", "FOGLE", "FOLEY", "FOLSE", "FOLSOM", "FOLTZ", "FONG", "FONSECA", "FONTAINE", "FONTENOT", - "FOOTE", "FORBES", "FORD", "FOREMAN", "FOREST", "FORET", "FORMAN", "FORNEY", "FORREST", "FORRESTER", - "FORSTER", "FORSYTH", "FORSYTHE", "FORT", "FORTE", "FORTENBERRY", "FORTIER", "FORTIN", "FORTNER", - "FORTUNE", "FOSS", "FOSTER", "FOUNTAIN", "FOURNIER", "FOUST", "FOWLER", "FOX", "FOY", "FRALEY", "FRAME", - "FRANCE", "FRANCIS", "FRANCISCO", "FRANCO", "FRANCOIS", "FRANK", "FRANKLIN", "FRANKS", "FRANTZ", - "FRANZ", "FRASER", "FRASIER", "FRAZER", "FRAZIER", "FREDERICK", "FREDERICKS", "FREDRICK", "FREDRICKSON", - "FREE", "FREED", "FREEDMAN", "FREEMAN", "FREESE", "FREITAS", "FRENCH", "FREUND", "FREY", "FRIAS", - "FRICK", "FRIEDMAN", "FRIEND", "FRIERSON", "FRIES", "FRITZ", "FRIZZELL", "FROST", "FRY", "FRYE", - "FRYER", "FUCHS", "FUENTES", "FUGATE", "FULCHER", "FULLER", "FULLERTON", "FULMER", "FULTON", "FULTZ", - "FUNDERBURK", "FUNK", "FUQUA", "FURMAN", "FURR", "FUSCO", "GABLE", "GABRIEL", "GADDIS", "GADDY", - "GAFFNEY", "GAGE", "GAGNE", "GAGNON", "GAINES", "GAINEY", "GAITHER", "GALARZA", "GALBRAITH", "GALE", - "GALINDO", "GALLAGHER", "GALLANT", "GALLARDO", "GALLEGOS", "GALLO", "GALLOWAY", "GALVAN", "GALVEZ", - "GALVIN", "GAMBLE", "GAMBOA", "GAMEZ", "GANDY", "GANN", "GANNON", "GANT", "GANTT", "GARAY", "GARBER", - "GARCIA", "GARDINER", "GARDNER", "GARLAND", "GARMON", "GARNER", "GARNETT", "GARRETT", "GARRIS", - "GARRISON", "GARVEY", "GARVIN", "GARY", "GARZA", "GASKIN", "GASKINS", "GASS", "GASTON", "GATES", - "GATEWOOD", "GATLIN", "GAULT", "GAUTHIER", "GAVIN", "GAY", "GAYLORD", "GEARY", "GEE", "GEER", "GEIGER", - "GENTILE", "GENTRY", "GEORGE", "GERALD", "GERARD", "GERBER", "GERMAN", "GETZ", "GIBBONS", "GIBBS", - "GIBSON", "GIFFORD", "GIL", "GILBERT", "GILBERTSON", "GILBREATH", "GILCHRIST", "GILES", "GILL", - "GILLEN", "GILLESPIE", "GILLETTE", "GILLEY", "GILLIAM", "GILLILAND", "GILLIS", "GILMAN", "GILMER", - "GILMORE", "GILSON", "GINN", "GIORDANO", "GIPSON", "GIRARD", "GIRON", "GIROUX", "GIST", "GIVENS", - "GLADDEN", "GLADNEY", "GLASER", "GLASGOW", "GLASS", "GLAZE", "GLEASON", "GLENN", "GLOVER", "GLYNN", - "GOAD", "GOBLE", "GODDARD", "GODFREY", "GODINEZ", "GODWIN", "GOEBEL", "GOETZ", "GOFF", "GOFORTH", - "GOINS", "GOLD", "GOLDBERG", "GOLDEN", "GOLDMAN", "GOLDSMITH", "GOLDSTEIN", "GOMES", "GOMEZ", - "GONSALVES", "GONZALES", "GONZALEZ", "GOOCH", "GOOD", "GOODE", "GOODEN", "GOODIN", "GOODING", "GOODMAN", - "GOODRICH", "GOODSON", "GOODWIN", "GOOLSBY", "GORDON", "GORE", "GORHAM", "GORMAN", "GOSS", "GOSSETT", - "GOUGH", "GOULD", "GOULET", "GRACE", "GRACIA", "GRADY", "GRAF", "GRAFF", "GRAGG", "GRAHAM", "GRANADOS", - "GRANGER", "GRANT", "GRANTHAM", "GRAVES", "GRAY", "GRAYSON", "GREATHOUSE", "GRECO", "GREEN", - "GREENBERG", "GREENE", "GREENFIELD", "GREENLEE", "GREENWOOD", "GREER", "GREGG", "GREGORY", "GREINER", - "GRENIER", "GRESHAM", "GREY", "GRICE", "GRIDER", "GRIER", "GRIFFIN", "GRIFFIS", "GRIFFITH", "GRIFFITHS", - "GRIGGS", "GRIGSBY", "GRIMES", "GRIMM", "GRISHAM", "GRISSOM", "GRISWOLD", "GROCE", "GROGAN", "GROOMS", - "GROSS", "GROSSMAN", "GROVE", "GROVER", "GROVES", "GRUBB", "GRUBBS", "GRUBER", "GUAJARDO", "GUENTHER", - "GUERIN", "GUERRA", "GUERRERO", "GUESS", "GUEST", "GUEVARA", "GUFFEY", "GUIDRY", "GUILLEN", "GUILLORY", - "GUINN", "GULLEY", "GUNDERSON", "GUNN", "GUNTER", "GUNTHER", "GURLEY", "GUSTAFSON", "GUTHRIE", - "GUTIERREZ", "GUY", "GUYTON", "GUZMAN", "HA", "HAAG", "HAAS", "HAASE", "HACKER", "HACKETT", "HACKNEY", - "HADDEN", "HADLEY", "HAGAN", "HAGEN", "HAGER", "HAGGARD", "HAGGERTY", "HAHN", "HAIGHT", "HAILEY", - "HAINES", "HAIR", "HAIRSTON", "HALCOMB", "HALE", "HALES", "HALEY", "HALL", "HALLER", "HALLMAN", - "HALSEY", "HALSTEAD", "HALVERSON", "HAM", "HAMBLIN", "HAMBY", "HAMEL", "HAMER", "HAMILTON", "HAMLIN", - "HAMM", "HAMMER", "HAMMETT", "HAMMOND", "HAMMONDS", "HAMMONS", "HAMPTON", "HAMRICK", "HAN", "HANCOCK", - "HAND", "HANDLEY", "HANDY", "HANES", "HANEY", "HANKINS", "HANKS", "HANLEY", "HANLON", "HANNA", "HANNAH", - "HANNAN", "HANNON", "HANSEN", "HANSON", "HARBIN", "HARDAWAY", "HARDEE", "HARDEN", "HARDER", "HARDESTY", - "HARDIN", "HARDING", "HARDISON", "HARDMAN", "HARDWICK", "HARDY", "HARE", "HARGIS", "HARGRAVE", - "HARGROVE", "HARKINS", "HARLAN", "HARLEY", "HARLOW", "HARMAN", "HARMON", "HARMS", "HARNESS", "HARP", - "HARPER", "HARR", "HARRELL", "HARRINGTON", "HARRIS", "HARRISON", "HARRY", "HART", "HARTER", "HARTLEY", - "HARTMAN", "HARTMANN", "HARTWELL", "HARVEY", "HARWELL", "HARWOOD", "HASKELL", "HASKINS", "HASS", - "HASSELL", "HASTINGS", "HATCH", "HATCHER", "HATCHETT", "HATFIELD", "HATHAWAY", "HATLEY", "HATTON", - "HAUGEN", "HAUSER", "HAVENS", "HAWES", "HAWK", "HAWKINS", "HAWKS", "HAWLEY", "HAWTHORNE", "HAY", - "HAYDEN", "HAYES", "HAYNES", "HAYS", "HAYWARD", "HAYWOOD", "HAZEL", "HEAD", "HEADLEY", "HEADRICK", - "HEALEY", "HEALY", "HEARD", "HEARN", "HEATH", "HEATON", "HEBERT", "HECK", "HECKMAN", "HEDGES", - "HEDRICK", "HEFFNER", "HEFLIN", "HEFNER", "HEIM", "HEIN", "HEINRICH", "HEINZ", "HELD", "HELLER", "HELM", - "HELMS", "HELTON", "HEMBREE", "HEMPHILL", "HENDERSON", "HENDON", "HENDRICK", "HENDRICKS", "HENDRICKSON", - "HENDRIX", "HENKE", "HENLEY", "HENNESSEY", "HENNING", "HENRY", "HENSLEY", "HENSON", "HER", "HERBERT", - "HEREDIA", "HERMAN", "HERMANN", "HERNANDEZ", "HERNDON", "HERR", "HERRERA", "HERRICK", "HERRIN", - "HERRING", "HERRINGTON", "HERRMANN", "HERRON", "HERSHBERGER", "HERZOG", "HESS", "HESTER", "HEWITT", - "HEYWARD", "HIATT", "HIBBARD", "HICKEY", "HICKMAN", "HICKS", "HICKSON", "HIDALGO", "HIGDON", - "HIGGINBOTHAM", "HIGGINS", "HIGGS", "HIGH", "HIGHTOWER", "HILDEBRAND", "HILDRETH", "HILL", "HILLARD", - "HILLER", "HILLIARD", "HILLMAN", "HILLS", "HILTON", "HIMES", "HINDMAN", "HINDS", "HINES", "HINKLE", - "HINOJOSA", "HINSON", "HINTON", "HIRSCH", "HITCHCOCK", "HITE", "HITT", "HO", "HOANG", "HOBBS", "HOBSON", - "HODGE", "HODGES", "HODGSON", "HOFF", "HOFFMAN", "HOFFMANN", "HOGAN", "HOGG", "HOGUE", "HOKE", - "HOLBROOK", "HOLCOMB", "HOLCOMBE", "HOLDEN", "HOLDER", "HOLGUIN", "HOLIDAY", "HOLLAND", "HOLLENBECK", - "HOLLEY", "HOLLIDAY", "HOLLINGSWORTH", "HOLLINS", "HOLLIS", "HOLLOMAN", "HOLLOWAY", "HOLLY", "HOLM", - "HOLMAN", "HOLMES", "HOLT", "HOLTON", "HOLTZ", "HOMAN", "HOMER", "HONEYCUTT", "HONG", "HOOD", "HOOK", - "HOOKER", "HOOKS", "HOOPER", "HOOVER", "HOPE", "HOPKINS", "HOPPE", "HOPPER", "HOPSON", "HORAN", "HORN", - "HORNE", "HORNER", "HORNSBY", "HOROWITZ", "HORSLEY", "HORTON", "HORVATH", "HOSKINS", "HOSTETLER", - "HOUCK", "HOUGH", "HOUGHTON", "HOULE", "HOUSE", "HOUSER", "HOUSTON", "HOWARD", "HOWE", "HOWELL", - "HOWERTON", "HOWES", "HOWLAND", "HOY", "HOYLE", "HOYT", "HSU", "HUANG", "HUBBARD", "HUBER", "HUBERT", - "HUDDLESTON", "HUDGENS", "HUDGINS", "HUDSON", "HUERTA", "HUEY", "HUFF", "HUFFMAN", "HUGGINS", "HUGHES", - "HUGHEY", "HULL", "HULSEY", "HUMES", "HUMMEL", "HUMPHREY", "HUMPHREYS", "HUMPHRIES", "HUNDLEY", "HUNT", - "HUNTER", "HUNTINGTON", "HUNTLEY", "HURD", "HURLEY", "HURST", "HURT", "HURTADO", "HUSKEY", "HUSSEY", - "HUSTON", "HUTCHENS", "HUTCHERSON", "HUTCHESON", "HUTCHINGS", "HUTCHINS", "HUTCHINSON", "HUTCHISON", - "HUTSON", "HUTTO", "HUTTON", "HUYNH", "HWANG", "HYATT", "HYDE", "HYLAND", "HYLTON", "HYMAN", "HYNES", - "IBARRA", "INGLE", "INGRAHAM", "INGRAM", "INMAN", "IRBY", "IRELAND", "IRISH", "IRIZARRY", "IRONS", - "IRVIN", "IRVINE", "IRVING", "IRWIN", "ISAAC", "ISAACS", "ISAACSON", "ISBELL", "ISOM", "ISON", "ISRAEL", - "IVERSON", "IVES", "IVEY", "IVORY", "IVY", "JACK", "JACKMAN", "JACKS", "JACKSON", "JACOB", "JACOBS", - "JACOBSEN", "JACOBSON", "JACOBY", "JACQUES", "JAEGER", "JAMES", "JAMESON", "JAMISON", "JANES", - "JANKOWSKI", "JANSEN", "JANSSEN", "JARAMILLO", "JARRELL", "JARRETT", "JARVIS", "JASPER", "JAY", - "JAYNES", "JEAN", "JEFFERIES", "JEFFERS", "JEFFERSON", "JEFFERY", "JEFFREY", "JEFFRIES", "JENKINS", - "JENNINGS", "JENSEN", "JENSON", "JERNIGAN", "JESSUP", "JETER", "JETT", "JEWELL", "JEWETT", "JIMENEZ", - "JOBE", "JOE", "JOHANSEN", "JOHN", "JOHNS", "JOHNSON", "JOHNSTON", "JOINER", "JOLLEY", "JOLLY", "JONES", - "JORDAN", "JORDON", "JORGENSEN", "JORGENSON", "JOSE", "JOSEPH", "JOY", "JOYCE", "JOYNER", "JUAREZ", - "JUDD", "JUDE", "JUDGE", "JUDKINS", "JULIAN", "JUNG", "JUSTICE", "JUSTUS", "KAHN", "KAISER", "KAMINSKI", - "KANE", "KANG", "KAPLAN", "KARR", "KASPER", "KATZ", "KAUFFMAN", "KAUFMAN", "KAY", "KAYE", "KEANE", - "KEARNEY", "KEARNS", "KEATING", "KEATON", "KECK", "KEE", "KEEFE", "KEEFER", "KEEGAN", "KEEL", "KEELER", - "KEELING", "KEEN", "KEENAN", "KEENE", "KEENER", "KEENEY", "KEETON", "KEITH", "KELLEHER", "KELLER", - "KELLEY", "KELLOGG", "KELLUM", "KELLY", "KELSEY", "KELSO", "KEMP", "KEMPER", "KENDALL", "KENDRICK", - "KENNEDY", "KENNEY", "KENNY", "KENT", "KENYON", "KERN", "KERNS", "KERR", "KESSLER", "KETCHUM", "KEY", - "KEYES", "KEYS", "KEYSER", "KHAN", "KIDD", "KIDWELL", "KIEFER", "KILGORE", "KILLIAN", "KILPATRICK", - "KIM", "KIMBALL", "KIMBLE", "KIMBRELL", "KIMBROUGH", "KIMMEL", "KINARD", "KINCAID", "KINDER", "KING", - "KINGSLEY", "KINNEY", "KINSEY", "KIRBY", "KIRCHNER", "KIRK", "KIRKLAND", "KIRKPATRICK", "KIRKWOOD", - "KISER", "KISH", "KITCHEN", "KITCHENS", "KLEIN", "KLINE", "KLINGER", "KNAPP", "KNIGHT", "KNOLL", - "KNOTT", "KNOTTS", "KNOWLES", "KNOWLTON", "KNOX", "KNUDSEN", "KNUDSON", "KNUTSON", "KOCH", "KOEHLER", - "KOENIG", "KOHL", "KOHLER", "KOHN", "KOLB", "KONG", "KOONCE", "KOONTZ", "KOPP", "KOVACH", "KOWALSKI", - "KOZAK", "KOZLOWSKI", "KRAFT", "KRAMER", "KRAUS", "KRAUSE", "KRAUSS", "KREBS", "KRIEGER", "KROLL", - "KRUEGER", "KRUG", "KRUGER", "KRUSE", "KUHN", "KUNKEL", "KUNTZ", "KUNZ", "KURTZ", "KUYKENDALL", "KYLE", - "LABBE", "LABELLE", "LACEY", "LACHANCE", "LACKEY", "LACROIX", "LACY", "LADD", "LADNER", "LAFFERTY", - "LAFLAMME", "LAFLEUR", "LAI", "LAIRD", "LAKE", "LAM", "LAMAR", "LAMB", "LAMBERT", "LAMM", "LANCASTER", - "LANCE", "LAND", "LANDERS", "LANDIS", "LANDON", "LANDRUM", "LANDRY", "LANE", "LANEY", "LANG", "LANGDON", - "LANGE", "LANGER", "LANGFORD", "LANGLEY", "LANGLOIS", "LANGSTON", "LANHAM", "LANIER", "LANKFORD", - "LANNING", "LANTZ", "LAPLANTE", "LAPOINTE", "LAPORTE", "LARA", "LARGE", "LARKIN", "LAROCHE", "LAROSE", - "LARRY", "LARSEN", "LARSON", "LARUE", "LASH", "LASHLEY", "LASSITER", "LASTER", "LATHAM", "LATIMER", - "LATTIMORE", "LAU", "LAUER", "LAUGHLIN", "LAVENDER", "LAVIGNE", "LAVOIE", "LAW", "LAWHORN", "LAWLER", - "LAWLESS", "LAWRENCE", "LAWS", "LAWSON", "LAWTON", "LAY", "LAYMAN", "LAYNE", "LAYTON", "LE", "LEA", - "LEACH", "LEAHY", "LEAK", "LEAKE", "LEAL", "LEAR", "LEARY", "LEAVITT", "LEBLANC", "LEBRON", "LECLAIR", - "LEDBETTER", "LEDESMA", "LEDFORD", "LEDOUX", "LEE", "LEEPER", "LEES", "LEFEBVRE", "LEGER", "LEGG", - "LEGGETT", "LEHMAN", "LEHMANN", "LEIGH", "LEIGHTON", "LEMASTER", "LEMAY", "LEMIEUX", "LEMKE", "LEMMON", - "LEMON", "LEMONS", "LEMUS", "LENNON", "LENTZ", "LENZ", "LEON", "LEONARD", "LEONE", "LERMA", "LERNER", - "LEROY", "LESLIE", "LESSARD", "LESTER", "LEUNG", "LEVESQUE", "LEVI", "LEVIN", "LEVINE", "LEVY", "LEW", - "LEWANDOWSKI", "LEWIS", "LEYVA", "LI", "LIBBY", "LIDDELL", "LIEBERMAN", "LIGHT", "LIGHTFOOT", - "LIGHTNER", "LIGON", "LILES", "LILLEY", "LILLY", "LIM", "LIMA", "LIMON", "LIN", "LINARES", "LINCOLN", - "LIND", "LINDBERG", "LINDER", "LINDGREN", "LINDLEY", "LINDQUIST", "LINDSAY", "LINDSEY", "LINDSTROM", - "LINK", "LINKOUS", "LINN", "LINTON", "LINVILLE", "LIPSCOMB", "LIRA", "LISTER", "LITTLE", "LITTLEFIELD", - "LITTLEJOHN", "LITTLETON", "LIU", "LIVELY", "LIVINGSTON", "LLOYD", "LO", "LOCKE", "LOCKETT", "LOCKHART", - "LOCKLEAR", "LOCKWOOD", "LOERA", "LOFTIN", "LOFTIS", "LOFTON", "LOGAN", "LOGSDON", "LOGUE", "LOMAX", - "LOMBARD", "LOMBARDI", "LOMBARDO", "LONDON", "LONG", "LONGO", "LONGORIA", "LOOMIS", "LOONEY", "LOPER", - "LOPES", "LOPEZ", "LORD", "LORENZ", "LORENZO", "LOTT", "LOUIS", "LOVE", "LOVEJOY", "LOVELACE", - "LOVELESS", "LOVELL", "LOVETT", "LOVING", "LOW", "LOWE", "LOWELL", "LOWERY", "LOWMAN", "LOWRY", "LOY", - "LOYA", "LOYD", "LOZANO", "LU", "LUCAS", "LUCE", "LUCERO", "LUCIANO", "LUCKETT", "LUDWIG", "LUGO", - "LUIS", "LUJAN", "LUKE", "LUMPKIN", "LUNA", "LUND", "LUNDBERG", "LUNDY", "LUNSFORD", "LUONG", "LUSK", - "LUSTER", "LUTHER", "LUTTRELL", "LUTZ", "LY", "LYLE", "LYLES", "LYMAN", "LYNCH", "LYNN", "LYON", - "LYONS", "LYTLE", "MA", "MAAS", "MABE", "MABRY", "MACDONALD", "MACE", "MACHADO", "MACIAS", "MACK", - "MACKAY", "MACKENZIE", "MACKEY", "MACKIE", "MACKLIN", "MACLEAN", "MACLEOD", "MACON", "MADDEN", "MADDOX", - "MADERA", "MADISON", "MADRID", "MADRIGAL", "MADSEN", "MAES", "MAESTAS", "MAGANA", "MAGEE", "MAGGARD", - "MAGNUSON", "MAGUIRE", "MAHAFFEY", "MAHAN", "MAHER", "MAHON", "MAHONEY", "MAIER", "MAIN", "MAJOR", - "MAJORS", "MAKI", "MALCOLM", "MALDONADO", "MALLEY", "MALLORY", "MALLOY", "MALONE", "MALONEY", "MANCINI", - "MANCUSO", "MANESS", "MANGUM", "MANLEY", "MANN", "MANNING", "MANNS", "MANSFIELD", "MANSON", "MANUEL", - "MANZO", "MAPLE", "MAPLES", "MARBLE", "MARCH", "MARCHAND", "MARCOTTE", "MARCUM", "MARCUS", "MARES", - "MARIN", "MARINO", "MARION", "MARK", "MARKHAM", "MARKLEY", "MARKS", "MARLER", "MARLOW", "MARLOWE", - "MARQUEZ", "MARQUIS", "MARR", "MARRERO", "MARROQUIN", "MARSH", "MARSHALL", "MARTEL", "MARTELL", - "MARTENS", "MARTIN", "MARTINDALE", "MARTINEZ", "MARTINO", "MARTINS", "MARTINSON", "MARTZ", "MARVIN", - "MARX", "MASON", "MASSEY", "MASSIE", "MAST", "MASTERS", "MASTERSON", "MATA", "MATHENY", "MATHESON", - "MATHEWS", "MATHIAS", "MATHIS", "MATLOCK", "MATNEY", "MATOS", "MATSON", "MATTESON", "MATTHEW", - "MATTHEWS", "MATTINGLY", "MATTISON", "MATTOS", "MATTOX", "MATTSON", "MAULDIN", "MAUPIN", "MAURER", - "MAURO", "MAXEY", "MAXFIELD", "MAXWELL", "MAY", "MAYBERRY", "MAYER", "MAYERS", "MAYES", "MAYFIELD", - "MAYHEW", "MAYNARD", "MAYO", "MAYS", "MAZZA", "MCADAMS", "MCAFEE", "MCALISTER", "MCALLISTER", - "MCARTHUR", "MCBEE", "MCBRIDE", "MCCABE", "MCCAFFREY", "MCCAIN", "MCCALL", "MCCALLISTER", "MCCALLUM", - "MCCANN", "MCCANTS", "MCCARTER", "MCCARTHY", "MCCARTNEY", "MCCARTY", "MCCASKILL", "MCCAULEY", "MCCLAIN", - "MCCLANAHAN", "MCCLARY", "MCCLEARY", "MCCLELLAN", "MCCLELLAND", "MCCLENDON", "MCCLINTOCK", "MCCLINTON", - "MCCLOSKEY", "MCCLOUD", "MCCLUNG", "MCCLURE", "MCCOLLUM", "MCCOMBS", "MCCONNELL", "MCCOOL", "MCCORD", - "MCCORKLE", "MCCORMACK", "MCCORMICK", "MCCOY", "MCCRACKEN", "MCCRARY", "MCCRAY", "MCCREARY", "MCCUE", - "MCCULLOCH", "MCCULLOUGH", "MCCUNE", "MCCURDY", "MCCURRY", "MCCUTCHEON", "MCDADE", "MCDANIEL", - "MCDANIELS", "MCDERMOTT", "MCDONALD", "MCDONNELL", "MCDONOUGH", "MCDOUGAL", "MCDOUGALL", "MCDOWELL", - "MCDUFFIE", "MCELROY", "MCEWEN", "MCFADDEN", "MCFALL", "MCFARLAND", "MCFARLANE", "MCGEE", "MCGEHEE", - "MCGHEE", "MCGILL", "MCGINNIS", "MCGOVERN", "MCGOWAN", "MCGRATH", "MCGRAW", "MCGREGOR", "MCGREW", - "MCGRIFF", "MCGUIRE", "MCHENRY", "MCHUGH", "MCINNIS", "MCINTIRE", "MCINTOSH", "MCINTYRE", "MCKAY", - "MCKEE", "MCKEEVER", "MCKENNA", "MCKENNEY", "MCKENZIE", "MCKEON", "MCKEOWN", "MCKINLEY", "MCKINNEY", - "MCKINNON", "MCKNIGHT", "MCLAIN", "MCLAUGHLIN", "MCLAURIN", "MCLEAN", "MCLEMORE", "MCLENDON", "MCLEOD", - "MCMAHAN", "MCMAHON", "MCMANUS", "MCMASTER", "MCMILLAN", "MCMILLEN", "MCMILLIAN", "MCMULLEN", - "MCMURRAY", "MCNABB", "MCNAIR", "MCNALLY", "MCNAMARA", "MCNEAL", "MCNEELY", "MCNEIL", "MCNEILL", - "MCNULTY", "MCNUTT", "MCPHERSON", "MCQUEEN", "MCRAE", "MCREYNOLDS", "MCSWAIN", "MCVAY", "MCVEY", - "MCWHORTER", "MCWILLIAMS", "MEACHAM", "MEAD", "MEADE", "MEADOR", "MEADOWS", "MEANS", "MEARS", - "MEDEIROS", "MEDINA", "MEDLEY", "MEDLIN", "MEDLOCK", "MEDRANO", "MEEHAN", "MEEK", "MEEKER", "MEEKS", - "MEIER", "MEJIA", "MELANCON", "MELENDEZ", "MELLO", "MELTON", "MELVIN", "MENA", "MENARD", "MENDENHALL", - "MENDEZ", "MENDOZA", "MENENDEZ", "MERCADO", "MERCER", "MERCHANT", "MERCIER", "MEREDITH", "MERRELL", - "MERRICK", "MERRILL", "MERRIMAN", "MERRITT", "MESA", "MESSENGER", "MESSER", "MESSINA", "METCALF", - "METZ", "METZGER", "METZLER", "MEYER", "MEYERS", "MEZA", "MICHAEL", "MICHAELS", "MICHAUD", "MICHEL", - "MICKENS", "MIDDLETON", "MILAM", "MILBURN", "MILES", "MILLARD", "MILLER", "MILLIGAN", "MILLIKEN", - "MILLS", "MILNE", "MILNER", "MILTON", "MIMS", "MINER", "MINNICK", "MINOR", "MINTER", "MINTON", "MINTZ", - "MIRANDA", "MIRELES", "MITCHELL", "MIXON", "MIZE", "MOBLEY", "MOCK", "MOE", "MOELLER", "MOEN", - "MOFFETT", "MOFFITT", "MOHR", "MOJICA", "MOLINA", "MOLL", "MONACO", "MONAGHAN", "MONAHAN", "MONEY", - "MONIZ", "MONK", "MONROE", "MONSON", "MONTAGUE", "MONTALVO", "MONTANEZ", "MONTANO", "MONTEMAYOR", - "MONTERO", "MONTES", "MONTEZ", "MONTGOMERY", "MONTOYA", "MOODY", "MOON", "MOONEY", "MOORE", "MOORMAN", - "MORA", "MORALES", "MORAN", "MOREAU", "MOREHEAD", "MORELAND", "MORENO", "MOREY", "MORGAN", "MORIARTY", - "MORIN", "MORLEY", "MORRELL", "MORRILL", "MORRIS", "MORRISON", "MORRISSEY", "MORROW", "MORSE", - "MORTENSEN", "MORTON", "MOSBY", "MOSELEY", "MOSER", "MOSES", "MOSHER", "MOSIER", "MOSLEY", "MOSS", - "MOTLEY", "MOTT", "MOULTON", "MOULTRIE", "MOUNT", "MOWERY", "MOYA", "MOYE", "MOYER", "MUELLER", - "MUHAMMAD", "MUIR", "MULKEY", "MULL", "MULLEN", "MULLER", "MULLIGAN", "MULLIN", "MULLINS", "MULLIS", - "MUNCY", "MUNDY", "MUNIZ", "MUNN", "MUNOZ", "MUNSON", "MURDOCK", "MURILLO", "MURPHY", "MURRAY", - "MURRELL", "MURRY", "MUSE", "MUSGROVE", "MUSSER", "MYERS", "MYLES", "MYRICK", "NABORS", "NADEAU", - "NAGEL", "NAGLE", "NAGY", "NAJERA", "NAKAMURA", "NALL", "NANCE", "NAPIER", "NAQUIN", "NARANJO", - "NARVAEZ", "NASH", "NATHAN", "NATION", "NAVA", "NAVARRETE", "NAVARRO", "NAYLOR", "NEAL", "NEALY", - "NEEDHAM", "NEEL", "NEELEY", "NEELY", "NEFF", "NEGRETE", "NEGRON", "NEIL", "NEILL", "NELMS", "NELSON", - "NESBITT", "NESMITH", "NESS", "NESTOR", "NETTLES", "NEUMAN", "NEUMANN", "NEVAREZ", "NEVILLE", "NEW", - "NEWBERRY", "NEWBY", "NEWCOMB", "NEWELL", "NEWKIRK", "NEWMAN", "NEWSOM", "NEWSOME", "NEWTON", "NG", - "NGO", "NGUYEN", "NICHOLAS", "NICHOLS", "NICHOLSON", "NICKEL", "NICKERSON", "NIELSEN", "NIELSON", - "NIETO", "NIEVES", "NILES", "NIX", "NIXON", "NOBLE", "NOBLES", "NOE", "NOEL", "NOLAN", "NOLAND", - "NOLEN", "NOLL", "NOONAN", "NORFLEET", "NORIEGA", "NORMAN", "NORRIS", "NORTH", "NORTON", "NORWOOD", - "NOVAK", "NOVOTNY", "NOWAK", "NOWLIN", "NOYES", "NUGENT", "NULL", "NUMBERS", "NUNES", "NUNEZ", "NUNLEY", - "NUNN", "NUTT", "NUTTER", "NYE", "OAKES", "OAKLEY", "OAKS", "OATES", "OBRIEN", "OBRYAN", "OCAMPO", - "OCASIO", "OCHOA", "OCHS", "OCONNELL", "OCONNER", "OCONNOR", "ODELL", "ODEN", "ODOM", "ODONNELL", - "ODUM", "OGDEN", "OGLE", "OGLESBY", "OH", "OHARA", "OJEDA", "OKEEFE", "OLDHAM", "OLDS", "OLEARY", - "OLIPHANT", "OLIVA", "OLIVARES", "OLIVAREZ", "OLIVAS", "OLIVE", "OLIVEIRA", "OLIVER", "OLIVO", - "OLMSTEAD", "OLSEN", "OLSON", "OLVERA", "OMALLEY", "ONEAL", "ONEIL", "ONEILL", "ONTIVEROS", "ORDONEZ", - "OREILLY", "ORELLANA", "ORLANDO", "ORNELAS", "OROSCO", "OROURKE", "OROZCO", "ORR", "ORTA", "ORTEGA", - "ORTIZ", "OSBORN", "OSBORNE", "OSBURN", "OSGOOD", "OSHEA", "OSORIO", "OSTEEN", "OSTRANDER", "OSULLIVAN", - "OSWALD", "OSWALT", "OTERO", "OTIS", "OTOOLE", "OTT", "OTTO", "OUELLETTE", "OUTLAW", "OVERBY", - "OVERSTREET", "OVERTON", "OWEN", "OWENS", "PACE", "PACHECO", "PACK", "PACKARD", "PACKER", "PADGETT", - "PADILLA", "PAGAN", "PAGE", "PAIGE", "PAINE", "PAINTER", "PAK", "PALACIOS", "PALMA", "PALMER", - "PALUMBO", "PANNELL", "PANTOJA", "PAPE", "PAPPAS", "PAQUETTE", "PARADIS", "PARDO", "PAREDES", "PARENT", - "PARHAM", "PARIS", "PARISH", "PARK", "PARKER", "PARKINSON", "PARKS", "PARNELL", "PARR", "PARRA", - "PARRIS", "PARRISH", "PARROTT", "PARRY", "PARSON", "PARSONS", "PARTIN", "PARTRIDGE", "PASSMORE", "PATE", - "PATEL", "PATERSON", "PATINO", "PATRICK", "PATTEN", "PATTERSON", "PATTON", "PAUL", "PAULEY", "PAULSEN", - "PAULSON", "PAXTON", "PAYNE", "PAYTON", "PAZ", "PEACE", "PEACHEY", "PEACOCK", "PEAK", "PEARCE", - "PEARSON", "PEASE", "PECK", "PEDERSEN", "PEDERSON", "PEEBLES", "PEEK", "PEEL", "PEELER", "PEEPLES", - "PELLETIER", "PELTIER", "PEMBERTON", "PENA", "PENCE", "PENDER", "PENDERGRASS", "PENDLETON", "PENN", - "PENNELL", "PENNINGTON", "PENNY", "PEOPLES", "PEPPER", "PERALES", "PERALTA", "PERDUE", "PEREA", - "PEREIRA", "PEREZ", "PERKINS", "PERREAULT", "PERRIN", "PERRON", "PERRY", "PERRYMAN", "PERSON", "PETER", - "PETERMAN", "PETERS", "PETERSEN", "PETERSON", "PETIT", "PETRIE", "PETTIGREW", "PETTIS", "PETTIT", - "PETTWAY", "PETTY", "PEYTON", "PFEIFER", "PFEIFFER", "PHAM", "PHAN", "PHELAN", "PHELPS", "PHIFER", - "PHILLIPS", "PHIPPS", "PICARD", "PICKARD", "PICKENS", "PICKERING", "PICKETT", "PIERCE", "PIERRE", - "PIERSON", "PIKE", "PILCHER", "PIMENTEL", "PINA", "PINCKNEY", "PINEDA", "PINKERTON", "PINKSTON", "PINO", - "PINSON", "PINTO", "PIPER", "PIPKIN", "PIPPIN", "PITMAN", "PITRE", "PITT", "PITTMAN", "PITTS", "PLACE", - "PLANTE", "PLATT", "PLEASANT", "PLUMMER", "PLUNKETT", "POE", "POGUE", "POINDEXTER", "POINTER", - "POIRIER", "POLANCO", "POLAND", "POLING", "POLK", "POLLACK", "POLLARD", "POLLOCK", "POMEROY", "PONCE", - "POND", "PONDER", "POOL", "POOLE", "POORE", "POPE", "POPP", "PORTER", "PORTERFIELD", "PORTILLO", - "POSEY", "POST", "POSTON", "POTTER", "POTTS", "POULIN", "POUNDS", "POWELL", "POWER", "POWERS", "PRADO", - "PRATER", "PRATHER", "PRATT", "PRENTICE", "PRESCOTT", "PRESLEY", "PRESSLEY", "PRESTON", "PREWITT", - "PRICE", "PRICHARD", "PRIDE", "PRIDGEN", "PRIEST", "PRIETO", "PRINCE", "PRINGLE", "PRITCHARD", - "PRITCHETT", "PROCTOR", "PROFFITT", "PROSSER", "PROVOST", "PRUETT", "PRUITT", "PRYOR", "PUCKETT", - "PUENTE", "PUGH", "PULIDO", "PULLEN", "PULLEY", "PULLIAM", "PURCELL", "PURDY", "PURNELL", "PURVIS", - "PUTMAN", "PUTNAM", "PYLE", "QUALLS", "QUARLES", "QUEEN", "QUEZADA", "QUICK", "QUIGLEY", "QUILLEN", - "QUINLAN", "QUINN", "QUINONES", "QUINONEZ", "QUINTANA", "QUINTANILLA", "QUINTERO", "QUIROZ", "RADER", - "RADFORD", "RAFFERTY", "RAGAN", "RAGLAND", "RAGSDALE", "RAINES", "RAINEY", "RAINS", "RALEY", "RALPH", - "RALSTON", "RAMEY", "RAMIREZ", "RAMON", "RAMOS", "RAMSAY", "RAMSEY", "RAND", "RANDALL", "RANDLE", - "RANDOLPH", "RANEY", "RANGEL", "RANKIN", "RANSOM", "RAPP", "RASH", "RASMUSSEN", "RATCLIFF", "RATLIFF", - "RAU", "RAUCH", "RAWLINGS", "RAWLINS", "RAWLS", "RAY", "RAYBURN", "RAYFORD", "RAYMOND", "RAYNOR", - "RAZO", "REA", "READ", "REAGAN", "REARDON", "REAVES", "RECTOR", "REDD", "REDDEN", "REDDICK", "REDDING", - "REDDY", "REDMAN", "REDMON", "REDMOND", "REECE", "REED", "REEDER", "REEDY", "REES", "REESE", "REEVES", - "REGALADO", "REGAN", "REGISTER", "REICH", "REICHERT", "REID", "REILLY", "REINHARDT", "REINHART", "REIS", - "REITER", "RENDON", "RENFRO", "RENNER", "RENO", "RENTERIA", "REUTER", "REY", "REYES", "REYNA", - "REYNOLDS", "REYNOSO", "RHEA", "RHOADES", "RHOADS", "RHODEN", "RHODES", "RICCI", "RICE", "RICH", - "RICHARD", "RICHARDS", "RICHARDSON", "RICHEY", "RICHIE", "RICHMOND", "RICHTER", "RICKARD", "RICKER", - "RICKETTS", "RICKMAN", "RICKS", "RICO", "RIDDELL", "RIDDICK", "RIDDLE", "RIDENOUR", "RIDER", "RIDGEWAY", - "RIDLEY", "RIFE", "RIGBY", "RIGGINS", "RIGGS", "RIGSBY", "RILEY", "RINALDI", "RINEHART", "RING", "RIOS", - "RIPLEY", "RITCHEY", "RITCHIE", "RITTER", "RIVAS", "RIVERA", "RIVERS", "RIZZO", "ROACH", "ROARK", - "ROBB", "ROBBINS", "ROBERGE", "ROBERSON", "ROBERT", "ROBERTS", "ROBERTSON", "ROBEY", "ROBINETTE", - "ROBINS", "ROBINSON", "ROBISON", "ROBLES", "ROBSON", "ROBY", "ROCHA", "ROCHE", "ROCK", "ROCKWELL", - "RODEN", "RODERICK", "RODGERS", "RODRIGUE", "RODRIGUES", "RODRIGUEZ", "RODRIQUEZ", "ROE", "ROGER", - "ROGERS", "ROHR", "ROJAS", "ROLAND", "ROLDAN", "ROLLER", "ROLLINS", "ROMAN", "ROMANO", "ROMEO", - "ROMERO", "ROMO", "RONEY", "ROONEY", "ROOT", "ROPER", "ROQUE", "ROSA", "ROSADO", "ROSALES", "ROSARIO", - "ROSAS", "ROSE", "ROSEN", "ROSENBAUM", "ROSENBERG", "ROSENTHAL", "ROSS", "ROSSER", "ROSSI", "ROTH", - "ROUNDS", "ROUNDTREE", "ROUNTREE", "ROUSE", "ROUSH", "ROUSSEAU", "ROUSSEL", "ROWAN", "ROWE", "ROWELL", - "ROWLAND", "ROWLEY", "ROY", "ROYAL", "ROYBAL", "ROYER", "ROYSTER", "RUBIN", "RUBIO", "RUBY", "RUCKER", - "RUDD", "RUDOLPH", "RUFF", "RUFFIN", "RUIZ", "RUNYAN", "RUNYON", "RUPERT", "RUPP", "RUSH", "RUSHING", - "RUSS", "RUSSELL", "RUSSO", "RUST", "RUTH", "RUTHERFORD", "RUTLEDGE", "RYAN", "RYDER", "SAAVEDRA", - "SABO", "SACCO", "SADLER", "SAENZ", "SAGE", "SAGER", "SALAS", "SALAZAR", "SALCEDO", "SALCIDO", - "SALDANA", "SALDIVAR", "SALERNO", "SALES", "SALGADO", "SALINAS", "SALISBURY", "SALLEE", "SALLEY", - "SALMON", "SALTER", "SAM", "SAMMONS", "SAMPLE", "SAMPLES", "SAMPSON", "SAMS", "SAMSON", "SAMUEL", - "SAMUELS", "SANBORN", "SANCHES", "SANCHEZ", "SANDBERG", "SANDER", "SANDERS", "SANDERSON", "SANDLIN", - "SANDOVAL", "SANDS", "SANFORD", "SANTANA", "SANTIAGO", "SANTOS", "SAPP", "SARGENT", "SASSER", - "SATTERFIELD", "SAUCEDO", "SAUCIER", "SAUER", "SAULS", "SAUNDERS", "SAVAGE", "SAVOY", "SAWYER", - "SAWYERS", "SAXON", "SAXTON", "SAYERS", "SAYLOR", "SAYRE", "SCALES", "SCANLON", "SCARBOROUGH", - "SCARBROUGH", "SCHAEFER", "SCHAEFFER", "SCHAFER", "SCHAFFER", "SCHELL", "SCHERER", "SCHILLER", - "SCHILLING", "SCHINDLER", "SCHMID", "SCHMIDT", "SCHMITT", "SCHMITZ", "SCHNEIDER", "SCHOFIELD", "SCHOLL", - "SCHOONOVER", "SCHOTT", "SCHRADER", "SCHREIBER", "SCHREINER", "SCHROEDER", "SCHUBERT", "SCHULER", - "SCHULTE", "SCHULTZ", "SCHULZ", "SCHULZE", "SCHUMACHER", "SCHUSTER", "SCHWAB", "SCHWARTZ", "SCHWARZ", - "SCHWEITZER", "SCOGGINS", "SCOTT", "SCRIBNER", "SCROGGINS", "SCRUGGS", "SCULLY", "SEAL", "SEALS", - "SEAMAN", "SEARCY", "SEARS", "SEATON", "SEAY", "SEE", "SEELEY", "SEGURA", "SEIBERT", "SEIDEL", - "SEIFERT", "SEILER", "SEITZ", "SELBY", "SELF", "SELL", "SELLERS", "SELLS", "SENA", "SEPULVEDA", "SERNA", - "SERRANO", "SESSIONS", "SETTLE", "SETTLES", "SEVERSON", "SEWARD", "SEWELL", "SEXTON", "SEYMORE", - "SEYMOUR", "SHACKELFORD", "SHADE", "SHAFER", "SHAFFER", "SHAH", "SHANK", "SHANKS", "SHANNON", "SHAPIRO", - "SHARKEY", "SHARP", "SHARPE", "SHAVER", "SHAW", "SHAY", "SHEA", "SHEARER", "SHEEHAN", "SHEETS", - "SHEFFIELD", "SHELBY", "SHELDON", "SHELL", "SHELLEY", "SHELLY", "SHELTON", "SHEPARD", "SHEPHARD", - "SHEPHERD", "SHEPPARD", "SHERIDAN", "SHERMAN", "SHERRILL", "SHERROD", "SHERRY", "SHERWOOD", "SHIELDS", - "SHIFFLETT", "SHIN", "SHINN", "SHIPLEY", "SHIPMAN", "SHIPP", "SHIRLEY", "SHIVELY", "SHIVERS", - "SHOCKLEY", "SHOEMAKER", "SHOOK", "SHORE", "SHORES", "SHORT", "SHORTER", "SHRADER", "SHULER", "SHULL", - "SHULTZ", "SHUMAKER", "SHUMAN", "SHUMATE", "SIBLEY", "SIDES", "SIEGEL", "SIERRA", "SIGLER", "SIKES", - "SILER", "SILLS", "SILVA", "SILVER", "SILVERMAN", "SILVERS", "SILVIA", "SIMMONS", "SIMMS", "SIMON", - "SIMONE", "SIMONS", "SIMONSON", "SIMPKINS", "SIMPSON", "SIMS", "SINCLAIR", "SINGER", "SINGH", - "SINGLETARY", "SINGLETON", "SIPES", "SISCO", "SISK", "SISSON", "SIZEMORE", "SKAGGS", "SKELTON", - "SKIDMORE", "SKINNER", "SKIPPER", "SLACK", "SLADE", "SLAGLE", "SLATER", "SLATON", "SLATTERY", - "SLAUGHTER", "SLAYTON", "SLEDGE", "SLOAN", "SLOCUM", "SLONE", "SMALL", "SMALLEY", "SMALLS", "SMALLWOOD", - "SMART", "SMILEY", "SMITH", "SMITHSON", "SMOOT", "SMOTHERS", "SMYTH", "SNEAD", "SNEED", "SNELL", - "SNIDER", "SNIPES", "SNODGRASS", "SNOW", "SNOWDEN", "SNYDER", "SOARES", "SOLANO", "SOLIS", "SOLIZ", - "SOLOMON", "SOMERS", "SOMERVILLE", "SOMMER", "SOMMERS", "SONG", "SORENSEN", "SORENSON", "SORIA", - "SORIANO", "SORRELL", "SOSA", "SOTELO", "SOTO", "SOUSA", "SOUTH", "SOUTHARD", "SOUTHERLAND", "SOUTHERN", - "SOUZA", "SOWELL", "SOWERS", "SPAIN", "SPALDING", "SPANGLER", "SPANN", "SPARKMAN", "SPARKS", "SPARROW", - "SPAULDING", "SPEAR", "SPEARMAN", "SPEARS", "SPEED", "SPEER", "SPEIGHT", "SPELLMAN", "SPENCE", - "SPENCER", "SPERRY", "SPICER", "SPILLMAN", "SPINKS", "SPIVEY", "SPOONER", "SPRADLIN", "SPRAGUE", - "SPRIGGS", "SPRING", "SPRINGER", "SPROUSE", "SPRUILL", "SPURGEON", "SPURLOCK", "SQUIRES", "STACEY", - "STACK", "STACKHOUSE", "STACY", "STAFFORD", "STAGGS", "STAHL", "STALEY", "STALLINGS", "STALLWORTH", - "STAMM", "STAMPER", "STAMPS", "STANFIELD", "STANFORD", "STANLEY", "STANTON", "STAPLES", "STAPLETON", - "STARK", "STARKEY", "STARKS", "STARLING", "STARNES", "STARR", "STATEN", "STATON", "STAUFFER", "STCLAIR", - "STEADMAN", "STEARNS", "STEED", "STEEL", "STEELE", "STEEN", "STEFFEN", "STEGALL", "STEIN", "STEINBERG", - "STEINER", "STEPHEN", "STEPHENS", "STEPHENSON", "STEPP", "STERLING", "STERN", "STEVENS", "STEVENSON", - "STEWARD", "STEWART", "STIDHAM", "STILES", "STILL", "STILLMAN", "STILLWELL", "STILTNER", "STINE", - "STINNETT", "STINSON", "STITT", "STJOHN", "STOCK", "STOCKTON", "STODDARD", "STOKER", "STOKES", "STOLL", - "STONE", "STONER", "STOREY", "STORY", "STOTT", "STOUT", "STOVALL", "STOVER", "STOWE", "STPIERRE", - "STRAIN", "STRAND", "STRANGE", "STRATTON", "STRAUB", "STRAUSS", "STREET", "STREETER", "STRICKLAND", - "STRINGER", "STRONG", "STROTHER", "STROUD", "STROUP", "STRUNK", "STUART", "STUBBLEFIELD", "STUBBS", - "STUCKEY", "STULL", "STUMP", "STURDIVANT", "STURGEON", "STURGILL", "STURGIS", "STURM", "STYLES", - "SUAREZ", "SUGGS", "SULLIVAN", "SUMMERLIN", "SUMMERS", "SUMNER", "SUMPTER", "SUN", "SUTHERLAND", - "SUTTER", "SUTTON", "SWAFFORD", "SWAIN", "SWAN", "SWANK", "SWANN", "SWANSON", "SWARTZ", "SWEARINGEN", - "SWEAT", "SWEENEY", "SWEET", "SWENSON", "SWIFT", "SWISHER", "SWITZER", "SWOPE", "SYKES", "SYLVESTER", - "TABER", "TABOR", "TACKETT", "TAFT", "TAGGART", "TALBERT", "TALBOT", "TALBOTT", "TALLENT", "TALLEY", - "TAM", "TAMAYO", "TAN", "TANAKA", "TANG", "TANNER", "TAPIA", "TAPP", "TARVER", "TATE", "TATUM", - "TAVARES", "TAYLOR", "TEAGUE", "TEAL", "TEEL", "TEETER", "TEJADA", "TEJEDA", "TELLEZ", "TEMPLE", - "TEMPLETON", "TENNANT", "TENNEY", "TERRELL", "TERRILL", "TERRY", "THACKER", "THAMES", "THAO", "THARP", - "THATCHER", "THAYER", "THERIAULT", "THERIOT", "THIBODEAU", "THIBODEAUX", "THIEL", "THIGPEN", "THOMAS", - "THOMASON", "THOMPSON", "THOMSEN", "THOMSON", "THORN", "THORNBURG", "THORNE", "THORNHILL", "THORNTON", - "THORP", "THORPE", "THORTON", "THRASH", "THRASHER", "THURMAN", "THURSTON", "TIBBETTS", "TIBBS", "TICE", - "TIDWELL", "TIERNEY", "TIJERINA", "TILLER", "TILLERY", "TILLEY", "TILLMAN", "TILTON", "TIMM", "TIMMONS", - "TINKER", "TINSLEY", "TIPTON", "TIRADO", "TISDALE", "TITUS", "TOBIAS", "TOBIN", "TODD", "TOLBERT", - "TOLEDO", "TOLER", "TOLIVER", "TOLLIVER", "TOM", "TOMLIN", "TOMLINSON", "TOMPKINS", "TONEY", "TONG", - "TORO", "TORRENCE", "TORRES", "TORREZ", "TOTH", "TOTTEN", "TOVAR", "TOWNES", "TOWNS", "TOWNSEND", - "TRACY", "TRAHAN", "TRAMMELL", "TRAN", "TRAPP", "TRASK", "TRAVERS", "TRAVIS", "TRAYLOR", "TREADWAY", - "TREADWELL", "TREJO", "TREMBLAY", "TRENT", "TREVINO", "TRIBBLE", "TRICE", "TRIMBLE", "TRINIDAD", - "TRIPLETT", "TRIPP", "TROTTER", "TROUT", "TROUTMAN", "TROY", "TRUDEAU", "TRUE", "TRUITT", "TRUJILLO", - "TRUONG", "TUBBS", "TUCK", "TUCKER", "TUGGLE", "TURK", "TURLEY", "TURMAN", "TURNBULL", "TURNER", - "TURNEY", "TURPIN", "TUTTLE", "TYLER", "TYNER", "TYREE", "TYSON", "ULRICH", "UNDERHILL", "UNDERWOOD", - "UNGER", "UPCHURCH", "UPSHAW", "UPTON", "URBAN", "URBINA", "URIBE", "USHER", "UTLEY", "VAIL", "VALADEZ", - "VALDES", "VALDEZ", "VALENCIA", "VALENTI", "VALENTIN", "VALENTINE", "VALENZUELA", "VALERIO", "VALLE", - "VALLEJO", "VALLES", "VAN", "VANBUREN", "VANCE", "VANDIVER", "VANDYKE", "VANG", "VANHOOSE", "VANHORN", - "VANMETER", "VANN", "VANOVER", "VANWINKLE", "VARELA", "VARGAS", "VARNER", "VARNEY", "VASQUEZ", - "VAUGHAN", "VAUGHN", "VAUGHT", "VAZQUEZ", "VEAL", "VEGA", "VELA", "VELASCO", "VELASQUEZ", "VELAZQUEZ", - "VELEZ", "VENABLE", "VENEGAS", "VENTURA", "VERA", "VERDIN", "VERGARA", "VERNON", "VEST", "VETTER", - "VICK", "VICKERS", "VICKERY", "VICTOR", "VIDAL", "VIEIRA", "VIERA", "VIGIL", "VILLA", "VILLALOBOS", - "VILLANUEVA", "VILLAREAL", "VILLARREAL", "VILLASENOR", "VILLEGAS", "VINCENT", "VINES", "VINSON", - "VITALE", "VO", "VOGEL", "VOGT", "VOSS", "VU", "VUE", "WADDELL", "WADE", "WADSWORTH", "WAGGONER", - "WAGNER", "WAGONER", "WAHL", "WAITE", "WAKEFIELD", "WALDEN", "WALDRON", "WALDROP", "WALKER", "WALL", - "WALLACE", "WALLEN", "WALLER", "WALLING", "WALLIS", "WALLS", "WALSH", "WALSTON", "WALTER", "WALTERS", - "WALTON", "WAMPLER", "WANG", "WARD", "WARDEN", "WARE", "WARFIELD", "WARNER", "WARREN", "WASHBURN", - "WASHINGTON", "WASSON", "WATERMAN", "WATERS", "WATKINS", "WATSON", "WATT", "WATTERS", "WATTS", "WAUGH", - "WAY", "WAYNE", "WEATHERFORD", "WEATHERLY", "WEATHERS", "WEAVER", "WEBB", "WEBBER", "WEBER", "WEBSTER", - "WEDDLE", "WEED", "WEEKS", "WEEMS", "WEINBERG", "WEINER", "WEINSTEIN", "WEIR", "WEIS", "WEISS", "WELCH", - "WELDON", "WELKER", "WELLER", "WELLMAN", "WELLS", "WELSH", "WENDT", "WENGER", "WENTWORTH", "WENTZ", - "WENZEL", "WERNER", "WERTZ", "WESLEY", "WEST", "WESTBROOK", "WESTER", "WESTFALL", "WESTMORELAND", - "WESTON", "WETZEL", "WHALEN", "WHALEY", "WHARTON", "WHATLEY", "WHEAT", "WHEATLEY", "WHEATON", "WHEELER", - "WHELAN", "WHIPPLE", "WHITAKER", "WHITCOMB", "WHITE", "WHITED", "WHITEHEAD", "WHITEHURST", "WHITEMAN", - "WHITESIDE", "WHITFIELD", "WHITING", "WHITLEY", "WHITLOCK", "WHITLOW", "WHITMAN", "WHITMIRE", - "WHITMORE", "WHITNEY", "WHITSON", "WHITT", "WHITTAKER", "WHITTEN", "WHITTINGTON", "WHITTLE", - "WHITWORTH", "WHYTE", "WICK", "WICKER", "WICKHAM", "WICKS", "WIESE", "WIGGINS", "WILBANKS", "WILBER", - "WILBUR", "WILBURN", "WILCOX", "WILD", "WILDE", "WILDER", "WILES", "WILEY", "WILHELM", "WILHITE", - "WILKE", "WILKERSON", "WILKES", "WILKINS", "WILKINSON", "WILKS", "WILL", "WILLARD", "WILLETT", "WILLEY", - "WILLIAM", "WILLIAMS", "WILLIAMSON", "WILLIFORD", "WILLINGHAM", "WILLIS", "WILLOUGHBY", "WILLS", - "WILLSON", "WILMOTH", "WILSON", "WILT", "WIMBERLY", "WINCHESTER", "WINDHAM", "WINFIELD", "WINFREY", - "WING", "WINGATE", "WINGFIELD", "WINKLER", "WINN", "WINSLOW", "WINSTEAD", "WINSTON", "WINTER", - "WINTERS", "WIRTH", "WISE", "WISEMAN", "WISNIEWSKI", "WITCHER", "WITHERS", "WITHERSPOON", "WITHROW", - "WITT", "WITTE", "WOFFORD", "WOLF", "WOLFE", "WOLFF", "WOLFORD", "WOMACK", "WONG", "WOO", "WOOD", - "WOODALL", "WOODARD", "WOODBURY", "WOODCOCK", "WOODEN", "WOODLEY", "WOODRUFF", "WOODS", "WOODSON", - "WOODWARD", "WOODWORTH", "WOODY", "WOOLDRIDGE", "WOOLEY", "WOOTEN", "WORD", "WORDEN", "WORKMAN", - "WORLEY", "WORRELL", "WORSHAM", "WORTH", "WORTHAM", "WORTHINGTON", "WORTHY", "WRAY", "WREN", "WRIGHT", - "WU", "WYANT", "WYATT", "WYLIE", "WYMAN", "WYNN", "WYNNE", "XIONG", "YAMAMOTO", "YANCEY", "YANEZ", - "YANG", "YARBROUGH", "YATES", "YAZZIE", "YBARRA", "YEAGER", "YEE", "YI", "YOCUM", "YODER", "YOO", - "YOON", "YORK", "YOST", "YOUNG", "YOUNGBLOOD", "YOUNGER", "YOUNT", "YU", "ZAMBRANO", "ZAMORA", "ZAPATA", - "ZARAGOZA", "ZARATE", "ZAVALA", "ZEIGLER", "ZELLER", "ZEPEDA", "ZHANG", "ZIEGLER", "ZIELINSKI", - "ZIMMER", "ZIMMERMAN", "ZINK", "ZOOK", "ZUNIGA" }; - } - - public static String generateRandomName() { - String first, last; - - boolean isScottish = (MathUtils.randInt(0, 10) >= 9); - - if (isScottish) { - first = mScottishFirstNames[MathUtils.randInt(0, mScottishFirstNames.length - 1)].toLowerCase(); - } else { - first = mFirstNames[MathUtils.randInt(0, mFirstNames.length - 1)].toLowerCase(); - } - - last = mLastNames[MathUtils.randInt(0, mLastNames.length - 1)].toLowerCase(); - if (first.equalsIgnoreCase(last)) { - while (first.equalsIgnoreCase(last)) - first = mFirstNames[MathUtils.randInt(0, mFirstNames.length - 1)].toLowerCase(); - } - first = StringUtils.capitalize(first); - last = StringUtils.capitalize(last); - return first + " " + last; - } -} diff --git a/src/main/java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java b/src/main/java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java deleted file mode 100644 index 7a93cbbeb7..0000000000 --- a/src/main/java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java +++ /dev/null @@ -1,30 +0,0 @@ -package gtPlusPlus.plugin.villagers; - -import net.minecraftforge.event.entity.EntityJoinWorldEvent; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import gtPlusPlus.core.util.Utils; - -public class VillagerEventHandler { - - private static final VillagerEventHandler mInstance; - - static { - mInstance = new VillagerEventHandler(); - Utils.registerEvent(mInstance); - } - - @SubscribeEvent - public void onEntityJoinWorld(EntityJoinWorldEvent event) { - - /* - * try { if (event.entity != null && event.entity instanceof EntityLivingBase && event.entity instanceof - * EntityVillager){ EntityVillager entity = (EntityVillager) event.entity; World world = entity.worldObj; int - * profession = entity.getProfession(); if (world != null && (profession >= 7735 && profession <= 7737)){ - * EntityBaseVillager mNew = new EntityBaseVillager(world, profession); mNew.copyLocationAndAnglesFrom(entity); - * if (mNew != null) { world.removeEntity(entity); world.spawnEntityInWorld(mNew); } } } } catch (Throwable t) { - * t.printStackTrace(); return; } - */ - - } -} diff --git a/src/main/java/gtPlusPlus/plugin/waila/Core_WailaPlugin.java b/src/main/java/gtPlusPlus/plugin/waila/Core_WailaPlugin.java deleted file mode 100644 index 2e050f411d..0000000000 --- a/src/main/java/gtPlusPlus/plugin/waila/Core_WailaPlugin.java +++ /dev/null @@ -1,59 +0,0 @@ -package gtPlusPlus.plugin.waila; - -import static gregtech.api.enums.Mods.Waila; - -import gtPlusPlus.api.interfaces.IPlugin; -import gtPlusPlus.plugin.manager.Core_Manager; - -public class Core_WailaPlugin implements IPlugin { - - static final Core_WailaPlugin mInstance; - static boolean mActive = false; - - static { - mInstance = new Core_WailaPlugin(); - mInstance.log("Preparing " + mInstance.getPluginName() + " for use."); - } - - Core_WailaPlugin() { - Core_Manager.registerPlugin(this); - } - - @Override - public boolean preInit() { - if (Waila.isModLoaded()) { - mActive = true; - } - return mActive; - } - - @Override - public boolean init() { - return mActive; - } - - @Override - public boolean postInit() { - return mActive; - } - - @Override - public boolean serverStart() { - return mActive; - } - - @Override - public boolean serverStop() { - return mActive; - } - - @Override - public String getPluginName() { - return "GT++ WAILA module"; - } - - @Override - public String getPluginAbbreviation() { - return "Look"; - } -} diff --git a/src/main/java/gtPlusPlus/preloader/CustomClassLoader.java b/src/main/java/gtPlusPlus/preloader/CustomClassLoader.java deleted file mode 100644 index 17cb86bf49..0000000000 --- a/src/main/java/gtPlusPlus/preloader/CustomClassLoader.java +++ /dev/null @@ -1,51 +0,0 @@ -package gtPlusPlus.preloader; - -import java.security.AllPermission; -import java.security.CodeSource; -import java.security.Permissions; -import java.security.ProtectionDomain; -import java.security.cert.Certificate; -import java.util.HashMap; - -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.tree.ClassNode; - -public class CustomClassLoader extends ClassLoader { - - private HashMap<String, ClassNode> classes = new HashMap<String, ClassNode>(); - - @Override - public Class<?> loadClass(String name) throws ClassNotFoundException { - return findClass(name); - } - - @Override - protected Class<?> findClass(String name) throws ClassNotFoundException { - ClassNode node = classes.get(name.replace('.', '/')); - if (node != null) return nodeToClass(node); - else return super.findClass(name); - } - - public final void addNode(ClassNode node) { - classes.put(node.name, node); - } - - private final Class<?> nodeToClass(ClassNode node) { - if (super.findLoadedClass(node.name) != null) return findLoadedClass(node.name); - ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS); - node.accept(cw); - byte[] b = cw.toByteArray(); - return defineClass(node.name.replace('/', '.'), b, 0, b.length, getDomain()); - } - - private final ProtectionDomain getDomain() { - CodeSource code = new CodeSource(null, (Certificate[]) null); - return new ProtectionDomain(code, getPermissions()); - } - - private final Permissions getPermissions() { - Permissions permissions = new Permissions(); - permissions.add(new AllPermission()); - return permissions; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java b/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java index 4d04eab1cd..e3fdc9ae0a 100644 --- a/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java +++ b/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java @@ -1,10 +1,7 @@ package gtPlusPlus.xmod.bartworks; -import java.util.ArrayList; - import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.bartworks.system.material.BW_NonMeta_MaterialItems; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; @@ -12,15 +9,6 @@ import gregtech.api.enums.OrePrefixes; public class BW_Utils { - public static ArrayList<ItemStack> getAll(int aStackSize) { - ArrayList<ItemStack> aItems = new ArrayList<>(); - aItems.add(BW_NonMeta_MaterialItems.TiberiumCell_1.get(aStackSize)); - aItems.add(BW_NonMeta_MaterialItems.TiberiumCell_2.get(aStackSize)); - aItems.add(BW_NonMeta_MaterialItems.TiberiumCell_4.get(aStackSize)); - aItems.add(BW_NonMeta_MaterialItems.TheCoreCell.get(aStackSize)); - return aItems; - } - public static ItemStack getCorrespondingItemStack(OrePrefixes orePrefixes, short werkstoffID, int amount) { Werkstoff werkstoff = Werkstoff.werkstoffHashMap.get(werkstoffID); if (werkstoff == null) return null; diff --git a/src/main/java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java b/src/main/java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java deleted file mode 100644 index 55bc7fb4cd..0000000000 --- a/src/main/java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java +++ /dev/null @@ -1,19 +0,0 @@ -package gtPlusPlus.xmod.bop.creative; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; - -public class MiscUtilsBOPTab extends CreativeTabs { - - public MiscUtilsBOPTab(final String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest).getItem(); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java deleted file mode 100644 index ef33baab5a..0000000000 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available - * at http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie, - * MysteriousAges - ******************************************************************************/ -package gtPlusPlus.xmod.forestry.bees.blocks; - -import forestry.apiculture.blocks.BlockApicultureType; -import forestry.core.blocks.BlockBase; -import gtPlusPlus.core.creative.AddToCreativeTab; - -public class BlockDenseBeeHouse extends BlockBase<BlockApicultureType> { - - public BlockDenseBeeHouse() { - super(); - setCreativeTab(AddToCreativeTab.tabBOP); - setHarvestLevel("axe", 0); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java deleted file mode 100644 index f873963b7f..0000000000 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java +++ /dev/null @@ -1,26 +0,0 @@ -package gtPlusPlus.xmod.forestry.bees.blocks; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -import cpw.mods.fml.common.registry.GameRegistry; -import forestry.core.utils.StringUtil; -import forestry.plugins.PluginManager; - -public abstract class FR_BlockRegistry { - - protected static <T extends Block> T registerBlock(T block, Class<? extends ItemBlock> itemClass, String name) { - if (PluginManager.getStage() != PluginManager.Stage.SETUP) { - throw new RuntimeException("Tried to register Block outside of Setup"); - } - block.setBlockName("for." + name); - GameRegistry.registerBlock(block, itemClass, StringUtil.cleanBlockName(block)); - return block; - } - - protected static void registerOreDictWildcard(String oreDictName, Block block) { - OreDictionary.registerOre(oreDictName, new ItemStack(block, 1, 32767)); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java deleted file mode 100644 index 73399d970f..0000000000 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available - * at http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie, - * MysteriousAges - ******************************************************************************/ -package gtPlusPlus.xmod.forestry.bees.gui; - -import net.minecraft.entity.player.InventoryPlayer; - -import forestry.apiculture.gui.ContainerBeeHelper; -import forestry.apiculture.gui.IContainerBeeHousing; -import forestry.apiculture.tiles.TileBeeHousingBase; -import forestry.core.gui.ContainerTile; -import forestry.core.network.IForestryPacketClient; -import forestry.core.network.packets.PacketGuiUpdate; - -public class ContainerBeeHouse extends ContainerTile<TileBeeHousingBase> implements IContainerBeeHousing { - - public ContainerBeeHouse(InventoryPlayer player, TileBeeHousingBase tile, boolean hasFrames) { - super(tile, player, 8, 108); - ContainerBeeHelper.addSlots(this, tile, hasFrames); - } - - private int beeProgress = 0; - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - - int beeProgress = tile.getBeekeepingLogic().getBeeProgressPercent(); - if (this.beeProgress != beeProgress) { - this.beeProgress = beeProgress; - IForestryPacketClient packet = new PacketGuiUpdate(tile); - sendPacketToCrafters(packet); - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java deleted file mode 100644 index b2cdd2b2ef..0000000000 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java +++ /dev/null @@ -1,56 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available - * at http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie, - * MysteriousAges - ******************************************************************************/ -package gtPlusPlus.xmod.forestry.bees.gui; - -import net.minecraft.inventory.Container; - -import forestry.apiculture.gui.IContainerBeeHousing; -import forestry.apiculture.gui.IGuiBeeHousingInventory; -import forestry.core.config.Constants; -import forestry.core.gui.GuiForestryTitled; -import forestry.core.render.EnumTankLevel; - -public class GuiBeeHouse<C extends Container & IContainerBeeHousing> - extends GuiForestryTitled<C, IGuiBeeHousingInventory> { - - public enum Icon { - - APIARY("/apiary.png"), - BEE_HOUSE("/alveary.png"); - - private final String path; - - Icon(String path) { - this.path = path; - } - } - - public GuiBeeHouse(IGuiBeeHousingInventory tile, C container, Icon icon) { - super(Constants.TEXTURE_PATH_GUI + icon.path, container, tile); - ySize = 190; - } - - @Override - protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); - - drawHealthMeter( - guiLeft + 20, - guiTop + 37, - inventory.getHealthScaled(46), - EnumTankLevel.rateTankLevel(inventory.getHealthScaled(100))); - } - - private void drawHealthMeter(int x, int y, int height, EnumTankLevel rated) { - int i = 176 + rated.getLevelScaled(16); - int k = 0; - - this.drawTexturedModalRect(x, y + 46 - height, i, k + 46 - height, 4, height); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java deleted file mode 100644 index 31671afaa1..0000000000 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java +++ /dev/null @@ -1,97 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available - * at http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie, - * MysteriousAges - ******************************************************************************/ -package gtPlusPlus.xmod.forestry.bees.inventory; - -import java.util.ArrayList; -import java.util.Collection; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import forestry.api.apiculture.BeeManager; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IBeekeepingMode; -import forestry.api.apiculture.IHiveFrame; -import forestry.apiculture.InventoryBeeHousing; -import forestry.apiculture.inventory.IApiaryInventory; -import forestry.core.access.IAccessHandler; -import forestry.core.utils.SlotUtil; - -public class InventoryDenseBeeHouse extends InventoryBeeHousing implements IApiaryInventory { - - public static final int SLOT_FRAMES_1 = 9; - public static final int SLOT_FRAMES_COUNT = 3; - - public InventoryDenseBeeHouse(IAccessHandler accessHandler) { - super(12, accessHandler); - } - - @Override - public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { - if (SlotUtil.isSlotInRange(slotIndex, SLOT_FRAMES_1, SLOT_FRAMES_COUNT)) { - return (itemStack.getItem() instanceof IHiveFrame) && (getStackInSlot(slotIndex) == null); - } - - return super.canSlotAccept(slotIndex, itemStack); - } - - // override for pipe automation - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) { - if (SlotUtil.isSlotInRange(slotIndex, SLOT_FRAMES_1, SLOT_FRAMES_COUNT)) { - return false; - } - return super.isItemValidForSlot(slotIndex, itemStack); - } - - public Collection<IHiveFrame> getFrames() { - Collection<IHiveFrame> hiveFrames = new ArrayList<>(SLOT_FRAMES_COUNT); - - for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) { - ItemStack stackInSlot = getStackInSlot(i); - if (stackInSlot == null) { - continue; - } - - Item itemInSlot = stackInSlot.getItem(); - if (itemInSlot instanceof IHiveFrame) { - hiveFrames.add((IHiveFrame) itemInSlot); - } - } - - return hiveFrames; - } - - @Override - public void wearOutFrames(IBeeHousing beeHousing, int amount) { - IBeekeepingMode beekeepingMode = BeeManager.beeRoot.getBeekeepingMode(beeHousing.getWorld()); - int wear = Math.round(amount * beekeepingMode.getWearModifier()); - - for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) { - ItemStack hiveFrameStack = getStackInSlot(i); - if (hiveFrameStack == null) { - continue; - } - - Item hiveFrameItem = hiveFrameStack.getItem(); - if (!(hiveFrameItem instanceof IHiveFrame)) { - continue; - } - - IHiveFrame hiveFrame = (IHiveFrame) hiveFrameItem; - - ItemStack queenStack = getQueen(); - IBee queen = BeeManager.beeRoot.getMember(queenStack); - ItemStack usedFrame = hiveFrame.frameUsed(beeHousing, hiveFrameStack, queen, wear); - - setInventorySlotContents(i, usedFrame); - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java deleted file mode 100644 index 56df184fc1..0000000000 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java +++ /dev/null @@ -1,97 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available - * at http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie, - * MysteriousAges - ******************************************************************************/ -package gtPlusPlus.xmod.forestry.bees.tileentities; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.statements.ITriggerExternal; -import cpw.mods.fml.common.Optional; -import forestry.api.apiculture.IBeeHousingInventory; -import forestry.api.apiculture.IBeeListener; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.apiculture.IHiveFrame; -import forestry.apiculture.ApiaryBeeListener; -import forestry.apiculture.ApiaryBeeModifier; -import forestry.apiculture.IApiary; -import forestry.apiculture.inventory.IApiaryInventory; -import forestry.apiculture.inventory.InventoryApiary; -import forestry.apiculture.tiles.TileBeeHousingBase; -import forestry.apiculture.trigger.ApicultureTriggers; -import gtPlusPlus.xmod.forestry.bees.gui.ContainerBeeHouse; -import gtPlusPlus.xmod.forestry.bees.gui.GuiBeeHouse; - -public class TileDenseBeeHouse extends TileBeeHousingBase implements IApiary { - - private final IBeeModifier beeModifier = new ApiaryBeeModifier(); - private final IBeeListener beeListener = new ApiaryBeeListener(this); - private final InventoryApiary inventory = new InventoryApiary(getAccessHandler()); - - public TileDenseBeeHouse() { - super("apiary2"); - setInternalInventory(inventory); - } - - @Override - public IBeeHousingInventory getBeeInventory() { - return inventory; - } - - @Override - public IApiaryInventory getApiaryInventory() { - return inventory; - } - - @Override - public Collection<IBeeModifier> getBeeModifiers() { - List<IBeeModifier> beeModifiers = new ArrayList<>(); - - beeModifiers.add(beeModifier); - - for (IHiveFrame frame : inventory.getFrames()) { - beeModifiers.add(frame.getBeeModifier()); - } - - return beeModifiers; - } - - @Override - public Iterable<IBeeListener> getBeeListeners() { - return Collections.singleton(beeListener); - } - - /* ITRIGGERPROVIDER */ - @Optional.Method(modid = "BuildCraftAPI|statements") - @Override - public Collection<ITriggerExternal> getExternalTriggers(ForgeDirection side, TileEntity tile) { - LinkedList<ITriggerExternal> res = new LinkedList<>(); - res.add(ApicultureTriggers.missingQueen); - res.add(ApicultureTriggers.missingDrone); - res.add(ApicultureTriggers.noFrames); - return res; - } - - @Override - public Object getGui(EntityPlayer player, int data) { - ContainerBeeHouse container = new ContainerBeeHouse(player.inventory, this, true); - return new GuiBeeHouse<>(this, container, GuiBeeHouse.Icon.APIARY); - } - - @Override - public Object getContainer(EntityPlayer player, int data) { - return new ContainerBeeHouse(player.inventory, this, true); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/goodgenerator/GG_Utils.java b/src/main/java/gtPlusPlus/xmod/goodgenerator/GG_Utils.java deleted file mode 100644 index a58ffc00df..0000000000 --- a/src/main/java/gtPlusPlus/xmod/goodgenerator/GG_Utils.java +++ /dev/null @@ -1,56 +0,0 @@ -package gtPlusPlus.xmod.goodgenerator; - -import java.lang.reflect.Field; -import java.util.ArrayList; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; - -public class GG_Utils { - - private static final Class sClassFuelRodLoader; - private static final Field[] sClassFuelRodLoaderFields; - - static { - sClassFuelRodLoader = ReflectionUtils.getClass("goodgenerator.loader.FuelRodLoader"); - sClassFuelRodLoaderFields = ReflectionUtils.getAllFields(sClassFuelRodLoader); - } - - public enum GG_Fuel_Rod { - rodCompressedUranium, - rodCompressedUranium_2, - rodCompressedUranium_4, - rodCompressedPlutonium, - rodCompressedPlutonium_2, - rodCompressedPlutonium_4, - rodCompressedUraniumDepleted, - rodCompressedUraniumDepleted_2, - rodCompressedUraniumDepleted_4, - rodCompressedPlutoniumDepleted, - rodCompressedPlutoniumDepleted_2, - rodCompressedPlutoniumDepleted_4,; - } - - public static ItemStack getGG_Fuel_Rod(GG_Fuel_Rod aItem, int aAmount) { - if (sClassFuelRodLoader != null) { - return ItemUtils.getSimpleStack( - (Item) ReflectionUtils.getFieldValue(ReflectionUtils.getField(sClassFuelRodLoader, aItem.name())), - aAmount); - } - return null; - } - - public static ArrayList<ItemStack> getAll(int aStackSize) { - ArrayList<ItemStack> aItems = new ArrayList<ItemStack>(); - aItems.add(getGG_Fuel_Rod(GG_Fuel_Rod.rodCompressedUranium, aStackSize)); - aItems.add(getGG_Fuel_Rod(GG_Fuel_Rod.rodCompressedUranium_2, aStackSize)); - aItems.add(getGG_Fuel_Rod(GG_Fuel_Rod.rodCompressedUranium_4, aStackSize)); - aItems.add(getGG_Fuel_Rod(GG_Fuel_Rod.rodCompressedPlutonium, aStackSize)); - aItems.add(getGG_Fuel_Rod(GG_Fuel_Rod.rodCompressedPlutonium_2, aStackSize)); - aItems.add(getGG_Fuel_Rod(GG_Fuel_Rod.rodCompressedPlutonium_4, aStackSize)); - return aItems; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index fee3c12277..efddb59ffb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -36,7 +36,6 @@ import gtPlusPlus.recipes.CokeAndPyrolyseOven; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config; -import gtPlusPlus.xmod.gregtech.api.world.GTPP_Worldgen; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; import gtPlusPlus.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; @@ -57,7 +56,6 @@ public class HANDLER_GT { public static GT_Config mMaterialProperties = null; public static GTPP_Config sCustomWorldgenFile = null; public static final List<WorldGen_GT> sWorldgenListEverglades = new ArrayList<>(); - public static final List<GTPP_Worldgen> sCustomWorldgenList = new ArrayList<>(); public static GT_MetaGenerated_Tool sMetaGeneratedToolInstance; public static void preInit() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java deleted file mode 100644 index 78b5cced08..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java +++ /dev/null @@ -1,55 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.energy; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -/** - * Provides the ability to store energy on the implementing item. - * - * The item should have a maximum damage of 13. - */ -public interface IC2ElectricItem { - - /** - * Determine if the item can be used in a machine or as an armor part to supply energy. - * - * @return Whether the item can supply energy - */ - boolean canProvideEnergy(ItemStack itemStack); - - /** - * Get the item ID to use for a charge energy greater than 0. - * - * @return Item ID to use - */ - Item getChargedItem(ItemStack itemStack); - - /** - * Get the item ID to use for a charge energy of 0. - * - * @return Item ID to use - */ - Item getEmptyItem(ItemStack itemStack); - - /** - * Get the item's maximum charge energy in EU. - * - * @return Maximum charge energy - */ - double getMaxCharge(ItemStack itemStack); - - /** - * Get the item's tier, lower tiers can't send energy to higher ones. Batteries are Tier 1, Energy Crystals are Tier - * 2, Lapotron Crystals are Tier 3. - * - * @return Item's tier - */ - int getTier(ItemStack itemStack); - - /** - * Get the item's transfer limit in EU per transfer operation. - * - * @return Transfer limit - */ - double getTransferLimit(ItemStack itemStack); -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java deleted file mode 100644 index 007d66de66..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java +++ /dev/null @@ -1,94 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.energy; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; - -/** - * This interface specifies a manager to handle the various tasks for electric items. - * - * The default implementation does the following: - store and retrieve the charge - handle charging, taking amount, - * tier, transfer limit, canProvideEnergy and simulate into account - replace item IDs if appropriate - * (getChargedItemId() and getEmptyItemId()) - update and manage the damage value for the visual charge indicator - * - * @note If you're implementing your own variant (ISpecialElectricItem), you can delegate to the default implementations - * through ElectricItem.rawManager. The default implementation is designed to minimize its dependency on its own - * constraints/structure and delegates most work back to the more atomic features in the gateway manager. - */ -public interface IC2ElectricItemManager { - - /** - * Charge an item with a specified amount of energy. - * - * @param itemStack electric item's stack - * @param amount amount of energy to charge in EU - * @param tier tier of the charging device, has to be at least as high as the item to charge - * @param ignoreTransferLimit ignore the transfer limit specified by getTransferLimit() - * @param simulate don't actually change the item, just determine the return value - * @return Energy transferred into the electric item - */ - double charge(ItemStack stack, double amount, int tier, boolean ignoreTransferLimit, boolean simulate); - - /** - * Discharge an item by a specified amount of energy - * - * @param itemStack electric item's stack - * @param amount amount of energy to discharge in EU - * @param tier tier of the discharging device, has to be at least as high as the item to discharge - * @param ignoreTransferLimit ignore the transfer limit specified by getTransferLimit() - * @param externally use the supplied item externally, i.e. to power something else as if it was a battery - * @param simulate don't actually discharge the item, just determine the return value - * @return Energy retrieved from the electric item - */ - double discharge(ItemStack stack, double amount, int tier, boolean ignoreTransferLimit, boolean externally, - boolean simulate); - - /** - * Determine the charge level for the specified item. - * - * @param itemStack ItemStack containing the electric item - * @return charge level in EU - */ - double getCharge(ItemStack stack); - - /** - * Determine if the specified electric item has at least a specific amount of EU. This is supposed to be used in the - * item code during operation, for example if you want to implement your own electric item. BatPacks are not taken - * into account. - * - * @param itemStack electric item's stack - * @param amount minimum amount of energy required - * @return true if there's enough energy - */ - boolean canUse(ItemStack stack, double amount); - - /** - * Try to retrieve a specific amount of energy from an Item, and if applicable, a BatPack. This is supposed to be - * used in the item code during operation, for example if you want to implement your own electric item. - * - * @param itemStack electric item's stack - * @param amount amount of energy to discharge in EU - * @param entity entity holding the item - * @return true if the operation succeeded - */ - boolean use(ItemStack stack, double amount, EntityLivingBase entity); - - /** - * Charge an item from the BatPack a player is wearing. This is supposed to be used in the item code during - * operation, for example if you want to implement your own electric item. use() already contains this - * functionality. - * - * @param itemStack electric item's stack - * @param entity entity holding the item - */ - void chargeFromArmor(ItemStack stack, EntityLivingBase entity); - - /** - * Get the tool tip to display for electric items. - * - * @param itemStack ItemStack to determine the tooltip for - * @return tool tip string or null for none - */ - String getToolTip(ItemStack stack); - - // TODO: add tier getter -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java deleted file mode 100644 index 74c9d9ee5b..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java +++ /dev/null @@ -1,83 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.enums; - -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; - -import gregtech.api.GregTech_API; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.interfaces.ITexture; -import gregtech.api.objects.GT_RenderedTexture; -import gtPlusPlus.core.lib.CORE; - -public class CustomGtTextures { - - public enum ItemIcons implements IIconContainer, Runnable { - - VOID, // The Empty Texture - RENDERING_ERROR, - PUMP, - SKOOKUMCHOOCHER; - - public static final ITexture[] ERROR_RENDERING = new ITexture[] { new GT_RenderedTexture(RENDERING_ERROR) }; - - protected IIcon mIcon, mOverlay; - - private ItemIcons() { - GregTech_API.sGTItemIconload.add(this); - } - - @Override - public IIcon getIcon() { - return this.mIcon; - } - - @Override - public IIcon getOverlayIcon() { - return this.mOverlay; - } - - @Override - public ResourceLocation getTextureFile() { - return TextureMap.locationItemsTexture; - } - - @Override - public void run() { - this.mIcon = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + "iconsets/" + this); - this.mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + "iconsets/" + this + "_OVERLAY"); - } - - public static class CustomIcon implements IIconContainer, Runnable { - - protected IIcon mIcon, mOverlay; - protected String mIconName; - - public CustomIcon(final String aIconName) { - this.mIconName = aIconName; - GregTech_API.sGTItemIconload.add(this); - } - - @Override - public IIcon getIcon() { - return this.mIcon; - } - - @Override - public IIcon getOverlayIcon() { - return this.mOverlay; - } - - @Override - public void run() { - this.mIcon = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + this.mIconName); - this.mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + this.mIconName + "_OVERLAY"); - } - - @Override - public ResourceLocation getTextureFile() { - return TextureMap.locationItemsTexture; - } - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java deleted file mode 100644 index 87d85a578e..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java +++ /dev/null @@ -1,159 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.enums; - -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.IIconContainer; - -public class GregtechTextureSet { - - public static final GregtechTextureSet SET_NONE = new GregtechTextureSet("NONE"), - SET_DULL = new GregtechTextureSet("DULL"), SET_RUBY = new GregtechTextureSet("RUBY"), - SET_OPAL = new GregtechTextureSet("OPAL"), SET_LEAF = new GregtechTextureSet("LEAF"), - SET_WOOD = new GregtechTextureSet("WOOD"), SET_SAND = new GregtechTextureSet("SAND"), - SET_FINE = new GregtechTextureSet("FINE"), SET_FIERY = new GregtechTextureSet("FIERY"), - SET_FLUID = new GregtechTextureSet("FLUID"), SET_ROUGH = new GregtechTextureSet("ROUGH"), - SET_PAPER = new GregtechTextureSet("PAPER"), SET_GLASS = new GregtechTextureSet("GLASS"), - SET_FLINT = new GregtechTextureSet("FLINT"), SET_LAPIS = new GregtechTextureSet("LAPIS"), - SET_SHINY = new GregtechTextureSet("SHINY"), SET_SHARDS = new GregtechTextureSet("SHARDS"), - SET_POWDER = new GregtechTextureSet("POWDER"), SET_QUARTZ = new GregtechTextureSet("QUARTZ"), - SET_EMERALD = new GregtechTextureSet("EMERALD"), SET_DIAMOND = new GregtechTextureSet("DIAMOND"), - SET_LIGNITE = new GregtechTextureSet("LIGNITE"), SET_MAGNETIC = new GregtechTextureSet("MAGNETIC"), - SET_METALLIC = new GregtechTextureSet("METALLIC"), SET_NETHERSTAR = new GregtechTextureSet("NETHERSTAR"), - SET_GEM_VERTICAL = new GregtechTextureSet("GEM_VERTICAL"), - SET_GEM_HORIZONTAL = new GregtechTextureSet("GEM_HORIZONTAL"); - - public final IIconContainer[] mTextures = new IIconContainer[128]; - public final String mSetName; - - public GregtechTextureSet(final String aSetName) { - this.mSetName = aSetName; - this.mTextures[0] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/turbineBlade"); - this.mTextures[1] = new Textures.ItemIcons.CustomIcon( - "materialicons/" + this.mSetName + "/toolHeadSkookumChoocher"); - this.mTextures[2] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[3] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[4] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[5] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[6] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[7] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[8] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[9] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[10] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[11] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[12] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[13] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[14] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[15] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[16] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[17] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[18] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[19] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[20] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[21] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[22] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[23] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[24] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[25] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[26] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[27] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[28] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[29] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[30] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[31] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[32] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[33] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[34] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[35] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[36] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[37] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[38] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[39] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[40] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[41] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[42] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[43] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[44] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[45] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[46] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[47] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[48] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[49] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[50] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[51] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[52] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[53] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[54] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[55] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[56] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[57] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[58] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[59] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[60] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[61] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[62] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[63] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[64] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[65] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[66] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[67] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[68] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[69] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[70] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[71] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[72] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[73] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[74] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[75] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[76] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[77] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[78] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[79] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[80] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[81] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[82] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[83] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[84] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[85] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[86] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[87] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[88] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[89] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[90] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[91] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[92] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[93] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[94] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[95] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[96] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[97] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[98] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[99] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[100] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[101] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[102] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[103] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[104] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[105] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[106] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[107] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[108] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[109] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[110] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[111] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[112] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[113] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[114] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[115] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[116] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[117] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[118] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[119] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[120] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[121] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[122] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[123] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[124] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[125] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[126] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - this.mTextures[127] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java deleted file mode 100644 index 1b9a88e230..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java +++ /dev/null @@ -1,188 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.enums; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; - -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_IconContainer; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_Texture; -import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; - -public class GregtechTextures { - - public enum BlockIcons implements Interface_IconContainer, Runnable { - - VOID, - - LARGECENTRIFUGE1, - LARGECENTRIFUGE2, - LARGECENTRIFUGE3, - LARGECENTRIFUGE4, - LARGECENTRIFUGE5, - LARGECENTRIFUGE6, - LARGECENTRIFUGE7, - LARGECENTRIFUGE8, - LARGECENTRIFUGE9, - LARGECENTRIFUGE_ACTIVE1, - LARGECENTRIFUGE_ACTIVE2, - LARGECENTRIFUGE_ACTIVE3, - LARGECENTRIFUGE_ACTIVE4, - LARGECENTRIFUGE_ACTIVE5, - LARGECENTRIFUGE_ACTIVE6, - LARGECENTRIFUGE_ACTIVE7, - LARGECENTRIFUGE_ACTIVE8, - LARGECENTRIFUGE_ACTIVE9; - - public static final Interface_IconContainer[] CENTRIFUGE = new Interface_IconContainer[] { LARGECENTRIFUGE1, - LARGECENTRIFUGE2, LARGECENTRIFUGE3, LARGECENTRIFUGE4, LARGECENTRIFUGE5, LARGECENTRIFUGE6, - LARGECENTRIFUGE7, LARGECENTRIFUGE8, LARGECENTRIFUGE9 }, - CENTRIFUGE_ACTIVE = new Interface_IconContainer[] { LARGECENTRIFUGE_ACTIVE1, LARGECENTRIFUGE_ACTIVE2, - LARGECENTRIFUGE_ACTIVE3, LARGECENTRIFUGE_ACTIVE4, LARGECENTRIFUGE_ACTIVE5, - LARGECENTRIFUGE_ACTIVE6, LARGECENTRIFUGE_ACTIVE7, LARGECENTRIFUGE_ACTIVE8, - LARGECENTRIFUGE_ACTIVE9 }; - - public static Interface_Texture[] GT_CASING_BLOCKS = new Interface_Texture[64]; - - protected IIcon mIcon; - - private BlockIcons() { - Meta_GT_Proxy.GT_BlockIconload.add(this); - } - - @Override - public IIcon getIcon() { - return this.mIcon; - } - - @Override - public IIcon getOverlayIcon() { - return null; - } - - @Override - public void run() { - this.mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(GTPlusPlus.ID + ":" + "iconsets/" + this); - } - - @Override - public ResourceLocation getTextureFile() { - return TextureMap.locationBlocksTexture; - } - - public static class CustomIcon implements Interface_IconContainer, Runnable { - - protected IIcon mIcon; - protected String mIconName; - - public CustomIcon(final String aIconName) { - this.mIconName = aIconName; - Meta_GT_Proxy.GT_BlockIconload.add(this); - } - - @Override - public IIcon getIcon() { - return this.mIcon; - } - - @Override - public IIcon getOverlayIcon() { - return null; - } - - @Override - public void run() { - this.mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(GTPlusPlus.ID + ":" + this.mIconName); - } - - @Override - public ResourceLocation getTextureFile() { - return TextureMap.locationBlocksTexture; - } - } - } - - public enum ItemIcons implements Interface_IconContainer, Runnable { - - VOID, // The Empty Texture - RENDERING_ERROR, // The Purple/Black Texture - SKOOKUMCHOOCHER, // The Skookum Tool Texture - PUMP, // The Hand Pump Texture - TURBINE_SMALL, - TURBINE_LARGE, - TURBINE_HUGE; - - /* - * public static final Interface_IconContainer[] DURABILITY_BAR = new Interface_IconContainer[]{ - * DURABILITY_BAR_0, DURABILITY_BAR_1, DURABILITY_BAR_2, DURABILITY_BAR_3, DURABILITY_BAR_4, DURABILITY_BAR_5, - * DURABILITY_BAR_6, DURABILITY_BAR_7, DURABILITY_BAR_8, }, ENERGY_BAR = new Interface_IconContainer[]{ - * ENERGY_BAR_0, ENERGY_BAR_1, ENERGY_BAR_2, ENERGY_BAR_3, ENERGY_BAR_4, ENERGY_BAR_5, ENERGY_BAR_6, - * ENERGY_BAR_7, ENERGY_BAR_8, }; - */ - - // public static final Interface_Texture[] ERROR_RENDERING = new Interface_Texture[]{new - // GregtechRenderedTexture(RENDERING_ERROR)}; - - protected IIcon mIcon, mOverlay; - - private ItemIcons() { - Meta_GT_Proxy.GT_ItemIconload.add(this); - } - - @Override - public IIcon getIcon() { - return this.mIcon; - } - - @Override - public IIcon getOverlayIcon() { - return this.mOverlay; - } - - @Override - public ResourceLocation getTextureFile() { - return TextureMap.locationItemsTexture; - } - - @Override - public void run() { - this.mIcon = Meta_GT_Proxy.sItemIcons.registerIcon(GTPlusPlus.ID + ":" + "iconsets/" + this); - this.mOverlay = Meta_GT_Proxy.sItemIcons - .registerIcon(GTPlusPlus.ID + ":" + "iconsets/" + this + "_OVERLAY"); - } - - public static class CustomIcon implements Interface_IconContainer, Runnable { - - protected IIcon mIcon, mOverlay; - protected String mIconName; - - public CustomIcon(final String aIconName) { - this.mIconName = aIconName; - Meta_GT_Proxy.GT_ItemIconload.add(this); - } - - @Override - public IIcon getIcon() { - return this.mIcon; - } - - @Override - public IIcon getOverlayIcon() { - return this.mOverlay; - } - - @Override - public void run() { - this.mIcon = Meta_GT_Proxy.sItemIcons.registerIcon(GTPlusPlus.ID + ":" + this.mIconName); - this.mOverlay = Meta_GT_Proxy.sItemIcons - .registerIcon(GTPlusPlus.ID + ":" + this.mIconName + "_OVERLAY"); - } - - @Override - public ResourceLocation getTextureFile() { - return TextureMap.locationItemsTexture; - } - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatEntity.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatEntity.java deleted file mode 100644 index eff3de28a3..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatEntity.java +++ /dev/null @@ -1,28 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.interfaces; - -import net.minecraftforge.common.util.ForgeDirection; - -import ic2.api.energy.tile.IHeatSource; - -public interface IHeatEntity extends IHeatSource, IHeatSink { - - public int getHeatBuffer(); - - public void setHeatBuffer(int HeatBuffer); - - public void addtoHeatBuffer(int heat); - - public int getTransmitHeat(); - - public int fillHeatBuffer(int maxAmount); - - public int getMaxHeatEmittedPerTick(); - - public void updateHeatEntity(); - - @Override - public int maxrequestHeatTick(ForgeDirection directionFrom); - - @Override - public int requestHeat(ForgeDirection directionFrom, int requestheat); -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatSink.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatSink.java deleted file mode 100644 index 9e671fe538..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatSink.java +++ /dev/null @@ -1,10 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.interfaces; - -import net.minecraftforge.common.util.ForgeDirection; - -public interface IHeatSink { - - int maxHeatInPerTick(ForgeDirection var1); - - int addHeat(ForgeDirection var1, int var2); -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IMetaTileEntityHeatPipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IMetaTileEntityHeatPipe.java deleted file mode 100644 index cb5d875071..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IMetaTileEntityHeatPipe.java +++ /dev/null @@ -1,12 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.interfaces; - -import java.util.ArrayList; - -import net.minecraft.tileentity.TileEntity; - -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; - -public interface IMetaTileEntityHeatPipe extends IMetaTileEntity { - - long transferHeat(byte var1, long var2, long var4, ArrayList<TileEntity> var6); -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java deleted file mode 100644 index 2f4eaf4293..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java +++ /dev/null @@ -1,22 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.interfaces.internal; - -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; - -public interface Interface_IconContainer { - - /** - * @return A regular Icon. - */ - public IIcon getIcon(); - - /** - * @return Icon of the Overlay (or null if there is no Icon) - */ - public IIcon getOverlayIcon(); - - /** - * @return the Default Texture File for this Icon. - */ - public ResourceLocation getTextureFile(); -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java deleted file mode 100644 index 230dc6ab8d..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java +++ /dev/null @@ -1,20 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.interfaces.internal; - -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.OrePrefixes; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; - -public interface Interface_OreRecipeRegistrator_GT { - - /** - * Contains a Code Fragment, used in the OrePrefix to register Recipes. Better than using a switch/case, like I did - * before. - * - * @param aPrefix always != null - * @param aMaterial always != null, and can be == _NULL if the Prefix is Self Referencing or not Material based! - * @param aStack always != null - */ - public void registerOre(OrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack); -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java deleted file mode 100644 index 53d3055213..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java +++ /dev/null @@ -1,21 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.interfaces.internal; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; - -public interface Interface_Texture { - - public void renderXPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ); - - public void renderXNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ); - - public void renderYPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ); - - public void renderYNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ); - - public void renderZPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ); - - public void renderZNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ); - - public boolean isValidTexture(); -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java deleted file mode 100644 index 91ad6d9d9c..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java +++ /dev/null @@ -1,617 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.items.tools; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map.Entry; - -import net.minecraft.block.Block; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.item.EntityMinecart; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.stats.AchievementList; -import net.minecraft.stats.StatList; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.event.world.BlockEvent; - -import gregtech.api.GregTech_API; -import gregtech.api.enchants.Enchantment_Radioactivity; -import gregtech.api.enums.Materials; -import gregtech.api.enums.TC_Aspects.TC_AspectStack; -import gregtech.api.interfaces.IToolStats; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats; - -/** - * This is an example on how you can create a Tool ItemStack, in this case a Bismuth Wrench: - * GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01").getToolWithStats(16, 1, Materials.Bismuth, Materials.Bismuth, - * null); - */ -public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool { - - /** - * All instances of this Item Class are listed here. This gets used to register the Renderer to all Items of this - * Type, if useStandardMetaItemRenderer() returns true. - * <p/> - * You can also use the unlocalized Name gotten from getUnlocalizedName() as Key if you want to get a specific Item. - */ - public static final HashMap<String, GT_MetaGenTool> sInstances = new HashMap<>(); - - /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */ - - public final HashMap<Short, IToolStats> mToolStats = new HashMap<>(); - - /** - * Creates the Item using these Parameters. - * - * @param aUnlocalized The Unlocalized Name of this Item. - */ - public GT_MetaGenTool(final String aUnlocalized) { - super(aUnlocalized); - GT_ModHandler.registerBoxableItemToToolBox(this); - this.setCreativeTab(GregTech_API.TAB_GREGTECH); - this.setMaxStackSize(1); - sInstances.put(this.getUnlocalizedName(), this); - } - - /* ---------- FOR ADDING CUSTOM ITEMS INTO THE REMAINING 766 RANGE ---------- */ - - public static final Materials getPrimaryMaterialEx(final ItemStack aStack) { - NBTTagCompound aNBT = aStack.getTagCompound(); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag("GT.ToolStats"); - if (aNBT != null) { - return Materials.getRealMaterial(aNBT.getString("PrimaryMaterial")); - } - } - return Materials._NULL; - } - - public static final Materials getSecondaryMaterialEx(final ItemStack aStack) { - NBTTagCompound aNBT = aStack.getTagCompound(); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag("GT.ToolStats"); - if (aNBT != null) { - return Materials.getRealMaterial(aNBT.getString("SecondaryMaterial")); - } - } - return Materials._NULL; - } - - /** - * This adds a Custom Item to the ending Range. - * - * @param aID The Id of the assigned Tool Class [0 - 32765] (only even Numbers allowed! Uneven - * ID's are empty electric Items) - * @param aEnglish The Default Localized Name of the created Item - * @param aToolTip The Default ToolTip of the created Item, you can also insert null for having no - * ToolTip - * @param aToolStats The Food Value of this Item. Can be null as well. - * @param aOreDictNamesAndAspects The OreDict Names you want to give the Item. Also used to assign Thaumcraft - * Aspects. - * @return An ItemStack containing the newly created Item, but without specific Stats. - */ - public final ItemStack addToolEx(final int aID, final String aEnglish, String aToolTip, final IToolStats aToolStats, - final Object... aOreDictNamesAndAspects) { - if (aToolTip == null) { - aToolTip = ""; - } - if ((aID >= 0) && (aID < 32766) && ((aID % 2) == 0)) { - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + "." + aID + ".name", aEnglish); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + "." + aID + ".tooltip", aToolTip); - GT_LanguageManager.addStringLocalization( - this.getUnlocalizedName() + "." + (aID + 1) + ".name", - aEnglish + " (Empty)"); - GT_LanguageManager.addStringLocalization( - this.getUnlocalizedName() + "." + (aID + 1) + ".tooltip", - "You need to recharge it"); - this.mToolStats.put((short) aID, aToolStats); - this.mToolStats.put((short) (aID + 1), aToolStats); - aToolStats.onStatsAddedToTool(this, aID); - final ItemStack rStack = new ItemStack(this, 1, aID); - final List<TC_AspectStack> tAspects = new ArrayList<>(); - for (final Object tOreDictNameOrAspect : aOreDictNamesAndAspects) { - if (tOreDictNameOrAspect instanceof TC_AspectStack) { - ((TC_AspectStack) tOreDictNameOrAspect).addToAspectList(tAspects); - } else { - GT_OreDictUnificator.registerOre(tOreDictNameOrAspect, rStack); - } - } - if (GregTech_API.sThaumcraftCompat != null) { - GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false); - } - return rStack; - } - return null; - } - - /** - * This Function gets an ItemStack Version of this Tool - * - * @param aToolID the ID of the Tool Class - * @param aAmount Amount of Items (well normally you only need 1) - * @param aPrimaryMaterial Primary Material of this Tool - * @param aSecondaryMaterial Secondary (Rod/Handle) Material of this Tool - * @param aElectricArray The Electric Stats of this Tool (or null if not electric) - */ - public final ItemStack getToolWithStatsEx(final int aToolID, final int aAmount, final Materials aPrimaryMaterial, - final Materials aSecondaryMaterial, final long[] aElectricArray) { - final ItemStack rStack = new ItemStack(this, aAmount, aToolID); - final IToolStats tToolStats = this.getToolStats(rStack); - if (tToolStats != null) { - final NBTTagCompound tMainNBT = new NBTTagCompound(), tToolNBT = new NBTTagCompound(); - if (aPrimaryMaterial != null) { - tToolNBT.setString("PrimaryMaterial", aPrimaryMaterial.toString()); - tToolNBT.setLong( - "MaxDamage", - 100L * (long) (aPrimaryMaterial.mDurability * tToolStats.getMaxDurabilityMultiplier())); - } - if (aSecondaryMaterial != null) { - tToolNBT.setString("SecondaryMaterial", aSecondaryMaterial.toString()); - } - - if (aElectricArray != null) { - tToolNBT.setBoolean("Electric", true); - tToolNBT.setLong("MaxCharge", aElectricArray[0]); - tToolNBT.setLong("Voltage", aElectricArray[1]); - tToolNBT.setLong("Tier", aElectricArray[2]); - tToolNBT.setLong("SpecialData", aElectricArray[3]); - } - - tMainNBT.setTag("GT.ToolStats", tToolNBT); - rStack.setTagCompound(tMainNBT); - } - this.isItemStackUsable(rStack); - return rStack; - } - - /** - * Called by the Block Harvesting Event within the GT_Proxy - */ - @Override - public void onHarvestBlockEvent(final ArrayList<ItemStack> aDrops, final ItemStack aStack, - final EntityPlayer aPlayer, final Block aBlock, final int aX, final int aY, final int aZ, - final byte aMetaData, final int aFortune, final boolean aSilkTouch, - final BlockEvent.HarvestDropsEvent aEvent) { - final IToolStats tStats = this.getToolStats(aStack); - if (this.isItemStackUsable(aStack) && (this.getDigSpeed(aStack, aBlock, aMetaData) > 0.0F)) { - this.doDamage( - aStack, - tStats.convertBlockDrops( - aDrops, - aStack, - aPlayer, - aBlock, - aX, - aY, - aZ, - aMetaData, - aFortune, - aSilkTouch, - aEvent) * tStats.getToolDamagePerDropConversion()); - } - } - - @Override - public boolean onLeftClickEntity(final ItemStack aStack, final EntityPlayer aPlayer, final Entity aEntity) { - final IToolStats tStats = this.getToolStats(aStack); - if ((tStats == null) || !this.isItemStackUsable(aStack)) { - return true; - } - GT_Utility.doSoundAtClient(tStats.getEntityHitSound(), 1, 1.0F); - if (super.onLeftClickEntity(aStack, aPlayer, aEntity)) { - return true; - } - if (aEntity.canAttackWithItem() && !aEntity.hitByEntity(aPlayer)) { - final float tMagicDamage = tStats - .getMagicDamageAgainstEntity( - aEntity instanceof EntityLivingBase - ? EnchantmentHelper - .getEnchantmentModifierLiving(aPlayer, (EntityLivingBase) aEntity) - : 0.0F, - aEntity, - aStack, - aPlayer); - float tDamage = tStats.getNormalDamageAgainstEntity( - (float) aPlayer.getEntityAttribute(SharedMonsterAttributes.attackDamage).getAttributeValue() - + this.getToolCombatDamage(aStack), - aEntity, - aStack, - aPlayer); - if ((tDamage + tMagicDamage) > 0.0F) { - final boolean tCriticalHit = (aPlayer.fallDistance > 0.0F) && !aPlayer.onGround - && !aPlayer.isOnLadder() - && !aPlayer.isInWater() - && !aPlayer.isPotionActive(Potion.blindness) - && (aPlayer.ridingEntity == null) - && (aEntity instanceof EntityLivingBase); - if (tCriticalHit && (tDamage > 0.0F)) { - tDamage *= 1.5F; - } - tDamage += tMagicDamage; - if (aEntity.attackEntityFrom(tStats.getDamageSource(aPlayer, aEntity), tDamage)) { - if (aEntity instanceof EntityLivingBase) { - aEntity.setFire(EnchantmentHelper.getFireAspectModifier(aPlayer) * 4); - } - final int tKnockcack = (aPlayer.isSprinting() ? 1 : 0) + (aEntity instanceof EntityLivingBase - ? EnchantmentHelper.getKnockbackModifier(aPlayer, (EntityLivingBase) aEntity) - : 0); - if (tKnockcack > 0) { - aEntity.addVelocity( - -MathHelper.sin((aPlayer.rotationYaw * (float) Math.PI) / 180.0F) * tKnockcack * 0.5F, - 0.1D, - MathHelper.cos((aPlayer.rotationYaw * (float) Math.PI) / 180.0F) * tKnockcack * 0.5F); - aPlayer.motionX *= 0.6D; - aPlayer.motionZ *= 0.6D; - aPlayer.setSprinting(false); - } - if (tCriticalHit) { - aPlayer.onCriticalHit(aEntity); - } - if (tMagicDamage > 0.0F) { - aPlayer.onEnchantmentCritical(aEntity); - } - if (tDamage >= 18.0F) { - aPlayer.triggerAchievement(AchievementList.overkill); - } - aPlayer.setLastAttacker(aEntity); - if (aEntity instanceof EntityLivingBase) { - EnchantmentHelper.func_151384_a((EntityLivingBase) aEntity, aPlayer); - } - EnchantmentHelper.func_151385_b(aPlayer, aEntity); - if (aEntity instanceof EntityLivingBase) { - aPlayer.addStat(StatList.damageDealtStat, Math.round(tDamage * 10.0F)); - } - aEntity.hurtResistantTime = Math - .max(1, tStats.getHurtResistanceTime(aEntity.hurtResistantTime, aEntity)); - aPlayer.addExhaustion(0.3F); - this.doDamage(aStack, tStats.getToolDamagePerEntityAttack()); - } - } - } - if (aStack.stackSize <= 0) { - aPlayer.destroyCurrentEquippedItem(); - } - return true; - } - - @Override - public ItemStack onItemRightClick(final ItemStack aStack, final World aWorld, final EntityPlayer aPlayer) { - final IToolStats tStats = this.getToolStats(aStack); - if ((tStats != null) && tStats.canBlock()) { - aPlayer.setItemInUse(aStack, 72000); - } - return super.onItemRightClick(aStack, aWorld, aPlayer); - } - - @Override - public Long[] getFluidContainerStats(final ItemStack aStack) { - return null; - } - - @Override - public Long[] getElectricStats(final ItemStack aStack) { - NBTTagCompound aNBT = aStack.getTagCompound(); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag("GT.ToolStats"); - if ((aNBT != null) && aNBT.getBoolean("Electric")) { - return new Long[] { aNBT.getLong("MaxCharge"), aNBT.getLong("Voltage"), aNBT.getLong("Tier"), - aNBT.getLong("SpecialData") }; - } - } - return null; - } - - @Override - public float getToolCombatDamage(final ItemStack aStack) { - final IToolStats tStats = this.getToolStats(aStack); - if (tStats == null) { - return 0; - } - return tStats.getBaseDamage() + getPrimaryMaterial(aStack).mToolQuality; - } - - @Override - public float getDigSpeed(final ItemStack aStack, final Block aBlock, final int aMetaData) { - if (!this.isItemStackUsable(aStack)) { - return 0.0F; - } - final IToolStats tStats = this.getToolStats(aStack); - if ((tStats == null) || (Math.max(0, this.getHarvestLevel(aStack, "")) < aBlock.getHarvestLevel(aMetaData))) { - return 0.0F; - } - return tStats.isMinableBlock(aBlock, (byte) aMetaData) - ? Math.max(Float.MIN_NORMAL, tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed) - : 0.0F; - } - - @Override - public boolean onBlockDestroyed(final ItemStack aStack, final World aWorld, final Block aBlock, final int aX, - final int aY, final int aZ, final EntityLivingBase aPlayer) { - if (!this.isItemStackUsable(aStack)) { - return false; - } - final IToolStats tStats = this.getToolStats(aStack); - if (tStats == null) { - return false; - } - GT_Utility.doSoundAtClient(tStats.getMiningSound(), 1, 1.0F); - this.doDamage( - aStack, - (int) Math.max(1, aBlock.getBlockHardness(aWorld, aX, aY, aZ) * tStats.getToolDamagePerBlockBreak())); - return this.getDigSpeed(aStack, aBlock, aWorld.getBlockMetadata(aX, aY, aZ)) > 0.0F; - } - - private ItemStack getContainerItem(ItemStack aStack, final boolean playSound) { - if (!this.isItemStackUsable(aStack)) { - return null; - } - aStack = GT_Utility.copyAmount(1, aStack); - final IToolStats tStats = this.getToolStats(aStack); - if (tStats == null) { - return null; - } - this.doDamage(aStack, tStats.getToolDamagePerContainerCraft()); - aStack = aStack.stackSize > 0 ? aStack : null; - if (playSound) { - // String sound = (aStack == null) ? tStats.getBreakingSound() : tStats.getCraftingSound(); - // GT_Utility.doSoundAtClient(sound, 1, 1.0F); - } - return aStack; - } - - @Override - public Interface_ToolStats getToolStats(final ItemStack aStack) { - this.isItemStackUsable(aStack); - return this.getToolStatsInternal(aStack); - } - - private Interface_ToolStats getToolStatsInternal(final ItemStack aStack) { - return (Interface_ToolStats) (aStack == null ? null : this.mToolStats.get((short) aStack.getItemDamage())); - } - - @Override - public float getSaplingModifier(final ItemStack aStack, final World aWorld, final EntityPlayer aPlayer, - final int aX, final int aY, final int aZ) { - final IToolStats tStats = this.getToolStats(aStack); - return (tStats != null) && tStats.isGrafter() ? Math.min(100.0F, (1 + this.getHarvestLevel(aStack, "")) * 20.0F) - : 0.0F; - } - - @Override - public boolean canWhack(final EntityPlayer aPlayer, final ItemStack aStack, final int aX, final int aY, - final int aZ) { - if (!this.isItemStackUsable(aStack)) { - return false; - } - final IToolStats tStats = this.getToolStats(aStack); - return (tStats != null) && tStats.isCrowbar(); - } - - @Override - public void onWhack(final EntityPlayer aPlayer, final ItemStack aStack, final int aX, final int aY, final int aZ) { - final IToolStats tStats = this.getToolStats(aStack); - if (tStats != null) { - this.doDamage(aStack, tStats.getToolDamagePerEntityAttack()); - } - } - - @Override - public boolean canWrench(final EntityPlayer player, final int x, final int y, final int z) { - System.out.println("canWrench"); - if (player == null) { - return false; - } - if (player.getCurrentEquippedItem() == null) { - return false; - } - if (!this.isItemStackUsable(player.getCurrentEquippedItem())) { - return false; - } - final Interface_ToolStats tStats = this.getToolStats(player.getCurrentEquippedItem()); - return (tStats != null) && tStats.isWrench(); - } - - @Override - public void wrenchUsed(final EntityPlayer player, final int x, final int y, final int z) { - if (player == null) { - return; - } - if (player.getCurrentEquippedItem() == null) { - return; - } - final IToolStats tStats = this.getToolStats(player.getCurrentEquippedItem()); - if (tStats != null) { - this.doDamage(player.getCurrentEquippedItem(), tStats.getToolDamagePerEntityAttack()); - } - } - - @Override - public boolean canUse(final ItemStack stack, final EntityPlayer player, final int x, final int y, final int z) { - return this.canWrench(player, x, y, z); - } - - @Override - public void used(final ItemStack stack, final EntityPlayer player, final int x, final int y, final int z) { - this.wrenchUsed(player, x, y, z); - } - - @Override - public boolean shouldHideFacades(final ItemStack stack, final EntityPlayer player) { - if (player == null) { - return false; - } - if (player.getCurrentEquippedItem() == null) { - return false; - } - if (!this.isItemStackUsable(player.getCurrentEquippedItem())) { - return false; - } - final Interface_ToolStats tStats = this.getToolStats(player.getCurrentEquippedItem()); - return tStats.isWrench(); - } - - @Override - public boolean canLink(final EntityPlayer aPlayer, final ItemStack aStack, final EntityMinecart cart) { - if (!this.isItemStackUsable(aStack)) { - return false; - } - final IToolStats tStats = this.getToolStats(aStack); - return (tStats != null) && tStats.isCrowbar(); - } - - @Override - public void onLink(final EntityPlayer aPlayer, final ItemStack aStack, final EntityMinecart cart) { - final IToolStats tStats = this.getToolStats(aStack); - if (tStats != null) { - this.doDamage(aStack, tStats.getToolDamagePerEntityAttack()); - } - } - - @Override - public boolean canBoost(final EntityPlayer aPlayer, final ItemStack aStack, final EntityMinecart cart) { - if (!this.isItemStackUsable(aStack)) { - return false; - } - final IToolStats tStats = this.getToolStats(aStack); - return (tStats != null) && tStats.isCrowbar(); - } - - @Override - public void onBoost(final EntityPlayer aPlayer, final ItemStack aStack, final EntityMinecart cart) { - final IToolStats tStats = this.getToolStats(aStack); - if (tStats != null) { - this.doDamage(aStack, tStats.getToolDamagePerEntityAttack()); - } - } - - @Override - public void onCreated(final ItemStack aStack, final World aWorld, final EntityPlayer aPlayer) { - final IToolStats tStats = this.getToolStats(aStack); - if ((tStats != null) && (aPlayer != null)) { - tStats.onToolCrafted(aStack, aPlayer); - } - super.onCreated(aStack, aWorld, aPlayer); - } - - @Override - public boolean isFull3D() { - return true; - } - - @Override - public boolean isItemStackUsable(final ItemStack aStack) { - final IToolStats tStats = this.getToolStatsInternal(aStack); - if (((aStack.getItemDamage() % 2) == 1) || (tStats == null)) { - final NBTTagCompound aNBT = aStack.getTagCompound(); - if (aNBT != null) { - aNBT.removeTag("ench"); - } - return false; - } - final Materials aMaterial = getPrimaryMaterial(aStack); - final HashMap<Integer, Integer> tMap = new HashMap<>(), tResult = new HashMap<>(); - if (aMaterial.mEnchantmentTools != null) { - tMap.put(aMaterial.mEnchantmentTools.effectId, (int) aMaterial.mEnchantmentToolsLevel); - if (aMaterial.mEnchantmentTools == Enchantment.fortune) { - tMap.put(Enchantment.looting.effectId, (int) aMaterial.mEnchantmentToolsLevel); - } - if (aMaterial.mEnchantmentTools == Enchantment.knockback) { - tMap.put(Enchantment.power.effectId, (int) aMaterial.mEnchantmentToolsLevel); - } - if (aMaterial.mEnchantmentTools == Enchantment.fireAspect) { - tMap.put(Enchantment.flame.effectId, (int) aMaterial.mEnchantmentToolsLevel); - } - } - final Enchantment[] tEnchants = tStats.getEnchantments(aStack); - final int[] tLevels = tStats.getEnchantmentLevels(aStack); - for (int i = 0; i < tEnchants.length; i++) { - if (tLevels[i] > 0) { - final Integer tLevel = tMap.get(tEnchants[i].effectId); - tMap.put( - tEnchants[i].effectId, - tLevel == null ? tLevels[i] : tLevel == tLevels[i] ? tLevel + 1 : Math.max(tLevel, tLevels[i])); - } - } - for (final Entry<Integer, Integer> tEntry : tMap.entrySet()) { - if ((tEntry.getKey() == 33) || ((tEntry.getKey() == 20) && (tEntry.getValue() > 2)) - || (tEntry.getKey() == Enchantment_Radioactivity.INSTANCE.effectId)) { - tResult.put(tEntry.getKey(), tEntry.getValue()); - } else { - switch (Enchantment.enchantmentsList[tEntry.getKey()].type) { - case weapon: - if (tStats.isWeapon()) { - tResult.put(tEntry.getKey(), tEntry.getValue()); - } - break; - case all: - tResult.put(tEntry.getKey(), tEntry.getValue()); - break; - case armor: - case armor_feet: - case armor_head: - case armor_legs: - case armor_torso: - break; - case bow: - if (tStats.isRangedWeapon()) { - tResult.put(tEntry.getKey(), tEntry.getValue()); - } - break; - case breakable: - break; - case fishing_rod: - break; - case digger: - if (tStats.isMiningTool()) { - tResult.put(tEntry.getKey(), tEntry.getValue()); - } - break; - } - } - } - EnchantmentHelper.setEnchantments(tResult, aStack); - return true; - } - - @Override - public short getChargedMetaData(final ItemStack aStack) { - return (short) (aStack.getItemDamage() - (aStack.getItemDamage() % 2)); - } - - @Override - public short getEmptyMetaData(final ItemStack aStack) { - final NBTTagCompound aNBT = aStack.getTagCompound(); - if (aNBT != null) { - aNBT.removeTag("ench"); - } - return (short) ((aStack.getItemDamage() + 1) - (aStack.getItemDamage() % 2)); - } - - @Override - public int getItemEnchantability() { - return 0; - } - - @Override - public boolean isBookEnchantable(final ItemStack aStack, final ItemStack aBook) { - return false; - } - - @Override - public boolean getIsRepairable(final ItemStack aStack, final ItemStack aMaterial) { - return false; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java deleted file mode 100644 index 463b6d9f7f..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java +++ /dev/null @@ -1,96 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.items.types; - -import java.util.List; - -import net.minecraft.block.BlockDispenser; -import net.minecraft.dispenser.BehaviorDefaultDispenseItem; -import net.minecraft.dispenser.IBlockSource; -import net.minecraft.dispenser.IPosition; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; - -import gregtech.api.enums.SubTag; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour; -import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_Base; - -public class ToolType_Base implements Interface_ItemBehaviour<Gregtech_MetaItem_Base> { - - @Override - public boolean onLeftClickEntity(final Gregtech_MetaItem_Base aItem, final ItemStack aStack, - final EntityPlayer aPlayer, final Entity aEntity) { - return false; - } - - @Override - public boolean onItemUse(final Gregtech_MetaItem_Base aItem, final ItemStack aStack, final EntityPlayer aPlayer, - final World aWorld, final int aX, final int aY, final int aZ, final int aSide, final float hitX, - final float hitY, final float hitZ) { - return false; - } - - @Override - public boolean onItemUseFirst(final Gregtech_MetaItem_Base aItem, final ItemStack aStack, - final EntityPlayer aPlayer, final World aWorld, final int aX, final int aY, final int aZ, final int aSide, - final float hitX, final float hitY, final float hitZ) { - return false; - } - - @Override - public ItemStack onItemRightClick(final Gregtech_MetaItem_Base aItem, final ItemStack aStack, final World aWorld, - final EntityPlayer aPlayer) { - return aStack; - } - - @Override - public List<String> getAdditionalToolTips(final Gregtech_MetaItem_Base aItem, final List<String> aList, - final ItemStack aStack) { - return aList; - } - - @Override - public void onUpdate(final Gregtech_MetaItem_Base aItem, final ItemStack aStack, final World aWorld, - final Entity aPlayer, final int aTimer, final boolean aIsInHand) {} - - @Override - public boolean isItemStackUsable(final Gregtech_MetaItem_Base aItem, final ItemStack aStack) { - return true; - } - - @Override - public boolean canDispense(final Gregtech_MetaItem_Base aItem, final IBlockSource aSource, final ItemStack aStack) { - return false; - } - - @Override - public ItemStack onDispense(final Gregtech_MetaItem_Base aItem, final IBlockSource aSource, - final ItemStack aStack) { - final EnumFacing enumfacing = BlockDispenser.func_149937_b(aSource.getBlockMetadata()); - final IPosition iposition = BlockDispenser.func_149939_a(aSource); - final ItemStack itemstack1 = aStack.splitStack(1); - BehaviorDefaultDispenseItem.doDispense(aSource.getWorld(), itemstack1, 6, enumfacing, iposition); - return aStack; - } - - @Override - public boolean hasProjectile(final Gregtech_MetaItem_Base aItem, final SubTag aProjectileType, - final ItemStack aStack) { - return false; - } - - @Override - public EntityArrow getProjectile(final Gregtech_MetaItem_Base aItem, final SubTag aProjectileType, - final ItemStack aStack, final World aWorld, final double aX, final double aY, final double aZ) { - return null; - } - - @Override - public EntityArrow getProjectile(final Gregtech_MetaItem_Base aItem, final SubTag aProjectileType, - final ItemStack aStack, final World aWorld, final EntityLivingBase aEntity, final float aSpeed) { - return null; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java deleted file mode 100644 index c387c513a4..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java +++ /dev/null @@ -1,157 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.items.types; - -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.IFluidBlock; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.objects.ItemData; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gregtech.common.blocks.GT_Block_Ores; -import gregtech.common.blocks.GT_TileEntity_Ores; - -public class ToolType_HardHammer extends ToolType_Base { - - private final int mVanillaCosts; - private final int mEUCosts; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.prospecting", "Usable for Prospecting"); - - public ToolType_HardHammer(final int aVanillaCosts, final int aEUCosts) { - this.mVanillaCosts = aVanillaCosts; - this.mEUCosts = aEUCosts; - } - - public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer, - final World aWorld, final int aX, final int aY, final int aZ, final int aSide, final float hitX, - final float hitY, final float hitZ) { - if (aWorld.isRemote) { - return false; - } - final Block aBlock = aWorld.getBlock(aX, aY, aZ); - if (aBlock == null) { - return false; - } - final byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ); - - ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta)); - if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) { - GT_Utility.sendChatToPlayer( - aPlayer, - "This is " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore."); - GT_Utility.sendSoundToPlayers( - aWorld, - GregTech_API.sSoundList.get(Integer.valueOf(1)), - 1.0F, - -1.0F, - aX, - aY, - aZ); - return true; - } - if ((aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone)) - || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites)) - || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.netherrack)) - || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.end_stone))) { - if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) { - GT_Utility.sendSoundToPlayers( - aWorld, - GregTech_API.sSoundList.get(Integer.valueOf(1)), - 1.0F, - -1.0F, - aX, - aY, - aZ); - int tX = aX; - int tY = aY; - int tZ = aZ; - int tMetaID = 0; - final int tQuality = (aItem instanceof GT_MetaGenerated_Tool) - ? ((GT_MetaGenerated_Tool) aItem).getHarvestLevel(aStack, "") - : 0; - - int i = 0; - for (final int j = 6 + tQuality; i < j; i++) { - tX -= ForgeDirection.getOrientation(aSide).offsetX; - tY -= ForgeDirection.getOrientation(aSide).offsetY; - tZ -= ForgeDirection.getOrientation(aSide).offsetZ; - - final Block tBlock = aWorld.getBlock(tX, tY, tZ); - if ((tBlock == Blocks.lava) || (tBlock == Blocks.flowing_lava)) { - GT_Utility.sendChatToPlayer(aPlayer, "There is Lava behind this Rock."); - break; - } - if ((tBlock == Blocks.water) || (tBlock == Blocks.flowing_water) - || ((tBlock instanceof IFluidBlock))) { - GT_Utility.sendChatToPlayer(aPlayer, "There is a Liquid behind this Rock."); - break; - } - if ((tBlock == Blocks.monster_egg) || (!GT_Utility.hasBlockHitBox(aWorld, tX, tY, tZ))) { - GT_Utility.sendChatToPlayer(aPlayer, "There is an Air Pocket behind this Rock."); - break; - } - if (tBlock != aBlock) { - if (i >= 4) { - break; - } - GT_Utility.sendChatToPlayer(aPlayer, "Material is changing behind this Rock."); - break; - } - } - final Random tRandom = new Random(aX ^ aY ^ aZ ^ aSide); - i = 0; - for (final int j = 9 + (2 * tQuality); i < j; i++) { - tX = (aX - 4 - tQuality) + tRandom.nextInt(j); - tY = (aY - 4 - tQuality) + tRandom.nextInt(j); - tZ = (aZ - 4 - tQuality) + tRandom.nextInt(j); - final Block tBlock = aWorld.getBlock(tX, tY, tZ); - if ((tBlock instanceof GT_Block_Ores)) { - final TileEntity tTileEntity = aWorld.getTileEntity(tX, tY, tZ); - if ((tTileEntity instanceof GT_TileEntity_Ores)) { - final Materials tMaterial = GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores) tTileEntity).mMetaData - % 1000)]; - if ((tMaterial != null) && (tMaterial != Materials._NULL)) { - GT_Utility.sendChatToPlayer( - aPlayer, - "Found traces of " + tMaterial.mDefaultLocalName + " Ore."); - return true; - } - } - } else { - tMetaID = aWorld.getBlockMetadata(tX, tY, tZ); - tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); - if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) { - GT_Utility.sendChatToPlayer( - aPlayer, - "Found traces of " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore."); - return true; - } - } - } - GT_Utility.sendChatToPlayer(aPlayer, "No Ores found."); - } - return true; - } - return false; - } - - public List<String> getAdditionalToolTips(final GT_MetaBase_Item aItem, final List<String> aList, - final ItemStack aStack) { - aList.add(this.mTooltip); - return aList; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java deleted file mode 100644 index e117c1b28e..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java +++ /dev/null @@ -1,188 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.items.types; - -import java.util.Arrays; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import gregtech.api.GregTech_API; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; -import ic2.api.tile.IWrenchable; - -public class ToolType_Wrench extends ToolType_Base { - - private final int mCosts; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.wrench", "Rotates Blocks on Rightclick"); - - public ToolType_Wrench(final int aCosts) { - this.mCosts = aCosts; - } - - public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer, - final World aWorld, final int aX, final int aY, final int aZ, final int ordinalSide, final float hitX, - final float hitY, final float hitZ) { - if (aWorld.isRemote) { - return false; - } - final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide); - final Block aBlock = aWorld.getBlock(aX, aY, aZ); - if (aBlock == null) { - return false; - } - final byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ); - final ForgeDirection targetSide = GT_Utility.determineWrenchingSide(side, hitX, hitY, hitZ); - final byte ordinalTargetSide = (byte) targetSide.ordinal(); - final TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); - try { - if ((aTileEntity != null) && ((aTileEntity instanceof IWrenchable wrenchable))) { - if (wrenchable.wrenchCanSetFacing(aPlayer, ordinalTargetSide)) { - if ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { - wrenchable.setFacing(ordinalTargetSide); - GT_Utility - .sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1.0F, aX, aY, aZ); - } - return true; - } - if (((IWrenchable) aTileEntity).wrenchCanRemove(aPlayer)) { - final int tDamage = ((IWrenchable) aTileEntity).getWrenchDropRate() < 1.0F ? 10 : 3; - if ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, tDamage * this.mCosts))) { - ItemStack tOutput = ((IWrenchable) aTileEntity).getWrenchDrop(aPlayer); - for (final ItemStack tStack : aBlock.getDrops(aWorld, aX, aY, aZ, aMeta, 0)) { - if (tOutput == null) { - aWorld.spawnEntityInWorld( - new EntityItem(aWorld, aX + 0.5D, aY + 0.5D, aZ + 0.5D, tStack)); - } else { - aWorld.spawnEntityInWorld( - new EntityItem(aWorld, aX + 0.5D, aY + 0.5D, aZ + 0.5D, tOutput)); - tOutput = null; - } - } - aWorld.setBlockToAir(aX, aY, aZ); - GT_Utility - .sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1.0F, aX, aY, aZ); - } - return true; - } - return true; - } - } catch (final Throwable e) {} - if ((aBlock == Blocks.log) || (aBlock == Blocks.log2) || (aBlock == Blocks.hay_block)) { - if ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { - aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta + 4) % 12, 3); - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1.0F, aX, aY, aZ); - } - return true; - } - if ((aBlock == Blocks.powered_repeater) || (aBlock == Blocks.unpowered_repeater)) { - if ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { - aWorld.setBlockMetadataWithNotify(aX, aY, aZ, ((aMeta / 4) * 4) + (((aMeta % 4) + 1) % 4), 3); - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1.0F, aX, aY, aZ); - } - return true; - } - if ((aBlock == Blocks.powered_comparator) || (aBlock == Blocks.unpowered_comparator)) { - if ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { - aWorld.setBlockMetadataWithNotify(aX, aY, aZ, ((aMeta / 4) * 4) + (((aMeta % 4) + 1) % 4), 3); - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1.0F, aX, aY, aZ); - } - return true; - } - if ((aBlock == Blocks.crafting_table) || (aBlock == Blocks.bookshelf)) { - if ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { - aWorld.spawnEntityInWorld( - new EntityItem(aWorld, aX + 0.5D, aY + 0.5D, aZ + 0.5D, new ItemStack(aBlock, 1, aMeta))); - aWorld.setBlockToAir(aX, aY, aZ); - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1.0F, aX, aY, aZ); - } - return true; - } - if (aMeta == ordinalTargetSide) { - if ((aBlock == Blocks.pumpkin) || (aBlock == Blocks.lit_pumpkin) - || (aBlock == Blocks.piston) - || (aBlock == Blocks.sticky_piston) - || (aBlock == Blocks.dispenser) - || (aBlock == Blocks.dropper) - || (aBlock == Blocks.furnace) - || (aBlock == Blocks.lit_furnace) - || (aBlock == Blocks.chest) - || (aBlock == Blocks.trapped_chest) - || (aBlock == Blocks.ender_chest) - || (aBlock == Blocks.hopper)) { - if ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { - aWorld.spawnEntityInWorld( - new EntityItem(aWorld, aX + 0.5D, aY + 0.5D, aZ + 0.5D, new ItemStack(aBlock, 1, 0))); - aWorld.setBlockToAir(aX, aY, aZ); - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1.0F, aX, aY, aZ); - } - return true; - } - } else { - if ((aBlock == Blocks.piston) || (aBlock == Blocks.sticky_piston) - || (aBlock == Blocks.dispenser) - || (aBlock == Blocks.dropper)) { - if ((aMeta < 6) && ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) { - aWorld.setBlockMetadataWithNotify(aX, aY, aZ, ordinalTargetSide, 3); - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1.0F, aX, aY, aZ); - } - return true; - } - if ((aBlock == Blocks.pumpkin) || (aBlock == Blocks.lit_pumpkin) - || (aBlock == Blocks.furnace) - || (aBlock == Blocks.lit_furnace) - || (aBlock == Blocks.chest) - || (aBlock == Blocks.ender_chest) - || (aBlock == Blocks.trapped_chest)) { - if ((targetSide.offsetY == 0) && ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) { - aWorld.setBlockMetadataWithNotify(aX, aY, aZ, ordinalTargetSide, 3); - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1.0F, aX, aY, aZ); - } - return true; - } - if (aBlock == Blocks.hopper) { - if ((targetSide != ForgeDirection.UP) && ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) { - aWorld.setBlockMetadataWithNotify(aX, aY, aZ, ordinalTargetSide, 3); - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1.0F, aX, aY, aZ); - } - return true; - } - } - if ((Arrays.asList(aBlock.getValidRotations(aWorld, aX, aY, aZ)).contains(targetSide)) - && ((aPlayer.capabilities.isCreativeMode) || (!GT_ModHandler.isElectricItem(aStack)) - || (GT_ModHandler.canUseElectricItem(aStack, this.mCosts))) - && (aBlock.rotateBlock(aWorld, aX, aY, aZ, targetSide))) { - if (!aPlayer.capabilities.isCreativeMode) { - ((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts); - } - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1.0F, aX, aY, aZ); - } - return false; - } - - public List<String> getAdditionalToolTips(final GT_MetaBase_Item aItem, final List<String> aList, - final ItemStack aStack) { - aList.add(this.mTooltip); - return aList; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java deleted file mode 100644 index a47ed592c4..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java +++ /dev/null @@ -1,81 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; - -import gregtech.api.interfaces.ITexture; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; - -public class GT_MetaTileEntity_BasicMachine_GTPP_Recipe extends GT_MetaTileEntity_BasicMachine_GT_Recipe { - - public GT_MetaTileEntity_BasicMachine_GTPP_Recipe(int aID, String aName, String aNameRegional, int aTier, - String aDescription, GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, - int aGUIParameterA, int aGUIParameterB, String aGUIName, String aSound, boolean aSharedTank, - boolean aRequiresFluidForFiltering, int aSpecialEffect, String aOverlays, Object[] aRecipe) { - super( - aID, - aName, - aNameRegional, - aTier, - aDescription, - aRecipes, - aInputSlots, - aOutputSlots, - aTankCapacity, - aGUIParameterA, - aGUIParameterB, - aGUIName, - aSound, - aSharedTank, - aRequiresFluidForFiltering, - aSpecialEffect, - aOverlays, - aRecipe); - } - - public GT_MetaTileEntity_BasicMachine_GTPP_Recipe(String aName, int aTier, String aDescription, - GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, int aAmperage, - int aGUIParameterA, int aGUIParameterB, ITexture[][][] aTextures, String aGUIName, String aNEIName, - String aSound, boolean aSharedTank, boolean aRequiresFluidForFiltering, int aSpecialEffect) { - super( - aName, - aTier, - aDescription, - aRecipes, - aInputSlots, - aOutputSlots, - aTankCapacity, - aAmperage, - aGUIParameterA, - aGUIParameterB, - aTextures, - aGUIName, - aNEIName, - aSound, - aSharedTank, - aRequiresFluidForFiltering, - aSpecialEffect); - } - - public GT_MetaTileEntity_BasicMachine_GTPP_Recipe(String aName, int aTier, String[] aDescription, - GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, int aAmperage, - int aGUIParameterA, int aGUIParameterB, ITexture[][][] aTextures, String aGUIName, String aNEIName, - String aSound, boolean aSharedTank, boolean aRequiresFluidForFiltering, int aSpecialEffect) { - super( - aName, - aTier, - aDescription[0], - aRecipes, - aInputSlots, - aOutputSlots, - aTankCapacity, - aAmperage, - aGUIParameterA, - aGUIParameterB, - aTextures, - aGUIName, - aNEIName, - aSound, - aSharedTank, - aRequiresFluidForFiltering, - aSpecialEffect); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java deleted file mode 100644 index fea297a53d..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java +++ /dev/null @@ -1,220 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; - -import java.lang.reflect.Field; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import com.google.common.collect.BiMap; - -import gregtech.api.enums.Textures.BlockIcons; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.reflect.ReflectionUtils; - -public class GT_MetaTileEntity_Hatch_Plasma extends GT_MetaTileEntity_Hatch_Output { - - public final AutoMap<Fluid> mFluidsToUse = new AutoMap<Fluid>(); - public final int mFluidCapacity; - private int mTotalPlasmaSupported = -1; - - public GT_MetaTileEntity_Hatch_Plasma(final int aID, final String aName, final String aNameRegional) { - super(aID, aName, aNameRegional, 6); - mFluidCapacity = 256000; - initHatch(); - } - - public GT_MetaTileEntity_Hatch_Plasma(final String aName, final String aDescription, - final ITexture[][][] aTextures) { - super(aName, 6, aDescription, aTextures); - mFluidCapacity = 256000; - initHatch(); - } - - public GT_MetaTileEntity_Hatch_Plasma(final String aName, final String[] aDescription, - final ITexture[][][] aTextures) { - super(aName, 6, aDescription[0], aTextures); - mFluidCapacity = 256000; - initHatch(); - } - - private void initHatch() { - - // Get all Plasmas, but the easiest way to do this is to just ask the Fluid Registry what exists and filter - // through them lazily. - Field fluidNameCache; - - fluidNameCache = ReflectionUtils.getField(FluidRegistry.class, "fluidNames"); - - AutoMap<String> mValidPlasmaNameCache = new AutoMap<String>(); - if (fluidNameCache != null) { - try { - Object fluidNames = fluidNameCache.get(null); - if (fluidNames != null) { - try { - @SuppressWarnings("unchecked") - BiMap<Integer, String> fluidNamesMap = (BiMap<Integer, String>) fluidNames; - if (fluidNamesMap != null) { - for (String g : fluidNamesMap.values()) { - if (g.toLowerCase().contains("plasma")) { - mValidPlasmaNameCache.put(g); - } - } - } - } catch (ClassCastException e) {} - } - } catch (IllegalArgumentException | IllegalAccessException e) {} - } - - AutoMap<Fluid> mPlasmaCache = new AutoMap<Fluid>(); - if (!mValidPlasmaNameCache.isEmpty()) { - for (String y : mValidPlasmaNameCache) { - Fluid t = FluidRegistry.getFluid(y); - if (t != null) { - if (t.getTemperature() > 1000) { - mPlasmaCache.put(t); - } - } - } - } - - if (!mPlasmaCache.isEmpty()) { - for (Fluid w : mPlasmaCache) { - mFluidsToUse.put(w); - } - } - } - - @Override - public ITexture[] getTexturesActive(final ITexture aBaseTexture) { - return new ITexture[] { aBaseTexture }; - } - - @Override - public ITexture[] getTexturesInactive(final ITexture aBaseTexture) { - return new ITexture[] { aBaseTexture }; - } - - public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, - final ForgeDirection side, final ItemStack aStack) { - if (side == aBaseMetaTileEntity.getFrontFacing() && aIndex == 0) { - for (Fluid f : mFluidsToUse) { - if (f != null) { - if (GT_Utility.getFluidForFilledItem(aStack, true).getFluid() == f) { - return true; - } - } - } - } - return false; - } - - @Override - public boolean isFluidInputAllowed(final FluidStack aFluid) { - for (Fluid f : mFluidsToUse) { - if (f != null) { - if (aFluid.getFluid() == f) { - return true; - } - } - } - return false; - } - - @Override - public int getCapacity() { - return this.mFluidCapacity; - } - - @Override - public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return (MetaTileEntity) new GT_MetaTileEntity_Hatch_Plasma(this.mName, this.mDescription, this.mTextures); - } - - @Override - public String[] getDescription() { - - if (mTotalPlasmaSupported < 0) { - if (mFluidsToUse.isEmpty()) { - mTotalPlasmaSupported = 0; - } else { - mTotalPlasmaSupported = mFluidsToUse.size(); - } - } - - String aX = EnumChatFormatting.GRAY + ""; - String a1 = EnumChatFormatting.GOLD + "Refined containment" + aX; - String a2 = EnumChatFormatting.GOLD + "Capacity: " + EnumChatFormatting.DARK_AQUA + getCapacity() + "L" + aX; - String a3 = EnumChatFormatting.GOLD + "Supports " - + EnumChatFormatting.DARK_RED - + mTotalPlasmaSupported - + EnumChatFormatting.GOLD - + " types of plasma" - + aX; - - String[] s2 = new String[] { a1, a2, a3, CORE.GT_Tooltip.get() }; - return s2; - } - - @Override - public boolean doesFillContainers() { - return true; - } - - @Override - public ITexture[][][] getTextureSet(ITexture[] aTextures) { - // TODO Auto-generated method stub - return super.getTextureSet(aTextures); - } - - private Field F1, F2; - - @Override - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int aColorIndex, boolean aActive, boolean aRedstone) { - byte a1 = 0, a2 = 0; - try { - if (F1 == null) { - F1 = ReflectionUtils.getField(getClass(), "actualTexture"); - } - if (F2 == null) { - F2 = ReflectionUtils.getField(getClass(), "mTexturePage"); - } - - if (F1 != null) { - a1 = F1.getByte(this); - } - if (F2 != null) { - a2 = F2.getByte(this); - } - } catch (IllegalArgumentException | IllegalAccessException n) {} - - int textureIndex = a1 | a2 << 7; - byte texturePointer = (byte) (a1 & 127); - - if (side == ForgeDirection.UP || side == ForgeDirection.DOWN) { - ITexture g = textureIndex > 0 ? BlockIcons.casingTexturePages[a2][texturePointer] - : BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1]; - - return new ITexture[] { g }; - } - - return side != facing - ? (textureIndex > 0 ? new ITexture[] { BlockIcons.casingTexturePages[a2][texturePointer] } - : new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1] }) - : (textureIndex > 0 - ? (aActive ? this.getTexturesActive(BlockIcons.casingTexturePages[a2][texturePointer]) - : this.getTexturesInactive(BlockIcons.casingTexturePages[a2][texturePointer])) - : (aActive ? this.getTexturesActive(BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1]) - : this.getTexturesInactive(BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1]))); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java deleted file mode 100644 index 0408469ecf..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java +++ /dev/null @@ -1,485 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base; - -import static gregtech.api.enums.GT_Values.VN; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Arrays; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import cofh.api.energy.IEnergyReceiver; -import gregtech.GT_Mod; -import gregtech.api.GregTech_API; -import gregtech.api.enums.Dyes; -import gregtech.api.enums.TextureSet; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.metatileentity.IMetaTileEntityCable; -import gregtech.api.interfaces.tileentity.IColoredTileEntity; -import gregtech.api.interfaces.tileentity.IEnergyConnected; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.BaseMetaPipeEntity; -import gregtech.api.metatileentity.MetaPipeEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_Proxy; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -import ic2.api.energy.tile.IEnergySink; - -public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements IMetaTileEntityCable { - - public final float mThickNess; - public final GT_Materials mMaterial; - public final long mCableLossPerMeter, mAmperage, mVoltage; - public final boolean mInsulated, mCanShock; - public long mTransferredAmperage = 0, mTransferredAmperageLast20 = 0, mTransferredVoltageLast20 = 0; - public long mRestRF; - public short mOverheat; - public final int mWireHeatingTicks; - - public GregtechMetaPipeEntityBase_Cable(final int aID, final String aName, final String aNameRegional, - final float aThickNess, final GT_Materials aMaterial, final long aCableLossPerMeter, final long aAmperage, - final long aVoltage, final boolean aInsulated, final boolean aCanShock) { - super(aID, aName, aNameRegional, 0); - this.mThickNess = aThickNess; - this.mMaterial = aMaterial; - this.mAmperage = aAmperage; - this.mVoltage = aVoltage; - this.mInsulated = aInsulated; - this.mCanShock = aCanShock; - this.mCableLossPerMeter = aCableLossPerMeter; - this.mWireHeatingTicks = this.getGT5Var(); - } - - public GregtechMetaPipeEntityBase_Cable(final String aName, final float aThickNess, final GT_Materials aMaterial, - final long aCableLossPerMeter, final long aAmperage, final long aVoltage, final boolean aInsulated, - final boolean aCanShock) { - super(aName, 0); - this.mThickNess = aThickNess; - this.mMaterial = aMaterial; - this.mAmperage = aAmperage; - this.mVoltage = aVoltage; - this.mInsulated = aInsulated; - this.mCanShock = aCanShock; - this.mCableLossPerMeter = aCableLossPerMeter; - this.mWireHeatingTicks = this.getGT5Var(); - } - - private int getGT5Var() { - final Class<? extends GT_Proxy> clazz = GT_Mod.gregtechproxy.getClass(); - final String lookingForValue = "mWireHeatingTicks"; - int temp = 4; - Field field; - try { - field = clazz.getClass().getField(lookingForValue); - final Class<?> clazzType = field.getType(); - if (clazzType.toString().equals("int")) { - temp = (field.getInt(clazz)); - } else { - temp = 4; - } - } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) { - // Utils.LOG_INFO("FATAL ERROR - REFLECTION FAILED FOR GT CABLES - // - PLEASE REPORT THIS."); - Logger.WARNING("FATAL ERROR - REFLECTION FAILED FOR GT CABLES - PLEASE REPORT THIS."); - Logger.ERROR("FATAL ERROR - REFLECTION FAILED FOR GT CABLES - PLEASE REPORT THIS."); - temp = 4; - } - return temp; - } - - @Override - public byte getTileEntityBaseType() { - return (byte) (this.mInsulated ? 9 : 8); - } - - @Override - public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaPipeEntityBase_Cable( - this.mName, - this.mThickNess, - this.mMaterial, - this.mCableLossPerMeter, - this.mAmperage, - this.mVoltage, - this.mInsulated, - this.mCanShock); - } - - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, - final byte aConnections, final int aColorIndex, final boolean aConnected, final boolean aRedstone) { - if (!this.mInsulated) { - return new ITexture[] { new GT_RenderedTexture( - this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], - this.mMaterial.mRGBa) }; - } - if (aConnected) { - final float tThickNess = this.getThickNess(); - if (tThickNess < 0.37F) { - return new ITexture[] { - new GT_RenderedTexture( - this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], - this.mMaterial.mRGBa), - new GT_RenderedTexture( - Textures.BlockIcons.INSULATION_TINY, - Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) }; - } - if (tThickNess < 0.49F) { - return new ITexture[] { - new GT_RenderedTexture( - this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], - this.mMaterial.mRGBa), - new GT_RenderedTexture( - Textures.BlockIcons.INSULATION_SMALL, - Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) }; - } - if (tThickNess < 0.74F) { - return new ITexture[] { - new GT_RenderedTexture( - this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], - this.mMaterial.mRGBa), - new GT_RenderedTexture( - Textures.BlockIcons.INSULATION_MEDIUM, - Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) }; - } - if (tThickNess < 0.99F) { - return new ITexture[] { - new GT_RenderedTexture( - this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], - this.mMaterial.mRGBa), - new GT_RenderedTexture( - Textures.BlockIcons.INSULATION_LARGE, - Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) }; - } - return new ITexture[] { - new GT_RenderedTexture( - this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], - this.mMaterial.mRGBa), - new GT_RenderedTexture( - Textures.BlockIcons.INSULATION_HUGE, - Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) }; - } - return new ITexture[] { new GT_RenderedTexture( - Textures.BlockIcons.INSULATION_FULL, - Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) }; - } - - @Override - public void onEntityCollidedWithBlock(final World aWorld, final int aX, final int aY, final int aZ, - final Entity aEntity) { - if (this.mCanShock && ((((BaseMetaPipeEntity) this.getBaseMetaTileEntity()).mConnections & -128) == 0) - && (aEntity instanceof EntityLivingBase)) { - GT_Utility.applyElectricityDamage( - (EntityLivingBase) aEntity, - this.mTransferredVoltageLast20, - this.mTransferredAmperageLast20); - } - } - - @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(final World aWorld, final int aX, final int aY, final int aZ) { - if (!this.mCanShock) { - return super.getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ); - } - return AxisAlignedBB - .getBoundingBox(aX + 0.125D, aY + 0.125D, aZ + 0.125D, aX + 0.875D, aY + 0.875D, aZ + 0.875D); - } - - @Override - public boolean isSimpleMachine() { - return true; - } - - @Override - public boolean isFacingValid(final ForgeDirection facing) { - return false; - } - - @Override - public boolean isValidSlot(final int aIndex) { - return true; - } - - @Override - public final boolean renderInside(final ForgeDirection side) { - return false; - } - - @Override - public int getProgresstime() { - return (int) this.mTransferredAmperage * 64; - } - - @Override - public int maxProgresstime() { - return (int) this.mAmperage * 64; - } - - @Override - public long injectEnergyUnits(final ForgeDirection side, final long aVoltage, final long aAmperage) { - if (!this.getBaseMetaTileEntity().getCoverBehaviorAtSide(side).letsEnergyIn( - side, - this.getBaseMetaTileEntity().getCoverIDAtSide(side), - this.getBaseMetaTileEntity().getCoverDataAtSide(side), - this.getBaseMetaTileEntity())) { - return 0; - } - return this.transferElectricity( - side, - aVoltage, - aAmperage, - new ArrayList<>(Arrays.asList((TileEntity) this.getBaseMetaTileEntity()))); - } - - @Override - public long transferElectricity(final ForgeDirection side, long aVoltage, final long aAmperage, - final ArrayList<TileEntity> aAlreadyPassedTileEntityList) { - long rUsedAmperes = 0; - aVoltage -= this.mCableLossPerMeter; - if (aVoltage > 0) { - for (final ForgeDirection targetSide : ForgeDirection.VALID_DIRECTIONS) { - if (rUsedAmperes > aAmperage) break; - final int ordinalTarget = targetSide.ordinal(); - if ((targetSide != side) && ((this.mConnections & (1 << ordinalTarget)) != 0) - && this.getBaseMetaTileEntity().getCoverBehaviorAtSide(targetSide).letsEnergyOut( - targetSide, - this.getBaseMetaTileEntity().getCoverIDAtSide(targetSide), - this.getBaseMetaTileEntity().getCoverDataAtSide(targetSide), - this.getBaseMetaTileEntity())) { - final TileEntity tTileEntity = this.getBaseMetaTileEntity().getTileEntityAtSide(targetSide); - if (!aAlreadyPassedTileEntityList.contains(tTileEntity)) { - aAlreadyPassedTileEntityList.add(tTileEntity); - if (tTileEntity instanceof IEnergyConnected) { - if (this.getBaseMetaTileEntity().getColorization() >= 0) { - final byte tColor = ((IEnergyConnected) tTileEntity).getColorization(); - if ((tColor >= 0) && (tColor != this.getBaseMetaTileEntity().getColorization())) { - continue; - } - } - if ((tTileEntity instanceof IGregTechTileEntity) - && (((IGregTechTileEntity) tTileEntity) - .getMetaTileEntity() instanceof IMetaTileEntityCable) - && ((IGregTechTileEntity) tTileEntity) - .getCoverBehaviorAtSide(targetSide.getOpposite()).letsEnergyIn( - targetSide.getOpposite(), - ((IGregTechTileEntity) tTileEntity) - .getCoverIDAtSide(targetSide.getOpposite()), - ((IGregTechTileEntity) tTileEntity) - .getCoverDataAtSide(targetSide.getOpposite()), - ((IGregTechTileEntity) tTileEntity))) { - if (((IGregTechTileEntity) tTileEntity).getTimer() > 50) { - rUsedAmperes += ((IMetaTileEntityCable) ((IGregTechTileEntity) tTileEntity) - .getMetaTileEntity()).transferElectricity( - targetSide.getOpposite(), - aVoltage, - aAmperage - rUsedAmperes, - aAlreadyPassedTileEntityList); - } - } else { - rUsedAmperes += ((IEnergyConnected) tTileEntity).injectEnergyUnits( - targetSide.getOpposite(), - aVoltage, - aAmperage - rUsedAmperes); - } - - } else if (tTileEntity instanceof IEnergySink) { - final ForgeDirection oppositeDirection = targetSide.getOpposite(); - if (((IEnergySink) tTileEntity) - .acceptsEnergyFrom((TileEntity) this.getBaseMetaTileEntity(), oppositeDirection)) { - if ((((IEnergySink) tTileEntity).getDemandedEnergy() > 0) - && (((IEnergySink) tTileEntity) - .injectEnergy(oppositeDirection, aVoltage, aVoltage) < aVoltage)) { - rUsedAmperes++; - } - } - } else if (GregTech_API.mOutputRF && (tTileEntity instanceof IEnergyReceiver)) { - final ForgeDirection oppositeDirection = targetSide.getOpposite(); - final int rfOut = (int) ((aVoltage * GregTech_API.mEUtoRF) / 100); - if (((IEnergyReceiver) tTileEntity).receiveEnergy(oppositeDirection, rfOut, true) - == rfOut) { - ((IEnergyReceiver) tTileEntity).receiveEnergy(oppositeDirection, rfOut, false); - rUsedAmperes++; - } else - if (((IEnergyReceiver) tTileEntity).receiveEnergy(oppositeDirection, rfOut, true) > 0) { - if (this.mRestRF == 0) { - final int RFtrans = ((IEnergyReceiver) tTileEntity) - .receiveEnergy(oppositeDirection, rfOut, false); - rUsedAmperes++; - this.mRestRF = rfOut - RFtrans; - } else { - final int RFtrans = ((IEnergyReceiver) tTileEntity) - .receiveEnergy(oppositeDirection, (int) this.mRestRF, false); - this.mRestRF = this.mRestRF - RFtrans; - } - } - if (GregTech_API.mRFExplosions - && (((IEnergyReceiver) tTileEntity).getMaxEnergyStored(oppositeDirection) - < (rfOut * 600))) { - if (rfOut > ((32 * GregTech_API.mEUtoRF) / 100)) { - this.doExplosion(rfOut); - } - } - } - } - } - } - } - - this.mTransferredAmperage += rUsedAmperes; - this.mTransferredVoltageLast20 = Math.max(this.mTransferredVoltageLast20, aVoltage); - this.mTransferredAmperageLast20 = Math.max(this.mTransferredAmperageLast20, this.mTransferredAmperage); - - if ((aVoltage > this.mVoltage) || (this.mTransferredAmperage > this.mAmperage)) { - if (this.mOverheat > (this.mWireHeatingTicks * 100)) { - this.getBaseMetaTileEntity().setToFire(); - } else { - this.mOverheat += 100; - } - return aAmperage; - } - - return rUsedAmperes; - } - - @Override - public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) { - if (aBaseMetaTileEntity.isServerSide()) { - this.mTransferredAmperage = 0; - if (this.mOverheat > 0) { - this.mOverheat--; - } - - if ((aTick % 20) == 0) { - this.mTransferredVoltageLast20 = 0; - this.mTransferredAmperageLast20 = 0; - this.mConnections = 0; - for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - final int ordinalSide = side.ordinal(); - final ForgeDirection oppositeSide = side.getOpposite(); - if (aBaseMetaTileEntity.getCoverBehaviorAtSide(side).alwaysLookConnected( - side, - aBaseMetaTileEntity.getCoverIDAtSide(side), - aBaseMetaTileEntity.getCoverDataAtSide(side), - aBaseMetaTileEntity) - || aBaseMetaTileEntity.getCoverBehaviorAtSide(side).letsEnergyIn( - side, - aBaseMetaTileEntity.getCoverIDAtSide(side), - aBaseMetaTileEntity.getCoverDataAtSide(side), - aBaseMetaTileEntity) - || aBaseMetaTileEntity.getCoverBehaviorAtSide(side).letsEnergyOut( - side, - aBaseMetaTileEntity.getCoverIDAtSide(side), - aBaseMetaTileEntity.getCoverDataAtSide(side), - aBaseMetaTileEntity)) { - final TileEntity tTileEntity = aBaseMetaTileEntity.getTileEntityAtSide(side); - if (tTileEntity instanceof IColoredTileEntity) { - if (aBaseMetaTileEntity.getColorization() >= 0) { - final byte tColor = ((IColoredTileEntity) tTileEntity).getColorization(); - if ((tColor >= 0) && (tColor != aBaseMetaTileEntity.getColorization())) { - continue; - } - } - } - if ((tTileEntity instanceof IEnergyConnected) - && (((IEnergyConnected) tTileEntity).inputEnergyFrom(oppositeSide) - || ((IEnergyConnected) tTileEntity).outputsEnergyTo(oppositeSide))) { - this.mConnections |= (1 << ordinalSide); - continue; - } - if ((tTileEntity instanceof IGregTechTileEntity) && (((IGregTechTileEntity) tTileEntity) - .getMetaTileEntity() instanceof IMetaTileEntityCable)) { - if (((IGregTechTileEntity) tTileEntity).getCoverBehaviorAtSide(oppositeSide) - .alwaysLookConnected( - oppositeSide, - ((IGregTechTileEntity) tTileEntity).getCoverIDAtSide(oppositeSide), - ((IGregTechTileEntity) tTileEntity).getCoverDataAtSide(oppositeSide), - ((IGregTechTileEntity) tTileEntity)) - || ((IGregTechTileEntity) tTileEntity).getCoverBehaviorAtSide(oppositeSide) - .letsEnergyIn( - oppositeSide, - ((IGregTechTileEntity) tTileEntity).getCoverIDAtSide(oppositeSide), - ((IGregTechTileEntity) tTileEntity) - .getCoverDataAtSide(oppositeSide), - ((IGregTechTileEntity) tTileEntity)) - || ((IGregTechTileEntity) tTileEntity).getCoverBehaviorAtSide(oppositeSide) - .letsEnergyOut( - oppositeSide, - ((IGregTechTileEntity) tTileEntity).getCoverIDAtSide(oppositeSide), - ((IGregTechTileEntity) tTileEntity) - .getCoverDataAtSide(oppositeSide), - ((IGregTechTileEntity) tTileEntity))) { - this.mConnections |= (1 << ordinalSide); - continue; - } - } - if ((tTileEntity instanceof IEnergySink) && ((IEnergySink) tTileEntity) - .acceptsEnergyFrom((TileEntity) aBaseMetaTileEntity, oppositeSide)) { - this.mConnections |= (1 << ordinalSide); - continue; - } - if (GregTech_API.mOutputRF && (tTileEntity instanceof IEnergyReceiver) - && ((IEnergyReceiver) tTileEntity).canConnectEnergy(oppositeSide)) { - this.mConnections |= (1 << ordinalSide); - continue; - } - - } - } - } - } - } - - @Override - public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, - final ForgeDirection side, final ItemStack aStack) { - return false; - } - - @Override - public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, - final ForgeDirection side, final ItemStack aStack) { - return false; - } - - @Override - public String[] getDescription() { - return new String[] { - "Max Voltage: " + EnumChatFormatting.GREEN - + this.mVoltage - + " (" - + VN[GT_Utility.getTier(this.mVoltage)] - + ")" - + EnumChatFormatting.GRAY, - "Max Amperage: " + EnumChatFormatting.YELLOW + this.mAmperage + EnumChatFormatting.GRAY, - "Loss/Meter/Ampere: " + EnumChatFormatting.RED - + this.mCableLossPerMeter - + EnumChatFormatting.GRAY - + " EU-Volt" }; - } - - @Override - public float getThickNess() { - return this.mThickNess; - } - - @Override - public void saveNBTData(final NBTTagCompound aNBT) { - // - } - - @Override - public void loadNBTData(final NBTTagCompound aNBT) { - // - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java index b50a40636a..714eb561d9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java @@ -24,7 +24,6 @@ public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_Tiered public boolean bOutput = false, bRedstoneIfFull = false, bInvert = false, bUnbreakable = false; public int mSuccess = 0, mTargetStackSize = 0; public UUID ownerUUID; - // UnbreakableBlockManager Xasda = new UnbreakableBlockManager(); private boolean value_last = false, value_current = false; public GregtechMetaSafeBlockBase(final int aID, final String aName, final String aNameRegional, final int aTier, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java deleted file mode 100644 index b7f41b11c8..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java +++ /dev/null @@ -1,31 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.objects; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraftforge.fluids.Fluid; - -import gregtech.api.GregTech_API; - -public class GregtechFluid extends Fluid implements Runnable { - - public final String mTextureName; - private final short[] mRGBa; - - public GregtechFluid(final String aName, final String aTextureName, final short[] aRGBa) { - super(aName); - this.mRGBa = aRGBa; - this.mTextureName = aTextureName; - GregTech_API.sGTBlockIconload.add(this); - } - - @Override - public int getColor() { - return (Math.max(0, Math.min(255, this.mRGBa[0])) << 16) | (Math.max(0, Math.min(255, this.mRGBa[1])) << 8) - | Math.max(0, Math.min(255, this.mRGBa[2])); - } - - @Override - public void run() { - this.setIcons(GregTech_API.sBlockIcons.registerIcon(GTPlusPlus.ID + ":" + "fluids/fluid." + this.mTextureName)); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java deleted file mode 100644 index 7f2fda6dd8..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java +++ /dev/null @@ -1,26 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.recipe; - -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.ToolDictNames; -import gregtech.api.interfaces.IOreRecipeRegistrator; -import gregtech.api.util.GT_ModHandler; -import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; - -public class ProcessingSkookumChoocherToolRecipes implements IOreRecipeRegistrator { - - public ProcessingSkookumChoocherToolRecipes() { - // GregtechOrePrefixes.toolSkookumChoocher.add(this); - } - - @Override - public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, - final String aModName, final ItemStack aStack) { - GT_ModHandler.addShapelessCraftingRecipe( - MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(7734, 1, aMaterial, aMaterial, null), - new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial), OrePrefixes.screw.get(aMaterial), - ToolDictNames.craftingToolScrewdriver }); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java deleted file mode 100644 index bfbd4e6da3..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java +++ /dev/null @@ -1,64 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.world; - -import static gtPlusPlus.xmod.gregtech.HANDLER_GT.sCustomWorldgenFile; - -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; - -import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkProvider; - -public abstract class GTPP_Worldgen { - - public final String mWorldGenName; - public final boolean mEnabled; - private final Map<String, Boolean> mDimensionMap = new ConcurrentHashMap<String, Boolean>(); - - public GTPP_Worldgen(String aName, List aList, boolean aDefault) { - mWorldGenName = aName; - mEnabled = sCustomWorldgenFile.get("worldgen", mWorldGenName, aDefault); - if (mEnabled) aList.add(this); - } - - /** - * @param aWorld The World Object - * @param aRandom The Random Generator to use - * @param aBiome The Name of the Biome (always != null) - * @param aDimensionType The Type of Worldgeneration to add. -1 = Nether, 0 = Overworld, +1 = End - * @param aChunkX xCoord of the Chunk - * @param aChunkZ zCoord of the Chunk - * @return if the Worldgeneration has been successfully completed - */ - public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, - int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) { - return false; - } - - /** - * @param aWorld The World Object - * @param aRandom The Random Generator to use - * @param aBiome The Name of the Biome (always != null) - * @param aDimensionType The Type of Worldgeneration to add. -1 = Nether, 0 = Overworld, +1 = End - * @param aChunkX xCoord of the Chunk - * @param aChunkZ zCoord of the Chunk - * @return if the Worldgeneration has been successfully completed - */ - public boolean executeCavegen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, - int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) { - return false; - } - - public boolean isGenerationAllowed(World aWorld, int aDimensionType, int aAllowedDimensionType) { - String aDimName = aWorld.provider.getDimensionName(); - Boolean tAllowed = mDimensionMap.get(aDimName); - if (tAllowed == null) { - boolean tValue = sCustomWorldgenFile - .get("worldgen.dimensions." + mWorldGenName, aDimName, aDimensionType == aAllowedDimensionType); - mDimensionMap.put(aDimName, tValue); - return tValue; - } - return tAllowed; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java deleted file mode 100644 index ffb1baf9f0..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java +++ /dev/null @@ -1,105 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.world; - -import java.util.Collection; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkProvider; - -import gtPlusPlus.core.lib.CORE; - -public class GTPP_Worldgen_Boulder extends GTPP_Worldgen_Ore { - - public GTPP_Worldgen_Boulder(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType, - int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList, - boolean aAllowToGenerateinVoid) { - super( - aName, - aDefault, - aBlock, - aBlockMeta, - aDimensionType, - aAmount, - aSize, - aProbability, - aMinY, - aMaxY, - aBiomeList, - aAllowToGenerateinVoid); - } - - @Override - public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, - int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) { - if (isGenerationAllowed(aWorld, aDimensionType, mDimensionType) - && (mBiomeList.isEmpty() || mBiomeList.contains(aBiome)) - && (mProbability <= 1 || aRandom.nextInt(mProbability) == 0)) { - for (int i = 0; i < mAmount; i++) { - int tX = aChunkX + aRandom.nextInt(16), tY = mMinY + aRandom.nextInt(mMaxY - mMinY), - tZ = aChunkZ + aRandom.nextInt(16); - Block tBlock = aWorld.getBlock(tX, tY - 7, tZ); - if (tBlock != null && tBlock.isOpaqueCube() - && aWorld.getBlock(tX, tY - 6, tZ).isAir(aWorld, tX, tY - 6, tZ)) { - float math_pi = CORE.PI; - float var6 = aRandom.nextFloat() * math_pi; - float var1b = mSize / 8.0F; - float var3b = MathHelper.sin(var6) * var1b; - float var4b = MathHelper.cos(var6) * var1b; - float var8b = -2 * var3b; - float var9b = -2 * var4b; - int var10b = (tX + 8); - int var11b = (tZ + 8); - float var7 = (var10b + var3b); - float var11 = (var11b + var4b); - int var5b = aRandom.nextInt(3); - int var6b = aRandom.nextInt(3); - int var7b = var6b - var5b; - float var15 = (tY + var5b - 2); - float var12b = math_pi / mSize; - - for (int var19 = 0; var19 <= mSize; ++var19) { - float var2b = var19 / mSize; - float var20 = var7 + var8b * var2b; - float var22 = var15 + var7b * var2b; - float var24 = var11 + var9b * var2b; - float var26 = aRandom.nextFloat() * mSize / 16.0F; - float var28 = ((MathHelper.sin(var19 * var12b) + 1.0F) * var26 + 1.0F) / 2.0F; - int var32 = MathHelper.floor_float(var20 - var28); - int var33 = MathHelper.floor_float(var22 - var28); - int var34 = MathHelper.floor_float(var24 - var28); - int var35 = MathHelper.floor_float(var20 + var28); - int var36 = MathHelper.floor_float(var22 + var28); - int var37 = MathHelper.floor_float(var24 + var28); - - for (int var38 = var32; var38 <= var35; ++var38) { - float var39 = (var38 + 0.5F - var20) / (var28); - float var13b = var39 * var39; - if (var13b < 1.0F) { - for (int var41 = var33; var41 <= var36; ++var41) { - float var42 = (var41 + 0.5F - var22) / (var28); - float var14b = var13b + var42 * var42; - if (var14b < 1.0F) { - for (int var44 = var34; var44 <= var37; ++var44) { - float var45 = (var44 + 0.5F - var24) / (var28); - Block block = aWorld.getBlock(var38, var41, var44); - if (var14b + var45 * var45 < 1.0F && ((mAllowToGenerateinVoid && aWorld - .getBlock(var38, var41, var44).isAir(aWorld, var38, var41, var44)) - || (block != null && !(block instanceof BlockContainer)))) { - aWorld.setBlock(var38, var41, var44, mBlock, mBlockMeta, 0); - } - } - } - } - } - } - } - } - } - return true; - } - return false; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java deleted file mode 100644 index 6e87662ef1..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java +++ /dev/null @@ -1,252 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.world; - -import static gtPlusPlus.xmod.gregtech.HANDLER_GT.sCustomWorldgenFile; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Random; - -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkProvider; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; -import gregtech.common.blocks.GT_TileEntity_Ores; -import gregtech.loaders.misc.GT_Achievements; -import gtPlusPlus.core.material.Material; - -public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen { - - public static ArrayList<GTPP_Worldgen_GT_Ore_Layer> sList = new ArrayList<GTPP_Worldgen_GT_Ore_Layer>(); - public static int sWeight = 0; - public final short mMinY; - public final short mMaxY; - public final short mWeight; - public final short mDensity; - public final short mSize; - public short mPrimaryMeta; - public short mSecondaryMeta; - public short mBetweenMeta; - public short mSporadicMeta; - public final String mRestrictBiome; - public final boolean mDarkWorld; - public final String aTextWorldgen = "worldgen.gtpp."; - - public GTPP_Worldgen_GT_Ore_Layer(String aName, boolean aDefault, int aMinY, int aMaxY, int aWeight, int aDensity, - int aSize, boolean aOverworld, Materials aPrimary, Materials aSecondary, Materials aBetween, - Materials aSporadic) { - super(aName, sList, aDefault); - this.mDarkWorld = sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Overworld", aOverworld); - this.mMinY = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MinHeight", aMinY)); - this.mMaxY = ((short) Math - .max(this.mMinY + 5, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MaxHeight", aMaxY))); - this.mWeight = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight)); - this.mDensity = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Density", aDensity)); - this.mSize = ((short) Math.max(1, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize))); - this.mPrimaryMeta = ((short) sCustomWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "OrePrimaryLayer", aPrimary.mMetaItemSubID)); - this.mSecondaryMeta = ((short) sCustomWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "OreSecondaryLayer", aSecondary.mMetaItemSubID)); - this.mBetweenMeta = ((short) sCustomWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "OreSporadiclyInbetween", aBetween.mMetaItemSubID)); - this.mSporadicMeta = ((short) sCustomWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "OreSporaticlyAround", aSporadic.mMetaItemSubID)); - this.mRestrictBiome = sCustomWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "RestrictToBiomeName", "None"); - - if (this.mEnabled) { - GT_Achievements.registerOre( - GregTech_API.sGeneratedMaterials[(mPrimaryMeta % 1000)], - aMinY, - aMaxY, - aWeight, - false, - false, - false); - GT_Achievements.registerOre( - GregTech_API.sGeneratedMaterials[(mSecondaryMeta % 1000)], - aMinY, - aMaxY, - aWeight, - false, - false, - false); - GT_Achievements.registerOre( - GregTech_API.sGeneratedMaterials[(mBetweenMeta % 1000)], - aMinY, - aMaxY, - aWeight, - false, - false, - false); - GT_Achievements.registerOre( - GregTech_API.sGeneratedMaterials[(mSporadicMeta % 1000)], - aMinY, - aMaxY, - aWeight, - false, - false, - false); - sWeight += this.mWeight; - } - } - - public GTPP_Worldgen_GT_Ore_Layer(String aName, boolean aDefault, int aMinY, int aMaxY, int aWeight, int aDensity, - int aSize, Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic) { - super(aName, sList, aDefault); - this.mDarkWorld = sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Darkworld", true); - this.mMinY = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MinHeight", aMinY)); - this.mMaxY = ((short) Math - .max(this.mMinY + 5, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MaxHeight", aMaxY))); - this.mWeight = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight)); - this.mDensity = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Density", aDensity)); - this.mSize = ((short) Math.max(1, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize))); - /* - * this.mPrimaryMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OrePrimaryLayer", - * aPrimary.mMetaItemSubID)); this.mSecondaryMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + - * this.mWorldGenName, "OreSecondaryLayer", aSecondary.mMetaItemSubID)); this.mBetweenMeta = ((short) - * sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OreSporadiclyInbetween", - * aBetween.mMetaItemSubID)); this.mSporadicMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + - * this.mWorldGenName, "OreSporaticlyAround", aSporadic.mMetaItemSubID)); - */ this.mRestrictBiome = sCustomWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "RestrictToBiomeName", "None"); - - if (this.mEnabled) { - /* - * GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mPrimaryMeta % 1000)], aMinY, aMaxY, - * aWeight, false, false, false); - * GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mSecondaryMeta % 1000)], aMinY, aMaxY, - * aWeight, false, false, false); GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mBetweenMeta - * % 1000)], aMinY, aMaxY, aWeight, false, false, false); - * GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mSporadicMeta % 1000)], aMinY, aMaxY, - * aWeight, false, false, false); - */ sWeight += this.mWeight; - } - } - - @Override - public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, - int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) { - if (!this.mRestrictBiome.equals("None") && !(this.mRestrictBiome.equals(aBiome))) { - return false; // Not the correct biome for ore mix - } - if (!isGenerationAllowed( - aWorld, - aDimensionType, - ((aDimensionType == -1) && (false)) || ((aDimensionType == 0) && (this.mDarkWorld)) - || ((aDimensionType == 1) && (false)) - || ((aWorld.provider.getDimensionName().equals("Moon")) && (false)) - || ((aWorld.provider.getDimensionName().equals("Mars")) && (false)) ? aDimensionType - : aDimensionType ^ 0xFFFFFFFF)) { - return false; - } - int tMinY = this.mMinY + aRandom.nextInt(this.mMaxY - this.mMinY - 5); - - int cX = aChunkX - aRandom.nextInt(this.mSize); - int eX = aChunkX + 16 + aRandom.nextInt(this.mSize); - for (int tX = cX; tX <= eX; tX++) { - int cZ = aChunkZ - aRandom.nextInt(this.mSize); - int eZ = aChunkZ + 16 + aRandom.nextInt(this.mSize); - for (int tZ = cZ; tZ <= eZ; tZ++) { - if (this.mSecondaryMeta > 0) { - for (int i = tMinY - 1; i < tMinY + 2; i++) { - if ((aRandom.nextInt( - Math.max( - 1, - Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) - / this.mDensity)) - == 0) - || (aRandom.nextInt( - Math.max( - 1, - Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) - / this.mDensity)) - == 0)) { - setOreBlock(aWorld, tX, i, tZ, this.mSecondaryMeta, false); - } - } - } - if ((this.mBetweenMeta > 0) && ((aRandom.nextInt( - Math.max(1, Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) / this.mDensity)) - == 0) - || (aRandom.nextInt( - Math.max( - 1, - Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) - / this.mDensity)) - == 0))) { - setOreBlock(aWorld, tX, tMinY + 2 + aRandom.nextInt(2), tZ, this.mBetweenMeta, false); - } - if (this.mPrimaryMeta > 0) { - for (int i = tMinY + 3; i < tMinY + 6; i++) { - if ((aRandom.nextInt( - Math.max( - 1, - Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) - / this.mDensity)) - == 0) - || (aRandom.nextInt( - Math.max( - 1, - Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) - / this.mDensity)) - == 0)) { - setOreBlock(aWorld, tX, i, tZ, this.mPrimaryMeta, false); - } - } - } - if ((this.mSporadicMeta > 0) && ((aRandom.nextInt( - Math.max(1, Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) / this.mDensity)) - == 0) - || (aRandom.nextInt( - Math.max( - 1, - Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) - / this.mDensity)) - == 0))) { - setOreBlock(aWorld, tX, tMinY - 1 + aRandom.nextInt(7), tZ, this.mSporadicMeta, false); - } - } - } - if (GT_Values.D1) { - System.out.println("Generated Orevein: " + this.mWorldGenName + " " + aChunkX + " " + aChunkZ); - } - return true; - } - - private Method mSetOre = null; - - private boolean setOreBlock(World world, int x, int y, int z, int secondarymeta, boolean bool) { - - if (mSetOre == null) { - try { - mSetOre = GT_TileEntity_Ores.class.getMethod( - "setOreBlock", - World.class, - int.class, - int.class, - int.class, - int.class, - boolean.class); - } catch (SecurityException | NoSuchMethodException e) { - try { - mSetOre = GT_TileEntity_Ores.class - .getMethod("setOreBlock", World.class, int.class, int.class, int.class, int.class); - } catch (SecurityException | NoSuchMethodException r) {} - } - } - - if (mSetOre != null) { - try { - return (boolean) mSetOre.invoke(world, x, y, z, secondarymeta, bool); - } catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException t) { - return false; - } - } else { - return false; - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java deleted file mode 100644 index 8ed90b799f..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java +++ /dev/null @@ -1,46 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.world; - -import static gtPlusPlus.xmod.gregtech.api.world.WorldGenUtils.mOresToRegister; - -import gtPlusPlus.core.material.Material; - -public class GTPP_Worldgen_Handler implements Runnable { - - @Override - public void run() { - - for (GT_OreVein_Object ore : mOresToRegister) { - generateNewVein(ore); - } - } - - private final GTPP_Worldgen_GT_Ore_Layer generateNewVein(final GT_OreVein_Object ore) { - return generateNewVein( - ore.mOreMixName, - ore.minY, - ore.maxY, - ore.weight, - ore.density, - ore.size, - ore.aPrimary, - ore.aSecondary, - ore.aBetween, - ore.aSporadic); - } - - private final GTPP_Worldgen_GT_Ore_Layer generateNewVein(String mOreMixName, int minY, int maxY, int weight, - int density, int size, Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic) { - return new GTPP_Worldgen_GT_Ore_Layer( - "ore.mix." + mOreMixName, // String aName, - true, // boolean aDefault, - minY, - maxY, // int aMinY, int aMaxY, - weight, // int aWeight, - density, // int aDensity, - size, // int aSize, - aPrimary, // Materials aPrimary, - aSecondary, // Materials aSecondary, - aBetween, // Materials aBetween, - aSporadic); // Materials aSporadic - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java deleted file mode 100644 index 22b64d6cfc..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java +++ /dev/null @@ -1,36 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.world; - -import static gtPlusPlus.xmod.gregtech.HANDLER_GT.sCustomWorldgenFile; - -import java.util.ArrayList; -import java.util.Collection; - -import net.minecraft.block.Block; - -import gtPlusPlus.xmod.gregtech.HANDLER_GT; - -public abstract class GTPP_Worldgen_Ore extends GTPP_Worldgen { - - public final int mBlockMeta, mAmount, mSize, mMinY, mMaxY, mProbability, mDimensionType; - public final Block mBlock; - public final Collection<String> mBiomeList; - public final boolean mAllowToGenerateinVoid; - private final String aTextWorldgen = "worldgen."; - - public GTPP_Worldgen_Ore(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType, - int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList, - boolean aAllowToGenerateinVoid) { - super(aName, HANDLER_GT.sCustomWorldgenList, aDefault); - mDimensionType = aDimensionType; - mBlock = aBlock; - mBlockMeta = Math.min(Math.max(aBlockMeta, 0), 15); - mProbability = sCustomWorldgenFile.get(aTextWorldgen + mWorldGenName, "Probability", aProbability); - mAmount = sCustomWorldgenFile.get(aTextWorldgen + mWorldGenName, "Amount", aAmount); - mSize = sCustomWorldgenFile.get(aTextWorldgen + mWorldGenName, "Size", aSize); - mMinY = sCustomWorldgenFile.get(aTextWorldgen + mWorldGenName, "MinHeight", aMinY); - mMaxY = sCustomWorldgenFile.get(aTextWorldgen + mWorldGenName, "MaxHeight", aMaxY); - if (aBiomeList == null) mBiomeList = new ArrayList<String>(); - else mBiomeList = aBiomeList; - mAllowToGenerateinVoid = aAllowToGenerateinVoid; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java deleted file mode 100644 index b8113d5f86..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java +++ /dev/null @@ -1,120 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.world; - -import java.util.Collection; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkProvider; - -import gtPlusPlus.core.lib.CORE; - -public class GTPP_Worldgen_Ore_Normal extends GTPP_Worldgen_Ore { - - public GTPP_Worldgen_Ore_Normal(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType, - int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList, - boolean aAllowToGenerateinVoid) { - super( - aName, - aDefault, - aBlock, - aBlockMeta, - aDimensionType, - aAmount, - aSize, - aProbability, - aMinY, - aMaxY, - aBiomeList, - aAllowToGenerateinVoid); - } - - @Override - public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, - int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) { - if (isGenerationAllowed(aWorld, aDimensionType, mDimensionType) - && (mBiomeList.isEmpty() || mBiomeList.contains(aBiome)) - && (mProbability <= 1 || aRandom.nextInt(mProbability) == 0)) { - for (int i = 0; i < mAmount; i++) { - int tX = aChunkX + aRandom.nextInt(16), tY = mMinY + aRandom.nextInt(mMaxY - mMinY), - tZ = aChunkZ + aRandom.nextInt(16); - if (mAllowToGenerateinVoid || aWorld.getBlock(tX, tY, tZ).isAir(aWorld, tX, tY, tZ)) { - float math_pi = CORE.PI; - float var1b = mSize / 8.0F; - float var6 = aRandom.nextFloat() * math_pi; - float var3b = MathHelper.sin(var6) * var1b; - float var4b = MathHelper.cos(var6) * var1b; - float var8b = -2 * var3b; - float var9b = -2 * var4b; - int var10b = (tX + 8); - int var11b = (tZ + 8); - float var7 = (var10b + var3b); - float var11 = (var11b + var4b); - int var5b = aRandom.nextInt(3); - int var6b = aRandom.nextInt(3); - int var7b = var6b - var5b; - float var15 = (tY + var5b - 2); - float var12b = math_pi / mSize; - - for (int var19 = 0; var19 <= mSize; ++var19) { - float var2b = var19 / mSize; - float var20 = var7 + var8b * var2b; - float var22 = var15 + var7b * var2b; - float var24 = var11 + var9b * var2b; - float var26 = aRandom.nextFloat() * mSize / 16.0F; - float var28 = ((MathHelper.sin(var19 * var12b) + 1.0F) * var26 + 1.0F) / 2.0F; - int var32 = MathHelper.floor_float(var20 - var28); - int var33 = MathHelper.floor_float(var22 - var28); - int var34 = MathHelper.floor_float(var24 - var28); - int var35 = MathHelper.floor_float(var20 + var28); - int var36 = MathHelper.floor_float(var22 + var28); - int var37 = MathHelper.floor_float(var24 + var28); - - for (int var38 = var32; var38 <= var35; ++var38) { - float var39 = (var38 + 0.5F - var20) / (var28); - float var13b = var39 * var39; - if (var13b < 1.0F) { - for (int var41 = var33; var41 <= var36; ++var41) { - float var42 = (var41 + 0.5F - var22) / (var28); - float var14b = var13b + var42 * var42; - if (var14b < 1.0F) { - for (int var44 = var34; var44 <= var37; ++var44) { - float var45 = (var44 + 0.5F - var24) / (var28); - Block block = aWorld.getBlock(var38, var41, var44); - if (var14b + var45 * var45 < 1.0F && ((mAllowToGenerateinVoid && aWorld - .getBlock(var38, var41, var44).isAir(aWorld, var38, var41, var44)) - || (block != null && (block.isReplaceableOreGen( - aWorld, - var38, - var41, - var44, - Blocks.stone) - || block.isReplaceableOreGen( - aWorld, - var38, - var41, - var44, - Blocks.end_stone) - || block.isReplaceableOreGen( - aWorld, - var38, - var41, - var44, - Blocks.netherrack))))) { - aWorld.setBlock(var38, var41, var44, mBlock, mBlockMeta, 0); - } - } - } - } - } - } - } - } - } - return true; - } - return false; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java deleted file mode 100644 index 65813693b3..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java +++ /dev/null @@ -1,30 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.world; - -import gtPlusPlus.core.material.Material; - -public class GT_OreVein_Object { - - final String mOreMixName; // String aName, - final int minY, maxY; // int aMinY, int aMaxY, - final int weight; // int aWeight, - final int density; // int aDensity, - final int size; // int aSize, - final Material aPrimary; // Materials aPrimary, - final Material aSecondary; // Materials aSecondary, - final Material aBetween; // Materials aBetween, - final Material aSporadic; // Materials aSporadic - - GT_OreVein_Object(String mOreMixName, int minY, int maxY, int weight, int density, int size, Material aPrimary, - Material aSecondary, Material aBetween, Material aSporadic) { - this.mOreMixName = mOreMixName; - this.minY = minY; - this.maxY = maxY; - this.weight = weight; - this.density = density; - this.size = size; - this.aPrimary = aPrimary; - this.aSecondary = aSecondary; - this.aBetween = aBetween; - this.aSporadic = aSporadic; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java deleted file mode 100644 index 5ca61cf4d7..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java +++ /dev/null @@ -1,32 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.world; - -import java.util.ArrayList; -import java.util.List; - -import gtPlusPlus.core.material.Material; - -public class WorldGenUtils { - - static List<GT_OreVein_Object> mOresToRegister = new ArrayList<GT_OreVein_Object>(); - - public static final void addNewOreMixForWorldgen(GT_OreVein_Object newVein) { - mOresToRegister.add(newVein); - } - - public static boolean generateNewOreVeinObject(String mOreMixName, int minY, int maxY, int weight, int density, - int size, Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic) { - GT_OreVein_Object newVein = new GT_OreVein_Object( - mOreMixName, - minY, - maxY, - weight, - density, - size, - aPrimary, - aSecondary, - aBetween, - aSporadic); - addNewOreMixForWorldgen(newVein); - return true; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java deleted file mode 100644 index 13d58aac5f..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java +++ /dev/null @@ -1,37 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.blocks; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -public class GregtechMetaItemCasings1 extends GregtechMetaItemCasingsAbstract { - - public GregtechMetaItemCasings1(final Block par1) { - super(par1); - } - - @Override - public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, final List aList, - final boolean aF3_H) { - super.addInformation(aStack, aPlayer, aList, aF3_H); - switch (this.getDamage(aStack)) { - case 0: - aList.add(this.mCasing_Centrifuge); - break; - case 1: - aList.add(this.mCasing_CokeOven); - break; - case 2: - aList.add(this.mCasing_CokeCoil1); - break; - case 3: - aList.add(this.mCasing_CokeCoil2); - break; - default: - aList.add(this.mCasing_CokeCoil2); - break; - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java index ae9f49c60a..ec1ee2a226 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java @@ -9,8 +9,6 @@ import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks; public class CasingTextureHandler { - // private static final TexturesGregtech59 gregtech59 = new TexturesGregtech59(); - // private static final TexturesGregtech58 gregtech58 = new TexturesGregtech58(); private static final TexturesCentrifugeMultiblock gregtechX = new TexturesCentrifugeMultiblock(); public static IIcon getIcon(final int ordinalSide, final int aMeta) { // Texture ID's. case 0 == ID[57] diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java deleted file mode 100644 index 5d907f7e3b..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java +++ /dev/null @@ -1,532 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.blocks.textures; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; - -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialCentrifuge; - -public class TexturesGregtech59 { - - private static Textures.BlockIcons.CustomIcon GT8_1_Active = new Textures.BlockIcons.CustomIcon( - "iconsets/LARGETURBINE_ST_ACTIVE1"); - private static Textures.BlockIcons.CustomIcon GT8_1 = new Textures.BlockIcons.CustomIcon( - "iconsets/LARGETURBINE_ST1"); - private static Textures.BlockIcons.CustomIcon GT8_2_Active = new Textures.BlockIcons.CustomIcon( - "iconsets/LARGETURBINE_ST_ACTIVE2"); - private static Textures.BlockIcons.CustomIcon GT8_2 = new Textures.BlockIcons.CustomIcon( - "iconsets/LARGETURBINE_ST2"); - private static Textures.BlockIcons.CustomIcon GT8_3_Active = new Textures.BlockIcons.CustomIcon( - "iconsets/LARGETURBINE_ST_ACTIVE3"); - private static Textures.BlockIcons.CustomIcon GT8_3 = new Textures.BlockIcons.CustomIcon( - "iconsets/LARGETURBINE_ST3"); - private static Textures.BlockIcons.CustomIcon GT8_4_Active = new Textures.BlockIcons.CustomIcon( - "iconsets/LARGETURBINE_ST_ACTIVE4"); - private static Textures.BlockIcons.CustomIcon GT8_4 = new Textures.BlockIcons.CustomIcon( - "iconsets/LARGETURBINE_ST4"); - private static Textures.BlockIcons.CustomIcon GT8_5_Active = new Textures.BlockIcons.CustomIcon( - "iconsets/LARGETURBINE_ST_ACTIVE5"); - private static Textures.BlockIcons.CustomIcon GT8_5 = new Textures.BlockIcons.CustomIcon( - "iconsets/LARGETURBINE_ST5"); - private static Textures.BlockIcons.CustomIcon GT8_6_Active = new Textures.BlockIcons.CustomIcon( - "iconsets/LARGETURBINE_ST_ACTIVE6"); - private static Textures.BlockIcons.CustomIcon GT8_6 = new Textures.BlockIcons.CustomIcon( - "iconsets/LARGETURBINE_ST6"); - private static Textures.BlockIcons.CustomIcon GT8_7_Active = new Textures.BlockIcons.CustomIcon( - "iconsets/LARGETURBINE_ST_ACTIVE7"); - private static Textures.BlockIcons.CustomIcon GT8_7 = new Textures.BlockIcons.CustomIcon( - "iconsets/LARGETURBINE_ST7"); - private static Textures.BlockIcons.CustomIcon GT8_8_Active = new Textures.BlockIcons.CustomIcon( - "iconsets/LARGETURBINE_ST_ACTIVE8"); - private static Textures.BlockIcons.CustomIcon GT8_8 = new Textures.BlockIcons.CustomIcon( - "iconsets/LARGETURBINE_ST8"); - private static Textures.BlockIcons.CustomIcon GT8_9_Active = new Textures.BlockIcons.CustomIcon( - "iconsets/LARGETURBINE_ST_ACTIVE9"); - private static Textures.BlockIcons.CustomIcon GT8_9 = new Textures.BlockIcons.CustomIcon( - "iconsets/LARGETURBINE_ST9"); - - private static Textures.BlockIcons.CustomIcon frontFace_0 = (GT8_1); - private static Textures.BlockIcons.CustomIcon frontFaceActive_0 = (GT8_1_Active); - private static Textures.BlockIcons.CustomIcon frontFace_1 = (GT8_2); - private static Textures.BlockIcons.CustomIcon frontFaceActive_1 = (GT8_2_Active); - private static Textures.BlockIcons.CustomIcon frontFace_2 = (GT8_3); - private static Textures.BlockIcons.CustomIcon frontFaceActive_2 = (GT8_3_Active); - private static Textures.BlockIcons.CustomIcon frontFace_3 = (GT8_4); - private static Textures.BlockIcons.CustomIcon frontFaceActive_3 = (GT8_4_Active); - private static Textures.BlockIcons.CustomIcon frontFace_4 = (GT8_5); - private static Textures.BlockIcons.CustomIcon frontFaceActive_4 = (GT8_5_Active); - private static Textures.BlockIcons.CustomIcon frontFace_5 = (GT8_6); - private static Textures.BlockIcons.CustomIcon frontFaceActive_5 = (GT8_6_Active); - private static Textures.BlockIcons.CustomIcon frontFace_6 = (GT8_7); - private static Textures.BlockIcons.CustomIcon frontFaceActive_6 = (GT8_7_Active); - private static Textures.BlockIcons.CustomIcon frontFace_7 = (GT8_8); - private static Textures.BlockIcons.CustomIcon frontFaceActive_7 = (GT8_8_Active); - private static Textures.BlockIcons.CustomIcon frontFace_8 = (GT8_9); - private static Textures.BlockIcons.CustomIcon frontFaceActive_8 = (GT8_9_Active); - - Textures.BlockIcons.CustomIcon[] TURBINE = new Textures.BlockIcons.CustomIcon[] { frontFace_0, frontFace_1, - frontFace_2, frontFace_3, frontFace_4, frontFace_5, frontFace_6, frontFace_7, frontFace_8 }; - - Textures.BlockIcons.CustomIcon[] TURBINE_ACTIVE = new Textures.BlockIcons.CustomIcon[] { frontFaceActive_0, - frontFaceActive_1, frontFaceActive_2, frontFaceActive_3, frontFaceActive_4, frontFaceActive_5, - frontFaceActive_6, frontFaceActive_7, frontFaceActive_8 }; - - public IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, - final ForgeDirection side, final GregtechMetaCasingBlocks thisBlock) { - return this.handleCasingsGT59(aWorld, xCoord, yCoord, zCoord, side, thisBlock); - } - - public IIcon handleCasingsGT59(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, - final ForgeDirection side, final GregtechMetaCasingBlocks thisBlock) { - final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); - final int ordinalSide = side.ordinal(); - if (((tMeta != 6) && (tMeta != 8) && (tMeta != 0))) { - return CasingTextureHandler.getIcon(ordinalSide, tMeta); - } - final int tStartIndex = tMeta == 6 ? 1 : 13; - if (tMeta == 0) { - if ((side == ForgeDirection.NORTH) || (side == ForgeDirection.SOUTH)) { - TileEntity tTileEntity; - IMetaTileEntity tMetaTileEntity; - if ((null != (tTileEntity = aWorld - .getTileEntity(xCoord + (side == ForgeDirection.SOUTH ? 1 : -1), yCoord - 1, zCoord))) - && ((tTileEntity instanceof IGregTechTileEntity)) - && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) - && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) { - if (((IGregTechTileEntity) tTileEntity).isActive()) { - return this.TURBINE_ACTIVE[0].getIcon(); - } - return this.TURBINE[0].getIcon(); - } - if ((null != (tTileEntity = aWorld - .getTileEntity(xCoord + (side == ForgeDirection.SOUTH ? 1 : -1), yCoord, zCoord))) - && ((tTileEntity instanceof IGregTechTileEntity)) - && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) - && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) { - if (((IGregTechTileEntity) tTileEntity).isActive()) { - return this.TURBINE_ACTIVE[3].getIcon(); - } - return this.TURBINE[3].getIcon(); - } - if ((null != (tTileEntity = aWorld - .getTileEntity(xCoord + (side == ForgeDirection.SOUTH ? 1 : -1), yCoord + 1, zCoord))) - && ((tTileEntity instanceof IGregTechTileEntity)) - && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) - && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) { - if (((IGregTechTileEntity) tTileEntity).isActive()) { - return this.TURBINE_ACTIVE[6].getIcon(); - } - return this.TURBINE[6].getIcon(); - } - if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord))) - && ((tTileEntity instanceof IGregTechTileEntity)) - && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) - && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) { - if (((IGregTechTileEntity) tTileEntity).isActive()) { - return this.TURBINE_ACTIVE[1].getIcon(); - } - return this.TURBINE[1].getIcon(); - } - if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord))) - && ((tTileEntity instanceof IGregTechTileEntity)) - && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) - && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) { - if (((IGregTechTileEntity) tTileEntity).isActive()) { - return this.TURBINE_ACTIVE[7].getIcon(); - } - return this.TURBINE[7].getIcon(); - } - if ((null != (tTileEntity = aWorld - .getTileEntity(xCoord + (side == ForgeDirection.NORTH ? 1 : -1), yCoord + 1, zCoord))) - && ((tTileEntity instanceof IGregTechTileEntity)) - && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) - && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) { - if (((IGregTechTileEntity) tTileEntity).isActive()) { - return this.TURBINE_ACTIVE[8].getIcon(); - } - return this.TURBINE[8].getIcon(); - } - if ((null != (tTileEntity = aWorld - .getTileEntity(xCoord + (side == ForgeDirection.NORTH ? 1 : -1), yCoord, zCoord))) - && ((tTileEntity instanceof IGregTechTileEntity)) - && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) - && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) { - if (((IGregTechTileEntity) tTileEntity).isActive()) { - return this.TURBINE_ACTIVE[5].getIcon(); - } - return this.TURBINE[5].getIcon(); - } - if ((null != (tTileEntity = aWorld - .getTileEntity(xCoord + (side == ForgeDirection.NORTH ? 1 : -1), yCoord - 1, zCoord))) - && ((tTileEntity instanceof IGregTechTileEntity)) - && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) - && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) { - if (((IGregTechTileEntity) tTileEntity).isActive()) { - return this.TURBINE_ACTIVE[2].getIcon(); - } - return this.TURBINE[2].getIcon(); - } - } else if ((side == ForgeDirection.WEST) || (side == ForgeDirection.EAST)) { - TileEntity tTileEntity; - Object tMetaTileEntity; - if ((null != (tTileEntity = aWorld - .getTileEntity(xCoord, yCoord - 1, zCoord + (side == ForgeDirection.WEST ? 1 : -1)))) - && ((tTileEntity instanceof IGregTechTileEntity)) - && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) - && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) { - if (((IGregTechTileEntity) tTileEntity).isActive()) { - return this.TURBINE_ACTIVE[0].getIcon(); - } - return this.TURBINE[0].getIcon(); - } - if ((null != (tTileEntity = aWorld - .getTileEntity(xCoord, yCoord, zCoord + (side == ForgeDirection.WEST ? 1 : -1)))) - && ((tTileEntity instanceof IGregTechTileEntity)) - && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) - && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) { - if (((IGregTechTileEntity) tTileEntity).isActive()) { - return this.TURBINE_ACTIVE[3].getIcon(); - } - return this.TURBINE[3].getIcon(); - } - if ((null != (tTileEntity = aWorld - .getTileEntity(xCoord, yCoord + 1, zCoord + (side == ForgeDirection.WEST ? 1 : -1)))) - && ((tTileEntity instanceof IGregTechTileEntity)) - && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) - && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) { - if (((IGregTechTileEntity) tTileEntity).isActive()) { - return this.TURBINE_ACTIVE[6].getIcon(); - } - return this.TURBINE[6].getIcon(); - } - if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord))) - && ((tTileEntity instanceof IGregTechTileEntity)) - && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) - && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) { - if (((IGregTechTileEntity) tTileEntity).isActive()) { - return this.TURBINE_ACTIVE[1].getIcon(); - } - return this.TURBINE[1].getIcon(); - } - if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord))) - && ((tTileEntity instanceof IGregTechTileEntity)) - && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) - && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) { - if (((IGregTechTileEntity) tTileEntity).isActive()) { - return this.TURBINE_ACTIVE[7].getIcon(); - } - return this.TURBINE[7].getIcon(); - } - if ((null != (tTileEntity = aWorld - .getTileEntity(xCoord, yCoord + 1, zCoord + (side == ForgeDirection.EAST ? 1 : -1)))) - && ((tTileEntity instanceof IGregTechTileEntity)) - && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) - && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) { - if (((IGregTechTileEntity) tTileEntity).isActive()) { - return this.TURBINE_ACTIVE[8].getIcon(); - } - return this.TURBINE[8].getIcon(); - } - if ((null != (tTileEntity = aWorld - .getTileEntity(xCoord, yCoord, zCoord + (side == ForgeDirection.EAST ? 1 : -1)))) - && ((tTileEntity instanceof IGregTechTileEntity)) - && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) - && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) { - if (((IGregTechTileEntity) tTileEntity).isActive()) { - return this.TURBINE_ACTIVE[5].getIcon(); - } - return this.TURBINE[5].getIcon(); - } - if ((null != (tTileEntity = aWorld - .getTileEntity(xCoord, yCoord - 1, zCoord + (side == ForgeDirection.EAST ? 1 : -1)))) - && ((tTileEntity instanceof IGregTechTileEntity)) - && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) - && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) { - if (((IGregTechTileEntity) tTileEntity).isActive()) { - return this.TURBINE_ACTIVE[2].getIcon(); - } - return this.TURBINE[2].getIcon(); - } - } - return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); - } - final boolean[] tConnectedSides = { - (aWorld.getBlock(xCoord, yCoord - 1, zCoord) == thisBlock) - && (aWorld.getBlockMetadata(xCoord, yCoord - 1, zCoord) == tMeta), - (aWorld.getBlock(xCoord, yCoord + 1, zCoord) == thisBlock) - && (aWorld.getBlockMetadata(xCoord, yCoord + 1, zCoord) == tMeta), - (aWorld.getBlock(xCoord + 1, yCoord, zCoord) == thisBlock) - && (aWorld.getBlockMetadata(xCoord + 1, yCoord, zCoord) == tMeta), - (aWorld.getBlock(xCoord, yCoord, zCoord + 1) == thisBlock) - && (aWorld.getBlockMetadata(xCoord, yCoord, zCoord + 1) == tMeta), - (aWorld.getBlock(xCoord - 1, yCoord, zCoord) == thisBlock) - && (aWorld.getBlockMetadata(xCoord - 1, yCoord, zCoord) == tMeta), - (aWorld.getBlock(xCoord, yCoord, zCoord - 1) == thisBlock) - && (aWorld.getBlockMetadata(xCoord, yCoord, zCoord - 1) == tMeta) }; - switch (side) { - case DOWN: - if (tConnectedSides[0]) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); - } - if ((tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 6)].getIcon(); - } - if ((!tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 2)].getIcon(); - } - if ((tConnectedSides[4]) && (!tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 3)].getIcon(); - } - if ((tConnectedSides[4]) && (tConnectedSides[5]) && (!tConnectedSides[2]) && (tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 4)].getIcon(); - } - if ((tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (!tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 5)].getIcon(); - } - if ((!tConnectedSides[4]) && (!tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 8)].getIcon(); - } - if ((tConnectedSides[4]) && (!tConnectedSides[5]) && (!tConnectedSides[2]) && (tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 9)].getIcon(); - } - if ((tConnectedSides[4]) && (tConnectedSides[5]) && (!tConnectedSides[2]) && (!tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 10)].getIcon(); - } - if ((!tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (!tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 11)].getIcon(); - } - if ((!tConnectedSides[4]) && (!tConnectedSides[5]) && (!tConnectedSides[2]) && (!tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); - } - if ((!tConnectedSides[4]) && (!tConnectedSides[2])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 1)].getIcon(); - } - if ((!tConnectedSides[5]) && (!tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 0)].getIcon(); - } - case UP: - if (tConnectedSides[1]) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); - } - if ((tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 6)].getIcon(); - } - if ((!tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 2)].getIcon(); - } - if ((tConnectedSides[4]) && (!tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 3)].getIcon(); - } - if ((tConnectedSides[4]) && (tConnectedSides[5]) && (!tConnectedSides[2]) && (tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 4)].getIcon(); - } - if ((tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (!tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 5)].getIcon(); - } - if ((!tConnectedSides[4]) && (!tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 8)].getIcon(); - } - if ((tConnectedSides[4]) && (!tConnectedSides[5]) && (!tConnectedSides[2]) && (tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 9)].getIcon(); - } - if ((tConnectedSides[4]) && (tConnectedSides[5]) && (!tConnectedSides[2]) && (!tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 10)].getIcon(); - } - if ((!tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (!tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 11)].getIcon(); - } - if ((!tConnectedSides[4]) && (!tConnectedSides[5]) && (!tConnectedSides[2]) && (!tConnectedSides[3])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); - } - if ((!tConnectedSides[2]) && (!tConnectedSides[4])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 1)].getIcon(); - } - if ((!tConnectedSides[3]) && (!tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 0)].getIcon(); - } - case NORTH: - if (tConnectedSides[5]) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); - } - if ((tConnectedSides[2]) && (tConnectedSides[0]) && (tConnectedSides[4]) && (tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 6)].getIcon(); - } - if ((!tConnectedSides[2]) && (tConnectedSides[0]) && (tConnectedSides[4]) && (tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 2)].getIcon(); - } - if ((tConnectedSides[2]) && (!tConnectedSides[0]) && (tConnectedSides[4]) && (tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 5)].getIcon(); - } - if ((tConnectedSides[2]) && (tConnectedSides[0]) && (!tConnectedSides[4]) && (tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 4)].getIcon(); - } - if ((tConnectedSides[2]) && (tConnectedSides[0]) && (tConnectedSides[4]) && (!tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 3)].getIcon(); - } - if ((!tConnectedSides[2]) && (!tConnectedSides[0]) && (tConnectedSides[4]) && (tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 11)].getIcon(); - } - if ((tConnectedSides[2]) && (!tConnectedSides[0]) && (!tConnectedSides[4]) && (tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 10)].getIcon(); - } - if ((tConnectedSides[2]) && (tConnectedSides[0]) && (!tConnectedSides[4]) && (!tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 9)].getIcon(); - } - if ((!tConnectedSides[2]) && (tConnectedSides[0]) && (tConnectedSides[4]) && (!tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 8)].getIcon(); - } - if ((!tConnectedSides[2]) && (!tConnectedSides[0]) && (!tConnectedSides[4]) && (!tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); - } - if ((!tConnectedSides[2]) && (!tConnectedSides[4])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 1)].getIcon(); - } - if ((!tConnectedSides[0]) && (!tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 0)].getIcon(); - } - case SOUTH: - if (tConnectedSides[3]) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); - } - if ((tConnectedSides[2]) && (tConnectedSides[0]) && (tConnectedSides[4]) && (tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 6)].getIcon(); - } - if ((!tConnectedSides[2]) && (tConnectedSides[0]) && (tConnectedSides[4]) && (tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 4)].getIcon(); - } - if ((tConnectedSides[2]) && (!tConnectedSides[0]) && (tConnectedSides[4]) && (tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 5)].getIcon(); - } - if ((tConnectedSides[2]) && (tConnectedSides[0]) && (!tConnectedSides[4]) && (tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 2)].getIcon(); - } - if ((tConnectedSides[2]) && (tConnectedSides[0]) && (tConnectedSides[4]) && (!tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 3)].getIcon(); - } - if ((!tConnectedSides[2]) && (!tConnectedSides[0]) && (tConnectedSides[4]) && (tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 10)].getIcon(); - } - if ((tConnectedSides[2]) && (!tConnectedSides[0]) && (!tConnectedSides[4]) && (tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 11)].getIcon(); - } - if ((tConnectedSides[2]) && (tConnectedSides[0]) && (!tConnectedSides[4]) && (!tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 8)].getIcon(); - } - if ((!tConnectedSides[2]) && (tConnectedSides[0]) && (tConnectedSides[4]) && (!tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 9)].getIcon(); - } - if ((!tConnectedSides[2]) && (!tConnectedSides[0]) && (!tConnectedSides[4]) && (!tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); - } - if ((!tConnectedSides[2]) && (!tConnectedSides[4])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 1)].getIcon(); - } - if ((!tConnectedSides[0]) && (!tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 0)].getIcon(); - } - case WEST: - if (tConnectedSides[4]) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); - } - if ((tConnectedSides[0]) && (tConnectedSides[3]) && (tConnectedSides[1]) && (tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 6)].getIcon(); - } - if ((!tConnectedSides[0]) && (tConnectedSides[3]) && (tConnectedSides[1]) && (tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 5)].getIcon(); - } - if ((tConnectedSides[0]) && (!tConnectedSides[3]) && (tConnectedSides[1]) && (tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 4)].getIcon(); - } - if ((tConnectedSides[0]) && (tConnectedSides[3]) && (!tConnectedSides[1]) && (tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 3)].getIcon(); - } - if ((tConnectedSides[0]) && (tConnectedSides[3]) && (tConnectedSides[1]) && (!tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 2)].getIcon(); - } - if ((!tConnectedSides[0]) && (!tConnectedSides[3]) && (tConnectedSides[1]) && (tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 10)].getIcon(); - } - if ((tConnectedSides[0]) && (!tConnectedSides[3]) && (!tConnectedSides[1]) && (tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 9)].getIcon(); - } - if ((tConnectedSides[0]) && (tConnectedSides[3]) && (!tConnectedSides[1]) && (!tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 8)].getIcon(); - } - if ((!tConnectedSides[0]) && (tConnectedSides[3]) && (tConnectedSides[1]) && (!tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 11)].getIcon(); - } - if ((!tConnectedSides[0]) && (!tConnectedSides[3]) && (!tConnectedSides[1]) && (!tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); - } - if ((!tConnectedSides[0]) && (!tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 0)].getIcon(); - } - if ((!tConnectedSides[3]) && (!tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 1)].getIcon(); - } - case EAST: - if (tConnectedSides[2]) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); - } - if ((tConnectedSides[0]) && (tConnectedSides[3]) && (tConnectedSides[1]) && (tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 6)].getIcon(); - } - if ((!tConnectedSides[0]) && (tConnectedSides[3]) && (tConnectedSides[1]) && (tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 5)].getIcon(); - } - if ((tConnectedSides[0]) && (!tConnectedSides[3]) && (tConnectedSides[1]) && (tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 2)].getIcon(); - } - if ((tConnectedSides[0]) && (tConnectedSides[3]) && (!tConnectedSides[1]) && (tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 3)].getIcon(); - } - if ((tConnectedSides[0]) && (tConnectedSides[3]) && (tConnectedSides[1]) && (!tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 4)].getIcon(); - } - if ((!tConnectedSides[0]) && (!tConnectedSides[3]) && (tConnectedSides[1]) && (tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 11)].getIcon(); - } - if ((tConnectedSides[0]) && (!tConnectedSides[3]) && (!tConnectedSides[1]) && (tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 8)].getIcon(); - } - if ((tConnectedSides[0]) && (tConnectedSides[3]) && (!tConnectedSides[1]) && (!tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 9)].getIcon(); - } - if ((!tConnectedSides[0]) && (tConnectedSides[3]) && (tConnectedSides[1]) && (!tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 10)].getIcon(); - } - if ((!tConnectedSides[0]) && (!tConnectedSides[3]) && (!tConnectedSides[1]) && (!tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); - } - if ((!tConnectedSides[0]) && (!tConnectedSides[1])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 0)].getIcon(); - } - if ((!tConnectedSides[3]) && (!tConnectedSides[5])) { - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 1)].getIcon(); - } - break; - } - return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java deleted file mode 100644 index e246697285..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java +++ /dev/null @@ -1,185 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.covers; - -import java.lang.reflect.Field; -import java.util.HashMap; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; - -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.ICoverable; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.util.GT_CoverBehavior; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.util.minecraft.LangUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; - -public class GTPP_Cover_Overflow_Item extends GT_CoverBehavior { - - public final int mInitialCapacity; - public final int mMaxItemCapacity; - - public static final Class sQuantumChest; - public static final Class sSuperChestGTPP; - public static final Class sSuperChestGTNH; - public static HashMap<Integer, Field> mItemAmountFields = new HashMap<Integer, Field>(); - public static HashMap<Integer, Field> mItemTypeFields = new HashMap<Integer, Field>(); - - static { - sQuantumChest = ReflectionUtils.getClass("gregtech.common.tileentities.storage.GT_MetaTileEntity_QuantumChest"); - sSuperChestGTPP = ReflectionUtils - .getClass("gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest"); - sSuperChestGTNH = ReflectionUtils.getClass("gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperChest"); - if (sQuantumChest != null) { - mItemAmountFields.put(0, ReflectionUtils.getField(sQuantumChest, "mItemCount")); - mItemTypeFields.put(0, ReflectionUtils.getField(sQuantumChest, "mItemStack")); - } - if (sSuperChestGTPP != null) { - mItemAmountFields.put(1, ReflectionUtils.getField(sSuperChestGTPP, "mItemCount")); - mItemTypeFields.put(1, ReflectionUtils.getField(sSuperChestGTPP, "mItemStack")); - } - if (sSuperChestGTNH != null) { - mItemAmountFields.put(2, ReflectionUtils.getField(sSuperChestGTNH, "mItemCount")); - mItemTypeFields.put(2, ReflectionUtils.getField(sSuperChestGTNH, "mItemStack")); - } - } - - public GTPP_Cover_Overflow_Item(int aCapacity) { - this.mInitialCapacity = aCapacity; - this.mMaxItemCapacity = aCapacity * 1000; - } - - public int doCoverThings(ForgeDirection side, byte aInputRedstone, int aCoverID, int aCoverVariable, - ICoverable aTileEntity, long aTimer) { - if (aCoverVariable == 0) { - return aCoverVariable; - } - - // Get the IGTTile - IGregTechTileEntity aGtTileEntity = aTileEntity - .getIGregTechTileEntity(aTileEntity.getXCoord(), aTileEntity.getYCoord(), aTileEntity.getZCoord()); - if (aGtTileEntity == null) { - return aCoverVariable; - } - - // Get the MetaTile - final IMetaTileEntity aMetaTileEntity = aGtTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - return aCoverVariable; - } - boolean didHandle = false; - // Special Case for everything I want to support. /facepalm - if (sQuantumChest != null && sQuantumChest.isInstance(aMetaTileEntity)) { - didHandle = handleDigitalChest(aMetaTileEntity, 0); - } else if (sSuperChestGTPP.isInstance(aMetaTileEntity)) { - didHandle = handleDigitalChest(aMetaTileEntity, 1); - - } else if (sSuperChestGTNH != null && sSuperChestGTNH.isInstance(aMetaTileEntity)) { - didHandle = handleDigitalChest(aMetaTileEntity, 2); - } - - return aCoverVariable; - } - - private boolean handleDigitalChest(IMetaTileEntity aTile, int aType) { - int aItemAmount = (int) ReflectionUtils.getFieldValue(mItemAmountFields.get(aType), aTile); - ItemStack aItemType = (ItemStack) ReflectionUtils.getFieldValue(mItemTypeFields.get(aType), aTile); - - if (aItemType == null || aItemAmount <= 0) { - return false; - } else { - if (aItemAmount > mInitialCapacity) { - int aNewItemAmount = mInitialCapacity; - ReflectionUtils.setField(aTile, mItemAmountFields.get(aType), aNewItemAmount); - } - } - return true; - } - - public int onCoverScrewdriverclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { - if (GT_Utility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) { - aCoverVariable += (mMaxItemCapacity * (aPlayer.isSneaking() ? 0.1f : 0.01f)); - } else { - aCoverVariable -= (mMaxItemCapacity * (aPlayer.isSneaking() ? 0.1f : 0.01f)); - } - if (aCoverVariable > mMaxItemCapacity) { - aCoverVariable = mInitialCapacity; - } - if (aCoverVariable <= 0) { - aCoverVariable = mMaxItemCapacity; - } - GT_Utility.sendChatToPlayer( - aPlayer, - LangUtils.trans("322", "Overflow point: ") + aCoverVariable + trans("323", "L")); - return aCoverVariable; - } - - public boolean onCoverRightclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { - boolean aShift = aPlayer.isSneaking(); - int aAmount = aShift ? 128 : 8; - if (GT_Utility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) { - aCoverVariable += aAmount; - } else { - aCoverVariable -= aAmount; - } - if (aCoverVariable > mMaxItemCapacity) { - aCoverVariable = mInitialCapacity; - } - if (aCoverVariable <= 0) { - aCoverVariable = mMaxItemCapacity; - } - GT_Utility.sendChatToPlayer( - aPlayer, - LangUtils.trans("322", "Overflow point: ") + aCoverVariable + trans("323", "L")); - aTileEntity.setCoverDataAtSide(side, aCoverVariable); - return true; - } - - public boolean letsRedstoneGoIn(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { - return true; - } - - public boolean letsRedstoneGoOut(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { - return true; - } - - public boolean letsEnergyIn(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { - return true; - } - - public boolean letsEnergyOut(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { - return true; - } - - public boolean letsItemsIn(ForgeDirection side, int aCoverID, int aCoverVariable, int aSlot, - ICoverable aTileEntity) { - return true; - } - - public boolean letsItemsOut(ForgeDirection side, int aCoverID, int aCoverVariable, int aSlot, - ICoverable aTileEntity) { - return true; - } - - public boolean letsFluidIn(ForgeDirection side, int aCoverID, int aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { - return false; - } - - public boolean letsFluidOut(ForgeDirection side, int aCoverID, int aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { - return true; - } - - public boolean alwaysLookConnected(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { - return true; - } - - public int getTickRate(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { - return 5; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java deleted file mode 100644 index 0d85d6299f..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java +++ /dev/null @@ -1,39 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.helpers; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.world.World; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.common.helpers.autocrafter.AC_Helper_Container; -import gtPlusPlus.xmod.gregtech.common.helpers.autocrafter.AC_Helper_Utils; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_AutoCrafter; - -public class CraftingHelper { - - public final String mInventoryName; - public final int mPosX; - public final int mPosY; - public final int mPosZ; - public final GT4Entity_AutoCrafter crafter; - public final World world; - public final EntityPlayerMP player; - public final AC_Helper_Container inventory; - - public CraftingHelper(GT4Entity_AutoCrafter AC) { - Logger.INFO("[A-C] Created a crafting helper."); - crafter = AC; - AC_Helper_Utils.addCrafter(AC); - // Get some variables. - world = AC.getBaseMetaTileEntity().getWorld(); - mPosX = AC.getBaseMetaTileEntity().getXCoord(); - mPosY = AC.getBaseMetaTileEntity().getYCoord(); - mPosZ = AC.getBaseMetaTileEntity().getZCoord(); - // Create Fake player to handle crating. - - player = CORE.getFakePlayer(world); - // Set storage container - inventory = new AC_Helper_Container(player.inventory, world, mPosX, mPosY, mPosZ); - mInventoryName = inventory.getMatrix().getInventoryName(); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java index 616475b66b..b866be1d87 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java @@ -8,8 +8,8 @@ import net.minecraftforge.oredict.OreDictionary; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.util.sys.Log; public class FlotationRecipeHandler { @@ -19,7 +19,7 @@ public class FlotationRecipeHandler { public static boolean registerOreType(Material aMaterial) { String aMaterialKey = aMaterial.getUnlocalizedName(); if (sMaterialMap.containsKey(aMaterialKey)) { - Log.warn("Tried to register a Flotation material already in use. Material: " + aMaterialKey); + Logger.WARNING("Tried to register a Flotation material already in use. Material: " + aMaterialKey); return false; } else { sMaterialMap.put(aMaterialKey, aMaterial); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java deleted file mode 100644 index b9ba13fa3f..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java +++ /dev/null @@ -1,410 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.helpers.treefarm; - -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockSapling; -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenAbstractTree; -import net.minecraftforge.common.util.ForgeDirection; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.minecraft.FakeBlockPos; -import gtPlusPlus.api.objects.minecraft.FakeWorld; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.math.MathUtils; - -public class TreeGenerator { - - private static final FakeTreeInFakeWorldGenerator mTreeData; - - static { - Logger.WARNING("Created Fake Tree Generator."); - mTreeData = new FakeTreeInFakeWorldGenerator(); - } - - public TreeGenerator() { - if (!mTreeData.hasGenerated) { - mTreeData.generate(null, CORE.RANDOM, 0, 0, 0); - } - } - - public AutoMap<ItemStack> generateOutput(int aTreeSize) { - AutoMap<ItemStack> aOutputMap = mTreeData.getOutputFromTree(); - if (aOutputMap != null && aOutputMap.size() > 0) { - Logger.WARNING("Valid tree data output"); - return aOutputMap; - } - Logger.WARNING("Invalid tree data output"); - return new AutoMap<ItemStack>(); - } - - public static class FakeTreeInFakeWorldGenerator extends WorldGenAbstractTree { - - /** The minimum height of a generated tree. */ - private final int minTreeHeight; - /** True if this tree should grow Vines. */ - private final boolean vinesGrow; - /** The metadata value of the wood to use in tree generation. */ - private final int metaWood; - /** The metadata value of the leaves to use in tree generation. */ - private final int metaLeaves; - - private final AutoMap<FakeWorld> mFakeWorld; - private final int mTreesToGenerate; - - private int mCurrentGeneratorIteration = 0; - - private boolean hasGenerated = false; - private AutoMap<ItemStack> aOutputsFromGenerator = new AutoMap<ItemStack>(); - - public FakeTreeInFakeWorldGenerator() { - this(4, 0, 0, false, 5000); - } - - public FakeTreeInFakeWorldGenerator(int aMinHeight, int aWoodMeta, int aLeafMeta, boolean aVines, - int aTreeCount) { - super(false); - this.minTreeHeight = aMinHeight; - this.metaWood = aWoodMeta; - this.metaLeaves = aLeafMeta; - this.vinesGrow = aVines; - this.mFakeWorld = new AutoMap<FakeWorld>(); - this.mTreesToGenerate = aTreeCount; - Logger.WARNING("Created Fake Tree In Fake World Instance."); - } - - public AutoMap<ItemStack> getOutputFromTree() { - if (!hasGenerated) { - Logger.WARNING("Generating Tree sample data"); - generate(null, CORE.RANDOM, 0, 0, 0); - } - AutoMap<ItemStack> aOutputMap = new AutoMap<ItemStack>(); - int aRandomTreeID = MathUtils.randInt(0, this.mFakeWorld.size() - 1); - FakeWorld aWorld = this.mFakeWorld.get(aRandomTreeID); - if (aWorld != null) { - // Logger.WARNING("Getting all block data from fake world"); - aOutputMap = aWorld.getAllBlocksStoredInFakeWorld(); - } - return aOutputMap; - } - - @Override - protected boolean func_150523_a(Block p_150523_1_) { - return p_150523_1_.getMaterial() == Material.air || p_150523_1_.getMaterial() == Material.leaves - || p_150523_1_ == Blocks.grass - || p_150523_1_ == Blocks.dirt - || p_150523_1_ == Blocks.log - || p_150523_1_ == Blocks.log2 - || p_150523_1_ == Blocks.sapling - || p_150523_1_ == Blocks.vine; - } - - @Override - protected boolean isReplaceable(World world, int x, int y, int z) { - FakeWorld aWorld = getWorld(); - Block block = aWorld.getBlock(x, y, z); - return block.isAir(null, x, y, z) || block.isLeaves(null, x, y, z) - || block.isWood(null, x, y, z) - || func_150523_a(block); - } - - @Override - public boolean generate(World world, Random aRand, int aWorldX, int aWorldRealY, int aWorldZ) { - // Only Generate Once - This object is Cached - if (hasGenerated) { - return hasGenerated; - } else { - for (int yy = 0; yy < mTreesToGenerate; yy++) { - generateTree(0, 0, 0); - mCurrentGeneratorIteration++; - } - hasGenerated = true; - if (this.mFakeWorld.size() > 0) { - for (FakeWorld aWorld : this.mFakeWorld) { - for (ItemStack aBlockInFakeWorld : aWorld.getAllBlocksStoredInFakeWorld()) { - aOutputsFromGenerator.add(aBlockInFakeWorld); - } - } - return true; - } else { - return false; - } - } - } - - private FakeWorld aFakeWorld; - - public FakeWorld getWorld() { - FakeWorld aWorld = this.mFakeWorld.get(mCurrentGeneratorIteration); - if (aWorld == null) { - this.mFakeWorld.set(mCurrentGeneratorIteration, new FakeWorld(200)); - aWorld = this.mFakeWorld.get(mCurrentGeneratorIteration); - } - return aWorld; - } - - public boolean generateTree(int aWorldX, int aWorldRealY, int aWorldZ) { - FakeWorld aWorld = getWorld(); - - // Set some static values - - Logger.WARNING("Stepping through generateTree [0]"); - // Dummy Value - int aWorldY = 10; - - int l = CORE.RANDOM.nextInt(3) + this.minTreeHeight; - boolean flag = true; - - if (aWorldY >= 1 && aWorldY + l + 1 <= 256) { - Logger.WARNING("Stepping through generateTree [1]"); - byte b0; - int k1; - Block block; - - for (int i1 = aWorldY; i1 <= aWorldY + 1 + l; ++i1) { - b0 = 1; - - if (i1 == aWorldY) { - b0 = 0; - } - - if (i1 >= aWorldY + 1 + l - 2) { - b0 = 2; - } - - for (int j1 = aWorldX - b0; j1 <= aWorldX + b0 && flag; ++j1) { - for (k1 = aWorldZ - b0; k1 <= aWorldZ + b0 && flag; ++k1) { - if (i1 >= 0 && i1 < 256) { - block = aWorld.getBlock(j1, i1, k1); - - if (!this.isReplaceable(null, j1, i1, k1)) { - flag = false; - } - } else { - flag = false; - } - } - } - } - - if (!flag) { - Logger.WARNING("Stepping through generateTree [2]"); - return false; - } else { - Logger.WARNING("Stepping through generateTree [3]"); - Block block2 = aWorld.getBlock(aWorldX, aWorldY - 1, aWorldZ); - FakeBlockPos aBlockToGrowPlantOn = aWorld.getBlockAtCoords(aWorldX, aWorldY - 1, aWorldZ); - - boolean isSoil = block2.canSustainPlant( - aWorld, - aWorldX, - aWorldY - 1, - aWorldZ, - ForgeDirection.UP, - (BlockSapling) Blocks.sapling); - if ( - /* isSoil && */ aWorldY < 256 - l - 1) { - Logger.WARNING("Stepping through generateTree [4]"); - aBlockToGrowPlantOn - .onPlantGrow(aWorld, aWorldX, aWorldY - 1, aWorldZ, aWorldX, aWorldY, aWorldZ); - b0 = 3; - byte b1 = 0; - int l1; - int i2; - int j2; - int i3; - - for (k1 = aWorldY - b0 + l; k1 <= aWorldY + l; ++k1) { - i3 = k1 - (aWorldY + l); - l1 = b1 + 1 - i3 / 2; - - for (i2 = aWorldX - l1; i2 <= aWorldX + l1; ++i2) { - j2 = i2 - aWorldX; - - for (int k2 = aWorldZ - l1; k2 <= aWorldZ + l1; ++k2) { - int l2 = k2 - aWorldZ; - - if (Math.abs(j2) != l1 || Math.abs(l2) != l1 - || CORE.RANDOM.nextInt(2) != 0 && i3 != 0) { - Block block1 = aWorld.getBlock(i2, k1, k2); - - if (block1.isAir(null, i2, k1, k2) || block1.isLeaves(null, i2, k1, k2)) { - this.setBlockAndNotifyAdequately( - aWorld, - i2, - k1, - k2, - Blocks.leaves, - this.metaLeaves); - } - } - } - } - } - Logger.WARNING("Stepping through generateTree [5]"); - - for (k1 = 0; k1 < l; ++k1) { - block = aWorld.getBlock(aWorldX, aWorldY + k1, aWorldZ); - - if (block.isAir(null, aWorldX, aWorldY + k1, aWorldZ) - || block.isLeaves(null, aWorldX, aWorldY + k1, aWorldZ)) { - this.setBlockAndNotifyAdequately( - aWorld, - aWorldX, - aWorldY + k1, - aWorldZ, - Blocks.log, - this.metaWood); - - if (this.vinesGrow && k1 > 0) { - if (CORE.RANDOM.nextInt(3) > 0 - && aWorld.isAirBlock(aWorldX - 1, aWorldY + k1, aWorldZ)) { - this.setBlockAndNotifyAdequately( - aWorld, - aWorldX - 1, - aWorldY + k1, - aWorldZ, - Blocks.vine, - 8); - } - - if (CORE.RANDOM.nextInt(3) > 0 - && aWorld.isAirBlock(aWorldX + 1, aWorldY + k1, aWorldZ)) { - this.setBlockAndNotifyAdequately( - aWorld, - aWorldX + 1, - aWorldY + k1, - aWorldZ, - Blocks.vine, - 2); - } - - if (CORE.RANDOM.nextInt(3) > 0 - && aWorld.isAirBlock(aWorldX, aWorldY + k1, aWorldZ - 1)) { - this.setBlockAndNotifyAdequately( - aWorld, - aWorldX, - aWorldY + k1, - aWorldZ - 1, - Blocks.vine, - 1); - } - - if (CORE.RANDOM.nextInt(3) > 0 - && aWorld.isAirBlock(aWorldX, aWorldY + k1, aWorldZ + 1)) { - this.setBlockAndNotifyAdequately( - aWorld, - aWorldX, - aWorldY + k1, - aWorldZ + 1, - Blocks.vine, - 4); - } - } - } - } - Logger.WARNING("Stepping through generateTree [6]"); - - if (this.vinesGrow) { - Logger.WARNING("Stepping through generateTree [7]"); - for (k1 = aWorldY - 3 + l; k1 <= aWorldY + l; ++k1) { - i3 = k1 - (aWorldY + l); - l1 = 2 - i3 / 2; - - for (i2 = aWorldX - l1; i2 <= aWorldX + l1; ++i2) { - for (j2 = aWorldZ - l1; j2 <= aWorldZ + l1; ++j2) { - if (aWorld.getBlock(i2, k1, j2).isLeaves(null, i2, k1, j2)) { - if (CORE.RANDOM.nextInt(4) == 0 - && aWorld.getBlock(i2 - 1, k1, j2).isAir(null, i2 - 1, k1, j2)) { - this.growVines(aWorld, i2 - 1, k1, j2, 8); - } - - if (CORE.RANDOM.nextInt(4) == 0 - && aWorld.getBlock(i2 + 1, k1, j2).isAir(null, i2 + 1, k1, j2)) { - this.growVines(aWorld, i2 + 1, k1, j2, 2); - } - - if (CORE.RANDOM.nextInt(4) == 0 - && aWorld.getBlock(i2, k1, j2 - 1).isAir(null, i2, k1, j2 - 1)) { - this.growVines(aWorld, i2, k1, j2 - 1, 1); - } - - if (CORE.RANDOM.nextInt(4) == 0 - && aWorld.getBlock(i2, k1, j2 + 1).isAir(null, i2, k1, j2 + 1)) { - this.growVines(aWorld, i2, k1, j2 + 1, 4); - } - } - } - } - } - Logger.WARNING("Stepping through generateTree [8]"); - - if (CORE.RANDOM.nextInt(5) == 0 && l > 5) { - for (k1 = 0; k1 < 2; ++k1) { - for (i3 = 0; i3 < 4; ++i3) { - if (CORE.RANDOM.nextInt(4 - k1) == 0) { - l1 = CORE.RANDOM.nextInt(3); - this.setBlockAndNotifyAdequately( - aWorld, - aWorldX + Direction.offsetX[Direction.rotateOpposite[i3]], - aWorldY + l - 5 + k1, - aWorldZ + Direction.offsetZ[Direction.rotateOpposite[i3]], - Blocks.cocoa, - l1 << 2 | i3); - } - } - } - } - } - Logger.WARNING("Stepping through generateTree [9]"); - return true; - } else { - Logger.WARNING("Stepping through generateTree [10]"); - return false; - } - } - } else { - Logger.WARNING("Stepping through generateTree [11]"); - return false; - } - } - - /** - * Grows vines downward from the given block for a given length. Args: World, x, starty, z, vine-length - */ - private void growVines(FakeWorld aWorld, int aX, int aY, int aZ, int aMeta) { - int aLoopSize = vinesGrow ? MathUtils.randInt(0, 4) : 0; - for (int i = 0; i < aLoopSize; i++) { - this.setBlockAndNotifyAdequately(aWorld, aX, aY, aZ, Blocks.vine, aMeta); - } - } - - @Override - protected void setBlockAndNotifyAdequately(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMeta) { - setBlockAndNotifyAdequately(getWorld(), aX, aY, aZ, aBlock, aMeta); - } - - protected void setBlockAndNotifyAdequately(FakeWorld aWorld, int aX, int aY, int aZ, Block aBlock, int aMeta) { - if (aBlock != null && (aMeta >= 0 && aMeta <= Short.MAX_VALUE)) { - Logger.WARNING( - "Setting block " + aX - + ", " - + aY - + ", " - + aZ - + " | " - + aBlock.getLocalizedName() - + " | " - + aMeta); - aWorld.setBlockAtCoords(aX, aY, aZ, aBlock, aMeta); - // aOutputsFromGenerator.put(ItemUtils.simpleMetaStack(aBlock, aMeta, 1)); - } - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index 292ecf807d..cc4503e46e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -446,47 +446,6 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { GregtechItemList.Chip_MultiNerf_NoSpeedBonus .set(this.addItem(161, "No-Bonus Chip", "You won't like using this")); GregtechItemList.Chip_MultiNerf_NoEuBonus.set(this.addItem(162, "No-Bonus Chip", "You won't like using this")); - - /* - * GregtechItemList.Cover_Overflow_Item_ULV.set(this.addItem(165, "Item Overflow Valve (ULV)", - * "Maximum void amount: 8000", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - * getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), - * getTcAspectStack(TC_Aspects.AQUA, 1L)})); GregtechItemList.Cover_Overflow_Item_LV.set(this.addItem(166, - * "Item Overflow Valve (LV)", "Maximum void amount: 64000", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, - * 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), - * getTcAspectStack(TC_Aspects.AQUA, 1L)})); GregtechItemList.Cover_Overflow_Item_MV.set(this.addItem(167, - * "Item Overflow Valve (MV)", "Maximum void amount: 512000", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, - * 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), - * getTcAspectStack(TC_Aspects.AQUA, 1L)})); GregtechItemList.Cover_Overflow_Item_HV.set(this.addItem(168, - * "Item Overflow Valve (HV)", "Maximum void amount: 4096000", new - * Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L), - * getTcAspectStack(TC_Aspects.ITER, 1L), getTcAspectStack(TC_Aspects.AQUA, 1L)})); - * GregtechItemList.Cover_Overflow_Item_EV.set(this.addItem(169, "Item Overflow Valve (EV)", - * "Maximum void amount: 32768000", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - * getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), - * getTcAspectStack(TC_Aspects.AQUA, 1L)})); GregtechItemList.Cover_Overflow_Item_IV.set(this.addItem(170, - * "Item Overflow Valve (IV)", "Maximum void amount: 262144000", new - * Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L), - * getTcAspectStack(TC_Aspects.ITER, 1L), getTcAspectStack(TC_Aspects.AQUA, 1L)})); - * GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_ULV.get(1L), new GT_MultiTexture(new - * ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[4][0], new - * GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(8)); - * GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_LV.get(1L), new GT_MultiTexture(new - * ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[4][0], new - * GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(64)); - * GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_MV.get(1L), new GT_MultiTexture(new - * ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[5][0], new - * GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(512)); - * GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_HV.get(1L), new GT_MultiTexture(new - * ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[5][0], new - * GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(4096)); - * GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_EV.get(1L), new GT_MultiTexture(new - * ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[8][0], new - * GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(32768)); - * GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_IV.get(1L), new GT_MultiTexture(new - * ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[8][0], new - * GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(262144)); - */ } private boolean registerComponents_ULV() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java deleted file mode 100644 index 94a18c8f07..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java +++ /dev/null @@ -1,95 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.items.behaviours; - -import java.util.List; - -import net.minecraft.dispenser.IBlockSource; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import gregtech.api.enums.SubTag; -import gregtech.api.interfaces.IItemBehaviour; -import gregtech.api.items.GT_MetaBase_Item; - -public class Behaviour_Grinder implements IItemBehaviour<GT_MetaBase_Item> { - - @Override - public boolean onLeftClickEntity(GT_MetaBase_Item var1, ItemStack var2, EntityPlayer var3, Entity var4) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean onItemUse(GT_MetaBase_Item var1, ItemStack var2, EntityPlayer var3, World var4, int var5, int var6, - int var7, int var8, float var9, float var10, float var11) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean onItemUseFirst(GT_MetaBase_Item var1, ItemStack var2, EntityPlayer var3, World var4, int var5, - int var6, int var7, ForgeDirection side, float var9, float var10, float var11) { - // TODO Auto-generated method stub - return false; - } - - @Override - public ItemStack onItemRightClick(GT_MetaBase_Item var1, ItemStack var2, World var3, EntityPlayer var4) { - // TODO Auto-generated method stub - return null; - } - - @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item var1, List<String> var2, ItemStack var3) { - // TODO Auto-generated method stub - return null; - } - - @Override - public void onUpdate(GT_MetaBase_Item var1, ItemStack var2, World var3, Entity var4, int var5, boolean var6) { - // TODO Auto-generated method stub - - } - - @Override - public boolean isItemStackUsable(GT_MetaBase_Item var1, ItemStack var2) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean canDispense(GT_MetaBase_Item var1, IBlockSource var2, ItemStack var3) { - // TODO Auto-generated method stub - return false; - } - - @Override - public ItemStack onDispense(GT_MetaBase_Item var1, IBlockSource var2, ItemStack var3) { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean hasProjectile(GT_MetaBase_Item var1, SubTag var2, ItemStack var3) { - // TODO Auto-generated method stub - return false; - } - - @Override - public EntityArrow getProjectile(GT_MetaBase_Item var1, SubTag var2, ItemStack var3, World var4, double var5, - double var7, double var9) { - // TODO Auto-generated method stub - return null; - } - - @Override - public EntityArrow getProjectile(GT_MetaBase_Item var1, SubTag var2, ItemStack var3, World var4, - EntityLivingBase var5, float var6) { - // TODO Auto-generated method stub - return null; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java deleted file mode 100644 index 9d0bcf4314..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java +++ /dev/null @@ -1,196 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.generators; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidHandler; - -import gregtech.api.enums.Dyes; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler; -import gtPlusPlus.core.lib.CORE; - -public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { - - public GT_MetaTileEntity_Boiler_Solar(final int aID, final String aName, final String aNameRegional) { - super(aID, aName, aNameRegional, "Steam Power by the Sun"); - } - - public GT_MetaTileEntity_Boiler_Solar(final String aName, final int aTier, final String aDescription, - final ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - - @Override - public String[] getDescription() { - return new String[] { this.mDescription, "Produces " + (this.getPollution() * 20) + " pollution/sec", - CORE.GT_Tooltip.get() }; - } - - @Override - public ITexture[][][] getTextureSet(final ITexture[] aTextures) { - final ITexture[][][] rTextures = new ITexture[4][17][]; - for (byte i = -1; i < 16; i = (byte) (i + 1)) { - final ITexture[] tmp0 = { new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM, - Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; - rTextures[0][(i + 1)] = tmp0; - final ITexture[] tmp1 = { - new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP, - Dyes.getModulation(i, Dyes._NULL.mRGBa)), - new GT_RenderedTexture(Textures.BlockIcons.BOILER_SOLAR) }; - rTextures[1][(i + 1)] = tmp1; - final ITexture[] tmp2 = { new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, - Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; - rTextures[2][(i + 1)] = tmp2; - final ITexture[] tmp3 = { - new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, - Dyes.getModulation(i, Dyes._NULL.mRGBa)), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) }; - rTextures[3][(i + 1)] = tmp3; - } - return rTextures; - } - - @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, - final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { - return this.mTextures[side.offsetY == 0 ? ((byte) (side != facing ? 2 : 3)) : side.ordinal()][aColorIndex + 1]; - } - - @Override - public int maxProgresstime() { - return 500; - } - - @Override - public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Boiler_Solar(this.mName, this.mTier, this.mDescription, this.mTextures); - } - - private int mRunTime = 0; - - @Override - public void saveNBTData(final NBTTagCompound aNBT) { - super.saveNBTData(aNBT); - aNBT.setInteger("mRunTime", this.mRunTime); - } - - @Override - public void loadNBTData(final NBTTagCompound aNBT) { - super.loadNBTData(aNBT); - this.mRunTime = aNBT.getInteger("mRunTime"); - } - - @Override - public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) { - if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)) { - if (this.mTemperature <= 20) { - this.mTemperature = 20; - this.mLossTimer = 0; - } - if (++this.mLossTimer > 45) { - this.mTemperature -= 1; - this.mLossTimer = 0; - } - if (this.mSteam != null) { - final ForgeDirection side = aBaseMetaTileEntity.getFrontFacing(); - final IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(side); - if (tTileEntity != null) { - final FluidStack tDrained = aBaseMetaTileEntity - .drain(side, Math.max(1, this.mSteam.amount / 2), false); - if (tDrained != null) { - final int tFilledAmount = tTileEntity.fill(side.getOpposite(), tDrained, false); - if (tFilledAmount > 0) { - tTileEntity.fill( - side.getOpposite(), - aBaseMetaTileEntity.drain(side, tFilledAmount, true), - true); - } - } - } - } - if ((aTick % 25L) == 0L) { - if (this.mTemperature > 100) { - if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) { - this.mHadNoWater = true; - } else { - if (this.mHadNoWater) { - aBaseMetaTileEntity.doExplosion(2048L); - return; - } - this.mFluid.amount -= 1; - this.mRunTime += 1; - int tOutput = 150; - if (this.mRunTime > 10000) { - tOutput = Math.max(50, 150 - ((this.mRunTime - 10000) / 100)); - } - if (this.mSteam == null) { - this.mSteam = GT_ModHandler.getSteam(tOutput); - } else if (GT_ModHandler.isSteam(this.mSteam)) { - this.mSteam.amount += tOutput; - } else { - this.mSteam = GT_ModHandler.getSteam(tOutput); - } - } - } else { - this.mHadNoWater = false; - } - } - if ((this.mSteam != null) && (this.mSteam.amount > 16000)) { - this.sendSound((byte) 1); - this.mSteam.amount = 12000; - } - if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) - && ((aTick % 256L) == 0L) - && (!aBaseMetaTileEntity.getWorld().isThundering())) { - final boolean bRain = aBaseMetaTileEntity.getWorld().isRaining() - && (aBaseMetaTileEntity.getBiome().rainfall > 0.0F); - this.mProcessingEnergy += (bRain && (aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4)) - || !aBaseMetaTileEntity.getSkyAtSide(ForgeDirection.UP) ? 0 - : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1; - } - if ((this.mTemperature < 500) && (this.mProcessingEnergy > 0) && ((aTick % 12L) == 0L)) { - this.mProcessingEnergy -= 1; - this.mTemperature += 1; - } - aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0); - } - } - - @Override - protected int getPollution() { - return 0; - } - - @Override - protected int getProductionPerSecond() { - return 0; - } - - @Override - protected int getMaxTemperature() { - return 0; - } - - @Override - protected int getEnergyConsumption() { - return 0; - } - - @Override - protected int getCooldownInterval() { - return 0; - } - - @Override - protected void updateFuel(IGregTechTileEntity iGregTechTileEntity, long l) {} -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java deleted file mode 100644 index 7df64e3f3a..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java +++ /dev/null @@ -1,171 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.generators; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Recipe; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechRocketFuelGeneratorBase; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; - -public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocketFuelGeneratorBase { - - public int mEfficiency; - - public GregtechMetaTileEntityDoubleFuelGeneratorBase(final int aID, final String aName, final String aNameRegional, - final int aTier) { - super( - aID, - aName, - aNameRegional, - aTier, - "Requires two liquid Fuels. Fuel A is Fastburn, Fuel B is slowburn.", - new ITexture[0]); - this.onConfigLoad(); - } - - public GregtechMetaTileEntityDoubleFuelGeneratorBase(final String aName, final int aTier, final String aDescription, - final ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - this.onConfigLoad(); - } - - @Override - public String[] getDescription() { - return new String[] { this.mDescription, "Generates power at " + this.getEfficiency() + "% Efficiency per tick", - "Output Voltage: " + this.getOutputTier() + " EU/t", CORE.GT_Tooltip.get() }; - } - - @Override - public boolean isOutputFacing(final ForgeDirection side) { - return side == this.getBaseMetaTileEntity().getFrontFacing(); - } - - @Override - public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntityDoubleFuelGeneratorBase( - this.mName, - this.mTier, - this.mDescription, - this.mTextures); - } - - @Override - public GT_Recipe.GT_Recipe_Map getRecipes() { - return GT_Recipe.GT_Recipe_Map.sDieselFuels; - } - - @Override - public int getCapacity() { - return 32000; - } - - public void onConfigLoad() { - this.mEfficiency = GregTech_API.sMachineFile.get( - ConfigCategories.machineconfig, - "RocketEngine.efficiency.tier." + this.mTier, - (100 - (this.mTier * 8))); - } - - @Override - public int getEfficiency() { - return this.mEfficiency; - } - - @Override - public int getFuelValue(final ItemStack aStack) { - int rValue = Math.max((GT_ModHandler.getFuelCanValue(aStack) * 6) / 5, super.getFuelValue(aStack)); - if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) { - rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3); - } - return rValue; - } - - private GT_RenderedTexture getCasingTexture() { - if (this.mTier <= 4) { - return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top); - } else if (this.mTier == 5) { - - return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Advanced); - } else { - - return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Ultra); - } - // return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top); - } - - @Override - public ITexture[] getFront(final byte aColor) { - return new ITexture[] { super.getFront(aColor)[0], this.getCasingTexture(), - Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; - } - - @Override - public ITexture[] getBack(final byte aColor) { - return new ITexture[] { super.getBack(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent) }; - } - - @Override - public ITexture[] getBottom(final byte aColor) { - return new ITexture[] { super.getBottom(aColor)[0], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; - } - - @Override - public ITexture[] getTop(final byte aColor) { - return new ITexture[] { super.getTop(aColor)[0], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off) }; - } - - @Override - public ITexture[] getSides(final byte aColor) { - return new ITexture[] { super.getSides(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal) }; - } - - @Override - public ITexture[] getFrontActive(final byte aColor) { - return new ITexture[] { super.getFrontActive(aColor)[0], this.getCasingTexture(), - Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; - } - - @Override - public ITexture[] getBackActive(final byte aColor) { - return new ITexture[] { super.getBackActive(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast) }; - } - - @Override - public ITexture[] getBottomActive(final byte aColor) { - return new ITexture[] { super.getBottomActive(aColor)[0], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; - } - - @Override - public ITexture[] getTopActive(final byte aColor) { - return new ITexture[] { super.getTopActive(aColor)[0], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On) }; - } - - @Override - public ITexture[] getSidesActive(final byte aColor) { - return new ITexture[] { super.getSidesActive(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active) }; - } - - @Override - public int getPollution() { - return 250; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java deleted file mode 100644 index e25ebb5daa..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java +++ /dev/null @@ -1,270 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; - -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; - -public class GregtechMetaTileEntityThaumcraftResearcher extends GregtechMetaTileEntity { - - public GregtechMetaTileEntityThaumcraftResearcher(final int aID, final String aName, final String aNameRegional, - final int aTier, final String aDescription, final int aSlotCount) { - super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription); - } - - public GregtechMetaTileEntityThaumcraftResearcher(final String aName, final int aTier, final String aDescription, - final ITexture[][][] aTextures, final int aSlotCount) { - super(aName, aTier, aSlotCount, aDescription, aTextures); - } - - @Override - public String[] getDescription() { - return new String[] { this.mDescription, "Generates Thaumcraft research notes, because it's magic." }; - } - - @Override - public ITexture[][][] getTextureSet(final ITexture[] aTextures) { - final ITexture[][][] rTextures = new ITexture[10][17][]; - for (byte i = -1; i < 16; i++) { - rTextures[0][i + 1] = this.getFront(i); - rTextures[1][i + 1] = this.getBack(i); - rTextures[2][i + 1] = this.getBottom(i); - rTextures[3][i + 1] = this.getTop(i); - rTextures[4][i + 1] = this.getSides(i); - rTextures[5][i + 1] = this.getFrontActive(i); - rTextures[6][i + 1] = this.getBackActive(i); - rTextures[7][i + 1] = this.getBottomActive(i); - rTextures[8][i + 1] = this.getTopActive(i); - rTextures[9][i + 1] = this.getSidesActive(i); - } - return rTextures; - } - - @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, - final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { - return this.mTextures[(aActive ? 5 : 0) - + (side == facing ? 0 - : side == facing.getOpposite() ? 1 - : side == ForgeDirection.DOWN ? 2 : side == ForgeDirection.UP ? 3 : 4)][aColorIndex - + 1]; - } - - public ITexture[] getFront(final byte aColor) { - return new ITexture[] { getSides(aColor)[0], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Metal_Grate_A) }; - } - - public ITexture[] getBack(final byte aColor) { - return new ITexture[] { getSides(aColor)[0], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Metal_Grate_B) }; - } - - public ITexture[] getBottom(final byte aColor) { - return new ITexture[] { getSides(aColor)[0] }; - } - - public ITexture[] getTop(final byte aColor) { - return new ITexture[] { getSides(aColor)[0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Blue) }; - } - - public ITexture[] getSides(final byte aColor) { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel) }; - } - - public ITexture[] getFrontActive(final byte aColor) { - return getFront(aColor); - } - - public ITexture[] getBackActive(final byte aColor) { - return getBack(aColor); - } - - public ITexture[] getBottomActive(final byte aColor) { - return getBottom(aColor); - } - - public ITexture[] getTopActive(final byte aColor) { - return new ITexture[] { getSides(aColor)[0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) }; - } - - public ITexture[] getSidesActive(final byte aColor) { - return getSides(aColor); - } - - @Override - public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ); - } - - @Override - public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntityThaumcraftResearcher( - this.mName, - this.mTier, - this.mDescription, - this.mTextures, - this.mInventory.length); - } - - @Override - public boolean isSimpleMachine() { - return false; - } - - @Override - public boolean isElectric() { - return true; - } - - @Override - public boolean isValidSlot(final int aIndex) { - return true; - } - - @Override - public boolean isFacingValid(final ForgeDirection facing) { - return true; - } - - @Override - public boolean isEnetInput() { - return true; - } - - @Override - public boolean isEnetOutput() { - return false; - } - - @Override - public boolean isInputFacing(final ForgeDirection side) { - return side != this.getBaseMetaTileEntity().getFrontFacing(); - } - - @Override - public boolean isOutputFacing(final ForgeDirection side) { - return side == this.getBaseMetaTileEntity().getBackFacing(); - } - - @Override - public boolean isTeleporterCompatible() { - return false; - } - - @Override - public long getMinimumStoredEU() { - return 0; - } - - @Override - public long maxEUStore() { - return 512000; - } - - @Override - public int rechargerSlotStartIndex() { - return 0; - } - - @Override - public int dechargerSlotStartIndex() { - return 0; - } - - @Override - public int rechargerSlotCount() { - return 0; - } - - @Override - public int dechargerSlotCount() { - return 0; - } - - @Override - public boolean isAccessAllowed(final EntityPlayer aPlayer) { - return true; - } - - @Override - public int getCapacity() { - return 128000; - } - - @Override - public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) { - if (aBaseMetaTileEntity.isClientSide()) { - return true; - } - return true; - } - - @Override - public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, - final ForgeDirection side, final ItemStack aStack) { - return side == this.getBaseMetaTileEntity().getBackFacing(); - } - - @Override - public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, - final ForgeDirection side, final ItemStack aStack) { - return true; - } - - @Override - public String[] getInfoData() { - return new String[] { this.getLocalName(), }; - } - - @Override - public boolean isGivingInformation() { - return true; - } - - @Override - public int getSizeInventory() { - return 2; - } - - @Override - public boolean isOverclockerUpgradable() { - return false; - } - - @Override - public boolean isTransformerUpgradable() { - return false; - } - - @Override - public void saveNBTData(final NBTTagCompound aNBT) { - // aNBT.setInteger("mCurrentPollution", this.mCurrentPollution); - // aNBT.setInteger("mAveragePollution", this.mAveragePollution); - } - - @Override - public void loadNBTData(final NBTTagCompound aNBT) { - // this.mCurrentPollution = aNBT.getInteger("mCurrentPollution"); - // this.mAveragePollution = aNBT.getInteger("mAveragePollution"); - } - - @Override - public void onFirstTick(final IGregTechTileEntity aBaseMetaTileEntity) { - super.onFirstTick(aBaseMetaTileEntity); - } - - @Override - public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) { - super.onPostTick(aBaseMetaTileEntity, aTick); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSinter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSinter.java deleted file mode 100644 index b93bde0f30..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSinter.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; public class - * GregtechMetaTileEntity_IndustrialSinter extends GT_MetaTileEntity_MultiBlockBase { RenderBlocks asdasd = - * RenderBlocks.getInstance(); public GregtechMetaTileEntity_IndustrialSinter(final int aID, final String aName, final - * String aNameRegional) { super(aID, aName, aNameRegional); } public GregtechMetaTileEntity_IndustrialSinter(final - * String aName) { super(aName); } - * @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { return new - * GregtechMetaTileEntity_IndustrialSinter(this.mName); } - * @Override public String[] getDescription() { return new String[]{ - * "Controller Block for the Industrial Sinter Furnace", "Size: 3x5x3 [WxLxH] (Hollow)", "Controller (front centered)", - * "2x Input Bus (side centered)", "2x Output Bus (side centered)", "1x Energy Hatch (top or bottom centered)", - * "1x Maintenance Hatch (back centered)", "Sinter Furnace Casings for the rest (32 at least!)", "Causes " + 20 * - * this.getPollutionPerTick(null) + " Pollution per second", CORE.GT_Tooltip.get() }; } - * @Override public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte - * aFacing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { if (side == facing) { return new - * ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(7)), new GT_RenderedTexture(aActive ? - * TexturesGtBlock.Overlay_Machine_Controller_Default_Active : TexturesGtBlock.Overlay_Machine_Controller_Default)}; } - * return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(7))}; } - * @Override public GT_Recipe.GT_Recipe_Map getRecipeMap() { return GT_Recipe.GT_Recipe_Map.sWiremillRecipes; } - * @Override public boolean isCorrectMachinePart(final ItemStack aStack) { return true; } - * @Override public boolean isFacingValid(final ForgeDirection facing) { return facing.offsetY == 0; } - * @Override public boolean checkRecipe(final ItemStack aStack) { final ArrayList<ItemStack> tInputList = - * this.getStoredInputs(); for (final ItemStack tInput : tInputList) { final long tVoltage = this.getMaxInputVoltage(); - * final byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); final GT_Recipe tRecipe = - * GT_Recipe.GT_Recipe_Map.sWiremillRecipes.findRecipe(this.getBaseMetaTileEntity(), false, - * gregtech.api.enums.GT_Values.V[tTier], null, new ItemStack[]{tInput}); if (tRecipe != null) { if - * (tRecipe.isRecipeInputEqual(true, null, new ItemStack[]{tInput})) { this.mEfficiency = (10000 - - * ((this.getIdealStatus() - this.getRepairStatus()) * 1000)); this.mEfficiencyIncrease = 10000; if (tRecipe.mEUt <= 16) - * { this.mEUt = (tRecipe.mEUt * (1 << (tTier - 1)) * (1 << (tTier - 1))); this.mMaxProgresstime = (tRecipe.mDuration / - * (1 << (tTier - 1))); } else { this.mEUt = tRecipe.mEUt; this.mMaxProgresstime = tRecipe.mDuration; while (this.mEUt - * <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { this.mEUt *= 4; this.mMaxProgresstime /= 2; } } if (this.mEUt > 0) - * { this.mEUt = (-this.mEUt); } this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); this.mOutputItems = new - * ItemStack[]{tRecipe.getOutput(0)}; this.updateSlots(); return true; } } } return false; } - * @Override public boolean checkMachine(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) { final - * int controllerX = aBaseMetaTileEntity.getXCoord(); final int controllerY = aBaseMetaTileEntity.getYCoord(); final int - * controllerZ = aBaseMetaTileEntity.getZCoord(); final byte tSide = this.getBaseMetaTileEntity().getBackFacing(); if - * ((this.getBaseMetaTileEntity().getAirAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 1)) && - * (this.getBaseMetaTileEntity().getAirAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 2) && - * (this.getBaseMetaTileEntity().getAirAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 3)))) { 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 (this.getBaseMetaTileEntity().getAirOffset(i, j, k)) { - * Logger.INFO("Found Air at: "+(controllerX+i)+" "+(controllerY+k)+" "+(controllerZ+k)); //if - * (aBaseMetaTileEntity.getWorld().isRemote){ //asdasd.renderStandardBlock(ModBlocks.MatterFabricatorEffectBlock, - * (controllerX+i), (controllerY+k), (controllerZ+k)); //UtilsRendering.drawBlockInWorld((controllerX+i), - * (controllerY+k), (controllerZ+k), Color.YELLOW_GREEN); //} tAirCount++; } } } } if (tAirCount != 10) { - * Logger.INFO("False. Air != 10. Air == "+tAirCount); //return false; } for (byte i = 2; i < 6; i = (byte) (i + 1)) { - * //UtilsRendering.drawBlockInWorld((controllerX+i), (controllerY), (controllerZ), Color.LIME_GREEN); - * IGregTechTileEntity tTileEntity; if ((null != (tTileEntity = - * this.getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance(i, 2))) && (tTileEntity.getFrontFacing() == - * this.getBaseMetaTileEntity().getFrontFacing()) && (tTileEntity.getMetaTileEntity() != null) && - * ((tTileEntity.getMetaTileEntity() instanceof GregtechMetaTileEntity_IndustrialSinter))) { - * //Utils.LOG_INFO("False 1"); return false; } } final int tX = this.getBaseMetaTileEntity().getXCoord(); final int tY - * = this.getBaseMetaTileEntity().getYCoord(); final int tZ = this.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 < 5; k = (byte) (k + 1)) { //UtilsRendering.drawBlockInWorld((controllerX+i), (controllerY+k), - * (controllerZ+k), Color.ORANGE); if (((i == 0) || (j == 0)) && ((k == 1) || (k == 2) || (k == 3))) { - * //UtilsRendering.drawBlockInWorld((controllerX+i), (controllerY+k), (controllerZ+k), Color.TOMATO); if - * ((this.getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : - * tside == ForgeDirection.SOUTH ? k : i)) == this.getCasingBlock()) && (this.getBaseMetaTileEntity().getMetaID(tX + - * (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tside == ForgeDirection.SOUTH ? k : i)) == - * this.getCasingMeta())) { } else if (!this.addToMachineList(this.getBaseMetaTileEntity().getIGregTechTileEntity(tX + - * (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tside == ForgeDirection.SOUTH ? k : i))) && - * (!this.addEnergyInputToMachineList(this.getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide - * == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tside == ForgeDirection.SOUTH ? k : i))))) { Logger.INFO("False 2"); - * return false; } } else if ((this.getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + - * j, tZ + (tSide == 2 ? -k : tside == ForgeDirection.SOUTH ? k : i)) == this.getCasingBlock()) && - * (this.getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : - * tside == ForgeDirection.SOUTH ? k : i)) == this.getCasingMeta())) { } else { Logger.INFO("False 3"); return false; } - * } } } } if ((this.mOutputHatches.size() != 0) || (this.mInputHatches.size() != 0)) { - * Logger.INFO("Use Busses, Not Hatches for Input/Output."); return false; } if ((this.mInputBusses.size() != 2) || - * (this.mOutputBusses.size() != 2)) { Logger.INFO("Incorrect amount of Input & Output busses."); return false; } - * this.mMaintenanceHatches.clear(); final IGregTechTileEntity tTileEntity = - * this.getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), - * 4); if ((tTileEntity != null) && (tTileEntity.getMetaTileEntity() != null)) { if ((tTileEntity.getMetaTileEntity() - * instanceof GT_MetaTileEntity_Hatch_Maintenance)) { this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) - * tTileEntity.getMetaTileEntity()); ((GT_MetaTileEntity_Hatch) tTileEntity.getMetaTileEntity()).mMachineBlock = - * this.getCasingTextureIndex(); } else { Logger.INFO("Maintenance hatch must be in the middle block on the back."); - * return false; } } if ((this.mMaintenanceHatches.size() != 1) || (this.mEnergyHatches.size() != 1)) { - * Logger.INFO("Incorrect amount of Maintenance or Energy hatches."); return false; } } else { Logger.INFO("False 5"); - * return false; } Logger.INFO("True"); return true; } - * @Override public int getMaxEfficiency(final ItemStack aStack) { return 10000; } - * @Override public int getPollutionPerTick(final ItemStack aStack) { return 0; } - * @Override public int getDamageToComponent(final ItemStack aStack) { return 0; } public int getAmountOfOutputs() { - * return 1; } - * @Override public boolean explodesOnComponentBreak(final ItemStack aStack) { return false; } public Block - * getCasingBlock() { return ModBlocks.blockCasingsMisc; } public byte getCasingMeta() { return 6; } public byte - * getCasingTextureIndex() { return 1; //TODO } private boolean addToMachineList(final IGregTechTileEntity tTileEntity) - * { return ((this.addMaintenanceToMachineList(tTileEntity, this.getCasingTextureIndex())) || - * (this.addInputToMachineList(tTileEntity, this.getCasingTextureIndex())) || (this.addOutputToMachineList(tTileEntity, - * this.getCasingTextureIndex())) || (this.addMufflerToMachineList(tTileEntity, this.getCasingTextureIndex()))); } - * private boolean addEnergyInputToMachineList(final IGregTechTileEntity tTileEntity) { return - * ((this.addEnergyInputToMachineList(tTileEntity, this.getCasingTextureIndex()))); } } - */ diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java deleted file mode 100644 index 2913e5bbed..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; public class - * GregtechMTE_FastNeutronReactor extends GregtechMeta_MultiBlockBase { private int mSuperEfficencyIncrease = 0; public - * GregtechMTE_FastNeutronReactor(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - * public GregtechMTE_FastNeutronReactor(String mName) { super(mName); } - * @Override public String getMachineType() { return "Reactor"; } - * @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new - * GregtechMTE_FastNeutronReactor(this.mName); } - * @Override public boolean isFacingValid(ForgeDirection facing) { return facing.offsetY == 0; } - * @Override public boolean isCorrectMachinePart(ItemStack aStack) { return true; } - * @Override public int getDamageToComponent(ItemStack aStack){ return 0; } - * @Override public boolean checkRecipe(final ItemStack aStack) { this.mSuperEfficencyIncrease=0; if - * (processing_Stage_1()) { if (processing_Stage_2()) { if (processing_Stage_3()) { if (processing_Stage_4()) { } else { - * //Stage 4 } } else { //Stage 3 } } else { //Stage 2 } } else { //Stage 1 } return false; } - * @Override public int getMaxParallelRecipes() { return 1; } - * @Override public int getEuDiscountForParallelism() { return 0; } public boolean processing_Stage_1() { //Deplete - * Water, Add More Progress Time for (GT_MetaTileEntity_Hatch_Input tRecipe : this.mInputHatches) { if - * (tRecipe.getFluid() != null){ FluidStack tFluid = FluidUtils.getFluidStack(tRecipe.getFluid(), 200); if (tFluid != - * null) { if (tFluid == GT_ModHandler.getDistilledWater(1)) { if (depleteInput(tFluid)) { this.mMaxProgresstime = - * Math.max(1, runtimeBoost(8 * 2)); this.mEUt = getEUt(); this.mEfficiencyIncrease = (this.mMaxProgresstime * - * getEfficiencyIncrease()); return true; } } } } } this.mMaxProgresstime = 0; this.mEUt = 0; return false; } public - * boolean processing_Stage_2() { return false; } public boolean processing_Stage_3() { return false; } public boolean - * processing_Stage_4() { return false; } - * @Override public boolean onRunningTick(ItemStack aStack) { if (this.mEUt > 0) { if(this.mSuperEfficencyIncrease>0){ - * this.mEfficiency = Math.min(10000, this.mEfficiency + this.mSuperEfficencyIncrease); } int tGeneratedEU = (int) - * (this.mEUt * 2L * this.mEfficiency / 10000L); if (tGeneratedEU > 0) { long amount = (tGeneratedEU + 160) / 160; if - * (!depleteInput(GT_ModHandler.getDistilledWater(amount))) { explodeMultiblock(); } else { - * addOutput(GT_ModHandler.getSteam(tGeneratedEU)); } } return true; } return true; } public int getEUt() { return 0; - * //Default 400 } public int getEfficiencyIncrease() { return 0; //Default 12 } int runtimeBoost(int mTime) { return - * mTime * 150 / 100; } - * @Override public boolean explodesOnComponentBreak(ItemStack aStack) { return true; } - * @Override public int getMaxEfficiency(ItemStack aStack) { return 10000; } - * @Override public int getPollutionPerTick(ItemStack aStack) { return 0; } public int getAmountOfOutputs() { return 1; - * } - * @Override public String[] getTooltip() { return new String[]{ "Fukushima-Daiichi Reactor No. 6", - * "------------------------------------------", "Boiling Water Reactor", "Harness the power of Nuclear Fission", - * "------------------------------------------", "Consult user manual for more information", }; } - * @Override public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte - * aFacing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { if (side == facing) { return new - * ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(1)), new GT_RenderedTexture(aActive ? - * Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE : - * Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE)}; } return new - * ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(1))}; } - * @Override public boolean checkMultiblock(IGregTechTileEntity aBaseMetaTileEntity, ItemStack arg1) { return true; } - * public boolean damageFilter(){ return false; } - * @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - * super.onPostTick(aBaseMetaTileEntity, aTick); } } - */ diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java deleted file mode 100644 index 5b190f09db..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java +++ /dev/null @@ -1,164 +0,0 @@ -/* - * package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; public class - * GregtechMTE_LargeNaqReactor extends GregtechMeta_MultiBlockBase { public ArrayList<GT_MetaTileEntity_Hatch_Naquadah> - * mNaqHatches = new ArrayList<GT_MetaTileEntity_Hatch_Naquadah>(); public static String[] mCasingName = new String[5]; - * public static String mHatchName = "Naquadah Fuel Hatch"; private final int CASING_TEXTURE_ID = - * TAE.getIndexFromPage(0, 13); private final int META_BaseCasing = 0; //4 private final int META_ContainmentCasing = - * 15; //3 private final int META_Shielding = 13; //1 private final int META_PipeCasing = 1; //4 private final int - * META_IntegralCasing = 6; //0 private final int META_ContainmentChamberCasing = 2; //4 public - * GregtechMTE_LargeNaqReactor(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); - * mCasingName[0] = LangUtils.getLocalizedNameOfBlock(getCasing(4), 0); mCasingName[1] = - * LangUtils.getLocalizedNameOfBlock(getCasing(4), 1); mCasingName[2] = LangUtils.getLocalizedNameOfBlock(getCasing(4), - * 2); mCasingName[3] = LangUtils.getLocalizedNameOfBlock(getCasing(3), 15); mCasingName[4] = - * LangUtils.getLocalizedNameOfBlock(getCasing(1), 13); mHatchName = - * LangUtils.getLocalizedNameOfBlock(GregTech_API.sBlockMachines, 969); } public GregtechMTE_LargeNaqReactor(String - * aName) { super(aName); } public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new - * GregtechMTE_LargeNaqReactor(this.mName); } public String[] getTooltip() { if - * (mCasingName[0].toLowerCase().contains(".name")) { mCasingName[0] = LangUtils.getLocalizedNameOfBlock(getCasing(4), - * 0); } if (mCasingName[1].toLowerCase().contains(".name")) { mCasingName[1] = - * LangUtils.getLocalizedNameOfBlock(getCasing(4), 1); } if (mCasingName[2].toLowerCase().contains(".name")) { - * mCasingName[2] = LangUtils.getLocalizedNameOfBlock(getCasing(4), 2); } if - * (mCasingName[3].toLowerCase().contains(".name")) { mCasingName[3] = LangUtils.getLocalizedNameOfBlock(getCasing(3), - * 15); } if (mCasingName[4].toLowerCase().contains(".name")) { mCasingName[4] = - * LangUtils.getLocalizedNameOfBlock(getCasing(1), 13); } if (mHatchName.toLowerCase().contains(".name")) { mHatchName = - * LangUtils.getLocalizedNameOfBlock(GregTech_API.sBlockMachines, 969); } return new String[]{ - * "Naquadah reacts violently with potassium, ", "resulting in massive explosions with radioactive potential.", - * "Size: 3x4x12, WxHxL", "Bottom Layer: "+mCasingName[0]+"s, (30x min)", - * "Middle Layer: "+mCasingName[2]+"s (10x), with", " "+mCasingName[3]+"s on either side", - * " "+mCasingName[3]+"s also on each end (x26)", "Middle Layer2: "+mCasingName[1]+" (12x total), with", - * " "+mCasingName[4]+"s on either side (x24)", - * "Top: Single row of "+mCasingName[0]+" along the middle (x12) ", "", "1x " + mHatchName + - * " (Any bottom layer casing)", "1x " + "Maintenance Hatch" + " (Any bottom layer side casing)", "1x " + "Energy Hatch" - * + " (Any top layer casing)", }; } public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, - * byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { return side == facing ? new - * ITexture[]{BlockIcons.getCasingTextureForId(TAE.getIndexFromPage(3, 0)), new GT_RenderedTexture(aActive ? - * TexturesGtBlock.Overlay_Machine_Controller_Default_Active : TexturesGtBlock.Overlay_Machine_Controller_Default)} : - * new ITexture[]{BlockIcons.getCasingTextureForId(TAE.getIndexFromPage(3, 0))}; } public GT_Recipe_Map getRecipeMap() { - * return null; } public boolean isCorrectMachinePart(ItemStack aStack) { return true; } public boolean - * isFacingValid(byte aFacing) { return aFacing == 1; } public boolean checkRecipe(ItemStack aStack) { return false; } - * @Override public int getMaxParallelRecipes() { return 1; } - * @Override public int getEuDiscountForParallelism() { return 0; } public void startSoundLoop(byte aIndex, double aX, - * double aY, double aZ) { super.startSoundLoop(aIndex, aX, aY, aZ); if (aIndex == 20) { - * GT_Utility.doSoundAtClient((String) GregTech_API.sSoundList.get(Integer.valueOf(212)), 10, 1.0F, aX, aY, aZ); } } - * @Override public String getSound() { return (String) GregTech_API.sSoundList.get(Integer.valueOf(212)); } private - * Block getCasing(int casingID) { if (casingID == 1) { return ModBlocks.blockCasingsMisc; } else if (casingID == 2) { - * return ModBlocks.blockCasings2Misc; } else if (casingID == 3) { return ModBlocks.blockCasings3Misc; } else if - * (casingID == 4) { return ModBlocks.blockCasings4Misc; } else { return ModBlocks.blockCasingsTieredGTPP; } } - * //Casing3, Meta 10 - "Grate Machine Casing"); //Casing2, Meta 0 - "Solid Steel Machine Casing" //Casing2, Meta 5 - - * "Assembling Line Casing" //Casing2, Meta 9 - "Assembler Machine Casing" //Magic Glass - blockAlloyGlass public - * boolean checkMultiblock(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { int xDir = - * ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 4; int zDir = - * ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 4; // Counts for all Casing Types int - * aBaseCasingCount = 0; int aContainmentCasingCount = 0; int aShieldingCount = 0; int aPipeCount = 0; int - * aIntegralCasingCount = 0; int aContainmentChamberCount = 0; // Bottom Layer aBaseCasingCount += - * checkEntireLayer(aBaseMetaTileEntity, getCasing(4), META_BaseCasing, -7, xDir, zDir); - * log("Bottom Layer is Valid. Moving to Layer 1."); // Layer 1 aShieldingCount += checkOuterRing(aBaseMetaTileEntity, - * getCasing(1), this.META_Shielding, -6, xDir, zDir); aIntegralCasingCount += checkIntegralRing(aBaseMetaTileEntity, - * getCasing(0), this.META_IntegralCasing, -6, xDir, zDir); aContainmentChamberCount += - * checkContainmentRing(aBaseMetaTileEntity, getCasing(4), this.META_ContainmentChamberCasing, -6, xDir, zDir); - * log("Layer 1 is Valid. Moving to Layer 2."); // Layer 2 aShieldingCount += checkOuterRing(aBaseMetaTileEntity, - * getCasing(1), this.META_Shielding, -5, xDir, zDir); aPipeCount += checkPipes(aBaseMetaTileEntity, getCasing(4), - * this.META_PipeCasing, -5, xDir, zDir); log("Layer 2 is Valid. Moving to Layer 3."); // Layer 3 - * aContainmentCasingCount += checkOuterRing(aBaseMetaTileEntity, getCasing(3), this.META_ContainmentCasing, -4, xDir, - * zDir); aPipeCount += checkPipes(aBaseMetaTileEntity, getCasing(4), this.META_PipeCasing, -4, xDir, zDir); - * log("Layer 3 is Valid. Moving to Layer 4."); // Layer 4 aContainmentCasingCount += - * checkOuterRing(aBaseMetaTileEntity, getCasing(3), this.META_ContainmentCasing, -3, xDir, zDir); aPipeCount += - * checkPipes(aBaseMetaTileEntity, getCasing(4), this.META_PipeCasing, -3, xDir, zDir); - * log("Layer 4 is Valid. Moving to Layer 5."); // Layer 5 aShieldingCount += checkOuterRing(aBaseMetaTileEntity, - * getCasing(1), this.META_Shielding, -2, xDir, zDir); aPipeCount += checkPipes(aBaseMetaTileEntity, getCasing(4), - * this.META_PipeCasing, -2, xDir, zDir); log("Layer 5 is Valid. Moving to Layer 6."); // Layer 6 aShieldingCount += - * checkOuterRing(aBaseMetaTileEntity, getCasing(1), this.META_Shielding, -1, xDir, zDir); aIntegralCasingCount += - * checkIntegralRing(aBaseMetaTileEntity, getCasing(0), this.META_IntegralCasing, -1, xDir, zDir); - * aContainmentChamberCount += checkContainmentRing(aBaseMetaTileEntity, getCasing(4), - * this.META_ContainmentChamberCasing, -1, xDir, zDir); log("Layer 6 is Valid. Moving to Top Layer."); // Top Layer - * aBaseCasingCount += checkEntireLayer(aBaseMetaTileEntity, getCasing(4), META_BaseCasing, 0, xDir, zDir); - * log("Found "+aBaseCasingCount+" "+mCasingName[0]+"s"); log("Found "+aShieldingCount+" "+mCasingName[4]+"s"); - * log("Found "+aPipeCount+" "+mCasingName[1]+"s"); log("Found "+aContainmentCasingCount+" "+mCasingName[3]+"s"); - * log("Found "+aIntegralCasingCount+" "+LangUtils.getLocalizedNameOfBlock(getCasing(0), 6)+"s"); - * log("Found "+aContainmentChamberCount+" "+mCasingName[2]+"s"); // Try mesage player String aOwnerName = - * this.getBaseMetaTileEntity().getOwnerName(); EntityPlayer aOwner = null; if (aOwnerName != null && - * aOwnerName.length() > 0) { aOwner = PlayerUtils.getPlayer(aOwnerName); } if (aShieldingCount != 128) { - * log("Not enough "+mCasingName[4]+"s, require 128."); if (aOwner != null) { PlayerUtils.messagePlayer(aOwner, - * "Not enough "+mCasingName[4]+"s, require 128."); } return false; } if (aPipeCount != 20) { - * log("Not enough "+mCasingName[1]+"s, require 20."); if (aOwner != null) { PlayerUtils.messagePlayer(aOwner, - * "Not enough "+mCasingName[1]+"s, require 20."); } return false; } if (aContainmentCasingCount != 64) { - * log("Not enough "+mCasingName[3]+"s, require 64."); if (aOwner != null) { PlayerUtils.messagePlayer(aOwner, - * "Not enough "+mCasingName[3]+"s, require 64."); } return false; } if (aContainmentChamberCount != 42) { - * log("Not enough "+mCasingName[2]+"s, require 42."); if (aOwner != null) { PlayerUtils.messagePlayer(aOwner, - * "Not enough "+mCasingName[2]+"s, require 42."); } return false; } if (aBaseCasingCount < 140) { - * log("Not enough "+mCasingName[0]+"s, require 140 at a minimum."); if (aOwner != null) { - * PlayerUtils.messagePlayer(aOwner, "Not enough "+mCasingName[0]+"s, require 140 at a minimum."); } return false; } if - * (aIntegralCasingCount != 48) { log("Not enough "+LangUtils.getLocalizedNameOfBlock(getCasing(0), - * 6)+"s, require 48."); if (aOwner != null) { PlayerUtils.messagePlayer(aOwner, - * "Not enough "+LangUtils.getLocalizedNameOfBlock(getCasing(0), 6)+"s, require 48."); } return false; } - * log("LNR Formed."); if (aOwner != null) { PlayerUtils.messagePlayer(aOwner, - * "Large Naquadah Reactor has formed successfully."); } return true; } public boolean - * addNaquadahHatchToMachineInput(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { if (aTileEntity == null) { - * return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity == - * null) { return false; } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Naquadah) { - * this.updateTexture(aMetaTileEntity, aBaseCasingIndex); return this.mNaqHatches.add((GT_MetaTileEntity_Hatch_Naquadah) - * aMetaTileEntity); } else { return false; } } } public int checkEntireLayer(IGregTechTileEntity aBaseMetaTileEntity, - * Block aBlock, int aMeta, int aY, int xDir, int zDir) { int aCasingCount = 0; for (int x = -4; x < 5; x++) { for (int - * z = -4; z < 5; z++) { int aOffsetX = this.getBaseMetaTileEntity().getXCoord() + x; int aOffsetY = - * this.getBaseMetaTileEntity().getYCoord() + aY; int aOffsetZ = this.getBaseMetaTileEntity().getZCoord() + z; //Skip - * the corners if ((x == 4 && z == 4) || (x == -4 && z == -4) || (x == 4 && z == -4) || (x == -4 && z == 4)) { continue; - * } // Skip controller if (aY == 0 && x == 0 && z == 0) { continue; } Block aCurrentBlock = - * aBaseMetaTileEntity.getBlockOffset(xDir + x, aY, zDir + z); int aCurrentMeta = (int) - * aBaseMetaTileEntity.getMetaIDOffset(xDir + x, aY, zDir + z); if (aCurrentBlock == aBlock && aCurrentMeta == aMeta) { - * aCasingCount++; } final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, - * aY, zDir + z); if (!isValidBlockForStructure(tTileEntity, CASING_TEXTURE_ID, true, aCurrentBlock, aCurrentMeta, - * aBlock, aMeta)) { log("Layer has error. Height: "+aY); //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, - * aOffsetY, aOffsetZ, aBlock, aMeta, 3); return 0; } } } return aCasingCount; } public int - * checkOuterRing(IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir, int zDir) { int - * aCasingCount = 0; for (int x = -4; x < 5; x++) { for (int z = -4; z < 5; z++) { int aOffsetX = - * this.getBaseMetaTileEntity().getXCoord() + x; int aOffsetY = this.getBaseMetaTileEntity().getYCoord() + aY; int - * aOffsetZ = this.getBaseMetaTileEntity().getZCoord() + z; //Skip the corners if ((x == 4 && z == 4) || (x == -4 && z - * == -4) || (x == 4 && z == -4) || (x == -4 && z == 4)) { continue; } // If we are on the 5x5 ring, proceed if ((x > -4 - * && x < 4 ) && (z > -4 && z < 4)) { if ((x == 3 && z == 3) || (x == -3 && z == -3) || (x == 3 && z == -3) || (x == -3 - * && z == 3)) { //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, aMeta, 3); } - * else { continue; } } Block aCurrentBlock = aBaseMetaTileEntity.getBlockOffset(xDir + x, aY, zDir + z); int - * aCurrentMeta = (int) aBaseMetaTileEntity.getMetaIDOffset(xDir + x, aY, zDir + z); if (aCurrentBlock == aBlock && - * aCurrentMeta == aMeta) { aCasingCount++; } final IGregTechTileEntity tTileEntity = - * aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, aY, zDir + z); if (!isValidBlockForStructure(tTileEntity, - * CASING_TEXTURE_ID, false, aCurrentBlock, aCurrentMeta, aBlock, aMeta)) { log("Layer has error. Height: "+aY); - * //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, aMeta, 3); return 0; } } } - * return aCasingCount; } public int checkIntegralRing(IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, - * int aY, int xDir, int zDir) { int aCasingCount = 0; for (int x = -3; x < 4; x++) { for (int z = -3; z < 4; z++) { int - * aOffsetX = this.getBaseMetaTileEntity().getXCoord() + x; int aOffsetY = this.getBaseMetaTileEntity().getYCoord() + - * aY; int aOffsetZ = this.getBaseMetaTileEntity().getZCoord() + z; //Skip the corners if ((x == 3 && z == 3) || (x == - * -3 && z == -3) || (x == 3 && z == -3) || (x == -3 && z == 3)) { continue; } // If we are on the 5x5 ring, proceed if - * ((x > -3 && x < 3 ) && (z > -3 && z < 3)) { if ((x == 2 && z == 2) || (x == -2 && z == -2) || (x == 2 && z == -2) || - * (x == -2 && z == 2)) { //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, - * aMeta, 3); } else { continue; } } Block aCurrentBlock = aBaseMetaTileEntity.getBlockOffset(xDir + x, aY, zDir + z); - * int aCurrentMeta = (int) aBaseMetaTileEntity.getMetaIDOffset(xDir + x, aY, zDir + z); if (aCurrentBlock == aBlock && - * aCurrentMeta == aMeta) { aCasingCount++; } final IGregTechTileEntity tTileEntity = - * aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, aY, zDir + z); if (!isValidBlockForStructure(tTileEntity, - * CASING_TEXTURE_ID, false, aCurrentBlock, aCurrentMeta, aBlock, aMeta)) { log("Layer has error. Height: "+aY); - * //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, aMeta, 3); return 0; } } } - * return aCasingCount; } public int checkPipes(IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int - * aY, int xDir, int zDir) { int aCasingCount = 0; for (int x = -1; x < 2; x++) { for (int z = -1; z < 2; z++) { int - * aOffsetX = this.getBaseMetaTileEntity().getXCoord() + x; int aOffsetY = this.getBaseMetaTileEntity().getYCoord() + - * aY; int aOffsetZ = this.getBaseMetaTileEntity().getZCoord() + z; //Skip the corners if ((x == 1 && z == 1) || (x == - * -1 && z == -1) || (x == 1 && z == -1) || (x == -1 && z == 1) || (x == 0 && z == 0)) { Block aCurrentBlock = - * aBaseMetaTileEntity.getBlockOffset(xDir + x, aY, zDir + z); int aCurrentMeta = (int) - * aBaseMetaTileEntity.getMetaIDOffset(xDir + x, aY, zDir + z); if (aCurrentBlock == aBlock && aCurrentMeta == aMeta) { - * aCasingCount++; } final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, - * aY, zDir + z); if (!isValidBlockForStructure(tTileEntity, CASING_TEXTURE_ID, false, aCurrentBlock, aCurrentMeta, - * aBlock, aMeta)) { log("Pipe has error. Height: "+aY); //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, - * aOffsetY, aOffsetZ, aBlock, aMeta, 3); return 0; }; } } } return aCasingCount; } public int - * checkContainmentRing(IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir, int zDir) { - * int aCasingCount = 0; for (int x = -2; x < 3; x++) { for (int z = -2; z < 3; z++) { int aOffsetX = - * this.getBaseMetaTileEntity().getXCoord() + x; int aOffsetY = this.getBaseMetaTileEntity().getYCoord() + aY; int - * aOffsetZ = this.getBaseMetaTileEntity().getZCoord() + z; //Skip the corners if ((x == 2 && z == 2) || (x == -2 && z - * == -2) || (x == 2 && z == -2) || (x == -2 && z == 2)) { continue; } Block aCurrentBlock = - * aBaseMetaTileEntity.getBlockOffset(xDir + x, aY, zDir + z); int aCurrentMeta = (int) - * aBaseMetaTileEntity.getMetaIDOffset(xDir + x, aY, zDir + z); if (aCurrentBlock == aBlock && aCurrentMeta == aMeta) { - * aCasingCount++; } final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, - * aY, zDir + z); if (!isValidBlockForStructure(tTileEntity, CASING_TEXTURE_ID, false, aCurrentBlock, aCurrentMeta, - * aBlock, aMeta)) { log("Layer has error. Height: "+aY); //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, - * aOffsetY, aOffsetZ, aBlock, aMeta, 3); return 0; } } } return aCasingCount; } public int getMaxEfficiency(ItemStack - * aStack) { return 10000; } public int getPollutionPerTick(ItemStack aStack) { return 133; } public int - * getDamageToComponent(ItemStack aStack) { return 0; } public boolean explodesOnComponentBreak(ItemStack aStack) { - * return false; } - * @Override public String getMachineType() { return "Reactor"; } } - */ diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java deleted file mode 100644 index 4d245cedc3..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; public class - * GregtechMTE_MiniFusionPlant extends GregtechMeta_MultiBlockBase { public long currentVoltage = GT_Values.V[7]; public - * byte currentTier = 8; public void upvolt() { byte f = currentTier; if ((f+1) > 10) { f = 8; } else { f++; } - * this.currentTier = f; updateVoltage(); } public void downvolt() { byte f = currentTier; if ((f-1) < 8) { f = 10; } - * else { f--; } this.currentTier = f; updateVoltage(); } private long updateVoltage() { this.currentVoltage = - * GT_Values.V[this.currentTier-1]; return currentVoltage; } public GregtechMTE_MiniFusionPlant(String aName) { - * super(aName); } public GregtechMTE_MiniFusionPlant(int aID, String aName, String aNameRegional) { super(aID, aName, - * aNameRegional); } - * @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new - * GregtechMTE_MiniFusionPlant(this.mName); } - * @Override public boolean isCorrectMachinePart(ItemStack aStack) { return true; } - * @Override public int getDamageToComponent(ItemStack aStack) { return 0; } - * @Override public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte - * aFacing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { if (aSide == - * this.getBaseMetaTileEntity().getBackFacing()) { return new - * ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(10)), - * Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[(int) this.getInputTier()]}; } if (side == ForgeDirection.UP) { return - * new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(10)), - * Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[(int) this.getOutputTier()]}; } if (side == facing) { return new - * ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(10)), new GT_RenderedTexture(aActive ? - * Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER)}; } return - * new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(10))}; } - * @Override public GT_Recipe.GT_Recipe_Map getRecipeMap() { return GTPP_Recipe.GTPP_Recipe_Map.sSlowFusionRecipes; } - * @Override public String getMachineType() { return "Fusion Reactor"; } - * @Override public String[] getTooltip() { return new String[] { "Small scale fusion", - * "16x slower than using Multiblock of the same voltage", //"Input voltage can be changed within the GUI", - * "Place Input/Output Hatches on sides and bottom", "Power can only be inserted into the back", - * //e"Power can only be extracted from the top", TAG_HIDE_HATCHES }; } - * @Override public int getMaxParallelRecipes() { return 1; } - * @Override public int getEuDiscountForParallelism() { return 0; } - * @Override public boolean checkMultiblock(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { int xDir = - * ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; int zDir = - * ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; int xDir2 = - * ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing()).offsetX; int zDir2 = - * ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing()).offsetZ; int tAmount = 0; ForgeDirection aDir = - * ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()); //Require air in front, I think if - * (!aBaseMetaTileEntity.getAirOffset(xDir2, 0, zDir2)) { Logger.INFO("Did not find air in front"); return false; } else - * { for (int i = -1; i < 2; ++i) { for (int j = -1; j < 2; ++j) { for (int h = -1; h < 2; ++h) { if (h != 0 || (xDir + - * i != 0 || zDir + j != 0) && (i != 0 || j != 0)) { IGregTechTileEntity tTileEntity = - * aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); if (this.addToMachineList(tTileEntity, - * TAE.GTPP_INDEX(10))) { tAmount++; } } } } } } Logger.INFO("Tanks found: "+tAmount); return tAmount == 3; } - * @Override public boolean checkRecipe(ItemStack arg0) { ArrayList tFluidList = this.getStoredFluids(); int - * tFluidList_sS = tFluidList.size(); for (int tFluids = 0; tFluids < tFluidList_sS - 1; ++tFluids) { for (int tRecipe = - * tFluids + 1; tRecipe < tFluidList_sS; ++tRecipe) { if (GT_Utility.areFluidsEqual((FluidStack) - * tFluidList.get(tFluids), (FluidStack) tFluidList.get(tRecipe))) { if (((FluidStack) tFluidList.get(tFluids)).amount < - * ((FluidStack) tFluidList.get(tRecipe)).amount) { tFluidList.remove(tFluids--); tFluidList_sS = tFluidList.size(); - * break; } tFluidList.remove(tRecipe--); tFluidList_sS = tFluidList.size(); } } } int aStep = 0; - * //Logger.INFO("Step "+aStep++); if (tFluidList.size() > 1) { //Logger.INFO("Step "+aStep++); FluidStack[] arg5 = - * (FluidStack[]) tFluidList.toArray(new FluidStack[tFluidList.size()]); GT_Recipe arg6 = - * getRecipeMap().findRecipe(this.getBaseMetaTileEntity(), this.mLastRecipe, false, this.getMaxInputVoltage(), arg5, new - * ItemStack[0]); if (arg6 == null && !this.mRunningOnLoad || (arg6 != null && this.maxEUStore() < (long) - * arg6.mSpecialValue)) { //Logger.INFO("Bad Step "+aStep++); //this.turnCasingActive(false); this.mLastRecipe = null; - * return false; } //Logger.INFO("Step "+aStep++); if (this.mRunningOnLoad || (arg6 != null && - * arg6.isRecipeInputEqual(true, arg5, new ItemStack[0]))) { //Logger.INFO("Step "+aStep++); this.mLastRecipe = arg6; - * this.mEUt = this.mLastRecipe.mEUt * 1; this.mMaxProgresstime = this.mLastRecipe.mDuration / 1; - * this.mEfficiencyIncrease = 10000; this.mOutputFluids = this.mLastRecipe.mFluidOutputs; //this.turnCasingActive(true); - * this.mRunningOnLoad = false; return true; } //Logger.INFO("Step "+aStep++); } //Logger.INFO("Step "+aStep++); return - * false; //return this.checkRecipeGeneric(this.getMaxParallelRecipes(), getEuDiscountForParallelism(), 0); } - * @Override public int getMaxEfficiency(ItemStack arg0) { return 10000; } - * @Override public boolean drainEnergyInput(long aEU) { // Not applicable to this machine return true; } - * @Override public boolean addEnergyOutput(long aEU) { // Not applicable to this machine return true; } - * @Override public long maxEUStore() { return this.getMaxInputVoltage() * 256 * 512; } - * @Override public long getMinimumStoredEU() { return 0; } - * @Override public String[] getExtraInfoData() { String mode = EnumChatFormatting.BLUE + "" + currentVoltage + - * EnumChatFormatting.RESET; String aOutput = EnumChatFormatting.BLUE + "" + mEUt + EnumChatFormatting.RESET; String - * storedEnergyText; if (this.getEUVar() > maxEUStore()) { storedEnergyText = EnumChatFormatting.RED + - * GT_Utility.formatNumbers(this.getEUVar()) + EnumChatFormatting.RESET; } else { storedEnergyText = - * EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.getEUVar()) + EnumChatFormatting.RESET; } return new - * String[]{ "Stored EU: " + storedEnergyText, "Capacity: " + EnumChatFormatting.YELLOW + - * GT_Utility.formatNumbers(this.maxEUStore()) + EnumChatFormatting.RESET, "Voltage: " + mode, "Output Voltage: " + - * aOutput }; } - * @Override public void explodeMultiblock() { super.explodeMultiblock(); } - * @Override public void doExplosion(long aExplosionPower) { super.doExplosion(aExplosionPower); } - * @Override public long getMaxInputVoltage() { return updateVoltage(); } - * @Override public long getInputTier() { return (long) GT_Utility.getTier(maxEUInput()); } - * @Override public boolean isElectric() { return true; } - * @Override public boolean isEnetInput() { return true; } - * @Override public boolean isEnetOutput() { return false; } - * @Override public boolean isInputFacing(ForgeDirection side) { return (aSide == - * this.getBaseMetaTileEntity().getBackFacing()); } - * @Override public boolean isOutputFacing(ForgeDirection side) { return side == ForgeDirection.UP; } - * @Override public long maxAmperesIn() { return 32; } - * @Override public long maxAmperesOut() { return 1; } - * @Override public long maxEUInput() { return updateVoltage(); } - * @Override public long maxEUOutput() { return mEUt > 0 ? mEUt : 0; } - * @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - * super.onPostTick(aBaseMetaTileEntity, aTick); this.mWrench = true; this.mScrewdriver = true; this.mSoftHammer = true; - * this.mHardHammer = true; this.mSolderingTool = true; this.mCrowbar = true; } - * @Override public boolean causeMaintenanceIssue() { return true; } - * @Override public int getControlCoreTier() { return this.currentTier; } - * @Override public int getPollutionPerTick(ItemStack arg0) { return 0; } - * @Override public GT_MetaTileEntity_Hatch_ControlCore getControlCoreBus() { GT_MetaTileEntity_Hatch_ControlCore x = - * new GT_MetaTileEntity_Hatch_ControlCore("", 0, "", null); return (GT_MetaTileEntity_Hatch_ControlCore) x; } } - */ diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index ef1d88d05b..ac961f8fdc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -75,7 +75,6 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< public static int CASING_TEXTURE_ID; public static String mCasingName = "Sterile Farm Casing"; - // public static TreeGenerator mTreeData; public static HashMap<String, ItemStack> sLogCache = new HashMap<>(); private static final int TICKS_PER_OPERATION = 100; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java deleted file mode 100644 index 97bd9dbce7..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java +++ /dev/null @@ -1,12 +0,0 @@ -/* - * package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.bedrock; public class - * GregtechMetaTileEntity_BedrockMiningPlatform1 extends GregtechMetaTileEntity_BedrockMiningPlatformBase { public - * GregtechMetaTileEntity_BedrockMiningPlatform1(final int aID, final String aName, final String aNameRegional) { - * super(aID, aName, aNameRegional); } public GregtechMetaTileEntity_BedrockMiningPlatform1(final String aName) { - * super(aName); } public String[] getTooltip() { return this.getDescriptionInternal("I"); } public IMetaTileEntity - * newMetaEntity(final IGregTechTileEntity aTileEntity) { return (IMetaTileEntity) new - * GregtechMetaTileEntity_BedrockMiningPlatform1(this.mName); } protected Material getFrameMaterial() { return - * ALLOY.INCONEL_690; } protected int getCasingTextureIndex() { return TAE.getIndexFromPage(0, 14); } protected int - * getRadiusInChunks() { return 9; } protected int getMinTier() { return 5; } protected int getBaseProgressTime() { - * return (int) (420*(this.mProductionModifier/100)); } } - */ diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java deleted file mode 100644 index b4be6eb80f..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java +++ /dev/null @@ -1,12 +0,0 @@ -/* - * package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.bedrock; public class - * GregtechMetaTileEntity_BedrockMiningPlatform2 extends GregtechMetaTileEntity_BedrockMiningPlatformBase { public - * GregtechMetaTileEntity_BedrockMiningPlatform2(final int aID, final String aName, final String aNameRegional) { - * super(aID, aName, aNameRegional); } public GregtechMetaTileEntity_BedrockMiningPlatform2(final String aName) { - * super(aName); } public String[] getTooltip() { return this.getDescriptionInternal("II"); } public IMetaTileEntity - * newMetaEntity(final IGregTechTileEntity aTileEntity) { return (IMetaTileEntity) new - * GregtechMetaTileEntity_BedrockMiningPlatform2(this.mName); } protected Material getFrameMaterial() { return - * ELEMENT.getInstance().AMERICIUM241; } protected int getCasingTextureIndex() { return 62; } protected int - * getRadiusInChunks() { return 9; } protected int getMinTier() { return 5; } protected int getBaseProgressTime() { - * return 480; } } - */ diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java deleted file mode 100644 index 810be16b79..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java +++ /dev/null @@ -1,621 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.bedrock; - -import static gregtech.api.enums.Mods.Railcraft; -import static gregtech.api.enums.Mods.Thaumcraft; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_Worldgen_GT_Ore_Layer; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.material.ORES; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.MiningUtils; -import gtPlusPlus.core.util.minecraft.OreDictUtils; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; - -public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends GregtechMeta_MultiBlockBase { - - protected double mProductionModifier = 0; - - private static final ItemStack miningPipe; - private static final ItemStack miningPipeTip; - - private Block casingBlock; - private int casingMeta; - // private int frameMeta; - private int casingTextureIndex; - - private ForgeDirection back; - - private int xDrill; - private int yDrill; - private int zDrill; - - private int[] xCenter = new int[5]; - private int[] zCenter = new int[5]; - - public GregtechMetaTileEntity_BedrockMiningPlatformBase(final int aID, final String aName, - final String aNameRegional) { - super(aID, aName, aNameRegional); - this.initFields(); - } - - public GregtechMetaTileEntity_BedrockMiningPlatformBase(final String aName) { - super(aName); - this.initFields(); - } - - private void initFields() { - this.casingBlock = this.getCasingBlockItem().getBlock(); - this.casingMeta = this.getCasingBlockItem().get(0L, new Object[0]).getItemDamage(); - this.casingTextureIndex = this.getCasingTextureIndex(); - } - - @Override - protected IIconContainer getActiveOverlay() { - return Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE; - } - - @Override - protected IIconContainer getInactiveOverlay() { - return Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT; - } - - @Override - protected int getCasingTextureId() { - return this.casingTextureIndex; - } - - @Override - public int getAmountOfOutputs() { - return 1; - } - - @Override - public void saveNBTData(final NBTTagCompound aNBT) { - super.saveNBTData(aNBT); - aNBT.setDouble("mProductionModifier", mProductionModifier); - } - - @Override - public void loadNBTData(final NBTTagCompound aNBT) { - super.loadNBTData(aNBT); - this.mProductionModifier = aNBT.getDouble("mProductionModifier"); - } - - @Override - public boolean checkRecipe(final ItemStack aStack) { - // this.setElectricityStats(); - - if (true) { - return false; - } - - boolean[] didWork = new boolean[5]; - - if (!this.tryConsumeDrillingFluid()) { - Logger.INFO("No drilling Fluid."); - return false; - } - - if (MathUtils.isNumberEven((int) this.mProductionModifier)) { - if (!this.tryConsumePyrotheum()) { - Logger.INFO("No tryConsumePyrotheum Fluid."); - return false; - } else { - mProductionModifier++; - } - } else { - if (!this.tryConsumeCryotheum()) { - Logger.INFO("No tryConsumeCryotheum Fluid."); - return false; - } else { - mProductionModifier++; - } - } - - for (int i = 0; i < 5; i++) { - process(); - didWork[i] = true; - } - - // Fail recipe handling if one pipe didn't handle properly, to try again - // next run. - for (boolean y : didWork) { - if (!y) { - Logger.INFO("[Bedrock Miner] Fail [x]"); - return false; - } - } - - this.lEUt = -8000; - this.mMaxProgresstime = 1; - this.mEfficiencyIncrease = 10000; - - return true; - } - - private boolean isEnergyEnough() { - long requiredEnergy = 512L + this.getMaxInputVoltage() * 4L; - for (final GT_MetaTileEntity_Hatch_Energy energyHatch : this.mEnergyHatches) { - requiredEnergy -= energyHatch.getEUVar(); - if (requiredEnergy <= 0L) { - return true; - } - } - return false; - } - - private void setElectricityStats() { - // this.mEfficiency = this.getCurrentEfficiency((ItemStack) null); - this.mEfficiencyIncrease = 10000; - final int overclock = 8 << GT_Utility.getTier(this.getMaxInputVoltage()); - // this.mEUt = -12 * overclock * overclock; - Logger.INFO("Trying to set EU to " + (12 * overclock * overclock)); - int mCombinedAvgTime = 0; - for (int g = 0; g < 5; g++) { - mCombinedAvgTime += this.getBaseProgressTime() / overclock; - } - Logger.INFO("Trying to set Max Time to " + (mCombinedAvgTime)); - // this.mMaxProgresstime = (mCombinedAvgTime / 5); - } - - private boolean tryConsumeDrillingFluid() { - boolean consumed = false; - boolean g = (this.getBaseMetaTileEntity().getWorld().getTotalWorldTime() % 2 == 0); - consumed = (g ? tryConsumePyrotheum() : tryConsumeCryotheum()); - if (consumed) { - // increaseProduction(g ? 2 : 1); - } else { - // lowerProduction(g ? 5 : 3); - } - return consumed; - } - - private boolean tryConsumePyrotheum() { - return this.depleteInput(FluidUtils.getFluidStack("pyrotheum", 4)); - } - - private boolean tryConsumeCryotheum() { - return this.depleteInput(FluidUtils.getFluidStack("cryotheum", 4)); - } - - private void putMiningPipesFromInputsInController() { - final int maxPipes = 64; - if (this.isHasMiningPipes(maxPipes)) { - return; - } - ItemStack pipes = this.getStackInSlot(1); - for (final ItemStack storedItem : this.getStoredInputs()) { - if (!storedItem.isItemEqual(GregtechMetaTileEntity_BedrockMiningPlatformBase.miningPipe)) { - continue; - } - if (pipes == null) { - this.setInventorySlotContents( - 1, - GT_Utility.copy(new Object[] { GregtechMetaTileEntity_BedrockMiningPlatformBase.miningPipe })); - pipes = this.getStackInSlot(1); - } - if (pipes.stackSize == maxPipes) { - break; - } - final int needPipes = maxPipes - pipes.stackSize; - final int transferPipes = (storedItem.stackSize < needPipes) ? storedItem.stackSize : needPipes; - final ItemStack itemStack = pipes; - itemStack.stackSize += transferPipes; - final ItemStack itemStack2 = storedItem; - itemStack2.stackSize -= transferPipes; - } - this.updateSlots(); - } - - private boolean isHasMiningPipes(final int minCount) { - final ItemStack pipe = this.getStackInSlot(1); - return pipe != null && pipe.stackSize > minCount - 1 - && pipe.isItemEqual(GregtechMetaTileEntity_BedrockMiningPlatformBase.miningPipe); - } - - public boolean checkMultiblock(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) { - this.updateCoordinates(); - int xDir = aBaseMetaTileEntity.getBackFacing().offsetX; - int zDir = aBaseMetaTileEntity.getBackFacing().offsetZ; - int tAmount = 0; - if (!aBaseMetaTileEntity.getAirOffset(xDir, 0, zDir)) { - return false; - } else { - - Block aCasing = Block.getBlockFromItem(getCasingBlockItem().getItem()); - - for (int i = -1; i < 2; ++i) { - for (int j = -1; j < 2; ++j) { - for (int h = -1; h < 2; ++h) { - if (h != 0 || (xDir + i != 0 || zDir + j != 0) && (i != 0 || j != 0)) { - IGregTechTileEntity tTileEntity = aBaseMetaTileEntity - .getIGregTechTileEntityOffset(xDir + i, h, zDir + j); - Block aBlock = aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j); - int aMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j); - - if (!this.addToMachineList(tTileEntity, 48)) { - if (aBlock != aCasing) { - Logger.INFO("Found Bad Casing"); - return false; - } - if (aMeta != 3) { - Logger.INFO("Found Bad Meta"); - return false; - } - } - ++tAmount; - - } - } - } - } - return tAmount >= 10; - } - } - - private void updateCoordinates() { - this.xDrill = this.getBaseMetaTileEntity().getXCoord(); - this.yDrill = this.getBaseMetaTileEntity().getYCoord() - 1; - this.zDrill = this.getBaseMetaTileEntity().getZCoord(); - this.back = this.getBaseMetaTileEntity().getBackFacing(); - - // Middle - this.xCenter[0] = this.xDrill + this.back.offsetX; - this.zCenter[0] = this.zDrill + this.back.offsetZ; - - this.xCenter[1] = xCenter[0] + 1; - this.zCenter[1] = zCenter[0]; - - this.xCenter[2] = xCenter[0] - 1; - this.zCenter[2] = zCenter[0]; - - this.xCenter[3] = xCenter[0]; - this.zCenter[3] = zCenter[0] + 1; - - this.xCenter[4] = xCenter[0]; - this.zCenter[4] = zCenter[0] - 1; - } - - @Override - public boolean isCorrectMachinePart(final ItemStack aStack) { - return true; - } - - @Override - public int getMaxEfficiency(final ItemStack aStack) { - return 10000; - } - - @Override - public int getPollutionPerTick(final ItemStack aStack) { - return 0; - } - - @Override - public int getDamageToComponent(final ItemStack aStack) { - return 0; - } - - @Override - public boolean explodesOnComponentBreak(final ItemStack aStack) { - return false; - } - - protected GregtechItemList getCasingBlockItem() { - return GregtechItemList.Casing_BedrockMiner; - } - - protected abstract Material getFrameMaterial(); - - protected abstract int getCasingTextureIndex(); - - protected abstract int getRadiusInChunks(); - - protected abstract int getMinTier(); - - protected abstract int getBaseProgressTime(); - - protected String[] getDescriptionInternal(final String tierSuffix) { - final String casings = this.getCasingBlockItem().get(0L, new Object[0]).getDisplayName(); - return new String[] { - "Controller Block for the Experimental Deep Earth Drilling Platform - MK " - + ((tierSuffix != null) ? tierSuffix : ""), - "Size(WxHxD): 3x7x3, Controller (Front middle bottom)", "3x1x3 Base of " + casings, - "1x3x1 " + casings + " pillar (Center of base)", - "1x3x1 " + this.getFrameMaterial().getLocalizedName() + " Frame Boxes (Each pillar side and on top)", - "2x Input Hatch (Any bottom layer casing)", - "1x Input Bus for mining pipes (Any bottom layer casing; not necessary)", - "1x Output Bus (Any bottom layer casing)", "1x Maintenance Hatch (Any bottom layer casing)", - "1x " + GT_Values.VN[this.getMinTier()] + "+ Energy Hatch (Any bottom layer casing)", - "Radius is " + (this.getRadiusInChunks() << 4) + " blocks", - "Every tick, this machine altenates betweem consumption of Pyrotheum & Cryotheum", - "Pyrotheum is used to bore through the Mantle of the world", - "Cryotheum is used to keep the internal components cool", }; - } - - static { - miningPipe = GT_ModHandler.getIC2Item("miningPipe", 0L); - miningPipeTip = GT_ModHandler.getIC2Item("miningPipeTip", 0L); - } - - private AutoMap<ItemStack> mOutputs; - - public void process() { - ItemStack aOutput = generateOutputWithchance(); - if (aOutput != null) { - this.addOutput(aOutput); - Logger.INFO("Mined some " + aOutput.getDisplayName()); - } - this.updateSlots(); - } - - public ItemStack generateOutputWithchance() { - int aChance = MathUtils.randInt(0, 7500); - if (aChance < 100) { - return generateOutput(); - } else { - return null; - } - } - - public ItemStack generateOutput() { - AutoMap<ItemStack> aData = generateOreForOutput(); - int aMax = aData.size() - 1; - return aData.get(MathUtils.randInt(0, aMax)); - } - - /** - * Here we generate valid ores and also a basic loot set - */ - public AutoMap<ItemStack> generateOreForOutput() { - - if (mOutputs != null) { - return mOutputs; - } - - AutoMap<GT_Worldgen_GT_Ore_Layer> aOverWorldOres = MiningUtils.getOresForDim(0); - AutoMap<GT_Worldgen_GT_Ore_Layer> aNetherOres = MiningUtils.getOresForDim(-1); - AutoMap<GT_Worldgen_GT_Ore_Layer> aEndOres = MiningUtils.getOresForDim(1); - - AutoMap<ItemStack> aTempMap = new AutoMap<ItemStack>(); - Block tOreBlock = GregTech_API.sBlockOres1; - Logger.INFO("Ore Map contains " + aTempMap.size() + " values. [Initial]"); - - for (GT_Worldgen_GT_Ore_Layer layer : aOverWorldOres) { - if (layer.mEnabled) { - ItemStack aTempOreStack1 = ItemUtils.simpleMetaStack(tOreBlock, layer.mPrimaryMeta, 1); - ItemStack aTempOreStack2 = ItemUtils.simpleMetaStack(tOreBlock, layer.mSecondaryMeta, 1); - ItemStack aTempOreStack3 = ItemUtils.simpleMetaStack(tOreBlock, layer.mBetweenMeta, 1); - ItemStack aTempOreStack4 = ItemUtils.simpleMetaStack(tOreBlock, layer.mSporadicMeta, 1); - aTempMap.put(aTempOreStack1); - aTempMap.put(aTempOreStack2); - aTempMap.put(aTempOreStack3); - aTempMap.put(aTempOreStack4); - aTempMap.put(aTempOreStack1); - aTempMap.put(aTempOreStack2); - aTempMap.put(aTempOreStack3); - aTempMap.put(aTempOreStack4); - aTempMap.put(aTempOreStack1); - aTempMap.put(aTempOreStack2); - aTempMap.put(aTempOreStack3); - aTempMap.put(aTempOreStack4); - } - } - Logger.INFO("Ore Map contains " + aTempMap.size() + " values. [Overworld]"); - for (GT_Worldgen_GT_Ore_Layer layer : aNetherOres) { - if (layer.mEnabled) { - ItemStack aTempOreStack1 = ItemUtils.simpleMetaStack(tOreBlock, layer.mPrimaryMeta, 1); - ItemStack aTempOreStack2 = ItemUtils.simpleMetaStack(tOreBlock, layer.mSecondaryMeta, 1); - ItemStack aTempOreStack3 = ItemUtils.simpleMetaStack(tOreBlock, layer.mBetweenMeta, 1); - ItemStack aTempOreStack4 = ItemUtils.simpleMetaStack(tOreBlock, layer.mSporadicMeta, 1); - aTempMap.put(aTempOreStack1); - aTempMap.put(aTempOreStack2); - aTempMap.put(aTempOreStack3); - aTempMap.put(aTempOreStack4); - aTempMap.put(aTempOreStack1); - aTempMap.put(aTempOreStack2); - aTempMap.put(aTempOreStack3); - aTempMap.put(aTempOreStack4); - } - } - Logger.INFO("Ore Map contains " + aTempMap.size() + " values. [Nether]"); - for (GT_Worldgen_GT_Ore_Layer layer : aEndOres) { - if (layer.mEnabled) { - ItemStack aTempOreStack1 = ItemUtils.simpleMetaStack(tOreBlock, layer.mPrimaryMeta, 1); - ItemStack aTempOreStack2 = ItemUtils.simpleMetaStack(tOreBlock, layer.mSecondaryMeta, 1); - ItemStack aTempOreStack3 = ItemUtils.simpleMetaStack(tOreBlock, layer.mBetweenMeta, 1); - ItemStack aTempOreStack4 = ItemUtils.simpleMetaStack(tOreBlock, layer.mSporadicMeta, 1); - aTempMap.put(aTempOreStack1); - aTempMap.put(aTempOreStack2); - aTempMap.put(aTempOreStack3); - aTempMap.put(aTempOreStack4); - } - } - Logger.INFO("Ore Map contains " + aTempMap.size() + " values. [End]"); - - addOreTypeToMap(ELEMENT.getInstance().IRON, 200, aTempMap); - addOreTypeToMap(ELEMENT.getInstance().COPPER, 175, aTempMap); - addOreTypeToMap(ELEMENT.getInstance().TIN, 150, aTempMap); - addOreTypeToMap(ELEMENT.getInstance().GOLD, 150, aTempMap); - addOreTypeToMap(ELEMENT.getInstance().SILVER, 110, aTempMap); - addOreTypeToMap(ELEMENT.getInstance().NICKEL, 40, aTempMap); - addOreTypeToMap(ELEMENT.getInstance().ZINC, 40, aTempMap); - addOreTypeToMap(ELEMENT.getInstance().LEAD, 40, aTempMap); - addOreTypeToMap(ELEMENT.getInstance().ALUMINIUM, 30, aTempMap); - addOreTypeToMap(ELEMENT.getInstance().THORIUM, 20, aTempMap); - Logger.INFO("Ore Map contains " + aTempMap.size() + " values. [Extra Common Ores]"); - - AutoMap<Pair<String, Integer>> mMixedOreData = new AutoMap<Pair<String, Integer>>(); - mMixedOreData.put(new Pair<String, Integer>("oreRuby", 30)); - mMixedOreData.put(new Pair<String, Integer>("oreSapphire", 25)); - mMixedOreData.put(new Pair<String, Integer>("oreEmerald", 25)); - mMixedOreData.put(new Pair<String, Integer>("oreLapis", 40)); - mMixedOreData.put(new Pair<String, Integer>("oreRedstone", 40)); - - if (Thaumcraft.isModLoaded() || (OreDictUtils.containsValidEntries("oreAmber") - && OreDictUtils.containsValidEntries("oreCinnabar"))) { - mMixedOreData.put(new Pair<String, Integer>("oreAmber", 20)); - mMixedOreData.put(new Pair<String, Integer>("oreCinnabar", 20)); - } - if (Railcraft.isModLoaded() || OreDictUtils.containsValidEntries("oreSaltpeter")) { - mMixedOreData.put(new Pair<String, Integer>("oreSaltpeter", 10)); - } - mMixedOreData.put(new Pair<String, Integer>("oreUranium", 10)); - if (OreDictUtils.containsValidEntries("oreSulfur")) { - mMixedOreData.put(new Pair<String, Integer>("oreSulfur", 15)); - } - if (OreDictUtils.containsValidEntries("oreSilicon")) { - mMixedOreData.put(new Pair<String, Integer>("oreSilicon", 15)); - } - if (OreDictUtils.containsValidEntries("oreApatite")) { - mMixedOreData.put(new Pair<String, Integer>("oreApatite", 25)); - } - - mMixedOreData.put(new Pair<String, Integer>("oreFirestone", 2)); - mMixedOreData.put(new Pair<String, Integer>("oreBismuth", 20)); - mMixedOreData.put(new Pair<String, Integer>("oreLithium", 20)); - mMixedOreData.put(new Pair<String, Integer>("oreManganese", 20)); - mMixedOreData.put(new Pair<String, Integer>("oreBeryllium", 20)); - mMixedOreData.put(new Pair<String, Integer>("oreCoal", 75)); - mMixedOreData.put(new Pair<String, Integer>("oreLignite", 75)); - mMixedOreData.put(new Pair<String, Integer>("oreSalt", 15)); - mMixedOreData.put(new Pair<String, Integer>("oreCalcite", 15)); - mMixedOreData.put(new Pair<String, Integer>("oreBauxite", 20)); - mMixedOreData.put(new Pair<String, Integer>("oreAlmandine", 15)); - mMixedOreData.put(new Pair<String, Integer>("oreGraphite", 25)); - mMixedOreData.put(new Pair<String, Integer>("oreGlauconite", 15)); - mMixedOreData.put(new Pair<String, Integer>("orePyrolusite", 15)); - mMixedOreData.put(new Pair<String, Integer>("oreGrossular", 15)); - mMixedOreData.put(new Pair<String, Integer>("oreTantalite", 15)); - - for (Pair<String, Integer> g : mMixedOreData) { - for (int i = 0; i < g.getValue(); i++) { - aTempMap.put(ItemUtils.getItemStackOfAmountFromOreDict(g.getKey(), 1)); - } - } - Logger.INFO("Ore Map contains " + aTempMap.size() + " values. [Extra Mixed Ores]"); - - addOreTypeToMap(ELEMENT.STANDALONE.RUNITE, 2, aTempMap); - addOreTypeToMap(ELEMENT.STANDALONE.GRANITE, 8, aTempMap); - Logger.INFO("Ore Map contains " + aTempMap.size() + " values. [OSRS Ores]"); - - AutoMap<Material> aMyOreMaterials = new AutoMap<Material>(); - aMyOreMaterials.add(ORES.CROCROITE); - aMyOreMaterials.add(ORES.GEIKIELITE); - aMyOreMaterials.add(ORES.NICHROMITE); - aMyOreMaterials.add(ORES.TITANITE); - aMyOreMaterials.add(ORES.ZIMBABWEITE); - aMyOreMaterials.add(ORES.ZIRCONILITE); - aMyOreMaterials.add(ORES.GADOLINITE_CE); - aMyOreMaterials.add(ORES.GADOLINITE_Y); - aMyOreMaterials.add(ORES.LEPERSONNITE); - aMyOreMaterials.add(ORES.SAMARSKITE_Y); - aMyOreMaterials.add(ORES.SAMARSKITE_YB); - aMyOreMaterials.add(ORES.XENOTIME); - aMyOreMaterials.add(ORES.YTTRIAITE); - aMyOreMaterials.add(ORES.YTTRIALITE); - aMyOreMaterials.add(ORES.YTTROCERITE); - aMyOreMaterials.add(ORES.ZIRCON); - aMyOreMaterials.add(ORES.POLYCRASE); - aMyOreMaterials.add(ORES.ZIRCOPHYLLITE); - aMyOreMaterials.add(ORES.ZIRKELITE); - aMyOreMaterials.add(ORES.LANTHANITE_LA); - aMyOreMaterials.add(ORES.LANTHANITE_CE); - aMyOreMaterials.add(ORES.LANTHANITE_ND); - aMyOreMaterials.add(ORES.AGARDITE_Y); - aMyOreMaterials.add(ORES.AGARDITE_CD); - aMyOreMaterials.add(ORES.AGARDITE_LA); - aMyOreMaterials.add(ORES.AGARDITE_ND); - aMyOreMaterials.add(ORES.HIBONITE); - aMyOreMaterials.add(ORES.CERITE); - aMyOreMaterials.add(ORES.FLUORCAPHITE); - aMyOreMaterials.add(ORES.FLORENCITE); - aMyOreMaterials.add(ORES.CRYOLITE); - aMyOreMaterials.add(ORES.LAUTARITE); - aMyOreMaterials.add(ORES.LAFOSSAITE); - aMyOreMaterials.add(ORES.DEMICHELEITE_BR); - aMyOreMaterials.add(ORES.COMANCHEITE); - aMyOreMaterials.add(ORES.PERROUDITE); - aMyOreMaterials.add(ORES.HONEAITE); - aMyOreMaterials.add(ORES.ALBURNITE); - aMyOreMaterials.add(ORES.MIESSIITE); - aMyOreMaterials.add(ORES.KASHINITE); - aMyOreMaterials.add(ORES.IRARSITE); - aMyOreMaterials.add(ORES.RADIOBARITE); - aMyOreMaterials.add(ORES.DEEP_EARTH_REACTOR_FUEL_DEPOSIT); - - for (Material aOreType : aMyOreMaterials) { - if (aOreType == ORES.DEEP_EARTH_REACTOR_FUEL_DEPOSIT || aOreType == ORES.RADIOBARITE) { - addOreTypeToMap(aOreType, 4, aTempMap); - } else { - addOreTypeToMap(aOreType, 7, aTempMap); - } - } - - // Cleanup Map - Logger.INFO("Ore Map contains " + aTempMap.size() + " values. [GT++]"); - AutoMap<ItemStack> aCleanUp = new AutoMap<ItemStack>(); - for (ItemStack verify : aTempMap) { - if (!ItemUtils.checkForInvalidItems(verify)) { - aCleanUp.put(verify); - } - } - Logger.INFO("Cleanup Map contains " + aCleanUp.size() + " values."); - for (ItemStack remove : aCleanUp) { - aTempMap.remove(remove); - } - - // Generate Massive Map - AutoMap<ItemStack> aFinalMap = new AutoMap<ItemStack>(); - for (ItemStack aTempItem : aTempMap) { - int aTempMulti = MathUtils.randInt(20, 50); - for (int i = 0; i < aTempMulti; i++) { - aFinalMap.put(aTempItem.copy()); - } - } - Logger.INFO("Final Ore Map contains " + aFinalMap.size() + " values."); - mOutputs = aFinalMap; - return mOutputs; - } - - private static void addOreTypeToMap(Material aMaterial, int aAmount, AutoMap<ItemStack> aMap) { - for (int i = 0; i < aAmount; i++) { - aMap.add(aMaterial.getOre(1)); - } - } - - @Override - public String getMachineType() { - return "Miner"; - } - - @Override - public int getMaxParallelRecipes() { - return 1; - } - - @Override - public int getEuDiscountForParallelism() { - return 0; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java deleted file mode 100644 index 8f81c180ad..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java +++ /dev/null @@ -1,270 +0,0 @@ -/* - * package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage; public class - * GregtechMetaTileEntity_MultiTank extends GregtechMeta_MultiBlockBase { public GregtechMetaTileEntity_MultiTank(final - * int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } private short - * multiblockCasingCount = 0; private int mInternalSaveClock = 0; private final short storageMultiplier = 1; private int - * maximumFluidStorage = 128000; private FluidStack internalStorageTank = null; private final NBTTagCompound - * internalCraftingComponentsTag = new NBTTagCompound(); - * @Override public String getMachineType() { return "Fluid Tank"; } - * @Override public String[] getExtraInfoData() { final ArrayList<GT_MetaTileEntity_Hatch_Energy> mTier = - * this.mEnergyHatches; if (!mTier.isEmpty()){ final int temp = mTier.get(0).mTier; if (this.internalStorageTank == - * null) { return new String[]{ GT_Values.VOLTAGE_NAMES[temp]+" Large Fluid Tank", "Stored Fluid: No Fluid", - * "Internal | Current: "+Integer.toString(0) + "L", "Internal | Maximum: "+Integer.toString(this.maximumFluidStorage) + - * "L"}; } return new String[]{ GT_Values.VOLTAGE_NAMES[temp]+" Large Fluid Tank", - * "Stored Fluid: "+this.internalStorageTank.getLocalizedName(), - * "Internal | Current: "+Integer.toString(this.internalStorageTank.amount) + "L", - * "Internal | Maximum: "+Integer.toString(this.maximumFluidStorage) + "L"}; } return new String[]{ - * "Voltage Tier not set -" +" Large Fluid Tank", "Stored Fluid: No Fluid", "Internal | Current: "+Integer.toString(0) + - * "L", "Internal | Maximum: "+Integer.toString(this.maximumFluidStorage) + "L"}; } - * @Override public void saveNBTData(final NBTTagCompound aNBT) { super.saveNBTData(aNBT); - */ -/* - * final NBTTagCompound gtCraftingComponentsTag = aNBT.getCompoundTag("GT.CraftingComponents"); if - * (gtCraftingComponentsTag != null){ Utils.LOG_WARNING("Got Crafting Tag"); if (this.internalStorageTank != null){ - * Utils.LOG_WARNING("mFluid was not null, Saving TileEntity NBT data."); gtCraftingComponentsTag.setString("xFluid", - * this.internalStorageTank.getFluid().getName()); gtCraftingComponentsTag.setInteger("xAmount", - * this.internalStorageTank.amount); gtCraftingComponentsTag.setLong("xAmountMax", this.maximumFluidStorage); - * aNBT.setTag("GT.CraftingComponents", gtCraftingComponentsTag); } else { - * Utils.LOG_WARNING("mFluid was null, Saving TileEntity NBT data."); gtCraftingComponentsTag.removeTag("xFluid"); - * gtCraftingComponentsTag.removeTag("xAmount"); gtCraftingComponentsTag.removeTag("xAmountMax"); - * gtCraftingComponentsTag.setLong("xAmountMax", this.maximumFluidStorage); aNBT.setTag("GT.CraftingComponents", - * gtCraftingComponentsTag); } } - *//* - * } - * @Override public void loadNBTData(final NBTTagCompound aNBT) { super.loadNBTData(aNBT); - */ -/* - * final NBTTagCompound gtCraftingComponentsTag = aNBT.getCompoundTag("GT.CraftingComponents"); String xFluid = null; - * int xAmount = 0; if (gtCraftingComponentsTag.hasNoTags()){ if (this.internalStorageTank != null){ - * Utils.LOG_WARNING("mFluid was not null, Creating TileEntity NBT data."); - * gtCraftingComponentsTag.setInteger("xAmount", this.internalStorageTank.amount); - * gtCraftingComponentsTag.setString("xFluid", this.internalStorageTank.getFluid().getName()); - * aNBT.setTag("GT.CraftingComponents", gtCraftingComponentsTag); } } else { //internalCraftingComponentsTag = - * gtCraftingComponentsTag.getCompoundTag("backupTag"); if (gtCraftingComponentsTag.hasKey("xFluid")){ - * Utils.LOG_WARNING("xFluid was not null, Loading TileEntity NBT data."); xFluid = - * gtCraftingComponentsTag.getString("xFluid"); } if (gtCraftingComponentsTag.hasKey("xAmount")){ - * Utils.LOG_WARNING("xAmount was not null, Loading TileEntity NBT data."); xAmount = - * gtCraftingComponentsTag.getInteger("xAmount"); } if ((xFluid != null) && (xAmount != 0)){ - * Utils.LOG_WARNING("Setting Internal Tank, loading "+xAmount+"L of "+xFluid); this.setInternalTank(xFluid, xAmount); } - * } - *//* - * } private boolean setInternalTank(final String fluidName, final int amount){ final FluidStack temp = - * FluidUtils.getFluidStack(fluidName, amount); if (temp != null){ if (this.internalStorageTank == null){ - * this.internalStorageTank = temp; Logger.WARNING(temp.getFluid().getName()+" Amount: "+temp.amount+"L"); } else{ - * Logger.WARNING("Retained Fluid."); - * Logger.WARNING(this.internalStorageTank.getFluid().getName()+" Amxount: "+this.internalStorageTank.amount+"L"); } - * this.markDirty(); return true; } return false; } - * @Override public void onLeftclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) { - * this.tryForceNBTUpdate(); super.onLeftclick(aBaseMetaTileEntity, aPlayer); } - * @Override public boolean onWrenchRightClick(final byte aSide, final byte aWrenchingSide, final EntityPlayer - * aPlayer, final float aX, final float aY, final float aZ) { this.tryForceNBTUpdate(); return - * super.onWrenchRightclick(side, aWrenchingSide, aPlayer, aX, aY, aZ); } - * @Override public void onRemoval() { this.tryForceNBTUpdate(); super.onRemoval(); } - * @Override public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) { - * super.onPostTick(aBaseMetaTileEntity, aTick); if ((this.internalStorageTank != null) && - * this.internalStorageTank.amount >= this.maximumFluidStorage){ if (this.internalStorageTank.amount > - * this.maximumFluidStorage){ this.internalStorageTank.amount = this.maximumFluidStorage; } this.stopMachine(); } if - * (this.mInternalSaveClock != 20){ this.mInternalSaveClock++; } else { this.mInternalSaveClock = 0; - * this.tryForceNBTUpdate(); } } public GregtechMetaTileEntity_MultiTank(final String aName) { super(aName); } - * @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { return new - * GregtechMetaTileEntity_MultiTank(this.mName); } - * @Override public String[] getTooltip() { return new String[]{ "Controller Block for the Multitank", - * "Size: 3xHx3 (Block behind controller must be air)", "Structure must be at least 4 blocks tall, maximum 20.", - * "Each casing within the structure adds 128000L storage.", "Multitank Exterior Casings (16 at least!)", - * "Controller (front centered)", "1x Input hatch", "1x Output hatch", "1x Energy Hatch", }; } - * @Override public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte - * aFacing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { if (side == facing) { return new - * ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(11)), new GT_RenderedTexture(aActive ? - * TexturesGtBlock.Overlay_Machine_Screen_Logo : TexturesGtBlock.Overlay_Machine_Screen_Logo)}; } return new - * ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(11))}; } - * @Override public GT_Recipe.GT_Recipe_Map getRecipeMap() { return null; } - * @Override public boolean isFacingValid(final ForgeDirection facing) { return facing.offsetY == 0; } - * @Override public boolean checkRecipe(final ItemStack aStack) { final ArrayList<ItemStack> tInputList = - * this.getStoredInputs(); for (int i = 0; i < (tInputList.size() - 1); i++) { for (int j = i + 1; j < - * tInputList.size(); j++) { if (GT_Utility.areStacksEqual(tInputList.get(i), tInputList.get(j))) { if - * (tInputList.get(i).stackSize >= tInputList.get(j).stackSize) { tInputList.remove(j--); } else { - * tInputList.remove(i--); break; } } } } final ItemStack[] tInputs = Arrays.copyOfRange(tInputList.toArray(new - * ItemStack[tInputList.size()]), 0, 2); final ArrayList<FluidStack> tFluidList = this.getStoredFluids(); for (int i - * = 0; i < (tFluidList.size() - 1); i++) { for (int j = i + 1; j < tFluidList.size(); j++) { if - * (GT_Utility.areFluidsEqual(tFluidList.get(i), tFluidList.get(j))) { if (tFluidList.get(i).amount >= - * tFluidList.get(j).amount) { tFluidList.remove(j--); } else { tFluidList.remove(i--); break; } } } } final - * FluidStack[] tFluids = Arrays.copyOfRange(tFluidList.toArray(new FluidStack[1]), 0, 1); if (tFluids.length >= 2){ - * Logger.WARNING("Bad"); return false; } final ArrayList<Pair<GT_MetaTileEntity_Hatch_Input, Boolean>> rList = new - * ArrayList<>(); int slotInputCount = 0; for (final GT_MetaTileEntity_Hatch_Input tHatch : this.mInputHatches) { - * boolean containsFluid = false; if (isValidMetaTileEntity(tHatch)) { slotInputCount++; for (int i=0; - * i<tHatch.getBaseMetaTileEntity().getSizeInventory(); i++) { if (tHatch.canTankBeEmptied()){containsFluid=true;} } - * rList.add(new Pair<>(tHatch, containsFluid)); } } if ((tFluids.length <= 0) || (slotInputCount > 1)){ - * Logger.WARNING("Bad"); return false; } Logger.WARNING("Okay - 2"); if (this.internalStorageTank == null){ - * Logger.WARNING("Okay - 3"); if ((rList.get(0).getKey().mFluid != null) && (rList.get(0).getKey().mFluid.amount > - * 0)){ Logger.WARNING("Okay - 4"); - * Logger.WARNING("Okay - 1"+" rList.get(0).getKey().mFluid.amount: "+rList.get(0).getKey().mFluid.amount - */ -/* +" internalStorageTank:"+internalStorageTank.amount *//* - * ); final FluidStack tempFluidStack = - * rList.get(0).getKey().mFluid; final Fluid tempFluid = - * tempFluidStack.getFluid(); this.internalStorageTank = - * FluidUtils.getFluidStack(tempFluid.getName(), - * tempFluidStack.amount); rList.get(0).getKey().mFluid.amount - * = 0; Logger.WARNING("Okay - 1.1" - * +" rList.get(0).getKey().mFluid.amount: "+rList.get(0). - * getKey().mFluid.amount - * +" internalStorageTank:"+this.internalStorageTank.amount); - * return true; } Logger.WARNING("No Fluid in hatch."); return - * false; } else if - * (this.internalStorageTank.isFluidEqual(rList.get(0).getKey() - * .mFluid)){ - * Logger.WARNING("Storing "+rList.get(0).getKey().mFluid. - * amount+"L"); - * Logger.WARNING("Contains "+this.internalStorageTank.amount+ - * "L"); int tempAdd = 0; tempAdd = - * rList.get(0).getKey().getFluidAmount(); - * rList.get(0).getKey().mFluid = null; - * Logger.WARNING("adding "+tempAdd); - * this.internalStorageTank.amount = - * this.internalStorageTank.amount + tempAdd; - * Logger.WARNING("Tank now Contains "+this.internalStorageTank - * .amount+"L of "+this.internalStorageTank.getFluid().getName( - * )+"."); //Utils.LOG_WARNING("Tank"); return true; } else { - * final FluidStack superTempFluidStack = - * rList.get(0).getKey().mFluid; - * Logger.WARNING("is input fluid equal to stored fluid? "+( - * this.internalStorageTank.isFluidEqual(superTempFluidStack))) - * ; if (superTempFluidStack != null) { - * Logger.WARNING("Input hatch[0] Contains " - * +superTempFluidStack.amount+"L of "+superTempFluidStack. - * getFluid().getName()+"."); } - * Logger.WARNING("Large Multi-Tank Contains "+this. - * internalStorageTank.amount+"L of "+this.internalStorageTank. - * getFluid().getName()+"."); if - * (this.internalStorageTank.amount <= 0){ - * Logger.WARNING("Internal Tank is empty, sitting idle."); - * return false; } if ((this.mOutputHatches.get(0).mFluid == - * null) || this.mOutputHatches.isEmpty() || - * (this.mOutputHatches.get(0).mFluid.isFluidEqual(this. - * internalStorageTank) && - * (this.mOutputHatches.get(0).mFluid.amount < - * this.mOutputHatches.get(0).getCapacity()))){ - * Logger.WARNING("Okay - 3"); final int tempCurrentStored = - * this.internalStorageTank.amount; int tempResult = 0; final - * int tempHatchSize = - * this.mOutputHatches.get(0).getCapacity(); final int - * tempHatchCurrentHolding = - * this.mOutputHatches.get(0).getFluidAmount(); final int - * tempHatchRemainingSpace = tempHatchSize - - * tempHatchCurrentHolding; final FluidStack tempOutputFluid = - * this.internalStorageTank; if (tempHatchRemainingSpace <= 0){ - * return false; } - * Logger.WARNING("Okay - 3.1.x"+" hatchCapacity: " - * +tempHatchSize +" tempCurrentStored: " - * +tempCurrentStored+" output hatch holds: " - * +tempHatchCurrentHolding+" tank has " - * +tempHatchRemainingSpace+"L of space left."); if - * (tempHatchSize >= tempHatchRemainingSpace){ - * Logger.WARNING("Okay - 3.1.1"+" hatchCapacity: " - * +tempHatchSize +" tempCurrentStored: " - * +tempCurrentStored+" output hatch holds: " - * +tempHatchCurrentHolding+" tank has " - * +tempHatchRemainingSpace+"L of space left."); int adder; if - * ((tempCurrentStored > 0) && (tempCurrentStored <= - * tempHatchSize)){ adder = tempCurrentStored; if (adder >= - * tempHatchRemainingSpace){ adder = tempHatchRemainingSpace; } - * } else { adder = 0; if (tempCurrentStored >= - * tempHatchRemainingSpace){ adder = tempHatchRemainingSpace; } - * } tempResult = adder; tempOutputFluid.amount = tempResult; - * Logger.WARNING("Okay - 3.1.2"+" result: "+tempResult - * +" tempCurrentStored: "+tempCurrentStored + - * " filling output hatch with: "+tempOutputFluid. - * amount+"L of "+tempOutputFluid.getFluid().getName()); - * this.mOutputHatches.get(0).fill(tempOutputFluid, true); - * //mOutputHatches.get(0).mFluid.amount = tempResult; - * this.internalStorageTank.amount = (tempCurrentStored-adder); - * Logger.WARNING("Okay - 3.1.3"+" internalTankStorage: "+this. - * internalStorageTank.amount - * +"L | output hatch contains: "+this.mOutputHatches.get(0). - * mFluid.amount+"L of "+this.mOutputHatches.get(0).mFluid. - * getFluid().getName()); - */ -/* - * if (internalStorageTank.amount <= 0) internalStorageTank = null; - *//* - * } Logger.WARNING("Tank ok."); return true; } } //this.getBaseMetaTileEntity().(tFluids[0].amount, true); - * Logger.WARNING("Tank"); return false; } - * @Override public int getMaxParallelRecipes() { return 1; } - * @Override public int getEuDiscountForParallelism() { return 0; } - * @Override public boolean checkMultiblock(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) { - * final int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; final int zDir = - * ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; if - * (!aBaseMetaTileEntity.getAirOffset(xDir, 0, zDir)) { Logger.WARNING("Must be hollow."); return false; } int - * tAmount = 0; for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { for (int h = -1; h < 19; h++) { if ((h - * != 0) || ((((xDir + i) != 0) || ((zDir + j) != 0)) && ((i != 0) || (j != 0)))) { final IGregTechTileEntity - * tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); if - * ((!this.addMaintenanceToMachineList(tTileEntity, TAE.GTPP_INDEX(11))) && (!this.addInputToMachineList(tTileEntity, - * TAE.GTPP_INDEX(11))) && (!this.addOutputToMachineList(tTileEntity, TAE.GTPP_INDEX(11))) && - * (!this.addEnergyInputToMachineList(tTileEntity, TAE.GTPP_INDEX(11)))) { if - * (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) { if (h < 3){ - * Logger.WARNING("Casing Expected."); return false; } else if (h >= 3){ - * //Utils.LOG_WARNING("Your Multitank can be 20 blocks tall."); } } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + - * i, h, zDir + j) != 11) { if (h < 3){ Logger.WARNING("Wrong Meta."); return false; } else if (h >= 3){ - * //Utils.LOG_WARNING("Your Multitank can be 20 blocks tall."); } } if (h < 3){ tAmount++; } else if (h >= 3){ if - * ((aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) == Blocks.air) || - * aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getUnlocalizedName().contains("residual")){ - * Logger.WARNING("Found air"); } else { - * Logger.WARNING("Layer "+(h+2)+" is complete. Adding "+(64000*9)+"L storage to the tank."); tAmount++; } } } } } } - * } this.multiblockCasingCount = (short) tAmount; this.maximumFluidStorage = getMaximumTankStorage(tAmount); - * Logger.INFO("Your Multitank can be 20 blocks tall."); - * Logger.INFO("Casings Count: "+this.multiblockCasingCount+" Valid Multiblock: "+(tAmount >= - * 16)+" Tank Storage Capacity:"+this.maximumFluidStorage+"L"); this.tryForceNBTUpdate(); return tAmount >= 16; } - */ -/* - * public int countCasings() { Utils.LOG_INFO("Counting Machine Casings"); try{ if - * (this.getBaseMetaTileEntity().getWorld() == null){ Utils.LOG_INFO("Tile Entity's world was null for casing count."); - * return 0; } if (this.getBaseMetaTileEntity() == null){ Utils.LOG_INFO("Tile Entity was null for casing count."); - * return 0; } } catch(NullPointerException r){ Utils.LOG_INFO("Null Pointer Exception caught."); return 0; } int xDir = - * ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetX; int zDir = - * ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetZ; if - * (!this.getBaseMetaTileEntity().getAirOffset(xDir, 0, zDir)) { Utils.LOG_INFO("Failed due to air being misplaced."); - * Utils.LOG_WARNING("Must be hollow."); return 0; } int tAmount = 0; Utils.LOG_INFO("Casing Count set to 0."); for (int - * i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { for (int h = -1; h < 19; h++) { if ((h != 0) || (((xDir + i != - * 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) { IGregTechTileEntity tTileEntity = - * this.getBaseMetaTileEntity().getIGregTechTileEntityOffset(xDir + i, h, zDir + j); if - * ((!addMaintenanceToMachineList(tTileEntity, TAE.GTPP_INDEX(11))) && (!addInputToMachineList(tTileEntity, - * TAE.GTPP_INDEX(11))) && (!addOutputToMachineList(tTileEntity, TAE.GTPP_INDEX(11))) && - * (!addEnergyInputToMachineList(tTileEntity, TAE.GTPP_INDEX(11)))) { if - * (this.getBaseMetaTileEntity().getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) { if (h < 3){ - * Utils.LOG_WARNING("Casing Expected."); return 0; } else if (h >= 3){ - * //Utils.LOG_WARNING("Your Multitank can be 20 blocks tall."); } } if - * (this.getBaseMetaTileEntity().getMetaIDOffset(xDir + i, h, zDir + j) != 11) { if (h < 3){ - * Utils.LOG_WARNING("Wrong Meta."); return 0; } else if (h >= 3){ - * //Utils.LOG_WARNING("Your Multitank can be 20 blocks tall."); } } if (h < 3){ tAmount++; } else if (h >= 3){ if - * (this.getBaseMetaTileEntity().getBlockOffset(xDir + i, h, zDir + j) == Blocks.air || - * this.getBaseMetaTileEntity().getBlockOffset(xDir + i, h, zDir + j).getUnlocalizedName().contains("residual")){ - * Utils.LOG_WARNING("Found air"); } else { - * Utils.LOG_WARNING("Layer "+(h+2)+" is complete. Adding "+(64000*9)+"L storage to the tank."); tAmount++; } } } } } } - * } Utils.LOG_INFO("Finished counting."); multiblockCasingCount = (short) tAmount; - * //Utils.LOG_INFO("Your Multitank can be 20 blocks tall."); - * Utils.LOG_INFO("Casings Count: "+tAmount+" Valid Multiblock: "+(tAmount >= - * 16)+" Tank Storage Capacity:"+getMaximumTankStorage(tAmount)+"L"); return tAmount; } - *//* - * @Override public int getMaxEfficiency(final ItemStack aStack) { return 10000; } - * @Override public int getPollutionPerTick(final ItemStack aStack) { return 5; } - * @Override public int getAmountOfOutputs() { return 1; } - * @Override public boolean explodesOnComponentBreak(final ItemStack aStack) { return false; } private static short - * getStorageMultiplier(final int casingCount){ final int tsm = 1*casingCount; if (tsm <= 0){ return 1; } return - * (short) tsm; } private static int getMaximumTankStorage(final int casingCount){ final int multiplier = - * getStorageMultiplier(casingCount); final int tempTankStorageMax = 128000*multiplier; if (tempTankStorageMax <= - * 0){return 128000;} return tempTankStorageMax; } private boolean tryForceNBTUpdate(){ - */ -/* - * //Block is invalid. if ((this == null) || (this.getBaseMetaTileEntity() == null)){ - * Utils.LOG_WARNING("Block was not valid for saving data."); return false; } //Don't need this to run clientside. if - * (!this.getBaseMetaTileEntity().isServerSide()) { return false; } //Internal Tag was not valid. try{ if - * (this.internalCraftingComponentsTag == null){ Utils.LOG_WARNING("Internal NBT data tag was null."); return false; } } - * catch (final NullPointerException x){ Utils.LOG_WARNING("Caught null NBT."); } //Internal tag was valid. - * this.saveNBTData(this.internalCraftingComponentsTag); //Mark block for update int x,y,z = 0; x = - * this.getBaseMetaTileEntity().getXCoord(); y = this.getBaseMetaTileEntity().getYCoord(); z = - * this.getBaseMetaTileEntity().getZCoord(); this.getBaseMetaTileEntity().getWorld().markBlockForUpdate(x, y, z); //Mark - * block dirty, let chunk know it's data has changed and it must be saved to disk. (Albeit slowly) - * this.getBaseMetaTileEntity().markDirty(); - *//* - * return true; } } - */ diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java deleted file mode 100644 index 4f2ebd9a80..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java +++ /dev/null @@ -1,186 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tools; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.AchievementList; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityDamageSource; -import net.minecraft.util.IChatComponent; -import net.minecraftforge.event.world.BlockEvent; - -import gregtech.api.GregTech_API; -import gregtech.api.damagesources.GT_DamageSources; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats; -import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool; - -public abstract class TOOL_Gregtech_Base implements Interface_ToolStats { - - public static final Enchantment[] FORTUNE_ENCHANTMENT = { Enchantment.fortune }; - public static final Enchantment[] LOOTING_ENCHANTMENT = { Enchantment.looting }; - public static final Enchantment[] ZERO_ENCHANTMENTS = new Enchantment[0]; - public static final int[] ZERO_ENCHANTMENT_LEVELS = new int[0]; - - @Override - public int getToolDamagePerBlockBreak() { - return 100; - } - - @Override - public int getToolDamagePerDropConversion() { - return 100; - } - - @Override - public int getToolDamagePerContainerCraft() { - return 800; - } - - @Override - public int getToolDamagePerEntityAttack() { - return 200; - } - - @Override - public float getSpeedMultiplier() { - return 1.0F; - } - - @Override - public float getMaxDurabilityMultiplier() { - return 1.0F; - } - - @Override - public int getHurtResistanceTime(final int aOriginalHurtResistance, final Entity aEntity) { - return aOriginalHurtResistance; - } - - @Override - public String getMiningSound() { - return null; - } - - @Override - public String getCraftingSound() { - return null; - } - - @Override - public String getEntityHitSound() { - return null; - } - - @Override - public String getBreakingSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(0)); - } - - @Override - public int getBaseQuality() { - return 0; - } - - @Override - public boolean canBlock() { - return false; - } - - @Override - public boolean isCrowbar() { - return false; - } - - @Override - public boolean isWrench() { - return false; - } - - @Override - public boolean isWeapon() { - return false; - } - - @Override - public boolean isRangedWeapon() { - return false; - } - - @Override - public boolean isMiningTool() { - return true; - } - - @Override - public boolean isChainsaw() { - return false; - } - - @Override - public boolean isGrafter() { - return false; - } - - @Override - public DamageSource getDamageSource(final EntityLivingBase aPlayer, final Entity aEntity) { - return GT_DamageSources.getCombatDamage( - (aPlayer instanceof EntityPlayer) ? "player" : "mob", - aPlayer, - (aEntity instanceof EntityLivingBase) ? this.getDeathMessage(aPlayer, (EntityLivingBase) aEntity) - : null); - } - - public IChatComponent getDeathMessage(final EntityLivingBase aPlayer, final EntityLivingBase aEntity) { - return new EntityDamageSource((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer) - .func_151519_b(aEntity); - } - - @Override - public int convertBlockDrops(final List<ItemStack> aDrops, final ItemStack aStack, final EntityPlayer aPlayer, - final Block aBlock, final int aX, final int aY, final int aZ, final byte aMetaData, final int aFortune, - final boolean aSilkTouch, final BlockEvent.HarvestDropsEvent aEvent) { - return 0; - } - - @Override - public ItemStack getBrokenItem(final ItemStack aStack) { - return null; - } - - @Override - public Enchantment[] getEnchantments(final ItemStack aStack) { - return ZERO_ENCHANTMENTS; - } - - @Override - public int[] getEnchantmentLevels(final ItemStack aStack) { - return ZERO_ENCHANTMENT_LEVELS; - } - - @Override - public void onToolCrafted(final ItemStack aStack, final EntityPlayer aPlayer) { - aPlayer.triggerAchievement(AchievementList.openInventory); - aPlayer.triggerAchievement(AchievementList.mineWood); - aPlayer.triggerAchievement(AchievementList.buildWorkBench); - } - - @Override - public void onStatsAddedToTool(final Gregtech_MetaTool aItem, final int aID) {} - - @Override - public float getNormalDamageAgainstEntity(final float aOriginalDamage, final Entity aEntity, final ItemStack aStack, - final EntityPlayer aPlayer) { - return aOriginalDamage; - } - - @Override - public float getMagicDamageAgainstEntity(final float aOriginalDamage, final Entity aEntity, final ItemStack aStack, - final EntityPlayer aPlayer) { - return aOriginalDamage; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java deleted file mode 100644 index e1248c0aae..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java +++ /dev/null @@ -1,9 +0,0 @@ -package gtPlusPlus.xmod.gregtech.loaders; - -import gtPlusPlus.xmod.gregtech.api.enums.GregtechTextures.ItemIcons.CustomIcon; - -public class Processing_Textures_Items { - - public static final CustomIcon itemSkookumChoocher = new CustomIcon("iconsets/SKOOKUMCHOOCHER"); - public static final CustomIcon itemElectricPump = new CustomIcon("iconsets/PUMP"); -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java deleted file mode 100644 index e05e32331d..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java +++ /dev/null @@ -1,175 +0,0 @@ -package gtPlusPlus.xmod.gregtech.loaders.misc; - -import java.util.concurrent.ConcurrentHashMap; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.Achievement; -import net.minecraft.stats.AchievementList; -import net.minecraft.stats.StatBase; -import net.minecraftforge.common.AchievementPage; -import net.minecraftforge.event.entity.player.EntityItemPickupEvent; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import gregtech.GT_Mod; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_Recipe; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class AssLineAchievements { - - public static int assReg = -1; - public static ConcurrentHashMap<String, Achievement> mAchievementMap; - public static ConcurrentHashMap<String, Boolean> mIssuedAchievementMap; - public static int adjX = 5; - public static int adjY = 9; - private static boolean active = true; - - public AssLineAchievements() { - Logger.INFO( - active ? "Loading custom achievement page for Assembly Line recipes." : "Achievements are disabled."); - Utils.registerEvent(this); - } - - private static boolean ready = false; - private static int recipeTotal = 0; - private static int recipeCount = 0; - - private static void init() { - if (!ready) { - active = GT_Mod.gregtechproxy.mAchievements; - recipeTotal = GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList.size(); - mAchievementMap = new ConcurrentHashMap<String, Achievement>(); - mIssuedAchievementMap = new ConcurrentHashMap<String, Boolean>(); - ready = true; - } - } - - public static void registerAchievements() { - if (active && mAchievementMap.size() > 0) { - AchievementPage.registerAchievementPage( - new AchievementPage( - "GT Assembly Line", - (Achievement[]) mAchievementMap.values().toArray(new Achievement[mAchievementMap.size()]))); - } else if (active) { - Logger.INFO("Unable to register custom achievement page for Assembly Line recipes."); - } - } - - public static Achievement registerAssAchievement(GT_Recipe recipe) { - init(); - String aSafeUnlocalName; - // Debugging - if (recipe == null) { - Logger.INFO( - "Someone tried to register an achievement for an invalid recipe. Please report this to Alkalus."); - return null; - } - if (recipe.getOutput(0) == null) { - Logger.INFO( - "Someone tried to register an achievement for a recipe with null output. Please report this to Alkalus."); - return null; - } - ItemStack aStack = recipe.getOutput(0); - try { - aSafeUnlocalName = aStack.getUnlocalizedName(); - } catch (Throwable t) { - aSafeUnlocalName = ItemUtils.getUnlocalizedItemName(aStack); - } - - Achievement aYouDidSomethingInGT; - if (mAchievementMap.get(aSafeUnlocalName) == null) { - assReg++; - recipeCount++; - aYouDidSomethingInGT = registerAchievement( - aSafeUnlocalName, - -(11 + assReg % 5), - ((assReg) / 5) - 8, - recipe.getOutput(0), - AchievementList.openInventory, - false); - } else { - aYouDidSomethingInGT = null; - } - if (recipeCount >= recipeTotal) { - Logger.INFO("Critical mass achieved. [" + recipeCount + "]"); - registerAchievements(); - } - - return aYouDidSomethingInGT; - } - - public static Achievement registerAchievement(String textId, int x, int y, ItemStack icon, Achievement requirement, - boolean special) { - if (!GT_Mod.gregtechproxy.mAchievements) { - return null; - } - Achievement achievement = new Achievement(textId, textId, adjX + x, adjY + y, icon, requirement); - if (special) { - achievement.setSpecial(); - } - achievement.registerStat(); - if (CORE.DEVENV) { - GT_Log.out.println("achievement." + textId + "="); - GT_Log.out.println("achievement." + textId + ".desc="); - } - mAchievementMap.put(textId, achievement); - return achievement; - } - - public static void issueAchievement(EntityPlayer entityplayer, String textId) { - if (entityplayer == null || !GT_Mod.gregtechproxy.mAchievements) { - return; - } - - entityplayer.triggerAchievement((StatBase) getAchievement(textId)); - } - - public static Achievement getAchievement(String textId) { - if (mAchievementMap.containsKey(textId)) { - Logger.INFO("Found Achivement: " + textId); - return (Achievement) mAchievementMap.get(textId); - } - return null; - } - - @SubscribeEvent - public void onItemPickup(EntityItemPickupEvent event) { - EntityPlayer player = event.entityPlayer; - ItemStack stack = event.item.getEntityItem(); - String aPickupUnlocalSafe = ItemUtils.getUnlocalizedItemName(stack); - if (player == null || stack == null) { - return; - } - - Logger.INFO("Trying to check for achievements"); - // Debug scanner unlocks all AL recipes in creative - if (player.capabilities.isCreativeMode && aPickupUnlocalSafe.equals("gt.metaitem.01.32761")) { - for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList) { - issueAchievement(player, recipe.getOutput(0).getUnlocalizedName()); - recipe.mHidden = false; - } - } - for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList) { - - String aSafeUnlocalName; - if (recipe.getOutput(0) == null) { - Logger.INFO( - "Someone tried to register an achievement for a recipe with null output. Please report this to Alkalus."); - continue; - } - ItemStack aStack = recipe.getOutput(0); - aSafeUnlocalName = ItemUtils.getUnlocalizedItemName(aStack); - if (aSafeUnlocalName.equals(aPickupUnlocalSafe)) { - issueAchievement(player, aSafeUnlocalName); - recipe.mHidden = false; - Logger.INFO("FOUND: " + aSafeUnlocalName + " | " + aPickupUnlocalSafe); - } else { - // Logger.INFO(aSafeUnlocalName + " | " + aPickupUnlocalSafe); - } - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java index 2cb2ed2c5f..88c2f90c3c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java @@ -31,7 +31,6 @@ import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy_RTG; import gtPlusPlus.xmod.gregtech.common.helpers.FlotationRecipeHandler; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntity_RTG; -import gtPlusPlus.xmod.gregtech.recipes.machines.RECIPEHANDLER_MatterFabricator; public class GregtechRecipeAdder implements IGregtech_RecipeAdder { @@ -116,7 +115,6 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { aEUt, 0); GTPP_Recipe_Map.sMatterFab2Recipes.addRecipe(aRecipe); - RECIPEHANDLER_MatterFabricator.debug5(aFluidInput, aFluidOutput, aDuration, aEUt); return true; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java deleted file mode 100644 index cb0ec59f22..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java +++ /dev/null @@ -1,14 +0,0 @@ -package gtPlusPlus.xmod.gregtech.recipes.machines; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -public class RECIPEHANDLER_AssemblyLine { - - public static boolean addAssemblylineRecipe(ItemStack paramItemStack1, int paramInt1, - ItemStack[] paramArrayOfItemStack, FluidStack[] paramArrayOfFluidStack, ItemStack paramItemStack2, - int paramInt2, int paramInt3) { - - return false; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java deleted file mode 100644 index 599b98ed86..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java +++ /dev/null @@ -1,121 +0,0 @@ -package gtPlusPlus.xmod.gregtech.recipes.machines; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -import gtPlusPlus.api.objects.Logger; - -public class RECIPEHANDLER_CokeOven { - - public static void debug1() { - Logger.WARNING("=================================================================================="); - Logger.WARNING("=================================================================================="); - Logger.WARNING("=================================================================================="); - Logger.WARNING("Walking Through CokeOven Recipe Creation."); - Logger.WARNING("My name is Ralph and I will be your humble host."); - } - - public static void debug2(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, - final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) { - Logger.WARNING("=================================================================================="); - Logger.WARNING("Taking a step forward."); - Logger.WARNING("aInput1 == null && aFluidInput == null || aOutput == null && aFluidOutput == null"); - Logger.WARNING( - "aInput1:" + aInput1.toString() - + " aInput2:" - + aInput2.toString() - + " aFluidInput:" - + aFluidInput.toString() - + " aFluidOutput:" - + aFluidOutput.toString() - + " aOutput:" - + aOutput.toString() - + " aDuration:" - + aDuration - + " aEU/t:" - + aEUt); - Logger.WARNING("Passed."); - } - - public static void debug3(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, - final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) { - Logger.WARNING("=================================================================================="); - Logger.WARNING("Taking a step forward."); - Logger.WARNING( - "(aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aOutput, aDuration)) <= 0)"); - Logger.WARNING( - "aInput1:" + aInput1.toString() - + " aInput2:" - + aInput2.toString() - + " aFluidInput:" - + aFluidInput.toString() - + " aFluidOutput:" - + aFluidOutput.toString() - + " aOutput:" - + aOutput.toString() - + " aDuration:" - + aDuration - + " aEU/t:" - + aEUt); - Logger.WARNING("Passed."); - } - - public static void debug4(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, - final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) { - Logger.WARNING("=================================================================================="); - Logger.WARNING("Taking a step forward."); - Logger.WARNING( - "(aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aFluidOutput.getFluid().getName(), aDuration)) <= 0)"); - Logger.WARNING( - "aInput1:" + aInput1.toString() - + " aInput2:" - + aInput2.toString() - + " aFluidInput:" - + aFluidInput.toString() - + " aFluidOutput:" - + aFluidOutput.toString() - + " aOutput:" - + aOutput.toString() - + " aDuration:" - + aDuration - + " aEU/t:" - + aEUt); - Logger.WARNING("Passed."); - Logger.WARNING( - "aInput1:" + aInput1.toString() - + " aInput2:" - + aInput2.toString() - + " aFluidInput:" - + aFluidInput.toString() - + " aFluidOutput:" - + aFluidOutput.toString() - + " aOutput:" - + aOutput.toString() - + " aDuration:" - + aDuration - + " aEU/t:" - + aEUt); - } - - public static void debug5(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, - final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) { - Logger.INFO( - "Successfully added a Coke Oven recipe for: " + aOutput.getDisplayName() - + " & " - + aFluidOutput.getFluid().getName() - + ", Using " - + aInput1.getDisplayName() - + " & " - + aInput2.getDisplayName() - + " & liquid " - + aFluidInput.getFluid().getName() - + ". This takes " - + (aDuration / 20) - + " seconds for " - + aEUt - + "eu/t."); - Logger.WARNING("=================================================================================="); - Logger.WARNING("=================================================================================="); - Logger.WARNING("=================================================================================="); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java deleted file mode 100644 index fc9ed99ffe..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java +++ /dev/null @@ -1,152 +0,0 @@ -package gtPlusPlus.xmod.gregtech.recipes.machines; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class RECIPEHANDLER_Dehydrator { - - public static void debug1() { - Logger.WARNING("=================================================================================="); - Logger.WARNING("=================================================================================="); - Logger.WARNING("=================================================================================="); - Logger.WARNING("Walking Through Chemical Dehydrator Recipe Creation."); - Logger.WARNING("My name is Willus and I will be your humble host."); - } - - public static void debug2(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, - final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) { - Logger.WARNING("=================================================================================="); - Logger.WARNING("Taking a step forward."); - Logger.WARNING("aInput1 == null && aFluidInput == null || aOutput == null && aFluidOutput == null"); - Logger.WARNING( - "aInput1:" + aInput1.toString() - + " aInput2:" - + aInput2.toString() - + " aFluidInput:" - + aFluidInput.toString() - + " aFluidOutput:" - + aFluidOutput.toString() - + " aOutput:" - + aOutput.toString() - + " aDuration:" - + aDuration - + " aEU/t:" - + aEUt); - Logger.WARNING("Passed."); - } - - public static void debug3(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, - final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) { - Logger.WARNING("=================================================================================="); - Logger.WARNING("Taking a step forward."); - Logger.WARNING( - "(aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aOutput, aDuration)) <= 0)"); - Logger.WARNING( - "aInput1:" + aInput1.toString() - + " aInput2:" - + aInput2.toString() - + " aFluidInput:" - + aFluidInput.toString() - + " aFluidOutput:" - + aFluidOutput.toString() - + " aOutput:" - + aOutput.toString() - + " aDuration:" - + aDuration - + " aEU/t:" - + aEUt); - Logger.WARNING("Passed."); - } - - public static void debug4(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, - final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) { - Logger.WARNING("=================================================================================="); - Logger.WARNING("Taking a step forward."); - Logger.WARNING( - "(aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aFluidOutput.getFluid().getName(), aDuration)) <= 0)"); - Logger.WARNING( - "aInput1:" + aInput1.toString() - + " aInput2:" - + aInput2.toString() - + " aFluidInput:" - + aFluidInput.toString() - + " aFluidOutput:" - + aFluidOutput.toString() - + " aOutput:" - + aOutput.toString() - + " aDuration:" - + aDuration - + " aEU/t:" - + aEUt); - Logger.WARNING("Passed."); - Logger.WARNING( - "aInput1:" + aInput1.toString() - + " aInput2:" - + aInput2.toString() - + " aFluidInput:" - + aFluidInput.toString() - + " aFluidOutput:" - + aFluidOutput.toString() - + " aOutput:" - + aOutput.toString() - + " aDuration:" - + aDuration - + " aEU/t:" - + aEUt); - } - - public static void debug5(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, - final FluidStack aFluidOutput, final ItemStack[] aOutput, final int aDuration, final int aEUt) { - - String inputAname; - String inputBname; - String inputFluidname; - String outputFluidName; - - if (aInput1 != null) { - inputAname = aInput1.getDisplayName(); - } else { - inputAname = "null"; - } - - if (aInput2 != null) { - inputBname = aInput2.getDisplayName(); - } else { - inputBname = "null"; - } - - if (aFluidInput != null) { - inputFluidname = aFluidInput.getFluid().getName(); - } else { - inputFluidname = "null"; - } - - if (aFluidOutput != null) { - outputFluidName = aFluidOutput.getFluid().getName(); - } else { - outputFluidName = "null"; - } - - Logger.INFO( - "Successfully added a Chemical Dehydrator recipe for: " + ItemUtils.getArrayStackNames(aOutput) - + " & " - + outputFluidName - + ", Using " - + inputAname - + " & " - + inputBname - + " & liquid " - + inputFluidname - + ". This takes " - + (aDuration / 20) - + " seconds for " - + aEUt - + "eu/t."); - Logger.WARNING("=================================================================================="); - Logger.WARNING("=================================================================================="); - Logger.WARNING("=================================================================================="); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java deleted file mode 100644 index ea2f4a95fe..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java +++ /dev/null @@ -1,101 +0,0 @@ -package gtPlusPlus.xmod.gregtech.recipes.machines; - -import net.minecraftforge.fluids.FluidStack; - -import gtPlusPlus.api.objects.Logger; - -public class RECIPEHANDLER_MatterFabricator { - - public static void debug1() { - Logger.WARNING("=================================================================================="); - Logger.WARNING("=================================================================================="); - Logger.WARNING("=================================================================================="); - Logger.WARNING("Walking Through Matter Fabrication Recipe Creation."); - Logger.WARNING("My name is Ralph and I will be your humble host."); - } - - public static void debug2(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, - final int aEUt) { - Logger.WARNING("=================================================================================="); - Logger.WARNING("Taking a step forward."); - Logger.WARNING("aInput1 == null && aFluidInput == null || aOutput == null && aFluidOutput == null"); - Logger.WARNING( - "aFluidInput:" + aFluidInput.toString() - + " aFluidOutput:" - + aFluidOutput.toString() - + " aDuration:" - + aDuration - + " aEU/t:" - + aEUt); - Logger.WARNING("Passed."); - } - - public static void debug3(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, - final int aEUt) { - Logger.WARNING("=================================================================================="); - Logger.WARNING("Taking a step forward."); - Logger.WARNING( - "(aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aOutput, aDuration)) <= 0)"); - Logger.WARNING( - "aFluidInput:" + aFluidInput.toString() - + " aFluidOutput:" - + aFluidOutput.toString() - + " aDuration:" - + aDuration - + " aEU/t:" - + aEUt); - Logger.WARNING("Passed."); - } - - public static void debug4(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, - final int aEUt) { - Logger.WARNING("=================================================================================="); - Logger.WARNING("Taking a step forward."); - Logger.WARNING( - "(aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aFluidOutput.getFluid().getName(), aDuration)) <= 0)"); - Logger.WARNING( - "aFluidInput:" + aFluidInput.toString() - + " aFluidOutput:" - + aFluidOutput.toString() - + " aDuration:" - + aDuration - + " aEU/t:" - + aEUt); - Logger.WARNING("Passed."); - Logger.WARNING( - "aFluidInput:" + aFluidInput.toString() - + " aFluidOutput:" - + aFluidOutput.toString() - + " aDuration:" - + aDuration - + " aEU/t:" - + aEUt); - } - - public static void debug5(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, - final int aEUt) { - String a = "nothing"; - String b = ""; - - if (aFluidInput != null) { - a = aFluidInput.getFluid().getName(); - } - if (aFluidOutput != null) { - b = aFluidOutput.getFluid().getName(); - } - - Logger.INFO( - "Successfully added a Matter Fabrication recipe for: " + b - + ", Using " - + " liquid " - + a - + ". This takes " - + (aDuration / 20) - + " seconds for " - + aEUt - + "eu/t."); - Logger.WARNING("=================================================================================="); - Logger.WARNING("=================================================================================="); - Logger.WARNING("=================================================================================="); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java deleted file mode 100644 index 592db618f2..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java +++ /dev/null @@ -1,6 +0,0 @@ -/* - * package gtPlusPlus.xmod.gregtech.registration.gregtech; public class GregtechBedrockPlatforms { //941-945 public - * static void run() { Logger.INFO("Gregtech5u Content | Registering Bedrock Mining Platform."); - * GregtechItemList.BedrockMiner_MKI.set(new GregtechMetaTileEntity_BedrockMiningPlatform1(941, - * "multimachine.tier.01.bedrockminer", "Experimental Deep Earth Drilling Platform - MK I").getStackForm(1)); } } - */ diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV deleted file mode 100644 index d063d85b1f..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV +++ /dev/null @@ -1,15 +0,0 @@ - - -public class GregtechGeneratorsULV { - public static void run(){ - - GregtechItemList.Generator_Diesel_ULV.set(new GT_MetaTileEntity_ULV_CombustionGenerator(960, "basicgenerator.diesel.tier.00", "Simple Combustion Generator", 0).getStackForm(1L)); - GregtechItemList.Generator_Gas_Turbine_ULV.set(new GT_MetaTileEntity_ULV_GasTurbine(961, "basicgenerator.gas.tier.00", "Simple Gas Turbine", 0).getStackForm(1L)); - GregtechItemList.Generator_Steam_Turbine_ULV.set(new GT_MetaTileEntity_ULV_SteamTurbine(962, "basicgenerator.steam.tier.00", "Simple Steam Turbine", 0).getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_Diesel_ULV.get(1L, new Object[0]), bitsd, new Object[]{"PCP", "EME", "GWG", 'M', ItemList.Hull_ULV, 'P', GregtechItemList.Electric_Piston_ULV, 'E', GregtechItemList.Electric_Motor_ULV, 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy), 'G', OrePrefixes.gearGt.get(Materials.Bronze)}); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_Gas_Turbine_ULV.get(1L, new Object[0]), bitsd, new Object[]{"CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_ULV, 'E', GregtechItemList.Electric_Motor_ULV, 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy)}); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_Steam_Turbine_ULV.get(1L, new Object[0]), bitsd, new Object[]{"PCP", "RMR", aTextMotorWire, 'M', ItemList.Hull_ULV, 'E', GregtechItemList.Electric_Motor_ULV, 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy), 'P', OrePrefixes.pipeMedium.get(Materials.Copper)}); - - } -}
\ No newline at end of file diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java deleted file mode 100644 index e17b8f22a2..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java +++ /dev/null @@ -1,10 +0,0 @@ -/* - * package gtPlusPlus.xmod.gregtech.registration.gregtech; public class GregtechIndustrialMultiTank { public static void - * run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - * Logger.INFO("Gregtech5u Content | Registering Industrial Multitank controller blocks."); if - * (CORE.ConfigSwitches.enableMultiblock_MultiTank) { run1(); } } } private static void run1() { - * GregtechItemList.Industrial_MultiTank .set(new GregtechMetaTileEntity_MultiTank(827, - * "multitank.controller.tier.single", "Gregtech Multitank") .getStackForm(1L)); // - * GregtechItemList.Industrial_MultiTankDense.set(new // GregtechMetaTileEntityMultiTankDense(828, // - * "multitankdense.controller.tier.single", "Gregtech Dense // Multitank").getStackForm(1L)); } } - */ diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java deleted file mode 100644 index ca2b1237c3..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * package gtPlusPlus.xmod.gregtech.registration.gregtech; public class GregtechMiniRaFusion { public static void run() - * { // Register the Simple Fusion Entity. GregtechItemList.Miniature_Fusion.set(new GregtechMTE_MiniFusionPlant(31015, - * "gtplusplus.fusion.single", "Helium Prime").getStackForm(1L)); GregtechItemList.Plasma_Tank.set(new - * GT_MetaTileEntity_Hatch_Plasma(31016, "gtplusplus.tank.plasma", "Plasma Tank").getStackForm(1L)); } public static - * boolean generateSlowFusionrecipes() { for (GT_Recipe x : GT_Recipe.GT_Recipe_Map.sFusionRecipes.mRecipeList){ if - * (x.mEnabled) { GT_Recipe y = x.copy(); y.mDuration *= 16; long z = y.mEUt * 4; if (z > Integer.MAX_VALUE) { - * y.mEnabled = false; continue; } y.mEUt = (int) Math.min(Math.max(0, z), Integer.MAX_VALUE); y.mCanBeBuffered = true; - * GTPP_Recipe.GTPP_Recipe_Map.sSlowFusionRecipes.add(y); } } int mRecipeCount = - * GTPP_Recipe.GTPP_Recipe_Map.sSlowFusionRecipes.mRecipeList.size(); if (mRecipeCount > 0) { - * Logger.INFO("[Pocket Fusion] Generated "+mRecipeCount+" recipes for the Pocket Fusion Reactor."); return true; } - * return false; } } - */ diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java deleted file mode 100644 index c98b023b08..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java +++ /dev/null @@ -1,7 +0,0 @@ -/* - * package gtPlusPlus.xmod.gregtech.registration.gregtech; public class GregtechNaqReactor { public static void run() { - * if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - * Logger.INFO("Gregtech5u Content | Registering Futuristic Naquadah Reactor {LNR]."); run1(); } } private static void - * run1() { // LFTR GregtechItemList.Controller_Naq_Reactor.set(new GregtechMTE_LargeNaqReactor(970, - * "lnr.controller.single", "Naquadah Reactor Mark XII").getStackForm(1L)); } } - */ diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java deleted file mode 100644 index 6e8cf675e8..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java +++ /dev/null @@ -1,186 +0,0 @@ -package gtPlusPlus.xmod.ic2.block.RTGGenerator; - -import java.util.List; -import java.util.Random; - -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import org.apache.commons.lang3.mutable.MutableObject; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.xmod.ic2.block.kieticgenerator.tileentity.TileEntityKineticWindGenerator; -import gtPlusPlus.xmod.ic2.item.IC2_Items; -import gtPlusPlus.xmod.ic2.item.ItemGenerators; -import ic2.core.IC2; -import ic2.core.Ic2Items; -import ic2.core.block.BlockMultiID; -import ic2.core.block.TileEntityBlock; -import ic2.core.block.reactor.tileentity.TileEntityNuclearReactorElectric; -import ic2.core.init.InternalName; - -public class BlockRTG extends BlockMultiID { - - public BlockRTG(final InternalName internalName1) { - super(internalName1, Material.iron, ItemGenerators.class); - this.setCreativeTab(AddToCreativeTab.tabMachines); - this.setHardness(3.0F); - this.setStepSound(soundTypeMetal); - - IC2_Items.blockRTG = new ItemStack(this, 1, 0); - IC2_Items.blockKineticGenerator = new ItemStack(this, 1, 1); - - GameRegistry.registerTileEntity(TileEntityRTG.class, "RTG Mach II"); - GameRegistry.registerTileEntity(TileEntityKineticWindGenerator.class, "Wind Ripper Mach II"); - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public void getSubBlocks(final Item j, final CreativeTabs tabs, final List itemList) { - final Item item = Item.getItemFromBlock(this); - if (!item.getHasSubtypes()) { - itemList.add(new ItemStack(this)); - } else { - for (int i = 0; i < 16; i++) { - final ItemStack is = new ItemStack(this, 1, i); - if (is.getItem().getUnlocalizedName(is) == null) { - break; - } - itemList.add(is); - } - } - } - - @Override - public String getTextureFolder(final int id) { - return "generator"; - } - - @Override - public int damageDropped(final int meta) { - switch (meta) { - case 2: - return 2; - } - return 0; - } - - @Override - public Class<? extends TileEntity> getTeClass(final int meta, final MutableObject<Class<?>[]> ctorArgTypes, - final MutableObject<Object[]> ctorArgs) { - try { - switch (meta) { - case 0: - return TileEntityRTG.class; - case 1: - return TileEntityKineticWindGenerator.class; - } - } catch (final Exception e) { - throw new RuntimeException(e); - } - return null; - } - - /* - * { case 0: return TileEntityGenerator.class; case 1: return TileEntityGeoGenerator.class; case 2: return - * TileEntityWaterGenerator.class; case 3: return TileEntitySolarGenerator.class; case 4: return - * TileEntityWindGenerator.class; case 5: return TileEntityNuclearReactorElectric.class; case 6: return - * TileEntityRTGenerator.class; case 7: return TileEntitySemifluidGenerator.class; case 8: return - * TileEntityStirlingGenerator.class; case 9: return TileEntityKineticGenerator.class; } (non-Javadoc) - * @see net.minecraft.block.Block#randomDisplayTick(net.minecraft.world.World, int, int, int, java.util.Random) - */ - - @Override - public void randomDisplayTick(final World world, final int x, final int y, final int z, final Random random) { - if (!IC2.platform.isRendering()) { - return; - } - final int meta = world.getBlockMetadata(x, y, z); - if ((meta == 0) && (this.isActive(world, x, y, z))) { - final TileEntityBlock te = (TileEntityBlock) this.getOwnTe(world, x, y, z); - if (te == null) { - return; - } - final int l = te.getFacing(); - final float f = x + 0.5F; - final float f1 = y + 0.0F + ((random.nextFloat() * 6.0F) / 16.0F); - final float f2 = z + 0.5F; - final float f3 = 0.52F; - final float f4 = (random.nextFloat() * 0.6F) - 0.3F; - switch (l) { - case 4: - world.spawnParticle("smoke", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); - break; - case 5: - world.spawnParticle("smoke", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); - break; - case 2: - world.spawnParticle("smoke", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D); - break; - case 3: - world.spawnParticle("smoke", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); - } - } else if (meta == 5) { - final TileEntityNuclearReactorElectric te = (TileEntityNuclearReactorElectric) this - .getOwnTe(world, x, y, z); - if (te == null) { - return; - } - int puffs = te.heat / 1000; - if (puffs <= 0) { - return; - } - puffs = world.rand.nextInt(puffs); - for (int n = 0; n < puffs; n++) { - world.spawnParticle( - "smoke", - x + random.nextFloat(), - y + 0.95F, - z + random.nextFloat(), - 0.0D, - 0.0D, - 0.0D); - } - puffs -= world.rand.nextInt(4) + 3; - for (int n = 0; n < puffs; n++) { - world.spawnParticle( - "flame", - x + random.nextFloat(), - y + 1.0F, - z + random.nextFloat(), - 0.0D, - 0.0D, - 0.0D); - } - } - } - - @Override - public boolean onBlockActivated(final World world, final int i, final int j, final int k, - final EntityPlayer entityplayer, final int side, final float a, final float b, final float c) { - if ((entityplayer.getCurrentEquippedItem() != null) - && (entityplayer.getCurrentEquippedItem().isItemEqual(Ic2Items.reactorChamber))) { - return false; - } - return super.onBlockActivated(world, i, j, k, entityplayer, side, a, b, c); - } - - @Override - @SideOnly(Side.CLIENT) - public EnumRarity getRarity(final ItemStack stack) { - return stack.getItemDamage() == 5 ? EnumRarity.uncommon : EnumRarity.common; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java deleted file mode 100644 index 097e3bf50d..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java +++ /dev/null @@ -1,75 +0,0 @@ -package gtPlusPlus.xmod.ic2.block.RTGGenerator; - -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.xmod.ic2.block.RTGGenerator.gui.CONTAINER_RTG; -import gtPlusPlus.xmod.ic2.block.RTGGenerator.gui.GUI_RTG; -import ic2.core.ContainerBase; -import ic2.core.Ic2Items; -import ic2.core.block.generator.tileentity.TileEntityRTGenerator; -import ic2.core.block.invslot.InvSlotConsumable; -import ic2.core.block.invslot.InvSlotConsumableId; - -public class TileEntityRTG extends TileEntityRTGenerator { - - public final InvSlotConsumable fuelSlot; - - public TileEntityRTG() { - this.fuelSlot = new InvSlotConsumableId(this, "fuelSlot", 0, 12, new Item[] { Ic2Items.RTGPellets.getItem() }); - } - - @Override - public int gaugeFuelScaled(final int i) { - return i; - } - - @Override - public boolean gainEnergy() { - int counter = 0; - for (int i = 0; i < this.fuelSlot.size(); i++) { - if (this.fuelSlot.get(i) != null) { - counter++; - } - } - if (counter == 0) { - return false; - } - this.storage += (int) Math.pow(2.0D, counter - 1); - return true; - } - - @Override - public boolean gainFuel() { - return false; - } - - @Override - public boolean needsFuel() { - return true; - } - - @Override - public String getInventoryName() { - return "RTG"; - } - - @Override - public ContainerBase<TileEntityRTGenerator> getGuiContainer(final EntityPlayer entityPlayer) { - return new CONTAINER_RTG(entityPlayer, this); - } - - @Override - @SideOnly(Side.CLIENT) - public GuiScreen getGui(final EntityPlayer entityPlayer, final boolean isAdmin) { - return new GUI_RTG(new CONTAINER_RTG(entityPlayer, this)); - } - - @Override - public boolean delayActiveUpdate() { - return true; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java deleted file mode 100644 index 22a48e8916..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java +++ /dev/null @@ -1,34 +0,0 @@ -package gtPlusPlus.xmod.ic2.block.RTGGenerator.gui; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; - -import gtPlusPlus.xmod.ic2.block.RTGGenerator.TileEntityRTG; -import ic2.core.block.generator.container.ContainerRTGenerator; -import ic2.core.slot.SlotInvSlot; - -public class CONTAINER_RTG extends ContainerRTGenerator { - - public CONTAINER_RTG(final EntityPlayer entityPlayer, final TileEntityRTG tileEntity1) { - super(entityPlayer, tileEntity1); - for (int i = 0; i < 4; i++) { - this.addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + (i * 18), 18)); - } - for (int i = 4; i < 8; i++) { - this.addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + ((i - 4) * 18), 36)); - } - for (int i = 8; i < 12; i++) { - this.addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + ((i - 8) * 18), 54)); - } - } - - @Override - public List<String> getNetworkedFields() { - final List<String> ret = super.getNetworkedFields(); - - ret.add("storage"); - - return ret; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java deleted file mode 100644 index 1e22f66f32..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java +++ /dev/null @@ -1,59 +0,0 @@ -package gtPlusPlus.xmod.ic2.block.RTGGenerator.gui; - -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; - -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.xmod.ic2.block.RTGGenerator.TileEntityRTG; -import ic2.core.IC2; -import ic2.core.block.generator.gui.GuiRTGenerator; -import ic2.core.util.GuiTooltipHelper; - -@SideOnly(Side.CLIENT) -public class GUI_RTG extends GuiRTGenerator { - - public CONTAINER_RTG container; - - public GUI_RTG(final CONTAINER_RTG container1) { - super(container1); - - this.container = container1; - this.name = "RTG Mach II"; - } - - @Override - protected void drawGuiContainerForegroundLayer(final int par1, final int par2) { - this.fontRendererObj - .drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 4, 4210752); - - GuiTooltipHelper.drawAreaTooltip( - par1 - this.guiLeft, - par2 - this.guiTop, - StatCollector.translateToLocalFormatted( - "ic2.generic.text.bufferEU", - new Object[] { Double.valueOf(((TileEntityRTG) this.container.base).storage) }), - 117, - 38, - 150, - 48); - } - - @Override - protected void drawGuiContainerBackgroundLayer(final float f, final int x, final int y) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(background); - final int j = (this.width - this.xSize) / 2; - final int k = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(j, k, 0, 0, this.xSize, this.ySize); - - final int i1 = ((TileEntityRTG) this.container.base).gaugeStorageScaled(31); - this.drawTexturedModalRect(j + 119, k + 40, 179, 3, i1, 8); - } - - private static final ResourceLocation background = new ResourceLocation( - IC2.textureDomain, - "textures/gui/GUIRTGenerator.png"); -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java deleted file mode 100644 index 2391809eb7..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java +++ /dev/null @@ -1,67 +0,0 @@ -package gtPlusPlus.xmod.ic2.block.kieticgenerator; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import org.apache.commons.lang3.mutable.MutableObject; - -import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.core.creative.AddToCreativeTab; -import ic2.core.block.BlockMultiID; -import ic2.core.block.kineticgenerator.tileentity.TileEntityManualKineticGenerator; -import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator; -import ic2.core.init.InternalName; -import ic2.core.item.block.ItemKineticGenerator; - -public class IC2_BlockKineticGenerator extends BlockMultiID { - - public IC2_BlockKineticGenerator(final InternalName internalName1) { - super(internalName1, Material.iron, ItemKineticGenerator.class); - - this.setHardness(3.0F); - this.setStepSound(Block.soundTypeMetal); - this.setCreativeTab(AddToCreativeTab.tabMachines); - - GameRegistry.registerTileEntity(TileEntityWindKineticGenerator.class, "Advanced Kinetic Wind Generator"); - } - - @Override - public String getTextureFolder(final int id) { - return "kineticgenerator"; - } - - @Override - public int damageDropped(final int meta) { - return meta; - } - - @Override - public Class<? extends TileEntity> getTeClass(final int meta, final MutableObject<Class<?>[]> ctorArgTypes, - final MutableObject<Object[]> ctorArgs) { - try { - switch (meta) { - case 0: - return TileEntityWindKineticGenerator.class; - } - } catch (final Exception e) { - e.printStackTrace(); - } - return null; - } - - @Override - public boolean onBlockActivated(final World world, final int x, final int y, final int z, - final EntityPlayer entityPlayer, final int side, final float a, final float b, final float c) { - if (entityPlayer.isSneaking()) { - return false; - } - final TileEntity te = this.getOwnTe(world, x, y, z); - if ((te != null) && ((te instanceof TileEntityManualKineticGenerator))) { - return ((TileEntityManualKineticGenerator) te).playerKlicked(entityPlayer); - } - return super.onBlockActivated(world, x, y, z, entityPlayer, side, a, b, c); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java deleted file mode 100644 index fe08f7f959..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java +++ /dev/null @@ -1,43 +0,0 @@ -package gtPlusPlus.xmod.ic2.block.kieticgenerator; - -import java.io.DataInput; -import java.io.IOException; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.NBTTagCompound; - -import ic2.core.block.TileEntityBlock; - -public abstract class IC2_TEComponent { - - protected final TileEntityBlock parent; - - public IC2_TEComponent(final TileEntityBlock parent) { - this.parent = parent; - } - - public abstract String getDefaultName(); - - public void readFromNbt(final NBTTagCompound nbt) {} - - public NBTTagCompound writeToNbt() { - return null; - } - - public void onLoaded() {} - - public void onUnloaded() {} - - public void onNeighborUpdate(final Block srcBlock) {} - - public void onContainerUpdate(final String name, final EntityPlayerMP player) {} - - public void onNetworkUpdate(final DataInput is) throws IOException {} - - public boolean enableWorldTick() { - return false; - } - - public void onWorldTick() {} -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java deleted file mode 100644 index 8c4e099889..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java +++ /dev/null @@ -1,26 +0,0 @@ -package gtPlusPlus.xmod.ic2.block.kieticgenerator.container; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; - -import ic2.core.ContainerFullInv; -import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator; -import ic2.core.slot.SlotInvSlot; - -public class ContainerKineticWindgenerator extends ContainerFullInv<TileEntityWindKineticGenerator> { - - public ContainerKineticWindgenerator(final EntityPlayer entityPlayer, - final TileEntityWindKineticGenerator tileEntity1) { - super(entityPlayer, tileEntity1, 166); - - this.addSlotToContainer(new SlotInvSlot(tileEntity1.rotorSlot, 0, 80, 26)); - } - - @Override - public List<String> getNetworkedFields() { - final List<String> ret = super.getNetworkedFields(); - ret.add("windStrength"); - return ret; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java deleted file mode 100644 index 29eaa6d69c..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java +++ /dev/null @@ -1,4 +0,0 @@ -package gtPlusPlus.xmod.ic2.block.kieticgenerator.container; - -public class IC2_ContainerBase { -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java deleted file mode 100644 index 33a59ee35a..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java +++ /dev/null @@ -1,103 +0,0 @@ -package gtPlusPlus.xmod.ic2.block.kieticgenerator.gui; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; - -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import ic2.core.IC2; -import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator; -import ic2.core.util.GuiTooltipHelper; - -@SideOnly(Side.CLIENT) -public class GuiKineticWindGenerator extends GuiContainer { - - public ContainerWindKineticGenerator container; - public String name; - - public GuiKineticWindGenerator(final ContainerWindKineticGenerator container1) { - super(container1); - - this.container = container1; - this.name = StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.name"); - } - - @Override - protected void drawGuiContainerForegroundLayer(final int par1, final int par2) { - this.fontRendererObj - .drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 6, 4210752); - if (this.container.base.checkrotor()) { - if (!this.container.base.rotorspace()) { - this.fontRendererObj.drawString( - StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotorspace"), - 20, - 52, - 2157374); - } else if ((this.container.base.checkrotor()) && (!this.container.base.guiisminWindStrength())) { - this.fontRendererObj.drawString( - StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak1"), - 27, - 52, - 2157374); - this.fontRendererObj.drawString( - StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak2"), - 24, - 69, - 2157374); - } else { - this.fontRendererObj.drawString( - StatCollector.translateToLocalFormatted( - "ic2.WindKineticGenerator.gui.output", - new Object[] { Integer.valueOf(this.container.base.getKuOutput()) }), - 55, - 52, - 2157374); - this.fontRendererObj.drawString(this.container.base.getRotorhealth() + " %", 46, 70, 2157374); - if (this.container.base.guiisoverload()) { - GuiTooltipHelper.drawAreaTooltip( - par1 - this.guiLeft, - par2 - this.guiTop, - StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload"), - 44, - 20, - 79, - 45); - GuiTooltipHelper.drawAreaTooltip( - par1 - this.guiLeft, - par2 - this.guiTop, - StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload2"), - 102, - 20, - 131, - 45); - } - } - } else { - this.fontRendererObj.drawString( - StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotormiss"), - 27, - 52, - 2157374); - } - } - - @Override - protected void drawGuiContainerBackgroundLayer(final float f, final int x, final int y) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(background); - final int j = (this.width - this.xSize) / 2; - final int k = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(j, k, 0, 0, this.xSize, this.ySize); - if ((this.container.base.guiisoverload()) && (this.container.base.checkrotor())) { - this.drawTexturedModalRect(j + 44, k + 20, 176, 0, 30, 26); - this.drawTexturedModalRect(j + 102, k + 20, 176, 0, 30, 26); - } - } - - private static final ResourceLocation background = new ResourceLocation( - IC2.textureDomain, - "textures/gui/GUIWindKineticGenerator.png"); -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java deleted file mode 100644 index 50787c0828..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java +++ /dev/null @@ -1,352 +0,0 @@ -package gtPlusPlus.xmod.ic2.block.kieticgenerator.tileentity; - -import java.util.List; -import java.util.Vector; - -import net.minecraft.block.Block; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import net.minecraft.world.ChunkCache; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import ic2.api.energy.tile.IKineticSource; -import ic2.api.item.IKineticRotor; -import ic2.api.item.IKineticRotor.GearboxType; -import ic2.core.ContainerBase; -import ic2.core.IC2; -import ic2.core.IHasGui; -import ic2.core.WorldData; -import ic2.core.block.invslot.InvSlotConsumableKineticRotor; -import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator; -import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator; -import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator; -import ic2.core.util.Util; - -public class TileEntityKineticWindGenerator extends TileEntityWindKineticGenerator implements IKineticSource, IHasGui { - - public final InvSlotConsumableKineticRotor rotorSlot; - private double windStrength; - private int obstructedCrossSection; - private int crossSection; - private int updateTicker; - private float rotationSpeed; - private static final double efficiencyRollOffExponent = 2.0D; - private static final int nominalRotationPeriod = 500; - - public TileEntityKineticWindGenerator() { - this.updateTicker = IC2.random.nextInt(this.getTickRate()); - this.rotorSlot = new InvSlotConsumableKineticRotor(this, "rotorslot", 0, null, 1, null, GearboxType.WIND); - } - - public void update2Entity() { - super.updateEntity(); - - assert (IC2.platform.isSimulating()); - if ((this.updateTicker++ % this.getTickRate()) != 0) { - return; - } - boolean needsInvUpdate = false; - if (!this.rotorSlot.isEmpty()) { - if (this.checkSpace(1, true) == 0) { - if (this.getActive() != true) { - this.setActive(true); - } - needsInvUpdate = true; - } else { - if (this.getActive()) { - this.setActive(false); - } - needsInvUpdate = true; - } - } else { - if (this.getActive()) { - this.setActive(false); - } - needsInvUpdate = true; - } - if (this.getActive()) { - this.crossSection = (((this.getRotorDiameter() / 2) * 2 * 2) + 1); - - this.crossSection *= this.crossSection; - this.obstructedCrossSection = this.checkSpace(this.getRotorDiameter() * 3, false); - if ((this.obstructedCrossSection > 0) - && (this.obstructedCrossSection <= ((this.getRotorDiameter() + 1) / 2))) { - this.obstructedCrossSection = 0; - } else if (this.obstructedCrossSection < 0) { - this.obstructedCrossSection = this.crossSection; - } - this.windStrength = this.calcWindStrength(); - - final float speed = (float) Util - .limit((this.windStrength - this.getMinWindStrength()) / this.getMaxWindStrength(), 0.0D, 2.0D); - - this.setRotationSpeed(speed * 2); - if (this.windStrength >= this.getMinWindStrength()) { - if (this.windStrength <= this.getMaxWindStrength()) { - this.rotorSlot.damage(1, false); - } else { - this.rotorSlot.damage(4, false); - } - } - } - } - - @Override - public List<String> getNetworkedFields() { - final List<String> ret = new Vector<>(1); - - ret.add("rotationSpeed"); - ret.add("rotorSlot"); - ret.addAll(super.getNetworkedFields()); - - return ret; - } - - @Override - public ContainerBase<TileEntityWindKineticGenerator> getGuiContainer(final EntityPlayer entityPlayer) { - return new ContainerWindKineticGenerator(entityPlayer, this); - } - - @Override - @SideOnly(Side.CLIENT) - public GuiScreen getGui(final EntityPlayer entityPlayer, final boolean isAdmin) { - return new GuiWindKineticGenerator(new ContainerWindKineticGenerator(entityPlayer, this)); - } - - @Override - public boolean facingMatchesDirection(final ForgeDirection direction) { - return direction.ordinal() == this.getFacing(); - } - - @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final int side) { - if ((side == 0) || (side == 1)) { - return false; - } - return this.getFacing() != side; - } - - @Override - public void setFacing(final short side) { - super.setFacing(side); - } - - public boolean enableUpdateEntity() { - return IC2.platform.isSimulating(); - } - - @Override - public String getRotorhealth() { - if (!this.rotorSlot.isEmpty()) { - return StatCollector.translateToLocalFormatted( - "ic2.WindKineticGenerator.gui.rotorhealth", - new Object[] { Integer.valueOf( - (int) (100.0F - - ((this.rotorSlot.get().getItemDamage() / this.rotorSlot.get().getMaxDamage()) - * 100.0F))) }); - } - return ""; - } - - @Override - public int maxrequestkineticenergyTick(final ForgeDirection directionFrom) { - return this.getKuOutput(); - } - - @Override - public int requestkineticenergy(final ForgeDirection directionFrom, final int requestkineticenergy) { - if (this.facingMatchesDirection(directionFrom.getOpposite())) { - return Math.min(requestkineticenergy, this.getKuOutput()); - } - return 0; - } - - @Override - public String getInventoryName() { - return "Advanced Kinetic Wind Generator"; - } - - @Override - public void onGuiClosed(final EntityPlayer entityPlayer) {} - - @Override - public boolean shouldRenderInPass(final int pass) { - return pass == 0; - } - - @Override - public int checkSpace(int length, final boolean onlyrotor) { - int box = this.getRotorDiameter() / 2; - int lentemp = 0; - if (onlyrotor) { - length = 1; - lentemp = length + 1; - } - if (!onlyrotor) { - box *= 2; - } - final ForgeDirection fwdDir = ForgeDirection.VALID_DIRECTIONS[this.getFacing()]; - final ForgeDirection rightDir = fwdDir.getRotation(ForgeDirection.DOWN); - - final int xMaxDist = Math.abs((length * fwdDir.offsetX) + (box * rightDir.offsetX)); - - final int zMaxDist = Math.abs((length * fwdDir.offsetZ) + (box * rightDir.offsetZ)); - - final ChunkCache chunkCache = new ChunkCache( - this.worldObj, - this.xCoord - xMaxDist, - this.yCoord - box, - this.zCoord - zMaxDist, - this.xCoord + xMaxDist, - this.yCoord + box, - this.zCoord + zMaxDist, - 0); - - int ret = 0; - for (int up = -box; up <= box; up++) { - final int y = this.yCoord + up; - for (int right = -box; right <= box; right++) { - boolean occupied = false; - for (int fwd = lentemp - length; fwd <= length; fwd++) { - final int x = this.xCoord + (fwd * fwdDir.offsetX) + (right * rightDir.offsetX); - - final int z = this.zCoord + (fwd * fwdDir.offsetZ) + (right * rightDir.offsetZ); - - assert (Math.abs(x - this.xCoord) <= xMaxDist); - assert (Math.abs(z - this.zCoord) <= zMaxDist); - - final Block block = chunkCache.getBlock(x, y, z); - if (!block.isAir(chunkCache, x, y, z)) { - occupied = true; - if (((up != 0) || (right != 0) || (fwd != 0)) - && ((chunkCache.getTileEntity(x, y, z) instanceof TileEntityKineticWindGenerator)) - && (!onlyrotor)) { - return -1; - } - } - } - if (occupied) { - ret++; - } - } - } - return ret; - } - - @Override - public boolean checkrotor() { - return !this.rotorSlot.isEmpty(); - } - - @Override - public boolean rotorspace() { - return this.checkSpace(1, true) == 0; - } - - private void setRotationSpeed(final float speed) { - if (this.rotationSpeed != speed) { - this.rotationSpeed = speed; - IC2.network.get().updateTileEntityField(this, "rotationSpeed"); - } - } - - @Override - public int getTickRate() { - return 32; - } - - @Override - public double calcWindStrength() { - double windStr = WorldData.get(this.worldObj).windSim.getWindAt(this.yCoord); - - windStr *= (1.0D - Math.pow(this.obstructedCrossSection / this.crossSection, 2.0D)); - - return Math.max(0.0D, windStr); - } - - @Override - public float getAngle() { - if (this.rotationSpeed > 0.0F) { - final long period = (long) (5.0E+008F / this.rotationSpeed); - - return ((float) (System.nanoTime() % period) / (float) period) * 360.0F; - } - return 0.0F; - } - - @Override - public float getefficiency() { - final ItemStack stack = this.rotorSlot.get(); - if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) { - return (float) (((IKineticRotor) stack.getItem()).getEfficiency(stack) * 1.5); - } - return 0.0F; - } - - @Override - public int getMinWindStrength() { - final ItemStack stack = this.rotorSlot.get(); - if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) { - return ((IKineticRotor) stack.getItem()).getMinWindStrength(stack) / 2; - } - return 0; - } - - @Override - public int getMaxWindStrength() { - final ItemStack stack = this.rotorSlot.get(); - if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) { - return ((IKineticRotor) stack.getItem()).getMaxWindStrength(stack) * 2; - } - return 0; - } - - @Override - public int getRotorDiameter() { - final ItemStack stack = this.rotorSlot.get(); - if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) { - return ((IKineticRotor) stack.getItem()).getDiameter(stack) / 2; - } - return 0; - } - - @Override - public ResourceLocation getRotorRenderTexture() { - final ItemStack stack = this.rotorSlot.get(); - if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) { - return ((IKineticRotor) stack.getItem()).getRotorRenderTexture(stack); - } - return new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorWoodmodel.png"); - } - - @Override - public boolean guiisoverload() { - if (this.windStrength > this.getMaxWindStrength()) { - return true; - } - return false; - } - - @Override - public boolean guiisminWindStrength() { - return this.windStrength >= this.getMinWindStrength(); - } - - @Override - public int getKuOutput() { - if ((this.windStrength >= this.getMinWindStrength()) && (this.getActive())) { - return (int) (this.windStrength * 50.0D * this.getefficiency()); - } - return 0; - } - - @Override - public int getWindStrength() { - return (int) this.windStrength; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java deleted file mode 100644 index 1ce01a5985..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java +++ /dev/null @@ -1,37 +0,0 @@ -package gtPlusPlus.xmod.ic2.item; - -import java.util.List; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.CoreItem; - -public class IC2_ItemGradual extends CoreItem { - - public IC2_ItemGradual(final String internalName) { - super(internalName, AddToCreativeTab.tabMachines, 1, 10000, "", EnumRarity.uncommon); - this.setNoRepair(); - } - - @Override - public boolean isDamaged(final ItemStack stack) { - return this.getDamage(stack) > 1; - } - - @Override - public boolean showDurabilityBar(final ItemStack stack) { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(final Item item, final CreativeTabs tabs, final List itemList) { - itemList.add(new ItemStack(this, 1, 1)); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java deleted file mode 100644 index 817a902813..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java +++ /dev/null @@ -1,47 +0,0 @@ -package gtPlusPlus.xmod.ic2.item; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import ic2.api.item.ICustomDamageItem; -import ic2.core.util.StackUtil; - -public class IC2_ItemGradualInteger extends IC2_ItemGradual implements ICustomDamageItem { - - private final int maxDmg; - - public IC2_ItemGradualInteger(final String internalName, final int maxdmg) { - super(internalName); - - this.maxDmg = maxdmg; - } - - @Override - public int getCustomDamage(final ItemStack stack) { - final NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack); - return nbt.getInteger("advDmg"); - } - - @Override - public int getMaxCustomDamage(final ItemStack stack) { - return this.maxDmg; - } - - @Override - public void setCustomDamage(final ItemStack stack, final int damage) { - final NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack); - nbt.setInteger("advDmg", 0); - - final int maxStackDamage = stack.getMaxDamage(); - if (maxStackDamage > 2) { - // stack.setItemDamage(1 + (int)Util.map(damage, this.maxDmg, maxStackDamage - 2)); - } - } - - @Override - public boolean applyCustomDamage(final ItemStack stack, final int damage, final EntityLivingBase src) { - this.setCustomDamage(stack, this.getCustomDamage(stack) + damage); - return true; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java deleted file mode 100644 index 98846e6950..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java +++ /dev/null @@ -1,73 +0,0 @@ -package gtPlusPlus.xmod.ic2.item; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; - -public class IC2_ItemIC2 extends Item { - - public IC2_ItemIC2(final String internalName) { - this.setUnlocalizedName(internalName); - this.setCreativeTab(AddToCreativeTab.tabMachines); - this.setTextureName(GTPlusPlus.ID + ":" + internalName); - - GameRegistry.registerItem(this, internalName); - } - - public String getTextureFolder() { - return null; - } - - /* - * public String getTextureName(int index) { if ((!this.hasSubtypes) && (index > 0)) { return null; } String name = - * getUnlocalizedName(new ItemStack(this, 1, index)); if ((name != null) && (name.length() > 4)) { return - * name.substring(4); } return name; } - * @Override - * @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { int indexCount = 0; while - * (getTextureName(indexCount) != null) { indexCount++; if (indexCount > 32767) { throw new - * RuntimeException("More Item Icons than actually possible @ " + getUnlocalizedName()); } } this.textures = new - * IIcon[indexCount]; for (int index = 0; index < indexCount; index++) { this.textures[index] = - * iconRegister.registerIcon(GTPlusPlus.ID + ":" + getUnlocalizedName()); } } - * @Override - * @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int meta) { if (meta < this.textures.length) { return - * this.textures[meta]; } return this.textures.length < 1 ? null : this.textures[0]; } - */ - - @Override - public String getUnlocalizedName() { - return super.getUnlocalizedName(); - } - - @Override - public String getUnlocalizedName(final ItemStack itemStack) { - return this.getUnlocalizedName(); - } - - @Override - public String getItemStackDisplayName(final ItemStack itemStack) { - return StatCollector.translateToLocal(this.getUnlocalizedName(itemStack)); - } - - public IC2_ItemIC2 setRarity(final int aRarity) { - this.rarity = aRarity; - return this; - } - - @Override - @SideOnly(Side.CLIENT) - public EnumRarity getRarity(final ItemStack stack) { - return EnumRarity.values()[this.rarity]; - } - - private int rarity = 0; - protected IIcon[] textures; -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java b/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java deleted file mode 100644 index e5809a0c98..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java +++ /dev/null @@ -1,53 +0,0 @@ -package gtPlusPlus.xmod.ic2.item; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -import ic2.core.item.block.ItemBlockIC2; - -public class ItemGenerators extends ItemBlockIC2 { - - public ItemGenerators(final Block block) { - super(block); - - this.setMaxDamage(0); - this.setHasSubtypes(true); - } - - @Override - public int getMetadata(final int i) { - return i; - } - - @Override - public String getUnlocalizedName(final ItemStack itemstack) { - final int meta = itemstack.getItemDamage(); - switch (meta) { - case 0: - return "ic2.blockRTGenerator2"; - case 1: - return "ic2.blockKineticGenerator2"; - } - return null; - } - - @Override - public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b) { - final int meta = itemStack.getItemDamage(); - switch (meta) { - case 0: - info.add( - StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-32 EU/t " - + StatCollector.translateToLocal("ic2.item.tooltip.max")); - break; - case 1: - info.add( - StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-512 EU/t " - + StatCollector.translateToLocal("ic2.item.tooltip.max")); - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java deleted file mode 100644 index 7ceb5b625f..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java +++ /dev/null @@ -1,94 +0,0 @@ -package gtPlusPlus.xmod.ic2.item; - -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; - -import ic2.api.item.IKineticRotor; -import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator; -import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator; -import ic2.core.init.InternalName; -import ic2.core.item.resources.ItemWindRotor; - -public class RotorBase extends ItemWindRotor { - - private final int maxWindStrength; - private final int minWindStrength; - private final int radius; - private final float efficiency; - private final ResourceLocation renderTexture; - private final boolean water; - - public RotorBase(final InternalName internalName, final int Radius, final int durability, final float efficiency, - final int minWindStrength, final int maxWindStrength, final ResourceLocation RenderTexture) { - super(internalName, Radius, durability, efficiency, minWindStrength, maxWindStrength, RenderTexture); - - this.setMaxStackSize(1); - this.setMaxDamage(durability); - - this.radius = Radius; - this.efficiency = efficiency; - this.renderTexture = RenderTexture; - this.minWindStrength = minWindStrength; - this.maxWindStrength = maxWindStrength; - this.water = true; - } - - @Override - public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b) { - info.add( - StatCollector.translateToLocalFormatted( - "ic2.itemrotor.wind.info", - new Object[] { Integer.valueOf(this.minWindStrength), Integer.valueOf(this.maxWindStrength) })); - IKineticRotor.GearboxType type = null; - if ((Minecraft.getMinecraft().currentScreen != null) - && ((Minecraft.getMinecraft().currentScreen instanceof GuiWaterKineticGenerator))) { - type = IKineticRotor.GearboxType.WATER; - } else if ((Minecraft.getMinecraft().currentScreen != null) - && ((Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator))) { - type = IKineticRotor.GearboxType.WIND; - } - if (type != null) { - // info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + isAcceptedType(itemStack, type))); - } - } - - @Override - public String getTextureFolder() { - return "rotors"; - } - - @Override - public int getDiameter(final ItemStack stack) { - return this.radius; - } - - @Override - public ResourceLocation getRotorRenderTexture(final ItemStack stack) { - return this.renderTexture; - } - - @Override - public float getEfficiency(final ItemStack stack) { - return this.efficiency; - } - - @Override - public int getMinWindStrength(final ItemStack stack) { - return this.minWindStrength; - } - - @Override - public int getMaxWindStrength(final ItemStack stack) { - return this.maxWindStrength; - } - - @Override - public boolean isAcceptedType(final ItemStack stack, final IKineticRotor.GearboxType type) { - return (type == IKineticRotor.GearboxType.WIND) || (this.water); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java deleted file mode 100644 index 410b106831..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java +++ /dev/null @@ -1,118 +0,0 @@ -package gtPlusPlus.xmod.ic2.item; - -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; - -import ic2.api.item.IKineticRotor; -import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator; -import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator; -import ic2.core.init.InternalName; -import ic2.core.util.StackUtil; - -public class RotorIridium extends RotorBase { - - private final int maxWindStrength; - private final int minWindStrength; - private final int radius; - private final float efficiency; - private final ResourceLocation renderTexture; - private final boolean water; - - public RotorIridium(final InternalName internalName, final int Radius, final int durability, final float efficiency, - final int minWindStrength, final int maxWindStrength, final ResourceLocation RenderTexture) { - super(internalName, Radius, durability, efficiency, minWindStrength, maxWindStrength, RenderTexture); - - this.setMaxStackSize(1); - this.setMaxDamage(Integer.MAX_VALUE); - - this.radius = Radius; - this.efficiency = efficiency; - this.renderTexture = RenderTexture; - this.minWindStrength = minWindStrength; - this.maxWindStrength = maxWindStrength; - this.water = (internalName != InternalName.itemwoodrotor); - } - - @Override - public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b) { - info.add( - StatCollector.translateToLocalFormatted( - "ic2.itemrotor.wind.info", - new Object[] { Integer.valueOf(this.minWindStrength), Integer.valueOf(this.maxWindStrength) })); - IKineticRotor.GearboxType type = null; - if ((Minecraft.getMinecraft().currentScreen != null) - && ((Minecraft.getMinecraft().currentScreen instanceof GuiWaterKineticGenerator))) { - type = IKineticRotor.GearboxType.WATER; - } else if ((Minecraft.getMinecraft().currentScreen != null) - && ((Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator))) { - type = IKineticRotor.GearboxType.WIND; - } - if (type != null) { - // info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + isAcceptedType(itemStack, type))); - } - } - - @Override - public String getTextureFolder() { - return "rotors"; - } - - @Override - public int getDiameter(final ItemStack stack) { - return this.radius; - } - - @Override - public ResourceLocation getRotorRenderTexture(final ItemStack stack) { - return this.renderTexture; - } - - @Override - public float getEfficiency(final ItemStack stack) { - return this.efficiency; - } - - @Override - public int getMinWindStrength(final ItemStack stack) { - return this.minWindStrength; - } - - @Override - public int getMaxWindStrength(final ItemStack stack) { - return this.maxWindStrength; - } - - @Override - public boolean isAcceptedType(final ItemStack stack, final IKineticRotor.GearboxType type) { - return (type == IKineticRotor.GearboxType.WIND) || (this.water); - } - - @Override - public void setCustomDamage(final ItemStack stack, final int damage) { - final NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack); - nbt.setInteger("advDmg", 0); - - final int maxStackDamage = stack.getMaxDamage(); - if (maxStackDamage > 2) { - // stack.setItemDamage(1 + (int)Util.map(damage, this.maxDmg, maxStackDamage - 2)); - } - } - - @Override - public boolean applyCustomDamage(final ItemStack stack, final int damage, final EntityLivingBase src) { - this.setCustomDamage(stack, this.getCustomDamage(stack) + damage); - return true; - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return false; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java b/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java deleted file mode 100644 index 69c08a0095..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java +++ /dev/null @@ -1,52 +0,0 @@ -package gtPlusPlus.xmod.ic2.item.reactor; - -import net.minecraft.item.ItemStack; - -import ic2.api.reactor.IReactor; -import ic2.api.reactor.IReactorComponent; - -public class IC2_FuelRod_Base implements IReactorComponent { - - @Override - public void processChamber(IReactor var1, ItemStack var2, int var3, int var4, boolean var5) { - // TODO Auto-generated method stub - - } - - @Override - public boolean acceptUraniumPulse(IReactor var1, ItemStack var2, ItemStack var3, int var4, int var5, int var6, - int var7, boolean var8) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean canStoreHeat(IReactor var1, ItemStack var2, int var3, int var4) { - // TODO Auto-generated method stub - return false; - } - - @Override - public int getMaxHeat(IReactor var1, ItemStack var2, int var3, int var4) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public int getCurrentHeat(IReactor var1, ItemStack var2, int var3, int var4) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public int alterHeat(IReactor var1, ItemStack var2, int var3, int var4, int var5) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public float influenceExplosion(IReactor var1, ItemStack var2) { - // TODO Auto-generated method stub - return 0; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java b/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java deleted file mode 100644 index 37133444e5..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java +++ /dev/null @@ -1,64 +0,0 @@ -package gtPlusPlus.xmod.ob; - -import static gregtech.api.enums.Mods.Forestry; - -import java.util.HashMap; - -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -import com.google.common.base.Objects; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -/** - * Wrapper Class to assist in handling the OB Sprinkler. - * - * @author Alkalus - * - */ -public class SprinklerHandler { - - private static final HashMap<Integer, ItemStack> mValidFerts = new HashMap<Integer, ItemStack>(); - - /** - * @return - A valid {@link Map} of all Fertilizers for the OB Sprinkler. - */ - public static HashMap<Integer, ItemStack> getValidFerts() { - return mValidFerts; - } - - /** - * @param aFert - An {@link ItemStack} which is to be registered for OB Sprinklers. - */ - public static void registerSprinklerFertilizer(ItemStack aFert) { - int aHash = Objects.hashCode(aFert.getItem(), aFert.getItemDamage()); - if (!mValidFerts.containsKey(aHash)) { - Logger.INFO("Registering " + aFert.getDisplayName() + " as OB Sprinkler Fertilizer."); - mValidFerts.put(aHash, aFert.copy()); - } - } - - public static void registerModFerts() { - ItemStack f; - - f = new ItemStack(Items.dye, 1, 15); - SprinklerHandler.registerSprinklerFertilizer(f); - - if (Forestry.isModLoaded()) { - f = ItemUtils.getCorrectStacktype("Forestry:fertilizerBio", 1); - if (f != null) { - registerSprinklerFertilizer(f); - } - f = ItemUtils.getCorrectStacktype("Forestry:fertilizerCompound", 1); - if (f != null) { - registerSprinklerFertilizer(f); - } - } - f = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1); - if (f != null) { - registerSprinklerFertilizer(f); - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java b/src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java deleted file mode 100644 index b5ee266143..0000000000 --- a/src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java +++ /dev/null @@ -1,99 +0,0 @@ -package gtPlusPlus.xmod.witchery; - -import static gregtech.api.enums.Mods.Witchery; - -import java.lang.reflect.Field; -import java.util.ArrayList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.oredict.OreDictionary; - -import com.mojang.authlib.GameProfile; - -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.util.reflect.ReflectionUtils; - -public class WitchUtils { - - private static final GameProfile NORMAL_MINER_PROFILE; - private static final GameProfile KOBOLDITE_MINER_PROFILE; - - static { - Field a1 = null, a2 = null; - GameProfile b1 = null, b2 = null; - if (Witchery.isModLoaded()) { - try { - a1 = getField("com.emoniph.witchery.entity.ai.EntityAIDigBlocks", "NORMAL_MINER_PROFILE"); - a2 = getField("com.emoniph.witchery.entity.ai.EntityAIDigBlocks", "KOBOLDITE_MINER_PROFILE"); - b1 = (GameProfile) a1.get(null); - b2 = (GameProfile) a2.get(null); - } catch (Throwable t) {} - } - NORMAL_MINER_PROFILE = b1; - KOBOLDITE_MINER_PROFILE = b2; - } - - // com.emoniph.witchery.entity.ai.EntityAIDigBlocks.onHarvestDrops(EntityPlayer, HarvestDropsEvent) - public static void onHarvestDrops(final EntityPlayer harvester, final BlockEvent.HarvestDropsEvent event) { - - if (Witchery.isModLoaded()) { - - if (harvester != null && !harvester.worldObj.isRemote - && !event.isCanceled() - && (isEqual(harvester.getGameProfile(), KOBOLDITE_MINER_PROFILE) - || isEqual(harvester.getGameProfile(), NORMAL_MINER_PROFILE))) { - final boolean hasKobolditePick = isEqual(harvester.getGameProfile(), KOBOLDITE_MINER_PROFILE); - final ArrayList<ItemStack> newDrops = new ArrayList<ItemStack>(); - double kobolditeChance = hasKobolditePick ? 0.02 : 0.01; - for (final ItemStack drop : event.drops) { - final int[] oreIDs = OreDictionary.getOreIDs(drop); - boolean addOriginal = true; - if (oreIDs.length > 0) { - final String oreName = OreDictionary.getOreName(oreIDs[0]); - if (oreName != null && oreName.startsWith("ore")) { - final ItemStack smeltedDrop = FurnaceRecipes.smelting().getSmeltingResult(drop); - if (smeltedDrop != null && hasKobolditePick && harvester.worldObj.rand.nextDouble() < 0.5) { - addOriginal = false; - newDrops.add(smeltedDrop.copy()); - newDrops.add(smeltedDrop.copy()); - if (harvester.worldObj.rand.nextDouble() < 0.25) { - newDrops.add(smeltedDrop.copy()); - } - } - kobolditeChance = (hasKobolditePick ? 0.08 : 0.05); - } - } - if (addOriginal) { - newDrops.add(drop); - } - } - event.drops.clear(); - for (final ItemStack newDrop : newDrops) { - event.drops.add(newDrop); - } - if (kobolditeChance > 0.0 && harvester.worldObj.rand.nextDouble() < kobolditeChance) { - event.drops.add(ALLOY.KOBOLDITE.getDust(1)); - } - } - } - } - - public static Field getField(String aClassName, String aFieldName) { - Class c; - c = ReflectionUtils.getClass(aClassName); - if (c != null) { - Field f = ReflectionUtils.getField(c, aFieldName); - if (f != null) { - return f; - } - } - return null; - } - - public static boolean isEqual(final GameProfile a, final GameProfile b) { - return a != null && b != null && a.getId() != null && b.getId() != null && a.getId().equals(b.getId()); - } -} |