Cleanup the codebase (#3311)

Co-authored-by: boubou19 <miisterunknown@gmail.com>

8 files changed, 36 insertions, 52 deletions

diff --git a/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java b/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java
index 74fb6c8d54..72732249b0 100644
--- a/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java
+++ b/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java
@@ -36,7 +36,6 @@ public class BiomeEverglades {
 
     static class BiomeGenEverglades extends BiomeGenBase {
 
-        @SuppressWarnings("unchecked")
         public BiomeGenEverglades() {
             super(Configuration.worldgen.EVERGLADESBIOME_ID);
             this.theBiomeDecorator = new CustomBiomeGenerator();
@@ -73,7 +72,7 @@ public class BiomeEverglades {
             return 0xF67A14;
         }
 
-        @SuppressWarnings({ "unchecked", "unused" })
+        @SuppressWarnings({ "unused" })
         private boolean addToMonsterSpawnLists(Class<? extends EntityLiving> EntityClass, int a, int b, int c) {
             this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityClass, a, b, c));
             return true;
diff --git a/src/main/java/gtPlusPlus/everglades/biome/CustomBiomeGenerator.java b/src/main/java/gtPlusPlus/everglades/biome/CustomBiomeGenerator.java
index 4df290b560..18d7151324 100644
--- a/src/main/java/gtPlusPlus/everglades/biome/CustomBiomeGenerator.java
+++ b/src/main/java/gtPlusPlus/everglades/biome/CustomBiomeGenerator.java
@@ -212,9 +212,7 @@ public class CustomBiomeGenerator extends BiomeDecorator {
             l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
 
             for (i1 = nextInt(this.currentWorld.getHeightValue(k, l) * 2); i1 > 0
-                && this.currentWorld.isAirBlock(k, i1 - 1, l); --i1) {
-                ;
-            }
+                && this.currentWorld.isAirBlock(k, i1 - 1, l); --i1) {}
 
             this.waterlilyGen.generate(this.currentWorld, this.randomGenerator, k, i1, l);
         }
diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java
index 16ad852e75..5afc3dc569 100644
--- a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java
+++ b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java
@@ -185,9 +185,8 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
         int x = pos.xPos, y = pos.yPos, z = pos.zPos;
         Logger.INFO("Trigger");
         int blockCount = 0;
-        BlockPos portal = pos;
-        World par1World = portal.world;
-        for (BlockPos side : portal.getSurroundingBlocks()) {
+        World par1World = pos.world;
+        for (BlockPos side : pos.getSurroundingBlocks()) {
             Block b = side.getBlockAtPos();
             if (b == DimensionEverglades.blockPortalFrame || b == DimensionEverglades.portalBlock) {
                 blockCount++;
@@ -195,7 +194,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
         }
         if (blockCount < 4) {
             par1World.setBlockToAir(x, y, z);
-            par1World.scheduleBlockUpdate(x, y, z, portal.getBlockAtPos(), 0);
+            par1World.scheduleBlockUpdate(x, y, z, pos.getBlockAtPos(), 0);
         }
 
         byte b0 = 0;
@@ -205,16 +204,12 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
             b1 = 0;
         }
         int i1;
-        for (i1 = y; par1World.getBlock(x, i1 - 1, z) == this; --i1) {
-            ;
-        }
+        for (i1 = y; par1World.getBlock(x, i1 - 1, z) == this; --i1) {}
         if (par1World.getBlock(x, i1 - 1, z) != DimensionEverglades.blockPortalFrame) {
             par1World.setBlockToAir(x, y, z);
         } else {
             int j1;
-            for (j1 = 1; j1 < 4 && par1World.getBlock(x, i1 + j1, z) == this; ++j1) {
-                ;
-            }
+            for (j1 = 1; j1 < 4 && par1World.getBlock(x, i1 + j1, z) == this; ++j1) {}
             if (j1 == 3 && par1World.getBlock(x, i1 + j1, z) == DimensionEverglades.blockPortalFrame) {
                 boolean flag = par1World.getBlock(x - 1, y, z) == this || par1World.getBlock(x + 1, y, z) == this;
                 boolean flag1 = par1World.getBlock(x, y, z - 1) == this || par1World.getBlock(x, y, z + 1) == this;
@@ -266,8 +261,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
                 && par1IBlockAccess.getBlock(par2, par3, par4 + 2) != this;
             boolean flag4 = flag || flag1;
             boolean flag5 = flag2 || flag3;
-            return flag4 && par5 == 4 ? true
-                : (flag4 && par5 == 5 ? true : (flag5 && par5 == 2 ? true : flag5 && par5 == 3));
+            return flag4 && par5 == 4 || (flag4 && par5 == 5 || (flag5 && par5 == 2 || flag5 && par5 == 3));
         }
     }
 
diff --git a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java
index f49046cd2b..409e3f150a 100644
--- a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java
+++ b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java
@@ -36,7 +36,7 @@ import gtPlusPlus.everglades.dimension.DimensionEverglades;
 
 public class ChunkProviderModded implements IChunkProvider {
 
-    private Random rand;
+    private final Random rand;
     private NoiseGeneratorOctaves field_147431_j;
     private NoiseGeneratorOctaves field_147432_k;
     private NoiseGeneratorOctaves field_147429_l;
@@ -53,8 +53,8 @@ public class ChunkProviderModded implements IChunkProvider {
     /**
      * Reference to the World object.
      */
-    private World worldObj;
-    private WorldType field_147435_p;
+    private final World worldObj;
+    private final WorldType field_147435_p;
     private final double[] field_147434_q;
     private final float[] parabolicField;
     private double[] stoneNoise = new double[256];
@@ -477,8 +477,6 @@ public class ChunkProviderModded implements IChunkProvider {
         }
         biomegenbase.decorate(this.worldObj, this.rand, k, l);
         SpawnerAnimals.performWorldGenSpawning(this.worldObj, biomegenbase, k + 8, l + 8, 16, 16, this.rand);
-        k += 8;
-        l += 8;
 
         MinecraftForge.EVENT_BUS
             .post(new PopulateChunkEvent.Post(par1IChunkProvider, worldObj, rand, par2, par3, flag));
diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java
index 50a7cd547a..bb1916adea 100644
--- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java
+++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java
@@ -99,12 +99,10 @@ public class WorldGen_GT_Base implements IWorldGenerator {
                 // generateEnd(world, random, chunkX * 16, chunkZ * 16);
                 break;
             default: // Any other dimension
-                if (world.provider.dimensionId != xDim) {
-                    break;
-                } else {
+                if (world.provider.dimensionId == xDim) {
                     generateEverglades(random, chunkX, chunkZ, world, chunkGenerator, chunkProvider);
-                    break;
                 }
+                break;
         }
     }
 
@@ -197,7 +195,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
 
         // Local class to track which orevein seeds must be checked when doing
         // chunkified worldgen
-        class NearbySeeds {
+        static class NearbySeeds {
 
             public int mX;
             public int mZ;
@@ -206,7 +204,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
                 this.mX = x;
                 this.mZ = z;
             }
-        };
+        }
 
         public static ArrayList<NearbySeeds> seedList = new ArrayList<>();
 
@@ -530,7 +528,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
             }
 
             // Now process each oreseed vs this requested chunk
-            for (; seedList.size() != 0; seedList.remove(0)) {
+            for (; !seedList.isEmpty(); seedList.remove(0)) {
                 if (debugWorldGen)
                     GTLog.out.println("Processing seed x=" + seedList.get(0).mX + " z=" + seedList.get(0).mZ);
                 worldGenFindVein(seedList.get(0).mX, seedList.get(0).mZ);
diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
index 46fef6b58c..9153264185 100644
--- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
+++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
@@ -487,9 +487,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
             || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, DimensionEverglades.blockSecondaryFiller)
             || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.sandstone)) {
 
-            if (aWorld.setBlock(aX, aY, aZ, aMetaData, 0, 3)) {
-                return true;
-            }
+            return aWorld.setBlock(aX, aY, aZ, aMetaData, 0, 3);
         }
         return false;
     }
diff --git a/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java
index 7e463e194c..e9d021d6fe 100644
--- a/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java
+++ b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java
@@ -135,7 +135,7 @@ public class TeleporterDimensionMod extends Teleporter {
             if (flag) {
                 this.destinationCoordinateCache
                     .add(j1, new Teleporter.PortalPosition(i, j, k, this.worldServerInstance.getTotalWorldTime()));
-                this.destinationCoordinateKeys.add(Long.valueOf(j1));
+                this.destinationCoordinateKeys.add(j1);
             }
 
             double d11 = i + 0.5D;
@@ -457,7 +457,7 @@ public class TeleporterDimensionMod extends Teleporter {
         }
     }
 
-    public class PortalPosition extends ChunkCoordinates {
+    public static class PortalPosition extends ChunkCoordinates {
 
         /**
          * The worldtime at which this PortalPosition was last verified
diff --git a/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java b/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java
index d1a621addf..4e1db08533 100644
--- a/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java
+++ b/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java
@@ -25,9 +25,9 @@ public class WorldChunkManagerCustom extends WorldChunkManager {
     /** A GenLayer containing the indices into BiomeGenBase.biomeList[] */
     private GenLayer biomeIndexLayer;
     /** The BiomeCache object for this world. */
-    private BiomeCache biomeCache;
+    private final BiomeCache biomeCache;
     /** A list of biomes that the player can spawn in. */
-    private List<BiomeGenBase> biomesToSpawnIn;
+    private final List<BiomeGenBase> biomesToSpawnIn;
 
     @SuppressWarnings({ "rawtypes" })
     public WorldChunkManagerCustom() {
@@ -80,12 +80,12 @@ public class WorldChunkManagerCustom extends WorldChunkManager {
             } catch (Throwable throwable) {
                 CrashReport crashreport = CrashReport.makeCrashReport(throwable, "Invalid Biome id");
                 CrashReportCategory crashreportcategory = crashreport.makeCategory("DownfallBlock");
-                crashreportcategory.addCrashSection("biome id", Integer.valueOf(i1));
-                crashreportcategory.addCrashSection("downfalls[] size", Integer.valueOf(listToReuse.length));
-                crashreportcategory.addCrashSection("x", Integer.valueOf(x));
-                crashreportcategory.addCrashSection("z", Integer.valueOf(z));
-                crashreportcategory.addCrashSection("w", Integer.valueOf(width));
-                crashreportcategory.addCrashSection("h", Integer.valueOf(length));
+                crashreportcategory.addCrashSection("biome id", i1);
+                crashreportcategory.addCrashSection("downfalls[] size", listToReuse.length);
+                crashreportcategory.addCrashSection("x", x);
+                crashreportcategory.addCrashSection("z", z);
+                crashreportcategory.addCrashSection("w", width);
+                crashreportcategory.addCrashSection("h", length);
                 throw new ReportedException(crashreport);
             }
         }
@@ -125,11 +125,11 @@ public class WorldChunkManagerCustom extends WorldChunkManager {
         } catch (Throwable throwable) {
             CrashReport crashreport = CrashReport.makeCrashReport(throwable, "Invalid Biome id");
             CrashReportCategory crashreportcategory = crashreport.makeCategory("RawBiomeBlock");
-            crashreportcategory.addCrashSection("biomes[] size", Integer.valueOf(par1ArrayOfBiomeGenBase.length));
-            crashreportcategory.addCrashSection("x", Integer.valueOf(par2));
-            crashreportcategory.addCrashSection("z", Integer.valueOf(par3));
-            crashreportcategory.addCrashSection("w", Integer.valueOf(par4));
-            crashreportcategory.addCrashSection("h", Integer.valueOf(par5));
+            crashreportcategory.addCrashSection("biomes[] size", par1ArrayOfBiomeGenBase.length);
+            crashreportcategory.addCrashSection("x", par2);
+            crashreportcategory.addCrashSection("z", par3);
+            crashreportcategory.addCrashSection("w", par4);
+            crashreportcategory.addCrashSection("h", par5);
             throw new ReportedException(crashreport);
         }
     }
@@ -159,15 +159,14 @@ public class WorldChunkManagerCustom extends WorldChunkManager {
         if (cacheFlag && width == 16 && length == 16 && (x & 15) == 0 && (y & 15) == 0) {
             BiomeGenBase[] abiomegenbase1 = this.biomeCache.getCachedBiomes(x, y);
             System.arraycopy(abiomegenbase1, 0, listToReuse, 0, width * length);
-            return listToReuse;
         } else {
             int[] aint = this.biomeIndexLayer.getInts(x, y, width, length);
 
             for (int i = 0; i < width * length; ++i) {
                 listToReuse[i] = BiomeGenBase.getBiome(aint[i]);
             }
-            return listToReuse;
         }
+        return listToReuse;
     }
 
     /**
@@ -199,9 +198,9 @@ public class WorldChunkManagerCustom extends WorldChunkManager {
             CrashReport crashreport = CrashReport.makeCrashReport(throwable, "Invalid Biome id");
             CrashReportCategory crashreportcategory = crashreport.makeCategory("Layer");
             crashreportcategory.addCrashSection("Layer", this.genBiomes.toString());
-            crashreportcategory.addCrashSection("x", Integer.valueOf(x));
-            crashreportcategory.addCrashSection("z", Integer.valueOf(y));
-            crashreportcategory.addCrashSection("radius", Integer.valueOf(z));
+            crashreportcategory.addCrashSection("x", x);
+            crashreportcategory.addCrashSection("z", y);
+            crashreportcategory.addCrashSection("radius", z);
             crashreportcategory.addCrashSection("allowed", par4List);
             throw new ReportedException(crashreport);
         }