Implemented use of GT_AssemblyLineUtils for the Scanner and Assembly line.

Cleaned up Assembly Line recipe handling code.
Cleaned up Scanner AL recipe handling code.
Cleaned up GT_AssemblyLineUtils a touch and added a little more debugging. (Turn D1 on in GT)

1 files changed, 99 insertions, 108 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
index 060c086741..c2460213c8 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
@@ -20,6 +20,7 @@ import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_AssemblyLineUtils;
 import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -157,123 +158,111 @@ public class GT_MetaTileEntity_AssemblyLine extends GT_MetaTileEntity_EnhancedMu
 
     @Override
     public boolean checkRecipe(ItemStack aStack) {
-        if (GT_Values.D1)
-            GT_FML_LOGGER.info("Start ALine recipe check");
+        if (GT_Values.D1) {
+        	GT_FML_LOGGER.info("Start ALine recipe check");
+        }
         ArrayList<ItemStack> tDataStickList = getDataItems(2);
-        if (tDataStickList.isEmpty()) return false;
-        if (GT_Values.D1)
-            GT_FML_LOGGER.info("Stick accepted, " + tDataStickList.size() + " Data Sticks found");
+        if (tDataStickList.isEmpty()) {
+        	return false;
+        }
+        if (GT_Values.D1) {
+        	GT_FML_LOGGER.info("Stick accepted, " + tDataStickList.size() + " Data Sticks found");
+        }
 
-        ItemStack[] tStack = new ItemStack[15];
-        FluidStack[] tFluids = new FluidStack[4];
+        ItemStack[] tStack = null;
+        FluidStack[] tFluids = null;
         boolean findRecipe = false;
-        nextDS:
+        
+        nextDataStick:
         for (ItemStack tDataStick : tDataStickList) {
-            NBTTagCompound tTag = tDataStick.getTagCompound();
-            if (tTag == null)
-                continue;
+        	GT_Recipe_AssemblyLine aFoundRecipe = GT_AssemblyLineUtils.findAssemblyLineRecipeFromDataStick(tDataStick);        	
+
+        	// Check if the recipe on the data stick is the current recipe for it's given output, if not we update it and continue to next.
+        	if (!GT_AssemblyLineUtils.processDataStick(tDataStick)) {
+        		continue;
+        	}
+        	
+        	tStack = aFoundRecipe.mInputs;
+        	tFluids = aFoundRecipe.mFluidInputs;
+        	
+        	// So here we check against the recipe found on the data stick.
+        	// If we run into missing buses/hatches or bad inputs, we go to the next data stick.
+        	// This check only happens if we have a valid up to date data stick.
+        	
+        	// Check Inputs allign
+        	int aItemCount = aFoundRecipe.mInputs.length;
             for (int i = 0; i < 15; i++) {
-                int count = tTag.getInteger("a" + i);
-                if (!tTag.hasKey("" + i) && count <= 0)
-                    continue;
-                if (mInputBusses.get(i) == null) {
-                    continue nextDS;
-                }
-
-                ItemStack stackInSlot = mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0);
-                boolean flag = true;
-                if (count > 0) {
-                    for (int j = 0; j < count; j++) {
-                        tStack[i] = GT_Utility.loadItem(tTag, "a" + i + ":" + j);
-                        if (tStack[i] == null) continue;
-                        if (GT_Values.D1)
-                            GT_FML_LOGGER.info("Item " + i + " : " + tStack[i].getUnlocalizedName());
-                        if (GT_Utility.areStacksEqual(tStack[i], stackInSlot, true) && tStack[i].stackSize <= stackInSlot.stackSize) {
-                            flag = false;
-                            break;
-                        }
-                    }
-                }
-                if (flag) {
-                    tStack[i] = GT_Utility.loadItem(tTag, "" + i);
-                    if (tStack[i] == null) {
-                        flag = false;
-                        continue;
-                    }
-                    if (GT_Values.D1)
-                        GT_FML_LOGGER.info("Item " + i + " : " + tStack[i].getUnlocalizedName());
-                    if (GT_Utility.areStacksEqual(tStack[i], stackInSlot, true) && tStack[i].stackSize <= stackInSlot.stackSize) {
-                        flag = false;
+            	if (i >= aItemCount) {
+            		continue;
+            	}
+            	else {
+            		if (mInputBusses.get(i) == null) {
+                        continue nextDataStick;
                     }
-                }
-                if (GT_Values.D1)
-                    GT_FML_LOGGER.info(i + (flag ? " not accepted" : " accepted"));
-                if (flag)
-                    continue nextDS;
-            }
-
-            if (GT_Values.D1) GT_FML_LOGGER.info("All Items done, start fluid check");
-            for (int i = 0; i < 4; i++) {
-                if (!tTag.hasKey("f" + i)) continue;
-                tFluids[i] = GT_Utility.loadFluid(tTag, "f" + i);
-                if (tFluids[i] == null) continue;
-                if (GT_Values.D1)
-                    GT_FML_LOGGER.info("Fluid " + i + " " + tFluids[i].getUnlocalizedName());
-                if (mInputHatches.get(i) == null) {
-                    continue nextDS;
-                }
-                FluidStack fluidInHatch = mInputHatches.get(i).mFluid;
-                if (!GT_Utility.areFluidsEqual(fluidInHatch, tFluids[i], true) || fluidInHatch.amount < tFluids[i].amount) {
-                    if (GT_Values.D1)
-                        GT_FML_LOGGER.info(i + " not accepted");
-                    continue nextDS;
-                }
-                if (GT_Values.D1)
-                    GT_FML_LOGGER.info(i + " accepted");
-            }
-
-            if (GT_Values.D1)
-                GT_FML_LOGGER.info("Input accepted, check other values");
-            if (!tTag.hasKey("output"))
-                continue;
-            mOutputItems = new ItemStack[]{GT_Utility.loadItem(tTag, "output")};
-            if (mOutputItems[0] == null || !GT_Utility.isStackValid(mOutputItems[0]))
-                continue;
-
-            if (!tTag.hasKey("time"))
-                continue;
-            int tMaxProgressTime = tTag.getInteger("time");
-            if (tMaxProgressTime <= 0)
-                continue;
-
-            if (!tTag.hasKey("eu"))
-                continue;
-
-            if (GT_Values.D1) GT_FML_LOGGER.info("Check overclock");
-
-            calculateOverclockedNessMulti(tTag.getInteger("eu"), tMaxProgressTime, 1, getMaxInputVoltage());
-            //In case recipe is too OP for that machine
-            if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) {
-                if (GT_Values.D1) GT_FML_LOGGER.info("Recipe too OP");
-                continue;
+            		else {
+                        ItemStack stackInSlot = mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0);
+            			if (!GT_Utility.areStacksEqual(tStack[i], stackInSlot, true) || tStack[i].stackSize <= stackInSlot.stackSize) {   
+                            continue nextDataStick;
+                        }
+                        if (GT_Values.D1) {
+                        	GT_FML_LOGGER.info("Item: " + i + " accepted");
+                        }
+            		}
+            	}
             }
