Move source files

11 files changed, 1738 insertions, 0 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
new file mode 100644
index 0000000000..23b9d74fb7
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
@@ -0,0 +1,115 @@
+package gregtech.common.tileentities.machines.basic;

+

+import gregtech.api.enums.GT_Values;

+import gregtech.api.enums.ItemList;

+import gregtech.api.enums.Textures;

+import gregtech.api.enums.Textures.BlockIcons;

+import gregtech.api.interfaces.ITexture;

+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

+import gregtech.api.metatileentity.MetaTileEntity;

+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;

+import gregtech.api.objects.GT_RenderedTexture;

+import gregtech.api.util.GT_ModHandler;

+import gregtech.api.util.GT_Recipe;

+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;

+import gregtech.api.util.GT_Utility;

+import net.minecraft.item.ItemStack;

+import net.minecraft.item.crafting.CraftingManager;

+

+public class GT_MetaTileEntity_Boxinator

+  extends GT_MetaTileEntity_BasicMachine

+{

+  public GT_MetaTileEntity_Boxinator(int aID, String aName, String aNameRegional, int aTier)

+  {

+    super(aID, aName, aNameRegional, aTier, 1, "Puts things into Boxes", 2, 1, "Packager.png", "", new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_BOXINATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR) });

+  }

+  

+  public GT_MetaTileEntity_Boxinator(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName)

+  {

+    super(aName, aTier, 1, aDescription, aTextures, 2, 1, aGUIName, aNEIName);

+  }

+  

+  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

+  {

+    return new GT_MetaTileEntity_Boxinator(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);

+  }

+  

+  public GT_Recipe.GT_Recipe_Map getRecipeList()

+  {

+    return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes;

+  }

+  

+  public int checkRecipe()

+  {

+    int tCheck = super.checkRecipe();

+    if (tCheck != 0) {

+      return tCheck;

+    }

+    if ((GT_Utility.isStackValid(getInputAt(0))) && (GT_Utility.isStackValid(getInputAt(1))) && (GT_Utility.getContainerItem(getInputAt(0), true) == null))

+    {

+      if ((ItemList.Schematic_1by1.isStackEqual(getInputAt(1))) && (getInputAt(0).stackSize >= 1))

+      {

+        this.mOutputItems[0] = GT_ModHandler.getRecipeOutput(new ItemStack[] { getInputAt(0) });

+        if (this.mOutputItems[0] != null) {

+          if (canOutput(new ItemStack[] { this.mOutputItems[0] }))

+          {

+            getInputAt(0).stackSize -= 1;

+            this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

+            this.mMaxProgresstime = (16 / (1 << this.mTier - 1));

+            return 2;

+          }

+        }

+        return 0;

+      }

+      if ((ItemList.Schematic_2by2.isStackEqual(getInputAt(1))) && (getInputAt(0).stackSize >= 4))

+      {

+        this.mOutputItems[0] = GT_ModHandler.getRecipeOutput(new ItemStack[] { getInputAt(0), getInputAt(0), null, getInputAt(0), getInputAt(0) });

+        if (this.mOutputItems[0] != null) {

+          if (canOutput(new ItemStack[] { this.mOutputItems[0] }))

+          {

+            getInputAt(0).stackSize -= 4;

+            this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

+            this.mMaxProgresstime = (32 / (1 << this.mTier - 1));

+            return 2;

+          }

+        }

+        return 0;

+      }

+      if ((ItemList.Schematic_3by3.isStackEqual(getInputAt(1))) && (getInputAt(0).stackSize >= 9))

+      {

+        this.mOutputItems[0] = GT_ModHandler.getRecipeOutput(new ItemStack[] { getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0) });

+        if (this.mOutputItems[0] != null) {

+          if (canOutput(new ItemStack[] { this.mOutputItems[0] }))

+          {

+            getInputAt(0).stackSize -= 9;

+            this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

+            this.mMaxProgresstime = (64 / (1 << this.mTier - 1));

+            return 2;

+          }

+        }

+        return 0;

+      }

+    }

+    return 0;

+  }

+  

+  public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)

+  {

+    if (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack))

+    {

+      if ((ItemList.Schematic_1by1.isStackEqual(getInputAt(1))) || (ItemList.Schematic_2by2.isStackEqual(getInputAt(1))) || (ItemList.Schematic_3by3.isStackEqual(getInputAt(1)))) {

+      if(GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.findRecipe(getBaseMetaTileEntity(), true, gregtech.api.enums.GT_Values.V[this.mTier], null, new ItemStack[] { GT_Utility.copyAmount(64L, new Object[] { aStack }), getInputAt(1) }) != null){return true;}

+      if(ItemList.Schematic_1by1.isStackEqual(getInputAt(1))&&GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack })!=null)return true;

