fix(setting): Correct spelling of 'saveable' to 'savable'

Author: Glavo

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

@@ -82,18 +82,18 @@ public void setSchema(JsonSchema schema) {
     }
 
     /// Whether this account storage list may be saved back to its JSON file.
-    private transient boolean saveable = true;
+    private transient boolean savable = true;
 
     /// Returns whether this account storage list may be saved back to its JSON file.
     @Override
-    public boolean isSaveable() {
-        return saveable;
+    public boolean isSavable() {
+        return savable;
     }
 
     /// Sets whether this account storage list may be saved back to its JSON file.
     @Override
-    public void setSaveable(boolean saveable) {
-        this.saveable = saveable;
+    public void setSavable(boolean savable) {
+        this.savable = savable;
     }
 
     /// Serialized account entries.

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

@@ -90,18 +90,18 @@ public void setSchema(JsonSchema schema) {
     }
 
     /// Whether this server list may be saved back to `authlib-injector-servers.json`.
-    private transient boolean saveable = true;
+    private transient boolean savable = true;
 
     /// Returns whether this server list may be saved back to `authlib-injector-servers.json`.
     @Override
-    public boolean isSaveable() {
-        return saveable;
+    public boolean isSavable() {
+        return savable;
     }
 
     /// Sets whether this server list may be saved back to `authlib-injector-servers.json`.
     @Override
-    public void setSaveable(boolean saveable) {
-        this.saveable = saveable;
+    public void setSavable(boolean savable) {
+        this.savable = savable;
     }
 
     /// Authlib-injector authentication servers available for account login.

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

@@ -71,18 +71,18 @@ public void setSchema(JsonSchema schema) {
     }
 
     /// Whether this game directory store may be saved back to its JSON file.
-    private transient boolean saveable = true;
+    private transient boolean savable = true;
 
     /// Returns whether this game directory store may be saved back to its JSON file.
     @Override
-    public boolean isSaveable() {
-        return saveable;
+    public boolean isSavable() {
+        return savable;
     }
 
     /// Sets whether this game directory store may be saved back to its JSON file.
     @Override
-    public void setSaveable(boolean saveable) {
-        this.saveable = saveable;
+    public void setSavable(boolean savable) {
+        this.savable = savable;
     }
 
     /// Game directories stored in this file.

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

@@ -108,18 +108,18 @@ public void setSchema(JsonSchema schema) {
         }
 
         /// Whether this instance setting may be saved back to its JSON file.
-        private transient boolean saveable = true;
+        private transient boolean savable = true;
 
         /// Returns whether this instance setting may be saved back to its JSON file.
         @Override
-        public boolean isSaveable() {
-            return saveable;
+        public boolean isSavable() {
+            return savable;
         }
 
         /// Sets whether this instance setting may be saved back to its JSON file.
         @Override
-        public void setSaveable(boolean saveable) {
-            this.saveable = saveable;
+        public void setSavable(boolean savable) {
+            this.savable = savable;
         }
 
         /// The parent preset ID.

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

@@ -81,18 +81,18 @@ public void setSchema(JsonSchema schema) {
     }
 
     /// Whether this preset store may be saved back to `game-settings.json`.
-    private transient boolean saveable = true;
+    private transient boolean savable = true;
 
     /// Returns whether this preset store may be saved back to `game-settings.json`.
     @Override
-    public boolean isSaveable() {
-        return saveable;
+    public boolean isSavable() {
+        return savable;
     }
 
     /// Sets whether this preset store may be saved back to `game-settings.json`.
     @Override
-    public void setSaveable(boolean saveable) {
-        this.saveable = saveable;
+    public void setSavable(boolean savable) {
+        this.savable = savable;
     }
 
     /// Reusable game setting presets.

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

@@ -34,10 +34,10 @@ interface JsonSchemaSetting {
     void setSchema(JsonSchema schema);
 
     /// Returns whether this settings object may be saved back to its JSON file.
-    boolean isSaveable();
+    boolean isSavable();
 
     /// Sets whether this settings object may be saved back to its JSON file.
     ///
-    /// @param saveable whether this settings object may be saved
-    void setSaveable(boolean saveable);
+    /// @param savable whether this settings object may be saved
+    void setSavable(boolean savable);
 }

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

@@ -116,8 +116,8 @@ LoadResult<T> load(@Nullable T migrated) throws IOException {
     }
 
     /// Creates a load result and stores the saveability metadata on the settings object.
-    private LoadResult<T> result(T value, boolean saveable) {
-        value.setSaveable(saveable);
+    private LoadResult<T> result(T value, boolean savable) {
+        value.setSavable(savable);
         return new LoadResult<>(value);
     }
 

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

@@ -122,18 +122,18 @@ public void setSchema(JsonSchema schema) {
     }
 
     /// Whether this launcher settings object may be saved back to `settings.json`.
-    private transient boolean saveable = true;
+    private transient boolean savable = true;
 
     /// Returns whether this launcher settings object may be saved back to `settings.json`.
     @Override
-    public boolean isSaveable() {
-        return saveable;
+    public boolean isSavable() {
+        return savable;
     }
 
     /// Sets whether this launcher settings object may be saved back to `settings.json`.
     @Override
-    public void setSaveable(boolean saveable) {
-        this.saveable = saveable;
+    public void setSavable(boolean savable) {
+        this.savable = savable;
     }
 
     /// The launcher UI language.

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

@@ -74,18 +74,18 @@ public void setSchema(JsonSchema schema) {
     }
 
     /// Whether this launcher state may be saved back to `launcher-state.json`.
-    private transient boolean saveable = true;
+    private transient boolean savable = true;
 
     /// Returns whether this launcher state may be saved back to `launcher-state.json`.
     @Override
-    public boolean isSaveable() {
-        return saveable;
+    public boolean isSavable() {
+        return savable;
     }
 
     /// Sets whether this launcher state may be saved back to `launcher-state.json`.
     @Override
-    public void setSaveable(boolean saveable) {
-        this.saveable = saveable;
+    public void setSavable(boolean savable) {
+        this.savable = savable;
     }
 
     /// The normalized launcher window content X position.

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

@@ -428,7 +428,7 @@ public static void init() throws IOException {
         loadUserGameAccounts();
         loadGameAccounts(detachedSettingsFallback.accountStorages());
 
-        if (launcherSettings.isSaveable()) {
+        if (launcherSettings.isSavable()) {
             launcherSettings.addListener(source -> {
                 // Back up the invalid on-disk file the first time we are about to overwrite it.
                 if (needBackupSettings) {
@@ -510,9 +510,9 @@ private static LauncherSettingsLoadResult loadLauncherSettings() throws IOExcept
     /// Creates a launcher settings load result and stores saveability metadata on the settings object.
     private static LauncherSettingsLoadResult launcherSettingsResult(
             LauncherSettings settings,
-            boolean saveable,
+            boolean savable,
             boolean unsupported) {
-        settings.setSaveable(saveable);
+        settings.setSavable(savable);
         return new LauncherSettingsLoadResult(settings, unsupported);
     }
 
@@ -538,16 +538,16 @@ private static void loadGameDirectories(
         localGameDirectories = localResult.value();
         localGameDirectories.setUserFile(false);
         gameDirectories = mergeGameDirectories(userGameDirectories, localGameDirectories);
-        if (localGameDirectories.isSaveable() || userGameDirectories.isSaveable()) {
+        if (localGameDirectories.isSavable() || userGameDirectories.isSavable()) {
             gameDirectories.addListener((InvalidationListener) source -> saveGameDirectories());
         }
 
-        if (newlyCreatedLocal && localGameDirectories.isSaveable()) {
+        if (newlyCreatedLocal && localGameDirectories.isSavable()) {
             LOG.info("Creating game directories file " + LOCAL_GAME_DIRECTORIES_LOCATION);
             saveLocalGameDirectories();
         }
 
-        if (newlyCreatedUser && userGameDirectories.isSaveable()) {
+        if (newlyCreatedUser && userGameDirectories.isSavable()) {
             LOG.info("Creating user game directories file " + USER_GAME_DIRECTORIES_LOCATION);
             saveUserGameDirectories();
         }
@@ -577,10 +577,10 @@ private static void addMergedGameDirectory(ObservableList<Profile> merged, Profi
 
     /// Saves the merged game directory store into the writable backing files.
     private static void saveGameDirectories() {
-        if (localGameDirectories.isSaveable()) {
+        if (localGameDirectories.isSavable()) {
             saveLocalGameDirectories();
         }
-        if (userGameDirectories.isSaveable()) {
+        if (userGameDirectories.isSavable()) {
             saveUserGameDirectories();
         }
     }
@@ -600,7 +600,7 @@ private static void saveUserGameDirectories() {
     /// Creates a game directory file containing only profiles that belong to the target storage location.
     private static GameDirectories createScopedGameDirectories(boolean userGameDirectories) {
         GameDirectories result = new GameDirectories();
-        result.setSaveable(true);
+        result.setSavable(true);
         result.setUserFile(userGameDirectories);
         for (Profile profile : getGameDirectories()) {
             if (profile.shouldSaveToUserGameDirectory() == userGameDirectories) {
@@ -625,12 +625,12 @@ private static void loadGameSettingsPresets(
         JsonSettingFile.LoadResult<GameSettingsPresets> result =
                 GAME_SETTINGS_FILE.load(fallbackGameSettingsPresets);
         gameSettingsPresets = result.value();
-        if (gameSettingsPresets.isSaveable()) {
+        if (gameSettingsPresets.isSavable()) {
             GAME_SETTINGS_FILE.installAutoSave(gameSettingsPresets);
         }
         normalizeGameSettingsPresets();
 
-        if (newlyCreated && gameSettingsPresets.isSaveable()) {
+        if (newlyCreated && gameSettingsPresets.isSavable()) {
             LOG.info("Creating game settings file " + GAME_SETTINGS_LOCATION);
             GAME_SETTINGS_FILE.save(gameSettingsPresets);
         }
@@ -660,11 +660,11 @@ private static void loadLauncherState(
         JsonSettingFile.LoadResult<LauncherState> result =
                 STATE_FILE.load(fallbackLauncherState);
         launcherState = result.value();
-        if (launcherState.isSaveable()) {
+        if (launcherState.isSavable()) {
             STATE_FILE.installAutoSave(launcherState);
         }
 
-        if (newlyCreated && launcherState.isSaveable()) {
+        if (newlyCreated && launcherState.isSavable()) {
             LOG.info("Creating launcher state file " + STATE_LOCATION);
             STATE_FILE.save(launcherState);
         }
@@ -687,11 +687,11 @@ private static void loadAuthlibInjectorServers(
         JsonSettingFile.LoadResult<AuthlibInjectorServerList> result =
                 AUTHLIB_INJECTOR_SERVERS_FILE.load(fallbackAuthlibInjectorServers);
         authlibInjectorServers = result.value();
-        if (authlibInjectorServers.isSaveable()) {
+        if (authlibInjectorServers.isSavable()) {
             AUTHLIB_INJECTOR_SERVERS_FILE.installAutoSave(authlibInjectorServers);
         }
 
-        if (newlyCreated && authlibInjectorServers.isSaveable()) {
+        if (newlyCreated && authlibInjectorServers.isSavable()) {
             LOG.info("Creating authlib-injector servers file " + AUTHLIB_INJECTOR_SERVERS_LOCATION);
             AUTHLIB_INJECTOR_SERVERS_FILE.save(authlibInjectorServers);
         }
@@ -711,11 +711,11 @@ private static void loadUserGameAccounts() {
         try {
             JsonSettingFile.LoadResult<AccountStorages> result = USER_GAME_ACCOUNTS_FILE.load(migrated);
             userGameAccounts = result.value();
-            if (userGameAccounts.isSaveable()) {
+            if (userGameAccounts.isSavable()) {
                 USER_GAME_ACCOUNTS_FILE.installAutoSave(userGameAccounts);
             }
 
-            if (newlyCreated && userGameAccounts.isSaveable()) {
+            if (newlyCreated && userGameAccounts.isSavable()) {
                 LOG.info("Creating user game accounts file " + USER_GAME_ACCOUNTS_LOCATION);
                 USER_GAME_ACCOUNTS_FILE.save(userGameAccounts);
                 if (migrationResult != null) {
@@ -774,11 +774,11 @@ private static void loadGameAccounts(
         JsonSettingFile.LoadResult<AccountStorages> result =
                 GAME_ACCOUNTS_FILE.load(fallbackGameAccounts);
         gameAccounts = result.value();
-        if (gameAccounts.isSaveable()) {
+        if (gameAccounts.isSavable()) {
             GAME_ACCOUNTS_FILE.installAutoSave(gameAccounts);
         }
 
-        if (newlyCreated && gameAccounts.isSaveable()) {
+        if (newlyCreated && gameAccounts.isSavable()) {
             LOG.info("Creating game accounts file " + GAME_ACCOUNTS_LOCATION);
             GAME_ACCOUNTS_FILE.save(gameAccounts);
         }
@@ -858,11 +858,11 @@ private static void loadUserSettings(
                 : null;
         JsonSettingFile.LoadResult<UserSettings> result = USER_SETTINGS_FILE.load(migratedUserSettings);
         userSettingsInstance = result.value();
-        if (userSettingsInstance.isSaveable()) {
+        if (userSettingsInstance.isSavable()) {
             USER_SETTINGS_FILE.installAutoSave(userSettingsInstance);
         }
 
-        if (newlyCreated && migratedUserSettings != null && userSettingsInstance.isSaveable()) {
+        if (newlyCreated && migratedUserSettings != null && userSettingsInstance.isSavable()) {
             LOG.info("Creating user settings file " + USER_SETTINGS_LOCATION);
             USER_SETTINGS_FILE.save(userSettingsInstance);
         }
@@ -883,11 +883,11 @@ private static void loadUserState(
                 : null;
         JsonSettingFile.LoadResult<UserState> result = USER_STATE_FILE.load(migratedUserState);
         userStateInstance = result.value();
-        if (userStateInstance.isSaveable()) {
+        if (userStateInstance.isSavable()) {
             USER_STATE_FILE.installAutoSave(userStateInstance);
         }
 
-        if (newlyCreated && userStateInstance.isSaveable()) {
+        if (newlyCreated && userStateInstance.isSavable()) {
             LOG.info("Creating user state file " + USER_STATE_LOCATION);
             USER_STATE_FILE.save(userStateInstance);
         }