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 b42fcbb..ec67c50 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 @@ -12,11 +12,8 @@ import net.minecraftforge.fml.common.event.FMLServerStoppedEvent; import org.imesense.dynamicspawncontrol.debug.CheckDebugger; -import org.imesense.dynamicspawncontrol.gameplay.EventGameplayManager; -import org.imesense.dynamicspawncontrol.gameplay.RegisterCommandsManager; -import org.imesense.dynamicspawncontrol.gameplay.events.OnUpdateTorchLogic; -import org.imesense.dynamicspawncontrol.technical.configs.IConfig; -import org.imesense.dynamicspawncontrol.technical.configs.SettingsLogFile; +import org.imesense.dynamicspawncontrol.technical.initializer.RegisterGameplayClasses; +import org.imesense.dynamicspawncontrol.technical.initializer.RegisterCommandsClasses; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.technical.eventprocessor.single.OnUpdateTimeWorld; import org.imesense.dynamicspawncontrol.technical.gamestructures.Structures; @@ -190,7 +187,7 @@ public synchronized void preInit(FMLPreInitializationEvent event) cacheStorage = new CacheStorage("CacheStorage"); // - EventGameplayManager.registerClasses(); + RegisterGameplayClasses.registerClasses(); // Proxy.preInit(event); @@ -242,7 +239,7 @@ public synchronized void onLoadComplete(FMLLoadCompleteEvent event) @EventHandler public synchronized void serverLoad(FMLServerStartingEvent event) { - RegisterCommandsManager.registerCommands(event); + RegisterCommandsClasses.registerCommands(event); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/gameworld/WorldTime.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/gameworld/WorldTime.java index f7aedb8..efcb494 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/gameworld/WorldTime.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/gameworld/WorldTime.java @@ -1,7 +1,7 @@ package org.imesense.dynamicspawncontrol.gameplay.gameworld; import net.minecraft.world.World; -import org.imesense.dynamicspawncontrol.technical.configs.SettingsWorldTime; +import org.imesense.dynamicspawncontrol.technical.configs.ConfigWorldTime; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import java.math.BigDecimal; @@ -24,12 +24,12 @@ public WorldTime(final String nameClass) /** * */ - private static final double day_multiplier = multiplier(SettingsWorldTime.DayLengthMinutes); + private static final double day_multiplier = multiplier(ConfigWorldTime.DayLengthMinutes); /** * */ - private static final double night_multiplier = multiplier(SettingsWorldTime.NightLengthMinutes); + private static final double night_multiplier = multiplier(ConfigWorldTime.NightLengthMinutes); /** * diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/worldgenerator/NetherRackGenerator.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/worldgenerator/NetherRackGenerator.java index 534a407..cca0a4b 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/worldgenerator/NetherRackGenerator.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/worldgenerator/NetherRackGenerator.java @@ -8,7 +8,7 @@ import net.minecraft.world.gen.feature.WorldGenMinable; import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.fml.common.IWorldGenerator; -import org.imesense.dynamicspawncontrol.technical.configs.SettingsWorldGenerator; +import org.imesense.dynamicspawncontrol.technical.configs.ConfigWorldGenerator; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import java.util.Objects; @@ -84,9 +84,9 @@ public void generate(Random random, int chunkX, int chunkZ, World world, IChunkG { run( classGenerateBlockNetherRack, world, random, chunkX, chunkZ, - SettingsWorldGenerator.BlockNetherrackChanceSpawn, - SettingsWorldGenerator.GetBlockNetherrackMinHeight, - SettingsWorldGenerator.GetBlockNetherrackMaxHeight + ConfigWorldGenerator.BlockNetherrackChanceSpawn, + ConfigWorldGenerator.GetBlockNetherrackMinHeight, + ConfigWorldGenerator.GetBlockNetherrackMaxHeight ); break; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/EntityRendererHooks.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/EntityRendererHooks.java index 78f585e..f9762af 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/EntityRendererHooks.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/EntityRendererHooks.java @@ -8,7 +8,7 @@ import net.minecraft.world.World; import net.minecraft.world.WorldProvider; import org.imesense.dynamicspawncontrol.debug.CheckDebugger; -import org.imesense.dynamicspawncontrol.technical.configs.SettingsRenderNight; +import org.imesense.dynamicspawncontrol.technical.configs.ConfigRenderNight; import java.lang.reflect.Field; @@ -121,12 +121,12 @@ private static boolean blacklistDim(WorldProvider dimension) { DimensionType dimType = dimension.getDimensionType(); - if (dimType == DimensionType.THE_END && !SettingsRenderNight.DarknessEnd) + if (dimType == DimensionType.THE_END && !ConfigRenderNight.DarknessEnd) { return true; } - return blacklistContains(dimension, dimType) ^ SettingsRenderNight.InvertBlacklist; + return blacklistContains(dimension, dimType) ^ ConfigRenderNight.InvertBlacklist; } /** @@ -139,7 +139,7 @@ private static boolean blacklistContains(WorldProvider dimension, DimensionType { String dimName = dimensionType.getName(); - for (String blacklistName : SettingsRenderNight.BlacklistByName) + for (String blacklistName : ConfigRenderNight.BlacklistByName) { if (!blacklistName.equals(dimName)) { @@ -151,7 +151,7 @@ private static boolean blacklistContains(WorldProvider dimension, DimensionType int dimID = dimension.getDimension(); - for (int blacklistID : SettingsRenderNight.BlacklistByID) + for (int blacklistID : ConfigRenderNight.BlacklistByID) { if (dimID != blacklistID) { @@ -174,23 +174,23 @@ private static boolean isDark(WorldProvider dimension, DimensionType dimensionTy { if (dimensionType == DimensionType.OVERWORLD) { - return SettingsRenderNight.DarknessOverWorld; + return ConfigRenderNight.DarknessOverWorld; } else if (dimensionType == DimensionType.NETHER) { - return SettingsRenderNight.DarknessNether; + return ConfigRenderNight.DarknessNether; } else if (dimensionType == DimensionType.THE_END) { - return SettingsRenderNight.DarknessEnd; + return ConfigRenderNight.DarknessEnd; } else if (dimension.hasSkyLight()) { - return SettingsRenderNight.DarknessDefault; + return ConfigRenderNight.DarknessDefault; } else { - return SettingsRenderNight.DarknessSkyLess; + return ConfigRenderNight.DarknessSkyLess; } } @@ -224,9 +224,9 @@ private static float getMoonBrightness(float partialTicks, World world) final double moon; - if (!SettingsRenderNight.IgnoreMoonLight) + if (!ConfigRenderNight.IgnoreMoonLight) { - double[] phaseFactors = SettingsRenderNight.MoonPhaseFactors; + double[] phaseFactors = ConfigRenderNight.MoonPhaseFactors; int moonPhase = dim.getMoonPhase(world.getWorldTime()); if (moonPhase < phaseFactors.length) diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/WorldProviderHooks.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/WorldProviderHooks.java index 4a8863d..dd2ab53 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/WorldProviderHooks.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/asm/WorldProviderHooks.java @@ -4,7 +4,7 @@ import net.minecraft.world.WorldProvider; import net.minecraft.world.WorldProviderEnd; import net.minecraft.world.WorldProviderHell; -import org.imesense.dynamicspawncontrol.technical.configs.SettingsRenderNight; +import org.imesense.dynamicspawncontrol.technical.configs.ConfigRenderNight; /** * @@ -20,12 +20,12 @@ public final class WorldProviderHooks */ public static Vec3d onGetFogColor(WorldProvider provider, float angle, float partialTicks) { - if (!SettingsRenderNight.DarknessEndFog && provider instanceof WorldProviderEnd) + if (!ConfigRenderNight.DarknessEndFog && provider instanceof WorldProviderEnd) { return null; } - if (!SettingsRenderNight.DarknessNetherFog && provider instanceof WorldProviderHell) + if (!ConfigRenderNight.DarknessNetherFog && provider instanceof WorldProviderHell) { return null; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsGameDebugger.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/ConfigGameDebugger.java similarity index 97% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsGameDebugger.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/ConfigGameDebugger.java index b6c79db..6e91e26 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsGameDebugger.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/ConfigGameDebugger.java @@ -11,7 +11,7 @@ /** * */ -public final class SettingsGameDebugger implements IConfig +public final class ConfigGameDebugger implements IConfig { /** * @@ -72,7 +72,7 @@ public final class SettingsGameDebugger implements IConfig * * @param nameClass */ - public SettingsGameDebugger(final String nameClass) + public ConfigGameDebugger(final String nameClass) { } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsLogFile.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/ConfigLogFile.java similarity index 94% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsLogFile.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/ConfigLogFile.java index b273a8a..7ef52ef 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsLogFile.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/ConfigLogFile.java @@ -11,7 +11,7 @@ /** * */ -public final class SettingsLogFile implements IConfig +public final class ConfigLogFile implements IConfig { /** * @@ -21,7 +21,7 @@ public final class SettingsLogFile implements IConfig /** * */ - public SettingsLogFile(final String nameClass) + public ConfigLogFile(final String nameClass) { } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsRenderNight.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/ConfigRenderNight.java similarity index 98% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsRenderNight.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/ConfigRenderNight.java index 6632892..bff5479 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsRenderNight.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/ConfigRenderNight.java @@ -11,7 +11,7 @@ /** * */ -public class SettingsRenderNight implements IConfig +public class ConfigRenderNight implements IConfig { /** * @@ -77,7 +77,7 @@ public class SettingsRenderNight implements IConfig * * @param nameClass */ - public SettingsRenderNight(final String nameClass) + public ConfigRenderNight(final String nameClass) { } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsWorldGenerator.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/ConfigWorldGenerator.java similarity index 95% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsWorldGenerator.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/ConfigWorldGenerator.java index 9d207fe..493810a 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsWorldGenerator.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/ConfigWorldGenerator.java @@ -11,7 +11,7 @@ /** * */ -public final class SettingsWorldGenerator implements IConfig +public final class ConfigWorldGenerator implements IConfig { /** * @@ -32,7 +32,7 @@ public final class SettingsWorldGenerator implements IConfig * * @param nameClass */ - public SettingsWorldGenerator(final String nameClass) + public ConfigWorldGenerator(final String nameClass) { } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsWorldTime.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/ConfigWorldTime.java similarity index 96% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsWorldTime.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/ConfigWorldTime.java index da4e11e..ef18982 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsWorldTime.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/ConfigWorldTime.java @@ -11,7 +11,7 @@ /** * */ -public final class SettingsWorldTime implements IConfig +public final class ConfigWorldTime implements IConfig { /** * @@ -42,7 +42,7 @@ public final class SettingsWorldTime implements IConfig * * @param nameClass */ - public SettingsWorldTime(final String nameClass) + public ConfigWorldTime(final String nameClass) { } 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/technical/customlibrary/Log.java index cb5e802..ccb246e 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/technical/customlibrary/Log.java @@ -1,7 +1,7 @@ package org.imesense.dynamicspawncontrol.technical.customlibrary; import org.imesense.dynamicspawncontrol.DynamicSpawnControl; -import org.imesense.dynamicspawncontrol.technical.configs.SettingsLogFile; +import org.imesense.dynamicspawncontrol.technical.configs.ConfigLogFile; import javax.annotation.Nonnull; import java.io.*; @@ -152,7 +152,7 @@ public static void writeDataToLogFile(@Nonnull String typeInfo, String data) writer.write("\n" + typeInfo + data); writer.close(); - cleanFile(logFile, SettingsLogFile.LogMaxLines); + cleanFile(logFile, ConfigLogFile.LogMaxLines); System.out.println("The data has been successfully written to the log file: " + logFile.getAbsolutePath()); } catch (IOException e) diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/single/OnUpdateTimeWorld.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/single/OnUpdateTimeWorld.java index 4e3651c..ab84b9c 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/single/OnUpdateTimeWorld.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/single/OnUpdateTimeWorld.java @@ -16,7 +16,7 @@ import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.relauncher.Side; import org.imesense.dynamicspawncontrol.gameplay.gameworld.WorldTime; -import org.imesense.dynamicspawncontrol.technical.configs.SettingsWorldTime; +import org.imesense.dynamicspawncontrol.technical.configs.ConfigWorldTime; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.technical.handlers.ITimeHandler; import org.imesense.dynamicspawncontrol.technical.handlers.TimeHandlerClient; @@ -72,7 +72,7 @@ public synchronized void onUpdateWorldLoad_0(ChunkDataEvent.Load event) world.getGameRules().setOrCreateGameRule("doDaylightCycle_tc", "true"); } - if (!world.isRemote && !SettingsWorldTime.SyncToSystemTime) + if (!world.isRemote && !ConfigWorldTime.SyncToSystemTime) { this.serverUpdate(world.getWorldTime()); } @@ -198,7 +198,7 @@ else if (event.getCommand() instanceof CommandTime && event.getParameters().leng } } - if (SettingsWorldTime.SyncToSystemTime) + if (ConfigWorldTime.SyncToSystemTime) { event.getSender().sendMessage(new TextComponentString (TextFormatting.RED + "Disable system time synchronization to " + args[0] + " time!")); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handlers/TimeHandlerClient.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handlers/TimeHandlerClient.java index 725181a..2a111b6 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handlers/TimeHandlerClient.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handlers/TimeHandlerClient.java @@ -6,7 +6,7 @@ import org.apache.logging.log4j.LogManager; import org.imesense.dynamicspawncontrol.gameplay.gameworld.WorldTime; -import org.imesense.dynamicspawncontrol.technical.configs.SettingsWorldTime; +import org.imesense.dynamicspawncontrol.technical.configs.ConfigWorldTime; /** * @@ -40,7 +40,7 @@ public final class TimeHandlerClient implements ITimeHandler @Override public void tick(World world) { - if (!SettingsWorldTime.SyncToSystemTime) + if (!ConfigWorldTime.SyncToSystemTime) { ++this.debugLogDelay; @@ -54,7 +54,7 @@ public void tick(World world) WorldTime.setWorldTime(world, this.customTime, this.multiplier); - if (SettingsWorldTime.TimeControlDebug && this.debugLogDelay % 20 == 0) + if (ConfigWorldTime.TimeControlDebug && this.debugLogDelay % 20 == 0) { long worldTime = world.getWorldTime(); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handlers/TimeHandlerServer.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handlers/TimeHandlerServer.java index 729bc44..cd2860e 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handlers/TimeHandlerServer.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/handlers/TimeHandlerServer.java @@ -12,7 +12,7 @@ import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.imesense.dynamicspawncontrol.gameplay.gameworld.WorldTime; -import org.imesense.dynamicspawncontrol.technical.configs.SettingsWorldTime; +import org.imesense.dynamicspawncontrol.technical.configs.ConfigWorldTime; import org.imesense.dynamicspawncontrol.technical.network.MessageHandler; import org.imesense.dynamicspawncontrol.technical.network.PacketTime; @@ -58,9 +58,9 @@ public final class TimeHandlerServer implements ITimeHandler @Override public void tick(World world) { - if (SettingsWorldTime.SyncToSystemTime) + if (ConfigWorldTime.SyncToSystemTime) { - if (!world.isRemote && world.getMinecraftServer().getTickCounter() % SettingsWorldTime.SyncToSystemTimeRate == 0) + if (!world.isRemote && world.getMinecraftServer().getTickCounter() % ConfigWorldTime.SyncToSystemTimeRate == 0) { this.syncTimeWithSystem(world); } @@ -106,7 +106,7 @@ public void tick(World world) { MessageHandler.INSTANCE.sendToAll(new PacketTime(this.customTime, this.multiplier)); - if (SettingsWorldTime.TimeControlDebug) + if (ConfigWorldTime.TimeControlDebug) { updatedWorldTime = world.getWorldTime(); @@ -160,7 +160,7 @@ private void syncTimeWithSystem(World world) world.provider.setWorldTime(time); - if (SettingsWorldTime.TimeControlDebug) + if (ConfigWorldTime.TimeControlDebug) { log.info(String.format("System time update: %d -> %d | day %s, %s:%s", worldTime, time, calendar.get(Calendar.DAY_OF_YEAR), hour, minute)); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/RegisterCommandsManager.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterCommandsClasses.java similarity index 90% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/RegisterCommandsManager.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterCommandsClasses.java index de40ff9..80745e4 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/RegisterCommandsManager.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterCommandsClasses.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.gameplay; +package org.imesense.dynamicspawncontrol.technical.initializer; import net.minecraft.command.ICommand; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; @@ -9,7 +9,7 @@ /** * */ -public class RegisterCommandsManager +public class RegisterCommandsClasses { /** * @@ -34,7 +34,7 @@ public class RegisterCommandsManager * * @param nameClass */ - public RegisterCommandsManager(final String nameClass) + public RegisterCommandsClasses(final String nameClass) { } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/ConfigManager.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterConfigClasses.java similarity index 71% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/ConfigManager.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterConfigClasses.java index 91a6405..a0e6347 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/ConfigManager.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterConfigClasses.java @@ -1,32 +1,30 @@ -package org.imesense.dynamicspawncontrol.technical.configs; +package org.imesense.dynamicspawncontrol.technical.initializer; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import org.imesense.dynamicspawncontrol.technical.configs.*; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; -import java.util.ArrayList; -import java.util.List; - /** * */ -public final class ConfigManager +public final class RegisterConfigClasses { /** * */ private static final Class[] CONFIG_CLASSES = { - SettingsLogFile.class, - SettingsGameDebugger.class, - SettingsWorldGenerator.class, - SettingsRenderNight.class, - SettingsWorldTime.class + ConfigLogFile.class, + ConfigGameDebugger.class, + ConfigWorldGenerator.class, + ConfigRenderNight.class, + ConfigWorldTime.class }; /** * */ - public ConfigManager(final String nameClass) + public RegisterConfigClasses(final String nameClass) { Log.writeDataToLogFile(Log.TypeLog[0], nameClass); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/EventGameplayManager.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterGameplayClasses.java similarity index 85% rename from dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/EventGameplayManager.java rename to dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterGameplayClasses.java index eef555a..88efb5a 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/EventGameplayManager.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/initializer/RegisterGameplayClasses.java @@ -1,4 +1,4 @@ -package org.imesense.dynamicspawncontrol.gameplay; +package org.imesense.dynamicspawncontrol.technical.initializer; import net.minecraftforge.common.MinecraftForge; import org.imesense.dynamicspawncontrol.gameplay.events.OnUpdateTorchLogic; @@ -7,7 +7,7 @@ /** * */ -public final class EventGameplayManager +public final class RegisterGameplayClasses { /** * @@ -20,7 +20,7 @@ public final class EventGameplayManager /** * */ - public EventGameplayManager(final String nameClass) + public RegisterGameplayClasses(final String nameClass) { } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/network/PacketGameRule.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/network/PacketGameRule.java index 0c62fb8..05d1a9b 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/network/PacketGameRule.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/network/PacketGameRule.java @@ -6,7 +6,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import org.apache.logging.log4j.LogManager; -import org.imesense.dynamicspawncontrol.technical.configs.SettingsWorldTime; +import org.imesense.dynamicspawncontrol.technical.configs.ConfigWorldTime; /** * @@ -70,7 +70,7 @@ public IMessage onMessage(PacketGameRule message, MessageContext ctx) { Minecraft.getMinecraft().world.getGameRules().setOrCreateGameRule("doDaylightCycle_tc", Boolean.toString(message.doDaylightCycle_tc)); - if (SettingsWorldTime.TimeControlDebug) + if (ConfigWorldTime.TimeControlDebug) { LogManager.getLogger().info("Network packet for game_rule doDaylightCycle_tc received, value: " + message.doDaylightCycle_tc); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ClientProxy.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ClientProxy.java index 11f6c22..82c005b 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ClientProxy.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ClientProxy.java @@ -13,7 +13,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import org.imesense.dynamicspawncontrol.gameplay.worldgenerator.NetherRackGenerator; -import org.imesense.dynamicspawncontrol.technical.configs.ConfigManager; +import org.imesense.dynamicspawncontrol.technical.initializer.RegisterConfigClasses; import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils; /** @@ -54,7 +54,7 @@ public final class ClientProxy implements IProxy @Override public void preInit(FMLPreInitializationEvent event) { - ConfigManager.init(event); + RegisterConfigClasses.init(event); GameRegistry.registerWorldGenerator(new NetherRackGenerator("NetherRackGenerator"), 3); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheEvents.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheEvents.java index d31c0db..4e067e2 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheEvents.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheEvents.java @@ -17,7 +17,7 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; -import org.imesense.dynamicspawncontrol.technical.configs.SettingsGameDebugger; +import org.imesense.dynamicspawncontrol.technical.configs.ConfigGameDebugger; import java.util.HashSet; @@ -52,7 +52,7 @@ public synchronized void onWorldTick(TickEvent.WorldTickEvent event) @SubscribeEvent(priority = EventPriority.NORMAL) public synchronized void onRenderOverlay(RenderGameOverlayEvent.Post event) { - if (!SettingsGameDebugger.DebugMonitorCache) + if (!ConfigGameDebugger.DebugMonitorCache) { return; }