Merge remote-tracking branch 'origin/unstable' into OilRefining

Conflicts:
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java

1 files changed, 28 insertions, 23 deletions

diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
index 189e5d25f1..74723db0e9 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
@@ -1,6 +1,7 @@
 package gregtech.api.gui;
 
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
@@ -31,44 +32,48 @@ public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machin
 
         if (mContainer != null) {
             if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 1) != 0)
-                fontRendererObj.drawString("Pipe is loose.", 10, 16, 16448255);
+                fontRendererObj.drawString(trans("132", "Pipe is loose."), 10, 16, 16448255);
             if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 2) != 0)
-                fontRendererObj.drawString("Screws are missing.", 10, 24, 16448255);
+                fontRendererObj.drawString(trans("133", "Screws are missing."), 10, 24, 16448255);
             if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 4) != 0)
-                fontRendererObj.drawString("Something is stuck.", 10, 32, 16448255);
+                fontRendererObj.drawString(trans("134", "Something is stuck."), 10, 32, 16448255);
             if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 8) != 0)
-                fontRendererObj.drawString("Platings are dented.", 10, 40, 16448255);
+                fontRendererObj.drawString(trans("135", "Platings are dented."), 10, 40, 16448255);
             if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 16) != 0)
-                fontRendererObj.drawString("Circuitry burned out.", 10, 48, 16448255);
+                fontRendererObj.drawString(trans("136", "Circuitry burned out."), 10, 48, 16448255);
             if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 32) != 0)
-                fontRendererObj.drawString("That doesn't belong there.", 10, 56, 16448255);
+                fontRendererObj.drawString(trans("137", "That doesn't belong there."), 10, 56, 16448255);
             if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 64) != 0)
-                fontRendererObj.drawString("Incomplete Structure.", 10, 64, 16448255);
+                fontRendererObj.drawString(trans("138", "Incomplete Structure."), 10, 64, 16448255);
 
             if (((GT_Container_MultiMachine) mContainer).mDisplayErrorCode == 0) {
                 if (((GT_Container_MultiMachine) mContainer).mActive == 0) {
-                    fontRendererObj.drawString("Hit with Soft Hammer", 10, 16, 16448255);
-                    fontRendererObj.drawString("to (re-)start the Machine", 10, 24, 16448255);
-                    fontRendererObj.drawString("if it doesn't start.", 10, 32, 16448255);
+                    fontRendererObj.drawString(trans("139", "Hit with Soft Hammer"), 10, 16, 16448255);
+                    fontRendererObj.drawString(trans("140", "to (re-)start the Machine"), 10, 24, 16448255);
+                    fontRendererObj.drawString(trans("141", "if it doesn't start."), 10, 32, 16448255);
                 } else {
-                    fontRendererObj.drawString("Running perfectly.", 10, 16, 16448255);
+                    fontRendererObj.drawString(trans("142", "Running perfectly."), 10, 16, 16448255);
+                }
+                int id = mContainer.mTileEntity.getMetaTileID();
+                if (id == 1157 || id == 1158 || id == 1177 || id == 1178 || id == 1179) {
+                    ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity().getStackInSlot(1);
+                    if (tItem == null || !GT_Utility.areStacksEqual(tItem, GT_ModHandler.getIC2Item("miningPipe", 1L))) {
+                        fontRendererObj.drawString(trans("143", "Missing Mining Pipe"), 10, ((GT_Container_MultiMachine) mContainer).mActive == 0 ? 40 : 24, 16448255);
+                    }
+                } else if (id == 1131 || id == 1151 || id == 1152 || id == 1153) {
+                    ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity().getStackInSlot(1);
+                    if (tItem == null || !(tItem.getItem() == GT_MetaGenerated_Tool_01.INSTANCE && tItem.getItemDamage() >= 170 && tItem.getItemDamage() <= 177)) {
+                        fontRendererObj.drawString(trans("144", "Missing Turbine Rotor"), 10, ((GT_Container_MultiMachine) mContainer).mActive == 0 ? 40 : 24, 16448255);
+                    }
                 }
-                	int id = mContainer.mTileEntity.getMetaTileID();
-                   if(id == 1157 || id == 1158){
-                    	ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity().getStackInSlot(1);
-                    	if(tItem==null || !GT_Utility.areStacksEqual(tItem, GT_ModHandler.getIC2Item("miningPipe", 1L))){
-                    		fontRendererObj.drawString("Missing Mining Pipe", 10,((GT_Container_MultiMachine) mContainer).mActive == 0 ? 40 : 24, 16448255);
-                    	}
-                    }else if(id == 1131 || id == 1151 || id == 1152 || id == 1153){
-                    	ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity().getStackInSlot(1);
-                    	if(tItem==null || !(tItem.getItem()==GT_MetaGenerated_Tool_01.INSTANCE&&tItem.getItemDamage()>=170&&tItem.getItemDamage()<=177)){
-                    		fontRendererObj.drawString("Missing Turbine Rotor", 10, ((GT_Container_MultiMachine) mContainer).mActive == 0 ? 40 : 24, 16448255);
-                    	}
-                    }                
             }
         }
     }
 
+    public String trans(String aKey, String aEnglish) {
+        return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_" + aKey, aEnglish, false);
+    }
+
     @Override
     protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
         super.drawGuiContainerBackgroundLayer(par1, par2, par3);