improved T.F.F.T code; Prepared for MultiHatch

5 files changed, 928 insertions, 812 deletions

diff --git a/src/main/java/kekztech/GTMultiController.java b/src/main/java/kekztech/GTMultiController.java
index d824077201..2138907faa 100644
--- a/src/main/java/kekztech/GTMultiController.java
+++ b/src/main/java/kekztech/GTMultiController.java
@@ -1,305 +1,305 @@
-package kekztech;
-
-import java.util.ArrayList;
-
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus;
-import gregtech.api.util.GT_Utility;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-
-/**
- * Only purpose of this class is to make me learn about GT multis :)
- * @author Kekzdealer
- *
- */
-public abstract class GTMultiController {
-	
-	private final GTRecipe GT_RECIPE = new GTRecipe();
-	
-	private boolean running = false;
-	private boolean structureValid = false;
-	
-	public final ArrayList<GT_MetaTileEntity_Hatch_Dynamo> mDynamoHatches = new ArrayList<>();
-	public final ArrayList<GT_MetaTileEntity_Hatch_Energy> mEnergyHatches = new ArrayList<>();
-	public final ArrayList<GT_MetaTileEntity_Hatch_Input> mInputHatches = new ArrayList<>();
-	public final ArrayList<GT_MetaTileEntity_Hatch_Output> mOutputHatches = new ArrayList<>();
-	public final ArrayList<GT_MetaTileEntity_Hatch_InputBus> mInputBusses = new ArrayList<>();
-	public final ArrayList<GT_MetaTileEntity_Hatch_OutputBus> mOutputBusses = new ArrayList<>();
-	public final ArrayList<GT_MetaTileEntity_Hatch_Muffler> mMufflerHatches = new ArrayList<>();
-	public final ArrayList<GT_MetaTileEntity_Hatch_Maintenance> mMaintenanceHatches = new ArrayList<>();
-	
-	protected GTRecipe getGT_RECIPE() {
-		return GT_RECIPE;
-	}
-	
-	protected abstract boolean checkStructure();
-	protected abstract String[] getDescription();
-	
-	protected long getMaxInputVoltage() {
-		long voltage = 0L;
-		for(GT_MetaTileEntity_Hatch_Energy energyHatch : mEnergyHatches) {
-			voltage += energyHatch.getBaseMetaTileEntity().getInputVoltage();
-		}
-		return voltage;
-	}
-	
-	private void updateDynamoHatches() {
-		if(GT_RECIPE.getEuPerTick() > 0) {
-			long remOutput = GT_RECIPE.getEuPerTick();
-			for(GT_MetaTileEntity_Hatch_Dynamo dynamoHatch : mDynamoHatches) {
-				final long deltaCapacity = dynamoHatch.getBaseMetaTileEntity().getEUCapacity()
-						- dynamoHatch.getBaseMetaTileEntity().getStoredEU();
-				final long toOutput = Math.min(deltaCapacity, GT_RECIPE.getEuPerTick());
-				dynamoHatch.getBaseMetaTileEntity().increaseStoredEnergyUnits(toOutput, false);
-				remOutput -= toOutput;
-			}
-		}
-	}
-	
-	private void updateEnergyHatches() {
-		if(GT_RECIPE.getEuPerTick() < 0) {
-			long remConsumption = GT_RECIPE.getEuPerTick();
-			for(GT_MetaTileEntity_Hatch_Energy energyHatch : mEnergyHatches) {
-				if(remConsumption > 0) {
-					final long toConsume = Math.min(remConsumption, energyHatch.getBaseMetaTileEntity().getStoredEU());
-					energyHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(toConsume, false);
-					remConsumption -= toConsume;
-				}
-			}
-		}
-	}
-	
-	private void updateInputBusses() {
-		if(GT_RECIPE.getInputItems() != null) {
-			// Check for each input stack...
-			for(ItemStack inputStack : GT_RECIPE.getInputItems()) {
-				int remainingRequired = inputStack.stackSize;
-				// ...Each slot in each input bus...
-				for(GT_MetaTileEntity_Hatch_InputBus inputBus : mInputBusses) {
-					for(int slot = 0; slot <= inputBus.getBaseMetaTileEntity().getSizeInventory(); slot++) {
-						
-						final ItemStack slotStack = inputBus.getBaseMetaTileEntity().getStackInSlot(slot);
-						if(GT_Utility.isStackValid(slotStack)) {
-							if(GT_Utility.areStacksEqual(inputStack, slotStack)) {
-								// Found correct slot
-								final int toConsume = Math.min(slotStack.stackSize, inputStack.stackSize);
-								final ItemStack retrievedStack = inputBus.getBaseMetaTileEntity().decrStackSize(slot, toConsume);						
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	private void updateInputHatches() {
-		if(GT_RECIPE.getInputFluids() != null) {
-			// Check for each input stack
-			for(FluidStack inputStack : GT_RECIPE.getInputFluids()) {
-				int remainingRequired = inputStack.amount;
-				// ...In each input hatch...
-				for(GT_MetaTileEntity_Hatch_Input inputHatch : mInputHatches) {
-					
-					FluidStack slotStack = inputHatch.getFluid();
-					if(slotStack.amount > 0 && slotStack.isFluidEqual(inputStack)) {
-						// Found correct hatch
-						final int toConsume = Math.min(slotStack.amount, remainingRequired);
-						inputHatch.drain(toConsume, true);
-						remainingRequired -= toConsume;
-					}
-				}
-			}
-		}
-	}
-	
-	private void updateOutputBusses() {
-		if(GT_RECIPE.getOutputItems() != null) {
-			
-		}
-	}
-	
-	private void updateOutputHatches() {
-		if(GT_RECIPE.getOutputFluids() != null) {
-			// Find for each output stack...
-			for(FluidStack outputStack : GT_RECIPE.getOutputFluids()) {
-				// ...an output hatch that can accept the stack
-				for(GT_MetaTileEntity_Hatch_Output outputHatch : mOutputHatches) {
-					
-				}
-			}
-		}
-	}
-	
-	protected boolean tryAddHatch(IGregTechTileEntity hatch, int aBaseCasingIndex) {
-		if (hatch == null) {
-			return false;
-		} else {
-			final IMetaTileEntity aMetaTileEntity = hatch.getMetaTileEntity();
-			if (aMetaTileEntity == null) {
-				return false;
-			} else {
-				if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) {
-					((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-				}
-
-				if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {
-					return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity);
-				} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) {
-					return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity);
-				} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) {
-					return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity);
-				} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) {
-					return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity);
-				} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) {
-					return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity);
-				} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) {
-					return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity);
-				} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) {
-					return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) aMetaTileEntity);
-				} else {
-					return aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler
-							? this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity)
-							: false;
-				}
-			}
-		}
-	}
-	
-	protected boolean tryAddMaintenanceHatch(IGregTechTileEntity hatch, int aBaseCasingIndex) {
-		if (hatch == null) {
-			return false;
-		} else {
-			IMetaTileEntity aMetaTileEntity = hatch.getMetaTileEntity();
-			if (aMetaTileEntity == null) {
-				return false;
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) {
-				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-				return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) aMetaTileEntity);
-			} else {
-				return false;
-			}
-		}
-	}
-	
-	protected boolean tryAddEnergyHatch(IGregTechTileEntity hatch, int aBaseCasingIndex) {
-		if (hatch == null) {
-			return false;
-		} else {
-			IMetaTileEntity aMetaTileEntity = hatch.getMetaTileEntity();
-			if (aMetaTileEntity == null) {
-				return false;
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) {
-				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-				return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity);
-			} else {
-				return false;
-			}
-		}
-	}
-
-	protected boolean tryAddDynamoHatch(IGregTechTileEntity hatch, int aBaseCasingIndex) {
-		if (hatch == null) {
-			return false;
-		} else {
-			IMetaTileEntity aMetaTileEntity = hatch.getMetaTileEntity();
-			if (aMetaTileEntity == null) {
-				return false;
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) {
-				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-				return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity);
-			} else {
-				return false;
-			}
-		}
-	}
-
-	protected boolean tryAddMufflerHatch(IGregTechTileEntity hatch, int aBaseCasingIndex) {
-		if (hatch == null) {
-			return false;
-		} else {
-			IMetaTileEntity aMetaTileEntity = hatch.getMetaTileEntity();
-			if (aMetaTileEntity == null) {
-				return false;
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) {
-				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-				return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity);
-			} else {
-				return false;
-			}
-		}
-	}
-
-	protected boolean tryAddInputBus(IGregTechTileEntity hatch, int aBaseCasingIndex) {
-		if (hatch == null) {
-			return false;
-		} else {
-			IMetaTileEntity aMetaTileEntity = hatch.getMetaTileEntity();
-			if (aMetaTileEntity == null) {
-				return false;
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) {
-				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-				return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity);
-			} else {
-				return false;
-			}
-		}
-	}
-	
-	protected boolean tryAddInputHatch(IGregTechTileEntity hatch, int aBaseCasingIndex) {
-		if (hatch == null) {
-			return false;
-		} else {
-			IMetaTileEntity aMetaTileEntity = hatch.getMetaTileEntity();
-			if (aMetaTileEntity == null) {
-				return false;
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {
-				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-				return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity);
-			} else {
-				return false;
-			}
-		}
-	}
-
-	protected boolean tryAddOutputBus(IGregTechTileEntity hatch, int aBaseCasingIndex) {
-		if (hatch == null) {
-			return false;
-		} else {
-			IMetaTileEntity aMetaTileEntity = hatch.getMetaTileEntity();
-			if (aMetaTileEntity == null) {
-				return false;
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) {
-				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-				return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity);
-			} else {
-				return false;
-			}
-		}
-	}
-	
-	protected boolean tryAddOutputHatch(IGregTechTileEntity hatch, int aBaseCasingIndex) {
-		if (hatch == null) {
-			return false;
-		} else {
-			IMetaTileEntity aMetaTileEntity = hatch.getMetaTileEntity();
-			if (aMetaTileEntity == null) {
-				return false;
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) {
-				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-				return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity);
-			} else {
-				return false;
-			}
-		}
-	}
-}
+package kekztech;

