Mirror/LunarCore
1
0
Fork 0
mirror of https://github.com/Melledy/LunarCore.git synced 2025-12-16 15:24:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

(fix) Add friendly error message for not having resources

Browse Source
This commit is contained in:
KingRainbow44
2023-11-25 23:06:59 -05:00
parent e5133841e7
commit f34ea36610
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/emu/lunarcore/data/ResourceLoader.java
View File

@@ -81,6 +81,8 @@ public class ResourceLoader {
try { try {
loadFromResource(resourceDefinition, type, map); loadFromResource(resourceDefinition, type, map);
} catch (FileNotFoundException e) {
LunarCore.getLogger().error("Resource file not found: {}.", Arrays.toString(type.name()));
} catch (Exception e) { } catch (Exception e) {
LunarCore.getLogger().error("Error loading resource file: " + Arrays.toString(type.name()), e); LunarCore.getLogger().error("Error loading resource file: " + Arrays.toString(type.name()), e);
} }
@@ -164,20 +166,20 @@ public class ResourceLoader {
return count.get(); return count.get();
} }
} }
// Might be better to cache // Might be better to cache
private static void loadFloorInfos() { private static void loadFloorInfos() {
// //
LunarCore.getLogger().info("Loading floor infos... this may take a while."); LunarCore.getLogger().info("Loading floor infos... this may take a while.");
// Load floor infos // Load floor infos
File floorDir = new File(LunarCore.getConfig().getResourceDir() + "/Config/LevelOutput/Floor/"); File floorDir = new File(LunarCore.getConfig().getResourceDir() + "/Config/LevelOutput/Floor/");
if (!floorDir.exists()) { if (!floorDir.exists()) {
LunarCore.getLogger().warn("Floor infos are missing, please check your resources."); LunarCore.getLogger().warn("Floor infos are missing, please check your resources.");
return; return;
} }
// Dump // Dump
for (File file : floorDir.listFiles()) { for (File file : floorDir.listFiles()) {
try (FileReader reader = new FileReader(file)) { try (FileReader reader = new FileReader(file)) {
@@ -188,16 +190,16 @@ public class ResourceLoader {
e.printStackTrace(); e.printStackTrace();
} }
} }
// Load group infos // Load group infos
for (FloorInfo floor : GameData.getFloorInfos().values()) { for (FloorInfo floor : GameData.getFloorInfos().values()) {
for (FloorGroupSimpleInfo simpleGroup : floor.getSimpleGroupList()) { for (FloorGroupSimpleInfo simpleGroup : floor.getSimpleGroupList()) {
File file = new File(LunarCore.getConfig().getResourceDir() + "/" + simpleGroup.getGroupPath()); File file = new File(LunarCore.getConfig().getResourceDir() + "/" + simpleGroup.getGroupPath());
if (!file.exists()) { if (!file.exists()) {
continue; continue;
} }
// TODO optimize // TODO optimize
try (FileReader reader = new FileReader(file)) { try (FileReader reader = new FileReader(file)) {
GroupInfo group = gson.fromJson(reader, GroupInfo.class); GroupInfo group = gson.fromJson(reader, GroupInfo.class);
@@ -207,27 +209,27 @@ public class ResourceLoader {
e.printStackTrace(); e.printStackTrace();
} }
} }
// Post load callback to cache floor info // Post load callback to cache floor info
floor.onLoad(); floor.onLoad();
} }
// Done // Done
LunarCore.getLogger().info("Loaded " + GameData.getFloorInfos().size() + " floor infos."); LunarCore.getLogger().info("Loaded " + GameData.getFloorInfos().size() + " floor infos.");
} }
// Might be better to cache // Might be better to cache
private static void loadMazeAbilities() { private static void loadMazeAbilities() {
int count = 0; int count = 0;
for (var avatarExcel : GameData.getAvatarExcelMap().values()) { for (var avatarExcel : GameData.getAvatarExcelMap().values()) {
// Get file // Get file
File file = new File(LunarCore.getConfig().getResourceDir() + "/Config/ConfigAdventureAbility/LocalPlayer/LocalPlayer_" + avatarExcel.getNameKey() + "_Ability.json"); File file = new File(LunarCore.getConfig().getResourceDir() + "/Config/ConfigAdventureAbility/LocalPlayer/LocalPlayer_" + avatarExcel.getNameKey() + "_Ability.json");
if (!file.exists()) continue; if (!file.exists()) continue;
try (FileReader reader = new FileReader(file)) { try (FileReader reader = new FileReader(file)) {
SkillAbilityInfo avatarSkills = gson.fromJson(reader, SkillAbilityInfo.class); SkillAbilityInfo avatarSkills = gson.fromJson(reader, SkillAbilityInfo.class);
if (avatarSkills.parse(avatarExcel)) { if (avatarSkills.parse(avatarExcel)) {
count++; count++;
} }
@@ -235,15 +237,15 @@ public class ResourceLoader {
e.printStackTrace(); e.printStackTrace();
} }
} }
// Done // Done
LunarCore.getLogger().info("Loaded " + count + " maze abilities for avatars."); LunarCore.getLogger().info("Loaded " + count + " maze abilities for avatars.");
} }
private static void loadRogueMapGen() { private static void loadRogueMapGen() {
File file = new File(LunarCore.getConfig().getDataDir() + "/RogueMapGen.json"); File file = new File(LunarCore.getConfig().getDataDir() + "/RogueMapGen.json");
if (!file.exists()) return; if (!file.exists()) return;
try (FileReader reader = new FileReader(file)) { try (FileReader reader = new FileReader(file)) {
Map<Integer, int[]> rogue = gson.fromJson(reader, TypeToken.getParameterized(Map.class, Integer.class, int[].class).getType()); Map<Integer, int[]> rogue = gson.fromJson(reader, TypeToken.getParameterized(Map.class, Integer.class, int[].class).getType());