Merge branch 'master' of https://github.com/draknyte1/GTplusplus

3 files changed, 91 insertions, 118 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java
index 191312dbfa..dd2837b021 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java
@@ -65,13 +65,8 @@ public class GregtechMetaTileEntityTreeFarm extends GT_MetaTileEntity_MultiBlock
 
 	private EntityPlayerMP farmerAI;
 
-	private SAWTOOL mCurrentMachineTool = SAWTOOL.NONE;
 	private boolean canChop = false;
 
-	private final int cuttingNumber = 0;
-	private final int cuttingNumber2 = 0;
-	private final int cuttingNumber3 = 0;
-
 	public GregtechMetaTileEntityTreeFarm(final int aID, final String aName, final String aNameRegional) {
 		super(aID, aName, aNameRegional);
 	}
@@ -253,10 +248,8 @@ public class GregtechMetaTileEntityTreeFarm extends GT_MetaTileEntity_MultiBlock
 		final SAWTOOL currentInputItem = TreeFarmHelper.isCorrectMachinePart(aStack);
 		if (currentInputItem != SAWTOOL.NONE){
 			if (currentInputItem == SAWTOOL.SAW){
-				this.mCurrentMachineTool = SAWTOOL.SAW;
 			}
 			else {
-				this.mCurrentMachineTool = SAWTOOL.BUZZSAW;
 			}
 			isValid = true;
 		}
@@ -423,6 +416,7 @@ public class GregtechMetaTileEntityTreeFarm extends GT_MetaTileEntity_MultiBlock
 
 
 
+	@SuppressWarnings("unused")
 	private boolean findLogs(final IGregTechTileEntity aBaseMetaTileEntity){
 
 		Utils.LOG_MACHINE_INFO("called findLogs()");
@@ -556,6 +550,7 @@ public class GregtechMetaTileEntityTreeFarm extends GT_MetaTileEntity_MultiBlock
 		return true;
 	}
 
+	@SuppressWarnings("deprecation")
 	private boolean plantSaplings(final IGregTechTileEntity aBaseMetaTileEntity){
 		Utils.LOG_MACHINE_INFO("called plantSaplings()");
 		final World world = aBaseMetaTileEntity.getWorld();
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_CatalyticReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_CatalyticReactor.java
index ab47262d38..e13360b7c5 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_CatalyticReactor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_CatalyticReactor.java
@@ -58,6 +58,7 @@ public class GregtechMetaTileEntity_CatalyticReactor extends GT_MetaTileEntity_M
 		return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), "LFTR.png");
 	}
 
+	@SuppressWarnings("unused")
 	@Override
 	public boolean checkRecipe(final ItemStack aStack) {
 		if ((this.mInventory[1] == null) || (this.mInventory[1].isItemEqual(GT_ModHandler.getIC2Item("miningPipe", 1L)) && (this.mInventory[1].stackSize < this.mInventory[1].getMaxStackSize()))) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java
index e99a8d2b44..47f225f53c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java
@@ -2,6 +2,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 
 import java.util.ArrayList;
 
+import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
@@ -10,8 +11,11 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.CustomRecipeMap;
 import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
+import gregtech.api.util.Recipe_GT;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
@@ -23,8 +27,8 @@ import net.minecraftforge.fluids.FluidStack;
 
 public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBlockBase {
 
-	private boolean completedCycle = false;
-
+	public GT_Recipe mLastRecipe;
+	
 	public GregtechMetaTileEntity_Refinery(final int aID, final String aName, final String aNameRegional) {
 		super(aID, aName, aNameRegional);
 	}
@@ -39,13 +43,13 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc
 				"Controller Block for the Fission Fuel Processing Unit",
 				"Size(WxHxD): 3x9x3", "Controller (Front middle at bottom)",
 				"3x2x3 Base platform of Hastelloy-X",
-				"1x7x1 Incoloy-DS Fluid Containment Block pillar (Center of base)",
-				"1x4x1 Hastelloy-N Sealant Blocks (Each Incoloy-DS Fluid Containment side and on top)",
-				"1x1x1 Zeron-100 Reactor Shielding (Second Sealant Tower layer, Surrounding Fluid Containment)",
+				"1x6x1 Incoloy-DS Fluid Containment Block pillar (Center of base, From layer 3 upwards)",
+				"4x Zeron-100 Reactor Shielding (Each side of Second Sealant Tower layer, Surrounding Incoloy-DS Fluid Containment)",
+				"Hastelloy-N Sealant Blocks (Each side of Incoloy-DS Fluid Containment casings, except layer 2 and one on top)",
 				"4x Input Hatch (One of base platform)",
 				"2x Output Hatch (One of base platform)",
 				"1x Output Bus (One of base platform)",
-				"2x Maintenance Hatch (One of base platform)",
+				"1x Maintenance Hatch (One of base platform)",
 				"1x ZPM or better Muffler (One of base platform)",
 				"1x Energy Hatch (One of base platform)",
 				CORE.GT_Tooltip
@@ -64,76 +68,41 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc
 	public Object getClientGUI(final int aID, final InventoryPlayer aPlayerInventory, final IGregTechTileEntity aBaseMetaTileEntity) {
 		return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), "LFTR.png");
 	}