+

+import java.util.ArrayList;

+

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

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

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

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

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

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

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

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

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

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

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

+import gregtech.api.util.GT_Utility;

+import net.minecraft.item.ItemStack;

+import net.minecraftforge.fluids.FluidStack;

+

+/**

+ * Only purpose of this class is to make me learn about GT multis :)

+ * @author Kekzdealer

+ *

+ */

+public abstract class GTMultiController {

+	

+	private final GTRecipe GT_RECIPE = new GTRecipe();

+	

+	private boolean running = false;

+	private boolean structureValid = false;

+	

+	public final ArrayList<GT_MetaTileEntity_Hatch_Dynamo> mDynamoHatches = new ArrayList<>();

+	public final ArrayList<GT_MetaTileEntity_Hatch_Energy> mEnergyHatches = new ArrayList<>();

+	public final ArrayList<GT_MetaTileEntity_Hatch_Input> mInputHatches = new ArrayList<>();

+	public final ArrayList<GT_MetaTileEntity_Hatch_Output> mOutputHatches = new ArrayList<>();

+	public final ArrayList<GT_MetaTileEntity_Hatch_InputBus> mInputBusses = new ArrayList<>();

+	public final ArrayList<GT_MetaTileEntity_Hatch_OutputBus> mOutputBusses = new ArrayList<>();

+	public final ArrayList<GT_MetaTileEntity_Hatch_Muffler> mMufflerHatches = new ArrayList<>();

+	public final ArrayList<GT_MetaTileEntity_Hatch_Maintenance> mMaintenanceHatches = new ArrayList<>();

+	

+	protected GTRecipe getGT_RECIPE() {

+		return GT_RECIPE;

+	}

+	

+	protected abstract boolean checkStructure();

+	protected abstract String[] getDescription();

+	

+	protected long getMaxInputVoltage() {

+		long voltage = 0L;

+		for(GT_MetaTileEntity_Hatch_Energy energyHatch : mEnergyHatches) {

+			voltage += energyHatch.getBaseMetaTileEntity().getInputVoltage();

+		}

+		return voltage;

+	}

+	

+	private void updateDynamoHatches() {

+		if(GT_RECIPE.getEuPerTick() > 0) {

+			long remOutput = GT_RECIPE.getEuPerTick();

+			for(GT_MetaTileEntity_Hatch_Dynamo dynamoHatch : mDynamoHatches) {

+				final long deltaCapacity = dynamoHatch.getBaseMetaTileEntity().getEUCapacity()

+						- dynamoHatch.getBaseMetaTileEntity().getStoredEU();

+				final long toOutput = Math.min(deltaCapacity, GT_RECIPE.getEuPerTick());

+				dynamoHatch.getBaseMetaTileEntity().increaseStoredEnergyUnits(toOutput, false);

+				remOutput -= toOutput;

+			}

+		}

+	}

+	

+	private void updateEnergyHatches() {

+		if(GT_RECIPE.getEuPerTick() < 0) {

+			long remConsumption = GT_RECIPE.getEuPerTick();

+			for(GT_MetaTileEntity_Hatch_Energy energyHatch : mEnergyHatches) {

+				if(remConsumption > 0) {

+					final long toConsume = Math.min(remConsumption, energyHatch.getBaseMetaTileEntity().getStoredEU());

+					energyHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(toConsume, false);

+					remConsumption -= toConsume;

+				}

+			}

+		}

+	}

+	

+	private void updateInputBusses() {

+		if(GT_RECIPE.getInputItems() != null) {

+			// Check for each input stack...

+			for(ItemStack inputStack : GT_RECIPE.getInputItems()) {

+				int remainingRequired = inputStack.stackSize;

+				// ...Each slot in each input bus...

+				for(GT_MetaTileEntity_Hatch_InputBus inputBus : mInputBusses) {

+					for(int slot = 0; slot <= inputBus.getBaseMetaTileEntity().getSizeInventory(); slot++) {

+						

+						final ItemStack slotStack = inputBus.getBaseMetaTileEntity().getStackInSlot(slot);

+						if(GT_Utility.isStackValid(slotStack)) {

+							if(GT_Utility.areStacksEqual(inputStack, slotStack)) {

+								// Found correct slot

+								final int toConsume = Math.min(slotStack.stackSize, inputStack.stackSize);

+								final ItemStack retrievedStack = inputBus.getBaseMetaTileEntity().decrStackSize(slot, toConsume);						

+							}

+						}

+					}

+				}

+			}

+		}

+	}

+	

+	private void updateInputHatches() {

+		if(GT_RECIPE.getInputFluids() != null) {

+			// Check for each input stack

+			for(FluidStack inputStack : GT_RECIPE.getInputFluids()) {

+				int remainingRequired = inputStack.amount;

+				// ...In each input hatch...

+				for(GT_MetaTileEntity_Hatch_Input inputHatch : mInputHatches) {

+					

+					FluidStack slotStack = inputHatch.getFluid();

+					if(slotStack.amount > 0 && slotStack.isFluidEqual(inputStack)) {

+						// Found correct hatch

+						final int toConsume = Math.min(slotStack.amount, remainingRequired);

+						inputHatch.drain(toConsume, true);

+						remainingRequired -= toConsume;

+					}

+				}

+			}

+		}

+	}

+	

+	private void updateOutputBusses() {

+		if(GT_RECIPE.getOutputItems() != null) {

+			

+		}

+	}

+	

+	private void updateOutputHatches() {

+		if(GT_RECIPE.getOutputFluids() != null) {

+			// Find for each output stack...

+			for(FluidStack outputStack : GT_RECIPE.getOutputFluids()) {

+				// ...an output hatch that can accept the stack

+				for(GT_MetaTileEntity_Hatch_Output outputHatch : mOutputHatches) {

+					

+				}

+			}

+		}

+	}

+	

+	protected boolean tryAddHatch(IGregTechTileEntity hatch, int aBaseCasingIndex) {

+		if (hatch == null) {

+			return false;

+		} else {

+			final IMetaTileEntity aMetaTileEntity = hatch.getMetaTileEntity();

+			if (aMetaTileEntity == null) {

+				return false;

+			} else {

+				if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) {

+					((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);

+				}

+

+				if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {

+					return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity);

+				} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) {

+					return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity);

+				} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) {

+					return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity);

