From 47037a3021f4a69315d00a8e4d4d96da4b3d1fe5 Mon Sep 17 00:00:00 2001 From: OldSerpskiStalker Date: Tue, 5 Nov 2024 20:22:08 +0500 Subject: [PATCH] Adaptation to the architectural diagram between 1.12.2/1.16.5 (Part 1) --- .../DynamicSpawnControl.java | 91 +++++++------------ ...java => DynamicSpawnControlStructure.java} | 2 +- .../dynamicspawncontrol/OnEventDummy.java | 51 +++++++++++ .../ai/zombie/event/OnBreakTorchEvent.java | 8 +- .../CmdAdminDumpBlock.java} | 8 +- .../CmdAdminDumpEntity.java} | 11 +-- .../CmdAdminDumpItem.java} | 8 +- .../CmdAdminGameMode.java} | 8 +- .../CmdAdminGetWorldMoonPhase.java} | 6 +- .../CmdAdminLaunchFireball.java} | 6 +- .../CmdAdminScanEntities.java} | 8 +- .../CmdAdminSwitchVanish.java} | 6 +- .../CmdServerJsonScriptReload.java} | 6 +- .../CmdServerMobsKiller.java} | 6 +- .../CmdServerSingleScriptReload.java} | 6 +- .../data/BlockWorldGeneratorData.java} | 10 +- .../BlockWorldGeneratorDataAbstract.java} | 14 +-- .../config/data/CacheWorldGameData.java | 9 ++ .../data/GameDebuggerData.java} | 14 +-- .../data/LogFileData.java} | 14 +-- .../data/PlayerAConfig.java} | 33 +++---- .../data/SkeletonDropItemData.java} | 14 +-- .../data/WindowTitleData.java} | 18 ++-- .../data/ZombieDropItemData.java} | 12 +-- .../file/BlockWorldGeneratorAConfig.java} | 60 ++++++------ .../file/CacheWorldGameAConfig.java} | 18 ++-- .../file/GameDebuggerAConfig.java} | 47 +++++----- .../file/LogFileAConfig.java} | 34 +++---- .../file/PlayerData.java} | 12 +-- .../file/SkeletonDropItemAConfig.java} | 61 +++++++------ .../file/WindowTitleAConfig.java} | 33 +++---- .../file/ZombieDropItemAConfig.java} | 57 ++++++------ .../staminaplayer/CfgStaminaPlayer.java | 16 ++-- .../staminaplayer/DataStaminaPlayer.java | 10 +- .../annotation/ConceptConfig.java} | 4 +- .../annotation}/Getter.java | 2 +- .../annotation}/Setter.java | 2 +- .../annotation}/UniqueObject.java | 2 +- .../api/AConfig.java} | 14 +-- .../dynamicspawncontrol/core/api/IDebug.java | 9 ++ .../api/IParser.java} | 8 +- .../recipes => core/api}/IRecipes.java | 2 +- .../{ => core}/debug/Timer.java | 6 +- .../{ => core/field}/UniqueField.java | 4 +- .../customlibrary => core/logfile}/Log.java | 15 ++- .../register/RegisterCommandClass.java | 11 +-- .../register/RegisterConfigClass.java | 52 +++++------ .../register/RegisterGameplayClass.java | 8 +- .../register/RegisterOreGenerator.java | 10 +- .../register/RegisterTechnicalClass.java | 12 +-- .../util/CodeGeneric.java} | 14 +-- .../{technical => core}/worldcache/Cache.java | 8 +- .../worldcache/CacheEvent.java | 16 ++-- .../worldcache/CacheMonitor.java | 11 +-- .../worldcache/CacheStorage.java | 6 +- .../dynamicspawncontrol/debug/IDebug.java | 9 -- .../debug/event/OnEventDummy.java | 74 --------------- .../gameplay/event/OnUpdateTorchLogic.java | 10 +- .../worldgenerator/BlockMonsterEgg.java | 12 +-- .../worldgenerator/BlockMossyCobblestone.java | 12 +-- .../worldgenerator/BlockNetherRack.java | 12 +-- .../asm/LoadingPlugin.java | 4 +- .../config/CfgBloodMoon.java | 4 +- .../LoadingPlugin.java | 4 +- .../asm/EntityRendererHook.java | 2 +- .../config/CfgDarkness.java | 14 +-- .../config/DataDarkness.java | 8 +- .../config/CfgEyeInTheDarkness.java | 8 +- .../Numbers.java | 2 - .../TimeEvents.java | 19 ---- .../config/CfgTimeControl.java | 14 +-- .../config/DataTimeControl.java | 8 +- .../handler/TimeHandlerClient.java | 2 - .../handler/TimeHandlerServer.java | 8 -- .../network/PacketTime.java | 1 - .../ObjectHandlerClient.java | 12 +-- .../capability/EventHandler.java | 9 +- .../capability/WebSlingerCapability.java | 10 +- .../config/CfgWebSlinger.java | 14 +-- .../config/DataWebSlinger.java | 8 +- .../webbing/AIWebbingAttack.java | 4 +- .../webbing/EntityWebbing.java | 6 +- .../webbing/ItemWebbing.java | 4 +- .../webbing/PlayerInWebMessage.java | 6 +- .../util/misc/RegistrationHelper.java | 4 +- .../{gameplay => }/recipes/CraftItemWeb.java | 3 +- .../cachedameworld/DataCacheWorldGame.java | 9 -- .../technical/customlibrary/AuxFunction.java | 1 + .../customlibrary/AuxFunctionS/Player.java | 6 -- .../customlibrary/InlineJsonService.java | 1 + .../customlibrary/ItemStackBuilder.java | 1 + .../customlibrary/ListActionBinary.java | 2 +- .../customlibrary/ListActionConsumer.java | 1 + .../ListActionConsumerMobTaskManager.java | 1 + .../enumeration/EnumSingleScript.java | 46 ---------- .../generic/GenericBlockBreakAction.java | 2 +- .../generic/GenericBlockPlaceAction.java | 2 +- .../generic/GenericDropLoot.java | 1 + .../generic/GenericExperience.java | 1 + .../generic/GenericLeftClickAction.java | 2 +- .../generic/GenericMapEffectAction.java | 2 +- .../generic/GenericMobTaskManager.java | 2 +- .../generic/GenericPotentialSpawn.java | 15 +-- .../generic/GenericRightClickAction.java | 2 +- .../generic/GenericSpawnCondition.java | 2 +- .../primitive/OnComplexityBiomes.java | 13 ++- .../primitive/OnDropHeadMob.java | 10 +- .../primitive/OnDropSkeletonItem.java | 30 +++--- .../primitive/OnDropZombieItem.java | 26 +++--- .../primitive/OnNickNameEntity.java | 12 +-- .../primitive/OnPlayerEvent.java | 14 +-- .../primitive/OnWindowTitle.java | 14 +-- .../script/multiple/OnBlockBreakEvent.java | 14 +-- .../script/multiple/OnBlockPlaceEvent.java | 14 +-- .../script/multiple/OnEntitySpawnEvent.java | 14 +-- .../script/multiple/OnLeftClickEvent.java | 14 +-- .../script/multiple/OnLivingDrop.java | 14 +-- .../multiple/OnLivingExperienceDrop.java | 14 +-- .../script/multiple/OnMobTaskManager.java | 10 +- .../script/multiple/OnPlayerTick.java | 14 +-- .../script/multiple/OnPotentialSpawn.java | 18 ++-- .../script/multiple/OnRightClickEvent.java | 14 +-- .../script/single/OnSingleJsonCheckSpawn.java | 10 +- .../single/OnSingleZombieSummonAID.java | 10 +- .../technical/parser/GeneralStorageData.java | 4 +- .../parser/ParserGenericJsonScript.java | 32 +++---- .../technical/parser/ParserManager.java | 27 +++--- ...ava => IParserSingleScriptCheckSpawn.java} | 33 ++++--- ... => IParserSingleScriptSettingsCache.java} | 21 ++--- ...java => IParserSingleZombieSummonAID.java} | 43 +++++---- 130 files changed, 829 insertions(+), 949 deletions(-) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{ProjectStructure.java => DynamicSpawnControlStructure.java} (97%) create mode 100644 dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/OnEventDummy.java rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{gameplay/command/cmdAdminDumpBlock.java => command/CmdAdminDumpBlock.java} (93%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{gameplay/command/cmdAdminDumpEntity.java => command/CmdAdminDumpEntity.java} (86%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{gameplay/command/cmdAdminDumpItem.java => command/CmdAdminDumpItem.java} (96%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{gameplay/command/cmdAdminGameMode.java => command/CmdAdminGameMode.java} (89%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{gameplay/command/cmdAdminGetWorldMoonPhase.java => command/CmdAdminGetWorldMoonPhase.java} (91%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{gameplay/command/cmdAdminLaunchFireball.java => command/CmdAdminLaunchFireball.java} (93%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{gameplay/command/cmdAdminScanEntities.java => command/CmdAdminScanEntities.java} (93%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{gameplay/command/cmdAdminSwitchVanish.java => command/CmdAdminSwitchVanish.java} (93%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{gameplay/command/cmdServerJsonScriptReload.java => command/CmdServerJsonScriptReload.java} (92%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{gameplay/command/cmdServerMobsKiller.java => command/CmdServerMobsKiller.java} (96%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{gameplay/command/cmdServerSingleScriptReload.java => command/CmdServerSingleScriptReload.java} (92%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/config/blockgenerator/DataBlockWorldGenerator.java => config/data/BlockWorldGeneratorData.java} (81%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/config/blockgenerator/ConfigDataBlock.java => config/data/BlockWorldGeneratorDataAbstract.java} (74%) create mode 100644 dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/data/CacheWorldGameData.java rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/config/gamedebugger/DataGameDebugger.java => config/data/GameDebuggerData.java} (87%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/config/logfile/DataLogFile.java => config/data/LogFileData.java} (70%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/config/player/CfgPlayer.java => config/data/PlayerAConfig.java} (72%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/config/skeletondropitem/DataSkeletonDropItem.java => config/data/SkeletonDropItemData.java} (89%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/config/windowtitle/DataWindowTitle.java => config/data/WindowTitleData.java} (62%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/config/zombiedropitem/DataZombieDropItem.java => config/data/ZombieDropItemData.java} (90%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/config/blockgenerator/CfgBlockWorldGenerator.java => config/file/BlockWorldGeneratorAConfig.java} (64%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/config/cachedameworld/CfgCacheWorldGame.java => config/file/CacheWorldGameAConfig.java} (76%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/config/gamedebugger/CfgGameDebugger.java => config/file/GameDebuggerAConfig.java} (68%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/config/logfile/CfgLogFile.java => config/file/LogFileAConfig.java} (63%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/config/player/DataPlayer.java => config/file/PlayerData.java} (74%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/config/skeletondropitem/CfgSkeletonDropItem.java => config/file/SkeletonDropItemAConfig.java} (71%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/config/windowtitle/CfgWindowTitle.java => config/file/WindowTitleAConfig.java} (72%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/config/zombiedropitem/CfgZombieDropItem.java => config/file/ZombieDropItemAConfig.java} (71%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical => }/config/staminaplayer/CfgStaminaPlayer.java (92%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical => }/config/staminaplayer/DataStaminaPlayer.java (92%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/customlibrary/inlineannotation/DCSSingleConfig.java => core/annotation/ConceptConfig.java} (62%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/customlibrary/inlineannotation => core/annotation}/Getter.java (76%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/customlibrary/inlineannotation => core/annotation}/Setter.java (76%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/customlibrary/inlineannotation => core/annotation}/UniqueObject.java (76%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/config/CfgClassAbstract.java => core/api/AConfig.java} (55%) create mode 100644 dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/api/IDebug.java rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/parser/IBetaParser.java => core/api/IParser.java} (71%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{gameplay/recipes => core/api}/IRecipes.java (64%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{ => core}/debug/Timer.java (70%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{ => core/field}/UniqueField.java (90%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical/customlibrary => core/logfile}/Log.java (90%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical => core}/register/RegisterCommandClass.java (83%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical => core}/register/RegisterConfigClass.java (54%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical => core}/register/RegisterGameplayClass.java (82%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical => core}/register/RegisterOreGenerator.java (82%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical => core}/register/RegisterTechnicalClass.java (81%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{debug/CodeGenericUtil.java => core/util/CodeGeneric.java} (89%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical => core}/worldcache/Cache.java (97%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical => core}/worldcache/CacheEvent.java (91%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical => core}/worldcache/CacheMonitor.java (88%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{technical => core}/worldcache/CacheStorage.java (90%) delete mode 100644 dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/IDebug.java delete mode 100644 dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/event/OnEventDummy.java rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/{gameplay => }/recipes/CraftItemWeb.java (86%) delete mode 100644 dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/cachedameworld/DataCacheWorldGame.java delete mode 100644 dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/AuxFunctionS/Player.java delete mode 100644 dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/enumeration/EnumSingleScript.java rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/{ParserSingleScriptCheckSpawn.java => IParserSingleScriptCheckSpawn.java} (75%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/{ParserSingleScriptSettingsCache.java => IParserSingleScriptSettingsCache.java} (87%) rename dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/{ParserSingleZombieSummonAID.java => IParserSingleZombieSummonAID.java} (75%) 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 137daaa..25375a0 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 @@ -11,23 +11,24 @@ import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import org.imesense.dynamicspawncontrol.core.api.IRecipes; +import org.imesense.dynamicspawncontrol.core.field.UniqueField; +import org.imesense.dynamicspawncontrol.core.register.*; import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.capability.EventHandler; import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.capability.WebSlingerCapability; import org.imesense.dynamicspawncontrol.ai.zombie.event.OnBreakTorchEvent; -import org.imesense.dynamicspawncontrol.gameplay.recipes.IRecipes; -import org.imesense.dynamicspawncontrol.gameplay.recipes.CraftItemWeb; +import org.imesense.dynamicspawncontrol.recipes.CraftItemWeb; import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.TimeEvents; import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnWindowTitle; -import org.imesense.dynamicspawncontrol.technical.register.*; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.gamestructure.Structure; import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.network.*; import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.webbing.PlayerInWebMessage; import org.imesense.dynamicspawncontrol.technical.parser.GeneralStorageData; import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; import org.imesense.dynamicspawncontrol.technical.parser.ParserManager; -import org.imesense.dynamicspawncontrol.technical.worldcache.Cache; -import org.imesense.dynamicspawncontrol.technical.worldcache.CacheStorage; +import org.imesense.dynamicspawncontrol.core.worldcache.Cache; +import org.imesense.dynamicspawncontrol.core.worldcache.CacheStorage; import java.io.File; @@ -35,14 +36,14 @@ * Main class of modification */ @Mod( - modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID, - name = ProjectStructure.STRUCT_INFO_MOD.NAME, - version = ProjectStructure.STRUCT_INFO_MOD.VERSION + modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID, + name = DynamicSpawnControlStructure.STRUCT_INFO_MOD.NAME, + version = DynamicSpawnControlStructure.STRUCT_INFO_MOD.VERSION ) -public class DynamicSpawnControl +public final class DynamicSpawnControl { /** - * Main class instance + * */ @Mod.Instance public static DynamicSpawnControl Instance; @@ -58,21 +59,19 @@ public class DynamicSpawnControl */ public static File getGlobalPathToConfigs() { - // return globalDirectory; } /** * */ - public static IRecipes Recipes; + public static IRecipes IRecipes; /** - * Constructor + * */ public DynamicSpawnControl() { - // Instance = this; } @@ -87,80 +86,63 @@ public DynamicSpawnControl() public static SimpleNetworkWrapper networkWrapper = null; /** - * Preinitialize modification - * - * @param event Preinitialization event + * + * @param fmlPreInitializationEvent + * @throws IllegalAccessException */ @Mod.EventHandler - public synchronized void preInit(FMLPreInitializationEvent event) throws IllegalAccessException + public synchronized void preInit(FMLPreInitializationEvent fmlPreInitializationEvent) throws IllegalAccessException { - // - globalDirectory = event.getModConfigurationDirectory(); + globalDirectory = fmlPreInitializationEvent.getModConfigurationDirectory(); - // UniqueField uniqueField = new UniqueField(); - Log.writeDataToLogFile(0, "Object create [UniqueField]: " + uniqueField.hashCode()); - // - Log.createLogFile(globalDirectory.getPath() + File.separator + ProjectStructure.STRUCT_FILES_DIRS.NAME_DIRECTORY, UniqueField.IDEA_RT); + Log.createLogFile(globalDirectory.getPath() + File.separator + DynamicSpawnControlStructure.STRUCT_FILES_DIRS.NAME_DIRECTORY, UniqueField.IDEA_RT); Log.writeDataToLogFile(1, "Launching from Intellij Idea: " + (UniqueField.IDEA_RT ? "true" : "false")); + Log.writeDataToLogFile(0, "Object create [UniqueField]: " + uniqueField.hashCode()); - // MessageHandler.init(); WebSlingerCapability.register(); networkWrapper = NetworkRegistry.INSTANCE.newSimpleChannel("dynamicspawncontrol"); PlayerInWebMessage.register(networkWrapper); - // RegisterConfigClass.initializeConfigs(); - // GeneralStorageData = new GeneralStorageData(); - // CacheStorage.Instance = new CacheStorage(); - // Cache.Instance = new Cache(); - // - ParserGenericJsonScript.setRulePath(event.getModConfigurationDirectory()); + ParserGenericJsonScript.setRulePath(fmlPreInitializationEvent.getModConfigurationDirectory()); - // RegisterTechnicalClass.registerClasses(); - // OnWindowTitle.replace(); - // RegisterGameplayClass.registerClasses(); - // - RegisterOreGenerator.init(event); + RegisterOreGenerator.init(fmlPreInitializationEvent); } /** - * Initialize modification - * - * @param fmlInitializationEvent Initialization event + * + * @param fmlInitializationEvent */ @Mod.EventHandler public synchronized void init(FMLInitializationEvent fmlInitializationEvent) { - // - Recipes = new CraftItemWeb(); + IRecipes = new CraftItemWeb(); - // - Recipes.registry(); + IRecipes.registry(); MinecraftForge.EVENT_BUS.register(TimeEvents.INSTANCE); } /** - * Postinitialize modification - * - * @param fmlPostInitializationEvent Postinitialization event + * + * @param fmlPostInitializationEvent */ @Mod.EventHandler public synchronized void postInit(FMLPostInitializationEvent fmlPostInitializationEvent) @@ -171,9 +153,8 @@ public synchronized void postInit(FMLPostInitializationEvent fmlPostInitializati } /** - * Load complete action - * - * @param fmlLoadCompleteEvent Load complete event + * + * @param fmlLoadCompleteEvent */ @Mod.EventHandler public synchronized void onLoadComplete(FMLLoadCompleteEvent fmlLoadCompleteEvent) @@ -184,9 +165,8 @@ public synchronized void onLoadComplete(FMLLoadCompleteEvent fmlLoadCompleteEven } /** - * Server load action - * - * @param fmlServerStartingEvent Server starting event + * + * @param fmlServerStartingEvent */ @Mod.EventHandler public synchronized void serverLoad(FMLServerStartingEvent fmlServerStartingEvent) @@ -195,9 +175,8 @@ public synchronized void serverLoad(FMLServerStartingEvent fmlServerStartingEven } /** - * Server stopped action - * - * @param fmlServerStoppedEvent Server stopped action + * + * @param fmlServerStoppedEvent */ @Mod.EventHandler public synchronized void serverStopped(FMLServerStoppedEvent fmlServerStoppedEvent) diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ProjectStructure.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/DynamicSpawnControlStructure.java similarity index 97% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ProjectStructure.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/DynamicSpawnControlStructure.java index 5add674..16330cf 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ProjectStructure.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/DynamicSpawnControlStructure.java @@ -3,7 +3,7 @@ /** * */ -public final class ProjectStructure +public final class DynamicSpawnControlStructure { /** * diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/OnEventDummy.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/OnEventDummy.java new file mode 100644 index 0000000..67c92fa --- /dev/null +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/OnEventDummy.java @@ -0,0 +1,51 @@ +package org.imesense.dynamicspawncontrol; + +import net.minecraftforge.fml.common.Mod; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.api.IDebug; +import org.imesense.dynamicspawncontrol.core.logfile.Log; + +/** + * + */ +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) +public final class OnEventDummy implements IDebug +{ + /** + * + */ + private static boolean instanceExists = false; + + /** + * + */ + public OnEventDummy() + { + CodeGeneric.printInitClassToLog(this.getClass()); + + if (instanceExists) + { + Log.writeDataToLogFile(2, String.format("An instance of [%s] already exists!", this.getClass().getSimpleName())); + throw new RuntimeException(); + } + + instanceExists = true; + } + + //@SubscribeEvent + //public static void onFogDensity(EntityViewRenderEvent.FogDensity event) { + // Задание плотности тумана + // event.setDensity(0.05f); // Чем больше значение, тем плотнее туман + // GlStateManager.setFog(GlStateManager.FogMode.EXP); + // event.setCanceled(true); // Обязательно отменяем стандартное поведение, чтобы применился наш туман + // } + + //@SubscribeEvent + // public static void onFogColors(EntityViewRenderEvent.FogColors event) { + // Установка красного цвета для тумана + // event.setRed(0.7f); // Красный оттенок + // event.setGreen(0.2f); // Зеленый оттенок + // event.setBlue(0.2f); // Синий оттенок + // } +} diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/zombie/event/OnBreakTorchEvent.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/zombie/event/OnBreakTorchEvent.java index 4603e1c..abb4d13 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/zombie/event/OnBreakTorchEvent.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/ai/zombie/event/OnBreakTorchEvent.java @@ -4,14 +4,14 @@ import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; import org.imesense.dynamicspawncontrol.ai.zombie.entityaibase.BreakTorchTask; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnBreakTorchEvent { /** @@ -19,7 +19,7 @@ public final class OnBreakTorchEvent */ public OnBreakTorchEvent() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminDumpBlock.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminDumpBlock.java similarity index 93% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminDumpBlock.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminDumpBlock.java index ae01a8b..b9ec24e 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminDumpBlock.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminDumpBlock.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.gameplay.command; +package org.imesense.dynamicspawncontrol.command; import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; @@ -13,8 +13,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.customlibrary.RayTrace; import javax.annotation.Nonnull; @@ -30,7 +30,7 @@ public final class CmdAdminDumpBlock extends CommandBase */ public CmdAdminDumpBlock() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminDumpEntity.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminDumpEntity.java similarity index 86% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminDumpEntity.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminDumpEntity.java index a075061..cf41d71 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminDumpEntity.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminDumpEntity.java @@ -1,6 +1,5 @@ -package org.imesense.dynamicspawncontrol.gameplay.command; +package org.imesense.dynamicspawncontrol.command; -import net.minecraft.client.Minecraft; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.Entity; @@ -9,9 +8,9 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; -import org.imesense.dynamicspawncontrol.UniqueField; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.core.field.UniqueField; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import javax.annotation.Nonnull; @@ -25,7 +24,7 @@ public final class CmdAdminDumpEntity extends CommandBase */ public CmdAdminDumpEntity() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminDumpItem.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminDumpItem.java similarity index 96% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminDumpItem.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminDumpItem.java index c282809..71585be 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminDumpItem.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminDumpItem.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.gameplay.command; +package org.imesense.dynamicspawncontrol.command; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; @@ -14,8 +14,8 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.util.Constants; import org.apache.commons.lang3.StringUtils; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import javax.annotation.Nonnull; import java.util.Objects; @@ -30,7 +30,7 @@ public final class CmdAdminDumpItem extends CommandBase */ public CmdAdminDumpItem() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminGameMode.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminGameMode.java similarity index 89% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminGameMode.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminGameMode.java index ef63e1d..80326d9 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminGameMode.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminGameMode.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.gameplay.command; +package org.imesense.dynamicspawncontrol.command; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; @@ -6,10 +6,10 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.GameType; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumTextColor; import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumUnicodeCharacter; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import javax.annotation.Nonnull; @@ -23,7 +23,7 @@ public final class CmdAdminGameMode extends CommandBase */ public CmdAdminGameMode() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminGetWorldMoonPhase.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminGetWorldMoonPhase.java similarity index 91% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminGetWorldMoonPhase.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminGetWorldMoonPhase.java index 9804b05..1462caf 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminGetWorldMoonPhase.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminGetWorldMoonPhase.java @@ -1,11 +1,11 @@ -package org.imesense.dynamicspawncontrol.gameplay.command; +package org.imesense.dynamicspawncontrol.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.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumCmdCallType; import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumTextColor; import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumUnicodeCharacter; @@ -22,7 +22,7 @@ public final class CmdAdminGetWorldMoonPhase extends CommandBase */ public CmdAdminGetWorldMoonPhase() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminLaunchFireball.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminLaunchFireball.java similarity index 93% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminLaunchFireball.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminLaunchFireball.java index f251212..80e6b1b 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminLaunchFireball.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminLaunchFireball.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.gameplay.command; +package org.imesense.dynamicspawncontrol.command; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; @@ -6,7 +6,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; import org.imesense.dynamicspawncontrol.gameplay.item.DSCFireball; import javax.annotation.Nonnull; @@ -21,7 +21,7 @@ public final class CmdAdminLaunchFireball extends CommandBase */ public CmdAdminLaunchFireball() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminScanEntities.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminScanEntities.java similarity index 93% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminScanEntities.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminScanEntities.java index 198a94e..4676102 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminScanEntities.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminScanEntities.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.gameplay.command; +package org.imesense.dynamicspawncontrol.command; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; @@ -8,8 +8,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.*; +import org.imesense.dynamicspawncontrol.core.logfile.Log; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumCmdCallType; import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumTextColor; import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumUnicodeCharacter; @@ -28,7 +28,7 @@ public final class CmdAdminScanEntities extends CommandBase */ public CmdAdminScanEntities() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminSwitchVanish.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminSwitchVanish.java similarity index 93% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminSwitchVanish.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminSwitchVanish.java index 2a20192..8f66ae2 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminSwitchVanish.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdAdminSwitchVanish.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.gameplay.command; +package org.imesense.dynamicspawncontrol.command; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; @@ -7,7 +7,7 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.TextComponentString; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; import javax.annotation.Nonnull; import java.util.Objects; @@ -22,7 +22,7 @@ public final class CmdAdminSwitchVanish extends CommandBase */ public CmdAdminSwitchVanish() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdServerJsonScriptReload.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdServerJsonScriptReload.java similarity index 92% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdServerJsonScriptReload.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdServerJsonScriptReload.java index 4df4e75..8b696a1 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdServerJsonScriptReload.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdServerJsonScriptReload.java @@ -1,10 +1,10 @@ -package org.imesense.dynamicspawncontrol.gameplay.command; +package org.imesense.dynamicspawncontrol.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.core.util.CodeGeneric; import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumCmdCallType; import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumTextColor; import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumUnicodeCharacter; @@ -22,7 +22,7 @@ public final class CmdServerJsonScriptReload extends CommandBase */ public CmdServerJsonScriptReload() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdServerMobsKiller.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdServerMobsKiller.java similarity index 96% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdServerMobsKiller.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdServerMobsKiller.java index 128c5a1..9f925df 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdServerMobsKiller.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdServerMobsKiller.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.gameplay.command; +package org.imesense.dynamicspawncontrol.command; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; @@ -11,7 +11,7 @@ import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.WorldServer; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; import javax.annotation.Nonnull; import java.util.ArrayList; @@ -27,7 +27,7 @@ public final class CmdServerMobsKiller extends CommandBase */ public CmdServerMobsKiller() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.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/command/CmdServerSingleScriptReload.java similarity index 92% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdServerSingleScriptReload.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/command/CmdServerSingleScriptReload.java index 7da9f42..46b6041 100644 --- 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/command/CmdServerSingleScriptReload.java @@ -1,10 +1,10 @@ -package org.imesense.dynamicspawncontrol.gameplay.command; +package org.imesense.dynamicspawncontrol.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.core.util.CodeGeneric; import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumCmdCallType; import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumTextColor; import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumUnicodeCharacter; @@ -22,7 +22,7 @@ public final class CmdServerSingleScriptReload extends CommandBase */ public CmdServerSingleScriptReload() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/blockgenerator/DataBlockWorldGenerator.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/data/BlockWorldGeneratorData.java similarity index 81% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/blockgenerator/DataBlockWorldGenerator.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/data/BlockWorldGeneratorData.java index c90bc20..f7df62a 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/blockgenerator/DataBlockWorldGenerator.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/data/BlockWorldGeneratorData.java @@ -1,16 +1,16 @@ -package org.imesense.dynamicspawncontrol.technical.config.blockgenerator; +package org.imesense.dynamicspawncontrol.config.data; import javax.annotation.Nonnull; /** * */ -public final class DataBlockWorldGenerator +public final class BlockWorldGeneratorData { /** * */ - public static final class InfoDataBlockNetherRack extends ConfigDataBlock + public static final class InfoDataBlockNetherRack extends BlockWorldGeneratorDataAbstract { /** * @@ -30,7 +30,7 @@ public InfoDataBlockNetherRack(@Nonnull final String CATEGORY) /** * */ - public static final class InfoDataBlockMossyCobblestone extends ConfigDataBlock + public static final class InfoDataBlockMossyCobblestone extends BlockWorldGeneratorDataAbstract { /** * @@ -50,7 +50,7 @@ public InfoDataBlockMossyCobblestone(@Nonnull final String CATEGORY) /** * */ - public static final class InfoDataBlockBlockMonsterEgg extends ConfigDataBlock + public static final class InfoDataBlockBlockMonsterEgg extends BlockWorldGeneratorDataAbstract { /** * 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/config/data/BlockWorldGeneratorDataAbstract.java similarity index 74% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/blockgenerator/ConfigDataBlock.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/data/BlockWorldGeneratorDataAbstract.java index 6d38c79..ea7f726 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/config/data/BlockWorldGeneratorDataAbstract.java @@ -1,13 +1,13 @@ -package org.imesense.dynamicspawncontrol.technical.config.blockgenerator; +package org.imesense.dynamicspawncontrol.config.data; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Getter; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Setter; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.annotation.Getter; +import org.imesense.dynamicspawncontrol.core.annotation.Setter; /** * */ -public abstract class ConfigDataBlock +public abstract class BlockWorldGeneratorDataAbstract { /** * @@ -36,14 +36,14 @@ public abstract class ConfigDataBlock * @param minHeight * @param maxHeight */ - public ConfigDataBlock(String category, Integer chanceSpawn, Integer minHeight, Integer maxHeight) + public BlockWorldGeneratorDataAbstract(String category, Integer chanceSpawn, Integer minHeight, Integer maxHeight) { this.CATEGORY = category; this.chanceSpawn = chanceSpawn; this.minHeight = minHeight; this.maxHeight = maxHeight; - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/data/CacheWorldGameData.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/data/CacheWorldGameData.java new file mode 100644 index 0000000..2199810 --- /dev/null +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/data/CacheWorldGameData.java @@ -0,0 +1,9 @@ +package org.imesense.dynamicspawncontrol.config.data; + +/** + * + */ +public final class CacheWorldGameData +{ + +} 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/config/data/GameDebuggerData.java similarity index 87% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/gamedebugger/DataGameDebugger.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/data/GameDebuggerData.java index 0136c70..393d680 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/config/data/GameDebuggerData.java @@ -1,8 +1,8 @@ -package org.imesense.dynamicspawncontrol.technical.config.gamedebugger; +package org.imesense.dynamicspawncontrol.config.data; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Getter; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Setter; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.annotation.Getter; +import org.imesense.dynamicspawncontrol.core.annotation.Setter; import javax.annotation.Nonnull; import java.util.HashMap; @@ -11,7 +11,7 @@ /** * */ -public final class DataGameDebugger +public final class GameDebuggerData { /** * @@ -39,7 +39,7 @@ public static final class ConfigDataMonitor */ public ConfigDataMonitor(@Nonnull final String CATEGORY) { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); this.CATEGORY = CATEGORY; } @@ -101,7 +101,7 @@ public static final class ConfigDataEvent */ public ConfigDataEvent(@Nonnull final String CATEGORY) { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); this.CATEGORY = CATEGORY; 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/config/data/LogFileData.java similarity index 70% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/logfile/DataLogFile.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/data/LogFileData.java index 2cd4ace..bfed80c 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/config/data/LogFileData.java @@ -1,15 +1,15 @@ -package org.imesense.dynamicspawncontrol.technical.config.logfile; +package org.imesense.dynamicspawncontrol.config.data; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Getter; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Setter; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.annotation.Getter; +import org.imesense.dynamicspawncontrol.core.annotation.Setter; import javax.annotation.Nonnull; /** * */ -public final class DataLogFile +public final class LogFileData { /** * @@ -29,7 +29,7 @@ public static final class ConfigDataLogFile /** * */ - private Short logMaxLines = 32767; + private Short logMaxLines = Short.MAX_VALUE; /** * @@ -37,7 +37,7 @@ public static final class ConfigDataLogFile */ public ConfigDataLogFile(@Nonnull final String CATEGORY) { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.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/config/data/PlayerAConfig.java similarity index 72% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/player/CfgPlayer.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/data/PlayerAConfig.java index a86a358..8817809 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/config/data/PlayerAConfig.java @@ -1,10 +1,11 @@ -package org.imesense.dynamicspawncontrol.technical.config.player; +package org.imesense.dynamicspawncontrol.config.data; import com.google.gson.*; -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.inlineannotation.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.config.file.PlayerData; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.api.AConfig; +import org.imesense.dynamicspawncontrol.core.logfile.Log; +import org.imesense.dynamicspawncontrol.core.annotation.ConceptConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -17,21 +18,21 @@ /** * */ -@DCSSingleConfig(fileName = "cfg_player") -public final class CfgPlayer extends CfgClassAbstract +@ConceptConfig(fileName = "cfg_player") +public final class PlayerAConfig extends AConfig { /** * * @param nameConfigFile */ - public CfgPlayer(String nameConfigFile) + public PlayerAConfig(String nameConfigFile) { super(nameConfigFile, Boolean.TRUE); - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); - DataPlayer.ConfigDataPlayer.Instance = - new DataPlayer.ConfigDataPlayer("player"); + PlayerData.ConfigDataPlayer.Instance = + new PlayerData.ConfigDataPlayer("player"); if (Files.exists(Paths.get(this.nameConfig))) { @@ -67,9 +68,9 @@ public void saveToFile() JsonObject jsonObjectPlayer = new JsonObject(); jsonObjectPlayer.addProperty("protected_respawn_player_radius", - DataPlayer.ConfigDataPlayer.Instance.getProtectRespawnPlayerRadius()); + PlayerData.ConfigDataPlayer.Instance.getProtectRespawnPlayerRadius()); - recordObject.add(DataPlayer.ConfigDataPlayer.Instance.getCategoryObject(), jsonObjectPlayer); + recordObject.add(PlayerData.ConfigDataPlayer.Instance.getCategoryObject(), jsonObjectPlayer); Gson gson = new GsonBuilder().setPrettyPrinting().create(); @@ -94,14 +95,14 @@ public void loadFromFile() JsonElement fileReaderJsonElement = new JsonParser().parse(fileReader); JsonObject readableObject = fileReaderJsonElement.getAsJsonObject(); - if (readableObject.has(DataPlayer.ConfigDataPlayer.Instance.getCategoryObject())) + if (readableObject.has(PlayerData.ConfigDataPlayer.Instance.getCategoryObject())) { JsonObject jsonObjectPlayer = - readableObject.getAsJsonObject(DataPlayer.ConfigDataPlayer.Instance.getCategoryObject()); + readableObject.getAsJsonObject(PlayerData.ConfigDataPlayer.Instance.getCategoryObject()); if (jsonObjectPlayer.has("protected_respawn_player_radius")) { - DataPlayer.ConfigDataPlayer.Instance. + PlayerData.ConfigDataPlayer.Instance. setProtectRespawnPlayerRadius(jsonObjectPlayer.get("protected_respawn_player_radius").getAsShort()); } } 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/config/data/SkeletonDropItemData.java similarity index 89% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/skeletondropitem/DataSkeletonDropItem.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/data/SkeletonDropItemData.java index dd9d090..42b7f72 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/config/data/SkeletonDropItemData.java @@ -1,8 +1,8 @@ -package org.imesense.dynamicspawncontrol.technical.config.skeletondropitem; +package org.imesense.dynamicspawncontrol.config.data; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Getter; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Setter; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.annotation.Getter; +import org.imesense.dynamicspawncontrol.core.annotation.Setter; import javax.annotation.Nonnull; import java.util.Random; @@ -10,7 +10,7 @@ /** * */ -public final class DataSkeletonDropItem +public final class SkeletonDropItemData { /** * @@ -25,7 +25,7 @@ public static final class ConfigDataSkeletonDrop /** * */ - public static DataSkeletonDropItem.ConfigDataSkeletonDrop Instance; + public static SkeletonDropItemData.ConfigDataSkeletonDrop Instance; /** * @@ -73,7 +73,7 @@ public static final class ConfigDataSkeletonDrop */ public ConfigDataSkeletonDrop(@Nonnull final String CATEGORY) { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); this.CATEGORY = CATEGORY; } 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/config/data/WindowTitleData.java similarity index 62% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/windowtitle/DataWindowTitle.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/data/WindowTitleData.java index 578813e..2704522 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/config/data/WindowTitleData.java @@ -1,18 +1,16 @@ -package org.imesense.dynamicspawncontrol.technical.config.windowtitle; +package org.imesense.dynamicspawncontrol.config.data; -import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Getter; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Setter; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.annotation.Getter; +import org.imesense.dynamicspawncontrol.core.annotation.Setter; import javax.annotation.Nonnull; -import java.lang.reflect.Method; /** * */ -public final class DataWindowTitle +public final class WindowTitleData { /** * @@ -34,7 +32,7 @@ public static final class ConfigDataWindowTitle */ private String windowTitle = String.format("Minecraft: %s + %s", - ProjectStructure.STRUCT_INFO_MOD.VERSION, ProjectStructure.STRUCT_INFO_MOD.NAME); + DynamicSpawnControlStructure.STRUCT_INFO_MOD.VERSION, DynamicSpawnControlStructure.STRUCT_INFO_MOD.NAME); /** * @@ -42,7 +40,7 @@ public static final class ConfigDataWindowTitle */ public ConfigDataWindowTitle(@Nonnull final String CATEGORY) { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); this.CATEGORY = CATEGORY; } 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/config/data/ZombieDropItemData.java similarity index 90% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/zombiedropitem/DataZombieDropItem.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/data/ZombieDropItemData.java index 2212452..af36b6f 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/config/data/ZombieDropItemData.java @@ -1,15 +1,15 @@ -package org.imesense.dynamicspawncontrol.technical.config.zombiedropitem; +package org.imesense.dynamicspawncontrol.config.data; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Getter; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Setter; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.annotation.Getter; +import org.imesense.dynamicspawncontrol.core.annotation.Setter; import javax.annotation.Nonnull; /** * */ -public final class DataZombieDropItem +public final class ZombieDropItemData { /** * @@ -67,7 +67,7 @@ public static final class ConfigDataZombieDrop */ public ConfigDataZombieDrop(@Nonnull final String CATEGORY) { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); this.CATEGORY = CATEGORY; } 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/config/file/BlockWorldGeneratorAConfig.java similarity index 64% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/blockgenerator/CfgBlockWorldGenerator.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/file/BlockWorldGeneratorAConfig.java index 98cae93..4ef9ea4 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/config/file/BlockWorldGeneratorAConfig.java @@ -1,10 +1,12 @@ -package org.imesense.dynamicspawncontrol.technical.config.blockgenerator; +package org.imesense.dynamicspawncontrol.config.file; import com.google.gson.*; -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.inlineannotation.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.config.data.BlockWorldGeneratorDataAbstract; +import org.imesense.dynamicspawncontrol.config.data.BlockWorldGeneratorData; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.api.AConfig; +import org.imesense.dynamicspawncontrol.core.logfile.Log; +import org.imesense.dynamicspawncontrol.core.annotation.ConceptConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -17,27 +19,27 @@ /** * */ -@DCSSingleConfig(fileName = "cfg_block_world_generator") -public final class CfgBlockWorldGenerator extends CfgClassAbstract +@ConceptConfig(fileName = "cfg_block_world_generator") +public final class BlockWorldGeneratorAConfig extends AConfig { /** * * @param nameConfigFile */ - public CfgBlockWorldGenerator(String nameConfigFile) + public BlockWorldGeneratorAConfig(String nameConfigFile) { super(nameConfigFile, Boolean.TRUE); - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); - DataBlockWorldGenerator.InfoDataBlockNetherRack.Instance = - new DataBlockWorldGenerator.InfoDataBlockNetherRack("settings_block_nether_rack"); + BlockWorldGeneratorData.InfoDataBlockNetherRack.Instance = + new BlockWorldGeneratorData.InfoDataBlockNetherRack("settings_block_nether_rack"); - DataBlockWorldGenerator.InfoDataBlockMossyCobblestone.Instance = - new DataBlockWorldGenerator.InfoDataBlockMossyCobblestone("settings_block_mossy_cobblestone"); + BlockWorldGeneratorData.InfoDataBlockMossyCobblestone.Instance = + new BlockWorldGeneratorData.InfoDataBlockMossyCobblestone("settings_block_mossy_cobblestone"); - DataBlockWorldGenerator.InfoDataBlockBlockMonsterEgg.Instance = - new DataBlockWorldGenerator.InfoDataBlockBlockMonsterEgg("settings_block_monster_egg"); + BlockWorldGeneratorData.InfoDataBlockBlockMonsterEgg.Instance = + new BlockWorldGeneratorData.InfoDataBlockBlockMonsterEgg("settings_block_monster_egg"); if (Files.exists(Paths.get(this.nameConfig))) { @@ -55,7 +57,7 @@ public CfgBlockWorldGenerator(String nameConfigFile) * @param blockName * @param block */ - public void saveBlockSettings(JsonObject jsonObject, String blockName, ConfigDataBlock block) + public void saveBlockSettings(JsonObject jsonObject, String blockName, BlockWorldGeneratorDataAbstract block) { JsonObject jsonObjectBlockInfo = new JsonObject(); @@ -72,7 +74,7 @@ public void saveBlockSettings(JsonObject jsonObject, String blockName, ConfigDat * @param blockName * @param block */ - public void loadBlockSettings(JsonObject jsonObject, String blockName, ConfigDataBlock block) + public void loadBlockSettings(JsonObject jsonObject, String blockName, BlockWorldGeneratorDataAbstract block) { if (jsonObject.has(blockName)) { @@ -121,14 +123,14 @@ public void saveToFile() JsonObject recordObject = new JsonObject(); - saveBlockSettings(recordObject, DataBlockWorldGenerator.InfoDataBlockNetherRack.Instance.getCategoryObject(), - DataBlockWorldGenerator.InfoDataBlockNetherRack.Instance); + saveBlockSettings(recordObject, BlockWorldGeneratorData.InfoDataBlockNetherRack.Instance.getCategoryObject(), + BlockWorldGeneratorData.InfoDataBlockNetherRack.Instance); - saveBlockSettings(recordObject, DataBlockWorldGenerator.InfoDataBlockNetherRack.Instance.getCategoryObject(), - DataBlockWorldGenerator.InfoDataBlockMossyCobblestone.Instance); + saveBlockSettings(recordObject, BlockWorldGeneratorData.InfoDataBlockNetherRack.Instance.getCategoryObject(), + BlockWorldGeneratorData.InfoDataBlockMossyCobblestone.Instance); - saveBlockSettings(recordObject, DataBlockWorldGenerator.InfoDataBlockNetherRack.Instance.getCategoryObject(), - DataBlockWorldGenerator.InfoDataBlockBlockMonsterEgg.Instance); + saveBlockSettings(recordObject, BlockWorldGeneratorData.InfoDataBlockNetherRack.Instance.getCategoryObject(), + BlockWorldGeneratorData.InfoDataBlockBlockMonsterEgg.Instance); Gson gson = new GsonBuilder().setPrettyPrinting().create(); @@ -153,14 +155,14 @@ public void loadFromFile() JsonElement fileReaderJsonElement = new JsonParser().parse(fileReader); JsonObject readableObject = fileReaderJsonElement.getAsJsonObject(); - loadBlockSettings(readableObject, DataBlockWorldGenerator.InfoDataBlockNetherRack.Instance.getCategoryObject(), - DataBlockWorldGenerator.InfoDataBlockNetherRack.Instance); + loadBlockSettings(readableObject, BlockWorldGeneratorData.InfoDataBlockNetherRack.Instance.getCategoryObject(), + BlockWorldGeneratorData.InfoDataBlockNetherRack.Instance); - loadBlockSettings(readableObject, DataBlockWorldGenerator.InfoDataBlockNetherRack.Instance.getCategoryObject(), - DataBlockWorldGenerator.InfoDataBlockMossyCobblestone.Instance); + loadBlockSettings(readableObject, BlockWorldGeneratorData.InfoDataBlockNetherRack.Instance.getCategoryObject(), + BlockWorldGeneratorData.InfoDataBlockMossyCobblestone.Instance); - loadBlockSettings(readableObject, DataBlockWorldGenerator.InfoDataBlockNetherRack.Instance.getCategoryObject(), - DataBlockWorldGenerator.InfoDataBlockBlockMonsterEgg.Instance); + loadBlockSettings(readableObject, BlockWorldGeneratorData.InfoDataBlockNetherRack.Instance.getCategoryObject(), + BlockWorldGeneratorData.InfoDataBlockBlockMonsterEgg.Instance); } catch (FileNotFoundException exception) { 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/config/file/CacheWorldGameAConfig.java similarity index 76% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/cachedameworld/CfgCacheWorldGame.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/file/CacheWorldGameAConfig.java index d3c2c82..422e147 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/config/file/CacheWorldGameAConfig.java @@ -1,10 +1,10 @@ -package org.imesense.dynamicspawncontrol.technical.config.cachedameworld; +package org.imesense.dynamicspawncontrol.config.file; import com.google.gson.*; -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.inlineannotation.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.api.AConfig; +import org.imesense.dynamicspawncontrol.core.logfile.Log; +import org.imesense.dynamicspawncontrol.core.annotation.ConceptConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -17,18 +17,18 @@ /** * */ -@DCSSingleConfig(fileName = "cfg_cache_world_game") -public final class CfgCacheWorldGame extends CfgClassAbstract +@ConceptConfig(fileName = "cfg_cache_world_game") +public final class CacheWorldGameAConfig extends AConfig { /** * * @param nameConfigFile */ - public CfgCacheWorldGame(String nameConfigFile) + public CacheWorldGameAConfig(String nameConfigFile) { super(nameConfigFile, Boolean.TRUE); - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.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/config/file/GameDebuggerAConfig.java similarity index 68% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/gamedebugger/CfgGameDebugger.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/file/GameDebuggerAConfig.java index 7e78b1d..9ac3dfd 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/config/file/GameDebuggerAConfig.java @@ -1,10 +1,11 @@ -package org.imesense.dynamicspawncontrol.technical.config.gamedebugger; +package org.imesense.dynamicspawncontrol.config.file; import com.google.gson.*; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.config.CfgClassAbstract; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.DCSSingleConfig; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.config.data.GameDebuggerData; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.api.AConfig; +import org.imesense.dynamicspawncontrol.core.annotation.ConceptConfig; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import java.io.*; import java.nio.file.Files; @@ -15,24 +16,24 @@ /** * */ -@DCSSingleConfig(fileName = "cfg_game_debugger") -public final class CfgGameDebugger extends CfgClassAbstract +@ConceptConfig(fileName = "cfg_game_debugger") +public final class GameDebuggerAConfig extends AConfig { /** * * @param nameConfigFile */ - public CfgGameDebugger(String nameConfigFile) + public GameDebuggerAConfig(String nameConfigFile) { super(nameConfigFile, Boolean.TRUE); - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); - DataGameDebugger.ConfigDataMonitor.Instance = - new DataGameDebugger.ConfigDataMonitor("monitor"); + GameDebuggerData.ConfigDataMonitor.Instance = + new GameDebuggerData.ConfigDataMonitor("monitor"); - DataGameDebugger.ConfigDataEvent.Instance = - new DataGameDebugger.ConfigDataEvent("event"); + GameDebuggerData.ConfigDataEvent.Instance = + new GameDebuggerData.ConfigDataEvent("event"); if (Files.exists(Paths.get(this.nameConfig))) { @@ -55,20 +56,20 @@ private static JsonObject getJsonObject() JsonObject jsonObjectMonitor = new JsonObject(); jsonObjectMonitor.addProperty("debug_monitor_cache", - DataGameDebugger.ConfigDataMonitor.Instance.getDebugMonitorCache()); + GameDebuggerData.ConfigDataMonitor.Instance.getDebugMonitorCache()); - recordObject.add(DataGameDebugger.ConfigDataEvent.Instance. + recordObject.add(GameDebuggerData.ConfigDataEvent.Instance. getCategoryObject(), jsonObjectMonitor); Map mapDebugSettings = - DataGameDebugger.ConfigDataEvent.Instance.getDebugSettings(); + GameDebuggerData.ConfigDataEvent.Instance.getDebugSettings(); for (Map.Entry entry : mapDebugSettings.entrySet()) { jsonObjectEvent.addProperty(entry.getKey(), entry.getValue()); } - recordObject.add(DataGameDebugger.ConfigDataEvent.Instance. + recordObject.add(GameDebuggerData.ConfigDataEvent.Instance. getCategoryObject(), jsonObjectEvent); return recordObject; @@ -119,22 +120,22 @@ public void loadFromFile() JsonElement fileReaderJsonElement = new JsonParser().parse(fileReader); JsonObject readableObject = fileReaderJsonElement.getAsJsonObject(); - if (readableObject.has(DataGameDebugger.ConfigDataMonitor.Instance.getCategoryObject())) + if (readableObject.has(GameDebuggerData.ConfigDataMonitor.Instance.getCategoryObject())) { JsonObject jsonObjectMonitor = - readableObject.getAsJsonObject(DataGameDebugger.ConfigDataMonitor.Instance.getCategoryObject()); + readableObject.getAsJsonObject(GameDebuggerData.ConfigDataMonitor.Instance.getCategoryObject()); - DataGameDebugger.ConfigDataMonitor.Instance.setDebugMonitorCache(jsonObjectMonitor.get("debug_monitor_cache").getAsBoolean()); + GameDebuggerData.ConfigDataMonitor.Instance.setDebugMonitorCache(jsonObjectMonitor.get("debug_monitor_cache").getAsBoolean()); } - if (readableObject.has(DataGameDebugger.ConfigDataEvent.Instance.getCategoryObject())) + if (readableObject.has(GameDebuggerData.ConfigDataEvent.Instance.getCategoryObject())) { JsonObject jsonObjectEvent = - readableObject.getAsJsonObject(DataGameDebugger.ConfigDataEvent.Instance. + readableObject.getAsJsonObject(GameDebuggerData.ConfigDataEvent.Instance. getCategoryObject()); Map debugSettings = - DataGameDebugger.ConfigDataEvent.Instance.getDebugSettings(); + GameDebuggerData.ConfigDataEvent.Instance.getDebugSettings(); for (Map.Entry entry : debugSettings.entrySet()) { 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/config/file/LogFileAConfig.java similarity index 63% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/logfile/CfgLogFile.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/file/LogFileAConfig.java index 0d0e418..b6a4c39 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/config/file/LogFileAConfig.java @@ -1,11 +1,11 @@ -package org.imesense.dynamicspawncontrol.technical.config.logfile; +package org.imesense.dynamicspawncontrol.config.file; import com.google.gson.*; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.config.CfgClassAbstract; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.api.AConfig; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.core.logfile.Log; +import org.imesense.dynamicspawncontrol.core.annotation.ConceptConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -18,21 +18,21 @@ /** * */ -@DCSSingleConfig(fileName = "cfg_log_file") -public final class CfgLogFile extends CfgClassAbstract +@ConceptConfig(fileName = "cfg_log_file") +public final class LogFileAConfig extends AConfig { /** * * @param nameConfigFile */ - public CfgLogFile(String nameConfigFile) + public LogFileAConfig(String nameConfigFile) { super(nameConfigFile, Boolean.TRUE); - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); - DataLogFile.ConfigDataLogFile.Instance = - new DataLogFile.ConfigDataLogFile("log_file"); + org.imesense.dynamicspawncontrol.config.data.LogFileData.ConfigDataLogFile.Instance = + new org.imesense.dynamicspawncontrol.config.data.LogFileData.ConfigDataLogFile("log_file"); if (Files.exists(Paths.get(this.nameConfig))) { @@ -68,9 +68,9 @@ public void saveToFile() JsonObject jsonObjectLogFile = new JsonObject(); jsonObjectLogFile.addProperty("max_lines", - DataLogFile.ConfigDataLogFile.Instance.getLogMaxLines()); + org.imesense.dynamicspawncontrol.config.data.LogFileData.ConfigDataLogFile.Instance.getLogMaxLines()); - recordObject.add(DataLogFile.ConfigDataLogFile.Instance.getCategoryObject(), jsonObjectLogFile); + recordObject.add(org.imesense.dynamicspawncontrol.config.data.LogFileData.ConfigDataLogFile.Instance.getCategoryObject(), jsonObjectLogFile); Gson gson = new GsonBuilder().setPrettyPrinting().create(); @@ -95,21 +95,21 @@ public void loadFromFile() JsonElement fileReaderJsonElement = new JsonParser().parse(fileReader); JsonObject readableObject = fileReaderJsonElement.getAsJsonObject(); - if (readableObject.has(DataLogFile.ConfigDataLogFile.Instance.getCategoryObject())) + if (readableObject.has(org.imesense.dynamicspawncontrol.config.data.LogFileData.ConfigDataLogFile.Instance.getCategoryObject())) { JsonObject jsonObjectLogFile = - readableObject.getAsJsonObject(DataLogFile.ConfigDataLogFile.Instance. + readableObject.getAsJsonObject(org.imesense.dynamicspawncontrol.config.data.LogFileData.ConfigDataLogFile.Instance. getCategoryObject()); if (jsonObjectLogFile.has("max_lines")) { - DataLogFile.ConfigDataLogFile.Instance. + org.imesense.dynamicspawncontrol.config.data.LogFileData.ConfigDataLogFile.Instance. setLogMaxLines(jsonObjectLogFile.get("max_lines").getAsShort()); } } else { - Log.writeDataToLogFile(2, "settings_block_nether_rack is missing in the config file."); + Log.writeDataToLogFile(2, "'log_file' is missing in the config file."); } } catch (FileNotFoundException exception) 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/config/file/PlayerData.java similarity index 74% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/player/DataPlayer.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/file/PlayerData.java index cbc1b70..f28abe1 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/config/file/PlayerData.java @@ -1,15 +1,15 @@ -package org.imesense.dynamicspawncontrol.technical.config.player; +package org.imesense.dynamicspawncontrol.config.file; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Getter; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Setter; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.annotation.Getter; +import org.imesense.dynamicspawncontrol.core.annotation.Setter; import javax.annotation.Nonnull; /** * */ -public final class DataPlayer +public final class PlayerData { /** * @@ -37,7 +37,7 @@ public static final class ConfigDataPlayer */ public ConfigDataPlayer(@Nonnull final String CATEGORY) { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.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/config/file/SkeletonDropItemAConfig.java similarity index 71% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/skeletondropitem/CfgSkeletonDropItem.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/file/SkeletonDropItemAConfig.java index 52acaec..7092f32 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/config/file/SkeletonDropItemAConfig.java @@ -1,10 +1,11 @@ -package org.imesense.dynamicspawncontrol.technical.config.skeletondropitem; +package org.imesense.dynamicspawncontrol.config.file; import com.google.gson.*; -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.inlineannotation.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.config.data.SkeletonDropItemData; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.api.AConfig; +import org.imesense.dynamicspawncontrol.core.logfile.Log; +import org.imesense.dynamicspawncontrol.core.annotation.ConceptConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -17,21 +18,21 @@ /** * */ -@DCSSingleConfig(fileName = "cfg_skeleton_drop_item") -public final class CfgSkeletonDropItem extends CfgClassAbstract +@ConceptConfig(fileName = "cfg_skeleton_drop_item") +public final class SkeletonDropItemAConfig extends AConfig { /** * * @param nameConfigFile */ - public CfgSkeletonDropItem(String nameConfigFile) + public SkeletonDropItemAConfig(String nameConfigFile) { super(nameConfigFile, Boolean.TRUE); - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance = - new DataSkeletonDropItem.ConfigDataSkeletonDrop("skeleton_drop"); + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance = + new SkeletonDropItemData.ConfigDataSkeletonDrop("skeleton_drop"); if (Files.exists(Paths.get(this.nameConfig))) { @@ -66,7 +67,7 @@ public void saveToFile() JsonObject recordObject = new JsonObject(); JsonObject jsonObjectSkeletonDrop = getJsonObject(); - recordObject.add(DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance. + recordObject.add(SkeletonDropItemData.ConfigDataSkeletonDrop.Instance. getCategoryObject(), jsonObjectSkeletonDrop); Gson gson = new GsonBuilder().setPrettyPrinting().create(); @@ -90,28 +91,28 @@ private static JsonObject getJsonObject() JsonObject recordObject = new JsonObject(); recordObject.addProperty("break_item", - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance.getBreakItem()); + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance.getBreakItem()); recordObject.addProperty("hand_item_damage_factor", - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance.getHandItemDamageFactor()); + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance.getHandItemDamageFactor()); recordObject.addProperty("head_damage_factor", - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance.getHeadDamageFactor()); + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance.getHeadDamageFactor()); recordObject.addProperty("chest_damage_factor", - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance.getChestDamageFactor()); + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance.getChestDamageFactor()); recordObject.addProperty("legs_damage_factor", - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance.getLegsDamageFactor()); + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance.getLegsDamageFactor()); recordObject.addProperty("feet_damage_factor", - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance.getFeetDamageFactor()); + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance.getFeetDamageFactor()); recordObject.addProperty("damage_spread_factor", - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance.getDamageSpreadFactor()); + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance.getDamageSpreadFactor()); recordObject.addProperty("arrows_to_drops", - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance.getArrowsToDrops()); + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance.getArrowsToDrops()); return recordObject; } @@ -127,56 +128,56 @@ public void loadFromFile() JsonElement fileReaderJsonElement = new JsonParser().parse(fileReader); JsonObject readableObject = fileReaderJsonElement.getAsJsonObject(); - if (readableObject.has(DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance.getCategoryObject())) + if (readableObject.has(SkeletonDropItemData.ConfigDataSkeletonDrop.Instance.getCategoryObject())) { JsonObject jsonObjectSkeletonDrop = - readableObject.getAsJsonObject(DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance.getCategoryObject()); + readableObject.getAsJsonObject(SkeletonDropItemData.ConfigDataSkeletonDrop.Instance.getCategoryObject()); if (jsonObjectSkeletonDrop.has("break_item")) { - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance. + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance. setBreakItem(jsonObjectSkeletonDrop.get("break_item").getAsFloat()); } if (jsonObjectSkeletonDrop.has("hand_item_damage_factor")) { - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance. + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance. setHandItemDamageFactor(jsonObjectSkeletonDrop.get("hand_item_damage_factor").getAsFloat()); } if (jsonObjectSkeletonDrop.has("head_damage_factor")) { - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance. + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance. setHeadDamageFactor(jsonObjectSkeletonDrop.get("head_damage_factor").getAsFloat()); } if (jsonObjectSkeletonDrop.has("chest_damage_factor")) { - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance. + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance. setChestDamageFactor(jsonObjectSkeletonDrop.get("chest_damage_factor").getAsFloat()); } if (jsonObjectSkeletonDrop.has("legs_damage_factor")) { - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance. + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance. setLegsDamageFactor(jsonObjectSkeletonDrop.get("legs_damage_factor").getAsFloat()); } if (jsonObjectSkeletonDrop.has("feet_damage_factor")) { - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance. + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance. setFeetDamageFactor(jsonObjectSkeletonDrop.get("feet_damage_factor").getAsFloat()); } if (jsonObjectSkeletonDrop.has("damage_spread_factor")) { - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance. + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance. setDamageSpreadFactor(jsonObjectSkeletonDrop.get("damage_spread_factor").getAsFloat()); } if (jsonObjectSkeletonDrop.has("arrows_to_drops")) { - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance. + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance. setArrowsToDrops(jsonObjectSkeletonDrop.get("arrows_to_drops").getAsByte()); } } 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/config/file/WindowTitleAConfig.java similarity index 72% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/windowtitle/CfgWindowTitle.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/file/WindowTitleAConfig.java index d3c2f48..11e3cc1 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/config/file/WindowTitleAConfig.java @@ -1,10 +1,11 @@ -package org.imesense.dynamicspawncontrol.technical.config.windowtitle; +package org.imesense.dynamicspawncontrol.config.file; import com.google.gson.*; -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.inlineannotation.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.config.data.WindowTitleData; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.api.AConfig; +import org.imesense.dynamicspawncontrol.core.logfile.Log; +import org.imesense.dynamicspawncontrol.core.annotation.ConceptConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -17,21 +18,21 @@ /** * */ -@DCSSingleConfig(fileName = "cfg_window_title") -public final class CfgWindowTitle extends CfgClassAbstract +@ConceptConfig(fileName = "cfg_window_title") +public final class WindowTitleAConfig extends AConfig { /** * * @param nameConfigFile */ - public CfgWindowTitle(String nameConfigFile) + public WindowTitleAConfig(String nameConfigFile) { super(nameConfigFile, Boolean.TRUE); - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); - DataWindowTitle.ConfigDataWindowTitle.Instance = - new DataWindowTitle.ConfigDataWindowTitle("window_title"); + WindowTitleData.ConfigDataWindowTitle.Instance = + new WindowTitleData.ConfigDataWindowTitle("window_title"); if (Files.exists(Paths.get(this.nameConfig))) { @@ -67,9 +68,9 @@ public void saveToFile() JsonObject jsonObjectWindowTitle = new JsonObject(); jsonObjectWindowTitle.addProperty("title", - DataWindowTitle.ConfigDataWindowTitle.Instance.getWindowTitle()); + WindowTitleData.ConfigDataWindowTitle.Instance.getWindowTitle()); - recordObject.add(DataWindowTitle.ConfigDataWindowTitle.Instance. + recordObject.add(WindowTitleData.ConfigDataWindowTitle.Instance. getCategoryObject(), jsonObjectWindowTitle); Gson gson = new GsonBuilder().setPrettyPrinting().create(); @@ -95,15 +96,15 @@ public void loadFromFile() JsonElement fileReaderJsonElement = new JsonParser().parse(fileReader); JsonObject readableObject = fileReaderJsonElement.getAsJsonObject(); - if (readableObject.has(DataWindowTitle.ConfigDataWindowTitle.Instance.getCategoryObject())) + if (readableObject.has(WindowTitleData.ConfigDataWindowTitle.Instance.getCategoryObject())) { JsonObject jsonObjectWindowTitle = - readableObject.getAsJsonObject(DataWindowTitle.ConfigDataWindowTitle. + readableObject.getAsJsonObject(WindowTitleData.ConfigDataWindowTitle. Instance.getCategoryObject()); if (jsonObjectWindowTitle.has("title")) { - DataWindowTitle.ConfigDataWindowTitle.Instance. + WindowTitleData.ConfigDataWindowTitle.Instance. setWindowTitle(jsonObjectWindowTitle.get("title").getAsString()); } } 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/config/file/ZombieDropItemAConfig.java similarity index 71% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/zombiedropitem/CfgZombieDropItem.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/file/ZombieDropItemAConfig.java index bc5e912..b39497c 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/config/file/ZombieDropItemAConfig.java @@ -1,10 +1,11 @@ -package org.imesense.dynamicspawncontrol.technical.config.zombiedropitem; +package org.imesense.dynamicspawncontrol.config.file; import com.google.gson.*; -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.inlineannotation.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.config.data.ZombieDropItemData; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.api.AConfig; +import org.imesense.dynamicspawncontrol.core.logfile.Log; +import org.imesense.dynamicspawncontrol.core.annotation.ConceptConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -17,21 +18,21 @@ /** * */ -@DCSSingleConfig(fileName = "cfg_zombie_drop_item") -public final class CfgZombieDropItem extends CfgClassAbstract +@ConceptConfig(fileName = "cfg_zombie_drop_item") +public final class ZombieDropItemAConfig extends AConfig { /** * * @param nameConfigFile */ - public CfgZombieDropItem(String nameConfigFile) + public ZombieDropItemAConfig(String nameConfigFile) { super(nameConfigFile, Boolean.TRUE); - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); - DataZombieDropItem.ConfigDataZombieDrop.Instance = - new DataZombieDropItem.ConfigDataZombieDrop("zombie_drop"); + ZombieDropItemData.ConfigDataZombieDrop.Instance = + new ZombieDropItemData.ConfigDataZombieDrop("zombie_drop"); if (Files.exists(Paths.get(this.nameConfig))) { @@ -66,7 +67,7 @@ public void saveToFile() JsonObject recordObject = new JsonObject(); JsonObject jsonObjectZombieDrop = getJsonObject(); - recordObject.add(DataZombieDropItem.ConfigDataZombieDrop.Instance. + recordObject.add(ZombieDropItemData.ConfigDataZombieDrop.Instance. getCategoryObject(), jsonObjectZombieDrop); Gson gson = new GsonBuilder().setPrettyPrinting().create(); @@ -90,25 +91,25 @@ private static JsonObject getJsonObject() JsonObject recordObject = new JsonObject(); recordObject.addProperty("break_item", - DataZombieDropItem.ConfigDataZombieDrop.Instance.getBreakItem()); + ZombieDropItemData.ConfigDataZombieDrop.Instance.getBreakItem()); recordObject.addProperty("hand_item_damage_factor", - DataZombieDropItem.ConfigDataZombieDrop.Instance.getHandItemDamageFactor()); + ZombieDropItemData.ConfigDataZombieDrop.Instance.getHandItemDamageFactor()); recordObject.addProperty("head_damage_factor", - DataZombieDropItem.ConfigDataZombieDrop.Instance.getHeadDamageFactor()); + ZombieDropItemData.ConfigDataZombieDrop.Instance.getHeadDamageFactor()); recordObject.addProperty("chest_damage_factor", - DataZombieDropItem.ConfigDataZombieDrop.Instance.getChestDamageFactor()); + ZombieDropItemData.ConfigDataZombieDrop.Instance.getChestDamageFactor()); recordObject.addProperty("legs_damage_factor", - DataZombieDropItem.ConfigDataZombieDrop.Instance.getLegsDamageFactor()); + ZombieDropItemData.ConfigDataZombieDrop.Instance.getLegsDamageFactor()); recordObject.addProperty("feet_damage_factor", - DataZombieDropItem.ConfigDataZombieDrop.Instance.getFeetDamageFactor()); + ZombieDropItemData.ConfigDataZombieDrop.Instance.getFeetDamageFactor()); recordObject.addProperty("damage_spread_factor", - DataZombieDropItem.ConfigDataZombieDrop.Instance.getDamageSpreadFactor()); + ZombieDropItemData.ConfigDataZombieDrop.Instance.getDamageSpreadFactor()); return recordObject; } @@ -124,50 +125,50 @@ public void loadFromFile() JsonElement fileReaderJsonElement = new JsonParser().parse(fileReader); JsonObject readableObject = fileReaderJsonElement.getAsJsonObject(); - if (readableObject.has(DataZombieDropItem.ConfigDataZombieDrop.Instance.getCategoryObject())) + if (readableObject.has(ZombieDropItemData.ConfigDataZombieDrop.Instance.getCategoryObject())) { JsonObject jsonObjectZombieDrop = - readableObject.getAsJsonObject(DataZombieDropItem.ConfigDataZombieDrop.Instance.getCategoryObject()); + readableObject.getAsJsonObject(ZombieDropItemData.ConfigDataZombieDrop.Instance.getCategoryObject()); if (jsonObjectZombieDrop.has("break_item")) { - DataZombieDropItem.ConfigDataZombieDrop.Instance. + ZombieDropItemData.ConfigDataZombieDrop.Instance. setBreakItem(jsonObjectZombieDrop.get("break_item").getAsFloat()); } if (jsonObjectZombieDrop.has("hand_item_damage_factor")) { - DataZombieDropItem.ConfigDataZombieDrop.Instance. + ZombieDropItemData.ConfigDataZombieDrop.Instance. setHandItemDamageFactor(jsonObjectZombieDrop.get("hand_item_damage_factor").getAsFloat()); } if (jsonObjectZombieDrop.has("head_damage_factor")) { - DataZombieDropItem.ConfigDataZombieDrop.Instance. + ZombieDropItemData.ConfigDataZombieDrop.Instance. setHeadDamageFactor(jsonObjectZombieDrop.get("head_damage_factor").getAsFloat()); } if (jsonObjectZombieDrop.has("chest_damage_factor")) { - DataZombieDropItem.ConfigDataZombieDrop.Instance. + ZombieDropItemData.ConfigDataZombieDrop.Instance. setChestDamageFactor(jsonObjectZombieDrop.get("chest_damage_factor").getAsFloat()); } if (jsonObjectZombieDrop.has("legs_damage_factor")) { - DataZombieDropItem.ConfigDataZombieDrop.Instance. + ZombieDropItemData.ConfigDataZombieDrop.Instance. setLegsDamageFactor(jsonObjectZombieDrop.get("legs_damage_factor").getAsFloat()); } if (jsonObjectZombieDrop.has("feet_damage_factor")) { - DataZombieDropItem.ConfigDataZombieDrop.Instance. + ZombieDropItemData.ConfigDataZombieDrop.Instance. setFeetDamageFactor(jsonObjectZombieDrop.get("feet_damage_factor").getAsFloat()); } if (jsonObjectZombieDrop.has("damage_spread_factor")) { - DataZombieDropItem.ConfigDataZombieDrop.Instance. + ZombieDropItemData.ConfigDataZombieDrop.Instance. setDamageSpreadFactor(jsonObjectZombieDrop.get("damage_spread_factor").getAsFloat()); } } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/staminaplayer/CfgStaminaPlayer.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/staminaplayer/CfgStaminaPlayer.java similarity index 92% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/staminaplayer/CfgStaminaPlayer.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/staminaplayer/CfgStaminaPlayer.java index 1be077c..033ad80 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/staminaplayer/CfgStaminaPlayer.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/staminaplayer/CfgStaminaPlayer.java @@ -1,10 +1,10 @@ -package org.imesense.dynamicspawncontrol.technical.config.staminaplayer; +package org.imesense.dynamicspawncontrol.config.staminaplayer; import com.google.gson.*; -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.inlineannotation.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.api.AConfig; +import org.imesense.dynamicspawncontrol.core.logfile.Log; +import org.imesense.dynamicspawncontrol.core.annotation.ConceptConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -17,8 +17,8 @@ /** * */ -@DCSSingleConfig(fileName = "cfg_plugin_stamina_player") -public final class CfgStaminaPlayer extends CfgClassAbstract +@ConceptConfig(fileName = "cfg_plugin_stamina_player") +public final class CfgStaminaPlayer extends AConfig { /** * @@ -28,7 +28,7 @@ public CfgStaminaPlayer(String nameConfigFile) { super(nameConfigFile, Boolean.FALSE); - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); DataStaminaPlayer.ConfigDataStaminaPlayer.Instance = new DataStaminaPlayer.ConfigDataStaminaPlayer("stamina_player"); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/staminaplayer/DataStaminaPlayer.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/staminaplayer/DataStaminaPlayer.java similarity index 92% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/staminaplayer/DataStaminaPlayer.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/staminaplayer/DataStaminaPlayer.java index 7cc85a5..8e7ce17 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/staminaplayer/DataStaminaPlayer.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/config/staminaplayer/DataStaminaPlayer.java @@ -1,8 +1,8 @@ -package org.imesense.dynamicspawncontrol.technical.config.staminaplayer; +package org.imesense.dynamicspawncontrol.config.staminaplayer; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Getter; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Setter; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.annotation.Getter; +import org.imesense.dynamicspawncontrol.core.annotation.Setter; import javax.annotation.Nonnull; @@ -82,7 +82,7 @@ public static final class ConfigDataStaminaPlayer */ public ConfigDataStaminaPlayer(@Nonnull final String CATEGORY) { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); this.CATEGORY = CATEGORY; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/inlineannotation/DCSSingleConfig.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/annotation/ConceptConfig.java similarity index 62% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/inlineannotation/DCSSingleConfig.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/annotation/ConceptConfig.java index e8638a3..28677df 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/inlineannotation/DCSSingleConfig.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/annotation/ConceptConfig.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation; +package org.imesense.dynamicspawncontrol.core.annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -7,7 +7,7 @@ * */ @Retention(RetentionPolicy.RUNTIME) -public @interface DCSSingleConfig +public @interface ConceptConfig { /** * diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/inlineannotation/Getter.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/annotation/Getter.java similarity index 76% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/inlineannotation/Getter.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/annotation/Getter.java index b2f2f9c..1ed894a 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/inlineannotation/Getter.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/annotation/Getter.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation; +package org.imesense.dynamicspawncontrol.core.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/inlineannotation/Setter.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/annotation/Setter.java similarity index 76% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/inlineannotation/Setter.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/annotation/Setter.java index b98a107..89297e9 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/inlineannotation/Setter.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/annotation/Setter.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation; +package org.imesense.dynamicspawncontrol.core.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/inlineannotation/UniqueObject.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/annotation/UniqueObject.java similarity index 76% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/inlineannotation/UniqueObject.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/annotation/UniqueObject.java index f8a4da2..7ada255 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/inlineannotation/UniqueObject.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/annotation/UniqueObject.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation; +package org.imesense.dynamicspawncontrol.core.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/CfgClassAbstract.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/api/AConfig.java similarity index 55% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/CfgClassAbstract.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/api/AConfig.java index 2d8a843..8c72f20 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/CfgClassAbstract.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/api/AConfig.java @@ -1,14 +1,14 @@ -package org.imesense.dynamicspawncontrol.technical.config; +package org.imesense.dynamicspawncontrol.core.api; import org.imesense.dynamicspawncontrol.DynamicSpawnControl; -import org.imesense.dynamicspawncontrol.ProjectStructure; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; import java.io.File; /** * */ -public abstract class CfgClassAbstract +public abstract class AConfig { /** * @@ -19,7 +19,7 @@ public abstract class CfgClassAbstract * * @param nameConfigFile */ - public CfgClassAbstract(String nameConfigFile, final Boolean IS_CONFIG_FOLDER) + public AConfig(String nameConfigFile, final Boolean IS_CONFIG_FOLDER) { this.nameConfig = this.constructPathToDirectory(IS_CONFIG_FOLDER) + nameConfigFile; } @@ -41,8 +41,8 @@ public CfgClassAbstract(String nameConfigFile, final Boolean IS_CONFIG_FOLDER) protected String constructPathToDirectory(final Boolean IS_CONFIG_FOLDER) { return DynamicSpawnControl.getGlobalPathToConfigs().getPath() + File.separator + - ProjectStructure.STRUCT_FILES_DIRS.NAME_DIRECTORY + File.separator + - (IS_CONFIG_FOLDER ? ProjectStructure.STRUCT_FILES_DIRS.NAME_DIR_CONFIGS : - ProjectStructure.STRUCT_FILES_DIRS.NAME_DIR_PLUGINS) + File.separator; + DynamicSpawnControlStructure.STRUCT_FILES_DIRS.NAME_DIRECTORY + File.separator + + (IS_CONFIG_FOLDER ? DynamicSpawnControlStructure.STRUCT_FILES_DIRS.NAME_DIR_CONFIGS : + DynamicSpawnControlStructure.STRUCT_FILES_DIRS.NAME_DIR_PLUGINS) + File.separator; } } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/api/IDebug.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/api/IDebug.java new file mode 100644 index 0000000..4aef1bd --- /dev/null +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/api/IDebug.java @@ -0,0 +1,9 @@ +package org.imesense.dynamicspawncontrol.core.api; + +/** + * + */ +public interface IDebug +{ + +} diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/IBetaParser.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/api/IParser.java similarity index 71% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/IBetaParser.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/api/IParser.java index 8dc024d..c5a6e17 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/IBetaParser.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/api/IParser.java @@ -1,14 +1,14 @@ -package org.imesense.dynamicspawncontrol.technical.parser; +package org.imesense.dynamicspawncontrol.core.api; import org.imesense.dynamicspawncontrol.DynamicSpawnControl; -import org.imesense.dynamicspawncontrol.ProjectStructure; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; import java.io.File; /** * */ -public interface IBetaParser +public interface IParser { /** * @@ -31,7 +31,7 @@ public interface IBetaParser default File getConfigFile(boolean initialization, final String DIRECTORY, final String FILE_NAME) { return initialization ? new File(DynamicSpawnControl.getGlobalPathToConfigs().getPath() + File.separator + - ProjectStructure.STRUCT_FILES_DIRS.NAME_DIRECTORY + File.separator + DIRECTORY, FILE_NAME) : + DynamicSpawnControlStructure.STRUCT_FILES_DIRS.NAME_DIRECTORY + File.separator + DIRECTORY, FILE_NAME) : new File("config/DynamicSpawnControl/" + DIRECTORY + "/" + FILE_NAME); } } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/recipes/IRecipes.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/api/IRecipes.java similarity index 64% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/recipes/IRecipes.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/api/IRecipes.java index 101eee8..a3d6a22 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/recipes/IRecipes.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/api/IRecipes.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.gameplay.recipes; +package org.imesense.dynamicspawncontrol.core.api; /** * 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/core/debug/Timer.java similarity index 70% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/Timer.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/debug/Timer.java index 1243204..4d9371a 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/core/debug/Timer.java @@ -1,4 +1,6 @@ -package org.imesense.dynamicspawncontrol.debug; +package org.imesense.dynamicspawncontrol.core.debug; + +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; /** * @@ -15,7 +17,7 @@ public final class Timer */ public Timer() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/UniqueField.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/field/UniqueField.java similarity index 90% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/UniqueField.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/field/UniqueField.java index 3a28b7a..f51992b 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/UniqueField.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/field/UniqueField.java @@ -1,7 +1,7 @@ -package org.imesense.dynamicspawncontrol; +package org.imesense.dynamicspawncontrol.core.field; import net.minecraft.client.Minecraft; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.UniqueObject; +import org.imesense.dynamicspawncontrol.core.annotation.UniqueObject; import java.lang.reflect.Field; import java.util.HashSet; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/Log.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/logfile/Log.java similarity index 90% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/Log.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/logfile/Log.java index 7eabcec..9134a17 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/Log.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/logfile/Log.java @@ -1,8 +1,7 @@ -package org.imesense.dynamicspawncontrol.technical.customlibrary; +package org.imesense.dynamicspawncontrol.core.logfile; -import org.imesense.dynamicspawncontrol.DynamicSpawnControl; -import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.technical.config.logfile.DataLogFile; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.config.data.LogFileData; import java.io.*; import java.text.SimpleDateFormat; @@ -25,7 +24,7 @@ public final class Log /** * */ - private static final String[] LEVEL_PREFIXES = { "[INFO]: ", "[WARN]: ", "[ERROR]: " }; + private static final String[] LEVEL_PREFIXES = { "[INFO]: ", "[WARN]: ", "[ERROR]: ", "[INIT]: " }; /** * @@ -40,7 +39,7 @@ public static void createLogFile(final String PATH, boolean isDebugMode) { try { - File file = new File(PATH, ProjectStructure.STRUCT_FILES_DIRS.NAME_DIR_LOGS); + File file = new File(PATH, DynamicSpawnControlStructure.STRUCT_FILES_DIRS.NAME_DIR_LOGS); if (!file.exists()) { @@ -64,7 +63,7 @@ public static void createLogFile(final String PATH, boolean isDebugMode) SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss"); String currentDate = simpleDateFormat.format(new Date()); - String fileName = file + "/log_" + currentDate + ProjectStructure.STRUCT_FILES_EXTENSION.LOG_FILE_EXTENSION; + String fileName = file + "/log_" + currentDate + DynamicSpawnControlStructure.STRUCT_FILES_EXTENSION.LOG_FILE_EXTENSION; logFile = new File(fileName); } @@ -163,7 +162,7 @@ public static void writeDataToLogFile(final int LEVEL_INFO, String data) fileWriter.write("\n" + LEVEL_PREFIXES[LOG_LEVEL[0]] + data); fileWriter.close(); - cleanFile(logFile, DataLogFile.ConfigDataLogFile.Instance.getLogMaxLines()); + cleanFile(logFile, LogFileData.ConfigDataLogFile.Instance.getLogMaxLines()); } catch (IOException exception) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterCommandClass.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/register/RegisterCommandClass.java similarity index 83% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterCommandClass.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/register/RegisterCommandClass.java index 743a02b..09a5afc 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterCommandClass.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/register/RegisterCommandClass.java @@ -1,11 +1,10 @@ -package org.imesense.dynamicspawncontrol.technical.register; +package org.imesense.dynamicspawncontrol.core.register; import net.minecraft.command.ICommand; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; - -import org.imesense.dynamicspawncontrol.gameplay.command.*; +import org.imesense.dynamicspawncontrol.command.*; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.logfile.Log; /** * @@ -38,7 +37,7 @@ public final class RegisterCommandClass */ public RegisterCommandClass() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterConfigClass.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/register/RegisterConfigClass.java similarity index 54% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterConfigClass.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/register/RegisterConfigClass.java index 131e3d1..4d51660 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterConfigClass.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/register/RegisterConfigClass.java @@ -1,21 +1,21 @@ -package org.imesense.dynamicspawncontrol.technical.register; +package org.imesense.dynamicspawncontrol.core.register; -import org.imesense.dynamicspawncontrol.ProjectStructure; -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; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.config.file.BlockWorldGeneratorAConfig; +import org.imesense.dynamicspawncontrol.config.file.CacheWorldGameAConfig; +import org.imesense.dynamicspawncontrol.config.file.GameDebuggerAConfig; import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.config.CfgTimeControl; -import org.imesense.dynamicspawncontrol.technical.config.logfile.CfgLogFile; -import org.imesense.dynamicspawncontrol.technical.config.player.CfgPlayer; +import org.imesense.dynamicspawncontrol.config.file.LogFileAConfig; +import org.imesense.dynamicspawncontrol.config.data.PlayerAConfig; import org.imesense.dynamicspawncontrol.plugin.darkness_forge_1_12_x_0_5_0.config.CfgDarkness; -import org.imesense.dynamicspawncontrol.technical.config.skeletondropitem.CfgSkeletonDropItem; +import org.imesense.dynamicspawncontrol.config.file.SkeletonDropItemAConfig; import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.config.CfgWebSlinger; -import org.imesense.dynamicspawncontrol.technical.config.staminaplayer.CfgStaminaPlayer; -import org.imesense.dynamicspawncontrol.technical.config.windowtitle.CfgWindowTitle; -import org.imesense.dynamicspawncontrol.technical.config.zombiedropitem.CfgZombieDropItem; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.DCSSingleConfig; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.config.staminaplayer.CfgStaminaPlayer; +import org.imesense.dynamicspawncontrol.config.file.WindowTitleAConfig; +import org.imesense.dynamicspawncontrol.config.file.ZombieDropItemAConfig; +import org.imesense.dynamicspawncontrol.core.annotation.ConceptConfig; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import java.lang.reflect.Constructor; @@ -29,16 +29,16 @@ public final class RegisterConfigClass */ private static final Class[] CONFIG_CLASSES = { - CfgCacheWorldGame.class, - CfgGameDebugger.class, - CfgLogFile.class, - CfgPlayer.class, + CacheWorldGameAConfig.class, + GameDebuggerAConfig.class, + LogFileAConfig.class, + PlayerAConfig.class, CfgDarkness.class, - CfgWindowTitle.class, - CfgBlockWorldGenerator.class, + WindowTitleAConfig.class, + BlockWorldGeneratorAConfig.class, CfgTimeControl.class, - CfgZombieDropItem.class, - CfgSkeletonDropItem.class, + ZombieDropItemAConfig.class, + SkeletonDropItemAConfig.class, CfgWebSlinger.class, CfgStaminaPlayer.class }; @@ -48,7 +48,7 @@ public final class RegisterConfigClass */ public RegisterConfigClass() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** @@ -71,10 +71,10 @@ private static void initializeConfig(Class _class) { try { - if (_class.isAnnotationPresent(DCSSingleConfig.class)) + if (_class.isAnnotationPresent(ConceptConfig.class)) { - DCSSingleConfig dcsSingleConfig = _class.getAnnotation(DCSSingleConfig.class); - String configFileName = dcsSingleConfig.fileName() + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION; + ConceptConfig dcsSingleConfig = _class.getAnnotation(ConceptConfig.class); + String configFileName = dcsSingleConfig.fileName() + DynamicSpawnControlStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION; Constructor constructor = _class.getConstructor(String.class); final T INSTANCE = constructor.newInstance(configFileName); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterGameplayClass.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/register/RegisterGameplayClass.java similarity index 82% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterGameplayClass.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/register/RegisterGameplayClass.java index 08245c6..9518b55 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterGameplayClass.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/register/RegisterGameplayClass.java @@ -1,9 +1,9 @@ -package org.imesense.dynamicspawncontrol.technical.register; +package org.imesense.dynamicspawncontrol.core.register; import net.minecraftforge.common.MinecraftForge; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; import org.imesense.dynamicspawncontrol.gameplay.event.OnUpdateTorchLogic; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.*; /** @@ -29,7 +29,7 @@ public final class RegisterGameplayClass */ public RegisterGameplayClass() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterOreGenerator.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/register/RegisterOreGenerator.java similarity index 82% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterOreGenerator.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/register/RegisterOreGenerator.java index 3d7b568..8be7611 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterOreGenerator.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/register/RegisterOreGenerator.java @@ -1,11 +1,11 @@ -package org.imesense.dynamicspawncontrol.technical.register; +package org.imesense.dynamicspawncontrol.core.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.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; import org.imesense.dynamicspawncontrol.gameplay.worldgenerator.*; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.core.logfile.Log; /** * @@ -28,7 +28,7 @@ public final class RegisterOreGenerator */ public RegisterOreGenerator() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** @@ -41,7 +41,7 @@ public static void init(FMLPreInitializationEvent fmlPreInitializationEvent) { try { - if (!CodeGenericUtil.hasDefaultConstructor(_class)) + if (!CodeGeneric.hasDefaultConstructor(_class)) { Log.writeDataToLogFile(2, "Class " + _class.getName() + " does not have a default constructor."); throw new RuntimeException("Default constructor not found in class: " + _class.getName()); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterTechnicalClass.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/register/RegisterTechnicalClass.java similarity index 81% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterTechnicalClass.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/register/RegisterTechnicalClass.java index fa1405f..a3be9c5 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/register/RegisterTechnicalClass.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/register/RegisterTechnicalClass.java @@ -1,14 +1,14 @@ -package org.imesense.dynamicspawncontrol.technical.register; +package org.imesense.dynamicspawncontrol.core.register; import net.minecraftforge.common.MinecraftForge; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.debug.event.OnEventDummy; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.OnEventDummy; +import org.imesense.dynamicspawncontrol.core.logfile.Log; 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.CacheEvent; +import org.imesense.dynamicspawncontrol.core.worldcache.CacheEvent; /** * @@ -42,7 +42,7 @@ public final class RegisterTechnicalClass */ public RegisterTechnicalClass() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/CodeGenericUtil.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/util/CodeGeneric.java similarity index 89% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/CodeGenericUtil.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/util/CodeGeneric.java index 573582c..2193bde 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/CodeGenericUtil.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/util/CodeGeneric.java @@ -1,9 +1,9 @@ -package org.imesense.dynamicspawncontrol.debug; +package org.imesense.dynamicspawncontrol.core.util; import com.google.gson.JsonElement; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeKey; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; import java.util.List; @@ -12,7 +12,7 @@ /** * */ -public final class CodeGenericUtil +public final class CodeGeneric { /** * @@ -102,13 +102,13 @@ public static void readAndLogRules(final String PATH, final String FILE_NAME /** * - * @param _class + * @param _CLASS * @param */ - public static void printInitClassToLog(final Class _class) + public static void printInitClassToLog(final Class _CLASS) { - Log.writeDataToLogFile(0, - String.format("Initializing a class: {%s}", _class.getName())); + Log.writeDataToLogFile(3, + String.format("Initializing a class: {%s}", _CLASS.getName())); } /** 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/core/worldcache/Cache.java similarity index 97% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/Cache.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/worldcache/Cache.java index 39cce44..d12c3f1 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/core/worldcache/Cache.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.technical.worldcache; +package org.imesense.dynamicspawncontrol.core.worldcache; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; @@ -13,8 +13,8 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.WorldServer; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import javax.annotation.Nonnull; import java.util.Collections; @@ -129,7 +129,7 @@ public final class Cache */ public Cache() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheEvent.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/worldcache/CacheEvent.java similarity index 91% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheEvent.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/worldcache/CacheEvent.java index 7066e40..6091f9f 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheEvent.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/worldcache/CacheEvent.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.technical.worldcache; +package org.imesense.dynamicspawncontrol.core.worldcache; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; @@ -18,17 +18,17 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -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.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.config.data.GameDebuggerData; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import java.util.HashSet; /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class CacheEvent { /** @@ -46,7 +46,7 @@ public final class CacheEvent */ public CacheEvent() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -123,7 +123,7 @@ public synchronized void onPlayerLoggedOut_2(PlayerEvent.PlayerLoggedOutEvent pl @SubscribeEvent public synchronized void onRenderOverlay_3(RenderGameOverlayEvent.Post post) { - if (!DataGameDebugger.ConfigDataMonitor.Instance.getDebugMonitorCache()) + if (!GameDebuggerData.ConfigDataMonitor.Instance.getDebugMonitorCache()) { return; } 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/core/worldcache/CacheMonitor.java similarity index 88% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheMonitor.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/worldcache/CacheMonitor.java index cbd3a5b..76153c0 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/core/worldcache/CacheMonitor.java @@ -1,12 +1,11 @@ -package org.imesense.dynamicspawncontrol.technical.worldcache; +package org.imesense.dynamicspawncontrol.core.worldcache; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.util.text.TextFormatting; import net.minecraft.client.gui.ScaledResolution; -import org.imesense.dynamicspawncontrol.UniqueField; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.core.field.UniqueField; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.logfile.Log; /** * @@ -23,7 +22,7 @@ public final class CacheMonitor */ public CacheMonitor() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.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/core/worldcache/CacheStorage.java similarity index 90% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheStorage.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/core/worldcache/CacheStorage.java index e193a23..dcbba68 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/core/worldcache/CacheStorage.java @@ -1,7 +1,7 @@ -package org.imesense.dynamicspawncontrol.technical.worldcache; +package org.imesense.dynamicspawncontrol.core.worldcache; import net.minecraft.util.ResourceLocation; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; import java.util.List; @@ -20,7 +20,7 @@ public final class CacheStorage */ public CacheStorage() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); Instance = this; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/IDebug.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/IDebug.java deleted file mode 100644 index 8768969..0000000 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/IDebug.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.imesense.dynamicspawncontrol.debug; - -/** - * - */ -public interface IDebug -{ - -} diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/event/OnEventDummy.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/event/OnEventDummy.java deleted file mode 100644 index 84136f7..0000000 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/debug/event/OnEventDummy.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.imesense.dynamicspawncontrol.debug.event; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderGlobal; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.entity.Entity; -import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.util.DamageSource; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.TextComponentString; -import net.minecraft.world.World; -import net.minecraftforge.client.IRenderHandler; -import net.minecraftforge.client.event.EntityViewRenderEvent; -import net.minecraftforge.client.event.RenderWorldLastEvent; -import net.minecraftforge.event.entity.living.LivingDeathEvent; -import net.minecraftforge.event.entity.living.LivingSpawnEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.debug.IDebug; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import org.lwjgl.opengl.GL11; -import scala.util.Random; - -import java.util.Objects; - -/** - * - */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) -public final class OnEventDummy implements IDebug -{ - /** - * - */ - private static boolean instanceExists = false; - - /** - * - */ - public OnEventDummy() - { - CodeGenericUtil.printInitClassToLog(this.getClass()); - - if (instanceExists) - { - Log.writeDataToLogFile(2, String.format("An instance of [%s] already exists!", this.getClass().getSimpleName())); - throw new RuntimeException(); - } - - instanceExists = true; - } - - //@SubscribeEvent - //public static void onFogDensity(EntityViewRenderEvent.FogDensity event) { - // Задание плотности тумана - // event.setDensity(0.05f); // Чем больше значение, тем плотнее туман - // GlStateManager.setFog(GlStateManager.FogMode.EXP); - // event.setCanceled(true); // Обязательно отменяем стандартное поведение, чтобы применился наш туман - // } - - //@SubscribeEvent - // public static void onFogColors(EntityViewRenderEvent.FogColors event) { - // Установка красного цвета для тумана - // event.setRed(0.7f); // Красный оттенок - // event.setGreen(0.2f); // Зеленый оттенок - // event.setBlue(0.2f); // Синий оттенок - // } -} diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/event/OnUpdateTorchLogic.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/event/OnUpdateTorchLogic.java index 0cce4df..0246fde 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/event/OnUpdateTorchLogic.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/event/OnUpdateTorchLogic.java @@ -16,14 +16,14 @@ import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.logfile.Log; /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnUpdateTorchLogic { /** @@ -36,7 +36,7 @@ public final class OnUpdateTorchLogic */ public OnUpdateTorchLogic() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) { 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 29ce677..8c200e3 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,8 +8,8 @@ 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.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.config.blockgenerator.DataBlockWorldGenerator; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.config.data.BlockWorldGeneratorData; import java.util.Objects; import java.util.Random; @@ -29,7 +29,7 @@ public final class BlockMonsterEgg implements IWorldGenerator */ public BlockMonsterEgg() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); CLASS_MONSTER_EGG_GENERATOR = new WorldGenMinable( Objects.requireNonNull(Block.getBlockFromName("monster_egg")).getDefaultState(), 5); @@ -81,9 +81,9 @@ public void generate(Random random, int chunkX, int chunkZ, World world, IChunkG { run( CLASS_MONSTER_EGG_GENERATOR, world, random, chunkX, chunkZ, - DataBlockWorldGenerator.InfoDataBlockBlockMonsterEgg.Instance.getChanceSpawn(), - DataBlockWorldGenerator.InfoDataBlockBlockMonsterEgg.Instance.getMinHeight(), - DataBlockWorldGenerator.InfoDataBlockBlockMonsterEgg.Instance.getMaxHeight() + BlockWorldGeneratorData.InfoDataBlockBlockMonsterEgg.Instance.getChanceSpawn(), + BlockWorldGeneratorData.InfoDataBlockBlockMonsterEgg.Instance.getMinHeight(), + BlockWorldGeneratorData.InfoDataBlockBlockMonsterEgg.Instance.getMaxHeight() ); break; 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 ced94de..37de1ef 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,8 +8,8 @@ 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.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.config.blockgenerator.DataBlockWorldGenerator; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.config.data.BlockWorldGeneratorData; import java.util.Objects; import java.util.Random; @@ -29,7 +29,7 @@ public final class BlockMossyCobblestone implements IWorldGenerator */ public BlockMossyCobblestone() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); CLASS_MOSSY_COBBLESTONE_GENERATOR = new WorldGenMinable( Objects.requireNonNull(Block.getBlockFromName("mossy_cobblestone")).getDefaultState(), 5); @@ -81,9 +81,9 @@ public void generate(Random random, int chunkX, int chunkZ, World world, IChunkG { run( CLASS_MOSSY_COBBLESTONE_GENERATOR, world, random, chunkX, chunkZ, - DataBlockWorldGenerator.InfoDataBlockMossyCobblestone.Instance.getChanceSpawn(), - DataBlockWorldGenerator.InfoDataBlockMossyCobblestone.Instance.getMinHeight(), - DataBlockWorldGenerator.InfoDataBlockMossyCobblestone.Instance.getMaxHeight() + BlockWorldGeneratorData.InfoDataBlockMossyCobblestone.Instance.getChanceSpawn(), + BlockWorldGeneratorData.InfoDataBlockMossyCobblestone.Instance.getMinHeight(), + BlockWorldGeneratorData.InfoDataBlockMossyCobblestone.Instance.getMaxHeight() ); break; 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 a076f35..f925774 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,8 +8,8 @@ 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.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.config.blockgenerator.DataBlockWorldGenerator; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.config.data.BlockWorldGeneratorData; import java.util.Objects; import java.util.Random; @@ -29,7 +29,7 @@ public final class BlockNetherRack implements IWorldGenerator */ public BlockNetherRack() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); CLASS_NETHER_RACK_GENERATOR = new WorldGenMinable( Objects.requireNonNull(Block.getBlockFromName("netherrack")).getDefaultState(), 5); @@ -81,9 +81,9 @@ public void generate(Random random, int chunkX, int chunkZ, World world, IChunkG { run( CLASS_NETHER_RACK_GENERATOR, world, random, chunkX, chunkZ, - DataBlockWorldGenerator.InfoDataBlockNetherRack.Instance.getChanceSpawn(), - DataBlockWorldGenerator.InfoDataBlockNetherRack.Instance.getMinHeight(), - DataBlockWorldGenerator.InfoDataBlockNetherRack.Instance.getMaxHeight() + BlockWorldGeneratorData.InfoDataBlockNetherRack.Instance.getChanceSpawn(), + BlockWorldGeneratorData.InfoDataBlockNetherRack.Instance.getMinHeight(), + BlockWorldGeneratorData.InfoDataBlockNetherRack.Instance.getMaxHeight() ); break; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/bloodmoon_mc1_12_2_1_5_3/asm/LoadingPlugin.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/bloodmoon_mc1_12_2_1_5_3/asm/LoadingPlugin.java index b7f67bd..9df1ab9 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/bloodmoon_mc1_12_2_1_5_3/asm/LoadingPlugin.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/bloodmoon_mc1_12_2_1_5_3/asm/LoadingPlugin.java @@ -2,7 +2,7 @@ import net.minecraftforge.common.ForgeVersion; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; -import org.imesense.dynamicspawncontrol.ProjectStructure; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; import java.util.Map; @@ -10,7 +10,7 @@ * */ @IFMLLoadingPlugin.MCVersion(ForgeVersion.mcVersion) -@IFMLLoadingPlugin.Name(ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@IFMLLoadingPlugin.Name(DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) @IFMLLoadingPlugin.SortingIndex(LoadingPlugin.AFTER_DEOBFUSCATION) public final class LoadingPlugin implements IFMLLoadingPlugin { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/bloodmoon_mc1_12_2_1_5_3/config/CfgBloodMoon.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/bloodmoon_mc1_12_2_1_5_3/config/CfgBloodMoon.java index 8fc02b9..e78affe 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/bloodmoon_mc1_12_2_1_5_3/config/CfgBloodMoon.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/bloodmoon_mc1_12_2_1_5_3/config/CfgBloodMoon.java @@ -1,11 +1,11 @@ package org.imesense.dynamicspawncontrol.plugin.bloodmoon_mc1_12_2_1_5_3.config; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.core.annotation.ConceptConfig; /** * */ -@DCSSingleConfig(fileName = "cfg_blood_moon_mc_1_12_2_1_5_3") +@ConceptConfig(fileName = "cfg_blood_moon_mc_1_12_2_1_5_3") public final class CfgBloodMoon { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/darkness_forge_1_12_x_0_5_0/LoadingPlugin.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/darkness_forge_1_12_x_0_5_0/LoadingPlugin.java index 64fb89c..9cb5c51 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/darkness_forge_1_12_x_0_5_0/LoadingPlugin.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/darkness_forge_1_12_x_0_5_0/LoadingPlugin.java @@ -5,7 +5,7 @@ import net.minecraftforge.common.ForgeVersion; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; -import org.imesense.dynamicspawncontrol.ProjectStructure; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; import org.imesense.dynamicspawncontrol.plugin.darkness_forge_1_12_x_0_5_0.asm.EntityRendererTransformer; import org.imesense.dynamicspawncontrol.plugin.darkness_forge_1_12_x_0_5_0.asm.WorldProviderTransformer; @@ -15,7 +15,7 @@ * -Dfml.coreMods.load=org.imesense.dynamicspawncontrol.technical.plugins.LoadingPluginNight */ @IFMLLoadingPlugin.MCVersion(ForgeVersion.mcVersion) -@IFMLLoadingPlugin.Name(ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@IFMLLoadingPlugin.Name(DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) @IFMLLoadingPlugin.SortingIndex(LoadingPlugin.AFTER_DEOBFUSCATION) public final class LoadingPlugin implements IFMLLoadingPlugin { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/darkness_forge_1_12_x_0_5_0/asm/EntityRendererHook.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/darkness_forge_1_12_x_0_5_0/asm/EntityRendererHook.java index 53497c7..7d227c0 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/darkness_forge_1_12_x_0_5_0/asm/EntityRendererHook.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/darkness_forge_1_12_x_0_5_0/asm/EntityRendererHook.java @@ -7,7 +7,7 @@ import net.minecraft.world.DimensionType; import net.minecraft.world.World; import net.minecraft.world.WorldProvider; -import org.imesense.dynamicspawncontrol.UniqueField; +import org.imesense.dynamicspawncontrol.core.field.UniqueField; import org.imesense.dynamicspawncontrol.plugin.darkness_forge_1_12_x_0_5_0.config.DataDarkness; import java.lang.reflect.Field; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/darkness_forge_1_12_x_0_5_0/config/CfgDarkness.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/darkness_forge_1_12_x_0_5_0/config/CfgDarkness.java index 821d3fa..c4d8940 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/darkness_forge_1_12_x_0_5_0/config/CfgDarkness.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/darkness_forge_1_12_x_0_5_0/config/CfgDarkness.java @@ -1,10 +1,10 @@ package org.imesense.dynamicspawncontrol.plugin.darkness_forge_1_12_x_0_5_0.config; import com.google.gson.*; -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.inlineannotation.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.api.AConfig; +import org.imesense.dynamicspawncontrol.core.logfile.Log; +import org.imesense.dynamicspawncontrol.core.annotation.ConceptConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -17,8 +17,8 @@ /** * */ -@DCSSingleConfig(fileName = "cfg_darkness_forge_1_12_x_0_5_0") -public final class CfgDarkness extends CfgClassAbstract +@ConceptConfig(fileName = "cfg_darkness_forge_1_12_x_0_5_0") +public final class CfgDarkness extends AConfig { /** * @@ -28,7 +28,7 @@ public CfgDarkness(String nameConfigFile) { super(nameConfigFile, Boolean.FALSE); - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); DataDarkness.ConfigDataRenderNight.Instance = new DataDarkness.ConfigDataRenderNight("darkness_forge_1_12_x_0_5_0"); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/darkness_forge_1_12_x_0_5_0/config/DataDarkness.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/darkness_forge_1_12_x_0_5_0/config/DataDarkness.java index 04a23a9..6bcc48b 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/darkness_forge_1_12_x_0_5_0/config/DataDarkness.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/darkness_forge_1_12_x_0_5_0/config/DataDarkness.java @@ -1,8 +1,8 @@ package org.imesense.dynamicspawncontrol.plugin.darkness_forge_1_12_x_0_5_0.config; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Getter; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Setter; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.annotation.Getter; +import org.imesense.dynamicspawncontrol.core.annotation.Setter; import javax.annotation.Nonnull; @@ -92,7 +92,7 @@ public static final class ConfigDataRenderNight */ public ConfigDataRenderNight(@Nonnull final String CATEGORY) { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); this.CATEGORY = CATEGORY; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/eyesInthedarkness_1_12_2_0_1_0/config/CfgEyeInTheDarkness.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/eyesInthedarkness_1_12_2_0_1_0/config/CfgEyeInTheDarkness.java index efef709..e248ab9 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/eyesInthedarkness_1_12_2_0_1_0/config/CfgEyeInTheDarkness.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/eyesInthedarkness_1_12_2_0_1_0/config/CfgEyeInTheDarkness.java @@ -1,10 +1,10 @@ package org.imesense.dynamicspawncontrol.plugin.eyesInthedarkness_1_12_2_0_1_0.config; -import org.imesense.dynamicspawncontrol.technical.config.CfgClassAbstract; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.core.api.AConfig; +import org.imesense.dynamicspawncontrol.core.annotation.ConceptConfig; -@DCSSingleConfig(fileName = "cfg_eye_in_the_darkness_1_12_2_0_1_0") -public final class CfgEyeInTheDarkness extends CfgClassAbstract +@ConceptConfig(fileName = "cfg_eye_in_the_darkness_1_12_2_0_1_0") +public final class CfgEyeInTheDarkness extends AConfig { /** * diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/Numbers.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/Numbers.java index 81a6973..3ee49de 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/Numbers.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/Numbers.java @@ -1,11 +1,9 @@ package org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2; import net.minecraft.world.World; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.config.DataTimeControl; import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.Collections; /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/TimeEvents.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/TimeEvents.java index 922cddd..1118dd9 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/TimeEvents.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/TimeEvents.java @@ -9,38 +9,19 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.event.CommandEvent; -import net.minecraftforge.event.world.ChunkDataEvent; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.PlayerEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.relauncher.Side; -import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.config.DataTimeControl; import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.handler.ITimeHandler; import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.handler.TimeHandlerClient; import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.handler.TimeHandlerServer; import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.network.*; -import net.minecraft.command.CommandBase; -import net.minecraft.command.CommandException; -import net.minecraft.command.CommandGameRule; -import net.minecraft.command.CommandTime; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.util.text.TextComponentString; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; -import net.minecraftforge.event.CommandEvent; import net.minecraftforge.event.world.WorldEvent.Load; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.common.gameevent.TickEvent.PlayerTickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.WorldTickEvent; -import net.minecraftforge.fml.relauncher.Side; - -import java.util.Objects; /** * diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/config/CfgTimeControl.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/config/CfgTimeControl.java index db7537e..39da848 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/config/CfgTimeControl.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/config/CfgTimeControl.java @@ -1,10 +1,10 @@ package org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.config; import com.google.gson.*; -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.inlineannotation.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.api.AConfig; +import org.imesense.dynamicspawncontrol.core.logfile.Log; +import org.imesense.dynamicspawncontrol.core.annotation.ConceptConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -17,8 +17,8 @@ /** * */ -@DCSSingleConfig(fileName = "cfg_time_control_mod_forge_1_12_2") -public final class CfgTimeControl extends CfgClassAbstract +@ConceptConfig(fileName = "cfg_time_control_mod_forge_1_12_2") +public final class CfgTimeControl extends AConfig { /** * @@ -28,7 +28,7 @@ public CfgTimeControl(String nameConfigFile) { super(nameConfigFile, Boolean.FALSE); - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); DataTimeControl.ConfigDataWorldTime.Instance = new DataTimeControl.ConfigDataWorldTime("time_control_mod_forge_1_12_2"); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/config/DataTimeControl.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/config/DataTimeControl.java index a75f0db..b9f59af 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/config/DataTimeControl.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/config/DataTimeControl.java @@ -1,8 +1,8 @@ package org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.config; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Getter; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Setter; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.annotation.Getter; +import org.imesense.dynamicspawncontrol.core.annotation.Setter; import javax.annotation.Nonnull; @@ -57,7 +57,7 @@ public static final class ConfigDataWorldTime */ public ConfigDataWorldTime(@Nonnull final String CATEGORY) { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); this.CATEGORY = CATEGORY; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/handler/TimeHandlerClient.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/handler/TimeHandlerClient.java index 5ed4e8f..6299739 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/handler/TimeHandlerClient.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/handler/TimeHandlerClient.java @@ -4,9 +4,7 @@ import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.Numbers; import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.config.DataTimeControl; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import net.minecraft.world.World; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/handler/TimeHandlerServer.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/handler/TimeHandlerServer.java index 957ef1c..af519d4 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/handler/TimeHandlerServer.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/handler/TimeHandlerServer.java @@ -3,7 +3,6 @@ import java.util.Calendar; import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; -import java.util.Objects; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -11,14 +10,7 @@ import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.Numbers; import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.config.DataTimeControl; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.network.*; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Calendar; -import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/network/PacketTime.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/network/PacketTime.java index fb066b8..7dc14bf 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/network/PacketTime.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/time_control_mod_forge_1_12_2/network/PacketTime.java @@ -5,7 +5,6 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import org.imesense.dynamicspawncontrol.UniqueField; import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.TimeEvents; public class PacketTime implements IMessage { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/ObjectHandlerClient.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/ObjectHandlerClient.java index 5bb5840..e185a05 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/ObjectHandlerClient.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/ObjectHandlerClient.java @@ -16,17 +16,17 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.registries.IForgeRegistry; -import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.UniqueField; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.field.UniqueField; import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.webbing.ItemWebbing; import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.webbing.EntityWebbing; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; import org.imesense.dynamicspawncontrol.plugin.wumpleutil_1_12_2_2_12_9.util.misc.RegistrationHelper; /** * */ -@GameRegistry.ObjectHolder(ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@GameRegistry.ObjectHolder(DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class ObjectHandlerClient { /** @@ -57,7 +57,7 @@ public final class ObjectHandlerClient /** * */ - @Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) + @Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public static class RegistrationHandler extends RegistrationHelper { /** @@ -65,7 +65,7 @@ public static class RegistrationHandler extends RegistrationHelper */ public RegistrationHandler() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/capability/EventHandler.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/capability/EventHandler.java index 1fe5df6..5b839a0 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/capability/EventHandler.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/capability/EventHandler.java @@ -8,10 +8,9 @@ import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.config.DataWebSlinger; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.plugin.wumpleutil_1_12_2_2_12_9.util.container.SimpleCapabilityProvider; import org.imesense.dynamicspawncontrol.plugin.wumpleutil_1_12_2_2_12_9.util.adapter.EntityThingBase; import org.imesense.dynamicspawncontrol.plugin.wumpleutil_1_12_2_2_12_9.util.adapter.IThingBase; @@ -20,7 +19,7 @@ /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class EventHandler { /** @@ -28,7 +27,7 @@ public final class EventHandler */ public EventHandler() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/capability/WebSlingerCapability.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/capability/WebSlingerCapability.java index 7efce63..6b22ee2 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/capability/WebSlingerCapability.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/capability/WebSlingerCapability.java @@ -15,9 +15,9 @@ import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.webbing.AIWebbingAttack; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.webbing.EntityWebbing; import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.config.DataWebSlinger; import org.imesense.dynamicspawncontrol.plugin.wumpleutil_1_12_2_2_12_9.util.adapter.EntityThingBase; @@ -26,7 +26,7 @@ /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class WebSlingerCapability implements IWebSlinger { /** @@ -83,11 +83,11 @@ private EntityLiving getOwner() { if (this.owner instanceof EntityThingBase) { - EntityThingBase thing = CodeGenericUtil.as(this.owner, EntityThingBase.class); + EntityThingBase thing = CodeGeneric.as(this.owner, EntityThingBase.class); assert thing != null; - return CodeGenericUtil.as(thing.Owner, EntityLiving.class); + return CodeGeneric.as(thing.Owner, EntityLiving.class); } else { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/config/CfgWebSlinger.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/config/CfgWebSlinger.java index 697d3d6..d6f48ab 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/config/CfgWebSlinger.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/config/CfgWebSlinger.java @@ -1,10 +1,10 @@ package org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.config; import com.google.gson.*; -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.inlineannotation.DCSSingleConfig; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.api.AConfig; +import org.imesense.dynamicspawncontrol.core.logfile.Log; +import org.imesense.dynamicspawncontrol.core.annotation.ConceptConfig; import java.io.FileNotFoundException; import java.io.FileReader; @@ -19,8 +19,8 @@ /** * */ -@DCSSingleConfig(fileName = "cfg_webslinger_1_12_2_2_2_4") -public final class CfgWebSlinger extends CfgClassAbstract +@ConceptConfig(fileName = "cfg_webslinger_1_12_2_2_2_4") +public final class CfgWebSlinger extends AConfig { /** * @@ -30,7 +30,7 @@ public CfgWebSlinger(String nameConfigFile) { super(nameConfigFile, Boolean.FALSE); - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); DataWebSlinger.ConfigDataSpiderAttackWeb.Instance = new DataWebSlinger.ConfigDataSpiderAttackWeb("webslinger_1_12_2_2_2_4"); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/config/DataWebSlinger.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/config/DataWebSlinger.java index 95a1156..10b1a0e 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/config/DataWebSlinger.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/config/DataWebSlinger.java @@ -1,8 +1,8 @@ package org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.config; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Getter; -import org.imesense.dynamicspawncontrol.technical.customlibrary.inlineannotation.Setter; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.annotation.Getter; +import org.imesense.dynamicspawncontrol.core.annotation.Setter; import javax.annotation.Nonnull; import java.util.HashMap; @@ -91,7 +91,7 @@ public void setEntityIdPriorityMap(Map entityIdPriorityMap) { */ public ConfigDataSpiderAttackWeb(@Nonnull final String CATEGORY) { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); this.CATEGORY = CATEGORY; entityIdPriorityMap = new HashMap<>(); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/webbing/AIWebbingAttack.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/webbing/AIWebbingAttack.java index 7997bf9..39c458e 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/webbing/AIWebbingAttack.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/webbing/AIWebbingAttack.java @@ -4,7 +4,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.world.World; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.config.DataWebSlinger; /** @@ -28,7 +28,7 @@ public final class AIWebbingAttack extends EntityAIBase */ public AIWebbingAttack(EntityLiving entityLiving) { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); this.parentEntity = entityLiving; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/webbing/EntityWebbing.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/webbing/EntityWebbing.java index 69a5536..395c28f 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/webbing/EntityWebbing.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/webbing/EntityWebbing.java @@ -15,7 +15,7 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import org.imesense.dynamicspawncontrol.DynamicSpawnControl; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.config.DataWebSlinger; import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.ObjectHandlerClient; @@ -37,7 +37,7 @@ public EntityWebbing(World worldIn) { super(worldIn); - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** @@ -49,7 +49,7 @@ public EntityWebbing(World worldIn, EntityLivingBase throwerIn) { super(worldIn, throwerIn); - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/webbing/ItemWebbing.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/webbing/ItemWebbing.java index 7bfdb18..90a40e3 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/webbing/ItemWebbing.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/webbing/ItemWebbing.java @@ -9,7 +9,7 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.ObjectHandlerClient; import javax.annotation.Nonnull; @@ -25,7 +25,7 @@ public final class ItemWebbing extends Item */ public ItemWebbing() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); this.maxStackSize = 1; this.setCreativeTab(CreativeTabs.MISC); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/webbing/PlayerInWebMessage.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/webbing/PlayerInWebMessage.java index 1d04022..0043874 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/webbing/PlayerInWebMessage.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/webslinger_1_12_2_2_2_4/webbing/PlayerInWebMessage.java @@ -8,8 +8,8 @@ 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.UniqueField; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.core.field.UniqueField; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; /** * @@ -26,7 +26,7 @@ public final class PlayerInWebMessage implements IMessage */ public PlayerInWebMessage() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/wumpleutil_1_12_2_2_12_9/util/misc/RegistrationHelper.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/wumpleutil_1_12_2_2_12_9/util/misc/RegistrationHelper.java index e42122f..35a1e55 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/wumpleutil_1_12_2_2_12_9/util/misc/RegistrationHelper.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/plugin/wumpleutil_1_12_2_2_12_9/util/misc/RegistrationHelper.java @@ -10,7 +10,7 @@ import net.minecraftforge.registries.GameData; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IForgeRegistryEntry; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; import java.util.Objects; @@ -24,7 +24,7 @@ public class RegistrationHelper */ public RegistrationHelper() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** 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/recipes/CraftItemWeb.java similarity index 86% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/recipes/CraftItemWeb.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/recipes/CraftItemWeb.java index 5a7330c..73db4c9 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/recipes/CraftItemWeb.java @@ -1,9 +1,10 @@ -package org.imesense.dynamicspawncontrol.gameplay.recipes; +package org.imesense.dynamicspawncontrol.recipes; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; +import org.imesense.dynamicspawncontrol.core.api.IRecipes; import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.ObjectHandlerClient; /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/cachedameworld/DataCacheWorldGame.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/cachedameworld/DataCacheWorldGame.java deleted file mode 100644 index ddcfaf1..0000000 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/config/cachedameworld/DataCacheWorldGame.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.imesense.dynamicspawncontrol.technical.config.cachedameworld; - -/** - * - */ -public final class DataCacheWorldGame -{ - -} diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/AuxFunction.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/AuxFunction.java index f967272..354a09f 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/AuxFunction.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/AuxFunction.java @@ -37,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.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration.EnumGameProperty; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/AuxFunctionS/Player.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/AuxFunctionS/Player.java deleted file mode 100644 index b55cdbe..0000000 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/AuxFunctionS/Player.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.imesense.dynamicspawncontrol.technical.customlibrary.AuxFunctionS; - -public final class Player -{ - -} diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/InlineJsonService.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/InlineJsonService.java index 76a22aa..edd1f85 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/InlineJsonService.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/InlineJsonService.java @@ -5,6 +5,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import org.apache.commons.lang3.tuple.Pair; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import javax.annotation.Nullable; import java.util.Collection; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ItemStackBuilder.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ItemStackBuilder.java index 9f7388c..39f6cd3 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ItemStackBuilder.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ItemStackBuilder.java @@ -10,6 +10,7 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionBinary.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionBinary.java index d570b76..8ab3c9c 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionBinary.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionBinary.java @@ -18,6 +18,7 @@ import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.registry.EntityEntry; import net.minecraftforge.fml.common.registry.ForgeRegistries; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeKey; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; @@ -29,7 +30,6 @@ import java.util.function.BiFunction; import java.util.function.BiPredicate; -import static org.imesense.dynamicspawncontrol.UniqueField.CLIENT; import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWord.CommonKeyWorlds.*; import static org.imesense.dynamicspawncontrol.technical.customlibrary.MultipleKeyWord.SpawnCondition.*; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionConsumer.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionConsumer.java index d295aad..2a0dafa 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionConsumer.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionConsumer.java @@ -30,6 +30,7 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeKey; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataGetter; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionConsumerMobTaskManager.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionConsumerMobTaskManager.java index 8bdc413..0f278be 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionConsumerMobTaskManager.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionConsumerMobTaskManager.java @@ -8,6 +8,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.EntityEntry; import net.minecraftforge.fml.common.registry.ForgeRegistries; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap; import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericPotentialSpawn; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataGetter; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/enumeration/EnumSingleScript.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/enumeration/EnumSingleScript.java deleted file mode 100644 index 5ae272e..0000000 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/enumeration/EnumSingleScript.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.imesense.dynamicspawncontrol.technical.customlibrary.enumeration; - -/** - * - * TODO: rework later - */ -public enum EnumSingleScript -{ - /** - * - */ - SCRIPT_MOBS_LIST_SEE_SKY("action_mobs_list_see_sky.json"), - - /** - * - */ - SCRIPT_ZOMBIE_SUMMON_AID("action_zombie_summon_aid.json"), - - /** - * - */ - SCRIPT_CACHE_MOBS("cache_mobs.json"); - - /** - * - */ - private final String KEYWORD; - - /** - * - * @param KEYWORD - */ - EnumSingleScript(final String KEYWORD) - { - this.KEYWORD = KEYWORD; - } - - /** - * - * @return - */ - public String getKeyword() - { - return this.KEYWORD; - } -} diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockBreakAction.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockBreakAction.java index 9823053..10eb639 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockBreakAction.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockBreakAction.java @@ -14,7 +14,7 @@ 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.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.ResultEvents; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataGetter; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockPlaceAction.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockPlaceAction.java index 784a0b2..01b7466 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockPlaceAction.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockPlaceAction.java @@ -14,7 +14,7 @@ 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.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.ResultEvents; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataGetter; 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 bfdd41f..e2ea115 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 @@ -13,6 +13,7 @@ import net.minecraftforge.event.entity.living.LivingDropsEvent; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.attributefactory.Attribute; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMapFactory; 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 737475f..b99c956 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 @@ -9,6 +9,7 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingExperienceDropEvent; import net.minecraftforge.fml.common.eventhandler.Event; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.attributefactory.Attribute; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMapFactory; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericLeftClickAction.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericLeftClickAction.java index 997e05b..093497e 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericLeftClickAction.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericLeftClickAction.java @@ -14,7 +14,7 @@ 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.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.ResultEvents; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataGetter; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMapEffectAction.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMapEffectAction.java index 41fd2e2..13297ad 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMapEffectAction.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMapEffectAction.java @@ -14,7 +14,7 @@ import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMapFactory; 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.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.customlibrary.SingleKeyWord; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataGetter; 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 36a7dcb..940105d 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 @@ -14,7 +14,7 @@ import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMapFactory; 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.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataGetter; 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 d684133..4fc6aed 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,8 @@ 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.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.core.logfile.Log; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; import org.imesense.dynamicspawncontrol.technical.attributefactory.Attribute; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap; import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMapFactory; @@ -146,12 +147,12 @@ private GenericPotentialSpawn(AttributeMap attributeMap) throw new RuntimeException(); } - 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"); + int weight = CodeGeneric.checkParameter(mobMap, MOB_WEIGHT, 1, 100, "frequency"); + int groupCountMin = CodeGeneric.checkParameter(mobMap, MOB_GROUP_COUNT_MIN, 1, 10, "group_count_min"); + int groupCountMax = CodeGeneric.checkParameter(mobMap, MOB_GROUP_COUNT_MAX, 1, 20, "group_count_max"); + float spawnChance = CodeGeneric.checkParameter(mobMap, MOB_SPAWN_CHANCE, 0.01f, 1.0f, "spawnChanceValue"); + int maxHeight = CodeGeneric.checkParameter(mobMap, MOB_MAX_HEIGHT, 5, 255, "max_height"); + int minHeight = CodeGeneric.checkParameter(mobMap, MOB_MIN_HEIGHT, 5, 255, "min_height"); Biome.SpawnListEntry entry = new Biome.SpawnListEntry((Class) typeClass, weight, groupCountMin, groupCountMax); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericRightClickAction.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericRightClickAction.java index ba4ed51..bd1a5fb 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericRightClickAction.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericRightClickAction.java @@ -14,7 +14,7 @@ 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.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.ResultEvents; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataGetter; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericSpawnCondition.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericSpawnCondition.java index f9051f4..f0a6de6 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericSpawnCondition.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericSpawnCondition.java @@ -14,7 +14,7 @@ import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMapFactory; 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.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataAccessor; import org.imesense.dynamicspawncontrol.technical.eventprocessor.signal.SignalDataGetter; 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 18a8d2f..d7e2b3c 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 @@ -1,6 +1,5 @@ package org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive; -import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.ResourceLocation; import net.minecraft.world.biome.Biome; @@ -8,17 +7,17 @@ import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.UniqueField; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.field.UniqueField; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import static net.minecraft.client.gui.Gui.*; /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnComplexityBiomes { //* TODO: Реализовать 'высоту' сложности, например 5 черепков от 5 до 20 высота в шахте и так далее @@ -73,7 +72,7 @@ public final class OnComplexityBiomes */ public OnComplexityBiomes() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropHeadMob.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropHeadMob.java index 3660452..54b4b1c 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropHeadMob.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropHeadMob.java @@ -14,11 +14,11 @@ import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.logfile.Log; -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnDropHeadMob { /** @@ -31,7 +31,7 @@ public final class OnDropHeadMob */ public OnDropHeadMob() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropSkeletonItem.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropSkeletonItem.java index b360ce1..7684fcf 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropSkeletonItem.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnDropSkeletonItem.java @@ -8,10 +8,10 @@ import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.config.skeletondropitem.DataSkeletonDropItem; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.config.data.SkeletonDropItemData; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import java.util.List; import java.util.Random; @@ -19,7 +19,7 @@ /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnDropSkeletonItem { /** @@ -32,7 +32,7 @@ public final class OnDropSkeletonItem */ public OnDropSkeletonItem() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -57,19 +57,19 @@ public synchronized void onUpdateLivingDropsEvent_0(LivingDropsEvent livingDrops List drops = livingDropsEvent.getDrops(); addDamagedItemToDrops(entitySkeleton, drops, entitySkeleton.getItemStackFromSlot(EntityEquipmentSlot.HEAD), - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance.getHeadDamageFactor()); + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance.getHeadDamageFactor()); addDamagedItemToDrops(entitySkeleton, drops, entitySkeleton.getItemStackFromSlot(EntityEquipmentSlot.CHEST), - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance.getChestDamageFactor()); + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance.getChestDamageFactor()); addDamagedItemToDrops(entitySkeleton, drops, entitySkeleton.getItemStackFromSlot(EntityEquipmentSlot.LEGS), - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance.getLegsDamageFactor()); + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance.getLegsDamageFactor()); addDamagedItemToDrops(entitySkeleton, drops, entitySkeleton.getItemStackFromSlot(EntityEquipmentSlot.FEET), - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance.getFeetDamageFactor()); + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance.getFeetDamageFactor()); addDamagedItemToDrops(entitySkeleton, drops, entitySkeleton.getHeldItemMainhand(), - DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance.getHandItemDamageFactor()); + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance.getHandItemDamageFactor()); Random rand = new Random(); double arrowDropChance = 0.50; @@ -85,7 +85,7 @@ public synchronized void onUpdateLivingDropsEvent_0(LivingDropsEvent livingDrops int currentCount = item.getItem().getCount(); item.getItem().setCount - (currentCount + 1 + DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance.getArrowsToDrops()); + (currentCount + 1 + SkeletonDropItemData.ConfigDataSkeletonDrop.Instance.getArrowsToDrops()); arrowsDropped = true; @@ -95,7 +95,7 @@ public synchronized void onUpdateLivingDropsEvent_0(LivingDropsEvent livingDrops if (!arrowsDropped) { - addArrowsToDrops(entitySkeleton, drops, DataSkeletonDropItem.ConfigDataSkeletonDrop.Instance.getArrowsToDrops()); + addArrowsToDrops(entitySkeleton, drops, SkeletonDropItemData.ConfigDataSkeletonDrop.Instance.getArrowsToDrops()); } } } @@ -112,7 +112,7 @@ private void addDamagedItemToDrops(EntitySkeleton entitySkeleton, List drops = livingDropsEvent.getDrops(); addDamagedItemToDrops(entityZombie, drops, entityZombie.getItemStackFromSlot(EntityEquipmentSlot.HEAD), - DataZombieDropItem.ConfigDataZombieDrop.Instance.getHeadDamageFactor()); + ZombieDropItemData.ConfigDataZombieDrop.Instance.getHeadDamageFactor()); addDamagedItemToDrops(entityZombie, drops, entityZombie.getItemStackFromSlot(EntityEquipmentSlot.CHEST), - DataZombieDropItem.ConfigDataZombieDrop.Instance.getChestDamageFactor()); + ZombieDropItemData.ConfigDataZombieDrop.Instance.getChestDamageFactor()); addDamagedItemToDrops(entityZombie, drops, entityZombie.getItemStackFromSlot(EntityEquipmentSlot.LEGS), - DataZombieDropItem.ConfigDataZombieDrop.Instance.getLegsDamageFactor()); + ZombieDropItemData.ConfigDataZombieDrop.Instance.getLegsDamageFactor()); addDamagedItemToDrops(entityZombie, drops, entityZombie.getItemStackFromSlot(EntityEquipmentSlot.FEET), - DataZombieDropItem.ConfigDataZombieDrop.Instance.getFeetDamageFactor()); + ZombieDropItemData.ConfigDataZombieDrop.Instance.getFeetDamageFactor()); addDamagedItemToDrops(entityZombie, drops, entityZombie.getHeldItemMainhand(), - DataZombieDropItem.ConfigDataZombieDrop.Instance.getHandItemDamageFactor()); + ZombieDropItemData.ConfigDataZombieDrop.Instance.getHandItemDamageFactor()); } } @@ -84,7 +84,7 @@ private void addDamagedItemToDrops(EntityZombie entityZombie, List d { if (originalItem.getItem() != Items.AIR) { - if (new Random().nextDouble() < DataZombieDropItem.ConfigDataZombieDrop.Instance.getBreakItem()) + if (new Random().nextDouble() < ZombieDropItemData.ConfigDataZombieDrop.Instance.getBreakItem()) { return; } @@ -97,7 +97,7 @@ private void addDamagedItemToDrops(EntityZombie entityZombie, List d Random random = new Random(); int minDamage = (int) (maxDamage * damageFactor); - int damageSpread = (int) (maxDamage * DataZombieDropItem.ConfigDataZombieDrop.Instance.getDamageSpreadFactor()); + int damageSpread = (int) (maxDamage * ZombieDropItemData.ConfigDataZombieDrop.Instance.getDamageSpreadFactor()); int randomDamage = minDamage + random.nextInt(damageSpread); itemStack.setItemDamage(randomDamage); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnNickNameEntity.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnNickNameEntity.java index d64b40a..cc58ef7 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnNickNameEntity.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnNickNameEntity.java @@ -10,10 +10,10 @@ import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.UniqueField; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.field.UniqueField; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import scala.util.Random; import java.io.*; @@ -23,7 +23,7 @@ /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnNickNameEntity { /** @@ -46,7 +46,7 @@ public final class OnNickNameEntity */ public OnNickNameEntity() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnPlayerEvent.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnPlayerEvent.java index 8393869..7ac1468 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnPlayerEvent.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnPlayerEvent.java @@ -12,10 +12,10 @@ 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.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.config.player.DataPlayer; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.config.file.PlayerData; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import java.util.ArrayList; import java.util.List; @@ -23,7 +23,7 @@ /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnPlayerEvent { /** @@ -41,7 +41,7 @@ public final class OnPlayerEvent */ public OnPlayerEvent() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -125,7 +125,7 @@ public synchronized void onPlayerRespawn_0(PlayerEvent.PlayerRespawnEvent player World world = entityPlayerMP.world; BlockPos blockPos = entityPlayerMP.getPosition(); - int radius = DataPlayer.ConfigDataPlayer.Instance.getProtectRespawnPlayerRadius(); + int radius = PlayerData.ConfigDataPlayer.Instance.getProtectRespawnPlayerRadius(); AxisAlignedBB area = new AxisAlignedBB ( 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 9fadc34..c73b873 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 @@ -5,10 +5,10 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.config.windowtitle.DataWindowTitle; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.config.data.WindowTitleData; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.lwjgl.opengl.Display; import javax.annotation.Nonnull; @@ -17,7 +17,7 @@ /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnWindowTitle { /** @@ -30,7 +30,7 @@ public final class OnWindowTitle */ public OnWindowTitle() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -45,7 +45,7 @@ public OnWindowTitle() * */ @Nonnull - private static final String TITLE = DataWindowTitle.ConfigDataWindowTitle.Instance.getWindowTitle(); + private static final String TITLE = WindowTitleData.ConfigDataWindowTitle.Instance.getWindowTitle(); /** * 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 17c5c54..44ccafb 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 @@ -6,18 +6,18 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; -import org.imesense.dynamicspawncontrol.technical.config.gamedebugger.DataGameDebugger; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.config.data.GameDebuggerData; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericBlockBreakAction; import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnBlockBreakEvent { /** @@ -30,7 +30,7 @@ public final class OnBlockBreakEvent */ public OnBlockBreakEvent() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -61,7 +61,7 @@ public synchronized void onUpdateBlockBreakEvent_0(BlockEvent.BreakEvent breakEv { Event.Result result = rule.getResult(); - if (DataGameDebugger.ConfigDataEvent.Instance.getDebugSetting("debug_on_block_break")) + if (GameDebuggerData.ConfigDataEvent.Instance.getDebugSetting("debug_on_block_break")) { Log.writeDataToLogFile(0, "ConfigsParser._GenericBlockBreakActions. ID Rule " + atomicInteger + ": " 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 1034260..f24cd12 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 @@ -6,18 +6,18 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; -import org.imesense.dynamicspawncontrol.technical.config.gamedebugger.DataGameDebugger; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.config.data.GameDebuggerData; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericBlockPlaceAction; import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnBlockPlaceEvent { /** @@ -30,7 +30,7 @@ public final class OnBlockPlaceEvent */ public OnBlockPlaceEvent() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -62,7 +62,7 @@ public synchronized void onUpdateBlockPaceEvent_0(BlockEvent.PlaceEvent placeEve { Event.Result result = rule.getResult(); - if (DataGameDebugger.ConfigDataEvent.Instance.getDebugSetting("debug_on_block_place")) + if (GameDebuggerData.ConfigDataEvent.Instance.getDebugSetting("debug_on_block_place")) { Log.writeDataToLogFile(0, "ConfigsParser._GenericBlockPlaceActions. ID Rule " + atomicInteger + ": " 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 2deee66..0540044 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 @@ -6,17 +6,17 @@ import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -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.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.config.data.GameDebuggerData; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericSpawnCondition; import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnEntitySpawnEvent { /** @@ -29,7 +29,7 @@ public final class OnEntitySpawnEvent */ public OnEntitySpawnEvent() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -58,7 +58,7 @@ public synchronized void onUpdateEntitySpawnEvent_0(LivingSpawnEvent.CheckSpawn { if (rule.match(checkSpawn)) { - if (DataGameDebugger.ConfigDataEvent.Instance.getDebugSetting("debug_on_entity_spawn")) + if (GameDebuggerData.ConfigDataEvent.Instance.getDebugSetting("debug_on_entity_spawn")) { Log.writeDataToLogFile(0, "ConfigsParser._GenericSpawnConditions. ID Rule: " + atomicInteger + ": " + "entity: " + checkSpawn.getEntity().getName() 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 53bcef8..fe8b270 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 @@ -6,17 +6,17 @@ import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -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.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.config.data.GameDebuggerData; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericLeftClickAction; import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnLeftClickEvent { /** @@ -29,7 +29,7 @@ public final class OnLeftClickEvent */ public OnLeftClickEvent() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -60,7 +60,7 @@ public synchronized void onUpdateLeftClickEvent_0(PlayerInteractEvent.LeftClickB { Event.Result result = rule.getResult(); - if (DataGameDebugger.ConfigDataEvent.Instance.getDebugSetting("debug_on_left_click")) + if (GameDebuggerData.ConfigDataEvent.Instance.getDebugSetting("debug_on_left_click")) { Log.writeDataToLogFile(0, "ConfigsParser._GenericLeftClickActions. ID Rule: " + atomicInteger + ": " + result diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnLivingDrop.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnLivingDrop.java index 0358437..bb6ab1a 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnLivingDrop.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/script/multiple/OnLivingDrop.java @@ -12,17 +12,17 @@ import net.minecraft.entity.item.EntityItem; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -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.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.config.data.GameDebuggerData; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericDropLoot; import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnLivingDrop { /** @@ -35,7 +35,7 @@ public final class OnLivingDrop */ public OnLivingDrop() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -88,7 +88,7 @@ public synchronized void onUpdateLivingDrops_0(LivingDropsEvent livingDropsEvent BlockPos blockPos = livingDropsEvent.getEntity().getPosition(); - if (DataGameDebugger.ConfigDataEvent.Instance.getDebugSetting("debug_on_living_drops")) + if (GameDebuggerData.ConfigDataEvent.Instance.getDebugSetting("debug_on_living_drops")) { Log.writeDataToLogFile(0, "ConfigsParser._GenericDropLoot. ID Rule: " + atomicInteger + " entity: " + livingDropsEvent.getEntity().getName() + " new drop @item: " + itemStack); 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 aac15c0..e45dfaa 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 @@ -6,17 +6,17 @@ import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.event.entity.living.LivingExperienceDropEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -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.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.config.data.GameDebuggerData; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericExperience; import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnLivingExperienceDrop { /** @@ -29,7 +29,7 @@ public final class OnLivingExperienceDrop */ public OnLivingExperienceDrop() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -60,7 +60,7 @@ public synchronized void onUpdateLivingExperienceDrop_0(LivingExperienceDropEven int modifyXp = rule.modifyXp(livingExperienceDropEvent.getDroppedExperience()); livingExperienceDropEvent.setDroppedExperience(modifyXp); - if (DataGameDebugger.ConfigDataEvent.Instance.getDebugSetting("debug_on_living_experience_drop")) + if (GameDebuggerData.ConfigDataEvent.Instance.getDebugSetting("debug_on_living_experience_drop")) { Log.writeDataToLogFile(0, "ConfigsParser._GenericExperience. ID Rule: " + atomicInteger + ": " + result 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 c176fe6..a4c9267 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 @@ -6,16 +6,16 @@ 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.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericMobTaskManager; import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnMobTaskManager { /** @@ -28,7 +28,7 @@ public final class OnMobTaskManager */ public OnMobTaskManager() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) { 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 00116b2..44d8b41 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 @@ -7,17 +7,17 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -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.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.config.data.GameDebuggerData; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericMapEffectAction; import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnPlayerTick { /** @@ -30,7 +30,7 @@ public final class OnPlayerTick */ public OnPlayerTick() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** @@ -58,7 +58,7 @@ public synchronized void onUpdatePlayerTick_0(TickEvent.PlayerTickEvent playerTi { if (tickCounter % rule.getTimeout() == 0 && rule.match(playerTickEvent)) { - if (DataGameDebugger.ConfigDataEvent.Instance.getDebugSetting("debug_on_player_tick")) + if (GameDebuggerData.ConfigDataEvent.Instance.getDebugSetting("debug_on_player_tick")) { Log.writeDataToLogFile(0, "ConfigsParser._GenericMapEffectsActions. ID Rule: " + atomicInteger + " entity: " + playerTickEvent.player.getName() 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 3c1eb32..63f2644 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 @@ -9,19 +9,19 @@ import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -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.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.config.data.GameDebuggerData; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericPotentialSpawn; import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; -import org.imesense.dynamicspawncontrol.technical.worldcache.Cache; -import org.imesense.dynamicspawncontrol.technical.worldcache.CacheStorage; +import org.imesense.dynamicspawncontrol.core.worldcache.Cache; +import org.imesense.dynamicspawncontrol.core.worldcache.CacheStorage; /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnPotentialSpawn { /** @@ -34,7 +34,7 @@ public final class OnPotentialSpawn */ public OnPotentialSpawn() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) @@ -105,7 +105,7 @@ public synchronized void onUpdatePotentialSpawns_0(WorldEvent.PotentialSpawns po potentialSpawns.getList().add(entry); } - if (DataGameDebugger.ConfigDataEvent.Instance.getDebugSetting("debug_on_potential_spawn")) + if (GameDebuggerData.ConfigDataEvent.Instance.getDebugSetting("debug_on_potential_spawn")) { Log.writeDataToLogFile(0, "ConfigsParser._GenericOverrideSpawn. List: " + potentialSpawns.getList()); } 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 d13b683..1ce9803 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 @@ -6,17 +6,17 @@ import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -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.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.config.data.GameDebuggerData; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericRightClickAction; import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnRightClickEvent { /** @@ -29,7 +29,7 @@ public final class OnRightClickEvent */ public OnRightClickEvent() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) { @@ -60,7 +60,7 @@ public synchronized void onUpdateRightClickEvent_0(PlayerInteractEvent.RightClic { Event.Result result = rule.getResult(); - if (DataGameDebugger.ConfigDataEvent.Instance.getDebugSetting("debug_on_right_click")) + if (GameDebuggerData.ConfigDataEvent.Instance.getDebugSetting("debug_on_right_click")) { Log.writeDataToLogFile(0, "ConfigsParser._GenericRightClickActions. ID Rule: " + atomicInteger + ": " + result + " entity: " + rightClickBlock.getEntityPlayer().getName() 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 cc81de9..d775e00 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 @@ -6,9 +6,9 @@ import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.parser.GeneralStorageData; import java.util.List; @@ -16,7 +16,7 @@ /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnSingleJsonCheckSpawn { /** @@ -29,7 +29,7 @@ public final class OnSingleJsonCheckSpawn */ public OnSingleJsonCheckSpawn() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.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 efbd3a3..79a27b2 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 @@ -12,9 +12,9 @@ import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.parser.GeneralStorageData; import java.util.*; @@ -22,7 +22,7 @@ /** * */ -@Mod.EventBusSubscriber(modid = ProjectStructure.STRUCT_INFO_MOD.MOD_ID) +@Mod.EventBusSubscriber(modid = DynamicSpawnControlStructure.STRUCT_INFO_MOD.MOD_ID) public final class OnSingleZombieSummonAID { /** @@ -45,7 +45,7 @@ public final class OnSingleZombieSummonAID */ public OnSingleZombieSummonAID() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); if (instanceExists) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/GeneralStorageData.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/GeneralStorageData.java index 612657f..c36e2f0 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/GeneralStorageData.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/GeneralStorageData.java @@ -1,6 +1,6 @@ package org.imesense.dynamicspawncontrol.technical.parser; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; import java.util.List; @@ -19,7 +19,7 @@ public final class GeneralStorageData */ public GeneralStorageData() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); Instance = this; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/ParserGenericJsonScript.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/ParserGenericJsonScript.java index 4cc6a7c..3182bb7 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/ParserGenericJsonScript.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/ParserGenericJsonScript.java @@ -2,9 +2,9 @@ import com.google.gson.JsonElement; import com.google.gson.JsonParser; -import org.imesense.dynamicspawncontrol.ProjectStructure; -import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil; -import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.*; import java.io.*; @@ -121,43 +121,43 @@ public static void readRules() private static void readAllRules() { // - CodeGenericUtil.readAndLogRules(_PATH, "DropAllItems" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + CodeGeneric.readAndLogRules(_PATH, "DropAllItems" + DynamicSpawnControlStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, GenericDropLoot::parse, GENERIC_DROP_LOOT_LIST, ARRAY_TYPE_SCRIPT[0]); // - CodeGenericUtil.readAndLogRules(_PATH, "DropAllExperience" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + CodeGeneric.readAndLogRules(_PATH, "DropAllExperience" + DynamicSpawnControlStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, GenericExperience::parse, GENERIC_EXPERIENCE_LIST, ARRAY_TYPE_SCRIPT[0]); // - CodeGenericUtil.readAndLogRules(_PATH, "MainPotentialSpawn" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + CodeGeneric.readAndLogRules(_PATH, "MainPotentialSpawn" + DynamicSpawnControlStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, GenericPotentialSpawn::parse, GENERIC_POTENTIAL_SPAWN_LIST, ARRAY_TYPE_SCRIPT[4]); // - CodeGenericUtil.readAndLogRules(_PATH, "SpawnConditions" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + CodeGeneric.readAndLogRules(_PATH, "SpawnConditions" + DynamicSpawnControlStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, GenericSpawnCondition::parse, GENERIC_SPAWN_CONDITIONS_LIST, ARRAY_TYPE_SCRIPT[4]); // - CodeGenericUtil.readAndLogRules(_PATH, "MobTaskManager" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + CodeGeneric.readAndLogRules(_PATH, "MobTaskManager" + DynamicSpawnControlStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, GenericMobTaskManager::parse, GENERIC_MOBS_TASK_MANAGER_LIST, ARRAY_TYPE_SCRIPT[4]); // - CodeGenericUtil.readAndLogRules(_PATH, "EventEffects" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + CodeGeneric.readAndLogRules(_PATH, "EventEffects" + DynamicSpawnControlStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, GenericMapEffectAction::parse, GENERIC_MAP_EFFECTS_ACTIONS_LIST, ARRAY_TYPE_SCRIPT[2]); // - CodeGenericUtil.readAndLogRules(_PATH, "EventBlockPlace" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + CodeGeneric.readAndLogRules(_PATH, "EventBlockPlace" + DynamicSpawnControlStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, GenericBlockPlaceAction::parse, GENERIC_BLOCK_PLACE_ACTIONS_LIST, ARRAY_TYPE_SCRIPT[1]); // - CodeGenericUtil.readAndLogRules(_PATH, "EventBlockBreak" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + CodeGeneric.readAndLogRules(_PATH, "EventBlockBreak" + DynamicSpawnControlStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, GenericBlockBreakAction::parse, GENERIC_BLOCK_BREAK_ACTIONS_LIST, ARRAY_TYPE_SCRIPT[1]); // - CodeGenericUtil.readAndLogRules(_PATH, "EventLeftMouseClick" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + CodeGeneric.readAndLogRules(_PATH, "EventLeftMouseClick" + DynamicSpawnControlStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, GenericLeftClickAction::parse, GENERIC_LEFT_CLICK_ACTIONS_LIST, ARRAY_TYPE_SCRIPT[3]); // - CodeGenericUtil.readAndLogRules(_PATH, "EventRightMouseClick" + ProjectStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, + CodeGeneric.readAndLogRules(_PATH, "EventRightMouseClick" + DynamicSpawnControlStructure.STRUCT_FILES_EXTENSION.SCRIPT_FILE_EXTENSION, GenericRightClickAction::parse, GENERIC_RIGHT_CLICK_ACTIONS_LIST, ARRAY_TYPE_SCRIPT[3]); } @@ -220,8 +220,8 @@ private static JsonElement getRootElement(final String PATH, final String FILE_N } else { - File infinityForceSpawnConfigsDir = new File(PATH + File.separator + ProjectStructure.STRUCT_FILES_DIRS.NAME_DIRECTORY); - File scriptsDir = new File(infinityForceSpawnConfigsDir, ProjectStructure.STRUCT_FILES_DIRS.NAME_DIR_SCRIPTS + File.separator + getTypeScript); + File infinityForceSpawnConfigsDir = new File(PATH + File.separator + DynamicSpawnControlStructure.STRUCT_FILES_DIRS.NAME_DIRECTORY); + File scriptsDir = new File(infinityForceSpawnConfigsDir, DynamicSpawnControlStructure.STRUCT_FILES_DIRS.NAME_DIR_SCRIPTS + File.separator + getTypeScript); if (!scriptsDir.exists()) { @@ -291,7 +291,7 @@ private static void makeEmptyRuleFile(File file) printWriter.println("["); printWriter.println("//-' OldSerpskiStalker, acidicMercury8"); - printWriter.println("//-' Dynamic Spawn Control for Minecraft: " + ProjectStructure.STRUCT_INFO_MOD.VERSION); + printWriter.println("//-' Dynamic Spawn Control for Minecraft: " + DynamicSpawnControlStructure.STRUCT_INFO_MOD.VERSION); printWriter.println("//-' Our organization: https://github.com/imesense"); printWriter.println("]"); 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 index 6fcda13..eb518d0 100644 --- 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 @@ -1,9 +1,10 @@ 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 org.imesense.dynamicspawncontrol.core.api.IParser; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.technical.parser.beta.IParserSingleZombieSummonAID; +import org.imesense.dynamicspawncontrol.technical.parser.beta.IParserSingleScriptCheckSpawn; +import org.imesense.dynamicspawncontrol.technical.parser.beta.IParserSingleScriptSettingsCache; import java.util.ArrayList; import java.util.List; @@ -16,14 +17,14 @@ public final class ParserManager /** * */ - private static final List BETA_PARSER_LIST = new ArrayList<>(); + private static final List BETA_I_PARSER_LIST = new ArrayList<>(); /** * */ public ParserManager() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** @@ -31,13 +32,13 @@ public ParserManager() */ public static void init() { - BETA_PARSER_LIST.add(new ParserSingleScriptSettingsCache()); - BETA_PARSER_LIST.add(new ParserSingleZombieSummonAID()); - BETA_PARSER_LIST.add(new ParserSingleScriptCheckSpawn()); + BETA_I_PARSER_LIST.add(new IParserSingleScriptSettingsCache()); + BETA_I_PARSER_LIST.add(new IParserSingleZombieSummonAID()); + BETA_I_PARSER_LIST.add(new IParserSingleScriptCheckSpawn()); - for (IBetaParser iBetaParser : BETA_PARSER_LIST) + for (IParser iBetaIParser : BETA_I_PARSER_LIST) { - iBetaParser.loadConfig(true); + iBetaIParser.loadConfig(true); } } @@ -46,9 +47,9 @@ public static void init() */ public static void reloadAllConfigs() { - for (IBetaParser iBetaParser : BETA_PARSER_LIST) + for (IParser iBetaIParser : BETA_I_PARSER_LIST) { - iBetaParser.reloadConfig(); + iBetaIParser.reloadConfig(); } } } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/ParserSingleScriptCheckSpawn.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/IParserSingleScriptCheckSpawn.java similarity index 75% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/ParserSingleScriptCheckSpawn.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/IParserSingleScriptCheckSpawn.java index ae9fc6e..726b55e 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/ParserSingleScriptCheckSpawn.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/IParserSingleScriptCheckSpawn.java @@ -2,12 +2,11 @@ import com.google.gson.*; import com.google.gson.reflect.TypeToken; -import org.imesense.dynamicspawncontrol.ProjectStructure; -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.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.parser.GeneralStorageData; -import org.imesense.dynamicspawncontrol.technical.parser.IBetaParser; +import org.imesense.dynamicspawncontrol.core.api.IParser; import java.io.File; import java.io.FileReader; @@ -19,14 +18,14 @@ /** * */ -public final class ParserSingleScriptCheckSpawn implements IBetaParser +public final class IParserSingleScriptCheckSpawn implements IParser { /** * */ - public ParserSingleScriptCheckSpawn() + public IParserSingleScriptCheckSpawn() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** @@ -43,8 +42,8 @@ public void reloadConfig() */ public void loadConfig(boolean initialization) { - File file = getConfigFile(initialization, ProjectStructure.STRUCT_FILES_DIRS.NAME_DIR_SINGLE_SCRIPTS, - EnumSingleScript.SCRIPT_MOBS_LIST_SEE_SKY.getKeyword()); + File file = getConfigFile(initialization, DynamicSpawnControlStructure.STRUCT_FILES_DIRS.NAME_DIR_SINGLE_SCRIPTS, + /*EnumSingleScript.SCRIPT_MOBS_LIST_SEE_SKY.getKeyword()*/"action_mobs_list_see_sky.json"); if (!file.exists()) { @@ -100,16 +99,16 @@ public void loadConfig(boolean initialization) final Type listType = new TypeToken>() {}.getType(); GeneralStorageData.Instance.EntitiesProhibitedOutdoors = gson.fromJson(jsonObject1.get("entities"), listType); - Log.writeDataToLogFile(0, "Script: " + - EnumSingleScript.SCRIPT_MOBS_LIST_SEE_SKY.getKeyword() + - " data blockedEntities: " + GeneralStorageData.Instance.EntitiesProhibitedOutdoors); + //Log.writeDataToLogFile(0, "Script: " + + // EnumSingleScript.SCRIPT_MOBS_LIST_SEE_SKY.getKeyword() + + // " data blockedEntities: " + GeneralStorageData.Instance.EntitiesProhibitedOutdoors); } else { - Log.writeDataToLogFile(0, - "Script: " + - EnumSingleScript.SCRIPT_MOBS_LIST_SEE_SKY.getKeyword() + - " not found key 'entities'"); + //Log.writeDataToLogFile(0, + // "Script: " + + // 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/parser/beta/ParserSingleScriptSettingsCache.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/IParserSingleScriptSettingsCache.java similarity index 87% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/ParserSingleScriptSettingsCache.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/IParserSingleScriptSettingsCache.java index 78f38cb..60aa0c2 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/ParserSingleScriptSettingsCache.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/IParserSingleScriptSettingsCache.java @@ -2,12 +2,11 @@ import com.google.gson.*; import net.minecraft.util.ResourceLocation; -import org.imesense.dynamicspawncontrol.ProjectStructure; -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.parser.IBetaParser; -import org.imesense.dynamicspawncontrol.technical.worldcache.CacheStorage; +import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.api.IParser; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.logfile.Log; +import org.imesense.dynamicspawncontrol.core.worldcache.CacheStorage; import java.io.File; import java.io.FileReader; @@ -19,14 +18,14 @@ /** * */ -public final class ParserSingleScriptSettingsCache implements IBetaParser +public final class IParserSingleScriptSettingsCache implements IParser { /** * */ - public ParserSingleScriptSettingsCache() + public IParserSingleScriptSettingsCache() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** @@ -43,8 +42,8 @@ public void reloadConfig() */ public void loadConfig(boolean initialization) { - File file = getConfigFile(initialization, ProjectStructure.STRUCT_FILES_DIRS.NAME_DIR_CACHE, - EnumSingleScript.SCRIPT_CACHE_MOBS.getKeyword()); + File file = getConfigFile(initialization, DynamicSpawnControlStructure.STRUCT_FILES_DIRS.NAME_DIR_CACHE, + /*EnumSingleScript.SCRIPT_CACHE_MOBS.getKeyword()*/"cache_mobs.json"); if (!file.exists()) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/ParserSingleZombieSummonAID.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/IParserSingleZombieSummonAID.java similarity index 75% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/ParserSingleZombieSummonAID.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/IParserSingleZombieSummonAID.java index f42ef50..664526b 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/ParserSingleZombieSummonAID.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/parser/beta/IParserSingleZombieSummonAID.java @@ -5,12 +5,11 @@ import com.google.gson.JsonObject; import com.google.gson.JsonSyntaxException; import com.google.gson.reflect.TypeToken; -import org.imesense.dynamicspawncontrol.ProjectStructure; -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.DynamicSpawnControlStructure; +import org.imesense.dynamicspawncontrol.core.util.CodeGeneric; +import org.imesense.dynamicspawncontrol.core.logfile.Log; import org.imesense.dynamicspawncontrol.technical.parser.GeneralStorageData; -import org.imesense.dynamicspawncontrol.technical.parser.IBetaParser; +import org.imesense.dynamicspawncontrol.core.api.IParser; import java.io.File; import java.io.FileReader; @@ -23,14 +22,14 @@ /** * */ -public final class ParserSingleZombieSummonAID implements IBetaParser +public final class IParserSingleZombieSummonAID implements IParser { /** * */ - public ParserSingleZombieSummonAID() + public IParserSingleZombieSummonAID() { - CodeGenericUtil.printInitClassToLog(this.getClass()); + CodeGeneric.printInitClassToLog(this.getClass()); } /** @@ -49,8 +48,8 @@ public void loadConfig(boolean initialization) { GeneralStorageData.Instance.EquipmentConfigs = new ArrayList<>(); - File file = getConfigFile(initialization, ProjectStructure.STRUCT_FILES_DIRS.NAME_DIR_SINGLE_SCRIPTS, - EnumSingleScript.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword()); + File file = getConfigFile(initialization, DynamicSpawnControlStructure.STRUCT_FILES_DIRS.NAME_DIR_SINGLE_SCRIPTS, + /*EnumSingleScript.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword()*/ "action_zombie_summon_aid.json"); if (!file.exists()) { @@ -94,8 +93,8 @@ public void loadConfig(boolean initialization) if (jsonArray.size() == 0) { - Log.writeDataToLogFile(0, "Script: " + - EnumSingleScript.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword() + " data is empty."); + //Log.writeDataToLogFile(0, "Script: " + + // EnumSingleScript.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword() + " data is empty."); return; } @@ -124,25 +123,25 @@ public void loadConfig(boolean initialization) GeneralStorageData.Instance.EquipmentConfigs.add(config); - Log.writeDataToLogFile(0, "Script: " + - EnumSingleScript.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword() + " data loaded."); + //Log.writeDataToLogFile(0, "Script: " + + // EnumSingleScript.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword() + " data loaded."); } else { - Log.writeDataToLogFile(0, - "Script: " + - EnumSingleScript.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword() + - " not found key 'equipment'"); + //Log.writeDataToLogFile(0, + // "Script: " + + // EnumSingleScript.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword() + + // " not found key 'equipment'"); throw new RuntimeException("Key 'equipment' not found in JSON file."); } } else { - Log.writeDataToLogFile(0, - "Script: " + - EnumSingleScript.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword() + - " not found key 'data'"); + //Log.writeDataToLogFile(0, + // "Script: " + + // EnumSingleScript.SCRIPT_ZOMBIE_SUMMON_AID.getKeyword() + + // " not found key 'data'"); throw new RuntimeException("Key 'data' not found in JSON file."); }