Grasscutter
/
Grasscutter
mirror of https://github.com/Grasscutters/Grasscutter.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix QuestEncryptionKeys Path (#1696) 

* Fix QuestEncryptionKeys Path

* Load resources QuestEncryptionKeys
This commit is contained in:
omg-xtao 2022-08-23 21:59:52 +08:00 committed by GitHub
parent 1dd84d69b3
commit 5db73d2849
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/data/DataLoader.java
View File

@ -112,7 +112,7 @@ public class DataLoader {
if (!Utils.fileExists(filePath)) {
// Check if file is in subdirectory
if (name.indexOf("/") != -1) {
if (name.contains("/")) {
String[] path = name.split("/");
String folder = "";

15
src/main/java/emu/grasscutter/data/ResourceLoader.java
View File

@ -413,13 +413,18 @@ public class ResourceLoader {
}
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);
}