Skip to content

Commit

Permalink
Adapting to new configs
Browse files Browse the repository at this point in the history
  • Loading branch information
OldSerpskiStalker committed Sep 30, 2024
1 parent 9ea8305 commit 15aaad0
Show file tree
Hide file tree
Showing 27 changed files with 94 additions and 89 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public DynamicSpawnControl()
* @param event Preinitialization event
*/
@EventHandler
public synchronized void preInit(FMLPreInitializationEvent event) throws IOException
public synchronized void preInit(FMLPreInitializationEvent event)
{
//
checkDebugger = new CheckDebugger();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

import net.minecraft.world.World;
import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
import org.imesense.dynamicspawncontrol.gameplay.events.OnUpdateTorchLogic;
import org.imesense.dynamicspawncontrol.technical.configs.ConfigWorldTime;
import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
import org.imesense.dynamicspawncontrol.technical.config.gameworldtime.DataPluginWorldTime;

import java.math.BigDecimal;
import java.util.Collections;
Expand All @@ -25,12 +23,12 @@ public WorldTime()
/**
*
*/
private static final double day_multiplier = multiplier(ConfigWorldTime.DayLengthMinutes);
private static final double day_multiplier = multiplier(DataPluginWorldTime.worldTime.instance.getDayLengthMinutes());

/**
*
*/
private static final double night_multiplier = multiplier(ConfigWorldTime.NightLengthMinutes);
private static final double night_multiplier = multiplier(DataPluginWorldTime.worldTime.instance.getNightLengthMinutes());

/**
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraftforge.fml.common.IWorldGenerator;
import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
import org.imesense.dynamicspawncontrol.technical.configs.ConfigWorldGenerator;
import org.imesense.dynamicspawncontrol.technical.config.blockgenerator.DataBlockWorldGenerator;

import java.util.Objects;
import java.util.Random;
Expand Down Expand Up @@ -83,9 +83,9 @@ public void generate(Random random, int chunkX, int chunkZ, World world, IChunkG
{
run(
CLASS_MONSTER_EGG_GENERATOR, world, random, chunkX, chunkZ,
ConfigWorldGenerator.settingsGenerationBlockNetherRack.BlockNetherRackChanceSpawn,
ConfigWorldGenerator.settingsGenerationBlockNetherRack.GetBlockNetherRackMinHeight,
ConfigWorldGenerator.settingsGenerationBlockNetherRack.GetBlockNetherRackMaxHeight
DataBlockWorldGenerator.InfoDataBlockBlockMonsterEgg.instance.getChanceSpawn(),
DataBlockWorldGenerator.InfoDataBlockBlockMonsterEgg.instance.getMinHeight(),
DataBlockWorldGenerator.InfoDataBlockBlockMonsterEgg.instance.getMaxHeight()
);
break;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraftforge.fml.common.IWorldGenerator;
import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
import org.imesense.dynamicspawncontrol.technical.configs.ConfigWorldGenerator;
import org.imesense.dynamicspawncontrol.technical.config.blockgenerator.DataBlockWorldGenerator;

import java.util.Objects;
import java.util.Random;
Expand Down Expand Up @@ -83,9 +83,9 @@ public void generate(Random random, int chunkX, int chunkZ, World world, IChunkG
{
run(
CLASS_MOSSY_COBBLESTONE_GENERATOR, world, random, chunkX, chunkZ,
ConfigWorldGenerator.settingsGenerationBlockMossyCobblestone.BlockMossyCobblestoneChanceSpawn,
ConfigWorldGenerator.settingsGenerationBlockMossyCobblestone.GetBlockMossyCobblestoneMinHeight,
ConfigWorldGenerator.settingsGenerationBlockMossyCobblestone.GetBlockMossyCobblestoneMaxHeight
DataBlockWorldGenerator.InfoDataBlockMossyCobblestone.instance.getChanceSpawn(),
DataBlockWorldGenerator.InfoDataBlockMossyCobblestone.instance.getMinHeight(),
DataBlockWorldGenerator.InfoDataBlockMossyCobblestone.instance.getMaxHeight()
);
break;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraftforge.fml.common.IWorldGenerator;
import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
import org.imesense.dynamicspawncontrol.technical.configs.ConfigWorldGenerator;
import org.imesense.dynamicspawncontrol.technical.config.blockgenerator.DataBlockWorldGenerator;

import java.util.Objects;
import java.util.Random;
Expand Down Expand Up @@ -83,9 +83,9 @@ public void generate(Random random, int chunkX, int chunkZ, World world, IChunkG
{
run(
CLASS_NETHER_RACK_GENERATOR, world, random, chunkX, chunkZ,
ConfigWorldGenerator.settingsGenerationBlockNetherRack.BlockNetherRackChanceSpawn,
ConfigWorldGenerator.settingsGenerationBlockNetherRack.GetBlockNetherRackMinHeight,
ConfigWorldGenerator.settingsGenerationBlockNetherRack.GetBlockNetherRackMaxHeight
DataBlockWorldGenerator.InfoDataBlockNetherRack.instance.getChanceSpawn(),
DataBlockWorldGenerator.InfoDataBlockNetherRack.instance.getMinHeight(),
DataBlockWorldGenerator.InfoDataBlockNetherRack.instance.getMaxHeight()
);
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.ConfigRenderNight;
import org.imesense.dynamicspawncontrol.technical.config.rendernight.DataRenderNight;

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 && !ConfigRenderNight.DarknessEnd)
if (dimType == DimensionType.THE_END && !DataRenderNight.renderNight.instance.getDarknessEnd())
{
return true;
}

return blacklistContains(dimension, dimType) ^ ConfigRenderNight.InvertBlacklist;
return blacklistContains(dimension, dimType) ^ DataRenderNight.renderNight.instance.getInvertBlacklist();
}

/**
Expand All @@ -139,7 +139,7 @@ private static boolean blacklistContains(WorldProvider dimension, DimensionType
{
String dimName = dimensionType.getName();

for (String blacklistName : ConfigRenderNight.BlacklistByName)
for (String blacklistName : DataRenderNight.renderNight.instance.getBlacklistByName())
{
if (!blacklistName.equals(dimName))
{
Expand All @@ -151,7 +151,7 @@ private static boolean blacklistContains(WorldProvider dimension, DimensionType

int dimID = dimension.getDimension();

for (int blacklistID : ConfigRenderNight.BlacklistByID)
for (int blacklistID : DataRenderNight.renderNight.instance.getBlacklistByID())
{
if (dimID != blacklistID)
{
Expand All @@ -174,23 +174,23 @@ private static boolean isDark(WorldProvider dimension, DimensionType dimensionTy
{
if (dimensionType == DimensionType.OVERWORLD)
{
return ConfigRenderNight.DarknessOverWorld;
return DataRenderNight.renderNight.instance.getDarknessOverWorld();
}
else if (dimensionType == DimensionType.NETHER)
{
return ConfigRenderNight.DarknessNether;
return DataRenderNight.renderNight.instance.getDarknessNether();
}
else if (dimensionType == DimensionType.THE_END)
{
return ConfigRenderNight.DarknessEnd;
return DataRenderNight.renderNight.instance.getDarknessEnd();
}
else if (dimension.hasSkyLight())
{
return ConfigRenderNight.DarknessDefault;
return DataRenderNight.renderNight.instance.getDarknessDefault();
}
else
{
return ConfigRenderNight.DarknessSkyLess;
return DataRenderNight.renderNight.instance.getDarknessSkyLess();
}
}

Expand Down Expand Up @@ -224,9 +224,10 @@ private static float getMoonBrightness(float partialTicks, World world)

final double moon;

if (!ConfigRenderNight.IgnoreMoonLight)
if (!DataRenderNight.renderNight.instance.getIgnoreMoonLight())
{
double[] phaseFactors = ConfigRenderNight.MoonPhaseFactors;
Double[] phaseFactors = DataRenderNight.renderNight.instance.getMoonPhaseFactors();

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.ConfigRenderNight;
import org.imesense.dynamicspawncontrol.technical.config.rendernight.DataRenderNight;

/**
*
Expand All @@ -20,12 +20,12 @@ public final class WorldProviderHooks
*/
public static Vec3d onGetFogColor(WorldProvider provider, float angle, float partialTicks)
{
if (!ConfigRenderNight.DarknessEndFog && provider instanceof WorldProviderEnd)
if (!DataRenderNight.renderNight.instance.getDarknessEndFog() && provider instanceof WorldProviderEnd)
{
return null;
}

if (!ConfigRenderNight.DarknessNetherFog && provider instanceof WorldProviderHell)
if (!DataRenderNight.renderNight.instance.getDarknessNetherFog() && provider instanceof WorldProviderHell)
{
return null;
}
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.config.ConfigLogFile;
import org.imesense.dynamicspawncontrol.technical.config.logfile.DataLogFile;

import java.io.*;
import java.text.SimpleDateFormat;
Expand Down Expand Up @@ -160,7 +160,7 @@ public static void writeDataToLogFile(final int levelInfo, String data)
writer.write("\n" + LEVEL_PREFIXES[logLevel[0]] + data);
writer.close();

cleanFile(logFile, ConfigLogFile.LogMaxLines);
cleanFile(logFile, DataLogFile.logFile.instance.getLogMaxLines());
}
catch (IOException exception)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
import org.imesense.dynamicspawncontrol.technical.configs.ConfigZombieDropItem;
import org.imesense.dynamicspawncontrol.technical.config.zombiedropitem.DataZombieDropItem;
import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;

import java.util.List;
Expand Down Expand Up @@ -56,12 +56,12 @@ public synchronized void onUpdateLivingDropsEvent_0(LivingDropsEvent event)

List<EntityItem> drops = event.getDrops();

addDamagedItemToDrops(zombie, drops, zombie.getItemStackFromSlot(EntityEquipmentSlot.HEAD), ConfigZombieDropItem.HeadDamageFactor);
addDamagedItemToDrops(zombie, drops, zombie.getItemStackFromSlot(EntityEquipmentSlot.CHEST), ConfigZombieDropItem.ChestDamageFactor);
addDamagedItemToDrops(zombie, drops, zombie.getItemStackFromSlot(EntityEquipmentSlot.LEGS), ConfigZombieDropItem.LegsDamageFactor);
addDamagedItemToDrops(zombie, drops, zombie.getItemStackFromSlot(EntityEquipmentSlot.FEET), ConfigZombieDropItem.FeetDamageFactor);
addDamagedItemToDrops(zombie, drops, zombie.getItemStackFromSlot(EntityEquipmentSlot.HEAD), DataZombieDropItem.zombieDrop.instance.getHeadDamageFactor());
addDamagedItemToDrops(zombie, drops, zombie.getItemStackFromSlot(EntityEquipmentSlot.CHEST), DataZombieDropItem.zombieDrop.instance.getChestDamageFactor());
addDamagedItemToDrops(zombie, drops, zombie.getItemStackFromSlot(EntityEquipmentSlot.LEGS), DataZombieDropItem.zombieDrop.instance.getLegsDamageFactor());
addDamagedItemToDrops(zombie, drops, zombie.getItemStackFromSlot(EntityEquipmentSlot.FEET), DataZombieDropItem.zombieDrop.instance.getFeetDamageFactor());

addDamagedItemToDrops(zombie, drops, zombie.getHeldItemMainhand(), ConfigZombieDropItem.HandItemDamageFactor);
addDamagedItemToDrops(zombie, drops, zombie.getHeldItemMainhand(), DataZombieDropItem.zombieDrop.instance.getHandItemDamageFactor());
}
}

