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

17 files changed, 1045 insertions, 2505 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 6f492ef2b9..dbf2e9f877 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -70,7 +70,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 	//Unused Machine Casings
 	Casing_MacerationStack, Casing_MatterGen, Casing_MatterFab, Casing_U7, 
 	//Unused Machine Coils
-	Casing_Coil_U1, Casing_Coil_U2, Casing_Coil_U3, Casing_Coil_U4,
+	Casing_Coil_U1, Casing_Coil_U2, Casing_Coil_BlastSmelter, Casing_BlastSmelter,
 	
 	//Windmill Shaft Shape for Extruder
 	Shape_Extruder_WindmillShaft, 
@@ -100,7 +100,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Food_Baked_Raisin_Bread, 
 	
 	//For sintering TODO
-	Industrial_SinterFurnace, 
+	Industrial_AlloyBlastSmelter, 
 	
 	//Block that enables uplink to a superconductor network
 	SuperConductorInputNode, 
@@ -122,7 +122,16 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Fluid_Cell_1L, Fluid_Cell_16L, Fluid_Cell_36L, Fluid_Cell_144L, 
 	
 	//Multitank
-	Industrial_MultiTank, Industrial_MultiTankDense, Casing_MultitankExterior;
+	Industrial_MultiTank, Industrial_MultiTankDense, Casing_MultitankExterior, 
+	
+	//Gt4 Workbenches
+	GT4_Workbench_Bronze, GT4_Workbench_Advanced, 
+	
+	//Geothermal Engines
+	Geothermal_Engine_EV, Geothermal_Engine_IV, Geothermal_Engine_LuV, 
+	
+	//Tesseracts
+	GT4_Tesseract_Generator, GT4_Tesseract_Terminal;
 
 	public static final GregtechItemList[]
 			DYE_ONLY_ITEMS = {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
index 238f535505..9a1ef1376d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
@@ -328,7 +328,7 @@ public enum GregtechOrePrefixes {
 		Staballoy(30, TextureSet.SET_ROUGH, 10.0F, 5120, 4, 1 | 2  | 16 | 32 | 64 | 128, 68, 75, 66, 0, "Staballoy", 0, 0, 1500, 2800, true, false, 1, 3, 1, Dyes.dyeGreen, 2, Arrays.asList(new MaterialStack(Materials.Titanium, 1), new MaterialStack(Materials.Uranium, 9)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
 		Bedrockium(31, TextureSet.SET_FINE, 8.0F, 8196, 3, 1 | 2 | 16 | 32 | 64 | 128, 39, 39, 39, 0, "Bedrockium", 0, 0, -1, 0, false, false, 1, 5, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Carbon, 63), new MaterialStack(Materials.Carbon, 56)),   Arrays.asList(getTcAspectStack(TC_Aspects.VACUOS, 8), getTcAspectStack(TC_Aspects.TUTAMEN, 3))),
 		BloodSteel(32, TextureSet.SET_METALLIC, 11.0F, 768, 4, 1 | 2 | 16 | 32 | 64 | 128, 142, 28, 0, 0, "Blood Steel", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Steel, 3)), Arrays.asList(getTcAspectStack(TC_Aspects.VICTUS, 8), getTcAspectStack(TC_Aspects.IGNIS, 3))),
