Fix QuestEncryptionKeys Path (Grasscutters#1696)

* Fix QuestEncryptionKeys Path * Load resources QuestEncryptionKeys
bellavee · Aug 23, 2022 · 5db73d2 · 5db73d2
1 parent 1dd84d6
commit 5db73d2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/emu/grasscutter/data/DataLoader.java b/src/main/java/emu/grasscutter/data/DataLoader.java
@@ -112,7 +112,7 @@ private static void checkAndCopyData(String name) {
 
         if (!Utils.fileExists(filePath)) {
             // Check if file is in subdirectory
-            if (name.indexOf("/") != -1) {
+            if (name.contains("/")) {
                 String[] path = name.split("/");
 
                 String folder = "";

diff --git a/src/main/java/emu/grasscutter/data/ResourceLoader.java b/src/main/java/emu/grasscutter/data/ResourceLoader.java
@@ -413,13 +413,18 @@ private static void loadQuests() {
         }
 
         try {
-            List<QuestEncryptionKey> keys = DataLoader.loadList("QuestEncryptionKeys.json", QuestEncryptionKey.class);
-
+            List<QuestEncryptionKey> keys;
             Int2ObjectMap<QuestEncryptionKey> questEncryptionMap = GameData.getMainQuestEncryptionMap();
-            keys.forEach(key -> questEncryptionMap.put(key.getMainQuestId(), key));
+            String path = "QuestEncryptionKeys.json";
+            if (Utils.fileExists(RESOURCE(path))) {
+                keys = JsonUtils.loadToList(RESOURCE(path), QuestEncryptionKey.class);
+                keys.forEach(key -> questEncryptionMap.put(key.getMainQuestId(), key));
+            }
+            if (Utils.fileExists(DATA(path))) {
+                keys = DataLoader.loadList(path, QuestEncryptionKey.class);
+                keys.forEach(key -> questEncryptionMap.put(key.getMainQuestId(), key));
+            }
             Grasscutter.getLogger().debug("Loaded {} quest keys.", questEncryptionMap.size());
-        } catch (FileNotFoundException | NullPointerException ignored) {
-            Grasscutter.getLogger().warn("Unable to load quest keys - ./resources/QuestEncryptionKeys.json not found.");
         } catch (Exception e) {
             Grasscutter.getLogger().error("Unable to load quest keys.", e);
         }