Verbs/sets in names have been removed

Одно из последующих стандартов кода
imesense · Oct 23, 2024 · fa3ffac · fa3ffac
1 parent ac39ff7
commit fa3ffac
Show file tree

Hide file tree

Showing 133 changed files with 758 additions and 794 deletions.
diff --git a/dynamicspawncontrol-1.12.2/build.gradle b/dynamicspawncontrol-1.12.2/build.gradle
@@ -56,7 +56,7 @@ minecraft
             property 'forge.logging.console.level', 'debug'
 
             // Loading plugin
-            property 'fml.coreMods.load', 'org.imesense.dynamicspawncontrol.technical.plugins.LoadingPluginNight'
+            property 'fml.coreMods.load', 'org.imesense.dynamicspawncontrol.technical.plugin.LoadingPluginNight'
         }
 
         server
@@ -68,7 +68,7 @@ minecraft
             property 'forge.logging.console.level', 'debug'
 
             // Loading plugin
-            property 'fml.coreMods.load', 'org.imesense.dynamicspawncontrol.technical.plugins.LoadingPluginNight'
+            property 'fml.coreMods.load', 'org.imesense.dynamicspawncontrol.technical.plugin.LoadingPluginNight'
         }
     }
 }

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
@@ -20,17 +20,17 @@
 import org.imesense.dynamicspawncontrol.gameplay.recipes.CraftItemWeb;
 import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnUpdateTimeWorld;
 import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnWindowTitle;
-import org.imesense.dynamicspawncontrol.technical.initializer.RegisterConfigClasses;
-import org.imesense.dynamicspawncontrol.technical.initializer.RegisterGameplayClasses;
-import org.imesense.dynamicspawncontrol.technical.initializer.RegisterCommandsClasses;
+import org.imesense.dynamicspawncontrol.technical.register.RegisterConfigClass;
+import org.imesense.dynamicspawncontrol.technical.register.RegisterGameplayClass;
+import org.imesense.dynamicspawncontrol.technical.register.RegisterCommandClass;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
-import org.imesense.dynamicspawncontrol.technical.gamestructures.Structures;
-import org.imesense.dynamicspawncontrol.technical.initializer.RegisterTechnicalClasses;
+import org.imesense.dynamicspawncontrol.technical.gamestructure.Structure;
+import org.imesense.dynamicspawncontrol.technical.register.RegisterTechnicalClass;
 import org.imesense.dynamicspawncontrol.technical.network.MessageHandler;
 import org.imesense.dynamicspawncontrol.technical.network.PlayerInWebMessage;
-import org.imesense.dynamicspawncontrol.technical.parsers.GeneralStorageData;
-import org.imesense.dynamicspawncontrol.technical.parsers.ParserGenericJsonScripts;
-import org.imesense.dynamicspawncontrol.technical.parsers.ParserManager;
+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.proxy.IProxy;
 import org.imesense.dynamicspawncontrol.technical.worldcache.Cache;
 import org.imesense.dynamicspawncontrol.technical.worldcache.CacheStorage;
@@ -127,7 +127,7 @@ public synchronized void preInit(FMLPreInitializationEvent event)
         PlayerInWebMessage.register(networkWrapper);
 
         //
-        RegisterConfigClasses.initializeConfigs();
+        RegisterConfigClass.initializeConfigs();
 
         //
         generalStorageData = new GeneralStorageData();
@@ -139,16 +139,16 @@ public synchronized void preInit(FMLPreInitializationEvent event)
         Cache.instance = new Cache();
 
         //
-        ParserGenericJsonScripts.setRulePath(event.getModConfigurationDirectory());
+        ParserGenericJsonScript.setRulePath(event.getModConfigurationDirectory());
 
         //
-        RegisterTechnicalClasses.registerClasses();
+        RegisterTechnicalClass.registerClasses();
 
         //
         OnWindowTitle.replace();
 
         //
