Update buildscript & apply spotless (#1306)

* Update dependencies

* Update buildscript, apply spotless

1 files changed, 54 insertions, 55 deletions

diff --git a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
index 9fcbaa235f..767026b286 100644
--- a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
+++ b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
@@ -1,5 +1,8 @@
 package gregtech.api.multitileentity.machine;
 
+import static com.google.common.primitives.Ints.saturatedCast;
+import static gregtech.api.enums.GT_Values.emptyIconContainerArray;
+
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.GT_Values.NBT;
 import gregtech.api.enums.Textures;
@@ -8,7 +11,6 @@ import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.multitileentity.MultiTileEntityRegistry;
 import gregtech.api.multitileentity.base.BaseTickableMultiTileEntity;
-import gregtech.api.multitileentity.multiblock.base.MultiBlockPart;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Util;
 import gregtech.api.util.GT_Utility;
@@ -21,10 +23,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidTank;
 
-import static com.google.common.primitives.Ints.saturatedCast;
-import static gregtech.api.enums.GT_Values.emptyIconContainerArray;
-
-public class MultiTileBasicMachine extends BaseTickableMultiTileEntity  {
+public class MultiTileBasicMachine extends BaseTickableMultiTileEntity {
     private static final String TEXTURE_LOCATION = "multitileentity/machines/";
     public IIconContainer[] mTexturesInactive = emptyIconContainerArray;
     public IIconContainer[] mTexturesActive = emptyIconContainerArray;
@@ -43,14 +42,13 @@ public class MultiTileBasicMachine extends BaseTickableMultiTileEntity  {
         return "gt.multitileentity.machine.basic";
     }
 
-
     @Override
     public void writeMultiTileNBT(NBTTagCompound aNBT) {
         super.writeMultiTileNBT(aNBT);
         if (mParallel > 0) aNBT.setInteger(NBT.PARALLEL, mParallel);
         if (mActive) aNBT.setBoolean(NBT.ACTIVE, mActive);
-
     }
+
     @Override
     public void readMultiTileNBT(NBTTagCompound aNBT) {
         super.readMultiTileNBT(aNBT);
@@ -58,7 +56,7 @@ public class MultiTileBasicMachine extends BaseTickableMultiTileEntity  {
         if (aNBT.hasKey(NBT.ACTIVE)) mActive = aNBT.getBoolean(NBT.ACTIVE);
 
         mInventory = getDefaultInventory(aNBT);
-        if(mInventory != null) {
+        if (mInventory != null) {
             final NBTTagList tList = aNBT.getTagList(NBT.INV_LIST, 10);
             for (int i = 0; i < tList.tagCount(); i++) {
                 final NBTTagCompound tNBT = tList.getCompoundTagAt(i);
@@ -75,19 +73,25 @@ public class MultiTileBasicMachine extends BaseTickableMultiTileEntity  {
         mOutputFluids = new FluidStack[getFluidOutputCount()];
         mOutputItems = new ItemStack[getItemOutputCount()];
 
-        // TODO: See if we need the adjustable map here `.setCapacity(mRecipes, mParallel * 2L)` in place of the `setCapacityMultiplier`
-        for (int i = 0; i < mTanksInput.length; i++) mTanksInput[i] = new FluidTankGT(tCapacity).setCapacityMultiplier(mParallel * 2L).readFromNBT(aNBT, NBT.TANK_IN + i);
-        for (int i = 0; i < mTanksOutput.length; i++) mTanksOutput[i] = new FluidTankGT().readFromNBT(aNBT, NBT.TANK_OUT + i);
-        for (int i = 0; i < mOutputFluids.length; i++) mOutputFluids[i] = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag(NBT.FLUID_OUT + "." + i));
-        for (int i = 0; i < mOutputItems.length; i++) mOutputItems[i] = ItemStack.loadItemStackFromNBT(aNBT.getCompoundTag(NBT.INV_OUT + "." + i));
-
+        // TODO: See if we need the adjustable map here `.setCapacity(mRecipes, mParallel * 2L)` in place of the
+        // `setCapacityMultiplier`
+        for (int i = 0; i < mTanksInput.length; i++)
+            mTanksInput[i] = new FluidTankGT(tCapacity)
+                    .setCapacityMultiplier(mParallel * 2L)
+                    .readFromNBT(aNBT, NBT.TANK_IN + i);
+        for (int i = 0; i < mTanksOutput.length; i++)
+            mTanksOutput[i] = new FluidTankGT().readFromNBT(aNBT, NBT.TANK_OUT + i);
+        for (int i = 0; i < mOutputFluids.length; i++)
+            mOutputFluids[i] = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag(NBT.FLUID_OUT + "." + i));
+        for (int i = 0; i < mOutputItems.length; i++)
+            mOutputItems[i] = ItemStack.loadItemStackFromNBT(aNBT.getCompoundTag(NBT.INV_OUT + "." + i));
     }
 
     @Override
     public void loadTextureNBT(NBTTagCompound aNBT) {
         // Loading the registry
         final String textureName = aNBT.getString(NBT.TEXTURE);
-        mTextures = new IIconContainer[]{
+        mTextures = new IIconContainer[] {
             new Textures.BlockIcons.CustomIcon(TEXTURE_LOCATION + textureName + "/bottom"),
             new Textures.BlockIcons.CustomIcon(TEXTURE_LOCATION + textureName + "/top"),
             new Textures.BlockIcons.CustomIcon(TEXTURE_LOCATION + textureName + "/left"),
@@ -95,7 +99,7 @@ public class MultiTileBasicMachine extends BaseTickableMultiTileEntity  {
             new Textures.BlockIcons.CustomIcon(TEXTURE_LOCATION + textureName + "/right"),
             new Textures.BlockIcons.CustomIcon(TEXTURE_LOCATION + textureName + "/side")
         };
-        mTexturesInactive = new IIconContainer[]{
+        mTexturesInactive = new IIconContainer[] {
             new Textures.BlockIcons.CustomIcon(TEXTURE_LOCATION + textureName + "/overlay/inactive/bottom"),
             new Textures.BlockIcons.CustomIcon(TEXTURE_LOCATION + textureName + "/overlay/inactive/top"),
             new Textures.BlockIcons.CustomIcon(TEXTURE_LOCATION + textureName + "/overlay/inactive/left"),
@@ -103,7 +107,7 @@ public class MultiTileBasicMachine extends BaseTickableMultiTileEntity  {
             new Textures.BlockIcons.CustomIcon(TEXTURE_LOCATION + textureName + "/overlay/inactive/right"),
             new Textures.BlockIcons.CustomIcon(TEXTURE_LOCATION + textureName + "/overlay/inactive/back")
         };
-        mTexturesActive = new IIconContainer[]{
+        mTexturesActive = new IIconContainer[] {
             new Textures.BlockIcons.CustomIcon(TEXTURE_LOCATION + textureName + "/overlay/active/bottom"),
             new Textures.BlockIcons.CustomIcon(TEXTURE_LOCATION + textureName + "/overlay/active/top"),
             new Textures.BlockIcons.CustomIcon(TEXTURE_LOCATION + textureName + "/overlay/active/left"),
@@ -111,38 +115,35 @@ public class MultiTileBasicMachine extends BaseTickableMultiTileEntity  {
             new Textures.BlockIcons.CustomIcon(TEXTURE_LOCATION + textureName + "/overlay/active/right"),
             new Textures.BlockIcons.CustomIcon(TEXTURE_LOCATION + textureName + "/overlay/active/back")
         };
-
     }
 
     @Override
     public void copyTextures() {
         // Loading an instance
-        final TileEntity tCanonicalTileEntity = MultiTileEntityRegistry.getCanonicalTileEntity(getMultiTileEntityRegistryID(), getMultiTileEntityID());
-        if(tCanonicalTileEntity instanceof MultiTileBasicMachine){
-            mTextures = ((MultiTileBasicMachine)tCanonicalTileEntity).mTextures;
-            mTexturesInactive = ((MultiTileBasicMachine)tCanonicalTileEntity).mTexturesInactive;
-            mTexturesActive   = ((MultiTileBasicMachine)tCanonicalTileEntity).mTexturesActive;
+        final TileEntity tCanonicalTileEntity =
+                MultiTileEntityRegistry.getCanonicalTileEntity(getMultiTileEntityRegistryID(), getMultiTileEntityID());
+        if (tCanonicalTileEntity instanceof MultiTileBasicMachine) {
+            mTextures = ((MultiTileBasicMachine) tCanonicalTileEntity).mTextures;
+            mTexturesInactive = ((MultiTileBasicMachine) tCanonicalTileEntity).mTexturesInactive;
+            mTexturesActive = ((MultiTileBasicMachine) tCanonicalTileEntity).mTexturesActive;
         } else {
             mTextures = mTexturesInactive = mTexturesActive = emptyIconContainerArray;
         }
     }
 
-
-
     @Override
     public ITexture[] getTexture(Block aBlock, byte aSide, boolean isActive, int aRenderPass) {
-        return new ITexture[]{
+        return new ITexture[] {
             TextureFactory.of(mTextures[GT_Values.FACING_ROTATIONS[mFacing][aSide]], GT_Util.getRGBaArray(mRGBa)),
-            TextureFactory.of((mActive ? mTexturesActive : mTexturesInactive)[GT_Values.FACING_ROTATIONS[mFacing][aSide]])
+            TextureFactory.of(
+                    (mActive ? mTexturesActive : mTexturesInactive)[GT_Values.FACING_ROTATIONS[mFacing][aSide]])
         };
     }
 
-
     /*
      * Fluids
      */
 
-
     /**
      * The number of fluid (input) slots available for this machine
      */
@@ -162,29 +163,26 @@ public class MultiTileBasicMachine extends BaseTickableMultiTileEntity  {
         return tSize > 0 ? new ItemStack[tSize] : GT_Values.emptyItemStackArray;
     }
 
-
     @Override
-    public void setLightValue(byte aLightValue) {
-
-    }
+    public void setLightValue(byte aLightValue) {}
 
     @Override
     public String getInventoryName() {
         final String name = getCustomName();
-        if(name != null) return name;
+        if (name != null) return name;
         final MultiTileEntityRegistry tRegistry = MultiTileEntityRegistry.getRegistry(getMultiTileEntityRegistryID());
         return tRegistry == null ? getClass().getName() : tRegistry.getLocal(getMultiTileEntityID());
     }
 
-
     @Override
     public boolean isUseableByPlayer(EntityPlayer aPlayer) {
-        return playerOwnsThis(aPlayer, false) && mTickTimer > 40 &&
-            getTileEntityOffset(0, 0, 0) == this &&
-            aPlayer.getDistanceSq(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5) < 64 && allowInteraction(aPlayer);
+        return playerOwnsThis(aPlayer, false)
+                && mTickTimer > 40
+                && getTileEntityOffset(0, 0, 0) == this
+                && aPlayer.getDistanceSq(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5) < 64
+                && allowInteraction(aPlayer);
     }
 
-
     @Override
     public boolean isLiquidInput(byte aSide) {
         return aSide != mFacing;
@@ -195,20 +193,19 @@ public class MultiTileBasicMachine extends BaseTickableMultiTileEntity  {
         return aSide != mFacing;
     }
 
-
     @Override
     protected IFluidTank[] getFluidTanks(byte aSide) {
         final boolean fluidInput = isLiquidInput(aSide);
         final boolean fluidOutput = isLiquidOutput(aSide);
 
-        if(fluidInput && fluidOutput) {
-            final IFluidTank[] rTanks = new IFluidTank[ mTanksInput.length + mTanksOutput.length];
+        if (fluidInput && fluidOutput) {
+            final IFluidTank[] rTanks = new IFluidTank[mTanksInput.length + mTanksOutput.length];
             System.arraycopy(mTanksInput, 0, rTanks, 0, mTanksInput.length);
             System.arraycopy(mTanksOutput, 0, rTanks, mTanksInput.length, mTanksOutput.length);
             return rTanks;
-        } else if(fluidInput) {
+        } else if (fluidInput) {
             return mTanksInput;
-        } else if(fluidOutput) {
+        } else if (fluidOutput) {
             return mTanksOutput;
         }
         return GT_Values.emptyFluidTank;
@@ -216,19 +213,19 @@ public class MultiTileBasicMachine extends BaseTickableMultiTileEntity  {
 
     @Override
     public IFluidTank getFluidTankFillable(byte aSide, FluidStack aFluidToFill) {
-        if(!isLiquidInput(aSide)) return null;
+        if (!isLiquidInput(aSide)) return null;
         for (FluidTankGT tankGT : mTanksInput) if (tankGT.contains(aFluidToFill)) return tankGT;
-//        if (!mRecipes.containsInput(aFluidToFill, this, slot(mRecipes.mInputItemsCount + mRecipes.mOutputItemsCount))) return null;
+        //        if (!mRecipes.containsInput(aFluidToFill, this, slot(mRecipes.mInputItemsCount +
+        // mRecipes.mOutputItemsCount))) return null;
         for (FluidTankGT fluidTankGT : mTanksInput) if (fluidTankGT.isEmpty()) return fluidTankGT;
         return null;
     }
 
     @Override
     protected IFluidTank getFluidTankDrainable(byte aSide, FluidStack aFluidToDrain) {
-        if(!isLiquidOutput(aSide)) return null;
+        if (!isLiquidOutput(aSide)) return null;
         for (FluidTankGT fluidTankGT : mTanksOutput)
-            if (aFluidToDrain == null ? fluidTankGT.has() : fluidTankGT.contains(aFluidToDrain))
-                return fluidTankGT;
+            if (aFluidToDrain == null ? fluidTankGT.has() : fluidTankGT.contains(aFluidToDrain)) return fluidTankGT;
 
         return null;
     }
@@ -282,7 +279,6 @@ public class MultiTileBasicMachine extends BaseTickableMultiTileEntity  {
         return 1;
     }
 
-
     public boolean isEnergyInputSide(byte aSide) {
         return true;
     }
@@ -295,8 +291,9 @@ public class MultiTileBasicMachine extends BaseTickableMultiTileEntity  {
     public boolean inputEnergyFrom(byte aSide) {
         if (aSide == GT_Values.SIDE_UNKNOWN) return true;
         if (aSide >= 0 && aSide < 6) {
-            if(isInvalid()) return false;
-            if (!getCoverBehaviorAtSideNew(aSide).letsEnergyIn(aSide, getCoverIDAtSide(aSide), getComplexCoverDataAtSide(aSide), this)) return false;
+            if (isInvalid()) return false;
+            if (!getCoverBehaviorAtSideNew(aSide)
+                    .letsEnergyIn(aSide, getCoverIDAtSide(aSide), getComplexCoverDataAtSide(aSide), this)) return false;
             if (isEnetInput()) return isEnergyInputSide(aSide);
         }
         return false;
@@ -307,7 +304,9 @@ public class MultiTileBasicMachine extends BaseTickableMultiTileEntity  {
         if (aSide == GT_Values.SIDE_UNKNOWN) return true;
         if (aSide >= 0 && aSide < 6) {
             if (isInvalid()) return false;
-            if (!getCoverBehaviorAtSideNew(aSide).letsEnergyOut(aSide, getCoverIDAtSide(aSide), getComplexCoverDataAtSide(aSide), this)) return false;
+            if (!getCoverBehaviorAtSideNew(aSide)
+                    .letsEnergyOut(aSide, getCoverIDAtSide(aSide), getComplexCoverDataAtSide(aSide), this))
+                return false;
             if (isEnetOutput()) return isEnergyOutputSide(aSide);
         }
         return false;
@@ -317,7 +316,8 @@ public class MultiTileBasicMachine extends BaseTickableMultiTileEntity  {
      * Inventory
      */
 
-    @Override public boolean hasInventoryBeenModified() {
+    @Override
+    public boolean hasInventoryBeenModified() {
         return mInventoryChanged;
     }
 
@@ -344,5 +344,4 @@ public class MultiTileBasicMachine extends BaseTickableMultiTileEntity  {
     public int getItemOutputCount() {
         return 2;
     }
-
 }