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 5378fb8..0a29a35 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 @@ -1,5 +1,6 @@ package org.imesense.dynamicspawncontrol; +import jdk.nashorn.internal.runtime.StoredScript; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -24,6 +25,7 @@ import org.imesense.dynamicspawncontrol.technical.parsers.ParserGenericJsonScripts; import org.imesense.dynamicspawncontrol.technical.parsers.ParserManager; import org.imesense.dynamicspawncontrol.technical.proxy.IProxy; +import org.imesense.dynamicspawncontrol.technical.worldcache.Cache; import org.imesense.dynamicspawncontrol.technical.worldcache.CacheStorage; import java.io.File; @@ -270,8 +272,7 @@ public synchronized void serverLoad(FMLServerStartingEvent event) @EventHandler public synchronized void serverStopped(FMLServerStoppedEvent event) { + Cache.cleanCache(); Structures.STRUCTURES_CACHE.clean(); - - Log.closeExecutor(); } } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpBlock.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpBlock.java index 3909c4c..275db09 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpBlock.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpBlock.java @@ -27,24 +27,11 @@ */ public final class cmdAdminDumpBlock extends CommandBase { - /** - * - */ - private static boolean instanceExists = false; - /** * */ public cmdAdminDumpBlock() { - if (instanceExists) - { - Log.writeDataToLogFile(2, String.format("An instance of [%s] already exists!", this.getClass().getSimpleName())); - throw new RuntimeException(); - } - - instanceExists = true; - CodeGenericUtils.printInitClassToLog(cmdAdminDumpBlock.class); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpEntity.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpEntity.java index fa13088..a820a81 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpEntity.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpEntity.java @@ -19,24 +19,11 @@ */ public final class cmdAdminDumpEntity extends CommandBase { - /** - * - */ - private static boolean instanceExists = false; - /** * */ public cmdAdminDumpEntity() { - if (instanceExists) - { - Log.writeDataToLogFile(2, String.format("An instance of [%s] already exists!", this.getClass().getSimpleName())); - throw new RuntimeException(); - } - - instanceExists = true; - CodeGenericUtils.printInitClassToLog(cmdAdminDumpEntity.class); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpItem.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpItem.java index 622afd5..c8d8cf5 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpItem.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpItem.java @@ -25,24 +25,11 @@ */ public final class cmdAdminDumpItem extends CommandBase { - /** - * - */ - private static boolean instanceExists = false; - /** * */ public cmdAdminDumpItem() { - if (instanceExists) - { - Log.writeDataToLogFile(2, String.format("An instance of [%s] already exists!", this.getClass().getSimpleName())); - throw new RuntimeException(); - } - - instanceExists = true; - CodeGenericUtils.printInitClassToLog(cmdAdminDumpItem.class); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminGameMode.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminGameMode.java index b337f8d..935deeb 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminGameMode.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminGameMode.java @@ -18,24 +18,11 @@ */ public final class cmdAdminGameMode extends CommandBase { - /** - * - */ - private static boolean instanceExists = false; - /** * */ public cmdAdminGameMode() { - if (instanceExists) - { - Log.writeDataToLogFile(2, String.format("An instance of [%s] already exists!", this.getClass().getSimpleName())); - throw new RuntimeException(); - } - - instanceExists = true; - CodeGenericUtils.printInitClassToLog(cmdAdminGameMode.class); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminGetWorldMoonPhase.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminGetWorldMoonPhase.java index e3b1bb0..cff0e57 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminGetWorldMoonPhase.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminGetWorldMoonPhase.java @@ -15,24 +15,11 @@ */ public final class cmdAdminGetWorldMoonPhase extends CommandBase { - /** - * - */ - private static boolean instanceExists = false; - /** * */ public cmdAdminGetWorldMoonPhase() { - if (instanceExists) - { - Log.writeDataToLogFile(2, String.format("An instance of [%s] already exists!", this.getClass().getSimpleName())); - throw new RuntimeException(); - } - - instanceExists = true; - CodeGenericUtils.printInitClassToLog(cmdAdminGetWorldMoonPhase.class); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminLaunchFireball.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminLaunchFireball.java index 0146227..ee162ee 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminLaunchFireball.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminLaunchFireball.java @@ -17,24 +17,11 @@ */ public final class cmdAdminLaunchFireball extends CommandBase { - /** - * - */ - private static boolean instanceExists = false; - /** * */ public cmdAdminLaunchFireball() { - if (instanceExists) - { - Log.writeDataToLogFile(2, String.format("An instance of [%s] already exists!", this.getClass().getSimpleName())); - throw new RuntimeException(); - } - - instanceExists = true; - CodeGenericUtils.printInitClassToLog(cmdAdminLaunchFireball.class); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminScanEntities.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminScanEntities.java index 2f05992..ac36615 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminScanEntities.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminScanEntities.java @@ -20,24 +20,11 @@ */ public final class cmdAdminScanEntities extends CommandBase { - /** - * - */ - private static boolean instanceExists = false; - /** * */ public cmdAdminScanEntities() { - if (instanceExists) - { - Log.writeDataToLogFile(2, String.format("An instance of [%s] already exists!", this.getClass().getSimpleName())); - throw new RuntimeException(); - } - - instanceExists = true; - CodeGenericUtils.printInitClassToLog(cmdAdminScanEntities.class); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminSwitchVanish.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminSwitchVanish.java index 775bf6e..5cccd34 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminSwitchVanish.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminSwitchVanish.java @@ -18,24 +18,11 @@ */ public final class cmdAdminSwitchVanish extends CommandBase { - /** - * - */ - private static boolean instanceExists = false; - /** * */ public cmdAdminSwitchVanish() { - if (instanceExists) - { - Log.writeDataToLogFile(2, String.format("An instance of [%s] already exists!", this.getClass().getSimpleName())); - throw new RuntimeException(); - } - - instanceExists = true; - CodeGenericUtils.printInitClassToLog(cmdAdminSwitchVanish.class); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerJsonScriptsReload.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerJsonScriptsReload.java index fad1d51..c038564 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerJsonScriptsReload.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerJsonScriptsReload.java @@ -15,24 +15,11 @@ */ public final class cmdServerJsonScriptsReload extends CommandBase { - /** - * - */ - private static boolean instanceExists = false; - /** * */ public cmdServerJsonScriptsReload() { - if (instanceExists) - { - Log.writeDataToLogFile(2, String.format("An instance of [%s] already exists!", this.getClass().getSimpleName())); - throw new RuntimeException(); - } - - instanceExists = true; - CodeGenericUtils.printInitClassToLog(cmdServerJsonScriptsReload.class); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerMobsKiller.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerMobsKiller.java index 8fc4db3..cdae49e 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerMobsKiller.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerMobsKiller.java @@ -23,24 +23,11 @@ */ public final class cmdServerMobsKiller extends CommandBase { - /** - * - */ - private static boolean instanceExists = false; - /** * */ public cmdServerMobsKiller() { - if (instanceExists) - { - Log.writeDataToLogFile(2, String.format("An instance of [%s] already exists!", this.getClass().getSimpleName())); - throw new RuntimeException(); - } - - instanceExists = true; - CodeGenericUtils.printInitClassToLog(cmdServerMobsKiller.class); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerSingleScriptsReload.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerSingleScriptsReload.java index f9e9086..553a7cf 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerSingleScriptsReload.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerSingleScriptsReload.java @@ -19,24 +19,11 @@ */ public final class cmdServerSingleScriptsReload extends CommandBase { - /** - * - */ - private static boolean instanceExists = false; - /** * */ public cmdServerSingleScriptsReload() { - if (instanceExists) - { - Log.writeDataToLogFile(2, String.format("An instance of [%s] already exists!", this.getClass().getSimpleName())); - throw new RuntimeException(); - } - - instanceExists = true; - CodeGenericUtils.printInitClassToLog(cmdServerSingleScriptsReload.class); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/Log.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/Log.java index b6e73c2..df7ade9 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/Log.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/Log.java @@ -22,13 +22,6 @@ public final class Log */ private static File logFile; - /** - * - */ - public static final int LEVEL_INFO = 0; - public static final int LEVEL_WARN = 1; - public static final int LEVEL_ERROR = 2; - /** * */ @@ -76,8 +69,6 @@ public static void createLogFile(final String path) writer.write("\n*******************************************************************"); writer.close(); - - System.out.println("The file was successfully created: " + logFile.getAbsolutePath()); } catch (IOException exception) { @@ -127,8 +118,6 @@ private static void cleanFile(File file, int maxLines) } writer.close(); - - System.out.println("The file was successfully updated."); } else { @@ -158,7 +147,7 @@ public static void writeDataToLogFile(final int levelInfo, String data) { if (logLevel[0] < 0 || logLevel[0] >= LEVEL_PREFIXES.length) { - logLevel[0] = LEVEL_INFO; + logLevel[0] = 0; } FileWriter writer = new FileWriter(logFile, true); @@ -167,24 +156,16 @@ public static void writeDataToLogFile(final int levelInfo, String data) writer.close(); cleanFile(logFile, ConfigLogFile.LogMaxLines); - System.out.println("The data has been successfully written to the log file: " + logFile.getAbsolutePath()); } catch (IOException exception) { System.err.println("Error writing data to a file: " + exception.getMessage()); } }); - } else + } + else { System.err.println("The log file has not been created. First, create a log file."); } } - - /** - * - */ - public static void closeExecutor() - { - EXECUTOR.shutdown(); - } } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterCommandsClasses.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterCommandsClasses.java index dcd519f..ad4dd5b 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterCommandsClasses.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterCommandsClasses.java @@ -10,6 +10,9 @@ /** * + * OldSerpskiStalker: + * Console commands are loaded every time you enter the world. + * A constructor with protection is not required! */ public final class RegisterCommandsClasses { 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 b1ade48..8ad715f 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 @@ -88,12 +88,7 @@ public static void updateCacheAsync(@Nonnull World world) */ public static void updateCache(@Nonnull World world) { - CACHED_ANIMALS.clear(); - CACHED_HOSTILES.clear(); - CACHED_ALL.clear(); - ENTITIES_BY_NAME.clear(); - ENTITIES_BY_RESOURCE_LOCATION.clear(); - CACHE_VALID_CHUNKS.clear(); + cleanCache(); if (world instanceof WorldServer) { @@ -219,4 +214,17 @@ public static Set getEntitiesByResourceLocation(@Nonnull Resou { return ENTITIES_BY_RESOURCE_LOCATION.getOrDefault(resourceLocation, Collections.emptySet()); } + + /** + * + */ + public static void cleanCache() + { + CACHED_ANIMALS.clear(); + CACHED_HOSTILES.clear(); + CACHED_ALL.clear(); + ENTITIES_BY_NAME.clear(); + ENTITIES_BY_RESOURCE_LOCATION.clear(); + CACHE_VALID_CHUNKS.clear(); + } }