From f09818e564da8d17cb858172469949af9a4356e9 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 6 Apr 2024 08:42:29 -0500 Subject: [PATCH] Update ELodShading names and descriptions --- .../api/enums/config/ELodShading.java | 16 +++++++++++----- .../distanthorizons/core/config/Config.java | 6 +++--- .../assets/distanthorizons/lang/en_us.json | 10 +++++----- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/ELodShading.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/ELodShading.java index b098bbab0..125a26d6f 100644 --- a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/ELodShading.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/ELodShading.java @@ -25,6 +25,7 @@ package com.seibel.distanthorizons.api.enums.config; * NONE
* * @since API 1.0.0 + * @version 2024-4-6 */ public enum ELodShading { @@ -32,15 +33,20 @@ public enum ELodShading // when adding items up the API minor version // when removing items up the API major version - /** Uses Minecraft's shading for LODs */ - MINECRAFT, /** - * Simulates Minecraft's shading. + * Uses Minecraft's shading for LODs.
+ * This means if Minecraft's shading is disabled DH's shading will be as well. + */ + AUTO, + + /** + * Simulates Minecraft's shading.
* This is most useful for shaders that disable Minecraft's shading * but still require shading on LODs. */ - OLD_LIGHTING, + ENABLED, + /** LODs will have no shading */ - NONE; + DISABLED; } 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 62ea54776..1594afe79 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 @@ -629,12 +629,12 @@ public class Config .build(); public static ConfigEntry lodShading = new ConfigEntry.Builder() - .set(ELodShading.MINECRAFT) + .set(ELodShading.AUTO) .comment("" + "How should LODs be shaded? \n" + "\n" - + ELodShading.MINECRAFT + ": Uses the same side shading as vanilla Minecraft blocks. \n" - + ELodShading.OLD_LIGHTING + ": Simulates Minecraft's block shading for LODs. \n" + + ELodShading.AUTO + ": Uses the same side shading as vanilla Minecraft blocks. \n" + + ELodShading.FORCED + ": Simulates Minecraft's block shading for LODs. \n" + " Can be used to force LOD shading when using some shaders. \n" + ELodShading.NONE + ": All LOD sides will be rendered with the same brightness. \n" + "") 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 89e9da5e0..f8d189706 100644 --- a/core/src/main/resources/assets/distanthorizons/lang/en_us.json +++ b/core/src/main/resources/assets/distanthorizons/lang/en_us.json @@ -903,12 +903,12 @@ "distanthorizons.config.enum.EBufferRebuildTimes.RARE": "Rare", - "distanthorizons.config.enum.ELodShading.MINECRAFT": + "distanthorizons.config.enum.ELodShading.AUTO": "Auto", - "distanthorizons.config.enum.ELodShading.OLD_LIGHTING": - "Force", - "distanthorizons.config.enum.ELodShading.NONE": - "None", + "distanthorizons.config.enum.ELodShading.ENABLED": + "Enabled", + "distanthorizons.config.enum.ELodShading.DISABLED": + "Disabled", "distanthorizons.config.enum.EUpdateBranch.STABLE": "Stable",