Merge branch 'master' of https://github.com/draknyte1/GTplusplus

9 files changed, 868 insertions, 1697 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java
new file mode 100644
index 0000000000..2effc58f9a
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java
@@ -0,0 +1,327 @@
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+
+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.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_DeluxeTank;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_DeluxeTank;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
+/**
+ * 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 mFluid;
+	public FluidStack mFluid2;
+
+	/**
+	 * @param aInvSlotCount should be 3
+	 */
+	public GT_MetaTileEntity_DeluxeTank(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription, ITexture... aTextures) {
+		super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
+	}
+
+	public GT_MetaTileEntity_DeluxeTank(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
+		super(aName, aTier, aInvSlotCount, aDescription, aTextures);
+	}
+
+	@Override
+	public boolean isSimpleMachine() {
+		return false;
+	}
+
+	@Override
+	public boolean isValidSlot(int aIndex) {
+		return aIndex != getStackDisplaySlot();
+	}
+
+	@Override
+	public void saveNBTData(NBTTagCompound aNBT) {
+		if (mFluid != null) aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
+		if (mFluid2 != null) aNBT.setTag("mFluid2", mFluid2.writeToNBT(new NBTTagCompound()));
+	}
+
+	@Override
+	public void loadNBTData(NBTTagCompound aNBT) {
+		mFluid = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid"));
+		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(FluidStack aFluid) {
+		return true;
+	}
+
+	@Override
+	public boolean isFluidChangingAllowed() {
+		return true;
+	}
+
+	@Override
+	public FluidStack getFillableStack() {
+		return getFillableStackEx(1);
+	}
+
+	public FluidStack getFillableStackEx(int stackID) {
+		if (stackID <= 1){
+			return mFluid;
+		}
+		return mFluid2;
+	}
+
+	@Override
+	public FluidStack setFillableStack(FluidStack aFluid) {
+		mFluid = aFluid;
+		return mFluid;
+	}
+	
+	public FluidStack setFillableStack2(FluidStack aFluid) {
+		mFluid2 = aFluid;
+		return mFluid2;
+	}
+
+	@Override
+	public FluidStack getDrainableStack() {
+		return getDrainableStackEx(1);
+	}
+
+	public FluidStack getDrainableStackEx(int stackID) {
+		if (stackID <= 1){
+			return mFluid;
+		}
+		return mFluid2;
+	}
+
+	@Override
+	public FluidStack setDrainableStack(FluidStack aFluid) {
+		mFluid = aFluid;
+		return mFluid;
+	}
+
+	@Override
+	public FluidStack getDisplayedFluid() {
+		return getDrainableStack();
+	}
+
+	@Override
+	public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+		return new CONTAINER_DeluxeTank(aPlayerInventory, aBaseMetaTileEntity);
+	}
+
+	@Override
+	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+		return new GUI_DeluxeTank(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
+	}
+
+	@Override
+	public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+		if (aBaseMetaTileEntity.isServerSide()) {
+			if (isFluidChangingAllowed() && getFillableStack() != null && getFillableStack().amount <= 0)
+				setFillableStack(null);
+
+			if (displaysItemStack() && getStackDisplaySlot() >= 0 && getStackDisplaySlot() < mInventory.length) {
+				if (getDisplayedFluid() == null) {
+					if (ItemList.Display_Fluid.isStackEqual(mInventory[getStackDisplaySlot()], true, true))
+						mInventory[getStackDisplaySlot()] = null;
+				} else {
+					mInventory[getStackDisplaySlot()] = GT_Utility.getFluidDisplayStack(getDisplayedFluid(), displaysStackSize());
+				}
+			}
+
+			if (displaysItemStack() && getStackDisplaySlot2() >= 0 && getStackDisplaySlot2() < mInventory.length) {
+				if (getDrainableStackEx(2) == null) {
+					if (ItemList.Display_Fluid.isStackEqual(mInventory[getStackDisplaySlot2()], true, true))
+						mInventory[getStackDisplaySlot2()] = null;
+				} else {
+					mInventory[getStackDisplaySlot2()] = GT_Utility.getFluidDisplayStack(getDrainableStackEx(2), displaysStackSize());
+				}
+			}
+
+			if (doesEmptyContainers()) {
+				FluidStack tFluid = GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true);
+				if (tFluid != null && isFluidInputAllowed(tFluid)) {
+
+					if (tFluid.isFluidEqual(getDrainableStackEx(1)) || getDrainableStackEx(1) == null){
+						if (getFillableStackEx(1) == null) {
+							if (isFluidInputAllowed(tFluid) && tFluid.amount <= getCapacity()) {
+								if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), GT_Utility.getContainerItem(mInventory[getInputSlot()], true), 1)) {
+									setFillableStack(tFluid.copy());
+									aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
+								}
+							}
+						} else {
+							if (tFluid.isFluidEqual(getFillableStack()) && tFluid.amount + getFillableStack().amount <= getCapacity()) {
+								if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), GT_Utility.getContainerItem(mInventory[getInputSlot()], true), 1)) {
+									getFillableStack().amount += tFluid.amount;
+									aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
+								}
+							}
+						}
+					}
+					else if (tFluid.isFluidEqual(getDrainableStackEx(2)) || (getDrainableStackEx(2) == null)){
+						if (getFillableStackEx(2) == null) {
+							if (isFluidInputAllowed(tFluid) && tFluid.amount <= getCapacity()) {
+								if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), GT_Utility.getContainerItem(mInventory[getInputSlot()], true), 1)) {
+									setFillableStack2(tFluid.copy());
+									aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
+								}
+							}
+						} else {
+							if (tFluid.isFluidEqual(getFillableStackEx(2)) && tFluid.amount + getFillableStackEx(2).amount <= getCapacity()) {
+								if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), GT_Utility.getContainerItem(mInventory[getInputSlot()], true), 1)) {
+									getFillableStackEx(2).amount += tFluid.amount;
+									aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
+								}
+							}
+						}
+					}
+					else {
+						Utils.LOG_INFO("Something broke when trying to empty cells between two fluid tank areas.");
+					}
+				}
+			}
+
+			if (doesFillContainers()) {
+				ItemStack tOutput = GT_Utility.fillFluidContainer(getDrainableStack(), mInventory[getInputSlot()], false, true);
+				if (tOutput != null && aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), tOutput, 1)) {
+					FluidStack tFluid = GT_Utility.getFluidForFilledItem(tOutput, true);
+					aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
+					if (tFluid != null) getDrainableStack().amount -= tFluid.amount;
+					if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) setDrainableStack(null);
+				}
+			}
+		}
+	}
+
+	@Override
+	public FluidStack getFluid() {
+		return getDrainableStack();
+	}
+
+	@Override
+	public int getFluidAmount() {
+		return getDrainableStack() != null ? getDrainableStack().amount : 0;
+	}
+
+	@Override
+	public int fill(FluidStack aFluid, boolean doFill) {
+		if (aFluid == null || aFluid.getFluid().getID() <= 0 || aFluid.amount <= 0 || !canTankBeFilled() || !isFluidInputAllowed(aFluid))
+			return 0;
+
+		if (getFillableStack() == null || getFillableStack().getFluid().getID() <= 0) {
+			if (aFluid.amount <= getCapacity()) {
+				if (doFill) {
+					setFillableStack(aFluid.copy());
+					getBaseMetaTileEntity().markDirty();
+				}
+				return aFluid.amount;
+			}
+			if (doFill) {
+				setFillableStack(aFluid.copy());
+				getFillableStack().amount = getCapacity();
+				getBaseMetaTileEntity().markDirty();
+			}
+			return getCapacity();
+		}
+
+		if (!getFillableStack().isFluidEqual(aFluid))
+			return 0;
+
+		int space = getCapacity() - getFillableStack().amount;
+		if (aFluid.amount <= space) {
+			if (doFill) {
+				getFillableStack().amount += aFluid.amount;
+				getBaseMetaTileEntity().markDirty();
+			}
+			return aFluid.amount;
+		}
+		if (doFill)
+			getFillableStack().amount = getCapacity();
+		return space;
+	}
+
+	@Override
+	public FluidStack drain(int maxDrain, boolean doDrain) {
+		if (getDrainableStack() == null || !canTankBeEmptied()) return null;
+		if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) {
+			setDrainableStack(null);
+			getBaseMetaTileEntity().markDirty();
+			return null;
+		}
+
+		int used = maxDrain;
+		if (getDrainableStack().amount < used)
+			used = getDrainableStack().amount;
+
+		if (doDrain) {
+			getDrainableStack().amount -= used;
+			getBaseMetaTileEntity().markDirty();
+		}
+
+		FluidStack drained = getDrainableStack().copy();
+		drained.amount = used;
+
+		if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) {
+			setDrainableStack(null);
+			getBaseMetaTileEntity().markDirty();
+		}
+
+		return drained;
+	}
+
+	@Override
+	public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+		return aIndex == getOutputSlot();
+	}
+
+	@Override
+	public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+		return aIndex == getInputSlot();
+	}
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaBasicTank.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaBasicTank.java
deleted file mode 100644
index c199114daa..0000000000
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaBasicTank.java
+++ /dev/null
@@ -1,261 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
-
-import gregtech.api.enums.ItemList;
-import gregtech.api.gui.GT_Container_BasicTank;
-import gregtech.api.gui.GT_GUIContainer_BasicTank;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Utility;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
-
-/**
- * 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 GregtechMetaBasicTank extends GregtechMetaTieredMachineBlock {
-
-    public FluidStack mFluid;
-    public FluidStack mInternal;
-    /**
-     * @param aInvSlotCount should be 3
-     */
-    public GregtechMetaBasicTank(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription, ITexture... aTextures) {
-        super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
-    }
-
-    public GregtechMetaBasicTank(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
-        super(aName, aTier, aInvSlotCount, aDescription, aTextures);
-    }
-
-    @Override
-    public boolean isSimpleMachine() {
-        return false;
-    }
-
-    @Override
-    public boolean isValidSlot(int aIndex) {
-        return aIndex != getStackDisplaySlot();
-    }
-
-    @Override
-    public void saveNBTData(NBTTagCompound aNBT) {
-        if (mFluid != null) aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
-    }
-
-    @Override
-    public void loadNBTData(NBTTagCompound aNBT) {
-        mFluid = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid"));
-    }
-
-    public abstract boolean doesFillContainers();
-
-    public abstract boolean doesEmptyContainers();
-
-    public abstract boolean canTankBeFilled();
-
-    public abstract boolean canTankBeEmptied();
-
-    public abstract boolean displaysItemStack();
-
-    public abstract boolean displaysStackSize();
-
-    public int getInputSlot() {
-        return 0;
-    }
-
-    public int getOutputSlot() {
-        return 1;
-    }
-
-    public int getStackDisplaySlot() {
-        return 2;
-    }
-
-    public boolean isFluidInputAllowed(FluidStack aFluid) {
-        return true;
-    }
-
-    public boolean isFluidChangingAllowed() {
-        return true;
-    }
-
-    public FluidStack getFillableStack() {
-        return mFluid;
-    }
-
-    public FluidStack setFillableStack(FluidStack aFluid) {
-        mFluid = aFluid;
-        return mFluid;
-    }
-    
-    public FluidStack setInternalStack(FluidStack aFluid) {
-        mInternal = aFluid;
-        return mInternal;
-    }
-    
-    public FluidStack getInternalStack() {
-        return mInternal;
-    }
-
-    public FluidStack getDrainableStack() {
-        return mFluid;
-    }
-
-    public FluidStack setDrainableStack(FluidStack aFluid) {
-        mFluid = aFluid;
-        return mFluid;
-    }
-
-    public FluidStack getDisplayedFluid() {
-        return getDrainableStack();
-    }
-
-    @Override
-    public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_Container_BasicTank(aPlayerInventory, aBaseMetaTileEntity);
-    }
-
-    @Override
-    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_GUIContainer_BasicTank(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
-    }
-
-    @Override
-    public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-        if (aBaseMetaTileEntity.isServerSide()) {
-            if (isFluidChangingAllowed() && getFillableStack() != null && getFillableStack().amount <= 0)
-                setFillableStack(null);
-            if (isFluidChangingAllowed() && getFillableStack() != null && getFillableStack().amount >= 1)
-            	setInternalStack(getFillableStack());
-            if (displaysItemStack() && getStackDisplaySlot() >= 0 && getStackDisplaySlot() < mInventory.length) {
-                if (getDisplayedFluid() == null) {
-                    if (ItemList.Display_Fluid.isStackEqual(mInventory[getStackDisplaySlot()], true, true))
-                        mInventory[getStackDisplaySlot()] = null;
-                } else {
-                    mInventory[getStackDisplaySlot()] = GT_Utility.getFluidDisplayStack(getDisplayedFluid(), displaysStackSize());
-                }
-            }
-
-            if (doesEmptyContainers()) {
-                FluidStack tFluid = GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true);
-                if (tFluid != null && isFluidInputAllowed(tFluid)) {
-                    if (getFillableStack() == null) {
-                        if (isFluidInputAllowed(tFluid) && tFluid.amount <= getCapacity()) {
-                            if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), GT_Utility.getContainerItem(mInventory[getInputSlot()], true), 1)) {
-                                setFillableStack(tFluid.copy());
-                                aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
-                            }
-                        }
-                    } else {
-                        if (tFluid.isFluidEqual(getFillableStack()) && tFluid.amount + getFillableStack().amount <= getCapacity()) {
-                            if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), GT_Utility.getContainerItem(mInventory[getInputSlot()], true), 1)) {
-                                getFillableStack().amount += tFluid.amount;
-                                aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
-                            }
-                        }
-                    }
-                }
-            }
-
-            if (doesFillContainers()) {
-                ItemStack tOutput = GT_Utility.fillFluidContainer(getDrainableStack(), mInventory[getInputSlot()], false, true);
-                if (tOutput != null && aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), tOutput, 1)) {
-                    FluidStack tFluid = GT_Utility.getFluidForFilledItem(tOutput, true);
-                    aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
-                    if (tFluid != null) getDrainableStack().amount -= tFluid.amount;
-                    if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) setDrainableStack(null);
-                }
-            }
-        }
-    }
-
-    @Override
-    public FluidStack getFluid() {
-        return getDrainableStack();
-    }
-
-    @Override
-    public int getFluidAmount() {
-        return getDrainableStack() != null ? getDrainableStack().amount : 0;
-    }
-
-    @Override
-    public int fill(FluidStack aFluid, boolean doFill) {
-        if (aFluid == null || aFluid.getFluid().getID() <= 0 || aFluid.amount <= 0 || !canTankBeFilled() || !isFluidInputAllowed(aFluid))
-            return 0;
-
-        if (getFillableStack() == null || getFillableStack().getFluid().getID() <= 0) {
-            if (aFluid.amount <= getCapacity()) {
-                if (doFill) {
-                    setFillableStack(aFluid.copy());
-                    getBaseMetaTileEntity().markDirty();
-                }
-                return aFluid.amount;
-            }
-            if (doFill) {
-                setFillableStack(aFluid.copy());
-                getFillableStack().amount = getCapacity();
-                getBaseMetaTileEntity().markDirty();
-            }
-            return getCapacity();
-        }
-
-        if (!getFillableStack().isFluidEqual(aFluid))
-            return 0;
-
-        int space = getCapacity() - getFillableStack().amount;
-        if (aFluid.amount <= space) {
-            if (doFill) {
-                getFillableStack().amount += aFluid.amount;
-                getBaseMetaTileEntity().markDirty();
-            }
-            return aFluid.amount;
-        }
-        if (doFill)
-            getFillableStack().amount = getCapacity();
-        return space;
-    }
-
-    @Override
-    public FluidStack drain(int maxDrain, boolean doDrain) {
-        if (getDrainableStack() == null || !canTankBeEmptied()) return null;
-        if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) {
-            setDrainableStack(null);
-            getBaseMetaTileEntity().markDirty();
-            return null;
-        }
-
-        int used = maxDrain;
-        if (getDrainableStack().amount < used)
-            used = getDrainableStack().amount;
-
-        if (doDrain) {
-            getDrainableStack().amount -= used;
-            getBaseMetaTileEntity().markDirty();
-        }
-
-        FluidStack drained = getDrainableStack().copy();
-        drained.amount = used;
-
-        if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) {
-            setDrainableStack(null);
-            getBaseMetaTileEntity().markDirty();
-        }
-
-        return drained;
-    }
-
-    @Override
-    public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
-        return aIndex == getOutputSlot();
-    }
-
-    @Override
-    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
-        return aIndex == getInputSlot();
-    }
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
index 45f05f4495..4f4f3f931f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
@@ -13,7 +13,9 @@ import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.player.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import ic2.api.item.IElectricItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -47,7 +49,81 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
 	/*
 	 * MACHINE_STEEL_SIDE
 	 */
