Remove unused code & migrate to FluidSlotWidget (#619)

* Remove unused code & migrate to FluidSlotWidget

* Update dependencies.gradle

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>

4 files changed, 4 insertions, 1748 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java
deleted file mode 100644
index c6d5c4ba5b..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java
+++ /dev/null
@@ -1,906 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
-
-import static gregtech.api.enums.GT_Values.V;
-
-import java.util.Arrays;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.DimensionManager;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidHandler;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Textures;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.random.XSTR;
-
-/**
- * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
- * <p/>
- * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple
- * Machine
- */
-public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_DeluxeTank {
-
-    /**
-     * return values for checkRecipe()
-     */
-    protected static final int DID_NOT_FIND_RECIPE = 0, FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS = 1,
-            FOUND_AND_SUCCESSFULLY_USED_RECIPE = 2;
-
-    public static final int OTHER_SLOT_COUNT = 4;
-    public final ItemStack[] mOutputItems;
-    public final int mInputSlotCount, mAmperage;
-    public boolean mAllowInputFromOutputSide = false, mFluidTransfer = false, mItemTransfer = false,
-            mHasBeenUpdated = false, mStuttering = false, mCharge = false, mDecharge = false;
-    public int mProgresstime = 0, mMaxProgresstime = 0, mEUt = 0, mOutputBlocked = 0;
-    public ForgeDirection mMainFacing = ForgeDirection.UNKNOWN;
-    public FluidStack mOutputFluid;
-    public String mGUIName = "", mNEIName = "";
-    /**
-     * Contains the Recipe which has been previously used, or null if there was no previous Recipe, which could have
-     * been buffered
-     */
-    protected GT_Recipe mLastRecipe = null;
-
-    private FluidStack mFluidOut;
-
-    /**
-     * @param aOverlays 0 = SideFacingActive 1 = SideFacingInactive 2 = FrontFacingActive 3 = FrontFacingInactive 4 =
-     *                  TopFacingActive 5 = TopFacingInactive 6 = BottomFacingActive 7 = BottomFacingInactive ----- Not
-     *                  all Array Elements have to be initialised, you can also just use 8 Parameters for the Default
-     *                  Pipe Texture Overlays ----- 8 = BottomFacingPipeActive 9 = BottomFacingPipeInactive 10 =
-     *                  TopFacingPipeActive 11 = TopFacingPipeInactive 12 = SideFacingPipeActive 13 =
-     *                  SideFacingPipeInactive
-     */
-    public GT_MetaTileEntity_DeluxeMachine(int aID, String aName, String aNameRegional, int aTier, int aAmperage,
-            String aDescription, int aInputSlotCount, int aOutputSlotCount, String aGUIName, String aNEIName,
-            ITexture... aOverlays) {
-        super(
-                aID,
-                aName,
-                aNameRegional,
-                aTier,
-                OTHER_SLOT_COUNT + aInputSlotCount + aOutputSlotCount + 1,
-                aDescription,
-                aOverlays);
-        mInputSlotCount = Math.max(0, aInputSlotCount);
-        mOutputItems = new ItemStack[Math.max(0, aOutputSlotCount)];
-        mAmperage = aAmperage;
-        mGUIName = aGUIName;
-        mNEIName = aNEIName;
-    }
-
-    public GT_MetaTileEntity_DeluxeMachine(String aName, int aTier, int aAmperage, String aDescription,
-            ITexture[][][] aTextures, int aInputSlotCount, int aOutputSlotCount, String aGUIName, String aNEIName) {
-        super(aName, aTier, OTHER_SLOT_COUNT + aInputSlotCount + aOutputSlotCount + 1, aDescription, aTextures);
-        mInputSlotCount = Math.max(0, aInputSlotCount);
-        mOutputItems = new ItemStack[Math.max(0, aOutputSlotCount)];
-        mAmperage = aAmperage;
-        mGUIName = aGUIName;
-        mNEIName = aNEIName;
-    }
-
-    public boolean setMainFacing(ForgeDirection direction) {
-        mMainFacing = direction;
-        if (getBaseMetaTileEntity().getFrontFacing() == mMainFacing) {
-            getBaseMetaTileEntity().setFrontFacing(direction.getOpposite());
-        }
-        onFacingChange();
-        onMachineBlockUpdate();
-        return true;
-    }
-
-    @Override
-    public ITexture[][][] getTextureSet(ITexture[] aTextures) {
-        ITexture[][][] rTextures = new ITexture[14][17][];
-        aTextures = Arrays.copyOf(aTextures, 14);
-
-        for (int i = 0; i < aTextures.length; i++) if (aTextures[i] != null) for (byte c = -1; c < 16; c++) {
-            if (rTextures[i][c + 1] == null) rTextures[i][c + 1] = new ITexture[] {
-                    Textures.BlockIcons.MACHINE_CASINGS[mTier][c + 1], aTextures[i] };
-        }
-
-        for (byte c = -1; c < 16; c++) {
-            if (rTextures[0][c + 1] == null) rTextures[0][c + 1] = getSideFacingActive(c);
-            if (rTextures[1][c + 1] == null) rTextures[1][c + 1] = getSideFacingInactive(c);
-            if (rTextures[2][c + 1] == null) rTextures[2][c + 1] = getFrontFacingActive(c);
-            if (rTextures[3][c + 1] == null) rTextures[3][c + 1] = getFrontFacingInactive(c);
-            if (rTextures[4][c + 1] == null) rTextures[4][c + 1] = getTopFacingActive(c);
-            if (rTextures[5][c + 1] == null) rTextures[5][c + 1] = getTopFacingInactive(c);
-            if (rTextures[6][c + 1] == null) rTextures[6][c + 1] = getBottomFacingActive(c);
-            if (rTextures[7][c + 1] == null) rTextures[7][c + 1] = getBottomFacingInactive(c);
-            if (rTextures[8][c + 1] == null) rTextures[8][c + 1] = getBottomFacingPipeActive(c);
-            if (rTextures[9][c + 1] == null) rTextures[9][c + 1] = getBottomFacingPipeInactive(c);
-            if (rTextures[10][c + 1] == null) rTextures[10][c + 1] = getTopFacingPipeActive(c);
-            if (rTextures[11][c + 1] == null) rTextures[11][c + 1] = getTopFacingPipeInactive(c);
-            if (rTextures[12][c + 1] == null) rTextures[12][c + 1] = getSideFacingPipeActive(c);
-            if (rTextures[13][c + 1] == null) rTextures[13][c + 1] = getSideFacingPipeInactive(c);
-        }
-        return rTextures;
-    }
-
-    @Override
-    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing,
-            int aColorIndex, boolean aActive, boolean aRedstone) {
-        return mTextures[mMainFacing.offsetY != 0
-                ? side == facing ? aActive ? 2 : 3
-                        : side == ForgeDirection.DOWN ? aActive ? 6 : 7
-                                : side == ForgeDirection.UP ? aActive ? 4 : 5 : aActive ? 0 : 1
-                : side == mMainFacing ? aActive ? 2 : 3
-                        : (showPipeFacing() && side == facing)
-                                ? side == ForgeDirection.DOWN ? aActive ? 8 : 9
-                                        : side == ForgeDirection.UP ? aActive ? 10 : 11 : aActive ? 12 : 13
-                                : side == ForgeDirection.DOWN ? aActive ? 6 : 7
-                                        : side == ForgeDirection.UP ? aActive ? 4 : 5 : aActive ? 0 : 1][aColorIndex
-                                                + 1];
-    }
-
-    @Override
-    public boolean isSimpleMachine() {
-        return false;
-    }
-
-    @Override
-    public boolean isOverclockerUpgradable() {
-        return false;
-    }
-
-    @Override
-    public boolean isTransformerUpgradable() {
-        return false;
-    }
-
-    @Override
-    public boolean isElectric() {
-        return true;
-    }
-
-    @Override
-    public boolean isValidSlot(int aIndex) {
-        return aIndex > 0 && super.isValidSlot(aIndex)
-                && aIndex != OTHER_SLOT_COUNT + mInputSlotCount + mOutputItems.length;
-    }
-
-    @Override
-    public boolean isFacingValid(ForgeDirection facing) {
-        return mMainFacing.offsetY == 0 || facing.offsetY == 0;
-    }
-
-    @Override
-    public boolean isEnetInput() {
-        return true;
-    }
-
-    @Override
-    public boolean isInputFacing(ForgeDirection side) {
-        return side != mMainFacing;
-    }
-
-    @Override
-    public boolean isOutputFacing(ForgeDirection side) {
-        return false;
-    }
-
-    @Override
-    public boolean isTeleporterCompatible() {
-        return false;
-    }
-
-    @Override
-    public boolean isLiquidInput(ForgeDirection side) {
-        return side != mMainFacing && (mAllowInputFromOutputSide || side != getBaseMetaTileEntity().getFrontFacing());
-    }
-
-    @Override
-    public boolean isLiquidOutput(ForgeDirection side) {
-        return side != mMainFacing;
-    }
-
-    @Override
-    public long getMinimumStoredEU() {
-        return V[mTier] * 16;
-    }
-
-    @Override
-    public long maxEUStore() {
-        return V[mTier] * 64;
-    }
-
-    @Override
-    public long maxEUInput() {
-        return V[mTier];
-    }
-
-    @Override
-    public long maxSteamStore() {
-        return maxEUStore();
-    }
-
-    @Override
-    public long maxAmperesIn() {
-        return (mEUt * 2) / V[mTier] + 1;
-    }
-
-    @Override
-    public int getInputSlot() {
-        return OTHER_SLOT_COUNT;
-    }
-
-    @Override
-    public int getOutputSlot() {
-        return OTHER_SLOT_COUNT + mInputSlotCount;
-    }
-
-    @Override
-    public int getStackDisplaySlot() {
-        return 2;
-    }
-
-    @Override
-    public int rechargerSlotStartIndex() {
-        return 1;
-    }
-
-    @Override
-    public int dechargerSlotStartIndex() {
-        return 1;
-    }
-
-    @Override
-    public int rechargerSlotCount() {
-        return mCharge ? 1 : 0;
-    }
-
-    @Override
-    public int dechargerSlotCount() {
-        return mDecharge ? 1 : 0;
-    }
-
-    @Override
-    public boolean isAccessAllowed(EntityPlayer aPlayer) {
-        return true;
-    }
-
-    @Override
-    public int getProgresstime() {
-        return mProgresstime;
-    }
-
-    @Override
-    public int maxProgresstime() {
-        return mMaxProgresstime;
-    }
-
-    @Override
-    public int increaseProgress(int aProgress) {
-        mProgresstime += aProgress;
-        return mMaxProgresstime - mProgresstime;
-    }
-
-    @Override
-    public boolean isFluidInputAllowed(FluidStack aFluid) {
-        return getFillableStack() != null || (getRecipeList() != null && getRecipeList().containsInput(aFluid));
-    }
-
-    @Override
-    public boolean isFluidChangingAllowed() {
-        return true;
-    }
-
-    @Override
-    public boolean doesFillContainers() {
-        return false;
-    }
-
-    @Override
-    public boolean doesEmptyContainers() {
-        return false;
-    }
-
-    @Override
-    public boolean canTankBeFilled() {
-        return true;
-    }
-
-    @Override
-    public boolean canTankBeEmptied() {
-        return true;
-    }
-
-    @Override
-    public boolean displaysItemStack() {
-        return true;
-    }
-
-    @Override
-    public boolean displaysStackSize() {
-        return true;
-    }
-
-    @Override
-    public FluidStack getDisplayedFluid() {
-        return displaysOutputFluid() ? getDrainableStack() : null;
-    }
-
-    @Override
-    public FluidStack getDrainableStack() {
-        return mFluidOut;
-    }
-
-    @Override
-    public FluidStack setDrainableStack(FluidStack aFluid) {
-        mFluidOut = aFluid;
-        return mFluidOut;
-    }
-
-    @Override
-    public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
-        return true;
-    }
-
-    @Override
-    public void initDefaultModes(NBTTagCompound aNBT) {
-        mMainFacing = ForgeDirection.UNKNOWN;
-    }
-
-    @Override
-    public void saveNBTData(NBTTagCompound aNBT) {
-        super.saveNBTData(aNBT);
-        aNBT.setBoolean("mFluidTransfer", mFluidTransfer);
-        aNBT.setBoolean("mItemTransfer", mItemTransfer);
-        aNBT.setBoolean("mHasBeenUpdated", mHasBeenUpdated);
-        aNBT.setBoolean("mAllowInputFromOutputSide", mAllowInputFromOutputSide);
-        aNBT.setInteger("mEUt", mEUt);
-        aNBT.setInteger("mMainFacing", mMainFacing.ordinal());
-        aNBT.setInteger("mProgresstime", mProgresstime);
-        aNBT.setInteger("mMaxProgresstime", mMaxProgresstime);
-        if (mOutputFluid != null) aNBT.setTag("mOutputFluid", mOutputFluid.writeToNBT(new NBTTagCompound()));
-        if (mFluidOut != null) aNBT.setTag("mFluidOut", mFluidOut.writeToNBT(new NBTTagCompound()));
-
-        for (int i = 0; i < mOutputItems.length; i++) if (mOutputItems[i] != null)
-            aNBT.setTag("mOutputItem" + i, mOutputItems[i].writeToNBT(new NBTTagCompound()));
-    }
-
-    @Override
-    public void loadNBTData(NBTTagCompound aNBT) {
-        super.loadNBTData(aNBT);
-        mFluidTransfer = aNBT.getBoolean("mFluidTransfer");
-        mItemTransfer = aNBT.getBoolean("mItemTransfer");
-        mHasBeenUpdated = aNBT.getBoolean("mHasBeenUpdated");
-        mAllowInputFromOutputSide = aNBT.getBoolean("mAllowInputFromOutputSide");
-        mEUt = aNBT.getInteger("mEUt");
-        mMainFacing = ForgeDirection.getOrientation(aNBT.getInteger("mMainFacing"));
-        mProgresstime = aNBT.getInteger("mProgresstime");
-        mMaxProgresstime = aNBT.getInteger("mMaxProgresstime");
-        mOutputFluid = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mOutputFluid"));
-        mFluidOut = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluidOut"));
-
-        for (int i = 0; i < mOutputItems.length; i++) mOutputItems[i] = GT_Utility.loadItem(aNBT, "mOutputItem" + i);
-    }
-
-    @Override
-    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-        super.onPostTick(aBaseMetaTileEntity, aTick);
-
-        if (aBaseMetaTileEntity.isServerSide()) {
-
-            // Utils.LOG_WARNING("Ticking Tank.");
-            mCharge = aBaseMetaTileEntity.getStoredEU() / 2 > aBaseMetaTileEntity.getEUCapacity() / 3;
-            mDecharge = aBaseMetaTileEntity.getStoredEU() < aBaseMetaTileEntity.getEUCapacity() / 3;
-
-            doDisplayThings();
-
-            boolean tSucceeded = false;
-
-            if (mMaxProgresstime > 0 && (mProgresstime >= 0 || aBaseMetaTileEntity.isAllowedToWork())) {
-                aBaseMetaTileEntity.setActive(true);
-                if (mProgresstime < 0 || drainEnergyForProcess(mEUt)) {
-                    if (++mProgresstime >= mMaxProgresstime) {
-                        for (int i = 0; i < mOutputItems.length; i++)
-                            for (int j = 0; j < mOutputItems.length; j++) if (aBaseMetaTileEntity
-                                    .addStackToSlot(getOutputSlot() + ((j + i) % mOutputItems.length), mOutputItems[i]))
-                                break;
-                        if (mOutputFluid != null)
-                            if (getDrainableStack() == null) setDrainableStack(mOutputFluid.copy());
-                            else if (mOutputFluid.isFluidEqual(getDrainableStack()))
-                                getDrainableStack().amount += mOutputFluid.amount;
-                        for (int i = 0; i < mOutputItems.length; i++) mOutputItems[i] = null;
-                        mOutputFluid = null;
-                        mEUt = 0;
-                        mProgresstime = 0;
-                        mMaxProgresstime = 0;
-                        mStuttering = false;
-                        tSucceeded = true;
-                        endProcess();
-                    }
-                    if (mProgresstime > 5) mStuttering = false;
-                    XSTR aXSTR = new XSTR();
-                    if (false && aXSTR.nextInt(5000) == 0) GT_Utility.sendSoundToPlayers(
-                            aBaseMetaTileEntity.getWorld(),
-                            GregTech_API.sSoundList.get(5),
-                            10.0F,
-                            -1.0F,
-                            aBaseMetaTileEntity.getXCoord(),
-                            aBaseMetaTileEntity.getYCoord(),
-                            aBaseMetaTileEntity.getZCoord());
-                } else {
-                    if (!mStuttering) {
-                        stutterProcess();
-                        if (canHaveInsufficientEnergy()) mProgresstime = -100;
-                        mStuttering = true;
-                    }
-                }
-            } else {
-                aBaseMetaTileEntity.setActive(false);
-            }
-
-            boolean tRemovedOutputFluid = false;
-            Logger.WARNING("R0");
-
-            if (doesAutoOutputFluids() && getDrainableStack() != null
-                    && aBaseMetaTileEntity.getFrontFacing() != mMainFacing
-                    && (tSucceeded || aTick % 20 == 0)) {
-                IFluidHandler tTank = aBaseMetaTileEntity.getITankContainerAtSide(aBaseMetaTileEntity.getFrontFacing());
-                if (tTank != null) {
-                    FluidStack tDrained = drain(1000, false);
-                    if (tDrained != null) {
-                        int tFilledAmount = tTank.fill(aBaseMetaTileEntity.getBackFacing(), tDrained, false);
-                        if (tFilledAmount > 0)
-                            tTank.fill(aBaseMetaTileEntity.getBackFacing(), drain(tFilledAmount, true), true);
-                    }
-                }
-                if (getDrainableStack() == null) tRemovedOutputFluid = true;
-            }
-
-            if (doesAutoOutput() && !isOutputEmpty()
-                    && aBaseMetaTileEntity.getFrontFacing() != mMainFacing
-                    && (tSucceeded || mOutputBlocked % 300 == 1
-                            || aBaseMetaTileEntity.hasInventoryBeenModified()
-                            || aTick % 600 == 0)) {
-                TileEntity tTileEntity2 = aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getFrontFacing());
-                for (int i = 0, tCosts = 1; i < mOutputItems.length && tCosts > 0
-                        && aBaseMetaTileEntity.isUniversalEnergyStored(128); i++) {
-                    tCosts = GT_Utility.moveOneItemStack(
-                            aBaseMetaTileEntity,
-                            tTileEntity2,
-                            aBaseMetaTileEntity.getFrontFacing(),
-                            aBaseMetaTileEntity.getBackFacing(),
-                            null,
-                            false,
-                            (byte) 64,
-                            (byte) 1,
-                            (byte) 64,
-                            (byte) 1);
-                    if (tCosts > 0) aBaseMetaTileEntity.decreaseStoredEnergyUnits(tCosts, true);
-                }
-            }
-
-            if (mOutputBlocked != 0) if (isOutputEmpty()) mOutputBlocked = 0;
-            else mOutputBlocked++;
-            Logger.WARNING("R1");
-            if (allowToCheckRecipe()) {
-                Logger.WARNING("R2--------------------------------------------------");
-                Logger.WARNING(
-                        "R2: (mMaxProgresstime <= 0 && aBaseMetaTileEntity.isAllowedToWork() && (tRemovedOutputFluid || tSucceeded || aBaseMetaTileEntity.hasInventoryBeenModified() || aTick % 600 == 0 || aBaseMetaTileEntity.hasWorkJustBeenEnabled()) && hasEnoughEnergyToCheckRecipe())");
-                Logger.WARNING("R2--------------------------------------------------");
-                Logger.WARNING("R2-mMaxProgresstime: " + mMaxProgresstime);
-                Logger.WARNING("R2-isAllowedToWork(): " + aBaseMetaTileEntity.isAllowedToWork());
-                Logger.WARNING("R2--------------------------------------------------");
-                Logger.WARNING("R2-tRemovedOutputFluid: " + tRemovedOutputFluid);
-                Logger.WARNING("R2-tSucceeded: " + tSucceeded);
-                Logger.WARNING("R2-hasInventoryBeenModified(): " + aBaseMetaTileEntity.hasInventoryBeenModified());
-                Logger.WARNING("R2-(aTick % 600 == 0): " + (aTick % 600 == 0));
-                Logger.WARNING("R2-hasWorkJustBeenEnabled(): " + aBaseMetaTileEntity.hasWorkJustBeenEnabled());
-                Logger.WARNING("R2--------------------------------------------------");
-                Logger.WARNING("R2-hasEnoughEnergyToCheckRecipe(): " + hasEnoughEnergyToCheckRecipe());
-                Logger.WARNING("R2--------------------------------------------------");
-                if (mMaxProgresstime <= 0 && aBaseMetaTileEntity.isAllowedToWork()
-                        && (tRemovedOutputFluid || tSucceeded
-                                || aBaseMetaTileEntity.hasInventoryBeenModified()
-                                || aTick % 600 == 0
-                                || aBaseMetaTileEntity.hasWorkJustBeenEnabled())
-                        && hasEnoughEnergyToCheckRecipe()) {
-                    Logger.WARNING("R3");
-                    if (checkRecipe() == 2) {
-                        if (mInventory[3] != null && mInventory[3].stackSize <= 0) mInventory[3] = null;
-                        Logger.WARNING("R4");
-                        for (int i = getInputSlot(), j = i + mInputSlotCount; i < j; i++)
-                            if (mInventory[i] != null && mInventory[i].stackSize <= 0) mInventory[i] = null;
-                        for (int i = 0; i < mOutputItems.length; i++) {
-                            mOutputItems[i] = GT_Utility.copy(mOutputItems[i]);
-                            if (mOutputItems[i] != null && mOutputItems[i].stackSize > 64)
-                                mOutputItems[i].stackSize = 64;
-                            mOutputItems[i] = GT_OreDictUnificator.get(true, mOutputItems[i]);
-                        }
-                        if (mFluid != null && mFluid.amount <= 0) mFluid = null;
-                        mMaxProgresstime = Math.max(1, mMaxProgresstime);
-                        if (GT_Utility.isDebugItem(mInventory[dechargerSlotStartIndex()])) {
-                            mEUt = mMaxProgresstime = 1;
-                        }
-                        startProcess();
-                    } else {
-                        mMaxProgresstime = 0;
-                        for (int i = 0; i < mOutputItems.length; i++) mOutputItems[i] = null;
-                        mOutputFluid = null;
-                    }
-                }
-            } else {
-                if (!mStuttering) {
-                    stutterProcess();
-                    mStuttering = true;
-                }
-            }
-        }
-    }
-
-    protected void doDisplayThings() {
-        if (mMainFacing.offsetY != 0 && getBaseMetaTileEntity().getFrontFacing().offsetY == 0) {
-            mMainFacing = getBaseMetaTileEntity().getFrontFacing();
-        }
-        if (mMainFacing.offsetY == 0 && !mHasBeenUpdated) {
-            mHasBeenUpdated = true;
-            // getBaseMetaTileEntity().setFrontFacing(getBaseMetaTileEntity().getBackFacing());
-        }
-
-        if (displaysInputFluid()) {
-            int tDisplayStackSlot = OTHER_SLOT_COUNT + mInputSlotCount + mOutputItems.length;
-            if (getFillableStack() == null) {
-                if (ItemList.Display_Fluid.isStackEqual(mInventory[tDisplayStackSlot], true, true))
-                    mInventory[tDisplayStackSlot] = null;
-            } else {
-                mInventory[tDisplayStackSlot] = GT_Utility
-                        .getFluidDisplayStack(getFillableStack(), displaysStackSize());
-            }
-        }
-    }
-
-    protected boolean hasEnoughEnergyToCheckRecipe() {
-        return getBaseMetaTileEntity().isUniversalEnergyStored(getMinimumStoredEU() / 2);
-    }
-
-    protected boolean drainEnergyForProcess(long aEUt) {
-        return getBaseMetaTileEntity().decreaseStoredEnergyUnits(aEUt, false);
-    }
-
-    protected void calculateOverclockedNess(GT_Recipe aRecipe) {
-        calculateOverclockedNess(aRecipe.mEUt, aRecipe.mDuration);
-    }
-
-    protected void calculateOverclockedNess(int aEUt, int aDuration) {
-        if (aEUt <= 16) {
-            mEUt = aEUt * (1 << (mTier - 1)) * (1 << (mTier - 1));
-            mMaxProgresstime = aDuration / (1 << (mTier - 1));
-        } else {
-            mEUt = aEUt;
-            mMaxProgresstime = aDuration;
-            while (mEUt <= V[mTier - 1] * mAmperage) {
-                mEUt *= 4;
-                mMaxProgresstime /= 2;
-            }
-        }
-    }
-
-    protected ItemStack getSpecialSlot() {
-        return mInventory[3];
-    }
-
-    protected ItemStack getOutputAt(int aIndex) {
-        return mInventory[getOutputSlot() + aIndex];
-    }
-
-    protected ItemStack[] getAllOutputs() {
-        ItemStack[] rOutputs = new ItemStack[mOutputItems.length];
-        for (int i = 0; i < mOutputItems.length; i++) rOutputs[i] = getOutputAt(i);
-        return rOutputs;
-    }
-
-    protected boolean canOutput(GT_Recipe aRecipe) {
-        return aRecipe != null && (aRecipe.mNeedsEmptyOutput ? isOutputEmpty() && getDrainableStack() == null
-                : canOutput(aRecipe.getFluidOutput(0)) && canOutput(aRecipe.mOutputs));
-    }
-
-    protected boolean canOutput(ItemStack... aOutputs) {
-        if (aOutputs == null) return true;
-        ItemStack[] tOutputSlots = getAllOutputs();
-        for (int i = 0; i < tOutputSlots.length && i < aOutputs.length; i++)
-            if (tOutputSlots[i] != null && aOutputs[i] != null
-                    && (!GT_Utility.areStacksEqual(tOutputSlots[i], aOutputs[i], false)
-                            || tOutputSlots[i].stackSize + aOutputs[i].stackSize > tOutputSlots[i].getMaxStackSize())) {
-                                mOutputBlocked++;
-                                return false;
-                            }
-        return true;
-    }
-
-    protected boolean canOutput(FluidStack aOutput) {
-        return getDrainableStack() == null || aOutput == null
-                || (getDrainableStack().isFluidEqual(aOutput) && (getDrainableStack().amount <= 0
-                        || getDrainableStack().amount + aOutput.amount <= getCapacity()));
-    }
-
-    protected ItemStack getInputAt(int aIndex) {
-        return mInventory[getInputSlot() + aIndex];
-    }
-
-    protected ItemStack[] getAllInputs() {
-        ItemStack[] rInputs = new ItemStack[mInputSlotCount];
-        for (int i = 0; i < mInputSlotCount; i++) rInputs[i] = getInputAt(i);
-        return rInputs;
-    }
-
-    protected boolean isOutputEmpty() {
-        boolean rIsEmpty = true;
-        for (ItemStack tOutputSlotContent : getAllOutputs()) if (tOutputSlotContent != null) rIsEmpty = false;
-        return rIsEmpty;
-    }
-
-    protected boolean displaysInputFluid() {
-        return true;
-    }
-
-    protected boolean displaysOutputFluid() {
-        return true;
-    }
-
-    @Override
-    public void onValueUpdate(byte aValue) {
-        mMainFacing = ForgeDirection.getOrientation(aValue);
-    }
-
-    @Override
-    public byte getUpdateData() {
-        return (byte) mMainFacing.ordinal();
-    }
-
-    @Override
-    public void doSound(byte aIndex, double aX, double aY, double aZ) {
-        super.doSound(aIndex, aX, aY, aZ);
-        if (aIndex == 8) GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(210), 100, 1.0F, aX, aY, aZ);
-    }
-
-    public boolean doesAutoOutput() {
-        return mItemTransfer;
-    }
-
-    public boolean doesAutoOutputFluids() {
-        return mFluidTransfer;
-    }
-
-    public boolean allowToCheckRecipe() {
-        return true;
-    }
-
-    public boolean showPipeFacing() {
-        return true;
-    }
-
-    /**
-     * Called whenever the Machine successfully started a Process, useful for Sound Effects
-     */
-    public void startProcess() {
-        //
-    }
-
-    /**
-     * Called whenever the Machine successfully finished a Process, useful for Sound Effects
-     */
-    public void endProcess() {
-        //
-    }
-
-    /**
-     * Called whenever the Machine aborted a Process, useful for Sound Effects
-     */
-    public void abortProcess() {
-        //
-    }
-
-    /**
-     * Called whenever the Machine aborted a Process but still works on it, useful for Sound Effects
-     */
-    public void stutterProcess() {
-        if (useStandardStutterSound()) sendSound((byte) 8);
-    }
-
-    /**
-     * If this Machine can have the Insufficient Energy Line Problem
-     */
-    public boolean canHaveInsufficientEnergy() {
-        return true;
-    }
-
-    public boolean useStandardStutterSound() {
-        return true;
-    }
-
-    @Override
-    public String[] getInfoData() {
-        return new String[] { mNEIName, "Progress:", (mProgresstime / 20) + " secs", (mMaxProgresstime / 20) + " secs",
-                "Stored Energy:", getBaseMetaTileEntity().getStoredEU() + "EU",
-                getBaseMetaTileEntity().getEUCapacity() + "EU" };
-    }
-
-    @Override
-    public boolean isGivingInformation() {
-        return true;
-    }
-
-    @Override
-    public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
-        if (side == getBaseMetaTileEntity().getFrontFacing() || side == mMainFacing) {
-            mAllowInputFromOutputSide = !mAllowInputFromOutputSide;
-            GT_Utility.sendChatToPlayer(
-                    aPlayer,
-                    mAllowInputFromOutputSide ? ("Input from Output Side allowed")
-                            : ("Input from Output Side forbidden"));
-        }
-    }
-
-    @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID) {
-        return (side != mMainFacing || GregTech_API.getCoverBehavior(aCoverID.toStack())
-                .isGUIClickable(side, GT_Utility.stackToInt(aCoverID.toStack()), 0, getBaseMetaTileEntity()));
-    }
-
-    @Override
-    public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
-            ItemStack aStack) {
-        return side != mMainFacing && aIndex >= getOutputSlot() && aIndex < getOutputSlot() + mOutputItems.length;
-    }
-
-    @Override
-    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
-            ItemStack aStack) {
-        if (side == mMainFacing || aIndex < getInputSlot()
-                || aIndex >= getInputSlot() + mInputSlotCount
-                || (!mAllowInputFromOutputSide && side == aBaseMetaTileEntity.getFrontFacing()))
-            return false;
-        for (int i = getInputSlot(), j = i + mInputSlotCount; i < j; i++)
-            if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(aStack), mInventory[i])) return i == aIndex;
-        return true;
-    }
-
-    /**
-     * @return the Recipe List which is used for this Machine, this is a useful Default Handler
-     */
-    public GT_Recipe_Map getRecipeList() {
-        return null;
-    }
-
-    /**
-     * Override this to check the Recipes yourself, super calls to this could be useful if you just want to add a
-     * special case
-     * <p/>
-     * I thought about Enum too, but Enum doesn't add support for people adding other return Systems.
-     * <p/>
-     * Funny how Eclipse marks the word Enum as not correctly spelled.
-     *
-     * @return see constants above
-     */
-    public int checkRecipe() {
-        return checkRecipe(false);
-    }
-
-    public static boolean isValidForLowGravity(GT_Recipe tRecipe, int dimId) {
-        return // TODO check or get a better solution
-        DimensionManager.getProvider(dimId).getClass().getName().contains("Orbit")
-                || DimensionManager.getProvider(dimId).getClass().getName().endsWith("Space")
-                || DimensionManager.getProvider(dimId).getClass().getName().endsWith("Asteroids")
-                || DimensionManager.getProvider(dimId).getClass().getName().endsWith("SS")
-                || DimensionManager.getProvider(dimId).getClass().getName().contains("SpaceStation");
-    }
-
-    /**
-     *
-     * @param skipOC disables OverclockedNess calculation and check - if you do you must implement your own method...
-     * @return
-     */
-    public int checkRecipe(boolean skipOC) {
-        GT_Recipe_Map tMap = getRecipeList();
-        if (tMap == null) return DID_NOT_FIND_RECIPE;
-        GT_Recipe tRecipe = tMap.findRecipe(
-                getBaseMetaTileEntity(),
-                mLastRecipe,
-                false,
-                V[mTier],
-                new FluidStack[] { getFillableStack() },
-                getSpecialSlot(),
-                getAllInputs());
-        if (tRecipe == null) return DID_NOT_FIND_RECIPE;
-
-        if (false && tRecipe.mSpecialValue == -100
-                && !isValidForLowGravity(tRecipe, getBaseMetaTileEntity().getWorld().provider.dimensionId))
-            return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
-        if (tRecipe.mCanBeBuffered) mLastRecipe = tRecipe;
-        if (!canOutput(tRecipe)) {
-            mOutputBlocked++;
-            return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
-        }
-        if (!tRecipe.isRecipeInputEqual(true, new FluidStack[] { getFillableStack() }, getAllInputs()))
-            return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
-        for (int i = 0; i < mOutputItems.length; i++)
-            if (getBaseMetaTileEntity().getRandomNumber(10000) < tRecipe.getOutputChance(i))
-                mOutputItems[i] = tRecipe.getOutput(i);
-        mOutputFluid = tRecipe.getFluidOutput(0);
-        calculateOverclockedNess(tRecipe);
-        return FOUND_AND_SUCCESSFULLY_USED_RECIPE;
-    }
-
-    public ITexture[] getSideFacingActive(byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
-    }
-
-    public ITexture[] getSideFacingInactive(byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
-    }
-
-    public ITexture[] getFrontFacingActive(byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
-    }
-
-    public ITexture[] getFrontFacingInactive(byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
-    }
-
-    public ITexture[] getTopFacingActive(byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
-    }
-
-    public ITexture[] getTopFacingInactive(byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
-    }
-
-    public ITexture[] getBottomFacingActive(byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
-    }
-
-    public ITexture[] getBottomFacingInactive(byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
-    }
-
-    public ITexture[] getBottomFacingPipeActive(byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
-    }
-
-    public ITexture[] getBottomFacingPipeInactive(byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
-    }
-
-    public ITexture[] getTopFacingPipeActive(byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
-    }
-
-    public ITexture[] getTopFacingPipeInactive(byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
-    }
-
-    public ITexture[] getSideFacingPipeActive(byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
-    }
-
-    public ITexture[] getSideFacingPipeInactive(byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java
deleted file mode 100644
index 0298fe866d..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java
+++ /dev/null
@@ -1,362 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-
-import gregtech.api.enums.ItemList;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.Logger;
-
-/**
- * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
- * <p/>
- * This is the main construct for my generic Tanks. Filling and emptying behavior have to be implemented manually
- */
-public abstract class GT_MetaTileEntity_DeluxeTank extends GT_MetaTileEntity_BasicTank {
-
-    public FluidStack mFluid2;
-
-    /**
-     * @param aInvSlotCount should be 3
-     */
-    public GT_MetaTileEntity_DeluxeTank(final int aID, final String aName, final String aNameRegional, final int aTier,
-            final int aInvSlotCount, final String aDescription, final ITexture... aTextures) {
-        super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
-    }
-
-    public GT_MetaTileEntity_DeluxeTank(final String aName, final int aTier, final int aInvSlotCount,
-            final String aDescription, final ITexture[][][] aTextures) {
-        super(aName, aTier, aInvSlotCount, aDescription, aTextures);
-    }
-
-    @Override
-    public boolean isSimpleMachine() {
-        return false;
-    }
-
-    @Override
-    public boolean isValidSlot(final int aIndex) {
-        return aIndex != this.getStackDisplaySlot();
-    }
-
-    @Override
-    public void saveNBTData(final NBTTagCompound aNBT) {
-        if (this.mFluid != null) {
-            aNBT.setTag("mFluid", this.mFluid.writeToNBT(new NBTTagCompound()));
-        }
-        if (this.mFluid2 != null) {
-            aNBT.setTag("mFluid2", this.mFluid2.writeToNBT(new NBTTagCompound()));
-        }
-    }
-
-    @Override
-    public void loadNBTData(final NBTTagCompound aNBT) {
-        this.mFluid = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid"));
-        this.mFluid2 = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid2"));
-    }
-
-    @Override
-    public abstract boolean doesFillContainers();
-
-    @Override
-    public abstract boolean doesEmptyContainers();
-
-    @Override
-    public abstract boolean canTankBeFilled();
-
-    @Override
-    public abstract boolean canTankBeEmptied();
-
-    @Override
-    public abstract boolean displaysItemStack();
-
-    @Override
-    public abstract boolean displaysStackSize();
-
-    @Override
-    public int getInputSlot() {
-        return 0;
-    }
-
-    @Override
-    public int getOutputSlot() {
-        return 1;
-    }
-
-    @Override
-    public int getStackDisplaySlot() {
-        return 2;
-    }
-
-    public int getStackDisplaySlot2() {
-        return 3;
-    }
-
-    @Override
-    public boolean isFluidInputAllowed(final FluidStack aFluid) {
-        return true;
-    }
-
-    @Override
-    public boolean isFluidChangingAllowed() {
-        return true;
-    }
-
-    @Override
-    public FluidStack getFillableStack() {
-        return this.getFillableStackEx(1);
-    }
-
-    public FluidStack getFillableStackEx(final int stackID) {
-        if (stackID <= 1) {
-            return this.mFluid;
-        }
-        return this.mFluid2;
-    }
-
-    @Override
-    public FluidStack setFillableStack(final FluidStack aFluid) {
-        this.mFluid = aFluid;
-        return this.mFluid;
-    }
-
-    public FluidStack setFillableStack2(final FluidStack aFluid) {
-        this.mFluid2 = aFluid;
-        return this.mFluid2;
-    }
-
-    @Override
-    public FluidStack getDrainableStack() {
-        return this.getDrainableStackEx(1);
-    }
-
-    public FluidStack getDrainableStackEx(final int stackID) {
-        if (stackID <= 1) {
-            return this.mFluid;
-        }
-        return this.mFluid2;
-    }
-
-    @Override
-    public FluidStack setDrainableStack(final FluidStack aFluid) {
-        this.mFluid = aFluid;
-        return this.mFluid;
-    }
-
-    @Override
-    public FluidStack getDisplayedFluid() {
-        return this.getDrainableStack();
-    }
-
-    @Override
-    public void onPreTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) {
-        if (aBaseMetaTileEntity.isServerSide()) {
-            if (this.isFluidChangingAllowed() && (this.getFillableStack() != null)
-                    && (this.getFillableStack().amount <= 0)) {
-                this.setFillableStack(null);
-            }
-
-            if (this.displaysItemStack() && (this.getStackDisplaySlot() >= 0)
-                    && (this.getStackDisplaySlot() < this.mInventory.length)) {
-                if (this.getDisplayedFluid() == null) {
-                    if (ItemList.Display_Fluid.isStackEqual(this.mInventory[this.getStackDisplaySlot()], true, true)) {
-                        this.mInventory[this.getStackDisplaySlot()] = null;
-                    }
-                } else {
-                    this.mInventory[this.getStackDisplaySlot()] = GT_Utility
-                            .getFluidDisplayStack(this.getDisplayedFluid(), this.displaysStackSize());
-                }
-            }
-
-            if (this.displaysItemStack() && (this.getStackDisplaySlot2() >= 0)
-                    && (this.getStackDisplaySlot2() < this.mInventory.length)) {
-                if (this.getDrainableStackEx(2) == null) {
-                    if (ItemList.Display_Fluid.isStackEqual(this.mInventory[this.getStackDisplaySlot2()], true, true)) {
-                        this.mInventory[this.getStackDisplaySlot2()] = null;
-                    }
-                } else {
-                    this.mInventory[this.getStackDisplaySlot2()] = GT_Utility
-                            .getFluidDisplayStack(this.getDrainableStackEx(2), this.displaysStackSize());
-                }
-            }
-
-            if (this.doesEmptyContainers()) {
-                final FluidStack tFluid = GT_Utility.getFluidForFilledItem(this.mInventory[this.getInputSlot()], true);
-                if ((tFluid != null) && this.isFluidInputAllowed(tFluid)) {
-
-                    if (tFluid.isFluidEqual(this.getDrainableStackEx(1)) || (this.getDrainableStackEx(1) == null)) {
-                        if (this.getFillableStackEx(1) == null) {
-                            if (this.isFluidInputAllowed(tFluid) && (tFluid.amount <= this.getCapacity())) {
-                                if (aBaseMetaTileEntity.addStackToSlot(
-                                        this.getOutputSlot(),
-                                        GT_Utility.getContainerItem(this.mInventory[this.getInputSlot()], true),
-                                        1)) {
-                                    this.setFillableStack(tFluid.copy());
-                                    aBaseMetaTileEntity.decrStackSize(this.getInputSlot(), 1);
-                                }
-                            }
-                        } else {
-                            if (tFluid.isFluidEqual(this.getFillableStack())
-                                    && ((tFluid.amount + this.getFillableStack().amount) <= this.getCapacity())) {
-                                if (aBaseMetaTileEntity.addStackToSlot(
-                                        this.getOutputSlot(),
-                                        GT_Utility.getContainerItem(this.mInventory[this.getInputSlot()], true),
-                                        1)) {
-                                    this.getFillableStack().amount += tFluid.amount;
-                                    aBaseMetaTileEntity.decrStackSize(this.getInputSlot(), 1);
-                                }
-                            }
-                        }
-                    } else
-                        if (tFluid.isFluidEqual(this.getDrainableStackEx(2)) || (this.getDrainableStackEx(2) == null)) {
-                            if (this.getFillableStackEx(2) == null) {
-                                if (this.isFluidInputAllowed(tFluid) && (tFluid.amount <= this.getCapacity())) {
-                                    if (aBaseMetaTileEntity.addStackToSlot(
-                                            this.getOutputSlot(),
-                                            GT_Utility.getContainerItem(this.mInventory[this.getInputSlot()], true),
-                                            1)) {
-                                        this.setFillableStack2(tFluid.copy());
-                                        aBaseMetaTileEntity.decrStackSize(this.getInputSlot(), 1);
-                                    }
-                                }
-                            } else {
-                                if (tFluid.isFluidEqual(this.getFillableStackEx(2))
-                                        && ((tFluid.amount + this.getFillableStackEx(2).amount)
-                                                <= this.getCapacity())) {
-                                    if (aBaseMetaTileEntity.addStackToSlot(
-                                            this.getOutputSlot(),
-                                            GT_Utility.getContainerItem(this.mInventory[this.getInputSlot()], true),
-                                            1)) {
-                                        this.getFillableStackEx(2).amount += tFluid.amount;
-                                        aBaseMetaTileEntity.decrStackSize(this.getInputSlot(), 1);
-                                    }
-                                }
-                            }
-                        } else {
-                            Logger.INFO("Something broke when trying to empty cells between two fluid tank areas.");
-                        }
-                }
-            }
-
-            if (this.doesFillContainers()) {
-                final ItemStack tOutput = GT_Utility.fillFluidContainer(
-                        this.getDrainableStack(),
-                        this.mInventory[this.getInputSlot()],
-                        false,
-                        true);
-                if ((tOutput != null) && aBaseMetaTileEntity.addStackToSlot(this.getOutputSlot(), tOutput, 1)) {
-                    final FluidStack tFluid = GT_Utility.getFluidForFilledItem(tOutput, true);
-                    aBaseMetaTileEntity.decrStackSize(this.getInputSlot(), 1);
-                    if (tFluid != null) {
-                        this.getDrainableStack().amount -= tFluid.amount;
-                    }
-                    if ((this.getDrainableStack().amount <= 0) && this.isFluidChangingAllowed()) {
-                        this.setDrainableStack(null);
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public FluidStack getFluid() {
-        return this.getDrainableStack();
-    }
-
-    @Override
-    public int getFluidAmount() {
-        return this.getDrainableStack() != null ? this.getDrainableStack().amount : 0;
-    }
-
-    @Override
-    public int fill(final FluidStack aFluid, final boolean doFill) {
-        if ((aFluid == null) || (aFluid.getFluid().getID() <= 0)
-                || (aFluid.amount <= 0)
-                || !this.canTankBeFilled()
-                || !this.isFluidInputAllowed(aFluid)) {
-            return 0;
-        }
-
-        if ((this.getFillableStack() == null) || (this.getFillableStack().getFluid().getID() <= 0)) {
-            if (aFluid.amount <= this.getCapacity()) {
-                if (doFill) {
-                    this.setFillableStack(aFluid.copy());
-                    this.getBaseMetaTileEntity().markDirty();
-                }
-                return aFluid.amount;
-            }
-            if (doFill) {
-                this.setFillableStack(aFluid.copy());
-                this.getFillableStack().amount = this.getCapacity();
-                this.getBaseMetaTileEntity().markDirty();
-            }
-            return this.getCapacity();
-        }
-
-        if (!this.getFillableStack().isFluidEqual(aFluid)) {
-            return 0;
-        }
-
-        final int space = this.getCapacity() - this.getFillableStack().amount;
-        if (aFluid.amount <= space) {
-            if (doFill) {
-                this.getFillableStack().amount += aFluid.amount;
-                this.getBaseMetaTileEntity().markDirty();
-            }
-            return aFluid.amount;
-        }
-        if (doFill) {
-            this.getFillableStack().amount = this.getCapacity();
-        }
-        return space;
-    }
-
-    @Override
-    public FluidStack drain(final int maxDrain, final boolean doDrain) {
-        if ((this.getDrainableStack() == null) || !this.canTankBeEmptied()) {
-            return null;
-        }
-        if ((this.getDrainableStack().amount <= 0) && this.isFluidChangingAllowed()) {
-            this.setDrainableStack(null);
-            this.getBaseMetaTileEntity().markDirty();
-            return null;
-        }
-
-        int used = maxDrain;
-        if (this.getDrainableStack().amount < used) {
-            used = this.getDrainableStack().amount;
-        }
-
-        if (doDrain) {
-            this.getDrainableStack().amount -= used;
-            this.getBaseMetaTileEntity().markDirty();
-        }
-
-        final FluidStack drained = this.getDrainableStack().copy();
-        drained.amount = used;
-
-        if ((this.getDrainableStack().amount <= 0) && this.isFluidChangingAllowed()) {
-            this.setDrainableStack(null);
-            this.getBaseMetaTileEntity().markDirty();
-        }
-
-        return drained;
-    }
-
-    @Override
-    public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex,
-            final ForgeDirection side, final ItemStack aStack) {
-        return aIndex == this.getOutputSlot();
-    }
-
-    @Override
-    public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex,
-            final ForgeDirection side, final ItemStack aStack) {
-        return aIndex == this.getInputSlot();
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java
index 7d1b186536..69a9c67d57 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java
@@ -10,6 +10,8 @@ import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
+import com.gtnewhorizons.modularui.common.widget.FluidSlotWidget;
+
 import gregtech.GT_Mod;
 import gregtech.api.gui.modularui.GT_UIInfos;
 import gregtech.api.interfaces.ITexture;
@@ -18,7 +20,6 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Utility;
-import gregtech.common.gui.modularui.widget.FluidDisplaySlotWidget;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 
@@ -211,7 +212,7 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H
     }
 
     @Override
-    protected FluidDisplaySlotWidget createDrainableFluidSlot() {
-        return super.createDrainableFluidSlot().setEmptyCanFillFilter(s -> s == mLockedFluid);
+    protected FluidSlotWidget createFluidSlot() {
+        return super.createFluidSlot().setFilter(f -> f == mLockedFluid);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java
deleted file mode 100644
index c70bf27467..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java
+++ /dev/null
@@ -1,477 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators;
-
-import static gregtech.api.enums.GT_Values.V;
-
-import java.util.Collection;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-
-import gregtech.api.enums.Textures;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_DeluxeTank;
-
-public abstract class GregtechDoubleFuelGeneratorBase extends GT_MetaTileEntity_DeluxeTank {
-
-    private boolean useFuel = false;
-
-    public GregtechDoubleFuelGeneratorBase(final int aID, final String aName, final String aNameRegional,
-            final int aTier, final String aDescription, final ITexture... aTextures) {
-        super(aID, aName, aNameRegional, aTier, 4, aDescription, aTextures);
-    }
-
-    public GregtechDoubleFuelGeneratorBase(final String aName, final int aTier, final String aDescription,
-            final ITexture[][][] aTextures) {
-        super(aName, aTier, 4, aDescription, aTextures);
-    }
-
-    @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];
-    }
-
-    @Override
-    public String[] getDescription() {
-        return new String[] { this.mDescription, "Fuel Efficiency: " + this.getEfficiency() + "%" };
-    }
-
-    /*
-     * @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { if
-     * (aBaseMetaTileEntity.isClientSide()) return true; aBaseMetaTileEntity.openGUI(aPlayer); return true; }
-     */
-
-    @Override
-    public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
-        if (aBaseMetaTileEntity.isClientSide()) {
-            Logger.WARNING("Entity is Client side, simply returning true");
-            return true;
-        }
-        Logger.WARNING(
-                "Entity is not Client side, opening entity Container and by extension, it's GUI, then returning true");
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
-        return true;
-    }
-
-    public ITexture[] getFront(final byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
-    }
-
-    public ITexture[] getBack(final byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
-    }
-
-    public ITexture[] getBottom(final byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
-    }
-
-    public ITexture[] getTop(final byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
-    }
-
-    public ITexture[] getSides(final byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
-    }
-
-    public ITexture[] getFrontActive(final byte aColor) {
-        return this.getFront(aColor);
-    }
-
-    public ITexture[] getBackActive(final byte aColor) {
-        return this.getBack(aColor);
-    }
-
-    public ITexture[] getBottomActive(final byte aColor) {
-        return this.getBottom(aColor);
-    }
-
-    public ITexture[] getTopActive(final byte aColor) {
-        return this.getTop(aColor);
-    }
-
-    public ITexture[] getSidesActive(final byte aColor) {
-        return this.getSides(aColor);
-    }
-
-    @Override
-    public boolean isFacingValid(final ForgeDirection side) {
-        return side.offsetY == 0;
-    }
-
-    @Override
-    public boolean isSimpleMachine() {
-        return false;
-    }
-
-    @Override
-    public boolean isValidSlot(final int aIndex) {
-        return aIndex < 2;
-    }
-
-    @Override
-    public boolean isEnetOutput() {
-        return true;
-    }
-
-    @Override
-    public boolean isOutputFacing(final ForgeDirection side) {
-        return true;
-    }
-
-    @Override
-    public boolean isAccessAllowed(final EntityPlayer aPlayer) {
-        return true;
-    }
-
-    @Override
-    public long maxEUOutput() {
-        return this.getBaseMetaTileEntity().isAllowedToWork() ? V[this.mTier] : 0;
-    }
-
-    @Override
-    public long maxEUStore() {
-        return Math.max(this.getEUVar(), (V[this.mTier] * 115) + this.getMinimumStoredEU());
-    }
-
-    @Override
-    public boolean doesFillContainers() {
-        return this.getBaseMetaTileEntity().isAllowedToWork();
-    }
-
-    @Override
-    public boolean doesEmptyContainers() {
-        return this.getBaseMetaTileEntity().isAllowedToWork();
-    }
-
-    @Override
-    public boolean canTankBeFilled() {
-        return this.getBaseMetaTileEntity().isAllowedToWork();
-    }
-
-    @Override
-    public boolean canTankBeEmptied() {
-        return this.getBaseMetaTileEntity().isAllowedToWork();
-    }
-
-    @Override
-    public boolean displaysItemStack() {
-        return true;
-    }
-
-    @Override
-    public boolean displaysStackSize() {
-        return false;
-    }
-
-    @Override
-    public boolean isFluidInputAllowed(final FluidStack aFluid) {
-        return this.getFuelValue(aFluid) > 0;
-    }
-
-    @Override
-    public long getMinimumStoredEU() {
-        return 512;
-    }
-
-    @Override
-    public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) {
-        if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && ((aTick % 10) == 0)) {
-            if (this.mFluid == null) {
-                if (aBaseMetaTileEntity.getUniversalEnergyStored() < (this.maxEUOutput() + this.getMinimumStoredEU())) {
-                    this.mInventory[this.getStackDisplaySlot()] = null;
-                } else {
-                    if (this.mInventory[this.getStackDisplaySlot()] == null) {
-                        this.mInventory[this.getStackDisplaySlot()] = new ItemStack(Blocks.fire, 1);
-                    }
-                    this.mInventory[this.getStackDisplaySlot()].setStackDisplayName(
-                            "Generating: "
-                                    + (aBaseMetaTileEntity.getUniversalEnergyStored() - this.getMinimumStoredEU())
-                                    + " EU");
-                }
-            } else {
-                if ((this.mFluid != null) && (this.mFluid2 != null)) {
-                    final int tFuelValue = this.getFuelValue(this.mFluid),
-                            tConsumed = this.consumedFluidPerOperation(this.mFluid);
-                    final int tFuelValue2 = this.getFuelValue(this.mFluid2),
-                            tConsumed2 = this.consumedFluidPerOperation(this.mFluid2);
-                    if (((tFuelValue > 0) && (tConsumed > 0)
-                            && (this.mFluid.amount > tConsumed)) /*
-                                                                  * && (tFuelValue2 > 0 && tConsumed2 > 0 &&
-                                                                  * mFluid2.amount > tConsumed2)
-                                                                  */) {
-
-                        Logger.WARNING("tFuelValue: " + tFuelValue);
-                        Logger.WARNING("tConsumed: " + tConsumed);
-                        Logger.WARNING("mFluid.name: " + this.mFluid.getFluid().getName());
-                        Logger.WARNING("mFluid.amount: " + this.mFluid.amount);
-                        Logger.WARNING("mFluid.amount > tConsumed: " + (this.mFluid.amount > tConsumed));
-
-                        Logger.WARNING("=========================================================");
-
-                        Logger.WARNING("tFuelValue2: " + tFuelValue2);
-                        Logger.WARNING("tConsumed2: " + tConsumed2);
-                        Logger.WARNING("mFluid2.name: " + this.mFluid2.getFluid().getName());
-                        Logger.WARNING("mFluid2.amount: " + this.mFluid2.amount);
-                        Logger.WARNING("mFluid2.amount > tConsumed2: " + (this.mFluid2.amount > tConsumed2));
-                        long tFluidAmountToUse = Math.min(
-                                this.mFluid.amount / tConsumed,
-                                (((this.maxEUOutput() * 30) + this.getMinimumStoredEU())
-                                        - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue);
-                        long tFluidAmountToUse2 = Math.min(
-                                this.mFluid2.amount / tConsumed2,
-                                (((this.maxEUOutput() * 30) + this.getMinimumStoredEU())
-                                        - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue2);
-
-                        if (tFluidAmountToUse <= 0) {
-                            /*
-                             * if ((mFluid.amount / tConsumed) == getCapacity()){ tFluidAmountToUse = 1; }
-                             */
-
-                            if (aBaseMetaTileEntity.getUniversalEnergyStored() <= (aBaseMetaTileEntity.getEUCapacity()
-                                    - aBaseMetaTileEntity.getUniversalEnergyStored())) {
-                                tFluidAmountToUse = 1;
-                                Logger.WARNING("=========================================================");
-                                Logger.WARNING("tFluidAmountToUse - Updated: " + tFluidAmountToUse);
-                                Logger.WARNING("=========================================================");
-                            }
-                        }
-
-                        if (tFluidAmountToUse2 <= 0) {
-                            /*
-                             * if ((mFluid2.amount / tConsumed) == getCapacity()){ tFluidAmountToUse2 = 1; }
-                             */
-                            if (aBaseMetaTileEntity.getUniversalEnergyStored() <= (aBaseMetaTileEntity.getEUCapacity()
-                                    - aBaseMetaTileEntity.getUniversalEnergyStored())) {
-                                tFluidAmountToUse2 = 1;
-                                Logger.WARNING("=========================================================");
-                                Logger.WARNING("tFluidAmountToUse2 - Updated: " + tFluidAmountToUse2);
-                                Logger.WARNING("=========================================================");
-                            }
-                        }
-
-                        Logger.WARNING("=========================================================");
-                        Logger.WARNING("tFluidAmountToUse: " + tFluidAmountToUse);
-                        Logger.WARNING("=========================================================");
-
-                        /*
-                         * Utils.LOG_WARNING("mFluid.amount / tConsumed: "+("fluidAmount:"+mFluid.amount)+(" tConsumed:"
-                         * +tConsumed)+" | "+(mFluid.amount / tConsumed));
-                         * Utils.LOG_WARNING("maxEUOutput() * 20 + getMinimumStoredEU(): "+(maxEUOutput() * 30 +
-                         * getMinimumStoredEU())); Utils.LOG_WARNING("maxEUOutput(): "+maxEUOutput());
-                         * Utils.LOG_WARNING("maxEUOutput() * 20: "+(maxEUOutput() * 30));
-                         * Utils.LOG_WARNING("getMinimumStoredEU(): "+(getMinimumStoredEU()));
-                         * Utils.LOG_WARNING("aBaseMetaTileEntity.getUniversalEnergyStored(): "+(aBaseMetaTileEntity.
-                         * getUniversalEnergyStored())); Utils.
-                         * LOG_WARNING("(maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()): "
-                         * +((maxEUOutput() * 30 + getMinimumStoredEU() -
-                         * aBaseMetaTileEntity.getUniversalEnergyStored())));
-                         * Utils.LOG_WARNING("tFuelValue: "+(tFuelValue)); Utils.
-                         * LOG_WARNING("(maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue): "
-                         * +((maxEUOutput() * 30 + getMinimumStoredEU() -
-                         * aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue));
-                         */
-
-                        Logger.WARNING("=========================================================");
-                        Logger.WARNING("tFluidAmountToUse2: " + tFluidAmountToUse2);
-                        Logger.WARNING("=========================================================");
-
-                        /*
-                         * Utils.LOG_WARNING("mFluid2.amount / tConsumed2: "+("fluidAmount2:"+mFluid2.amount)+
-                         * (" tConsumed2:"+tConsumed2)+" | "+(mFluid2.amount / tConsumed2));
-                         * Utils.LOG_WARNING("maxEUOutput() * 20 + getMinimumStoredEU(): "+(maxEUOutput() * 30 +
-                         * getMinimumStoredEU())); Utils.LOG_WARNING("maxEUOutput(): "+maxEUOutput());
-                         * Utils.LOG_WARNING("maxEUOutput() * 20: "+(maxEUOutput() * 30));
-                         * Utils.LOG_WARNING("getMinimumStoredEU(): "+(getMinimumStoredEU()));
-                         * Utils.LOG_WARNING("aBaseMetaTileEntity.getUniversalEnergyStored(): "+(aBaseMetaTileEntity.
-                         * getUniversalEnergyStored())); Utils.
-                         * LOG_WARNING("(maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()): "
-                         * +((maxEUOutput() * 30 + getMinimumStoredEU() -
-                         * aBaseMetaTileEntity.getUniversalEnergyStored())));
-                         * Utils.LOG_WARNING("tFuelValue2: "+(tFuelValue2)); Utils.
-                         * LOG_WARNING("(maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue2): "
-                         * +((maxEUOutput() * 30 + getMinimumStoredEU() -
-                         * aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue2));
-                         */
-                        if (((tFluidAmountToUse > 0)
-                                && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true))
-                                && ((tFluidAmountToUse2 > 0) && aBaseMetaTileEntity
-                                        .increaseStoredEnergyUnits(tFluidAmountToUse2 * tFuelValue2, true))) {
-
-                            Logger.WARNING("tFuelValue: " + tFuelValue);
-                            Logger.WARNING("tConsumed: " + tConsumed);
-                            Logger.WARNING("mFluid.name: " + this.mFluid.getFluid().getName());
-                            Logger.WARNING("mFluid.amount: " + this.mFluid.amount);
-                            Logger.WARNING("mFluid.amount > tConsumed: " + (this.mFluid.amount > tConsumed));
-
-                            Logger.WARNING("=========================================================");
-
-                            Logger.WARNING("tFuelValue2: " + tFuelValue2);
-                            Logger.WARNING("tConsumed2: " + tConsumed2);
-                            Logger.WARNING("mFluid2.name: " + this.mFluid2.getFluid().getName());
-                            Logger.WARNING("mFluid2.amount: " + this.mFluid2.amount);
-                            Logger.WARNING("mFluid2.amount > tConsumed2: " + (this.mFluid2.amount > tConsumed2));
-
-                            if (this.useFuel) {
-                                this.mFluid.amount -= tFluidAmountToUse * tConsumed;
-                                this.mFluid2.amount -= tFluidAmountToUse2 * tConsumed2;
-                                this.useFuel = false;
-                            } else {
-                                this.useFuel = true;
-                            }
-
-                        } else {
-                            Logger.WARNING("=========================================================");
-                            Logger.WARNING(
-                                    "Either tFluidAmountToUse1 <= 0, power cannot be increased of tFluidAmountToUse2 <= 0");
-                            Logger.WARNING("tFluidAmountToUse1: " + tFluidAmountToUse);
-                            Logger.WARNING("tFluidAmountToUse2: " + tFluidAmountToUse2);
-                        }
-                    } else {
-                        /*
-                         * Utils.
-                         * LOG_WARNING("(tFuelValue > 0 && tConsumed > 0 && mFluid.amount > tConsumed) && (tFuelValue2 > 0 && tConsumed2 > 0 && mFluid2.amount > tConsumed2)"
-                         * ); Utils.LOG_WARNING("tFuelValue: "+tFuelValue); Utils.LOG_WARNING("tConsumed: "+tConsumed);
-                         * Utils.LOG_WARNING("mFluid.amount: "+mFluid.amount);
-                         * Utils.LOG_WARNING("mFluid.amount > tConsumed: "+(mFluid.amount > tConsumed));
-                         * Utils.LOG_WARNING("=========================================================");
-                         * Utils.LOG_WARNING("tFuelValue2: "+tFuelValue2); Utils.LOG_WARNING("tConsumed2: "+tConsumed2);
-                         * Utils.LOG_WARNING("mFluid2.amount: "+mFluid2.amount);
-                         * Utils.LOG_WARNING("mFluid2.amount > tConsumed2: "+(mFluid2.amount > tConsumed2));
-                         */
-                    }
-                } else {
-                    Logger.WARNING("One mFluid is null");
-                    if (this.mFluid != null) {
-                        Logger.WARNING("mFluid1 is not null");
-                    }
-                    if (this.mFluid2 != null) {
-                        Logger.WARNING("mFluid2 is not null");
-                    }
-                }
-            }
-            if ((this.mInventory[this.getInputSlot()] != null)
-                    && (aBaseMetaTileEntity.getUniversalEnergyStored()
-                            < ((this.maxEUOutput() * 20) + this.getMinimumStoredEU()))
-                    && (GT_Utility.getFluidForFilledItem(this.mInventory[this.getInputSlot()], true) == null)) {
-                final int tFuelValue = this.getFuelValue(this.mInventory[this.getInputSlot()]);
-                if (tFuelValue > 0) {
-                    final ItemStack tEmptyContainer = this.getEmptyContainer(this.mInventory[this.getInputSlot()]);
-                    if (aBaseMetaTileEntity.addStackToSlot(this.getOutputSlot(), tEmptyContainer)) {
-                        aBaseMetaTileEntity.increaseStoredEnergyUnits(tFuelValue, true);
-                        aBaseMetaTileEntity.decrStackSize(this.getInputSlot(), 1);
-                    }
-                }
-            }
-        }
-
-        if (aBaseMetaTileEntity.isServerSide()) {
-            aBaseMetaTileEntity.setActive(
-                    aBaseMetaTileEntity.isAllowedToWork() && (aBaseMetaTileEntity.getUniversalEnergyStored()
-                            >= (this.maxEUOutput() + this.getMinimumStoredEU())));
-        }
-    }
-
-    public abstract GT_Recipe_Map getRecipes();
-
-    public abstract int getEfficiency();
-
-    public int consumedFluidPerOperation(final FluidStack aLiquid) {
-        return 1;
-    }
-
-    public int getFuelValue(final FluidStack aLiquid) {
-        if ((aLiquid == null) || (this.getRecipes() == null)) {
-            return 0;
-        }
-        FluidStack tLiquid;
-        final Collection<GT_Recipe> tRecipeList = this.getRecipes().mRecipeList;
-        if (tRecipeList != null) {
-            for (final GT_Recipe tFuel : tRecipeList) {
-                if ((tLiquid = GT_Utility.getFluidForFilledItem(tFuel.getRepresentativeInput(0), true)) != null) {
-                    if (aLiquid.isFluidEqual(tLiquid)) {
-                        return (int) (((long) tFuel.mSpecialValue * this.getEfficiency()
-                                * this.consumedFluidPerOperation(tLiquid)) / 100);
-                    }
-                }
-            }
-        }
-        return 0;
-    }
-
-    public int getFuelValue(final ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack) || (this.getRecipes() == null)) {
-            return 0;
-        }
-        final GT_Recipe tFuel = this.getRecipes()
-                .findRecipe(this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
-        if (tFuel != null) {
-            return (int) ((tFuel.mSpecialValue * 1000L * this.getEfficiency()) / 100);
-        }
-        return 0;
-    }
-
-    public ItemStack getEmptyContainer(final ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack) || (this.getRecipes() == null)) {
-            return null;
-        }
-        final GT_Recipe tFuel = this.getRecipes()
-                .findRecipe(this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
-        if (tFuel != null) {
-            return GT_Utility.copy(tFuel.getOutput(0));
-        }
-        return GT_Utility.getContainerItem(aStack, true);
-    }
-
-    @Override
-    public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex,
-            final ForgeDirection side, final ItemStack aStack) {
-        return super.allowPutStack(aBaseMetaTileEntity, aIndex, side, aStack) && ((this.getFuelValue(aStack) > 0)
-                || (this.getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true)) > 0));
-    }
-
-    @Override
-    public int getCapacity() {
-        return 32000;
-    }
-
-    @Override
-    public int getTankPressure() {
-        return -100;
-    }
-
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-}