-		VoidMetal(33, TextureSet.SET_METALLIC, 6.0F, 1280, 3, 1 | 2 | 16 | 32 | 64 | 128, 82, 17, 82, 0, "Void Metal", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeBlack, Arrays.asList(getTcAspectStack("PRAECANTATIO", 5), getTcAspectStack(TC_Aspects.VACUOS, 7))),
+		Void(33, TextureSet.SET_METALLIC, 6.0F, 1280, 3, 1 | 2 | 16 | 32 | 64 | 128, 82, 17, 82, 0, "Void Metal", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeBlack, Arrays.asList(getTcAspectStack("PRAECANTATIO", 5), getTcAspectStack(TC_Aspects.VACUOS, 7))),
 		ConductiveIron(34, TextureSet.SET_METALLIC, 5.0F, 256, 2, 1 | 2, 164, 109, 100, 0, "Conductive Iron", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Iron, 6), new MaterialStack(Materials.Redstone, 2)), Arrays.asList(getTcAspectStack(TC_Aspects.POTENTIA, 2), getTcAspectStack(TC_Aspects.METALLUM, 2))),
 		ElectricalSteel(35, TextureSet.SET_METALLIC, 7.0F, 768, 3, 1 | 2 | 64 | 128, 194, 194, 194, 0, "Electrical Steel", 0, 0, 1811, 1000, true, false, 3, 1, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Iron, 3), new MaterialStack(Materials.Coal, 2), new MaterialStack(Materials.Silicon, 2)),   Arrays.asList(getTcAspectStack(TC_Aspects.MAGNETO, 2), getTcAspectStack(TC_Aspects.ELECTRUM, 5))),
 		EnergeticAlloy(36, TextureSet.SET_SHINY, 5.0F, 512, 3, 1 | 2 | 64 | 128, 252, 152, 45, 0, "Energetic Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeOrange, 2, Arrays.asList(new MaterialStack(Materials.Gold, 3), new MaterialStack(Materials.Glowstone, 2), new MaterialStack(Materials.Redstone, 2)),  Arrays.asList(getTcAspectStack(TC_Aspects.POTENTIA, 4), getTcAspectStack(TC_Aspects.LUX, 3))),
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
index 705f5b338e..dca5d7301c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
@@ -1,9 +1,9 @@
 package gtPlusPlus.xmod.gregtech.api.enums;
 
-import gregtech.api.GregTech_API;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_IconContainer;
 import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_Texture;
+import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
@@ -51,7 +51,7 @@ public class GregtechTextures {
 		protected IIcon mIcon;
 
         private BlockIcons() {
-            CORE.GT_BlockIconload.add(this);
+        	Meta_GT_Proxy.GT_BlockIconload.add(this);
         }
 
         @Override
@@ -66,7 +66,7 @@ public class GregtechTextures {
 
         @Override
         public void run() {
-            mIcon = GregTech_API.sBlockIcons.registerIcon(CORE.MODID + ":" + "iconsets/" + this);
+            mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(CORE.MODID + ":" + "iconsets/" + this);
         }
         
         @Override
@@ -80,7 +80,7 @@ public class GregtechTextures {
 
             public CustomIcon(String aIconName) {
                 mIconName = aIconName;
-                CORE.GT_BlockIconload.add(this);
+                Meta_GT_Proxy.GT_BlockIconload.add(this);
             }
 
             @Override
@@ -95,7 +95,7 @@ public class GregtechTextures {
 
             @Override
             public void run() {
-                mIcon = CORE.GT_BlockIcons.registerIcon(CORE.MODID + ":" + mIconName);
+                mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(CORE.MODID + ":" + mIconName);
             }
 
             @Override
@@ -107,10 +107,12 @@ public class GregtechTextures {
 	
 	
 	public enum ItemIcons implements Interface_IconContainer, Runnable {
-        VOID // The Empty Texture
-        , RENDERING_ERROR, SKOOKUMCHOOCHER, DURABILITY_BAR_0, DURABILITY_BAR_1, DURABILITY_BAR_2, DURABILITY_BAR_3, DURABILITY_BAR_4, DURABILITY_BAR_5, DURABILITY_BAR_6, DURABILITY_BAR_7, DURABILITY_BAR_8, ENERGY_BAR_0, ENERGY_BAR_1, ENERGY_BAR_2, ENERGY_BAR_3, ENERGY_BAR_4, ENERGY_BAR_5, ENERGY_BAR_6, ENERGY_BAR_7, ENERGY_BAR_8, TURBINE, TURBINE_SMALL, TURBINE_LARGE, TURBINE_HUGE;
+        VOID, // The Empty Texture
+        RENDERING_ERROR, //The Purple/Black Texture
+        SKOOKUMCHOOCHER, //The Skookum Tool Texture
+        TURBINE_SMALL, TURBINE_LARGE, TURBINE_HUGE;
 
-        public static final Interface_IconContainer[]
+       /* public static final Interface_IconContainer[]
                 DURABILITY_BAR = new Interface_IconContainer[]{
                 DURABILITY_BAR_0,
                 DURABILITY_BAR_1,
@@ -132,14 +134,14 @@ public class GregtechTextures {
                         ENERGY_BAR_6,
                         ENERGY_BAR_7,
                         ENERGY_BAR_8,
-                };
+                };*/
 
         //public static final Interface_Texture[] ERROR_RENDERING = new Interface_Texture[]{new GregtechRenderedTexture(RENDERING_ERROR)};
 
         protected IIcon mIcon, mOverlay;
 
         private ItemIcons() {
-            GregTech_API.sGTItemIconload.add(this);
+        	Meta_GT_Proxy.GT_ItemIconload.add(this);
         }
 
         @Override
@@ -159,8 +161,8 @@ public class GregtechTextures {
 
         @Override
         public void run() {
-            mIcon = GregTech_API.sItemIcons.registerIcon(CORE.MODID+ ":" + "iconsets/" + this);
-            mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.MODID+ ":" + "iconsets/" + this + "_OVERLAY");
+            mIcon = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID+ ":" + "iconsets/" + this);
+            mOverlay = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID+ ":" + "iconsets/" + this + "_OVERLAY");
         }
 
         public static class CustomIcon implements Interface_IconContainer, Runnable {
@@ -169,7 +171,7 @@ public class GregtechTextures {
 
             public CustomIcon(String aIconName) {
                 mIconName = aIconName;
-                GregTech_API.sGTItemIconload.add(this);
+                Meta_GT_Proxy.GT_ItemIconload.add(this);
             }
 
             @Override
@@ -184,8 +186,8 @@ public class GregtechTextures {
 
             @Override
             public void run() {
-                mIcon = GregTech_API.sItemIcons.registerIcon(CORE.MODID+ ":" + mIconName);
-                mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.MODID+ ":" + mIconName + "_OVERLAY");
+                mIcon = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID+ ":" + mIconName);
+                mOverlay = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID+ ":" + mIconName + "_OVERLAY");
             }
 
             @Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java
new file mode 100644
index 0000000000..12094ad620
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java
@@ -0,0 +1,77 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import gregtech.api.gui.GT_Container_BasicTank;
+import gregtech.api.gui.GT_Slot_Output;
+import gregtech.api.gui.GT_Slot_Render;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_DeluxeTank;
+
+import java.util.Iterator;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.Slot;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+/**
+ * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
+ * <p/>
+ * The Container I use for all my Basic Tanks
+ */
+public class CONTAINER_DeluxeTank extends GT_Container_BasicTank {
+
+    public int mContent = 0;
+
+    public CONTAINER_DeluxeTank(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+        super(aInventoryPlayer, aTileEntity);
+    }
+
+    @Override
+    public void addSlots(InventoryPlayer aInventoryPlayer) {
+        addSlotToContainer(new Slot(mTileEntity, 0, 80, 17));
+        addSlotToContainer(new GT_Slot_Output(mTileEntity, 1, 80, 53));
+        addSlotToContainer(new GT_Slot_Render(mTileEntity, 2, 41, 42));
+        addSlotToContainer(new GT_Slot_Render(mTileEntity, 3, 59, 42));
+    }
+
+    @Override
+    public void detectAndSendChanges() {
+        super.detectAndSendChanges();
+        if (mTileEntity.isClientSide() || mTileEntity.getMetaTileEntity() == null) return;
+        if (((GT_MetaTileEntity_DeluxeTank) mTileEntity.getMetaTileEntity()).mFluid != null)
+            mContent = ((GT_MetaTileEntity_DeluxeTank) mTileEntity.getMetaTileEntity()).mFluid.amount;
+        else
+            mContent = 0;
+        Iterator var2 = this.crafters.iterator();
+        while (var2.hasNext()) {
+            ICrafting var1 = (ICrafting) var2.next();
+            var1.sendProgressBarUpdate(this, 100, mContent & 65535);
+            var1.sendProgressBarUpdate(this, 101, mContent >>> 16);
+        }
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void updateProgressBar(int par1, int par2) {
+        super.updateProgressBar(par1, par2);
+        switch (par1) {
+            case 100:
+                mContent = mContent & -65536 | par2;
+                break;
+            case 101:
+                mContent = mContent & 65535 | par2 << 16;
+                break;
+        }
+    }
+
+    @Override
+    public int getSlotCount() {
+        return 2;
+    }
+
+    @Override
+    public int getShiftClickSlotCount() {
+        return 1;
+    }
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java
index a258274f07..1c94298e09 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java
@@ -2,7 +2,7 @@ package gtPlusPlus.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityMassFabricator;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_MassFabricator;
 import net.minecraft.entity.player.InventoryPlayer;
 
 /**
@@ -12,8 +12,8 @@ import net.minecraft.entity.player.InventoryPlayer;
  */
 public class CONTAINER_MatterFab extends GT_ContainerMetaTile_Machine {
 	
-	public int mUUA_USED = ((GregtechMetaTileEntityMassFabricator)this.mTileEntity.getMetaTileEntity()).getAmplifierUsed();
-	public int mUUM_MADE = ((GregtechMetaTileEntityMassFabricator)this.mTileEntity.getMetaTileEntity()).getMatterProduced();
+	public int mUUA_USED = ((GregtechMetaTileEntity_MassFabricator)this.mTileEntity.getMetaTileEntity()).getAmplifierUsed();
+	public int mUUM_MADE = ((GregtechMetaTileEntity_MassFabricator)this.mTileEntity.getMetaTileEntity()).getMatterProduced();
 	
     public CONTAINER_MatterFab(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
         super(aInventoryPlayer, aTileEntity);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java
new file mode 100644
index 0000000000..758aa55294
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java
@@ -0,0 +1,35 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.StatCollector;
+
+public class GUI_DeluxeTank extends GT_GUIContainerMetaTile_Machine {
+
+    private final String mName;
+
+    public GUI_DeluxeTank(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
+        super(new CONTAINER_DeluxeTank(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "BasicTank.png");
+        mName = aName;
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+        fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752);
+        fontRendererObj.drawString(mName, 8, 6, 4210752);
+        if (mContainer != null) {
+            fontRendererObj.drawString("Fuel  | A | B |", 10, 20, 16448255);
+            //fontRendererObj.drawString(GT_Utility.parseNumberToString(((CONTAINER_DeluxeTank) mContainer).mContent), 10, 30, 16448255);
+        }
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
+        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+        int x = (width - xSize) / 2;
+        int y = (height - ySize) / 2;
+        drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
+    }
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
index 96f2cbcfcf..73e7a5d56f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
@@ -37,19 +37,46 @@ public interface IGregtech_RecipeAdder {
 	
 	
 	/**
-     * Adds a Recipe for the Sifter. (up to 9 Outputs)
+     * Adds a Recipe for the Dehydrator. (up to 9 Outputs)
      *
-	 * @param aFluidOutput   = Output of the UU-Matter (not null, and respects StackSize)
+	 * @param aInput   = Input itemstack (not null, and respects StackSize)
 	 * @param aFluidInput   = fluid Input (can be UU_Amp or null, and respects StackSize)
+	 * @param aOutputItems   = Itemstack[] (not null, and respects StackSize)
 	 * @param aDuration 	= Duration (must be >= 0)
 	 * @param aEUt			= EU needed for heating up (must be >= 0)
 	 * @return true if the Recipe got added, otherwise false.
      */
-    
-	/*public boolean addDehydratorRecipe(FluidStack aFluid, FluidStack aOutputFluid, ItemStack[] aOutputItems, int aDuration, int aEUt);
+
     public boolean addDehydratorRecipe(ItemStack aInput, FluidStack aFluid, ItemStack[] aOutputItems, int aDuration, int aEUt);
-    public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, ItemStack[] aOutputItems, int aDuration, int aEUt);
+	/*public boolean addDehydratorRecipe(FluidStack aFluid, FluidStack aOutputFluid, ItemStack[] aOutputItems, int aDuration, int aEUt);*/
+    /*public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, ItemStack[] aOutputItems, int aDuration, int aEUt);
     public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, FluidStack aFluid, ItemStack[] aOutputItems, FluidStack aOutputFluid, int aDuration, int aEUt);*/
+   
+    /**
+     * Adds a Recipe for the Dehydrator. (up to 9 Outputs)
+     *
+	 * @param aInput   = ItemStack[] (not null, and respects StackSize)
+	 * @param aFluidInput   = fluid Input (can be UU_Amp or null, and respects StackSize)
+	 * @param aFluidOutput   = Output of the UU-Matter (not null, and respects StackSize)
+	 * @param aOutputItems   = ItemStack[] (not null, and respects StackSize)
+	 * @param aChances 	= Output Change (can be == 0)
+	 * @param aDuration 	= Duration (must be >= 0)
+	 * @param aEUt			= EU needed for heating up (must be >= 0)
+	 * @return true if the Recipe got added, otherwise false.
+     */
     public boolean addDehydratorRecipe(ItemStack[] aInput, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack[] aOutputItems, int[] aChances, int aDuration, int aEUt);
     
+    
+    /**
+     * Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs)
+     *
+	 * @param aInput   = ItemStack[] (not null, and respects StackSize)
+	 * @param aFluidOutput   = Output of the UU-Matter (not null, and respects StackSize)
+	 * @param aChances 	= Output Change (can be == 0)
+	 * @param aDuration 	= Duration (must be >= 0)
+	 * @param aEUt			= EU needed for heating up (must be >= 0)
+	 * @return true if the Recipe got added, otherwise false.
+     */
+    public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aOutput, int aChance, int aDuration, int aEUt);
+    
 }
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;
-                    }
-                    continue;
-                }
-
-                if (aRecipe[i] == X.PLATE) {
-                    switch (mTier) {
-                        case 0:
-                        case 1:
-                            aRecipe[i] = OrePrefixes.plate.get(Materials.Steel);
-                            break;
-                        case 2:
-                            aRecipe[i] = OrePrefixes.plate.get(Materials.Aluminium);
-                            break;
-                        case 3:
-                            aRecipe[i] = OrePrefixes.plate.get(Materials.StainlessSteel);
-                            break;
-                        case 4:
-                            aRecipe[i] = OrePrefixes.plate.get(Materials.Titanium);
-                            break;
-                        default:
-                            aRecipe[i] = OrePrefixes.plate.get(Materials.TungstenSteel);
-                            break;
-                    }
-                    continue;
-                }
-
-                if (aRecipe[i] == X.PIPE) {
-                    switch (mTier) {
-                        case 0:
-                        case 1:
-                            aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.Bronze);
-                            break;
-                        case 2:
-                            aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.Steel);
-                            break;
-                        case 3:
-                            aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.StainlessSteel);
-                            break;
-                        case 4:
-                            aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.Titanium);
-                            break;
-                        default:
-                            aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.TungstenSteel);
-                            break;
-                    }
-                    continue;
-                }
-
-                if (aRecipe[i] == X.COIL_HEATING) {
-                    switch (mTier) {
-                        case 0:
-                        case 1:
-                            aRecipe[i] = OrePrefixes.wireGt02.get(Materials.AnyCopper);
-                            break;
-                        case 2:
-                            aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Cupronickel);
-                            break;
-                        case 3:
-                            aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Kanthal);
-                            break;
-                        case 4:
-                            aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Nichrome);
-                            break;
-                        default:
-                            aRecipe[i] = OrePrefixes.wireGt08.get(Materials.Nichrome);
-                            break;
-                    }
-                    continue;
-                }
-
-                if (aRecipe[i] == X.COIL_HEATING_DOUBLE) {
-                    switch (mTier) {
-                        case 0:
-                        case 1:
-                            aRecipe[i] = OrePrefixes.wireGt04.get(Materials.AnyCopper);
-                            break;
-                        case 2:
-                            aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Cupronickel);
-                            break;
-                        case 3:
-                            aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Kanthal);
-                            break;
-                        case 4:
-                            aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Nichrome);
-                            break;
-                        default:
-                            aRecipe[i] = OrePrefixes.wireGt16.get(Materials.Nichrome);
-                            break;
-                    }
-                    continue;
-                }
-
-                if (aRecipe[i] == X.STICK_DISTILLATION) {
-                    switch (mTier) {
-                        default:
-                            aRecipe[i] = OrePrefixes.stick.get(Materials.Blaze);
-                            break;
-                    }
-                    continue;
-                }
-
-                if (aRecipe[i] == X.STICK_MAGNETIC) {
-                    switch (mTier) {
-                        case 0:
-                        case 1:
-                            aRecipe[i] = OrePrefixes.stick.get(Materials.IronMagnetic);
-                            break;
-                        case 2:
-                        case 3:
-                            aRecipe[i] = OrePrefixes.stick.get(Materials.SteelMagnetic);
-                            break;
-                        default:
-                            aRecipe[i] = OrePrefixes.stick.get(Materials.NeodymiumMagnetic);
-                            break;
-                    }
-                    continue;
-                }
-
-                if (aRecipe[i] == X.STICK_ELECTROMAGNETIC) {
-                    switch (mTier) {
-                        case 0:
-                        case 1:
-                            aRecipe[i] = OrePrefixes.stick.get(Materials.AnyIron);
-                            break;
-                        case 2:
-                        case 3:
-                            aRecipe[i] = OrePrefixes.stick.get(Materials.Steel);
-                            break;
-                        case 4:
-                            aRecipe[i] = OrePrefixes.stick.get(Materials.Neodymium);
-                            break;
-                        default:
-                            aRecipe[i] = OrePrefixes.stick.get(Materials.VanadiumGallium);
-                            break;
-                    }
-                    continue;
-                }
-
-                if (aRecipe[i] == X.COIL_ELECTRIC) {
-                    switch (mTier) {
-                        case 0:
-                            aRecipe[i] = OrePrefixes.wireGt01.get(Materials.Tin);
-                            break;
-                        case 1:
-                            aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Tin);
-                            break;
-                        case 2:
-                            aRecipe[i] = OrePrefixes.wireGt02.get(Materials.AnyCopper);
-                            break;
-                        case 3:
-                            aRecipe[i] = OrePrefixes.wireGt04.get(Materials.AnyCopper);
-                            break;
-                        case 4:
-                            aRecipe[i] = OrePrefixes.wireGt08.get(Materials.AnnealedCopper);
-                            break;
-                        default:
-                            aRecipe[i] = OrePrefixes.wireGt16.get(Materials.AnnealedCopper);
-                            break;
-                    }
-                    continue;
-                }
-
-                if (aRecipe[i] == X.ROBOT_ARM) {
-                    switch (mTier) {
-                        case 0:
-                        case 1:
-                            aRecipe[i] = ItemList.Robot_Arm_LV;
-                            break;
-                        case 2:
-                            aRecipe[i] = ItemList.Robot_Arm_MV;
-                            break;
-                        case 3:
-                            aRecipe[i] = ItemList.Robot_Arm_HV;
-                            break;
-                        case 4:
-                            aRecipe[i] = ItemList.Robot_Arm_EV;
-                            break;
-                        case 5:
-                            aRecipe[i] = ItemList.Robot_Arm_IV;
-                            break;
-                        case 6:
-                            aRecipe[i] = ItemList.Robot_Arm_LuV;
-                            break;
-                        case 7:
-                            aRecipe[i] = ItemList.Robot_Arm_ZPM;
-                            break;
-                        default:
-                            aRecipe[i] = ItemList.Robot_Arm_UV;
-                            break;
-                    }
-                    continue;
-                }
-
-                if (aRecipe[i] == X.PUMP) {
-                    switch (mTier) {
-                        case 0:
-                        case 1:
-                            aRecipe[i] = ItemList.Electric_Pump_LV;
-                            break;
-                        case 2:
-                            aRecipe[i] = ItemList.Electric_Pump_MV;
-                            break;
-                        case 3:
-                            aRecipe[i] = ItemList.Electric_Pump_HV;
-                            break;
-                        case 4:
-                            aRecipe[i] = ItemList.Electric_Pump_EV;
-                            break;
-                        case 5:
-                            aRecipe[i] = ItemList.Electric_Pump_IV;
-                            break;
-                        case 6:
-                            aRecipe[i] = ItemList.Electric_Pump_LuV;
-                            break;
-                        case 7:
-                            aRecipe[i] = ItemList.Electric_Pump_ZPM;
-                            break;
-                        default:
-                            aRecipe[i] = ItemList.Electric_Pump_UV;
-                            break;
-                    }
-                    continue;
-                }
-
-                if (aRecipe[i] == X.ROTOR) {
-                    switch (mTier) {
-                        case 0:
-                        case 1:
-                            aRecipe[i] = OrePrefixes.rotor.get(Materials.Tin);
-                            break;
-                        case 2:
-                            aRecipe[i] = OrePrefixes.rotor.get(Materials.Bronze);
-                            break;
-                        case 3:
-                            aRecipe[i] = OrePrefixes.rotor.get(Materials.Steel);
-                            break;
-                        case 4:
-                            aRecipe[i] = OrePrefixes.rotor.get(Materials.StainlessSteel);
-                            break;
-                        case 5:
-                            aRecipe[i] = OrePrefixes.rotor.get(Materials.TungstenSteel);
-                            break;
-                        case 6:
-                            aRecipe[i] = OrePrefixes.rotor.get(Materials.TungstenSteel);
-                            break;
-                        case 7:
-                            aRecipe[i] = OrePrefixes.rotor.get(Materials.TungstenSteel);
-                            break;
-                        default:
-                            aRecipe[i] = OrePrefixes.rotor.get(Materials.TungstenSteel);
-                            break;
-                    }
-                    continue;
-                }
-
-                if (aRecipe[i] == X.MOTOR) {
-                    switch (mTier) {
-                        case 0:
-                        case 1:
-                            aRecipe[i] = ItemList.Electric_Motor_LV;
-                            break;
-                        case 2:
-                            aRecipe[i] = ItemList.Electric_Motor_MV;
-                            break;
-                        case 3:
-                            aRecipe[i] = ItemList.Electric_Motor_HV;
-                            break;
-                        case 4:
-                            aRecipe[i] = ItemList.Electric_Motor_EV;
-                            break;
-                        case 5:
-                            aRecipe[i] = ItemList.Electric_Motor_IV;
-                            break;
-                        case 6:
-                            aRecipe[i] = ItemList.Electric_Motor_LuV;
-                            break;
-                        case 7:
-                            aRecipe[i] = ItemList.Electric_Motor_ZPM;
-                            break;
-                        default:
-                            aRecipe[i] = ItemList.Electric_Motor_UV;
-                            break;
-                    }
-                    continue;
-                }
-
-                if (aRecipe[i] == X.PISTON) {
-                    switch (mTier) {
-                        case 0:
-                        case 1:
-                            aRecipe[i] = ItemList.Electric_Piston_LV;
-                            break;
-                        case 2:
-                            aRecipe[i] = ItemList.Electric_Piston_MV;
-                            break;
-                        case 3:
-                            aRecipe[i] = ItemList.Electric_Piston_HV;
-                            break;
-                        case 4:
-                            aRecipe[i] = ItemList.Electric_Piston_EV;
-                            break;
-                        case 5:
-                            aRecipe[i] = ItemList.Electric_Piston_IV;
-                            break;
-                        case 6:
-                            aRecipe[i] = ItemList.Electric_Piston_LuV;
-                            break;
-                        case 7:
-                            aRecipe[i] = ItemList.Electric_Piston_ZPM;
-                            break;
-                        default:
-                            aRecipe[i] = ItemList.Electric_Piston_UV;
-                            break;
-                    }
-                    continue;
-                }
-
-                if (aRecipe[i] == X.CONVEYOR) {
-                    switch (mTier) {
-                        case 0:
-                        case 1:
-                            aRecipe[i] = ItemList.Conveyor_Module_LV;
-                            break;
-                        case 2:
-                            aRecipe[i] = ItemList.Conveyor_Module_MV;
-                            break;
-                        case 3:
-                            aRecipe[i] = ItemList.Conveyor_Module_HV;
-                            break;
-                        case 4:
-                            aRecipe[i] = ItemList.Conveyor_Module_EV;
-                            break;
-                        case 5:
-                            aRecipe[i] = ItemList.Conveyor_Module_IV;
-                            break;
-                        case 6:
-                            aRecipe[i] = ItemList.Conveyor_Module_LuV;
-                            break;
-                        case 7:
-                            aRecipe[i] = ItemList.Conveyor_Module_ZPM;
-                            break;
-                        default:
-                            aRecipe[i] = ItemList.Conveyor_Module_UV;
-                            break;
-                    }
-                    continue;
-                }
-
-                if (aRecipe[i] == X.EMITTER) {
-                    switch (mTier) {
-                        case 0:
-                        case 1:
-                            aRecipe[i] = ItemList.Emitter_LV;
-                            break;
-                        case 2:
-                            aRecipe[i] = ItemList.Emitter_MV;
-                            break;
-                        case 3:
-                            aRecipe[i] = ItemList.Emitter_HV;
-                            break;
-                        case 4:
-                            aRecipe[i] = ItemList.Emitter_EV;
-                            break;
-                        case 5:
-                            aRecipe[i] = ItemList.Emitter_IV;
-                            break;
-                        case 6:
-                            aRecipe[i] = ItemList.Emitter_LuV;
-                            break;
-                        case 7:
-                            aRecipe[i] = ItemList.Emitter_ZPM;
-                            break;
-                        default:
-                            aRecipe[i] = ItemList.Emitter_UV;
-                            break;
-                    }
-                    continue;
-                }
-
-                if (aRecipe[i] == X.SENSOR) {
-                    switch (mTier) {
-                        case 0:
-                        case 1:
-                            aRecipe[i] = ItemList.Sensor_LV;
-                            break;
-                        case 2:
-                            aRecipe[i] = ItemList.Sensor_MV;
-                            break;
-                        case 3:
-                            aRecipe[i] = ItemList.Sensor_HV;
-                            break;
-                        case 4:
-                            aRecipe[i] = ItemList.Sensor_EV;
-                            break;
-                        case 5:
-                            aRecipe[i] = ItemList.Sensor_IV;
-                            break;
-                        case 6:
-                            aRecipe[i] = ItemList.Sensor_LuV;
-                            break;
-                        case 7:
-                            aRecipe[i] = ItemList.Sensor_ZPM;
-                            break;
-                        default:
-                            aRecipe[i] = ItemList.Sensor_UV;
-                            break;
-                    }
-                    continue;
-                }
-
-                if (aRecipe[i] == X.FIELD_GENERATOR) {
-                    switch (mTier) {
-                        case 0:
-                        case 1:
-                            aRecipe[i] = ItemList.Field_Generator_LV;
-                            break;
-                        case 2:
-                            aRecipe[i] = ItemList.Field_Generator_MV;
-                            break;
-                        case 3:
-                            aRecipe[i] = ItemList.Field_Generator_HV;
-                            break;
-                        case 4:
-                            aRecipe[i] = ItemList.Field_Generator_EV;
-                            break;
-                        case 5:
-                            aRecipe[i] = ItemList.Field_Generator_IV;
-                            break;
-                        case 6:
-                            aRecipe[i] = ItemList.Field_Generator_LuV;
-                            break;
-                        case 7:
-                            aRecipe[i] = ItemList.Field_Generator_ZPM;
-                            break;
-                        default:
-                            aRecipe[i] = ItemList.Field_Generator_UV;
-                            break;
-                    }
-                    continue;
-                }
-
-                if (aRecipe[i] instanceof X)
-                    throw new IllegalArgumentException("MISSING TIER MAPPING FOR: " + aRecipe[i] + " AT TIER " + mTier);
-            }
-
-            if (!GT_ModHandler.addCraftingRecipe(getStackForm(1), RecipeBits.DISMANTLEABLE | RecipeBits.BUFFERED | RecipeBits.NOT_REMOVABLE | RecipeBits.REVERSIBLE, aRecipe)) {
-                throw new IllegalArgumentException("INVALID CRAFTING RECIPE FOR: " + getStackForm(1).getDisplayName());
-            }
-        }
-    }
-
-    public GT_MTE_BasicMachine_Custom_Recipe(String aName, int aTier, String aDescription, Gregtech_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, int aAmperage, int aGUIParameterA, int aGUIParameterB, ITexture[][][] aTextures, String aGUIName, String aNEIName, String aSound, boolean aSharedTank, boolean aRequiresFluidForFiltering, int aSpecialEffect) {
-        super(aName, aTier, aAmperage, aDescription, aTextures, aInputSlots, aOutputSlots, aGUIName, aNEIName);
-        mSharedTank = aSharedTank;
-        mTankCapacity = aTankCapacity;
-        mSpecialEffect = aSpecialEffect;
-        mRequiresFluidForFiltering = aRequiresFluidForFiltering;
-        mRecipes = aRecipes;
-        mSound = aSound;
-        mGUIParameterA = (byte) aGUIParameterA;
-        mGUIParameterB = (byte) aGUIParameterB;
-    }
-
-    @Override
-    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MTE_BasicMachine_Custom_Recipe(mName, mTier, mDescription, mRecipes, mInputSlotCount, mOutputItems == null ? 0 : mOutputItems.length, mTankCapacity, mAmperage, mGUIParameterA, mGUIParameterB, mTextures, mGUIName, mNEIName, mSound, mSharedTank, mRequiresFluidForFiltering, mSpecialEffect);
-    }
-
-    @Override
-    public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_Container_BasicMachine(aPlayerInventory, aBaseMetaTileEntity);
-    }
-
-    @Override
-    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_GUIContainer_BasicMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), mGUIName, GT_Utility.isStringValid(mNEIName) ? mNEIName : getRecipeList() != null ? getRecipeList().mUnlocalizedName : "", mGUIParameterA, mGUIParameterB);
-    }
-
-	@Override
-	public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
-		if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) return false;
-		if (mInventory[aIndex] != null) return true;
-		switch (mInputSlotCount) {
-		case  0: return false;
-		case  1: return getFillableStack() == null ? !mRequiresFluidForFiltering && getRecipeList().containsInput(aStack) : null!=getRecipeList().findRecipe(getBaseMetaTileEntity(), mLastRecipe, true, V[mTier], new FluidStack[] {getFillableStack()}, getSpecialSlot(), new ItemStack[] {aStack});
-		case  2: return (!mRequiresFluidForFiltering || getFillableStack() != null) && (((getInputAt(0)!=null&&getInputAt(1)!=null) || (getInputAt(0)==null&&getInputAt(1)==null?getRecipeList().containsInput(aStack):(getRecipeList().containsInput(aStack)&&null!=getRecipeList().findRecipe(getBaseMetaTileEntity(), mLastRecipe, true, V[mTier], new FluidStack[] {getFillableStack()}, getSpecialSlot(), aIndex == getInputSlot() ? new ItemStack[] {aStack, getInputAt(1)} : new ItemStack[] {getInputAt(0), aStack})))));
-		default: return getRecipeList().containsInput(aStack);
-		}
-	}
-
-    @Override
-    public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-        super.onPreTick(aBaseMetaTileEntity, aTick);
-        if (aBaseMetaTileEntity.isClientSide() && aBaseMetaTileEntity.isActive()) {
-            switch (mSpecialEffect) {
-                case 0:
-                    break;
-                case 1:
-                    if (aBaseMetaTileEntity.getFrontFacing() != 1 && aBaseMetaTileEntity.getCoverIDAtSide((byte) 1) == 0 && !aBaseMetaTileEntity.getOpacityAtSide((byte) 1)) {
-                        Random tRandom = aBaseMetaTileEntity.getWorld().rand;
-                        aBaseMetaTileEntity.getWorld().spawnParticle("smoke", aBaseMetaTileEntity.getXCoord() + 0.8F - tRandom.nextFloat() * 0.6F, aBaseMetaTileEntity.getYCoord() + 0.9F + tRandom.nextFloat() * 0.2F, aBaseMetaTileEntity.getZCoord() + 0.8F - tRandom.nextFloat() * 0.6F, 0.0D, 0.0D, 0.0D);
-                    }
-                    break;
-            }
-        }
-    }
-
-    
-    public Gregtech_Recipe_Map getRecipeList() {
-        return mRecipes;
-    }
-
-    @Override
-    public int getCapacity() {
-        return mTankCapacity;
-    }
-
-    @Override
-    public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
-        super.startSoundLoop(aIndex, aX, aY, aZ);
-        if (aIndex == 1 && GT_Utility.isStringValid(mSound)) GT_Utility.doSoundAtClient(mSound, 100, 1.0F, aX, aY, aZ);
-    }
-
-    @Override
-    public void startProcess() {
-        if (GT_Utility.isStringValid(mSound)) sendLoopStart((byte) 1);
-    }
-
-    @Override
-    public FluidStack getFillableStack() {
-        return mSharedTank ? getDrainableStack() : super.getFillableStack();
-    }
-
-    @Override
-    public FluidStack setFillableStack(FluidStack aFluid) {
-        return mSharedTank ? setDrainableStack(aFluid) : super.setFillableStack(aFluid);
-    }
-
-    @Override
-    protected boolean displaysOutputFluid() {
-        return !mSharedTank;
-    }
-
-    public static enum X {PUMP, WIRE, WIRE4, HULL, PIPE, GLASS, PLATE, MOTOR, ROTOR, SENSOR, PISTON, CIRCUIT, EMITTER, CONVEYOR, ROBOT_ARM, COIL_HEATING, COIL_ELECTRIC, STICK_MAGNETIC, STICK_DISTILLATION, BETTER_CIRCUIT, FIELD_GENERATOR, COIL_HEATING_DOUBLE, STICK_ELECTROMAGNETIC;}
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MTE_CustomRecipe_BasicMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MTE_CustomRecipe_BasicMachine.java
deleted file mode 100644
index 521b23a42e..0000000000
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MTE_CustomRecipe_BasicMachine.java
+++ /dev/null
@@ -1,799 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base;
-
-import static gregtech.api.enums.GT_Values.V;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Textures;
-import gregtech.api.gui.GT_Container_BasicMachine;
-import gregtech.api.gui.GT_GUIContainer_BasicMachine;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.xmod.gregtech.api.util.GregtechRecipe_OLD;
-import gtPlusPlus.xmod.gregtech.api.util.GregtechRecipe_OLD.Gregtech_Recipe_Map;
-
-import java.util.Arrays;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidHandler;
-
-/**
- * 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_MTE_CustomRecipe_BasicMachine extends GT_MetaTileEntity_BasicTank {
-    /**
-     * 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;
-    private 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 mMainFacing = -1, mProgresstime = 0, mMaxProgresstime = 0, mEUt = 0, mOutputBlocked = 0;
-    public FluidStack mOutputFluid;
-    public String mGUIName = "", mNEIName = "";
-    private NBTTagCompound mRecipeStuff = new NBTTagCompound();
-    /**
-     * Contains the Recipe which has been previously used, or null if there was no previous Recipe, which could have been buffered
-     */
-    protected GregtechRecipe_OLD 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_MTE_CustomRecipe_BasicMachine(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_MTE_CustomRecipe_BasicMachine(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;
-    }
-
-    @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, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
-        return mTextures[mMainFacing < 2 ? aSide == aFacing ? aActive ? 2 : 3 : aSide == 0 ? aActive ? 6 : 7 : aSide == 1 ? aActive ? 4 : 5 : aActive ? 0 : 1 : aSide == mMainFacing ? aActive ? 2 : 3 : (showPipeFacing() && aSide == aFacing) ? aSide == 0 ? aActive ? 8 : 9 : aSide == 1 ? aActive ? 10 : 11 : aActive ? 12 : 13 : aSide == 0 ? aActive ? 6 : 7 : aSide == 1 ? 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(byte aFacing) {
-        return mMainFacing > 1 || aFacing > 1;
-    }
-
-    @Override
-    public boolean isEnetInput() {
-        return true;
-    }
-
-    @Override
-    public boolean isInputFacing(byte aSide) {
-        return aSide != mMainFacing;
-    }
-
-    @Override
-    public boolean isOutputFacing(byte aSide) {
-        return false;
-    }
-
-    @Override
-    public boolean isTeleporterCompatible() {
-        return false;
-    }
-
-    @Override
-    public boolean isLiquidInput(byte aSide) {
-        return aSide != mMainFacing && (mAllowInputFromOutputSide || aSide != getBaseMetaTileEntity().getFrontFacing());
-    }
-
-    @Override
-    public boolean isLiquidOutput(byte aSide) {
-        return aSide != 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) {
-        if (aBaseMetaTileEntity.isClientSide()) return true;
-        aBaseMetaTileEntity.openGUI(aPlayer);
-        return true;
-    }
-
-    @Override
-    public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_Container_BasicMachine(aPlayerInventory, aBaseMetaTileEntity);
-    }
-
-    @Override
-    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_GUIContainer_BasicMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), mGUIName, GT_Utility.isStringValid(mNEIName) ? mNEIName : getRecipeList() != null ? getRecipeList().mUnlocalizedName : "");
-    }
-
-    @Override
-    public void initDefaultModes(NBTTagCompound aNBT) {
-        mMainFacing = -1;
-    }
-
-    @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);
-        aNBT.setInteger("mProgresstime", mProgresstime);
-        aNBT.setInteger("mMaxProgresstime", mMaxProgresstime);
-        aNBT.setTag("GT.CraftingComponents", mRecipeStuff);
-        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 = aNBT.getInteger("mMainFacing");
-        mProgresstime = aNBT.getInteger("mProgresstime");
-        mMaxProgresstime = aNBT.getInteger("mMaxProgresstime");
-        mRecipeStuff = aNBT.getCompoundTag("GT.CraftingComponents");
-        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()) {
-            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;
-                } else {
-                    if (!mStuttering) {
-                        stutterProcess();
-                        if (canHaveInsufficientEnergy()) mProgresstime = -100;
-                        mStuttering = true;
-                    }
-                }
-            } else {
-                aBaseMetaTileEntity.setActive(false);
-            }
-
-            boolean tRemovedOutputFluid = false;
-
-            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(ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()), tDrained, false);
-                        if (tFilledAmount > 0)
-                            tTank.fill(ForgeDirection.getOrientation(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++;
-
-            if (allowToCheckRecipe()) {
-                if (mMaxProgresstime <= 0 && aBaseMetaTileEntity.isAllowedToWork() && (tRemovedOutputFluid || tSucceeded || aBaseMetaTileEntity.hasInventoryBeenModified() || aTick % 600 == 0 || aBaseMetaTileEntity.hasWorkJustBeenEnabled()) && hasEnoughEnergyToCheckRecipe()) {
-                    if (checkRecipe() == 2) {
-                        if (mInventory[3] != null && mInventory[3].stackSize <= 0) mInventory[3] = null;
-                        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 < 2 && getBaseMetaTileEntity().getFrontFacing() > 1) {
-            mMainFacing = getBaseMetaTileEntity().getFrontFacing();
-        }
-        if (mMainFacing >= 2 && !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(GregtechRecipe_OLD tRecipe) {
-        calculateOverclockedNess(tRecipe.mEUt, tRecipe.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(GregtechRecipe_OLD tRecipe) {
-        return tRecipe != null && (tRecipe.mNeedsEmptyOutput ? isOutputEmpty() && getDrainableStack() == null : canOutput(tRecipe.getFluidOutput(0)) && canOutput(tRecipe.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 = aValue;
-    }
-
-    @Override
-    public byte getUpdateData() {
-        return (byte) mMainFacing;
-    }
-
-    @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[]{
-        		mRecipeStuff.toString(),
-                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(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
-        if (aSide == getBaseMetaTileEntity().getFrontFacing() || aSide == mMainFacing) {
-            mAllowInputFromOutputSide = !mAllowInputFromOutputSide;
-            GT_Utility.sendChatToPlayer(aPlayer, mAllowInputFromOutputSide ? "Input from Output Side allowed" : "Input from Output Side forbidden");
-        }
-    }
-
-    @Override
-    public boolean allowCoverOnSide(byte aSide, GT_ItemStack aCoverID) {
-        return (aSide != mMainFacing || GregTech_API.getCoverBehavior(aCoverID.toStack()).isGUIClickable(aSide, GT_Utility.stackToInt(aCoverID.toStack()), 0, getBaseMetaTileEntity()));
-    }
-
-    @Override
-    public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
-        return aSide != mMainFacing && aIndex >= getOutputSlot() && aIndex < getOutputSlot() + mOutputItems.length;
-    }
-
-    @Override
-    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
-        if (aSide == mMainFacing || aIndex < getInputSlot() || aIndex >= getInputSlot() + mInputSlotCount || (!mAllowInputFromOutputSide && aSide == 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 Gregtech_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() {
-    	Gregtech_Recipe_Map tMap = getRecipeList();
-        if (tMap == null) return DID_NOT_FIND_RECIPE;
-        GregtechRecipe_OLD tRecipe = tMap.findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, V[mTier], new FluidStack[]{getFillableStack()}, getSpecialSlot(), getAllInputs());
-        if (tRecipe == null) return DID_NOT_FIND_RECIPE;
-        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)};
-    }
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
index 585987797c..e9947464be 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
@@ -16,6 +16,7 @@ import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
+import gregtech.common.GT_Proxy;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
@@ -71,13 +72,14 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
 	}
 	
 	private int getGT5Var(){
-		Class clazz = GT_Mod.gregtechproxy.getClass();
+		Class<? extends GT_Proxy> clazz = GT_Mod.gregtechproxy.getClass();
 		String lookingForValue = "mWireHeatingTicks";
 		int temp = 4;
 		Field field;
+		if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
 		try {
 			field = clazz.getClass().getField(lookingForValue);
-			Class clazzType = field.getType();           
+			Class<?> clazzType = field.getType();           
 			if (clazzType.toString().equals("int")){
 				temp = (field.getInt(clazz));
 			}
@@ -85,10 +87,12 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
 				temp = 4;
 			}
 		} catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
-			Utils.LOG_INFO("FATAL ERROR - REFLECTION FAILED FOR GT CABLES - PLEASE REPORT THIS.");
+			//Utils.LOG_INFO("FATAL ERROR - REFLECTION FAILED FOR GT CABLES - PLEASE REPORT THIS.");
 			Utils.LOG_WARNING("FATAL ERROR - REFLECTION FAILED FOR GT CABLES - PLEASE REPORT THIS.");
 			Utils.LOG_ERROR("FATAL ERROR - REFLECTION FAILED FOR GT CABLES - PLEASE REPORT THIS.");
+			temp = 4;
 			}
+		}
 		return temp;
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 59f98b8767..a6121f783d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -22,9 +22,11 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Outpu
 import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.util.GT_ModHandler;
 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 gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_MultiMachine;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 
@@ -824,5 +826,46 @@ public abstract class GregtechMeta_MultiBlockBase extends MetaTileEntity {
         //
     }
     
+    public int getValidOutputSlots(GT_Recipe.GT_Recipe_Map sRecipeMap, ItemStack[] sInputs){    	
+    	ArrayList<ItemStack> tInputList = getStoredInputs();
+		GT_Recipe tRecipe = sRecipeMap.findRecipe(getBaseMetaTileEntity(), false, 9223372036854775807L, null, sInputs);
+		ArrayList<Pair<GT_MetaTileEntity_Hatch_OutputBus, Integer>> rList = new ArrayList<Pair<GT_MetaTileEntity_Hatch_OutputBus, Integer>>();
+		int tTotalHatches=0;
+		for (GT_MetaTileEntity_Hatch_OutputBus tHatch : mOutputBusses) {
+			int hatchUsedSlotCount = 0;
+			if (isValidMetaTileEntity(tHatch)) {
+				tTotalHatches++;
+				for (int i=0; i<tHatch.getBaseMetaTileEntity().getSizeInventory(); i++) {
+					if (tHatch.getBaseMetaTileEntity().getStackInSlot(i) != null){hatchUsedSlotCount++;}					
+				}
+				rList.add(new Pair<GT_MetaTileEntity_Hatch_OutputBus, Integer>(tHatch, hatchUsedSlotCount));
+			}
+		}
+		boolean[] mValidOutputSlots = new boolean[tTotalHatches];
+		int arrayPos=0;
+		for (Pair<GT_MetaTileEntity_Hatch_OutputBus, Integer> IE : rList) {
+			GT_MetaTileEntity_Hatch_OutputBus vTE = IE.getKey();
+			int vUsedSlots = IE.getValue();
+			if (vUsedSlots == 0){mValidOutputSlots[arrayPos] = true;}	
+			else if (vUsedSlots < vTE.getSizeInventory()){	
+				int outputItemCount = tRecipe.mOutputs.length;
+				if (vUsedSlots < vTE.getSizeInventory()-outputItemCount){mValidOutputSlots[arrayPos] = true;}
+				else if (vUsedSlots >= vTE.getSizeInventory()-outputItemCount){		
+					if (vUsedSlots > vTE.getSizeInventory()-outputItemCount){if (arrayPos == tTotalHatches){return 0;} /*Change to Hatch total*/ }				
+				}			
+			}			
+			//Hatch is full
+			if (vUsedSlots == vTE.getSizeInventory()){
+				mValidOutputSlots[arrayPos] = false;
+				if (arrayPos == tTotalHatches){return 0;} // Change to Hatch Total
+			}
+			arrayPos++;
+		}
+		int tValidOutputSlots = 0;
+		for (int cr=0;cr<mValidOutputSlots.length;cr++){if (mValidOutputSlots[cr]){tValidOutputSlots++;}}
+		if (tValidOutputSlots >= 1) {return tValidOutputSlots;}    	
+    	return 0;	
+    }
+    
     
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java
new file mode 100644
index 0000000000..49f9fb1344
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java
@@ -0,0 +1,407 @@
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators;
+
+import static gregtech.api.enums.GT_Values.V;
+import gregtech.api.enums.Textures;
+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.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_DeluxeTank;
+
+import java.util.Collection;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+public abstract class GregtechDoubleFuelGeneratorBase extends GT_MetaTileEntity_DeluxeTank {
+
+	private boolean useFuel = false;
+
+	public GregtechDoubleFuelGeneratorBase(int aID, String aName, String aNameRegional, int aTier, String aDescription, ITexture... aTextures) {
+		super(aID, aName, aNameRegional, aTier, 4, aDescription, aTextures);
+	}
+
+	public GregtechDoubleFuelGeneratorBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+		super(aName, aTier, 4, aDescription, aTextures);
+	}
+
+	@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];
+	}
+
+
+	@Override
+	public String[] getDescription() {
+		return new String[]{mDescription, "Fuel Efficiency: " + getEfficiency() + "%", CORE.GT_Tooltip};
+	}
+
+
+	/* @Override
+    public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
+        if (aBaseMetaTileEntity.isClientSide()) return true;
+        aBaseMetaTileEntity.openGUI(aPlayer);
+        return true;
+    }*/
+
+	@Override
+	public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
+		if (aBaseMetaTileEntity.isClientSide()){
+			Utils.LOG_WARNING("Entity is Client side, simply returning true");
+			return true;
+		}
+		Utils.LOG_WARNING("Entity is not Client side, opening entity Container and by extension, it's GUI, then returning true");
+		aBaseMetaTileEntity.openGUI(aPlayer);
+		return true;
+	} 
+
+	public ITexture[] getFront(byte aColor) {
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+	}
+
+	public ITexture[] getBack(byte aColor) {
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+	}
+
+	public ITexture[] getBottom(byte aColor) {
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+	}
+
+	public ITexture[] getTop(byte aColor) {
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+	}
+
+	public ITexture[] getSides(byte aColor) {
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+	}
+
+	public ITexture[] getFrontActive(byte aColor) {
+		return getFront(aColor);
+	}
+
+	public ITexture[] getBackActive(byte aColor) {
+		return getBack(aColor);
+	}
+
+	public ITexture[] getBottomActive(byte aColor) {
+		return getBottom(aColor);
+	}
+
+	public ITexture[] getTopActive(byte aColor) {
+		return getTop(aColor);
+	}
+
+	public ITexture[] getSidesActive(byte aColor) {
+		return getSides(aColor);
+	}
+
+	@Override
+	public boolean isFacingValid(byte aSide) {
+		return aSide > 1;
+	}
+
+	@Override
+	public boolean isSimpleMachine() {
+		return false;
+	}
+
+	@Override
+	public boolean isValidSlot(int aIndex) {
+		return aIndex < 2;
+	}
+
+	@Override
+	public boolean isEnetOutput() {
+		return true;
+	}
+
+	@Override
+	public boolean isOutputFacing(byte aSide) {
+		return true;
+	}
+
+	@Override
+	public boolean isAccessAllowed(EntityPlayer aPlayer) {
+		return true;
+	}
+
+	@Override
+	public long maxEUOutput() {
+		return getBaseMetaTileEntity().isAllowedToWork() ? V[mTier] : 0;
+	}
+
+	@Override
+	public long maxEUStore() {
+		return Math.max(getEUVar(), V[mTier] * 115 + getMinimumStoredEU());
+	}
+
+	@Override
+	public boolean doesFillContainers() {
+		return getBaseMetaTileEntity().isAllowedToWork();
+	}
+
+	@Override
+	public boolean doesEmptyContainers() {
+		return getBaseMetaTileEntity().isAllowedToWork();
+	}
+
+	@Override
+	public boolean canTankBeFilled() {
+		return getBaseMetaTileEntity().isAllowedToWork();
+	}
+
+	@Override
+	public boolean canTankBeEmptied() {
+		return getBaseMetaTileEntity().isAllowedToWork();
+	}
+
+	@Override
+	public boolean displaysItemStack() {
+		return true;
+	}
+
+	@Override
+	public boolean displaysStackSize() {
+		return false;
+	}
+
+	@Override
+	public boolean isFluidInputAllowed(FluidStack aFluid) {
+		return getFuelValue(aFluid) > 0;
+	}
+	
+	@Override
+	public long getMinimumStoredEU() {
+        return 512;
+    }
+
+	@Override
+	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+		if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && aTick % 10 == 0) {
+			if (mFluid == null) {
+				if (aBaseMetaTileEntity.getUniversalEnergyStored() < maxEUOutput() + getMinimumStoredEU()) {
+					mInventory[getStackDisplaySlot()] = null;
+				} else {
+					if (mInventory[getStackDisplaySlot()] == null)
+						mInventory[getStackDisplaySlot()] = new ItemStack(Blocks.fire, 1);
+					mInventory[getStackDisplaySlot()].setStackDisplayName("Generating: " + (aBaseMetaTileEntity.getUniversalEnergyStored() - getMinimumStoredEU()) + " EU");
+				}
+			} else {
+				if (mFluid != null && mFluid2 != null){
+					int tFuelValue = getFuelValue(mFluid), tConsumed = consumedFluidPerOperation(mFluid);
+					int tFuelValue2 = getFuelValue(mFluid2), tConsumed2 = consumedFluidPerOperation(mFluid2);
+					if ((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.name: "+mFluid.getFluid().getName());
+						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.name: "+mFluid2.getFluid().getName());
+						Utils.LOG_WARNING("mFluid2.amount: "+mFluid2.amount);
+						Utils.LOG_WARNING("mFluid2.amount > tConsumed2: "+(mFluid2.amount > tConsumed2));  
+						long tFluidAmountToUse = Math.min(mFluid.amount / tConsumed, (maxEUOutput() * 30 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue);
+						long tFluidAmountToUse2 = Math.min(mFluid2.amount / tConsumed2, (maxEUOutput() * 30 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue2);
+
+						if (tFluidAmountToUse <= 0){
+							/*if ((mFluid.amount / tConsumed) == getCapacity()){
+								tFluidAmountToUse = 1;
+							}*/
+							
+							if (aBaseMetaTileEntity.getUniversalEnergyStored() <= (aBaseMetaTileEntity.getEUCapacity()-aBaseMetaTileEntity.getUniversalEnergyStored())){
+								tFluidAmountToUse = 1;
+								Utils.LOG_WARNING("=========================================================");
+								Utils.LOG_WARNING("tFluidAmountToUse - Updated: "+tFluidAmountToUse);
+								Utils.LOG_WARNING("=========================================================");
+							}
+						}
+						
+						if (tFluidAmountToUse2 <= 0){
+							/*if ((mFluid2.amount / tConsumed) == getCapacity()){
+								tFluidAmountToUse2 = 1;
+							}*/
+							if (aBaseMetaTileEntity.getUniversalEnergyStored() <= (aBaseMetaTileEntity.getEUCapacity()-aBaseMetaTileEntity.getUniversalEnergyStored())){
+								tFluidAmountToUse2 = 1;
+								Utils.LOG_WARNING("=========================================================");
+								Utils.LOG_WARNING("tFluidAmountToUse2 - Updated: "+tFluidAmountToUse2);
+								Utils.LOG_WARNING("=========================================================");
+							}
+						}
+						
+						Utils.LOG_WARNING("=========================================================");
+						Utils.LOG_WARNING("tFluidAmountToUse: "+tFluidAmountToUse);
+						Utils.LOG_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));
+						*/
+						
+						Utils.LOG_WARNING("=========================================================");
+						Utils.LOG_WARNING("tFluidAmountToUse2: "+tFluidAmountToUse2);
+						Utils.LOG_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))){
+
+							Utils.LOG_WARNING("tFuelValue: "+tFuelValue);
+							Utils.LOG_WARNING("tConsumed: "+tConsumed);
+							Utils.LOG_WARNING("mFluid.name: "+mFluid.getFluid().getName());
+							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.name: "+mFluid2.getFluid().getName());
+							Utils.LOG_WARNING("mFluid2.amount: "+mFluid2.amount);
+							Utils.LOG_WARNING("mFluid2.amount > tConsumed2: "+(mFluid2.amount > tConsumed2));  
+
+							if (useFuel){
+								mFluid.amount -= tFluidAmountToUse * tConsumed;
+								mFluid2.amount -= tFluidAmountToUse2 * tConsumed2;
+								useFuel = false;
+							}
+							else {
+								useFuel = true;
+							}
+
+						}
+						else {
+							Utils.LOG_WARNING("=========================================================");
+							Utils.LOG_WARNING("Either tFluidAmountToUse1 <= 0, power cannot be increased of tFluidAmountToUse2 <= 0");
+							Utils.LOG_WARNING("tFluidAmountToUse1: "+tFluidAmountToUse);
+							Utils.LOG_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 {
+					Utils.LOG_WARNING("One mFluid is null");
+					if (mFluid != null)
+						Utils.LOG_WARNING("mFluid1 is not null");
+					if (mFluid2 != null)
+						Utils.LOG_WARNING("mFluid2 is not null");
+				}
+			}
+			if (mInventory[getInputSlot()] != null && aBaseMetaTileEntity.getUniversalEnergyStored() < (maxEUOutput() * 20 + getMinimumStoredEU()) && GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true) == null) {
+				int tFuelValue = getFuelValue(mInventory[getInputSlot()]);
+				if (tFuelValue > 0) {
+					ItemStack tEmptyContainer = getEmptyContainer(mInventory[getInputSlot()]);
+					if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), tEmptyContainer)) {
+						aBaseMetaTileEntity.increaseStoredEnergyUnits(tFuelValue, true);
+						aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
+					}
+				}
+			}
+		}
+
+		if (aBaseMetaTileEntity.isServerSide())
+			aBaseMetaTileEntity.setActive(aBaseMetaTileEntity.isAllowedToWork() && aBaseMetaTileEntity.getUniversalEnergyStored() >= maxEUOutput() + getMinimumStoredEU());
+	}
+
+	public abstract GT_Recipe_Map getRecipes();
+
+	public abstract int getEfficiency();
+
+	public int consumedFluidPerOperation(FluidStack aLiquid) {
+		return 1;
+	}
+
+	public int getFuelValue(FluidStack aLiquid) {
+		if (aLiquid == null || getRecipes() == null) return 0;
+		FluidStack tLiquid;
+		Collection<GT_Recipe> tRecipeList = getRecipes().mRecipeList;
+		if (tRecipeList != null) for (GT_Recipe tFuel : tRecipeList)
+			if ((tLiquid = GT_Utility.getFluidForFilledItem(tFuel.getRepresentativeInput(0), true)) != null)
+				if (aLiquid.isFluidEqual(tLiquid))
+					return (int) (((long) tFuel.mSpecialValue * getEfficiency() * consumedFluidPerOperation(tLiquid)) / 100);
+		return 0;
+	}
+
+	public int getFuelValue(ItemStack aStack) {
+		if (GT_Utility.isStackInvalid(aStack) || getRecipes() == null) return 0;
+		GT_Recipe tFuel = getRecipes().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
+		if (tFuel != null) return (int) ((tFuel.mSpecialValue * 1000L * getEfficiency()) / 100);
+		return 0;
+	}
+
+	public ItemStack getEmptyContainer(ItemStack aStack) {
+		if (GT_Utility.isStackInvalid(aStack) || getRecipes() == null) return null;
+		GT_Recipe tFuel = getRecipes().findRecipe(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(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+		return super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack) && (getFuelValue(aStack) > 0 || getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true)) > 0);
+	}
+
+	@Override
+	public int getCapacity() {
+		return 32000;
+	}
+
+	@Override
+	public int getTankPressure() {
+		return -100;
+	}
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
index ddbc5aab96..2c43293e87 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
@@ -10,6 +10,7 @@ import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.handler.events.UnbreakableBlockManager;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.player.PlayerCache;
+import gtPlusPlus.core.util.player.PlayerUtils;
 
 import java.util.UUID;
 
