Deprecation cleanup (#637)

63 files changed, 245 insertions, 562 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java
index 9dc531edd9..db107fa5cd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java
@@ -13,6 +13,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import com.gtnewhorizon.gtnhlib.util.map.ItemStackMap;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
@@ -62,7 +64,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
                 aDescription);
     }
 
-    public GT_MetaTileEntity_CropHarvestor(final String aName, final int aTier, final String aDescription,
+    public GT_MetaTileEntity_CropHarvestor(final String aName, final int aTier, final String[] aDescription,
             final ITexture[][][] aTextures) {
         super(aName, aTier, 21, aDescription, aTextures);
     }
@@ -140,7 +142,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_CropHarvestor(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_CropHarvestor(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -508,13 +510,16 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
     public String[] getDescription() {
         int aRadius = 10 + getRange(this.mTier);
         int aSide = (aRadius - 1) / 2;
-        return new String[] { this.mDescription, "Secondary mode can Hydrate/Fertilize/Weed-EX",
+        return ArrayUtils.addAll(
+                this.mDescriptionArray,
+                "Secondary mode can Hydrate/Fertilize/Weed-EX",
                 "Consumes " + powerUsage() + "eu per harvest",
                 "Consumes " + powerUsageSecondary() + "eu per secondary operation",
                 "Can harvest 2 blocks above and below",
                 "Radius: " + aSide + " each side (" + aRadius + "x3x" + aRadius + ")",
-                "Has " + (this.mTier * 5) + "% chance for extra drops", "Holds " + this.getCapacity() + "L of Water",
-                CORE.GT_Tooltip.get() };
+                "Has " + (this.mTier * 5) + "% chance for extra drops",
+                "Holds " + this.getCapacity() + "L of Water",
+                CORE.GT_Tooltip.get());
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
deleted file mode 100644
index 9a26ea57ec..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
+++ /dev/null
@@ -1,311 +0,0 @@
-package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
-
-import static gregtech.api.enums.GT_Values.V;
-import static gregtech.api.enums.Mods.GregTech;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.Textures;
-import gregtech.api.enums.Textures.BlockIcons.CustomIcon;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.objects.GT_RenderedTexture;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
-
-public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_TieredMachineBlock {
-
-    public static String[] BlacklistedTileEntiyClassNames;
-
-    private byte mMode = 0; // 0: RandomTicks around 1: TileEntities with range
-    // 1
-    private static CustomIcon _mGTIco_Norm_Idle;
-    private static CustomIcon _mGTIco_Norm_Active;
-    private static CustomIcon _mGTIco_TE_Idle;
-    private static CustomIcon _mGTIco_TE_Active;
-    private static int[] mAccelerateStatic = { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 512, 512, 512, 512, 512, 512 };
-
-    @Override
-    public void registerIcons(IIconRegister aBlockIconRegister) {
-        super.registerIcons(aBlockIconRegister);
-        _mGTIco_Norm_Idle = new CustomIcon("iconsets/OVERLAY_ACCELERATOR");
-        _mGTIco_Norm_Active = new CustomIcon("iconsets/OVERLAY_ACCELERATOR_ACTIVE");
-        _mGTIco_TE_Idle = new CustomIcon("iconsets/OVERLAY_ACCELERATOR_TE");
-        _mGTIco_TE_Active = new CustomIcon("iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE");
-    }
-
-    @SideOnly(Side.CLIENT)
-    @Override
-    public void onValueUpdate(byte aValue) {
-        mMode = aValue;
-    }
-
-    @Override
-    public byte getUpdateData() {
-        return mMode;
-    }
-
-    public GT_MetaTileEntity_WorldAccelerator(int pID, String pName, String pNameRegional, int pTier) {
-        super(pID, pName, pNameRegional, pTier, 0, "");
-    }
-
-    @Override
-    public String[] getDescription() {
-        return new String[] {
-                String.format(
-                        "Accelerating things (Radius: %d EU/t: %d Speed Bonus: x%d)",
-                        mTier,
-                        getEnergyDemand(mTier, false),
-                        mAccelerateStatic[mTier]),
-                "Use a screwdriver to change mode", "To accelerate TileEntities, this machine has to be adjacent to it",
-                "This machine accepts up to 8 Amps", "Accelerating TileEntities doubles Energy-Demand" };
-    }
-
-    public GT_MetaTileEntity_WorldAccelerator(String pName, int pTier, int pInvSlotCount, String pDescription,
-            ITexture[][][] pTextures) {
-        super(pName, pTier, pInvSlotCount, pDescription, pTextures);
-    }
-
-    @Override
-    public MetaTileEntity newMetaEntity(IGregTechTileEntity pTileEntity) {
-        return new GT_MetaTileEntity_WorldAccelerator(mName, mTier, mInventory.length, mDescription, mTextures);
-    }
-
-    @Override
-    public ITexture[][][] getTextureSet(ITexture[] pTextures) {
-        return new ITexture[0][0][0];
-    }
-
-    @Override
-    public ITexture[] getTexture(IGregTechTileEntity pBaseMetaTileEntity, ForgeDirection side, ForgeDirection sacing,
-            int pColorIndex, boolean pActive, boolean pRedstone) {
-        if (mMode == 0) return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1],
-                (side.offsetY != 0) ? null
-                        : pActive ? new GT_RenderedTexture(_mGTIco_Norm_Active)
-                                : new GT_RenderedTexture(_mGTIco_Norm_Idle) };
-        else return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1], (side.offsetY != 0)
-                ? null
-                : pActive ? new GT_RenderedTexture(_mGTIco_TE_Active) : new GT_RenderedTexture(_mGTIco_TE_Idle) };
-    }
-
-    @Override
-    public boolean allowPullStack(IGregTechTileEntity pBaseMetaTileEntity, int pIndex, ForgeDirection side,
-            ItemStack pStack) {
-        return false;
-    }
-
-    @Override
-    public boolean allowPutStack(IGregTechTileEntity pBaseMetaTileEntity, int pIndex, ForgeDirection side,
-            ItemStack pStack) {
-        return false;
-    }
-
-    @Override
-    public void saveNBTData(NBTTagCompound pNBT) {
-        pNBT.setByte("mAccelMode", mMode);
-    }
-
-    public static long getEnergyDemand(int pTier, boolean pIsAcceleratingTEs) {
-        return V[pTier] * (pIsAcceleratingTEs ? 6 : 3);
-    }
-
-    @Override
-    public void loadNBTData(NBTTagCompound pNBT) {
-        mMode = pNBT.getByte("mAccelMode");
-    }
-
-    @Override
-    public boolean isAccessAllowed(EntityPlayer pPlayer) {
-        return true;
-    }
-
-    @Override
-    public boolean isSimpleMachine() {
-        return false;
-    }
-
-    @Override
-    public boolean isFacingValid(ForgeDirection facing) {
-        return true;
-    }
-
-    @Override
-    public boolean isEnetInput() {
-        return true;
-    }
-
-    @Override
-    public boolean isInputFacing(ForgeDirection side) {
-        return true;
-    }
-
-    @Override
-    public boolean isTeleporterCompatible() {
-        return false;
-    }
-
-    @Override
-    public long getMinimumStoredEU() {
-        return 512;
-    }
-
-    @Override
-    public long maxEUStore() {
-        return 512 + V[mTier] * 50;
-    }
-
-    @Override
-    public long maxEUInput() {
-        return V[mTier];
-    }
-
-    @Override
-    public long maxAmperesIn() {
-        return 8;
-    }
-
-    private static String[] mModeStr = { "Blocks", "TileEntities" };
-
-    @Override
-    public void onScrewdriverRightClick(ForgeDirection pSide, EntityPlayer pPlayer, float pX, float pY, float pZ) {
-        mMode = (byte) (mMode == 0x00 ? 0x01 : 0x00);
-        markDirty();
-        PlayerUtils.messagePlayer(pPlayer, String.format("Switched mode to: %s", mModeStr[mMode]));
-    }
-
-    @Override
-    public void onPostTick(IGregTechTileEntity pBaseMetaTileEntity, long pTick) {
-        try {
-            if (!pBaseMetaTileEntity.isServerSide()) return;
-
-            long tEnergyDemand = getEnergyDemand(mTier, (mMode == 1));
-
-            // Do we have enough energy to run? Or are we not allowed to run?
-            if (pBaseMetaTileEntity.getStoredEU() < tEnergyDemand || !pBaseMetaTileEntity.isAllowedToWork()) {
-                // Check if machine was active before
-                if (pBaseMetaTileEntity.isActive()) pBaseMetaTileEntity.setActive(false); // Then disable it now
-            } else {
-                // Continue to drain power
-                if (pBaseMetaTileEntity.decreaseStoredEnergyUnits(tEnergyDemand, false)) {
-                    World tWorld = pBaseMetaTileEntity.getWorld();
-                    // Limit the random ticks to once per second
-                    if (mMode == 0) {
-                        if (pTick % 20 == 0) doAccelerateNormalBlo