-
-            if (GT_Values.D1) GT_FML_LOGGER.info("Find avaiable recipe");
             
-            // Check data stick is valid.
-            if (GT_AssemblyLineUtils.processDataStick(tDataStick)) {
-                findRecipe = true;            	
+            // Check Fluid Inputs allign
+        	int aFluidCount = aFoundRecipe.mFluidInputs.length;
+            for (int i = 0; i < 4; i++){
+            	if (i >= aFluidCount) {
+            		continue;
+            	}
+            	else {
+            		if (mInputHatches.get(i) == null) {
+                        continue nextDataStick;
+                    }
+            		else {
+                        FluidStack fluidInHatch = mInputHatches.get(i).mFluid;
+                        if (!GT_Utility.areFluidsEqual(fluidInHatch, tFluids[i], true) || fluidInHatch.amount < tFluids[i].amount) {
+                            continue nextDataStick;
+                        }
+                        if (GT_Values.D1) {
+                        	GT_FML_LOGGER.info("Fluid:" + i + " accepted");
+                        }
+            		}
+            	}
             }
-            
-            break;
+        	
+        	if (GT_Values.D1) {
+        		GT_FML_LOGGER.info("Check overclock");
+        	}
+        	calculateOverclockedNessMulti(aFoundRecipe.mEUt, aFoundRecipe.mDuration, 1, getMaxInputVoltage());
+        	//In case recipe is too OP for that machine
+        	if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) {
+        		if (GT_Values.D1) {
+        			GT_FML_LOGGER.info("Recipe too OP");
+        		}
+        		continue;
+        	}
+        	if (GT_Values.D1) {
+        		GT_FML_LOGGER.info("Find available recipe");             
+        	}
+        	findRecipe = true;        	
+        }
+        
+        // Best not to run this recipe.
+        if (!findRecipe || tStack == null || tStack.length <= 0 || tFluids == null || tFluids.length <= 0) {
+        	return false;
         }
-        if (!findRecipe) return false;
         
 
-        if (GT_Values.D1) GT_FML_LOGGER.info("All checked start consuming inputs");
+        if (GT_Values.D1) {
+        	GT_FML_LOGGER.info("All checked start consuming inputs");
+        }
         for (int i = 0; i < 15; i++) {
-            if (tStack[i] == null)
-                continue;
+            if (tStack[i] == null) {
+            	continue;
+            }
             ItemStack stackInSlot = mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0);
             stackInSlot.stackSize -= tStack[i].stackSize;
         }
@@ -287,13 +276,15 @@ public class GT_MetaTileEntity_AssemblyLine extends GT_MetaTileEntity_EnhancedMu
             }
         }
 
-        if (this.mEUt > 0)
-            this.mEUt = -this.mEUt;
+        if (this.mEUt > 0) {
+        	this.mEUt = -this.mEUt;
+        }
         this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
         this.mEfficiencyIncrease = 10000;
         updateSlots();
-        if (GT_Values.D1)
-            GT_FML_LOGGER.info("Recipe sucessfull");
+        if (GT_Values.D1) {
+        	GT_FML_LOGGER.info("Recipe sucessfull");
+        }
         return true;
     }