-
+	
 	@Override
-	public boolean checkRecipe(final ItemStack aStack) {
-		if ((this.mInventory[1] == null) || (this.mInventory[1].isItemEqual(GT_ModHandler.getIC2Item("miningPipe", 1L)) && (this.mInventory[1].stackSize < this.mInventory[1].getMaxStackSize()))) {
-			final ArrayList<ItemStack> tItems = this.getStoredInputs();
-			for (ItemStack tStack : tItems) {
-				if (tStack.isItemEqual(GT_ModHandler.getIC2Item("miningPipe", 1L))) {
-					if (tStack.stackSize < 2) {
-						tStack = null;
-					} else {
-						tStack.stackSize--;
-					}
-
-				}
-				if (this.mInventory[1] == null) {
-					this.mInventory[1] = GT_ModHandler.getIC2Item("miningPipe", 1L);
-				} else {
-					this.mInventory[1].stackSize++;
-				}
-			}
-		}
-		FluidStack tFluid = null;//GT_Utility.getUndergroundOil(getBaseMetaTileEntity().getWorld(), getBaseMetaTileEntity().getXCoord(), getBaseMetaTileEntity().getZCoord());
-		{
-			return false;
-		}
-	}
-
-	private boolean moveOneDown() {
-		if ((this.mInventory[1] == null) || (this.mInventory[1].stackSize < 1)
-				|| (!GT_Utility.areStacksEqual(this.mInventory[1], GT_ModHandler.getIC2Item("miningPipe", 1L)))) {
-			return false;
-		}
-		final int xDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetX;
-		final int zDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetZ;
-		final int yHead = this.getYOfPumpHead();
-		if (yHead < 1) {
-			return false;
-		}
-		if (this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord() + xDir, yHead - 1, this.getBaseMetaTileEntity().getZCoord() + zDir) == Blocks.bedrock) {
-			return false;
-		}
-		if (!(this.getBaseMetaTileEntity().getWorld().setBlock(this.getBaseMetaTileEntity().getXCoord() + xDir, yHead - 1, this.getBaseMetaTileEntity().getZCoord() + zDir, GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))))) {
-			return false;
-		}
-		if (yHead != this.getBaseMetaTileEntity().getYCoord()) {
-			this.getBaseMetaTileEntity().getWorld().setBlock(this.getBaseMetaTileEntity().getXCoord() + xDir, yHead, this.getBaseMetaTileEntity().getZCoord() + zDir, GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipe", 1L)));
-		}
-		this.getBaseMetaTileEntity().decrStackSize(1, 1);
-		return true;
-	}
-
-	private int getYOfPumpHead() {
-		final int xDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetX;
-		final int zDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetZ;
-		int y = this.getBaseMetaTileEntity().getYCoord() - 1;
-		while (this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord() + xDir, y, this.getBaseMetaTileEntity().getZCoord() + zDir) == GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipe", 1L))) {
-			y--;
-		}
-		if (y == (this.getBaseMetaTileEntity().getYCoord() - 1)) {
-			if (this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord() + xDir, y, this.getBaseMetaTileEntity().getZCoord() + zDir) != GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))) {
-				return y + 1;
-			}
-		} else if ((this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord() + xDir, y, this.getBaseMetaTileEntity().getZCoord() + zDir) != GT_Utility
-				.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))) && (this.mInventory[1] != null) && (this.mInventory[1].stackSize > 0) && GT_Utility.areStacksEqual(this.mInventory[1], GT_ModHandler.getIC2Item("miningPipe", 1L))) {
-			this.getBaseMetaTileEntity().getWorld().setBlock(this.getBaseMetaTileEntity().getXCoord() + xDir, y, this.getBaseMetaTileEntity().getZCoord() + zDir,
-					GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L)));
-			this.getBaseMetaTileEntity().decrStackSize(0, 1);
-		}
-		return y;
-	}
+    public boolean checkRecipe(ItemStack aStack) {
+        ArrayList<FluidStack> tFluidList = getStoredFluids();
+        int tFluidList_sS=tFluidList.size();
+        for (int i = 0; i < tFluidList_sS - 1; i++) {
+            for (int j = i + 1; j < tFluidList_sS; j++) {
+                if (GT_Utility.areFluidsEqual((FluidStack) tFluidList.get(i), (FluidStack) tFluidList.get(j))) {
+                    if (((FluidStack) tFluidList.get(i)).amount >= ((FluidStack) tFluidList.get(j)).amount) {
+                        tFluidList.remove(j--); tFluidList_sS=tFluidList.size();
+                    } else {
+                        tFluidList.remove(i--); tFluidList_sS=tFluidList.size();
+                        break;
+                    }
+                }
+            }
+        }
+        if (tFluidList.size() > 1) {
+            FluidStack[] tFluids = tFluidList.toArray(new FluidStack[tFluidList.size()]);
+            GT_Recipe tRecipe = CustomRecipeMap.sFissionFuelProcessing.findRecipe(this.getBaseMetaTileEntity(), this.mLastRecipe, false, GT_Values.V[4], tFluids, new ItemStack[]{});
+            if (tRecipe == null) {
+                this.mLastRecipe = null;
+                return false;
+            }
+            if (tRecipe.isRecipeInputEqual(true, tFluids, new ItemStack[]{})) {
+            this.mLastRecipe = tRecipe;
+            this.mEUt = this.mLastRecipe.mEUt;
+            this.mMaxProgresstime = this.mLastRecipe.mDuration;
+            this.mEfficiencyIncrease = 10000;
+            this.mOutputFluids = this.mLastRecipe.mFluidOutputs;
+            return true;
+            }
+        }
+        return false;
+    }
 
 	@Override
 	public boolean checkMachine(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) {
@@ -147,55 +116,68 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc
 					if ((!this.addToMachineList(tTileEntity, TAE.GTPP_INDEX(18))) && (!this.addEnergyInputToMachineList(tTileEntity, TAE.GTPP_INDEX(18)))) {
 
 						if (aBaseMetaTileEntity.getBlockOffset(xDir + i, Y, zDir + j) != ModBlocks.blockCasings2Misc) {
-							Utils.LOG_INFO("Wrong Block.");
+							Utils.LOG_INFO("1 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, Y, zDir + j).getLocalizedName());
 							return false;
 						}
 						if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, Y, zDir + j) != 2) {
-							Utils.LOG_INFO("Wrong Meta 1.");
+							Utils.LOG_INFO("1 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, Y, zDir + j).getLocalizedName()+" | Expected Meta 2 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir + i, Y, zDir + j));
 							return false;
 						}
 					}
 					else {
-						Utils.LOG_INFO("Added Hatch. "+tTileEntity.getInventoryName());
+						//Utils.LOG_INFO("Added Hatch. "+tTileEntity.getInventoryName());
 					}
 				}
 				Y = 1;