+      if(ItemList.Schematic_2by2.isStackEqual(getInputAt(1))&&GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack, aStack, null, aStack, aStack })!=null){return true;}

+      if(ItemList.Schematic_3by3.isStackEqual(getInputAt(1))&&(GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack,aStack,aStack,aStack,aStack,aStack,aStack,aStack,aStack })!=null)){return true;}

+      }else{return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.containsInput(aStack);}

+    }

+    return false;

+  }

+}

+

+


+/* Location:           F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar


+ * Qualified Name:     gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Boxinator


+ * JD-Core Version:    0.7.0.1


+ */
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
new file mode 100644
index 0000000000..1a5d8e1a6d
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
@@ -0,0 +1,71 @@
+package gregtech.common.tileentities.machines.basic;

+

+import gregtech.api.enums.Textures;

+import gregtech.api.enums.Textures.BlockIcons;

+import gregtech.api.interfaces.ITexture;

+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

+import gregtech.api.metatileentity.MetaTileEntity;

+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;

+import gregtech.api.objects.GT_RenderedTexture;

+import gregtech.api.util.GT_Utility;

+import net.minecraft.item.ItemStack;

+import net.minecraft.nbt.NBTTagCompound;

+

+public class GT_MetaTileEntity_Disassembler

+  extends GT_MetaTileEntity_BasicMachine

+{

+  public GT_MetaTileEntity_Disassembler(int aID, String aName, String aNameRegional, int aTier)

+  {

+    super(aID, aName, aNameRegional, aTier, 1, "Disassembles Machines at " + (50 + 10 * aTier) + "% Efficiency", 1, 9, "Disassembler.png", "", new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_DISASSEMBLER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_DISASSEMBLER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_DISASSEMBLER) });

+  }

+  

+  public GT_MetaTileEntity_Disassembler(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName)

+  {

+    super(aName, aTier, 1, aDescription, aTextures, 1, 9, aGUIName, aNEIName);

+  }

+  

+  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

+  {

+    return new GT_MetaTileEntity_Disassembler(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);

+  }

+  

+  public int checkRecipe()

+  {

+    if ((getInputAt(0) != null) && (isOutputEmpty()))

+    {

+      NBTTagCompound tNBT = getInputAt(0).getTagCompound();

+      if (tNBT != null)

+      {

+        tNBT = tNBT.getCompoundTag("GT.CraftingComponents");

+        if (tNBT != null)

+        {

+          getInputAt(0).stackSize -= 1;

+          this.mEUt = (16 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

+          this.mMaxProgresstime = 80;

+          for (int i = 0; i < this.mOutputItems.length; i++) {

+            if (getBaseMetaTileEntity().getRandomNumber(100) < 50 + 10 * this.mTier)

+            {

+              this.mOutputItems[i] = GT_Utility.loadItem(tNBT, "Ingredient." + i);

+              if (this.mOutputItems[i] != null) {

+                this.mMaxProgresstime *= 1.7;

+              }

+            }

+          }

+          return 2;

+        }

+      }

+    }

+    return 0;

+  }

+  

+  public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)

+  {

+    return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (aStack.getTagCompound() != null) && (aStack.getTagCompound().getCompoundTag("GT.CraftingComponents") != null);

+  }

+}

+

+


+/* Location:           F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar


+ * Qualified Name:     gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Disassembler


+ * JD-Core Version:    0.7.0.1


+ */
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
new file mode 100644
index 0000000000..07337cd305
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
@@ -0,0 +1,83 @@
+package gregtech.common.tileentities.machines.basic;

+

+import gregtech.api.enums.ConfigCategories;

+import gregtech.api.enums.ItemList;

+import gregtech.api.enums.Materials;

+import gregtech.api.enums.Textures;

+import gregtech.api.enums.Textures.BlockIcons;

+import gregtech.api.interfaces.ITexture;

+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

+import gregtech.api.metatileentity.MetaTileEntity;

+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;

+import gregtech.api.objects.GT_RenderedTexture;

+import gregtech.api.util.GT_Config;

+import net.minecraftforge.fluids.FluidStack;

+

+public class GT_MetaTileEntity_Massfabricator

+  extends GT_MetaTileEntity_BasicMachine