@@ -222,8 +223,8 @@ public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_Tiered
 					//Utils.LOG_WARNING("GUI should now be open for you sir.");
 				}
 				else {
-					Utils.messagePlayer(aPlayer, "Access Denied, This does not belong to you.");
-					Utils.messagePlayer(aPlayer, "it is owned by: "+PlayerCache.lookupPlayerByUUID(ownerUUID));
+					PlayerUtils.messagePlayer(aPlayer, "Access Denied, This does not belong to you.");
+					PlayerUtils.messagePlayer(aPlayer, "it is owned by: "+PlayerCache.lookupPlayerByUUID(ownerUUID));
 					Utils.LOG_WARNING("Expecting Player : "+PlayerCache.lookupPlayerByUUID(ownerUUID));
 					Utils.LOG_ERROR("Access Denied.");
 					return true;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechRecipe_OLD.java b/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechRecipe_OLD.java
deleted file mode 100644
index 60583ed27b..0000000000
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechRecipe_OLD.java
+++ /dev/null
@@ -1,781 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.util;
-
-import static gregtech.api.enums.GT_Values.E;
-import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
-import static gregtech.api.enums.GT_Values.W;
-import gregtech.api.GregTech_API;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
-import gregtech.api.objects.GT_FluidStack;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Log;
-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.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-
-/**
- * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
- * <p/>
- * This File contains the functions used for Recipes. Please do not include this File AT ALL in your Moddownload as it ruins compatibility
- * This is just the Core of my Recipe System, if you just want to GET the Recipes I add, then you can access this File.
- * Do NOT add Recipes using the Constructors inside this Class, The GregTech_API File calls the correct Functions for these Constructors.
- * <p/>
- * I know this File causes some Errors, because of missing Main Functions, but if you just need to compile Stuff, then remove said erroreous Functions.
- */
-public class GregtechRecipe_OLD {
-
-	public static volatile int VERSION = 508;
-	/**
-	 * If you want to change the Output, feel free to modify or even replace the whole ItemStack Array, for Inputs, please add a new Recipe, because of the HashMaps.
-	 */
-	public ItemStack[] mInputs, mOutputs;
-	/**
-	 * If you want to change the Output, feel free to modify or even replace the whole ItemStack Array, for Inputs, please add a new Recipe, because of the HashMaps.
-	 */
-	public FluidStack[] mFluidInputs, mFluidOutputs;
-	/**
-	 * If you changed the amount of Array-Items inside the Output Array then the length of this Array must be larger or equal to the Output Array. A chance of 10000 equals 100%
-	 */
-	public int[] mChances;
-	/**
-	 * An Item that needs to be inside the Special Slot, like for example the Copy Slot inside the Printer. This is only useful for Fake Recipes in NEI, since findRecipe() and containsInput() don't give a shit about this Field. Lists are also possible.
-	 */
-	public Object mSpecialItems;
-	public int mDuration, mEUt, mSpecialValue;
-	/**
-	 * Use this to just disable a specific Recipe, but the Configuration enables that already for every single Recipe.
-	 */
-	public boolean mEnabled = true;
-	/**
-	 * If this Recipe is hidden from NEI
-	 */
-	public boolean mHidden = false;
-	/**
-	 * If this Recipe is Fake and therefore doesn't get found by the findRecipe Function (It is still in the HashMaps, so that containsInput does return T on those fake Inputs)
-	 */
-	public boolean mFakeRecipe = false;
-	/**
-	 * If this Recipe can be stored inside a Machine in order to make Recipe searching more Efficient by trying the previously used Recipe first. In case you have a Recipe Map overriding things and returning one time use Recipes, you have to set this to F.
-	 */
-	public boolean mCanBeBuffered = true;
-	/**
-	 * If this Recipe needs the Output Slots to be completely empty. Needed in case you have randomised Outputs
-	 */
-	public boolean mNeedsEmptyOutput = false;
-	private GregtechRecipe_OLD(GregtechRecipe_OLD aRecipe) {
-		mInputs = GT_Utility.copyStackArray((Object[]) aRecipe.mInputs);
-		mOutputs = GT_Utility.copyStackArray((Object[]) aRecipe.mOutputs);
-		mSpecialItems = aRecipe.mSpecialItems;
-		mChances = aRecipe.mChances;
-		mFluidInputs = GT_Utility.copyFluidArray(aRecipe.mFluidInputs);
-		mFluidOutputs = GT_Utility.copyFluidArray(aRecipe.mFluidOutputs);
-		mDuration = aRecipe.mDuration;
-		mSpecialValue = aRecipe.mSpecialValue;
-		mEUt = aRecipe.mEUt;
-		mNeedsEmptyOutput = aRecipe.mNeedsEmptyOutput;
-		mCanBeBuffered = aRecipe.mCanBeBuffered;
-		mFakeRecipe = aRecipe.mFakeRecipe;
-		mEnabled = aRecipe.mEnabled;
-		mHidden = aRecipe.mHidden;
-	}
-	protected GregtechRecipe_OLD(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
-		if (aInputs == null) aInputs = new ItemStack[0];
-		if (aOutputs == null) aOutputs = new ItemStack[0];
-		if (aFluidInputs == null) aFluidInputs = new FluidStack[0];
-		if (aFluidOutputs == null) aFluidOutputs = new FluidStack[0];
-		if (aChances == null) aChances = new int[aOutputs.length];
-		if (aChances.length < aOutputs.length) aChances = Arrays.copyOf(aChances, aOutputs.length);
-
-		aInputs = GT_Utility.getArrayListWithoutTrailingNulls(aInputs).toArray(new ItemStack[0]);
-		aOutputs = GT_Utility.getArrayListWithoutTrailingNulls(aOutputs).toArray(new ItemStack[0]);
-		aFluidInputs = GT_Utility.getArrayListWithoutNulls(aFluidInputs).toArray(new FluidStack[0]);
-		aFluidOutputs = GT_Utility.getArrayListWithoutNulls(aFluidOutputs).toArray(new FluidStack[0]);
-
-		GT_OreDictUnificator.setStackArray(true, aInputs);
-		GT_OreDictUnificator.setStackArray(true, aOutputs);
-
-		for (ItemStack tStack : aOutputs) GT_Utility.updateItemStack(tStack);
-
-		for (int i = 0; i < aChances.length; i++) if (aChances[i] <= 0) aChances[i] = 10000;
-		for (int i = 0; i < aFluidInputs.length; i++) aFluidInputs[i] = new GT_FluidStack(aFluidInputs[i]);
-		for (int i = 0; i < aFluidOutputs.length; i++) aFluidOutputs[i] = new GT_FluidStack(aFluidOutputs[i]);
-
-		for (int i = 0; i < aInputs.length; i++)
-			if (aInputs[i] != null && Items.feather.getDamage(aInputs[i]) != W)
-				for (int j = 0; j < aOutputs.length; j++) {
-					if (GT_Utility.areStacksEqual(aInputs[i], aOutputs[j])) {
-						if (aInputs[i].stackSize >= aOutputs[j].stackSize) {
-							aInputs[i].stackSize -= aOutputs[j].stackSize;
-							aOutputs[j] = null;
-						} else {
-							aOutputs[j].stackSize -= aInputs[i].stackSize;
-						}
-					}
-				}
-
-		if (aOptimize && aDuration >= 32) {
-			ArrayList<ItemStack> tList = new ArrayList<ItemStack>();
-			tList.addAll(Arrays.asList(aInputs));
-			tList.addAll(Arrays.asList(aOutputs));
-			for (int i = 0; i < tList.size(); i++) if (tList.get(i) == null) tList.remove(i--);
-
-			for (byte i = (byte) Math.min(64, aDuration / 16); i > 1; i--)
-				if (aDuration / i >= 16) {
-					boolean temp = true;
-					for (int j = 0, k = tList.size(); temp && j < k; j++)
-						if (tList.get(j).stackSize % i != 0) temp = false;
-					for (int j = 0; temp && j < aFluidInputs.length; j++)
-						if (aFluidInputs[j].amount % i != 0) temp = false;
-					for (int j = 0; temp && j < aFluidOutputs.length; j++)
-						if (aFluidOutputs[j].amount % i != 0) temp = false;
-					if (temp) {
-						for (int j = 0, k = tList.size(); j < k; j++) tList.get(j).stackSize /= i;
-						for (int j = 0; j < aFluidInputs.length; j++) aFluidInputs[j].amount /= i;
-						for (int j = 0; j < aFluidOutputs.length; j++) aFluidOutputs[j].amount /= i;
-						aDuration /= i;
-					}
-				}
-		}
-
-		mInputs = aInputs;
-		mOutputs = aOutputs;
-		mSpecialItems = aSpecialItems;
-		mChances = aChances;
-		mFluidInputs = aFluidInputs;
-		mFluidOutputs = aFluidOutputs;
-		mDuration = aDuration;
-		mSpecialValue = aSpecialValue;
-		mEUt = aEUt;
-
-		//		checkCellBalance();
-		
-		Utils.LOG_SPECIFIC_WARNING(this.getClass().getName()+" | [GregtechRecipe_OLD]", "Created new recipe instance for "+UtilsItems.getArrayStackNames(aInputs), 167);
-	}
-
-	public GregtechRecipe_OLD(ItemStack aInput1, ItemStack aOutput1, int aFuelValue, int aType) {
-		this(aInput1, aOutput1, null, null, null, aFuelValue, aType);
-	}
-
-	// aSpecialValue = EU per Liter! If there is no Liquid for this Object, then it gets multiplied with 1000!
-	public GregtechRecipe_OLD(ItemStack aInput1, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, int aSpecialValue, int aType) {
-		this(true, new ItemStack[]{aInput1}, new ItemStack[]{aOutput1, aOutput2, aOutput3, aOutput4}, null, null, null, null, 0, 0, Math.max(1, aSpecialValue));
-
-		Utils.LOG_INFO("Switch case method for adding fuels");
-		if (mInputs.length > 0 && aSpecialValue > 0) {
-			switch (aType) {
-			// Diesel Generator
-			case 0:
-				Utils.LOG_INFO("Added fuel "+aInput1.getDisplayName()+" is ROCKET FUEL - continuing");
-				Gregtech_Recipe_Map.sRocketFuels.addRecipe(this);				
-				break;
-				// Gas Turbine
-			case 1:
-				Gregtech_Recipe_Map.sGeoThermalFuels.addRecipe(this);
-				break;
-				// Thermal Generator
-			case 2:
-				//Gregtech_Recipe_Map.sHotFuels.addRecipe(this);
-				break;
-				// Plasma Generator
-			case 4:
-				//Gregtech_Recipe_Map.sPlasmaFuels.addRecipe(this);
-				break;
-				// Magic Generator
-			case 5:
-				//Gregtech_Recipe_Map.sMagicFuels.addRecipe(this);
-				break;
-				// Fluid Generator. Usually 3. Every wrong Type ends up in the Semifluid Generator
-			default:
-				//Gregtech_Recipe_Map.sDenseLiquidFuels.addRecipe(this);
-				break;
-			}
-		}
-	}
-	
-	//Custom Recipe Handlers
-	public GregtechRecipe_OLD(ItemStack aInput, FluidStack aFluid, ItemStack[] aOutput, int aDuration, int aEUt) {
-        this(true, new ItemStack[]{aInput}, aOutput.clone(), null, null, new FluidStack[]{aFluid}, null, aDuration, aEUt, 0);
-        if (mInputs.length > 0 && mOutputs[0] != null) {
-            Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(this);
-        }
-    }
-	
-	/*public GregtechRecipe_OLD(ItemStack aInput, FluidStack aFluid, ItemStack[] aOutput, int aDuration, int aEUt) {
-        this(true, new ItemStack[]{aInput}, aOutput.clone(), null, null, new FluidStack[]{aFluid}, null, aDuration, aEUt, 0);
-        if (mInputs.length > 0 && mOutputs[0] != null) {
-            Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(this);
-        }
-    }*/
-	
-
-	public static void reInit() {
-		GT_Log.out.println("GT_Mod: Re-Unificating Recipes.");
-		for (Gregtech_Recipe_Map tMapEntry : Gregtech_Recipe_Map.sMappings) tMapEntry.reInit();
-	}
-	
-	public ItemStack getRepresentativeInput(int aIndex) {
-        if (aIndex < 0 || aIndex >= mInputs.length) return null;
-        return GT_Utility.copy(mInputs[aIndex]);
-    }
-
-    public ItemStack getOutput(int aIndex) {
-        if (aIndex < 0 || aIndex >= mOutputs.length) return null;
-        return GT_Utility.copy(mOutputs[aIndex]);
-    }
-
-    public int getOutputChance(int aIndex) {
-        if (aIndex < 0 || aIndex >= mChances.length) return 10000;
-        return mChances[aIndex];
-    }
-
-    public FluidStack getRepresentativeFluidInput(int aIndex) {
-        if (aIndex < 0 || aIndex >= mFluidInputs.length || mFluidInputs[aIndex] == null) return null;
-        return mFluidInputs[aIndex].copy();
-    }
-
-    public FluidStack getFluidOutput(int aIndex) {
-        if (aIndex < 0 || aIndex >= mFluidOutputs.length || mFluidOutputs[aIndex] == null) return null;
-        return mFluidOutputs[aIndex].copy();
-    }
-
-	public GregtechRecipe_OLD copy() {
-		return new GregtechRecipe_OLD(this);
-	}
-
-	public boolean isRecipeInputEqual(boolean aDecreaseStacksizeBySuccess, FluidStack[] aFluidInputs, ItemStack... aInputs) {
-		return isRecipeInputEqual(aDecreaseStacksizeBySuccess, false, aFluidInputs, aInputs);
-	}
-
-	public boolean isRecipeInputEqual(boolean aDecreaseStacksizeBySuccess, boolean aDontCheckStackSizes, FluidStack[] aFluidInputs, ItemStack... aInputs) {
-		if (mFluidInputs.length > 0 && aFluidInputs == null) return false;
-		for (FluidStack tFluid : mFluidInputs)
-			if (tFluid != null) {
-				boolean temp = true;
-				for (FluidStack aFluid : aFluidInputs)
-					if (aFluid != null && aFluid.isFluidEqual(tFluid) && (aDontCheckStackSizes || aFluid.amount >= tFluid.amount)) {
-						temp = false;
-						break;
-					}
-				if (temp) return false;
-			}
-
-		if (mInputs.length > 0 && aInputs == null) return false;
-
-		for (ItemStack tStack : mInputs)
-			if (tStack != null) {
-				boolean temp = true;
-				for (ItemStack aStack : aInputs)
-					if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true)) && (aDontCheckStackSizes || aStack.stackSize >= tStack.stackSize)) {
-						temp = false;
-						break;
-					}
-				if (temp) return false;
-			}
-
-		if (aDecreaseStacksizeBySuccess) {
-			if (aFluidInputs != null) {
-				for (FluidStack tFluid : mFluidInputs)
-					if (tFluid != null) {
-						for (FluidStack aFluid : aFluidInputs)
-							if (aFluid != null && aFluid.isFluidEqual(tFluid) && (aDontCheckStackSizes || aFluid.amount >= tFluid.amount)) {
-								aFluid.amount -= tFluid.amount;
-								break;
-							}
-					}
-			}
-
-			if (aInputs != null) {
-				for (ItemStack tStack : mInputs)
-					if (tStack != null) {
-						for (ItemStack aStack : aInputs)
-							if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true)) && (aDontCheckStackSizes || aStack.stackSize >= tStack.stackSize)) {
-								aStack.stackSize -= tStack.stackSize;
-								break;
-							}
-					}
-			}
-		}
-
-		return true;
-	}
-
-	public static class Gregtech_Recipe_Map {
-		/**
-		 * Contains all Recipe Maps
-		 */
-		public static final Collection<Gregtech_Recipe_Map> sMappings = new ArrayList<Gregtech_Recipe_Map>();
-		//public static final GT_Recipe_Map sChemicalBathRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(200), "gt.recipe.chemicalbath", "Chemical Bath", null, RES_PATH_GUI + "basicmachines/ChemicalBath", 1, 3, 1, 1, 1, E, 1, E, true, true);
-		public static final GT_Recipe_Map sCokeOvenRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(200), "gt.recipe.cokeoven", "Coke Oven", null, RES_PATH_GUI + "basicmachines/Dehydrator", 2, 2, 1, 0, 1, E, 1, E, true, true);
-		public static final GT_Recipe_Map sMatterFab2Recipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(200), "gt.recipe.matterfab2", "Matter Fabricator", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, E, 1, E, true, true);
-		//public static final Gregtech_Recipe_Map sMatterFabRecipes = new Gregtech_Recipe_Map(new HashSet<GregtechRecipe_OLD>(200), "gt.recipe.matterfab", "Matter Fabricator", null, RES_PATH_GUI + "basicmachines/Massfabricator", 1, 3, 1, 1, 1, E, 1, E, true, true);
-		public static final Gregtech_Recipe_Map_Fuel sRocketFuels = new Gregtech_Recipe_Map_Fuel(new HashSet<GregtechRecipe_OLD>(10), "gt.recipe.rocketenginefuel", "Rocket Engine Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 3000, " EU", true, true);
-		public static final Gregtech_Recipe_Map_Fuel sGeoThermalFuels = new Gregtech_Recipe_Map_Fuel(new HashSet<GregtechRecipe_OLD>(10), "gt.recipe.geothermalfuel", "GeoThermal Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
-		public static final Gregtech_Recipe_Map sChemicalDehydratorRecipes = new Gregtech_Recipe_Map(new HashSet<GregtechRecipe_OLD>(200), "gt.recipe.chemicaldehydrator", "Chemical Dehydrator", null, RES_PATH_GUI + "basicmachines/Dehydrator", 1, 1, 0, 0, 1, E, 1, E, true, true);
-		
-		/**
-		 * HashMap of Recipes based on their Items
-		 */
-		public final Map<GT_ItemStack, Collection<GregtechRecipe_OLD>> mRecipeItemMap = new HashMap<GT_ItemStack, Collection<GregtechRecipe_OLD>>();
-		/**
-		 * HashMap of Recipes based on their Fluids
-		 */
-		public final Map<Fluid, Collection<GregtechRecipe_OLD>> mRecipeFluidMap = new HashMap<Fluid, Collection<GregtechRecipe_OLD>>();
-		/**
-		 * The List of all Recipes
-		 */
-		public final Collection<GregtechRecipe_OLD> mRecipeList;
-		/**
-		 * String used as an unlocalised Name.
-		 */
-		public final String mUnlocalizedName;
-		/**
-		 * String used in NEI for the Recipe Lists. If null it will use the unlocalised Name instead
-		 */
-		public final String mNEIName;
-		/**
-		 * GUI used for NEI Display. Usually the GUI of the Machine itself
-		 */
-		public final String mNEIGUIPath;
-		public final String mNEISpecialValuePre, mNEISpecialValuePost;
-		public final int mUsualInputCount, mUsualOutputCount, mNEISpecialValueMultiplier, mMinimalInputItems, mMinimalInputFluids, mAmperage;
-		public final boolean mNEIAllowed, mShowVoltageAmperageInNEI;
-
-		/**
-		 * Initialises a new type of Recipe Handler.
-		 *
-		 * @param aRecipeList                a List you specify as Recipe List. Usually just an ArrayList with a pre-initialised Size.
-		 * @param aUnlocalizedName           the unlocalised Name of this Recipe Handler, used mainly for NEI.
-		 * @param aLocalName                 the displayed Name inside the NEI Recipe GUI.
-		 * @param aNEIGUIPath                the displayed GUI Texture, usually just a Machine GUI. Auto-Attaches ".png" if forgotten.
-		 * @param aUsualInputCount           the usual amount of Input Slots this Recipe Class has.
-		 * @param aUsualOutputCount          the usual amount of Output Slots this Recipe Class has.
-		 * @param aNEISpecialValuePre        the String in front of the Special Value in NEI.
-		 * @param aNEISpecialValueMultiplier the Value the Special Value is getting Multiplied with before displaying
-		 * @param aNEISpecialValuePost       the String after the Special Value. Usually for a Unit or something.
-		 * @param aNEIAllowed                if NEI is allowed to display this Recipe Handler in general.
-		 */
-		public Gregtech_Recipe_Map(Collection<GregtechRecipe_OLD> aRecipeList,
-				String aUnlocalizedName, String aLocalName, String aNEIName,
-				String aNEIGUIPath, int aUsualInputCount,
-				int aUsualOutputCount, int aMinimalInputItems,
-				int aMinimalInputFluids, int aAmperage,
-				String aNEISpecialValuePre, int aNEISpecialValueMultiplier,
-				String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI,
-				boolean aNEIAllowed) {
-			sMappings.add(this);
-			mNEIAllowed = aNEIAllowed;
-			mShowVoltageAmperageInNEI = aShowVoltageAmperageInNEI;
-			mRecipeList = aRecipeList;
-			mNEIName = aNEIName == null ? aUnlocalizedName : aNEIName;
-			mNEIGUIPath = aNEIGUIPath.endsWith(".png") ? aNEIGUIPath : aNEIGUIPath + ".png";
-			mNEISpecialValuePre = aNEISpecialValuePre;
-			mNEISpecialValueMultiplier = aNEISpecialValueMultiplier;
-			mNEISpecialValuePost = aNEISpecialValuePost;
-			mAmperage = aAmperage;
-			mUsualInputCount = aUsualInputCount;
-			mUsualOutputCount = aUsualOutputCount;
-			mMinimalInputItems = aMinimalInputItems;
-			mMinimalInputFluids = aMinimalInputFluids;
-			GregTech_API.sFluidMappings.add(mRecipeFluidMap);
-			GregTech_API.sItemStackMappings.add(mRecipeItemMap);
-			GT_LanguageManager.addStringLocalization(mUnlocalizedName = aUnlocalizedName, aLocalName);
-		}
-
-		public GregtechRecipe_OLD addRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, int[] aOutputChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
-			return addRecipe(new GregtechRecipe_OLD(aOptimize, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
-		}
-
-		public GregtechRecipe_OLD addRecipe(int[] aOutputChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
-			return addRecipe(new GregtechRecipe_OLD(false, null, null, null, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue), false, false, false);
-		}
-
-		public GregtechRecipe_OLD addRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
-			return addRecipe(new GregtechRecipe_OLD(aOptimize, aInputs, aOutputs, aSpecial, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
-		}
-
-		public GregtechRecipe_OLD addRecipe(boolean aOptimize, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
-			return addRecipe(new GregtechRecipe_OLD(aOptimize, null, null, null, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
-		}
-
-		/*public GregtechRecipe_OLD addRecipe(boolean aOptimize, FluidStack aInput1, FluidStack aOutput1, ItemStack[] bInput1, ItemStack[] bOutput1, int aDuration, int aEUt, int aSpecialValue) {
-			 return addRecipe(new GregtechRecipe_OLD(aOptimize, aInput1, aOutput1, bInput1,bOutput1, aDuration, aEUt, aSpecialValue));
-
-			}*/
-
-		public GregtechRecipe_OLD addRecipe(GregtechRecipe_OLD aRecipe) {
-			Utils.LOG_INFO("Adding Recipe Method 1");
-			return addRecipe(aRecipe, true, false, false);
-		}
-
-		protected GregtechRecipe_OLD addRecipe(GregtechRecipe_OLD aRecipe, boolean aCheckForCollisions, boolean aFakeRecipe, boolean aHidden) {
-			Utils.LOG_INFO("Adding Recipe Method 2 - This Checks if hidden, fake or if duplicate recipes exists, I think.");
-			aRecipe.mHidden = aHidden;
-			aRecipe.mFakeRecipe = aFakeRecipe;
-			Utils.LOG_INFO("Logging some data about this method: GregtechRecipe_OLD["+aRecipe.toString()+"] | aCheckForCollisions["+aCheckForCollisions+"] | aFakeRecipe["+aFakeRecipe+"] | aHidden["+aHidden+"]");
-			Utils.LOG_INFO("Logging some data about this method: mMinimalInputFluids["+mMinimalInputFluids+"] | mMinimalInputItems["+mMinimalInputItems+"] | aRecipe.mFluidInputs.length["+aRecipe.mFluidInputs.length+"] | aRecipe.mInputs.length["+aRecipe.mInputs.length+"]");
-			if (aRecipe.mFluidInputs.length < mMinimalInputFluids && aRecipe.mInputs.length < mMinimalInputItems){
-				Utils.LOG_INFO("Step 2 failed");
-				return null;}
-
-			Utils.LOG_INFO("Logging some data about this method: aCheckForCollisions["+aCheckForCollisions+"] | findRecipe != null ["+(findRecipe(null, false, Long.MAX_VALUE, aRecipe.mFluidInputs, aRecipe.mInputs) != null)+"]");
-			if (aCheckForCollisions && findRecipe(null, false, Long.MAX_VALUE, aRecipe.mFluidInputs, aRecipe.mInputs) != null){
-				Utils.LOG_INFO("Step 2 failed - 2");
-				return null;
-			}			
-			return add(aRecipe);
-		}
-		
-		
-
-		/**
-		 * Only used for fake Recipe Handlers to show something in NEI, do not use this for adding actual Recipes! findRecipe wont find fake Recipes, containsInput WILL find fake Recipes
-		 */
-		public GregtechRecipe_OLD addFakeRecipe(boolean aCheckForCollisions, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, int[] aOutputChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
-			return addFakeRecipe(aCheckForCollisions, new GregtechRecipe_OLD(false, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
-		}
-
-		/**
-		 * Only used for fake Recipe Handlers to show something in NEI, do not use this for adding actual Recipes! findRecipe wont find fake Recipes, containsInput WILL find fake Recipes
-		 */
-		public GregtechRecipe_OLD addFakeRecipe(boolean aCheckForCollisions, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
-			return addFakeRecipe(aCheckForCollisions, new GregtechRecipe_OLD(false, aInputs, aOutputs, aSpecial, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
-		}
-
-		/**
-		 * Only used for fake Recipe Handlers to show something in NEI, do not use this for adding actual Recipes! findRecipe wont find fake Recipes, containsInput WILL find fake Recipes
-		 */
-		public GregtechRecipe_OLD addFakeRecipe(boolean aCheckForCollisions, GregtechRecipe_OLD aRecipe) {
-			return addRecipe(aRecipe, aCheckForCollisions, true, false);
-		}
-
-		public GregtechRecipe_OLD add(GregtechRecipe_OLD aRecipe) {
-			Utils.LOG_INFO("Adding Recipe Method 3");
-			mRecipeList.add(aRecipe);
-			for (FluidStack aFluid : aRecipe.mFluidInputs)
-				if (aFluid != null) {
-					Utils.LOG_INFO("Fluid is valid - getting some kind of fluid instance to add to the recipe hashmap.");
-					Collection<GregtechRecipe_OLD> tList = mRecipeFluidMap.get(aFluid.getFluid());
-					if (tList == null) mRecipeFluidMap.put(aFluid.getFluid(), tList = new HashSet<GregtechRecipe_OLD>(1));
-					tList.add(aRecipe);
-				}
-			return addToItemMap(aRecipe);
-		}
-
-		public void reInit() {
-			Map<GT_ItemStack, Collection<GregtechRecipe_OLD>> tMap = mRecipeItemMap;
-			if (tMap != null) tMap.clear();
-			for (GregtechRecipe_OLD tRecipe : mRecipeList) {
-				GT_OreDictUnificator.setStackArray(true, tRecipe.mInputs);
-				GT_OreDictUnificator.setStackArray(true, tRecipe.mOutputs);
-				if (tMap != null) addToItemMap(tRecipe);
-			}
-		}
-
-		/**
-		 * @return if this Item is a valid Input for any for the Recipes
-		 */
-		public boolean containsInput(ItemStack aStack) {
-			return aStack != null && (mRecipeItemMap.containsKey(new GT_ItemStack(aStack)) || mRecipeItemMap.containsKey(new GT_ItemStack(GT_Utility.copyMetaData(W, aStack))));
-		}
-
-		/**
-		 * @return if this Fluid is a valid Input for any for the Recipes
-		 */
-		public boolean containsInput(FluidStack aFluid) {
-			return aFluid != null && containsInput(aFluid.getFluid());
-		}
-
-		/**
-		 * @return if this Fluid is a valid Input for any for the Recipes
-		 */
-		public boolean containsInput(Fluid aFluid) {
-			return aFluid != null && mRecipeFluidMap.containsKey(aFluid);
-		}
-
-		public GregtechRecipe_OLD findRecipe(IHasWorldObjectAndCoords aTileEntity, boolean aNotUnificated, long aVoltage, FluidStack[] aFluids, ItemStack... aInputs) {
-			return findRecipe(aTileEntity, null, aNotUnificated, aVoltage, aFluids, null, aInputs);
-		}
-
-		public GregtechRecipe_OLD findRecipe(IHasWorldObjectAndCoords aTileEntity, GregtechRecipe_OLD aRecipe, boolean aNotUnificated, long aVoltage, FluidStack[] aFluids, ItemStack... aInputs) {
-			return findRecipe(aTileEntity, aRecipe, aNotUnificated, aVoltage, aFluids, null, aInputs);
-		}
-
-		/**
-		 * finds a Recipe matching the aFluid and ItemStack Inputs.
-		 *
-		 * @param aTileEntity    an Object representing the current coordinates of the executing Block/Entity/Whatever. This may be null, especially during Startup.
-		 * @param aRecipe        in case this is != null it will try to use this Recipe first when looking things up.
-		 * @param aNotUnificated if this is T the Recipe searcher will unificate the ItemStack Inputs
-		 * @param aVoltage       Voltage of the Machine or Long.MAX_VALUE if it has no Voltage
-		 * @param aFluids        the Fluid Inputs
-		 * @param aSpecialSlot   the content of the Special Slot, the regular Manager doesn't do anything with this, but some custom ones do.
-		 * @param aInputs        the Item Inputs
-		 * @return the Recipe it has found or null for no matching Recipe
-		 */
-		public GregtechRecipe_OLD findRecipe(IHasWorldObjectAndCoords aTileEntity, GregtechRecipe_OLD aRecipe, boolean aNotUnificated, long aVoltage, FluidStack[] aFluids, ItemStack aSpecialSlot, ItemStack... aInputs) {
-			// No Recipes? Well, nothing to be found then.
-			if (mRecipeList.isEmpty()) return null;
-
-			// Some Recipe Classes require a certain amount of Inputs of certain kinds. Like "at least 1 Fluid + 1 Stack" or "at least 2 Stacks" before they start searching for Recipes.
-			// This improves Performance massively, especially if people leave things like Circuits, Molds or Shapes in their Machines to select Sub Recipes.
-			if (GregTech_API.sPostloadFinished) {
-				if (mMinimalInputFluids > 0) {
-					if (aFluids == null) return null;
-					int tAmount = 0;
-					for (FluidStack aFluid : aFluids) if (aFluid != null) tAmount++;
-					if (tAmount < mMinimalInputFluids) return null;
-				}
-				if (mMinimalInputItems > 0) {
-					if (aInputs == null) return null;
-					int tAmount = 0;
-					for (ItemStack aInput : aInputs) if (aInput != null) tAmount++;
-					if (tAmount < mMinimalInputItems) return null;
-				}
-			}
-
-			// Unification happens here in case the Input isn't already unificated.
-			if (aNotUnificated) aInputs = GT_OreDictUnificator.getStackArray(true, (Object[]) aInputs);
-
-			// Check the Recipe which has been used last time in order to not have to search for it again, if possible.
-			if (aRecipe != null)
-				if (!aRecipe.mFakeRecipe && aRecipe.mCanBeBuffered && aRecipe.isRecipeInputEqual(false, true, aFluids, aInputs))
-					return aRecipe.mEnabled && aVoltage * mAmperage >= aRecipe.mEUt ? aRecipe : null;
-
-					// Now look for the Recipes inside the Item HashMaps, but only when the Recipes usually have Items.
-					if (mUsualInputCount > 0 && aInputs != null) for (ItemStack tStack : aInputs)
-						if (tStack != null) {
-							Collection<GregtechRecipe_OLD>
-							tRecipes = mRecipeItemMap.get(new GT_ItemStack(tStack));
-							if (tRecipes != null) for (GregtechRecipe_OLD tRecipe : tRecipes)
-								if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, true, aFluids, aInputs))
-									return tRecipe.mEnabled && aVoltage * mAmperage >= tRecipe.mEUt ? tRecipe : null;
-									tRecipes = mRecipeItemMap.get(new GT_ItemStack(GT_Utility.copyMetaData(W, tStack)));
-									if (tRecipes != null) for (GregtechRecipe_OLD tRecipe : tRecipes)
-										if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, true, aFluids, aInputs))
-											return tRecipe.mEnabled && aVoltage * mAmperage >= tRecipe.mEUt ? tRecipe : null;
-						}
-
-					// If the minimal Amount of Items for the Recipe is 0, then it could be a Fluid-Only Recipe, so check that Map too.
-					if (mMinimalInputItems == 0 && aFluids != null) for (FluidStack aFluid : aFluids)
-						if (aFluid != null) {
-							Collection<GregtechRecipe_OLD>
-							tRecipes = mRecipeFluidMap.get(aFluid.getFluid());
-							if (tRecipes != null) for (GregtechRecipe_OLD tRecipe : tRecipes)
-								if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, true, aFluids, aInputs))
-									return tRecipe.mEnabled && aVoltage * mAmperage >= tRecipe.mEUt ? tRecipe : null;
-						}
-
-					// And nothing has been found.
-					return null;
-		}
-
-		protected GregtechRecipe_OLD addToItemMap(GregtechRecipe_OLD aRecipe) {
-			Utils.LOG_INFO("Adding Recipe Method 4");
-			for (ItemStack aStack : aRecipe.mInputs)
-				if (aStack != null) {
-					Utils.LOG_INFO("Method 4 - Manipulating "+aStack.getDisplayName());
-					GT_ItemStack tStack = new GT_ItemStack(aStack);
-					Utils.LOG_INFO("Method 4 - Made gt stack of item "+tStack.toStack().getDisplayName());
-					Collection<GregtechRecipe_OLD> tList = mRecipeItemMap.get(tStack);
-					if (tList != null){
-						Utils.LOG_INFO("Method 4 - Gt Recipe Hashmap: "+tList.toString());
-					}					
-					if (tList == null){ 
-						Utils.LOG_INFO("Method 4 - brrr list was NUll");	
-						mRecipeItemMap.put(tStack, tList = new HashSet<GregtechRecipe_OLD>(1));
-						Utils.LOG_INFO("Method 4 - Attemping backup method for Gt Recipe Hashmap:");
-						
-						while (tList.iterator().hasNext()){
-							Utils.LOG_INFO(tList.iterator().next().toString());
-						}
-						
-					}
-					tList.add(aRecipe);
-					Utils.LOG_INFO("Method 4 - Added recipe to map? I think.");					
-				}
-			return aRecipe;
-		}
-
-		public GregtechRecipe_OLD findRecipe(IGregTechTileEntity baseMetaTileEntity, GregtechRecipe_OLD aRecipe, boolean aNotUnificated,
-				long aVoltage, FluidStack[] aFluids, FluidStack[] fluidStacks) {
-
-			ItemStack aInputs[] = null;
-			// No Recipes? Well, nothing to be found then.
-			if (mRecipeList.isEmpty()) return null;
-
-			// Some Recipe Classes require a certain amount of Inputs of certain kinds. Like "at least 1 Fluid + 1 Stack" or "at least 2 Stacks" before they start searching for Recipes.
-			// This improves Performance massively, especially if people leave things like Circuits, Molds or Shapes in their Machines to select Sub Recipes.
-			if (GregTech_API.sPostloadFinished) {
-				if (mMinimalInputFluids > 0) {
-					if (aFluids == null) return null;
-					int tAmount = 0;
-					for (FluidStack aFluid : aFluids) if (aFluid != null) tAmount++;
-					if (tAmount < mMinimalInputFluids) return null;
-				}
-				if (mMinimalInputItems > 0) {
-					if (aInputs == null) return null;
-					int tAmount = 0;
-					for (ItemStack aInput : aInputs) if (aInput != null) tAmount++;
-					if (tAmount < mMinimalInputItems) return null;
-				}
-			}
-
-			// Unification happens here in case the Input isn't already unificated.
-			if (aNotUnificated) aInputs = GT_OreDictUnificator.getStackArray(true, (Object[]) aInputs);
-
-			// Check the Recipe which has been used last time in order to not have to search for it again, if possible.
-			if (aRecipe != null)
-				if (!aRecipe.mFakeRecipe && aRecipe.mCanBeBuffered && aRecipe.isRecipeInputEqual(false, true, aFluids, aInputs))
-					return aRecipe.mEnabled && aVoltage * mAmperage >= aRecipe.mEUt ? aRecipe : null;
-
-					// Now look for the Recipes inside the Item HashMaps, but only when the Recipes usually have Items.
-					if (mUsualInputCount > 0 && aInputs != null) for (ItemStack tStack : aInputs)
-						if (tStack != null) {
-							Collection<GregtechRecipe_OLD>
-							tRecipes = mRecipeItemMap.get(new GT_ItemStack(tStack));
-							if (tRecipes != null) for (GregtechRecipe_OLD tRecipe : tRecipes)
-								if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, true, aFluids, aInputs))
-									return tRecipe.mEnabled && aVoltage * mAmperage >= tRecipe.mEUt ? tRecipe : null;
-									tRecipes = mRecipeItemMap.get(new GT_ItemStack(GT_Utility.copyMetaData(W, tStack)));
-									if (tRecipes != null) for (GregtechRecipe_OLD tRecipe : tRecipes)
-										if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, true, aFluids, aInputs))
-											return tRecipe.mEnabled && aVoltage * mAmperage >= tRecipe.mEUt ? tRecipe : null;
-						}
-
-					// If the minimal Amount of Items for the Recipe is 0, then it could be a Fluid-Only Recipe, so check that Map too.
-					if (mMinimalInputItems == 0 && aFluids != null) for (FluidStack aFluid : aFluids)
-						if (aFluid != null) {
-							Collection<GregtechRecipe_OLD>
-							tRecipes = mRecipeFluidMap.get(aFluid.getFluid());
-							if (tRecipes != null) for (GregtechRecipe_OLD tRecipe : tRecipes)
-								if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, true, aFluids, aInputs))
-									return tRecipe.mEnabled && aVoltage * mAmperage >= tRecipe.mEUt ? tRecipe : null;
-						}
-
-					// And nothing has been found.
-					return null;
-		}
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Here are a few Classes I use for Special Cases in some Machines without having to write a separate Machine Class.
-	// -----------------------------------------------------------------------------------------------------------------
-
-	/**
-	 * Abstract Class for general Recipe Handling of non GT Recipes
-	 */
-	public static abstract class GT_Recipe_Map_NonGTRecipes extends Gregtech_Recipe_Map {
-		public GT_Recipe_Map_NonGTRecipes(Collection<GregtechRecipe_OLD> aRecipeList, String aUnlocalizedName, String aLocalName, String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) {
-			super(aRecipeList, aUnlocalizedName, aLocalName, aNEIName, aNEIGUIPath, aUsualInputCount, aUsualOutputCount, aMinimalInputItems, aMinimalInputFluids, aAmperage, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed);
-		}
-
-		@Override
-		public boolean containsInput(ItemStack aStack) {
-			return false;
-		}
-
-		@Override
-		public boolean containsInput(FluidStack aFluid) {
-			return false;
-		}
-
-		@Override
-		public boolean containsInput(Fluid aFluid) {
-			return false;
-		}
-
-		@Override
-		public GregtechRecipe_OLD addRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, int[] aOutputChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
-			return null;
-		}
-
-		@Override
-		public GregtechRecipe_OLD addRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
-			return null;
-		}
-
-		@Override
-		public GregtechRecipe_OLD addRecipe(GregtechRecipe_OLD aRecipe) {
-			return null;
-		}
-
-		@Override
-		public GregtechRecipe_OLD addFakeRecipe(boolean aCheckForCollisions, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, int[] aOutputChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
-			return null;
-		}
-
-		@Override
-		public GregtechRecipe_OLD addFakeRecipe(boolean aCheckForCollisions, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
-			return null;
-		}
-
-		@Override
-		public GregtechRecipe_OLD addFakeRecipe(boolean aCheckForCollisions, GregtechRecipe_OLD aRecipe) {
-			return null;
-		}
-
-		@Override
-		public GregtechRecipe_OLD add(GregtechRecipe_OLD aRecipe) {
-			return null;
-		}
-
-		@Override
-		public void reInit() {/**/}
-
-		@Override
-		protected GregtechRecipe_OLD addToItemMap(GregtechRecipe_OLD aRecipe) {
-			return null;
-		}		
-	}
-
-	/**
-	 * Just a Recipe Map with Utility specifically for Fuels.
-	 */
-	public static class Gregtech_Recipe_Map_Fuel extends Gregtech_Recipe_Map {
-		public Gregtech_Recipe_Map_Fuel(Collection<GregtechRecipe_OLD> aRecipeList, String aUnlocalizedName, String aLocalName, String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) {
-			super(aRecipeList, aUnlocalizedName, aLocalName, aNEIName, aNEIGUIPath, aUsualInputCount, aUsualOutputCount, aMinimalInputItems, aMinimalInputFluids, aAmperage, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed);
-		}
-
-		public GregtechRecipe_OLD addFuel(ItemStack aInput, ItemStack aOutput, int aFuelValueInEU) {
-			Utils.LOG_INFO("Adding Fuel using method 1");
-			return addFuel(aInput, aOutput, null, null, 10000, aFuelValueInEU);
-		}
-
-		public GregtechRecipe_OLD addFuel(ItemStack aInput, ItemStack aOutput, int aChance, int aFuelValueInEU) {
-			Utils.LOG_INFO("Adding Fuel using method 2");
-			return addFuel(aInput, aOutput, null, null, aChance, aFuelValueInEU);
-		}
-
-		public GregtechRecipe_OLD addFuel(FluidStack aFluidInput, FluidStack aFluidOutput, int aFuelValueInEU) {
-			Utils.LOG_INFO("Adding Fuel using method 3");
-			return addFuel(null, null, aFluidInput, aFluidOutput, 10000, aFuelValueInEU);
-		}
-
-		public GregtechRecipe_OLD addFuel(ItemStack aInput, ItemStack aOutput, FluidStack aFluidInput, FluidStack aFluidOutput, int aFuelValueInEU) {
-			Utils.LOG_INFO("Adding Fuel using method 4");
-			return addFuel(aInput, aOutput, aFluidInput, aFluidOutput, 10000, aFuelValueInEU);
-		}
-
-		public GregtechRecipe_OLD addFuel(ItemStack aInput, ItemStack aOutput, FluidStack aFluidInput, FluidStack aFluidOutput, int aChance, int aFuelValueInEU) {
-			Utils.LOG_INFO("Adding Fuel using method 5");
-			return addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aOutput}, null, new int[]{aChance}, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, 0, 0, aFuelValueInEU);
-		}
-	}
-
-}
\ No newline at end of file