更新主题系统

HMCL/src/main/java/org/jackhuang/hmcl/game/OAuthServer.java

@@ -143,7 +143,7 @@ public Response serve(IHTTPSession session) {
         String html;
         try {
             html = IOUtils.readFullyAsString(OAuthServer.class.getResourceAsStream("/assets/microsoft_auth.html"))
-                    .replace("%style%", Themes.getTheme().toColorScheme().toStyleSheet().replace("-monet", "--monet"))
+                    .replace("%style%", Themes.getColorScheme().toStyleSheet().replace("-monet", "--monet"))
                     .replace("%lang%", Locale.getDefault().toLanguageTag())
                     .replace("%success%", i18n("message.success"))
                     .replace("%ok%", i18n("button.ok"))

HMCL/src/main/java/org/jackhuang/hmcl/setting/StyleSheets.java

@@ -25,8 +25,7 @@
 import org.glavo.monetfx.Brightness;
 import org.glavo.monetfx.ColorRole;
 import org.glavo.monetfx.ColorScheme;
-import org.jackhuang.hmcl.theme.Theme;
-import org.jackhuang.hmcl.theme.ThemeColor;
+import org.jackhuang.hmcl.theme.ColorTheme;
 import org.jackhuang.hmcl.theme.Themes;
 import org.jackhuang.hmcl.ui.FXUtils;
 
@@ -144,24 +143,25 @@ private static String getBrightnessStyleSheet() {
 
     private static void addColor(StringBuilder builder, String name, Color color) {
         builder.append("  ").append(name)
-                .append(": ").append(ThemeColor.getColorDisplayName(color)).append(";\n");
+                .append(": ").append(FXUtils.getColorDisplayName(color)).append(";\n");
     }
 
     private static void addColor(StringBuilder builder, String name, Color color, double opacity) {
         builder.append("  ").append(name)
-                .append(": ").append(ThemeColor.getColorDisplayNameWithOpacity(color, opacity)).append(";\n");
+                .append(": ").append(FXUtils.getColorDisplayNameWithOpacity(color, opacity)).append(";\n");
     }
 
     private static void addColor(StringBuilder builder, ColorScheme scheme, ColorRole role, double opacity) {
+        Color c = scheme.getColor(role);
         builder.append("  ").append(role.getVariableName()).append("-transparent-%02d".formatted((int) (100 * opacity)))
-                .append(": ").append(ThemeColor.getColorDisplayNameWithOpacity(scheme.getColor(role), opacity))
+                .append(": ").append(FXUtils.getColorDisplayNameWithOpacity(c, opacity))
                 .append(";\n");
     }
 
     private static String getThemeStyleSheet() {
         final String blueCss = "/assets/css/blue.css";
 
-        if (Theme.DEFAULT.equals(Themes.getTheme()))
+        if (ColorTheme.DEFAULT.equals(Themes.getColorTheme()))
             return blueCss;
 
         ColorScheme scheme = Themes.getColorScheme();

HMCL/src/main/java/org/jackhuang/hmcl/theme/ColorTheme.java

@@ -0,0 +1,41 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2025 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.theme;
+
+import javafx.scene.paint.Color;
+import org.glavo.monetfx.*;
+
+/// @author Glavo
+public record ColorTheme(
+        Color primaryColorSeed,
+        Brightness brightness,
+        ColorStyle colorStyle,
+        Contrast contrast) {
+
+    public static final ColorTheme DEFAULT = new ColorTheme(ThemeColor.DEFAULT.color(), Brightness.DEFAULT, ColorStyle.FIDELITY, Contrast.DEFAULT);
+
+    public ColorScheme toColorScheme() {
+        return ColorScheme.newBuilder()
+                .setPrimaryColorSeed(primaryColorSeed)
+                .setColorStyle(colorStyle)
+                .setBrightness(brightness)
+                .setSpecVersion(ColorSpecVersion.SPEC_2025)
+                .setContrast(contrast)
+                .build();
+    }
+}