From d5c7dcfe9024765203be45fe6b9434809bc20857 Mon Sep 17 00:00:00 2001 From: tildejustin Date: Tue, 28 Jan 2025 17:20:08 -0500 Subject: [PATCH] fix event resource loading in dev --- .../com/redlimerl/speedrunigt/events/EventFactoryLoader.java | 2 +- .../java/com/redlimerl/speedrunigt/utils/ResourcesHelper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/redlimerl/speedrunigt/events/EventFactoryLoader.java b/src/main/java/com/redlimerl/speedrunigt/events/EventFactoryLoader.java index 4aafead7..fc35350a 100644 --- a/src/main/java/com/redlimerl/speedrunigt/events/EventFactoryLoader.java +++ b/src/main/java/com/redlimerl/speedrunigt/events/EventFactoryLoader.java @@ -46,7 +46,7 @@ private static void loadEventFactories() { String[] parts = resource.split("/"); String source = parts[parts.length - 1].replace(".json", ""); - InputStream stream = ResourcesHelper.toStream(resource); + InputStream stream = ResourcesHelper.toStream("/" + resource); String content = IOUtils.toString(stream, Charset.defaultCharset()); JsonArray eventsArray = PARSER.parse(content).getAsJsonArray(); for (JsonElement element : eventsArray) { diff --git a/src/main/java/com/redlimerl/speedrunigt/utils/ResourcesHelper.java b/src/main/java/com/redlimerl/speedrunigt/utils/ResourcesHelper.java index 776a0ab8..2ca0aa42 100644 --- a/src/main/java/com/redlimerl/speedrunigt/utils/ResourcesHelper.java +++ b/src/main/java/com/redlimerl/speedrunigt/utils/ResourcesHelper.java @@ -26,7 +26,7 @@ public static String[] getResourceChildren(String folder) throws IOException, UR path = Paths.get(parent.toURI()); } try (Stream children = Files.list(path)) { - return children.map(Path::toString).toArray(String[]::new); + return children.map(inner -> inner.subpath(inner.getNameCount() - 2, inner.getNameCount())).map(Path::toString).toArray(String[]::new); } }