+				} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) {

+					return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity);

+				} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) {

+					return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity);

+				} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) {

+					return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity);

+				} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) {

+					return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) aMetaTileEntity);

+				} else {

+					return aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler

+							? this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity)

+							: false;

+				}

+			}

+		}

+	}

+	

+	protected boolean tryAddMaintenanceHatch(IGregTechTileEntity hatch, int aBaseCasingIndex) {

+		if (hatch == null) {

+			return false;

+		} else {

+			IMetaTileEntity aMetaTileEntity = hatch.getMetaTileEntity();

+			if (aMetaTileEntity == null) {

+				return false;

+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) {

+				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);

+				return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) aMetaTileEntity);

+			} else {

+				return false;

+			}

+		}

+	}

+	

+	protected boolean tryAddEnergyHatch(IGregTechTileEntity hatch, int aBaseCasingIndex) {

+		if (hatch == null) {

+			return false;

+		} else {

+			IMetaTileEntity aMetaTileEntity = hatch.getMetaTileEntity();

+			if (aMetaTileEntity == null) {

+				return false;

+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) {

+				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);

+				return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity);

+			} else {

+				return false;

+			}

+		}

+	}

+

+	protected boolean tryAddDynamoHatch(IGregTechTileEntity hatch, int aBaseCasingIndex) {

+		if (hatch == null) {

+			return false;

+		} else {

+			IMetaTileEntity aMetaTileEntity = hatch.getMetaTileEntity();

+			if (aMetaTileEntity == null) {

+				return false;

+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) {

+				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);

+				return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity);

+			} else {

+				return false;

+			}

