Added Advanced Air Intake Hatch.

Added Reservoir Hatch.
Refactored Air Intake Hatch into a base class.

7 files changed, 485 insertions, 222 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index d3caf99af6..a8ee2e24ad 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -438,6 +438,10 @@ public enum GregtechItemList implements GregtechItemContainer {
 
 	//Air Intake hatch
 	Hatch_Air_Intake,
+	Hatch_Air_Intake_Extreme,
+	
+	//Reservoir Hatch
+	Hatch_Reservoir,
 	
 	//XL Turbine Rotor Hatch
 	/*Hatch_Turbine_Rotor,*/
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java
index 5fb3b11d08..4716d8038a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java
@@ -1,165 +1,65 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
 
-import java.lang.reflect.Field;
-
-import gregtech.api.enums.Textures;
-import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.objects.GT_RenderedTexture;
-import gtPlusPlus.api.objects.random.XSTR;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
 
-public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_Input {
-	
-	private static XSTR floatGen;
-    public int mProgresstime = 0, mMaxProgresstime = 0;
+public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_FluidGenerator {
 
-	public GT_MetaTileEntity_Hatch_AirIntake(final int aID, final String aName, final String aNameRegional,
-			final int aTier) {
+	public GT_MetaTileEntity_Hatch_AirIntake(final int aID, final String aName, final String aNameRegional,	final int aTier) {
 		super(aID, aName, aNameRegional, aTier);
 	}
 
-	public GT_MetaTileEntity_Hatch_AirIntake(final String aName, final int aTier, final String aDescription,
-			final ITexture[][][] aTextures) {
+	public GT_MetaTileEntity_Hatch_AirIntake(final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
 		super(aName, aTier, aDescription, aTextures);
 	}
 
-	/*public GT_MetaTileEntity_Hatch_AirIntake(final String aName, final int aTier, final String[] aDescription,
-			final ITexture[][][] aTextures) {
-		super(aName, aTier, aDescription, aTextures);
-	}*/
-
-	private static String[] S;
-	private static Field F;
-
-	public synchronized String[] getDescription() {
-		try {
-			if (F == null || S == null) {
-				Field t = ReflectionUtils.getField(this.getClass(), "mDescriptionArray");
-				if (t != null) {
-					F = t;
-				}
-				else {
-					F = ReflectionUtils.getField(this.getClass(), "mDescription");
-				}
-				if (S == null && F != null) {
-					Object o = F.get(this);
-					if (o instanceof String[]) {
-						S = (String[]) o;
-					}
-					else if (o instanceof String) {
-						S = new String[] {(String) o};
-					}
-				}
-
-			}
-		}
-		catch (Throwable t) {
-
-		}
-		if (S != null) {
-			final String[] desc = new String[S.length + 4];
-			System.arraycopy(S, 0, desc, 0, S.length);
-			desc[S.length] = "DO NOT OBSTRUCT THE INPUT!";
-			desc[S.length + 1] = "Draws in Air from the surrounding environment";
-			desc[S.length + 2] = "Creates 1000L of Air every 4 ticks";
-			desc[S.length + 3] = CORE.GT_Tooltip;
-			return desc;
-		}
-		else {
-			return new String[] {"DO NOT OBSTRUCT THE INPUT!", "Draws in Air from the surrounding environment", "Creates 1000L of Air every 4 ticks", CORE.GT_Tooltip};
-		}
 
-
-	}
-
-	public ITexture[] getTexturesActive(final ITexture aBaseTexture) {
-		return new ITexture[]{aBaseTexture,
-				new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER)};
-	}
-
-	public ITexture[] getTexturesInactive(final ITexture aBaseTexture) {
-		return new ITexture[]{aBaseTexture,
-				new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER)};
-	}
-
-	public boolean isSimpleMachine() {
-		return true;
-	}
-
-	public boolean isFacingValid(final byte aFacing) {
-		return true;
+	public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
+		return new GT_MetaTileEntity_Hatch_AirIntake(this.mName, this.mTier, this.mDescription, this.mTextures);
 	}
 
-	public boolean isAccessAllowed(final EntityPlayer aPlayer) {
-		return true;
+	@Override
+	public String[] getCustomTooltip() {
+		String[] aTooltip = new String[3];
+		aTooltip[0] = "DO NOT OBSTRUCT THE INPUT!";
+		aTooltip[1] = "Draws in Air from the surrounding environment";
+		aTooltip[2] = "Creates 1000L of Air every 4 ticks";
+		return aTooltip;
 	}
 
-	public boolean isValidSlot(final int aIndex) {
-		return false;
+	@Override
+	public Fluid getFluidToGenerate() {
+		return FluidUtils.getAir(1).getFluid();
 	}
 
-	public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-		return new GT_MetaTileEntity_Hatch_AirIntake(this.mName, this.mTier, this.mDescription, this.mTextures);
+	@Override
+	public int getAmountOfFluidToGenerate() {
+		return 1000;
 	}
 
-	public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
-			final ItemStack aStack) {
-		return false;
+	@Override
+	public int getMaxTickTime() {
+		return 4;
 	}
 
-	public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
-			final ItemStack aStack) {
-		return false;
+	@Override
+	public int getCapacity() {
+		return 128000;
 	}
 
-	public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) {
-		super.onPostTick(aBaseMetaTileEntity, aTick);	
-		
-		if (!aBaseMetaTileEntity.isAllowedToWork()) {
-            aBaseMetaTileEntity.setActive(false);	
-            mProgresstime = 0;
-            mMaxProgresstime = 0;		
-		}
-		else {
-			aBaseMetaTileEntity.setActive(true);
-			mMaxProgresstime = 4;
-			if (++mProgresstime >= mMaxProgresstime) {
-				addAirToHatch(aTick);
-				mProgresstime = 0;
-			}
-		}
+	@Override
+	public boolean doesHatchMeetConditionsToGenerate() {
+		return this.getBaseMetaTileEntity().getAirAtSide(this.getBaseMetaTileEntity().getFrontFacing());
 	}
-	
-    @Override
-    public int getProgresstime() {
-        return mProgresstime;
-    }
-
-    @Override
-    public int maxProgresstime() {
-        return mMaxProgresstime;
-    }
 
-    @Override
-    public int increaseProgress(int aProgress) {
-        mProgresstime += aProgress;
-        return mMaxProgresstime - mProgresstime;
-    }
-
-	public void pollutionParticles(final World aWorld, final String name) {
+	@Override
+	public void generateParticles(World aWorld, String name) {
 		if (this.getBaseMetaTileEntity().isServerSide()) {
 			return;
 		}		
@@ -207,97 +107,4 @@ public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_I
 				(double) -ySpd, (double) zSpd);		
 	}
 
-	static {
-		GT_MetaTileEntity_Hatch_AirIntake.floatGen = new XSTR();
-	}
-
-	public int getTankPressure() {
-		return 100;
-	}
-
-	public int getCapacity() {
-		return 128000;
-	}
-
-	@Override
-	public boolean canTankBeEmptied() {
-		return true;
-	}
-	
-	private static Fluid AIR;
-	
-	public boolean isAirInHatch() {		
-		if (this.mFluid != null) {
-			if (AIR == null) {
-				AIR = FluidUtils.getAir(1).getFluid();
-			}
-			if (AIR == this.mFluid.getFluid()) {
-				return true;
-			}
-		}		
-		return false;
-	}
-
-	public boolean addAirToHatch(long aTick) {		
-		if (!this.getBaseMetaTileEntity().getAirAtSide(this.getBaseMetaTileEntity().getFrontFacing())) {
-			return false;
-		}		
-		boolean didFill = this.fill(FluidUtils.getAir(1000), true) > 0;
-        if (didFill) {					
-			this.pollutionParticles(this.getBaseMetaTileEntity().getWorld(), "cloud");
-		}
-		return didFill;	
-	}
-
-	@Override
-	public boolean canTankBeFilled() {
-		if (this.mFluid == null || (this.mFluid != null && (this.mFluid.amount <= this.getCapacity()))) {
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public boolean doesEmptyContainers() {
-		return false;
-	}
-
-	@Override
-	public boolean doesFillContainers() {
-		return true;
-	}
-
-	@Override
-	public int fill(FluidStack aFluid, boolean doFill) {
-		return super.fill(aFluid, doFill);
-	}
-
-	@Override
-	public boolean canFill(ForgeDirection aSide, Fluid aFluid) {
-		return false;
-	}
-
-	@Override
-	public int fill(ForgeDirection arg0, FluidStack arg1, boolean arg2) {
-		return 0;
-	}
-
-	@Override
-	public int fill_default(ForgeDirection aSide, FluidStack aFluid, boolean doFill) {
-		return 0;
-	}
-	
-	@Override
-	public void saveNBTData(NBTTagCompound aNBT) {
-        aNBT.setInteger("mProgresstime", mProgresstime);
-        aNBT.setInteger("mMaxProgresstime", mMaxProgresstime);
-		super.saveNBTData(aNBT);
-	}
-
-	@Override
-	public void loadNBTData(NBTTagCompound aNBT) {
-        mProgresstime = aNBT.getInteger("mProgresstime");
-        mMaxProgresstime = aNBT.getInteger("mMaxProgresstime");
-		super.loadNBTData(aNBT);
-	}
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java
new file mode 100644
index 0000000000..5ebb2da8d4
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java
@@ -0,0 +1,110 @@
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+
+public class GT_MetaTileEntity_Hatch_AirIntake_Extreme extends GT_MetaTileEntity_Hatch_FluidGenerator {
+
+	public GT_MetaTileEntity_Hatch_AirIntake_Extreme(final int aID, final String aName, final String aNameRegional,	final int aTier) {
+		super(aID, aName, aNameRegional, aTier);
+	}
+
+	public GT_MetaTileEntity_Hatch_AirIntake_Extreme(final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+		super(aName, aTier, aDescription, aTextures);
+	}
+
+
+	public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
+		return new GT_MetaTileEntity_Hatch_AirIntake_Extreme(this.mName, this.mTier, this.mDescription, this.mTextures);
+	}
+
+	@Override
+	public String[] getCustomTooltip() {
+		String[] aTooltip = new String[3];
+		aTooltip[0] = "DO NOT OBSTRUCT THE INPUT!";
+		aTooltip[1] = "Draws in Air from the surrounding environment";
+		aTooltip[2] = "Creates 5000L of Air every 4 ticks";
+		return aTooltip;
+	}
+
+	@Override
+	public Fluid getFluidToGenerate() {
+		return FluidUtils.getAir(1).getFluid();
+	}
+
+	@Override
+	public int getAmountOfFluidToGenerate() {
+		return 5000;
+	}
+
+	@Override
+	public int getMaxTickTime() {
+		return 4;
+	}
+
+	@Override
+	public int getCapacity() {
+		return 256000;
+	}
+
+	@Override
+	public boolean doesHatchMeetConditionsToGenerate() {
+		return this.getBaseMetaTileEntity().getAirAtSide(this.getBaseMetaTileEntity().getFrontFacing());
+	}
+
+	@Override
+	public void generateParticles(World aWorld, String name) {
+		if (this.getBaseMetaTileEntity().isServerSide()) {
+			return;
+		}		
+		final float ran1 = GT_MetaTileEntity_Hatch_AirIntake_Extreme.floatGen.nextFloat();
+		float ran2 = 0.0f;
+		float ran3 = 0.0f;
+		ran2 = GT_MetaTileEntity_Hatch_AirIntake_Extreme.floatGen.nextFloat();
+		ran3 = GT_MetaTileEntity_Hatch_AirIntake_Extreme.floatGen.nextFloat();
+
+		final IGregTechTileEntity aMuffler = this.getBaseMetaTileEntity();
+		final ForgeDirection aDir = ForgeDirection.getOrientation((int) aMuffler.getFrontFacing());
+		final float xPos = aDir.offsetX * 0.76f + aMuffler.getXCoord() + 0.25f;
+		float yPos = aDir.offsetY * 0.76f + aMuffler.getYCoord() + 0.65f;
+		final float zPos = aDir.offsetZ * 0.76f + aMuffler.getZCoord() + 0.25f;
+		float ySpd = aDir.offsetY * 0.1f + 0.2f + 0.1f * GT_MetaTileEntity_Hatch_AirIntake_Extreme.floatGen.nextFloat();
+		float xSpd;
+		float zSpd;
+		if (aDir.offsetY == -1) {
+			//Logger.INFO("Y = -1");
+			final float temp = GT_MetaTileEntity_Hatch_AirIntake_Extreme.floatGen.nextFloat() * 2.0f * CORE.PI;
+			xSpd = (float) Math.sin(temp) * 0.1f;
+			zSpd = (float) Math.cos(temp) * 0.1f;
+			ySpd = -ySpd;
+			yPos = yPos - 0.8f;
+		} 
+		else {
+			xSpd = aDir.offsetX * (0.1f + 0.2f * GT_MetaTileEntity_Hatch_AirIntake_Extreme.floatGen.nextFloat());
+			zSpd = aDir.offsetZ * (0.1f + 0.2f * GT_MetaTileEntity_Hatch_AirIntake_Extreme.floatGen.nextFloat());
+
+			xSpd = -xSpd;
+			zSpd = -zSpd;
+		}
+
+		aWorld.spawnParticle(name, (double) (xPos + ran1 * 0.5f),
+				(double) (yPos + GT_MetaTileEntity_Hatch_AirIntake_Extreme.floatGen.nextFloat() * 0.5f),
+				(double) (zPos + GT_MetaTileEntity_Hatch_AirIntake_Extreme.floatGen.nextFloat() * 0.5f), (double) xSpd,
+				(double) -ySpd, (double) zSpd);
+		aWorld.spawnParticle(name, (double) (xPos + ran2 * 0.5f),
+				(double) (yPos + GT_MetaTileEntity_Hatch_AirIntake_Extreme.floatGen.nextFloat() * 0.5f),
+				(double) (zPos + GT_MetaTileEntity_Hatch_AirIntake_Extreme.floatGen.nextFloat() * 0.5f), (double) xSpd,
+				(double) -ySpd, (double) zSpd);
+		aWorld.spawnParticle(name, (double) (xPos + ran3 * 0.5f),
+				(double) (yPos + GT_MetaTileEntity_Hatch_AirIntake_Extreme.floatGen.nextFloat() * 0.5f),
+				(double) (zPos + GT_MetaTileEntity_Hatch_AirIntake_Extreme.floatGen.nextFloat() * 0.5f), (double) xSpd,
+				(double) -ySpd, (double) zSpd);		
+	}
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java
new file mode 100644
index 0000000000..7579c8ec5a
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java
@@ -0,0 +1,254 @@
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+
+import java.lang.reflect.Field;
+
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
+import gregtech.api.objects.GT_RenderedTexture;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.random.XSTR;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
+public abstract class GT_MetaTileEntity_Hatch_FluidGenerator extends GT_MetaTileEntity_Hatch_Input {
+	
+	protected static XSTR floatGen = new XSTR();
+    public int mProgresstime = 0, mMaxProgresstime = 0;
+
+	public GT_MetaTileEntity_Hatch_FluidGenerator(final int aID, final String aName, final String aNameRegional, final int aTier) {
+		super(aID, aName, aNameRegional, aTier);
+	}
+
+	public GT_MetaTileEntity_Hatch_FluidGenerator(final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+		super(aName, aTier, aDescription, aTextures);
+	}
+
+	private static String[] S;
+	private static Field F;
+	
+	public abstract String[] getCustomTooltip();
+	
+	public abstract Fluid getFluidToGenerate();
+	
+	public abstract int getAmountOfFluidToGenerate();
+	
+	public abstract int getMaxTickTime();
+
+	public synchronized String[] getDescription() {
+		try {
+			if (F == null || S == null) {
+				Field t = ReflectionUtils.getField(this.getClass(), "mDescriptionArray");
+				if (t != null) {
+					F = t;
+				}
+				else {
+					F = ReflectionUtils.getField(this.getClass(), "mDescription");
+				}
+				if (S == null && F != null) {
+					Object o = F.get(this);
+					if (o instanceof String[]) {
+						S = (String[]) o;
+					}
+					else if (o instanceof String) {
+						S = new String[] {(String) o};
+					}
+				}
+
+			}
+		}
+		catch (Throwable t) {
+			Logger.INFO("1");
+			t.printStackTrace();
+		}
+		try {
+		if (S != null) {
+			String[] aCustomTips = getCustomTooltip();
+			final String[] desc = new String[S.length + aCustomTips.length + 1];
+			System.arraycopy(S, 0, desc, 0, S.length);
+			for (int i=0;i<aCustomTips.length;i++) {
+				desc[S.length + i] = aCustomTips[i];
+			}
+			desc[S.length + aCustomTips.length] = CORE.GT_Tooltip;
+			return desc;
+		}
+		}
+		catch (Throwable t) {
+			Logger.INFO("2");
+			t.printStackTrace();
+		}
+
+		return new String[] {"Broken Tooltip - Report on Github"};
+
+	}
+
+	public ITexture[] getTexturesActive(final ITexture aBaseTexture) {
+		return new ITexture[]{aBaseTexture,
+				new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER)};
+	}
+
+	public ITexture[] getTexturesInactive(final ITexture aBaseTexture) {
+		return new ITexture[]{aBaseTexture,
+				new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER)};
+	}
+
+	public boolean isSimpleMachine() {
+		return true;
+	}
+
+	public boolean isFacingValid(final byte aFacing) {
+		return true;
+	}
+
+	public boolean isAccessAllowed(final EntityPlayer aPlayer) {
+		return true;
+	}
+
+	public boolean isValidSlot(final int aIndex) {
+		return false;
+	}
+
+	public  abstract MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity);
+
+	public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+			final ItemStack aStack) {
+		return false;
+	}
+
+	public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+			final ItemStack aStack) {
+		return false;
+	}
+
+	public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) {
+		super.onPostTick(aBaseMetaTileEntity, aTick);	
+		
+		if (!aBaseMetaTileEntity.isAllowedToWork()) {
+            aBaseMetaTileEntity.setActive(false);	
+            mProgresstime = 0;
+            mMaxProgresstime = 0;		
+		}
+		else {
+			aBaseMetaTileEntity.setActive(true);
+			mMaxProgresstime = getMaxTickTime();
+			if (++mProgresstime >= mMaxProgresstime) {
+				addFluidToHatch(aTick);
+				mProgresstime = 0;
+			}
+		}
+	}
+	
+    @Override
+    public int getProgresstime() {
+        return mProgresstime;
+    }
+
+    @Override
+    public int maxProgresstime() {
+        return mMaxProgresstime;
+    }
+
+    @Override
+    public int increaseProgress(int aProgress) {
+        mProgresstime += aProgress;
+        return mMaxProgresstime - mProgresstime;
+    }
+
+	public abstract void generateParticles(final World aWorld, final String name);
+
+	public int getTankPressure() {
+		return 100;
+	}
+
+	public abstract int getCapacity();
+
+	@Override
+	public boolean canTankBeEmptied() {
+		return true;
+	}
+	
+	public boolean isAirInHatch() {		
+		if (this.mFluid != null) {
+			if (getFluidToGenerate() == this.mFluid.getFluid()) {
+				return true;
+			}
+		}		
+		return false;
+	}
+	
+	public abstract boolean doesHatchMeetConditionsToGenerate();
+
+	public boolean addFluidToHatch(long aTick) {		
+		if (!doesHatchMeetConditionsToGenerate()) {
+			return false;
+		}		
+		boolean didFill = this.fill(FluidUtils.getFluidStack(getFluidToGenerate(), getAmountOfFluidToGenerate()), true) > 0;
+        if (didFill) {					
+			this.generateParticles(this.getBaseMetaTileEntity().getWorld(), "cloud");
+		}
+		return didFill;	
+	}
+
+	@Override
+	public boolean canTankBeFilled() {
+		if (this.mFluid == null || (this.mFluid != null && (this.mFluid.amount <= this.getCapacity()))) {
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean doesEmptyContainers() {
+		return false;
+	}
+
+	@Override
+	public boolean doesFillContainers() {
+		return true;
+	}
+
+	@Override
+	public int fill(FluidStack aFluid, boolean doFill) {
+		return super.fill(aFluid, doFill);
+	}
+
+	@Override
+	public boolean canFill(ForgeDirection aSide, Fluid aFluid) {
+		return false;
+	}
+
+	@Override
+	public int fill(ForgeDirection arg0, FluidStack arg1, boolean arg2) {
+		return 0;
+	}
+
+	@Override
+	public int fill_default(ForgeDirection aSide, FluidStack aFluid, boolean doFill) {
+		return 0;
+	}
+	
+	@Override
+	public void saveNBTData(NBTTagCompound aNBT) {
+        aNBT.setInteger("mProgresstime", mProgresstime);
+        aNBT.setInteger("mMaxProgresstime", mMaxProgresstime);
+		super.saveNBTData(aNBT);
+	}
+
+	@Override
+	public void loadNBTData(NBTTagCompound aNBT) {
+        mProgresstime = aNBT.getInteger("mProgresstime");
+        mMaxProgresstime = aNBT.getInteger("mMaxProgresstime");
+		super.loadNBTData(aNBT);
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
new file mode 100644
index 0000000000..5cd57e9e92
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
@@ -0,0 +1,81 @@
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.objects.GT_RenderedTexture;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+
+public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_FluidGenerator {
+
+	public GT_MetaTileEntity_Hatch_Reservoir(final int aID, final String aName, final String aNameRegional,	final int aTier) {
+		super(aID, aName, aNameRegional, aTier);
+	}
+
+	public GT_MetaTileEntity_Hatch_Reservoir(final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+		super(aName, aTier, aDescription, aTextures);
+	}
+
+
+	public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
+		return new GT_MetaTileEntity_Hatch_Reservoir(this.mName, this.mTier, this.mDescription, this.mTextures);
+	}
+
+	@Override
+	public String[] getCustomTooltip() {
+		String[] aTooltip = new String[3];
+		aTooltip[0] = "Requires a Block of water facing the intake";
+		aTooltip[1] = "Infinite water supply hatch";
+		aTooltip[2] = "Creates 2000L of Water every 4 ticks";
+		return aTooltip;
+	}
+
+	@Override
+	public Fluid getFluidToGenerate() {
+		return FluidRegistry.WATER;
+	}
+
+	@Override
+	public int getAmountOfFluidToGenerate() {
+		return 2000;
+	}
+
+	@Override
+	public int getMaxTickTime() {
+		return 4;
+	}
+
+	@Override
+	public int getCapacity() {
+		return 128000;
+	}
+
+	@Override
+	public boolean doesHatchMeetConditionsToGenerate() {
+		Block aWater = this.getBaseMetaTileEntity().getBlockAtSide(this.getBaseMetaTileEntity().getFrontFacing());
+		return aWater == Blocks.water || aWater == Blocks.flowing_water;
+	}
+
+	@Override
+	public void generateParticles(World aWorld, String name) {
+		
+	}
+	
+	public ITexture[] getTexturesActive(final ITexture aBaseTexture) {
+		return new ITexture[]{aBaseTexture,
+				new GT_RenderedTexture(TexturesGtBlock.Overlay_Water)};
+	}
+
+	public ITexture[] getTexturesInactive(final ITexture aBaseTexture) {
+		return new ITexture[]{aBaseTexture,
+				new GT_RenderedTexture(TexturesGtBlock.Overlay_Water)};
+	}
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
index 518ffe0eae..8b372dff0c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
@@ -445,6 +445,8 @@ public class TexturesGtBlock {
 	
 	private static final CustomIcon Internal_Overlay_Oil = new CustomIcon("TileEntities/adv_machine_oil");
 	public static final CustomIcon Overlay_Oil = Internal_Overlay_Oil;
+	private static final CustomIcon Internal_Overlay_Water = new CustomIcon("TileEntities/adv_machine_water");
+	public static final CustomIcon Overlay_Water = Internal_Overlay_Water;
 	private static final CustomIcon Internal_Overlay_UU_Matter = new CustomIcon("TileEntities/adv_machine_uum");
 	public static final CustomIcon Overlay_UU_Matter = Internal_Overlay_UU_Matter;
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
index 64e77393bd..b93933d088 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
@@ -68,7 +68,12 @@ public class GregtechCustomHatches {
 
 		// Multiblock Air Intake Hatch
 		GregtechItemList.Hatch_Air_Intake.set(new GT_MetaTileEntity_Hatch_AirIntake(861, "hatch.air.intake.tier.00", "Air Intake Hatch", 5).getStackForm(1L));
+		GregtechItemList.Hatch_Air_Intake_Extreme.set(new GT_MetaTileEntity_Hatch_AirIntake_Extreme(31070, "hatch.air.intake.tier.01", "Extreme Air Intake Hatch", 6).getStackForm(1L));
 
+		// Multiblock Reservoir Hatch
+		GregtechItemList.Hatch_Reservoir.set(new GT_MetaTileEntity_Hatch_Reservoir(31071, "hatch.water.intake.tier.00", "Reservoir Hatch", 6).getStackForm(1L));
+
+		
 		// Steam Hatch
 		GregtechItemList.Hatch_Input_Steam
 		.set(new GT_MetaTileEntity_Hatch_CustomFluidBase(FluidUtils.getSteam(1).getFluid(), // Fluid