+{

+  public static int sUUAperUUM = 1;

+  public static int sUUASpeedBonus = 4;

+  public static int sDurationMultiplier = 3215;

+  public static boolean sRequiresUUA = false;

+  

+  public GT_MetaTileEntity_Massfabricator(int aID, String aName, String aNameRegional, int aTier)

+  {

+    super(aID, aName, aNameRegional, aTier, 1, "UUM = Matter * Fabrication Squared", 1, 1, "Massfabricator.png", "", new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_MASSFAB), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB) });

+  }

+  

+  public GT_MetaTileEntity_Massfabricator(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName)

+  {

+    super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);

+  }

+  

+  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

+  {

+    return new GT_MetaTileEntity_Massfabricator(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);

+  }

+  

+  public void onConfigLoad(GT_Config aConfig)

+  {

+    super.onConfigLoad(aConfig);

+    sDurationMultiplier = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUM_Duration_Multiplier", sDurationMultiplier);

+    sUUAperUUM = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_per_UUM", sUUAperUUM);

+    sUUASpeedBonus = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_Speed_Bonus", sUUASpeedBonus);

+    sRequiresUUA = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_Requirement", sRequiresUUA);

+    Materials.UUAmplifier.mChemicalFormula = ("Mass Fabricator Eff/Speed Bonus: x" + sUUASpeedBonus);

+  }

+  

+  public int checkRecipe()

+  {

+    FluidStack tFluid = getDrainableStack();

+    if ((tFluid == null) || (tFluid.amount < getCapacity()))

+    {

+      this.mOutputFluid = Materials.UUMatter.getFluid(1L);

+      this.mEUt = ((int)gregtech.api.enums.GT_Values.V[this.mTier]);

+      this.mMaxProgresstime = (sDurationMultiplier / (1 << this.mTier - 1));

+      if (((tFluid = getFillableStack()) != null) && (tFluid.amount >= sUUAperUUM) && (tFluid.isFluidEqual(Materials.UUAmplifier.getFluid(1L))))

+      {

+        tFluid.amount -= sUUAperUUM;

+        this.mMaxProgresstime /= sUUASpeedBonus;

+        return 2;

+      }

+      return (sRequiresUUA) || (ItemList.Circuit_Integrated.isStackEqual(getInputAt(0), true, true)) ? 1 : 2;

+    }

+    return 0;

+  }

+  

+  public boolean isFluidInputAllowed(FluidStack aFluid)

+  {

+    return aFluid.isFluidEqual(Materials.UUAmplifier.getFluid(1L));

+  }

+  

+  public int getCapacity()

+  {

+    return Math.max(sUUAperUUM, 1000);

+  }

+}

+

+


