Merge branch 'refs/heads/1.21.1/dev' into 1.21.1/stable

Author: FlashyReese

build.gradle.kts

@@ -14,7 +14,7 @@ val PARCHMENT_VERSION by extra { null }
 // https://semver.org/
 val MAVEN_GROUP by extra { "me.flashyreese.mods" }
 val ARCHIVE_NAME by extra { "sodium-extra" }
-val MOD_VERSION by extra { "0.8.7" }
+val MOD_VERSION by extra { "0.9.0" }
 val SODIUM_VERSION by extra { "0.8.12-alpha.3+mc1.21.1" }
 
 allprojects {

common/src/main/java/me/flashyreese/mods/sodiumextra/client/SodiumExtraClientMod.java

@@ -1,6 +1,8 @@
 package me.flashyreese.mods.sodiumextra.client;
 
 import me.flashyreese.mods.sodiumextra.client.config.SodiumExtraGameOptions;
+import me.flashyreese.mods.sodiumextra.client.config.SodiumExtraConfigKeys;
+import me.flashyreese.mods.sodiumextra.client.gui.FullscreenResolutionConfirmation;
 import me.flashyreese.mods.sodiumextra.client.gui.SodiumExtraHud;
 import net.caffeinemc.caffeineconfig.CaffeineConfig;
 import net.caffeinemc.mods.sodium.client.services.PlatformRuntimeInformation;
@@ -43,7 +45,6 @@ public static CaffeineConfig mixinConfig() {
                     .addMixinOption("cloud", true)
                     .addMixinOption("compat", true, false)
                     .addMixinOption("fog", true)
-                    .addMixinOption("fog_falloff", true)
                     .addMixinOption("fps", true)
                     .addMixinOption("gui", true)
                     .addMixinOption("instant_sneak", true)
@@ -82,14 +83,31 @@ public static CaffeineConfig mixinConfig() {
     }
 
     private static SodiumExtraGameOptions loadConfig() {
-        return SodiumExtraGameOptions.load(PlatformRuntimeInformation.getInstance().getConfigDirectory().resolve("sodium-extra-options.json").toFile());
+        return SodiumExtraGameOptions.load(PlatformRuntimeInformation.getInstance().getConfigDirectory().resolve(SodiumExtraConfigKeys.FILE_NAME).toFile());
+    }
+
+    public static void armWaylandFullscreenResolutionRecovery() {
+        SodiumExtraGameOptions options = options();
+        if (!options.extraSettings.waylandFullscreenResolutionRecoveryPending) {
+            options.extraSettings.waylandFullscreenResolutionRecoveryPending = true;
+            options.writeChanges();
+        }
+    }
+
+    public static void disarmWaylandFullscreenResolutionRecovery() {
+        SodiumExtraGameOptions options = options();
+        if (options.extraSettings.waylandFullscreenResolutionRecoveryPending) {
+            options.extraSettings.waylandFullscreenResolutionRecoveryPending = false;
+            options.writeChanges();
+        }
     }
 
     public static void onTick(Minecraft client) {
         if (hud == null) {
             hud = new SodiumExtraHud();
         }
         hud.onStartTick(client);
+        FullscreenResolutionConfirmation.tick(client);
     }
 
     public static void onHudRender(GuiGraphics guiGraphics, DeltaTracker deltaTracker) {

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

@@ -0,0 +1,8 @@
+package me.flashyreese.mods.sodiumextra.client.config;
+
+public final class SodiumExtraConfigKeys {
+    public static final String FILE_NAME = "sodium-extra-options.json";
+    public static final String EXTRA_SETTINGS = "extra_settings";
+    public static final String WAYLAND_FULLSCREEN_RESOLUTION = "wayland_fullscreen_resolution";
+    public static final String WAYLAND_FULLSCREEN_RESOLUTION_RECOVERY_PENDING = "wayland_fullscreen_resolution_recovery_pending";
+}