Order in the architecture of the project

dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/DynamicSpawnControl.java

@@ -12,22 +12,18 @@
 import net.minecraftforge.fml.common.event.FMLServerStoppedEvent;
 
 import org.imesense.dynamicspawncontrol.debug.CheckDebugger;
-import org.imesense.dynamicspawncontrol.technical.eventprocessor.single.OnWindowTitle;
+import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnUpdateTimeWorld;
+import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnWindowTitle;
 import org.imesense.dynamicspawncontrol.technical.initializer.RegisterGameplayClasses;
 import org.imesense.dynamicspawncontrol.technical.initializer.RegisterCommandsClasses;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
-import org.imesense.dynamicspawncontrol.technical.eventprocessor.single.OnUpdateTimeWorld;
 import org.imesense.dynamicspawncontrol.technical.gamestructures.Structures;
 import org.imesense.dynamicspawncontrol.technical.initializer.RegisterTechnicalClasses;
 import org.imesense.dynamicspawncontrol.technical.network.MessageHandler;
 import org.imesense.dynamicspawncontrol.technical.parsers.GeneralStorageData;
-import org.imesense.dynamicspawncontrol.technical.parsers.IBetaParsers;
-import org.imesense.dynamicspawncontrol.technical.parsers.ParserJsonScripts;
-import org.imesense.dynamicspawncontrol.technical.parsers.beta.ParserSingleScriptCheckSpawn;
-import org.imesense.dynamicspawncontrol.technical.parsers.beta.ParserSingleZombieSummonAID;
+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.CacheConfig;
-import org.imesense.dynamicspawncontrol.technical.worldcache.CacheEvents;
 import org.imesense.dynamicspawncontrol.technical.worldcache.CacheStorage;
 
 import java.io.File;
@@ -136,11 +132,6 @@ public static final class STRUCT_FILES_EXTENSION
      */
     private static File globalDirectory = null;
 
-    /**
-     *
-     */
-    static CacheConfig cacheConfig = null;
-
     /**
      *
      */
@@ -177,13 +168,7 @@ public DynamicSpawnControl()
     /**
      *
      */
-    public GeneralStorageData _parsersData = null;
-
-    /**
-     *
-     */
-    static ParserSingleZombieSummonAID _configHandler1; // rework later
-    static ParserSingleScriptCheckSpawn _configHandler; // rework later
+    public GeneralStorageData generalStorageData = null;
 
     /**
      * Preinitialize modification
@@ -207,13 +192,13 @@ public synchronized void preInit(FMLPreInitializationEvent event)
         MessageHandler.init();
 
         //
-        _parsersData = new GeneralStorageData("GeneralStorageData");
+        generalStorageData = new GeneralStorageData();
 
         //
-        cacheStorage = new CacheStorage("CacheStorage");
+        cacheStorage = new CacheStorage();
 
         //
-        ParserJsonScripts.setRulePath(event.getModConfigurationDirectory());
+        ParserGenericJsonScripts.setRulePath(event.getModConfigurationDirectory());
 
         //
         RegisterTechnicalClasses.registerClasses();
@@ -238,7 +223,6 @@ public synchronized void init(FMLInitializationEvent event)
     {
         Proxy.init(event);
 
-        MinecraftForge.EVENT_BUS.register(new CacheEvents());
         MinecraftForge.EVENT_BUS.register(OnUpdateTimeWorld.INSTANCE);
     }
 
@@ -262,16 +246,9 @@ public synchronized void postInit(FMLPostInitializationEvent event)
     @EventHandler
     public synchronized void onLoadComplete(FMLLoadCompleteEvent event)
     {
-        ParserJsonScripts.readRules();
-
-        cacheConfig = new CacheConfig("CacheConfig");
-        cacheConfig.loadConfig(true);
-
-        _configHandler = new ParserSingleScriptCheckSpawn("onLoadComplete -> ParserSingleScriptCheckSpawn");
-        _configHandler.loadConfig(true);
+        ParserGenericJsonScripts.readRules();
 
-        _configHandler1 = new ParserSingleZombieSummonAID("onLoadComplete -> ParserSingleZombieSummonAID");
-        _configHandler1.loadConfig(true);
+        ParserManager.init();
     }
 
     /**

dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/CodeGenericUtils.java

@@ -4,15 +4,15 @@
 import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeKey;
 import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
-import org.imesense.dynamicspawncontrol.technical.parsers.ParserJsonScripts;
+import org.imesense.dynamicspawncontrol.technical.parsers.ParserGenericJsonScripts;
 
 import java.util.List;
 import java.util.function.Function;
 
 /**
  *
  */
