Merge pull request #251 from GTNewHorizons/Refactor

Refactor

10 files changed, 102 insertions, 71 deletions

diff --git a/src/main/java/gregtech/api/gui/GT_Container.java b/src/main/java/gregtech/api/gui/GT_Container.java
index 49aa1d9fe8..4ce583cff5 100644
--- a/src/main/java/gregtech/api/gui/GT_Container.java
+++ b/src/main/java/gregtech/api/gui/GT_Container.java
@@ -167,7 +167,7 @@ public class GT_Container extends Container {
                             aSlot.putStack(var13.splitStack(tTempStackSize));
 
                             if (var13.stackSize == 0) {
-                                aPlayerInventory.setItemStack((ItemStack) null);
+                                aPlayerInventory.setItemStack(null);
                             }
                         }
                     } else if (aSlot.canTakeStack(aPlayer)) {
@@ -176,7 +176,7 @@ public class GT_Container extends Container {
                             aHoldStack = aSlot.decrStackSize(tTempStackSize);
                             aPlayerInventory.setItemStack(aHoldStack);
                             if (tTempStack.stackSize == 0) {
-                                aSlot.putStack((ItemStack) null);
+                                aSlot.putStack(null);
                             }
                             aSlot.onPickupFromSlot(aPlayer, aPlayerInventory.getItemStack());
                         } else if (aSlot.isItemValid(var13)) {
@@ -190,7 +190,7 @@ public class GT_Container extends Container {
                                 }
                                 var13.splitStack(tTempStackSize);
                                 if (var13.stackSize == 0) {
-                                    aPlayerInventory.setItemStack((ItemStack) null);
+                                    aPlayerInventory.setItemStack(null);
                                 }
                                 tTempStack.stackSize += tTempStackSize;
                             } else if (var13.stackSize <= aSlot.getSlotStackLimit()) {
@@ -205,7 +205,7 @@ public class GT_Container extends Container {
                                 tTempStack = aSlot.decrStackSize(tTempStackSize);
 
                                 if (tTempStack.stackSize == 0) {
-                                    aSlot.putStack((ItemStack) null);
+                                    aSlot.putStack(null);
                                 }
 
                                 aSlot.onPickupFromSlot(aPlayer, aPlayerInventory.getItemStack());
@@ -225,7 +225,7 @@ public class GT_Container extends Container {
 
                 if (!var9) {
                     tTempStackSize = aPlayerInventory.getFirstEmptyStack();
-                    var9 |= tTempStackSize > -1;
+                    var9 = tTempStackSize > -1;
                 }
 
                 if (var9 && aSlot.getHasStack()) {
@@ -236,7 +236,7 @@ public class GT_Container extends Container {
                         if (tTempStackSize > -1) {
                             aPlayerInventory.addItemStackToInventory(tTempStack);
                             aSlot.decrStackSize(aHoldStack.stackSize);
-                            aSlot.putStack((ItemStack) null);
+                            aSlot.putStack(null);
                             aSlot.onPickupFromSlot(aPlayer, aHoldStack);
                         }
                     } else {
@@ -245,7 +245,7 @@ public class GT_Container extends Container {
                         aSlot.onPickupFromSlot(aPlayer, aHoldStack);
                     }
                 } else if (tTempStack != null && !aSlot.getHasStack() && aSlot.isItemValid(tTempStack)) {
-                    aPlayerInventory.setInventorySlotContents(aMouseclick, (ItemStack) null);
+                    aPlayerInventory.setInventorySlotContents(aMouseclick, null);
                     aSlot.putStack(tTempStack);
                 }
             }
@@ -315,18 +315,19 @@ public class GT_Container extends Container {
                 var8 = var7.getStack();
                 if (!(var7 instanceof GT_Slot_Holo) && !(var7 instanceof GT_Slot_Output) && var8 != null && var8.getItem() == aStack.getItem() && (!aStack.getHasSubtypes() || aStack.getItemDamage() == var8.getItemDamage()) && ItemStack.areItemStackTagsEqual(aStack, var8)) {
                     int var9 = var8.stackSize + aStack.stackSize;
-                    if(var8.stackSize<mTileEntity.getInventoryStackLimit()){
-                    if (var9 <= aStack.getMaxStackSize()) {
-                        aStack.stackSize = 0;
-                        var8.stackSize = var9;
-                        var7.onSlotChanged();
-                        var5 = true;
-                    } else if (var8.stackSize < aStack.getMaxStackSize()) {
-                        aStack.stackSize -= aStack.getMaxStackSize() - var8.stackSize;
-                        var8.stackSize = aStack.getMaxStackSize();
-                        var7.onSlotChanged();
-                        var5 = true;
-                    }}
+                    if (var8.stackSize < mTileEntity.getInventoryStackLimit()) {
+                        if (var9 <= aStack.getMaxStackSize()) {
+                            aStack.stackSize = 0;
+                            var8.stackSize = var9;
+                            var7.onSlotChanged();
+                            var5 = true;
+                        } else if (var8.stackSize < aStack.getMaxStackSize()) {
+                            aStack.stackSize -= aStack.getMaxStackSize() - var8.stackSize;
+                            var8.stackSize = aStack.getMaxStackSize();
+                            var7.onSlotChanged();
+                            var5 = true;
+                        }
+                    }
                 }
 
                 if (par4) {
@@ -348,7 +349,7 @@ public class GT_Container extends Container {
                 var8 = var7.getStack();
 
                 if (var8 == null) {
-                	int var10 = Math.min(aStack.stackSize, mTileEntity.getInventoryStackLimit());
+                    int var10 = Math.min(aStack.stackSize, mTileEntity.getInventoryStackLimit());
                     var7.putStack(GT_Utility.copyAmount(var10, aStack));
                     var7.onSlotChanged();
                     aStack.stackSize -= var10;
diff --git a/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java b/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java
index 14d2db52dd..33bdec53e1 100644
--- a/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java
+++ b/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java
@@ -8,8 +8,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ICrafting;
 
-import java.util.Iterator;
-
 /**
  * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
  * <p/>
@@ -17,8 +15,29 @@ import java.util.Iterator;
  */
 public class GT_ContainerMetaTile_Machine extends GT_Container {
 
-    public int mActive = 0, mMaxProgressTime = 0, mProgressTime = 0, mEnergy = 0, mSteam = 0, mSteamStorage = 0, mStorage = 0, mOutput = 0, mInput = 0, mID = 0, mDisplayErrorCode = 0;
-    private int oActive = 0, oMaxProgressTime = 0, oProgressTime = 0, oEnergy = 0, oSteam = 0, oSteamStorage = 0, oStorage = 0, oOutput = 0, oInput = 0, oID = 0, oDisplayErrorCode = 0, mTimer = 0;
+    public int mActive = 0,
+            mMaxProgressTime = 0,
+            mProgressTime = 0,
+            mEnergy = 0,
+            mSteam = 0,
+            mSteamStorage = 0,
+            mStorage = 0,
+            mOutput = 0,
+            mInput = 0,
+            mID = 0,
+            mDisplayErrorCode = 0;
+    private int oActive = 0,
+            oMaxProgressTime = 0,
+            oProgressTime = 0,
+            oEnergy = 0,
+            oSteam = 0,
+            oSteamStorage = 0,
+            oStorage = 0,
+            oOutput = 0,
+            oInput = 0,
+            oID = 0,
+            oDisplayErrorCode = 0,
+            mTimer = 0;
 
 
     public GT_ContainerMetaTile_Machine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
@@ -28,19 +47,22 @@ public class GT_ContainerMetaTile_Machine extends GT_Container {
 
         if (mTileEntity != null && mTileEntity.getMetaTileEntity() != null) {
             addSlots(aInventoryPlayer);
-            if (doesBindPlayerInventory()) bindPlayerInventory(aInventoryPlayer);
+            if (doesBindPlayerInventory())
+                bindPlayerInventory(aInventoryPlayer);
             detectAndSendChanges();
         } else {
             aInventoryPlayer.player.openContainer = aInventoryPlayer.player.inventoryContainer;
         }
     }
+
     public GT_ContainerMetaTile_Machine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, boolean doesBindInventory) {
         super(aInventoryPlayer, aTileEntity);
         mTileEntity = aTileEntity;
 
         if (mTileEntity != null && mTileEntity.getMetaTileEntity() != null) {
             addSlots(aInventoryPlayer);
-            if (doesBindPlayerInventory() && doesBindInventory) bindPlayerInventory(aInventoryPlayer);
+            if (doesBindPlayerInventory() && doesBindInventory)
+                bindPlayerInventory(aInventoryPlayer);
             detectAndSendChanges();
         } else {
             aInventoryPlayer.player.openContainer = aInventoryPlayer.player.inventoryContainer;
@@ -50,7 +72,8 @@ public class GT_ContainerMetaTile_Machine extends GT_Container {
     @Override
     public void detectAndSendChanges() {
         super.detectAndSendChanges();
-        if (mTileEntity.isClientSide() || mTileEntity.getMetaTileEntity() == null) return;
+        if (mTileEntity.isClientSide() || mTileEntity.getMetaTileEntity() == null)
+            return;
         mStorage = (int) Math.min(Integer.MAX_VALUE, mTileEntity.getEUCapacity());
         mEnergy = (int) Math.min(Integer.MAX_VALUE, mTileEntity.getStoredEU());
         mSteamStorage = (int) Math.min(Integer.MAX_VALUE, mTileEntity.getSteamCapacity());
@@ -63,9 +86,8 @@ public class GT_ContainerMetaTile_Machine extends GT_Container {
         mActive = mTileEntity.isActive() ? 1 : 0;
         mTimer++;
 
-        Iterator var2 = this.crafters.iterator();
-        while (var2.hasNext()) {
-            ICrafting var1 = (ICrafting) var2.next();
+        for (Object crafter : this.crafters) {
+            ICrafting var1 = (ICrafting) crafter;
             if (mTimer % 500 == 10 || oEnergy != mEnergy) {
                 var1.sendProgressBarUpdate(this, 0, mEnergy & 65535);
                 var1.sendProgressBarUpdate(this, 1, mEnergy >>> 16);
@@ -183,8 +205,8 @@ public class GT_ContainerMetaTile_Machine extends GT_Container {
     public boolean canInteractWith(EntityPlayer player) {
         return mTileEntity.isUseableByPlayer(player);
     }
-    
-    public String trans(String aKey, String aEnglish){
-    	return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_"+aKey, aEnglish, false);
+
+    public String trans(String aKey, String aEnglish) {
+        return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_" + aKey, aEnglish, false);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java b/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java
index 2dbc298d44..7e14061d2f 100644
--- a/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java
+++ b/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java
@@ -10,8 +10,6 @@ import net.minecraft.inventory.ICrafting;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import java.util.Iterator;
-
 /**
  * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
  * <p/>
@@ -19,7 +17,10 @@ import java.util.Iterator;
  */
 public class GT_Container_BasicMachine extends GT_Container_BasicTank {
 
-    public boolean mFluidTransfer = false, mItemTransfer = false, mStuttering = false;
+    public boolean
+            mFluidTransfer = false,
+            mItemTransfer = false,
+            mStuttering = false;
 
     public GT_Container_BasicMachine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
         super(aInventoryPlayer, aTileEntity);
@@ -201,9 +202,8 @@ public class GT_Container_BasicMachine extends GT_Container_BasicTank {
         mItemTransfer = ((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mItemTransfer;
         mStuttering = ((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mStuttering;
 
-        Iterator var2 = this.crafters.iterator();
-        while (var2.hasNext()) {
-            ICrafting var1 = (ICrafting) var2.next();
+        for (Object crafter : this.crafters) {
+            ICrafting var1 = (ICrafting) crafter;
             var1.sendProgressBarUpdate(this, 102, mFluidTransfer ? 1 : 0);
             var1.sendProgressBarUpdate(this, 103, mItemTransfer ? 1 : 0);
             var1.sendProgressBarUpdate(this, 104, mStuttering ? 1 : 0);
diff --git a/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java b/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java
index aeb0ef0c45..c80874eef4 100644
--- a/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java
+++ b/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java
@@ -8,8 +8,6 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ICrafting;
 import net.minecraft.inventory.Slot;
 
-import java.util.Iterator;
-
 /**
  * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
  * <p/>
@@ -38,9 +36,8 @@ public class GT_Container_BasicTank extends GT_ContainerMetaTile_Machine {
             mContent = ((GT_MetaTileEntity_BasicTank) mTileEntity.getMetaTileEntity()).mFluid.amount;
         else
             mContent = 0;
-        Iterator var2 = this.crafters.iterator();
-        while (var2.hasNext()) {
-            ICrafting var1 = (ICrafting) var2.next();
+        for (Object crafter : this.crafters) {
+            ICrafting var1 = (ICrafting) crafter;
             var1.sendProgressBarUpdate(this, 100, mContent & 65535);
             var1.sendProgressBarUpdate(this, 101, mContent >>> 16);
         }
diff --git a/src/main/java/gregtech/api/gui/GT_Container_MaintenanceHatch.java b/src/main/java/gregtech/api/gui/GT_Container_MaintenanceHatch.java
index 5c469f8704..c8a70e71f2 100644
--- a/src/main/java/gregtech/api/gui/GT_Container_MaintenanceHatch.java
+++ b/src/main/java/gregtech/api/gui/GT_Container_MaintenanceHatch.java
@@ -19,11 +19,13 @@ public class GT_Container_MaintenanceHatch extends GT_ContainerMetaTile_Machine
 
     @Override
     public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) {
-        if (aSlotIndex != 0) return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
+        if (aSlotIndex != 0)
+            return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
         ItemStack tStack = aPlayer.inventory.getItemStack();
         if (tStack != null) {
             ((GT_MetaTileEntity_Hatch_Maintenance) mTileEntity.getMetaTileEntity()).onToolClick(tStack, aPlayer);
-            if (tStack.stackSize <= 0) aPlayer.inventory.setItemStack(null);
+            if (tStack.stackSize <= 0)
+                aPlayer.inventory.setItemStack(null);
         }
         return null;
     }
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java b/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java
index 9cdb74c2f1..532ce85146 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java
@@ -28,11 +28,14 @@ public class GT_GUIContainerMetaTile_Machine extends GT_GUIContainer {
     protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
         super.drawGuiContainerBackgroundLayer(par1, par2, par3);
         if (GregTech_API.sColoredGUI && mContainer != null && mContainer.mTileEntity != null) {
-            byte colorByte=mContainer.mTileEntity.getColorization();
+            byte colorByte = mContainer.mTileEntity.getColorization();
             Dyes color;
-            if(colorByte != -1) color= Dyes.get(colorByte);
-            else color=Dyes.MACHINE_METAL;
-            GL11.glColor3ub((byte)color.mRGBa[0], (byte)color.mRGBa[1], (byte)color.mRGBa[2]);
-        } else GL11.glColor3ub((byte)255,(byte)255,(byte)255);
+            if (colorByte != -1)
+                color = Dyes.get(colorByte);
+            else
+                color = Dyes.MACHINE_METAL;
+            GL11.glColor3ub((byte) color.mRGBa[0], (byte) color.mRGBa[1], (byte) color.mRGBa[2]);
+        } else
+            GL11.glColor3ub((byte) 255, (byte) 255, (byte) 255);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java
index acf9d54c15..ae17087670 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java
@@ -16,7 +16,7 @@ public class GT_GUIContainer_2by2 extends GT_GUIContainerMetaTile_Machine {
 
     public GT_GUIContainer_2by2(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aBackground) {
         super(new GT_Container_2by2(aInventoryPlayer, aTileEntity), RES_PATH_GUI + aBackground + "2by2.png");
-                mName = aName;
+        mName = aName;
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java
index 0a2176010c..3bb802fcf7 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java
@@ -17,8 +17,12 @@ import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
  */
 public class GT_GUIContainer_BasicMachine extends GT_GUIContainerMetaTile_Machine {
 
-    public final String mName, mNEI;
-    public final byte mProgressBarDirection, mProgressBarAmount;
+    public final String
+            mName,
+            mNEI;
+    public final byte
+            mProgressBarDirection,
+            mProgressBarAmount;
 
     public GT_GUIContainer_BasicMachine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile, String aNEI) {
         this(aInventoryPlayer, aTileEntity, aName, aTextureFile, aNEI, (byte) 0, (byte) 1);
@@ -34,8 +38,8 @@ public class GT_GUIContainer_BasicMachine extends GT_GUIContainerMetaTile_Machin
 
     @Override
     public void drawScreen(int par1, int par2, float par3) {
-    	super.drawScreen(par1, par2, par3);
-    	drawTooltip(par1, par2);
+        super.drawScreen(par1, par2, par3);
+        drawTooltip(par1, par2);
     }
 
     @Override
@@ -48,7 +52,7 @@ public class GT_GUIContainer_BasicMachine extends GT_GUIContainerMetaTile_Machin
         int yStart = (height - ySize) / 2;
         int x = x2 - xStart;
         int y = y2 - yStart + 5;
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         if (y >= 67 && y <= 84) {
             if (x >= 7 && x <= 24) {
                 list.add("Fluid Auto-Output");
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 470f504f19..0620701311 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
@@ -13,7 +13,6 @@ import net.minecraft.item.ItemStack;
 import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
 
 
-
 /**
  * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
  * <p/>
@@ -36,27 +35,27 @@ public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machin
 
         if (mContainer != null) {//(mWrench ? 0 : 1) | (mScrewdriver ? 0 : 2) | (mSoftHammer ? 0 : 4) | (mHardHammer ? 0 : 8) | (mSolderingTool ? 0 : 16) | (mCrowbar ? 0 : 32) | (mMachine ? 0 : 64));
             if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 1) != 0)
-                fontRendererObj.drawString(trans("132","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(trans("133","Screws are loose."), 10, 24, 16448255);
+                fontRendererObj.drawString(trans("133", "Screws are loose."), 10, 24, 16448255);
             if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 4) != 0)
-                fontRendererObj.drawString(trans("134","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(trans("135","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(trans("136","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(trans("137","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(trans("138","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(trans("139","Hit with Soft Mallet"), 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);
+                    fontRendererObj.drawString(trans("139", "Hit with Soft Mallet"), 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(trans("142","Running perfectly."), 10, 16, 16448255);
+                    fontRendererObj.drawString(trans("142", "Running perfectly."), 10, 16, 16448255);
                 }
                 if (mContainer.mTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_DrillerBase) {
                     ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity().getStackInSlot(1);
diff --git a/src/main/java/gregtech/api/gui/GT_Slot_Holo.java b/src/main/java/gregtech/api/gui/GT_Slot_Holo.java
index c6b577514b..22d4f091a4 100644
--- a/src/main/java/gregtech/api/gui/GT_Slot_Holo.java
+++ b/src/main/java/gregtech/api/gui/GT_Slot_Holo.java
@@ -7,7 +7,9 @@ import net.minecraft.item.ItemStack;
 
 public class GT_Slot_Holo extends Slot {
     public final int mSlotIndex;
-    public boolean mCanInsertItem, mCanStackItem;
+    public boolean
+            mCanInsertItem,
+            mCanStackItem;
     public int mMaxStacksize = 127;
 
     public GT_Slot_Holo(IInventory par1iInventory, int par2, int par3, int par4, boolean aCanInsertItem, boolean aCanStackItem, int aMaxStacksize) {
@@ -35,7 +37,8 @@ public class GT_Slot_Holo extends Slot {
 
     @Override
     public ItemStack decrStackSize(int par1) {
-        if (!mCanStackItem) return null;
+        if (!mCanStackItem)
+            return null;
         return super.decrStackSize(par1);
     }