Refactoring like a champion.

11 files changed, 2667 insertions, 0 deletions

diff --git a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCasingBlocks.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCasingBlocks.java
new file mode 100644
index 0000000000..e2587fffef
--- /dev/null
+++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCasingBlocks.java
@@ -0,0 +1,88 @@
+package miscutil.gregtech.api.metatileentity.implementations;
+
+import gregtech.api.enums.Textures;
+import gregtech.api.objects.GT_CopiedBlockTexture;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.common.blocks.GT_Block_Casings_Abstract;
+import gregtech.common.blocks.GT_Item_Casings1;
+import gregtech.common.blocks.GT_Material_Casings;
+import miscutil.gregtech.api.enums.GregtechItemList;
+import miscutil.gregtech.api.enums.GregtechTextures;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+
+public class GregtechMetaCasingBlocks
+extends GT_Block_Casings_Abstract {
+	public GregtechMetaCasingBlocks() {
+		super(GT_Item_Casings1.class, "miscutils.blockcasings", GT_Material_Casings.INSTANCE);
+		for (byte i = 0; i < 16; i = (byte) (i + 1)) {
+			GregtechTextures.BlockIcons.GT_CASING_BLOCKS[i] = new GT_CopiedBlockTexture(this, 6, i);
+		}
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Centrifuge Anti-Vibration Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Centrifuge Casing");
+		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "MV Machine Casing");
+		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "HV Machine Casing");
+		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "EV Machine Casing");
+		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "IV Machine Casing");
+		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "LuV Machine Casing");
+		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "ZPM Machine Casing");
+		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "UV Machine Casing");
+		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "MAX Machine Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Iron Plated Bricks");
+		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Heat Proof Machine Casing");
+		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cupronickel Coil Block");
+		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Kanthal Coil Block");
+		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Nichrome Coil Block");
+		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Superconducting Coil Block");
+		GregtechItemList.Casing_Centrifuge1.set(new ItemStack(this, 1, 0));
+		GregtechItemList.Casing_Centrifuge2.set(new ItemStack(this, 1, 1));
+        /*ItemList.Casing_MV.set(new ItemStack(this, 1, 2));
+        ItemList.Casing_HV.set(new ItemStack(this, 1, 3));
+        ItemList.Casing_EV.set(new ItemStack(this, 1, 4));
+        ItemList.Casing_IV.set(new ItemStack(this, 1, 5));
+        ItemList.Casing_LuV.set(new ItemStack(this, 1, 6));
+        ItemList.Casing_ZPM.set(new ItemStack(this, 1, 7));
+        ItemList.Casing_UV.set(new ItemStack(this, 1, 8));
+        ItemList.Casing_MAX.set(new ItemStack(this, 1, 9));*/
+		GregtechItemList.Casing_IronPlatedBricks.set(new ItemStack(this, 1, 10));
+       /*ItemList.Casing_HeatProof.set(new ItemStack(this, 1, 11));
+        ItemList.Casing_Coil_Cupronickel.set(new ItemStack(this, 1, 12));
+        ItemList.Casing_Coil_Kanthal.set(new ItemStack(this, 1, 13));
+        ItemList.Casing_Coil_Nichrome.set(new ItemStack(this, 1, 14));
+        ItemList.Casing_Coil_Superconductor.set(new ItemStack(this, 1, 15));*/
+	}
+
+	public IIcon getIcon(int aSide, int aMeta) {
+		if ((aMeta >= 0) && (aMeta < 16)) {
+			switch (aMeta) {
+            case 1:
+                return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
+            case 2:
+                return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
+			case 11:
+				return Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon();
+			case 12:
+				return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon();
+			case 13:
+				return Textures.BlockIcons.MACHINE_COIL_KANTHAL.getIcon();
+			case 14:
+				return Textures.BlockIcons.MACHINE_COIL_NICHROME.getIcon();
+			case 15:
+				return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon();
+			}
+			if (aSide == 0) {
+				return Textures.BlockIcons.MACHINECASINGS_BOTTOM[aMeta].getIcon();
+			}
+			if (aSide == 1) {
+				return Textures.BlockIcons.MACHINECASINGS_TOP[aMeta].getIcon();
+			}
+			return Textures.BlockIcons.MACHINECASINGS_SIDE[aMeta].getIcon();
+		}
+		return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
+	}
+
+	public int colorMultiplier(IBlockAccess aWorld, int aX, int aY, int aZ) {
+		return aWorld.getBlockMetadata(aX, aY, aZ) > 9 ? super.colorMultiplier(aWorld, aX, aY, aZ) : gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[0] << 16 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[1] << 8 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[2];
+	}
+}
diff --git a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java
new file mode 100644
index 0000000000..b05e863241
--- /dev/null
+++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java
@@ -0,0 +1,164 @@
+package miscutil.gregtech.api.metatileentity.implementations;
+
+import gregtech.api.enums.Dyes;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_ModHandler;
+import miscutil.core.util.Utils;
+import miscutil.gregtech.api.gui.CONTAINER_SteamCondenser;
+import miscutil.gregtech.api.gui.GUI_SteamCondenser;
+import miscutil.gregtech.api.metatileentity.implementations.base.GregtechMetaBoilerBase;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidHandler;
+
+public class GregtechMetaCondensor extends GregtechMetaBoilerBase{
+
+	 public GregtechMetaCondensor(int aID, String aName, String aNameRegional)
+	  {
+	    super(aID, aName, aNameRegional, "A Steam condenser - [IC2->Steam]", new ITexture[0]);
+	  }
+	  
+	  public GregtechMetaCondensor(String aName, int aTier, String aDescription, ITexture[][][] aTextures)
+	  {
+	    super(aName, aTier, aDescription, aTextures);
+	  }
+	  
+	  @Override
+		public String[] getDescription() {
+			return new String[] {mDescription, "Added by: "	+ EnumChatFormatting.DARK_GREEN+"Alkalus"};
+		}
+	  
+	  public ITexture[][][] getTextureSet(ITexture[] aTextures)
+	  {
+	    ITexture[][][] rTextures = new ITexture[5][17][];
+	    for (byte i = -1; i < 16; i++){
+	      rTextures[0][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa))};
+	      rTextures[1][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) };
+	      rTextures[2][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) };
+	      rTextures[3][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER) };
+	      rTextures[4][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE) };
+	    }
+	    return rTextures;
+	  }
+	  
+	  public int maxProgresstime()
+	  {
+	    return 1000;
+	  }
+	  
+	  public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity)
+	  {
+	    return new CONTAINER_SteamCondenser(aPlayerInventory, aBaseMetaTileEntity, 32000);
+	  }
+	  
+	  public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity)
+	  {
+	    return new GUI_SteamCondenser(aPlayerInventory, aBaseMetaTileEntity, "SteelBoiler.png", 32000);
+	  }
+	  
+	  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
+	  {
+	    return new GregtechMetaCondensor(this.mName, this.mTier, this.mDescription, this.mTextures);
+	  }
+	  
+	  public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick)
+	  {
+		  this.RI = Utils.randLong(5L, 30L);
+	    if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L))
+	    {
+	      if (this.mTemperature <= 5)
+	      {
+	        this.mTemperature = 5;
+	        this.mLossTimer = 0;
+	      }
+	      if (++this.mLossTimer > 10)
+	      {
+	        this.mTemperature -= 1;
+	        this.mLossTimer = 0;
+	      }
+	      for (byte i = 1; (this.mSteam != null) && (i < 6); i = (byte)(i + 1)) {
+	        if (i != aBaseMetaTileEntity.getFrontFacing())
+	        {
+	          IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i);
+	          if (tTileEntity != null)
+	          {
+	            FluidStack tDrained = aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);
+	            if (tDrained != null)
+	            {
+	              int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);
+	              if (tFilledAmount > 0) {
+	                tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), tFilledAmount, true), true);
+	              }
+	            }
+	          }
+	        }
+	      }
+	      if (aTick % 10L == 0L) {
+	        if (this.mTemperature > 5)
+	        {
+	          if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0))
+	          {
+	            this.mHadNoWater = true;
+	          }
+	          else
+	          {
+	            if (this.mHadNoWater)
+	            {
+	              aBaseMetaTileEntity.doExplosion(2048L);
+	              return;
+	            }
+	            this.mFluid.amount -= 1;
+	            if (this.mSteam == null) {
+	              this.mSteam = GT_ModHandler.getSteam(30L);
+	            } else if (GT_ModHandler.isSteam(this.mSteam)) {
+	              this.mSteam.amount += 30;
+	            } else {
+	              this.mSteam = GT_ModHandler.getSteam(30L);
+	            }
+	          }
+	        }
+	        else {
+	          this.mHadNoWater = false;
+	        }
+	      }
+	      if ((this.mSteam != null) && 
+	        (this.mSteam.amount > 32000))
+	      {
+	        sendSound((byte)1);
+	        this.mSteam.amount = 24000;
+	      }
+	      /*if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && 
+	        (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.bucket.get(IC2.getItemFromBlock(p_150898_0_)))))
+	      {
+	        this.mProcessingEnergy += 1000;
+	        aBaseMetaTileEntity.decrStackSize(2, 1);
+	        aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Empty, 1L));
+	      }*/	      
+	      if ((this.mTemperature < 1000) && (this.mProcessingEnergy > 0) && (aTick % RI == 0L))
+	      {
+	        this.mProcessingEnergy -= 40;
+	        this.mTemperature += 2;
+	      }
+	      aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);
+	    }
+	  }
+	  
+	  public final int fill(FluidStack aFluid, boolean doFill)
+	  {
+	    if ((Utils.isIC2Steam(aFluid)) && (this.mProcessingEnergy < 50))
+	    {
+	      int tFilledAmount = Math.min(50, aFluid.amount);
+	      if (doFill) {
+	        this.mProcessingEnergy += tFilledAmount;
+	      }
+	      return tFilledAmount;
+	    }
+	    return super.fill(aFluid, doFill);
+	  }
+}
diff --git a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCreativeEnergyBuffer.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCreativeEnergyBuffer.java
new file mode 100644
index 0000000000..0509b0f8e9
--- /dev/null
+++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCreativeEnergyBuffer.java
@@ -0,0 +1,261 @@
+package miscutil.gregtech.api.metatileentity.implementations;
+
+import static gregtech.api.enums.GT_Values.V;
+import gregtech.api.enums.Textures;
+import gregtech.api.gui.GT_Container_1by1;
+import gregtech.api.gui.GT_Container_2by2;
+import gregtech.api.gui.GT_Container_3by3;
+import gregtech.api.gui.GT_Container_4by4;
+import gregtech.api.gui.GT_GUIContainer_1by1;
+import gregtech.api.gui.GT_GUIContainer_2by2;
+import gregtech.api.gui.GT_GUIContainer_3by3;
+import gregtech.api.gui.GT_GUIContainer_4by4;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Utility;
+import ic2.api.item.IElectricItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+/**
+ * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
+ * 
+ * This is the main construct for my Basic Machines such as the Automatic Extractor
+ * Extend this class to make a simple Machine
+ */
+public class GregtechMetaCreativeEnergyBuffer extends GregtechMetaEnergyBuffer {
+
+
+	public GregtechMetaCreativeEnergyBuffer(String aName, int aTier,
+			String aDescription, ITexture[][][] aTextures, int aSlotCount) {
+		super(aName, aTier, aDescription, aTextures, aSlotCount);
+		// TODO Auto-generated constructor stub
+	}
+
+	public GregtechMetaCreativeEnergyBuffer(int aID, String aName,
+			String aNameRegional, int aTier, String aDescription, int aSlotCount) {
+		super(aID, aName, aNameRegional, aTier, aDescription, aSlotCount);
+	}
+
+	public boolean mCharge = false, mDecharge = false;
+	public int mBatteryCount = 1, mChargeableCount = 1;
+
+	/*
+	 * MACHINE_STEEL_SIDE
+	 */
+	@Override
+	public ITexture[][][] getTextureSet(ITexture[] aTextures) {
+		ITexture[][][] rTextures = new ITexture[2][17][];
+		for (byte i = -1; i < 16; i++) {
+			rTextures[0][i + 1] = new ITexture[] { new GT_RenderedTexture(
+					Textures.BlockIcons.MACHINE_STEEL_SIDE) };
+			rTextures[1][i + 1] = new ITexture[] {
+					new GT_RenderedTexture(
+							Textures.BlockIcons.MACHINE_STEEL_SIDE),
+							mInventory.length > 4 ? Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier]
+									: Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] };
+		}
+		return rTextures;
+	}
+
+	@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) {
+		return new GregtechMetaCreativeEnergyBuffer(mName, mTier, mDescription,
+				mTextures, mInventory.length);
+	}
+
+	@Override public boolean isSimpleMachine()						{return false;}
+	@Override public boolean isElectric()							{return true;}
+	@Override public boolean isValidSlot(int aIndex)				{return true;}
+	@Override public boolean isFacingValid(byte aFacing)			{return true;}
+	@Override public boolean isEnetInput() 							{return true;}
+	@Override public boolean isEnetOutput() 						{return true;}
+	@Override public boolean isInputFacing(byte aSide)				{return aSide!=getBaseMetaTileEntity().getFrontFacing();}
+	@Override public boolean isOutputFacing(byte aSide)				{return aSide==getBaseMetaTileEntity().getFrontFacing();}
+	@Override public boolean isTeleporterCompatible()				{return false;}
+
+	@Override
+	public long getMinimumStoredEU() {
+		return 1;
+	}
+
+	@Override
+	public long maxEUStore() {
+		return Long.MAX_VALUE;
+	}
+
+	@Override
+	public long maxEUInput() {
+		return V[mTier];
+	}
+
+	@Override
+	public long maxEUOutput() {
+		return V[mTier];
+	}
+
+	@Override
+	public long maxAmperesIn() {
+		return mChargeableCount * 16;
+	}
+
+	@Override
+	public long maxAmperesOut() {
+		return mChargeableCount * 16;
+	}
+	@Override public int rechargerSlotStartIndex()					{return 0;}
+	@Override public int dechargerSlotStartIndex()					{return 0;}
+	@Override public int rechargerSlotCount()						{return mCharge?mInventory.length:0;}
+	@Override public int dechargerSlotCount()						{return mDecharge?mInventory.length:0;}
+	@Override public int getProgresstime()							{return Integer.MAX_VALUE;}
+	@Override public int maxProgresstime()							{return (int)getBaseMetaTileEntity().getUniversalEnergyCapacity();}
+	@Override public boolean isAccessAllowed(EntityPlayer aPlayer)	{return true;}
+
+	@Override
+	public void saveNBTData(NBTTagCompound aNBT) {
+		//
+	}
+
+	@Override
+	public void loadNBTData(NBTTagCompound aNBT) {
+		//
+	}
+
+	@Override
+	public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory,
+			IGregTechTileEntity aBaseMetaTileEntity) {
+		switch (mInventory.length) {
+		case  1: return new GT_Container_1by1(aPlayerInventory, aBaseMetaTileEntity);
+		case  4: return new GT_Container_2by2(aPlayerInventory, aBaseMetaTileEntity);
+		case  9: return new GT_Container_3by3(aPlayerInventory, aBaseMetaTileEntity);
+		case 16: return new GT_Container_4by4(aPlayerInventory, aBaseMetaTileEntity);
+		}
+		return new GT_Container_1by1(aPlayerInventory, aBaseMetaTileEntity);
+	}
+
+	@Override
+	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory,
+			IGregTechTileEntity aBaseMetaTileEntity) {
+		switch (mInventory.length) {
+		case  1: return new GT_GUIContainer_1by1(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
+		case  4: return new GT_GUIContainer_2by2(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
+		case  9: return new GT_GUIContainer_3by3(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
+		case 16: return new GT_GUIContainer_4by4(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
+		}
+		return new GT_GUIContainer_1by1(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
+	}
+
+	@Override
+	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+		this.getBaseMetaTileEntity().increaseStoredEnergyUnits(Integer.MAX_VALUE, true);
+		if (aBaseMetaTileEntity.isServerSide()) {
+			mCharge = aBaseMetaTileEntity.getStoredEU() / 2 > aBaseMetaTileEntity
+					.getEUCapacity() / 3;
+			mDecharge = aBaseMetaTileEntity.getStoredEU()     < aBaseMetaTileEntity.getEUCapacity() / 3;
+			mBatteryCount = 1;
+			mChargeableCount = 1;
+			this.getBaseMetaTileEntity().increaseStoredEnergyUnits(mMax, true);
+			for (ItemStack tStack : mInventory) if (GT_ModHandler.isElectricItem(tStack, mTier)) {
+				if (GT_ModHandler.isChargerItem(tStack)) mBatteryCount++;
+				mChargeableCount++;
+			}
+		}
+	}
+
+	@Override
+	public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+		if(GT_ModHandler.isElectricItem(aStack)&&aStack.getUnlocalizedName().startsWith("gt.metaitem.01.")){
+			String name = aStack.getUnlocalizedName();
+			if(name.equals("gt.metaitem.01.32510")||
+					name.equals("gt.metaitem.01.32511")||
+					name.equals("gt.metaitem.01.32520")||
+					name.equals("gt.metaitem.01.32521")||
+					name.equals("gt.metaitem.01.32530")||
+					name.equals("gt.metaitem.01.32531")){
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+		if(!GT_Utility.isStackValid(aStack)){
+			return false;
+		}
+		if(GT_ModHandler.isElectricItem(aStack, this.mTier)){
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public long[] getStoredEnergy(){
+		long tScale = getBaseMetaTileEntity().getEUCapacity();
+		long tStored = getBaseMetaTileEntity().getStoredEU();
+		if (mInventory != null) {
+			for (ItemStack aStack : mInventory) {
+				if (GT_ModHandler.isElectricItem(aStack)) {
+
+					if (aStack.getItem() instanceof GT_MetaBase_Item) {
+						Long[] stats = ((GT_MetaBase_Item) aStack.getItem())
+								.getElectricStats(aStack);
+						if (stats != null) {
+							tScale = tScale + stats[0];
+							tStored = tStored
+									+ ((GT_MetaBase_Item) aStack.getItem())
+									.getRealCharge(aStack);
+						}
+					} else if (aStack.getItem() instanceof IElectricItem) {
+						tStored = tStored
+								+ (long) ic2.api.item.ElectricItem.manager
+								.getCharge(aStack);
+						tScale = tScale
+								+ (long) ((IElectricItem) aStack.getItem())
+								.getMaxCharge(aStack);
+					}
+				}
+			}
+
+		}
+		return new long[] { tStored, tScale };
+	}
+
+	private long count=0;
+	private long mStored=0;
+	private long mMax=0;
+
+	@Override
+	public String[] getInfoData() {
+		count++;
+		if(mMax==0||count%20==0){
+			long[] tmp = getStoredEnergy();
+			mStored=tmp[0];
+			mMax=tmp[1];
+		}
+
+		return new String[] {
+				getLocalName(),
+				"Stored Items:",
+				GT_Utility.formatNumbers(mStored)+" EU /",
+				GT_Utility.formatNumbers(mMax)+" EU"};
+	}
+
+	@Override
+	public boolean isGivingInformation() {
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
new file mode 100644
index 0000000000..57c88c0cd3
--- /dev/null
+++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
@@ -0,0 +1,446 @@
+package miscutil.gregtech.api.metatileentity.implementations;
+
+import static gregtech.api.enums.GT_Values.V;
+import gregtech.api.enums.Textures;
+import gregtech.api.gui.GT_Container_1by1;
+import gregtech.api.gui.GT_Container_2by2;
+import gregtech.api.gui.GT_Container_3by3;
+import gregtech.api.gui.GT_Container_4by4;
+import gregtech.api.gui.GT_GUIContainer_1by1;
+import gregtech.api.gui.GT_GUIContainer_2by2;
+import gregtech.api.gui.GT_GUIContainer_3by3;
+import gregtech.api.gui.GT_GUIContainer_4by4;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Utility;
+import ic2.api.item.IElectricItem;
+
+import java.util.List;
+
+import miscutil.core.handler.GuiHandler;
+import miscutil.core.util.Utils;
+import miscutil.core.waila.IWailaInfoProvider;
+import miscutil.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
+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.util.EnumChatFormatting;
+import net.minecraft.world.World;
+import crazypants.enderio.gui.TooltipAddera;
+import crazypants.util.Lang;
+import crazypants.util.Util;
+
+/**
+ * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
+ * 
+ * This is the main construct for my Basic Machines such as the Automatic Extractor
+ * Extend this class to make a simple Machine
+ */
+public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity implements IWailaInfoProvider{
+
+	/*
+	 * public GregtechMetaEnergyBuffer() { super.this
+	 * setCreativeTab(GregTech_API.TAB_GREGTECH); }
+	 */
+
+	public boolean mCharge = false, mDecharge = false;
+	public int mBatteryCount = 1, mChargeableCount = 1;
+
+	public GregtechMetaEnergyBuffer(int aID, String aName, String aNameRegional, int aTier, String aDescription, int aSlotCount) {
+		super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription);
+		//setCreativeTab(AddToCreativeTab.tabMachines);
+	}
+
+	public GregtechMetaEnergyBuffer(String aName, int aTier, String aDescription, ITexture[][][] aTextures, int aSlotCount) {
+		super(aName, aTier, aSlotCount, aDescription, aTextures);
+	}
+
+	@Override
+	public String[] getDescription() {
+		return new String[] {mDescription, "Added by: "	+ EnumChatFormatting.DARK_GREEN+"Alkalus"};
+	}
+
+	/*
+	 * MACHINE_STEEL_SIDE
+	 */
+	@Override
+	public ITexture[][][] getTextureSet(ITexture[] aTextures) {
+		ITexture[][][] rTextures = new ITexture[2][17][];
+		for (byte i = -1; i < 16; i++) {
+			rTextures[0][i + 1] = new ITexture[] { new GT_RenderedTexture(
+					Textures.BlockIcons.MACHINE_HEATPROOFCASING) };
+			rTextures[1][i + 1] = new ITexture[] {
+					new GT_RenderedTexture(
+							Textures.BlockIcons.MACHINE_HEATPROOFCASING),
+					mInventory.length > 4 ? Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier]
+							: Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] };
+		}
+		return rTextures;
+	}
+
+	/*
+	 * @Override public ITexture[][][] getTextureSet(ITexture[] aTextures) {
+	 * ITexture[][][] rTextures = new ITexture[5][17][]; for (byte i = -1; i <
+	 * 16; i = (byte) (i + 1)) { ITexture[] tmp0 = { new GT_RenderedTexture(
+	 * Textures.BlockIcons.MACHINE_STEEL_BOTTOM, Dyes.getModulation(i,
+	 * Dyes._NULL.mRGBa)) }; rTextures[0][(i + 1)] = tmp0; ITexture[] tmp1 = {
+	 * new GT_RenderedTexture( Textures.BlockIcons.MACHINE_STEEL_TOP) };
+	 * rTextures[1][(i + 1)] = tmp1; ITexture[] tmp2 = { new GT_RenderedTexture(
+	 * Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i,
+	 * Dyes._NULL.mRGBa)), new
+	 * GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) }; rTextures[2][(i +
+	 * 1)] = tmp2; ITexture[] tmp4 = { new GT_RenderedTexture(
+	 * Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i,
+	 * Dyes._NULL.mRGBa)), new
+	 * GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) }; rTextures[3][(i +
+	 * 1)] = tmp4; ITexture[] tmp5 = { new GT_RenderedTexture(
+	 * Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i,
+	 * Dyes._NULL.mRGBa)), new GT_RenderedTexture(
+	 * Textures.BlockIcons.BOILER_FRONT_ACTIVE) }; rTextures[4][(i + 1)] = tmp5;
+	 * } return rTextures; }
+	 */
+
+	@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) {
+		return new GregtechMetaEnergyBuffer(mName, mTier, mDescription, mTextures, mInventory.length);
+	}
+
+	@Override public boolean isSimpleMachine()						{return false;}
+	@Override public boolean isElectric()							{return true;}
+	@Override public boolean isValidSlot(int aIndex)				{return true;}
+	@Override public boolean isFacingValid(byte aFacing)			{return true;}
+	@Override public boolean isEnetInput() 							{return true;}
+	@Override public boolean isEnetOutput() 						{return true;}
+	@Override public boolean isInputFacing(byte aSide)				{return aSide!=getBaseMetaTileEntity().getFrontFacing();}
+	@Override public boolean isOutputFacing(byte aSide)				{return aSide==getBaseMetaTileEntity().getFrontFacing();}
+	@Override public boolean isTeleporterCompatible()				{return false;}
+	@Override public long getMinimumStoredEU()						{return V[mTier]*16*mInventory.length;}
+	@Override public long maxEUStore()								{return V[mTier]*250000;}
+
+	@Override
+	public long maxEUInput() {
+		return V[mTier];
+	}
+
+	@Override
+	public long maxEUOutput() {
+		return V[mTier];
+	}
+
+	@Override
+	public long maxAmperesIn() {
+		return mChargeableCount * 4;
+	}
+
+	@Override
+	public long maxAmperesOut() {
+		return mChargeableCount * 4;
+	}
+	@Override public int rechargerSlotStartIndex()					{return 0;}
+	@Override public int dechargerSlotStartIndex()					{return 0;}
+	@Override public int rechargerSlotCount()						{return mCharge?mInventory.length:0;}
+	@Override public int dechargerSlotCount()						{return mDecharge?mInventory.length:0;}
+	@Override public int getProgresstime()							{return (int)getBaseMetaTileEntity().getUniversalEnergyStored();}
+	@Override public int maxProgresstime()							{return (int)getBaseMetaTileEntity().getUniversalEnergyCapacity();}
+	@Override public boolean isAccessAllowed(EntityPlayer aPlayer)	{return true;}
+
+	@Override
+	public void saveNBTData(NBTTagCompound aNBT) {
+		//
+	}
+
+	@Override
+	public void loadNBTData(NBTTagCompound aNBT) {
+		//
+	}
+
+	@Override
+	public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
+		Utils.LOG_WARNING("Right Click on MTE by Player");
+		if (aBaseMetaTileEntity.isClientSide()) return true;
+		//aBaseMetaTileEntity.openGUI(aPlayer);
+		
+		Utils.LOG_WARNING("MTE is Client-side");
+		showEnergy(aPlayer.getEntityWorld(), aPlayer);  
+		return true;
+	}
+
+	private void showEnergy(World worldIn, EntityPlayer playerIn){
+		Utils.LOG_WARNING("Begin Show Energy");
+		final double c = ((double) getProgresstime() / maxProgresstime()) * 100;
+		Utils.LOG_WARNING(""+c);
+		final double roundOff = Math.round(c * 100.0) / 100.0;
+		Utils.messagePlayer(playerIn, "Energy: " + getProgresstime() + " EU at "+V[mTier]+"v ("+roundOff+"%)");
+		Utils.LOG_WARNING("Making new instance of Guihandler");
+		GuiHandler block = new GuiHandler();
+		Utils.LOG_WARNING("Guihandler.toString(): "+block.toString());
+		block.getClientGuiElement(1, playerIn, worldIn, (int) playerIn.posX, (int) playerIn.posY, (int) playerIn.posZ);
+		
+	}
+
+	@Override
+	public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory,
+			IGregTechTileEntity aBaseMetaTileEntity) {
+		switch (mInventory.length) {
+		case  1: return new GT_Container_1by1(aPlayerInventory, aBaseMetaTileEntity);
+		case  4: return new GT_Container_2by2(aPlayerInventory, aBaseMetaTileEntity);
+		case  9: return new GT_Container_3by3(aPlayerInventory, aBaseMetaTileEntity);
+		case 16: return new GT_Container_4by4(aPlayerInventory, aBaseMetaTileEntity);
+		}
+		return new GT_Container_1by1(aPlayerInventory, aBaseMetaTileEntity);
+	}
+
+	@Override
+	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory,
+			IGregTechTileEntity aBaseMetaTileEntity) {
+		switch (mInventory.length) {
+		case  1: return new GT_GUIContainer_1by1(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
+		case  4: return new GT_GUIContainer_2by2(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
+		case  9: return new GT_GUIContainer_3by3(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
+		case 16: return new GT_GUIContainer_4by4(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
+		}
+		return new GT_GUIContainer_1by1(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
+	}
+
+	@Override
+	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+		if (aBaseMetaTileEntity.isServerSide()) {
+			mCharge = aBaseMetaTileEntity.getStoredEU() / 2 > aBaseMetaTileEntity
+					.getEUCapacity() / 3;
+			mDecharge = aBaseMetaTileEntity.getStoredEU()     < aBaseMetaTileEntity.getEUCapacity() / 3;
+			mBatteryCount = 1;
+			mChargeableCount = 1;
+			for (ItemStack tStack : mInventory) if (GT_ModHandler.isElectricItem(tStack, mTier)) {
+				if (GT_ModHandler.isChargerItem(tStack)) mBatteryCount++;
+				mChargeableCount++;
+			}
+		}
+	}
+
+	@Override
+	public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+		if(GT_ModHandler.isElectricItem(aStack)&&aStack.getUnlocalizedName().startsWith("gt.metaitem.01.")){
+			String name = aStack.getUnlocalizedName();
+			if(name.equals("gt.metaitem.01.32510")||
+					name.equals("gt.metaitem.01.32511")||
+					name.equals("gt.metaitem.01.32520")||
+					name.equals("gt.metaitem.01.32521")||
+					name.equals("gt.metaitem.01.32530")||
+					name.equals("gt.metaitem.01.32531")){
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+		if(!GT_Utility.isStackValid(aStack)){
+			return false;
+		}
+		if(GT_ModHandler.isElectricItem(aStack, this.mTier)){
+			return true;
+		}
+		return false;
+	}
+
+	public long[] getStoredEnergy(){
+		long tScale = getBaseMetaTileEntity().getEUCapacity();
+		long tStored = getBaseMetaTileEntity().getStoredEU();
+		if (mInventory !=