+/* Location:           F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar


+ * Qualified Name:     gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Massfabricator


+ * JD-Core Version:    0.7.0.1


+ */
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java
new file mode 100644
index 0000000000..871835020d
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java
@@ -0,0 +1,79 @@
+package gregtech.common.tileentities.machines.basic;
+
+import static gregtech.api.enums.GT_Values.V;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.eventhandler.Event;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.living.LivingSpawnEvent;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_SpawnEventHandler;
+
+public class GT_MetaTileEntity_MonsterRepellent extends GT_MetaTileEntity_TieredMachineBlock {
+
+	public int mRange = 16;
+	
+	public GT_MetaTileEntity_MonsterRepellent(int aID, String aName, String aNameRegional, int aTier) {
+		super(aID, aName, aNameRegional, aTier, 0, "Reprells nasty Creatures. Range: "+(4 + (12*aTier))+" unpowered / "+(16 + (48*aTier))+" powered");
+	}
+
+	public GT_MetaTileEntity_MonsterRepellent(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
+		super(aName, aTier, aInvSlotCount, aDescription, aTextures);
+	}
+
+	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+		return new GT_MetaTileEntity_MonsterRepellent(this.mName, this.mTier, this.mInventory.length, this.mDescription, this.mTextures);
+	}
+
+	@Override
+	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1], (aSide != 1) ? null : aActive ? new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE) : new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER) };
+	}
+	
+	@Override
+	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) {
+		if (aBaseMetaTileEntity.isAllowedToWork() && aBaseMetaTileEntity.isServerSide()) {
+			int[] tCoords = new int[]{aBaseMetaTileEntity.getXCoord(),aBaseMetaTileEntity.getYCoord(),aBaseMetaTileEntity.getZCoord(),aBaseMetaTileEntity.getWorld().provider.dimensionId};
+		if((aTimer%600 == 0)&&!GT_SpawnEventHandler.mobReps.contains(tCoords)){
+			GT_SpawnEventHandler.mobReps.add(tCoords);
+		}
+		if(aBaseMetaTileEntity.isUniversalEnergyStored(getMinimumStoredEU()) && aBaseMetaTileEntity.decreaseStoredEnergyUnits(1 << (this.mTier*2), false)){
+			mRange = 16 + (48*mTier);
+		}else{
+			mRange = 4 + (12*mTier);
+		}}
+	}
+	
+	@Override
+	public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) {
+		int[] tCoords = new int[]{aBaseMetaTileEntity.getXCoord(),aBaseMetaTileEntity.getYCoord(),aBaseMetaTileEntity.getZCoord(),aBaseMetaTileEntity.getWorld().provider.dimensionId};
+		GT_SpawnEventHandler.mobReps.add(tCoords);
+	}
+	
+	@Override
+	public void onRemoval() {
+		int[] tCoords = new int[]{this.getBaseMetaTileEntity().getXCoord(),this.getBaseMetaTileEntity().getYCoord(),this.getBaseMetaTileEntity().getZCoord(),this.getBaseMetaTileEntity().getWorld().provider.dimensionId};
+		GT_SpawnEventHandler.mobReps.remove(tCoords);
+	}
+	@Override public boolean isSimpleMachine()						{return false;}
+	@Override public boolean isFacingValid(byte aFacing)			{return true;}
+	@Override public boolean isEnetInput() 							{return true;}
+	@Override public boolean isInputFacing(byte aSide)				{return true;}
+	@Override public boolean isTeleporterCompatible()				{return false;}
+	@Override public long getMinimumStoredEU()						{return 512;}
+	@Override public long maxEUStore()								{return 512+V[mTier]*50;}
+    @Override public long maxEUInput()								{return V[mTier];}
+    @Override public long maxAmperesIn()							{return 2;}
+	@Override public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {return false;}
+	@Override public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {return false;}
+	@Override public ITexture[][][] getTextureSet(ITexture[] aTextures) {return null;}
+	@Override public void saveNBTData(NBTTagCompound aNBT) {}
+	@Override public void loadNBTData(NBTTagCompound aNBT) {}
+	}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
new file mode 100644
index 0000000000..5064b50cb5
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
@@ -0,0 +1,165 @@
+package gregtech.common.tileentities.machines.basic;

+

+import gregtech.api.enums.Materials;

+import gregtech.api.enums.OrePrefixes;

+import gregtech.api.enums.Textures;

+import gregtech.api.enums.Textures.BlockIcons;

+import gregtech.api.interfaces.ITexture;

+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

+import gregtech.api.metatileentity.MetaTileEntity;

+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;

+import gregtech.api.objects.GT_RenderedTexture;

+import gregtech.api.util.GT_OreDictUnificator;

+import gregtech.api.util.GT_Recipe;

+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;

+import gregtech.api.util.GT_Utility;

+import net.minecraft.init.Items;

+import net.minecraft.item.ItemStack;

+import net.minecraftforge.fluids.Fluid;

+import net.minecraftforge.fluids.FluidRegistry;

+import net.minecraftforge.fluids.FluidStack;

+

+public class GT_MetaTileEntity_PotionBrewer

+  extends GT_MetaTileEntity_BasicMachine

+{

+  public GT_MetaTileEntity_PotionBrewer(int aID, String aName, String aNameRegional, int aTier)

+  {

+    super(aID, aName, aNameRegional, aTier, 1, "Brewing your Drinks", 1, 0, "PotionBrewer.png", "", new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_POTIONBREWER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_POTIONBREWER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_POTIONBREWER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_POTIONBREWER) });

+  }

+  

+  public GT_MetaTileEntity_PotionBrewer(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName)

+  {

+    super(aName, aTier, 1, aDescription, aTextures, 1, 0, aGUIName, aNEIName);

+  }

+  

+  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

+  {

+    return new GT_MetaTileEntity_PotionBrewer(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);

+  }

+  

+  public GT_Recipe.GT_Recipe_Map getRecipeList()

+  {

+    return GT_Recipe.GT_Recipe_Map.sBrewingRecipes;

+  }

+  

+  public int checkRecipe()

