From dac1e2ac021991d1f73e64eea33ffcfb6737f27e Mon Sep 17 00:00:00 2001
From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Date: Sat, 16 Jun 2018 22:00:03 +0200
Subject: fixed Multiple items on one page

---
 .../gregtech/api/util/GT_Assemblyline_Server.java     |  2 +-
 .../machines/basic/GT_MetaTileEntity_Scanner.java     | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java b/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java
index 5ede304298..712699b760 100644
--- a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java
+++ b/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java
@@ -96,5 +96,5 @@ public class GT_Assemblyline_Server {
 		internal3 = null;
 		internal4 = null;
 	}
-
+		
 }
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 e77a9253ca..4fa4059108 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
@@ -223,8 +223,8 @@ public class GT_MetaTileEntity_Scanner
             	String s = tRecipe.mOutput.getDisplayName();
             	if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
             		s = GT_Assemblyline_Server.lServerNames.get(tRecipe.mOutput.getDisplayName());
-                if (s==null)
-               	 s=tRecipe.mOutput.getDisplayName();
+            		if (s==null)
+            			s=tRecipe.mOutput.getDisplayName();
             	}
             	this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{getSpecialSlot()});
                 GT_Utility.ItemNBT.setBookTitle(this.mOutputItems[0], s+" Construction Data");
@@ -255,8 +255,8 @@ public class GT_MetaTileEntity_Scanner
                 s=tRecipe.mOutput.getDisplayName();
                 if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
             		s = GT_Assemblyline_Server.lServerNames.get(tRecipe.mOutput.getDisplayName());
-                if (s==null)
-                	 s=tRecipe.mOutput.getDisplayName();
+            		if (s==null)
+            			s=tRecipe.mOutput.getDisplayName();
                 }
                 tNBTList.appendTag(new NBTTagString("Construction plan for "+tRecipe.mOutput.stackSize+" "+s+". Needed EU/t: "+tRecipe.mEUt+" Production time: "+(tRecipe.mDuration/20)));
                 for(int i=0;i<tRecipe.mInputs.length;i++){
@@ -266,6 +266,13 @@ public class GT_MetaTileEntity_Scanner
                 		for (ItemStack tStack : tRecipe.mOreDictAlt[i]) {
                 			if (tStack != null) {
                 				s=tStack.getDisplayName();
+                				if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
+                					s=GT_Assemblyline_Server.lServerNames.get(tStack.getDisplayName());
+                					if (s==null)
+                						s=tStack.getDisplayName();
+                				}
+                				
+                				
                 				tBuilder.append((count == 0 ? "" : "\nOr ") + tStack.stackSize+" "+s);
                     			count++;
                 			}
@@ -275,8 +282,8 @@ public class GT_MetaTileEntity_Scanner
                 		s=tRecipe.mInputs[i].getDisplayName();
                 		if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
                     		s = GT_Assemblyline_Server.lServerNames.get(tRecipe.mInputs[i].getDisplayName());
-                		if (s==null)
-                			s=tRecipe.mInputs[i].getDisplayName();
+                    		if (s==null)
+                    			s=tRecipe.mInputs[i].getDisplayName();
                 		}
                 		tNBTList.appendTag(new NBTTagString("Input Bus "+(i+1)+": "+tRecipe.mInputs[i].stackSize+" "+s));
                 	}
-- 
cgit