+		}

+	}

+

+	protected boolean tryAddMufflerHatch(IGregTechTileEntity hatch, int aBaseCasingIndex) {

+		if (hatch == null) {

+			return false;

+		} else {

+			IMetaTileEntity aMetaTileEntity = hatch.getMetaTileEntity();

+			if (aMetaTileEntity == null) {

+				return false;

+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) {

+				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);

+				return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity);

+			} else {

+				return false;

+			}

+		}

+	}

+

+	protected boolean tryAddInputBus(IGregTechTileEntity hatch, int aBaseCasingIndex) {

+		if (hatch == null) {

+			return false;

+		} else {

+			IMetaTileEntity aMetaTileEntity = hatch.getMetaTileEntity();

+			if (aMetaTileEntity == null) {

+				return false;

+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) {

+				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);

+				return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity);

+			} else {

+				return false;

+			}

+		}

+	}

+	

+	protected boolean tryAddInputHatch(IGregTechTileEntity hatch, int aBaseCasingIndex) {

+		if (hatch == null) {

+			return false;

+		} else {

+			IMetaTileEntity aMetaTileEntity = hatch.getMetaTileEntity();

+			if (aMetaTileEntity == null) {

+				return false;

+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {

+				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);

+				return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity);

+			} else {

+				return false;

+			}

+		}

