From 96caa7db179b70aa3df64f2500e8c5309c7a4acc Mon Sep 17 00:00:00 2001
From: pfyy <112098515+pfyy@users.noreply.github.com>
Date: Wed, 31 Aug 2022 17:13:48 +0800
Subject: [PATCH] fix serenitea pot (#1726)

* partial fix of serenitea pot

* fix serenitea pot
---
 src/main/java/emu/grasscutter/data/ResourceLoader.java  | 4 ++--
 src/main/java/emu/grasscutter/data/excels/ItemData.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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<Integer> furnType;
     private List<Integer> furnitureGadgetID;
-    @SerializedName("JFDLJGDFIGL")
+    @SerializedName(value="OHIANNAEEAK", alternate={"DANFGGLKLNO", "JFDLJGDFIGL"})
     private int roomSceneId;
 
     // Custom