More Assembly Line recipe work

2 files changed, 50 insertions, 13 deletions

diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java
index 43f077094b..b377d49804 100644
--- a/src/main/java/gregtech/common/GT_RecipeAdder.java
+++ b/src/main/java/gregtech/common/GT_RecipeAdder.java
@@ -8,6 +8,7 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.internal.IGT_RecipeAdder;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
@@ -770,25 +771,25 @@ public class GT_RecipeAdder
     }
 
 	@Override
-	public boolean addAssemblylineRecipe(ItemStack mainItem, int researchTime, ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput1, int aDuration, int aEUt) {
-        if ((mainItem==null)||(researchTime<=0)||(aInputs == null) || (aOutput1 == null) || aInputs.length>15 || aInputs.length<4) {
+	public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput1, int aDuration, int aEUt) {
+        if ((aResearchItem==null)||(aResearchTime<=0)||(aInputs == null) || (aOutput1 == null) || aInputs.length>15 || aInputs.length<4) {
             return false;
         }
         if ((aDuration = GregTech_API.sRecipeFile.get("assemblingline", aOutput1, aDuration)) <= 0) {
             return false;
         }
-        String tRecipe = "";
-        for(ItemStack sStack: aInputs){
-        	tRecipe += sStack.getItem().getItemStackDisplayName(sStack)+" x"+sStack.stackSize+"; ";
-        }
-        
-        for(FluidStack sStack: aFluidInputs){
-        	tRecipe += sStack.getLocalizedName()+" "+sStack.amount+"L; ";
-        }
-        
-        GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "tRecipe", new Object[0])}, new ItemStack[]{aOutput1}, null, null, null, aDuration, aEUt, 0);
+//        String tRecipe = "";
+//        for(ItemStack sStack: aInputs){
+//        	tRecipe += sStack.getItem().getItemStackDisplayName(sStack)+" x"+sStack.stackSize+"; ";
+//        }
+//        
+//        for(FluidStack sStack: aFluidInputs){
+//        	tRecipe += sStack.getLocalizedName()+" "+sStack.amount+"L; ";
+//        }
+//        
+        GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{aResearchItem}, new ItemStack[]{aOutput1}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Research result", new Object[0])}, null, null, aResearchTime, 30, 0);
         
-        GT_Recipe.GT_Recipe_Map.sAssemblylineRecipes.addRecipe(true, aInputs, new ItemStack[]{aOutput1}, null, aFluidInputs, null, aDuration, aEUt, 0);
+        GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe_AssemblyLine( aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput1, aDuration, aEUt));
         return true;
 	}
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
index 95d6ef9364..167ba141d6 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
@@ -16,6 +16,7 @@ import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;

 import gregtech.api.util.GT_Utility;

 import gregtech.common.items.behaviors.Behaviour_DataOrb;

+import gregtech.common.items.behaviors.Behaviour_DataStick;

 import net.minecraft.init.Items;

 import net.minecraft.item.ItemStack;

 import net.minecraft.nbt.NBTTagCompound;

@@ -147,6 +148,41 @@ public class GT_MetaTileEntity_Scanner
 

                 }

             }

+            if(ItemList.Tool_DataStick.isStackEqual(getSpecialSlot(), false, true)&& aStack !=null){

+            	for(GT_Recipe.GT_Recipe_AssemblyLine tRecipe:GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes){

+            	if(GT_Utility.areStacksEqual(tRecipe.mResearchItem, aStack, true)){

+            	

+            	this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{getSpecialSlot()});

+            	getSpecialSlot().stackSize -= 1;

+                GT_Utility.ItemNBT.setBookTitle(this.mOutputItems[0], tRecipe.mOutput.getDisplayName()+" Construction Data");

+                

+                

+                

+                NBTTagCompound tNBT = this.mOutputItems[0].getTagCompound();

+                if (tNBT == null) {

+                    tNBT = new NBTTagCompound();

+                }     

+                tNBT.setTag("output", new NBTTagCompound());

+                tNBT.setInteger("time", tRecipe.mDuration);

+                tNBT.setInteger("eu", tRecipe.mEUt);

+                for(int i = 0 ; i < tRecipe.mInputs.length ; i++){

+                	

+                	tNBT.setTag(""+i, new NBTTagCompound());

+                }

+                for(int i = 0 ; i < tRecipe.mFluidInputs.length ; i++){

+                	

+                	tNBT.setTag("f"+i, new NBTTagCompound());

+                }

+                this.mOutputItems[0].setTagCompound(tNBT);

+                

+                aStack.stackSize -= 1;

+                this.mMaxProgresstime = (tRecipe.mResearchTime / (1 << this.mTier - 1));

+                this.mEUt = (30 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

+            	getSpecialSlot().stackSize -= 1;

+            	return 2;

+            	}

+            	}

+            }

 

         }

         return 0;