wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

start cleaning up config

Browse Source
This commit is contained in:
James Seibel
2026-03-24 19:37:52 -05:00
parent 88c7245be6
commit 13895fec51
9 changed files with 29 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiAmbientOcclusionConfig.java
Vendored
+1 -1
View File
@@ -35,6 +35,6 @@ public class DhApiAmbientOcclusionConfig implements IDhApiAmbientOcclusionConfig
@Override
public IDhApiConfigValue<Boolean> enabled()
{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.Ssao.enableSsao); }
{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.enableSsao); }
}
core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiDebuggingConfig.java
Vendored
+1 -1
View File
@@ -34,7 +34,7 @@ public class DhApiDebuggingConfig implements IDhApiDebuggingConfig
public IDhApiConfigValue<EDhApiDebugRendering> debugRendering()
{ return new DhApiConfigValue<EDhApiDebugRendering, EDhApiDebugRendering>(Config.Client.Advanced.Debugging.debugRendering); }
{ return new DhApiConfigValue<EDhApiDebugRendering, EDhApiDebugRendering>(Config.Client.Advanced.Debugging.debugRenderingColors); }
public IDhApiConfigValue<Boolean> debugKeybindings()
{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Debugging.enableDebugKeybindings); }
core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java
+2 -3
View File
@@ -41,7 +41,6 @@ import com.seibel.distanthorizons.core.util.objects.RollingAverage;
import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhMetaRenderer;
import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhTerrainRenderer;
import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhVanillaFadeRenderer;
import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhTestTriangleRenderer;
import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
@@ -763,8 +762,8 @@ public class ClientApi
}
else if (glfwKey == GLFW.GLFW_KEY_F8)
{
Config.Client.Advanced.Debugging.debugRendering.set(EDhApiDebugRendering.next(Config.Client.Advanced.Debugging.debugRendering.get()));
MC_CLIENT.sendChatMessage("F8: Set debug mode to " + Config.Client.Advanced.Debugging.debugRendering.get());
Config.Client.Advanced.Debugging.debugRenderingColors.set(EDhApiDebugRendering.next(Config.Client.Advanced.Debugging.debugRenderingColors.get()));
MC_CLIENT.sendChatMessage("F8: Set debug mode to " + Config.Client.Advanced.Debugging.debugRenderingColors.get());
}
}
core/src/main/java/com/seibel/distanthorizons/core/config/Config.java
+15 -50
View File
@@ -19,7 +19,6 @@
package com.seibel.distanthorizons.core.config;
import com.seibel.distanthorizons.api.DhApi;
import com.seibel.distanthorizons.api.enums.config.*;
import com.seibel.distanthorizons.api.enums.config.quickOptions.*;
import com.seibel.distanthorizons.api.enums.rendering.*;
@@ -27,14 +26,12 @@ import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGenerat
import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorProgressDisplayLocation;
import com.seibel.distanthorizons.core.config.eventHandlers.*;
import com.seibel.distanthorizons.core.config.eventHandlers.presets.*;
import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
import com.seibel.distanthorizons.core.config.types.*;
import com.seibel.distanthorizons.core.config.types.enums.*;
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
import com.seibel.distanthorizons.core.pos.DhSectionPos;
import com.seibel.distanthorizons.core.util.NativeDialogUtil;
import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
import com.seibel.distanthorizons.coreapi.ModInfo;
import com.seibel.distanthorizons.core.logging.DhLogger;
@@ -146,8 +143,11 @@ public class Config
public static ConfigCategory quality = new ConfigCategory.Builder().set(Quality.class).build();
public static ConfigUISpacer qualitySpacer = new ConfigUISpacer.Builder().build();
public static ConfigUiLinkedEntry quickEnableSsao = new ConfigUiLinkedEntry(Ssao.enableSsao);
public static ConfigCategory ssao = new ConfigCategory.Builder().set(Ssao.class).build();
public static ConfigEntry<Boolean> enableSsao = new ConfigEntry.Builder<Boolean>()
.set(true)
.comment("Enable Screen Space Ambient Occlusion")
.build();
public static ConfigUISpacer ssaoSpacer = new ConfigUISpacer.Builder().build();
@@ -358,17 +358,6 @@ public class Config
.build();
}
public static class Ssao
{
public static ConfigUIComment ssaoHeader = new ConfigUIComment.Builder().setParentConfigClass(Ssao.class).build();
public static ConfigEntry<Boolean> enableSsao = new ConfigEntry.Builder<Boolean>()
.set(true)
.comment("Enable Screen Space Ambient Occlusion")
.build();
}
public static class GenericRendering
{
public static ConfigUIComment genericRendererHeader = new ConfigUIComment.Builder().setParentConfigClass(GenericRendering.class).build();
@@ -424,14 +413,6 @@ public class Config
+ "Changes will only be seen when the world is re-loaded.\n"
+ "")
.build();
public static ConfigEntry<Boolean> enableInstancedRendering = new ConfigEntry.Builder<Boolean>()
.set(true)
.comment(""
+ "Can be disabled to use much slower but more compatible direct rendering. \n"
+ "Disabling this can be used to fix some crashes on Mac. \n"
+ "")
.build();
}
public static class Fog
@@ -565,7 +546,7 @@ public class Config
.build();
public static ConfigEntry<Float> heightFogBaseHeight = new ConfigEntry.Builder<Float>()
.setMinDefaultMax(-4096.0f, 80.0f, 4096.0f)
.setMinDefaultMax(-3_000_000.0f, 80.0f, 3_000_000.0f)
.comment("If the height fog is calculated around a set height, what is that height position?")
.build();
@@ -910,7 +891,7 @@ public class Config
+ EDhApiRendererMode.DISABLED + ": Disable rendering")
.build();
public static ConfigEntry<EDhApiDebugRendering> debugRendering = new ConfigEntry.Builder<EDhApiDebugRendering>()
public static ConfigEntry<EDhApiDebugRendering> debugRenderingColors = new ConfigEntry.Builder<EDhApiDebugRendering>()
.set(EDhApiDebugRendering.OFF)
.comment(""
+ "Should specialized colors/rendering modes be used? \n"
@@ -923,6 +904,13 @@ public class Config
.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
.build();
public static ConfigEntry<Boolean> enableWhiteWorld = new ConfigEntry.Builder<Boolean>()
.set(false)
.comment(""
+ "Stops vertex colors from being passed. \n"
+ "Useful for debugging shaders")
.build();
public static ConfigEntry<Boolean> lodOnlyMode = new ConfigEntry.Builder<Boolean>()
.set(false)
.comment(""
@@ -950,13 +938,6 @@ public class Config
+ "")
.build();
public static ConfigEntry<Boolean> enableWhiteWorld = new ConfigEntry.Builder<Boolean>()
.set(false)
.comment(""
+ "Stops vertex colors from being passed. \n"
+ "Useful for debugging shaders")
.build();
public static ConfigEntry<Boolean> showOverlappingQuadErrors = new ConfigEntry.Builder<Boolean>()
.set(false)
.comment(""
@@ -1017,15 +998,6 @@ public class Config
.set(false)
.comment("Render LOD section status?")
.build();
public static ConfigEntry<Boolean> showRenderSectionToggling = new ConfigEntry.Builder<Boolean>()
.set(false)
.comment("" +
"A white box will be drawn when an LOD starts rendering \n" +
"and a purple box when an LOD stops rendering. \n" +
"\n" +
"This can be used to debug Quad Tree holes.\n" +
"")
.build();
public static ConfigEntry<Boolean> showQuadTreeRenderStatus = new ConfigEntry.Builder<Boolean>()
.set(false)
@@ -1078,13 +1050,6 @@ public class Config
+ "")
.build();
public static ConfigEntry<EDhApiGpuUploadMethod> glUploadMode = new ConfigEntry.Builder<EDhApiGpuUploadMethod>()
.set(EDhApiGpuUploadMethod.AUTO)
.comment(""
+ "\n"
+ "")
.build();
}
public static class ColumnBuilderDebugging
@@ -1167,7 +1132,7 @@ public class Config
public static ConfigEntry<Boolean> showQueuedChunkUpdateCount = new ConfigEntry.Builder<Boolean>()
.set(true)
.comment("Shows how many chunks are queud for processing and the max count that can be queued.")
.comment("Shows how many chunks are queued for processing and the max count that can be queued.")
.build();
public static ConfigEntry<Boolean> showLevelStatus = new ConfigEntry.Builder<Boolean>()
core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/RenderQualityPresetConfigEventHandler.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
this.put(EDhApiQualityPreset.HIGH, EDhApiTransparency.COMPLETE);
this.put(EDhApiQualityPreset.EXTREME, EDhApiTransparency.COMPLETE);
}});
private final ConfigPresetOptions<EDhApiQualityPreset, Boolean> ssaoEnabled = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Ssao.enableSsao,
private final ConfigPresetOptions<EDhApiQualityPreset, Boolean> ssaoEnabled = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.enableSsao,
new HashMap<EDhApiQualityPreset, Boolean>()
{{
this.put(EDhApiQualityPreset.MINIMUM, false);
core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java
+1 -1
View File
@@ -328,7 +328,7 @@ public class ColumnRenderBufferBuilder
int color;
boolean fullBright = false;
EDhApiDebugRendering debugging = Config.Client.Advanced.Debugging.debugRendering.get();
EDhApiDebugRendering debugging = Config.Client.Advanced.Debugging.debugRenderingColors.get();
switch (debugging)
{
case OFF:
core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/LodQuadBuilder.java
+1 -2
View File
@@ -32,7 +32,6 @@ import com.seibel.distanthorizons.core.logging.DhLogger;
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
import com.seibel.distanthorizons.core.util.ColorUtil;
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhTerrainRenderer;
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
import org.lwjgl.system.MemoryUtil;
@@ -132,7 +131,7 @@ public class LodQuadBuilder
this.clientLevelWrapper = clientLevelWrapper;
this.debugRenderingMode = Config.Client.Advanced.Debugging.debugRendering.get();
this.debugRenderingMode = Config.Client.Advanced.Debugging.debugRenderingColors.get();
this.grassSideRenderingMode = Config.Client.Advanced.Graphics.Quality.grassSideRendering.get();
}
core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderer.java
+1 -1
View File
@@ -211,7 +211,7 @@ public class LodRenderer
}
// SSAO
if (Config.Client.Advanced.Graphics.Ssao.enableSsao.get())
if (Config.Client.Advanced.Graphics.enableSsao.get())
{
profiler.popPush("LOD SSAO");
this.ssaoRenderer.render(renderParams);
core/src/main/resources/assets/distanthorizons/lang/en_us.json
+6 -37
View File
@@ -172,49 +172,18 @@
"This is the same as vanilla Biome Blending settings for LOD area. \n\nNote that anything other than '0' will greatly effect Lod building time\nand increase triangle count. The cost on chunk generation speed is also \nquite large if set to too high.\n\n'0' equals to Vanilla Biome Blending of '1x1', \n'1' equals to Vanilla Biome Blending of '3x3', \n'2' equals to Vanilla Biome Blending of '5x5'... \n",
"distanthorizons.config.client.advanced.graphics.ssao":
"Ambient Occlusion",
"distanthorizons.config.client.advanced.graphics.ssao.enableSsao":
"distanthorizons.config.client.advanced.graphics.enableSsao":
"Enable Ambient Occlusion",
"distanthorizons.config.client.advanced.graphics.ssao.enableSsao.@tooltip":
"distanthorizons.config.client.advanced.graphics.enableSsao.@tooltip":
"Ambient Occlusion adds depth to the lighting of blocks.",
"distanthorizons.config.client.advanced.graphics.ssao.sampleCount":
"Sample Count",
"distanthorizons.config.client.advanced.graphics.ssao.sampleCount.@tooltip":
"Determines how many points in space are sampled for the occlusion test. \nHigher numbers will improve quality and reduce banding, but will increase GPU load.",
"distanthorizons.config.client.advanced.graphics.ssao.radius":
"Radius",
"distanthorizons.config.client.advanced.graphics.ssao.radius.@tooltip":
"Determines the radius Screen Space Ambient Occlusion is applied, measured in blocks.",
"distanthorizons.config.client.advanced.graphics.ssao.strength":
"Strength",
"distanthorizons.config.client.advanced.graphics.ssao.strength.@tooltip":
"Determines how dark the Screen Space Ambient Occlusion effect will be.",
"distanthorizons.config.client.advanced.graphics.ssao.bias":
"Bias",
"distanthorizons.config.client.advanced.graphics.ssao.bias.@tooltip":
"Increasing the value can reduce banding at the cost of reducing the strength of the effect.",
"distanthorizons.config.client.advanced.graphics.ssao.minLight":
"Min Light",
"distanthorizons.config.client.advanced.graphics.ssao.minLight.@tooltip":
"Determines how dark the occlusion shadows can be. \n0 = totally black at the corners \n1 = no shadow",
"distanthorizons.config.client.advanced.graphics.ssao.blurRadius":
"Blur Radius",
"distanthorizons.config.client.advanced.graphics.ssao.blurRadius.@tooltip":
"The radius, measured in pixels, that blurring is calculated for the SSAO. \nHigher numbers will reduce banding at the cost of GPU performance.",
"distanthorizons.config.client.advanced.graphics.ssao.fadeDistanceInBlocks":
"Fade Distance",
"distanthorizons.config.client.advanced.graphics.ssao.fadeDistanceInBlocks.@tooltip":
"The distance in blocks from the camera where the SSAO will fade out to. \nThis is done to prevent banding and noise at extreme distances.",
"distanthorizons.config.client.advanced.graphics.genericRendering":
"Generic Object Rendering",
"distanthorizons.config.client.advanced.graphics.genericRendering.enableGenericRendering":
"Enable Rendering",
"Enable Generic Rendering",
"distanthorizons.config.client.advanced.graphics.genericRendering.enableGenericRendering.@tooltip":
"If true non terrain objects will be rendered in DH's terrain. \nThis includes beacon beams and clouds.",
"distanthorizons.config.client.advanced.graphics.genericRendering.enableBeaconRendering":
@@ -369,7 +338,7 @@
"distanthorizons.config.client.advanced.graphics.culling.reduceOverdrawWithFastMovement.@tooltip":
"If set to true the overdraw prevention radius will get closer \nto the camera when flying/moving quickly. \n\nThis helps reduce issues where Minecraft can't load or \ngenerate chunks fast enough to keep up with DH.",
"distanthorizons.config.client.advanced.graphics.culling.enableCaveCulling":
"Cave Culling",
"Enable Cave Culling",
"distanthorizons.config.client.advanced.graphics.culling.enableCaveCulling.@tooltip":
"If enabled caves will be culled \n\nAdditional Info: Currently this cull all faces \n with skylight value of 0 under the cave culling height in dimensions that \n do not have a ceiling. \n",
"distanthorizons.config.client.advanced.graphics.culling.caveCullingHeight":
@@ -462,8 +431,8 @@
"distanthorizons.config.client.advanced.debugging.rendererMode":
"Renderer Mode",
"distanthorizons.config.client.advanced.debugging.debugRendering":
"Debug Rendering",
"distanthorizons.config.client.advanced.debugging.debugRenderingColors":
"Debug Rendering Colors",
"distanthorizons.config.client.advanced.debugging.lodOnlyMode":
"Only Render LODs",
"distanthorizons.config.client.advanced.debugging.lodOnlyMode.@tooltip":