Skip to content

Commit 70a20b9

Browse files
committed
refactor: update Gson references to use SETTINGS_GSON in multiple classes
1 parent 8088213 commit 70a20b9

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public void duplicateVersion(String srcId, String dstId, boolean copySaves) thro
220220
private GameSettings.Instance copyLocalGameSettings(String id) {
221221
GameSettings.Instance setting = getLocalGameSettings(id);
222222
if (setting != null) {
223-
return JsonUtils.clone(LauncherSettings.GSON, setting, TypeToken.get(GameSettings.Instance.class));
223+
return JsonUtils.clone(LauncherSettings.SETTINGS_GSON, setting, TypeToken.get(GameSettings.Instance.class));
224224
}
225225

226226
GameSettings.Instance copied = new GameSettings.Instance();
@@ -267,7 +267,7 @@ private void loadLocalGameSettings(String id) {
267267

268268
try {
269269
try (var reader = Files.newBufferedReader(file)) {
270-
return LauncherSettings.GSON.fromJson(reader, GameSettings.Instance.class);
270+
return LauncherSettings.SETTINGS_GSON.fromJson(reader, GameSettings.Instance.class);
271271
}
272272
} catch (Exception ex) {
273273
LOG.warning("Failed to load game setting " + file, ex);
@@ -457,7 +457,7 @@ public void saveGameSettings(String id) {
457457
LOG.warning("Failed to create directory: " + file.getParent(), e);
458458
}
459459

460-
FileSaver.save(file, LauncherSettings.GSON.toJson(localGameSettings.get(id)));
460+
FileSaver.save(file, LauncherSettings.SETTINGS_GSON.toJson(localGameSettings.get(id)));
461461
}
462462

463463
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ private static void loadGlobalAccountStorages() {
207207

208208
try (Reader reader = Files.newBufferedReader(LEGACY_GLOBAL_ACCOUNTS_LOCATION)) {
209209
List<Map<Object, Object>> accounts =
210-
LauncherSettings.GSON.fromJson(reader, listTypeOf(mapTypeOf(Object.class, Object.class)));
210+
LauncherSettings.SETTINGS_GSON.fromJson(reader, listTypeOf(mapTypeOf(Object.class, Object.class)));
211211
return accounts != null ? AccountStorages.fromAccounts(accounts) : null;
212212
} catch (Throwable e) {
213213
LOG.warning("Failed to load legacy global accounts", e);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ public final class GlobalConfig extends ObservableSetting {
3333

3434
@Nullable
3535
public static GlobalConfig fromJson(String json) throws JsonParseException {
36-
return LauncherSettings.GSON.fromJson(json, GlobalConfig.class);
36+
return LauncherSettings.SETTINGS_GSON.fromJson(json, GlobalConfig.class);
3737
}
3838

3939
public GlobalConfig() {
4040
register();
4141
}
4242

4343
public String toJson() {
44-
return LauncherSettings.GSON.toJson(this);
44+
return LauncherSettings.SETTINGS_GSON.toJson(this);
4545
}
4646

4747
@SerializedName("agreementVersion")

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public final class LauncherSettings extends ObservableSetting {
6767
static final String SELECTED_INSTANCE_MEMBER_NAME = "selectedInstance";
6868

6969
/// Gson instance used for launcher settings and related settings objects that depend on JavaFX properties.
70-
public static final Gson GSON = new GsonBuilder()
70+
public static final Gson SETTINGS_GSON = new GsonBuilder()
7171
.registerTypeAdapter(Path.class, PathTypeAdapter.INSTANCE)
7272
.registerTypeAdapter(UUID.class, UUIDTypeAdapter.INSTANCE)
7373
.registerTypeAdapter(GUID.class, GUIDTypeAdapter.INSTANCE)
@@ -89,7 +89,7 @@ public final class LauncherSettings extends ObservableSetting {
8989
/// @throws JsonParseException if the JSON cannot be deserialized as launcher settings
9090
@Nullable
9191
public static LauncherSettings fromJson(JsonObject json) throws JsonParseException {
92-
return GSON.fromJson(json, LauncherSettings.class);
92+
return SETTINGS_GSON.fromJson(json, LauncherSettings.class);
9393
}
9494

9595
/// Creates empty launcher settings using current defaults.
@@ -100,7 +100,7 @@ public LauncherSettings() {
100100

101101
/// Serializes these launcher settings to formatted JSON.
102102
public String toJson() {
103-
return GSON.toJson(this);
103+
return SETTINGS_GSON.toJson(this);
104104
}
105105

106106
// Properties

0 commit comments

Comments
 (0)