+	}

+

+	protected boolean tryAddOutputBus(IGregTechTileEntity hatch, int aBaseCasingIndex) {

+		if (hatch == null) {

+			return false;

+		} else {

+			IMetaTileEntity aMetaTileEntity = hatch.getMetaTileEntity();

+			if (aMetaTileEntity == null) {

+				return false;

+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) {

+				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);

+				return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity);

+			} else {

+				return false;

+			}

+		}

+	}

+	

+	protected boolean tryAddOutputHatch(IGregTechTileEntity hatch, int aBaseCasingIndex) {

+		if (hatch == null) {

+			return false;

+		} else {

+			IMetaTileEntity aMetaTileEntity = hatch.getMetaTileEntity();

+			if (aMetaTileEntity == null) {

+				return false;

+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) {

+				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);

+				return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity);

+			} else {

+				return false;

+			}

+		}

+	}

+}

diff --git a/src/main/java/kekztech/GTRecipe.java b/src/main/java/kekztech/GTRecipe.java
index 2add4d3c0e..1939afc8ff 100644
--- a/src/main/java/kekztech/GTRecipe.java
+++ b/src/main/java/kekztech/GTRecipe.java
@@ -1,104 +1,104 @@
-package kekztech;
-
-import java.util.ArrayList;
-
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-import util.Util;
-
-public class GTRecipe {
-	
-	private int euPerTick = 0;
-	private int duration = 0;
-	
-	private ArrayList<ItemStack> inputItems;
-	private ArrayList<FluidStack> inputFluids;
-	private ArrayList<ItemStack> outputItems;
-	private ArrayList<FluidStack> outputFluids;
-	
-	public int getEuPerTick() {
-		return euPerTick;
-	}
-	public int getDuration() {
-		return duration;
-	}
-	public ItemStack[] getInputItems() {
-		return Util.toItemStackArray(inputItems);
-	}
-	public FluidStack[] getInputFluids() {
-		return Util.toFluidStackArray(inputFluids);
-	}
-	public ItemStack[] getOutputItems() {
-		return Util.toItemStackArray(outputItems);
-	}
-	public FluidStack[] getOutputFluids() {
-		return Util.toFluidStackArray(outputFluids);
-	}
-	public ItemStack getInputItem() {
-		final ItemStack[] s = Util.toItemStackArray(inputItems);
-		return s[0];
-	}
-	public FluidStack getInputFluid() {
-		final FluidStack[] s = Util.toFluidStackArray(inputFluids);
-		return s[0];
-	}
-	public ItemStack getOutputItem() {
-		final ItemStack[] s = Util.toItemStackArray(outputItems);
-		return s[0];
-	}
-	public FluidStack getOutputFluid() {
-		final FluidStack[] s = Util.toFluidStackArray(outputFluids);
-		return s[0];
-	}
-	
-	public GTRecipe addInputItem(ItemStack inputItem) {
-		if(inputItems == null) {
-			inputItems = new ArrayList<ItemStack>();
-			inputItems.add(inputItem);
-		} else {
-			inputItems.add(inputItem);
-		}
-		return this;
-	}
-	
-	public GTRecipe addOutputItem(ItemStack outputItem) {
-		if(outputItems == null) {
-			outputItems = new ArrayList<ItemStack>();
-			outputItems.add(outputItem);
-		} else {
-			outputItems.add(outputItem);
-		}
-		return this;
-	}
-	
-	public GTRecipe addInputFluid(FluidStack inputFluid) {
-		if(inputFluids == null) {
-			inputFluids = new ArrayList<FluidStack>();
-			inputFluids.add(inputFluid);
-		} else {
-			inputFluids.add(inputFluid);
-		}
-		return this;
-	}
-	
-	public GTRecipe addOutputFluid(FluidStack outputFluid) {
-		if(outputFluids == null) {
-			outputFluids = new ArrayList<FluidStack>();
-			outputFluids.add(outputFluid);
-		} else {
-			outputFluids.add(outputFluid);
-		}
-		return this;
-	}
-	
-	public GTRecipe setEUPerTick(int euPerTick) {
-		this.euPerTick = euPerTick;
-		return this;
-	}
-	
-	public GTRecipe setDuration(int duration) {
-		this.duration = duration;
-		return this;
-	}
-	
-}
+package kekztech;

