Fix rogue events warning

This commit is contained in:
Melledy
2024-09-16 01:19:09 -07:00
parent 3db4b2ab3e
commit e5eb277110

View File

@@ -355,14 +355,15 @@ public class ResourceLoader {
private static void loadRogueDialogueEvent() { private static void loadRogueDialogueEvent() {
// Loaded configs count // Loaded configs count
int count = 0; int count = 0;
// Load dialogue event configs // Load dialogue event configs
for (var npcEventExcel : GameData.getRogueNPCExcelMap().values()) { for (var npcEventExcel : GameData.getRogueNPCExcelMap().values()) {
// Get file // Get file
if (npcEventExcel.getNPCJsonPath().isEmpty()) { if (npcEventExcel.getNPCJsonPath().isEmpty()) {
count++; count++;
continue; continue;
} }
File file = new File(LunarCore.getConfig().getResourceDir() + "/" + npcEventExcel.getNPCJsonPath()); File file = new File(LunarCore.getConfig().getResourceDir() + "/" + npcEventExcel.getNPCJsonPath());
if (!file.exists()) { if (!file.exists()) {
continue; continue;
@@ -375,16 +376,22 @@ public class ResourceLoader {
// Load dialogue option // Load dialogue option
for (var dialogue : info.DialogueList) { for (var dialogue : info.DialogueList) {
if (dialogue.getOptionPath() == null) { if (dialogue.getOptionPath() == null) {
count++;
continue; continue;
} }
File optionFile = new File(LunarCore.getConfig().getResourceDir() + "/" + dialogue.getOptionPath()); File optionFile = new File(LunarCore.getConfig().getResourceDir() + "/" + dialogue.getOptionPath());
if (!file.exists()) { if (!file.exists()) {
continue; continue;
} }
RogueDialogueEventConfigInfo optionInfo = gson.fromJson(new FileReader(optionFile), RogueDialogueEventConfigInfo.class);
dialogue.setOptionInfo(optionInfo); try (FileReader optionFileReader = new FileReader(optionFile)) {
RogueDialogueEventConfigInfo optionInfo = gson.fromJson(optionFileReader, RogueDialogueEventConfigInfo.class);
dialogue.setOptionInfo(optionInfo);
} catch (Exception e) {
e.printStackTrace();
}
} }
count++; count++;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@@ -392,9 +399,10 @@ public class ResourceLoader {
} }
// Notify the server owner if we are missing any files // Notify the server owner if we are missing any files
if (count < GameData.getRogueDialogueEventList().size()) { if (count < GameData.getRogueNPCExcelMap().size()) {
LunarCore.getLogger().warn("Rogue dialogue event configs are missing, please check your resources folder: {resources}/Config/Level/Rogue/. Rogue event may not work!"); LunarCore.getLogger().warn("Rogue dialogue event configs are missing, please check your resources folder: {resources}/Config/Level/Rogue/. Rogue event may not work!");
} }
// Done // Done
LunarCore.getLogger().info("Loaded " + count + " rogue events."); LunarCore.getLogger().info("Loaded " + count + " rogue events.");
} }