-				Utils.LOG_INFO("Checking at Y+1 as well.");
+				//Utils.LOG_INFO("Checking at Y+1 as well.");
 				final IGregTechTileEntity tTileEntity2 = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, Y, zDir + j);
 				if ((!this.addToMachineList(tTileEntity2, TAE.GTPP_INDEX(18))) && (!this.addEnergyInputToMachineList(tTileEntity2, TAE.GTPP_INDEX(18)))) {
 
 					if (aBaseMetaTileEntity.getBlockOffset(xDir + i, Y, zDir + j) != ModBlocks.blockCasings2Misc) {
-						Utils.LOG_INFO("Wrong Block.");
+						Utils.LOG_INFO("2 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, Y, zDir).getLocalizedName());
 						return false;
 					}
 					if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, Y, zDir + j) != 2) {
-						Utils.LOG_INFO("Wrong Meta 1.");
+						Utils.LOG_INFO("2 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, Y, zDir).getLocalizedName()+" | Expected Meta 2 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, Y, zDir));
 						return false;
 					}
 				}
 				else {
-					Utils.LOG_INFO("Added Hatch. "+tTileEntity2.getInventoryName());
+					//Utils.LOG_INFO("Added Hatch. "+tTileEntity2.getInventoryName());
 				}
 			}
 		}
 