+

+import java.util.ArrayList;

+

+import net.minecraft.item.ItemStack;

+import net.minecraftforge.fluids.FluidStack;

+import util.Util;

+

+public class GTRecipe {

+	

+	private int euPerTick = 0;

+	private int duration = 0;

+	

+	private ArrayList<ItemStack> inputItems;

+	private ArrayList<FluidStack> inputFluids;

+	private ArrayList<ItemStack> outputItems;

+	private ArrayList<FluidStack> outputFluids;

+	

+	public int getEuPerTick() {

+		return euPerTick;

+	}

+	public int getDuration() {

+		return duration;

+	}

+	public ItemStack[] getInputItems() {

+		return Util.toItemStackArray(inputItems);

+	}

+	public FluidStack[] getInputFluids() {

+		return Util.toFluidStackArray(inputFluids);

+	}

+	public ItemStack[] getOutputItems() {

+		return Util.toItemStackArray(outputItems);

+	}

+	public FluidStack[] getOutputFluids() {

+		return Util.toFluidStackArray(outputFluids);

+	}

+	public ItemStack getInputItem() {

+		final ItemStack[] s = Util.toItemStackArray(inputItems);

+		return s[0];

+	}

+	public FluidStack getInputFluid() {

+		final FluidStack[] s = Util.toFluidStackArray(inputFluids);

+		return s[0];

+	}

+	public ItemStack getOutputItem() {

+		final ItemStack[] s = Util.toItemStackArray(outputItems);

+		return s[0];

+	}

+	public FluidStack getOutputFluid() {

+		final FluidStack[] s = Util.toFluidStackArray(outputFluids);

+		return s[0];

+	}

+	

+	public GTRecipe addInputItem(ItemStack inputItem) {

+		if(inputItems == null) {

+			inputItems = new ArrayList<ItemStack>();

+			inputItems.add(inputItem);

+		} else {

+			inputItems.add(inputItem);

+		}

+		return this;

+	}

+	

+	public GTRecipe addOutputItem(ItemStack outputItem) {

+		if(outputItems == null) {

+			outputItems = new ArrayList<ItemStack>();

+			outputItems.add(outputItem);

+		} else {

+			outputItems.add(outputItem);

+		}

+		return this;

+	}

+	

+	public GTRecipe addInputFluid(FluidStack inputFluid) {

+		if(inputFluids == null) {

+			inputFluids = new ArrayList<FluidStack>();

+			inputFluids.add(inputFluid);

+		} else {

+			inputFluids.add(inputFluid);

+		}

+		return this;

+	}

+	

+	public GTRecipe addOutputFluid(FluidStack outputFluid) {

+		if(outputFluids == null) {

+			outputFluids = new ArrayList<FluidStack>();

+			outputFluids.add(outputFluid);

+		} else {

+			outputFluids.add(outputFluid);

+		}

+		return this;

+	}

+	

+	public GTRecipe setEUPerTick(int euPerTick) {

+		this.euPerTick = euPerTick;

+		return this;

+	}

+	

+	public GTRecipe setDuration(int duration) {

+		this.duration = duration;

+		return this;

+	}

+	

+}

