From 3751e743e97e177647b108006fc2fd13e9002ecd Mon Sep 17 00:00:00 2001 From: Exidex Date: Sat, 8 Apr 2017 14:12:19 +0200 Subject: [PATCH] Delete some unused staff --- src/main/java/gregtech/api/enums/Dyes.java | 4 - .../java/gregtech/api/enums/Materials.java | 7 -- .../interfaces/internal/IGT_RecipeAdder.java | 6 - .../tileentity/IBasicEnergyContainer.java | 5 - .../tileentity/IHasWorldObjectAndCoords.java | 29 +---- .../gregtech/api/items/GT_MetaBase_Item.java | 105 ------------------ .../java/gregtech/api/items/GT_Tool_Item.java | 25 ----- .../metatileentity/BaseMetaPipeEntity.java | 10 -- .../metatileentity/BaseMetaTileEntity.java | 11 -- .../api/metatileentity/BaseTileEntity.java | 54 --------- .../api/metatileentity/MetaPipeEntity.java | 5 - .../api/metatileentity/MetaTileEntity.java | 30 ----- .../GT_MetaPipeEntity_Fluid.java | 5 - .../GT_MetaPipeEntity_Item.java | 5 - .../GT_MetaTileEntity_BasicGenerator.java | 5 - .../GT_MetaTileEntity_BasicMachine.java | 10 -- .../GT_MetaTileEntity_Hatch_Input.java | 5 - .../GT_MetaTileEntity_Hatch_Output.java | 5 - .../common/GT_MinableOreGenerator.java | 85 -------------- .../java/gregtech/common/GT_RecipeAdder.java | 5 - .../boilers/GT_MetaTileEntity_Boiler.java | 6 - ...TileEntity_MicrowaveEnergyTransmitter.java | 10 -- .../basic/GT_MetaTileEntity_Pump.java | 17 --- .../basic/GT_MetaTileEntity_Teleporter.java | 10 -- .../GT_MetaTileEntity_QuantumTank.java | 6 - 25 files changed, 1 insertion(+), 464 deletions(-) delete mode 100644 src/main/java/gregtech/api/items/GT_Tool_Item.java delete mode 100644 src/main/java/gregtech/common/GT_MinableOreGenerator.java diff --git a/src/main/java/gregtech/api/enums/Dyes.java b/src/main/java/gregtech/api/enums/Dyes.java index 256d9f79..3f762573 100644 --- a/src/main/java/gregtech/api/enums/Dyes.java +++ b/src/main/java/gregtech/api/enums/Dyes.java @@ -67,10 +67,6 @@ public enum Dyes implements IColorModulationContainer { return aDefaultModulation; } - public static short[] getOrDef(int get, Dyes def) { - return getModulation(get, def); - } - public static Dyes get(String aColor) { Object tObject = GT_Utility.getFieldContent(Dyes.class, aColor, false, false); if (tObject instanceof Dyes) return (Dyes) tObject; diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index fc1b6f7e..4d402f09 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -26,12 +26,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { private static final Map MATERIALS_MAP = new LinkedHashMap(); public static final List mMaterialHandlers = new ArrayList(); - /** - * This is for keeping compatibility with addons mods (Such as TinkersGregworks etc) that looped over the old materials enum - */ - @Deprecated - public static Collection VALUES = new LinkedHashSet(); - /** * This is the Default Material returned in case no Material has been found or a NullPointer has been inserted at a location where it shouldn't happen. */ @@ -1286,7 +1280,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } initMaterialProperties(); //No more material addition or manipulation should be done past this point! MATERIALS_ARRAY = MATERIALS_MAP.values().toArray(new Materials[MATERIALS_MAP.size()]); //Generate standard object array. This is a lot faster to loop over. - VALUES = Arrays.asList(MATERIALS_ARRAY); if (!GT_Mod.gregtechproxy.mEnableAllComponents) OrePrefixes.initMaterialComponents(); for (Materials aMaterial : MATERIALS_ARRAY) { if (aMaterial.mMetaItemSubID >= 0) { diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java index 26c7604b..850b4edd 100644 --- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java +++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java @@ -5,12 +5,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; public interface IGT_RecipeAdder { - /** - * Adds a FusionreactorRecipe - * Does not work anymore! - */ - @Deprecated - public boolean addFusionReactorRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aFusionDurationInTicks, int aFusionEnergyPerTick, int aEnergyNeededForStartingFusion); /** * Adds a FusionreactorRecipe diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java b/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java index 423b3d43..ea5b0b44 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java @@ -52,11 +52,6 @@ public interface IBasicEnergyContainer extends IEnergyConnected { */ public boolean increaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooMuchEnergy); - /** - * Drain Energy Call for Electricity. - */ - public boolean drainEnergyUnits(byte aSide, long aVoltage, long aAmperage); - /** * returns the amount of Electricity, accepted by this Block the last 5 ticks as Average. */ diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IHasWorldObjectAndCoords.java b/src/main/java/gregtech/api/interfaces/tileentity/IHasWorldObjectAndCoords.java index 3cfd18e6..98ded5bb 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IHasWorldObjectAndCoords.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IHasWorldObjectAndCoords.java @@ -45,14 +45,6 @@ public interface IHasWorldObjectAndCoords { public TileEntity getTileEntityAtSideAndDistance(byte aSide, int aDistance); - public IInventory getIInventory(int aX, int aY, int aZ); - - public IInventory getIInventoryOffset(int aX, int aY, int aZ); - - public IInventory getIInventoryAtSide(byte aSide); - - public IInventory getIInventoryAtSideAndDistance(byte aSide, int aDistance); - public IFluidHandler getITankContainer(int aX, int aY, int aZ); public IFluidHandler getITankContainerOffset(int aX, int aY, int aZ); @@ -92,16 +84,9 @@ public interface IHasWorldObjectAndCoords { public byte getMetaIDAtSide(byte aSide); public byte getMetaIDAtSideAndDistance(byte aSide, int aDistance); + public boolean isAir(BlockPos pos); - public byte getLightLevel(int aX, int aY, int aZ); - - public byte getLightLevelOffset(int aX, int aY, int aZ); - - public byte getLightLevelAtSide(byte aSide); - - public byte getLightLevelAtSideAndDistance(byte aSide, int aDistance); - public boolean getOpacity(int aX, int aY, int aZ); public boolean getOpacityOffset(int aX, int aY, int aZ); @@ -128,8 +113,6 @@ public interface IHasWorldObjectAndCoords { public Biome getBiome(); - public Biome getBiome(int aX, int aZ); - public int getOffsetX(byte aSide, int aMultiplier); public short getOffsetY(byte aSide, int aMultiplier); @@ -157,16 +140,6 @@ public interface IHasWorldObjectAndCoords { */ public void setLightValue(byte aLightValue); - /** - * Function of the regular TileEntity - */ - public NBTTagCompound writeToNBT(NBTTagCompound aNBT); - - /** - * Function of the regular TileEntity - */ - public void readFromNBT(NBTTagCompound aNBT); - /** * Function of the regular TileEntity */ diff --git a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java index 93f17e25..6e327100 100644 --- a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java +++ b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java @@ -138,8 +138,6 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci return false; } - - @Override public EnumActionResult onItemUse(ItemStack aStack, EntityPlayer aPlayer, World aWorld, BlockPos blockPos, EnumHand hand, EnumFacing aSide, float hitX, float hitY, float hitZ) { use(aStack, 0, aPlayer); @@ -160,7 +158,6 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci return EnumActionResult.PASS; } - @Override public int getMaxItemUseDuration(ItemStack stack) { return 5; @@ -185,8 +182,6 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci return EnumActionResult.PASS; } - - @Override public ActionResult onItemRightClick(ItemStack aStack, World aWorld, EntityPlayer aPlayer, EnumHand hand) { use(aStack, 0, aPlayer); @@ -252,13 +247,6 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci return Math.abs(tStats[0]); } - - public final double getTransferLimit(ItemStack aStack) { - Long[] tStats = getElectricStats(aStack); - if (tStats == null) return 0; - return Math.max(tStats[1], tStats[3]); - } - @Override public final double charge(ItemStack aStack, double aCharge, int aTier, boolean aIgnoreTransferLimit, boolean aSimulate) { Long[] tStats = getElectricStats(aStack); @@ -329,91 +317,6 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci } } - /* - - @Override - public final int getMaxCharge(ItemStack aStack) { - Long[] tStats = getElectricStats(aStack); - if (tStats == null) return 0; - return (int)Math.abs(tStats[0]); - } - - @Override - public final int getTransferLimit(ItemStack aStack) { - Long[] tStats = getElectricStats(aStack); - if (tStats == null) return 0; - return (int)Math.max(tStats[1], tStats[3]); - } - - @Override - public final int charge(ItemStack aStack, int aCharge, int aTier, boolean aIgnoreTransferLimit, boolean aSimulate) { - Long[] tStats = getElectricStats(aStack); - if (tStats == null || tStats[2] > aTier || !(tStats[3] == -1 || tStats[3] == -3 || (tStats[3] < 0 && aCharge == Integer.MAX_VALUE)) || aStack.stackSize != 1) return 0; - long tChargeBefore = getRealCharge(aStack), tNewCharge = aCharge==Integer.MAX_VALUE?Long.MAX_VALUE:Math.min(Math.abs(tStats[0]), tChargeBefore + (aIgnoreTransferLimit?aCharge:Math.min(tStats[1], aCharge))); - if (!aSimulate) setCharge(aStack, tNewCharge); - return (int)(tNewCharge-tChargeBefore); - } - - @Override - public final int discharge(ItemStack aStack, int aCharge, int aTier, boolean aIgnoreTransferLimit, boolean aSimulate) { - Long[] tStats = getElectricStats(aStack); - if (tStats == null || tStats[2] > aTier) return 0; - if (tStats[3] > 0) { - if (aCharge < tStats[3] || aStack.stackSize < 1) return 0; - if (!aSimulate) aStack.stackSize--; - return (int)(long)tStats[3]; - } - long tChargeBefore = getRealCharge(aStack), tNewCharge = Math.max(0, tChargeBefore - (aIgnoreTransferLimit?aCharge:Math.min(tStats[1], aCharge))); - if (!aSimulate) setCharge(aStack, tNewCharge); - return (int)(tChargeBefore-tNewCharge); - } - - @Override - public final int getCharge(ItemStack aStack) { - return (int)Math.min(Integer.MAX_VALUE, getRealCharge(aStack)); - } - - @Override - public final boolean canUse(ItemStack aStack, int aAmount) { - return getRealCharge(aStack) >= aAmount; - } - - @Override - public final boolean use(ItemStack aStack, int aAmount, EntityLivingBase aPlayer) { - chargeFromArmor(aStack, aPlayer); - if (aPlayer instanceof EntityPlayer && ((EntityPlayer)aPlayer).capabilities.isCreativeMode) return true; - int tTransfer = discharge(aStack, aAmount, Integer.MAX_VALUE, true, true); - if (tTransfer == aAmount) { - discharge(aStack, aAmount, Integer.MAX_VALUE, true, false); - chargeFromArmor(aStack, aPlayer); - return true; - } - discharge(aStack, aAmount, Integer.MAX_VALUE, true, false); - chargeFromArmor(aStack, aPlayer); - return false; - } - - @Override - public final void chargeFromArmor(ItemStack aStack, EntityLivingBase aPlayer) { - if (aPlayer == null || aPlayer.worldObj.isRemote) return; - for (int i = 1; i < 5; i++) { - ItemStack tArmor = aPlayer.getEquipmentInSlot(i); - if (GT_ModHandler.isElectricItem(tArmor)) { - IElectricItem tArmorItem = (IElectricItem)tArmor.getItem(); - if (tArmorItem.canProvideEnergy(tArmor) && tArmorItem.getTier(tArmor) >= getTier(aStack)) { - int tCharge = ElectricItem.manager.discharge(tArmor, charge(aStack, Integer.MAX_VALUE-1, Integer.MAX_VALUE, true, true), Integer.MAX_VALUE, true, false); - if (tCharge > 0) { - charge(aStack, tCharge, Integer.MAX_VALUE, true, false); - if (aPlayer instanceof EntityPlayer) { - Container tContainer = ((EntityPlayer)aPlayer).openContainer; - if (tContainer != null) tContainer.detectAndSendChanges(); - } - } - } - } - } - } - */ public final long getRealCharge(ItemStack aStack) { Long[] tStats = getElectricStats(aStack); if (tStats == null) return 0; @@ -571,14 +474,6 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci return 64; } - public final Item getChargedItem(ItemStack itemStack) { - return this; - } - - public final Item getEmptyItem(ItemStack itemStack) { - return this; - } - @Override public final int getTier(ItemStack aStack) { Long[] tStats = getElectricStats(aStack); diff --git a/src/main/java/gregtech/api/items/GT_Tool_Item.java b/src/main/java/gregtech/api/items/GT_Tool_Item.java deleted file mode 100644 index c6670349..00000000 --- a/src/main/java/gregtech/api/items/GT_Tool_Item.java +++ /dev/null @@ -1,25 +0,0 @@ -package gregtech.api.items; - -import gregtech.api.util.GT_ModHandler; - -/** - * This is just a basic Tool, which has normal durability and could break Blocks. - */ -public class GT_Tool_Item extends GT_Generic_Item { - public GT_Tool_Item(String aUnlocalized, String aEnglish, String aTooltip, int aMaxDamage, int aEntityDamage, boolean aSwingIfUsed) { - this(aUnlocalized, aEnglish, aTooltip, aMaxDamage, aEntityDamage, aSwingIfUsed, -1, -1); - } - - public GT_Tool_Item(String aUnlocalized, String aEnglish, String aTooltip, int aMaxDamage, int aEntityDamage, boolean aSwingIfUsed, int aChargedGTID, int aDisChargedGTID) { - this(aUnlocalized, aEnglish, aTooltip, aMaxDamage, aEntityDamage, aSwingIfUsed, aChargedGTID, aDisChargedGTID, 0, 0.0F); - } - - public GT_Tool_Item(String aUnlocalized, String aEnglish, String aTooltip, int aMaxDamage, int aEntityDamage, boolean aSwingIfUsed, int aChargedGTID, int aDisChargedGTID, int aToolQuality, float aToolStrength) { - super(aUnlocalized, aEnglish, aTooltip, aTooltip != null && !aTooltip.equals("Doesn't work as intended, this is a Bug")); - setMaxDamage(aMaxDamage); - setMaxStackSize(1); - setNoRepair(); - setFull3D(); - GT_ModHandler.registerBoxableItemToToolBox(this); - } -} \ No newline at end of file diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java index f43bd60f..2f1a4bdc 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java @@ -1227,11 +1227,6 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE return 0; } - @Override - public boolean drainEnergyUnits(byte aSide, long aVoltage, long aAmperage) { - return false; - } - @Override public boolean acceptsRotationalEnergy(byte aSide) { if (!canAccessData() || getCoverIDAtSide(aSide) != 0) return false; @@ -1331,11 +1326,6 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE return 1.0F; } - public boolean renderInside(byte aSide) { - if (canAccessData()) return mMetaTileEntity.renderInside(aSide); - return false; - } - @Override public float getBlastResistance(byte aSide) { return (mConnections & 192) != 0 ? 50.0F : 5.0F; diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index 87eb8191..4fb91ed4 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -1687,17 +1687,6 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE return 0; } - @Override - public boolean drainEnergyUnits(byte aSide, long aVoltage, long aAmperage) { - if (!canAccessData() || !mMetaTileEntity.isElectric() || !outputsEnergyTo(aSide) || getStoredEU() - (aVoltage * aAmperage) < mMetaTileEntity.getMinimumStoredEU()) - return false; - if (decreaseStoredEU(aVoltage * aAmperage, false)) { - mAverageEUOutput[mAverageEUOutputIndex] += aVoltage * aAmperage; - return true; - } - return false; - } - @Override public boolean acceptsRotationalEnergy(byte aSide) { if (!canAccessData() || getCoverIDAtSide(aSide) != 0) return false; diff --git a/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java index 13d49021..9686f932 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java @@ -110,13 +110,6 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje private BlockPos.MutableBlockPos M = new BlockPos.MutableBlockPos(); - - - @Override - public final Biome getBiome(int aX, int aZ) { - return worldObj.getBiome(M.setPos(aX, 1, aZ)); - } - @Override public final Biome getBiome() { return worldObj.getBiome(getPos()); @@ -164,22 +157,6 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje return (byte) blockState.getBlock().getMetaFromState(blockState); } - @Override - public final byte getLightLevelOffset(int aX, int aY, int aZ) { - return (byte) worldObj.getLight(M.setPos(getXCoord() + aX, getYCoord() + aY, getZCoord() + aZ)); - } - - @Override - public final byte getLightLevelAtSide(byte aSide) { - return getLightLevelAtSideAndDistance(aSide, 1); - } - - @Override - public final byte getLightLevelAtSideAndDistance(byte aSide, int aDistance) { - EnumFacing side = EnumFacing.VALUES[aSide]; - return getLightLevelOffset(side.getFrontOffsetX() * aDistance, side.getFrontOffsetY() * aDistance, side.getFrontOffsetZ() * aDistance); - } - @Override public final boolean getOpacityOffset(int aX, int aY, int aZ) { return getBlockStateOffset(aX, aY, aZ).isOpaqueCube(); @@ -238,29 +215,6 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje return getTileEntityOffset(side.getFrontOffsetX() * aDistance, side.getFrontOffsetY() * aDistance, side.getFrontOffsetZ() * aDistance); } - @Override - public final IInventory getIInventory(int aX, int aY, int aZ) { - TileEntity tileEntity = getTileEntity(aX, aY, aZ); - return tileEntity instanceof IInventory ? (IInventory) tileEntity : null; - } - - @Override - public final IInventory getIInventoryOffset(int aX, int aY, int aZ) { - TileEntity tileEntity = getTileEntityOffset(aX, aY, aZ); - return tileEntity instanceof IInventory ? (IInventory) tileEntity : null; - } - - @Override - public final IInventory getIInventoryAtSide(byte aSide) { - return getIInventoryAtSideAndDistance(aSide, 1); - } - - @Override - public final IInventory getIInventoryAtSideAndDistance(byte aSide, int aDistance) { - TileEntity tileEntity = getTileEntityAtSideAndDistance(aSide, aDistance); - return tileEntity instanceof IInventory ? (IInventory) tileEntity : null; - } - @Override public final IFluidHandler getITankContainer(int aX, int aY, int aZ) { TileEntity tileEntity = getTileEntity(aX, aY, aZ); @@ -324,14 +278,6 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje return (byte) blockState.getBlock().getMetaFromState(blockState); } - @Override - public final byte getLightLevel(int aX, int aY, int aZ) { - M.setPos(aX, aY, aZ); - if (ignoreUnloadedChunks && crossedChunkBorder(aX, aZ) && !worldObj.isBlockLoaded(M)) - return 0; - return (byte) worldObj.getLight(M); - } - @Override public final boolean getSky(int aX, int aY, int aZ) { M.setPos(aX, aY, aZ); diff --git a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java index dac0ec74..d32d86ac 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java @@ -111,11 +111,6 @@ public abstract class MetaPipeEntity implements IMetaTileEntity { */ public abstract float getThickNess(); - /** - * For Pipe Rendering - */ - public abstract boolean renderInside(byte aSide); - public boolean isConductor() { return false; } diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java index 072424f5..6602d62a 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java @@ -331,13 +331,6 @@ public abstract class MetaTileEntity implements IMetaTileEntity { return false; } - /** - * @return true if Transformer Upgrades increase Packet Amount. - */ - public boolean isTransformingLowEnergy() { - return true; - } - @Override public boolean isFacingValid(byte aFacing) { return false; @@ -489,13 +482,6 @@ public abstract class MetaTileEntity implements IMetaTileEntity { return null; } - /** - * Tank pressure - */ - public int getTankPressure() { - return 0; - } - /** * Liquid Capacity */ @@ -515,20 +501,6 @@ public abstract class MetaTileEntity implements IMetaTileEntity { return false; } - /** - * If this accepts up to 4 Overclockers - */ - public boolean isOverclockerUpgradable() { - return false; - } - - /** - * If this accepts Transformer Upgrades - */ - public boolean isTransformerUpgradable() { - return false; - } - /** * Progress this machine has already made */ @@ -667,8 +639,6 @@ public abstract class MetaTileEntity implements IMetaTileEntity { return rArray; } - - @Override public boolean canInsertItem(int aIndex, ItemStack aStack, EnumFacing aSide) { return isValidSlot(aIndex) && aStack != null && aIndex < mInventory.length && (mInventory[aIndex] == null || GT_Utility.areStacksEqual(aStack, mInventory[aIndex])) && allowPutStack(getBaseMetaTileEntity(), aIndex, (byte) aSide.getIndex(), aStack); diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java index e4c6de58..0841dfb6 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java @@ -108,11 +108,6 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { @Override public void onLeftclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, EnumHand hand) {} - @Override - public final boolean renderInside(byte aSide) { - return false; - } - @Override public int getProgresstime() { return getFluidAmount(); diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java index 9fbae6e0..0b74638f 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java @@ -115,11 +115,6 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE return true; } - @Override - public final boolean renderInside(byte aSide) { - return false; - } - @Override public int getProgresstime() { return getPipeContent() * 64; diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java index 43a18549..137ca574 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java @@ -261,9 +261,4 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity public int getCapacity() { return 16000; } - - @Override - public int getTankPressure() { - return -100; - } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java index 4cab0489..80802016 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java @@ -139,16 +139,6 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B return false; } - @Override - public boolean isOverclockerUpgradable() { - return false; - } - - @Override - public boolean isTransformerUpgradable() { - return false; - } - @Override public boolean isElectric() { return true; diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java index 5f582bc4..edb882d7 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java @@ -114,9 +114,4 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch { public int getCapacity() { return 8000 * (mTier + 1); } - - @Override - public int getTankPressure() { - return -100; - } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java index b857ce82..13819649 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java @@ -188,9 +188,4 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch { public boolean outputsItems() { return mMode % 4 < 2; } - - @Override - public int getTankPressure() { - return +100; - } } diff --git a/src/main/java/gregtech/common/GT_MinableOreGenerator.java b/src/main/java/gregtech/common/GT_MinableOreGenerator.java deleted file mode 100644 index 4b46da83..00000000 --- a/src/main/java/gregtech/common/GT_MinableOreGenerator.java +++ /dev/null @@ -1,85 +0,0 @@ -package gregtech.common; - -import gregtech.api.world.GT_Worldgen_Constants; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; - -import java.util.Random; - -public class GT_MinableOreGenerator extends WorldGenerator { - private Block minableBlockId; - private Block mBlock; - private int minableBlockMeta = 0; - private int numberOfBlocks; - private boolean allowVoid = false; - - public GT_MinableOreGenerator(Block par1, int par2) { - this.minableBlockId = par1; - this.numberOfBlocks = par2; - } - - public GT_MinableOreGenerator(Block id, int meta, int number, boolean aAllowVoid, Block aBlock) { - this(id, number); - this.minableBlockMeta = meta; - this.allowVoid = aAllowVoid; - this.mBlock = aBlock; - } - - public boolean generate(World par1World, Random par2Random, BlockPos pos) { - float math_pi = 3.141593F; - float var6 = par2Random.nextFloat() * math_pi; - int par3 = pos.getX(), par4 = pos.getY(), par5 = pos.getZ(); - float var1s = this.numberOfBlocks / 8.0F; - int var4s = par4 - 2;int var5s = par3 + 8;int var6s = par5 + 8; - float var7s = this.numberOfBlocks / 16.0F; - float var8s = math_pi / this.numberOfBlocks; - float mh_s_0 = MathHelper.sin(var6) * var1s;float mh_c_0 = MathHelper.cos(var6) * var1s; - float var7 = var5s + mh_s_0; - float var11 = var6s + mh_c_0; - int var15r = par2Random.nextInt(3);int var17r = par2Random.nextInt(3); - int mh_n_4=var17r - var15r; - int var15 = var4s + var15r; - float mh_n_0 = -2*mh_s_0;float mh_n_1 = -2*mh_c_0; - for (int var19 = 0; var19 <= this.numberOfBlocks; var19++) { - float mh_n_2 = var19 / this.numberOfBlocks; - float var20 = var7 + mh_n_0 * mh_n_2; - float var22 = var15 + mh_n_4 * mh_n_2; - float var24 = var11 + mh_n_1 * mh_n_2; - float var26 = par2Random.nextFloat() * var7s; - float var1c = var19 * var8s; - float var28 = ((MathHelper.sin(var1c) + 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 var5c = var39 * var39; - if (var5c < 1.0F) { - for (int var41 = var33; var41 <= var36; var41++) { - float var42 = (var41 + 0.5F - var22) / (var28); - float var7c = var5c + var42 * var42; - if (var7c < 1.0F) { - for (int var44 = var34; var44 <= var37; var44++) { - float var45 = (var44 + 0.5F - var24) / (var28); - BlockPos block = new BlockPos(var38, var41, var44); - IBlockState blockState = par1World.getBlockState(block); - if ((var39 * var39 + var42 * var42 + var45 * var45 < 1.0D) && ((this.allowVoid && par1World.isAirBlock(block)) || - (block != null && (blockState.getBlock().isReplaceableOreGen(blockState, par1World, pos, GT_Worldgen_Constants.ANY))))) { - par1World.setBlockState(block, this.minableBlockId.getStateFromMeta(minableBlockMeta)); - } - } - } - } - } - } - } - return true; - } -} \ No newline at end of file diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 0ad29a51..0110caed 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -19,11 +19,6 @@ import net.minecraftforge.fluids.FluidStack; public class GT_RecipeAdder implements IGT_RecipeAdder { - @Deprecated - public boolean addFusionReactorRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt, int aStartEU) { - return false; - } - @Override public boolean addFusionReactorRecipe(FluidStack aInput1, FluidStack aInput2, FluidStack aOutput1, int aDuration, int aEUt, int aStartEU) { if (aInput1 == null || aInput2 == null || aOutput1 == null || aDuration < 1 || aEUt < 1 || aStartEU < 1) { diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java index 5b6ce978..924d04dd 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java @@ -286,10 +286,4 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa public int getCapacity() { return 16000; } - - @Override - public int getTankPressure() { - return 100; - } - } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java index 351fd961..698957c5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java @@ -206,16 +206,6 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt return false; } - @Override - public boolean isOverclockerUpgradable() { - return false; - } - - @Override - public boolean isTransformerUpgradable() { - return false; - } - @Override public boolean isElectric() { return true; diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java index a0ab88fd..712da4dd 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java @@ -335,22 +335,11 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch { return true; } - @Override public boolean isSimpleMachine() { return false; } - @Override - public boolean isOverclockerUpgradable() { - return false; - } - - @Override - public boolean isTransformerUpgradable() { - return false; - } - @Override public boolean isElectric() { return true; @@ -416,17 +405,11 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch { return true; } - @Override public int getCapacity() { return 16000 * this.mTier; } - @Override - public int getTankPressure() { - return 100; - } - @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1], (aSide == 0 || aSide == 1) ? null : new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ADV_PUMP)}; diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java index 7993b164..e7ea614c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java @@ -299,16 +299,6 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank { return false; } - @Override - public boolean isOverclockerUpgradable() { - return false; - } - - @Override - public boolean isTransformerUpgradable() { - return false; - } - @Override public boolean isElectric() { return true; diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java index c42a1243..84a0361a 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java @@ -130,10 +130,4 @@ public class GT_MetaTileEntity_QuantumTank public int getCapacity() { return (int) (Math.pow(6, mTier) * 267000); } - - @Override - public int getTankPressure() { - return 100; - } - } \ No newline at end of file