Update buildscript & apply spotless (#1306)

* Update dependencies

* Update buildscript, apply spotless

7 files changed, 193 insertions, 161 deletions

diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java
index ffd1fd0e4a..8c844b8071 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java
@@ -1,5 +1,9 @@
 package gregtech.common.tileentities.storage;
 
+import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
+import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SCHEST;
+import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SCHEST_GLOW;
+
 import cpw.mods.fml.common.Optional;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
@@ -11,6 +15,8 @@ import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.gui.GT_Container_QuantumChest;
 import gregtech.common.gui.GT_GUIContainer_QuantumChest;
+import java.util.HashMap;
+import java.util.Map;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -18,26 +24,21 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SCHEST;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SCHEST_GLOW;
-
 @Optional.Interface(iface = "appeng.api.storage.IMEMonitor", modid = "appliedenergistics2", striprefs = true)
-public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEntity_TieredMachineBlock implements appeng.api.storage.IMEMonitor<appeng.api.storage.data.IAEItemStack> {
+public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEntity_TieredMachineBlock
+        implements appeng.api.storage.IMEMonitor<appeng.api.storage.data.IAEItemStack> {
     protected boolean mVoidOverflow = false;
     public boolean voidBreak;
-    private Map<appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack>, Object> listeners = null;
+    private Map<appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack>, Object> listeners =
+            null;
 
     public GT_MetaTileEntity_DigitalChestBase(int aID, String aName, String aNameRegional, int aTier) {
-        super(aID, aName, aNameRegional, aTier, 3, new String[]{
-                "This Chest stores " + GT_Utility.formatNumbers(commonSizeCompute(aTier)) + " Blocks",
-                "Use a screwdriver to enable",
-                "voiding items on overflow",
-                "Can keep its contents when harvested",
-                "Sneak when harvesting to void its contents"
+        super(aID, aName, aNameRegional, aTier, 3, new String[] {
+            "This Chest stores " + GT_Utility.formatNumbers(commonSizeCompute(aTier)) + " Blocks",
+            "Use a screwdriver to enable",
+            "voiding items on overflow",
+            "Can keep its contents when harvested",
+            "Sneak when harvesting to void its contents"
         });
     }
 
@@ -72,28 +73,35 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_DigitalChestBase(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public GT_MetaTileEntity_DigitalChestBase(
+            String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
     @Optional.Method(modid = "appliedenergistics2")
     public static void registerAEIntegration() {
-        appeng.api.AEApi.instance().registries().externalStorage().addExternalStorageInterface(new AE2DigitalChestHandler());
+        appeng.api.AEApi.instance()
+                .registries()
+                .externalStorage()
+                .addExternalStorageInterface(new AE2DigitalChestHandler());
     }
 
     @Optional.Method(modid = "appliedenergistics2")
     @Override
-    public void addListener(appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack> imeMonitorHandlerReceiver, Object o) {
-        if (listeners == null)
-            listeners = new HashMap<>();
+    public void addListener(
+            appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack>
+                    imeMonitorHandlerReceiver,
+            Object o) {
+        if (listeners == null) listeners = new HashMap<>();
         listeners.put(imeMonitorHandlerReceiver, o);
     }
 
     @Optional.Method(modid = "appliedenergistics2")
     @Override
-    public void removeListener(appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack> imeMonitorHandlerReceiver) {
-        if (listeners == null)
-            listeners = new HashMap<>();
+    public void removeListener(
+            appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack>
+                    imeMonitorHandlerReceiver) {
+        if (listeners == null) listeners = new HashMap<>();
         listeners.remove(imeMonitorHandlerReceiver);
     }
 
@@ -107,8 +115,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
     @Override
     public boolean isPrioritized(appeng.api.storage.data.IAEItemStack iaeItemStack) {
         ItemStack s = getItemStack();
-        if (s == null || iaeItemStack == null)
-            return false;
+        if (s == null || iaeItemStack == null) return false;
         return iaeItemStack.isSameType(s);
     }
 
@@ -116,8 +123,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
     @Override
     public boolean canAccept(appeng.api.storage.data.IAEItemStack iaeItemStack) {
         ItemStack s = getItemStack();
-        if (s == null || iaeItemStack == null)
-            return true;
+        if (s == null || iaeItemStack == null) return true;
         return iaeItemStack.isSameType(s);
     }
 
@@ -145,7 +151,8 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
 
     @Override
     @Optional.Method(modid = "appliedenergistics2")
-    public appeng.api.storage.data.IItemList<appeng.api.storage.data.IAEItemStack> getAvailableItems(final appeng.api.storage.data.IItemList out) {
+    public appeng.api.storage.data.IItemList<appeng.api.storage.data.IAEItemStack> getAvailableItems(
+            final appeng.api.storage.data.IItemList out) {
         ItemStack storedStack = getItemStack();
         if (storedStack != null) {
             appeng.util.item.AEItemStack s = appeng.util.item.AEItemStack.create(storedStack);
@@ -195,12 +202,13 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
 
     @Override
     @Optional.Method(modid = "appliedenergistics2")
-    public appeng.api.storage.data.IAEItemStack injectItems(final appeng.api.storage.data.IAEItemStack input, final appeng.api.config.Actionable mode, final appeng.api.networking.security.BaseActionSource src) {
+    public appeng.api.storage.data.IAEItemStack injectItems(
+            final appeng.api.storage.data.IAEItemStack input,
+            final appeng.api.config.Actionable mode,
+            final appeng.api.networking.security.BaseActionSource src) {
         final ItemStack inputStack = input.getItemStack();
-        if (inputStack == null)
-            return null;
-        if (getBaseMetaTileEntity() == null)
-            return input;
+        if (inputStack == null) return null;
+        if (getBaseMetaTileEntity() == null) return input;
         if (mode != appeng.api.config.Actionable.SIMULATE)
             getBaseMetaTileEntity().markDirty();
         ItemStack storedStack = getItemStack();
@@ -208,8 +216,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
             if (GT_Utility.areStacksEqual(storedStack, inputStack)) {
                 if (input.getStackSize() + getItemCount() > getMaxItemCount()) {
                     if (mVoidOverflow) {
-                        if (mode != appeng.api.config.Actionable.SIMULATE)
-                            setItemCount(getMaxItemCount());
+                        if (mode != appeng.api.config.Actionable.SIMULATE) setItemCount(getMaxItemCount());
                         return null;
                     }
                     return createOverflowStack(input.getStackSize() + getItemCount(), mode);
@@ -220,12 +227,9 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
             }
             return input;
         }
-        if (mode != appeng.api.config.Actionable.SIMULATE)
-            setItemStack(inputStack.copy());
-        if (input.getStackSize() > getMaxItemCount())
-            return createOverflowStack(input.getStackSize(), mode);
-        if (mode != appeng.api.config.Actionable.SIMULATE)
-            setItemCount((int) input.getStackSize());
+        if (mode != appeng.api.config.Actionable.SIMULATE) setItemStack(inputStack.copy());
+        if (input.getStackSize() > getMaxItemCount()) return createOverflowStack(input.getStackSize(), mode);
+        if (mode != appeng.api.config.Actionable.SIMULATE) setItemCount((int) input.getStackSize());
         return null;
     }
 
@@ -233,24 +237,24 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
     private appeng.api.storage.data.IAEItemStack createOverflowStack(long size, appeng.api.config.Actionable mode) {
         final appeng.api.storage.data.IAEItemStack overflow = appeng.util.item.AEItemStack.create(getItemStack());
         overflow.setStackSize(size - getMaxItemCount());
-        if (mode != appeng.api.config.Actionable.SIMULATE)
-            setItemCount(getMaxItemCount());
+        if (mode != appeng.api.config.Actionable.SIMULATE) setItemCount(getMaxItemCount());
         return overflow;
     }
 
     @Override
     @Optional.Method(modid = "appliedenergistics2")
-    public appeng.api.storage.data.IAEItemStack extractItems(final appeng.api.storage.data.IAEItemStack request, final appeng.api.config.Actionable mode, final appeng.api.networking.security.BaseActionSource src) {
+    public appeng.api.storage.data.IAEItemStack extractItems(
+            final appeng.api.storage.data.IAEItemStack request,
+            final appeng.api.config.Actionable mode,
+            final appeng.api.networking.security.BaseActionSource src) {
         if (request.isSameType(getItemStack())) {
-            if (getBaseMetaTileEntity() == null)
-                return null;
+            if (getBaseMetaTileEntity() == null) return null;
             if (mode != appeng.api.config.Actionable.SIMULATE)
                 getBaseMetaTileEntity().markDirty();
             if (request.getStackSize() >= getItemCount()) {
                 appeng.util.item.AEItemStack result = appeng.util.item.AEItemStack.create(getItemStack());
                 result.setStackSize(getItemCount());
-                if (mode != appeng.api.config.Actionable.SIMULATE)
-                    setItemCount(0);
+                if (mode != appeng.api.config.Actionable.SIMULATE) setItemCount(0);
                 return result;
             } else {
                 if (mode != appeng.api.config.Actionable.SIMULATE)
@@ -270,7 +274,10 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
     @Override
     public final void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         mVoidOverflow = !mVoidOverflow;
-        GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal(mVoidOverflow ? "GT5U.machines.voidoveflow.enabled" : "GT5U.machines.voidoveflow.disabled"));
+        GT_Utility.sendChatToPlayer(
+                aPlayer,
+                StatCollector.translateToLocal(
+                        mVoidOverflow ? "GT5U.machines.voidoveflow.enabled" : "GT5U.machines.voidoveflow.disabled"));
     }
 
     @Override
@@ -288,7 +295,9 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
             ItemStack stack = getItemStack();
             int savedCount = count;
 
-            if ((mInventory[0] != null) && ((count < getMaxItemCount()) || mVoidOverflow) && GT_Utility.areStacksEqual(mInventory[0], stack)) {
+            if ((mInventory[0] != null)
+                    && ((count < getMaxItemCount()) || mVoidOverflow)
+                    && GT_Utility.areStacksEqual(mInventory[0], stack)) {
                 count += mInventory[0].stackSize;
                 if (count <= getMaxItemCount()) {
                     mInventory[0] = null;
@@ -305,7 +314,9 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
                 mInventory[1] = stack.copy();
                 mInventory[1].stackSize = Math.min(stack.getMaxStackSize(), count);
                 count -= mInventory[1].stackSize;
-            } else if ((count > 0) && GT_Utility.areStacksEqual(mInventory[1], stack) && mInventory[1].getMaxStackSize() > mInventory[1].stackSize) {
+            } else if ((count > 0)
+                    && GT_Utility.areStacksEqual(mInventory[1], stack)
+                    && mInventory[1].getMaxStackSize() > mInventory[1].stackSize) {
                 int tmp = Math.min(count, mInventory[1].getMaxStackSize() - mInventory[1].stackSize);
                 mInventory[1].stackSize += tmp;
                 count -= tmp;
@@ -318,10 +329,8 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
                 mInventory[2] = null;
             }
 
-            if (GregTech_API.mAE2)
-                notifyListeners(count - savedCount, stack);
-            if (count != savedCount)
-                getBaseMetaTileEntity().markDirty();
+            if (GregTech_API.mAE2) notifyListeners(count - savedCount, stack);
+            if (count != savedCount) getBaseMetaTileEntity().markDirty();
         }
     }
 
@@ -359,7 +368,9 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
 
     @Override
     public int getProgresstime() {
-        return getItemCount() + (mInventory[0] == null ? 0 : mInventory[0].stackSize) + (mInventory[1] == null ? 0 : mInventory[1].stackSize);
+        return getItemCount()
+                + (mInventory[0] == null ? 0 : mInventory[0].stackSize)
+                + (mInventory[1] == null ? 0 : mInventory[1].stackSize);
     }
 
     @Override
@@ -376,20 +387,20 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
     public String[] getInfoData() {
 
         if (getItemStack() == null) {
-            return new String[]{
-                    EnumChatFormatting.BLUE + chestName() + EnumChatFormatting.RESET,
-                    "Stored Items:",
-                    EnumChatFormatting.GOLD + "No Items" + EnumChatFormatting.RESET,
-                    EnumChatFormatting.GREEN + "0" + EnumChatFormatting.RESET + " " +
-                            EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(getMaxItemCount()) + EnumChatFormatting.RESET
-            };
-        }
-        return new String[]{
+            return new String[] {
                 EnumChatFormatting.BLUE + chestName() + EnumChatFormatting.RESET,
                 "Stored Items:",
-                EnumChatFormatting.GOLD + getItemStack().getDisplayName() + EnumChatFormatting.RESET,
-                EnumChatFormatting.GREEN + GT_Utility.formatNumbers(getItemCount()) + EnumChatFormatting.RESET + " " +
-                        EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(getMaxItemCount()) + EnumChatFormatting.RESET
+                EnumChatFormatting.GOLD + "No Items" + EnumChatFormatting.RESET,
+                EnumChatFormatting.GREEN + "0" + EnumChatFormatting.RESET + " " + EnumChatFormatting.YELLOW
+                        + GT_Utility.formatNumbers(getMaxItemCount()) + EnumChatFormatting.RESET
+            };
+        }
+        return new String[] {
+            EnumChatFormatting.BLUE + chestName() + EnumChatFormatting.RESET,
+            "Stored Items:",
+            EnumChatFormatting.GOLD + getItemStack().getDisplayName() + EnumChatFormatting.RESET,
+            EnumChatFormatting.GREEN + GT_Utility.formatNumbers(getItemCount()) + EnumChatFormatting.RESET + " "
+                    + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(getMaxItemCount()) + EnumChatFormatting.RESET
         };
     }
 
@@ -406,31 +417,25 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
             listeners = new HashMap<>();
             return;
         }
-        if (count == 0 || stack == null)
-            return;
+        if (count == 0 || stack == null) return;
         appeng.util.item.ItemList change = new appeng.util.item.ItemList();
         appeng.util.item.AEItemStack s = appeng.util.item.AEItemStack.create(stack);
         s.setStackSize(count);
         change.add(s);
         listeners.forEach((l, o) -> {
-            if (l.isValid(o))
-                l.postChange(this, change, null);
-            else
-                removeListener(l);
+            if (l.isValid(o)) l.postChange(this, change, null);
+            else removeListener(l);
         });
     }
 
     @Optional.Method(modid = "appliedenergistics2")
     private boolean hasActiveMEConnection() {
-        if (listeners == null || listeners.isEmpty())
-            return false;
-        for (Map.Entry<appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack>, Object> e : listeners.entrySet())
-        {
-            if ((e.getKey() instanceof appeng.api.parts.IPart))
-            {
+        if (listeners == null || listeners.isEmpty()) return false;
+        for (Map.Entry<appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack>, Object> e :
+                listeners.entrySet()) {
+            if ((e.getKey() instanceof appeng.api.parts.IPart)) {
                 appeng.api.networking.IGridNode n = ((appeng.api.parts.IPart) e.getKey()).getGridNode();
-                if (n != null && n.isActive())
-                    return true;
+                if (n != null && n.isActive()) return true;
             }
         }
         // if there are no active storage buses - clear the listeners
@@ -441,42 +446,43 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
     @Override
     public void saveNBTData(NBTTagCompound aNBT) {
         aNBT.setInteger("mItemCount", getItemCount());
-        if (getItemStack() != null)
-            aNBT.setTag("mItemStack", getItemStack().writeToNBT(new NBTTagCompound()));
+        if (getItemStack() != null) aNBT.setTag("mItemStack", getItemStack().writeToNBT(new NBTTagCompound()));
         aNBT.setBoolean("mVoidOverflow", mVoidOverflow);
     }
 
     @Override
     public void loadNBTData(NBTTagCompound aNBT) {
-        if (aNBT.hasKey("mItemCount"))
-            setItemCount(aNBT.getInteger("mItemCount"));
+        if (aNBT.hasKey("mItemCount")) setItemCount(aNBT.getInteger("mItemCount"));
         if (aNBT.hasKey("mItemStack"))
             setItemStack(ItemStack.loadItemStackFromNBT((NBTTagCompound) aNBT.getTag("mItemStack")));
         mVoidOverflow = aNBT.getBoolean("mVoidOverflow");
-
     }
 
     @Override
     public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
-        if (GregTech_API.mAE2 && GT_Values.disableDigitalChestsExternalAccess && hasActiveMEConnection())
-            return false;
+        if (GregTech_API.mAE2 && GT_Values.disableDigitalChestsExternalAccess && hasActiveMEConnection()) return false;
         return aIndex == 1;
     }
 
     @Override
     public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
-        if (GregTech_API.mAE2 && GT_Values.disableDigitalChestsExternalAccess && hasActiveMEConnection())
-            return false;
+        if (GregTech_API.mAE2 && GT_Values.disableDigitalChestsExternalAccess && hasActiveMEConnection()) return false;
         return aIndex == 0 && (mInventory[0] == null || GT_Utility.areStacksEqual(mInventory[0], aStack));
     }
 
     @Override
-    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
-        if (aSide != aFacing) return new ITexture[]{MACHINE_CASINGS[mTier][aColorIndex + 1]};
-        return new ITexture[]{
-                MACHINE_CASINGS[mTier][aColorIndex + 1],
-                TextureFactory.of(OVERLAY_SCHEST),
-                TextureFactory.builder().addIcon(OVERLAY_SCHEST_GLOW).glow().build()
+    public ITexture[] getTexture(
+            IGregTechTileEntity aBaseMetaTileEntity,
+            byte aSide,
+            byte aFacing,
+            byte aColorIndex,
+            boolean aActive,
+            boolean aRedstone) {
+        if (aSide != aFacing) return new ITexture[] {MACHINE_CASINGS[mTier][aColorIndex + 1]};
+        return new ITexture[] {
+            MACHINE_CASINGS[mTier][aColorIndex + 1],
+            TextureFactory.of(OVERLAY_SCHEST),
+            TextureFactory.builder().addIcon(OVERLAY_SCHEST_GLOW).glow().build()
         };
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java
index 2567a80252..6b2a9caf4b 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java
@@ -1,5 +1,9 @@
 package gregtech.common.tileentities.storage;
 
+import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
+import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_QTANK;
+import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_QTANK_GLOW;
+
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
@@ -13,17 +17,12 @@ import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 
-import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_QTANK;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_QTANK_GLOW;
-
 public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntity_BasicTank {
     protected boolean mVoidOverflow = false;
     private boolean voidBreak;
 
-
     public GT_MetaTileEntity_DigitalTankBase(int aID, String aName, String aNameRegional, int aTier) {
-        super(aID, aName, aNameRegional, aTier, 3, new String[]{
+        super(aID, aName, aNameRegional, aTier, 3, new String[] {
             "Stores " + GT_Utility.formatNumbers(commonSizeCompute(aTier)) + "L of fluid",
             "Use a screwdriver to enable",
             "voiding fluid on overflow",
@@ -59,7 +58,6 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
         }
     }
 
-
     public GT_MetaTileEntity_DigitalTankBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
@@ -84,7 +82,6 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
         super.setItemNBT(aNBT);
     }
 
-
     @Override
     public void saveNBTData(NBTTagCompound aNBT) {
         super.saveNBTData(aNBT);
@@ -97,7 +94,6 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
         mVoidOverflow = aNBT.getBoolean("mVoidOverflow");
     }
 
-
     @Override
     public boolean isSimpleMachine() {
         return true;
@@ -134,9 +130,15 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
     }
 
     @Override
-    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
-        if (aSide != ForgeDirection.UP.ordinal()) return new ITexture[]{MACHINE_CASINGS[mTier][aColorIndex + 1]};
-        return new ITexture[]{
+    public ITexture[] getTexture(
+            IGregTechTileEntity aBaseMetaTileEntity,
+            byte aSide,
+            byte aFacing,
+            byte aColorIndex,
+            boolean aActive,
+            boolean aRedstone) {
+        if (aSide != ForgeDirection.UP.ordinal()) return new ITexture[] {MACHINE_CASINGS[mTier][aColorIndex + 1]};
+        return new ITexture[] {
             MACHINE_CASINGS[mTier][aColorIndex + 1],
             TextureFactory.of(OVERLAY_QTANK),
             TextureFactory.builder().addIcon(OVERLAY_QTANK_GLOW).glow().build()
@@ -158,7 +160,10 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
     @Override
     public final void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         mVoidOverflow = !mVoidOverflow;
-        GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal(mVoidOverflow ? "GT5U.machines.voidoveflow.enabled" : "GT5U.machines.voidoveflow.disabled"));
+        GT_Utility.sendChatToPlayer(
+                aPlayer,
+                StatCollector.translateToLocal(
+                        mVoidOverflow ? "GT5U.machines.voidoveflow.enabled" : "GT5U.machines.voidoveflow.disabled"));
     }
 
     @Override
@@ -185,8 +190,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
             if (isFluidChangingAllowed() && getFillableStack() != null && getFillableStack().amount <= 0)
                 setFillableStack(null);
 
-            if (mOpenerCount > 0)
-                updateFluidDisplayItem();
+            if (mOpenerCount > 0) updateFluidDisplayItem();
 
             if (doesEmptyContainers()) {
                 FluidStack tFluid = GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true);
@@ -196,7 +200,10 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
                             if ((tFluid.amount <= getRealCapacity()) || mVoidOverflow) {
                                 tFluid = tFluid.copy();
                                 tFluid.amount = Math.min(tFluid.amount, getRealCapacity());
-                                if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), GT_Utility.getContainerForFilledItem(mInventory[getInputSlot()], true), 1)) {
+                                if (aBaseMetaTileEntity.addStackToSlot(
+                                        getOutputSlot(),
+                                        GT_Utility.getContainerForFilledItem(mInventory[getInputSlot()], true),
+                                        1)) {
                                     setFillableStack(tFluid);
                                     this.onEmptyingContainerWhenEmpty();
                                     aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
@@ -205,9 +212,14 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
                         }
                     } else {
                         if (tFluid.isFluidEqual(getFillableStack())) {
-                            if ((((long) tFluid.amount + getFillableStack().amount) <= (long) getRealCapacity()) || mVoidOverflow) {
-                                if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), GT_Utility.getContainerForFilledItem(mInventory[getInputSlot()], true), 1)) {
-                                    getFillableStack().amount += Math.min(tFluid.amount, getRealCapacity() - getFillableStack().amount);
+                            if ((((long) tFluid.amount + getFillableStack().amount) <= (long) getRealCapacity())
+                                    || mVoidOverflow) {
+                                if (aBaseMetaTileEntity.addStackToSlot(
+                                        getOutputSlot(),
+                                        GT_Utility.getContainerForFilledItem(mInventory[getInputSlot()], true),
+                                        1)) {
+                                    getFillableStack().amount +=
+                                            Math.min(tFluid.amount, getRealCapacity() - getFillableStack().amount);
                                     aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
                                 }
                             }
@@ -217,7 +229,8 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
             }
 
             if (doesFillContainers()) {
-                ItemStack tOutput = GT_Utility.fillFluidContainer(getDrainableStack(), mInventory[getInputSlot()], false, true);
+                ItemStack tOutput =
+                        GT_Utility.fillFluidContainer(getDrainableStack(), mInventory[getInputSlot()], false, true);
                 if (tOutput != null && aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), tOutput, 1)) {
                     FluidStack tFluid = GT_Utility.getFluidForFilledItem(tOutput, true);
                     aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
@@ -230,8 +243,11 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
 
     @Override
     public int fill(FluidStack aFluid, boolean doFill) {
-        if (aFluid == null || aFluid.getFluid().getID() <= 0 || aFluid.amount <= 0 || !canTankBeFilled() || !isFluidInputAllowed(aFluid))
-            return 0;
+        if (aFluid == null
+                || aFluid.getFluid().getID() <= 0
+                || aFluid.amount <= 0
+                || !canTankBeFilled()
+                || !isFluidInputAllowed(aFluid)) return 0;
         if (getFillableStack() != null && !getFillableStack().isFluidEqual(aFluid)) {
             return 0;
         }
@@ -276,7 +292,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
         return mVoidOverflow ? Integer.MAX_VALUE : getRealCapacity();
     }
 
-    public int getRealCapacity(){
+    public int getRealCapacity() {
         return commonSizeCompute(mTier);
     }
 
@@ -292,6 +308,6 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
 
     @Override
     public FluidTankInfo[] getTankInfo(ForgeDirection aSide) {
-        return new FluidTankInfo[]{getInfo()};
+        return new FluidTankInfo[] {getInfo()};
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java
index ce8380f419..b4d5345391 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java
@@ -1,5 +1,10 @@
 package gregtech.common.tileentities.storage;
 
+import static gregtech.api.enums.Textures.BlockIcons.LOCKERS;
+import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
+import static gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_IN;
+import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_LOCKER;
+
 import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -12,11 +17,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
-import static gregtech.api.enums.Textures.BlockIcons.LOCKERS;
-import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_IN;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_LOCKER;
-
 public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlock {
     public byte mType = 0;
 
@@ -55,9 +55,19 @@ public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlo
     }
 
     @Override
-    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+    public ITexture[] getTexture(
+            IGregTechTileEntity aBaseMetaTileEntity,
+            byte aSide,
+            byte aFacing,
+            byte aColorIndex,
+            boolean aActive,
+            boolean aRedstone) {
         if (aSide == aFacing) {
-            return new ITexture[]{this.mTextures[2][(aColorIndex + 1)][0], this.mTextures[2][(aColorIndex + 1)][1], LOCKERS[Math.abs(this.mType % LOCKERS.length)]};
+            return new ITexture[] {
+                this.mTextures[2][(aColorIndex + 1)][0],
+                this.mTextures[2][(aColorIndex + 1)][1],
+                LOCKERS[Math.abs(this.mType % LOCKERS.length)]
+            };
         }
         return this.mTextures[0][(aColorIndex + 1)];
     }
@@ -172,7 +182,8 @@ public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlo
     }
 
     @Override
-    public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) {
+    public boolean onRightclick(
+            IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) {
         if ((aBaseMetaTileEntity.isServerSide()) && (aSide == aBaseMetaTileEntity.getFrontFacing())) {
             for (int i = 0; i < 4; i++) {
                 ItemStack tSwapStack = this.mInventory[i];
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
index f991fea66e..384b55cc4c 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
@@ -47,8 +47,7 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_DigitalChe
                     mInvData.appendTag(tNBT);
                 }
             }
-            if (mItemStack != null)
-                aNBT.setTag("mItemStack", getItemStack().writeToNBT(new NBTTagCompound()));
+            if (mItemStack != null) aNBT.setTag("mItemStack", getItemStack().writeToNBT(new NBTTagCompound()));
             aNBT.setTag("Inventory", mInvData);
             aNBT.setInteger("mItemCount", getItemCount());
             aNBT.setBoolean("mVoidOverflow", mVoidOverflow);
@@ -58,7 +57,7 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_DigitalChe
 
     @Override
     protected String chestName() {
-        return  "Quantum Chest";
+        return "Quantum Chest";
     }
 
     @Override
@@ -73,7 +72,7 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_DigitalChe
 
     @Override
     protected ItemStack getItemStack() {
-        return  mItemStack;
+        return mItemStack;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java
index da283a19d8..886dd676e7 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java
@@ -28,21 +28,22 @@ public class GT_MetaTileEntity_QuantumTank extends GT_MetaTileEntity_DigitalTank
     public String[] getInfoData() {
 
         if (mFluid == null) {
-            return new String[]{
-                    EnumChatFormatting.BLUE + "Quantum Tank" + EnumChatFormatting.RESET,
-                    "Stored Fluid:",
-                    EnumChatFormatting.GOLD + "No Fluid" + EnumChatFormatting.RESET,
-                    EnumChatFormatting.GREEN + Integer.toString(0) + " L" + EnumChatFormatting.RESET + " " +
-                            EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(getCapacity()) + " L" + EnumChatFormatting.RESET
-            };
-        }
-        return new String[]{
+            return new String[] {
                 EnumChatFormatting.BLUE + "Quantum Tank" + EnumChatFormatting.RESET,
                 "Stored Fluid:",
-                EnumChatFormatting.GOLD + mFluid.getLocalizedName() + EnumChatFormatting.RESET,
-                EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mFluid.amount) + " L" + EnumChatFormatting.RESET + " " +
-                        EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(getCapacity()) + " L" + EnumChatFormatting.RESET
+                EnumChatFormatting.GOLD + "No Fluid" + EnumChatFormatting.RESET,
+                EnumChatFormatting.GREEN + Integer.toString(0) + " L" + EnumChatFormatting.RESET + " "
+                        + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(getCapacity()) + " L"
+                        + EnumChatFormatting.RESET
+            };
+        }
+        return new String[] {
+            EnumChatFormatting.BLUE + "Quantum Tank" + EnumChatFormatting.RESET,
+            "Stored Fluid:",
+            EnumChatFormatting.GOLD + mFluid.getLocalizedName() + EnumChatFormatting.RESET,
+            EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mFluid.amount) + " L" + EnumChatFormatting.RESET + " "
+                    + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(getCapacity()) + " L"
+                    + EnumChatFormatting.RESET
         };
     }
-
 }
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperChest.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperChest.java
index 92f9aec998..f2be7312ec 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperChest.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperChest.java
@@ -42,8 +42,7 @@ public class GT_MetaTileEntity_SuperChest extends GT_MetaTileEntity_DigitalChest
                     mInvData.appendTag(tNBT);
                 }
             }
-            if (mItemStack != null)
-                aNBT.setTag("mItemStack", getItemStack().writeToNBT(new NBTTagCompound()));
+            if (mItemStack != null) aNBT.setTag("mItemStack", getItemStack().writeToNBT(new NBTTagCompound()));
             aNBT.setTag("Inventory", mInvData);
             aNBT.setInteger("mItemCount", getItemCount());
             aNBT.setBoolean("mVoidOverflow", mVoidOverflow);
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java
index dbe54e9005..3b7fb8e849 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java
@@ -28,21 +28,21 @@ public class GT_MetaTileEntity_SuperTank extends GT_MetaTileEntity_DigitalTankBa
     public String[] getInfoData() {
 
         if (mFluid == null) {
-            return new String[]{
-                    EnumChatFormatting.BLUE + "Super Tank" + EnumChatFormatting.RESET,
-                    "Stored Fluid:",
-                    EnumChatFormatting.GOLD + "No Fluid" + EnumChatFormatting.RESET,
-                    EnumChatFormatting.GREEN + "0 L" + EnumChatFormatting.RESET + " " +
-                            EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(getCapacity()) + " L" + EnumChatFormatting.RESET
-            };
-        }
-        return new String[]{
+            return new String[] {
                 EnumChatFormatting.BLUE + "Super Tank" + EnumChatFormatting.RESET,
                 "Stored Fluid:",
-                EnumChatFormatting.GOLD + mFluid.getLocalizedName() + EnumChatFormatting.RESET,
-                EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mFluid.amount) + " L" + EnumChatFormatting.RESET + " " +
-                        EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(getCapacity()) + " L" + EnumChatFormatting.RESET
+                EnumChatFormatting.GOLD + "No Fluid" + EnumChatFormatting.RESET,
+                EnumChatFormatting.GREEN + "0 L" + EnumChatFormatting.RESET + " " + EnumChatFormatting.YELLOW
+                        + GT_Utility.formatNumbers(getCapacity()) + " L" + EnumChatFormatting.RESET
+            };
+        }
+        return new String[] {
+            EnumChatFormatting.BLUE + "Super Tank" + EnumChatFormatting.RESET,
+            "Stored Fluid:",
+            EnumChatFormatting.GOLD + mFluid.getLocalizedName() + EnumChatFormatting.RESET,
+            EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mFluid.amount) + " L" + EnumChatFormatting.RESET + " "
+                    + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(getCapacity()) + " L"
+                    + EnumChatFormatting.RESET
         };
     }
-
 }