change: Preserve dimension cloud height (#459)

Author: FlashyReese

common/src/main/java/me/flashyreese/mods/sodiumextra/client/config/SodiumExtraConfig.java

@@ -41,6 +41,7 @@ private static Identifier id(String path) {
     private static final Identifier MULTI_DIMENSION_FOG_OPTION_ID = id("multi_dimension_fog");
     private static final Identifier PROTECTED_GAMEPLAY_FOG_OPTION_ID = id("protected_gameplay_fog");
     private static final Identifier WAYLAND_FULLSCREEN_RESOLUTION_OPTION_ID = id("wayland_fullscreen_resolution");
+    private static final Identifier CLOUD_HEIGHT_OVERRIDE_OPTION_ID = id("cloud_height_override");
     private static final Identifier SODIUM_FULLSCREEN_OPTION_ID = Identifier.parse("sodium:general.fullscreen");
     private static final Identifier SODIUM_FULLSCREEN_RESOLUTION_OPTION_ID = Identifier.parse("sodium:general.fullscreen_resolution");
     private static final Identifier SODIUM_VSYNC_OPTION_ID = Identifier.parse("sodium:general.vsync");
@@ -79,6 +80,11 @@ private static boolean isProtectedGameplayFogOptionEnabled(ConfigState state) {
                 && state.readBooleanOption(PROTECTED_GAMEPLAY_FOG_OPTION_ID);
     }
 
+    private static boolean isCloudHeightOptionEnabled(ConfigState state) {
+        return SodiumExtraClientMod.mixinConfig().getOptions().get("mixin.cloud").isEnabled()
+                && state.readBooleanOption(CLOUD_HEIGHT_OVERRIDE_OPTION_ID);
+    }
+
     private static SodiumExtraGameOptions.FogSettings fogSettings() {
         SodiumExtraGameOptions.RenderSettings renderSettings = SodiumExtraClientMod.options().renderSettings;
         renderSettings.sanitize();
@@ -878,8 +884,17 @@ private OptionPageBuilder createExtraPage(ConfigBuilder builder) {
                                 .setBinding((value) -> SodiumExtraClientMod.options().extraSettings.showCoords = value, () -> SodiumExtraClientMod.options().extraSettings.showCoords)
                                 .setStorageHandler(SodiumExtraClientMod.options())
                         )
-                        .addOption(builder.createIntegerOption(id("cloud_height"))
+                        .addOption(builder.createBooleanOption(CLOUD_HEIGHT_OVERRIDE_OPTION_ID)
                                 .setEnabled(SodiumExtraClientMod.mixinConfig().getOptions().get("mixin.cloud").isEnabled())
+                                .setName(Component.translatable("sodium-extra.option.cloud_height_override"))
+                                .setTooltip(Component.translatable("sodium-extra.option.cloud_height_override.tooltip"))
+                                .setDefaultValue(false)
+                                .setBinding((value) -> SodiumExtraClientMod.options().extraSettings.cloudHeightOverride = value, () -> SodiumExtraClientMod.options().extraSettings.cloudHeightOverride)
+                                .setStorageHandler(SodiumExtraClientMod.options())
+                        )
+                        .addOption(builder.createIntegerOption(id("cloud_height"))
+                                .setEnabledProvider(SodiumExtraConfig::isCloudHeightOptionEnabled, CLOUD_HEIGHT_OVERRIDE_OPTION_ID)
+                                .setControlHiddenWhenDisabled(false)
                                 .setName(Component.translatable("sodium-extra.option.cloud_height"))
                                 .setTooltip(Component.translatable("sodium-extra.option.cloud_height.tooltip"))
                                 .setRange(-64, 319, 1)

common/src/main/java/me/flashyreese/mods/sodiumextra/client/config/SodiumExtraGameOptions.java

@@ -435,6 +435,7 @@ public static class ExtraSettings {
         @SerializedName(SodiumExtraConfigKeys.WAYLAND_FULLSCREEN_RESOLUTION_RECOVERY_PENDING)
         public boolean waylandFullscreenResolutionRecoveryPending;
         public boolean useAdaptiveSync;
+        public boolean cloudHeightOverride;
         public int cloudHeight;
         public boolean toasts;
         public boolean advancementToast;
@@ -456,6 +457,7 @@ public ExtraSettings() {
             this.waylandFullscreenResolution = false;
             this.waylandFullscreenResolutionRecoveryPending = false;
             this.useAdaptiveSync = false;
+            this.cloudHeightOverride = false;
             this.cloudHeight = 192;
             this.toasts = true;
             this.advancementToast = true;

common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/cloud/MixinLevelRenderer.java

@@ -13,7 +13,9 @@
 public abstract class MixinLevelRenderer {
     @Redirect(method = {"method_62205", "lambda$addCloudsPass$3"}, require = 1, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/CloudRenderer;render(ILnet/minecraft/client/CloudStatus;FLnet/minecraft/world/phys/Vec3;JF)V"))
     private void modifyCloudHeight(CloudRenderer instance, int i, CloudStatus cloudStatus, float f, Vec3 vec3, long l, float g) {
-        // todo: don't force overwrite
-        instance.render(i, cloudStatus, SodiumExtraClientMod.options().extraSettings.cloudHeight + 0.33F, vec3, l, g);
+        float cloudHeight = SodiumExtraClientMod.options().extraSettings.cloudHeightOverride
+                ? SodiumExtraClientMod.options().extraSettings.cloudHeight + 0.33F
+                : f;
+        instance.render(i, cloudStatus, cloudHeight, vec3, l, g);
     }
 }

common/src/main/resources/assets/sodium-extra/lang/en_us.json

@@ -267,7 +267,9 @@
   "sodium-extra.option.cloud_distance": "Cloud Distance",
   "sodium-extra.option.cloud_distance.tooltip": "Sets how far from the player clouds are rendered.",
   "sodium-extra.option.cloud_height": "Cloud Height",
-  "sodium-extra.option.cloud_height.tooltip": "Sets the height at which clouds are rendered.",
+  "sodium-extra.option.cloud_height.tooltip": "Sets the cloud height used by Sodium Extra's cloud height override.",
+  "sodium-extra.option.cloud_height_override": "Cloud Height Override",
+  "sodium-extra.option.cloud_height_override.tooltip": "Overrides dimension-defined cloud heights with Sodium Extra's Cloud Height setting.",
   "sodium-extra.option.details": "Details",
   "sodium-extra.option.enchanting_table_book": "Enchanting Table Book",
   "sodium-extra.option.enchanting_table_book.tooltip": "Renders the enchanting table book.",