Fixed running under new versions of the IDE

imesense · Jan 6, 2025 · 5d53b40 · 5d53b40
1 parent cedce36
commit 5d53b40
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 15 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
@@ -94,9 +94,15 @@ public void preInit(FMLPreInitializationEvent fmlPreInitializationEvent) throws
     {
         globalDirectory = fmlPreInitializationEvent.getModConfigurationDirectory();
 
-        Log.createLogFile(globalDirectory.getPath() + File.separator + DynamicSpawnControlStructure.STRUCT_FILES_DIRS.NAME_DIRECTORY, UniqueField.IDEA_RT);
-        Log.writeDataToLogFile(1, "Launching from Intellij Idea: " + (UniqueField.IDEA_RT ? "true" : "false"));
-        Log.writeDataToLogFile(0, "Object create [UniqueField]: " + UniqueField.getInstance().hashCode());
+        Log.createLogFile(globalDirectory.getPath() +
+                File.separator + DynamicSpawnControlStructure.STRUCT_FILES_DIRS.NAME_DIRECTORY,
+                UniqueField.LOGGING_CONSOLE_LEVEL_DEBUG);
+
+        Log.writeDataToLogFile(1, "Is running in IDE (based on logging level): " +
+                (UniqueField.LOGGING_CONSOLE_LEVEL_DEBUG ? "true" : "false"));
+
+        Log.writeDataToLogFile(0, "Object create [UniqueField]: " +
+                UniqueField.getInstance().hashCode());
 
         MessageHandler.init();
 

diff --git a/...control-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/field/UniqueField.java b/...control-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/field/UniqueField.java
@@ -28,7 +28,7 @@ public final class UniqueField
     public static final Minecraft CLIENT = Minecraft.getMinecraft();
 
     @UniqueObject
-    public static final Boolean IDEA_RT = System.getProperty("java.class.path").toLowerCase().contains("idea_rt.jar");
+    public static final Boolean LOGGING_CONSOLE_LEVEL_DEBUG = "debug".equalsIgnoreCase(System.getProperty("forge.logging.console.level"));
 
     /**
      *

diff --git a/...ol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/event/OnEventNickNameEntity.java b/...ol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/event/OnEventNickNameEntity.java
@@ -94,7 +94,7 @@ public void onEntitySpawn_0(LivingSpawnEvent.SpecialSpawn specialSpawn)
                         this.RANDOM_NAMES.get(UniqueField.RANDOM.nextInt(this.RANDOM_NAMES.size()));
 
                 entityZombie.setCustomNameTag(randomName);
-                entityZombie.setAlwaysRenderNameTag(UniqueField.IDEA_RT);
+                entityZombie.setAlwaysRenderNameTag(UniqueField.LOGGING_CONSOLE_LEVEL_DEBUG);
             }
         }
 
@@ -106,7 +106,7 @@ public void onEntitySpawn_0(LivingSpawnEvent.SpecialSpawn specialSpawn)
                     this.RANDOM_NAMES.get(UniqueField.RANDOM.nextInt(this.RANDOM_NAMES.size()));
 
             entityVillager.setCustomNameTag(randomName);
-            entityVillager.setAlwaysRenderNameTag(UniqueField.IDEA_RT);
+            entityVillager.setAlwaysRenderNameTag(UniqueField.LOGGING_CONSOLE_LEVEL_DEBUG);
         }
     }
 

diff --git a/...esense/dynamicspawncontrol/plugin/darkness_forge_1_12_x_0_5_0/asm/EntityRendererHook.java b/...esense/dynamicspawncontrol/plugin/darkness_forge_1_12_x_0_5_0/asm/EntityRendererHook.java
@@ -70,7 +70,7 @@ public static void onUpdateLightmap(EntityRenderer entityRenderer, float partial
 
         boolean lightmapUpdateNeededValue;
         {
-            lightmapUpdateNeededField = _class.getDeclaredField(UniqueField.IDEA_RT ? "lightmapUpdateNeeded" : "field_78536_aa");
+            lightmapUpdateNeededField = _class.getDeclaredField(UniqueField.LOGGING_CONSOLE_LEVEL_DEBUG ? "lightmapUpdateNeeded" : "field_78536_aa");
             lightmapUpdateNeededField.setAccessible(true);
             lightmapUpdateNeededValue = lightmapUpdateNeededField.getBoolean(entityRenderer);
         }
@@ -82,7 +82,9 @@ public static void onUpdateLightmap(EntityRenderer entityRenderer, float partial
 
         Minecraft mc;
         {
-            mcField = _class.getDeclaredField(UniqueField.IDEA_RT ? "mc" : "field_78531_r");
+            mcField = _class.getDeclaredField(UniqueField.LOGGING_CONSOLE_LEVEL_DEBUG ?
+                    "mc" : "field_78531_r");
+
             mcField.setAccessible(true);
             mc = (Minecraft) mcField.get(entityRenderer);
         }
@@ -304,7 +306,7 @@ private static void updateLuminance(EntityRenderer entityRenderer, float partial
             float bossColorModifier;
             {
                 bossColorModifierField =
-                        entityRenderer.getClass().getDeclaredField(UniqueField.IDEA_RT ? "bossColorModifier" : "field_82831_U");
+                        entityRenderer.getClass().getDeclaredField(UniqueField.LOGGING_CONSOLE_LEVEL_DEBUG ? "bossColorModifier" : "field_82831_U");
 
                 bossColorModifierField.setAccessible(true);
                 bossColorModifier = bossColorModifierField.getFloat(entityRenderer);
@@ -313,7 +315,8 @@ private static void updateLuminance(EntityRenderer entityRenderer, float partial
             float bossColorModifierPrev;
             {
                 bossColorModifierPrevField =
-                        entityRenderer.getClass().getDeclaredField(UniqueField.IDEA_RT ? "bossColorModifierPrev" : "field_82832_V");
+                        entityRenderer.getClass().getDeclaredField(UniqueField.LOGGING_CONSOLE_LEVEL_DEBUG ?
+                                "bossColorModifierPrev" : "field_82832_V");
 
                 bossColorModifierPrevField.setAccessible(true);
                 bossColorModifierPrev = bossColorModifierPrevField.getFloat(entityRenderer);
@@ -322,7 +325,8 @@ private static void updateLuminance(EntityRenderer entityRenderer, float partial
             float torchFlickerX;
             {
                 torchFlickerXField =
-                        entityRenderer.getClass().getDeclaredField(UniqueField.IDEA_RT ? "torchFlickerX" : "field_78514_e");
+                        entityRenderer.getClass().getDeclaredField(UniqueField.LOGGING_CONSOLE_LEVEL_DEBUG ?
+                                "torchFlickerX" : "field_78514_e");
 
                 torchFlickerXField.setAccessible(true);
                 torchFlickerX = torchFlickerXField.getFloat(entityRenderer);
@@ -331,7 +335,8 @@ private static void updateLuminance(EntityRenderer entityRenderer, float partial
             Object mcObject;
             {
                 mcField =
-                        entityRenderer.getClass().getDeclaredField(UniqueField.IDEA_RT ? "mc" : "field_78531_r");
+                        entityRenderer.getClass().getDeclaredField(UniqueField.LOGGING_CONSOLE_LEVEL_DEBUG ?
+                                "mc" : "field_78531_r");
 
                 mcField.setAccessible(true);
                 mcObject = mcField.get(entityRenderer);
@@ -340,7 +345,8 @@ private static void updateLuminance(EntityRenderer entityRenderer, float partial
             Object gameSettingsObject;
             {
                 gameSettingsField =
-                        mcObject.getClass().getDeclaredField(UniqueField.IDEA_RT ? "gameSettings" : "field_71474_y");
+                        mcObject.getClass().getDeclaredField(UniqueField.LOGGING_CONSOLE_LEVEL_DEBUG ?
+                                "gameSettings" : "field_71474_y");
 
                 gameSettingsField.setAccessible(true);
                 gameSettingsObject = gameSettingsField.get(mcObject);
@@ -349,7 +355,8 @@ private static void updateLuminance(EntityRenderer entityRenderer, float partial
             float gammaSetting;
             {
                 gammaSettingField =
-                        gameSettingsObject.getClass().getDeclaredField(UniqueField.IDEA_RT ? "gammaSetting" : "field_74333_Y");
+                        gameSettingsObject.getClass().getDeclaredField(UniqueField.LOGGING_CONSOLE_LEVEL_DEBUG ?
+                                "gammaSetting" : "field_74333_Y");
 
                 gammaSettingField.setAccessible(true);
                 gammaSetting = gammaSettingField.getFloat(gameSettingsObject);
@@ -358,7 +365,8 @@ private static void updateLuminance(EntityRenderer entityRenderer, float partial
             int[] lightmapColors;
             {
                 lightmapColorsField =
-                        entityRenderer.getClass().getDeclaredField(UniqueField.IDEA_RT ? "lightmapColors" : "field_78504_Q");
+                        entityRenderer.getClass().getDeclaredField(UniqueField.LOGGING_CONSOLE_LEVEL_DEBUG ?
+                                "lightmapColors" : "field_78504_Q");
 
                 lightmapColorsField.setAccessible(true);
                 lightmapColors = (int[]) lightmapColorsField.get(entityRenderer);