-	@Override
+	
+	@Override
+    public ITexture[][][] getTextureSet(ITexture[] aTextures) {
+        ITexture[][][] rTextures = new ITexture[10][17][];
+        for (byte i = -1; i < 16; i++) {
+            rTextures[0][i + 1] = getFront(i);
+            rTextures[1][i + 1] = getBack(i);
+            rTextures[2][i + 1] = getBottom(i);
+            rTextures[3][i + 1] = getTop(i);
+            rTextures[4][i + 1] = getSides(i);
+            rTextures[5][i + 1] = getFrontActive(i);
+            rTextures[6][i + 1] = getBackActive(i);
+            rTextures[7][i + 1] = getBottomActive(i);
+            rTextures[8][i + 1] = getTopActive(i);
+            rTextures[9][i + 1] = getSidesActive(i);
+        }
+        return rTextures;
+    }
+	
+	@Override
+    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+        return mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0 : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex + 1];
+    }
+	
+	
+	public ITexture[] getFront(byte aColor) {
+        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]};
+    }
+
+    
+	public ITexture[] getBack(byte aColor) {
+        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)};
+    }
+
+    
+	public ITexture[] getBottom(byte aColor) {
+        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)};
+    }
+
+    
+	public ITexture[] getTop(byte aColor) {
+        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Screen_Logo)};
+    }
+
+    
+	public ITexture[] getSides(byte aColor) {
+        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)};
+    }
+
+    
+	public ITexture[] getFrontActive(byte aColor) {
+        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]};
+    }
+
+    
+	public ITexture[] getBackActive(byte aColor) {
+        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)};
+    }
+
+    
+	public ITexture[] getBottomActive(byte aColor) {
+        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)};
+    }
+
+    
+	public ITexture[] getTopActive(byte aColor) {
+        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Screen_Logo)};
+    }
+
+    
+	public ITexture[] getSidesActive(byte aColor) {
+        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)};
+    }
+	
+	/*@Override
 	public ITexture[][][] getTextureSet(ITexture[] aTextures) {
 		ITexture[][][] rTextures = new ITexture[2][17][];
 		for (byte i = -1; i < 16; i++) {
@@ -60,7 +136,7 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
 									: Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] };
 		}
 		return rTextures;
-	}
+	}*/
 
 	/*
 	 * @Override public ITexture[][][] getTextureSet(ITexture[] aTextures) {
@@ -84,10 +160,10 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
 	 * } return rTextures; }
 	 */
 
