+ Added OD tag 'rodBlaze' to blaze rods.

$ Corrected certain multiblocks not counting their casings during construction. Fixes #549.
$ Stopped custom MTE's incorrectly handling getDrops(). Fixes #553.
$ Stopped GT++ Multis trying to reduce the 'wait' time on themselves when placed or first loaded. Fixes #556.

13 files changed, 153 insertions, 67 deletions

diff --git a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index 87158fe4ee..fd0d044c05 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -3,7 +3,6 @@ package gtPlusPlus.core.item.chemistry;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 
-import forestry.plugins.PluginCore;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gtPlusPlus.api.objects.Logger;
@@ -393,7 +392,6 @@ public class AgriculturalChem extends ItemPackage {
 
 	@Override
 	public String errorMessage() {
-		// TODO Auto-generated method stub
 		return "Failed to generate recipes for AgroChem.";
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 0e21387c56..f5ddfa4dd9 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -335,7 +335,6 @@ public class CoalTar extends ItemPackage {
 
 	@Override
 	public String errorMessage() {
-		// TODO Auto-generated method stub
 		return "Bad Coal Science!";
 	}
 
@@ -383,7 +382,6 @@ public class CoalTar extends ItemPackage {
 
 	@Override
 	public void blocks() {
-		// TODO Auto-generated method stub
 		
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/OilChem.java b/src/Java/gtPlusPlus/core/item/chemistry/OilChem.java
index cb7e32eaf0..4fe9347324 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/OilChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/OilChem.java
@@ -177,7 +177,6 @@ public class OilChem extends ItemPackage {
 
 	@Override
 	public String errorMessage() {
-		// TODO Auto-generated method stub
 		return "Failed to generate recipes for AgroChem.";
 	}
 
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
index a0eb0f17e2..ff60d8c416 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
@@ -15,7 +15,6 @@ import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.item.base.cell.BaseItemPlasmaCell;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
@@ -206,7 +205,7 @@ public class FluidUtils {
 		ItemStack temp = null;
 		//Generate a Cell if we need to
 		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellPlasma"+aMaterial.getUnlocalizedName(), 1) == null){
-			final Item temp2 = new BaseItemPlasmaCell(aMaterial);
+			new BaseItemPlasmaCell(aMaterial);
 			temp = aMaterial.getPlasmaCell(1);
 		}
 		else {
diff --git a/src/Java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java b/src/Java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java
index 2c808002cb..2bfd05e5be 100644
--- a/src/Java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java
+++ b/src/Java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java
@@ -61,6 +61,7 @@ public class Core_VanillaFixes implements IPlugin {
 	}
 	
 	private boolean fixVanillaOD() {		
+		registerToOreDict(ItemUtils.getSimpleStack(Items.blaze_rod), "rodBlaze");
 		registerToOreDict(ItemUtils.getSimpleStack(Items.nether_wart), "cropNetherWart");	
 		registerToOreDict(ItemUtils.getSimpleStack(Items.reeds), "sugarcane");	
 		registerToOreDict(ItemUtils.getSimpleStack(Items.paper), "paper");	
@@ -71,7 +72,7 @@ public class Core_VanillaFixes implements IPlugin {
 		registerToOreDict(ItemUtils.getSimpleStack(Items.nether_star), "netherStar");	
 		registerToOreDict(ItemUtils.getSimpleStack(Items.leather), "leather");	
 		registerToOreDict(ItemUtils.getSimpleStack(Items.feather), "feather");	
-		registerToOreDict(ItemUtils.getSimpleStack(Items.egg), "egg");
+		registerToOreDict(ItemUtils.getSimpleStack(Items.egg), "egg");	
 		registerToOreDict(ItemUtils.getSimpleStack(Blocks.end_stone), "endstone");	
 		registerToOreDict(ItemUtils.getSimpleStack(Blocks.vine), "vine");	
 		registerToOreDict(ItemUtils.getSimpleStack(Blocks.cactus), "blockCactus");	
@@ -82,7 +83,12 @@ public class Core_VanillaFixes implements IPlugin {
 	}
 	
 	private void registerToOreDict(ItemStack aStack, String aString) {
-		mInstance.log("Registering "+aStack.getDisplayName()+" to OreDictionary under the tag '"+aString+"'. (Added to Forge in 1.8.9)");
+		if (aStack.getItem() == Items.blaze_rod) {
+			mInstance.log("Registering "+aStack.getDisplayName()+" to OreDictionary under the tag '"+aString+"'.");			
+		}
+		else {
+			mInstance.log("Registering "+aStack.getDisplayName()+" to OreDictionary under the tag '"+aString+"'. (Added to Forge in 1.8.9)");			
+		}		
 		ItemUtils.addItemToOreDictionary(aStack, aString);		
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java
index e637365c1e..f6bec1f402 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java
@@ -11,6 +11,7 @@ import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.GT_Pollution;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
@@ -96,17 +97,36 @@ public class BaseCustomTileEntity extends BaseMetaTileEntity {
 	}
 
 	public ArrayList<ItemStack> getDrops() {
-		ItemStack rStack = new ItemStack(Meta_GT_Proxy.sBlockMachines, 1, this.getMetaTileID());		
-		NBTTagCompound aSuperNBT = super.getDrops().get(0).getTagCompound();		
-		NBTTagCompound tNBT = aSuperNBT;
-		if (this.hasValidMetaTileEntity()) {
-			this.mMetaTileEntity.setItemNBT(tNBT);
+		ArrayList<ItemStack> aDrops = new ArrayList<ItemStack>();
+		ItemStack rStack = new ItemStack(GregTech_API.sBlockMachines, 1, this.getMetaTileID());
+		// Currently not using my custom block.
+		// ItemStack rStack = new ItemStack(Meta_GT_Proxy.sBlockMachines, 1,
+		// this.getMetaTileID());
+		boolean fail = true;
+
+		ArrayList<ItemStack> aSuperDrops = super.getDrops();
+		if (aSuperDrops != null && !aSuperDrops.isEmpty()) {
+			ItemStack aSuperStack = super.getDrops().get(0);
+			if (aSuperStack != null && aSuperStack.hasTagCompound()) {
+				NBTTagCompound aSuperNBT = aSuperStack.getTagCompound();
+				if (aSuperNBT != null && !aSuperNBT.hasNoTags()) {
+					NBTTagCompound tNBT = (NBTTagCompound) aSuperNBT.copy();
+					if (tNBT != null && !tNBT.hasNoTags()) {
+						if (this.hasValidMetaTileEntity()) {
+							this.mMetaTileEntity.setItemNBT(tNBT);
+							rStack.setTagCompound(tNBT);
+							fail = false;
+			                aDrops.add(rStack);
+						}
+					}
+				}
+
+			}
 		}
-		if (!tNBT.hasNoTags()) {
-			rStack.setTagCompound(tNBT);
+		if (fail) {
+                aDrops.add(rStack);
 		}
-
-		return new ArrayList<ItemStack>(Arrays.asList(new ItemStack[] { rStack }));
+		return aDrops;
 	}
 
 	public boolean isTeleporterCompatible(Direction aSide) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index b556dc10f9..c16f62866f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -2232,9 +2232,9 @@ GT_MetaTileEntity_MultiBlockBase {
 	}
 
 	private final void tryTickWaitTimerDown() {		
-		if (mStartUpCheck > 10) {
+		/*if (mStartUpCheck > 10) {
 			mStartUpCheck = 10;			
-		}		
+		}*/		
 	}
 
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockRequirements.java b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockRequirements.java
index afdf36f930..10909081d1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockRequirements.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockRequirements.java
@@ -2,35 +2,22 @@ package gtPlusPlus.xmod.gregtech.api.objects;
 
 public class MultiblockRequirements {
 
-	public final int mInputBusMinimum;
-	public final int mInputHatchMinimum;
+	public int mInputBusMinimum = 0;
+	public int mInputHatchMinimum = 0;
 	
-	public final int mOutputBusMinimum;
-	public final int mOutputHatchMinimum;
+	public int mOutputBusMinimum = 0;
+	public int mOutputHatchMinimum = 0;
 	
-	public final int mMaintMinimum;
+	public int mMaintMinimum = 1;
 	
-	public final int mEnergyHatchMinimum;
-	public final int mDynamoHatchMinimum;
+	public int mEnergyHatchMinimum = 1;
+	public int mDynamoHatchMinimum = 0;
 	
-	public final MultiblockBlueprint mBlueprint;
-	
-	public static final int mControlCoreMinimum = 1;
+	public final int mMinimumCasingCount;
 	
-	/**
-	 * 
-	 * @param aInputBusses
-	 * @param aOutputBusses
-	 * @param aInputHatches
-	 * @param aOutputHatches
-	 * @param aEnergyHatches
-	 * @param aDynamoHatches
-	 * @param aBlueprint - A data object containing the structural data for this Multiblock
-	 */
-	public MultiblockRequirements(final int aInputBusses, final int aOutputBusses, final int aInputHatches, final int aOutputHatches, final int aEnergyHatches, final int aDynamoHatches, final MultiblockBlueprint aBlueprint) {
-		this(aInputBusses, aOutputBusses, aInputHatches, aOutputHatches, aEnergyHatches, aDynamoHatches, 1, aBlueprint);
-	}
+	public final MultiblockBlueprint mBlueprint;
 	
+	//public static final int mControlCoreMinimum = 1;
 	/**
 	 * 
 	 * @param aInputBusses
@@ -42,15 +29,80 @@ public class MultiblockRequirements {
 	 * @param aMaintHatches
 	 * @param aBlueprint - A data object containing the structural data for this Multiblock
 	 */
-	public MultiblockRequirements(final int aInputBusses, final int aOutputBusses, final int aInputHatches, final int aOutputHatches, final int aEnergyHatches, final int aDynamoHatches, final int aMaintHatches, final MultiblockBlueprint aBlueprint) {
-		mInputBusMinimum = aInputBusses;
-		mOutputBusMinimum = aOutputBusses;		
-		mInputHatchMinimum = aInputHatches;
-		mOutputHatchMinimum = aOutputHatches;		
-		mEnergyHatchMinimum = aEnergyHatches;
-		mDynamoHatchMinimum = aDynamoHatches;		
-		mMaintMinimum = aMaintHatches;
+	public MultiblockRequirements(int aCasingCount, MultiblockBlueprint aBlueprint) {
+		mMinimumCasingCount = aCasingCount;
 		mBlueprint = aBlueprint;
+	}	
+
+	public final int getInputBusMinimum() {
+		return this.mInputBusMinimum;
+	}
+
+	public final MultiblockRequirements setInputBusMinimum(int mInputBusMinimum) {
+		this.mInputBusMinimum = mInputBusMinimum;
+		return this;
+	}
+
+	public final int getInputHatchMinimum() {
+		return this.mInputHatchMinimum;
+	}
+
+	public final MultiblockRequirements setInputHatchMinimum(int mInputHatchMinimum) {
+		this.mInputHatchMinimum = mInputHatchMinimum;
+		return this;
+	}
+
+	public final int getOutputBusMinimum() {
+		return this.mOutputBusMinimum;
+	}
+
+	public final MultiblockRequirements setOutputBusMinimum(int mOutputBusMinimum) {
+		this.mOutputBusMinimum = mOutputBusMinimum;
+		return this;
+	}
+
+	public final int getOutputHatchMinimum() {
+		return this.mOutputHatchMinimum;
+	}
+
+	public final MultiblockRequirements setOutputHatchMinimum(int mOutputHatchMinimum) {
+		this.mOutputHatchMinimum = mOutputHatchMinimum;
+		return this;
+	}
+
+	public final int getMaintMinimum() {
+		return this.mMaintMinimum;
+	}
+
+	public final MultiblockRequirements setMaintMinimum(int mMaintMinimum) {
+		this.mMaintMinimum = mMaintMinimum;
+		return this;
+	}
+
+	public final int getEnergyHatchMinimum() {
+		return this.mEnergyHatchMinimum;
+	}
+
+	public final MultiblockRequirements setEnergyHatchMinimum(int mEnergyHatchMinimum) {
+		this.mEnergyHatchMinimum = mEnergyHatchMinimum;
+		return this;
+	}
+
+	public final int getDynamoHatchMinimum() {
+		return this.mDynamoHatchMinimum;
+	}
+
+	public final MultiblockRequirements setDynamoHatchMinimum(int mDynamoHatchMinimum) {
+		this.mDynamoHatchMinimum = mDynamoHatchMinimum;
+		return this;
+	}
+
+	public final MultiblockBlueprint getBlueprint() {
+		return this.mBlueprint;
+	}
+
+	public final int getMinimumCasingCount() {
+		return this.mMinimumCasingCount;
 	}
 	
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/requirements/RequirementsBasicCubic.java b/src/Java/gtPlusPlus/xmod/gregtech/common/requirements/RequirementsBasicCubic.java
index ba44acdcb5..e53a7e4738 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/requirements/RequirementsBasicCubic.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/requirements/RequirementsBasicCubic.java
@@ -5,7 +5,7 @@ import gtPlusPlus.xmod.gregtech.api.objects.MultiblockRequirements;
 public class RequirementsBasicCubic extends MultiblockRequirements {
 
 	public RequirementsBasicCubic( ) {
-		super(-1, -1, -1, -1, 1, 0, 1, null);
+		super(0, null);
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
index 5e852b5f76..6a154051d5 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
@@ -100,6 +100,7 @@ extends GregtechMeta_MultiBlockBase {
 	@Override
 	public boolean checkMultiblock(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) {
 		final byte tSide = this.getBaseMetaTileEntity().getBackFacing();
+		int aCasingCount = 0;
 		if ((this.getBaseMetaTileEntity().getAirAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 1)) && (this.getBaseMetaTileEntity().getAirAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 2) && (this.getBaseMetaTileEntity().getAirAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 3)))) {
 			for (byte i = 2; i < 6; i = (byte) (i + 1)) {
 				IGregTechTileEntity tTileEntity;
@@ -141,7 +142,12 @@ extends GregtechMeta_MultiBlockBase {
 								if (!isValidBlockForStructure(aTile, getCasingTextureIndex(), true, aBlock, aMeta, getCasingBlock(), getCasingMeta())) {
 									log("Bad Casing on Cutting Machine.");
 									return false;
-								}	
+								}		
+								else {
+									if (aTile == null) {
+										aCasingCount++;
+									}
+								}
 						}
 					}
 				}
@@ -159,7 +165,7 @@ extends GregtechMeta_MultiBlockBase {
 			return false;
 		}
 		log("True");
-		return true;
+		return aCasingCount >= 26;
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
index f4f8a5fe78..9885db20d6 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
@@ -58,7 +58,7 @@ extends GregtechMeta_MultiBlockBase {
 				"1x Output Bus",
 				"1x Input Hatch",
 				"1x Energy Hatch",
-				"Maintenance Hatch must be at the back, centered",
+				//"Maintenance Hatch must be at the back, centered",
 				};
 	}
 
@@ -142,6 +142,7 @@ extends GregtechMeta_MultiBlockBase {
 	@Override
 	public boolean checkMultiblock(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) {
 		final byte tSide = this.getBaseMetaTileEntity().getBackFacing();
+		int aCasingCount = 0;
 		if ((this.getBaseMetaTileEntity().getAirAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 1)) && (this.getBaseMetaTileEntity().getAirAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 2) && (this.getBaseMetaTileEntity().getAirAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 3)))) {			
 			for (byte i = 2; i < 6; i = (byte) (i + 1)) {
 				IGregTechTileEntity tTileEntity;
@@ -183,7 +184,11 @@ extends GregtechMeta_MultiBlockBase {
 								log("Bad Casing on Extruder.");
 								return false;
 							}
-							
+							else {
+								if (aTile == null) {
+									aCasingCount++;
+								}
+							}							
 						}
 					}
 				}
@@ -200,8 +205,11 @@ extends GregtechMeta_MultiBlockBase {
 			log("False 5");
 			return false;
 		}
+		
+		
+		
 		log("True");
-		return true;
+		return aCasingCount >= 28;
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
index d798691d04..1b92d30705 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
@@ -1,24 +1,19 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
 
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.TAE;
 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_Hatch;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 
 public class GregtechMetaTileEntity_IndustrialWireMill
 extends GregtechMeta_MultiBlockBase {
@@ -53,7 +48,7 @@ extends GregtechMeta_MultiBlockBase {
 				"1x Input Bus",
 				"1x Output Bus",
 				"1x Energy Hatch",
-				"Maintenance Hatch must be at the back, centered",
+				//"Maintenance Hatch must be at the back, centered",
 		};
 	}
 	
@@ -108,6 +103,7 @@ extends GregtechMeta_MultiBlockBase {
 	@Override
 	public boolean checkMultiblock(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) {
 		final byte tSide = this.getBaseMetaTileEntity().getBackFacing();
+		int aCasingCount = 0;
 		if ((this.getBaseMetaTileEntity().getAirAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 1)) && (this.getBaseMetaTileEntity().getAirAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 2) && (this.getBaseMetaTileEntity().getAirAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 3)))) {
 			for (byte i = 2; i < 6; i = (byte) (i + 1)) {
 				IGregTechTileEntity tTileEntity;
@@ -147,6 +143,11 @@ extends GregtechMeta_MultiBlockBase {
 									log("Bad Casing on Wiremill.");
 									return false;
 								}	
+								else {
+									if (aTile == null) {
+										aCasingCount++;
+									}
+								}
 						}
 					}
 				}
@@ -168,7 +169,7 @@ extends GregtechMeta_MultiBlockBase {
 			return false;
 		}
 		log("True");
-		return true;
+		return aCasingCount >= 32;
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
index 307319f642..e394a8b8c0 100644
--- a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
+++ b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
@@ -8,7 +8,6 @@ import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;