From d26cdf0b559c6e6d11a203f7a79bf7c10506bd7a Mon Sep 17 00:00:00 2001 From: cpw Date: Tue, 20 Jun 2023 17:06:16 -0400 Subject: [PATCH] Update early loading default configs to match standard expectations. (#9577) Also allow a global override env variable for darkmode always. "FML_EARLY_WINDOW_DARK" --- .../fml/earlydisplay/DisplayWindow.java | 21 +++++++++++-------- .../minecraftforge/fml/loading/FMLConfig.java | 4 ++-- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java b/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java index 99cfcc1433..625c08cd13 100644 --- a/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java +++ b/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java @@ -120,16 +120,19 @@ public class DisplayWindow implements ImmediateWindowProvider { FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_WIDTH, winWidth); FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_HEIGHT, winHeight); fbScale = FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_FBSCALE); - try { - var optionLines = Files.readAllLines(FMLPaths.GAMEDIR.get().resolve(Paths.get("options.txt"))); - var options = optionLines.stream().map(l->l.split(":")).filter(a->a.length == 2).collect(Collectors.toMap(a->a[0], a->a[1])); - var colourScheme = Boolean.parseBoolean(options.getOrDefault("darkMojangStudiosBackground", "false")); - this.colourScheme = colourScheme ? ColourScheme.BLACK : ColourScheme.RED; - } catch (IOException ioe) { - // No options - this.colourScheme = ColourScheme.RED; // default to red colourscheme + if (System.getenv("FML_EARLY_WINDOW_DARK")!= null) { + this.colourScheme = ColourScheme.BLACK; + } else { + try { + var optionLines = Files.readAllLines(FMLPaths.GAMEDIR.get().resolve(Paths.get("options.txt"))); + var options = optionLines.stream().map(l -> l.split(":")).filter(a -> a.length == 2).collect(Collectors.toMap(a -> a[0], a -> a[1])); + var colourScheme = Boolean.parseBoolean(options.getOrDefault("darkMojangStudiosBackground", "false")); + this.colourScheme = colourScheme ? ColourScheme.BLACK : ColourScheme.RED; + } catch (IOException ioe) { + // No options + this.colourScheme = ColourScheme.RED; // default to red colourscheme + } } - this.maximized = parsed.has(maximizedopt) || FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_MAXIMIZED); var forgeVersion = parsed.valueOf(forgeversionopt); diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLConfig.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLConfig.java index e6ed31e6ab..3ac70cd665 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLConfig.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLConfig.java @@ -36,8 +36,8 @@ public class FMLConfig EARLY_WINDOW_PROVIDER("earlyWindowProvider", "fmlearlywindow", "Early window provider"), EARLY_WINDOW_WIDTH("earlyWindowWidth", 854, "Early window width"), EARLY_WINDOW_HEIGHT("earlyWindowHeight", 480, "Early window height"), - EARLY_WINDOW_FBSCALE("earlyWindowFBScale", 2, "Early window framebuffer scale"), - EARLY_WINDOW_MAXIMIZED("earlyWindowMaximized", true, "Early window starts maximized") + EARLY_WINDOW_FBSCALE("earlyWindowFBScale", 1, "Early window framebuffer scale"), + EARLY_WINDOW_MAXIMIZED("earlyWindowMaximized", Boolean.FALSE, "Early window starts maximized") ; private final String entry;