-	@Override
+	/*@Override
 	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
 		return mTextures[aSide == aFacing ? 1 : 0][aColorIndex+1];
-	}
+	}*/
 
 	@Override
 	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
@@ -158,7 +234,7 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
 		long tempStorage = getStoredEnergy()[0];		
 		final double c = ((double) tempStorage / maxEUStore()) * 100;
 		final double roundOff = Math.round(c * 100.00) / 100.00;
-		Utils.messagePlayer(playerIn, "Energy: " + tempStorage + " EU at "+V[mTier]+"v ("+roundOff+"%)");
+		PlayerUtils.messagePlayer(playerIn, "Energy: " + tempStorage + " EU at "+V[mTier]+"v ("+roundOff+"%)");
 
 	}
 		//Utils.LOG_WARNING("Begin Show Energy");
@@ -314,10 +390,6 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
 	}
 
 	@Override
-	public void markDirty() {
-	}
-
-	@Override
 	public boolean isUseableByPlayer(EntityPlayer p_70300_1_) {
 		return false;
 	}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MTE_BasicMachine_Custom_Recipe.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MTE_BasicMachine_Custom_Recipe.java
deleted file mode 100644
index c7f84f1095..0000000000
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MTE_BasicMachine_Custom_Recipe.java
+++ /dev/null
@@ -1,623 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base;
-
-import static gregtech.api.enums.GT_Values.V;
-import static gregtech.api.enums.GT_Values.W;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.Textures;
-import gregtech.api.enums.Tier;
-import gregtech.api.gui.GT_Container_BasicMachine;
-import gregtech.api.gui.GT_GUIContainer_BasicMachine;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_ModHandler.RecipeBits;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.xmod.gregtech.api.util.GregtechRecipe_OLD.Gregtech_Recipe_Map;
-
-import java.util.Random;
-
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-
-/**
- * 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 class GT_MTE_BasicMachine_Custom_Recipe extends GT_MTE_CustomRecipe_BasicMachine {
-    private final Gregtech_Recipe_Map mRecipes;
-    private final int mTankCapacity, mSpecialEffect;
-    private final String mSound;
-    private final boolean mSharedTank, mRequiresFluidForFiltering;
-    private final byte mGUIParameterA, mGUIParameterB;
-    public GT_MTE_BasicMachine_Custom_Recipe(int aID, String aName, String aNameRegional, int aTier, String aDescription, Gregtech_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, int aGUIParameterA, int aGUIParameterB, String aGUIName, String aSound, boolean aSharedTank, boolean aRequiresFluidForFiltering, int aSpecialEffect, String aOverlays, Object[] aRecipe) {
-        super(aID, aName, aNameRegional, aTier, aRecipes.mAmperage, aDescription, aInputSlots, aOutputSlots, aGUIName, aRecipes.mNEIName, new ITexture[]{new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/" + aOverlays.toLowerCase() + "/OVERLAY_SIDE_ACTIVE")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/" + aOverlays.toLowerCase() + "/OVERLAY_SIDE")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/" + aOverlays.toLowerCase() + "/OVERLAY_FRONT_ACTIVE")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/" + aOverlays.toLowerCase() + "/OVERLAY_FRONT")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/" + aOverlays.toLowerCase() + "/OVERLAY_TOP_ACTIVE")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/" + aOverlays.toLowerCase() + "/OVERLAY_TOP")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/" + aOverlays.toLowerCase() + "/OVERLAY_BOTTOM_ACTIVE")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/" + aOverlays.toLowerCase() + "/OVERLAY_BOTTOM"))});
-        mSharedTank = aSharedTank;
-        mTankCapacity = aTankCapacity;
-        mSpecialEffect = aSpecialEffect;
-        mRequiresFluidForFiltering = aRequiresFluidForFiltering;
-        mRecipes = aRecipes;
-        mSound = aSound;
-        mGUIParameterA = (byte) aGUIParameterA;
-        mGUIParameterB = (byte) aGUIParameterB;
-
-        if (aRecipe != null) {
-            for (int i = 3; i < aRecipe.length; i++) {
-                if (aRecipe[i] == X.CIRCUIT) {
-                    aRecipe[i] = Tier.ELECTRIC[mTier].mManagingObject;
-                    continue;
-                }
-                if (aRecipe[i] == X.BETTER_CIRCUIT) {
-                    aRecipe[i] = Tier.ELECTRIC[mTier].mBetterManagingObject;
-                    continue;
-                }
-                if (aRecipe[i] == X.HULL) {
-                    aRecipe[i] = Tier.ELECTRIC[mTier].mHullObject;
-                    continue;
-                }
-                if (aRecipe[i] == X.WIRE) {
-                    aRecipe[i] = Tier.ELECTRIC[mTier].mConductingObject;
-                    continue;
-                }
-                if (aRecipe[i] == X.WIRE4) {
-                    aRecipe[i] = Tier.ELECTRIC[mTier].mLargerConductingObject;
-                    continue;
-                }
-
-                if (aRecipe[i] == X.GLASS) {
-                    switch (mTier) {
-                        default:
-                            aRecipe[i] = new ItemStack(Blocks.glass, 1, W);
-                            break;
-                    }