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 2f4bad3b5..6cf20210a 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 @@ -849,18 +849,6 @@ public class Config .addListener(WorldCurvatureConfigEventHandler.INSTANCE) .build(); - // TODO should be replaced with a better long-term solution - @Deprecated - public static ConfigEntry onlyLoadCenterLods = new ConfigEntry.Builder() - .set(false) - .comment("" - + "For internal testing:\n" - + "Skips loading adjacent LODs to significantly reduce load times (~5x)\n" - + "but causes lighting on LOD borders to appear as full-bright\n" - + "and other graphical bugs.\n" - + "") - .addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE) - .build(); } } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java b/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java index 9bdfabb83..6a2512780 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java @@ -241,24 +241,10 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable // get the adjacent positions // needs to be done async to prevent threads waiting on the same positions to be processed final CompletableFuture[] adjacentLoadFutures = new CompletableFuture[4]; - - if (Config.Client.Advanced.Graphics.Experimental.onlyLoadCenterLods.get()) - { - // TODO temporary test, long term something else should be done to so we can get adjacent lighting data - // probably a change to the LOD data format - adjacentLoadFutures[0] = CompletableFuture.completedFuture(null); - adjacentLoadFutures[1] = CompletableFuture.completedFuture(null); - adjacentLoadFutures[2] = CompletableFuture.completedFuture(null); - adjacentLoadFutures[3] = CompletableFuture.completedFuture(null); - } - else - { - adjacentLoadFutures[0] = this.getRenderSourceForPosAsync(this.pos, EDhDirection.NORTH); - adjacentLoadFutures[1] = this.getRenderSourceForPosAsync(this.pos, EDhDirection.SOUTH); - adjacentLoadFutures[2] = this.getRenderSourceForPosAsync(this.pos, EDhDirection.EAST); - adjacentLoadFutures[3] = this.getRenderSourceForPosAsync(this.pos, EDhDirection.WEST); - } - + adjacentLoadFutures[0] = this.getRenderSourceForPosAsync(this.pos, EDhDirection.NORTH); + adjacentLoadFutures[1] = this.getRenderSourceForPosAsync(this.pos, EDhDirection.SOUTH); + adjacentLoadFutures[2] = this.getRenderSourceForPosAsync(this.pos, EDhDirection.EAST); + adjacentLoadFutures[3] = this.getRenderSourceForPosAsync(this.pos, EDhDirection.WEST); return CompletableFuture.allOf(adjacentLoadFutures).thenRun(() -> { try (ColumnRenderSource northRenderSource = adjacentLoadFutures[0].get(); diff --git a/core/src/main/resources/assets/distanthorizons/lang/en_us.json b/core/src/main/resources/assets/distanthorizons/lang/en_us.json index 4c2d954f4..9f8f91626 100644 --- a/core/src/main/resources/assets/distanthorizons/lang/en_us.json +++ b/core/src/main/resources/assets/distanthorizons/lang/en_us.json @@ -400,15 +400,10 @@ "Experimental", "distanthorizons.config.client.advanced.graphics.experimental.earthCurveRatio": - "Earth Curve Ratio §6(EXPERIMENTAL)§r", + "Earth Curve Ratio", "distanthorizons.config.client.advanced.graphics.experimental.earthCurveRatio.@tooltip": "A value of 1 is equivalent to the curvature of Earth in real life. \nThe minimum accepted value is 50 and the maximum value is 5000. \nEverything between 1 and 49 will be rounded up to 50.", - "distanthorizons.config.client.advanced.graphics.experimental.onlyLoadCenterLods": - "Only load center LODs", - "distanthorizons.config.client.advanced.graphics.experimental.onlyLoadCenterLods.@tooltip": - "Skips loading adjacent LODs to significantly reduce load times (~5x)\nbut causes lighting on LOD borders to appear as full-bright\nand other graphical bugs.\n", - "distanthorizons.config.client.advanced.autoUpdater":