Adaptation to the architectural diagram between 1.12.2/1.16.5 (Part 1)

imesense · Nov 5, 2024 · 47037a3 · 47037a3
1 parent 87da197
commit 47037a3
Show file tree

Hide file tree

Showing 130 changed files with 829 additions and 949 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
@@ -11,38 +11,39 @@
 
 import net.minecraftforge.fml.common.network.NetworkRegistry;
 import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
+import org.imesense.dynamicspawncontrol.core.api.IRecipes;
+import org.imesense.dynamicspawncontrol.core.field.UniqueField;
+import org.imesense.dynamicspawncontrol.core.register.*;
 import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.capability.EventHandler;
 import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.capability.WebSlingerCapability;
 import org.imesense.dynamicspawncontrol.ai.zombie.event.OnBreakTorchEvent;
-import org.imesense.dynamicspawncontrol.gameplay.recipes.IRecipes;
-import org.imesense.dynamicspawncontrol.gameplay.recipes.CraftItemWeb;
+import org.imesense.dynamicspawncontrol.recipes.CraftItemWeb;
 import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.TimeEvents;
 import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnWindowTitle;
-import org.imesense.dynamicspawncontrol.technical.register.*;
-import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
+import org.imesense.dynamicspawncontrol.core.logfile.Log;
 import org.imesense.dynamicspawncontrol.technical.gamestructure.Structure;
 import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.network.*;
 import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.webbing.PlayerInWebMessage;
 import org.imesense.dynamicspawncontrol.technical.parser.GeneralStorageData;
 import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript;
 import org.imesense.dynamicspawncontrol.technical.parser.ParserManager;
-import org.imesense.dynamicspawncontrol.technical.worldcache.Cache;
-import org.imesense.dynamicspawncontrol.technical.worldcache.CacheStorage;
+import org.imesense.dynamicspawncontrol.core.worldcache.Cache;
+import org.imesense.dynamicspawncontrol.core.worldcache.CacheStorage;
 
 import java.io.File;
 
 /**
  * Main class of modification
  */
 @Mod(
-    modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID,
-    name = ProjectStructure.STRUCT_INFO_MOD.NAME,
-    version = ProjectStructure.STRUCT_INFO_MOD.VERSION
+    modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID,
+    name = DynamicSpawnControlStructure.STRUCT_INFO_MOD.NAME,
+    version = DynamicSpawnControlStructure.STRUCT_INFO_MOD.VERSION
 )
-public class DynamicSpawnControl
+public final class DynamicSpawnControl
 {
     /**
-     * Main class instance
+     *
      */
     @Mod.Instance
     public static DynamicSpawnControl Instance;
@@ -58,21 +59,19 @@ public class DynamicSpawnControl
      */
     public static File getGlobalPathToConfigs()
     {
-        //
         return globalDirectory;
     }
 
     /**
      *
      */
-    public static IRecipes Recipes;
+    public static IRecipes IRecipes;
 
     /**
-     * Constructor
+     *
      */
     public DynamicSpawnControl()
     {
-        //
         Instance = this;
     }
 
@@ -87,80 +86,63 @@ public DynamicSpawnControl()
     public static SimpleNetworkWrapper networkWrapper = null;
 
     /**
-     * Preinitialize modification
-     * 
-     * @param event Preinitialization event
+     *
+     * @param fmlPreInitializationEvent
+     * @throws IllegalAccessException
      */
     @Mod.EventHandler
-    public synchronized void preInit(FMLPreInitializationEvent event) throws IllegalAccessException
+    public synchronized void preInit(FMLPreInitializationEvent fmlPreInitializationEvent) throws IllegalAccessException
     {
-        //
-        globalDirectory = event.getModConfigurationDirectory();
+        globalDirectory = fmlPreInitializationEvent.getModConfigurationDirectory();
 
-        //
         UniqueField uniqueField = new UniqueField();
-        Log.writeDataToLogFile(0, "Object create [UniqueField]: " + uniqueField.hashCode());
 
-        //
-        Log.createLogFile(globalDirectory.getPath() + File.separator + ProjectStructure.STRUCT_FILES_DIRS.NAME_DIRECTORY, UniqueField.IDEA_RT);
+        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.hashCode());
 
-        //
         MessageHandler.init();
 
         WebSlingerCapability.register();
         networkWrapper = NetworkRegistry.INSTANCE.newSimpleChannel("dynamicspawncontrol");
         PlayerInWebMessage.register(networkWrapper);
 
-        //
         RegisterConfigClass.initializeConfigs();
 
-        //
         GeneralStorageData = new GeneralStorageData();
 
-        //
         CacheStorage.Instance = new CacheStorage();
 
-        //
         Cache.Instance = new Cache();
 
-        //
-        ParserGenericJsonScript.setRulePath(event.getModConfigurationDirectory());
+        ParserGenericJsonScript.setRulePath(fmlPreInitializationEvent.getModConfigurationDirectory());
 
-        //
         RegisterTechnicalClass.registerClasses();
 
-        //
         OnWindowTitle.replace();
 
-        //
         RegisterGameplayClass.registerClasses();
 
-        //
-        RegisterOreGenerator.init(event);
+        RegisterOreGenerator.init(fmlPreInitializationEvent);
     }
 
     /**
-     * Initialize modification
-     * 
-     * @param fmlInitializationEvent Initialization event
+     *
+     * @param fmlInitializationEvent
      */
     @Mod.EventHandler
     public synchronized void init(FMLInitializationEvent fmlInitializationEvent)
     {
-        //
-        Recipes = new CraftItemWeb();
+        IRecipes = new CraftItemWeb();
 
-        //
-        Recipes.registry();
+        IRecipes.registry();
 
         MinecraftForge.EVENT_BUS.register(TimeEvents.INSTANCE);
     }
 
     /**
-     * Postinitialize modification
-     * 
-     * @param fmlPostInitializationEvent Postinitialization event
+     *
+     * @param fmlPostInitializationEvent
      */
     @Mod.EventHandler
     public synchronized void postInit(FMLPostInitializationEvent fmlPostInitializationEvent)
