diff --git a/src/main/java/emu/grasscutter/data/ResourceLoader.java b/src/main/java/emu/grasscutter/data/ResourceLoader.java index d89f1e1b8..f68244361 100644 --- a/src/main/java/emu/grasscutter/data/ResourceLoader.java +++ b/src/main/java/emu/grasscutter/data/ResourceLoader.java @@ -465,7 +465,7 @@ public class ResourceLoader { } try { var sceneId = Integer.parseInt(matcher.group(1)); - var data = JsonUtils.loadToClass(filename, HomeworldDefaultSaveData.class); + var data = JsonUtils.loadToClass(file.toString(), HomeworldDefaultSaveData.class); GameData.getHomeworldDefaultSaveData().put(sceneId, data); } catch (Exception ignored) {} }); @@ -480,7 +480,7 @@ public class ResourceLoader { return; } try { - var data = JsonUtils.loadToClass(file.getFileName().toString(), SceneNpcBornData.class); + var data = JsonUtils.loadToClass(file.toString(), SceneNpcBornData.class); if (data.getBornPosList() == null || data.getBornPosList().size() == 0) { return; } diff --git a/src/main/java/emu/grasscutter/data/excels/ItemData.java b/src/main/java/emu/grasscutter/data/excels/ItemData.java index 6a97e6efe..7ff869f7f 100644 --- a/src/main/java/emu/grasscutter/data/excels/ItemData.java +++ b/src/main/java/emu/grasscutter/data/excels/ItemData.java @@ -75,7 +75,7 @@ public class ItemData extends GameResource { private int comfort; private List furnType; private List furnitureGadgetID; - @SerializedName("JFDLJGDFIGL") + @SerializedName(value="OHIANNAEEAK", alternate={"DANFGGLKLNO", "JFDLJGDFIGL"}) private int roomSceneId; // Custom