Deprecation cleanup (#637)

3 files changed, 24 insertions, 65 deletions

diff --git a/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java
index 528ae6ef68..f7ed248669 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java
@@ -1,7 +1,5 @@
 package gtPlusPlus.core.tileentities;
 
-import static gregtech.api.enums.Mods.Thaumcraft;
-
 import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.general.BlockSuperLight.TileEntitySuperLight;
@@ -23,7 +21,6 @@ import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable;
 import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator;
 import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable;
 import gtPlusPlus.plugin.villagers.tile.TileEntityGenericSpawner;
-import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 
 public class ModTileEntities {
 
@@ -49,19 +46,6 @@ public class ModTileEntities {
         GameRegistry.registerTileEntity(TileEntityEggBox.class, "TileEggBox");
 
         GameRegistry.registerTileEntity(TileEntityVolumetricFlaskSetter.class, "TileEntityVolumetricFlaskSetter");
-
-        // Mod TEs
-        if (Thaumcraft.isModLoaded()) {}
-
-        blacklistTilesFromAcceleration();
     }
 
-    private static void blacklistTilesFromAcceleration() {
-        Meta_GT_Proxy.setTileEntityClassAsBlacklistedInWorldAccelerator(
-                "gtPlusPlus.core.tileentities.general.TileEntityFishTrap");
-        Meta_GT_Proxy.setTileEntityClassAsBlacklistedInWorldAccelerator(
-                "gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest");
-        Meta_GT_Proxy
-                .setTileEntityClassAsBlacklistedInWorldAccelerator("gtPlusPlus.core.tileentities.general.TileEggBox");
-    }
 }
diff --git a/src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java b/src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java
index 540005d8d1..563249672d 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java
@@ -7,6 +7,7 @@ import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 import net.minecraftforge.fluids.IFluidTank;
 
+import gregtech.common.covers.CoverInfo;
 import gtPlusPlus.api.objects.minecraft.BTF_FluidTank;
 
 public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFluidTank {
@@ -73,13 +74,8 @@ public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFlu
     public int fill(ForgeDirection side, FluidStack aFluid, boolean doFill) {
         if (mTickTimer > 5 && canAccessData()
                 && (mRunningThroughTick || !mInputDisabled)
-                && (side == ForgeDirection.UNKNOWN
-                        || (this.isLiquidInput(side) && getCoverBehaviorAtSide(side).letsFluidIn(
-                                side,
-                                getCoverIDAtSide(side),
-                                getCoverDataAtSide(side),
-                                aFluid == null ? null : aFluid.getFluid(),
-                                this))))
+                && (side == ForgeDirection.UNKNOWN || (this.isLiquidInput(side)
+                        && getCoverInfoAtSide(side).letsFluidIn(aFluid == null ? null : aFluid.getFluid()))))
             return this.fillEx(side, aFluid, doFill);
         return 0;
     }
@@ -88,13 +84,8 @@ public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFlu
     public FluidStack drain(ForgeDirection side, int maxDrain, boolean doDrain) {
         if (mTickTimer > 5 && canAccessData()
                 && (mRunningThroughTick || !mOutputDisabled)
-                && (side == ForgeDirection.UNKNOWN
-                        || (this.isLiquidOutput(side) && getCoverBehaviorAtSide(side).letsFluidOut(
-                                side,
-                                getCoverIDAtSide(side),
-                                getCoverDataAtSide(side),
-                                this.getFluid() == null ? null : this.getFluid().getFluid(),
-                                this))))
+                && (side == ForgeDirection.UNKNOWN || (this.isLiquidOutput(side) && getCoverInfoAtSide(side)
+                        .letsFluidOut(this.getFluid() == null ? null : this.getFluid().getFluid()))))
             return this.drainEx(side, maxDrain, doDrain);
         return null;
     }
