diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/DynamicSpawnControl.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/DynamicSpawnControl.java index 1e5096b..a77a7c0 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/DynamicSpawnControl.java +++ b/dynamicspawncontrol-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/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/CheckDebugger.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/CheckDebugger.java index e760d8f..0dc70b1 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/CheckDebugger.java +++ b/dynamicspawncontrol-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/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/EntityRendererHooks.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/EntityRendererHooks.java index 4fd32f1..7865707 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/EntityRendererHooks.java +++ b/dynamicspawncontrol-1.12.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,7 +303,7 @@ 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); } @@ -311,7 +311,7 @@ private static void updateLuminance(EntityRenderer renderer, float partialTicks, 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); } @@ -319,7 +319,7 @@ private static void updateLuminance(EntityRenderer renderer, float partialTicks, 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); } @@ -327,7 +327,7 @@ private static void updateLuminance(EntityRenderer renderer, float partialTicks, 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); } @@ -335,7 +335,7 @@ private static void updateLuminance(EntityRenderer renderer, float partialTicks, 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); } @@ -343,14 +343,14 @@ private static void updateLuminance(EntityRenderer renderer, float partialTicks, 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/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/blockgenerator/DataBlockWorldGenerator.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/blockgenerator/DataBlockWorldGenerator.java index a1096f8..b9a9c21 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/blockgenerator/DataBlockWorldGenerator.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/blockgenerator/DataBlockWorldGenerator.java @@ -7,7 +7,7 @@ /** * */ -public class DataBlockWorldGenerator +public final class DataBlockWorldGenerator { /** * diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/cachedameworld/DataCacheWorldGame.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/cachedameworld/DataCacheWorldGame.java index 2827aad..ddcfaf1 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/cachedameworld/DataCacheWorldGame.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/cachedameworld/DataCacheWorldGame.java @@ -3,7 +3,7 @@ /** * */ -public class DataCacheWorldGame +public final class DataCacheWorldGame { } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/gamedebugger/DataGameDebugger.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/gamedebugger/DataGameDebugger.java index a963848..8aeb927 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/gamedebugger/DataGameDebugger.java +++ b/dynamicspawncontrol-1.12.2/src/main/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/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/gameworldtime/DataPluginWorldTime.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/gameworldtime/DataPluginWorldTime.java index 66f9ccd..892dc77 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/gameworldtime/DataPluginWorldTime.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/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/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/logfile/DataLogFile.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/logfile/DataLogFile.java index eeb9655..7b0fac8 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/logfile/DataLogFile.java +++ b/dynamicspawncontrol-1.12.2/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/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/player/DataPlayer.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/player/DataPlayer.java index 60a145e..c521c74 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/player/DataPlayer.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/player/DataPlayer.java @@ -7,7 +7,7 @@ /** * */ -public class DataPlayer +public final class DataPlayer { /** * diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/rendernight/DataRenderNight.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/rendernight/DataRenderNight.java index f6a2ab8..00d5328 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/rendernight/DataRenderNight.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/rendernight/DataRenderNight.java @@ -7,7 +7,7 @@ /** * */ -public class DataRenderNight +public final class DataRenderNight { /** * @@ -101,7 +101,7 @@ public renderNight(@Nonnull final String category) */ public Boolean getDarknessOverWorld() { - return darknessOverWorld; + return this.darknessOverWorld; } /** @@ -119,7 +119,7 @@ public void setDarknessOverWorld(Boolean darknessOverWorld) */ public Boolean getDarknessNether() { - return darknessNether; + return this.darknessNether; } /** @@ -137,7 +137,7 @@ public void setDarknessNether(Boolean darknessNether) */ public Boolean getDarknessEnd() { - return darknessEnd; + return this.darknessEnd; } /** @@ -155,7 +155,7 @@ public void setDarknessEnd(Boolean darknessEnd) */ public Boolean getDarknessDefault() { - return darknessDefault; + return this.darknessDefault; } /** @@ -173,7 +173,7 @@ public void setDarknessDefault(Boolean darknessDefault) */ public Boolean getDarknessSkyLess() { - return darknessSkyLess; + return this.darknessSkyLess; } /** @@ -191,7 +191,7 @@ public void setDarknessSkyLess(Boolean darknessSkyLess) */ public Boolean getDarknessNetherFog() { - return darknessNetherFog; + return this.darknessNetherFog; } /** @@ -209,7 +209,7 @@ public void setDarknessNetherFog(Boolean darknessNetherFog) */ public Boolean getDarknessEndFog() { - return darknessEndFog; + return this.darknessEndFog; } /** @@ -227,7 +227,7 @@ public void setDarknessEndFog(Boolean darknessEndFog) */ public Boolean getIgnoreMoonLight() { - return ignoreMoonLight; + return this.ignoreMoonLight; } /** @@ -245,7 +245,7 @@ public void setIgnoreMoonLight(Boolean ignoreMoonLight) */ public Boolean getInvertBlacklist() { - return invertBlacklist; + return this.invertBlacklist; } /** @@ -263,7 +263,7 @@ public void setInvertBlacklist(Boolean invertBlacklist) */ public Integer[] getBlacklistByID() { - return blacklistByID; + return this.blacklistByID; } /** @@ -281,7 +281,7 @@ public void setBlacklistByID(Integer[] blacklistByID) */ public Double[] getMoonPhaseFactors() { - return moonPhaseFactors; + return this.moonPhaseFactors; } /** @@ -299,7 +299,7 @@ public void setMoonPhaseFactors(Double[] moonPhaseFactors) */ public String[] getBlacklistByName() { - return blacklistByName; + return this.blacklistByName; } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/windowtitle/DataWindowTitle.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/windowtitle/DataWindowTitle.java index 302c344..5acffa5 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/windowtitle/DataWindowTitle.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/windowtitle/DataWindowTitle.java @@ -8,7 +8,7 @@ /** * */ -public class DataWindowTitle +public final class DataWindowTitle { /** * diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/zombiedropitem/DataZombieDropItem.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/zombiedropitem/DataZombieDropItem.java index cc7812e..3b45f17 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/zombiedropitem/DataZombieDropItem.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/zombiedropitem/DataZombieDropItem.java @@ -7,7 +7,7 @@ /** * */ -public class DataZombieDropItem +public final class DataZombieDropItem { /** * @@ -76,7 +76,7 @@ public zombieDrop(@Nonnull final String category) */ public Float getBreakItem() { - return breakItem; + return this.breakItem; } /** @@ -94,7 +94,7 @@ public void setBreakItem(Float breakItem) */ public Float getHandItemDamageFactor() { - return handItemDamageFactor; + return this.handItemDamageFactor; } /** @@ -112,7 +112,7 @@ public void setHandItemDamageFactor(Float handItemDamageFactor) */ public Float getHeadDamageFactor() { - return headDamageFactor; + return this.headDamageFactor; } /** @@ -130,7 +130,7 @@ public void setHeadDamageFactor(Float headDamageFactor) */ public Float getChestDamageFactor() { - return chestDamageFactor; + return this.chestDamageFactor; } /** @@ -148,7 +148,7 @@ public void setChestDamageFactor(Float chestDamageFactor) */ public Float getLegsDamageFactor() { - return legsDamageFactor; + return this.legsDamageFactor; } /** @@ -166,7 +166,7 @@ public void setLegsDamageFactor(Float legsDamageFactor) */ public Float getFeetDamageFactor() { - return feetDamageFactor; + return this.feetDamageFactor; } /** @@ -184,7 +184,7 @@ public void setFeetDamageFactor(Float feetDamageFactor) */ public Float getDamageSpreadFactor() { - return damageSpreadFactor; + return this.damageSpreadFactor; } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnPotentialSpawns.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnPotentialSpawns.java index bb6cd36..781a418 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnPotentialSpawns.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnPotentialSpawns.java @@ -80,13 +80,13 @@ public synchronized void onUpdatePotentialSpawns_0(WorldEvent.PotentialSpawns ev for (Biome.SpawnListEntry entry : spawnEntries) { ResourceLocation entityKey = EntityList.getKey(entry.entityClass); - CacheStorage.EntityData entityData = CacheStorage.getInstance().getEntityDataByResourceLocation(entityKey); + CacheStorage.EntityData entityData = CacheStorage.instance.getEntityDataByResourceLocation(entityKey); if (entityData != null) { assert entityKey != null; - int currentCount = Cache.getInstance().getEntitiesByResourceLocation(entityKey).size(); + int currentCount = Cache.instance.getEntitiesByResourceLocation(entityKey).size(); int maxCount = entityData.getMaxCount(); if (currentCount >= maxCount) diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/single/OnSingleJsonCheckSpawn.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/single/OnSingleJsonCheckSpawn.java index cf564ca..ff1a6ef 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/single/OnSingleJsonCheckSpawn.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/single/OnSingleJsonCheckSpawn.java @@ -59,7 +59,7 @@ public synchronized void onCheckSpawn_0(LivingSpawnEvent.CheckSpawn event) if (entityResource != null) { - List blockedEntities = GeneralStorageData.getInstance().getEntitiesProhibitedOutdoors(); + List blockedEntities = GeneralStorageData.instance.getEntitiesProhibitedOutdoors(); if (blockedEntities != null && blockedEntities.contains(entityResource.toString())) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/single/OnSingleZombieSummonAID.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/single/OnSingleZombieSummonAID.java index 5750894..295d563 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/single/OnSingleZombieSummonAID.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/single/OnSingleZombieSummonAID.java @@ -171,7 +171,7 @@ public void onZombieAttack_0(LivingAttackEvent event) EntityZombie newZombie = new EntityZombie(world); newZombie.setPosition(spawnPos.getX(), spawnPos.getY(), spawnPos.getZ()); - GeneralStorageData parser = GeneralStorageData.getInstance(); + GeneralStorageData parser = GeneralStorageData.instance; if (parser != null) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterCfgClasses.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterCfgClasses.java index 137b399..550bbda 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterCfgClasses.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterCfgClasses.java @@ -18,8 +18,13 @@ /** * */ -public final class RegisterCfgClasses { - private static final Class[] CONFIG_CLASSES = { +public final class RegisterCfgClasses +{ + /** + * + */ + private static final Class[] CONFIG_CLASSES = + { CfgCacheWorldGame.class, CfgGameDebugger.class, CfgLogFile.class, @@ -31,19 +36,36 @@ public final class RegisterCfgClasses { CfgZombieDropItem.class }; - public RegisterCfgClasses() { + /** + * + */ + public RegisterCfgClasses() + { CodeGenericUtils.printInitClassToLog(this.getClass()); } - public static void initializeConfigs() { - for (Class configClass : CONFIG_CLASSES) { + /** + * + */ + public static void initializeConfigs() + { + for (Class configClass : CONFIG_CLASSES) + { initializeConfig(configClass); } } - private static void initializeConfig(Class configClass) { - try { - if (configClass.isAnnotationPresent(DCSSingleConfig.class)) { + /** + * + * @param configClass + * @param + */ + private static void initializeConfig(Class configClass) + { + try + { + if (configClass.isAnnotationPresent(DCSSingleConfig.class)) + { DCSSingleConfig configAnnotation = configClass.getAnnotation(DCSSingleConfig.class); String configFileName = configAnnotation.fileName(); @@ -52,12 +74,18 @@ private static void initializeConfig(Class configClass) { Log.writeDataToLogFile(0, "Initialized config: " + configFileName); Log.writeDataToLogFile(0, "configClass: " + configClass + " " + configInstance); - } else { + } + else + { Log.writeDataToLogFile(2, "No ConfigClass annotation found in: " + configClass.getName()); } - } catch (NoSuchMethodException e) { + } + catch (NoSuchMethodException e) + { Log.writeDataToLogFile(2, "Constructor with String parameter not found in class: " + configClass.getName() + " - " + e.getMessage()); - } catch (Exception e) { + } + catch (Exception e) + { Log.writeDataToLogFile(2, "Exception in class: " + configClass.getName() + " - " + e.getMessage()); throw new RuntimeException(e); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/GeneralStorageData.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/GeneralStorageData.java index c02d839..b2dc2e2 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/GeneralStorageData.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/GeneralStorageData.java @@ -13,21 +13,7 @@ public final class GeneralStorageData /** * */ - private static GeneralStorageData instance; - - /** - * - * @return - */ - public static GeneralStorageData getInstance() - { - if (instance == null) - { - throw new IllegalStateException("Instance not initialized. Call the constructor first."); - } - - return instance; - } + public static GeneralStorageData instance; /** * diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/beta/ParserSingleScriptCheckSpawn.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/beta/ParserSingleScriptCheckSpawn.java index f79cfa0..484969a 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/beta/ParserSingleScriptCheckSpawn.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/beta/ParserSingleScriptCheckSpawn.java @@ -22,11 +22,6 @@ */ public final class ParserSingleScriptCheckSpawn implements IBetaParsers { - /** - * - */ - private static ParserSingleScriptCheckSpawn instance; - /** * */ @@ -35,15 +30,6 @@ public ParserSingleScriptCheckSpawn() CodeGenericUtils.printInitClassToLog(this.getClass()); } - /** - * - * @return - */ - public static ParserSingleScriptCheckSpawn getClassInstance() - { - return instance; - } - /** * */ @@ -58,8 +44,6 @@ public void reloadConfig() */ public void loadConfig(boolean initialization) { - instance = this; - File file = getConfigFile(initialization, DynamicSpawnControl.STRUCT_FILES_DIRS.NAME_DIR_SINGLE_SCRIPTS, EnumSingleScripts.SCRIPT_MOBS_LIST_SEE_SKY.getKeyword()); @@ -113,10 +97,11 @@ public void loadConfig(boolean initialization) if (entitiesObject != null) { final Type listType = new TypeToken>() {}.getType(); - GeneralStorageData.getInstance().EntitiesProhibitedOutdoors = gson.fromJson(entitiesObject.get("entities"), listType); + GeneralStorageData.instance.EntitiesProhibitedOutdoors = gson.fromJson(entitiesObject.get("entities"), listType); Log.writeDataToLogFile(0, "Script: " + - EnumSingleScripts.SCRIPT_MOBS_LIST_SEE_SKY.getKeyword() + " data blockedEntities: " + GeneralStorageData.getInstance().EntitiesProhibitedOutdoors); + EnumSingleScripts.SCRIPT_MOBS_LIST_SEE_SKY.getKeyword() + + " data blockedEntities: " + GeneralStorageData.instance.EntitiesProhibitedOutdoors); } else { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/beta/ParserSingleScriptSettingsCache.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/beta/ParserSingleScriptSettingsCache.java index 8ce9b6d..182b997 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/beta/ParserSingleScriptSettingsCache.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/beta/ParserSingleScriptSettingsCache.java @@ -37,28 +37,12 @@ public void reloadConfig() loadConfig(false); } - /** - * - */ - private static ParserSingleScriptSettingsCache instance; - - /** - * - * @return - */ - public static ParserSingleScriptSettingsCache getClassInstance() - { - return instance; - } - /** * * @param initialization */ public void loadConfig(boolean initialization) { - instance = this; - File file = getConfigFile(initialization, DynamicSpawnControl.STRUCT_FILES_DIRS.NAME_DIR_CACHE, EnumSingleScripts.SCRIPT_CACHE_MOBS.getKeyword()); @@ -122,7 +106,7 @@ public void loadConfig(boolean initialization) entitiesList.add(new CacheStorage.EntityData(entityResourceLocation, maxCount)); } - CacheStorage.getInstance().EntityCacheMobs = entitiesList; + CacheStorage.instance.EntityCacheMobs = entitiesList; Log.writeDataToLogFile(0, "Loaded script with data: " + entitiesList); } else diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/beta/ParserSingleZombieSummonAID.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/beta/ParserSingleZombieSummonAID.java index 37938e3..b16bd47 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/beta/ParserSingleZombieSummonAID.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/beta/ParserSingleZombieSummonAID.java @@ -25,11 +25,6 @@ */ public final class ParserSingleZombieSummonAID implements IBetaParsers { - /** - * - */ - private static ParserSingleZombieSummonAID instance; - /** * */ @@ -38,15 +33,6 @@ public ParserSingleZombieSummonAID() CodeGenericUtils.printInitClassToLog(this.getClass()); } - /** - * - * @return - */ - public static ParserSingleZombieSummonAID getClassInstance() - { - return instance; - } - /** * */ @@ -61,9 +47,7 @@ public void reloadConfig() */ public void loadConfig(boolean initialization) { - instance = this; - - GeneralStorageData.getInstance().EquipmentConfigs = new ArrayList<>(); + GeneralStorageData.instance.EquipmentConfigs = new ArrayList<>(); File file = getConfigFile(initialization, DynamicSpawnControl.STRUCT_FILES_DIRS.NAME_DIR_SINGLE_SCRIPTS, EnumSingleScripts.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword()); @@ -136,7 +120,7 @@ public void loadConfig(boolean initialization) config.Leggings = gson.fromJson(equipmentObject.get("armor_legs"), listType); config.Boots = gson.fromJson(equipmentObject.get("armor_boots"), listType); - GeneralStorageData.getInstance().EquipmentConfigs.add(config); + GeneralStorageData.instance.EquipmentConfigs.add(config); Log.writeDataToLogFile(0, "Script: " + EnumSingleScripts.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword() + " data loaded."); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/Cache.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/Cache.java index f34d5b3..a3464d3 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/Cache.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/Cache.java @@ -47,12 +47,10 @@ public final class Cache public final ConcurrentMap> ENTITIES_ACTUAL_BY_RESOURCE_LOCATION = new ConcurrentHashMap<>(); public final ConcurrentMap> ENTITIES_BUFFER_BY_RESOURCE_LOCATION = new ConcurrentHashMap<>(); - private static Cache instance = null; + public static Cache instance; private static boolean instanceExists = false; - public static Cache getInstance() { return instance; } - public Cache() { CodeGenericUtils.printInitClassToLog(this.getClass()); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheEvents.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheEvents.java index 51df46b..ef4d3e2 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheEvents.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheEvents.java @@ -52,19 +52,19 @@ public synchronized void onWorldTick_0(TickEvent.WorldTickEvent event) { if (event.phase == TickEvent.Phase.END) { - Cache.getInstance().TickCounter++; + Cache.instance.TickCounter++; - if (Cache.getInstance().TickCounter >= Cache.getInstance().DynamicUpdateInterval) + if (Cache.instance.TickCounter >= Cache.instance.DynamicUpdateInterval) { - Cache.getInstance().TickCounter = 0; + Cache.instance.TickCounter = 0; - Cache.getInstance().copyActualToBuffer(); - Cache.getInstance().updateCache(event.world); + Cache.instance.copyActualToBuffer(); + Cache.instance.updateCache(event.world); - if (Cache.getInstance().isFirstUpdate) + if (Cache.instance.isFirstUpdate) { - Cache.getInstance().DynamicUpdateInterval = Cache.getInstance().SUBSEQUENT_UPDATE_INTERVAL; - Cache.getInstance().isFirstUpdate = false; + Cache.instance.DynamicUpdateInterval = Cache.instance.SUBSEQUENT_UPDATE_INTERVAL; + Cache.instance.isFirstUpdate = false; } } } @@ -73,22 +73,22 @@ public synchronized void onWorldTick_0(TickEvent.WorldTickEvent event) @SubscribeEvent public synchronized void onPlayerLoggedIn_1(PlayerEvent.PlayerLoggedInEvent event) { - if (!Cache.getInstance().isPrimaryPlayerLogged) + if (!Cache.instance.isPrimaryPlayerLogged) { - Cache.getInstance().isPrimaryPlayerLogged = true; - Cache.getInstance().DynamicUpdateInterval = Cache.getInstance().FIRST_UPDATE_INTERVAL; - Cache.getInstance().TickCounter = 0; - Cache.getInstance().isFirstUpdate = true; + Cache.instance.isPrimaryPlayerLogged = true; + Cache.instance.DynamicUpdateInterval = Cache.instance.FIRST_UPDATE_INTERVAL; + Cache.instance.TickCounter = 0; + Cache.instance.isFirstUpdate = true; } - Cache.getInstance().copyActualToBuffer(); + Cache.instance.copyActualToBuffer(); } @SubscribeEvent public synchronized void onPlayerLoggedOut_2(PlayerEvent.PlayerLoggedOutEvent event) { - Cache.getInstance().copyActualToBuffer(); + Cache.instance.copyActualToBuffer(); } @SubscribeEvent(priority = EventPriority.LOW) @@ -130,19 +130,19 @@ public synchronized void onEntityJoinWorld_4(EntityJoinWorldEvent event) WorldServer worldServer = (WorldServer) world; - Cache.getInstance().updateCache(worldServer); + Cache.instance.updateCache(worldServer); - if (Cache.getInstance().CACHE_VALID_CHUNKS.contains(new ChunkPos(entity.chunkCoordX, entity.chunkCoordZ))) + if (Cache.instance.CACHE_VALID_CHUNKS.contains(new ChunkPos(entity.chunkCoordX, entity.chunkCoordZ))) { if (entity instanceof IAnimals) { if (entity instanceof EntityAnimal) { - Cache.getInstance().CACHED_ACTUAL_ANIMALS.add((EntityAnimal) entity); + Cache.instance.CACHED_ACTUAL_ANIMALS.add((EntityAnimal) entity); } else if (entity instanceof EntityMob) { - Cache.getInstance().CACHED_ACTUAL_HOSTILES.add((IAnimals) entity); + Cache.instance.CACHED_ACTUAL_HOSTILES.add((IAnimals) entity); } } @@ -150,16 +150,16 @@ else if (entity instanceof EntityMob) { String entityName = entity.getName(); - Cache.getInstance().CACHED_ACTUAL_ALL.add((EntityLivingBase) entity); + Cache.instance.CACHED_ACTUAL_ALL.add((EntityLivingBase) entity); - Cache.getInstance().ENTITIES_ACTUAL_BY_NAME.computeIfAbsent(entityName, k -> + Cache.instance.ENTITIES_ACTUAL_BY_NAME.computeIfAbsent(entityName, k -> new HashSet<>()).add((EntityLivingBase) entity); ResourceLocation entityKey = EntityList.getKey(entity); if (entityKey != null) { - Cache.getInstance().ENTITIES_ACTUAL_BY_RESOURCE_LOCATION.computeIfAbsent(entityKey, k -> + Cache.instance.ENTITIES_ACTUAL_BY_RESOURCE_LOCATION.computeIfAbsent(entityKey, k -> new HashSet<>()).add((EntityLivingBase) entity); } } @@ -173,14 +173,14 @@ public synchronized void updateEntitySpawnEvent_5(LivingSpawnEvent.CheckSpawn ev ResourceLocation entityKey = EntityList.getKey(entity); - CacheStorage.EntityData entityData = CacheStorage.getInstance().getEntityDataByResourceLocation(entityKey); + CacheStorage.EntityData entityData = CacheStorage.instance.getEntityDataByResourceLocation(entityKey); if (entityData != null) { assert entityKey != null; int maxCount = entityData.getMaxCount(); - int currentCount = Cache.getInstance().getEntitiesByResourceLocation(entityKey).size(); + int currentCount = Cache.instance.getEntitiesByResourceLocation(entityKey).size(); if (currentCount > maxCount) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheMonitor.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheMonitor.java index d0b79bf..c07addb 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheMonitor.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheMonitor.java @@ -19,16 +19,19 @@ public final class CacheMonitor */ private final int X = 10, Y = 10; - private static CacheMonitor instance = null; - + /** + * + */ private static boolean instanceExists = false; - public static CacheMonitor getInstance() { return instance; } /** * */ public final Minecraft GetMinecraft = Minecraft.getMinecraft(); + /** + * + */ public CacheMonitor() { CodeGenericUtils.printInitClassToLog(this.getClass()); @@ -40,8 +43,6 @@ public CacheMonitor() } instanceExists = true; - - instance = this; } /** @@ -52,11 +53,11 @@ public void renderDebugInfo(ScaledResolution resolution) { final FontRenderer FONT_RENDER = GetMinecraft.fontRenderer; - final String ACTUAL_ANIMALS = TextFormatting.GREEN + "Actual Animals: " + Cache.getInstance().getActualAnimalCount(); - final String ACTUAL_HOSTILE = TextFormatting.RED + "Actual Hostile Entities: " + Cache.getInstance().getActualHostileEntityCount(); - final String ACTUAL_TOTAL = TextFormatting.YELLOW + "Actual Total Entities: " + Cache.getInstance().getActualTotalEntityCount(); - final String UPDATE_TICK = TextFormatting.WHITE + "Tick Counter: " + Cache.getInstance().TickCounter; - final String VALID_CHUNKS = TextFormatting.YELLOW + "Valid Chunks: " + Cache.getInstance().getValidChunkCount(); + final String ACTUAL_ANIMALS = TextFormatting.GREEN + "Actual Animals: " + Cache.instance.getActualAnimalCount(); + final String ACTUAL_HOSTILE = TextFormatting.RED + "Actual Hostile Entities: " + Cache.instance.getActualHostileEntityCount(); + final String ACTUAL_TOTAL = TextFormatting.YELLOW + "Actual Total Entities: " + Cache.instance.getActualTotalEntityCount(); + final String UPDATE_TICK = TextFormatting.WHITE + "Tick Counter: " + Cache.instance.TickCounter; + final String VALID_CHUNKS = TextFormatting.YELLOW + "Valid Chunks: " + Cache.instance.getValidChunkCount(); final String SEPARATOR = TextFormatting.WHITE + "--------------------------------------------"; @@ -67,9 +68,9 @@ public void renderDebugInfo(ScaledResolution resolution) FONT_RENDER.drawString(VALID_CHUNKS, X, Y + 40, 0xFFFFFF); FONT_RENDER.drawString(SEPARATOR, X, Y + 50, 0xFFFFFF); - final String BUFFER_ANIMALS = TextFormatting.GREEN + "Buffer Animals: " + Cache.getInstance().getBufferAnimalCount(); - final String BUFFER_HOSTILE = TextFormatting.RED + "Buffer Hostile Entities: " + Cache.getInstance().getBufferHostileEntityCount(); - final String BUFFER_TOTAL = TextFormatting.YELLOW + "Buffer Total Entities: " + Cache.getInstance().getBufferTotalEntityCount(); + final String BUFFER_ANIMALS = TextFormatting.GREEN + "Buffer Animals: " + Cache.instance.getBufferAnimalCount(); + final String BUFFER_HOSTILE = TextFormatting.RED + "Buffer Hostile Entities: " + Cache.instance.getBufferHostileEntityCount(); + final String BUFFER_TOTAL = TextFormatting.YELLOW + "Buffer Total Entities: " + Cache.instance.getBufferTotalEntityCount(); FONT_RENDER.drawString(BUFFER_ANIMALS, X, Y + 60, 0xFFFFFF); FONT_RENDER.drawString(BUFFER_HOSTILE, X, Y + 70, 0xFFFFFF); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheStorage.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheStorage.java index 248d03f..9dfed0f 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheStorage.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheStorage.java @@ -14,16 +14,7 @@ public final class CacheStorage /** * */ - private static CacheStorage instance; - - /** - * - * @return - */ - public static CacheStorage getInstance() - { - return instance; - } + public static CacheStorage instance; /** *