-        RegisterGameplayClasses.registerClasses();
+        RegisterGameplayClass.registerClasses();
 
         //
         Proxy.preInit(event);
@@ -198,7 +198,7 @@ public synchronized void postInit(FMLPostInitializationEvent event)
     @Mod.EventHandler
     public synchronized void onLoadComplete(FMLLoadCompleteEvent event)
     {
-        ParserGenericJsonScripts.readRules();
+        ParserGenericJsonScript.readRules();
 
         ParserManager.init();
     }
@@ -211,7 +211,7 @@ public synchronized void onLoadComplete(FMLLoadCompleteEvent event)
     @Mod.EventHandler
     public synchronized void serverLoad(FMLServerStartingEvent event)
     {
-        RegisterCommandsClasses.registerCommands(event);
+        RegisterCommandClass.registerCommands(event);
     }
 
     /**
@@ -225,6 +225,6 @@ public synchronized void serverStopped(FMLServerStoppedEvent event)
         Cache.instance.cleanActualCache();
         Cache.instance.cleanBufferCache();
 
-        Structures.STRUCTURES_CACHE.clean();
+        Structure.STRUCTURES_CACHE.clean();
     }
 }
diff --git a/.../src/main/java/org/imesense/dynamicspawncontrol/ai/spider/entityaibase/WebAttackTask.java b/.../src/main/java/org/imesense/dynamicspawncontrol/ai/spider/entityaibase/WebAttackTask.java
@@ -4,8 +4,8 @@
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.world.World;
-import org.imesense.dynamicspawncontrol.gameplay.throwingobjects.DSCThrowItemWeb;
-import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
+import org.imesense.dynamicspawncontrol.gameplay.throwingobject.DSCThrowItemWeb;
+import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil;
 import org.imesense.dynamicspawncontrol.technical.config.spiderattackweb.DataSpiderAttackWeb;
 
 /**
@@ -29,7 +29,7 @@ public final class WebAttackTask extends EntityAIBase
      */
     public WebAttackTask(EntityLiving entity)
     {
-        CodeGenericUtils.printInitClassToLog(this.getClass());
+        CodeGenericUtil.printInitClassToLog(this.getClass());
 
         this.parentEntity = entity;
     }

diff --git a/.../java/org/imesense/dynamicspawncontrol/ai/spider/util/attackweb/WebSlingerCapability.java b/.../java/org/imesense/dynamicspawncontrol/ai/spider/util/attackweb/WebSlingerCapability.java
@@ -17,8 +17,8 @@
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.imesense.dynamicspawncontrol.ProjectStructure;
 import org.imesense.dynamicspawncontrol.ai.spider.entityaibase.WebAttackTask;
-import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
-import org.imesense.dynamicspawncontrol.gameplay.throwingobjects.DSCThrowItemWeb;
+import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil;
+import org.imesense.dynamicspawncontrol.gameplay.throwingobject.DSCThrowItemWeb;
 import org.imesense.dynamicspawncontrol.technical.config.spiderattackweb.DataSpiderAttackWeb;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.thing.EntityThingBase;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.thing.IThingBase;
