Skip to content

Commit f897b9e

Browse files
committed
Rename game directories JSON field to directories
1 parent a4b8287 commit f897b9e

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void setSchema(JsonSchema schema) {
7474
}
7575

7676
/// Per-workspace game directories.
77-
@SerializedName("gameDirectories")
77+
@SerializedName("directories")
7878
private final ObservableList<Profile> gameDirectories =
7979
FXCollections.observableArrayList(profile -> new Observable[] { profile });
8080

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ private static void ensureDefaultGameSettingsPreset(LauncherSettings launcherSet
292292

293293
JsonObject object = new JsonObject();
294294
object.add(JsonSchema.DEFAULT_MEMBER_NAME, JsonUtils.GSON.toJsonTree(GameDirectories.CURRENT_SCHEMA, JsonSchema.class));
295-
object.add("gameDirectories", profiles);
295+
object.add("directories", profiles);
296296

297297
return JsonUtils.GSON.fromJson(object, GameDirectories.class);
298298
}

HMCL/src/test/java/org/jackhuang/hmcl/setting/GameDirectoriesTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public void doesNotStoreSelectedGameDirectoryInGameDirectories() {
191191
{
192192
"$schema": "https://schemas.glavo.site/hmcl/game-directories/1.0.0",
193193
"selectedGameDirectory": "123e4567-e89b-12d3-a456-426614174000",
194-
"gameDirectories": []
194+
"directories": []
195195
}
196196
""").getAsJsonObject();
197197

@@ -202,7 +202,7 @@ public void doesNotStoreSelectedGameDirectoryInGameDirectories() {
202202
assertEquals(GameDirectories.CURRENT_SCHEMA,
203203
JsonSchema.readFromMember(rewritten, JsonSchema.DEFAULT_MEMBER_NAME));
204204
assertFalse(rewritten.has(LauncherSettings.SELECTED_GAME_DIRECTORY_MEMBER_NAME));
205-
assertTrue(rewritten.has("gameDirectories"));
205+
assertTrue(rewritten.has("directories"));
206206
}
207207

208208
/// Tests that patch-version schemas are preserved together with unknown fields.
@@ -215,7 +215,7 @@ public void preservesPatchSchemaAndUnknownFields(@TempDir Path tempDir) throws I
215215
"futureField": {
216216
"enabled": true
217217
},
218-
"gameDirectories": []
218+
"directories": []
219219
}
220220
""");
221221

0 commit comments

Comments
 (0)