Refactor window mode option

xCollateral · Dec 13, 2024 · d8f2073 · d8f2073
1 parent 70d5cdc
commit d8f2073
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 13 deletions.
diff --git a/src/main/java/net/vulkanmod/config/Config.java b/src/main/java/net/vulkanmod/config/Config.java
@@ -16,7 +16,7 @@ public class Config {
 
     public int frameQueueSize = 2;
     public VideoModeSet.VideoMode videoMode = VideoModeManager.getFirstAvailable().getVideoMode();
-    public boolean windowedFullscreen = false;
+    public int windowMode = 0;
 
     public int advCulling = 2;
     public boolean indirectDraw = true;

diff --git a/src/main/java/net/vulkanmod/config/option/Options.java b/src/main/java/net/vulkanmod/config/option/Options.java
@@ -8,6 +8,7 @@
 import net.vulkanmod.config.gui.OptionBlock;
 import net.vulkanmod.config.video.VideoModeManager;
 import net.vulkanmod.config.video.VideoModeSet;
+import net.vulkanmod.config.video.WindowMode;
 import net.vulkanmod.render.chunk.build.light.LightMode;
 import net.vulkanmod.render.vertex.TerrainRenderType;
 import net.vulkanmod.vulkan.Renderer;
@@ -77,19 +78,18 @@ public static OptionBlock[] getVideoOpts() {
                 new OptionBlock("", new Option<?>[]{
                         resolutionOption,
                         RefreshRate,
-                        new SwitchOption(Component.translatable("options.fullscreen"),
+                        new CyclingOption<>(Component.translatable("vulkanmod.options.windowMode"),
+                                WindowMode.values(),
                                 value -> {
-                                    minecraftOptions.fullscreen().set(value);
-//                            window.toggleFullScreen();
-                                    fullscreenDirty = true;
-                                },
-                                () -> minecraftOptions.fullscreen().get()),
-                        new SwitchOption(Component.translatable("vulkanmod.options.windowedFullscreen"),
-                                value -> {
-                                    config.windowedFullscreen = value;
+                                    boolean exclusiveFullscreen = value == WindowMode.EXCLUSIVE_FULLSCREEN;
+                                    minecraftOptions.fullscreen()
+                                                    .set(exclusiveFullscreen);
+
+                                    config.windowMode = value.mode;
                                     fullscreenDirty = true;
                                 },
-                                () -> config.windowedFullscreen),
+                                () -> WindowMode.fromValue(config.windowMode))
+                                .setTranslator(value -> Component.translatable(WindowMode.getComponentName(value))),
                         new RangeOption(Component.translatable("options.framerateLimit"),
                                 10, 260, 10,
                                 value -> Component.nullToEmpty(value == 260 ?

diff --git a/src/main/java/net/vulkanmod/config/video/WindowMode.java b/src/main/java/net/vulkanmod/config/video/WindowMode.java
@@ -0,0 +1,31 @@
+package net.vulkanmod.config.video;
+
+public enum WindowMode {
+    WINDOWED(0),
+    WINDOWED_FULLSCREEN(1),
+    EXCLUSIVE_FULLSCREEN(2);
+
+    public final int mode;
+
+    WindowMode(int mode) {
+        this.mode = mode;
+    }
+
+    public static WindowMode fromValue(int value) {
+        return switch (value) {
+            case 0 -> WINDOWED;
+            case 1 -> WINDOWED_FULLSCREEN;
+            case 2 -> EXCLUSIVE_FULLSCREEN;
+
+            default -> throw new IllegalStateException("Unexpected value: " + value);
+        };
+    }
+
+    public static String getComponentName(WindowMode windowMode) {
+        return switch (windowMode) {
+            case WINDOWED -> "vulkanmod.options.windowMode.windowed";
+            case WINDOWED_FULLSCREEN -> "vulkanmod.options.windowMode.windowedFullscreen";
+            case EXCLUSIVE_FULLSCREEN -> "options.fullscreen";
+        };
+    }
+}
diff --git a/src/main/java/net/vulkanmod/mixin/window/WindowMixin.java b/src/main/java/net/vulkanmod/mixin/window/WindowMixin.java
@@ -8,6 +8,7 @@
 import net.vulkanmod.config.video.VideoModeManager;
 import net.vulkanmod.config.option.Options;
 import net.vulkanmod.config.video.VideoModeSet;
+import net.vulkanmod.config.video.WindowMode;
 import net.vulkanmod.vulkan.Renderer;
 import net.vulkanmod.vulkan.VRenderSystem;
 import net.vulkanmod.vulkan.Vulkan;
@@ -163,7 +164,7 @@ private void setMode() {
                 this.wasOnFullscreen = true;
             }
         }
-        else if (config.windowedFullscreen) {
+        else if (config.windowMode == WindowMode.WINDOWED_FULLSCREEN.mode) {
             VideoModeSet.VideoMode videoMode = VideoModeManager.getOsVideoMode();
 
             if (!this.wasOnFullscreen) {

diff --git a/src/main/resources/assets/vulkanmod/lang/en_us.json b/src/main/resources/assets/vulkanmod/lang/en_us.json
@@ -39,5 +39,7 @@
   "vulkanmod.options.uniqueOpaqueLayer": "Unique opaque layer",
   "vulkanmod.options.uniqueOpaqueLayer.tooltip": "Use a unique render layer for opaque terrain to improve performance.",
 
-  "vulkanmod.options.windowedFullscreen": "Windowed Fullscreen"
+  "vulkanmod.options.windowMode": "Window Mode",
+  "vulkanmod.options.windowMode.windowed": "Windowed",
+  "vulkanmod.options.windowMode.windowedFullscreen": "Windowed Fullscreen"
 }