Code adjustments and simplifications

imesense · Oct 1, 2024 · ff07fa6 · ff07fa6
1 parent c8a89a2
commit ff07fa6
Show file tree

Hide file tree

Showing 24 changed files with 143 additions and 212 deletions.
diff --git a/...awncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/DynamicSpawnControl.java b/...awncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/DynamicSpawnControl.java
@@ -103,11 +103,6 @@ public static final class STRUCT_FILES_DIRS
      */
     public static final class STRUCT_FILES_EXTENSION
     {
-        /**
-         *
-         */
-        public static final String CONFIG_FILE_EXTENSION = ".cfg";
-
         /**
          *
          */
@@ -125,26 +120,11 @@ public static final class STRUCT_FILES_EXTENSION
     @Mod.Instance
     public static DynamicSpawnControl Instance;
 
-    /**
-     *
-     */
-    static CheckDebugger checkDebugger;
-
     /**
      *
      */
     private static File globalDirectory = null;
 
-    /**
-     *
-     */
-    static Cache cache = null;
-
-    /**
-     *
-     */
-    static CacheStorage cacheStorage = null;
-
     /**
      *
      * @return
@@ -187,14 +167,14 @@ public DynamicSpawnControl()
     public synchronized void preInit(FMLPreInitializationEvent event)
     {
         //
-        checkDebugger = new CheckDebugger();
+        CheckDebugger.instance = new CheckDebugger();
 
         //
         globalDirectory = event.getModConfigurationDirectory();
 
         //
-        Log.createLogFile(globalDirectory.getPath() + File.separator + STRUCT_FILES_DIRS.NAME_DIRECTORY, checkDebugger.IsRunDebugger);
-        Log.writeDataToLogFile(1, "Debugger is running: " + (checkDebugger.IsRunDebugger ? "true" : "false"));
+        Log.createLogFile(globalDirectory.getPath() + File.separator + STRUCT_FILES_DIRS.NAME_DIRECTORY, CheckDebugger.instance.IsRunDebugger);
+        Log.writeDataToLogFile(1, "Debugger is running: " + (CheckDebugger.instance.IsRunDebugger ? "true" : "false"));
 
         //
         MessageHandler.init();
@@ -206,10 +186,10 @@ public synchronized void preInit(FMLPreInitializationEvent event)
         generalStorageData = new GeneralStorageData();
 
         //
-        cacheStorage = new CacheStorage();
+        CacheStorage.instance = new CacheStorage();
 
         //
-        cache = new Cache();
+        Cache.instance = new Cache();
 
         //
         ParserGenericJsonScripts.setRulePath(event.getModConfigurationDirectory());
@@ -284,8 +264,8 @@ public synchronized void serverLoad(FMLServerStartingEvent event)
     @EventHandler
     public synchronized void serverStopped(FMLServerStoppedEvent event)
     {
-        cache.cleanActualCache();
-        cache.cleanBufferCache();
+        Cache.instance.cleanActualCache();
+        Cache.instance.cleanBufferCache();
 
         Structures.STRUCTURES_CACHE.clean();
     }

diff --git a/...awncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/CheckDebugger.java b/...awncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/CheckDebugger.java
@@ -13,7 +13,7 @@ public final class CheckDebugger
     /**
      *
      */
-    private static CheckDebugger instance = null;
+    public static CheckDebugger instance;
 
     /**
      *
@@ -24,15 +24,6 @@ public CheckDebugger()
         IsRunDebugger = run();
     }
 
-    /**
-     *
-     * @return
-     */
-    public static CheckDebugger getInstance()
-    {
-        return instance;
-    }
-
     /**
      *
      * @return

diff --git a/...2.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/EntityRendererHooks.java b/...2.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/EntityRendererHooks.java
@@ -70,7 +70,7 @@ public static void onUpdateLightmap(EntityRenderer renderer, float partialTicks)
 
         boolean lightmapUpdateNeededValue;
         {
-            lightmapUpdateNeededField = rendererClass.getDeclaredField(CheckDebugger.getInstance().IsRunDebugger ? "lightmapUpdateNeeded" : "field_78536_aa");
+            lightmapUpdateNeededField = rendererClass.getDeclaredField(CheckDebugger.instance.IsRunDebugger ? "lightmapUpdateNeeded" : "field_78536_aa");
             lightmapUpdateNeededField.setAccessible(true);
             lightmapUpdateNeededValue = lightmapUpdateNeededField.getBoolean(renderer);
         }
@@ -82,7 +82,7 @@ public static void onUpdateLightmap(EntityRenderer renderer, float partialTicks)
 
         Minecraft mc;
         {
-            mcField = rendererClass.getDeclaredField(CheckDebugger.getInstance().IsRunDebugger ? "mc" : "field_78531_r");
+            mcField = rendererClass.getDeclaredField(CheckDebugger.instance.IsRunDebugger ? "mc" : "field_78531_r");
             mcField.setAccessible(true);
             mc = (Minecraft) mcField.get(renderer);
         }
@@ -303,54 +303,54 @@ private static void updateLuminance(EntityRenderer renderer, float partialTicks,
             float bossColorModifier;
             {
                 bossColorModifierField =
-                        renderer.getClass().getDeclaredField(CheckDebugger.getInstance().IsRunDebugger ? "bossColorModifier" : "field_82831_U");
+                        renderer.getClass().getDeclaredField(CheckDebugger.instance.IsRunDebugger ? "bossColorModifier" : "field_82831_U");
                 bossColorModifierField.setAccessible(true);
                 bossColorModifier = bossColorModifierField.getFloat(renderer);
             }
 
             float bossColorModifierPrev;
             {
                 bossColorModifierPrevField =
-                        renderer.getClass().getDeclaredField(CheckDebugger.getInstance().IsRunDebugger ? "bossColorModifierPrev" : "field_82832_V");
+                        renderer.getClass().getDeclaredField(CheckDebugger.instance.IsRunDebugger ? "bossColorModifierPrev" : "field_82832_V");
                 bossColorModifierPrevField.setAccessible(true);
                 bossColorModifierPrev = bossColorModifierPrevField.getFloat(renderer);
             }
 
             float torchFlickerX;
             {
                 torchFlickerXField =
-                        renderer.getClass().getDeclaredField(CheckDebugger.getInstance().IsRunDebugger ? "torchFlickerX" : "field_78514_e");
+                        renderer.getClass().getDeclaredField(CheckDebugger.instance.IsRunDebugger ? "torchFlickerX" : "field_78514_e");
                 torchFlickerXField.setAccessible(true);
                 torchFlickerX = torchFlickerXField.getFloat(renderer);
             }
 
             Object mcObject;
             {
                 mcField =
-                        renderer.getClass().getDeclaredField(CheckDebugger.getInstance().IsRunDebugger ? "mc" : "field_78531_r");
+                        renderer.getClass().getDeclaredField(CheckDebugger.instance.IsRunDebugger ? "mc" : "field_78531_r");
                 mcField.setAccessible(true);
                 mcObject = mcField.get(renderer);
             }
 
             Object gameSettingsObject;
             {
                 gameSettingsField =
-                        mcObject.getClass().getDeclaredField(CheckDebugger.getInstance().IsRunDebugger ? "gameSettings" : "field_71474_y");
+                        mcObject.getClass().getDeclaredField(CheckDebugger.instance.IsRunDebugger ? "gameSettings" : "field_71474_y");
                 gameSettingsField.setAccessible(true);
                 gameSettingsObject = gameSettingsField.get(mcObject);
             }
 
             float gammaSetting;
             {
                 gammaSettingField =
-                        gameSettingsObject.getClass().getDeclaredField(CheckDebugger.getInstance().IsRunDebugger ? "gammaSetting" : "field_74333_Y");
+                        gameSettingsObject.getClass().getDeclaredField(CheckDebugger.instance.IsRunDebugger ? "gammaSetting" : "field_74333_Y");
                 gammaSettingField.setAccessible(true);
                 gammaSetting = gammaSettingField.getFloat(gameSettingsObject);
             }
 
             int[] lightmapColors;
             {
-                lightmapColorsField = renderer.getClass().getDeclaredField(CheckDebugger.getInstance().IsRunDebugger ? "lightmapColors" : "field_78504_Q");
+                lightmapColorsField = renderer.getClass().getDeclaredField(CheckDebugger.instance.IsRunDebugger ? "lightmapColors" : "field_78504_Q");
                 lightmapColorsField.setAccessible(true);
                 lightmapColors = (int[]) lightmapColorsField.get(renderer);
             }

diff --git a/...imesense/dynamicspawncontrol/technical/config/blockgenerator/DataBlockWorldGenerator.java b/...imesense/dynamicspawncontrol/technical/config/blockgenerator/DataBlockWorldGenerator.java
@@ -7,7 +7,7 @@
 /**
  *
  */
-public class DataBlockWorldGenerator
+public final class DataBlockWorldGenerator
 {
     /**
      *

diff --git a/.../org/imesense/dynamicspawncontrol/technical/config/cachedameworld/DataCacheWorldGame.java b/.../org/imesense/dynamicspawncontrol/technical/config/cachedameworld/DataCacheWorldGame.java
@@ -3,7 +3,7 @@
 /**
  *
  */
-public class DataCacheWorldGame
+public final class DataCacheWorldGame
 {
 
 }
diff --git a/...java/org/imesense/dynamicspawncontrol/technical/config/gamedebugger/DataGameDebugger.java b/...java/org/imesense/dynamicspawncontrol/technical/config/gamedebugger/DataGameDebugger.java
@@ -4,7 +4,10 @@
 
 import javax.annotation.Nonnull;
 
-public class DataGameDebugger
+/**
+ *
+ */
+public final class DataGameDebugger
 {
     /**
      *

diff --git a/.../org/imesense/dynamicspawncontrol/technical/config/gameworldtime/DataPluginWorldTime.java b/.../org/imesense/dynamicspawncontrol/technical/config/gameworldtime/DataPluginWorldTime.java
@@ -7,7 +7,7 @@
 /**
  *
  */
-public class DataPluginWorldTime
+public final class DataPluginWorldTime
 {
     /**
      *
@@ -66,7 +66,7 @@ public worldTime(@Nonnull final String category)
          */
         public Integer getDayLengthMinutes()
         {
-            return dayLengthMinutes;
+            return this.dayLengthMinutes;
         }
 
         /**
@@ -75,7 +75,7 @@ public Integer getDayLengthMinutes()
          */
         public Integer getNightLengthMinutes()
         {
-            return nightLengthMinutes;
+            return this.nightLengthMinutes;
         }
 
         /**
@@ -84,7 +84,7 @@ public Integer getNightLengthMinutes()
          */
         public Integer getSyncToSystemTimeRate()
         {
-            return syncToSystemTimeRate;
+            return this.syncToSystemTimeRate;
         }
 
         /**
@@ -93,7 +93,7 @@ public Integer getSyncToSystemTimeRate()
          */
         public Boolean getTimeControlDebug()
         {
-            return timeControlDebug;
+            return this.timeControlDebug;
         }
 
         /**
@@ -102,7 +102,7 @@ public Boolean getTimeControlDebug()
          */
         public Boolean getSyncToSystemTime()
         {
-            return syncToSystemTime;
+            return this.syncToSystemTime;
         }
 
         /**

diff --git a/.../src/main/java/org/imesense/dynamicspawncontrol/technical/config/logfile/DataLogFile.java b/.../src/main/java/org/imesense/dynamicspawncontrol/technical/config/logfile/DataLogFile.java
@@ -7,7 +7,7 @@
 /**
  *
  */
-public class DataLogFile
+public final class DataLogFile
 {
     /**
      *

diff --git a/....2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/player/DataPlayer.java b/....2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/player/DataPlayer.java
@@ -7,7 +7,7 @@
 /**
  *
  */
-public class DataPlayer
+public final class DataPlayer
 {
     /**
      *