@@ -171,9 +153,8 @@ public synchronized void postInit(FMLPostInitializationEvent fmlPostInitializati
     }
 
     /**
-     * Load complete action
-     * 
-     * @param fmlLoadCompleteEvent Load complete event
+     *
+     * @param fmlLoadCompleteEvent
      */
     @Mod.EventHandler
     public synchronized void onLoadComplete(FMLLoadCompleteEvent fmlLoadCompleteEvent)
@@ -184,9 +165,8 @@ public synchronized void onLoadComplete(FMLLoadCompleteEvent fmlLoadCompleteEven
     }
 
     /**
-     * Server load action
-     * 
-     * @param fmlServerStartingEvent Server starting event
+     *
+     * @param fmlServerStartingEvent
      */
     @Mod.EventHandler
     public synchronized void serverLoad(FMLServerStartingEvent fmlServerStartingEvent)
@@ -195,9 +175,8 @@ public synchronized void serverLoad(FMLServerStartingEvent fmlServerStartingEven
     }
 
     /**
-     * Server stopped action
-     * 
-     * @param fmlServerStoppedEvent Server stopped action
+     *
+     * @param fmlServerStoppedEvent
      */
     @Mod.EventHandler
     public synchronized void serverStopped(FMLServerStoppedEvent fmlServerStoppedEvent)

diff --git a/...dynamicspawncontrol/ProjectStructure.java → ...control/DynamicSpawnControlStructure.java b/...dynamicspawncontrol/ProjectStructure.java → ...control/DynamicSpawnControlStructure.java
@@ -3,7 +3,7 @@
 /**
  *
  */
-public final class ProjectStructure
+public final class DynamicSpawnControlStructure
 {
     /**
      *

diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/OnEventDummy.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/OnEventDummy.java
@@ -0,0 +1,51 @@
+package org.imesense.dynamicspawncontrol;
+
+import net.minecraftforge.fml.common.Mod;
+import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure;
+import org.imesense.dynamicspawncontrol.core.util.CodeGeneric;
+import org.imesense.dynamicspawncontrol.core.api.IDebug;
+import org.imesense.dynamicspawncontrol.core.logfile.Log;
+
+/**
+ *
+ */
+@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID)
+public final class OnEventDummy implements IDebug
+{
+    /**
+     *
+     */
+    private static boolean instanceExists = false;
+
+    /**
+     *
+     */
+    public OnEventDummy()
+    {
+		CodeGeneric.printInitClassToLog(this.getClass());
+
+        if (instanceExists)
+        {
+            Log.writeDataToLogFile(2, String.format("An instance of [%s] already exists!", this.getClass().getSimpleName()));
+            throw new RuntimeException();
+        }
+
+        instanceExists = true;
+    }
+
+    //@SubscribeEvent
+    //public static void onFogDensity(EntityViewRenderEvent.FogDensity event) {
+        // Задание плотности тумана
+   //     event.setDensity(0.05f); // Чем больше значение, тем плотнее туман
+    //    GlStateManager.setFog(GlStateManager.FogMode.EXP);
+    //    event.setCanceled(true); // Обязательно отменяем стандартное поведение, чтобы применился наш туман
+   // }
+
+    //@SubscribeEvent
+   // public static void onFogColors(EntityViewRenderEvent.FogColors event) {
+        // Установка красного цвета для тумана
+   //     event.setRed(0.7f);   // Красный оттенок
+   //     event.setGreen(0.2f); // Зеленый оттенок
+   //     event.setBlue(0.2f);  // Синий оттенок
+   // }
+}
diff --git a/...2.2/src/main/java/org/imesense/dynamicspawncontrol/ai/zombie/event/OnBreakTorchEvent.java b/...2.2/src/main/java/org/imesense/dynamicspawncontrol/ai/zombie/event/OnBreakTorchEvent.java
@@ -4,22 +4,22 @@
 import net.minecraftforge.event.entity.EntityJoinWorldEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import org.imesense.dynamicspawncontrol.ProjectStructure;
