Skip to content

Commit

Permalink
Add category 'initializer', renaming classes
Browse files Browse the repository at this point in the history
  • Loading branch information
OldSerpskiStalker committed Sep 18, 2024
1 parent 61fae6c commit 5fc040f
Show file tree
Hide file tree
Showing 20 changed files with 70 additions and 75 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -190,7 +187,7 @@ public synchronized void preInit(FMLPreInitializationEvent event)
cacheStorage = new CacheStorage("CacheStorage");

//
EventGameplayManager.registerClasses();
RegisterGameplayClasses.registerClasses();

//
Proxy.preInit(event);
Expand Down Expand Up @@ -242,7 +239,7 @@ public synchronized void onLoadComplete(FMLLoadCompleteEvent event)
@EventHandler
public synchronized void serverLoad(FMLServerStartingEvent event)
{
RegisterCommandsManager.registerCommands(event);
RegisterCommandsClasses.registerCommands(event);
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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);

/**
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}

/**
Expand All @@ -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))
{
Expand All @@ -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)
{
Expand All @@ -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;
}
}

Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
*
Expand All @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/**
*
*/
public final class SettingsGameDebugger implements IConfig
public final class ConfigGameDebugger implements IConfig
{
/**
*
Expand Down Expand Up @@ -72,7 +72,7 @@ public final class SettingsGameDebugger implements IConfig
*
* @param nameClass
*/
public SettingsGameDebugger(final String nameClass)
public ConfigGameDebugger(final String nameClass)
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/**
*
*/
public final class SettingsLogFile implements IConfig
public final class ConfigLogFile implements IConfig
{
/**
*
Expand All @@ -21,7 +21,7 @@ public final class SettingsLogFile implements IConfig
/**
*
*/
public SettingsLogFile(final String nameClass)
public ConfigLogFile(final String nameClass)
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/**
*
*/
public class SettingsRenderNight implements IConfig
public class ConfigRenderNight implements IConfig
{
/**
*
Expand Down Expand Up @@ -77,7 +77,7 @@ public class SettingsRenderNight implements IConfig
*
* @param nameClass
*/
public SettingsRenderNight(final String nameClass)
public ConfigRenderNight(final String nameClass)
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/**
*
*/
public final class SettingsWorldGenerator implements IConfig
public final class ConfigWorldGenerator implements IConfig
{
/**
*
Expand All @@ -32,7 +32,7 @@ public final class SettingsWorldGenerator implements IConfig
*
* @param nameClass
*/
public SettingsWorldGenerator(final String nameClass)
public ConfigWorldGenerator(final String nameClass)
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/**
*
*/
public final class SettingsWorldTime implements IConfig
public final class ConfigWorldTime implements IConfig
{
/**
*
Expand Down Expand Up @@ -42,7 +42,7 @@ public final class SettingsWorldTime implements IConfig
*
* @param nameClass
*/
public SettingsWorldTime(final String nameClass)
public ConfigWorldTime(final String nameClass)
{

}
Expand Down
Original file line number Diff line number Diff line change
@@ -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.*;
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
}
Expand Down Expand Up @@ -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!"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
*
Expand Down Expand Up @@ -40,7 +40,7 @@ public final class TimeHandlerClient implements ITimeHandler
@Override
public void tick(World world)
{
if (!SettingsWorldTime.SyncToSystemTime)
if (!ConfigWorldTime.SyncToSystemTime)
{
++this.debugLogDelay;

Expand All @@ -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();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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));
}
Expand Down
Loading

0 comments on commit 5fc040f

Please sign in to comment.