input)
{
this.onTestEvent(input);
if (input.value)
diff --git a/api/src/test/java/tests/EventInjectorTest.java b/api/src/test/java/tests/EventInjectorTest.java
index 70ad89118..67fb480cb 100644
--- a/api/src/test/java/tests/EventInjectorTest.java
+++ b/api/src/test/java/tests/EventInjectorTest.java
@@ -133,7 +133,7 @@ public class EventInjectorTest
oneTimeEventList = TEST_EVENT_HANDLER.getAll(AbstractDhApiCancelableOneTimeTestEvent.class);
for (int i = 0; i < oneTimeEventList.size(); i++)
{
- Assert.assertEquals("Event not fired for object ["+i+"].", true, oneTimeEventList.get(i).getTestValue());
+ Assert.assertEquals("Event not fired for object [" + i + "].", true, oneTimeEventList.get(i).getTestValue());
}
diff --git a/api/src/test/java/tests/ExampleTest.java b/api/src/test/java/tests/ExampleTest.java
index de45feab0..150f77422 100644
--- a/api/src/test/java/tests/ExampleTest.java
+++ b/api/src/test/java/tests/ExampleTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
/**
* This is just a quick demo to confirm the testing system is set up correctly.
- *
+ *
* @author James Seibel
* @version 2022-9-5
*/
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/IReflectionHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/IReflectionHandler.java
index f20788af3..9755811e4 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/IReflectionHandler.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/IReflectionHandler.java
@@ -23,7 +23,7 @@ import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindab
/**
* A singleton used to get variables from methods
- * where they are private or potentially absent.
+ * where they are private or potentially absent.
* Specifically the fog setting used by Optifine or the
* presence/absence of other mods.
*
@@ -32,7 +32,7 @@ import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindab
* passing in interfaces), and it may be needed in the future if
* we find that reflection handlers need to be different for
* different MC versions.
- *
+ *
* @author James Seibel
* @version 2022-11-24
*/
@@ -40,7 +40,7 @@ public interface IReflectionHandler extends IBindable
{
/** @return if Sodium (or a sodium like) mod is present. */
boolean sodiumPresent();
-
+
boolean optifinePresent();
}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/Initializer.java b/core/src/main/java/com/seibel/distanthorizons/core/Initializer.java
index a580e8d2a..3684e61a6 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/Initializer.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/Initializer.java
@@ -17,9 +17,9 @@ import org.apache.logging.log4j.Logger;
/** Handles first time Core setup. */
public class Initializer
{
- private static final Logger LOGGER = LogManager.getLogger(ModInfo.NAME+"-"+Initializer.class.getSimpleName());
+ private static final Logger LOGGER = LogManager.getLogger(ModInfo.NAME + "-" + Initializer.class.getSimpleName());
- public static void init()
+ public static void init()
{
// confirm that all referenced libraries are available to use
try
@@ -33,15 +33,15 @@ public class Initializer
}
catch (NoClassDefFoundError e)
{
- LOGGER.fatal("Critical programmer error: One or more libraries aren't present. Error: ["+e.getMessage()+"].");
+ LOGGER.fatal("Critical programmer error: One or more libraries aren't present. Error: [" + e.getMessage() + "].");
throw e;
}
- CompleteFullDataSourceLoader unused2 = new CompleteFullDataSourceLoader(); // Auto register into the loader system
- HighDetailIncompleteFullDataSourceLoader unused3 = new HighDetailIncompleteFullDataSourceLoader(); // Auto register
- LowDetailIncompleteFullDataSourceLoader unused4 = new LowDetailIncompleteFullDataSourceLoader(); // Auto register
+ CompleteFullDataSourceLoader unused2 = new CompleteFullDataSourceLoader(); // Auto register into the loader system
+ HighDetailIncompleteFullDataSourceLoader unused3 = new HighDetailIncompleteFullDataSourceLoader(); // Auto register
+ LowDetailIncompleteFullDataSourceLoader unused4 = new LowDetailIncompleteFullDataSourceLoader(); // Auto register
// link Core's config to the API
DhApi.Delayed.configs = DhApiConfig.INSTANCE;
@@ -49,5 +49,6 @@ public class Initializer
DhApi.Delayed.worldProxy = DhApiWorldProxy.INSTANCE;
DhApi.Delayed.renderProxy = DhApiRenderProxy.INSTANCE;
- }
+ }
+
}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/ReflectionHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/ReflectionHandler.java
index e8e385b28..2690144b7 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/ReflectionHandler.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/ReflectionHandler.java
@@ -26,12 +26,12 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.AbstractOpt
import org.apache.logging.log4j.Logger;
/**
- * A singleton used to determine if a class is present or
- * access variables from methods where they are private
+ * A singleton used to determine if a class is present or
+ * access variables from methods where they are private
* or potentially absent.
- *
+ *
* For example: presence/absence of Optifine.
- *
+ *
* @author James Seibel
* @version 2022-11-24
*/
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/DhApiConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/DhApiConfig.java
index 3713ac7e1..46c9bc022 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/DhApiConfig.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/DhApiConfig.java
@@ -10,21 +10,21 @@ public class DhApiConfig implements IDhApiConfig
{
public static final DhApiConfig INSTANCE = new DhApiConfig();
- private DhApiConfig() { }
+ private DhApiConfig() { }
@Override
public IDhApiGraphicsConfig graphics() { return DhApiGraphicsConfig.INSTANCE; }
- @Override
+ @Override
public IDhApiWorldGenerationConfig worldGenerator() { return DhApiWorldGenerationConfig.INSTANCE; }
@Override
public IDhApiMultiplayerConfig multiplayer() { return DhApiMultiplayerConfig.INSTANCE; }
@Override
public IDhApiMultiThreadingConfig multiThreading() { return DhApiMultiThreadingConfig.INSTANCE; }
- @Override
+ @Override
public IDhApiGpuBuffersConfig gpuBuffers() { return DhApiGpuBuffersConfig.INSTANCE; }
- @Override
+ @Override
public IDhApiDebuggingConfig debugging() { return DhApiDebuggingConfig.INSTANCE; }
}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiGraphicsConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiGraphicsConfig.java
index 867d6484c..c07bb82cf 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiGraphicsConfig.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiGraphicsConfig.java
@@ -106,7 +106,7 @@ public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
//===========================//
// advanced graphic settings //
//===========================//
-
+
// @Override
// public IDhApiConfigValue getDisableDirectionalCulling()
// { return new DhApiConfigValue(AdvancedGraphics.disableDirectionalCulling); }
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/common/DhApiWorldGenerationConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/common/DhApiWorldGenerationConfig.java
index b69711a46..ef0f93dd3 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/common/DhApiWorldGenerationConfig.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/common/DhApiWorldGenerationConfig.java
@@ -36,7 +36,7 @@ import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGenerat
*/
public class DhApiWorldGenerationConfig implements IDhApiWorldGenerationConfig
{
- public static DhApiWorldGenerationConfig INSTANCE = new DhApiWorldGenerationConfig();
+ public static DhApiWorldGenerationConfig INSTANCE = new DhApiWorldGenerationConfig();
private DhApiWorldGenerationConfig() { }
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/data/DhApiTerrainDataRepo.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/data/DhApiTerrainDataRepo.java
index bc27d82bd..1968658ee 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/data/DhApiTerrainDataRepo.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/data/DhApiTerrainDataRepo.java
@@ -55,7 +55,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
- private DhApiTerrainDataRepo()
+ private DhApiTerrainDataRepo()
{
}
@@ -67,12 +67,12 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
//================//
@Override
- public DhApiResult getSingleDataPointAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosY, int blockPosZ)
+ public DhApiResult getSingleDataPointAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosY, int blockPosZ)
{
return getTerrainDataAtBlockYPos(levelWrapper, new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), blockPosY);
}
@Override
- public DhApiResult getColumnDataAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosZ)
+ public DhApiResult getColumnDataAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosZ)
{
return getTerrainDataColumnArray(levelWrapper, new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), null);
}
@@ -112,14 +112,14 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
}
}
- /**
+ /**
* Returns all the block columns represented by the given {@link DhLodPos}.
* IE, A position with the detail level:
* 0 (block): will return a 1x1 matrix of data. (don't do this, we have a specific method for that.)
* 1 (2 blocks): will return a 2x2 matrix of data.
* 4 (chunk): will return a 16x16 matrix of data.
- *
- * will stop and return the in progress data if any errors are encountered.
+ *
+ * will stop and return the in progress data if any errors are encountered.
*/
private static DhApiResult getTerrainDataOverAreaForPositionDetailLevel(IDhApiLevelWrapper levelWrapper, DhLodPos requestedAreaPos)
{
@@ -151,10 +151,10 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
return dataColumnsReturned != 0 ? DhApiResult.createSuccess("[" + dataColumnsReturned + "] columns returned.", returnArray) : DhApiResult.createSuccess("No data found.", returnArray);
}
- /**
+ /**
* If nullableBlockYPos is null: returns every datapoint in the column defined by the DhLodPos.
* If nullableBlockYPos is NOT null: returns a single datapoint in the column defined by the DhLodPos which contains the block Y position.
- *
+ *
* If the ApiResult is successful there will be an array of data.
* The returned array will be empty if no data could be retrieved.
*/
@@ -170,7 +170,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
{
// custom level wrappers aren't supported,
// the API user must get a level wrapper from our code somewhere
- return DhApiResult.createFail("Unsupported ["+IDhApiLevelWrapper.class.getSimpleName()+"] implementation, only the core class ["+ IDhLevel.class.getSimpleName()+"] is a valid parameter.");
+ return DhApiResult.createFail("Unsupported [" + IDhApiLevelWrapper.class.getSimpleName() + "] implementation, only the core class [" + IDhLevel.class.getSimpleName() + "] is a valid parameter.");
}
ILevelWrapper coreLevelWrapper = (ILevelWrapper) levelWrapper;
@@ -256,7 +256,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
catch (InterruptedException | ExecutionException e)
{
// shouldn't normally happen, but just in case
- LOGGER.error("Unexpected exception in getTerrainDataColumnArray. Error: ["+e.getMessage()+"]", e);
+ LOGGER.error("Unexpected exception in getTerrainDataColumnArray. Error: [" + e.getMessage() + "]", e);
return DhApiResult.createFail("Unexpected exception: [" + e.getMessage() + "].");
}
}
@@ -270,7 +270,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
int height = FullDataPointUtil.getHeight(dataPoint);
int topY = bottomY + height;
- return new DhApiTerrainDataPoint(detailLevel,
+ return new DhApiTerrainDataPoint(detailLevel,
FullDataPointUtil.getLight(dataPoint), topY, bottomY,
blockState, biomeWrapper);
}
@@ -282,7 +282,8 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
//====================//
@Override
- public DhApiResult raycast(IDhApiLevelWrapper levelWrapper,
+ public DhApiResult raycast(
+ IDhApiLevelWrapper levelWrapper,
double rayOriginX, double rayOriginY, double rayOriginZ,
float rayDirectionX, float rayDirectionY, float rayDirectionZ,
int maxRayBlockLength)
@@ -340,7 +341,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
{
// does this LOD contain the given Y position?
Vec3i dataPointPos = new Vec3i(columnPos.x, dataPoint.bottomYBlockPos, columnPos.z);
- if (exactPos.y >= dataPoint.bottomYBlockPos && exactPos.y <= dataPoint.topYBlockPos)
+ if (exactPos.y >= dataPoint.bottomYBlockPos && exactPos.y <= dataPoint.topYBlockPos)
{
if (closetFoundDataPoint == null)
{
@@ -423,7 +424,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
{
if (!(levelWrapper instanceof ILevelWrapper))
{
- return DhApiResult.createFail("Level wrapper needs to be an instance of ["+IDhApiLevelWrapper.class.getSimpleName()+"].");
+ return DhApiResult.createFail("Level wrapper needs to be an instance of [" + IDhApiLevelWrapper.class.getSimpleName() + "].");
}
AbstractDhWorld dhWorld = SharedApi.getAbstractDhWorld();
if (dhWorld == null)
@@ -452,8 +453,8 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
// debug methods //
//===============//
- /**
- * This method is here for debugging the repo and isn't intended for normal use.
+ /**
+ * This method is here for debugging the repo and isn't intended for normal use.
* The method need to be async because pausing the main thread with a breakpoint and hot swapping will crash the program
*/
public static void asyncDebugMethod(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosY, int blockPosZ)
@@ -476,7 +477,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
if (rayCast.payload != null && !rayCast.payload.pos.equals(currentDebugVec3i))
{
currentDebugVec3i = rayCast.payload.pos;
-
+
// get a string for the block
String blockString = "[NULL BLOCK]"; // shouldn't normally happen unless there is an issue with getting the terrain at the given position
if (rayCast.payload.dataPoint.blockStateWrapper != null)
@@ -487,10 +488,10 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
}
else
{
- blockString = "[AIR]";
+ blockString = "[AIR]";
}
}
-
+
LOGGER.info("raycast: " + currentDebugVec3i + "\t block: " + blockString);
}
else if (rayCast.payload == null && currentDebugVec3i != null)
@@ -504,7 +505,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
}
catch (Exception e)
{
- LOGGER.error("Test method Error: ["+e.getMessage()+"]", e);
+ LOGGER.error("Test method Error: [" + e.getMessage() + "]", e);
}
finally
{
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java
index 37a4d8ed6..15e950e4a 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java
@@ -106,7 +106,7 @@ public class ClientApi
// world events //
//==============//
- /**
+ /**
* May be fired slightly before or after the associated
* {@link ClientApi#clientLevelLoadEvent(IClientLevelWrapper)} event
* depending on how the host mod loader functions.
@@ -123,7 +123,7 @@ public class ClientApi
SharedApi.setDhWorld(new DhClientWorld());
- LOGGER.info("Loading ["+this.waitingClientLevels.size()+"] waiting client level wrappers.");
+ LOGGER.info("Loading [" + this.waitingClientLevels.size() + "] waiting client level wrappers.");
for (IClientLevelWrapper level : this.waitingClientLevels)
{
this.clientLevelLoadEvent(level);
@@ -132,7 +132,7 @@ public class ClientApi
this.waitingClientLevels.clear();
}
}
-
+
public void onClientOnlyDisconnected()
{
if (MC.clientConnectedToDedicatedServer())
@@ -141,7 +141,7 @@ public class ClientApi
if (world != null)
{
LOGGER.info("Client on ClientOnly mode disconnecting.");
-
+
world.close();
SharedApi.setDhWorld(null);
}
@@ -166,7 +166,7 @@ public class ClientApi
public void clientLevelUnloadEvent(IClientLevelWrapper level)
{
- LOGGER.info("Unloading client level ["+level+"].");
+ LOGGER.info("Unloading client level [" + level + "].");
AbstractDhWorld world = SharedApi.getAbstractDhWorld();
if (world != null)
@@ -191,7 +191,7 @@ public class ClientApi
}
- LOGGER.info("Loading "+(isServerCommunication ? "Multiverse" : "")+" client level [" + level + "].");
+ LOGGER.info("Loading " + (isServerCommunication ? "Multiverse" : "") + " client level [" + level + "].");
AbstractDhWorld world = SharedApi.getAbstractDhWorld();
if (world != null)
@@ -220,7 +220,7 @@ public class ClientApi
keysToRemove.add(levelChunkPair);
}
}
- LOGGER.info("Loaded ["+keysToRemove.size()+"] waiting chunk wrappers.");
+ LOGGER.info("Loaded [" + keysToRemove.size() + "] waiting chunk wrappers.");
for (Pair keyToRemove : keysToRemove)
{
@@ -263,8 +263,8 @@ public class ClientApi
{
for (int zOffset = -1; zOffset <= 1; zOffset++)
{
- DhChunkPos neighbourPos = new DhChunkPos(chunk.getChunkPos().x+xOffset, chunk.getChunkPos().z+zOffset);
- IChunkWrapper neighbourChunk = dhLevel.getLevelWrapper().tryGetChunk(neighbourPos);
+ DhChunkPos neighbourPos = new DhChunkPos(chunk.getChunkPos().x + xOffset, chunk.getChunkPos().z + zOffset);
+ IChunkWrapper neighbourChunk = dhLevel.getLevelWrapper().tryGetChunk(neighbourPos);
if (neighbourChunk != null)
{
dhLevel.updateChunkAsync(neighbourChunk);
@@ -282,20 +282,20 @@ public class ClientApi
public void rendererShutdownEvent()
{
LOGGER.info("Renderer shutting down.");
-
+
IProfilerWrapper profiler = MC.getProfiler();
profiler.push("DH-RendererShutdown");
-
+
profiler.pop();
}
public void rendererStartupEvent()
{
LOGGER.info("Renderer starting up.");
-
+
IProfilerWrapper profiler = MC.getProfiler();
profiler.push("DH-RendererStartup");
-
+
// make sure the GLProxy is created before the LodBufferBuilder needs it
GLProxy.getInstance();
profiler.pop();
@@ -305,7 +305,7 @@ public class ClientApi
{
IProfilerWrapper profiler = MC.getProfiler();
profiler.push("DH-ClientTick");
-
+
boolean doFlush = System.nanoTime() - this.lastFlushNanoTime >= SPAM_LOGGER_FLUSH_NS;
if (doFlush)
{
@@ -314,7 +314,7 @@ public class ClientApi
}
ConfigBasedLogger.updateAll();
ConfigBasedSpamLogger.updateAll(doFlush);
-
+
IDhClientWorld clientWorld = SharedApi.getIDhClientWorld();
if (clientWorld != null)
{
@@ -384,7 +384,7 @@ public class ClientApi
short commandLength = byteBuf.readShort();
if (commandLength < 1 || commandLength > 32)
{
- LOGGER.error("Server command length ["+commandLength+"] outside the expected range of 1 to 32 (inclusive).");
+ LOGGER.error("Server command length [" + commandLength + "] outside the expected range of 1 to 32 (inclusive).");
ClientApi.INSTANCE.serverNetworkingIsMalformed = true;
return;
}
@@ -397,7 +397,7 @@ public class ClientApi
}
catch (Exception e)
{
- LOGGER.error("Server sent un-parsable command. Error: "+e.getMessage());
+ LOGGER.error("Server sent un-parsable command. Error: " + e.getMessage());
return;
}
@@ -407,7 +407,7 @@ public class ClientApi
LOGGER.info("Server supports DH multiverse protocol.");
ClientApi.INSTANCE.isServerCommunicationEnabled = true;
KEYED_CLIENT_LEVEL_MANAGER.setUseOverrideWrapper(true);
- MC.executeOnRenderThread(() ->
+ MC.executeOnRenderThread(() ->
{
// Unload the current world, since it may be wrong.
// A followup WorldChanged event should be received from the server soon after this.
@@ -420,7 +420,7 @@ public class ClientApi
short levelKeyLength = byteBuf.readShort();
if (levelKeyLength < 1 || levelKeyLength > 128) // TODO 128 should be put into a constant somewhere
{
- LOGGER.error("Server [LevelChanged] command length ["+commandLength+"] outside the expected range of 1 to 128 (inclusive).");
+ LOGGER.error("Server [LevelChanged] command length [" + commandLength + "] outside the expected range of 1 to 128 (inclusive).");
this.serverNetworkingIsMalformed = true;
return;
}
@@ -434,7 +434,7 @@ public class ClientApi
return;
}
- LOGGER.info("Server level change event received, changing the level to ["+levelKey+"].");
+ LOGGER.info("Server level change event received, changing the level to [" + levelKey + "].");
MC.executeOnRenderThread(() -> {
if (MC.getWrappedClientWorld() != null)
{
@@ -464,8 +464,8 @@ public class ClientApi
MC.sendChatMessage("Here be dragons!");
this.configOverrideReminderPrinted = true;
}
-
-
+
+
IProfilerWrapper profiler = MC.getProfiler();
profiler.pop(); // get out of "terrain"
profiler.push("DH-RenderLevel");
@@ -475,20 +475,20 @@ public class ClientApi
{
return;
}
-
-
+
+
//FIXME: Improve class hierarchy of DhWorld, IClientWorld, IServerWorld to fix all this hard casting
// (also in RenderUtil)
IDhClientWorld dhClientWorld = SharedApi.getIDhClientWorld();
IDhClientLevel level = dhClientWorld.getOrLoadClientLevel(levelWrapper);
-
+
if (prefLoggerEnabled)
{
level.dumpRamUsage();
}
-
-
-
+
+
+
try
{
@@ -496,9 +496,9 @@ public class ClientApi
{
DhApiRenderParam renderEventParam =
new DhApiRenderParam(mcProjectionMatrix, mcModelViewMatrix,
- RenderUtil.createLodProjectionMatrix(mcProjectionMatrix, partialTicks),
- RenderUtil.createLodModelViewMatrix(mcModelViewMatrix), partialTicks);
-
+ RenderUtil.createLodProjectionMatrix(mcProjectionMatrix, partialTicks),
+ RenderUtil.createLodModelViewMatrix(mcModelViewMatrix), partialTicks);
+
boolean renderingCanceled = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderEvent.class, new DhApiBeforeRenderEvent.EventParam(renderEventParam));
if (!this.rendererDisabledBecauseOfExceptions && !renderingCanceled)
{
@@ -518,7 +518,7 @@ public class ClientApi
{
this.rendererDisabledBecauseOfExceptions = true;
LOGGER.error("Renderer thrown an uncaught exception: ", e);
-
+
MC.sendChatMessage("\u00A74\u00A7l\u00A7uERROR: Distant Horizons"
+ " renderer has encountered an exception!");
MC.sendChatMessage("\u00A74Renderer is now disabled to prevent further issues.");
@@ -535,13 +535,13 @@ public class ClientApi
profiler.push("terrain"); // go back into "terrain"
}
}
-
-
-
+
+
+
//=================//
// DEBUG USE //
//=================//
-
+
/** Trigger once on key press, with CLIENT PLAYER. */
public void keyPressedEvent(int glfwKey)
{
@@ -550,8 +550,8 @@ public class ClientApi
// keybindings are disabled
return;
}
-
-
+
+
if (glfwKey == GLFW.GLFW_KEY_F8)
{
Config.Client.Advanced.Debugging.debugRendering.set(EDebugRendering.next(Config.Client.Advanced.Debugging.debugRendering.get()));
@@ -568,6 +568,4 @@ public class ClientApi
MC.sendChatMessage("P: Debug Pref Logger is " + (prefLoggerEnabled ? "enabled" : "disabled"));
}
}
-
-
}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ServerApi.java b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ServerApi.java
index 2b1c68735..c79c76908 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ServerApi.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ServerApi.java
@@ -22,6 +22,7 @@ package com.seibel.distanthorizons.core.api.internal;
import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiLevelLoadEvent;
import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiLevelUnloadEvent;
import com.seibel.distanthorizons.core.generation.DhLightingEngine;
+import com.seibel.distanthorizons.core.util.ThreadUtil;
import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
import com.seibel.distanthorizons.core.level.IDhLevel;
@@ -37,6 +38,7 @@ import org.apache.logging.log4j.Logger;
import java.util.LinkedList;
import java.util.List;
+import java.util.concurrent.ThreadPoolExecutor;
/**
* This holds the methods that should be called by the host mod loader (Fabric,
@@ -48,6 +50,14 @@ public class ServerApi
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+ private static final ThreadPoolExecutor LIGHT_POPULATOR_THREAD_POOL = ThreadUtil.makeRateLimitedThreadPool(
+ // thread count doesn't need to be very high since the player can only move so fast, 1 should be plenty
+ (Runtime.getRuntime().availableProcessors() <= 12) ? 1 : 2,
+ "Server Light Populator",
+ // only run the thread 50% of the time to prevent lagging the server thread
+ 0.5,
+ ThreadUtil.MINIMUM_RELATIVE_PRIORITY);
+
private int lastWorldGenTickDelta = 0;
@@ -56,9 +66,9 @@ public class ServerApi
- // =============//
- // tick events //
- // =============//
+ //=============//
+ // tick events //
+ //=============//
public void serverTickEvent()
{
@@ -74,23 +84,23 @@ public class ServerApi
catch (Exception e)
{
// try catch is necessary to prevent crashing the internal server when an exception is thrown
- LOGGER.error("ServerTickEvent error: "+e.getMessage(), e);
+ LOGGER.error("ServerTickEvent error: " + e.getMessage(), e);
}
}
public void serverLevelTickEvent(IServerLevelWrapper level)
{
//TODO
}
-
+
public void serverLoadEvent(boolean isDedicatedEnvironment)
{
- LOGGER.debug("Server World loading with (dedicated?:"+isDedicatedEnvironment+")");
+ LOGGER.debug("Server World loading with (dedicated?:" + isDedicatedEnvironment + ")");
SharedApi.setDhWorld(isDedicatedEnvironment ? new DhServerWorld() : new DhClientServerWorld());
}
public void serverUnloadEvent()
{
- LOGGER.debug("Server World "+SharedApi.getAbstractDhWorld()+" unloading");
+ LOGGER.debug("Server World " + SharedApi.getAbstractDhWorld() + " unloading");
SharedApi.getAbstractDhWorld().close();
SharedApi.setDhWorld(null);
@@ -98,7 +108,7 @@ public class ServerApi
public void serverLevelLoadEvent(IServerLevelWrapper level)
{
- LOGGER.debug("Server Level "+level+" loading");
+ LOGGER.debug("Server Level " + level + " loading");
AbstractDhWorld serverWorld = SharedApi.getAbstractDhWorld();
if (serverWorld != null)
@@ -109,7 +119,7 @@ public class ServerApi
}
public void serverLevelUnloadEvent(IServerLevelWrapper level)
{
- LOGGER.debug("Server Level "+level+" unloading");
+ LOGGER.debug("Server Level " + level + " unloading");
AbstractDhWorld serverWorld = SharedApi.getAbstractDhWorld();
if (serverWorld != null)
@@ -118,11 +128,11 @@ public class ServerApi
ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelUnloadEvent.class, new DhApiLevelUnloadEvent.EventParam(level));
}
}
-
+
@Deprecated // TODO not implemented, remove
public void serverSaveEvent()
{
- LOGGER.debug("Server world "+SharedApi.getAbstractDhWorld()+" saving");
+ LOGGER.debug("Server world " + SharedApi.getAbstractDhWorld() + " saving");
AbstractDhWorld serverWorld = SharedApi.getAbstractDhWorld();
if (serverWorld != null)
@@ -130,7 +140,7 @@ public class ServerApi
serverWorld.saveAndFlush();
}
}
-
+
public void serverChunkLoadEvent(IChunkWrapper chunk, ILevelWrapper level)
{
// the world should always be non-null, this != null is just in case the world was removed accidentally
@@ -147,40 +157,48 @@ public class ServerApi
public void serverChunkSaveEvent(IChunkWrapper chunk, ILevelWrapper level)
{
AbstractDhWorld dhWorld = SharedApi.getAbstractDhWorld();
- if (dhWorld != null)
+ if (dhWorld == null)
{
- IDhLevel dhLevel = SharedApi.getAbstractDhWorld().getLevel(level);
- if (dhLevel != null)
+ return;
+ }
+
+ IDhLevel dhLevel = SharedApi.getAbstractDhWorld().getLevel(level);
+ if (dhLevel == null)
+ {
+ return;
+ }
+
+
+ // lighting the chunk needs to be done outside the event thread to prevent lagging the server thread
+ LIGHT_POPULATOR_THREAD_POOL.execute(() ->
+ {
+ // Save or populate the chunk wrapper's lighting
+ // this is done so we don't have to worry about MC unloading the lighting data for this chunk
+ if (chunk.isLightCorrect())
{
-
- // Save or populate the chunk wrapper's lighting
- // this is done so we don't have to worry about MC unloading the lighting data for this chunk
- if (chunk.isLightCorrect())
+ try
{
- try
- {
- chunk.bakeDhLightingUsingMcLightingEngine();
- chunk.setUseDhLighting(true);
- }
- catch (IllegalStateException e)
- {
- LOGGER.warn(e.getMessage(), e);
- }
- }
- else
- {
- // generate the chunk's lighting, ignoring neighbors.
- // not a perfect solution, but should prevent chunks from having completely broken lighting
- List nearbyChunkList = new LinkedList<>();
- nearbyChunkList.add(chunk);
- DhLightingEngine.INSTANCE.lightChunks(chunk, nearbyChunkList, level.hasSkyLight() ? 15 : 0);
+ // If MC's lighting engine isn't thread safe this may cause the server thread to lag
+ chunk.bakeDhLightingUsingMcLightingEngine();
chunk.setUseDhLighting(true);
}
-
-
- dhLevel.updateChunkAsync(chunk);
+ catch (IllegalStateException e)
+ {
+ LOGGER.warn(e.getMessage(), e);
+ }
}
- }
+ else
+ {
+ // generate the chunk's lighting, ignoring neighbors.
+ // not a perfect solution, but should prevent chunks from having completely broken lighting
+ List nearbyChunkList = new LinkedList<>();
+ nearbyChunkList.add(chunk);
+ DhLightingEngine.INSTANCE.lightChunks(chunk, nearbyChunkList, level.hasSkyLight() ? 15 : 0);
+ chunk.setUseDhLighting(true);
+ }
+
+ dhLevel.updateChunkAsync(chunk);
+ });
}
public void serverPlayerJoinEvent(IServerPlayerWrapper player)
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/SharedApi.java b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/SharedApi.java
index c6ba85169..ff2fdca79 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/SharedApi.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/SharedApi.java
@@ -11,22 +11,16 @@ import com.seibel.distanthorizons.core.world.*;
/** Contains code and variables used by both {@link ClientApi} and {@link ServerApi} */
public class SharedApi
{
- private static AbstractDhWorld currentWorld;
+ private static AbstractDhWorld currentWorld;
private static int lastWorldGenTickDelta = 0;
-
-
-
-
- public static void init() { Initializer.init(); }
-
+ public static void init() { Initializer.init(); }
public static EWorldEnvironment getEnvironment() { return (currentWorld == null) ? null : currentWorld.environment; }
-
- public static void setDhWorld(AbstractDhWorld newWorld)
+ public static void setDhWorld(AbstractDhWorld newWorld)
{
- currentWorld = newWorld;
+ currentWorld = newWorld;
// starting and stopping the DataRenderTransformer is necessary to prevent attempting to
// access the MC level at inappropriate times, which can cause exceptions
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/AppliedConfigState.java b/core/src/main/java/com/seibel/distanthorizons/core/config/AppliedConfigState.java
index 658b374e8..8c8a6be15 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/AppliedConfigState.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/AppliedConfigState.java
@@ -5,31 +5,31 @@ import com.seibel.distanthorizons.core.config.types.ConfigEntry;
// TODO: Make this intergrate with the config system
public class AppliedConfigState
{
- final ConfigEntry entry;
- T activeValue;
+ final ConfigEntry entry;
+ T activeValue;
- public AppliedConfigState(ConfigEntry entryToWatch)
+ public AppliedConfigState(ConfigEntry entryToWatch)
{
- this.entry = entryToWatch;
- this.activeValue = entryToWatch.get();
- }
+ this.entry = entryToWatch;
+ this.activeValue = entryToWatch.get();
+ }
/** Returns true if the value was changed */
- public boolean pollNewValue()
+ public boolean pollNewValue()
{
- T newValue = this.entry.get();
- if (newValue.equals(this.activeValue))
+ T newValue = this.entry.get();
+ if (newValue.equals(this.activeValue))
{
- return false;
- }
+ return false;
+ }
this.activeValue = newValue;
- return true;
- }
+ return true;
+ }
- public T get() { return this.activeValue; }
+ public T get() { return this.activeValue; }
}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java
index 516927657..424ece2f4 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java
@@ -43,12 +43,12 @@ import java.util.*;
/**
* This handles any configuration the user has access to.
- *
+ *
* Note:
* Only add simpler listeners here (IE listeners that only depend on 1 config entry).
* For listeners that depend on 2 or more config entries, add them before the config menu is opened.
* Otherwise, you will have issues where only some of the config entries will exist when your listener is created.
- *
+ *
* @author coolGi
* @version 2023-7-16
*/
@@ -57,11 +57,11 @@ public class Config
{
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
- public static ConfigCategory client = new ConfigCategory.Builder().set(Client.class).build();
+ public static ConfigCategory client = new ConfigCategory.Builder().set(Client.class).build();
- public static class Client
- {
+ public static class Client
+ {
public static ConfigEntry quickEnableRendering = new ConfigEntry.Builder()
.set(true)
.comment(""
@@ -105,7 +105,7 @@ public class Config
public static ConfigEntry optionsButton = new ConfigEntry.Builder()
.set(true)
.comment("" +
- "Should Distant Horizon's config button appear in the options screen next to fov slider?")
+ "Should Distant Horizon's config button appear in the options screen next to fov slider?")
.build();
@@ -219,7 +219,7 @@ public class Config
+ "\n"
+ "True: a red flower will tint the grass below it red. \n"
+ "False: skipped blocks will not change color of surface below them. "
- +"")
+ + "")
.setPerformance(EConfigEntryPerformance.NONE)
.addListener(RenderCacheConfigEventHandler.INSTANCE)
.build();
@@ -310,7 +310,7 @@ public class Config
.build();
public static ConfigEntry farFogMin = new ConfigEntry.Builder()
- .setMinDefaultMax(-5.0,0.0, FOG_RANGE_MAX)
+ .setMinDefaultMax(-5.0, 0.0, FOG_RANGE_MAX)
.comment(""
+ "What is the minimum fog thickness? \n"
+ "\n"
@@ -338,7 +338,7 @@ public class Config
.build();
public static ConfigEntry farFogDensity = new ConfigEntry.Builder()
- .setMinDefaultMax(0.01,2.5, 50.0)
+ .setMinDefaultMax(0.01, 2.5, 50.0)
.comment(""
+ "Used in conjunction with the Fog Falloff.")
.build();
@@ -367,7 +367,7 @@ public class Config
+ EHeightFogMixMode.INVERSE_MULTIPLY_ADDITION + ": farFog + 1 - (1-heightFog) * (1-farFog) \n"
+ EHeightFogMixMode.AVERAGE + ": farFog*0.5 + heightFog*0.5 \n"
+ "\n"
- + "Note: height fog settings are ignored if '"+EHeightFogMixMode.BASIC+"' or '"+EHeightFogMixMode.IGNORE_HEIGHT+"' are selected.")
+ + "Note: height fog settings are ignored if '" + EHeightFogMixMode.BASIC + "' or '" + EHeightFogMixMode.IGNORE_HEIGHT + "' are selected.")
.build();
public static ConfigEntry heightFogMode = new ConfigEntry.Builder()
@@ -440,7 +440,9 @@ public class Config
.build();
}
+
}
+
}
public static class NoiseTextureSettings
@@ -449,7 +451,7 @@ public class Config
.set(true)
.comment(""
+ "Should a noise texture be applied to LODs? \n"
- +"\n"
+ + "\n"
+ "This is done to simulate textures and make the LODs appear more detailed. \n"
+ "")
.build();
@@ -472,6 +474,7 @@ public class Config
+ "Defines how far should the noise texture render before it fades away. (in blocks) \n"
+ "Set to 0 to disable noise from fading away")
.build();
+
}
public static class AdvancedGraphics
@@ -512,7 +515,7 @@ public class Config
+ "reducing overdraw. \n"
+ "\n"
+ "Only functional on Fabric.\n"
- + "Works best with an overdraw prevention setting of "+EOverdrawPrevention.MEDIUM+" or higher \n"
+ + "Works best with an overdraw prevention setting of " + EOverdrawPrevention.MEDIUM + " or higher \n"
+ " and cave culling is disabled. \n"
+ "")
.setPerformance(EConfigEntryPerformance.NONE)
@@ -553,13 +556,13 @@ public class Config
.build();
public static ConfigEntry caveCullingHeight = new ConfigEntry.Builder()
- .setMinDefaultMax(-4096,40,4096)
- .comment(""
+ .setMinDefaultMax(-4096, 40, 4096)
+ .comment(""
+ "At what Y value should cave culling start?")
.build();
public static ConfigEntry earthCurveRatio = new ConfigEntry.Builder()
- .setMinDefaultMax(0,0,5000)
+ .setMinDefaultMax(0, 0, 5000)
.comment(""
+ "This is the earth size ratio when applying the curvature shader effect. \n"
+ "Note: Enabling this feature may cause rendering bugs. \n"
@@ -643,14 +646,14 @@ public class Config
+ "WARNING: This may cause world generator bugs or instability when paired with certain world generator mods. \n"
+ "- Fast \n"
+ "")
- /*
- // FULL isn't currently implemented
- + "\n"
- + EDhApiDistantGeneratorMode.FULL + " \n"
- + "Ask the local server to generate/load each chunk. \n"
- + "This is the most compatible, but will cause server/simulation lag. \n"
- + "- Slow (15-50 ms, with spikes up to 200 ms) \n"
- */
+ /*
+ // FULL isn't currently implemented
+ + "\n"
+ + EDhApiDistantGeneratorMode.FULL + " \n"
+ + "Ask the local server to generate/load each chunk. \n"
+ + "This is the most compatible, but will cause server/simulation lag. \n"
+ + "- Slow (15-50 ms, with spikes up to 200 ms) \n"
+ */
.build();
public static ConfigEntry worldGenLightingEngine = new ConfigEntry.Builder()
@@ -667,7 +670,7 @@ public class Config
.build();
public static ConfigEntry worldGenerationTimeoutLengthInSeconds = new ConfigEntry.Builder()
- .setMinDefaultMax(5, 60, 60*10/*10 minutes*/)
+ .setMinDefaultMax(5, 60, 60 * 10/*10 minutes*/ )
.comment(""
+ "How long should a world generator thread run for before timing out? \n"
+ "Note: If you are experiencing timeout errors it is better to lower your CPU usage first \n"
@@ -695,7 +698,7 @@ public class Config
+ " fake chunks. \n"
+ "\n"
+ EGenerationPriority.BALANCED + " \n"
- + "A mix between "+ EGenerationPriority.NEAR_FIRST+"and"+ EGenerationPriority.FAR_FIRST+". \n"
+ + "A mix between " + EGenerationPriority.NEAR_FIRST + "and" + EGenerationPriority.FAR_FIRST + ". \n"
+ "First prioritise completing nearby highest detail chunks, \n"
+ " then focus on filling in the low detail areas away from the player. \n"
+ "\n"
@@ -944,6 +947,7 @@ public class Config
+ "How frequently should vertex buffers (geometry) be rebuilt and sent to the GPU? \n"
+ "Higher settings may cause stuttering, but will prevent holes in the world")
.build();
+
}
public static class AutoUpdater
@@ -956,10 +960,11 @@ public class Config
public static ConfigEntry enableSilentUpdates = new ConfigEntry.Builder()
.set(false)
- .comment(""
+ .comment(""
+ "Should Distant Horizons silently, automatically download and install new versions? "
+ "")
.build();
+
}
public static class Logging
@@ -1028,6 +1033,7 @@ public class Config
+ "If enabled, the mod will log information about network operations. \n"
+ "This can be useful for debugging.")
.build();
+
}
public static class Debugging
@@ -1079,7 +1085,7 @@ public class Config
+ " This setting is only for fun and debugging. \n"
+ " Mod compatibility is not guaranteed.")
.build();
-
+
public static ConfigEntry debugWireframeRendering = new ConfigEntry.Builder()
.set(false)
.comment(""
@@ -1089,21 +1095,21 @@ public class Config
+ " Additionally, only stuff that's loaded after you enable this \n"
+ " will render their debug wireframes.")
.build();
-
+
public static ConfigEntry enableWhiteWorld = new ConfigEntry.Builder()
.set(false)
.comment(""
+ "Stops vertex colors from being passed. \n"
+ "Useful for debugging shaders")
.build();
-
+
// Note: This will reset on game restart, and should have a warning on the tooltip
public static ConfigEntry allowUnsafeValues = new ConfigEntry.Builder()
.set(false)
.setAppearance(EConfigEntryAppearance.ONLY_IN_GUI)
.addListener(UnsafeValuesConfigListener.INSTANCE)
.build();
-
+
// can be set to public inorder to show in the config file and UI
public static ConfigCategory exampleConfigScreen = new ConfigCategory.Builder()
@@ -1141,7 +1147,7 @@ public class Config
public static ConfigEntry longTest = new ConfigEntry.Builder()
.set(42069L)
.build();
-
+
public static ConfigEntry floatTest = new ConfigEntry.Builder()
.set(0.42069f)
.build();
@@ -1153,15 +1159,15 @@ public class Config
public static ConfigEntry> listTest = new ConfigEntry.Builder>()
.set(new ArrayList(Arrays.asList("option 1", "option 2", "option 3")))
.build();
-
+
public static ConfigEntry> mapTest = new ConfigEntry.Builder>()
.set(new HashMap())
.build();
-
+
public static ConfigUIButton uiButtonTest = new ConfigUIButton(() -> {
System.setProperty("java.awt.headless", "false"); // Required to make it work
- JOptionPane.showMessageDialog(null, "Button pressed!", "UITester dialog", JOptionPane.INFORMATION_MESSAGE);
- });
+ JOptionPane.showMessageDialog(null, "Button pressed!", "UITester dialog", JOptionPane.INFORMATION_MESSAGE);
+ });
public static ConfigCategory categoryTest = new ConfigCategory.Builder().set(CategoryTest.class).build();
@@ -1174,7 +1180,9 @@ public class Config
{
// The name of this can be anything as it will be overwritten by the name of the linked object
public static ConfigLinkedEntry linkableTest = new ConfigLinkedEntry(ExampleConfigScreen.linkableTest);
+
}
+
}
}
@@ -1195,7 +1203,7 @@ public class Config
}
- }
+ }
@@ -1204,10 +1212,10 @@ public class Config
/**
* Runs any config setup that needs all (or most) config entries be initialized (not null),
* but doesn't necessarily require they have the right values yet.
- *
+ *
* Specially:
- * Updates any config values that are UI only
- * and adds any listeners that depend on multiple config values.
+ * Updates any config values that are UI only
+ * and adds any listeners that depend on multiple config values.
*/
public static void completeDelayedSetup()
{
@@ -1219,11 +1227,11 @@ public class Config
{
ThreadPresetConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
RenderQualityPresetConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
- QuickRenderToggleConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
+ QuickRenderToggleConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
}
catch (Exception e)
{
- LOGGER.error("Unexpected exception when setting up complicated config listeners. Error: ["+e.getMessage()+"].", e);
+ LOGGER.error("Unexpected exception when setting up complicated config listeners. Error: [" + e.getMessage() + "].", e);
}
}
}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/ConfigBase.java b/core/src/main/java/com/seibel/distanthorizons/core/config/ConfigBase.java
index 7b0ddd4e3..0df37a368 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/ConfigBase.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/ConfigBase.java
@@ -20,181 +20,205 @@ import java.util.*;
* @author Ran
*/
// Init the config after singletons have been blinded
-public class ConfigBase
+public class ConfigBase
{
- /** Our own config instance, don't modify */
- public static ConfigBase INSTANCE;
- public ConfigFileHandling configFileINSTANCE;
-
- public static final Logger LOGGER = LogManager.getLogger(ConfigBase.class.getSimpleName());
- public final String modID;
- public final String modName;
- public final int configVersion;
+ /** Our own config instance, don't modify */
+ public static ConfigBase INSTANCE;
+ public ConfigFileHandling configFileINSTANCE;
+
+ public static final Logger LOGGER = LogManager.getLogger(ConfigBase.class.getSimpleName());
+ public final String modID;
+ public final String modName;
+ public final int configVersion;
+
+ /**
+ * What the config works with
+ *
+ * Enum
+ * Boolean
+ * Byte
+ * Integer
+ * Double
+ * Short
+ * Long
+ * Float
+ * String
+ *
+ * // Below, "T" should be a value from above
+ * List
+ * ArrayList
+ * Map
+ * HashMap
+ */
+ public static final List> acceptableInputs = new ArrayList>()
+ {{
+ add(Boolean.class);
+ add(Byte.class);
+ add(Integer.class);
+ add(Double.class);
+ add(Short.class);
+ add(Long.class);
+ add(Float.class);
+ add(String.class);
+
+ // TODO[CONFIG]: Check the type of these is valid
+ add(List.class);
+ add(ArrayList.class);
+ add(Map.class);
+ add(HashMap.class);
+ }};
+
+ /** Disables the minimum and maximum of any variable */
+ public boolean disableMinMax = false; // Very fun to use, but should always be disabled by default
+ public final List> entries = new ArrayList<>();
+
+
+ public ConfigBase(String modID, String modName, Class config, int configVersion)
+ {
+ LOGGER.info("Initialising config for " + modName);
+ this.modID = modID;
+ this.modName = modName;
+ this.configVersion = configVersion;
+
+ initNestedClass(config, ""); // Init root category
+
+ // File handling (load from file)
+ this.configFileINSTANCE = new ConfigFileHandling(this);
+ this.configFileINSTANCE.loadFromFile();
+ LOGGER.info("Config for " + modName + " initialised");
+ }
+
+ private void initNestedClass(Class config, String category)
+ {
+ // Put all the entries in entries
+
+ for (Field field : config.getFields())
+ {
+ if (AbstractConfigType.class.isAssignableFrom(field.getType()))
+ {
+ try
+ {
+ entries.add((AbstractConfigType) field.get(field.getType()));
+ }
+ catch (IllegalAccessException exception)
+ {
+ exception.printStackTrace();
+ }
+
+ AbstractConfigType entry = entries.get(entries.size() - 1);
+ entry.category = category;
+ entry.name = field.getName();
+ entry.configBase = this;
+
+ if (ConfigEntry.class.isAssignableFrom(field.getType()))
+ { // If item is type ConfigEntry
+ if (!isAcceptableType(entry.getType()))
+ {
+ LOGGER.error("Invalid variable type at [" + (category.isEmpty() ? "" : category + ".") + field.getName() + "].");
+ LOGGER.error("Type [" + entry.getType() + "] is not one of these types [" + acceptableInputs.toString() + "]");
+ entries.remove(entries.size() - 1); // Delete the entry if it is invalid so the game can still run
+ }
+ }
+
+ if (ConfigCategory.class.isAssignableFrom(field.getType()))
+ { // If it's a category then init the stuff inside it and put it in the category list
+ assert entry instanceof ConfigCategory;
+ if (((ConfigCategory) entry).getDestination() == null)
+ ((ConfigCategory) entry).destination = entry.getNameWCategory();
+ if (entry.get() != null)
+ {
+ initNestedClass(((ConfigCategory) entry).get(), ((ConfigCategory) entry).getDestination());
+ }
+ }
+ }
+ }
+ }
+
+ private static boolean isAcceptableType(Class Clazz)
+ {
+ if (Clazz.isEnum())
+ return true;
+ return acceptableInputs.contains(Clazz);
+ }
+
+
+
+
+ /**
+ * Used for checking that all the lang files for the config exist
+ *
+ * @param onlyShowNew If disabled then it would basically remake the config lang
+ * @param checkEnums Checks if all the lang for the enum's exist
+ */
+ // This is just to re-format the lang or check if there is something in the lang that is missing
+ public String generateLang(boolean onlyShowNew, boolean checkEnums)
+ {
+ ILangWrapper langWrapper = SingletonInjector.INSTANCE.get(ILangWrapper.class);
+ List> enumList = new ArrayList<>();
+
+ String generatedLang = "";
+
+ String starter = " \"";
+ String separator = "\":\n \"";
+ String ending = "\",\n";
+
+ for (AbstractConfigType entry : this.entries)
+ {
+ String entryPrefix = "lod.config." + entry.getNameWCategory();
+
+ if (checkEnums && entry.getType().isEnum() && !enumList.contains(entry.getType()))
+ { // Put it in an enum list to work with at the end
+ enumList.add((Class) entry.getType());
+ }
+ if (!onlyShowNew || langWrapper.langExists(entryPrefix))
+ {
+ if (!ConfigLinkedEntry.class.isAssignableFrom(entry.getClass()))
+ { // If it is a linked item, dont generate the base lang
+ generatedLang += starter
+ + entryPrefix
+ + separator
+ + langWrapper.getLang(entryPrefix)
+ + ending
+ ;
+ }
+ // Adds tooltips
+ if (langWrapper.langExists(entryPrefix + ".@tooltip"))
+ {
+ generatedLang += starter
+ + entryPrefix + ".@tooltip"
+ + separator
+ + langWrapper.getLang(entryPrefix + ".@tooltip")
+ .replaceAll("\n", "\\\\n")
+ .replaceAll("\"", "\\\\\"")
+ + ending
+ ;
+ }
+ }
+ }
+ if (!enumList.isEmpty())
+ {
+ generatedLang += "\n"; // Separate the main lang with the enum's
+
+ for (Class anEnum : enumList)
+ {
+ for (Object enumStr : new ArrayList<>(EnumSet.allOf(anEnum)))
+ {
+ String enumPrefix = "lod.config.enum." + anEnum.getSimpleName() + "." + enumStr.toString();
+
+ if (!onlyShowNew || langWrapper.langExists(enumPrefix))
+ {
+ generatedLang += starter
+ + enumPrefix
+ + separator
+ + langWrapper.getLang(enumPrefix)
+ + ending
+ ;
+ }
+ }
+ }
+ }
+
+ return generatedLang;
+ }
- /**
- What the config works with
-
- Enum
- Boolean
- Byte
- Integer
- Double
- Short
- Long
- Float
- String
-
- // Below, "T" should be a value from above
- List
- ArrayList
- Map
- HashMap
- */
- public static final List> acceptableInputs = new ArrayList>() {{
- add(Boolean.class);
- add(Byte.class);
- add(Integer.class);
- add(Double.class);
- add(Short.class);
- add(Long.class);
- add(Float.class);
- add(String.class);
-
- // TODO[CONFIG]: Check the type of these is valid
- add(List.class);
- add(ArrayList.class);
- add(Map.class);
- add(HashMap.class);
- }};
-
- /** Disables the minimum and maximum of any variable */
- public boolean disableMinMax = false; // Very fun to use, but should always be disabled by default
- public final List> entries = new ArrayList<>();
-
-
- public ConfigBase(String modID, String modName, Class config, int configVersion) {
- LOGGER.info("Initialising config for " + modName);
- this.modID = modID;
- this.modName = modName;
- this.configVersion = configVersion;
-
- initNestedClass(config, ""); // Init root category
-
- // File handling (load from file)
- this.configFileINSTANCE = new ConfigFileHandling(this);
- this.configFileINSTANCE.loadFromFile();
- LOGGER.info("Config for " + modName + " initialised");
- }
-
- private void initNestedClass(Class config, String category) {
- // Put all the entries in entries
-
- for (Field field : config.getFields()) {
- if (AbstractConfigType.class.isAssignableFrom(field.getType())) {
- try {
- entries.add((AbstractConfigType) field.get(field.getType()));
- } catch (IllegalAccessException exception) {
- exception.printStackTrace();
- }
-
- AbstractConfigType entry = entries.get(entries.size() - 1);
- entry.category = category;
- entry.name = field.getName();
- entry.configBase = this;
-
- if (ConfigEntry.class.isAssignableFrom(field.getType())) { // If item is type ConfigEntry
- if (!isAcceptableType(entry.getType())) {
- LOGGER.error("Invalid variable type at [" + (category.isEmpty() ? "" : category + ".") + field.getName() + "].");
- LOGGER.error("Type [" + entry.getType() + "] is not one of these types [" + acceptableInputs.toString() + "]");
- entries.remove(entries.size() -1); // Delete the entry if it is invalid so the game can still run
- }
- }
-
- if (ConfigCategory.class.isAssignableFrom(field.getType())) { // If it's a category then init the stuff inside it and put it in the category list
- assert entry instanceof ConfigCategory;
- if (((ConfigCategory) entry).getDestination() == null)
- ((ConfigCategory) entry).destination = entry.getNameWCategory();
- if (entry.get() != null) {
- initNestedClass(((ConfigCategory) entry).get(), ((ConfigCategory) entry).getDestination());
- }
- }
- }
- }
- }
-
- private static boolean isAcceptableType(Class Clazz) {
- if (Clazz.isEnum())
- return true;
- return acceptableInputs.contains(Clazz);
- }
-
-
-
-
- /**
- * Used for checking that all the lang files for the config exist
- *
- * @param onlyShowNew If disabled then it would basically remake the config lang
- * @param checkEnums Checks if all the lang for the enum's exist
- */
- // This is just to re-format the lang or check if there is something in the lang that is missing
- public String generateLang(boolean onlyShowNew, boolean checkEnums) {
- ILangWrapper langWrapper = SingletonInjector.INSTANCE.get(ILangWrapper.class);
- List> enumList = new ArrayList<>();
-
- String generatedLang = "";
-
- String starter = " \"";
- String separator = "\":\n \"";
- String ending = "\",\n";
-
- for (AbstractConfigType entry: this.entries) {
- String entryPrefix = "lod.config."+entry.getNameWCategory();
-
- if (checkEnums && entry.getType().isEnum() && !enumList.contains(entry.getType())) { // Put it in an enum list to work with at the end
- enumList.add((Class) entry.getType());
- }
- if (!onlyShowNew || langWrapper.langExists(entryPrefix)) {
- if (!ConfigLinkedEntry.class.isAssignableFrom(entry.getClass())) { // If it is a linked item, dont generate the base lang
- generatedLang += starter
- + entryPrefix
- + separator
- + langWrapper.getLang(entryPrefix)
- + ending
- ;
- }
- // Adds tooltips
- if (langWrapper.langExists(entryPrefix+".@tooltip")) {
- generatedLang += starter
- + entryPrefix+".@tooltip"
- + separator
- + langWrapper.getLang(entryPrefix+".@tooltip")
- .replaceAll("\n", "\\\\n")
- .replaceAll("\"", "\\\\\"")
- + ending
- ;
- }
- }
- }
- if (!enumList.isEmpty()) {
- generatedLang += "\n"; // Separate the main lang with the enum's
-
- for (Class anEnum: enumList) {
- for (Object enumStr: new ArrayList<>(EnumSet.allOf(anEnum))) {
- String enumPrefix = "lod.config.enum."+anEnum.getSimpleName()+"."+enumStr.toString();
-
- if (!onlyShowNew || langWrapper.langExists(enumPrefix)) {
- generatedLang += starter
- + enumPrefix
- + separator
- + langWrapper.getLang(enumPrefix)
- + ending
- ;
- }
- }
- }
- }
-
- return generatedLang;
- }
}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/NumberUtil.java b/core/src/main/java/com/seibel/distanthorizons/core/config/NumberUtil.java
index 1731da4d0..b53e59f89 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/NumberUtil.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/NumberUtil.java
@@ -10,59 +10,67 @@ import java.util.Map;
* @version 2023-7-16
*/
// TODO: Should this be moved out of here into somewhere like the util section
-public class NumberUtil {
- // Is there no better way of doing this?
- public static Map minValues = new HashMap() {{
- put(Byte.class, Byte.MIN_VALUE);
- put(Short.class, Short.MIN_VALUE);
- put(Integer.class, Integer.MIN_VALUE);
- put(Long.class, Long.MIN_VALUE);
- put(Double.class, Double.MIN_VALUE);
- put(Float.class, Float.MIN_VALUE);
- }};
- public static Map maxValues = new HashMap() {{
- put(Byte.class, Byte.MAX_VALUE);
- put(Short.class, Short.MAX_VALUE);
- put(Integer.class, Integer.MAX_VALUE);
- put(Long.class, Long.MAX_VALUE);
- put(Double.class, Double.MAX_VALUE);
- put(Float.class, Float.MAX_VALUE);
- }};
-
- public static Number getMinimum(Class c) {
- return minValues.get(c);
- }
- public static Number getMaximum(Class c) {
- return maxValues.get(c);
- }
-
- /** Does a greater than (>) operator on any number */
- public static boolean greaterThan(Number a, Number b) {
- if (a.getClass() != b.getClass())
- return false;
- Class typeClass = a.getClass();
-
- if (typeClass == Byte.class) return a.byteValue() > b.byteValue();
- if (typeClass == Short.class) return a.shortValue() > b.shortValue();
- if (typeClass == Integer.class) return a.intValue() > b.intValue();
- if (typeClass == Long.class) return a.longValue() > b.longValue();
- if (typeClass == Double.class) return a.doubleValue() > b.doubleValue();
- if (typeClass == Float.class) return a.floatValue() > b.floatValue();
- return false;
- }
-
- /** Does a less than (<) operator on any number */
- public static boolean lessThan(Number a, Number b) {
- if (a.getClass() != b.getClass())
- return false;
- Class typeClass = a.getClass();
-
- if (typeClass == Byte.class) return a.byteValue() < b.byteValue();
- if (typeClass == Short.class) return a.shortValue() < b.shortValue();
- if (typeClass == Integer.class) return a.intValue() < b.intValue();
- if (typeClass == Long.class) return a.longValue() < b.longValue();
- if (typeClass == Double.class) return a.doubleValue() < b.doubleValue();
- if (typeClass == Float.class) return a.floatValue() < b.floatValue();
- return false;
- }
+public class NumberUtil
+{
+ // Is there no better way of doing this?
+ public static Map minValues = new HashMap()
+ {{
+ put(Byte.class, Byte.MIN_VALUE);
+ put(Short.class, Short.MIN_VALUE);
+ put(Integer.class, Integer.MIN_VALUE);
+ put(Long.class, Long.MIN_VALUE);
+ put(Double.class, Double.MIN_VALUE);
+ put(Float.class, Float.MIN_VALUE);
+ }};
+ public static Map maxValues = new HashMap()
+ {{
+ put(Byte.class, Byte.MAX_VALUE);
+ put(Short.class, Short.MAX_VALUE);
+ put(Integer.class, Integer.MAX_VALUE);
+ put(Long.class, Long.MAX_VALUE);
+ put(Double.class, Double.MAX_VALUE);
+ put(Float.class, Float.MAX_VALUE);
+ }};
+
+ public static Number getMinimum(Class c)
+ {
+ return minValues.get(c);
+ }
+ public static Number getMaximum(Class c)
+ {
+ return maxValues.get(c);
+ }
+
+ /** Does a greater than (>) operator on any number */
+ public static boolean greaterThan(Number a, Number b)
+ {
+ if (a.getClass() != b.getClass())
+ return false;
+ Class typeClass = a.getClass();
+
+ if (typeClass == Byte.class) return a.byteValue() > b.byteValue();
+ if (typeClass == Short.class) return a.shortValue() > b.shortValue();
+ if (typeClass == Integer.class) return a.intValue() > b.intValue();
+ if (typeClass == Long.class) return a.longValue() > b.longValue();
+ if (typeClass == Double.class) return a.doubleValue() > b.doubleValue();
+ if (typeClass == Float.class) return a.floatValue() > b.floatValue();
+ return false;
+ }
+
+ /** Does a less than (<) operator on any number */
+ public static boolean lessThan(Number a, Number b)
+ {
+ if (a.getClass() != b.getClass())
+ return false;
+ Class typeClass = a.getClass();
+
+ if (typeClass == Byte.class) return a.byteValue() < b.byteValue();
+ if (typeClass == Short.class) return a.shortValue() < b.shortValue();
+ if (typeClass == Integer.class) return a.intValue() < b.intValue();
+ if (typeClass == Long.class) return a.longValue() < b.longValue();
+ if (typeClass == Double.class) return a.doubleValue() < b.doubleValue();
+ if (typeClass == Float.class) return a.floatValue() < b.floatValue();
+ return false;
+ }
+
}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/QuickRenderToggleConfigEventHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/QuickRenderToggleConfigEventHandler.java
index 5f5a5a12a..d3b8811c5 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/QuickRenderToggleConfigEventHandler.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/QuickRenderToggleConfigEventHandler.java
@@ -14,15 +14,15 @@ public class QuickRenderToggleConfigEventHandler
/** private since we only ever need one handler at a time */
- private QuickRenderToggleConfigEventHandler()
+ private QuickRenderToggleConfigEventHandler()
{
this.quickRenderChangeListener = new ConfigChangeListener<>(Config.Client.quickEnableRendering, (val) -> { Config.Client.Advanced.Debugging.rendererMode.set(Config.Client.quickEnableRendering.get() ? ERendererMode.DEFAULT : ERendererMode.DISABLED); });
this.rendererModeChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Debugging.rendererMode, (val) -> { Config.Client.quickEnableRendering.set(Config.Client.Advanced.Debugging.rendererMode.get() != ERendererMode.DISABLED); });
}
/**
- * Set the UI only config based on what is set in the file.
- * This should only be called once.
+ * Set the UI only config based on what is set in the file.
+ * This should only be called once.
*/
public void setUiOnlyConfigValues()
{
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/RenderCacheConfigEventHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/RenderCacheConfigEventHandler.java
index 8bbca7f0c..4f69ce2ed 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/RenderCacheConfigEventHandler.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/RenderCacheConfigEventHandler.java
@@ -13,7 +13,7 @@ import java.util.TimerTask;
/**
* Listens to the config and will automatically
* clear the current render cache if certain settings are changed.
- *
+ *
* Note: if additional settings should clear the render cache, add those to this listener, don't create a new listener
*/
public class RenderCacheConfigEventHandler implements IConfigListener
@@ -31,11 +31,11 @@ public class RenderCacheConfigEventHandler implements IConfigListener
/** private since we only ever need one handler at a time */
- private RenderCacheConfigEventHandler() { }
+ private RenderCacheConfigEventHandler() { }
- @Override
+ @Override
public void onConfigValueSet()
{
// confirm a setting was actually changed
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/ResetConfigEventHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/ResetConfigEventHandler.java
index 7c05ed28f..a2fd1a48e 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/ResetConfigEventHandler.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/ResetConfigEventHandler.java
@@ -11,7 +11,7 @@ public class ResetConfigEventHandler
/** private since we only ever need one handler at a time */
- private ResetConfigEventHandler()
+ private ResetConfigEventHandler()
{
this.configChangeListener = new ConfigChangeListener<>(Config.Client.ResetConfirmation.resetAllSettings, (resetSettings) -> { doStuff(resetSettings); });
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/UnsafeValuesConfigListener.java b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/UnsafeValuesConfigListener.java
index 4c0eca3bc..af7f1f19c 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/UnsafeValuesConfigListener.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/UnsafeValuesConfigListener.java
@@ -3,17 +3,21 @@ package com.seibel.distanthorizons.core.config.eventHandlers;
import com.seibel.distanthorizons.core.config.Config;
import com.seibel.distanthorizons.core.config.listeners.IConfigListener;
-public class UnsafeValuesConfigListener implements IConfigListener {
- public static UnsafeValuesConfigListener INSTANCE = new UnsafeValuesConfigListener();
-
- @Override
- public void onConfigValueSet() {
- Config.Client.Advanced.Debugging.allowUnsafeValues.configBase.disableMinMax =
- Config.Client.Advanced.Debugging.allowUnsafeValues.get();
- }
-
- @Override
- public void onUiModify() {
-
- }
+public class UnsafeValuesConfigListener implements IConfigListener
+{
+ public static UnsafeValuesConfigListener INSTANCE = new UnsafeValuesConfigListener();
+
+ @Override
+ public void onConfigValueSet()
+ {
+ Config.Client.Advanced.Debugging.allowUnsafeValues.configBase.disableMinMax =
+ Config.Client.Advanced.Debugging.allowUnsafeValues.get();
+ }
+
+ @Override
+ public void onUiModify()
+ {
+
+ }
+
}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/AbstractPresetConfigEventHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/AbstractPresetConfigEventHandler.java
index 9c21d6233..36b103c49 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/AbstractPresetConfigEventHandler.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/AbstractPresetConfigEventHandler.java
@@ -22,9 +22,9 @@ public abstract class AbstractPresetConfigEventHandler
- * This should only be called once.
+ /**
+ * Set the UI only config based on what is set in the file.
+ * This should only be called once.
*/
public void setUiOnlyConfigValues()
{
@@ -37,7 +37,7 @@ public abstract class AbstractPresetConfigEventHandler 1)
{
// we shouldn't have multiple options, but just in case
- LOGGER.warn("Multiple potential preset options ["+StringUtil.join(", ", possiblePrestList)+"], defaulting to the first one.");
+ LOGGER.warn("Multiple potential preset options [" + StringUtil.join(", ", possiblePrestList) + "], defaulting to the first one.");
}
if (possiblePrestList.size() == 0)
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/RenderQualityPresetConfigEventHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/RenderQualityPresetConfigEventHandler.java
index c830fd611..5ae270f1d 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/RenderQualityPresetConfigEventHandler.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/RenderQualityPresetConfigEventHandler.java
@@ -21,51 +21,51 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
private static final Logger LOGGER = LogManager.getLogger();
- private final ConfigEntryWithPresetOptions drawResolution = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.maxHorizontalResolution,
- new HashMap()
- {{
- this.put(EQualityPreset.MINIMUM, EMaxHorizontalResolution.TWO_BLOCKS);
- this.put(EQualityPreset.LOW, EMaxHorizontalResolution.BLOCK);
- this.put(EQualityPreset.MEDIUM, EMaxHorizontalResolution.BLOCK);
- this.put(EQualityPreset.HIGH, EMaxHorizontalResolution.BLOCK);
- this.put(EQualityPreset.EXTREME, EMaxHorizontalResolution.BLOCK);
- }});
+ private final ConfigEntryWithPresetOptions drawResolution = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.maxHorizontalResolution,
+ new HashMap()
+ {{
+ this.put(EQualityPreset.MINIMUM, EMaxHorizontalResolution.TWO_BLOCKS);
+ this.put(EQualityPreset.LOW, EMaxHorizontalResolution.BLOCK);
+ this.put(EQualityPreset.MEDIUM, EMaxHorizontalResolution.BLOCK);
+ this.put(EQualityPreset.HIGH, EMaxHorizontalResolution.BLOCK);
+ this.put(EQualityPreset.EXTREME, EMaxHorizontalResolution.BLOCK);
+ }});
private final ConfigEntryWithPresetOptions verticalQuality = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.verticalQuality,
- new HashMap()
- {{
- this.put(EQualityPreset.MINIMUM, EVerticalQuality.HEIGHT_MAP);
- this.put(EQualityPreset.LOW, EVerticalQuality.LOW);
- this.put(EQualityPreset.MEDIUM, EVerticalQuality.MEDIUM);
- this.put(EQualityPreset.HIGH, EVerticalQuality.HIGH);
- this.put(EQualityPreset.EXTREME, EVerticalQuality.EXTREME);
- }});
+ new HashMap()
+ {{
+ this.put(EQualityPreset.MINIMUM, EVerticalQuality.HEIGHT_MAP);
+ this.put(EQualityPreset.LOW, EVerticalQuality.LOW);
+ this.put(EQualityPreset.MEDIUM, EVerticalQuality.MEDIUM);
+ this.put(EQualityPreset.HIGH, EVerticalQuality.HIGH);
+ this.put(EQualityPreset.EXTREME, EVerticalQuality.EXTREME);
+ }});
private final ConfigEntryWithPresetOptions horizontalQuality = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.horizontalQuality,
- new HashMap()
- {{
- this.put(EQualityPreset.MINIMUM, EHorizontalQuality.LOWEST);
- this.put(EQualityPreset.LOW, EHorizontalQuality.LOW);
- this.put(EQualityPreset.MEDIUM, EHorizontalQuality.MEDIUM);
- this.put(EQualityPreset.HIGH, EHorizontalQuality.HIGH);
- this.put(EQualityPreset.EXTREME, EHorizontalQuality.EXTREME);
- }});
- private final ConfigEntryWithPresetOptions transparency = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.transparency,
- new HashMap()
- {{
- this.put(EQualityPreset.MINIMUM, ETransparency.DISABLED);
- this.put(EQualityPreset.LOW, ETransparency.DISABLED); // should be fake if/when fake is fixed
- this.put(EQualityPreset.MEDIUM, ETransparency.COMPLETE);
- this.put(EQualityPreset.HIGH, ETransparency.COMPLETE);
- this.put(EQualityPreset.EXTREME, ETransparency.COMPLETE);
- }});
- private final ConfigEntryWithPresetOptions ssao = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.ssao,
- new HashMap()
- {{
- this.put(EQualityPreset.MINIMUM, false);
- this.put(EQualityPreset.LOW, false);
- this.put(EQualityPreset.MEDIUM, true);
- this.put(EQualityPreset.HIGH, true);
- this.put(EQualityPreset.EXTREME, true);
- }});
+ new HashMap()
+ {{
+ this.put(EQualityPreset.MINIMUM, EHorizontalQuality.LOWEST);
+ this.put(EQualityPreset.LOW, EHorizontalQuality.LOW);
+ this.put(EQualityPreset.MEDIUM, EHorizontalQuality.MEDIUM);
+ this.put(EQualityPreset.HIGH, EHorizontalQuality.HIGH);
+ this.put(EQualityPreset.EXTREME, EHorizontalQuality.EXTREME);
+ }});
+ private final ConfigEntryWithPresetOptions transparency = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.transparency,
+ new HashMap()
+ {{
+ this.put(EQualityPreset.MINIMUM, ETransparency.DISABLED);
+ this.put(EQualityPreset.LOW, ETransparency.DISABLED); // should be fake if/when fake is fixed
+ this.put(EQualityPreset.MEDIUM, ETransparency.COMPLETE);
+ this.put(EQualityPreset.HIGH, ETransparency.COMPLETE);
+ this.put(EQualityPreset.EXTREME, ETransparency.COMPLETE);
+ }});
+ private final ConfigEntryWithPresetOptions ssao = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.ssao,
+ new HashMap()
+ {{
+ this.put(EQualityPreset.MINIMUM, false);
+ this.put(EQualityPreset.LOW, false);
+ this.put(EQualityPreset.MEDIUM, true);
+ this.put(EQualityPreset.HIGH, true);
+ this.put(EQualityPreset.EXTREME, true);
+ }});
@@ -74,7 +74,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
//==============//
/** private since we only ever need one handler at a time */
- private RenderQualityPresetConfigEventHandler()
+ private RenderQualityPresetConfigEventHandler()
{
// add each config used by this preset
this.configList.add(this.drawResolution);
@@ -100,9 +100,9 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
@Override
protected IConfigEntry getPresetConfigEntry() { return Config.Client.qualityPresetSetting; }
- @Override
+ @Override
protected List getPresetEnumList() { return Arrays.asList(EQualityPreset.values()); }
- @Override
+ @Override
protected EQualityPreset getCustomPresetEnum() { return EQualityPreset.CUSTOM; }
}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/ThreadPresetConfigEventHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/ThreadPresetConfigEventHandler.java
index 1a3f5e295..e16844729 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/ThreadPresetConfigEventHandler.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/ThreadPresetConfigEventHandler.java
@@ -22,114 +22,114 @@ public class ThreadPresetConfigEventHandler extends AbstractPresetConfigEventHan
- public static int getWorldGenDefaultThreadCount() { return getThreadCountByPercent(0.2); }
- private final ConfigEntryWithPresetOptions worldGenThreadCount = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.numberOfWorldGenerationThreads,
- new HashMap()
- {{
- this.put(EThreadPreset.MINIMAL_IMPACT, 1);
- this.put(EThreadPreset.LOW_IMPACT, getWorldGenDefaultThreadCount());
- this.put(EThreadPreset.BALANCED, getThreadCountByPercent(0.4));
- this.put(EThreadPreset.AGGRESSIVE, getThreadCountByPercent(0.6));
- //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, getThreadCountByPercent(1.0));
- }});
+ public static int getWorldGenDefaultThreadCount() { return getThreadCountByPercent(0.2); }
+ private final ConfigEntryWithPresetOptions worldGenThreadCount = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.numberOfWorldGenerationThreads,
+ new HashMap()
+ {{
+ this.put(EThreadPreset.MINIMAL_IMPACT, 1);
+ this.put(EThreadPreset.LOW_IMPACT, getWorldGenDefaultThreadCount());
+ this.put(EThreadPreset.BALANCED, getThreadCountByPercent(0.4));
+ this.put(EThreadPreset.AGGRESSIVE, getThreadCountByPercent(0.6));
+ //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, getThreadCountByPercent(1.0));
+ }});
public static double getWorldGenDefaultRunTimeRatio() { return LOW_THREAD_COUNT_CPU ? 0.5 : 1; }
private final ConfigEntryWithPresetOptions worldGenRunTime = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.runTimeRatioForWorldGenerationThreads,
- new HashMap()
- {{
- this.put(EThreadPreset.MINIMAL_IMPACT, LOW_THREAD_COUNT_CPU ? 0.1 : 0.25);
- this.put(EThreadPreset.LOW_IMPACT, getWorldGenDefaultRunTimeRatio());
- this.put(EThreadPreset.BALANCED, LOW_THREAD_COUNT_CPU ? 0.5 : 1.0);
- this.put(EThreadPreset.AGGRESSIVE, LOW_THREAD_COUNT_CPU ? 0.75 : 1.0);
- //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, 1.0);
- }});
+ new HashMap()
+ {{
+ this.put(EThreadPreset.MINIMAL_IMPACT, LOW_THREAD_COUNT_CPU ? 0.1 : 0.25);
+ this.put(EThreadPreset.LOW_IMPACT, getWorldGenDefaultRunTimeRatio());
+ this.put(EThreadPreset.BALANCED, LOW_THREAD_COUNT_CPU ? 0.5 : 1.0);
+ this.put(EThreadPreset.AGGRESSIVE, LOW_THREAD_COUNT_CPU ? 0.75 : 1.0);
+ //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, 1.0);
+ }});
public static int getBufferBuilderDefaultThreadCount() { return getThreadCountByPercent(0.1); }
- private final ConfigEntryWithPresetOptions bufferBuilderThreadCount = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.numberOfBufferBuilderThreads,
- new HashMap()
- {{
- this.put(EThreadPreset.MINIMAL_IMPACT, 1);
- this.put(EThreadPreset.LOW_IMPACT, getBufferBuilderDefaultThreadCount());
- this.put(EThreadPreset.BALANCED, getThreadCountByPercent(0.2));
- this.put(EThreadPreset.AGGRESSIVE, getThreadCountByPercent(0.4));
- //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, getThreadCountByPercent(1.0));
- }});
+ private final ConfigEntryWithPresetOptions bufferBuilderThreadCount = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.numberOfBufferBuilderThreads,
+ new HashMap()
+ {{
+ this.put(EThreadPreset.MINIMAL_IMPACT, 1);
+ this.put(EThreadPreset.LOW_IMPACT, getBufferBuilderDefaultThreadCount());
+ this.put(EThreadPreset.BALANCED, getThreadCountByPercent(0.2));
+ this.put(EThreadPreset.AGGRESSIVE, getThreadCountByPercent(0.4));
+ //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, getThreadCountByPercent(1.0));
+ }});
public static double getBufferBuilderDefaultRunTimeRatio() { return LOW_THREAD_COUNT_CPU ? 0.5 : 0.75; }
private final ConfigEntryWithPresetOptions bufferBuilderRunTime = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.runTimeRatioForBufferBuilderThreads,
- new HashMap()
- {{
- this.put(EThreadPreset.MINIMAL_IMPACT, 0.25);
- this.put(EThreadPreset.LOW_IMPACT, getBufferBuilderDefaultRunTimeRatio());
- this.put(EThreadPreset.BALANCED, LOW_THREAD_COUNT_CPU ? 0.75 : 1.0);
- this.put(EThreadPreset.AGGRESSIVE, 1.0);
- //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, 1.0);
- }});
+ new HashMap()
+ {{
+ this.put(EThreadPreset.MINIMAL_IMPACT, 0.25);
+ this.put(EThreadPreset.LOW_IMPACT, getBufferBuilderDefaultRunTimeRatio());
+ this.put(EThreadPreset.BALANCED, LOW_THREAD_COUNT_CPU ? 0.75 : 1.0);
+ this.put(EThreadPreset.AGGRESSIVE, 1.0);
+ //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, 1.0);
+ }});
public static int getFileHandlerDefaultThreadCount() { return getThreadCountByPercent(0.1); }
- private final ConfigEntryWithPresetOptions fileHandlerThreadCount = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.numberOfFileHandlerThreads,
- new HashMap()
- {{
- this.put(EThreadPreset.MINIMAL_IMPACT, 1);
- this.put(EThreadPreset.LOW_IMPACT, getFileHandlerDefaultThreadCount());
- this.put(EThreadPreset.BALANCED, getThreadCountByPercent(0.2));
- this.put(EThreadPreset.AGGRESSIVE, getThreadCountByPercent(0.2));
- //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, getThreadCountByPercent(1.0));
- }});
+ private final ConfigEntryWithPresetOptions fileHandlerThreadCount = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.numberOfFileHandlerThreads,
+ new HashMap()
+ {{
+ this.put(EThreadPreset.MINIMAL_IMPACT, 1);
+ this.put(EThreadPreset.LOW_IMPACT, getFileHandlerDefaultThreadCount());
+ this.put(EThreadPreset.BALANCED, getThreadCountByPercent(0.2));
+ this.put(EThreadPreset.AGGRESSIVE, getThreadCountByPercent(0.2));
+ //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, getThreadCountByPercent(1.0));
+ }});
public static double getFileHandlerDefaultRunTimeRatio() { return 0.5; }
private final ConfigEntryWithPresetOptions fileHandlerRunTime = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.runTimeRatioForFileHandlerThreads,
- new HashMap()
- {{
- this.put(EThreadPreset.MINIMAL_IMPACT, 0.25);
- this.put(EThreadPreset.LOW_IMPACT, getFileHandlerDefaultRunTimeRatio());
- this.put(EThreadPreset.BALANCED, 0.75);
- this.put(EThreadPreset.AGGRESSIVE, 1.0);
- //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, 1.0);
- }});
+ new HashMap()
+ {{
+ this.put(EThreadPreset.MINIMAL_IMPACT, 0.25);
+ this.put(EThreadPreset.LOW_IMPACT, getFileHandlerDefaultRunTimeRatio());
+ this.put(EThreadPreset.BALANCED, 0.75);
+ this.put(EThreadPreset.AGGRESSIVE, 1.0);
+ //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, 1.0);
+ }});
public static int getDataTransformerDefaultThreadCount() { return getThreadCountByPercent(0.1); }
- private final ConfigEntryWithPresetOptions dataTransformerThreadCount = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.numberOfDataTransformerThreads,
- new HashMap()
- {{
- this.put(EThreadPreset.MINIMAL_IMPACT, 1);
- this.put(EThreadPreset.LOW_IMPACT, getDataTransformerDefaultThreadCount());
- this.put(EThreadPreset.BALANCED, getThreadCountByPercent(0.2));
- this.put(EThreadPreset.AGGRESSIVE, getThreadCountByPercent(0.2));
- //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, getThreadCountByPercent(1.0));
- }});
+ private final ConfigEntryWithPresetOptions dataTransformerThreadCount = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.numberOfDataTransformerThreads,
+ new HashMap()
+ {{
+ this.put(EThreadPreset.MINIMAL_IMPACT, 1);
+ this.put(EThreadPreset.LOW_IMPACT, getDataTransformerDefaultThreadCount());
+ this.put(EThreadPreset.BALANCED, getThreadCountByPercent(0.2));
+ this.put(EThreadPreset.AGGRESSIVE, getThreadCountByPercent(0.2));
+ //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, getThreadCountByPercent(1.0));
+ }});
public static double getDataTransformerDefaultRunTimeRatio() { return LOW_THREAD_COUNT_CPU ? 0.5 : 1; }
private final ConfigEntryWithPresetOptions dataTransformerRunTime = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.runTimeRatioForDataTransformerThreads,
- new HashMap()
- {{
- this.put(EThreadPreset.MINIMAL_IMPACT, 0.25);
- this.put(EThreadPreset.LOW_IMPACT, getDataTransformerDefaultRunTimeRatio());
- this.put(EThreadPreset.BALANCED, LOW_THREAD_COUNT_CPU ? 0.75 : 1);
- this.put(EThreadPreset.AGGRESSIVE, 1.0);
- //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, 1.0);
- }});
+ new HashMap()
+ {{
+ this.put(EThreadPreset.MINIMAL_IMPACT, 0.25);
+ this.put(EThreadPreset.LOW_IMPACT, getDataTransformerDefaultRunTimeRatio());
+ this.put(EThreadPreset.BALANCED, LOW_THREAD_COUNT_CPU ? 0.75 : 1);
+ this.put(EThreadPreset.AGGRESSIVE, 1.0);
+ //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, 1.0);
+ }});
public static int getChunkLodConverterDefaultThreadCount() { return getThreadCountByPercent(0.1); }
- private final ConfigEntryWithPresetOptions chunkLodConverterThreadCount = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.numberOfChunkLodConverterThreads,
- new HashMap()
- {{
- this.put(EThreadPreset.MINIMAL_IMPACT, 1);
- this.put(EThreadPreset.LOW_IMPACT, getChunkLodConverterDefaultThreadCount());
- this.put(EThreadPreset.BALANCED, getThreadCountByPercent(0.2));
- this.put(EThreadPreset.AGGRESSIVE, getThreadCountByPercent(0.4));
- //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, getThreadCountByPercent(1.0));
- }});
+ private final ConfigEntryWithPresetOptions chunkLodConverterThreadCount = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.numberOfChunkLodConverterThreads,
+ new HashMap()
+ {{
+ this.put(EThreadPreset.MINIMAL_IMPACT, 1);
+ this.put(EThreadPreset.LOW_IMPACT, getChunkLodConverterDefaultThreadCount());
+ this.put(EThreadPreset.BALANCED, getThreadCountByPercent(0.2));
+ this.put(EThreadPreset.AGGRESSIVE, getThreadCountByPercent(0.4));
+ //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, getThreadCountByPercent(1.0));
+ }});
public static double getChunkLodConverterDefaultRunTimeRatio() { return LOW_THREAD_COUNT_CPU ? 0.5 : 0.75; }
private final ConfigEntryWithPresetOptions chunkLodConverterRunTime = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.runTimeRatioForChunkLodConverterThreads,
- new HashMap()
- {{
- this.put(EThreadPreset.MINIMAL_IMPACT, LOW_THREAD_COUNT_CPU ? 0.1 : 0.25);
- this.put(EThreadPreset.LOW_IMPACT, getDataTransformerDefaultRunTimeRatio());
- this.put(EThreadPreset.BALANCED, LOW_THREAD_COUNT_CPU ? 0.75 : 1);
- this.put(EThreadPreset.AGGRESSIVE, 1.0);
- //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, 1.0);
- }});
+ new HashMap()
+ {{
+ this.put(EThreadPreset.MINIMAL_IMPACT, LOW_THREAD_COUNT_CPU ? 0.1 : 0.25);
+ this.put(EThreadPreset.LOW_IMPACT, getChunkLodConverterDefaultRunTimeRatio());
+ this.put(EThreadPreset.BALANCED, LOW_THREAD_COUNT_CPU ? 0.75 : 1);
+ this.put(EThreadPreset.AGGRESSIVE, 1.0);
+ //this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, 1.0);
+ }});
@@ -138,7 +138,7 @@ public class ThreadPresetConfigEventHandler extends AbstractPresetConfigEventHan
//==============//
/** private since we only ever need one handler at a time */
- private ThreadPresetConfigEventHandler()
+ private ThreadPresetConfigEventHandler()
{
// add each config used by this preset
this.configList.add(this.worldGenThreadCount);
@@ -204,9 +204,9 @@ public class ThreadPresetConfigEventHandler extends AbstractPresetConfigEventHan
@Override
protected IConfigEntry getPresetConfigEntry() { return Config.Client.threadPresetSetting; }
- @Override
+ @Override
protected List getPresetEnumList() { return Arrays.asList(EThreadPreset.values()); }
- @Override
+ @Override
protected EThreadPreset getCustomPresetEnum() { return EThreadPreset.CUSTOM; }
}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigFileHandling.java b/core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigFileHandling.java
index e8ef1fef5..b37a9af5d 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigFileHandling.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigFileHandling.java
@@ -19,197 +19,243 @@ import java.nio.file.Path;
* @author coolGi
* @version 2023-7-16
*/
-public class ConfigFileHandling {
+public class ConfigFileHandling
+{
private static final Logger LOGGER = ConfigBase.LOGGER;
-
- public final ConfigBase configBase;
+
+ public final ConfigBase configBase;
public final Path ConfigPath;
-
- public ConfigFileHandling(ConfigBase configBase) {
- this.configBase = configBase;
- ConfigPath = SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class)
- .getInstallationDirectory().toPath().resolve("config").resolve(this.configBase.modName+".toml");
- }
-
- /** Saves the entire config to the file */
- public void saveToFile() {
- CommentedFileConfig config = CommentedFileConfig.builder(ConfigPath.toFile()).build();
- if (!Files.exists(ConfigPath)) // Try to check if the config exists
- try {
- Files.createFile(ConfigPath);
- } catch (IOException ex) {
- ex.printStackTrace();
- }
-
- loadConfig(config);
-
- for (AbstractConfigType entry : this.configBase.entries) {
- if (ConfigEntry.class.isAssignableFrom(entry.getClass())) {
- createComment((ConfigEntry) entry, config);
- saveEntry((ConfigEntry) entry, config);
- }
- }
-
-
- try {
- config.save();
- } catch (Exception e) {
- // If it fails to save, crash game
- SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class).crashMinecraft("Failed to save config at ["+ ConfigPath.toString() +"]", e);
- }
- config.close();
- }
- /**
- * Loads the entire config from the file
- * @apiNote This overwrites any value currently stored in the config
- */
- public void loadFromFile() {
- CommentedFileConfig config = CommentedFileConfig.builder(ConfigPath.toFile()).build();
- // Attempt to load the file and if it fails then save config to file
- try {
- if (Files.exists(ConfigPath))
- config.load();
- else {
- saveToFile();
- return;
- }
- } catch (Exception e) {
- e.printStackTrace();
- saveToFile();
- return;
- }
-
- // Load all the entries
- for (AbstractConfigType entry : this.configBase.entries) {
- if (ConfigEntry.class.isAssignableFrom(entry.getClass())) {
- createComment((ConfigEntry) entry, config);
- loadEntry((ConfigEntry) entry, config);
- }
- }
-
-
- try {
- config.save();
- } catch (Exception e) {
- // If it fails to save, crash game
- SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class).crashMinecraft("Failed to save config at ["+ ConfigPath.toString() +"]", e);
- }
- config.close();
- }
-
-
-
-
- // Save an entry when only given the entry
- public void saveEntry(ConfigEntry entry) {
- CommentedFileConfig config = CommentedFileConfig.builder(ConfigPath.toFile()).build();
- loadConfig(config);
- saveEntry(entry, config);
- config.save();
- config.close();
- }
- // Save an entry
- @SuppressWarnings("unchecked")
- public void saveEntry(ConfigEntry entry, CommentedFileConfig workConfig) {
- if (!entry.getAppearance().showInFile) return;
- if (entry.getTrueValue() == null)
- throw new IllegalArgumentException("Entry ["+ entry.getNameWCategory() +"] is null, this may be a problem with ["+ configBase.modName +"]. Please contact the authors");
-
- Class originalClass = ConfigTypeConverters.isClassConvertable(entry.getType());
- if (originalClass != null) {
- workConfig.set(entry.getNameWCategory(), ConfigTypeConverters.convertToString(originalClass, entry.getTrueValue()));
- return;
- }
- workConfig.set(entry.getNameWCategory(), entry.getTrueValue());
- }
-
- // Loads an entry when only given the entry
- public void loadEntry(ConfigEntry entry) {
- CommentedFileConfig config = CommentedFileConfig.builder(ConfigPath.toFile()).autosave().build();
- loadConfig(config);
- loadEntry(entry, config);
- config.close();
-
- }
- // Loads an entry
- @SuppressWarnings("unchecked") // Suppress due to its always safe
- public void loadEntry(ConfigEntry entry, CommentedFileConfig workConfig) {
- if (!entry.getAppearance().showInFile) return;
-
- if (workConfig.contains(entry.getNameWCategory())) {
- try {
- if (entry.getType().isEnum()) {
- entry.setWithoutSaving((T) ( workConfig.getEnum(entry.getNameWCategory(), (Class) entry.getType())));
- return;
- }
- Class originalClass = ConfigTypeConverters.isClassConvertable(entry.getType());
- if (originalClass != null) {
- entry.setWithoutSaving((T) ConfigTypeConverters.convertFromString(originalClass, workConfig.get(entry.getNameWCategory())));
- return;
- }
-
- if (entry.getType() == workConfig.get(entry.getNameWCategory()).getClass()) { // If the types are the same
- entry.setWithoutSaving((T) workConfig.get(entry.getNameWCategory()));
- entry.clampWithinRange();
- return;
- }
-
- LOGGER.warn("Entry ["+ entry.getNameWCategory() +"] is invalid. Expected " + entry.getType() + " but got " + workConfig.get(entry.getNameWCategory()).getClass() + ". Using default value.");
- saveEntry(entry, workConfig);
- } catch (Exception e) {
+
+ public ConfigFileHandling(ConfigBase configBase)
+ {
+ this.configBase = configBase;
+ ConfigPath = SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class)
+ .getInstallationDirectory().toPath().resolve("config").resolve(this.configBase.modName + ".toml");
+ }
+
+ /** Saves the entire config to the file */
+ public void saveToFile()
+ {
+ CommentedFileConfig config = CommentedFileConfig.builder(ConfigPath.toFile()).build();
+ if (!Files.exists(ConfigPath)) // Try to check if the config exists
+ try
+ {
+ Files.createFile(ConfigPath);
+ }
+ catch (IOException ex)
+ {
+ ex.printStackTrace();
+ }
+
+ loadConfig(config);
+
+ for (AbstractConfigType entry : this.configBase.entries)
+ {
+ if (ConfigEntry.class.isAssignableFrom(entry.getClass()))
+ {
+ createComment((ConfigEntry) entry, config);
+ saveEntry((ConfigEntry) entry, config);
+ }
+ }
+
+
+ try
+ {
+ config.save();
+ }
+ catch (Exception e)
+ {
+ // If it fails to save, crash game
+ SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class).crashMinecraft("Failed to save config at [" + ConfigPath.toString() + "]", e);
+ }
+ config.close();
+ }
+ /**
+ * Loads the entire config from the file
+ *
+ * @apiNote This overwrites any value currently stored in the config
+ */
+ public void loadFromFile()
+ {
+ CommentedFileConfig config = CommentedFileConfig.builder(ConfigPath.toFile()).build();
+ // Attempt to load the file and if it fails then save config to file
+ try
+ {
+ if (Files.exists(ConfigPath))
+ config.load();
+ else
+ {
+ saveToFile();
+ return;
+ }
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ saveToFile();
+ return;
+ }
+
+ // Load all the entries
+ for (AbstractConfigType entry : this.configBase.entries)
+ {
+ if (ConfigEntry.class.isAssignableFrom(entry.getClass()))
+ {
+ createComment((ConfigEntry) entry, config);
+ loadEntry((ConfigEntry) entry, config);
+ }
+ }
+
+
+ try
+ {
+ config.save();
+ }
+ catch (Exception e)
+ {
+ // If it fails to save, crash game
+ SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class).crashMinecraft("Failed to save config at [" + ConfigPath.toString() + "]", e);
+ }
+ config.close();
+ }
+
+
+
+
+ // Save an entry when only given the entry
+ public void saveEntry(ConfigEntry entry)
+ {
+ CommentedFileConfig config = CommentedFileConfig.builder(ConfigPath.toFile()).build();
+ loadConfig(config);
+ saveEntry(entry, config);
+ config.save();
+ config.close();
+ }
+ // Save an entry
+ @SuppressWarnings("unchecked")
+ public void saveEntry(ConfigEntry entry, CommentedFileConfig workConfig)
+ {
+ if (!entry.getAppearance().showInFile) return;
+ if (entry.getTrueValue() == null)
+ throw new IllegalArgumentException("Entry [" + entry.getNameWCategory() + "] is null, this may be a problem with [" + configBase.modName + "]. Please contact the authors");
+
+ Class originalClass = ConfigTypeConverters.isClassConvertable(entry.getType());
+ if (originalClass != null)
+ {
+ workConfig.set(entry.getNameWCategory(), ConfigTypeConverters.convertToString(originalClass, entry.getTrueValue()));
+ return;
+ }
+ workConfig.set(entry.getNameWCategory(), entry.getTrueValue());
+ }
+
+ // Loads an entry when only given the entry
+ public void loadEntry(ConfigEntry entry)
+ {
+ CommentedFileConfig config = CommentedFileConfig.builder(ConfigPath.toFile()).autosave().build();
+ loadConfig(config);
+ loadEntry(entry, config);
+ config.close();
+
+ }
+ // Loads an entry
+ @SuppressWarnings("unchecked") // Suppress due to its always safe
+ public void loadEntry(ConfigEntry entry, CommentedFileConfig workConfig)
+ {
+ if (!entry.getAppearance().showInFile) return;
+
+ if (workConfig.contains(entry.getNameWCategory()))
+ {
+ try
+ {
+ if (entry.getType().isEnum())
+ {
+ entry.setWithoutSaving((T) (workConfig.getEnum(entry.getNameWCategory(), (Class) entry.getType())));
+ return;
+ }
+ Class originalClass = ConfigTypeConverters.isClassConvertable(entry.getType());
+ if (originalClass != null)
+ {
+ entry.setWithoutSaving((T) ConfigTypeConverters.convertFromString(originalClass, workConfig.get(entry.getNameWCategory())));
+ return;
+ }
+
+ if (entry.getType() == workConfig.get(entry.getNameWCategory()).getClass())
+ { // If the types are the same
+ entry.setWithoutSaving((T) workConfig.get(entry.getNameWCategory()));
+ entry.clampWithinRange();
+ return;
+ }
+
+ LOGGER.warn("Entry [" + entry.getNameWCategory() + "] is invalid. Expected " + entry.getType() + " but got " + workConfig.get(entry.getNameWCategory()).getClass() + ". Using default value.");
+ saveEntry(entry, workConfig);
+ }
+ catch (Exception e)
+ {
// e.printStackTrace();
- LOGGER.warn("Entry ["+entry.getNameWCategory()+"] had an invalid value when loading the config. Using default value.");
- saveEntry(entry, workConfig);
- }
- } else {
- saveEntry(entry, workConfig);
- }
- }
-
- // Creates the comment for an entry when only given the entry
- public void createComment(ConfigEntry entry) {
- CommentedFileConfig config = CommentedFileConfig.builder(ConfigPath.toFile()).autosave().build();
- loadConfig(config);
- createComment(entry, config);
- config.close();
- }
- // Creates a comment for an entry
- public void createComment(ConfigEntry entry, CommentedFileConfig workConfig) {
- if (!entry.getAppearance().showInFile)
- return;
- if (entry.getComment() != null) {
- workConfig.setComment(entry.getNameWCategory(), " " + entry.getComment().replaceAll("\n", "\n ") + "\n ");
- }
- }
-
-
-
-
- /** Does config.load(); but with error checking */
- public void loadConfig(CommentedFileConfig config) {
- try {
- config.load();
- } catch (Exception e) {
- System.out.println("Loading file failed because of this expectation:\n"+e);
- try { // Now try remaking the file and loading it
- if (!ConfigPath.getParent().toFile().exists())
- Files.createDirectory(ConfigPath.getParent());
- else
- Files.deleteIfExists(ConfigPath);
- Files.createFile(ConfigPath);
- config.load();
- } catch (IOException ex) {
- System.out.println("Creating file failed");
- ex.printStackTrace();
- SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class).crashMinecraft("Loading file and resetting config file failed at path ["+ConfigPath+"]. Please check the file is ok and you have the permissions", ex);
- }
- }
- }
-
-
- // ========== API (server) STUFF ========== //
- /** ALWAYS CLEAR WHEN NOT ON SERVER!!!! */
- // We are not using this stuff, so comment it out for now (if we ever do need it then we can uncomment it)
+ LOGGER.warn("Entry [" + entry.getNameWCategory() + "] had an invalid value when loading the config. Using default value.");
+ saveEntry(entry, workConfig);
+ }
+ }
+ else
+ {
+ saveEntry(entry, workConfig);
+ }
+ }
+
+ // Creates the comment for an entry when only given the entry
+ public void createComment(ConfigEntry entry)
+ {
+ CommentedFileConfig config = CommentedFileConfig.builder(ConfigPath.toFile()).autosave().build();
+ loadConfig(config);
+ createComment(entry, config);
+ config.close();
+ }
+ // Creates a comment for an entry
+ public void createComment(ConfigEntry entry, CommentedFileConfig workConfig)
+ {
+ if (!entry.getAppearance().showInFile)
+ return;
+ if (entry.getComment() != null)
+ {
+ workConfig.setComment(entry.getNameWCategory(), " " + entry.getComment().replaceAll("\n", "\n ") + "\n ");
+ }
+ }
+
+
+
+
+ /** Does config.load(); but with error checking */
+ public void loadConfig(CommentedFileConfig config)
+ {
+ try
+ {
+ config.load();
+ }
+ catch (Exception e)
+ {
+ System.out.println("Loading file failed because of this expectation:\n" + e);
+ try
+ { // Now try remaking the file and loading it
+ if (!ConfigPath.getParent().toFile().exists())
+ Files.createDirectory(ConfigPath.getParent());
+ else
+ Files.deleteIfExists(ConfigPath);
+ Files.createFile(ConfigPath);
+ config.load();
+ }
+ catch (IOException ex)
+ {
+ System.out.println("Creating file failed");
+ ex.printStackTrace();
+ SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class).crashMinecraft("Loading file and resetting config file failed at path [" + ConfigPath + "]. Please check the file is ok and you have the permissions", ex);
+ }
+ }
+ }
+
+
+ // ========== API (server) STUFF ========== //
+ /** ALWAYS CLEAR WHEN NOT ON SERVER!!!! */
+ // We are not using this stuff, so comment it out for now (if we ever do need it then we can uncomment it)
/*
@SuppressWarnings("unchecked")
public static void clearApiValues() {
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigTypeConverters.java b/core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigTypeConverters.java
index 0ac53df7b..489c9d191 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigTypeConverters.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigTypeConverters.java
@@ -13,99 +13,135 @@ import java.util.Map;
*
* @author coolGi
*/
-public class ConfigTypeConverters {
- // Once you've made a converter add it to here where the first value is the type you want to convert and the 2nd value is the converter
- public static final Map, ConverterBase> convertObjects = new HashMap, ConverterBase>() {{
- put(Short.class, new ShortConverter());
- put(Long.class, new LongConverter());
- put(Float.class, new FloatConverter());
- put(Byte.class, new ByteConverter());
-
- put(Map.class, new MapConverter());
- }};
-
- public static Class isClassConvertable(Class clazz) {
- for (int i = 0; i < convertObjects.size(); i++) {
- Class selectedClass = (Class) convertObjects.keySet().toArray()[i];
- if (selectedClass.isAssignableFrom(clazz))
- return selectedClass;
- }
- return null;
- }
-
- public static String convertToString(Class clazz, Object value) {
- try {
- return convertObjects.get(clazz).convertToString(value);
- } catch (Exception e) {
- System.out.println("Type [" + clazz.toString() + "] isn't a convertible value in the config file handler");
- return null;
- }
- }
- public static Object convertFromString(Class clazz, String value) {
- try {
- return convertObjects.get(clazz).convertFromString(value);
- } catch (Exception e) {
- System.out.println("Type [" + clazz.toString() + "] isn't a convertible value in the config file handler");
- return null;
- }
- }
-
-
- /**
- * The converter should extend this
- */
- public static abstract class ConverterBase {
- public abstract String convertToString(Object value);
- public abstract Object convertFromString(String value);
- }
-
-
-
- // Some number types are a bit wack with the config parser
- // So we just store them as strings
- public static class ShortConverter extends ConverterBase {
- @Override public String convertToString(Object item) { return ((Short) item).toString(); }
- @Override public Short convertFromString(String s) { return Short.valueOf(s); }
- }
- public static class LongConverter extends ConverterBase {
- @Override public String convertToString(Object item) { return ((Long) item).toString(); }
- @Override public Long convertFromString(String s) { return Long.valueOf(s); }
- }
- public static class FloatConverter extends ConverterBase {
- @Override public String convertToString(Object item) { return ((Float) item).toString(); }
- @Override public Float convertFromString(String s) { return Float.valueOf(s); }
- }
- public static class ByteConverter extends ConverterBase {
- @Override public String convertToString(Object item) { return ((Byte) item).toString(); }
- @Override public Byte convertFromString(String s) { return Byte.valueOf(s); }
- }
-
-
-
- @SuppressWarnings("unchecked")
- public static class MapConverter extends ConverterBase {
- @Override
- public String convertToString(Object item) {
- Map mapObject = (Map) item;
- Config jsonObject = Config.inMemory();
-
- for (int i = 0; i < mapObject.size(); i++) {
- jsonObject.add(mapObject.keySet().toArray()[i].toString(), mapObject.get(mapObject.keySet().toArray()[i]));
- }
-
- return JsonFormat.minimalInstance().createWriter().writeToString(jsonObject);
- }
-
- @Override
- public Map convertFromString(String s) {
- Map map = new HashMap<>();
-
- Config jsonObject = Config.inMemory();
- try {
- JsonFormat.minimalInstance().createParser().parse(s, jsonObject, ParsingMode.REPLACE);
- } catch (Exception e) { e.printStackTrace(); }
-
- return jsonObject.valueMap();
- }
- }
+public class ConfigTypeConverters
+{
+ // Once you've made a converter add it to here where the first value is the type you want to convert and the 2nd value is the converter
+ public static final Map, ConverterBase> convertObjects = new HashMap, ConverterBase>()
+ {{
+ put(Short.class, new ShortConverter());
+ put(Long.class, new LongConverter());
+ put(Float.class, new FloatConverter());
+ put(Byte.class, new ByteConverter());
+
+ put(Map.class, new MapConverter());
+ }};
+
+ public static Class isClassConvertable(Class clazz)
+ {
+ for (int i = 0; i < convertObjects.size(); i++)
+ {
+ Class selectedClass = (Class) convertObjects.keySet().toArray()[i];
+ if (selectedClass.isAssignableFrom(clazz))
+ return selectedClass;
+ }
+ return null;
+ }
+
+ public static String convertToString(Class clazz, Object value)
+ {
+ try
+ {
+ return convertObjects.get(clazz).convertToString(value);
+ }
+ catch (Exception e)
+ {
+ System.out.println("Type [" + clazz.toString() + "] isn't a convertible value in the config file handler");
+ return null;
+ }
+ }
+ public static Object convertFromString(Class clazz, String value)
+ {
+ try
+ {
+ return convertObjects.get(clazz).convertFromString(value);
+ }
+ catch (Exception e)
+ {
+ System.out.println("Type [" + clazz.toString() + "] isn't a convertible value in the config file handler");
+ return null;
+ }
+ }
+
+
+ /**
+ * The converter should extend this
+ */
+ public static abstract class ConverterBase
+ {
+ public abstract String convertToString(Object value);
+ public abstract Object convertFromString(String value);
+
+ }
+
+
+
+ // Some number types are a bit wack with the config parser
+ // So we just store them as strings
+ public static class ShortConverter extends ConverterBase
+ {
+ @Override public String convertToString(Object item) { return ((Short) item).toString(); }
+ @Override public Short convertFromString(String s) { return Short.valueOf(s); }
+
+ }
+
+ public static class LongConverter extends ConverterBase
+ {
+ @Override public String convertToString(Object item) { return ((Long) item).toString(); }
+ @Override public Long convertFromString(String s) { return Long.valueOf(s); }
+
+ }
+
+ public static class FloatConverter extends ConverterBase
+ {
+ @Override public String convertToString(Object item) { return ((Float) item).toString(); }
+ @Override public Float convertFromString(String s) { return Float.valueOf(s); }
+
+ }
+
+ public static class ByteConverter extends ConverterBase
+ {
+ @Override public String convertToString(Object item) { return ((Byte) item).toString(); }
+ @Override public Byte convertFromString(String s) { return Byte.valueOf(s); }
+
+ }
+
+
+
+ @SuppressWarnings("unchecked")
+ public static class MapConverter extends ConverterBase
+ {
+ @Override
+ public String convertToString(Object item)
+ {
+ Map mapObject = (Map) item;
+ Config jsonObject = Config.inMemory();
+
+ for (int i = 0; i < mapObject.size(); i++)
+ {
+ jsonObject.add(mapObject.keySet().toArray()[i].toString(), mapObject.get(mapObject.keySet().toArray()[i]));
+ }
+
+ return JsonFormat.minimalInstance().createWriter().writeToString(jsonObject);
+ }
+
+ @Override
+ public Map convertFromString(String s)
+ {
+ Map map = new HashMap<>();
+
+ Config jsonObject = Config.inMemory();
+ try
+ {
+ JsonFormat.minimalInstance().createParser().parse(s, jsonObject, ParsingMode.REPLACE);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+
+ return jsonObject.valueMap();
+ }
+
+ }
+
}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/gui/AbstractScreen.java b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/AbstractScreen.java
index 687ceef9d..704b2ed4f 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/gui/AbstractScreen.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/AbstractScreen.java
@@ -9,32 +9,35 @@ import java.util.List;
*
* @author coolGi
*/
-public abstract class AbstractScreen {
- public long minecraftWindow;
- public int width;
- public int height;
- public int scaledWidth;
- public int scaledHeight;
- public int mouseX = 0;
- public int mouseY = 0;
- /** Weather it should close when you press the escape key */
- public boolean shouldCloseOnEsc = true;
- /** If set to true, the screen would close on the next tick (warning, it closes after tick gets called for a last time) */
- public boolean close = false;
-
-
- /** Called once when the screen is opened */
- public abstract void init();
- /** Called every frame */
- public abstract void render(float delta);
- public void tick() {}
-
- /** Called every time the window gets re-sized */
- public void onResize() {};
- /** What happens when the user closes the screen*/
- public void onClose() {}
-
- // ---------- Random stuff that might be needed later on ---------- //
- /** File dropped into the screen */
- public void onFilesDrop(List files) {}
+public abstract class AbstractScreen
+{
+ public long minecraftWindow;
+ public int width;
+ public int height;
+ public int scaledWidth;
+ public int scaledHeight;
+ public int mouseX = 0;
+ public int mouseY = 0;
+ /** Weather it should close when you press the escape key */
+ public boolean shouldCloseOnEsc = true;
+ /** If set to true, the screen would close on the next tick (warning, it closes after tick gets called for a last time) */
+ public boolean close = false;
+
+
+ /** Called once when the screen is opened */
+ public abstract void init();
+ /** Called every frame */
+ public abstract void render(float delta);
+ public void tick() { }
+
+ /** Called every time the window gets re-sized */
+ public void onResize() { }
+ ;
+ /** What happens when the user closes the screen */
+ public void onClose() { }
+
+ // ---------- Random stuff that might be needed later on ---------- //
+ /** File dropped into the screen */
+ public void onFilesDrop(List files) { }
+
}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/gui/ConfigScreen.java b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/ConfigScreen.java
index 7cffb7ac4..a43f4891f 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/gui/ConfigScreen.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/ConfigScreen.java
@@ -3,25 +3,29 @@ package com.seibel.distanthorizons.core.config.gui;
import javax.swing.*;
import java.awt.*;
-public class ConfigScreen extends JFrame {
-
- public ConfigScreen() {
- setLayout(new GridBagLayout());
- GridBagConstraints constraints = new GridBagConstraints();
- constraints.fill = GridBagConstraints.HORIZONTAL;
- constraints.weightx = 0.5;
- constraints.gridx = 0;
- constraints.gridy = 0;
- add(new JLabel("Hello World!"), constraints);
- }
-
-
- public static void main(String[] args) {
- SwingUtilities.invokeLater(() -> {
- JFrame frame = new ConfigScreen();
- frame.setSize(300, 200);
- frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
- frame.setVisible(true);
- });
- }
+public class ConfigScreen extends JFrame
+{
+
+ public ConfigScreen()
+ {
+ setLayout(new GridBagLayout());
+ GridBagConstraints constraints = new GridBagConstraints();
+ constraints.fill = GridBagConstraints.HORIZONTAL;
+ constraints.weightx = 0.5;
+ constraints.gridx = 0;
+ constraints.gridy = 0;
+ add(new JLabel("Hello World!"), constraints);
+ }
+
+
+ public static void main(String[] args)
+ {
+ SwingUtilities.invokeLater(() -> {
+ JFrame frame = new ConfigScreen();
+ frame.setSize(300, 200);
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.setVisible(true);
+ });
+ }
+
}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/gui/EmbeddedFrameUtil.java b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/EmbeddedFrameUtil.java
index 1cf49ddc7..efa1e189b 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/gui/EmbeddedFrameUtil.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/EmbeddedFrameUtil.java
@@ -25,120 +25,153 @@ import static org.lwjgl.system.macosx.ObjCRuntime.*;
* @author Ran
* @author coolGi
*/
-public final class EmbeddedFrameUtil {
-
- private static final int JAVA_VERSION;
-
- private static final JAWT awt;
-
- static {
- Pattern p = Pattern.compile("^(?:1[.])?([1-9][0-9]*)[.-]");
- Matcher m = p.matcher(System.getProperty("java.version"));
-
- if (!m.find()) {
- throw new IllegalStateException("Failed to parse java.version");
- }
-
- JAVA_VERSION = Integer.parseInt(m.group(1));
-
- awt = JAWT.calloc();
- awt.version(JAVA_VERSION < 9 ? JAWT_VERSION_1_4 : JAWT_VERSION_9);
- if (!JAWT_GetAWT(awt)) {
- throw new RuntimeException("GetAWT failed");
- }
- }
-
- private static String getEmbeddedFrameImpl() {
- switch (Platform.get()) {
- case LINUX:
- return "sun.awt.X11.XEmbeddedFrame";
- case WINDOWS:
- return "sun.awt.windows.WEmbeddedFrame";
- case MACOS:
- return "sun.lwawt.macosx.CViewEmbeddedFrame";
- default:
- throw new IllegalStateException();
- }
- }
-
- private static long getEmbeddedFrameHandle(long window) {
- switch (Platform.get()) {
- case LINUX:
- return glfwGetX11Window(window);
- case WINDOWS:
- return glfwGetWin32Window(window);
- case MACOS:
- long objc_msgSend = ObjCRuntime.getLibrary().getFunctionAddress("objc_msgSend");
- return invokePPP(glfwGetCocoaWindow(window), sel_getUid("contentView"), objc_msgSend);
- default:
- throw new IllegalStateException();
- }
- }
-
- public static Frame embeddedFrameCreate(long window) {
- if (JAVA_VERSION < 9) {
- try {
- @SuppressWarnings("unchecked")
- Class EmdeddedFrame = (Class)Class.forName(getEmbeddedFrameImpl());
- Constructor c = EmdeddedFrame.getConstructor(long.class);
-
- return c.newInstance(getEmbeddedFrameHandle(window));
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- } else {
- return nJAWT_CreateEmbeddedFrame(getEmbeddedFrameHandle(window), awt.CreateEmbeddedFrame());
- }
- }
-
- static void embeddedFrameSynthesizeWindowActivation(Frame embeddedFrame, boolean doActivate) {
- if (JAVA_VERSION < 9) {
- try {
- embeddedFrame
- .getClass()
- .getMethod("synthesizeWindowActivation", boolean.class)
- .invoke(embeddedFrame, doActivate);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- } else {
- JAWT_SynthesizeWindowActivation(embeddedFrame, doActivate, awt.SynthesizeWindowActivation());
- }
- }
-
- public static void embeddedFrameSetBounds(Frame embeddedFrame, int x, int y, int width, int height) {
- if (JAVA_VERSION < 9) {
- try {
- Method setLocationPrivate = embeddedFrame
- .getClass()
- .getSuperclass()
- .getDeclaredMethod("setBoundsPrivate", int.class, int.class, int.class, int.class);
- setLocationPrivate.setAccessible(true);
- setLocationPrivate.invoke(embeddedFrame, x, y, width, height);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- } else {
- JAWT_SetBounds(embeddedFrame, x, y, width, height, awt.SetBounds());
- }
- }
-
-
- public static void hideFrame(@NotNull Frame embeddedFrame) {
- embeddedFrame.setVisible(false);
- embeddedFrameSynthesizeWindowActivation(embeddedFrame, false);
- }
-
- public static void showFrame(@NotNull Frame embeddedFrame) {
- embeddedFrameSynthesizeWindowActivation(embeddedFrame, true);
- embeddedFrame.setVisible(true);
- }
- public static void placeAtCenter(Frame embeddedFrame, int windowWidth, int windowHeight, int frameWidth, int frameHeight, float scale) {
- float scaleFactor = (100.0F - scale) / 100.0F;
- float newWidth = frameWidth * scaleFactor;
- float newHeight = frameHeight * scaleFactor;
- float newX = (windowWidth - newWidth) / 2F;
- float newY = (windowHeight - newHeight) / 2F;
- embeddedFrameSetBounds(embeddedFrame, Math.round(newX), Math.round(newY), Math.round(newWidth), Math.round(newHeight));
- }
+public final class EmbeddedFrameUtil
+{
+
+ private static final int JAVA_VERSION;
+
+ private static final JAWT awt;
+
+ static
+ {
+ Pattern p = Pattern.compile("^(?:1[.])?([1-9][0-9]*)[.-]");
+ Matcher m = p.matcher(System.getProperty("java.version"));
+
+ if (!m.find())
+ {
+ throw new IllegalStateException("Failed to parse java.version");
+ }
+
+ JAVA_VERSION = Integer.parseInt(m.group(1));
+
+ awt = JAWT.calloc();
+ awt.version(JAVA_VERSION < 9 ? JAWT_VERSION_1_4 : JAWT_VERSION_9);
+ if (!JAWT_GetAWT(awt))
+ {
+ throw new RuntimeException("GetAWT failed");
+ }
+ }
+
+ private static String getEmbeddedFrameImpl()
+ {
+ switch (Platform.get())
+ {
+ case LINUX:
+ return "sun.awt.X11.XEmbeddedFrame";
+ case WINDOWS:
+ return "sun.awt.windows.WEmbeddedFrame";
+ case MACOS:
+ return "sun.lwawt.macosx.CViewEmbeddedFrame";
+ default:
+ throw new IllegalStateException();
+ }
+ }
+
+ private static long getEmbeddedFrameHandle(long window)
+ {
+ switch (Platform.get())
+ {
+ case LINUX:
+ return glfwGetX11Window(window);
+ case WINDOWS:
+ return glfwGetWin32Window(window);
+ case MACOS:
+ long objc_msgSend = ObjCRuntime.getLibrary().getFunctionAddress("objc_msgSend");
+ return invokePPP(glfwGetCocoaWindow(window), sel_getUid("contentView"), objc_msgSend);
+ default:
+ throw new IllegalStateException();
+ }
+ }
+
+ public static Frame embeddedFrameCreate(long window)
+ {
+ if (JAVA_VERSION < 9)
+ {
+ try
+ {
+ @SuppressWarnings("unchecked")
+ Class EmdeddedFrame = (Class) Class.forName(getEmbeddedFrameImpl());
+ Constructor c = EmdeddedFrame.getConstructor(long.class);
+
+ return c.newInstance(getEmbeddedFrameHandle(window));
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ else
+ {
+ return nJAWT_CreateEmbeddedFrame(getEmbeddedFrameHandle(window), awt.CreateEmbeddedFrame());
+ }
+ }
+
+ static void embeddedFrameSynthesizeWindowActivation(Frame embeddedFrame, boolean doActivate)
+ {
+ if (JAVA_VERSION < 9)
+ {
+ try
+ {
+ embeddedFrame
+ .getClass()
+ .getMethod("synthesizeWindowActivation", boolean.class)
+ .invoke(embeddedFrame, doActivate);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ else
+ {
+ JAWT_SynthesizeWindowActivation(embeddedFrame, doActivate, awt.SynthesizeWindowActivation());
+ }
+ }
+
+ public static void embeddedFrameSetBounds(Frame embeddedFrame, int x, int y, int width, int height)
+ {
+ if (JAVA_VERSION < 9)
+ {
+ try
+ {
+ Method setLocationPrivate = embeddedFrame
+ .getClass()
+ .getSuperclass()
+ .getDeclaredMethod("setBoundsPrivate", int.class, int.class, int.class, int.class);
+ setLocationPrivate.setAccessible(true);
+ setLocationPrivate.invoke(embeddedFrame, x, y, width, height);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ else
+ {
+ JAWT_SetBounds(embeddedFrame, x, y, width, height, awt.SetBounds());
+ }
+ }
+
+
+ public static void hideFrame(@NotNull Frame embeddedFrame)
+ {
+ embeddedFrame.setVisible(false);
+ embeddedFrameSynthesizeWindowActivation(embeddedFrame, false);
+ }
+
+ public static void showFrame(@NotNull Frame embeddedFrame)
+ {
+ embeddedFrameSynthesizeWindowActivation(embeddedFrame, true);
+ embeddedFrame.setVisible(true);
+ }
+ public static void placeAtCenter(Frame embeddedFrame, int windowWidth, int windowHeight, int frameWidth, int frameHeight, float scale)
+ {
+ float scaleFactor = (100.0F - scale) / 100.0F;
+ float newWidth = frameWidth * scaleFactor;
+ float newHeight = frameHeight * scaleFactor;
+ float newX = (windowWidth - newWidth) / 2F;
+ float newY = (windowHeight - newHeight) / 2F;
+ embeddedFrameSetBounds(embeddedFrame, Math.round(newX), Math.round(newY), Math.round(newWidth), Math.round(newHeight));
+ }
+
}
\ No newline at end of file
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/gui/JavaScreenHandlerScreen.java b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/JavaScreenHandlerScreen.java
index 418995e78..2985ffb6d 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/gui/JavaScreenHandlerScreen.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/JavaScreenHandlerScreen.java
@@ -8,61 +8,74 @@ import java.awt.*;
/**
*
*/
-public class JavaScreenHandlerScreen extends AbstractScreen {
- public static Frame frame;
- public static boolean firstRun = true;
- public final Component jComponent;
-
- static {
- // Required to run this
- System.setProperty("java.awt.headless", "false");
- }
-
- public JavaScreenHandlerScreen(@NotNull Component component) {
- this.jComponent = component;
- }
-
- @Override
- public void init() {
- if (firstRun)
- frame = EmbeddedFrameUtil.embeddedFrameCreate(this.minecraftWindow); // Don't call this multiple times
-
- frame.add(jComponent);
-
- if (firstRun) {
- EmbeddedFrameUtil.embeddedFrameSetBounds(frame, 0, 0, this.width, this.height);
- firstRun = false;
- } else
- EmbeddedFrameUtil.showFrame(frame);
- }
-
- /** A testing/debug screen */
- public static class ExampleScreen extends JComponent {
- public ExampleScreen() {
- setLayout(new GridBagLayout());
- GridBagConstraints constraints = new GridBagConstraints();
- constraints.fill = GridBagConstraints.HORIZONTAL;
- constraints.weightx = 0.5;
- constraints.gridx = 0;
- constraints.gridy = 0;
- add(new JLabel("Hello World!"), constraints);
- }
- }
-
-
- @Override
- public void render(float delta) {
- // TODO: Make screen only update on this being called
- }
-
- @Override
- public void onResize() {
- EmbeddedFrameUtil.embeddedFrameSetBounds(frame, 0, 0, this.width, this.height);
- }
-
- @Override
- public void onClose() {
- frame.remove(jComponent);
- EmbeddedFrameUtil.hideFrame(frame);
- }
+public class JavaScreenHandlerScreen extends AbstractScreen
+{
+ public static Frame frame;
+ public static boolean firstRun = true;
+ public final Component jComponent;
+
+ static
+ {
+ // Required to run this
+ System.setProperty("java.awt.headless", "false");
+ }
+
+ public JavaScreenHandlerScreen(@NotNull Component component)
+ {
+ this.jComponent = component;
+ }
+
+ @Override
+ public void init()
+ {
+ if (firstRun)
+ frame = EmbeddedFrameUtil.embeddedFrameCreate(this.minecraftWindow); // Don't call this multiple times
+
+ frame.add(jComponent);
+
+ if (firstRun)
+ {
+ EmbeddedFrameUtil.embeddedFrameSetBounds(frame, 0, 0, this.width, this.height);
+ firstRun = false;
+ }
+ else
+ EmbeddedFrameUtil.showFrame(frame);
+ }
+
+ /** A testing/debug screen */
+ public static class ExampleScreen extends JComponent
+ {
+ public ExampleScreen()
+ {
+ setLayout(new GridBagLayout());
+ GridBagConstraints constraints = new GridBagConstraints();
+ constraints.fill = GridBagConstraints.HORIZONTAL;
+ constraints.weightx = 0.5;
+ constraints.gridx = 0;
+ constraints.gridy = 0;
+ add(new JLabel("Hello World!"), constraints);
+ }
+
+ }
+
+
+ @Override
+ public void render(float delta)
+ {
+ // TODO: Make screen only update on this being called
+ }
+
+ @Override
+ public void onResize()
+ {
+ EmbeddedFrameUtil.embeddedFrameSetBounds(frame, 0, 0, this.width, this.height);
+ }
+
+ @Override
+ public void onClose()
+ {
+ frame.remove(jComponent);
+ EmbeddedFrameUtil.hideFrame(frame);
+ }
+
}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/gui/OpenGLConfigScreen.java b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/OpenGLConfigScreen.java
index 8c38429f7..5035a4726 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/gui/OpenGLConfigScreen.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/OpenGLConfigScreen.java
@@ -14,89 +14,99 @@ import java.nio.ByteOrder;
/**
* @author coolGi
*/
-public class OpenGLConfigScreen extends AbstractScreen {
- ShaderProgram basicShader;
- GLVertexBuffer sameContextBuffer;
- GLVertexBuffer sharedContextBuffer;
- VertexAttribute va;
-
- @Override
- public void init() {
- System.out.println("init");
-
- va = VertexAttribute.create();
- va.bind();
- // Pos
- va.setVertexAttribute(0, 0, VertexAttribute.VertexPointer.addVec2Pointer(false));
- // Color
- va.setVertexAttribute(0, 1, VertexAttribute.VertexPointer.addVec4Pointer(false));
- va.completeAndCheck(Float.BYTES * 6);
- basicShader = new ShaderProgram("shaders/test/vert.vert", "shaders/test/frag.frag",
- "fragColor", new String[]{"vPosition", "color"});
- createBuffer();
- }
-
- // Render a square with uv color
- private static final float[] vertices = {
- // PosX,Y, ColorR,G,B,A
- -0.5f, -0.5f, 0.0f, 0.0f, 0.0f, 1.0f,
- 0.4f, -0.4f, 1.0f, 0.0f, 0.0f, 1.0f,
- 0.3f, 0.3f, 1.0f, 1.0f, 0.0f, 0.0f,
- -0.2f, 0.2f, 0.0f, 1.0f, 1.0f, 1.0f
- };
-
- private static GLVertexBuffer createTextingBuffer() {
- ByteBuffer buffer = ByteBuffer.allocateDirect(vertices.length * Float.BYTES);
- // Fill buffer with the vertices.
- buffer = buffer.order(ByteOrder.nativeOrder());
- buffer.asFloatBuffer().put(vertices);
- buffer.rewind();
- GLVertexBuffer vbo = new GLVertexBuffer(false);
- vbo.bind();
- vbo.uploadBuffer(buffer, 4, EGpuUploadMethod.DATA, vertices.length * Float.BYTES);
- return vbo;
- }
-
- private void createBuffer() {
- GLProxy.getInstance().recordOpenGlCall(() -> sharedContextBuffer = createTextingBuffer());
- GLProxy.ensureAllGLJobCompleted();
- sameContextBuffer = createTextingBuffer();
- }
-
- @Override
- public void render(float delta) {
- System.out.println("Updated config screen with the delta of " + delta);
-
- GLState state = new GLState();
+public class OpenGLConfigScreen extends AbstractScreen
+{
+ ShaderProgram basicShader;
+ GLVertexBuffer sameContextBuffer;
+ GLVertexBuffer sharedContextBuffer;
+ VertexAttribute va;
+
+ @Override
+ public void init()
+ {
+ System.out.println("init");
+
+ va = VertexAttribute.create();
+ va.bind();
+ // Pos
+ va.setVertexAttribute(0, 0, VertexAttribute.VertexPointer.addVec2Pointer(false));
+ // Color
+ va.setVertexAttribute(0, 1, VertexAttribute.VertexPointer.addVec4Pointer(false));
+ va.completeAndCheck(Float.BYTES * 6);
+ basicShader = new ShaderProgram("shaders/test/vert.vert", "shaders/test/frag.frag",
+ "fragColor", new String[]{"vPosition", "color"});
+ createBuffer();
+ }
+
+ // Render a square with uv color
+ private static final float[] vertices = {
+ // PosX,Y, ColorR,G,B,A
+ -0.5f, -0.5f, 0.0f, 0.0f, 0.0f, 1.0f,
+ 0.4f, -0.4f, 1.0f, 0.0f, 0.0f, 1.0f,
+ 0.3f, 0.3f, 1.0f, 1.0f, 0.0f, 0.0f,
+ -0.2f, 0.2f, 0.0f, 1.0f, 1.0f, 1.0f
+ };
+
+ private static GLVertexBuffer createTextingBuffer()
+ {
+ ByteBuffer buffer = ByteBuffer.allocateDirect(vertices.length * Float.BYTES);
+ // Fill buffer with the vertices.
+ buffer = buffer.order(ByteOrder.nativeOrder());
+ buffer.asFloatBuffer().put(vertices);
+ buffer.rewind();
+ GLVertexBuffer vbo = new GLVertexBuffer(false);
+ vbo.bind();
+ vbo.uploadBuffer(buffer, 4, EGpuUploadMethod.DATA, vertices.length * Float.BYTES);
+ return vbo;
+ }
+
+ private void createBuffer()
+ {
+ GLProxy.getInstance().recordOpenGlCall(() -> sharedContextBuffer = createTextingBuffer());
+ GLProxy.ensureAllGLJobCompleted();
+ sameContextBuffer = createTextingBuffer();
+ }
+
+ @Override
+ public void render(float delta)
+ {
+ System.out.println("Updated config screen with the delta of " + delta);
+
+ GLState state = new GLState();
// GL32.glBindFramebuffer(GL32.GL_FRAMEBUFFER, MC_RENDER.getTargetFrameBuffer());
- GL32.glViewport(0,0, width, height);
- GL32.glPolygonMode(GL32.GL_FRONT_AND_BACK, GL32.GL_FILL);
- GL32.glDisable(GL32.GL_CULL_FACE);
- GL32.glDisable(GL32.GL_DEPTH_TEST);
- GL32.glDisable(GL32.GL_STENCIL_TEST);
- GL32.glDisable(GL32.GL_BLEND);
- //GL32.glDisable(GL32.GL_SCISSOR_TEST);
-
- basicShader.bind();
- va.bind();
-
- // Switch between the two buffers per second
- if (System.currentTimeMillis() % 2000 < 1000) {
- sameContextBuffer.bind();
- va.bindBufferToAllBindingPoint(sameContextBuffer.getId());
- } else {
- sameContextBuffer.bind();
- va.bindBufferToAllBindingPoint(sharedContextBuffer.getId());
- }
- // Render the square
- GL32.glDrawArrays(GL32.GL_TRIANGLE_FAN, 0, 4);
- GL32.glClear(GL32.GL_DEPTH_BUFFER_BIT);
-
- state.restore();
- }
-
- @Override
- public void tick() {
- System.out.println("Ticked");
- }
+ GL32.glViewport(0, 0, width, height);
+ GL32.glPolygonMode(GL32.GL_FRONT_AND_BACK, GL32.GL_FILL);
+ GL32.glDisable(GL32.GL_CULL_FACE);
+ GL32.glDisable(GL32.GL_DEPTH_TEST);
+ GL32.glDisable(GL32.GL_STENCIL_TEST);
+ GL32.glDisable(GL32.GL_BLEND);
+ //GL32.glDisable(GL32.GL_SCISSOR_TEST);
+
+ basicShader.bind();
+ va.bind();
+
+ // Switch between the two buffers per second
+ if (System.currentTimeMillis() % 2000 < 1000)
+ {
+ sameContextBuffer.bind();
+ va.bindBufferToAllBindingPoint(sameContextBuffer.getId());
+ }
+ else
+ {
+ sameContextBuffer.bind();
+ va.bindBufferToAllBindingPoint(sharedContextBuffer.getId());
+ }
+ // Render the square
+ GL32.glDrawArrays(GL32.GL_TRIANGLE_FAN, 0, 4);
+ GL32.glClear(GL32.GL_DEPTH_BUFFER_BIT);
+
+ state.restore();
+ }
+
+ @Override
+ public void tick()
+ {
+ System.out.println("Ticked");
+ }
+
}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/listeners/ConfigChangeListener.java b/core/src/main/java/com/seibel/distanthorizons/core/config/listeners/ConfigChangeListener.java
index 25ee5ce67..048b343f7 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/listeners/ConfigChangeListener.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/listeners/ConfigChangeListener.java
@@ -9,7 +9,7 @@ import java.util.function.Consumer;
* A basic {@link IConfigListener} that will fire a {@link Consumer}
* when the value changes from the value the config started with
* when this object was created.
- *
+ *
* @param the config value type
*/
public class ConfigChangeListener implements IConfigListener, Closeable
@@ -47,9 +47,9 @@ public class ConfigChangeListener implements IConfigListener, Closeable
- /**
+ /**
* Removes the config event listener.
- * Must be fired to prevent memory leaks.
+ * Must be fired to prevent memory leaks.
*/
@Override
public void close() { this.configEntry.removeListener(this); }
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/listeners/IConfigListener.java b/core/src/main/java/com/seibel/distanthorizons/core/config/listeners/IConfigListener.java
index f7f2f6a08..20749748c 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/listeners/IConfigListener.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/listeners/IConfigListener.java
@@ -5,7 +5,7 @@ public interface IConfigListener
/** Called whenever the value is set (including in core DH code) */
void onConfigValueSet();
- /**
+ /**
* TODO not implemented
* Called whenever the value is changed through the UI (only when the done button is pressed)
*/
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/types/AbstractConfigType.java b/core/src/main/java/com/seibel/distanthorizons/core/config/types/AbstractConfigType.java
index 3d71f227c..218d4bcc4 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/types/AbstractConfigType.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/types/AbstractConfigType.java
@@ -8,68 +8,83 @@ import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance
*
* @author coolGi
*/
-public abstract class AbstractConfigType { // The S is the class that is extending this
- public String category = ""; // This should only be set once in the init
- public String name; // This should only be set once in the init
- protected T value;
- public ConfigBase configBase;
-
- public Object guiValue; // This is a storage variable something like the gui can use
-
- protected EConfigEntryAppearance appearance;
-
- protected AbstractConfigType(EConfigEntryAppearance appearance, T value) {
- this.appearance = appearance;
- this.value = value;
- }
-
-
- /** Gets the value */
- public T get() {
- return this.value;
- }
- /** Sets the value */
- public void set(T newValue) {
- this.value = newValue;
- }
-
- public EConfigEntryAppearance getAppearance() {
- return appearance;
- }
- public void setAppearance(EConfigEntryAppearance newAppearance) {
- this.appearance = newAppearance;
- }
-
-
- public String getCategory() {
- return this.category;
- }
- public String getName() {
- return this.name;
- }
- public String getNameWCategory() {
- return (this.category.isEmpty() ? "" : this.category + ".") + this.name;
- }
-
-
- // Gets the class of T
- public Class getType() {
- return value.getClass();
- }
-
- protected static abstract class Builder {
- protected EConfigEntryAppearance tmpAppearance = EConfigEntryAppearance.ALL;
- protected T tmpValue;
-
-
- // Put this into your own builder
- public S setAppearance(EConfigEntryAppearance newAppearance) {
- this.tmpAppearance = newAppearance;
- return (S) this;
- }
- public S set(T newValue) {
- this.tmpValue = newValue;
- return (S) this;
- }
- }
+public abstract class AbstractConfigType
+{ // The S is the class that is extending this
+ public String category = ""; // This should only be set once in the init
+ public String name; // This should only be set once in the init
+ protected T value;
+ public ConfigBase configBase;
+
+ public Object guiValue; // This is a storage variable something like the gui can use
+
+ protected EConfigEntryAppearance appearance;
+
+ protected AbstractConfigType(EConfigEntryAppearance appearance, T value)
+ {
+ this.appearance = appearance;
+ this.value = value;
+ }
+
+
+ /** Gets the value */
+ public T get()
+ {
+ return this.value;
+ }
+ /** Sets the value */
+ public void set(T newValue)
+ {
+ this.value = newValue;
+ }
+
+ public EConfigEntryAppearance getAppearance()
+ {
+ return appearance;
+ }
+ public void setAppearance(EConfigEntryAppearance newAppearance)
+ {
+ this.appearance = newAppearance;
+ }
+
+
+ public String getCategory()
+ {
+ return this.category;
+ }
+ public String getName()
+ {
+ return this.name;
+ }
+ public String getNameWCategory()
+ {
+ return (this.category.isEmpty() ? "" : this.category + ".") + this.name;
+ }
+
+
+ // Gets the class of T
+ public Class getType()
+ {
+ return value.getClass();
+ }
+
+ protected static abstract class Builder
+ {
+ protected EConfigEntryAppearance tmpAppearance = EConfigEntryAppearance.ALL;
+ protected T tmpValue;
+
+
+ // Put this into your own builder
+ public S setAppearance(EConfigEntryAppearance newAppearance)
+ {
+ this.tmpAppearance = newAppearance;
+ return (S) this;
+ }
+ public S set(T newValue)
+ {
+ this.tmpValue = newValue;
+ return (S) this;
+ }
+
+ }
+
}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigCategory.java b/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigCategory.java
index 5197590f8..07d5dea9a 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigCategory.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigCategory.java
@@ -8,41 +8,51 @@ import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance
*
* @author coolGi
*/
-public class ConfigCategory extends AbstractConfigType {
- /** This should not be set by anything other than the config system itself */
- public String destination; // Where the category goes to
-
- private ConfigCategory(EConfigEntryAppearance appearance, Class value, String destination) {
- super(appearance, value);
- this.destination = destination;
- }
-
- public String getDestination() {
- return this.destination;
- }
-
- @Override
- @Deprecated
- /** Use get() instead for category */
- public Class getType() {
- return value;
- }
-
- public static class Builder extends AbstractConfigType.Builder {
- private String tmpDestination = null;
-
- public Builder setDestination(String newDestination) {
- this.tmpDestination = newDestination;
- return this;
- }
-
- public Builder setAppearance(EConfigEntryAppearance newAppearance) {
- this.tmpAppearance = newAppearance;
- return this;
- }
-
- public ConfigCategory build() {
- return new ConfigCategory(tmpAppearance, tmpValue, tmpDestination);
- }
- }
+public class ConfigCategory extends AbstractConfigType
+{
+ /** This should not be set by anything other than the config system itself */
+ public String destination; // Where the category goes to
+
+ private ConfigCategory(EConfigEntryAppearance appearance, Class value, String destination)
+ {
+ super(appearance, value);
+ this.destination = destination;
+ }
+
+ public String getDestination()
+ {
+ return this.destination;
+ }
+
+ @Override
+ @Deprecated
+ /** Use get() instead for category */
+ public Class getType()
+ {
+ return value;
+ }
+
+ public static class Builder extends AbstractConfigType.Builder
+ {
+ private String tmpDestination = null;
+
+ public Builder setDestination(String newDestination)
+ {
+ this.tmpDestination = newDestination;
+ return this;
+ }
+
+ public Builder setAppearance(EConfigEntryAppearance newAppearance)
+ {
+ this.tmpAppearance = newAppearance;
+ return this;
+ }
+
+ public ConfigCategory build()
+ {
+ return new ConfigCategory(tmpAppearance, tmpValue, tmpDestination);
+ }
+
+ }
+
}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigEntry.java b/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigEntry.java
index 218aacbd3..f768ffb13 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigEntry.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigEntry.java
@@ -19,258 +19,265 @@ import java.util.Arrays;
*/
public class ConfigEntry extends AbstractConfigType> implements IConfigEntry
{
- private final T defaultValue;
- private String comment;
- private T min;
- private T max;
- private final ArrayList listenerList;
-
- // API control //
- /**
- * If true this config can be controlled by the API
- * and any get() method calls will return the apiValue if it is set.
- */
- public final boolean allowApiOverride;
- private T apiValue;
-
- private final EConfigEntryPerformance performance;
-
-
- /** Creates the entry */
- private ConfigEntry(EConfigEntryAppearance appearance, T value, String comment, T min, T max, boolean allowApiOverride, EConfigEntryPerformance performance, ArrayList listenerList)
+ private final T defaultValue;
+ private String comment;
+ private T min;
+ private T max;
+ private final ArrayList listenerList;
+
+ // API control //
+ /**
+ * If true this config can be controlled by the API
+ * and any get() method calls will return the apiValue if it is set.
+ */
+ public final boolean allowApiOverride;
+ private T apiValue;
+
+ private final EConfigEntryPerformance performance;
+
+
+ /** Creates the entry */
+ private ConfigEntry(EConfigEntryAppearance appearance, T value, String comment, T min, T max, boolean allowApiOverride, EConfigEntryPerformance performance, ArrayList listenerList)
{
- super(appearance, value);
-
- this.defaultValue = value;
- this.comment = comment;
- this.min = min;
- this.max = max;
- this.allowApiOverride = allowApiOverride;
- this.performance = performance;
- this.listenerList = listenerList;
- }
+ super(appearance, value);
+
+ this.defaultValue = value;
+ this.comment = comment;
+ this.min = min;
+ this.max = max;
+ this.allowApiOverride = allowApiOverride;
+ this.performance = performance;
+ this.listenerList = listenerList;
+ }
- /** Gets the default value of the option */
+ /** Gets the default value of the option */
@Override
public T getDefaultValue() { return this.defaultValue; }
@Override
- public void setApiValue(T newApiValue)
+ public void setApiValue(T newApiValue)
{
this.apiValue = newApiValue;
this.listenerList.forEach(IConfigListener::onConfigValueSet);
}
@Override
public T getApiValue() { return this.apiValue; }
- @Override
+ @Override
public boolean getAllowApiOverride() { return this.allowApiOverride; }
- @Override
- public void set(T newValue)
+ @Override
+ public void set(T newValue)
{
- super.set(newValue);
- this.save();
- this.listenerList.forEach(IConfigListener::onConfigValueSet);
- }
- public void uiSet(T newValue)
+ super.set(newValue);
+ this.save();
+ this.listenerList.forEach(IConfigListener::onConfigValueSet);
+ }
+ public void uiSet(T newValue)
{
- this.set(newValue);
- this.listenerList.forEach(IConfigListener::onUiModify);
- }
- @Override
- public T get()
+ this.set(newValue);
+ this.listenerList.forEach(IConfigListener::onUiModify);
+ }
+ @Override
+ public T get()
{
- if (allowApiOverride && apiValue != null)
+ if (allowApiOverride && apiValue != null)
{
return apiValue;
}
- return super.get();
- }
+ return super.get();
+ }
@Override
- public T getTrueValue() {
- return super.get();
- }
-
- /** Sets the value without saving */
+ public T getTrueValue()
+ {
+ return super.get();
+ }
+
+ /** Sets the value without saving */
@Override
- public void setWithoutSaving(T newValue)
+ public void setWithoutSaving(T newValue)
{
super.set(newValue);
this.listenerList.forEach(IConfigListener::onConfigValueSet);
}
-
- /** Gets the min value */
- @Override
- public T getMin() { return this.min; }
- /** Sets the min value */
- @Override
- public void setMin(T newMin) { this.min = newMin; }
- /** Gets the max value */
- @Override
- public T getMax() { return this.max; }
- /** Sets the max value */
- @Override
- public void setMax(T newMax) { this.max = newMax; }
- /** Sets the min and max within a single setter */
- @Override
- public void setMinMax(T newMin, T newMax) {
- this.setMin(newMin);
- this.setMax(newMax);
- }
-
- /**
- * Clamps the value within the set range
- * @apiNote This does not save the value
- */
- public void clampWithinRange() { this.clampWithinRange(this.min, this.max); }
- /**
- * Clamps the value within a set range
- *
- * @param min The minimum that the value can be
- * @param max The maximum that the value can be
- * @apiNote This does not save the value
- */
- @SuppressWarnings("unchecked") // Suppress due to its always safe
- public void clampWithinRange(T min, T max) {
- byte validness = this.isValid(min, max);
- if (validness == -1) this.value = (T) NumberUtil.getMinimum(this.value.getClass());
- if (validness == 1) this.value = (T) NumberUtil.getMaximum(this.value.getClass());
- }
-
- @Override
- public String getComment() { return this.comment; }
- @Override
- public void setComment(String newComment) { this.comment = newComment; }
-
- /** Gets the performance impact of an option */
- public EConfigEntryPerformance getPerformance() { return this.performance; }
-
- public void addListener(IConfigListener newListener) { this.listenerList.add(newListener); }
- public void removeListener(IConfigListener oldListener) { this.listenerList.remove(oldListener); }
- public void clearListeners() { this.listenerList.clear(); }
- public ArrayList getListeners() { return this.listenerList; }
- /** Replaces the listener list */
- public void setListeners(ArrayList newListeners)
- {
- this.listenerList.clear();
- this.listenerList.addAll(newListeners);
- }
- public void setListeners(IConfigListener... newListeners) { this.listenerList.addAll(Arrays.asList(newListeners)); }
-
-
- /**
- * Checks if the option is valid
- *
- * @return 0 == valid
- * 2 == invalid
- *
1 == number too high
- *
-1 == number too low
- */
+ /** Gets the min value */
@Override
- public byte isValid() { return isValid(this.value, this.min, this.max); }
- /**
- * Checks if a new value is valid
- *
- * @param value Value that is being checked whether valid
- * @return 0 == valid
- *
2 == invalid
- *
1 == number too high
- *
-1 == number too low
- */
- @Override
- public byte isValid(T value) { return this.isValid(value, this.min, this.max); }
- /**
- * Checks if a new value is valid
- *
- * @param min The minimum that the value can be
- * @param max The maximum that the value can be
- * @return 0 == valid
- *
2 == invalid
- *
1 == number too high
- *
-1 == number too low
- */
- public byte isValid(T min, T max) { return this.isValid(this.value, min, max); }
- /**
- * Checks if a new value is valid
- *
- * @param value Value that is being checked whether valid
- * @param min The minimum that the value can be
- * @param max The maximum that the value can be
- * @return 0 == valid
- *
2 == invalid
- *
1 == number too high
- *
-1 == number too low
- */
- public byte isValid(T value, T min, T max) {
- if (this.configBase.disableMinMax)
- return 0;
-
- if (value == null || this.value == null || value.getClass() != this.value.getClass()) // If the 2 variables aren't the same type then it will be invalid
- return 2;
- if (Number.class.isAssignableFrom(value.getClass())) { // Only check min max if it is a number
- if (max != null && NumberUtil.greaterThan((Number) value, (Number) max))
- return 1;
- if (min != null && NumberUtil.lessThan((Number) value, (Number) min))
- return -1;
-
- return 0;
- }
- return 0;
- }
-
- /** This should normally not be called since set() automatically calls this */
- public void save() { configBase.configFileINSTANCE.saveEntry(this); }
- /** This should normally not be called except for special circumstances */
- public void load() { configBase.configFileINSTANCE.loadEntry(this); }
+ public T getMin() { return this.min; }
+ /** Sets the min value */
+ @Override
+ public void setMin(T newMin) { this.min = newMin; }
+ /** Gets the max value */
+ @Override
+ public T getMax() { return this.max; }
+ /** Sets the max value */
+ @Override
+ public void setMax(T newMax) { this.max = newMax; }
+ /** Sets the min and max within a single setter */
+ @Override
+ public void setMinMax(T newMin, T newMax)
+ {
+ this.setMin(newMin);
+ this.setMax(newMax);
+ }
+
+ /**
+ * Clamps the value within the set range
+ *
+ * @apiNote This does not save the value
+ */
+ public void clampWithinRange() { this.clampWithinRange(this.min, this.max); }
+ /**
+ * Clamps the value within a set range
+ *
+ * @param min The minimum that the value can be
+ * @param max The maximum that the value can be
+ * @apiNote This does not save the value
+ */
+ @SuppressWarnings("unchecked") // Suppress due to its always safe
+ public void clampWithinRange(T min, T max)
+ {
+ byte validness = this.isValid(min, max);
+ if (validness == -1) this.value = (T) NumberUtil.getMinimum(this.value.getClass());
+ if (validness == 1) this.value = (T) NumberUtil.getMaximum(this.value.getClass());
+ }
+
+ @Override
+ public String getComment() { return this.comment; }
+ @Override
+ public void setComment(String newComment) { this.comment = newComment; }
+
+ /** Gets the performance impact of an option */
+ public EConfigEntryPerformance getPerformance() { return this.performance; }
+
+ public void addListener(IConfigListener newListener) { this.listenerList.add(newListener); }
+ public void removeListener(IConfigListener oldListener) { this.listenerList.remove(oldListener); }
+
+ public void clearListeners() { this.listenerList.clear(); }
+ public ArrayList getListeners() { return this.listenerList; }
+ /** Replaces the listener list */
+ public void setListeners(ArrayList newListeners)
+ {
+ this.listenerList.clear();
+ this.listenerList.addAll(newListeners);
+ }
+ public void setListeners(IConfigListener... newListeners) { this.listenerList.addAll(Arrays.asList(newListeners)); }
+
+
+ /**
+ * Checks if the option is valid
+ *
+ * @return 0 == valid
+ * 2 == invalid
+ *
1 == number too high
+ *
-1 == number too low
+ */
+ @Override
+ public byte isValid() { return isValid(this.value, this.min, this.max); }
+ /**
+ * Checks if a new value is valid
+ *
+ * @param value Value that is being checked whether valid
+ * @return 0 == valid
+ *
2 == invalid
+ *
1 == number too high
+ *
-1 == number too low
+ */
+ @Override
+ public byte isValid(T value) { return this.isValid(value, this.min, this.max); }
+ /**
+ * Checks if a new value is valid
+ *
+ * @param min The minimum that the value can be
+ * @param max The maximum that the value can be
+ * @return 0 == valid
+ *
2 == invalid
+ *
1 == number too high
+ *
-1 == number too low
+ */
+ public byte isValid(T min, T max) { return this.isValid(this.value, min, max); }
+ /**
+ * Checks if a new value is valid
+ *
+ * @param value Value that is being checked whether valid
+ * @param min The minimum that the value can be
+ * @param max The maximum that the value can be
+ * @return 0 == valid
+ *
2 == invalid
+ *
1 == number too high
+ *
-1 == number too low
+ */
+ public byte isValid(T value, T min, T max)
+ {
+ if (this.configBase.disableMinMax)
+ return 0;
+
+ if (value == null || this.value == null || value.getClass() != this.value.getClass()) // If the 2 variables aren't the same type then it will be invalid
+ return 2;
+ if (Number.class.isAssignableFrom(value.getClass()))
+ { // Only check min max if it is a number
+ if (max != null && NumberUtil.greaterThan((Number) value, (Number) max))
+ return 1;
+ if (min != null && NumberUtil.lessThan((Number) value, (Number) min))
+ return -1;
+
+ return 0;
+ }
+ return 0;
+ }
+
+ /** This should normally not be called since set() automatically calls this */
+ public void save() { configBase.configFileINSTANCE.saveEntry(this); }
+ /** This should normally not be called except for special circumstances */
+ public void load() { configBase.configFileINSTANCE.loadEntry(this); }
@Override
public boolean equals(IConfigEntry obj) { return obj.getClass() == ConfigEntry.class && equals((ConfigEntry) obj); }
- /** Is the value of this equal to another */
- public boolean equals(ConfigEntry obj) {
- // Can all of this just be "return this.value.equals(obj.value)"?
-
- if (Number.class.isAssignableFrom(this.value.getClass()))
- return this.value == obj.value;
- else
- return this.value.equals(obj.value);
- }
-
-
- public static class Builder extends AbstractConfigType.Builder