-		for (int y = 2; y < 6; y++) {
-			if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir) != ModBlocks.blockCasings2Misc) { //Must Define meta for center blocks
-				Utils.LOG_INFO("Wrong Block.");
-				return false;
+		for (int y = 2; y < 7; y++) {
+			if (y<=6){
+				if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir) != ModBlocks.blockCasings2Misc) { //Must Define meta for center blocks
+					Utils.LOG_INFO("3 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName());
+					return false;
+				}
+				if (aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir) != 3) {
+					Utils.LOG_INFO("3 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 3 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir));
+					return false;
+				}				
 			}
-			if (aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir) != 3) {
-				Utils.LOG_INFO("Wrong Meta. 2");
-				return false;
+			if (y==6){
+				if (aBaseMetaTileEntity.getBlockOffset(xDir, y + 1, zDir) != ModBlocks.blockCasings2Misc) {
+					Utils.LOG_INFO("8 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y+1, zDir).getLocalizedName()+" | "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y+1, zDir));
+					return false;
+				}
+				if (aBaseMetaTileEntity.getMetaIDOffset(xDir, y + 1, zDir) != 1) {
+					Utils.LOG_INFO("8 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y+1, zDir).getLocalizedName()+" | Expected Meta 1 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y + 1, zDir));
+					return false;
+				}
 			}
 			if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) != ModBlocks.blockCasings2Misc) {
-				Utils.LOG_INFO("Wrong Block.1");
+				//Utils.LOG_INFO("4 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName());
 				if (y==3){
 					if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) == ModBlocks.blockCasingsMisc) {
 						if (aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, y, zDir) != 13) {
+							Utils.LOG_INFO("4 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir));
 							return false;
 						}
-						Utils.LOG_INFO("Found Zeron-Casing.");
+						Utils.LOG_INFO("Found Zeron-Casing at "+(aBaseMetaTileEntity.getYCoord()+y));
 					}
 				}
 				else {
@@ -205,13 +187,14 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc
 			}
 
 			if (aBaseMetaTileEntity.getBlockOffset(xDir - 1, y, zDir) != ModBlocks.blockCasings2Misc) {
-				Utils.LOG_INFO("Wrong Block.2");
+				//Utils.LOG_INFO("5 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName());
 				if (y==3){
 					if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) == ModBlocks.blockCasingsMisc) {
 						if (aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, y, zDir) != 13) {
+							Utils.LOG_INFO("5 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir));
 							return false;
 						}
-						Utils.LOG_INFO("Found Zeron-Casing.");
+						Utils.LOG_INFO("Found Zeron-Casing at "+(aBaseMetaTileEntity.getYCoord()+y));
 					}
 				}
 				else {
@@ -221,13 +204,14 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc
 			}
 
 			if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir + 1) != ModBlocks.blockCasings2Misc) {
-				Utils.LOG_INFO("Wrong Block.3");
+				//Utils.LOG_INFO("6 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName());
 				if (y==3){
 					if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) == ModBlocks.blockCasingsMisc) {
 						if (aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, y, zDir) != 13) {
+							Utils.LOG_INFO("6 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir));
 							return false;
 						}
-						Utils.LOG_INFO("Found Zeron-Casing.");
+						Utils.LOG_INFO("Found Zeron-Casing at "+(aBaseMetaTileEntity.getYCoord()+y));
 					}
 				}
 				else {
@@ -236,33 +220,26 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc
 				}
 			}
 			if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir - 1) != ModBlocks.blockCasings2Misc) {
-				Utils.LOG_INFO("Wrong Block.4");
+				//Utils.LOG_INFO("7 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName());
 				if (y==3){
 					if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) == ModBlocks.blockCasingsMisc) {
 						if (aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, y, zDir) != 13) {
+							Utils.LOG_INFO("7 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir));
 							return false;
 						}
-						Utils.LOG_INFO("Found Zeron-Casing.");
+						Utils.LOG_INFO("Found Zeron-Casing at "+(aBaseMetaTileEntity.getYCoord()+y));
 					}
 				}
 				else {
 					Utils.LOG_INFO("debug.4");
 					return false;
 				}
-			}
-			if (aBaseMetaTileEntity.getBlockOffset(xDir, y + 3, zDir) != ModBlocks.blockCasings2Misc) {
-				Utils.LOG_INFO("Wrong Block.5");
-				return false;
-			}
-			if (aBaseMetaTileEntity.getMetaIDOffset(xDir, y + 3, zDir) != 3) {
-				Utils.LOG_INFO("Wrong Meta. 3");
-				return false;
-			}
+			}			
 		}
 
 		if ((this.mInputHatches.size() != 4) || (this.mOutputHatches.size() != 2) ||
 				(this.mOutputBusses.size() != 1) || (this.mMufflerHatches.size() != 1) ||
-				(this.mMaintenanceHatches.size() != 2) || (this.mEnergyHatches.size() < 1)){
+				(this.mMaintenanceHatches.size() != 1) || (this.mEnergyHatches.size() != 1)){
 			Utils.LOG_INFO("Wrong Hatch count.");
 			return false;
 		}
@@ -270,8 +247,8 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc
 			if (this.mMufflerHatches.get(0).mTier < 7){
 				Utils.LOG_INFO("Your Muffler must be AT LEAST ZPM tier or higher.");
 			}
-		}
-		Utils.LOG_INFO("Multiblock Formed.");
+		}		
+		Utils.LOG_INFO("Fission Fuel Production Plant Formed.");
 		return true;
 	}
 
@@ -287,7 +264,7 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc
 
 	@Override
 	public int getPollutionPerTick(final ItemStack aStack) {
-		return 0;
+		return 200;
 	}
 
 	@Override
@@ -296,7 +273,7 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc
 	}
 
 	public int getAmountOfOutputs() {
-		return 3;
+		return 5;
 	}
 
 	@Override