Merge branch 'main' of https://gitlab.com/jeseibel/distant-horizons-core
This commit is contained in:
James Seibel
@@ -43,7 +43,7 @@ public class Config extends ConfigBase
|
||||
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry optionsButton = new ConfigEntry.Builder<Boolean>()
|
||||
public static ConfigEntry<Boolean> optionsButton = new ConfigEntry.Builder<Boolean>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.OPTIONS_BUTTON_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.OPTIONS_BUTTON_DEFAULT)
|
||||
.build();
|
||||
@@ -64,39 +64,39 @@ public class Config extends ConfigBase
|
||||
public static class Quality
|
||||
{
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry drawResolution = new ConfigEntry.Builder<HorizontalResolution>()
|
||||
public static ConfigEntry<HorizontalResolution> drawResolution = new ConfigEntry.Builder<HorizontalResolution>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IGraphics.IQuality.DRAW_RESOLUTION_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IGraphics.IQuality.DRAW_RESOLUTION_DEFAULT)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry lodChunkRenderDistance = new ConfigEntry.Builder<Integer>()
|
||||
public static ConfigEntry<Integer> lodChunkRenderDistance = new ConfigEntry.Builder<Integer>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IGraphics.IQuality.LOD_CHUNK_RENDER_DISTANCE_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IGraphics.IQuality.LOD_CHUNK_RENDER_DISTANCE_MIN_DEFAULT_MAX.defaultValue)
|
||||
.setMinMax(ILodConfigWrapperSingleton.IClient.IGraphics.IQuality.LOD_CHUNK_RENDER_DISTANCE_MIN_DEFAULT_MAX.minValue, ILodConfigWrapperSingleton.IClient.IGraphics.IQuality.LOD_CHUNK_RENDER_DISTANCE_MIN_DEFAULT_MAX.maxValue)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry verticalQuality = new ConfigEntry.Builder<VerticalQuality>()
|
||||
public static ConfigEntry<VerticalQuality> verticalQuality = new ConfigEntry.Builder<VerticalQuality>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IGraphics.IQuality.VERTICAL_QUALITY_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IGraphics.IQuality.VERTICAL_QUALITY_DEFAULT)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry horizontalScale = new ConfigEntry.Builder<Integer>()
|
||||
public static ConfigEntry<Integer> horizontalScale = new ConfigEntry.Builder<Integer>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IGraphics.IQuality.HORIZONTAL_SCALE_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IGraphics.IQuality.HORIZONTAL_SCALE_MIN_DEFAULT_MAX.defaultValue)
|
||||
.setMinMax(ILodConfigWrapperSingleton.IClient.IGraphics.IQuality.HORIZONTAL_SCALE_MIN_DEFAULT_MAX.minValue, ILodConfigWrapperSingleton.IClient.IGraphics.IQuality.HORIZONTAL_SCALE_MIN_DEFAULT_MAX.maxValue)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry horizontalQuality = new ConfigEntry.Builder<HorizontalQuality>()
|
||||
public static ConfigEntry<HorizontalQuality> horizontalQuality = new ConfigEntry.Builder<HorizontalQuality>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IGraphics.IQuality.HORIZONTAL_SCALE_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IGraphics.IQuality.HORIZONTAL_QUALITY_DEFAULT)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry dropoffQuality = new ConfigEntry.Builder<DropoffQuality>()
|
||||
public static ConfigEntry<DropoffQuality> dropoffQuality = new ConfigEntry.Builder<DropoffQuality>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IGraphics.IQuality.DROPOFF_QUALITY_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IGraphics.IQuality.DROPOFF_QUALITY_DEFAULT)
|
||||
.build();
|
||||
@@ -106,25 +106,25 @@ public class Config extends ConfigBase
|
||||
public static class FogQuality
|
||||
{
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry fogDistance = new ConfigEntry.Builder<FogDistance>()
|
||||
public static ConfigEntry<FogDistance> fogDistance = new ConfigEntry.Builder<FogDistance>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IGraphics.IFogQuality.FOG_DISTANCE_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IGraphics.IFogQuality.FOG_DISTANCE_DEFAULT)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry fogDrawMode = new ConfigEntry.Builder<FogDrawMode>()
|
||||
public static ConfigEntry<FogDrawMode> fogDrawMode = new ConfigEntry.Builder<FogDrawMode>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IGraphics.IFogQuality.FOG_DRAW_MODE_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IGraphics.IFogQuality.FOG_DRAW_MODE_DEFAULT)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry fogColorMode = new ConfigEntry.Builder<FogColorMode>()
|
||||
public static ConfigEntry<FogColorMode> fogColorMode = new ConfigEntry.Builder<FogColorMode>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IGraphics.IFogQuality.FOG_COLOR_MODE_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IGraphics.IFogQuality.FOG_COLOR_MODE_DEFAULT)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry disableVanillaFog = new ConfigEntry.Builder<Boolean>()
|
||||
public static ConfigEntry<Boolean> disableVanillaFog = new ConfigEntry.Builder<Boolean>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IGraphics.IFogQuality.DISABLE_VANILLA_FOG_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IGraphics.IFogQuality.DISABLE_VANILLA_FOG_DEFAULT)
|
||||
.build();
|
||||
@@ -134,19 +134,19 @@ public class Config extends ConfigBase
|
||||
public static class AdvancedGraphics
|
||||
{
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry disableDirectionalCulling = new ConfigEntry.Builder<Boolean>()
|
||||
public static ConfigEntry<Boolean> disableDirectionalCulling = new ConfigEntry.Builder<Boolean>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IGraphics.IAdvancedGraphics.DISABLE_DIRECTIONAL_CULLING_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IGraphics.IAdvancedGraphics.DISABLE_DIRECTIONAL_CULLING_DEFAULT)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry vanillaOverdraw = new ConfigEntry.Builder<VanillaOverdraw>()
|
||||
public static ConfigEntry<VanillaOverdraw> vanillaOverdraw = new ConfigEntry.Builder<VanillaOverdraw>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IGraphics.IAdvancedGraphics.VANILLA_OVERDRAW_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IGraphics.IAdvancedGraphics.VANILLA_OVERDRAW_DEFAULT)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry useExtendedNearClipPlane = new ConfigEntry.Builder<Boolean>()
|
||||
public static ConfigEntry<Boolean> useExtendedNearClipPlane = new ConfigEntry.Builder<Boolean>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IGraphics.IAdvancedGraphics.USE_EXTENDED_NEAR_CLIP_PLANE_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IGraphics.IAdvancedGraphics.USE_EXTENDED_NEAR_CLIP_PLANE_DEFAULT)
|
||||
.build();
|
||||
@@ -162,31 +162,31 @@ public class Config extends ConfigBase
|
||||
public static class WorldGenerator
|
||||
{
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry enableDistantGeneration = new ConfigEntry.Builder<Boolean>()
|
||||
public static ConfigEntry<Boolean> enableDistantGeneration = new ConfigEntry.Builder<Boolean>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IWorldGenerator.ENABLE_DISTANT_GENERATION_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IWorldGenerator.ENABLE_DISTANT_GENERATION_DEFAULT)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry distanceGenerationMode = new ConfigEntry.Builder<DistanceGenerationMode>()
|
||||
public static ConfigEntry<DistanceGenerationMode> distanceGenerationMode = new ConfigEntry.Builder<DistanceGenerationMode>()
|
||||
//.comment(ILodConfigWrapperSingleton.IClient.IWorldGenerator.getDistanceGenerationModeDesc())
|
||||
.set(ILodConfigWrapperSingleton.IClient.IWorldGenerator.DISTANCE_GENERATION_MODE_DEFAULT)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry lightGenerationMode = new ConfigEntry.Builder<LightGenerationMode>()
|
||||
public static ConfigEntry<LightGenerationMode> lightGenerationMode = new ConfigEntry.Builder<LightGenerationMode>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IWorldGenerator.LIGHT_GENERATION_MODE_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IWorldGenerator.LIGHT_GENERATION_MODE_DEFAULT)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry generationPriority = new ConfigEntry.Builder<GenerationPriority>()
|
||||
public static ConfigEntry<GenerationPriority> generationPriority = new ConfigEntry.Builder<GenerationPriority>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IWorldGenerator.GENERATION_PRIORITY_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IWorldGenerator.GENERATION_PRIORITY_DEFAULT)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry blocksToAvoid = new ConfigEntry.Builder<BlocksToAvoid>()
|
||||
public static ConfigEntry<BlocksToAvoid> blocksToAvoid = new ConfigEntry.Builder<BlocksToAvoid>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IWorldGenerator.BLOCKS_TO_AVOID_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IWorldGenerator.BLOCKS_TO_AVOID_DEFAULT)
|
||||
.build();
|
||||
@@ -207,14 +207,14 @@ public class Config extends ConfigBase
|
||||
public static class Threading
|
||||
{
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry numberOfWorldGenerationThreads = new ConfigEntry.Builder<Integer>()
|
||||
public static ConfigEntry<Integer> numberOfWorldGenerationThreads = new ConfigEntry.Builder<Integer>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IAdvanced.IThreading.NUMBER_OF_WORLD_GENERATION_THREADS_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IAdvanced.IThreading.NUMBER_OF_WORLD_GENERATION_THREADS_DEFAULT.defaultValue)
|
||||
.setMinMax(ILodConfigWrapperSingleton.IClient.IAdvanced.IThreading.NUMBER_OF_WORLD_GENERATION_THREADS_DEFAULT.minValue, ILodConfigWrapperSingleton.IClient.IAdvanced.IThreading.NUMBER_OF_WORLD_GENERATION_THREADS_DEFAULT.maxValue)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry numberOfBufferBuilderThreads = new ConfigEntry.Builder<Integer>()
|
||||
public static ConfigEntry<Integer> numberOfBufferBuilderThreads = new ConfigEntry.Builder<Integer>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IAdvanced.IThreading.NUMBER_OF_BUFFER_BUILDER_THREADS_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IAdvanced.IThreading.NUMBER_OF_BUFFER_BUILDER_THREADS_MIN_DEFAULT_MAX.defaultValue)
|
||||
.setMinMax(ILodConfigWrapperSingleton.IClient.IAdvanced.IThreading.NUMBER_OF_BUFFER_BUILDER_THREADS_MIN_DEFAULT_MAX.minValue, ILodConfigWrapperSingleton.IClient.IAdvanced.IThreading.NUMBER_OF_BUFFER_BUILDER_THREADS_MIN_DEFAULT_MAX.maxValue)
|
||||
@@ -225,19 +225,19 @@ public class Config extends ConfigBase
|
||||
public static class Debugging
|
||||
{
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry drawLods = new ConfigEntry.Builder<Boolean>()
|
||||
public static ConfigEntry<Boolean> drawLods = new ConfigEntry.Builder<Boolean>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IAdvanced.IDebugging.DRAW_LODS_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IAdvanced.IDebugging.DRAW_LODS_DEFAULT)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry debugMode = new ConfigEntry.Builder<DebugMode>()
|
||||
public static ConfigEntry<DebugMode> debugMode = new ConfigEntry.Builder<DebugMode>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IAdvanced.IDebugging.DEBUG_MODE_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IAdvanced.IDebugging.DEBUG_MODE_DEFAULT)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry enableDebugKeybindings = new ConfigEntry.Builder<Boolean>()
|
||||
public static ConfigEntry<Boolean> enableDebugKeybindings = new ConfigEntry.Builder<Boolean>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IAdvanced.IDebugging.DEBUG_KEYBINDINGS_ENABLED_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IAdvanced.IDebugging.DEBUG_KEYBINDINGS_ENABLED_DEFAULT)
|
||||
.build();
|
||||
@@ -247,20 +247,20 @@ public class Config extends ConfigBase
|
||||
public static class Buffers
|
||||
{
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry gpuUploadMethod = new ConfigEntry.Builder<GpuUploadMethod>()
|
||||
public static ConfigEntry<GpuUploadMethod> gpuUploadMethod = new ConfigEntry.Builder<GpuUploadMethod>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IAdvanced.IBuffers.GPU_UPLOAD_METHOD_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IAdvanced.IBuffers.GPU_UPLOAD_METHOD_DEFAULT)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry gpuUploadPerMegabyteInMilliseconds = new ConfigEntry.Builder<Integer>()
|
||||
public static ConfigEntry<Integer> gpuUploadPerMegabyteInMilliseconds = new ConfigEntry.Builder<Integer>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IAdvanced.IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IAdvanced.IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DEFAULT.defaultValue)
|
||||
.setMinMax(ILodConfigWrapperSingleton.IClient.IAdvanced.IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DEFAULT.minValue, ILodConfigWrapperSingleton.IClient.IAdvanced.IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DEFAULT.maxValue)
|
||||
.build();
|
||||
|
||||
@ConfigAnnotations.Entry
|
||||
public static ConfigEntry rebuildTimes = new ConfigEntry.Builder<BufferRebuildTimes>()
|
||||
public static ConfigEntry<BufferRebuildTimes> rebuildTimes = new ConfigEntry.Builder<BufferRebuildTimes>()
|
||||
.comment(ILodConfigWrapperSingleton.IClient.IAdvanced.IBuffers.REBUILD_TIMES_DESC)
|
||||
.set(ILodConfigWrapperSingleton.IClient.IAdvanced.IBuffers.REBUILD_TIMES_DEFAULT)
|
||||
.build();
|
||||
|
||||
@@ -32,11 +32,11 @@
|
||||
"DistantHorizons.config.client.graphics.quality.horizontalQuality":
|
||||
"Horizontal quality",
|
||||
"DistantHorizons.config.client.graphics.quality.horizontalQuality.@tooltip":
|
||||
"How far appart drops in quality are.\n\nHigher settings will increase the distance between drops\nbut will increase memory and GPU usage.",
|
||||
"How far apart drops in quality are.\n\nHigher settings will increase the distance between drops\nbut will increase memory and GPU usage.",
|
||||
"DistantHorizons.config.client.graphics.quality.dropoffQuality":
|
||||
"Dropoff quality",
|
||||
"DistantHorizons.config.client.graphics.quality.dropoffQuality.@tooltip":
|
||||
"How detail dropoff is calculated.\n\nHigher settings will make the dropoff less noticable\nbut will increase how often the geometry has to be rebuilt,\nincreasing CPU usage and the chance of stuttering.",
|
||||
"How detail dropoff is calculated.\n\nHigher settings will make the drop-off less noticeable\nbut will increase how often the geometry has to be rebuilt,\nincreasing CPU usage and the chance of stuttering.",
|
||||
"DistantHorizons.config.client.graphics.fogQuality":
|
||||
"Fog options",
|
||||
"DistantHorizons.config.client.graphics.fogQuality.fogDistance":
|
||||
@@ -76,7 +76,7 @@
|
||||
"DistantHorizons.config.client.graphics.advancedGraphics.useExtendedNearClipPlane":
|
||||
"Use extended near clip plane",
|
||||
"DistantHorizons.config.client.graphics.advancedGraphics.useExtendedNearClipPlane.@tooltip":
|
||||
"Will prevent some overdraw issues,\nbut may cause nearby fake chunks to render incorrectly, especially when near fancy leaves.\nLess noticable with a longer vanilla render distance.",
|
||||
"Will prevent some overdraw issues,\nbut may cause nearby fake chunks to render incorrectly, especially when near fancy leaves.\nLess noticeable with a longer vanilla render distance.",
|
||||
"DistantHorizons.config.client.graphics.advancedGraphics.backsideCullingRange":
|
||||
"Backside Culling Range",
|
||||
"DistantHorizons.config.client.graphics.advancedGraphics.backsideCullingRange.@tooltip":
|
||||
@@ -124,7 +124,7 @@
|
||||
"DistantHorizons.config.client.advanced.buffers.gpuUploadMethod":
|
||||
"GPU upload method",
|
||||
"DistantHorizons.config.client.advanced.buffers.gpuUploadMethod.@tooltip":
|
||||
"The method for uploading geometry to the GPU.\n\nIf you experience stuttering while your CPU and GPU usage is low, try changing this setting.\nNote: if you are in a wold you may have to leaving and rejoin to see the full effect.",
|
||||
"The method for uploading geometry to the GPU.\n\nIf you experience stuttering while your CPU and GPU usage is low, try changing this setting.\nNote: if you are in a world you may have to leaving and rejoin to see the full effect.",
|
||||
"DistantHorizons.config.client.advanced.buffers.gpuUploadPerMegabyteInMilliseconds":
|
||||
"GPU upload speed (milliseconds)",
|
||||
"DistantHorizons.config.client.advanced.buffers.gpuUploadPerMegabyteInMilliseconds.@tooltip":
|
||||
|
||||
Reference in New Issue
Block a user