Update buildscript & apply spotless (#1306)

* Update dependencies

* Update buildscript, apply spotless

4 files changed, 155 insertions, 36 deletions

diff --git a/src/main/java/gregtech/api/world/GT_Worldgen.java b/src/main/java/gregtech/api/world/GT_Worldgen.java
index c2bbdd1e21..698ed0d1c9 100644
--- a/src/main/java/gregtech/api/world/GT_Worldgen.java
+++ b/src/main/java/gregtech/api/world/GT_Worldgen.java
@@ -1,13 +1,12 @@
 package gregtech.api.world;
 
 import gregtech.api.GregTech_API;
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.IChunkProvider;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.IChunkProvider;
 
 public abstract class GT_Worldgen {
 
@@ -30,12 +29,30 @@ public abstract class GT_Worldgen {
      * @param aChunkZ        zCoord of the Chunk
      * @return if the Worldgeneration has been successfully completed
      */
-    public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
+    public boolean executeWorldgen(
+            World aWorld,
+            Random aRandom,
+            String aBiome,
+            int aDimensionType,
+            int aChunkX,
+            int aChunkZ,
+            IChunkProvider aChunkGenerator,
+            IChunkProvider aChunkProvider) {
         return false;
     }
 
-    public int executeWorldgenChunkified(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, int aChunkZ, int seedX, int seedZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
-        return 4; // This is for the empty Orevein 
+    public int executeWorldgenChunkified(
+            World aWorld,
+            Random aRandom,
+            String aBiome,
+            int aDimensionType,
+            int aChunkX,
+            int aChunkZ,
+            int seedX,
+            int seedZ,
+            IChunkProvider aChunkGenerator,
+            IChunkProvider aChunkProvider) {
+        return 4; // This is for the empty Orevein
     }
 
     /**
@@ -47,26 +64,38 @@ public abstract class GT_Worldgen {
      * @param aChunkZ        zCoord of the Chunk
      * @return if the Worldgeneration has been successfully completed
      */
-    public boolean executeCavegen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
+    public boolean executeCavegen(
+            World aWorld,
+            Random aRandom,
+            String aBiome,
+            int aDimensionType,
+            int aChunkX,
+            int aChunkZ,
+            IChunkProvider aChunkGenerator,
+            IChunkProvider aChunkProvider) {
         return false;
     }
 
     /**
-     * 
+     *
      * @param aWorld					The World Object
      * @param aDimensionType			The Type of Worldgeneration to add. -1 = Nether, 0 = Overworld, +1 = End
      * @param aAllowedDimensionType		The Type of allowed Worldgeneration
      * @return if generation for this world is allowed for MoronTech (tm) OreGen (ATM (2.0.3.1Dev) only End, Nether, Overworld, Twilight Forest and Deep Dark)
      */
     public boolean isGenerationAllowed(World aWorld, int aDimensionType, int aAllowedDimensionType) {
-       
-    	if (!((aWorld.provider.getDimensionName().equalsIgnoreCase("Overworld")) || (aWorld.provider.getDimensionName().equalsIgnoreCase("Nether"))||(aWorld.provider.getDimensionName().equalsIgnoreCase("The End"))||(aWorld.provider.getDimensionName().equalsIgnoreCase("Twilight Forest"))||(aWorld.provider.getDimensionName().equalsIgnoreCase("Underdark"))))
-        	return false;
-        
-    	String aDimName = aWorld.provider.getDimensionName();
+
+        if (!((aWorld.provider.getDimensionName().equalsIgnoreCase("Overworld"))
+                || (aWorld.provider.getDimensionName().equalsIgnoreCase("Nether"))
+                || (aWorld.provider.getDimensionName().equalsIgnoreCase("The End"))
+                || (aWorld.provider.getDimensionName().equalsIgnoreCase("Twilight Forest"))
+                || (aWorld.provider.getDimensionName().equalsIgnoreCase("Underdark")))) return false;
+
+        String aDimName = aWorld.provider.getDimensionName();
         Boolean tAllowed = mDimensionMap.get(aDimName);
         if (tAllowed == null) {
-            boolean tValue = GregTech_API.sWorldgenFile.get("worldgen." + mWorldGenName, aDimName, aDimensionType == aAllowedDimensionType);
+            boolean tValue = GregTech_API.sWorldgenFile.get(
+                    "worldgen." + mWorldGenName, aDimName, aDimensionType == aAllowedDimensionType);
             mDimensionMap.put(aDimName, tValue);
             return tValue;
         }
diff --git a/src/main/java/gregtech/api/world/GT_Worldgen_Ore.java b/src/main/java/gregtech/api/world/GT_Worldgen_Ore.java
index 5d82d2798f..c9d1325529 100644
--- a/src/main/java/gregtech/api/world/GT_Worldgen_Ore.java
+++ b/src/main/java/gregtech/api/world/GT_Worldgen_Ore.java
@@ -1,10 +1,9 @@
 package gregtech.api.world;
 
 import gregtech.api.GregTech_API;
-import net.minecraft.block.Block;
-
 import java.util.ArrayList;
 import java.util.Collection;
+import net.minecraft.block.Block;
 
 public abstract class GT_Worldgen_Ore extends GT_Worldgen {
     public final int mBlockMeta, mAmount, mSize, mMinY, mMaxY, mProbability, mDimensionType;
@@ -13,7 +12,19 @@ public abstract class GT_Worldgen_Ore extends GT_Worldgen {
     public final boolean mAllowToGenerateinVoid;
     private final String aTextWorldgen = "worldgen.";
 
-    public GT_Worldgen_Ore(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType, int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList, boolean aAllowToGenerateinVoid) {
+    public GT_Worldgen_Ore(
+            String aName,
+            boolean aDefault,
+            Block aBlock,
+            int aBlockMeta,
+            int aDimensionType,
+            int aAmount,
+            int aSize,
+            int aProbability,
+            int aMinY,
+            int aMaxY,
+            Collection<String> aBiomeList,
+            boolean aAllowToGenerateinVoid) {
         super(aName, GregTech_API.sWorldgenList, aDefault);
         mDimensionType = aDimensionType;
         mBlock = aBlock;
diff --git a/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock.java b/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock.java
index 7205eef4a5..92c00bc455 100644
--- a/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock.java
+++ b/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock.java
@@ -1,25 +1,64 @@
 package gregtech.api.world;
 
+import java.util.Collection;
+import java.util.Random;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
 
-import java.util.Collection;
-import java.util.Random;
-
 public class GT_Worldgen_Ore_SingleBlock extends GT_Worldgen_Ore {
-    public GT_Worldgen_Ore_SingleBlock(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType, int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList, boolean aAllowToGenerateinVoid) {
-        super(aName, aDefault, aBlock, aBlockMeta, aDimensionType, aAmount, aSize, aProbability, aMinY, aMaxY, aBiomeList, aAllowToGenerateinVoid);
+    public GT_Worldgen_Ore_SingleBlock(
+            String aName,
+            boolean aDefault,
+            Block aBlock,
+            int aBlockMeta,
+            int aDimensionType,
+            int aAmount,
+            int aSize,
+            int aProbability,
+            int aMinY,
+            int aMaxY,
+            Collection<String> aBiomeList,
+            boolean aAllowToGenerateinVoid) {
+        super(
+                aName,
+                aDefault,
+                aBlock,
+                aBlockMeta,
+                aDimensionType,
+                aAmount,
+                aSize,
+                aProbability,
+                aMinY,
+                aMaxY,
+                aBiomeList,
+                aAllowToGenerateinVoid);
     }
 
     @Override
-    public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
-        if (isGenerationAllowed(aWorld, aDimensionType, mDimensionType) && (mBiomeList.isEmpty() || mBiomeList.contains(aBiome)) && (mProbability <= 1 || aRandom.nextInt(mProbability) == 0)) {
+    public boolean executeWorldgen(
+            World aWorld,
+            Random aRandom,
+            String aBiome,
+            int aDimensionType,
+            int aChunkX,
+            int aChunkZ,
+            IChunkProvider aChunkGenerator,
+            IChunkProvider aChunkProvider) {
+        if (isGenerationAllowed(aWorld, aDimensionType, mDimensionType)
+                && (mBiomeList.isEmpty() || mBiomeList.contains(aBiome))
+                && (mProbability <= 1 || aRandom.nextInt(mProbability) == 0)) {
             for (int i = 0; i < mAmount; i++) {
-                int tX = aChunkX + aRandom.nextInt(16), tY = mMinY + aRandom.nextInt(mMaxY - mMinY), tZ = aChunkZ + aRandom.nextInt(16);
+                int tX = aChunkX + aRandom.nextInt(16),
+                        tY = mMinY + aRandom.nextInt(mMaxY - mMinY),
+                        tZ = aChunkZ + aRandom.nextInt(16);
                 Block tBlock = aWorld.getBlock(tX, tY, tZ);
-                if (((mAllowToGenerateinVoid && aWorld.getBlock(tX, tY, tZ).isAir(aWorld, tX, tY, tZ)) || (tBlock != null && (tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.stone) || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.end_stone) || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.netherrack))))) {
+                if (((mAllowToGenerateinVoid && aWorld.getBlock(tX, tY, tZ).isAir(aWorld, tX, tY, tZ))
+                        || (tBlock != null
+                                && (tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.stone)
+                                        || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.end_stone)
+                                        || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.netherrack))))) {
                     aWorld.setBlock(tX, tY, tZ, mBlock, mBlockMeta, 0);
                 }
             }
diff --git a/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock_UnderLava.java b/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock_UnderLava.java
index 16f6d37555..940f923815 100644
--- a/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock_UnderLava.java
+++ b/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock_UnderLava.java
@@ -1,26 +1,66 @@
 package gregtech.api.world;
 
+import java.util.Collection;
+import java.util.Random;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
 
-import java.util.Collection;
-import java.util.Random;
-
 public class GT_Worldgen_Ore_SingleBlock_UnderLava extends GT_Worldgen_Ore {
-    public GT_Worldgen_Ore_SingleBlock_UnderLava(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType, int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList, boolean aAllowToGenerateinVoid) {
-        super(aName, aDefault, aBlock, aBlockMeta, aDimensionType, aAmount, aSize, aProbability, aMinY, aMaxY, aBiomeList, aAllowToGenerateinVoid);
+    public GT_Worldgen_Ore_SingleBlock_UnderLava(
+            String aName,
+            boolean aDefault,
+            Block aBlock,
+            int aBlockMeta,
+            int aDimensionType,
+            int aAmount,
+            int aSize,
+            int aProbability,
+            int aMinY,
+            int aMaxY,
+            Collection<String> aBiomeList,
+            boolean aAllowToGenerateinVoid) {
+        super(
+                aName,
+                aDefault,
+                aBlock,
+                aBlockMeta,
+                aDimensionType,
+                aAmount,
+                aSize,
+                aProbability,
+                aMinY,
+                aMaxY,
+                aBiomeList,
+                aAllowToGenerateinVoid);
     }
 
     @Override
-    public boolean executeCavegen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
-        if (isGenerationAllowed(aWorld, aDimensionType, mDimensionType) && (mBiomeList.isEmpty() || mBiomeList.contains(aBiome)) && (mProbability <= 1 || aRandom.nextInt(mProbability) == 0)) {
+    public boolean executeCavegen(
+            World aWorld,
+            Random aRandom,
+            String aBiome,
+            int aDimensionType,
+            int aChunkX,
+            int aChunkZ,
+            IChunkProvider aChunkGenerator,
+            IChunkProvider aChunkProvider) {
+        if (isGenerationAllowed(aWorld, aDimensionType, mDimensionType)
+                && (mBiomeList.isEmpty() || mBiomeList.contains(aBiome))
+                && (mProbability <= 1 || aRandom.nextInt(mProbability) == 0)) {
             for (int i = 0; i < mAmount; i++) {
-                int tX = aChunkX + aRandom.nextInt(16), tY = mMinY + aRandom.nextInt(mMaxY - mMinY), tZ = aChunkZ + aRandom.nextInt(16);
+                int tX = aChunkX + aRandom.nextInt(16),
+                        tY = mMinY + aRandom.nextInt(mMaxY - mMinY),
+                        tZ = aChunkZ + aRandom.nextInt(16);
                 Block tBlock = aWorld.getBlock(tX, tY, tZ);
-                if (((mAllowToGenerateinVoid && aWorld.getBlock(tX, tY, tZ).isAir(aWorld, tX, tY, tZ)) || (tBlock != null && (tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.stone) || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.end_stone) || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.netherrack))))) {
-                    if (aWorld.getBlock(tX, tY + 1, tZ) == Blocks.lava || aWorld.getBlock(tX, tY, tZ) == Blocks.flowing_lava)
+                if (((mAllowToGenerateinVoid && aWorld.getBlock(tX, tY, tZ).isAir(aWorld, tX, tY, tZ))
+                        || (tBlock != null
+                                && (tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.stone)
+                                        || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.end_stone)
+                                        || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.netherrack))))) {
+                    if (aWorld.getBlock(tX, tY + 1, tZ) == Blocks.lava
+                            || aWorld.getBlock(tX, tY, tZ) == Blocks.flowing_lava)
                         aWorld.setBlock(tX, tY, tZ, mBlock, mBlockMeta, 0);
                 }
             }