+  {

+    int tCheck = super.checkRecipe();

+    if (tCheck != 0) {

+      return tCheck;

+    }

+    FluidStack aFluid = getFillableStack();

+    if ((getDrainableStack() == null) && (aFluid != null) && (getInputAt(0) != null))

+    {

+      String tInputName = aFluid.getFluid().getName();

+      if (tInputName.startsWith("potion."))

+      {

+        tInputName = tInputName.replaceFirst("potion.", "");

+        int tFirstDot = tInputName.indexOf('.') + 1;

+        String tModifier = tFirstDot <= 0 ? "" : tInputName.substring(tFirstDot);

+        if (!tModifier.isEmpty()) {

+          tInputName = tInputName.replaceFirst("." + tModifier, "");

+        }

+        if (GT_Utility.areStacksEqual(new ItemStack(Items.fermented_spider_eye, 1, 0), getInputAt(0)))

+        {

+          if (tInputName.equals("poison")) {

+            return setOutput("potion.damage" + tModifier);

+          }

+          if (tInputName.equals("health")) {

+            return setOutput("potion.damage" + tModifier);

+          }

+          if (tInputName.equals("waterbreathing")) {

+            return setOutput("potion.damage" + tModifier);

+          }

+          if (tInputName.equals("nightvision")) {

+            return setOutput("potion.invisibility" + tModifier);

+          }

+          if (tInputName.equals("fireresistance")) {

+            return setOutput("potion.slowness" + tModifier);

+          }

+          if (tInputName.equals("speed")) {

+            return setOutput("potion.slowness" + tModifier);

+          }

+          if (tInputName.equals("strength")) {

+            return setOutput("potion.weakness" + tModifier);

+          }

+          if (tInputName.equals("regen")) {

+            return setOutput("potion.poison" + tModifier);

+          }

+          return setOutput("potion.weakness");

+        }

+        if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L), getInputAt(0)))

+        {

+          if (!tModifier.startsWith("strong")) {

+            return setOutput("potion." + tInputName + ".strong" + (tModifier.isEmpty() ? "" : new StringBuilder().append(".").append(tModifier).toString()));

+          }

+          if (tModifier.startsWith("long")) {

+            return setOutput("potion." + tInputName + tModifier.replaceFirst("long", ""));

+          }

+          return setOutput("potion.thick");

+        }

+        if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), getInputAt(0)))

+        {

+          if (!tModifier.startsWith("long")) {

+            return setOutput("potion." + tInputName + ".long" + (tModifier.isEmpty() ? "" : new StringBuilder().append(".").append(tModifier).toString()));

+          }

+          if (tModifier.startsWith("strong")) {

+            return setOutput("potion." + tInputName + tModifier.replaceFirst("strong", ""));

+          }

+          return setOutput("potion.mundane");

+        }

+        if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1L), getInputAt(0)))

+        {

+          if (!tInputName.endsWith(".splash")) {

+            return setOutput("potion." + tInputName + ".splash");

+          }

+          return setOutput("potion.mundane");

+        }

+      }

+    }

+    return 0;

+  }

+  

+  private final int setOutput(String aFluidName)

+  {

+    this.mOutputFluid = FluidRegistry.getFluidStack(aFluidName, 750);

+    if (this.mOutputFluid == null)

+    {

+      this.mOutputFluid = FluidRegistry.getFluidStack("potion.mundane", getFillableStack().amount);

+      getInputAt(0).stackSize -= 1;

+      getFillableStack().amount = 0;

+      this.mEUt = (4 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

+      this.mMaxProgresstime = (128 / (1 << this.mTier - 1));

+      return 2;

+    }

+    if (getFillableStack().amount < 750) {

+      return 0;

+    }

+    getInputAt(0).stackSize -= 1;

+    getFillableStack().amount -= 750;

+    this.mEUt = (4 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

+    this.mMaxProgresstime = (128 / (1 << this.mTier - 1));

+    return 2;

+  }

+  

+  public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)

+  {

+    return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (getRecipeList().containsInput(aStack));

+  }

+  

+  public boolean isFluidInputAllowed(FluidStack aFluid)

+  {

+    return (aFluid.getFluid().getName().startsWith("potion.")) || (super.isFluidInputAllowed(aFluid));

+  }

+  

+  public int getCapacity()

+  {

+    return 750;

+  }

+}

+

+


+/* Location:           F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar


+ * Qualified Name:     gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_PotionBrewer


+ * JD-Core Version:    0.7.0.1


+ */
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java
new file mode 100644
index 0000000000..bf10c5143e
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java
@@ -0,0 +1,71 @@
+package gregtech.common.tileentities.machines.basic;

+

+import gregtech.api.enums.OrePrefixes;

+import gregtech.api.interfaces.ITexture;

+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;