diff --git a/src/main/java/kekztech/Items.java b/src/main/java/kekztech/Items.java
index 47708971c7..52539222e7 100644
--- a/src/main/java/kekztech/Items.java
+++ b/src/main/java/kekztech/Items.java
@@ -1,48 +1,48 @@
-package kekztech;
-
-public enum Items {
-	// Heat Vents
-	T1HeatVent(0), T2HeatVent(1), T3HeatVent(2), T4HeatVent(3),
-	T1ComponentHeatVent(4), T2ComponentHeatVent(5), T3ComponentHeatVent(6), T4ComponentHeatVent(7), 
-	T1OverclockedHeatVent(8), T2OverclockedHeatVent(9), T3OverclockedHeatVent(10), T4OverclockedHeatVent(11), 
-	// Heat Exchanger
-	T1HeatExchanger(12), T2HeatExchanger(13), T3HeatExchanger(14), T4HeatExchanger(15),
-	// Fuel Rods
-	UraniumFuelRod(16), UraniumDualFuelRod(17), UraniumQuadFuelRod(18),
-	ThoriumFuelRod(19), ThoriumDualFuelRod(20), ThoriumQuadFuelRod(21),
-	MOXFuelRod(22), MOXDualFuelRod(23), MOXQuadFuelRod(24),
-	NaquadahFuelRod(25), NaquadahDualFuelRod(26), NaquadahQuadFuelRod(27),
-	Th_MOXFuelRod(28), Th_MOXDualFuelRod(29), Th_MOXQuadFuelRod(30),
-	// Depleted Fuel Rods
-	DepletedUraniumFuelRod(31), DepletedUraniumDualFuelRod(32), DepletedUraniumQuadFuelRod(33),
-	DepletedThoriumFuelRod(34), DepletedThoriumDualFuelRod(35), DepletedThoriumQuadFuelRod(36),
-	DepletedMOXFuelRod(37), DepletedMOXDualFuelRod(38), DepletedMOXQuadFuelRod(39),
-	DepletedNaquadahFuelRod(40), DepletedNaquadahDualFuelRod(41), DepletedNaquadahQuadFuelRod(42),
-	Th_DepletedMOXFuelRod(43), Th_DepletedMOXDualFuelRod(44), Th_DepletedMOXQuadFuelRod(45),
-	// Neutron Reflectors
-	T1NeutronReflector(46), T2NeutronReflector(47),
-	// Coolant Cells
-	HeliumCoolantCell360k(48), NaKCoolantCell360k(49),
-	
-	// Heat Pipes
-	CopperHeatPipe(0), SilverHeatPipe(1), BoronArsenideHeatPipe(2), DiamondHeatPipe(3),
-	BoronArsenideDust(4), IsotopicallyPureDiamondDust(5), AmineCarbamiteDust(6), 
-	BoronArsenideCrystal(7), IsotopicallyPureDiamondCrystal(8),
-	// Ceramics
-	YSZCeramicDust(9), GDCCeramicDust(10),
-	YttriaDust(11), ZirconiaDust(12), CeriaDust(13),
-	YSZCeramicPlate(14), GDCCeramicPlate(15),
-	// Error Item
-	Error(0);
-	
-	private final int metaID;
-	
-	private Items(int metaID) {
-		this.metaID = metaID;
-	}
-	
-	public int getMetaID() {
-		return metaID;
-	}
-	
-}
+package kekztech;

