fix: deduplicate fog options by dimension effects

Sanitize fog distance overrides, skip empty dimension option groups, include known custom dimensions, and key fog overrides by dimension effects id so equivalent dimensions share one option.

(cherry picked from commit a749f2a)

Author: FlashyReese

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

@@ -46,7 +46,7 @@ private static Identifier id(String path) {
     private static final Identifier SODIUM_FULLSCREEN_MODE_OPTION_ID = Identifier.parse("sodium:general.fullscreen_mode");
     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");
-    private static final List<Identifier> DEFAULT_DIMENSION_IDS = List.of(
+    private static final List<Identifier> DEFAULT_DIMENSION_EFFECT_IDS = List.of(
             Level.OVERWORLD.identifier(),
             Level.NETHER.identifier(),
             Level.END.identifier()
@@ -107,6 +107,36 @@ private static SodiumExtraGameOptions.AtmosphericFogSettings createDimensionFogS
         return settings;
     }
 
+    private static List<Identifier> getDimensionFogEffectIds(SodiumExtraGameOptions.FogSettings fogSettings) {
+        Set<Identifier> identifiers = new LinkedHashSet<>(DEFAULT_DIMENSION_EFFECT_IDS);
+        addKnownWorldDimensionEffectIds(identifiers);
+        identifiers.addAll(fogSettings.dimensionOverrides.keySet());
+
+        identifiers.forEach(identifier -> fogSettings.dimensionOverrides.computeIfAbsent(identifier, ignored -> createDimensionFogSettings()));
+
+        return identifiers.stream()
+                .sorted(Comparator.comparing(Identifier::toString))
+                .toList();
+    }
+
+    private static void addKnownWorldDimensionEffectIds(Set<Identifier> identifiers) {
+        Minecraft minecraft = Minecraft.getInstance();
+        if (minecraft == null) {
+            return;
+        }
+
+        if (minecraft.level != null) {
+            identifiers.add(getDimensionFogEffectId(minecraft.level));
+        }
+    }
+
+    private static Identifier getDimensionFogEffectId(Level level) {
+        return level.dimensionTypeRegistration()
+                .unwrapKey()
+                .map(key -> key.identifier())
+                .orElseGet(() -> level.dimension().identifier());
+    }
+
     private static void setAtmosphericFogStart(int value) {
         SodiumExtraGameOptions.FogSettings fogSettings = fogSettings();
         int clampedValue = Math.clamp(value, 0, 100);
@@ -517,9 +547,7 @@ private OptionPageBuilder createRenderPage(ConfigBuilder builder) {
                 .setName(Component.translatable("sodium-extra.option.render"));
 
         SodiumExtraGameOptions.FogSettings fogSettings = fogSettings();
-        DEFAULT_DIMENSION_IDS.stream()
-                .filter(identifier -> !fogSettings.dimensionOverrides.containsKey(identifier))
-                .forEach(identifier -> fogSettings.dimensionOverrides.put(identifier, createDimensionFogSettings()));
+        List<Identifier> dimensionFogEffectIds = getDimensionFogEffectIds(fogSettings);
 
         page.addOptionGroup(builder.createOptionGroup()
                 .addOption(builder.createBooleanOption(ADVANCED_FOG_OPTION_ID)
@@ -607,9 +635,7 @@ private OptionPageBuilder createRenderPage(ConfigBuilder builder) {
         );
 
         OptionGroupBuilder dimensionFogGroup = builder.createOptionGroup();
-        fogSettings.dimensionOverrides.keySet().stream()
-                .sorted(Comparator.comparing(Identifier::toString))
-                .forEach(identifier -> dimensionFogGroup.addOption(builder.createIntegerOption(id("fog." + identifier.toLanguageKey("options.dimensions")))
+        dimensionFogEffectIds.forEach(identifier -> dimensionFogGroup.addOption(builder.createIntegerOption(id("fog." + identifier.toLanguageKey("options.dimensions")))
                         .setEnabledProvider(
                                 SodiumExtraConfig::isDimensionFogOptionEnabled,
                                 ADVANCED_FOG_OPTION_ID,
@@ -627,7 +653,9 @@ private OptionPageBuilder createRenderPage(ConfigBuilder builder) {
                         )
                         .setDefaultValue(0)
                 ));
-        page.addOptionGroup(dimensionFogGroup);
+        if (!dimensionFogEffectIds.isEmpty()) {
+            page.addOptionGroup(dimensionFogGroup);
+        }
 
         page.addOptionGroup(builder.createOptionGroup()
                 .addOption(builder.createBooleanOption(PROTECTED_GAMEPLAY_FOG_OPTION_ID)

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

@@ -353,14 +353,23 @@ public void sanitize() {
             if (this.dimensionOverrides == null) {
                 this.dimensionOverrides = new Object2ObjectArrayMap<>();
             }
-            this.dimensionOverrides.replaceAll((identifier, settings) -> {
+
+            Map<Identifier, AtmosphericFogSettings> sanitizedDimensionOverrides = new Object2ObjectArrayMap<>(this.dimensionOverrides.size());
+            for (Map.Entry<Identifier, AtmosphericFogSettings> entry : this.dimensionOverrides.entrySet()) {
+                Identifier identifier = entry.getKey();
+                if (identifier == null) {
+                    continue;
+                }
+
+                AtmosphericFogSettings settings = entry.getValue();
                 if (settings == null) {
                     settings = new AtmosphericFogSettings();
                 }
 
                 settings.sanitize();
-                return settings;
-            });
+                sanitizedDimensionOverrides.put(identifier, settings);
+            }
+            this.dimensionOverrides = sanitizedDimensionOverrides;
 
             if (this.protectedGameplay == null) {
                 this.protectedGameplay = new ProtectedFogSettings();

common/src/main/java/me/flashyreese/mods/sodiumextra/client/fog/FogDistanceHelper.java

@@ -42,8 +42,11 @@ public enum ProtectedFogType {
 
     public static SodiumExtraGameOptions.AtmosphericFogSettings getAtmosphericSettings(ClientLevel level) {
         SodiumExtraGameOptions.FogSettings fogSettings = getFogSettings();
-        Identifier dimensionId = level.dimension().identifier();
-        return fogSettings.getAtmospheric(dimensionId);
+        Identifier dimensionEffectsId = level.dimensionTypeRegistration()
+                .unwrapKey()
+                .map(key -> key.identifier())
+                .orElseGet(() -> level.dimension().identifier());
+        return fogSettings.getAtmospheric(dimensionEffectsId);
     }
 
     public static int getFogDistance(ClientLevel level) {