+import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure;
 import org.imesense.dynamicspawncontrol.ai.zombie.entityaibase.BreakTorchTask;
-import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil;
+import org.imesense.dynamicspawncontrol.core.util.CodeGeneric;
 
 /**
  *
  */
-@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID)
+@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID)
 public final class OnBreakTorchEvent
 {
     /**
      *
      */
     public OnBreakTorchEvent()
     {
-        CodeGenericUtil.printInitClassToLog(this.getClass());
+        CodeGeneric.printInitClassToLog(this.getClass());
     }
 
     /**

diff --git a/...l/gameplay/command/cmdAdminDumpBlock.java → ...awncontrol/command/CmdAdminDumpBlock.java b/...l/gameplay/command/cmdAdminDumpBlock.java → ...awncontrol/command/CmdAdminDumpBlock.java
@@ -1,4 +1,4 @@
-package org.imesense.dynamicspawncontrol.gameplay.command;
+package org.imesense.dynamicspawncontrol.command;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.properties.IProperty;
@@ -13,8 +13,8 @@
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextFormatting;
-import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil;
-import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
+import org.imesense.dynamicspawncontrol.core.util.CodeGeneric;
+import org.imesense.dynamicspawncontrol.core.logfile.Log;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.RayTrace;
 
 import javax.annotation.Nonnull;
@@ -30,7 +30,7 @@ public final class CmdAdminDumpBlock extends CommandBase
      */
     public CmdAdminDumpBlock()
     {
-        CodeGenericUtil.printInitClassToLog(this.getClass());
+        CodeGeneric.printInitClassToLog(this.getClass());
     }
 
     /**

diff --git a/.../gameplay/command/cmdAdminDumpEntity.java → ...wncontrol/command/CmdAdminDumpEntity.java b/.../gameplay/command/cmdAdminDumpEntity.java → ...wncontrol/command/CmdAdminDumpEntity.java
@@ -1,6 +1,5 @@
-package org.imesense.dynamicspawncontrol.gameplay.command;
+package org.imesense.dynamicspawncontrol.command;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.Entity;
@@ -9,9 +8,9 @@
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextFormatting;
-import org.imesense.dynamicspawncontrol.UniqueField;
-import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil;
-import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
+import org.imesense.dynamicspawncontrol.core.field.UniqueField;
+import org.imesense.dynamicspawncontrol.core.util.CodeGeneric;
+import org.imesense.dynamicspawncontrol.core.logfile.Log;
 
 import javax.annotation.Nonnull;
 
@@ -25,7 +24,7 @@ public final class CmdAdminDumpEntity extends CommandBase
      */
     public CmdAdminDumpEntity()
     {
-        CodeGenericUtil.printInitClassToLog(this.getClass());
+        CodeGeneric.printInitClassToLog(this.getClass());
     }
 
     /**

diff --git a/...ol/gameplay/command/cmdAdminDumpItem.java → ...pawncontrol/command/CmdAdminDumpItem.java b/...ol/gameplay/command/cmdAdminDumpItem.java → ...pawncontrol/command/CmdAdminDumpItem.java
@@ -1,4 +1,4 @@
-package org.imesense.dynamicspawncontrol.gameplay.command;
+package org.imesense.dynamicspawncontrol.command;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
@@ -14,8 +14,8 @@
 import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.common.util.Constants;
 import org.apache.commons.lang3.StringUtils;
-import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil;
-import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
+import org.imesense.dynamicspawncontrol.core.util.CodeGeneric;
+import org.imesense.dynamicspawncontrol.core.logfile.Log;
 
 import javax.annotation.Nonnull;
 import java.util.Objects;
@@ -30,7 +30,7 @@ public final class CmdAdminDumpItem extends CommandBase
      */
     public CmdAdminDumpItem()
     {
-        CodeGenericUtil.printInitClassToLog(this.getClass());
+        CodeGeneric.printInitClassToLog(this.getClass());
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     /**
      *
      */
-    public final class ProjectStructure
+    public final class DynamicSpawnControlStructure
     {
         /**
          *
@@ Expand Down @@