Refactored GT_MetaTileEntity_Hatch_AirIntake_Extreme to extend GT_MetaTileEntity_Hatch_AirIntake.

Refactored GT_MetaTileEntity_Hatch_Reservoir.
Refactored Chisel singles/multi to utilise a cache.

3 files changed, 7 insertions, 95 deletions

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 4716d8038a..02b7a03f3b 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
@@ -29,7 +29,7 @@ public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_F
 		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";
+		aTooltip[2] = "Creates "+getAmountOfFluidToGenerate()+"L of Air every "+getMaxTickTime()+" ticks";
 		return aTooltip;
 	}
 
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
index d70afcb433..45611d9e05 100644
--- 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
@@ -3,13 +3,8 @@ 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 class GT_MetaTileEntity_Hatch_AirIntake_Extreme extends GT_MetaTileEntity_Hatch_AirIntake {
 
 	public GT_MetaTileEntity_Hatch_AirIntake_Extreme(final int aID, final String aName, final String aNameRegional,	final int aTier) {
 		super(aID, aName, aNameRegional, aTier);
@@ -25,86 +20,13 @@ public class GT_MetaTileEntity_Hatch_AirIntake_Extreme extends GT_MetaTileEntity
 	}
 
 	@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 8000L of Air every 4 ticks";
-		return aTooltip;
-	}
-
-	@Override
-	public Fluid getFluidToGenerate() {
-		return FluidUtils.getAir(1).getFluid();
-	}
-
-	@Override
 	public int getAmountOfFluidToGenerate() {
 		return 8000;
 	}
 
 	@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_Reservoir.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
index a2aa4d266c..716251ecf0 100644
--- 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
@@ -1,13 +1,11 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
 
-import java.lang.reflect.Field;
-
+import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
@@ -20,10 +18,6 @@ import net.minecraftforge.fluids.IFluidHandler;
 
 public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_FluidGenerator {
 
-	private static Class sClass_EIO;
-	private static Class sClass_RIO;
-	private static Field sField_EIO;
-	private static Field sField_RIO;
 	private static Block sBlock_EIO;
 	private static Block sBlock_RIO;
 	
@@ -70,15 +64,11 @@ public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_F
 	}
 	
 	private static void setCrossModData() {
-		if (LoadedMods.EnderIO && sClass_EIO == null) {
-			sClass_EIO = ReflectionUtils.getClass("crazypants.enderio.EnderIO");
-			sField_EIO = ReflectionUtils.getField(sClass_EIO, "blockReservoir");
-			sBlock_EIO = ReflectionUtils.getFieldValue(sField_EIO, null);
+		if (LoadedMods.EnderIO && sBlock_EIO == null) {
+			sBlock_EIO = GameRegistry.findBlock("EnderIO", "blockReservoir");
 		}
-		if (LoadedMods.RemoteIO && sClass_RIO == null) {
-			sClass_RIO = ReflectionUtils.getClass("remoteio.common.lib.ModBlocks");
-			sField_RIO = ReflectionUtils.getField(sClass_RIO, "machine");
-			sBlock_RIO = ReflectionUtils.getFieldValue(sField_RIO, null);
+		if (LoadedMods.RemoteIO && sBlock_RIO == null) {
+			sBlock_RIO = GameRegistry.findBlock("RIO", "machine");
 		}
 	}