-public class CodeGenericUtils
+public final class CodeGenericUtils
 {
     /**
      *
@@ -25,7 +25,7 @@ public static <T> T checkObjectNotNull(final T object, final String message)
     {
         if (object == null)
         {
-            Log.writeDataToLogFile(2, "Object return null: " + message);
+            Log.writeDataToLogFile(2, "Object or class return null: " + message);
             throw new NullPointerException(message);
         }
 
@@ -58,10 +58,10 @@ public static <T extends Number> T checkParameter(AttributeMap<?> mobMap, Attrib
         {
             numericValue = (T) value;
         }
-        catch (ClassCastException e)
+        catch (ClassCastException exception)
         {
             Log.writeDataToLogFile(2, "Parameter '" + logParameterName + "' has an invalid type");
-            throw new RuntimeException();
+            throw new RuntimeException(exception);
         }
 
         if (numericValue.doubleValue() < min.doubleValue() || numericValue.doubleValue() > max.doubleValue())
@@ -76,18 +76,16 @@ public static <T extends Number> T checkParameter(AttributeMap<?> mobMap, Attrib
     /**
      *
      * @param clazz
-     * @param parameterTypes
      * @return
-     * @param <T>
      */
-    public static <T> boolean hasConstructorWithParameter(Class<T> clazz, Class<?>... parameterTypes)
+    public static boolean hasDefaultConstructor(Class<?> clazz)
     {
         try
         {
-            clazz.getConstructor(parameterTypes);
+            clazz.getConstructor();
             return true;
         }
-        catch (NoSuchMethodException e)
+        catch (NoSuchMethodException exception)
         {
             return false;
         }
@@ -103,12 +101,22 @@ public static <T> boolean hasConstructorWithParameter(Class<T> clazz, Class<?>..
      */
     public static <T> void readAndLogRules(final String path, final String fileName, Function<JsonElement, T> parser, List<T> list, final String listType)
     {
-        ParserJsonScripts.readRules(path, fileName, parser, list, listType);
+        ParserGenericJsonScripts.readRules(path, fileName, parser, list, listType);
 
         if (!list.isEmpty())
         {
             Log.writeDataToLogFile(0,
                     String.format("Parsing '%s' list size = %d", list, list.size()));
         }
     }
+
+    /**
+     *
+     * @param getClass
+     * @param <T>
+     */
+    public static <T> void printInitClassToLog(final Class<T> getClass)
+    {
+        Log.writeDataToLogFile(0, String.format("Initializing a class: {%s}", getClass.getName()));
+    }
 }

dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/Timer.java

@@ -1,7 +1,5 @@
 package org.imesense.dynamicspawncontrol.debug;
 
-import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
-
 /**
  *
  */
@@ -14,11 +12,10 @@ public final class Timer
 
     /**
      *
-     * @param nameClass
      */
-    public Timer(final String nameClass)
+    public Timer()
     {
-        Log.writeDataToLogFile(0, nameClass);
+        CodeGenericUtils.printInitClassToLog(Timer.class);
     }
 
     /**

dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/events/OnEventDummy.java

@@ -1,17 +1,33 @@
 package org.imesense.dynamicspawncontrol.debug.events;
 
+import net.minecraftforge.fml.common.Mod;
+import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
 
 /**
  *
  */
+@Mod.EventBusSubscriber
 public final class OnEventDummy
 {
     /**
      *
      */
-    public OnEventDummy(final String nameClass)
+    private static boolean instanceExists = false;
+
+    /**
+     *
+     */
+    public OnEventDummy()
     {
-        Log.writeDataToLogFile(0, nameClass);
+        if (instanceExists)
+        {
+            Log.writeDataToLogFile(2, String.format("An instance of [%s] already exists!", this.getClass().getSimpleName()));
+            throw new RuntimeException();
+        }
+
+        instanceExists = true;
+
+        CodeGenericUtils.printInitClassToLog(OnEventDummy.class);
     }
 }

dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpBlock.java

@@ -13,8 +13,11 @@
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextFormatting;
+import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
+import org.imesense.dynamicspawncontrol.debug.events.OnEventDummy;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.RayTrace;
+import scala.io.StdIn;
 
 import javax.annotation.Nonnull;
 import java.util.Objects;
@@ -26,11 +29,23 @@ public final class cmdAdminDumpBlock extends CommandBase
 {
     /**
      *
-     * @param nameClass
      */
-    public cmdAdminDumpBlock(final String nameClass)
+    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);
     }
 
     /**

dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpEntity.java

@@ -9,6 +9,7 @@
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextFormatting;
+import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
 
 import javax.annotation.Nonnull;
@@ -20,11 +21,23 @@ public final class cmdAdminDumpEntity extends CommandBase
 {
     /**
      *
-     * @param nameClass
      */
-    public cmdAdminDumpEntity(final String nameClass)
+    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);
     }
 
     /**

dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpItem.java

@@ -14,6 +14,7 @@
 import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.common.util.Constants;
 import org.apache.commons.lang3.StringUtils;
+import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
 
 import javax.annotation.Nonnull;
@@ -26,11 +27,23 @@ public final class cmdAdminDumpItem extends CommandBase
 {
     /**
      *
-     * @param nameClass
      */
-    public cmdAdminDumpItem(final String nameClass)
+    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);
     }
 
     /**

dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminGameMode.java

@@ -6,6 +6,9 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.world.GameType;
+import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
+import org.imesense.dynamicspawncontrol.technical.customlibrary.EnumTextColors;
+import org.imesense.dynamicspawncontrol.technical.customlibrary.EnumUnicodeCharacters;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
 
 import javax.annotation.Nonnull;
@@ -17,11 +20,23 @@ public final class cmdAdminGameMode extends CommandBase
 {
     /**
      *
-     * @param nameClass
      */
-    public cmdAdminGameMode(final String nameClass)
+    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);
     }
 
     /**
@@ -68,8 +83,14 @@ public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sen
         {
             mode = Integer.parseInt(args[0]);
         }
-        catch (NumberFormatException e)
+        catch (NumberFormatException exception)
         {
+            Log.writeDataToLogFile(2, String.format("Error parsing game mode: %s. Exception: %s", args[0], exception.getMessage()));
+
+            sender.sendMessage(new TextComponentString(EnumUnicodeCharacters.SECTION.getCharacter() +
+                    EnumTextColors.RED.getCode() +
+                    "Invalid game mode: " + args[0]));
+
             return;
         }