refactor: rename Config to LauncherSettings and update related references

Author: Glavo

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

@@ -30,7 +30,7 @@
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.mod.ModpackConfiguration;
 import org.jackhuang.hmcl.mod.ModpackProvider;
-import org.jackhuang.hmcl.setting.Config;
+import org.jackhuang.hmcl.setting.LauncherSettings;
 import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.setting.DefaultIsolationType;
 import org.jackhuang.hmcl.setting.GameSettings;
@@ -220,7 +220,7 @@ public void duplicateVersion(String srcId, String dstId, boolean copySaves) thro
     private GameSettings.Instance copyLocalGameSettings(String id) {
         GameSettings.Instance setting = getLocalGameSettings(id);
         if (setting != null) {
-            return JsonUtils.clone(Config.CONFIG_GSON, setting, TypeToken.get(GameSettings.Instance.class));
+            return JsonUtils.clone(LauncherSettings.GSON, setting, TypeToken.get(GameSettings.Instance.class));
         }
 
         GameSettings.Instance copied = new GameSettings.Instance();
@@ -267,7 +267,7 @@ private void loadLocalGameSettings(String id) {
 
         try {
             try (var reader = Files.newBufferedReader(file)) {
-                return Config.CONFIG_GSON.fromJson(reader, GameSettings.Instance.class);
+                return LauncherSettings.GSON.fromJson(reader, GameSettings.Instance.class);
             }
         } catch (Exception ex) {
             LOG.warning("Failed to load game setting " + file, ex);
@@ -457,7 +457,7 @@ public void saveGameSettings(String id) {
             LOG.warning("Failed to create directory: " + file.getParent(), e);
         }
 
-        FileSaver.save(file, Config.CONFIG_GSON.toJson(localGameSettings.get(id)));
+        FileSaver.save(file, LauncherSettings.GSON.toJson(localGameSettings.get(id)));
     }
 
     public LaunchOptions.Builder getLaunchOptions(String version, JavaRuntime javaVersion, Path gameDir, List<String> javaAgents, List<String> javaArguments, boolean makeLaunchScript) {

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

@@ -207,7 +207,7 @@ private static void loadGlobalAccountStorages() {
 
         try (Reader reader = Files.newBufferedReader(LEGACY_GLOBAL_ACCOUNTS_LOCATION)) {
             List<Map<Object, Object>> accounts =
-                    Config.CONFIG_GSON.fromJson(reader, listTypeOf(mapTypeOf(Object.class, Object.class)));
+                    LauncherSettings.GSON.fromJson(reader, listTypeOf(mapTypeOf(Object.class, Object.class)));
             return accounts != null ? AccountStorages.fromAccounts(accounts) : null;
         } catch (Throwable e) {
             LOG.warning("Failed to load legacy global accounts", e);

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

@@ -116,7 +116,7 @@ private ConfigHolder() {
             AuthlibInjectorServerList::createDefault);
 
     /// The loaded per-workspace config instance.
-    private static @UnknownNullability Config configInstance;
+    private static @UnknownNullability LauncherSettings configInstance;
 
     /// The loaded user-global config instance.
     private static @UnknownNullability GlobalConfig globalConfigInstance;
@@ -168,7 +168,7 @@ private ConfigHolder() {
     private static @Nullable AccountStorages migratedGameAccounts;
 
     /// Returns the loaded per-workspace config.
-    public static Config config() {
+    public static LauncherSettings config() {
         if (configInstance == null) {
             throw new IllegalStateException("Configuration hasn't been loaded");
         }
@@ -369,7 +369,7 @@ public static void init() throws IOException {
             throw new IllegalStateException("Configuration is already loaded");
         }
 
-        LOG.info("Config location: " + SETTINGS_LOCATION);
+        LOG.info("Launcher settings location: " + SETTINGS_LOCATION);
 
         configInstance = loadConfig();
         if (!unsupportedVersion) {
@@ -405,7 +405,7 @@ public static void init() throws IOException {
     }
 
     /// Loads the current per-workspace config or migrates a legacy config when needed.
-    private static Config loadConfig() throws IOException {
+    private static LauncherSettings loadConfig() throws IOException {
         if (Files.exists(SETTINGS_LOCATION)) {
             checkOwner(SETTINGS_LOCATION);
 
@@ -415,21 +415,21 @@ private static Config loadConfig() throws IOException {
             } catch (Exception e) {
                 needBackupSettings = true;
                 LOG.warning("Failed to read settings file: " + SETTINGS_LOCATION, e);
-                return new Config();
+                return new LauncherSettings();
             }
 
             if (jsonObject == null) {
                 LOG.warning("Settings file is empty: " + SETTINGS_LOCATION);
-                return new Config();
+                return new LauncherSettings();
             }
 
             JsonSchemaPolicy.Result schema =
-                    JsonSchemaPolicy.check(SETTINGS_LOCATION, "settings file", jsonObject, Config.CURRENT_SCHEMA);
+                    JsonSchemaPolicy.check(SETTINGS_LOCATION, "settings file", jsonObject, LauncherSettings.CURRENT_SCHEMA);
             if (!schema.allowSave()) {
                 unsupportedVersion = true;
             }
             if (!schema.readable()) {
-                return new Config();
+                return new LauncherSettings();
             }
 
             migratedGameAccounts = LegacyConfigMigrator.extractAccountStorages(jsonObject);
@@ -438,20 +438,20 @@ private static Config loadConfig() throws IOException {
             }
 
             try {
-                Config settings = Config.fromJson(jsonObject);
+                LauncherSettings settings = LauncherSettings.fromJson(jsonObject);
                 if (settings == null) {
-                    return new Config();
+                    return new LauncherSettings();
                 }
 
-                if (!schema.preserveSchema() && !Config.CURRENT_SCHEMA.equals(settings.schemaProperty().get())) {
-                    settings.schemaProperty().set(Config.CURRENT_SCHEMA);
+                if (!schema.preserveSchema() && !LauncherSettings.CURRENT_SCHEMA.equals(settings.schemaProperty().get())) {
+                    settings.schemaProperty().set(LauncherSettings.CURRENT_SCHEMA);
                 }
 
                 return settings;
             } catch (JsonParseException e) {
                 needBackupSettings = true;
                 LOG.warning("Failed to parse settings file: " + SETTINGS_LOCATION, e);
-                return new Config();
+                return new LauncherSettings();
             }
         } else {
             LegacyConfigMigrator.MigrationResult migrationResult = LegacyConfigMigrator.migrateLegacyConfig();
@@ -463,11 +463,11 @@ private static Config loadConfig() throws IOException {
                 migratedAuthlibInjectorServers = migrationResult.authlibInjectorServers();
                 migratedGameAccounts = migrationResult.accountStorages();
                 FileUtils.saveSafely(SETTINGS_LOCATION, migrationResult.contentForMigration());
-                return migrationResult.config();
+                return migrationResult.launcherSettings();
             }
         }
 
-        var newSettings = new Config();
+        var newSettings = new LauncherSettings();
         newlyCreated = true;
         return newSettings;
     }
@@ -654,13 +654,13 @@ private static void checkWritable(Path location) throws IOException {
             if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS
                     && location.getFileSystem() == FileSystems.getDefault()
                     && location.toFile().canWrite()) {
-                LOG.warning("Config at " + location + " is not writable, but it seems to be a Samba share or OpenJDK bug");
+                LOG.warning("Launcher settings at " + location + " is not writable, but it seems to be a Samba share or OpenJDK bug");
                 // There are some serious problems with the implementation of Samba or OpenJDK
                 throw new SambaException();
             } else {
                 // the config cannot be saved
                 // throw up the error now to prevent further data loss
-                throw new IOException("Config at " + location + " is not writable");
+                throw new IOException("Launcher settings at " + location + " is not writable");
             }
         }
     }
@@ -672,7 +672,7 @@ private static GlobalConfig loadGlobalConfig() throws IOException {
                 String content = Files.readString(GLOBAL_CONFIG_PATH);
                 GlobalConfig deserialized = GlobalConfig.fromJson(content);
                 if (deserialized == null) {
-                    LOG.info("Config is empty");
+                    LOG.info("Global config is empty");
                 } else {
                     return deserialized;
                 }

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

@@ -99,7 +99,7 @@ protected GameDirectories createInstance() {
                 JsonDeserializationContext context) throws JsonParseException {
             @Nullable GameDirectories result = super.deserialize(json, typeOfT, context);
             if (result != null) {
-                result.unknownFields.remove(Config.SELECTED_GAME_DIRECTORY_MEMBER_NAME);
+                result.unknownFields.remove(LauncherSettings.SELECTED_GAME_DIRECTORY_MEMBER_NAME);
             }
             return result;
         }

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

@@ -134,7 +134,7 @@ protected GameSettingsPresets createInstance() {
                 JsonDeserializationContext context) throws JsonParseException {
             @Nullable GameSettingsPresets result = super.deserialize(json, typeOfT, context);
             if (result != null) {
-                result.unknownFields.remove(Config.DEFAULT_GAME_SETTINGS_PRESET_MEMBER_NAME);
+                result.unknownFields.remove(LauncherSettings.DEFAULT_GAME_SETTINGS_PRESET_MEMBER_NAME);
             }
             return result;
         }

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

@@ -33,15 +33,15 @@ public final class GlobalConfig extends ObservableSetting {
 
     @Nullable
     public static GlobalConfig fromJson(String json) throws JsonParseException {
-        return Config.CONFIG_GSON.fromJson(json, GlobalConfig.class);
+        return LauncherSettings.GSON.fromJson(json, GlobalConfig.class);
     }
 
     public GlobalConfig() {
         register();
     }
 
     public String toJson() {
-        return Config.CONFIG_GSON.toJson(this);
+        return LauncherSettings.GSON.toJson(this);
     }
 
     @SerializedName("agreementVersion")

…a/org/jackhuang/hmcl/setting/Config.java …huang/hmcl/setting/LauncherSettings.javaHMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java renamed to HMCL/src/main/java/org/jackhuang/hmcl/setting/LauncherSettings.java HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java renamed to HMCL/src/main/java/org/jackhuang/hmcl/setting/LauncherSettings.java

@@ -51,10 +51,10 @@
 /// selected instances, and account selection. Larger domain-specific stores, such as game directories,
 /// game settings presets, accounts, launcher state, and authlib-injector servers, are persisted in detached
 /// JSON files managed by [ConfigHolder].
-@JsonAdapter(value = Config.Adapter.class)
-public final class Config extends ObservableSetting {
+@JsonAdapter(value = LauncherSettings.Adapter.class)
+public final class LauncherSettings extends ObservableSetting {
 
-    /// The JSON schema supported by this config class.
+    /// The JSON schema supported by this launcher settings class.
     public static final JsonSchema CURRENT_SCHEMA = new JsonSchema("settings", new JsonSchema.Version(1, 0, 0));
 
     /// The JSON member name for the default game setting preset ID.
@@ -66,8 +66,8 @@ public final class Config extends ObservableSetting {
     /// The JSON member name for selected instance IDs keyed by game directory ID.
     static final String SELECTED_INSTANCE_MEMBER_NAME = "selectedInstance";
 
-    /// Gson instance used for main config and related settings objects that depend on JavaFX properties.
-    public static final Gson CONFIG_GSON = new GsonBuilder()
+    /// Gson instance used for launcher settings and related settings objects that depend on JavaFX properties.
+    public static final Gson GSON = new GsonBuilder()
             .registerTypeAdapter(Path.class, PathTypeAdapter.INSTANCE)
             .registerTypeAdapter(UUID.class, UUIDTypeAdapter.INSTANCE)
             .registerTypeAdapter(GUID.class, GUIDTypeAdapter.INSTANCE)
@@ -82,30 +82,30 @@ public final class Config extends ObservableSetting {
             .setObjectToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE)
             .create();
 
-    /// Deserializes a config object from JSON.
+    /// Deserializes launcher settings from JSON.
     ///
     /// @param json the JSON object to read
-    /// @return the deserialized config, or `null` if the JSON represents `null`
-    /// @throws JsonParseException if the JSON cannot be deserialized as a config
+    /// @return the deserialized launcher settings, or `null` if the JSON represents `null`
+    /// @throws JsonParseException if the JSON cannot be deserialized as launcher settings
     @Nullable
-    public static Config fromJson(JsonObject json) throws JsonParseException {
-        return CONFIG_GSON.fromJson(json, Config.class);
+    public static LauncherSettings fromJson(JsonObject json) throws JsonParseException {
+        return GSON.fromJson(json, LauncherSettings.class);
     }
 
-    /// Creates an empty config using current defaults.
-    public Config() {
+    /// Creates empty launcher settings using current defaults.
+    public LauncherSettings() {
         tracker.markDirty(schema);
         register();
     }
 
-    /// Serializes this config to formatted JSON.
+    /// Serializes these launcher settings to formatted JSON.
     public String toJson() {
-        return CONFIG_GSON.toJson(this);
+        return GSON.toJson(this);
     }
 
     // Properties
 
-    /// The schema used by this config file.
+    /// The schema used by this launcher settings file.
     @SerializedName(JsonSchema.DEFAULT_MEMBER_NAME)
     private final ObjectProperty<JsonSchema> schema = new SimpleObjectProperty<>(CURRENT_SCHEMA);
 
@@ -477,17 +477,17 @@ public StringProperty selectedAccountProperty() {
         return selectedAccount;
     }
 
-    /// JSON adapter for [Config].
-    public static final class Adapter extends ObservableSetting.Adapter<Config> {
-        /// Creates an empty config for deserialization.
+    /// JSON adapter for [LauncherSettings].
+    public static final class Adapter extends ObservableSetting.Adapter<LauncherSettings> {
+        /// Creates empty launcher settings for deserialization.
         @Override
-        protected Config createInstance() {
-            return new Config();
+        protected LauncherSettings createInstance() {
+            return new LauncherSettings();
         }
 
-        /// Serializes the main config with its stored schema.
+        /// Serializes the main launcher settings with their stored schema.
         @Override
-        public JsonElement serialize(Config src, Type typeOfSrc, JsonSerializationContext context) {
+        public JsonElement serialize(LauncherSettings src, Type typeOfSrc, JsonSerializationContext context) {
             if (src == null) {
                 return JsonNull.INSTANCE;
             }