@@ -103,13 +94,8 @@ public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFlu
     public FluidStack drain(ForgeDirection side, FluidStack aFluid, boolean doDrain) {
         if (mTickTimer > 5 && canAccessData()
                 && (mRunningThroughTick || !mOutputDisabled)
-                && (side == ForgeDirection.UNKNOWN
-                        || (this.isLiquidOutput(side) && getCoverBehaviorAtSide(side).letsFluidOut(
-                                side,
-                                getCoverIDAtSide(side),
-                                getCoverDataAtSide(side),
-                                aFluid == null ? null : aFluid.getFluid(),
-                                this))))
+                && (side == ForgeDirection.UNKNOWN || (this.isLiquidOutput(side)
+                        && getCoverInfoAtSide(side).letsFluidOut(aFluid == null ? null : aFluid.getFluid()))))
             return this.drainEx(side, aFluid, doDrain);
         return null;
     }
@@ -118,8 +104,8 @@ public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFlu
     public boolean canFill(ForgeDirection side, Fluid aFluid) {
         if (mTickTimer > 5 && canAccessData()
                 && (mRunningThroughTick || !mInputDisabled)
-                && (side == ForgeDirection.UNKNOWN || (this.isLiquidInput(side) && getCoverBehaviorAtSide(side)
-                        .letsFluidIn(side, getCoverIDAtSide(side), getCoverDataAtSide(side), aFluid, this))))
+                && (side == ForgeDirection.UNKNOWN
+                        || (this.isLiquidInput(side) && getCoverInfoAtSide(side).letsFluidIn(aFluid))))
             return this.canFillEx(side, aFluid);
         return false;
     }
@@ -128,19 +114,18 @@ public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFlu
     public boolean canDrain(ForgeDirection side, Fluid aFluid) {
         if (mTickTimer > 5 && canAccessData()
                 && (mRunningThroughTick || !mOutputDisabled)
-                && (side == ForgeDirection.UNKNOWN || (this.isLiquidOutput(side) && getCoverBehaviorAtSide(side)
-                        .letsFluidOut(side, getCoverIDAtSide(side), getCoverDataAtSide(side), aFluid, this))))
+                && (side == ForgeDirection.UNKNOWN
+                        || (this.isLiquidOutput(side) && getCoverInfoAtSide(side).letsFluidOut(aFluid))))
             return this.canDrainEx(side, aFluid);
         return false;
     }
 
     @Override
     public FluidTankInfo[] getTankInfo(ForgeDirection side) {
-        if (canAccessData() && (side == ForgeDirection.UNKNOWN
-                || (this.isLiquidInput(side) && getCoverBehaviorAtSide(side)
-                        .letsFluidIn(side, getCoverIDAtSide(side), getCoverDataAtSide(side), null, this))
-                || (this.isLiquidOutput(side) && getCoverBehaviorAtSide(side)
-                        .letsFluidOut(side, getCoverIDAtSide(side), getCoverDataAtSide(side), null, this))))
+        CoverInfo coverInfo = getCoverInfoAtSide(side);
+        if (canAccessData()
+                && (side == ForgeDirection.UNKNOWN || (this.isLiquidInput(side) && coverInfo.letsFluidIn(null))
+                        || (this.isLiquidOutput(side) && coverInfo.letsFluidOut(null))))
             return this.getTankInfoEx(side);
         return new FluidTankInfo[] {};
     }
diff --git a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java
index 032fa62956..762d5a4d61 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java
@@ -23,10 +23,10 @@ import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.net.GT_Packet_Block_Event;
 import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.util.ISerializableObject;
+import gregtech.common.covers.CoverInfo;
 import gtPlusPlus.api.interfaces.ILazyCoverable;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.BTF_Inventory;
@@ -264,10 +264,8 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
     @Override
     public int[] getAccessibleSlotsFromSide(int ordinalSide) {
         final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide);
