diff --git a/dynamicspawncontrol-1.12.2/build.gradle b/dynamicspawncontrol-1.12.2/build.gradle index 28cfebd..14ea57a 100644 --- 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/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 fc98736..2a2998a 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 @@ -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/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/entityaibase/WebAttackTask.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/entityaibase/WebAttackTask.java index 0729325..fd082b5 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/entityaibase/WebAttackTask.java +++ b/dynamicspawncontrol-1.12.2/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/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/util/attackweb/WebSlingerCapability.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/util/attackweb/WebSlingerCapability.java index 085848e..20dc642 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/util/attackweb/WebSlingerCapability.java +++ b/dynamicspawncontrol-1.12.2/src/main/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/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/util/event/WebAttackEvent.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/util/event/WebAttackEvent.java index a31876b..d9cf8bb 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/spider/util/event/WebAttackEvent.java +++ b/dynamicspawncontrol-1.12.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 clazz) */ public static void readAndLogRules(final String path, final String fileName, Function parser, List 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 index 22ce1f3..ed150ed 100644 --- 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/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/events/OnEventDummy.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/event/OnEventDummy.java similarity index 61% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/events/OnEventDummy.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/event/OnEventDummy.java index fe26940..fc51ae4 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/events/OnEventDummy.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/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/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/command/cmdAdminDumpBlock.java similarity index 92% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpBlock.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminDumpBlock.java index 822996d..91a2a2a 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/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/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/command/cmdAdminDumpEntity.java similarity index 92% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpEntity.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminDumpEntity.java index 1355b01..7048c3e 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/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/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/command/cmdAdminDumpItem.java similarity index 97% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpItem.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminDumpItem.java index 6d970cb..b8d4c78 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/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()); } /** 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/command/cmdAdminGameMode.java similarity index 85% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminGameMode.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminGameMode.java index 25607a7..38c3fc5 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/command/cmdAdminGameMode.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; @@ -6,9 +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.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumTextColor; +import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumUnicodeCharacter; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import javax.annotation.Nonnull; @@ -23,7 +23,7 @@ public final class cmdAdminGameMode extends CommandBase */ public cmdAdminGameMode() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** @@ -74,8 +74,8 @@ public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sen { 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() + + sender.sendMessage(new TextComponentString(EnumUnicodeCharacter.SECTION.getCharacter() + + EnumTextColor.RED.getCode() + "Invalid game mode: " + args[0])); return; 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/command/cmdAdminGetWorldMoonPhase.java similarity index 67% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminGetWorldMoonPhase.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminGetWorldMoonPhase.java index 973712c..bbb7d2b 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/command/cmdAdminGetWorldMoonPhase.java @@ -1,12 +1,14 @@ -package org.imesense.dynamicspawncontrol.gameplay.commands; +package org.imesense.dynamicspawncontrol.gameplay.command; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.WorldProvider; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; -import org.imesense.dynamicspawncontrol.technical.customlibrary.*; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumCmdCallType; +import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumTextColor; +import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumUnicodeCharacter; import javax.annotation.Nonnull; @@ -20,7 +22,7 @@ public final class cmdAdminGetWorldMoonPhase extends CommandBase */ public cmdAdminGetWorldMoonPhase() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** @@ -59,10 +61,10 @@ public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sen int moonPhase = worldProvider.getMoonPhase(sender.getEntityWorld().getWorldTime()); sender.sendMessage(new TextComponentString( - EnumUnicodeCharacters.SECTION.getCharacter() + - EnumTextColors.AQUA.getCode() + - EnumCmdCalledType.CMD.getDescription() + - EnumUnicodeCharacters.WHITE_SPACE.getCharacter() + + EnumUnicodeCharacter.SECTION.getCharacter() + + EnumTextColor.AQUA.getCode() + + EnumCmdCallType.CMD.getDescription() + + EnumUnicodeCharacter.WHITE_SPACE.getCharacter() + "-> The current phase of the moon: " + moonPhase)); } 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/command/cmdAdminLaunchFireball.java similarity index 90% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminLaunchFireball.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminLaunchFireball.java index 3dbfbf2..e8d1abb 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/command/cmdAdminLaunchFireball.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; @@ -6,8 +6,8 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; -import org.imesense.dynamicspawncontrol.gameplay.items.DSCFireball; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.gameplay.item.DSCFireball; import javax.annotation.Nonnull; @@ -21,7 +21,7 @@ public final class cmdAdminLaunchFireball extends CommandBase */ public cmdAdminLaunchFireball() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** 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/command/cmdAdminScanEntities.java similarity index 79% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminScanEntities.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminScanEntities.java index 8687df5..9b4fad9 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/command/cmdAdminScanEntities.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; @@ -8,8 +8,11 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.customlibrary.*; +import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumCmdCallType; +import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumTextColor; +import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumUnicodeCharacter; import javax.annotation.Nonnull; import java.util.List; @@ -25,7 +28,7 @@ public final class cmdAdminScanEntities extends CommandBase */ public cmdAdminScanEntities() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** @@ -96,10 +99,10 @@ public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sen } sender.sendMessage(new TextComponentString( - EnumUnicodeCharacters.SECTION.getCharacter() + - EnumTextColors.GREEN.getCode() + - EnumCmdCalledType.CMD.getDescription() + - EnumUnicodeCharacters.WHITE_SPACE.getCharacter() + + EnumUnicodeCharacter.SECTION.getCharacter() + + EnumTextColor.GREEN.getCode() + + EnumCmdCallType.CMD.getDescription() + + EnumUnicodeCharacter.WHITE_SPACE.getCharacter() + "The scan is completed")); Log.writeDataToLogFile(0, "------------ END SCAN ENTITY LIST ------------"); 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/command/cmdAdminSwitchVanish.java similarity index 90% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminSwitchVanish.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminSwitchVanish.java index 5d55919..90a63a5 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/command/cmdAdminSwitchVanish.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; @@ -7,8 +7,7 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.TextComponentString; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import javax.annotation.Nonnull; import java.util.Objects; @@ -23,7 +22,7 @@ public final class cmdAdminSwitchVanish extends CommandBase */ public cmdAdminSwitchVanish() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** 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/command/cmdServerJsonScriptReload.java similarity index 52% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerJsonScriptsReload.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdServerJsonScriptReload.java index 0af0e48..be9ab27 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/command/cmdServerJsonScriptReload.java @@ -1,26 +1,28 @@ -package org.imesense.dynamicspawncontrol.gameplay.commands; +package org.imesense.dynamicspawncontrol.gameplay.command; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.TextComponentString; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; -import org.imesense.dynamicspawncontrol.technical.customlibrary.*; -import org.imesense.dynamicspawncontrol.technical.parsers.ParserGenericJsonScripts; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumCmdCallType; +import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumTextColor; +import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumUnicodeCharacter; +import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; import javax.annotation.Nonnull; /** * */ -public final class cmdServerJsonScriptsReload extends CommandBase +public final class cmdServerJsonScriptReload extends CommandBase { /** * */ - public cmdServerJsonScriptsReload() + public cmdServerJsonScriptReload() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** @@ -60,21 +62,21 @@ public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sen this.getUsage(sender); sender.sendMessage(new TextComponentString( - EnumUnicodeCharacters.SECTION.getCharacter() + - EnumTextColors.RED.getCode() + - EnumCmdCalledType.CMD.getDescription() + - EnumUnicodeCharacters.WHITE_SPACE.getCharacter() + + EnumUnicodeCharacter.SECTION.getCharacter() + + EnumTextColor.RED.getCode() + + EnumCmdCallType.CMD.getDescription() + + EnumUnicodeCharacter.WHITE_SPACE.getCharacter() + "The command does not accept arguments")); } else { - ParserGenericJsonScripts.reloadRules(); + ParserGenericJsonScript.reloadRules(); sender.sendMessage(new TextComponentString( - EnumUnicodeCharacters.SECTION.getCharacter() + - EnumTextColors.GREEN.getCode() + - EnumCmdCalledType.CMD.getDescription() + - EnumUnicodeCharacters.WHITE_SPACE.getCharacter() + + EnumUnicodeCharacter.SECTION.getCharacter() + + EnumTextColor.GREEN.getCode() + + EnumCmdCallType.CMD.getDescription() + + EnumUnicodeCharacter.WHITE_SPACE.getCharacter() + "Configurations have been reloaded")); } } 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/command/cmdServerMobsKiller.java similarity index 94% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerMobsKiller.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdServerMobsKiller.java index cb00ce8..eaff0de 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/command/cmdServerMobsKiller.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; @@ -11,8 +11,7 @@ import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.WorldServer; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import javax.annotation.Nonnull; import java.util.ArrayList; @@ -28,7 +27,7 @@ public final class cmdServerMobsKiller extends CommandBase */ public cmdServerMobsKiller() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdServerSingleScriptReload.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdServerSingleScriptReload.java new file mode 100644 index 0000000..85c1061 --- /dev/null +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdServerSingleScriptReload.java @@ -0,0 +1,74 @@ +package org.imesense.dynamicspawncontrol.gameplay.command; + +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.text.TextComponentString; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumCmdCallType; +import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumTextColor; +import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumUnicodeCharacter; +import org.imesense.dynamicspawncontrol.technical.parser.ParserManager; + +import javax.annotation.Nonnull; + +/** + * + */ +public final class cmdServerSingleScriptReload extends CommandBase +{ + /** + * + */ + public cmdServerSingleScriptReload() + { + CodeGenericUtil.printInitClassToLog(this.getClass()); + } + + @Nonnull + @Override + public String getName() + { + return "dsc_single_scripts_reload"; + } + + @Nonnull + @Override + public String getUsage(@Nonnull ICommandSender sender) + { + return "/dsc_single_scripts_reload"; + } + + /** + * + * @param server + * @param sender + * @param args + */ + @Override + public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sender, @Nonnull String... args) + { + if (args.length > 0) + { + this.getUsage(sender); + + sender.sendMessage(new TextComponentString( + EnumUnicodeCharacter.SECTION.getCharacter() + + EnumTextColor.RED.getCode() + + EnumCmdCallType.CMD.getDescription() + + EnumUnicodeCharacter.WHITE_SPACE.getCharacter() + + "The command does not accept arguments")); + } + else + { + ParserManager.reloadAllConfigs(); + + sender.sendMessage(new TextComponentString( + EnumUnicodeCharacter.SECTION.getCharacter() + + EnumTextColor.GREEN.getCode() + + EnumCmdCallType.CMD.getDescription() + + EnumUnicodeCharacter.WHITE_SPACE.getCharacter() + + "Configurations have been reloaded")); + } + } +} 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 deleted file mode 100644 index 77c24c4..0000000 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerSingleScriptsReload.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.imesense.dynamicspawncontrol.gameplay.commands; - -import net.minecraft.command.CommandBase; -import net.minecraft.command.ICommandSender; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.text.TextComponentString; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; -import org.imesense.dynamicspawncontrol.technical.customlibrary.*; -import org.imesense.dynamicspawncontrol.technical.parsers.IBetaParsers; -import org.imesense.dynamicspawncontrol.technical.parsers.ParserManager; -import org.imesense.dynamicspawncontrol.technical.parsers.beta.ParserSingleScriptCheckSpawn; -import org.imesense.dynamicspawncontrol.technical.parsers.beta.ParserSingleScriptSettingsCache; -import org.imesense.dynamicspawncontrol.technical.parsers.beta.ParserSingleZombieSummonAID; - -import javax.annotation.Nonnull; - -/** - * - */ -public final class cmdServerSingleScriptsReload extends CommandBase -{ - /** - * - */ - public cmdServerSingleScriptsReload() - { - CodeGenericUtils.printInitClassToLog(this.getClass()); - } - - @Nonnull - @Override - public String getName() - { - return "dsc_single_scripts_reload"; - } - - @Nonnull - @Override - public String getUsage(@Nonnull ICommandSender sender) - { - return "/dsc_single_scripts_reload"; - } - - /** - * - * @param server - * @param sender - * @param args - */ - @Override - public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sender, @Nonnull String... args) - { - if (args.length > 0) - { - this.getUsage(sender); - - sender.sendMessage(new TextComponentString( - EnumUnicodeCharacters.SECTION.getCharacter() + - EnumTextColors.RED.getCode() + - EnumCmdCalledType.CMD.getDescription() + - EnumUnicodeCharacters.WHITE_SPACE.getCharacter() + - "The command does not accept arguments")); - } - else - { - ParserManager.reloadAllConfigs(); - - sender.sendMessage(new TextComponentString( - EnumUnicodeCharacters.SECTION.getCharacter() + - EnumTextColors.GREEN.getCode() + - EnumCmdCalledType.CMD.getDescription() + - EnumUnicodeCharacters.WHITE_SPACE.getCharacter() + - "Configurations have been reloaded")); - } - } -} diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/events/OnUpdateTorchLogic.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/event/OnUpdateTorchLogic.java similarity index 93% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/events/OnUpdateTorchLogic.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/event/OnUpdateTorchLogic.java index 619cc4e..d47cd54 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/events/OnUpdateTorchLogic.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/event/OnUpdateTorchLogic.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.gameplay.events; +package org.imesense.dynamicspawncontrol.gameplay.event; import net.minecraft.block.Block; import net.minecraft.block.BlockTorch; @@ -17,8 +17,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; -import org.imesense.dynamicspawncontrol.gameplay.commands.cmdServerSingleScriptsReload; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; /** @@ -37,7 +36,7 @@ public final class OnUpdateTorchLogic */ public OnUpdateTorchLogic() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/gameworld/WorldTime.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/gameworld/WorldTime.java index a60741c..37f075b 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/gameworld/WorldTime.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/gameworld/WorldTime.java @@ -1,7 +1,7 @@ package org.imesense.dynamicspawncontrol.gameplay.gameworld; import net.minecraft.world.World; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.gameworldtime.DataPluginWorldTime; import java.math.BigDecimal; @@ -17,7 +17,7 @@ public final class WorldTime */ public WorldTime() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/items/DSCFireball.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/item/DSCFireball.java similarity index 98% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/items/DSCFireball.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/item/DSCFireball.java index 1e7f34a..5c390cc 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/items/DSCFireball.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/item/DSCFireball.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.gameplay.items; +package org.imesense.dynamicspawncontrol.gameplay.item; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityFireball; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/items/DSCWeb.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/item/DSCWeb.java similarity index 73% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/items/DSCWeb.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/item/DSCWeb.java index 75233ec..6370ceb 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/items/DSCWeb.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/item/DSCWeb.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.gameplay.items; +package org.imesense.dynamicspawncontrol.gameplay.item; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -9,9 +9,9 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import org.imesense.dynamicspawncontrol.gameplay.throwingobjects.DSCThrowItemWeb; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ObjectHandler; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.gameplay.throwingobject.DSCThrowItemWeb; +import org.imesense.dynamicspawncontrol.technical.handler.ObjectHandlerClient; import javax.annotation.Nonnull; import java.util.Objects; @@ -26,12 +26,12 @@ public final class DSCWeb extends Item */ public DSCWeb() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); this.maxStackSize = 1; this.setCreativeTab(CreativeTabs.MISC); - ObjectHandler.RegistrationHandler.nameHelper(this, "dynamicspawncontrol:webbing"); + ObjectHandlerClient.RegistrationHandler.nameHelper(this, "dynamicspawncontrol:webbing"); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/recipes/CraftItemWeb.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/recipes/CraftItemWeb.java index 4bd7d87..ddd3f62 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/recipes/CraftItemWeb.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/recipes/CraftItemWeb.java @@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ObjectHandler; +import org.imesense.dynamicspawncontrol.technical.handler.ObjectHandlerClient; /** * @@ -18,7 +18,7 @@ public final class CraftItemWeb implements IRecipes public void registry() { GameRegistry.addShapedRecipe(new ResourceLocation("dynamicspawncontrol", "webbing"), null, - new ItemStack(ObjectHandler.webbing), + new ItemStack(ObjectHandlerClient.webbing), "SSS", "SWS", "SSS", diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/throwingobjects/DSCThrowItemWeb.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/throwingobject/DSCThrowItemWeb.java similarity index 90% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/throwingobjects/DSCThrowItemWeb.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/throwingobject/DSCThrowItemWeb.java index 5ad619c..db53410 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/throwingobjects/DSCThrowItemWeb.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/throwingobject/DSCThrowItemWeb.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.gameplay.throwingobjects; +package org.imesense.dynamicspawncontrol.gameplay.throwingobject; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -14,9 +14,9 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import org.imesense.dynamicspawncontrol.DynamicSpawnControl; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.spiderattackweb.DataSpiderAttackWeb; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ObjectHandler; +import org.imesense.dynamicspawncontrol.technical.handler.ObjectHandlerClient; import org.imesense.dynamicspawncontrol.technical.network.PlayerInWebMessage; /** @@ -37,7 +37,7 @@ public DSCThrowItemWeb(World worldIn) { super(worldIn); - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** @@ -49,7 +49,7 @@ public DSCThrowItemWeb(World worldIn, EntityLivingBase throwerIn) { super(worldIn, throwerIn); - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** @@ -114,7 +114,7 @@ public static DSCThrowItemWeb sling(World worldIn, EntityLivingBase entityIn) DSCThrowItemWeb entity = null; float pitch = 1.0f / (entityIn.getRNG().nextFloat() * 0.4f + 0.8f); - entityIn.playSound(ObjectHandler.WEBBING_SHOOT, 1.0f, pitch); + entityIn.playSound(ObjectHandlerClient.WEBBING_SHOOT, 1.0f, pitch); if (!worldIn.isRemote) { @@ -144,12 +144,12 @@ public static void onHit(World world, BlockPos pos, Entity source, Entity target if (!stick) { - world.playSound(null, pos, ObjectHandler.WEBBING_NONSTICK, + world.playSound(null, pos, ObjectHandlerClient.WEBBING_NONSTICK, SoundCategory.NEUTRAL, 0.5f, 0.4f / (world.rand.nextFloat() * 0.4f + 0.8f)); } else { - world.playSound(null, pos, ObjectHandler.WEBBING_STICK, + world.playSound(null, pos, ObjectHandlerClient.WEBBING_STICK, SoundCategory.NEUTRAL, 0.5f, 0.4f / (world.rand.nextFloat() * 0.4f + 0.8f)); if (!world.isRemote) diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/worldgenerator/BlockMonsterEgg.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/worldgenerator/BlockMonsterEgg.java index 4e5e2ad..06262bb 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/worldgenerator/BlockMonsterEgg.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/worldgenerator/BlockMonsterEgg.java @@ -8,7 +8,7 @@ import net.minecraft.world.gen.feature.WorldGenMinable; import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.fml.common.IWorldGenerator; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.blockgenerator.DataBlockWorldGenerator; import java.util.Objects; @@ -31,7 +31,7 @@ public final class BlockMonsterEgg implements IWorldGenerator */ public BlockMonsterEgg() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); CLASS_MONSTER_EGG_GENERATOR = new WorldGenMinable( Objects.requireNonNull(Block.getBlockFromName("monster_egg")).getDefaultState(), 5); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/worldgenerator/BlockMossyCobblestone.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/worldgenerator/BlockMossyCobblestone.java index 8eafa3a..601569e 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/worldgenerator/BlockMossyCobblestone.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/worldgenerator/BlockMossyCobblestone.java @@ -8,7 +8,7 @@ import net.minecraft.world.gen.feature.WorldGenMinable; import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.fml.common.IWorldGenerator; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.blockgenerator.DataBlockWorldGenerator; import java.util.Objects; @@ -31,7 +31,7 @@ public final class BlockMossyCobblestone implements IWorldGenerator */ public BlockMossyCobblestone() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); CLASS_MOSSY_COBBLESTONE_GENERATOR = new WorldGenMinable( Objects.requireNonNull(Block.getBlockFromName("mossy_cobblestone")).getDefaultState(), 5); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/worldgenerator/BlockNetherRack.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/worldgenerator/BlockNetherRack.java index c2e971d..6379ec9 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/worldgenerator/BlockNetherRack.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/worldgenerator/BlockNetherRack.java @@ -8,7 +8,7 @@ import net.minecraft.world.gen.feature.WorldGenMinable; import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.fml.common.IWorldGenerator; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.blockgenerator.DataBlockWorldGenerator; import java.util.Objects; @@ -31,7 +31,7 @@ public final class BlockNetherRack implements IWorldGenerator */ public BlockNetherRack() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); CLASS_NETHER_RACK_GENERATOR = new WorldGenMinable( Objects.requireNonNull(Block.getBlockFromName("netherrack")).getDefaultState(), 5); 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/EntityRendererHook.java similarity index 99% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/EntityRendererHooks.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/EntityRendererHook.java index ab334ca..6eb1315 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/EntityRendererHook.java @@ -15,7 +15,7 @@ /** * */ -public final class EntityRendererHooks +public final class EntityRendererHook { /** * diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/EntityRendererTransformer.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/EntityRendererTransformer.java index 73dbc0c..fe14532 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/EntityRendererTransformer.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/EntityRendererTransformer.java @@ -71,7 +71,7 @@ public final class EntityRendererTransformer implements IClassTransformer * */ private static final String ENTITY_RENDERER_HOOKS = - EntityRendererHooks.class.getName().replace('.', '/'); + EntityRendererHook.class.getName().replace('.', '/'); /** * diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/WorldProviderHooks.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/WorldProviderHook.java similarity index 95% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/WorldProviderHooks.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/WorldProviderHook.java index fb76807..c12eea5 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/WorldProviderHooks.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/WorldProviderHook.java @@ -9,7 +9,7 @@ /** * */ -public final class WorldProviderHooks +public final class WorldProviderHook { /** * diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/WorldProviderTransformer.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/WorldProviderTransformer.java index dde1fe7..0fe9127 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/WorldProviderTransformer.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/WorldProviderTransformer.java @@ -59,7 +59,7 @@ public final class WorldProviderTransformer implements IClassTransformer * */ private static final String WORLD_PROVIDER_HOOKS = - WorldProviderHooks.class.getName().replace('.', '/'); + WorldProviderHook.class.getName().replace('.', '/'); /** * diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/attributefactory/AttributeMapFactory.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/attributefactory/AttributeMapFactory.java index c22b45c..fc6a33a 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/attributefactory/AttributeMapFactory.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/attributefactory/AttributeMapFactory.java @@ -1,7 +1,7 @@ package org.imesense.dynamicspawncontrol.technical.attributefactory; import com.google.gson.*; -import org.imesense.dynamicspawncontrol.technical.customlibrary.JsonServices; +import org.imesense.dynamicspawncontrol.technical.customlibrary.InlineJsonService; import java.util.*; import javax.annotation.Nonnull; @@ -56,9 +56,9 @@ public AttributeMap parse(@Nonnull JsonElement element) transformers.put((AttributeType)AttributeType.STRING, JsonElement::getAsString); transformers.put((AttributeType)AttributeType.JSON, JsonElement::toString); - JsonServices.getElement(jsonObject, key.getName()) + InlineJsonService.getElement(jsonObject, key.getName()) .ifPresent(e -> - JsonServices.asArrayOrSingle(e) + InlineJsonService.asArrayOrSingle(e) .map(transformers.getOrDefault(type, x -> "INVALID")) .forEach(s -> map.addListNonnull(key, (T) s))); } @@ -66,15 +66,15 @@ public AttributeMap parse(@Nonnull JsonElement element) { if (type == AttributeType.INTEGER) { - map.setNonnull(key, (T) JsonServices.parseInt(jsonObject, key.getName())); + map.setNonnull(key, (T) InlineJsonService.parseInt(jsonObject, key.getName())); } else if (type == AttributeType.FLOAT) { - map.setNonnull(key, (T) JsonServices.parseFloat(jsonObject, key.getName())); + map.setNonnull(key, (T) InlineJsonService.parseFloat(jsonObject, key.getName())); } else if (type == AttributeType.BOOLEAN) { - map.setNonnull(key, (T) JsonServices.parseBool(jsonObject, key.getName())); + map.setNonnull(key, (T) InlineJsonService.parseBool(jsonObject, key.getName())); } else if (type == AttributeType.STRING) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/blockgenerator/CfgBlockWorldGenerator.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/blockgenerator/CfgBlockWorldGenerator.java index 0b24ca6..8fe926c 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/blockgenerator/CfgBlockWorldGenerator.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/blockgenerator/CfgBlockWorldGenerator.java @@ -1,10 +1,10 @@ package org.imesense.dynamicspawncontrol.technical.config.blockgenerator; import com.google.gson.*; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.CfgClassAbstract; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotations.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.DCSSingleConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -28,7 +28,7 @@ public CfgBlockWorldGenerator(String nameConfigFile) { super(nameConfigFile, Boolean.TRUE); - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); DataBlockWorldGenerator.InfoDataBlockNetherRack.instance = new DataBlockWorldGenerator.InfoDataBlockNetherRack("settings_block_nether_rack"); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/blockgenerator/ConfigDataBlock.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/blockgenerator/ConfigDataBlock.java index 584fa0a..d7658bf 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/blockgenerator/ConfigDataBlock.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/blockgenerator/ConfigDataBlock.java @@ -1,6 +1,6 @@ package org.imesense.dynamicspawncontrol.technical.config.blockgenerator; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; /** * @@ -41,7 +41,7 @@ public ConfigDataBlock(String category, Integer chanceSpawn, Integer minHeight, this.minHeight = minHeight; this.maxHeight = maxHeight; - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/cachedameworld/CfgCacheWorldGame.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/cachedameworld/CfgCacheWorldGame.java index 86f10ac..ffeaf71 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/cachedameworld/CfgCacheWorldGame.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/cachedameworld/CfgCacheWorldGame.java @@ -1,10 +1,10 @@ package org.imesense.dynamicspawncontrol.technical.config.cachedameworld; import com.google.gson.*; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.CfgClassAbstract; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotations.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.DCSSingleConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -28,7 +28,7 @@ public CfgCacheWorldGame(String nameConfigFile) { super(nameConfigFile, Boolean.TRUE); - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (Files.exists(Paths.get(this.nameConfig))) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/gamedebugger/CfgGameDebugger.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/gamedebugger/CfgGameDebugger.java index 6d149bd..dd18a3c 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/gamedebugger/CfgGameDebugger.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/gamedebugger/CfgGameDebugger.java @@ -1,9 +1,9 @@ package org.imesense.dynamicspawncontrol.technical.config.gamedebugger; import com.google.gson.*; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.CfgClassAbstract; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotations.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.DCSSingleConfig; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import java.io.*; @@ -26,7 +26,7 @@ public CfgGameDebugger(String nameConfigFile) { super(nameConfigFile, Boolean.TRUE); - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); DataGameDebugger.ConfigDataMonitor.instance = new DataGameDebugger.ConfigDataMonitor("monitor"); 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 b548de3..f3f497f 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 @@ -1,6 +1,6 @@ package org.imesense.dynamicspawncontrol.technical.config.gamedebugger; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import javax.annotation.Nonnull; import java.util.HashMap; @@ -37,7 +37,7 @@ public static final class ConfigDataMonitor */ public ConfigDataMonitor(@Nonnull final String category) { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); this.category = category; } @@ -95,7 +95,7 @@ public static final class ConfigDataEvent */ public ConfigDataEvent(@Nonnull final String category) { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); this.category = category; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/gameworldtime/CfgPluginWorldTime.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/gameworldtime/CfgPluginWorldTime.java index acc133e..122f3ac 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/gameworldtime/CfgPluginWorldTime.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/gameworldtime/CfgPluginWorldTime.java @@ -1,10 +1,10 @@ package org.imesense.dynamicspawncontrol.technical.config.gameworldtime; import com.google.gson.*; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.CfgClassAbstract; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotations.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.DCSSingleConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -28,7 +28,7 @@ public CfgPluginWorldTime(String nameConfigFile) { super(nameConfigFile, Boolean.FALSE); - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); DataPluginWorldTime.ConfigDataWorldTime.instance = new DataPluginWorldTime.ConfigDataWorldTime("game_world_time"); 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 db803c1..63c3f01 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 @@ -1,6 +1,6 @@ package org.imesense.dynamicspawncontrol.technical.config.gameworldtime; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import javax.annotation.Nonnull; @@ -55,7 +55,7 @@ public static final class ConfigDataWorldTime */ public ConfigDataWorldTime(@Nonnull final String category) { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); this.category = category; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/logfile/CfgLogFile.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/logfile/CfgLogFile.java index 37b9fcb..adc5149 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/logfile/CfgLogFile.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/logfile/CfgLogFile.java @@ -1,11 +1,11 @@ package org.imesense.dynamicspawncontrol.technical.config.logfile; import com.google.gson.*; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.CfgClassAbstract; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotations.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.DCSSingleConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -29,7 +29,7 @@ public CfgLogFile(String nameConfigFile) { super(nameConfigFile, Boolean.TRUE); - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); DataLogFile.ConfigDataLogFile.instance = new DataLogFile.ConfigDataLogFile("log_file"); 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 965e631..a844fe7 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 @@ -1,6 +1,6 @@ package org.imesense.dynamicspawncontrol.technical.config.logfile; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import javax.annotation.Nonnull; @@ -35,7 +35,7 @@ public static final class ConfigDataLogFile */ public ConfigDataLogFile(@Nonnull final String category) { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); this.category = category; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/player/CfgPlayer.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/player/CfgPlayer.java index ec7328d..7aa5a4b 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/player/CfgPlayer.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/player/CfgPlayer.java @@ -1,10 +1,10 @@ package org.imesense.dynamicspawncontrol.technical.config.player; import com.google.gson.*; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.CfgClassAbstract; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotations.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.DCSSingleConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -28,7 +28,7 @@ public CfgPlayer(String nameConfigFile) { super(nameConfigFile, Boolean.TRUE); - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); DataPlayer.ConfigDataPlayer.instance = new DataPlayer.ConfigDataPlayer("player"); 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 6383653..8a77bf3 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 @@ -1,6 +1,6 @@ package org.imesense.dynamicspawncontrol.technical.config.player; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import javax.annotation.Nonnull; @@ -35,7 +35,7 @@ public static final class ConfigDataPlayer */ public ConfigDataPlayer(@Nonnull final String category) { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); this.category = category; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/rendernight/CfgRenderNight.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/rendernight/CfgRenderNight.java index e63a175..667261a 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/rendernight/CfgRenderNight.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/rendernight/CfgRenderNight.java @@ -1,10 +1,10 @@ package org.imesense.dynamicspawncontrol.technical.config.rendernight; import com.google.gson.*; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.CfgClassAbstract; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotations.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.DCSSingleConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -28,7 +28,7 @@ public CfgRenderNight(String nameConfigFile) { super(nameConfigFile, Boolean.TRUE); - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); DataRenderNight.ConfigDataRenderNight.instance = new DataRenderNight.ConfigDataRenderNight("render_night"); 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 c31a199..072e86f 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 @@ -1,6 +1,6 @@ package org.imesense.dynamicspawncontrol.technical.config.rendernight; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import javax.annotation.Nonnull; @@ -90,7 +90,7 @@ public static final class ConfigDataRenderNight */ public ConfigDataRenderNight(@Nonnull final String category) { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); this.category = category; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/skeletondropitem/CfgSkeletonDropItem.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/skeletondropitem/CfgSkeletonDropItem.java index b4f8470..162f21f 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/skeletondropitem/CfgSkeletonDropItem.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/skeletondropitem/CfgSkeletonDropItem.java @@ -1,10 +1,10 @@ package org.imesense.dynamicspawncontrol.technical.config.skeletondropitem; import com.google.gson.*; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.CfgClassAbstract; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotations.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.DCSSingleConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -28,7 +28,7 @@ public CfgSkeletonDropItem(String nameConfigFile) { super(nameConfigFile, Boolean.TRUE); - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); DataSkeletonDropItem.ConfigDataSkeletonDrop.instance = new DataSkeletonDropItem.ConfigDataSkeletonDrop("skeleton_drop"); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/skeletondropitem/DataSkeletonDropItem.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/skeletondropitem/DataSkeletonDropItem.java index 555fb51..a2b03d3 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/skeletondropitem/DataSkeletonDropItem.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/skeletondropitem/DataSkeletonDropItem.java @@ -1,6 +1,6 @@ package org.imesense.dynamicspawncontrol.technical.config.skeletondropitem; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import javax.annotation.Nonnull; import java.util.Random; @@ -71,7 +71,7 @@ public static final class ConfigDataSkeletonDrop */ public ConfigDataSkeletonDrop(@Nonnull final String category) { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); this.category = category; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/spiderattackweb/CfgSpiderAttackWeb.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/spiderattackweb/CfgSpiderAttackWeb.java index 9c37b31..0690f44 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/spiderattackweb/CfgSpiderAttackWeb.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/spiderattackweb/CfgSpiderAttackWeb.java @@ -1,12 +1,10 @@ package org.imesense.dynamicspawncontrol.technical.config.spiderattackweb; import com.google.gson.*; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.CfgClassAbstract; -import org.imesense.dynamicspawncontrol.technical.config.player.DataPlayer; -import org.imesense.dynamicspawncontrol.technical.config.skeletondropitem.DataSkeletonDropItem; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotations.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.DCSSingleConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -30,7 +28,7 @@ public CfgSpiderAttackWeb(String nameConfigFile) { super(nameConfigFile, Boolean.FALSE); - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); DataSpiderAttackWeb.ConfigDataSpiderAttackWeb.instance = new DataSpiderAttackWeb.ConfigDataSpiderAttackWeb("spider_web_attack"); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/spiderattackweb/DataSpiderAttackWeb.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/spiderattackweb/DataSpiderAttackWeb.java index b5c8ee1..424349d 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/spiderattackweb/DataSpiderAttackWeb.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/spiderattackweb/DataSpiderAttackWeb.java @@ -1,6 +1,6 @@ package org.imesense.dynamicspawncontrol.technical.config.spiderattackweb; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import javax.annotation.Nonnull; @@ -75,7 +75,7 @@ public static final class ConfigDataSpiderAttackWeb */ public ConfigDataSpiderAttackWeb(@Nonnull final String category) { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); this.category = category; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/windowtitle/CfgWindowTitle.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/windowtitle/CfgWindowTitle.java index 17dac51..6062c47 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/windowtitle/CfgWindowTitle.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/windowtitle/CfgWindowTitle.java @@ -1,10 +1,10 @@ package org.imesense.dynamicspawncontrol.technical.config.windowtitle; import com.google.gson.*; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.CfgClassAbstract; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotations.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.DCSSingleConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -28,7 +28,7 @@ public CfgWindowTitle(String nameConfigFile) { super(nameConfigFile, Boolean.TRUE); - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); DataWindowTitle.ConfigDataWindowTitle.instance = new DataWindowTitle.ConfigDataWindowTitle("window_title"); 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 a1f5f22..7786f75 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 @@ -1,8 +1,7 @@ package org.imesense.dynamicspawncontrol.technical.config.windowtitle; -import org.imesense.dynamicspawncontrol.DynamicSpawnControl; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import javax.annotation.Nonnull; @@ -38,7 +37,7 @@ public static final class ConfigDataWindowTitle */ public ConfigDataWindowTitle(@Nonnull final String category) { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); this.category = category; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/zombiedropitem/CfgZombieDropItem.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/zombiedropitem/CfgZombieDropItem.java index 1dee97c..0b1c899 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/zombiedropitem/CfgZombieDropItem.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/zombiedropitem/CfgZombieDropItem.java @@ -1,10 +1,10 @@ package org.imesense.dynamicspawncontrol.technical.config.zombiedropitem; import com.google.gson.*; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.CfgClassAbstract; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotations.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.DCSSingleConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -28,7 +28,7 @@ public CfgZombieDropItem(String nameConfigFile) { super(nameConfigFile, Boolean.TRUE); - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); DataZombieDropItem.ConfigDataZombieDrop.instance = new DataZombieDropItem.ConfigDataZombieDrop("zombie_drop"); 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 be14564..9e74f54 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 @@ -1,6 +1,6 @@ package org.imesense.dynamicspawncontrol.technical.config.zombiedropitem; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import javax.annotation.Nonnull; @@ -65,7 +65,7 @@ public static final class ConfigDataZombieDrop */ public ConfigDataZombieDrop(@Nonnull final String category) { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); this.category = category; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/AuxFunctions.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/AuxFunction.java similarity index 96% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/AuxFunctions.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/AuxFunction.java index 8032dd1..8ed20af 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/AuxFunctions.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/AuxFunction.java @@ -11,7 +11,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; @@ -38,6 +37,7 @@ import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.tuple.Pair; import org.codehaus.plexus.util.StringUtils; +import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumGameProperty; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; import javax.annotation.Nonnull; @@ -49,7 +49,7 @@ /** * */ -public class AuxFunctions +public class AuxFunction { /** * @@ -176,19 +176,19 @@ public static BiFunction parseOffset(String JsonElement element = parser.parse(json); JsonObject obj = element.getAsJsonObject(); - if (obj.has(EnumGameProperties.BlockProperties.OFFSET.getValue())) + if (obj.has(EnumGameProperty.BlockProperties.OFFSET.getValue())) { JsonObject offset = - obj.getAsJsonObject(EnumGameProperties.BlockProperties.OFFSET.getValue()); + obj.getAsJsonObject(EnumGameProperty.BlockProperties.OFFSET.getValue()); - offsetX = offset.has(EnumGameProperties.Coordinates.X.getValue()) ? - offset.get(EnumGameProperties.Coordinates.X.getValue()).getAsInt() : 0; + offsetX = offset.has(EnumGameProperty.Coordinates.X.getValue()) ? + offset.get(EnumGameProperty.Coordinates.X.getValue()).getAsInt() : 0; - offsetY = offset.has(EnumGameProperties.Coordinates.Y.getValue()) ? - offset.get(EnumGameProperties.Coordinates.Y.getValue()).getAsInt() : 0; + offsetY = offset.has(EnumGameProperty.Coordinates.Y.getValue()) ? + offset.get(EnumGameProperty.Coordinates.Y.getValue()).getAsInt() : 0; - offsetZ = offset.has(EnumGameProperties.Coordinates.Z.getValue()) ? - offset.get(EnumGameProperties.Coordinates.Z.getValue()).getAsInt() : 0; + offsetZ = offset.has(EnumGameProperty.Coordinates.Z.getValue()) ? + offset.get(EnumGameProperty.Coordinates.Z.getValue()).getAsInt() : 0; } else { @@ -197,7 +197,7 @@ public static BiFunction parseOffset(String offsetZ = 0; } - if (obj.has(EnumGameProperties.BlockProperties.STEP.getValue())) + if (obj.has(EnumGameProperty.BlockProperties.STEP.getValue())) { return (event, query) -> { @@ -215,7 +215,7 @@ public static BiFunction parseOffset(String }; } - if (obj.has(EnumGameProperties.BlockProperties.LOOK.getValue())) + if (obj.has(EnumGameProperty.BlockProperties.LOOK.getValue())) { return (event, query) -> { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/JsonServices.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/InlineJsonService.java similarity index 99% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/JsonServices.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/InlineJsonService.java index 9fee679..362271b 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/JsonServices.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/InlineJsonService.java @@ -16,7 +16,7 @@ /** * */ -public final class JsonServices +public final class InlineJsonService { /** * diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionsBinary.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionBinary.java similarity index 96% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionsBinary.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionBinary.java index 9521fae..414fc93 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionsBinary.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionBinary.java @@ -23,20 +23,20 @@ import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataGetter; import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericPotentialSpawn; -import org.imesense.dynamicspawncontrol.technical.gamestructures.Structures; +import org.imesense.dynamicspawncontrol.technical.gamestructure.Structure; import java.util.*; import java.util.function.BiFunction; import java.util.function.BiPredicate; -import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWords.CommonKeyWorlds.*; -import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWords.SpawnCondition.*; +import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWord.CommonKeyWorlds.*; +import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWord.SpawnCondition.*; /** * * @param */ -public final class ListActionsBinary +public final class ListActionBinary { /** * @@ -47,7 +47,7 @@ public final class ListActionsBinary * * @param map */ - public ListActionsBinary(AttributeMap map) + public ListActionBinary(AttributeMap map) { this.CreateListActions(map); } @@ -564,7 +564,7 @@ private void addStructureCheck(AttributeMap map) Object structure = map.get(STRUCTURE); this.ARRAY_LIST.add((event,query) -> - Structures.STRUCTURES_CACHE.isInStructure(query.getWorld(event), (String) structure, query.getPos(event))); + Structure.STRUCTURES_CACHE.isInStructure(query.getWorld(event), (String) structure, query.getPos(event))); } /** @@ -597,7 +597,7 @@ private void addDimensionCheck(AttributeMap map) */ public void addHelmetCheck(AttributeMap map) { - List> items = AuxFunctions.getItems(map.getList(HELMET)); + List> items = AuxFunction.getItems(map.getList(HELMET)); this.ARRAY_LIST.add((event, query) -> { @@ -622,7 +622,7 @@ public void addHelmetCheck(AttributeMap map) */ public void addChestPlateCheck(AttributeMap map) { - List> items = AuxFunctions.getItems(map.getList(CHEST_PLATE)); + List> items = AuxFunction.getItems(map.getList(CHEST_PLATE)); this.ARRAY_LIST.add((event, query) -> { @@ -647,7 +647,7 @@ public void addChestPlateCheck(AttributeMap map) */ public void addLeggingsCheck(AttributeMap map) { - List> items = AuxFunctions.getItems(map.getList(LEGGINGS)); + List> items = AuxFunction.getItems(map.getList(LEGGINGS)); this.ARRAY_LIST.add((event, query) -> { @@ -672,7 +672,7 @@ public void addLeggingsCheck(AttributeMap map) */ public void addBootsCheck(AttributeMap map) { - List> items = AuxFunctions.getItems(map.getList(BOOTS)); + List> items = AuxFunction.getItems(map.getList(BOOTS)); this.ARRAY_LIST.add((event, query) -> { @@ -876,7 +876,7 @@ private void addBlocksCheck(AttributeMap map) if (map.has(BLOCK_OFFSET)) { - posFunction = AuxFunctions.parseOffset((String)map.get(BLOCK_OFFSET)); + posFunction = AuxFunction.parseOffset((String)map.get(BLOCK_OFFSET)); } else { @@ -889,7 +889,7 @@ private void addBlocksCheck(AttributeMap map) if (blocks.size() == 1) { String json = blocks.get(0); - BiPredicate blockMatcher = AuxFunctions.parseBlock(json); + BiPredicate blockMatcher = AuxFunction.parseBlock(json); if (blockMatcher != null) { @@ -907,7 +907,7 @@ private void addBlocksCheck(AttributeMap map) for (String block : blocks) { - BiPredicate blockMatcher = AuxFunctions.parseBlock(block); + BiPredicate blockMatcher = AuxFunction.parseBlock(block); if (blockMatcher == null) { @@ -1078,12 +1078,12 @@ private void addFakePlayerCheck(AttributeMap _map) if ((Boolean)asPlayer) { this.ARRAY_LIST.add((event, query) -> - query.getAttacker(event) == null ? false : AuxFunctions.isFakePlayer(query.getAttacker(event))); + query.getAttacker(event) == null ? false : AuxFunction.isFakePlayer(query.getAttacker(event))); } else { this.ARRAY_LIST.add((event, query) -> - query.getAttacker(event) == null ? true : !AuxFunctions.isFakePlayer(query.getAttacker(event))); + query.getAttacker(event) == null ? true : !AuxFunction.isFakePlayer(query.getAttacker(event))); } } @@ -1098,12 +1098,12 @@ private void addRealPlayerCheck(AttributeMap map) if ((Boolean)asPlayer) { this.ARRAY_LIST.add((event, query) -> - query.getAttacker(event) == null ? false : AuxFunctions.isRealPlayer(query.getAttacker(event))); + query.getAttacker(event) == null ? false : AuxFunction.isRealPlayer(query.getAttacker(event))); } else { this.ARRAY_LIST.add((event, query) -> - query.getAttacker(event) == null ? true : !AuxFunctions.isRealPlayer(query.getAttacker(event))); + query.getAttacker(event) == null ? true : !AuxFunction.isRealPlayer(query.getAttacker(event))); } } @@ -1114,7 +1114,7 @@ private void addRealPlayerCheck(AttributeMap map) */ public void addHeldItemCheck(AttributeMap map, AttributeKey key) { - List> items = AuxFunctions.getItems(map.getList(key)); + List> items = AuxFunction.getItems(map.getList(key)); this.ARRAY_LIST.add((event,query) -> { @@ -1146,7 +1146,7 @@ public void addHeldItemCheck(AttributeMap map, AttributeKey key) */ public void addOffHandItemCheck(AttributeMap map) { - List> items = AuxFunctions.getItems(map.getList(OFF_HAND_ITEM)); + List> items = AuxFunction.getItems(map.getList(OFF_HAND_ITEM)); this.ARRAY_LIST.add((event,query) -> { @@ -1278,7 +1278,7 @@ private void addSourceCheck(AttributeMap map) */ public void addBothHandsItemCheck(AttributeMap map) { - List> items = AuxFunctions.getItems(map.getList(BOTH_HANDS_ITEM)); + List> items = AuxFunction.getItems(map.getList(BOTH_HANDS_ITEM)); this.ARRAY_LIST.add((event,query) -> { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionsConsumer.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionConsumer.java similarity index 94% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionsConsumer.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionConsumer.java index 3e1099c..a7733f6 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionsConsumer.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionConsumer.java @@ -38,13 +38,13 @@ import java.util.function.Consumer; import java.util.function.Function; -import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWords.CommonKeyWorlds.*; +import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWord.CommonKeyWorlds.*; /** * * @param */ -public abstract class ListActionsConsumer +public abstract class ListActionConsumer { /** * @@ -54,7 +54,7 @@ public abstract class ListActionsConsumer /** * */ - public ListActionsConsumer() + public ListActionConsumer() { } @@ -248,7 +248,7 @@ else if (entityLiving instanceof EntityLiving) */ private void addHeldItem(AttributeMap map) { - List> items = AuxFunctions.getItemsWeighted(map.getList(ACTION_HELD_ITEM)); + List> items = AuxFunction.getItemsWeighted(map.getList(ACTION_HELD_ITEM)); if (items.isEmpty()) { @@ -282,7 +282,7 @@ private void addHeldItem(AttributeMap map) } else { - float total = AuxFunctions.getTotal(items); + float total = AuxFunction.getTotal(items); this.ACTIONS.add(event -> { @@ -290,7 +290,7 @@ private void addHeldItem(AttributeMap map) if (entityLiving != null) { - ItemStack item = AuxFunctions.getRandomItem(items, total); + ItemStack item = AuxFunction.getRandomItem(items, total); if (entityLiving instanceof EntityEnderman) { @@ -317,7 +317,7 @@ private void addHeldItem(AttributeMap map) */ private void addArmorItem(AttributeMap map, AttributeKey itemKey, EntityEquipmentSlot slot) { - List> items = AuxFunctions.getItemsWeighted(map.getList(itemKey)); + List> items = AuxFunction.getItemsWeighted(map.getList(itemKey)); if (items.isEmpty()) { @@ -340,7 +340,7 @@ private void addArmorItem(AttributeMap map, AttributeKey itemKey, Ent } else { - float total = AuxFunctions.getTotal(items); + float total = AuxFunction.getTotal(items); this.ACTIONS.add(event -> { @@ -348,7 +348,7 @@ private void addArmorItem(AttributeMap map, AttributeKey itemKey, Ent if (entityLiving != null) { - entityLiving.setItemStackToSlot(slot, AuxFunctions.getRandomItem(items, total)); + entityLiving.setItemStackToSlot(slot, AuxFunction.getRandomItem(items, total)); } }); } @@ -490,7 +490,7 @@ private void addCustomName(AttributeMap map) */ private void addPotionsAction(AttributeMap map) { - List effects = new ArrayList<>(); + List effects = new ArrayList<>(); for (String actionPotion : map.getList(ACTION_POTION)) { @@ -532,7 +532,7 @@ private void addPotionsAction(AttributeMap map) continue; } - effects.add(new AuxFunctions.PotionEffectWithChance(new PotionEffect(potion, duration, amplifier), chance)); + effects.add(new AuxFunction.PotionEffectWithChance(new PotionEffect(potion, duration, amplifier), chance)); } if (!effects.isEmpty()) @@ -543,7 +543,7 @@ private void addPotionsAction(AttributeMap map) if (living != null) { - for (AuxFunctions.PotionEffectWithChance effectWithChance : effects) + for (AuxFunction.PotionEffectWithChance effectWithChance : effects) { if (Math.random() <= effectWithChance.Chance) { @@ -563,7 +563,7 @@ private void addPotionsAction(AttributeMap map) */ private void addGiveAction(AttributeMap map) { - List> items = AuxFunctions.getItemsWeighted(map.getList(ACTION_GIVE)); + List> items = AuxFunction.getItemsWeighted(map.getList(ACTION_GIVE)); if (items.isEmpty()) { @@ -589,7 +589,7 @@ private void addGiveAction(AttributeMap map) } else { - float total = AuxFunctions.getTotal(items); + float total = AuxFunction.getTotal(items); this.ACTIONS.add(event -> { @@ -597,7 +597,7 @@ private void addGiveAction(AttributeMap map) if (player != null) { - ItemStack item = AuxFunctions.getRandomItem(items, total); + ItemStack item = AuxFunction.getRandomItem(items, total); if (!player.inventory.addItemStackToInventory(item.copy())) { @@ -614,7 +614,7 @@ private void addGiveAction(AttributeMap map) */ private void addDropAction(AttributeMap map) { - List> items = AuxFunctions.getItemsWeighted(map.getList(ACTION_DROP)); + List> items = AuxFunction.getItemsWeighted(map.getList(ACTION_DROP)); if (items.isEmpty()) { @@ -634,12 +634,12 @@ private void addDropAction(AttributeMap map) } else { - float total = AuxFunctions.getTotal(items); + float total = AuxFunction.getTotal(items); this.ACTIONS.add(event -> { BlockPos pos = event.getPosition(); - ItemStack item = AuxFunctions.getRandomItem(items, total); + ItemStack item = AuxFunction.getRandomItem(items, total); EntityItem entityItem = new EntityItem(event.getWorld(), pos.getX(), pos.getY(), pos.getZ(), item.copy()); event.getWorld().spawnEntity(entityItem); }); @@ -755,7 +755,7 @@ private void addDoDamageAction(AttributeMap map) { String damage = (String) map.get(ACTION_DAMAGE); String[] split = StringUtils.split(damage, "="); - DamageSource source = AuxFunctions.DamageMap.get(split[0]); + DamageSource source = AuxFunction.DamageMap.get(split[0]); if (source == null) { @@ -787,7 +787,7 @@ private void addSetBlockAction(AttributeMap map) if (map.has(BLOCK_OFFSET)) { posFunction = (Function) - AuxFunctions.parseOffset((String)map.get(BLOCK_OFFSET)); + AuxFunction.parseOffset((String)map.get(BLOCK_OFFSET)); } else { @@ -856,7 +856,7 @@ private void addSetBlockAction(AttributeMap map) { if (name.equals(key.getName())) { - state = AuxFunctions.set(state, key, value); + state = AuxFunction.set(state, key, value); } } } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionsConsumerMobTaskManager.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionConsumerMobTaskManager.java similarity index 98% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionsConsumerMobTaskManager.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionConsumerMobTaskManager.java index 427d73b..6d93bb4 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionsConsumerMobTaskManager.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionConsumerMobTaskManager.java @@ -18,13 +18,13 @@ import java.util.Set; import java.util.function.Consumer; -import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWords.MobTaskManager.*; +import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWord.MobTaskManager.*; /** * * @param */ -public abstract class ListActionsConsumerMobTaskManager +public abstract class ListActionConsumerMobTaskManager { /** * @@ -34,7 +34,7 @@ public abstract class ListActionsConsumerMobTaskManager map) { - if (map.has(MultipleKeyWords.CommonKeyWorlds.ACTION_RESULT)) + if (map.has(MultipleKeyWord.CommonKeyWorlds.ACTION_RESULT)) { - this.finalResult = map.get(MultipleKeyWords.CommonKeyWorlds.ACTION_RESULT); + this.finalResult = map.get(MultipleKeyWord.CommonKeyWorlds.ACTION_RESULT); } - if (SingleKeyWords.EVENT_RESULTS.SUPER.equals(this.finalResult)) + if (SingleKeyWord.EVENT_RESULTS.SUPER.equals(this.finalResult)) { this.result = Event.Result.DEFAULT; } - else if (SingleKeyWords.EVENT_RESULTS.TRUE.equals(this.finalResult)) + else if (SingleKeyWord.EVENT_RESULTS.TRUE.equals(this.finalResult)) { this.result = Event.Result.ALLOW; } - else if (SingleKeyWords.EVENT_RESULTS.FALSE.equals(this.finalResult)) + else if (SingleKeyWord.EVENT_RESULTS.FALSE.equals(this.finalResult)) { this.result = Event.Result.DENY; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockBreakActions.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockBreakAction.java similarity index 89% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockBreakActions.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockBreakAction.java index 0ff1376..da5eb20 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockBreakActions.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockBreakAction.java @@ -11,9 +11,9 @@ import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.Event; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionsBinary; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionsConsumer; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionsStaticFactoryBlocks; +import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionBinary; +import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionConsumer; +import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionStaticFactoryBlock; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.ResultEvents; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; @@ -24,7 +24,7 @@ /** * */ -public final class GenericBlockBreakActions extends ListActionsConsumer +public final class GenericBlockBreakAction extends ListActionConsumer { /** * @@ -39,7 +39,7 @@ public final class GenericBlockBreakActions extends ListActionsConsumer map) + private GenericBlockBreakAction(AttributeMap map) { super(); - Log.writeDataToLogFile(0, String.format("Iterator for [%s] number [%d]", GenericBlockBreakActions.class.getName(), countCreatedMaps++)); + Log.writeDataToLogFile(0, String.format("Iterator for [%s] number [%d]", GenericBlockBreakAction.class.getName(), countCreatedMaps++)); - this.RULE_EVALUATOR = new ListActionsBinary<>(map); + this.RULE_EVALUATOR = new ListActionBinary<>(map); this.addActions(map); @@ -82,7 +82,7 @@ private GenericBlockBreakActions(AttributeMap map) * @param element * @return */ - public static GenericBlockBreakActions parse(JsonElement element) + public static GenericBlockBreakAction parse(JsonElement element) { if (element == null) { @@ -90,9 +90,9 @@ public static GenericBlockBreakActions parse(JsonElement element) } else { - AttributeMap map = ListActionsStaticFactoryBlocks.FACTORY.parse(element); + AttributeMap map = ListActionStaticFactoryBlock.FACTORY.parse(element); - return new GenericBlockBreakActions(map); + return new GenericBlockBreakAction(map); } } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockPlaceActions.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockPlaceAction.java similarity index 90% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockPlaceActions.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockPlaceAction.java index 6b63b3c..070b2dc 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockPlaceActions.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockPlaceAction.java @@ -11,9 +11,9 @@ import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.Event; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionsBinary; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionsConsumer; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionsStaticFactoryBlocks; +import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionBinary; +import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionConsumer; +import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionStaticFactoryBlock; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.ResultEvents; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; @@ -24,7 +24,7 @@ /** * */ -public final class GenericBlockPlaceActions extends ListActionsConsumer +public final class GenericBlockPlaceAction extends ListActionConsumer { /** * @@ -39,7 +39,7 @@ public final class GenericBlockPlaceActions extends ListActionsConsumer map) + private GenericBlockPlaceAction(AttributeMap map) { super(); - Log.writeDataToLogFile(0, String.format("Iterator for [%s] number [%d]", GenericBlockPlaceActions.class.getName(), countCreatedMaps++)); + Log.writeDataToLogFile(0, String.format("Iterator for [%s] number [%d]", GenericBlockPlaceAction.class.getName(), countCreatedMaps++)); - this.RULE_EVALUATOR = new ListActionsBinary<>(map); + this.RULE_EVALUATOR = new ListActionBinary<>(map); this.addActions(map); @@ -83,7 +83,7 @@ private GenericBlockPlaceActions(AttributeMap map) * @param element * @return */ - public static GenericBlockPlaceActions parse(JsonElement element) + public static GenericBlockPlaceAction parse(JsonElement element) { if (element == null) { @@ -91,9 +91,9 @@ public static GenericBlockPlaceActions parse(JsonElement element) } else { - AttributeMap map = ListActionsStaticFactoryBlocks.FACTORY.parse(element); + AttributeMap map = ListActionStaticFactoryBlock.FACTORY.parse(element); - return new GenericBlockPlaceActions(map); + return new GenericBlockPlaceAction(map); } } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericDropLoot.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericDropLoot.java index 4e5a6e8..d380ffe 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericDropLoot.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericDropLoot.java @@ -26,13 +26,13 @@ import java.util.Random; import java.util.function.Function; -import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWords.CommonKeyWorlds.*; -import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWords.DroopLoot.*; +import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWord.CommonKeyWorlds.*; +import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWord.DroopLoot.*; /** * */ -public final class GenericDropLoot extends ListActionsConsumer +public final class GenericDropLoot extends ListActionConsumer { /** * @@ -47,7 +47,7 @@ public final class GenericDropLoot extends ListActionsConsumer /** * */ - private final ListActionsBinary RULE_EVALUATOR; + private final ListActionBinary RULE_EVALUATOR; /** * @@ -104,7 +104,7 @@ private GenericDropLoot(AttributeMap map) Log.writeDataToLogFile(0, String.format("Iterator for [%s] number [%d]", GenericDropLoot.class.getName(), countCreatedMaps++)); - this.RULE_EVALUATOR = new ListActionsBinary<>(map); + this.RULE_EVALUATOR = new ListActionBinary<>(map); this.addActions(map); @@ -113,14 +113,14 @@ private GenericDropLoot(AttributeMap map) this.addItem(map); } - if (map.has(MultipleKeyWords.DroopLoot.ACTION_REMOVE)) + if (map.has(MultipleKeyWord.DroopLoot.ACTION_REMOVE)) { this.removeItem(map); } - if (map.has(MultipleKeyWords.DroopLoot.ACTION_REMOVE_ALL)) + if (map.has(MultipleKeyWord.DroopLoot.ACTION_REMOVE_ALL)) { - this.removeAll = (Boolean) map.get(MultipleKeyWords.DroopLoot.ACTION_REMOVE_ALL); + this.removeAll = (Boolean) map.get(MultipleKeyWord.DroopLoot.ACTION_REMOVE_ALL); } } @@ -456,8 +456,8 @@ private static List>> getItems(List map) { - Object nbt = map.get(MultipleKeyWords.DroopLoot.ACTION_ITEM_NBT); - Object itemCount = map.get(MultipleKeyWords.DroopLoot.ACTION_ITEM_COUNT); + Object nbt = map.get(MultipleKeyWord.DroopLoot.ACTION_ITEM_NBT); + Object itemCount = map.get(MultipleKeyWord.DroopLoot.ACTION_ITEM_COUNT); this.TO_ADD_ITEMS.addAll(getItems(map.getList(ACTION_ITEM), (String)nbt, (String)itemCount)); } @@ -468,6 +468,6 @@ private void addItem(AttributeMap map) */ private void removeItem(AttributeMap map) { - this.TO_REMOVE_ITEMS.addAll(AuxFunctions.getItems((JsonElement)map.getList(MultipleKeyWords.DroopLoot.ACTION_REMOVE))); + this.TO_REMOVE_ITEMS.addAll(AuxFunction.getItems((JsonElement)map.getList(MultipleKeyWord.DroopLoot.ACTION_REMOVE))); } } \ No newline at end of file diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericExperience.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericExperience.java index 1c72105..56c400b 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericExperience.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericExperience.java @@ -17,12 +17,12 @@ import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataGetter; -import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWords.CommonKeyWorlds.*; +import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWord.CommonKeyWorlds.*; /** * */ -public final class GenericExperience extends ListActionsConsumer +public final class GenericExperience extends ListActionConsumer { /** * @@ -52,7 +52,7 @@ public final class GenericExperience extends ListActionsConsumer map, int xp, float multiXp, float addi Log.writeDataToLogFile(0, String.format("Iterator for [%s] number [%d]", GenericExperience.class.getName(), countCreatedMaps++)); - this.RULE_EVALUATOR = new ListActionsBinary<>(map); + this.RULE_EVALUATOR = new ListActionBinary<>(map); this.addActions(map); @@ -117,25 +117,25 @@ public static GenericExperience parse(JsonElement element) { AttributeMap map = FACTORY.parse(element); - int localSetXp = JsonServices.getValueFromJson( + int localSetXp = InlineJsonService.getValueFromJson( element.getAsJsonObject(), - SingleKeyWords.DROP_ALL_EXPERIENCE.SET_XP, + SingleKeyWord.DROP_ALL_EXPERIENCE.SET_XP, 0, (_element, defaultValue) -> _element.getAsJsonPrimitive().isNumber() ? _element.getAsInt() : defaultValue ); - float localMultiXp = JsonServices.getValueFromJson( + float localMultiXp = InlineJsonService.getValueFromJson( element.getAsJsonObject(), - SingleKeyWords.DROP_ALL_EXPERIENCE.MULTI_XP, + SingleKeyWord.DROP_ALL_EXPERIENCE.MULTI_XP, 0.f, (_element, defaultValue) -> _element.getAsJsonPrimitive().isNumber() ? _element.getAsFloat() : defaultValue ); - float localAddXp = JsonServices.getValueFromJson( + float localAddXp = InlineJsonService.getValueFromJson( element.getAsJsonObject(), - SingleKeyWords.DROP_ALL_EXPERIENCE.ADD_XP, + SingleKeyWord.DROP_ALL_EXPERIENCE.ADD_XP, 0.f, (_element, defaultValue) -> _element.getAsJsonPrimitive().isNumber() ? _element.getAsFloat() : defaultValue diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericLeftClickActions.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericLeftClickAction.java similarity index 90% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericLeftClickActions.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericLeftClickAction.java index dcf5ca7..ba1edd6 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericLeftClickActions.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericLeftClickAction.java @@ -11,9 +11,9 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.Event; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionsBinary; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionsConsumer; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionsStaticFactoryMouse; +import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionBinary; +import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionConsumer; +import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionStaticFactoryMouse; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.ResultEvents; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; @@ -24,7 +24,7 @@ /** * */ -public final class GenericLeftClickActions extends ListActionsConsumer +public final class GenericLeftClickAction extends ListActionConsumer { /** * @@ -39,7 +39,7 @@ public final class GenericLeftClickActions extends ListActionsConsumer map) + private GenericLeftClickAction(AttributeMap map) { super(); - Log.writeDataToLogFile(0, String.format("Iterator for [%s] number [%d]", GenericLeftClickActions.class.getName(), countCreatedMaps++)); + Log.writeDataToLogFile(0, String.format("Iterator for [%s] number [%d]", GenericLeftClickAction.class.getName(), countCreatedMaps++)); - this.RULE_EVALUATOR = new ListActionsBinary<>(map); + this.RULE_EVALUATOR = new ListActionBinary<>(map); this.addActions(map); @@ -82,7 +82,7 @@ private GenericLeftClickActions(AttributeMap map) * @param element * @return */ - public static GenericLeftClickActions parse(JsonElement element) + public static GenericLeftClickAction parse(JsonElement element) { if (element == null) { @@ -90,9 +90,9 @@ public static GenericLeftClickActions parse(JsonElement element) } else { - AttributeMap map = ListActionsStaticFactoryMouse.FACTORY.parse(element); + AttributeMap map = ListActionStaticFactoryMouse.FACTORY.parse(element); - return new GenericLeftClickActions(map); + return new GenericLeftClickAction(map); } } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMapEffectsActions.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMapEffectAction.java similarity index 92% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMapEffectsActions.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMapEffectAction.java index bc71a60..633da96 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMapEffectsActions.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMapEffectAction.java @@ -12,21 +12,21 @@ import org.imesense.dynamicspawncontrol.technical.attributefactory.Attribute; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMapFactory; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionsBinary; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionsConsumer; +import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionBinary; +import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionConsumer; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.customlibrary.SingleKeyWords; +import org.imesense.dynamicspawncontrol.technical.customlibrary.SingleKeyWord; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataGetter; import java.util.function.Consumer; -import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWords.CommonKeyWorlds.*; +import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWord.CommonKeyWorlds.*; /** * */ -public final class GenericMapEffectsActions extends ListActionsConsumer +public final class GenericMapEffectAction extends ListActionConsumer { /** * @@ -47,7 +47,7 @@ public final class GenericMapEffectsActions extends ListActionsConsumer map, int timeout) + private GenericMapEffectAction(AttributeMap map, int timeout) { super(); - Log.writeDataToLogFile(0, String.format("Iterator for [%s] number [%d]", GenericMapEffectsActions.class.getName(), countCreatedMaps++)); + Log.writeDataToLogFile(0, String.format("Iterator for [%s] number [%d]", GenericMapEffectAction.class.getName(), countCreatedMaps++)); - this.RULE_EVALUATOR = new ListActionsBinary<>(map); + this.RULE_EVALUATOR = new ListActionBinary<>(map); this.addActions(map); @@ -84,7 +84,7 @@ private GenericMapEffectsActions(AttributeMap map, int timeout) * @param element * @return */ - public static GenericMapEffectsActions parse(JsonElement element) + public static GenericMapEffectAction parse(JsonElement element) { if (element == null) { @@ -94,10 +94,10 @@ public static GenericMapEffectsActions parse(JsonElement element) { AttributeMap map = FACTORY.parse(element); - int localTimeOut = element.getAsJsonObject().has(SingleKeyWords.EVENT_EFFECTS.KEYWORD_TIMEOUT) - ? element.getAsJsonObject().get(SingleKeyWords.EVENT_EFFECTS.KEYWORD_TIMEOUT).getAsInt() : 20; + int localTimeOut = element.getAsJsonObject().has(SingleKeyWord.EVENT_EFFECTS.KEYWORD_TIMEOUT) + ? element.getAsJsonObject().get(SingleKeyWord.EVENT_EFFECTS.KEYWORD_TIMEOUT).getAsInt() : 20; - return new GenericMapEffectsActions(map, localTimeOut); + return new GenericMapEffectAction(map, localTimeOut); } } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMobTaskManager.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMobTaskManager.java index 6ccf49b..fef43fe 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMobTaskManager.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMobTaskManager.java @@ -12,21 +12,21 @@ import org.imesense.dynamicspawncontrol.technical.attributefactory.Attribute; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMapFactory; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionsBinary; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionsConsumerMobTaskManager; +import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionBinary; +import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionConsumerMobTaskManager; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataGetter; import java.util.function.Consumer; -import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWords.CommonKeyWorlds.*; -import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWords.MobTaskManager.*; +import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWord.CommonKeyWorlds.*; +import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWord.MobTaskManager.*; /** * */ -public final class GenericMobTaskManager extends ListActionsConsumerMobTaskManager +public final class GenericMobTaskManager extends ListActionConsumerMobTaskManager { /** * @@ -36,7 +36,7 @@ public final class GenericMobTaskManager extends ListActionsConsumerMobTaskManag /** * */ - private final ListActionsBinary RULE_EVALUATOR; + private final ListActionBinary RULE_EVALUATOR; /** * @@ -60,7 +60,7 @@ private GenericMobTaskManager(AttributeMap map) Log.writeDataToLogFile(0, String.format("Iterator for [%s] number [%d]", GenericMobTaskManager.class.getName(), countCreatedMaps++)); - this.RULE_EVALUATOR = new ListActionsBinary<>(map); + this.RULE_EVALUATOR = new ListActionBinary<>(map); this.addActions(map); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericPotentialSpawn.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericPotentialSpawn.java index f7fb121..5a7d3c0 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericPotentialSpawn.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericPotentialSpawn.java @@ -17,7 +17,7 @@ import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fml.common.registry.EntityEntry; import net.minecraftforge.fml.common.registry.ForgeRegistries; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.attributefactory.Attribute; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMapFactory; @@ -29,13 +29,13 @@ import java.util.HashMap; import java.util.List; -import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWords.CommonKeyWorlds.*; -import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWords.PotentialSpawn.*; +import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWord.CommonKeyWorlds.*; +import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWord.PotentialSpawn.*; /** * */ -public final class GenericPotentialSpawn extends ListActionsConsumer +public final class GenericPotentialSpawn extends ListActionConsumer { /** * @@ -45,7 +45,7 @@ public final class GenericPotentialSpawn extends ListActionsConsumer map) Log.writeDataToLogFile(0, String.format("Iterator for [%s] number [%d]", GenericPotentialSpawn.class.getName(), countCreatedMaps++)); - this.RULE_EVALUATOR = new ListActionsBinary<>(map); + this.RULE_EVALUATOR = new ListActionBinary<>(map); for (AttributeMap mobMap : map.getListA(MOB_STRUCT)) { @@ -146,12 +146,12 @@ private GenericPotentialSpawn(AttributeMap map) throw new RuntimeException(); } - int weight = CodeGenericUtils.checkParameter(mobMap, MOB_WEIGHT, 1, 100, "frequency"); - int groupCountMin = CodeGenericUtils.checkParameter(mobMap, MOB_GROUP_COUNT_MIN, 1, 10, "group_count_min"); - int groupCountMax = CodeGenericUtils.checkParameter(mobMap, MOB_GROUP_COUNT_MAX, 1, 20, "group_count_max"); - float spawnChance = CodeGenericUtils.checkParameter(mobMap, MOB_SPAWN_CHANCE, 0.01f, 1.0f, "spawnChanceValue"); - int maxHeight = CodeGenericUtils.checkParameter(mobMap, MOB_MAX_HEIGHT, 5, 255, "max_height"); - int minHeight = CodeGenericUtils.checkParameter(mobMap, MOB_MIN_HEIGHT, 5, 255, "min_height"); + int weight = CodeGenericUtil.checkParameter(mobMap, MOB_WEIGHT, 1, 100, "frequency"); + int groupCountMin = CodeGenericUtil.checkParameter(mobMap, MOB_GROUP_COUNT_MIN, 1, 10, "group_count_min"); + int groupCountMax = CodeGenericUtil.checkParameter(mobMap, MOB_GROUP_COUNT_MAX, 1, 20, "group_count_max"); + float spawnChance = CodeGenericUtil.checkParameter(mobMap, MOB_SPAWN_CHANCE, 0.01f, 1.0f, "spawnChanceValue"); + int maxHeight = CodeGenericUtil.checkParameter(mobMap, MOB_MAX_HEIGHT, 5, 255, "max_height"); + int minHeight = CodeGenericUtil.checkParameter(mobMap, MOB_MIN_HEIGHT, 5, 255, "min_height"); Biome.SpawnListEntry entry = new Biome.SpawnListEntry((Class) typeClass, weight, groupCountMin, groupCountMax); @@ -316,7 +316,7 @@ public static GenericPotentialSpawn parse(JsonElement element) { JsonObject jsonObject = element.getAsJsonObject(); - if (!jsonObject.has(SingleKeyWords.MAIN_POTENTIAL_SPAWN.MAIN_STRUCT)) + if (!jsonObject.has(SingleKeyWord.MAIN_POTENTIAL_SPAWN.MAIN_STRUCT)) { Log.writeDataToLogFile(0, "Not found 'struct' for rule [ { ... } ]"); throw new RuntimeException(); @@ -324,14 +324,14 @@ public static GenericPotentialSpawn parse(JsonElement element) AttributeMap map = FACTORY.parse(element); - JsonArray mobs = jsonObject.getAsJsonArray(SingleKeyWords.MAIN_POTENTIAL_SPAWN.MAIN_STRUCT); + JsonArray mobs = jsonObject.getAsJsonArray(SingleKeyWord.MAIN_POTENTIAL_SPAWN.MAIN_STRUCT); if (mobs != null) { for (JsonElement mob : mobs) { AttributeMap mobMap = FACTORY.parse(mob); - map.addList(MultipleKeyWords.PotentialSpawn.MOB_STRUCT, mobMap); + map.addList(MultipleKeyWord.PotentialSpawn.MOB_STRUCT, mobMap); } } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericRightClickActions.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericRightClickAction.java similarity index 90% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericRightClickActions.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericRightClickAction.java index b6c5e3b..c8d4841 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericRightClickActions.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericRightClickAction.java @@ -11,9 +11,9 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.Event; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionsBinary; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionsConsumer; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionsStaticFactoryMouse; +import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionBinary; +import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionConsumer; +import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionStaticFactoryMouse; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.ResultEvents; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; @@ -24,7 +24,7 @@ /** * */ -public final class GenericRightClickActions extends ListActionsConsumer +public final class GenericRightClickAction extends ListActionConsumer { /** * @@ -39,7 +39,7 @@ public final class GenericRightClickActions extends ListActionsConsumer map) + private GenericRightClickAction(AttributeMap map) { super(); - Log.writeDataToLogFile(0, String.format("Iterator for [%s] number [%d]", GenericRightClickActions.class.getName(), countCreatedMaps++)); + Log.writeDataToLogFile(0, String.format("Iterator for [%s] number [%d]", GenericRightClickAction.class.getName(), countCreatedMaps++)); - this.RULE_EVALUATOR = new ListActionsBinary<>(map); + this.RULE_EVALUATOR = new ListActionBinary<>(map); this.addActions(map); @@ -82,7 +82,7 @@ private GenericRightClickActions(AttributeMap map) * @param element * @return */ - public static GenericRightClickActions parse(JsonElement element) + public static GenericRightClickAction parse(JsonElement element) { if (element == null) { @@ -90,9 +90,9 @@ public static GenericRightClickActions parse(JsonElement element) } else { - AttributeMap map = ListActionsStaticFactoryMouse.FACTORY.parse(element); + AttributeMap map = ListActionStaticFactoryMouse.FACTORY.parse(element); - return new GenericRightClickActions(map); + return new GenericRightClickAction(map); } } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericSpawnConditions.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericSpawnCondition.java similarity index 94% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericSpawnConditions.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericSpawnCondition.java index 4788167..f53bf34 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericSpawnConditions.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericSpawnCondition.java @@ -12,21 +12,21 @@ import org.imesense.dynamicspawncontrol.technical.attributefactory.Attribute; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMapFactory; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionsBinary; -import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionsConsumer; +import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionBinary; +import org.imesense.dynamicspawncontrol.technical.customlibrary.ListActionConsumer; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataGetter; import java.util.function.Consumer; -import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWords.CommonKeyWorlds.*; -import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWords.SpawnCondition.*; +import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWord.CommonKeyWorlds.*; +import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWord.SpawnCondition.*; /** * */ -public final class GenericSpawnConditions extends ListActionsConsumer +public final class GenericSpawnCondition extends ListActionConsumer { /** * @@ -36,7 +36,7 @@ public final class GenericSpawnConditions extends ListActionsConsumer map) + private GenericSpawnCondition(AttributeMap map) { super(); - Log.writeDataToLogFile(0, String.format("Iterator for [%s] number [%d]", GenericSpawnConditions.class.getName(), countCreatedMaps++)); + Log.writeDataToLogFile(0, String.format("Iterator for [%s] number [%d]", GenericSpawnCondition.class.getName(), countCreatedMaps++)); - this.RULE_EVALUATOR = new ListActionsBinary<>(map); + this.RULE_EVALUATOR = new ListActionBinary<>(map); this.addActions(map); } @@ -70,7 +70,7 @@ private GenericSpawnConditions(AttributeMap map) * @param element * @return */ - public static GenericSpawnConditions parse(JsonElement element) + public static GenericSpawnCondition parse(JsonElement element) { if (element == null) { @@ -80,7 +80,7 @@ public static GenericSpawnConditions parse(JsonElement element) { AttributeMap map = FACTORY.parse(element); - return new GenericSpawnConditions(map); + return new GenericSpawnCondition(map); } } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnComplexityBiomes.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnComplexityBiomes.java index 9efc720..c9a3633 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnComplexityBiomes.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnComplexityBiomes.java @@ -7,10 +7,9 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import static net.minecraft.client.gui.Gui.*; @@ -68,7 +67,7 @@ public final class OnComplexityBiomes */ public OnComplexityBiomes() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropSkeletonItems.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropSkeletonItem.java similarity index 95% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropSkeletonItems.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropSkeletonItem.java index cd25090..01b8233 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropSkeletonItems.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropSkeletonItem.java @@ -7,10 +7,9 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.skeletondropitem.DataSkeletonDropItem; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; @@ -21,7 +20,7 @@ * */ @Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) -public final class OnDropSkeletonItems +public final class OnDropSkeletonItem { /** * @@ -31,9 +30,9 @@ public final class OnDropSkeletonItems /** * */ - public OnDropSkeletonItems() + public OnDropSkeletonItem() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropZombieItems.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropZombieItem.java similarity index 93% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropZombieItems.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropZombieItem.java index c607802..7bf8640 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropZombieItems.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropZombieItem.java @@ -7,10 +7,9 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.zombiedropitem.DataZombieDropItem; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; @@ -21,7 +20,7 @@ * */ @Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) -public final class OnDropZombieItems +public final class OnDropZombieItem { /** * @@ -31,9 +30,9 @@ public final class OnDropZombieItems /** * */ - public OnDropZombieItems() + public OnDropZombieItem() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnPlayerEvents.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnPlayerEvent.java similarity index 94% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnPlayerEvents.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnPlayerEvent.java index 6e28150..29c3e19 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnPlayerEvents.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnPlayerEvent.java @@ -9,12 +9,11 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent; import net.minecraftforge.fml.common.network.FMLNetworkEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.player.DataPlayer; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; @@ -25,7 +24,7 @@ * */ @Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) -public final class OnPlayerEvents +public final class OnPlayerEvent { /** * @@ -40,9 +39,9 @@ public final class OnPlayerEvents /** * */ - public OnPlayerEvents() + public OnPlayerEvent() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnUpdateTimeWorld.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnUpdateTimeWorld.java index 121fb1d..e00eb25 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnUpdateTimeWorld.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnUpdateTimeWorld.java @@ -16,12 +16,12 @@ import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.relauncher.Side; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.gameplay.gameworld.WorldTime; import org.imesense.dynamicspawncontrol.technical.config.gameworldtime.DataPluginWorldTime; -import org.imesense.dynamicspawncontrol.technical.handlers.ITimeHandler; -import org.imesense.dynamicspawncontrol.technical.handlers.TimeHandlerClient; -import org.imesense.dynamicspawncontrol.technical.handlers.TimeHandlerServer; +import org.imesense.dynamicspawncontrol.technical.handler.ITimeHandler; +import org.imesense.dynamicspawncontrol.technical.handler.TimeHandlerClient; +import org.imesense.dynamicspawncontrol.technical.handler.TimeHandlerServer; import org.imesense.dynamicspawncontrol.technical.network.MessageHandler; import org.imesense.dynamicspawncontrol.technical.network.PacketGameRule; @@ -51,7 +51,7 @@ public final class OnUpdateTimeWorld */ private OnUpdateTimeWorld() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnWindowTitle.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnWindowTitle.java index 7d3361e..2c6c61f 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnWindowTitle.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnWindowTitle.java @@ -3,11 +3,10 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.windowtitle.DataWindowTitle; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.lwjgl.opengl.Display; @@ -31,7 +30,7 @@ public final class OnWindowTitle */ public OnWindowTitle() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnBlockBreakEvent.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnBlockBreakEvent.java index 19b51a5..5ea7eae 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnBlockBreakEvent.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnBlockBreakEvent.java @@ -5,15 +5,14 @@ import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.Event; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.gamedebugger.DataGameDebugger; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericBlockBreakActions; -import org.imesense.dynamicspawncontrol.technical.parsers.ParserGenericJsonScripts; +import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericBlockBreakAction; +import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; /** * @@ -31,7 +30,7 @@ public final class OnBlockBreakEvent */ public OnBlockBreakEvent() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -56,7 +55,7 @@ public synchronized void onUpdateBlockBreakEvent_0(BlockEvent.BreakEvent event) AtomicInteger i = new AtomicInteger(); - for (GenericBlockBreakActions rule : ParserGenericJsonScripts.GENERIC_BLOCK_BREAK_ACTIONS_LIST) + for (GenericBlockBreakAction rule : ParserGenericJsonScript.GENERIC_BLOCK_BREAK_ACTIONS_LIST) { if (rule.match(event)) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnBlockPlaceEvent.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnBlockPlaceEvent.java index d35c618..d07fd69 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnBlockPlaceEvent.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnBlockPlaceEvent.java @@ -5,15 +5,14 @@ import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.Event; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.gamedebugger.DataGameDebugger; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericBlockPlaceActions; -import org.imesense.dynamicspawncontrol.technical.parsers.ParserGenericJsonScripts; +import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericBlockPlaceAction; +import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; /** * @@ -31,7 +30,7 @@ public final class OnBlockPlaceEvent */ public OnBlockPlaceEvent() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -57,7 +56,7 @@ public synchronized void onUpdateBlockPaceEvent_0(BlockEvent.PlaceEvent event) AtomicInteger i = new AtomicInteger(); - for (GenericBlockPlaceActions rule : ParserGenericJsonScripts.GENERIC_BLOCK_PLACE_ACTIONS_LIST) + for (GenericBlockPlaceAction rule : ParserGenericJsonScript.GENERIC_BLOCK_PLACE_ACTIONS_LIST) { if (rule.match(event)) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnEntitySpawnEvent.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnEntitySpawnEvent.java index bd51c6e..17ea9f4 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnEntitySpawnEvent.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnEntitySpawnEvent.java @@ -5,14 +5,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.gamedebugger.DataGameDebugger; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericSpawnConditions; -import org.imesense.dynamicspawncontrol.technical.parsers.ParserGenericJsonScripts; +import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericSpawnCondition; +import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; /** * @@ -30,7 +29,7 @@ public final class OnEntitySpawnEvent */ public OnEntitySpawnEvent() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -55,7 +54,7 @@ public synchronized void onUpdateEntitySpawnEvent_0(LivingSpawnEvent.CheckSpawn AtomicInteger i = new AtomicInteger(); - for (GenericSpawnConditions rule : ParserGenericJsonScripts.GENERIC_SPAWN_CONDITIONS_LIST) + for (GenericSpawnCondition rule : ParserGenericJsonScript.GENERIC_SPAWN_CONDITIONS_LIST) { if (rule.match(event)) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnLeftClickEvent.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnLeftClickEvent.java index 1a45a07..4fd7854 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnLeftClickEvent.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnLeftClickEvent.java @@ -4,15 +4,14 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.Event; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.gamedebugger.DataGameDebugger; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericLeftClickActions; -import org.imesense.dynamicspawncontrol.technical.parsers.ParserGenericJsonScripts; +import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericLeftClickAction; +import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; /** * @@ -30,7 +29,7 @@ public final class OnLeftClickEvent */ public OnLeftClickEvent() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -55,7 +54,7 @@ public synchronized void onUpdateLeftClickEvent_0(PlayerInteractEvent.LeftClickB AtomicInteger i = new AtomicInteger(); - for (GenericLeftClickActions rule : ParserGenericJsonScripts.GENERIC_LEFT_CLICK_ACTIONS_LIST) + for (GenericLeftClickAction rule : ParserGenericJsonScript.GENERIC_LEFT_CLICK_ACTIONS_LIST) { if (rule.match(event)) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnLivingDrops.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnLivingDrop.java similarity index 90% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnLivingDrops.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnLivingDrop.java index b8b6375..7e23a2a 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnLivingDrops.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnLivingDrop.java @@ -11,20 +11,19 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.entity.item.EntityItem; import net.minecraftforge.event.entity.living.LivingDropsEvent; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.gamedebugger.DataGameDebugger; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericDropLoot; -import org.imesense.dynamicspawncontrol.technical.parsers.ParserGenericJsonScripts; +import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; /** * */ @Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) -public final class OnLivingDrops +public final class OnLivingDrop { /** * @@ -34,9 +33,9 @@ public final class OnLivingDrops /** * */ - public OnLivingDrops() + public OnLivingDrop() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -56,7 +55,7 @@ public synchronized void onUpdateLivingDrops_0(LivingDropsEvent event) { AtomicInteger i = new AtomicInteger(); - for (GenericDropLoot rule : ParserGenericJsonScripts.GENERIC_DROP_LOOT_LIST) + for (GenericDropLoot rule : ParserGenericJsonScript.GENERIC_DROP_LOOT_LIST) { if (rule.match(event)) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnLivingExperienceDrop.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnLivingExperienceDrop.java index 04a9994..5d512e5 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnLivingExperienceDrop.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnLivingExperienceDrop.java @@ -4,15 +4,14 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.Event; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.event.entity.living.LivingExperienceDropEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.gamedebugger.DataGameDebugger; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericExperience; -import org.imesense.dynamicspawncontrol.technical.parsers.ParserGenericJsonScripts; +import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; /** * @@ -30,7 +29,7 @@ public final class OnLivingExperienceDrop */ public OnLivingExperienceDrop() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -50,7 +49,7 @@ public synchronized void onUpdateLivingExperienceDrop_0(LivingExperienceDropEven { AtomicInteger i = new AtomicInteger(); - for (GenericExperience rule : ParserGenericJsonScripts.GENERIC_EXPERIENCE_LIST) + for (GenericExperience rule : ParserGenericJsonScript.GENERIC_EXPERIENCE_LIST) { if (rule.match(event)) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnMobTaskManager.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnMobTaskManager.java index 2f48e91..c6915c9 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnMobTaskManager.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnMobTaskManager.java @@ -5,13 +5,12 @@ import net.minecraft.entity.EntityLiving; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericMobTaskManager; -import org.imesense.dynamicspawncontrol.technical.parsers.ParserGenericJsonScripts; +import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; /** * @@ -29,7 +28,7 @@ public final class OnMobTaskManager */ public OnMobTaskManager() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -54,7 +53,7 @@ public synchronized void onUpdateEntityJoinWorld_0(EntityJoinWorldEvent event) AtomicInteger i = new AtomicInteger(); - for (GenericMobTaskManager rule : ParserGenericJsonScripts.GENERIC_MOBS_TASK_MANAGER_LIST) + for (GenericMobTaskManager rule : ParserGenericJsonScript.GENERIC_MOBS_TASK_MANAGER_LIST) { if (rule.match(event)) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnPlayerTick.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnPlayerTick.java index a292813..1ce4714 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnPlayerTick.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnPlayerTick.java @@ -6,14 +6,13 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.common.gameevent.TickEvent; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.gamedebugger.DataGameDebugger; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericMapEffectsActions; -import org.imesense.dynamicspawncontrol.technical.parsers.ParserGenericJsonScripts; +import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericMapEffectAction; +import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; /** * @@ -31,7 +30,7 @@ public final class OnPlayerTick */ public OnPlayerTick() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** @@ -55,7 +54,7 @@ public synchronized void onUpdatePlayerTick_0(TickEvent.PlayerTickEvent event) AtomicInteger i = new AtomicInteger(); - for (GenericMapEffectsActions rule : ParserGenericJsonScripts.GENERIC_MAP_EFFECTS_ACTIONS_LIST) + for (GenericMapEffectAction rule : ParserGenericJsonScript.GENERIC_MAP_EFFECTS_ACTIONS_LIST) { if (tickCounter % rule.getTimeout() == 0 && rule.match(event)) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnPotentialSpawn.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnPotentialSpawn.java index e98f711..be993e7 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnPotentialSpawn.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnPotentialSpawn.java @@ -8,14 +8,13 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.gamedebugger.DataGameDebugger; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericPotentialSpawn; -import org.imesense.dynamicspawncontrol.technical.parsers.ParserGenericJsonScripts; +import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; import org.imesense.dynamicspawncontrol.technical.worldcache.Cache; import org.imesense.dynamicspawncontrol.technical.worldcache.CacheStorage; @@ -35,7 +34,7 @@ public final class OnPotentialSpawn */ public OnPotentialSpawn() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) @@ -61,7 +60,7 @@ public synchronized void onUpdatePotentialSpawns_0(WorldEvent.PotentialSpawns ev AtomicInteger i = new AtomicInteger(); - for (GenericPotentialSpawn rule : ParserGenericJsonScripts.GENERIC_POTENTIAL_SPAWN_LIST) + for (GenericPotentialSpawn rule : ParserGenericJsonScript.GENERIC_POTENTIAL_SPAWN_LIST) { if (rule.match(event)) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnRightClickEvent.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnRightClickEvent.java index 26d2678..b581044 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnRightClickEvent.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnRightClickEvent.java @@ -4,15 +4,14 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.Event; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.gamedebugger.DataGameDebugger; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericRightClickActions; -import org.imesense.dynamicspawncontrol.technical.parsers.ParserGenericJsonScripts; +import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericRightClickAction; +import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; /** * @@ -30,7 +29,7 @@ public final class OnRightClickEvent */ public OnRightClickEvent() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -55,7 +54,7 @@ public synchronized void onUpdateRightClickEvent_0(PlayerInteractEvent.RightClic AtomicInteger i = new AtomicInteger(); - for (GenericRightClickActions rule : ParserGenericJsonScripts.GENERIC_RIGHT_CLICK_ACTIONS_LIST) + for (GenericRightClickAction rule : ParserGenericJsonScript.GENERIC_RIGHT_CLICK_ACTIONS_LIST) { if (rule.match(event)) { 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 ae32579..f2ee834 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 @@ -5,12 +5,11 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.parsers.GeneralStorageData; +import org.imesense.dynamicspawncontrol.technical.parser.GeneralStorageData; import java.util.List; @@ -30,7 +29,7 @@ public final class OnSingleJsonCheckSpawn */ public OnSingleJsonCheckSpawn() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { 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 7495e16..2e90bc4 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 @@ -11,12 +11,11 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.parsers.GeneralStorageData; +import org.imesense.dynamicspawncontrol.technical.parser.GeneralStorageData; import java.util.*; @@ -46,7 +45,7 @@ public final class OnSingleZombieSummonAID */ public OnSingleZombieSummonAID() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/gamestructures/Structures.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/gamestructure/Structure.java similarity index 96% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/gamestructures/Structures.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/gamestructure/Structure.java index 8eb153d..4b882e0 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/gamestructures/Structures.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/gamestructure/Structure.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.technical.gamestructures; +package org.imesense.dynamicspawncontrol.technical.gamestructure; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; @@ -15,12 +15,12 @@ /** * */ -public final class Structures +public final class Structure { /** * */ - public static final Structures STRUCTURES_CACHE = new Structures(); + public static final Structure STRUCTURES_CACHE = new Structure(); /** * diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/gamestructures/StructureEntry.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/gamestructure/StructureEntry.java similarity index 99% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/gamestructures/StructureEntry.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/gamestructure/StructureEntry.java index 2ef0c93..a82d3f7 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/gamestructures/StructureEntry.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/gamestructure/StructureEntry.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.technical.gamestructures; +package org.imesense.dynamicspawncontrol.technical.gamestructure; import javax.annotation.Nonnull; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handlers/ITimeHandler.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handler/ITimeHandler.java similarity index 81% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handlers/ITimeHandler.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handler/ITimeHandler.java index 0dbaa4b..d47c007 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handlers/ITimeHandler.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handler/ITimeHandler.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.technical.handlers; +package org.imesense.dynamicspawncontrol.technical.handler; import net.minecraft.world.World; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ObjectHandler.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handler/ObjectHandlerClient.java similarity index 74% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ObjectHandler.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handler/ObjectHandlerClient.java index f0b0777..4bd59a2 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ObjectHandler.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handler/ObjectHandlerClient.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.technical.customlibrary; +package org.imesense.dynamicspawncontrol.technical.handler; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderSnowball; @@ -18,16 +18,16 @@ import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.registries.IForgeRegistry; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.gameplay.throwingobjects.DSCThrowItemWeb; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; -import org.imesense.dynamicspawncontrol.gameplay.items.DSCWeb; -import org.imesense.dynamicspawncontrol.technical.customlibrary.registrationhelpers.RegistrationHelpers; +import org.imesense.dynamicspawncontrol.gameplay.throwingobject.DSCThrowItemWeb; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.gameplay.item.DSCWeb; +import org.imesense.dynamicspawncontrol.technical.customlibrary.registrationhelper.RegistrationHelper; /** * */ @GameRegistry.ObjectHolder(ProjectStructure.STRUCT_INFO_MOD.MOD_ID) -public final class ObjectHandler +public final class ObjectHandlerClient { /** * @@ -58,14 +58,14 @@ public final class ObjectHandler * */ @Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) - public static class RegistrationHandler extends RegistrationHelpers + public static class RegistrationHandler extends RegistrationHelper { /** * */ public RegistrationHandler() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** @@ -76,7 +76,7 @@ public RegistrationHandler() public static void registerItems(Register event) { IForgeRegistry registry = event.getRegistry(); - ObjectHandler.webbing = regHelper(registry, new DSCWeb()); + ObjectHandlerClient.webbing = regHelper(registry, new DSCWeb()); } /** @@ -87,10 +87,10 @@ public static void registerItems(Register event) @SideOnly(Side.CLIENT) public static void registerRenders(ModelRegistryEvent event) { - registerRender(ObjectHandler.webbing); + registerRender(ObjectHandlerClient.webbing); RenderingRegistry.registerEntityRenderingHandler(DSCThrowItemWeb.class, (manager) -> - new RenderSnowball<>(manager, ObjectHandler.webbing, Minecraft.getMinecraft().getRenderItem())); + new RenderSnowball<>(manager, ObjectHandlerClient.webbing, Minecraft.getMinecraft().getRenderItem())); } /** @@ -112,7 +112,7 @@ protected static void registerEntity(IForgeRegistry registry) EntityEntry entry = EntityEntryBuilder.create().entity(DSCThrowItemWeb.class).id( new ResourceLocation("dynamicspawncontrol", "webbing"), - ObjectHandler.entityID++).name("webbing").tracker(64, 10, true).build(); + ObjectHandlerClient.entityID++).name("webbing").tracker(64, 10, true).build(); registry.register(entry); } @@ -124,9 +124,9 @@ protected static void registerEntity(IForgeRegistry registry) @SubscribeEvent public static void soundRegistration(Register event) { - ObjectHandler.WEBBING_SHOOT = SoundEvents.ENTITY_SNOWBALL_THROW; - ObjectHandler.WEBBING_STICK = SoundEvents.BLOCK_SNOW_HIT; - ObjectHandler.WEBBING_NONSTICK = SoundEvents.BLOCK_SNOW_BREAK; + ObjectHandlerClient.WEBBING_SHOOT = SoundEvents.ENTITY_SNOWBALL_THROW; + ObjectHandlerClient.WEBBING_STICK = SoundEvents.BLOCK_SNOW_HIT; + ObjectHandlerClient.WEBBING_NONSTICK = SoundEvents.BLOCK_SNOW_BREAK; } } } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handlers/TimeHandlerClient.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handler/TimeHandlerClient.java similarity index 92% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handlers/TimeHandlerClient.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handler/TimeHandlerClient.java index ec48946..af0bc2e 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handlers/TimeHandlerClient.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handler/TimeHandlerClient.java @@ -1,10 +1,7 @@ -package org.imesense.dynamicspawncontrol.technical.handlers; +package org.imesense.dynamicspawncontrol.technical.handler; import net.minecraft.world.World; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; - import org.imesense.dynamicspawncontrol.gameplay.gameworld.WorldTime; import org.imesense.dynamicspawncontrol.technical.config.gameworldtime.DataPluginWorldTime; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handlers/TimeHandlerServer.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handler/TimeHandlerServer.java similarity index 97% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handlers/TimeHandlerServer.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handler/TimeHandlerServer.java index 934d924..6c1778a 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handlers/TimeHandlerServer.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handler/TimeHandlerServer.java @@ -1,12 +1,9 @@ -package org.imesense.dynamicspawncontrol.technical.handlers; +package org.imesense.dynamicspawncontrol.technical.handler; import java.util.Calendar; import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; - import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.fml.relauncher.ReflectionHelper; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/network/PacketGameRule.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/network/PacketGameRule.java index dd90002..781698e 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/network/PacketGameRule.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/network/PacketGameRule.java @@ -6,7 +6,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import org.apache.logging.log4j.LogManager; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.gameworldtime.DataPluginWorldTime; /** @@ -24,7 +24,7 @@ public final class PacketGameRule implements IMessage */ public PacketGameRule() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/network/PlayerInWebMessage.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/network/PlayerInWebMessage.java index 89a45d4..f33b2da 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/network/PlayerInWebMessage.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/network/PlayerInWebMessage.java @@ -9,7 +9,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; import net.minecraftforge.fml.relauncher.Side; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; /** * @@ -26,7 +26,7 @@ public final class PlayerInWebMessage implements IMessage */ public PlayerInWebMessage() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** 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/parser/GeneralStorageData.java similarity index 81% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/GeneralStorageData.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/GeneralStorageData.java index b2dc2e2..04298fc 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/parser/GeneralStorageData.java @@ -1,7 +1,6 @@ -package org.imesense.dynamicspawncontrol.technical.parsers; +package org.imesense.dynamicspawncontrol.technical.parser; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; -import org.imesense.dynamicspawncontrol.technical.parsers.beta.ParserSingleZombieSummonAID; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import java.util.List; @@ -20,7 +19,7 @@ public final class GeneralStorageData */ public GeneralStorageData() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); instance = this; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/IBetaParsers.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/IBetaParser.java similarity index 90% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/IBetaParsers.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/IBetaParser.java index 7c22a5d..dc985ec 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/IBetaParsers.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/IBetaParser.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.technical.parsers; +package org.imesense.dynamicspawncontrol.technical.parser; import org.imesense.dynamicspawncontrol.DynamicSpawnControl; import org.imesense.dynamicspawncontrol.ProjectStructure; @@ -8,7 +8,7 @@ /** * */ -public interface IBetaParsers +public interface IBetaParser { /** * diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/ParserGenericJsonScripts.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/ParserGenericJsonScript.java similarity index 70% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/ParserGenericJsonScripts.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/ParserGenericJsonScript.java index a5b354e..e86300f 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/ParserGenericJsonScripts.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/ParserGenericJsonScript.java @@ -1,10 +1,9 @@ -package org.imesense.dynamicspawncontrol.technical.parsers; +package org.imesense.dynamicspawncontrol.technical.parser; import com.google.gson.JsonElement; import com.google.gson.JsonParser; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.DynamicSpawnControl; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.*; @@ -17,7 +16,7 @@ /** * */ -public final class ParserGenericJsonScripts +public final class ParserGenericJsonScript { /** * @@ -42,12 +41,12 @@ public final class ParserGenericJsonScripts /** * */ - public final static List GENERIC_SPAWN_CONDITIONS_LIST = new ArrayList<>(); + public final static List GENERIC_SPAWN_CONDITIONS_LIST = new ArrayList<>(); /** * */ - public final static List GENERIC_LEFT_CLICK_ACTIONS_LIST = new ArrayList<>(); + public final static List GENERIC_LEFT_CLICK_ACTIONS_LIST = new ArrayList<>(); /** * @@ -57,22 +56,22 @@ public final class ParserGenericJsonScripts /** * */ - public final static List GENERIC_BLOCK_PLACE_ACTIONS_LIST = new ArrayList<>(); + public final static List GENERIC_BLOCK_PLACE_ACTIONS_LIST = new ArrayList<>(); /** * */ - public final static List GENERIC_BLOCK_BREAK_ACTIONS_LIST = new ArrayList<>(); + public final static List GENERIC_BLOCK_BREAK_ACTIONS_LIST = new ArrayList<>(); /** * */ - public final static List GENERIC_MAP_EFFECTS_ACTIONS_LIST = new ArrayList<>(); + public final static List GENERIC_MAP_EFFECTS_ACTIONS_LIST = new ArrayList<>(); /** * */ - public final static List GENERIC_RIGHT_CLICK_ACTIONS_LIST = new ArrayList<>(); + public final static List GENERIC_RIGHT_CLICK_ACTIONS_LIST = new ArrayList<>(); /** * @@ -122,44 +121,44 @@ public static void readRules() private static void readAllRules() { // - CodeGenericUtils.readAndLogRules(path, "DropAllItems" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + CodeGenericUtil.readAndLogRules(path, "DropAllItems" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, GenericDropLoot::parse, GENERIC_DROP_LOOT_LIST, ARRAY_TYPE_SCRIPT[0]); // - CodeGenericUtils.readAndLogRules(path, "DropAllExperience" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + CodeGenericUtil.readAndLogRules(path, "DropAllExperience" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, GenericExperience::parse, GENERIC_EXPERIENCE_LIST, ARRAY_TYPE_SCRIPT[0]); // - CodeGenericUtils.readAndLogRules(path, "MainPotentialSpawn" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + CodeGenericUtil.readAndLogRules(path, "MainPotentialSpawn" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, GenericPotentialSpawn::parse, GENERIC_POTENTIAL_SPAWN_LIST, ARRAY_TYPE_SCRIPT[4]); // - CodeGenericUtils.readAndLogRules(path, "SpawnConditions" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, - GenericSpawnConditions::parse, GENERIC_SPAWN_CONDITIONS_LIST, ARRAY_TYPE_SCRIPT[4]); + CodeGenericUtil.readAndLogRules(path, "SpawnConditions" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + GenericSpawnCondition::parse, GENERIC_SPAWN_CONDITIONS_LIST, ARRAY_TYPE_SCRIPT[4]); // - CodeGenericUtils.readAndLogRules(path, "MobTaskManager" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + CodeGenericUtil.readAndLogRules(path, "MobTaskManager" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, GenericMobTaskManager::parse, GENERIC_MOBS_TASK_MANAGER_LIST, ARRAY_TYPE_SCRIPT[4]); // - CodeGenericUtils.readAndLogRules(path, "EventEffects" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, - GenericMapEffectsActions::parse, GENERIC_MAP_EFFECTS_ACTIONS_LIST, ARRAY_TYPE_SCRIPT[2]); + CodeGenericUtil.readAndLogRules(path, "EventEffects" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + GenericMapEffectAction::parse, GENERIC_MAP_EFFECTS_ACTIONS_LIST, ARRAY_TYPE_SCRIPT[2]); // - CodeGenericUtils.readAndLogRules(path, "EventBlockPlace" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, - GenericBlockPlaceActions::parse, GENERIC_BLOCK_PLACE_ACTIONS_LIST, ARRAY_TYPE_SCRIPT[1]); + CodeGenericUtil.readAndLogRules(path, "EventBlockPlace" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + GenericBlockPlaceAction::parse, GENERIC_BLOCK_PLACE_ACTIONS_LIST, ARRAY_TYPE_SCRIPT[1]); // - CodeGenericUtils.readAndLogRules(path, "EventBlockBreak" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, - GenericBlockBreakActions::parse, GENERIC_BLOCK_BREAK_ACTIONS_LIST, ARRAY_TYPE_SCRIPT[1]); + CodeGenericUtil.readAndLogRules(path, "EventBlockBreak" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + GenericBlockBreakAction::parse, GENERIC_BLOCK_BREAK_ACTIONS_LIST, ARRAY_TYPE_SCRIPT[1]); // - CodeGenericUtils.readAndLogRules(path, "EventLeftMouseClick" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, - GenericLeftClickActions::parse, GENERIC_LEFT_CLICK_ACTIONS_LIST, ARRAY_TYPE_SCRIPT[3]); + CodeGenericUtil.readAndLogRules(path, "EventLeftMouseClick" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + GenericLeftClickAction::parse, GENERIC_LEFT_CLICK_ACTIONS_LIST, ARRAY_TYPE_SCRIPT[3]); // - CodeGenericUtils.readAndLogRules(path, "EventRightMouseClick" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, - GenericRightClickActions::parse, GENERIC_RIGHT_CLICK_ACTIONS_LIST, ARRAY_TYPE_SCRIPT[3]); + CodeGenericUtil.readAndLogRules(path, "EventRightMouseClick" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + GenericRightClickAction::parse, GENERIC_RIGHT_CLICK_ACTIONS_LIST, ARRAY_TYPE_SCRIPT[3]); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/ParserManager.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/ParserManager.java new file mode 100644 index 0000000..62604cc --- /dev/null +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/ParserManager.java @@ -0,0 +1,54 @@ +package org.imesense.dynamicspawncontrol.technical.parser; + +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.technical.parser.beta.ParserSingleScriptCheckSpawn; +import org.imesense.dynamicspawncontrol.technical.parser.beta.ParserSingleScriptSettingsCache; +import org.imesense.dynamicspawncontrol.technical.parser.beta.ParserSingleZombieSummonAID; + +import java.util.ArrayList; +import java.util.List; + +/** + * + */ +public final class ParserManager +{ + /** + * + */ + private static final List betaParsersList = new ArrayList<>(); + + /** + * + */ + public ParserManager() + { + CodeGenericUtil.printInitClassToLog(this.getClass()); + } + + /** + * + */ + public static void init() + { + betaParsersList.add(new ParserSingleScriptSettingsCache()); + betaParsersList.add(new ParserSingleZombieSummonAID()); + betaParsersList.add(new ParserSingleScriptCheckSpawn()); + + for (IBetaParser parser : betaParsersList) + { + parser.loadConfig(true); + } + } + + /** + * + */ + public static void reloadAllConfigs() + { + for (IBetaParser parser : betaParsersList) + { + parser.reloadConfig(); + } + } +} diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/ParserSingleJsonScripts.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/ParserSingleJsonScript.java similarity index 51% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/ParserSingleJsonScripts.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/ParserSingleJsonScript.java index 06cecfb..9117465 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/ParserSingleJsonScripts.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/ParserSingleJsonScript.java @@ -1,9 +1,9 @@ -package org.imesense.dynamicspawncontrol.technical.parsers; +package org.imesense.dynamicspawncontrol.technical.parser; /** * */ -public final class ParserSingleJsonScripts +public final class ParserSingleJsonScript { //-' Not implementation, later //-' This new concept for single and multiple scripts 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/parser/beta/ParserSingleScriptCheckSpawn.java similarity index 85% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/beta/ParserSingleScriptCheckSpawn.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/ParserSingleScriptCheckSpawn.java index e9ec4f6..9a96868 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/parser/beta/ParserSingleScriptCheckSpawn.java @@ -1,15 +1,13 @@ -package org.imesense.dynamicspawncontrol.technical.parsers.beta; +package org.imesense.dynamicspawncontrol.technical.parser.beta; import com.google.gson.*; import com.google.gson.reflect.TypeToken; -import org.imesense.dynamicspawncontrol.DynamicSpawnControl; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; -import org.imesense.dynamicspawncontrol.technical.customlibrary.EnumSingleScripts; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumSingleScript; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.network.PacketTime; -import org.imesense.dynamicspawncontrol.technical.parsers.GeneralStorageData; -import org.imesense.dynamicspawncontrol.technical.parsers.IBetaParsers; +import org.imesense.dynamicspawncontrol.technical.parser.GeneralStorageData; +import org.imesense.dynamicspawncontrol.technical.parser.IBetaParser; import java.io.File; import java.io.FileReader; @@ -21,14 +19,14 @@ /** * */ -public final class ParserSingleScriptCheckSpawn implements IBetaParsers +public final class ParserSingleScriptCheckSpawn implements IBetaParser { /** * */ public ParserSingleScriptCheckSpawn() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** @@ -46,7 +44,7 @@ public void reloadConfig() public void loadConfig(boolean initialization) { File file = getConfigFile(initialization, ProjectStructure.STRUCT_FILES_DIRS.NAME_DIR_SINGLE_SCRIPTS, - EnumSingleScripts.SCRIPT_MOBS_LIST_SEE_SKY.getKeyword()); + EnumSingleScript.SCRIPT_MOBS_LIST_SEE_SKY.getKeyword()); if (!file.exists()) { @@ -101,14 +99,14 @@ public void loadConfig(boolean initialization) GeneralStorageData.instance.EntitiesProhibitedOutdoors = gson.fromJson(entitiesObject.get("entities"), listType); Log.writeDataToLogFile(0, "Script: " + - EnumSingleScripts.SCRIPT_MOBS_LIST_SEE_SKY.getKeyword() + + EnumSingleScript.SCRIPT_MOBS_LIST_SEE_SKY.getKeyword() + " data blockedEntities: " + GeneralStorageData.instance.EntitiesProhibitedOutdoors); } else { Log.writeDataToLogFile(0, "Script: " + - EnumSingleScripts.SCRIPT_MOBS_LIST_SEE_SKY.getKeyword() + + EnumSingleScript.SCRIPT_MOBS_LIST_SEE_SKY.getKeyword() + " not found key 'entities'"); throw new RuntimeException("Key 'entities' not found in JSON file."); 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/parser/beta/ParserSingleScriptSettingsCache.java similarity index 92% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/beta/ParserSingleScriptSettingsCache.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/ParserSingleScriptSettingsCache.java index 40acf7d..53bc6c4 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/parser/beta/ParserSingleScriptSettingsCache.java @@ -1,13 +1,12 @@ -package org.imesense.dynamicspawncontrol.technical.parsers.beta; +package org.imesense.dynamicspawncontrol.technical.parser.beta; import com.google.gson.*; import net.minecraft.util.ResourceLocation; -import org.imesense.dynamicspawncontrol.DynamicSpawnControl; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; -import org.imesense.dynamicspawncontrol.technical.customlibrary.EnumSingleScripts; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumSingleScript; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.parsers.IBetaParsers; +import org.imesense.dynamicspawncontrol.technical.parser.IBetaParser; import org.imesense.dynamicspawncontrol.technical.worldcache.CacheStorage; import java.io.File; @@ -20,14 +19,14 @@ /** * */ -public final class ParserSingleScriptSettingsCache implements IBetaParsers +public final class ParserSingleScriptSettingsCache implements IBetaParser { /** * */ public ParserSingleScriptSettingsCache() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** @@ -45,7 +44,7 @@ public void reloadConfig() public void loadConfig(boolean initialization) { File file = getConfigFile(initialization, ProjectStructure.STRUCT_FILES_DIRS.NAME_DIR_CACHE, - EnumSingleScripts.SCRIPT_CACHE_MOBS.getKeyword()); + EnumSingleScript.SCRIPT_CACHE_MOBS.getKeyword()); if (!file.exists()) { 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/parser/beta/ParserSingleZombieSummonAID.java similarity index 85% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/beta/ParserSingleZombieSummonAID.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/ParserSingleZombieSummonAID.java index cd66a96..754da0a 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/parser/beta/ParserSingleZombieSummonAID.java @@ -1,17 +1,16 @@ -package org.imesense.dynamicspawncontrol.technical.parsers.beta; +package org.imesense.dynamicspawncontrol.technical.parser.beta; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonSyntaxException; import com.google.gson.reflect.TypeToken; -import org.imesense.dynamicspawncontrol.DynamicSpawnControl; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; -import org.imesense.dynamicspawncontrol.technical.customlibrary.EnumSingleScripts; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumSingleScript; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.parsers.GeneralStorageData; -import org.imesense.dynamicspawncontrol.technical.parsers.IBetaParsers; +import org.imesense.dynamicspawncontrol.technical.parser.GeneralStorageData; +import org.imesense.dynamicspawncontrol.technical.parser.IBetaParser; import java.io.File; import java.io.FileReader; @@ -24,14 +23,14 @@ /** * */ -public final class ParserSingleZombieSummonAID implements IBetaParsers +public final class ParserSingleZombieSummonAID implements IBetaParser { /** * */ public ParserSingleZombieSummonAID() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** @@ -51,7 +50,7 @@ public void loadConfig(boolean initialization) GeneralStorageData.instance.EquipmentConfigs = new ArrayList<>(); File file = getConfigFile(initialization, ProjectStructure.STRUCT_FILES_DIRS.NAME_DIR_SINGLE_SCRIPTS, - EnumSingleScripts.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword()); + EnumSingleScript.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword()); if (!file.exists()) { @@ -95,7 +94,7 @@ public void loadConfig(boolean initialization) if (jsonArray.size() == 0) { Log.writeDataToLogFile(0, "Script: " + - EnumSingleScripts.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword() + " data is empty."); + EnumSingleScript.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword() + " data is empty."); return; } @@ -124,13 +123,13 @@ public void loadConfig(boolean initialization) GeneralStorageData.instance.EquipmentConfigs.add(config); Log.writeDataToLogFile(0, "Script: " + - EnumSingleScripts.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword() + " data loaded."); + EnumSingleScript.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword() + " data loaded."); } else { Log.writeDataToLogFile(0, "Script: " + - EnumSingleScripts.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword() + + EnumSingleScript.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword() + " not found key 'equipment'"); throw new RuntimeException("Key 'equipment' not found in JSON file."); } @@ -139,7 +138,7 @@ public void loadConfig(boolean initialization) { Log.writeDataToLogFile(0, "Script: " + - EnumSingleScripts.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword() + + EnumSingleScript.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword() + " not found key 'data'"); throw new RuntimeException("Key 'data' not found in JSON file."); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/ParserManager.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/ParserManager.java deleted file mode 100644 index f4a2c6f..0000000 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parsers/ParserManager.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.imesense.dynamicspawncontrol.technical.parsers; - -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; -import org.imesense.dynamicspawncontrol.technical.parsers.beta.ParserSingleScriptCheckSpawn; -import org.imesense.dynamicspawncontrol.technical.parsers.beta.ParserSingleScriptSettingsCache; -import org.imesense.dynamicspawncontrol.technical.parsers.beta.ParserSingleZombieSummonAID; - -import java.util.ArrayList; -import java.util.List; - -/** - * - */ -public final class ParserManager -{ - /** - * - */ - private static final List betaParsersList = new ArrayList<>(); - - /** - * - */ - public ParserManager() - { - CodeGenericUtils.printInitClassToLog(this.getClass()); - } - - /** - * - */ - public static void init() - { - betaParsersList.add(new ParserSingleScriptSettingsCache()); - betaParsersList.add(new ParserSingleZombieSummonAID()); - betaParsersList.add(new ParserSingleScriptCheckSpawn()); - - for (IBetaParsers parser : betaParsersList) - { - parser.loadConfig(true); - } - } - - /** - * - */ - public static void reloadAllConfigs() - { - for (IBetaParsers parser : betaParsersList) - { - parser.reloadConfig(); - } - } -} diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/plugins/LoadingPluginNight.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/plugin/LoadingPluginNight.java similarity index 97% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/plugins/LoadingPluginNight.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/plugin/LoadingPluginNight.java index ce82d64..f526ce2 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/plugins/LoadingPluginNight.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/plugin/LoadingPluginNight.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.technical.plugins; +package org.imesense.dynamicspawncontrol.technical.plugin; import java.io.File; import java.util.Map; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ClientProxy.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ClientProxy.java index eb94781..29a5674 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ClientProxy.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ClientProxy.java @@ -10,7 +10,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import org.imesense.dynamicspawncontrol.technical.initializer.RegisterOreGenerators; +import org.imesense.dynamicspawncontrol.technical.register.RegisterOreGenerator; /** * Client sided proxy @@ -25,7 +25,7 @@ public final class ClientProxy implements IProxy @Override public void preInit(FMLPreInitializationEvent event) { - RegisterOreGenerators.init(event); + RegisterOreGenerator.init(event); } /** 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/register/RegisterCommandClass.java similarity index 77% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterCommandsClasses.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterCommandClass.java index 09c1d4a..009b25e 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/register/RegisterCommandClass.java @@ -1,11 +1,11 @@ -package org.imesense.dynamicspawncontrol.technical.initializer; +package org.imesense.dynamicspawncontrol.technical.register; import net.minecraft.command.ICommand; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.gameplay.commands.*; +import org.imesense.dynamicspawncontrol.gameplay.command.*; /** * @@ -13,7 +13,7 @@ * Console commands are loaded every time you enter the world. * A constructor with protection is not required! */ -public final class RegisterCommandsClasses +public final class RegisterCommandClass { /** * @@ -28,17 +28,17 @@ public final class RegisterCommandsClasses cmdAdminLaunchFireball.class, cmdAdminScanEntities.class, cmdAdminSwitchVanish.class, - cmdServerJsonScriptsReload.class, + cmdServerJsonScriptReload.class, cmdServerMobsKiller.class, - cmdServerSingleScriptsReload.class + cmdServerSingleScriptReload.class }; /** * */ - public RegisterCommandsClasses() + public RegisterCommandClass() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterConfigClasses.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterConfigClass.java similarity index 91% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterConfigClasses.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterConfigClass.java index 790dff2..53a1fe7 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterConfigClasses.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterConfigClass.java @@ -1,7 +1,7 @@ -package org.imesense.dynamicspawncontrol.technical.initializer; +package org.imesense.dynamicspawncontrol.technical.register; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.blockgenerator.CfgBlockWorldGenerator; import org.imesense.dynamicspawncontrol.technical.config.cachedameworld.CfgCacheWorldGame; import org.imesense.dynamicspawncontrol.technical.config.gamedebugger.CfgGameDebugger; @@ -13,7 +13,7 @@ import org.imesense.dynamicspawncontrol.technical.config.spiderattackweb.CfgSpiderAttackWeb; import org.imesense.dynamicspawncontrol.technical.config.windowtitle.CfgWindowTitle; import org.imesense.dynamicspawncontrol.technical.config.zombiedropitem.CfgZombieDropItem; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotations.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.DCSSingleConfig; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import java.lang.reflect.Constructor; @@ -21,7 +21,7 @@ /** * */ -public final class RegisterConfigClasses +public final class RegisterConfigClass { /** * @@ -44,9 +44,9 @@ public final class RegisterConfigClasses /** * */ - public RegisterConfigClasses() + public RegisterConfigClass() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterGameplayClasses.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterGameplayClass.java similarity index 70% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterGameplayClasses.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterGameplayClass.java index 047c5f4..626c8fc 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterGameplayClasses.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterGameplayClass.java @@ -1,17 +1,17 @@ -package org.imesense.dynamicspawncontrol.technical.initializer; +package org.imesense.dynamicspawncontrol.technical.register; import net.minecraftforge.common.MinecraftForge; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; -import org.imesense.dynamicspawncontrol.gameplay.events.OnUpdateTorchLogic; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.gameplay.event.OnUpdateTorchLogic; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnComplexityBiomes; -import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnDropSkeletonItems; -import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnDropZombieItems; +import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnDropSkeletonItem; +import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnDropZombieItem; /** * */ -public final class RegisterGameplayClasses +public final class RegisterGameplayClass { /** * @@ -19,17 +19,17 @@ public final class RegisterGameplayClasses private static final Class[] EVENT_CLASSES = { OnUpdateTorchLogic.class, - OnDropZombieItems.class, - OnDropSkeletonItems.class, + OnDropZombieItem.class, + OnDropSkeletonItem.class, OnComplexityBiomes.class }; /** * */ - public RegisterGameplayClasses() + public RegisterGameplayClass() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterOreGenerators.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterOreGenerator.java similarity index 81% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterOreGenerators.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterOreGenerator.java index b0ee9dc..5718c67 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterOreGenerators.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterOreGenerator.java @@ -1,16 +1,16 @@ -package org.imesense.dynamicspawncontrol.technical.initializer; +package org.imesense.dynamicspawncontrol.technical.register; import net.minecraftforge.fml.common.IWorldGenerator; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.gameplay.worldgenerator.*; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; /** * */ -public final class RegisterOreGenerators +public final class RegisterOreGenerator { /** * @@ -25,9 +25,9 @@ public final class RegisterOreGenerators /** * */ - public RegisterOreGenerators() + public RegisterOreGenerator() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** @@ -40,7 +40,7 @@ public static void init(FMLPreInitializationEvent event) { try { - if (!CodeGenericUtils.hasDefaultConstructor(oreGeneratorClass)) + if (!CodeGenericUtil.hasDefaultConstructor(oreGeneratorClass)) { Log.writeDataToLogFile(2, "Class " + oreGeneratorClass.getName() + " does not have a default constructor."); throw new RuntimeException("Default constructor not found in class: " + oreGeneratorClass.getName()); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterTechnicalClasses.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterTechnicalClass.java similarity index 78% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterTechnicalClasses.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterTechnicalClass.java index 400f84c..64c1583 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterTechnicalClasses.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterTechnicalClass.java @@ -1,36 +1,36 @@ -package org.imesense.dynamicspawncontrol.technical.initializer; +package org.imesense.dynamicspawncontrol.technical.register; import net.minecraftforge.common.MinecraftForge; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; -import org.imesense.dynamicspawncontrol.debug.events.OnEventDummy; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.debug.event.OnEventDummy; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnPlayerEvents; +import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnPlayerEvent; import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnWindowTitle; import org.imesense.dynamicspawncontrol.technical.eventprocessor.script.multiple.*; import org.imesense.dynamicspawncontrol.technical.eventprocessor.script.single.*; -import org.imesense.dynamicspawncontrol.technical.worldcache.CacheEvents; +import org.imesense.dynamicspawncontrol.technical.worldcache.CacheEvent; /** * */ -public final class RegisterTechnicalClasses +public final class RegisterTechnicalClass { /** * */ private static final Class[] EVENT_CLASSES = { - CacheEvents.class, + CacheEvent.class, OnEventDummy.class, OnWindowTitle.class, OnBlockBreakEvent.class, OnBlockPlaceEvent.class, OnEntitySpawnEvent.class, OnLeftClickEvent.class, - OnLivingDrops.class, + OnLivingDrop.class, OnLivingExperienceDrop.class, OnMobTaskManager.class, - OnPlayerEvents.class, + OnPlayerEvent.class, OnPotentialSpawn.class, OnRightClickEvent.class, OnSingleJsonCheckSpawn.class, @@ -40,9 +40,9 @@ public final class RegisterTechnicalClasses /** * */ - public RegisterTechnicalClasses() + public RegisterTechnicalClass() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); } /** 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 fdadfd6..51f337e 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 @@ -13,7 +13,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.WorldServer; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import javax.annotation.Nonnull; @@ -129,7 +129,7 @@ public final class Cache */ public Cache() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { 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/CacheEvent.java similarity index 97% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheEvents.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheEvent.java index 9d959a7..4ce22b9 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/CacheEvent.java @@ -19,7 +19,7 @@ import net.minecraftforge.fml.common.gameevent.PlayerEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.config.gamedebugger.DataGameDebugger; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; @@ -29,7 +29,7 @@ * */ @Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) -public final class CacheEvents +public final class CacheEvent { /** * @@ -44,9 +44,9 @@ public final class CacheEvents /** * */ - public CacheEvents() + public CacheEvent() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { 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 73d5db6..ad6e209 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 @@ -4,11 +4,9 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.util.text.TextFormatting; import net.minecraft.client.gui.ScaledResolution; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import static org.imesense.dynamicspawncontrol.technical.worldcache.Cache.*; - /** * */ @@ -29,7 +27,7 @@ public final class CacheMonitor */ public CacheMonitor() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); if (instanceExists) { 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 ffbd7a9..e3b1992 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 @@ -1,8 +1,7 @@ package org.imesense.dynamicspawncontrol.technical.worldcache; import net.minecraft.util.ResourceLocation; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; -import org.imesense.dynamicspawncontrol.technical.parsers.ParserManager; +import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import java.util.List; @@ -21,7 +20,7 @@ public final class CacheStorage */ public CacheStorage() { - CodeGenericUtils.printInitClassToLog(this.getClass()); + CodeGenericUtil.printInitClassToLog(this.getClass()); instance = this; }