Expand All @@ -76,7 +76,7 @@ private void addDamagedItemToDrops(EntityZombie zombie, List<EntityItem> drops,
{
if (originalItem.getItem() != Items.AIR)
{
if (new Random().nextDouble() < ConfigZombieDropItem.BreakItem)
if (new Random().nextDouble() < DataZombieDropItem.zombieDrop.instance.getBreakItem())
{
return;
}
Expand All @@ -89,7 +89,7 @@ private void addDamagedItemToDrops(EntityZombie zombie, List<EntityItem> drops,
Random rand = new Random();
int minDamage = (int)(maxDamage * damageFactor);

int damageSpread = (int)(maxDamage * ConfigZombieDropItem.DamageSpreadFactor);
int damageSpread = (int)(maxDamage * DataZombieDropItem.zombieDrop.instance.getDamageSpreadFactor());
int randomDamage = minDamage + rand.nextInt(damageSpread);

damagedItem.setItemDamage(randomDamage);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
import net.minecraftforge.fml.common.network.FMLNetworkEvent;
import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
import org.imesense.dynamicspawncontrol.technical.configs.ConfigPlayer;
import org.imesense.dynamicspawncontrol.technical.config.player.DataPlayer;
import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;

import java.util.ArrayList;
Expand Down Expand Up @@ -124,7 +124,7 @@ public void onPlayerRespawn_0(PlayerEvent.PlayerRespawnEvent event)
World world = player.world;
BlockPos playerPos = player.getPosition();

int radius = ConfigPlayer.ProtectRespawnPlayerRadius;
int radius = DataPlayer.player.instance.getProtectRespawnPlayerRadius();

AxisAlignedBB area = new AxisAlignedBB
(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import net.minecraftforge.fml.relauncher.Side;
import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
import org.imesense.dynamicspawncontrol.gameplay.gameworld.WorldTime;
import org.imesense.dynamicspawncontrol.technical.configs.ConfigWorldTime;
import org.imesense.dynamicspawncontrol.technical.config.gameworldtime.DataPluginWorldTime;
import org.imesense.dynamicspawncontrol.technical.handlers.ITimeHandler;
import org.imesense.dynamicspawncontrol.technical.handlers.TimeHandlerClient;
import org.imesense.dynamicspawncontrol.technical.handlers.TimeHandlerServer;
Expand Down Expand Up @@ -71,7 +71,7 @@ public synchronized void onUpdateWorldLoad_0(ChunkDataEvent.Load event)
world.getGameRules().setOrCreateGameRule("doDaylightCycle_tc", "true");
}

if (!world.isRemote && !ConfigWorldTime.SyncToSystemTime)
if (!world.isRemote && !DataPluginWorldTime.worldTime.instance.getSyncToSystemTime())
{
this.serverUpdate(world.getWorldTime());
}
Expand Down Expand Up @@ -197,7 +197,7 @@ else if (event.getCommand() instanceof CommandTime && event.getParameters().leng
}
}

if (ConfigWorldTime.SyncToSystemTime)
if (DataPluginWorldTime.worldTime.instance.getSyncToSystemTime())
{
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 @@ -7,7 +7,7 @@
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent;
import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
import org.imesense.dynamicspawncontrol.technical.configs.ConfigWindowTitle;
import org.imesense.dynamicspawncontrol.technical.config.windowtitle.DataWindowTitle;
import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
import org.lwjgl.opengl.Display;

Expand Down Expand Up @@ -45,7 +45,7 @@ public OnWindowTitle()
*
*/
@Nonnull
private static final String TITLE = ConfigWindowTitle.WindowTitle;
private static final String TITLE = DataWindowTitle.windowTitle.instance.getWindowTitle();

/**
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
import org.imesense.dynamicspawncontrol.technical.configs.ConfigGameDebugger;

import org.imesense.dynamicspawncontrol.technical.config.gamedebugger.DataGameDebugger;
import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericBlockBreakActions;
import org.imesense.dynamicspawncontrol.technical.parsers.ParserGenericJsonScripts;
Expand Down Expand Up @@ -60,7 +61,7 @@ public synchronized void onUpdateBlockBreakEvent_0(BlockEvent.BreakEvent event)
{
Event.Result result = rule.getResult();

if (ConfigGameDebugger.DebugGenericBlockBreakEvent)
if (DataGameDebugger.DebugEvent.instance.getDebugOnBlockBreak())
{
Log.writeDataToLogFile(0, "ConfigsParser._GenericBlockBreakActions. ID Rule "
+ i + ": "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
import org.imesense.dynamicspawncontrol.technical.configs.ConfigGameDebugger;

import org.imesense.dynamicspawncontrol.technical.config.gamedebugger.DataGameDebugger;
import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericBlockPlaceActions;
import org.imesense.dynamicspawncontrol.technical.parsers.ParserGenericJsonScripts;
Expand Down Expand Up @@ -61,7 +62,7 @@ public synchronized void onUpdateBlockPaceEvent_0(BlockEvent.PlaceEvent event)
{
Event.Result result = rule.getResult();

if (ConfigGameDebugger.DebugGenericBlockPlaceEvent)
if (DataGameDebugger.DebugEvent.instance.getDebugOnBlockPlace())
{
Log.writeDataToLogFile(0, "ConfigsParser._GenericBlockPlaceActions. ID Rule "
+ i + ": "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.imesense.dynamicspawncontrol.debug.CodeGenericUtils;
import org.imesense.dynamicspawncontrol.technical.configs.ConfigGameDebugger;
import org.imesense.dynamicspawncontrol.technical.config.gamedebugger.DataGameDebugger;
import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
import org.imesense.dynamicspawncontrol.technical.eventprocessor.generic.GenericSpawnConditions;
import org.imesense.dynamicspawncontrol.technical.parsers.ParserGenericJsonScripts;
Expand Down Expand Up @@ -58,7 +58,7 @@ public synchronized void onUpdateEntitySpawnEvent_0(LivingSpawnEvent.CheckSpawn
{
if (rule.match(event))
{
if (ConfigGameDebugger.DebugGenericEntitySpawnEvent)
if (DataGameDebugger.DebugEvent.instance.getDebugOnEntitySpawn())
{
Log.writeDataToLogFile(0, "ConfigsParser._GenericSpawnConditions. ID Rule: " + i + ": "
+ "entity: " + event.getEntity().getName()
Expand Down
Loading

0 comments on commit 15aaad0

Please sign in to comment.