> Fixes from #610

$ Fix Large Arc Furnace not forming and broken size detection. Closes #572.
% Changed Large Auto-Assembler input bus Behaviour for Circuit/Assembly mode. Closes #559.

2 files changed, 47 insertions, 13 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java
index c549cf9216..68e060c778 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java
@@ -137,13 +137,13 @@ extends GregtechMeta_MultiBlockBase {
 		int depth = 1;
 		int mPlascreteCount = 0;
 		for (int i = 1; i < 4; i++) {
-			Block tBlock = aBaseMetaTileEntity.getBlockOffset(i, 0, 0);
-			int tMeta = aBaseMetaTileEntity.getMetaIDOffset(i, 0, 0);
-			if (tBlock == ModBlocks.blockCasings3Misc && tMeta == 1) {
-				Logger.INFO("Found Correct Top Casing at offset "+i);
+			if (aBaseMetaTileEntity.getAirOffset(i, -1, 0)) {
+				Logger.INFO("aitfound "+i);
 				continue;				
 			}
-			else {
+			Block tBlock = aBaseMetaTileEntity.getBlockOffset(i, -1, 0);
+			int tMeta = aBaseMetaTileEntity.getMetaIDOffset(i, -1, 0);
+			{
 				if (isValidCasingBlock(tBlock, tMeta)) {
 					x = i;
 					z = i;
@@ -176,7 +176,7 @@ extends GregtechMeta_MultiBlockBase {
 		}
 		//!addToMachineList(tTileEntity, mCasingTextureID)
 		if (depth >= -1) {
-			Logger.INFO("Structure is not 5 blocks or taller.");
+			Logger.INFO("Structure is not 5 blocks or taller. depth = "+depth);
 			return false;
 		}
 		
@@ -207,7 +207,7 @@ extends GregtechMeta_MultiBlockBase {
 						}
 						else if (dY < 0) {							
 							//Check Walls
-							if (dX == -x || dX == x || dZ == -z || dZ == z) {
+							if (dY != depth && (dX == -x || dX == x || dZ == -z || dZ == z)) {
 								if (!isValidCasingBlock(tBlock, tMeta) && !addToMachineList(tTileEntity, mCasingTextureID)) {
 									Logger.INFO("Found Incorrect Wall Casing at offset X:"+dX+" | Y:"+dY+" | Z:"+dZ);
 									return false;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
index f24825ba8a..9754eebbb8 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
@@ -33,6 +33,7 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.Gregtech
 import gtPlusPlus.xmod.gregtech.common.helpers.CraftingHelper;
 import gtPlusPlus.xmod.gregtech.common.helpers.autocrafter.AC_Helper_Utils;
 import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
 
 public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase {
 
@@ -269,20 +270,53 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase {
 		}
 	}
 
+//	@Override
+//	public boolean checkRecipe(final ItemStack aStack) {
+//
+//		final long tVoltage = this.getMaxInputVoltage();
+//		final byte tTier = this.mTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
+//
+//		if (mMachineMode == MODE.DISASSEMBLY) {
+//			return doDisassembly();
+//		} else if (mMachineMode == MODE.CRAFTING) {
+//			return doCrafting(aStack);
+//		} else {
+//			return super.checkRecipeGeneric(getMaxParallelRecipes(), 100, 200);
+//		}
+//	}	
+	
 	@Override
 	public boolean checkRecipe(final ItemStack aStack) {
-
-		final long tVoltage = this.getMaxInputVoltage();
-		final byte tTier = this.mTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
-
 		if (mMachineMode == MODE.DISASSEMBLY) {
 			return doDisassembly();
 		} else if (mMachineMode == MODE.CRAFTING) {
 			return doCrafting(aStack);
 		} else {
-			return super.checkRecipeGeneric(getMaxParallelRecipes(), 100, 200);
+			ArrayList<FluidStack> tFluids = getStoredFluids();	
+			//Logger.MACHINE_INFO("1");
+			for (GT_MetaTileEntity_Hatch_InputBus tBus : mInputBusses) {
+				ArrayList<ItemStack> tBusItems = new ArrayList<ItemStack>();
+				tBus.mRecipeMap = getRecipeMap();
+				//Logger.MACHINE_INFO("2");
+				if (isValidMetaTileEntity(tBus)) {
+					//Logger.MACHINE_INFO("3");
+					for (int i = tBus.getBaseMetaTileEntity().getSizeInventory() - 1; i >= 0; i--) {
+						if (tBus.getBaseMetaTileEntity().getStackInSlot(i) != null)
+							tBusItems.add(tBus.getBaseMetaTileEntity().getStackInSlot(i));
+					}
+				}
+				
+				Object[] tempArray = tFluids.toArray(new FluidStack[] {});
+				FluidStack[] properArray;
+				properArray = ((tempArray != null && tempArray.length > 0) ? (FluidStack[]) tempArray : new FluidStack[] {});
+
+				//Logger.MACHINE_INFO("4");
+				if (checkRecipeGeneric(tBusItems.toArray(new ItemStack[]{}), properArray,
+					getMaxParallelRecipes(), 100, 200, 10000)) return true;
+			}
+			return false;
 		}
-	}	
+	}
 	
 	@Override
 	public int getMaxParallelRecipes() {