+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;

+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 java.util.ArrayList;

+

+import net.minecraft.item.ItemStack;

+

+public class GT_MetaTileEntity_Printer

+  extends GT_MetaTileEntity_BasicMachine

+{

+  public GT_MetaTileEntity_Printer(int aID, String aName, String aNameRegional, int aTier)

+  {

+    super(aID, aName, aNameRegional, aTier, 1, "It can copy Books and paint Stuff", 1, 1, "Printer.png", GT_Recipe.GT_Recipe_Map.sPrinterRecipes.mNEIName, new ITexture[0]);

+  }

+  

+  public GT_MetaTileEntity_Printer(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName)

+  {

+    super(aName, aTier, 1, aDescription, aTextures, 2, 2, aGUIName, aNEIName);

+  }

+  

+  public int checkRecipe()

+  {

+    if (getOutputAt(0) != null)

+    {

+      this.mOutputBlocked += 1;

+    }

+    else if ((GT_Utility.isStackValid(getInputAt(0))) && (getInputAt(0).stackSize > 0) && 

+      (GT_Utility.isStackInvalid(getSpecialSlot())) && 

+      (OrePrefixes.block.contains(getInputAt(0))))

+    {

+      ArrayList<ItemStack> tList = GT_OreDictUnificator.getOres(GT_OreDictUnificator.getAssociation(getInputAt(0)));

+      if (tList.size() > 1)

+      {

+        tList.add(tList.get(0));

+        int i = 0;

+        for (int j = tList.size() - 1; i < j; i++) {

+          if (GT_Utility.areStacksEqual(getInputAt(0), (ItemStack)tList.get(i)))

+          {

+            this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[] { tList.get(i + 1) });

+            this.mEUt = (1 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

+            this.mMaxProgresstime = (32 / (1 << this.mTier - 1));

+            getInputAt(0).stackSize -= 1;

+            return 2;

+          }

+        }

+      }

+    }

+    this.mMaxProgresstime = 0;

+    return 0;

+  }

+  

+  public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

+  {

+    return null;

+  }

+}

+

+


+/* Location:           F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar


+ * Qualified Name:     gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Printer


+ * JD-Core Version:    0.7.0.1


+ */
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
new file mode 100644
index 0000000000..40020ef435
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
@@ -0,0 +1,380 @@
+package gregtech.common.tileentities.machines.basic;
+
+import static gregtech.api.enums.GT_Values.V;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.ChunkPosition;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidBlock;
+import gregtech.api.enums.Textures;
+import gregtech.api.gui.GT_Container_BasicTank;
+import gregtech.api.gui.GT_GUIContainer_BasicTank;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.BaseTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Utility;
+
+public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch {
+
+	public ArrayList<ChunkPosition> mPumpList = new ArrayList();
+	public int mPumpTimer = 0;
+	public int mPumpCountBelow = 0;
+	public Block mPumpedBlock1 = null;
+	public Block mPumpedBlock2 = null;
+
+	public GT_MetaTileEntity_Pump(int aID, String aName, String aNameRegional, int aTier) {
+		super(aID, aName, aNameRegional, aTier, 3, "The best way of emptying Oceans!");
+	}
+
+	public GT_MetaTileEntity_Pump(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+		super(aName, aTier, 3, aDescription,aTextures);
+	}
+
+	@Override
+	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+		return new GT_MetaTileEntity_Pump(this.mName, this.mTier, this.mDescription, this.mTextures);
+	}
+
+	public void saveNBTData(NBTTagCompound aNBT) {
+		super.saveNBTData(aNBT);
+		aNBT.setString("mPumpedBlock1", this.mPumpedBlock1 == null ? "" : this.mPumpedBlock1.getUnlocalizedName());
+		aNBT.setString("mPumpedBlock2", this.mPumpedBlock2 == null ? "" : this.mPumpedBlock2.getUnlocalizedName());
+	}
+
+	public void loadNBTData(NBTTagCompound aNBT) {
+		super.loadNBTData(aNBT);
+		this.mPumpedBlock1 = Block.getBlockFromName(aNBT.getString("mPumpedBlock1"));
+		this.mPumpedBlock2 = Block.getBlockFromName(aNBT.getString("mPumpedBlock2"));
+	}
+	
+	@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 boolean doesFillContainers() {
+		return true;
+	}
+	@Override
+	public boolean doesEmptyContainers() {
+		return false;
+	}
+	@Override
+	public boolean canTankBeFilled() {
+		return false;
+	}
+	@Override
+	publ