feat: add a workarround for #4

Author: TheBossMagnus

common/src/main/java/io/github/thebossmagnus/mods/config_manager/common_coremod/ConfigManagerStartup.java

@@ -1,6 +1,7 @@
 package io.github.thebossmagnus.mods.config_manager.common_coremod;
 
 
+
 import java.nio.file.Files;
 import java.nio.file.Path;
 

common/src/main/java/io/github/thebossmagnus/mods/config_manager/common_coremod/CopyConfig.java

@@ -1,6 +1,8 @@
 package io.github.thebossmagnus.mods.config_manager.common_coremod;
 
 
+import io.github.thebossmagnus.mods.config_manager.common_coremod.compat.ModrinthAppCompat;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -24,31 +26,42 @@ public static void init(Path gameDir) {
             throw new RuntimeException(String.format("A subfolder called \"%s\" is inside config/%s: %s", DIR_NAME, DIR_NAME, nestedDir));
         }
 
+        //Check if there's already an Options.txt generated by the ModrinthApp for the fullscreen setting
+        int fullscreenSetting = ModrinthAppCompat.getFullScreenSetting(gameDir);
+        if (fullscreenSetting != -1) {
+            try {
+                Files.deleteIfExists(configDir.resolve("options.txt"));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
 
         // Copy contents of root/config/dirName into root
         try (var paths = Files.walk(configDir)) {
-            paths.filter(path -> !path.equals(configDir))
-                    .forEach(source -> {
-                        Path relative = configDir.relativize(source);
-                        Path target = gameDir.resolve(relative);
-
-                        if (Files.exists(target)) {
-                            return;
-                        }
-
-                        try {
-                            if (Files.isDirectory(source)) {
-                                Files.createDirectories(target);
-                            } else {
-                                Files.createDirectories(target.getParent());
-                                Files.copy(source, target);
-                            }
-                        } catch (IOException e) {
-                            throw new RuntimeException("Error copying " + source + " to " + target, e);
-                        }
-                    });
+            paths.filter(path -> !path.equals(configDir)).forEach(source -> {
+                Path relative = configDir.relativize(source);
+                Path target = gameDir.resolve(relative);
+
+                if (Files.exists(target)) {
+                    return;
+                }
+
+                try {
+                    if (Files.isDirectory(source)) {
+                        Files.createDirectories(target);
+                    } else {
+                        Files.createDirectories(target.getParent());
+                        Files.copy(source, target);
+                    }
+                } catch (IOException e) {
+                    throw new RuntimeException("Error copying " + source + " to " + target, e);
+                }
+            });
         } catch (IOException e) {
             throw new RuntimeException("Failed to copy modpack_defaults", e);
         }
+
+        ModrinthAppCompat.reapplyFullScreenSetting(gameDir, fullscreenSetting);
     }
 }

common/src/main/java/io/github/thebossmagnus/mods/config_manager/common_coremod/OverwriteConfig.java

@@ -12,7 +12,6 @@
 public final class OverwriteConfig {
 
 
-
     public static void run(Path gameDir) {
         Path configDir = gameDir.resolve("config");
         Path defaultsDir = configDir.resolve(Constants.DIR_NAME);

common/src/main/java/io/github/thebossmagnus/mods/config_manager/common_coremod/compat/ModrinthAppCompat.java

@@ -0,0 +1,69 @@
+package io.github.thebossmagnus.mods.config_manager.common_coremod.compat;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static io.github.thebossmagnus.mods.config_manager.common.Constants.LOGGER;
+
+/*
+In the Modrinth app, enabling instance options under window size enable Fullscreen.
+This will cause Modrinth to generate an options.txt file with Fullscreen enabled which doesn't get overridden by Config Manager.
+Fixing this requires a slightly hacky workaround.
+The launcher option will override the pack preference (only for the full screen obv)
+To do that we first check if the file, that only "fullscreen:..."  exits or not (-1), than we save the status of fullscreen (0 or 1),
+delete the file, copy and later reapply it after the copy
+ */
+public final class ModrinthAppCompat {
+
+
+    public static int getFullScreenSetting(@NotNull Path gameDir) {
+
+        //check if the file content equals fullscreen:true
+        if (Files.exists(gameDir.resolve("options.txt"))) {
+            try {
+                String content = Files.readString(gameDir.resolve("options.txt"));
+                if (content.equals("fullscreen:true")) {
+                    LOGGER.info("Detected fullscreen preference imposed by the launcher: true, Merging it with modpack preference");
+                    return 1;
+                } else if (content.equals("fullscreen:false")) {
+                    LOGGER.info("Detected fullscreen preference imposed by the launcher: false, Merging it with modpack preference");
+                    return 0;
+                }
+            } catch (Exception e) {
+                return -1;
+            }
+        }
+
+        return -1;
+    }
+
+    public static void reapplyFullScreenSetting(@NotNull Path gameDir, int status) {
+        if (status == -1) {
+            return;
+        }
+        String fullscreenSetting = (status == 1) ? "fullscreen:true" : "fullscreen:false";
+
+        try {
+            Path optionsFile = gameDir.resolve("options.txt");
+            java.util.List<String> lines = Files.readAllLines(optionsFile);
+            boolean replaced = false;
+            for (int i = 0; i < lines.size(); i++) {
+                if (lines.get(i).startsWith("fullscreen:")) {
+                    lines.set(i, fullscreenSetting);
+                    replaced = true;
+                    break;
+                }
+            }
+            if (!replaced) {
+                lines.add(fullscreenSetting);
+            }
+            Path tmp = Files.createTempFile(gameDir, "options", ".tmp");
+            Files.write(tmp, lines);
+            java.nio.file.Files.move(tmp, optionsFile, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+        } catch (Exception e) {
+            throw new RuntimeException("Could not reapply fullscreen preference chosen by the launcher", e);
+        }
+    }
+}