Cleanup the codebase (#3311)

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

11 files changed, 37 insertions, 41 deletions

diff --git a/src/main/java/galacticgreg/api/AsteroidBlockComb.java b/src/main/java/galacticgreg/api/AsteroidBlockComb.java
index 208d8faed3..d9961cf8ec 100644
--- a/src/main/java/galacticgreg/api/AsteroidBlockComb.java
+++ b/src/main/java/galacticgreg/api/AsteroidBlockComb.java
@@ -58,8 +58,7 @@ public class AsteroidBlockComb extends BlockMetaComb {
     public boolean equals(Object other) {
         if (other == null) return false;
         if (other == this) return true;
-        if (!(other instanceof AsteroidBlockComb)) return false;
-        AsteroidBlockComb otherObj = (AsteroidBlockComb) other;
+        if (!(other instanceof AsteroidBlockComb otherObj)) return false;
 
         boolean tFlag = true;
         String otherName = Block.blockRegistry.getNameForObject(otherObj.getBlock());
diff --git a/src/main/java/galacticgreg/api/BlockMetaComb.java b/src/main/java/galacticgreg/api/BlockMetaComb.java
index f4dc416c6b..47a1ced4f3 100644
--- a/src/main/java/galacticgreg/api/BlockMetaComb.java
+++ b/src/main/java/galacticgreg/api/BlockMetaComb.java
@@ -7,8 +7,8 @@ import net.minecraft.block.Block;
  */
 public class BlockMetaComb {
 
-    private int mMeta;
-    private Block mBlock;
+    private final int mMeta;
+    private final Block mBlock;
 
     /**
      * Creates a simple instance for a block that has no meta value
diff --git a/src/main/java/galacticgreg/api/GTOreTypes.java b/src/main/java/galacticgreg/api/GTOreTypes.java
index fdc4ea61ff..7c0245419a 100644
--- a/src/main/java/galacticgreg/api/GTOreTypes.java
+++ b/src/main/java/galacticgreg/api/GTOreTypes.java
@@ -36,10 +36,10 @@ public enum GTOreTypes {
      */
     NormalOres(0, Blocks.stone, 0, 0); // Unsure about blockupdate value!
 
-    private int _mOffset;
-    private Block _mStoneBlock;
-    private int _mBlockMeta;
-    private int _mUpdateMode;
+    private final int _mOffset;
+    private final Block _mStoneBlock;
+    private final int _mBlockMeta;
+    private final int _mUpdateMode;
 
     GTOreTypes(int pOffset, Block pBlock, int pMeta, int pUpdateMode) {
         _mOffset = pOffset;
diff --git a/src/main/java/galacticgreg/api/ModDBMDef.java b/src/main/java/galacticgreg/api/ModDBMDef.java
index 11d6bc630e..e405dfdd1f 100644
--- a/src/main/java/galacticgreg/api/ModDBMDef.java
+++ b/src/main/java/galacticgreg/api/ModDBMDef.java
@@ -10,8 +10,8 @@ import net.minecraft.block.Block;
 public class ModDBMDef {
 
     private String _targetBlockName;
-    private int _targetMeta;
-    private boolean _canAlwaysReplace;
+    private final int _targetMeta;
+    private final boolean _canAlwaysReplace;
 
     public String getBlockName() {
         return _targetBlockName;
@@ -27,7 +27,7 @@ public class ModDBMDef {
 
     /**
      * Internal function
-     *
+     * <p>
      * Check if the given Block is equal to the block in this instance
      *
      * @param pBlock the Block in question
@@ -43,7 +43,7 @@ public class ModDBMDef {
 
     /**
      * Internal function
-     *
+     * <p>
      * Check if the given Block is equal to the block in this instance and matches the metadata
      *
      * @param pBlock the block in question
@@ -64,8 +64,7 @@ public class ModDBMDef {
     public boolean equals(Object other) {
         if (other == null) return false;
         if (other == this) return true;
-        if (!(other instanceof ModDBMDef)) return false;
-        ModDBMDef otherModDBMDef = (ModDBMDef) other;
+        if (!(other instanceof ModDBMDef otherModDBMDef)) return false;
         return (otherModDBMDef._targetBlockName.equals(_targetBlockName) && otherModDBMDef._targetMeta == _targetMeta);
     }
 
diff --git a/src/main/java/galacticgreg/api/ModDimensionDef.java b/src/main/java/galacticgreg/api/ModDimensionDef.java
index b456aa031e..fbfbd674f3 100644
--- a/src/main/java/galacticgreg/api/ModDimensionDef.java
+++ b/src/main/java/galacticgreg/api/ModDimensionDef.java
@@ -15,15 +15,15 @@ import net.minecraft.world.chunk.IChunkProvider;
 public class ModDimensionDef {
 
     private static final String STR_NOTDEFINED = "iiznotdefined";
-    private String _mDimensionName;
+    private final String _mDimensionName;
     private String _mInternalDimIdentifier;
-    private String _mChunkProvider;
+    private final String _mChunkProvider;
     private Enums.AirReplaceRule _mDimAirSetting;
-    private ArrayList<ModDBMDef> _mReplaceableBlocks;
+    private final ArrayList<ModDBMDef> _mReplaceableBlocks;
     private Enums.DimensionType _mDimensionType;
 
-    private List<ISpaceObjectGenerator> _mSpaceObjectsGenerators;
-    private List<ISpaceObjectGenerator> _mSpaceStructureGenerators;
+    private final List<ISpaceObjectGenerator> _mSpaceObjectsGenerators;
+    private final List<ISpaceObjectGenerator> _mSpaceStructureGenerators;
 
     // Special Planets config settings
     private int _mGroundOreMaxY = 64;
@@ -34,10 +34,10 @@ public class ModDimensionDef {
     private GTOreTypes _mStoneType;
 
     // Asteroid stuff
-    private List<AsteroidBlockComb> _mValidAsteroidMaterials;
-    private List<SpecialBlockComb> _mSpecialBlocksForAsteroids;
+    private final List<AsteroidBlockComb> _mValidAsteroidMaterials;
+    private final List<SpecialBlockComb> _mSpecialBlocksForAsteroids;
 
-    private Random _mRandom = new Random(System.currentTimeMillis());
+    private final Random _mRandom = new Random(System.currentTimeMillis());
 
     /**
      * Internal function
@@ -184,7 +184,7 @@ public class ModDimensionDef {
      * NeverReplaceAir: No matter what, if there is an Air-Block found, it will not replace it. AllowReplaceAir: This
      * will generate Ores in Stones (defined by addBlockDefinition()) and air if found OnlyReplaceAir : This will not
      * generate Ores in solid blocks, but only in air
-     *
+     * <p>
      * Note that "OnlyReplaceAir" is a special setting if you have a dimension that is not defined as "Asteroids" but
      * you still need/want to generate ores in midair.
      *
@@ -206,7 +206,7 @@ public class ModDimensionDef {
     /**
      * Set a manual override for ores that shall be generated. This setting is ignored if getIsAsteroidDimension()
      * returns true
-     *
+     * <p>
      * For example, on GalactiCraft Mars, this value is set to GTOreTypes.RedGranite, because it matches the color
      * better. If you don't set anything here, it will generate regular stone-ores.
      *
@@ -336,7 +336,7 @@ public class ModDimensionDef {
 
     /**
      * Internal function
-     *
+     * <p>
      * Do not call this function by yourself. Ever. It will cause explosions, water to blood, death of firstborn,...
      * Seriously, don't do it.
      */
@@ -351,7 +351,7 @@ public class ModDimensionDef {
 
     /**
      * Internal function
-     *
+     * <p>
      * Check if pBlock can be replaced by an ore
      *
      * @param pBlock
@@ -380,13 +380,13 @@ public class ModDimensionDef {
 
     /**
      * Internal function
-     *
+     * <p>
      * Randomly select one material out of all defined materials
      *
      * @return
      */
     public AsteroidBlockComb getRandomAsteroidMaterial() {
-        if (_mValidAsteroidMaterials.size() == 0) return null;
+        if (_mValidAsteroidMaterials.isEmpty()) return null;
 
         if (_mValidAsteroidMaterials.size() == 1) return _mValidAsteroidMaterials.get(0);
         else {
@@ -396,13 +396,13 @@ public class ModDimensionDef {
 
     /**
      * Internal function
-     *
+     * <p>
      * Randomly select one special block to be placed in the asteroids
      *
      * @return
      */
     public SpecialBlockComb getRandomSpecialAsteroidBlock() {
-        if (_mSpecialBlocksForAsteroids.size() == 0) return null;
+        if (_mSpecialBlocksForAsteroids.isEmpty()) return null;
 
         if (_mSpecialBlocksForAsteroids.size() == 1) return _mSpecialBlocksForAsteroids.get(0);
         else {
diff --git a/src/main/java/galacticgreg/api/SpecialBlockComb.java b/src/main/java/galacticgreg/api/SpecialBlockComb.java
index 2cf812169a..bc3d884d3d 100644
--- a/src/main/java/galacticgreg/api/SpecialBlockComb.java
+++ b/src/main/java/galacticgreg/api/SpecialBlockComb.java
@@ -4,7 +4,7 @@ import net.minecraft.block.Block;
 
 public class SpecialBlockComb extends BlockMetaComb {
 
-    private Enums.AllowedBlockPosition _mBlockPosition;
+    private final Enums.AllowedBlockPosition _mBlockPosition;
 
     /**
      * Creates a simple instance for a block that has a meta value and a block position it is allowed to spawn
@@ -52,8 +52,7 @@ public class SpecialBlockComb extends BlockMetaComb {
     public boolean equals(Object other) {
         if (other == null) return false;
         if (other == this) return true;
-        if (!(other instanceof SpecialBlockComb)) return false;
-        SpecialBlockComb otherObj = (SpecialBlockComb) other;
+        if (!(other instanceof SpecialBlockComb otherObj)) return false;
 
         boolean tFlag = true;
         String otherName = Block.blockRegistry.getNameForObject(otherObj.getBlock());
diff --git a/src/main/java/galacticgreg/api/StructureInformation.java b/src/main/java/galacticgreg/api/StructureInformation.java
index 4c33f88c20..83c47603f5 100644
--- a/src/main/java/galacticgreg/api/StructureInformation.java
+++ b/src/main/java/galacticgreg/api/StructureInformation.java
@@ -9,9 +9,9 @@ import galacticgreg.api.Enums.TargetBlockPosition;
  */
 public class StructureInformation {
 
-    private Vec3 _mCoordinates;
-    private TargetBlockPosition _mBlockPosition;
-    private BlockMetaComb _mBlockMetaComb;
+    private final Vec3 _mCoordinates;
+    private final TargetBlockPosition _mBlockPosition;
+    private final BlockMetaComb _mBlockMetaComb;
 
     public TargetBlockPosition getBlockPosition() {
         return _mBlockPosition;
diff --git a/src/main/java/galacticgreg/api/enums/DimensionBlockMetaDefinitionList.java b/src/main/java/galacticgreg/api/enums/DimensionBlockMetaDefinitionList.java
index a9cf4a4e79..72dfd9f512 100644
--- a/src/main/java/galacticgreg/api/enums/DimensionBlockMetaDefinitionList.java
+++ b/src/main/java/galacticgreg/api/enums/DimensionBlockMetaDefinitionList.java
@@ -51,7 +51,7 @@ public enum DimensionBlockMetaDefinitionList {
 
     public final List<ModDBMDef> DBMDefList;
 
-    private DimensionBlockMetaDefinitionList(ModDBMDef... DBMDefArray) {
+    DimensionBlockMetaDefinitionList(ModDBMDef... DBMDefArray) {
         DBMDefList = Arrays.asList(DBMDefArray);
     }
 }
diff --git a/src/main/java/galacticgreg/api/enums/DimensionDef.java b/src/main/java/galacticgreg/api/enums/DimensionDef.java
index 96626ee7f3..6684777bba 100644
--- a/src/main/java/galacticgreg/api/enums/DimensionDef.java
+++ b/src/main/java/galacticgreg/api/enums/DimensionDef.java
@@ -222,7 +222,7 @@ public enum DimensionDef {
 
     public final ModDimensionDef modDimensionDef;
 
-    private DimensionDef(ModDimensionDef modDimDef) {
+    DimensionDef(ModDimensionDef modDimDef) {
         this.modDimensionDef = modDimDef;
     }
 }
diff --git a/src/main/java/galacticgreg/api/enums/ModContainers.java b/src/main/java/galacticgreg/api/enums/ModContainers.java
index ddac1e14d5..e49d8aca39 100644
--- a/src/main/java/galacticgreg/api/enums/ModContainers.java
+++ b/src/main/java/galacticgreg/api/enums/ModContainers.java
@@ -13,7 +13,7 @@ public enum ModContainers {
 
     public final ModContainer modContainer;
 
-    private ModContainers(ModContainer modContainer) {
+    ModContainers(ModContainer modContainer) {
         this.modContainer = modContainer;
     }
 }
diff --git a/src/main/java/galacticgreg/api/enums/properties/Asteroids.java b/src/main/java/galacticgreg/api/enums/properties/Asteroids.java
index 2916031aaf..32020506ce 100644
--- a/src/main/java/galacticgreg/api/enums/properties/Asteroids.java
+++ b/src/main/java/galacticgreg/api/enums/properties/Asteroids.java
@@ -69,8 +69,7 @@ public enum Asteroids {
     public DimensionDef dimensionDef;
     public AsteroidPropertyBuilder asteroidPropertyBuilder;
 
-    private Asteroids(ModContainers modContainers, DimensionDef dimensionDef,
-        AsteroidPropertyBuilder asteroidPropertyBuilder) {
+    Asteroids(ModContainers modContainers, DimensionDef dimensionDef, AsteroidPropertyBuilder asteroidPropertyBuilder) {
         this.modContainers = modContainers;
         this.dimensionDef = dimensionDef;
         this.asteroidPropertyBuilder = asteroidPropertyBuilder;