Remove Breaker Box (#683)

15 files changed, 1 insertions, 2642 deletions

diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java
index 4383c31c3d..4b48a97305 100644
--- a/src/main/java/gtPlusPlus/GTplusplus.java
+++ b/src/main/java/gtPlusPlus/GTplusplus.java
@@ -29,7 +29,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.FishPondFakeRecipe;
 import gregtech.api.util.GTPP_Recipe;
@@ -155,10 +154,6 @@ public class GTplusplus implements ActionListener {
     public GTplusplus() {
         super();
         INIT_PHASE.SUPER.setPhaseActive(true);
-
-        for (int i = 12; i < 16; i++) {
-            GregTech_API.registerTileEntityConstructor(i, Meta_GT_Proxy::constructCustomGregtechMetaTileEntityByMeta);
-        }
     }
 
     // Pre-Init
@@ -317,46 +312,6 @@ public class GTplusplus implements ActionListener {
         mInvalidCount[6] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells(
                 GTPP_Recipe.GTPP_Recipe_Map.sReactorProcessingUnitRecipes,
                 GTPP_Recipe.GTPP_Recipe_Map.sNuclearSaltProcessingPlantRecipes);
-        /*
-         * //Large Centrifuge generation mOriginalCount[0] =
-         * GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.size(); for (GT_Recipe x :
-         * GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList) { if (x != null) { if
-         * (ItemUtils.checkForInvalidItems(x.mInputs, x.mOutputs)) { if
-         * (CORE.RA.addMultiblockCentrifugeRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mChances,
-         * x.mDuration, x.mEUt, x.mSpecialValue)) { mValidCount[0]++; } else { mInvalidCount[0]++; } } else {
-         * Logger.INFO("[Recipe] Error generating Large Centrifuge recipe.");
-         * Logger.INFO("Inputs: "+ItemUtils.getArrayStackNames(x.mInputs));
-         * Logger.INFO("Fluid Inputs: "+ItemUtils.getArrayStackNames(x.mFluidInputs));
-         * Logger.INFO("Outputs: "+ItemUtils.getArrayStackNames(x.mOutputs));
-         * Logger.INFO("Fluid Outputs: "+ItemUtils.getArrayStackNames(x.mFluidOutputs)); } } else { mInvalidCount[0]++;
-         * } } if (GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.size() < 1) { for (GT_Recipe
-         * a : GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList) {
-         * GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.add(a); } } //Large Electrolyzer generation
-         * mOriginalCount[1] = GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList.size(); for (GT_Recipe x :
-         * GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList) { if (x != null) { if
-         * (ItemUtils.checkForInvalidItems(x.mInputs, x.mOutputs)) { if
-         * (CORE.RA.addMultiblockElectrolyzerRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mChances,
-         * x.mDuration, x.mEUt, x.mSpecialValue)) { mValidCount[1]++; } else { mInvalidCount[1]++; } } else {
-         * Logger.INFO("[Recipe] Error generating Large Electrolyzer recipe.");
-         * Logger.INFO("Inputs: "+ItemUtils.getArrayStackNames(x.mInputs));
-         * Logger.INFO("Fluid Inputs: "+ItemUtils.getArrayStackNames(x.mFluidInputs));
-         * Logger.INFO("Outputs: "+ItemUtils.getArrayStackNames(x.mOutputs));
-         * Logger.INFO("Fluid Outputs: "+ItemUtils.getArrayStackNames(x.mFluidOutputs)); } } else { mInvalidCount[1]++;
-         * } } if (GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mRecipeList.size() < 1) { for
-         * (GT_Recipe a : GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mRecipeList) {
-         * GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.add(a); } } //Advanced Vacuum Freezer
-         * generation mOriginalCount[2] = GT_Recipe.GT_Recipe_Map.sVacuumRecipes.mRecipeList.size(); for (GT_Recipe x :
-         * GT_Recipe.GT_Recipe_Map.sVacuumRecipes.mRecipeList) { if (x != null &&
-         * RecipeUtils.doesGregtechRecipeHaveEqualCells(x)) { if (ItemUtils.checkForInvalidItems(x.mInputs, x.mOutputs))
-         * { if (CORE.RA.addAdvancedFreezerRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mChances,
-         * x.mDuration, x.mEUt, x.mSpecialValue)) { mValidCount[2]++; } } else { mInvalidCount[2]++; } } else {
-         * mInvalidCount[2]++; } } //Redo plasma recipes in Adv. Vac.
-         * //Meta_GT_Proxy.generatePlasmaRecipesForAdvVacFreezer(); String[] machineName = new String[] {"Centrifuge",
-         * "Electrolyzer", "Vacuum Freezer"}; for (int i=0;i<3;i++) {
-         * Logger.INFO("[Recipe] Generated "+mValidCount[i]+" recipes for the Industrial "+machineName[i]
-         * +". The original machine can process "+mOriginalCount[i]+" recipes, meaning "+mInvalidCount[i]
-         * +" are invalid for this Multiblock's processing in some way."); }
-         */
     }
 
     protected void dumpGtRecipeMap(final GT_Recipe_Map r) {
diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index eef430bd4e..5f9cfb732e 100644
--- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -89,7 +89,6 @@ import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechLargeTurbinesAndHe
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechMolecularTransformer;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechNuclearSaltProcessingPlant;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPollutionDevices;
-import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPowerBreakers;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPowerSubStation;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechQuantumForceTransformer;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRTG;
@@ -200,7 +199,6 @@ public class COMPAT_HANDLER {
         GregtechIndustrialArcFurnace.run();
         GregtechSolarTower.run();
         GregtechLargeTurbinesAndHeatExchanger.run();
-        GregtechPowerBreakers.run();
         GregtechAlgaeContent.run();
         GregtechIndustrialAlloySmelter.run();
         GregtechIsaMill.run();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 2343b6e76e..d1c8504e88 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -765,18 +765,6 @@ public enum GregtechItemList implements GregtechItemContainer {
     ColdTrap_IV,
     ColdTrap_ZPM,
 
-    // Breakers
-    BreakerBox_ULV,
-    BreakerBox_LV,
-    BreakerBox_MV,
-    BreakerBox_HV,
-    BreakerBox_EV,
-    BreakerBox_IV,
-    BreakerBox_LuV,
-    BreakerBox_ZPM,
-    BreakerBox_UV,
-    BreakerBox_MAX,
-
     // Solar Generators
     GT_Solar_ULV,
     GT_Solar_LV,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IBaseCustomMetaTileEntity.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IBaseCustomMetaTileEntity.java
deleted file mode 100644
index e210dfb487..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IBaseCustomMetaTileEntity.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.interfaces;
-
-public interface IBaseCustomMetaTileEntity {
-
-    public boolean doesExplode();
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java
deleted file mode 100644
index 0c4a66d890..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.metatileentity;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Random;
-
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
-import gtPlusPlus.xmod.gregtech.api.interfaces.IBaseCustomMetaTileEntity;
-import ic2.api.Direction;
-
-public class BaseCustomTileEntity extends BaseMetaTileEntity implements IBaseCustomMetaTileEntity {
-
-    protected NBTTagCompound mRecipeStuff2;
-    private static final Field ENTITY_ITEM_HEALTH_FIELD_2;
-
-    static {
-        Field f = null;
-        try {
-            f = EntityItem.class.getDeclaredField("field_70291_e");
-            f.setAccessible(true);
-        } catch (Exception var4) {
-            try {
-                f = EntityItem.class.getDeclaredField("health");
-                f.setAccessible(true);
-            } catch (Exception var3) {
-                var4.printStackTrace();
-                var3.printStackTrace();
-            }
-        }
-
-        ENTITY_ITEM_HEALTH_FIELD_2 = f;
-    }
-
-    public BaseCustomTileEntity() {
-        super();
-        Logger.MACHINE_INFO("Created new BaseCustomTileEntity");
-    }
-
-    @Override
-    public boolean doesExplode() {
-        return true;
-    }
-
-    @Override
-    public void writeToNBT(NBTTagCompound aNBT) {
-        try {
-            super.writeToNBT(aNBT);
-        } catch (Throwable arg7) {
-            GT_Log.err.println(
-                    "Encountered CRITICAL ERROR while saving MetaTileEntity, the Chunk whould\'ve been corrupted by now, but I prevented that. Please report immidietly to GregTech Intergalactical!!!");
-            arg7.printStackTrace(GT_Log.err);
-        }
-
-        try {
-            if (!aNBT.hasKey("ModVersion")) aNBT.setString("ModVersion", CORE.VERSION);
-        } catch (Throwable arg6) {
-            GT_Log.err.println(
-                    "Encountered CRITICAL ERROR while saving MetaTileEntity, the Chunk whould\'ve been corrupted by now, but I prevented that. Please report immidietly to GregTech Intergalactical!!!");
-            arg6.printStackTrace(GT_Log.err);
-        }
-    }
-
-    @Override
-    public void doEnergyExplosion() {
-        if (!doesExplode()) {
-            Logger.INFO("Machine tried to explode, let's stop that. xo [doEnergyExplosion]");
-            return;
-        }
-        if (this.getUniversalEnergyCapacity() > 0L
-                && this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity() / 5L) {
-            this.doExplosion(
-                    this.getOutput() * (long) (this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity() ? 4
-                            : (this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity() / 2L ? 2 : 1)));
-            GT_Mod arg9999 = GT_Mod.instance;
-            GT_Mod.achievements.issueAchievement(
-                    this.getWorldObj().getPlayerEntityByName(this.getOwnerName()),
-                    "electricproblems");
-        }
-    }
-
-    @Override
-    public void doExplosion(long aAmount) {
-
-        if (!doesExplode()) {
-            Logger.INFO("Machine tried to explode, let's stop that. xo [doExplosion]");
-            return;
-        }
-
-        if (this.canAccessData()) {
-            if (GregTech_API.sMachineWireFire && this.mMetaTileEntity.isElectric()) {
-                try {
-                    this.mReleaseEnergy = true;
-                    Util.emitEnergyToNetwork(GT_Values.V[5], Math.max(1L, this.getStoredEU() / GT_Values.V[5]), this);
-                } catch (Exception arg4) {
-                    ;
-                }
-            }
-
-            this.mReleaseEnergy = false;
-            this.mMetaTileEntity.onExplosion();
-            int i;
-
-            if (GT_Mod.gregtechproxy.mExplosionItemDrop) {
-                for (i = 0; i < this.getSizeInventory(); ++i) {
-                    ItemStack tItem = this.getStackInSlot(i);
-                    if (tItem != null && tItem.stackSize > 0 && this.isValidSlot(i)) {
-                        this.dropItems(tItem);
-                        this.setInventorySlotContents(i, (ItemStack) null);
-                    }
-                }
-            }
-
-            if (this.mRecipeStuff2 != null) {
-                for (i = 0; i < 9; ++i) {
-                    this.dropItems(GT_Utility.loadItem(this.mRecipeStuff2, "Ingredient." + i));
-                }
-            }
-
-            PollutionUtils.addPollution(this, 100000);
-            this.mMetaTileEntity.doExplosion(aAmount);
-        }
-    }
-
-    @Override
-    public void dropItems(ItemStack tItem) {
-        if (tItem != null) {
-            Random tRandom = new Random();
-            EntityItem tItemEntity = new EntityItem(
-                    this.worldObj,
-                    (double) ((float) this.xCoord + tRandom.nextFloat() * 0.8F + 0.1F),
-                    (double) ((float) this.yCoord + tRandom.nextFloat() * 0.8F + 0.1F),
-                    (double) ((float) this.zCoord + tRandom.nextFloat() * 0.8F + 0.1F),
-                    new ItemStack(tItem.getItem(), tItem.stackSize, tItem.getItemDamage()));
-            if (tItem.hasTagCompound()) {
-                tItemEntity.getEntityItem().setTagCompound((NBTTagCompound) tItem.getTagCompound().copy());
-            }
-
-            tItemEntity.motionX = tRandom.nextGaussian() * 0.0500000007450581D;
-            tItemEntity.motionY = tRandom.nextGaussian() * 0.0500000007450581D + 0.2000000029802322D;
-            tItemEntity.motionZ = tRandom.nextGaussian() * 0.0500000007450581D;
-            tItemEntity.hurtResistantTime = 999999;
-            tItemEntity.lifespan = 60000;
-
-            try {
-                if (ENTITY_ITEM_HEALTH_FIELD_2 != null) {
-                    ENTITY_ITEM_HEALTH_FIELD_2.setInt(tItemEntity, 99999999);
-                }
-            } catch (Exception var5) {
-                ;
-            }
-
-            this.worldObj.spawnEntityInWorld(tItemEntity);
-            tItem.stackSize = 0;
-        }
-    }
-
-    @Override
-    public ArrayList<ItemStack> getDrops() {
-        ArrayList<ItemStack> aDrops = new ArrayList<ItemStack>();
-        ItemStack rStack = new ItemStack(GregTech_API.sBlockMachines, 1, this.getMetaTileID());
-        // Currently not using my custom block.
-        // ItemStack rStack = new ItemStack(Meta_GT_Proxy.sBlockMachines, 1,
-        // this.getMetaTileID());
-        boolean fail = true;
-
-        ArrayList<ItemStack> aSuperDrops = super.getDrops();
-        if (aSuperDrops != null && !aSuperDrops.isEmpty()) {
-            ItemStack aSuperStack = super.getDrops().get(0);
-            if (aSuperStack != null && aSuperStack.hasTagCompound()) {
-                NBTTagCompound aSuperNBT = aSuperStack.getTagCompound();
-                if (aSuperNBT != null && !aSuperNBT.hasNoTags()) {
-                    NBTTagCompound tNBT = (NBTTagCompound) aSuperNBT.copy();
-                    if (tNBT != null && !tNBT.hasNoTags()) {
-                        if (this.hasValidMetaTileEntity()) {
-                            this.mMetaTileEntity.setItemNBT(tNBT);
-                            rStack.setTagCompound(tNBT);
-                            fail = false;
-                            aDrops.add(rStack);
-                        }
-                    }
-                }
-            }
-        }
-        if (fail) {
-            aDrops.add(rStack);
-        }
-        return aDrops;
-    }
-
-    @Override
-    public boolean isTeleporterCompatible(Direction aSide) {
-        return this.canAccessData() && this.mMetaTileEntity.isTeleporterCompatible();
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java
deleted file mode 100644
index 079a9946d1..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java
+++ /dev/null
@@ -1,291 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power;
-
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.BaseCustomTileEntity;
-import ic2.api.Direction;
-
-public class BaseCustomPower_MTE extends BaseCustomTileEntity {
-
-    public BaseCustomPower_MTE() {
-        super();
-        Logger.INFO("Created new BaseCustomPower_MTE");
-    }
-
-    @Override
-    public boolean doesExplode() {
-        return false;
-    }
-
-    public long injectEnergyUnits(ForgeDirection side, long aVoltage, long aAmperage) {
-        if (mMetaTileEntity == null) {
-            Logger.INFO("Bad Tile");
-        }
-        if (this.canAccessData() && this.mMetaTileEntity.isElectric()
-                && this.inputEnergyFrom(side)
-                && aAmperage > 0L
-                && aVoltage > 0L
-                && this.getStoredEU() < this.getEUCapacity()
-                && this.mMetaTileEntity.maxAmperesIn() >= this.getInputAmperage()) {
-            Logger.INFO("Injecting Energy Units");
-            return super.injectEnergyUnits(side, aVoltage, aAmperage);
-        } else {
-            Logger.INFO("canAccessData(): " + canAccessData());
-            Logger.INFO("isElectric(): " + this.mMetaTileEntity.isElectric());
-            Logger.INFO("InputEnergyFromSide(" + side + "): " + this.inputEnergyFrom(side));
-            Logger.INFO("aAmperage: " + aAmperage);
-            Logger.INFO("aVoltage: " + aVoltage);
-            Logger.INFO("this.getStoredEU() < this.getEUCapacity(): " + (this.getStoredEU() < this.getEUCapacity()));
-            Logger.INFO(
-                    "this.mMetaTileEntity.maxAmperesIn() >= this.mAcceptedAmperes: "
-                            + (this.mMetaTileEntity.maxAmperesIn() >= this.getInputAmperage()));
-            Logger.INFO("this.mMetaTileEntity.maxAmperesIn(): " + (this.mMetaTileEntity.maxAmperesIn()));
-            Logger.INFO("this.mAcceptedAmperes: " + (this.getInputAmperage()));
-            return 0L;
-        }
-    }
-
-    public boolean drainEnergyUnits(ForgeDirection side, long aVoltage, long aAmperage) {
-        Logger.INFO("Draining Energy Units 4");
-        if (this.canAccessData() && this.mMetaTileEntity.isElectric()
-                && this.outputsEnergyTo(side)
-                && this.getStoredEU() - aVoltage * aAmperage >= this.mMetaTileEntity.getMinimumStoredEU()) {
-            if (this.decreaseStoredEU(aVoltage * aAmperage, false)) {
-                this.mAverageEUOutput[this.mAverageEUOutputIndex] = (int) ((long) this.mAverageEUOutput[this.mAverageEUOutputIndex]
-                        + aVoltage * aAmperage);
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public boolean decreaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooLessEnergy) {
-        Logger.INFO("Draining Energy Units 3");
-        // TODO Auto-generated method stub
-        return super.decreaseStoredEnergyUnits(aEnergy, aIgnoreTooLessEnergy);
-    }
-
-    @Override
-    public boolean increaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooMuchEnergy) {
-        // TODO Auto-generated method stub
-        return super.increaseStoredEnergyUnits(aEnergy, aIgnoreTooMuchEnergy);
-    }
-
-    @Override
-    public boolean inputEnergyFrom(ForgeDirection side) {
-        // TODO Auto-generated method stub
-        return super.inputEnergyFrom(side);
-    }
-
-    @Override
-    public boolean outputsEnergyTo(ForgeDirection side) {
-        Logger.INFO("Draining Energy Units 2");
-        // TODO Auto-generated method stub
-        return super.outputsEnergyTo(side);
-    }
-
-    @Override
-    public long getOutputAmperage() {
-        // TODO Auto-generated method stub
-        return super.getOutputAmperage();
-    }
-
-    @Override
-    public long getOutputVoltage() {
-        // TODO Auto-generated method stub
-        return super.getOutputVoltage();
-    }
-
-    @Override
-    public long getInputAmperage() {
-        // TODO Auto-generated method stub
-        return super.getInputAmperage();
-    }
-
-    @Override
-    public long getInputVoltage() {
-        // TODO Auto-generated method stub
-        return super.getInputVoltage();
-    }
-
-    @Override
-    public long getUniversalEnergyStored() {
-        // TODO Auto-generated method stub
-        return super.getUniversalEnergyStored();
-    }
-
-    @Override
-    public long getUniversalEnergyCapacity() {
-        // TODO Auto-generated method stub
-        return super.getUniversalEnergyCapacity();
-    }
-
-    @Override
-    public long getStoredEU() {
-        // TODO Auto-generated method stub
-        return super.getStoredEU();
-    }
-
-    @Override
-    public long getEUCapacity() {
-        // TODO Auto-generated method stub
-        return super.getEUCapacity();
-    }
-
-    @Override
-    public boolean setStoredEU(long aEnergy) {
-        // TODO Auto-generated method stub
-        return super.setStoredEU(aEnergy);
-    }
-
-    @Override
-    public boolean decreaseStoredEU(long aEnergy, boolean aIgnoreTooLessEnergy) {
-        Logger.INFO("Draining Energy Units 1");
-        // TODO Auto-generated method stub
-        return super.decreaseStoredEU(aEnergy, aIgnoreTooLessEnergy);
-    }
-
-    @Override
-    public boolean decreaseStoredSteam(long aEnergy, boolean aIgnoreTooLessEnergy) {
-        // TODO Auto-generated method stub
-        return super.decreaseStoredSteam(aEnergy, aIgnoreTooLessEnergy);
-    }
-
-    @Override
-    public void doEnergyExplosion() {
-        // TODO Auto-generated method stub
-        super.doEnergyExplosion();
-    }
-
-    @Override
-    public void doExplosion(long aAmount) {
-        // TODO Auto-generated method stub
-        super.doExplosion(aAmount);
-    }
-
-    @Override
-    public byte getLightValue() {
-        // TODO Auto-generated method stub
-        return super.getLightValue();
-    }
-
-    @Override
-    public long getAverageElectricInput() {
-        // TODO Auto-generated method stub
-        return super.getAverageElectricInput();
-    }
-
-    @Override
-    public long getAverageElectricOutput() {
-        // TODO Auto-generated method stub
-        return super.getAverageElectricOutput();
-    }
-
-    @Override
-    public double getOutputEnergyUnitsPerTick() {
-        // TODO Auto-generated method stub
-        return super.getOutputEnergyUnitsPerTick();
-    }
-
-    @Override
-    public double demandedEnergyUnits() {
-        // TODO Auto-generated method stub
-        return super.demandedEnergyUnits();
-    }
-
-    @Override
-    public double injectEnergyUnits(ForgeDirection aDirection, double aAmount) {
-        // TODO Auto-generated method stub
-        return super.injectEnergyUnits(aDirection, aAmount);
-    }
-
-    @Override
-    public boolean acceptsEnergyFrom(TileEntity aEmitter, ForgeDirection aDirection) {
-        // TODO Auto-generated method stub
-        return super.acceptsEnergyFrom(aEmitter, aDirection);
-    }
-
-    @Override
-    public boolean emitsEnergyTo(TileEntity aReceiver, ForgeDirection aDirection) {
-        // TODO Auto-generated method stub
-        return super.emitsEnergyTo(aReceiver, aDirection);
-    }
-
-    @Override
-    public double getOfferedEnergy() {
-        // TODO Auto-generated method stub
-        return super.getOfferedEnergy();
-    }
-
-    @Override
-    public void drawEnergy(double amount) {
-        // TODO Auto-generated method stub
-        super.drawEnergy(amount);
-    }
-
-    @Override
-    public int injectEnergy(ForgeDirection aForgeDirection, int aAmount) {
-        // TODO Auto-generated method stub
-        return super.injectEnergy(aForgeDirection, aAmount);
-    }
-
-    @Override
-    public int addEnergy(int aEnergy) {
-        // TODO Auto-generated method stub
-        return super.addEnergy(aEnergy);
-    }
-
-    @Override
-    public boolean isAddedToEnergyNet() {
-        // TODO Auto-generated method stub
-        return super.isAddedToEnergyNet();
-    }
-
-    @Override
-    public int demandsEnergy() {
-        // TODO Auto-generated method stub
-        return super.demandsEnergy();
-    }
-
-    @Override
-    public int getMaxSafeInput() {
-        // TODO Auto-generated method stub
-        return super.getMaxSafeInput();
-    }
-
-    @Override
-    public int getMaxEnergyOutput() {
-        // TODO Auto-generated method stub
-        return super.getMaxEnergyOutput();
-    }
-
-    @Override
-    public int injectEnergy(Direction aDirection, int aAmount) {
-        // TODO Auto-generated method stub
-        return super.injectEnergy(aDirection, aAmount);
-    }
-
-    @Override
-    public boolean acceptsEnergyFrom(TileEntity aReceiver, Direction aDirection) {
-        // TODO Auto-generated method stub
-        return super.acceptsEnergyFrom(aReceiver, aDirection);
-    }
-
-    @Override
-    public boolean emitsEnergyTo(TileEntity aReceiver, Direction aDirection) {
-        // TODO Auto-generated method stub
-        return super.emitsEnergyTo(aReceiver, aDirection);
-    }
-
-    @Override
-    public boolean isUniversalEnergyStored(long aEnergyAmount) {
-        // TODO Auto-generated method stub
-        return super.isUniversalEnergyStored(aEnergyAmount);
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java
deleted file mode 100644
index 9a09ad6538..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power;
-
-import static gregtech.api.enums.GT_Values.GT;
-
-import gregtech.api.interfaces.ITexture;
-import gtPlusPlus.api.objects.data.AutoMap;
-
-public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPower {
-
-    /**
-     * Value between [0 - 9] to describe the Tier of this Machine.
-     */
-    public final byte mTier;
-
-    /**
-     * A simple Description.
-     */
-    public final String[] mDescriptionArray;
-
-    /**
-     * Contains all Textures used by this Block.
-     */
-    public final ITexture[][][] mTextures;
-
-    public GTPP_MTE_TieredMachineBlock(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
-            String aDescription, ITexture... aTextures) {
-        super(aID, aName, aNameRegional, aInvSlotCount);
-        mTier = (byte) Math.max(0, Math.min(aTier, 9));
-        mDescriptionArray = aDescription == null ? new String[0] : new String[] { aDescription };
-        // must always be the last call!
-        if (GT.isClientSide()) mTextures = getTextureSet(aTextures);
-        else mTextures = null;
-    }
-
-    public GTPP_MTE_TieredMachineBlock(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
-            String[] aDescription, ITexture... aTextures) {
-        super(aID, aName, aNameRegional, aInvSlotCount);
-        mTier = (byte) Math.max(0, Math.min(aTier, 9));
-        mDescriptionArray = aDescription == null ? new String[0] : aDescription;
-
-        // must always be the last call!
-        if (GT.isClientSide()) mTextures = getTextureSet(aTextures);
-        else mTextures = null;
-    }
-
-    public GTPP_MTE_TieredMachineBlock(String aName, int aTier, int aInvSlotCount, String aDescription,
-            ITexture[][][] aTextures) {
-        super(aName, aInvSlotCount);
-        mTier = (byte) aTier;
-        mDescriptionArray = aDescription == null ? new String[0] : new String[] { aDescription };
-        mTextures = aTextures;
-    }
-
-    public GTPP_MTE_TieredMachineBlock(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-            ITexture[][][] aTextures) {
-        super(aName, aInvSlotCount);
-        mTier = (byte) aTier;
-        mDescriptionArray = aDescription == null ? new String[0] : aDescription;
-        mTextures = aTextures;
-    }
-
-    @Override
-    public byte getTileEntityBaseType() {
-        return 12;
-    }
-
-    @Override
-    public long getInputTier() {
-        return mTier;
-    }
-
-    @Override
-    public long getOutputTier() {
-        return mTier;
-    }
-
-    @Override
-    public String[] getDescription() {
-        AutoMap<String> aTooltip = new AutoMap<String>();
-        String[] s1 = null;
-        s1 = new String[aTooltip.size()];
-        int u = 0;
-        for (String s : aTooltip) {
-            s1[u] = s;
-        }
-        return s1;
-    }
-
-    /**
-     * Used Client Side to get a Texture Set for this Block. Called after setting the Tier and the Description so that
-     * those two are accessible.
-     *
-     * @param aTextures is the optional Array you can give to the Constructor.
-     */
-    public abstract ITexture[][][] getTextureSet(ITexture[] aTextures);
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java
deleted file mode 100644
index 79975d3ac8..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.init.Blocks;
-import net.minecraft.world.World;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.SoundResource;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.CustomMetaTileBase;
-import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
-
-public abstract class MetaTileEntityCustomPower extends CustomMetaTileBase {
-
-    public MetaTileEntityCustomPower(int aID, String aBasicName, String aRegionalName, int aInvSlotCount) {
-        super(aID, aBasicName, aRegionalName, aInvSlotCount);
-        this.setBaseMetaTileEntity(Meta_GT_Proxy.constructBaseMetaTileEntityCustomPower());
-        this.getBaseMetaTileEntity().setMetaTileID((short) aID);
-    }
-
-    public MetaTileEntityCustomPower(String aStack, int aInvSlotCount) {
-        super(aStack, aInvSlotCount);
-    }
-
-    @Override
-    public long getMinimumStoredEU() {
-        return 0L;
-    }
-
-    public boolean doesExplode() {
-        return this.getBaseCustomMetaTileEntity().doesExplode();
-    }
-
-    @Override
-    public void doExplosion(long aExplosionPower) {
-
-        if (!doesExplode()) {
-            Logger.INFO("Machine tried to explode, let's stop that. xo [doExplosion]");
-            return;