From 3497adfa6db1fae5754874eda081fb7b93b91277 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sun, 16 Apr 2023 13:21:10 -0400 Subject: [PATCH] Bugfixes --- .../mixin/perf/resourcepacks/ModFileResourcePackMixin.java | 2 +- .../java/org/embeddedt/modernfix/util/CachedResourcePath.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/ModFileResourcePackMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/ModFileResourcePackMixin.java index a4af0a11..147a1b4c 100644 --- a/src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/ModFileResourcePackMixin.java +++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/ModFileResourcePackMixin.java @@ -82,7 +82,7 @@ public abstract class ModFileResourcePackMixin { } private boolean isValidCachedResourcePath(Path path) { - if(path.getFileName() == null) { + if(path.getFileName() == null || path.getNameCount() == 0) { return false; } String str = path.toString(); diff --git a/src/main/java/org/embeddedt/modernfix/util/CachedResourcePath.java b/src/main/java/org/embeddedt/modernfix/util/CachedResourcePath.java index 4f3d287d..03a851c7 100644 --- a/src/main/java/org/embeddedt/modernfix/util/CachedResourcePath.java +++ b/src/main/java/org/embeddedt/modernfix/util/CachedResourcePath.java @@ -29,7 +29,8 @@ public class CachedResourcePath { } public CachedResourcePath(String s) { - this(NO_PREFIX, SLASH_SPLITTER.splitToList(s)); + // normalize so we can guarantee there are no empty sections + this(NO_PREFIX, SLASH_SPLITTER.splitToList(FileUtil.normalize(s))); } public CachedResourcePath(String[] prefixElements, Collection collection) {