@@ -82,11 +82,11 @@ private EntityLiving getOwner()
     {
         if (this.owner instanceof EntityThingBase)
         {
-            EntityThingBase thing = CodeGenericUtils.as(this.owner, EntityThingBase.class);
+            EntityThingBase thing = CodeGenericUtil.as(this.owner, EntityThingBase.class);
 
             assert thing != null;
 
-            return CodeGenericUtils.as(thing.owner, EntityLiving.class);
+            return CodeGenericUtil.as(thing.owner, EntityLiving.class);
         }
         else
         {

diff --git a/...2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/util/event/WebAttackEvent.java b/...2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/util/event/WebAttackEvent.java
@@ -9,7 +9,7 @@
 import org.imesense.dynamicspawncontrol.ProjectStructure;
 import org.imesense.dynamicspawncontrol.ai.spider.util.attackweb.IWebSlinger;
 import org.imesense.dynamicspawncontrol.ai.spider.util.attackweb.WebSlingerCapability;
-import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
+import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.SimpleCapabilityProvider;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.thing.EntityThingBase;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.thing.IThingBase;
@@ -26,7 +26,7 @@ public final class WebAttackEvent
      */
     public WebAttackEvent()
     {
-        CodeGenericUtils.printInitClassToLog(this.getClass());
+        CodeGenericUtil.printInitClassToLog(this.getClass());
     }
 
     /**
@@ -48,10 +48,20 @@ public synchronized void attachCapabilitiesTileEntity(AttachCapabilitiesEvent<Ti
                 WebSlingerCapability.DEFAULT_FACING,
                 WebSlingerCapability.CAPABILITY.getDefaultInstance())
             {
+                /**
+                 *
+                 */
                 private final int TASK_PRIORITY = priority;
 
+                /**
+                 *
+                 */
                 private final IThingBase OWNER = new TileEntityThingBase(entity);
 
+                /**
+                 *
+                 * @return
+                 */
                 @Override
                 public IWebSlinger getInstance()
                 {
@@ -83,10 +93,20 @@ public synchronized void attachCapabilitiesEntity(AttachCapabilitiesEvent<Entity
                 WebSlingerCapability.DEFAULT_FACING,
                 WebSlingerCapability.CAPABILITY.getDefaultInstance())
             {
+                /**
+                 *
+                 */
                 private final int TASK_PRIORITY = priority;
 
+                /**
+                 *
+                 */
                 private final IThingBase OWNER = new EntityThingBase(entity);
 
+                /**
+                 *
+                 * @return
+                 */
                 @Override
                 public IWebSlinger getInstance()
                 {

diff --git a/...src/main/java/org/imesense/dynamicspawncontrol/ai/zombie/entityaibase/BreakTorchTask.java b/...src/main/java/org/imesense/dynamicspawncontrol/ai/zombie/entityaibase/BreakTorchTask.java
@@ -5,8 +5,6 @@
 import net.minecraft.entity.monster.EntityZombie;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
-import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
-import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/....12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/zombie/event/BreakTorchEvent.java b/....12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/zombie/event/BreakTorchEvent.java
@@ -6,7 +6,7 @@
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.imesense.dynamicspawncontrol.ProjectStructure;
 import org.imesense.dynamicspawncontrol.ai.zombie.entityaibase.BreakTorchTask;
-import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
+import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil;
 
 /**
  *
@@ -19,7 +19,7 @@ public final class BreakTorchEvent
      */
     public BreakTorchEvent()
     {
-        CodeGenericUtils.printInitClassToLog(this.getClass());
+        CodeGenericUtil.printInitClassToLog(this.getClass());
     }
 
     /**

diff --git a/...cspawncontrol/debug/CodeGenericUtils.java → ...icspawncontrol/debug/CodeGenericUtil.java b/...cspawncontrol/debug/CodeGenericUtils.java → ...icspawncontrol/debug/CodeGenericUtil.java
@@ -1,25 +1,18 @@
 package org.imesense.dynamicspawncontrol.debug;
 
 import com.google.gson.JsonElement;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.ICapabilityProvider;
 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.ParserGenericJsonScripts;
+import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.function.Function;
 
 /**
  *
  */
-public final class CodeGenericUtils
+public final class CodeGenericUtil
 {
     /**
      *
@@ -90,7 +83,7 @@ public static boolean hasDefaultConstructor(Class<?> clazz)
      */
     public static <T> void readAndLogRules(final String path, final String fileName, Function<JsonElement, T> parser, List<T> list, final String listType)
     {
-        ParserGenericJsonScripts.readRules(path, fileName, parser, list, listType);
+        ParserGenericJsonScript.readRules(path, fileName, parser, list, listType);
 
         if (!list.isEmpty())
         {

diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/Timer.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/Timer.java
@@ -15,7 +15,7 @@ public final class Timer
      */
     public Timer()
     {
-        CodeGenericUtils.printInitClassToLog(this.getClass());
+        CodeGenericUtil.printInitClassToLog(this.getClass());
     }
 
     /**

diff --git a/...awncontrol/debug/events/OnEventDummy.java → ...pawncontrol/debug/event/OnEventDummy.java b/...awncontrol/debug/events/OnEventDummy.java → ...pawncontrol/debug/event/OnEventDummy.java
@@ -1,12 +1,8 @@
-package org.imesense.dynamicspawncontrol.debug.events;
+package org.imesense.dynamicspawncontrol.debug.event;
 
-import net.minecraft.entity.monster.EntityZombie;
-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.ai.zombie.entityaibase.BreakTorchTask;
-import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
+import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
 
 /**
@@ -25,7 +21,7 @@ public final class OnEventDummy
      */
     public OnEventDummy()
     {
-		CodeGenericUtils.printInitClassToLog(this.getClass());
+		CodeGenericUtil.printInitClassToLog(this.getClass());
 
         if (instanceExists)
         {

diff --git a/.../gameplay/commands/cmdAdminDumpBlock.java → ...l/gameplay/command/cmdAdminDumpBlock.java b/.../gameplay/commands/cmdAdminDumpBlock.java → ...l/gameplay/command/cmdAdminDumpBlock.java
@@ -1,4 +1,4 @@
-package org.imesense.dynamicspawncontrol.gameplay.commands;
+package org.imesense.dynamicspawncontrol.gameplay.command;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.properties.IProperty;
@@ -13,11 +13,9 @@
 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.debug.CodeGenericUtil;
 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;
@@ -32,7 +30,7 @@ public final class cmdAdminDumpBlock extends CommandBase
      */
     public cmdAdminDumpBlock()
     {
-        CodeGenericUtils.printInitClassToLog(this.getClass());
+        CodeGenericUtil.printInitClassToLog(this.getClass());
     }
 
     /**

diff --git a/...gameplay/commands/cmdAdminDumpEntity.java → .../gameplay/command/cmdAdminDumpEntity.java b/...gameplay/commands/cmdAdminDumpEntity.java → .../gameplay/command/cmdAdminDumpEntity.java
@@ -1,4 +1,4 @@
-package org.imesense.dynamicspawncontrol.gameplay.commands;
+package org.imesense.dynamicspawncontrol.gameplay.command;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.command.CommandBase;
@@ -9,7 +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.debug.CodeGenericUtil;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
 
 import javax.annotation.Nonnull;
@@ -24,7 +24,7 @@ public final class cmdAdminDumpEntity extends CommandBase
      */
     public cmdAdminDumpEntity()
     {
-        CodeGenericUtils.printInitClassToLog(this.getClass());
+        CodeGenericUtil.printInitClassToLog(this.getClass());
     }
 
     /**

diff --git a/...l/gameplay/commands/cmdAdminDumpItem.java → ...ol/gameplay/command/cmdAdminDumpItem.java b/...l/gameplay/commands/cmdAdminDumpItem.java → ...ol/gameplay/command/cmdAdminDumpItem.java
@@ -1,4 +1,4 @@
-package org.imesense.dynamicspawncontrol.gameplay.commands;
+package org.imesense.dynamicspawncontrol.gameplay.command;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
@@ -14,7 +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.debug.CodeGenericUtil;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
 
 import javax.annotation.Nonnull;
@@ -30,7 +30,7 @@ public final class cmdAdminDumpItem extends CommandBase
      */
     public cmdAdminDumpItem()
     {
-        CodeGenericUtils.printInitClassToLog(this.getClass());
+        CodeGenericUtil.printInitClassToLog(this.getClass());
     }
 
     /**