-        if (canAccessData() && (getCoverBehaviorAtSide(side)
-                .letsItemsOut(side, getCoverIDAtSide(side), getCoverDataAtSide(side), -1, this)
-                || getCoverBehaviorAtSide(side)
-                        .letsItemsIn(side, getCoverIDAtSide(side), getCoverDataAtSide(side), -1, this)))
+        CoverInfo coverInfo = getCoverInfoAtSide(side);
+        if (canAccessData() && (coverInfo.letsItemsOut(-1) || coverInfo.letsItemsIn(-1)))
             return mInventory.getAccessibleSlotsFromSide(ordinalSide);
         return new int[0];
     }
@@ -279,8 +277,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
     public boolean canInsertItem(int aIndex, ItemStack aStack, int ordinalSide) {
         final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide);
         return canAccessData() && (mRunningThroughTick || !mInputDisabled)
-                && getCoverBehaviorAtSide(side)
-                        .letsItemsIn(side, getCoverIDAtSide(side), getCoverDataAtSide(side), aIndex, this)
+                && getCoverInfoAtSide(side).letsItemsIn(aIndex)
                 && mInventory.canInsertItem(aIndex, aStack, ordinalSide);
     }
 
@@ -291,8 +288,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
     public boolean canExtractItem(int aIndex, ItemStack aStack, int ordinalSide) {
         final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide);
         return canAccessData() && (mRunningThroughTick || !mOutputDisabled)
-                && getCoverBehaviorAtSide(side)
-                        .letsItemsOut(side, getCoverIDAtSide(side), getCoverDataAtSide(side), aIndex, this)
+                && getCoverInfoAtSide(side).letsItemsOut(aIndex)
                 && mInventory.canExtractItem(aIndex, aStack, ordinalSide);
     }
 
@@ -431,8 +427,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
 
     private boolean isEnergyInputSide(ForgeDirection side) {
         if (side != ForgeDirection.UNKNOWN) {
-            if (!this.getCoverBehaviorAtSide(side)
-                    .letsEnergyIn(side, this.getCoverIDAtSide(side), this.getCoverDataAtSide(side), this)) {
+            if (!this.getCoverInfoAtSide(side).letsEnergyIn()) {
                 return false;
             }
 
@@ -450,8 +445,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
 
     private boolean isEnergyOutputSide(ForgeDirection side) {
         if (side != ForgeDirection.UNKNOWN) {
-            if (!this.getCoverBehaviorAtSide(side)
-                    .letsEnergyOut(side, this.getCoverIDAtSide(side), this.getCoverDataAtSide(side), this)) {
+            if (!this.getCoverInfoAtSide(side).letsEnergyOut()) {
                 return false;
             }
 
@@ -872,10 +866,6 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
         this.worldObj.setBlock(this.xCoord, this.yCoord, this.zCoord, Blocks.fire);
     }
 
-    public String trans(String aKey, String aEnglish) {
-        return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_" + aKey, aEnglish, false);
-    }
-
     @Override
     public byte getInternalInputRedstoneSignal(ForgeDirection side) {
         return (byte) (getCoverBehaviorAtSide(side).getRedstoneInput(
@@ -955,7 +945,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
             final int ordinalSide = side.ordinal();
             mCoverSides[ordinalSide] = aID;
             mCoverData[ordinalSide] = 0;
-            mCoverBehaviors[ordinalSide] = GregTech_API.getCoverBehavior(aID);
+            mCoverBehaviors[ordinalSide] = (GT_CoverBehavior) GregTech_API.getCoverBehaviorNew(aID);
             return true;
         }
         return false;
@@ -969,7 +959,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
 
     @Override
     public void setCoverItemAtSide(ForgeDirection side, ItemStack aCover) {
-        GregTech_API.getCoverBehavior(aCover).placeCover(side, aCover, this);
+        GregTech_API.getCoverBehaviorNew(aCover).placeCover(side, aCover, this);
     }
 
     @Override