+

+public enum Items {

+	// Heat Vents

+	T1HeatVent(0), T2HeatVent(1), T3HeatVent(2), T4HeatVent(3),

+	T1ComponentHeatVent(4), T2ComponentHeatVent(5), T3ComponentHeatVent(6), T4ComponentHeatVent(7), 

+	T1OverclockedHeatVent(8), T2OverclockedHeatVent(9), T3OverclockedHeatVent(10), T4OverclockedHeatVent(11), 

+	// Heat Exchanger

+	T1HeatExchanger(12), T2HeatExchanger(13), T3HeatExchanger(14), T4HeatExchanger(15),

+	// Fuel Rods

+	UraniumFuelRod(16), UraniumDualFuelRod(17), UraniumQuadFuelRod(18),

+	ThoriumFuelRod(19), ThoriumDualFuelRod(20), ThoriumQuadFuelRod(21),

+	MOXFuelRod(22), MOXDualFuelRod(23), MOXQuadFuelRod(24),

+	NaquadahFuelRod(25), NaquadahDualFuelRod(26), NaquadahQuadFuelRod(27),

+	Th_MOXFuelRod(28), Th_MOXDualFuelRod(29), Th_MOXQuadFuelRod(30),

+	// Depleted Fuel Rods

+	DepletedUraniumFuelRod(31), DepletedUraniumDualFuelRod(32), DepletedUraniumQuadFuelRod(33),

+	DepletedThoriumFuelRod(34), DepletedThoriumDualFuelRod(35), DepletedThoriumQuadFuelRod(36),

+	DepletedMOXFuelRod(37), DepletedMOXDualFuelRod(38), DepletedMOXQuadFuelRod(39),

+	DepletedNaquadahFuelRod(40), DepletedNaquadahDualFuelRod(41), DepletedNaquadahQuadFuelRod(42),

+	Th_DepletedMOXFuelRod(43), Th_DepletedMOXDualFuelRod(44), Th_DepletedMOXQuadFuelRod(45),

+	// Neutron Reflectors

+	T1NeutronReflector(46), T2NeutronReflector(47),

+	// Coolant Cells

+	HeliumCoolantCell360k(48), NaKCoolantCell360k(49),

+	

+	// Heat Pipes

+	CopperHeatPipe(0), SilverHeatPipe(1), BoronArsenideHeatPipe(2), DiamondHeatPipe(3),

+	BoronArsenideDust(4), IsotopicallyPureDiamondDust(5), AmineCarbamiteDust(6), 

+	BoronArsenideCrystal(7), IsotopicallyPureDiamondCrystal(8),

+	// Ceramics

+	YSZCeramicDust(9), GDCCeramicDust(10),

+	YttriaDust(11), ZirconiaDust(12), CeriaDust(13),

+	YSZCeramicPlate(14), GDCCeramicPlate(15),

+	// Error Item

+	Error(0);

+	

+	private final int metaID;

+	

+	private Items(int metaID) {

+		this.metaID = metaID;

+	}

+	

+	public int getMetaID() {

+		return metaID;

+	}

+	

+}

diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index e84b428219..5eb2916e02 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -1,355 +1,333 @@
-package kekztech;
-
-import blocks.Block_GDCUnit;
-import blocks.Block_TFFTCasing;
-import blocks.Block_TFFTStorageFieldBlockT1;
-import blocks.Block_TFFTStorageFieldBlockT2;
-import blocks.Block_TFFTStor