From 4964cccff9026b4bf257e35d919ab29166c35322 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sun, 18 May 2025 15:36:12 -0400 Subject: [PATCH] Ensure files in assets/ are not counted as namespaces --- .../resources/PackResourcesCacheEngine.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java b/common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java index 479c8398..f07eabbc 100644 --- a/common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java +++ b/common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java @@ -147,9 +147,17 @@ public class PackResourcesCacheEngine { public Set getNamespaces(PackType type) { awaitLoad(); - if(PackTypeHelper.isVanillaPackType(type)) - return this.root.getChild(type.getDirectory()).children.keySet(); - else + if(PackTypeHelper.isVanillaPackType(type)) { + var namespaceToNodeMap = this.root.getChild(type.getDirectory()).children; + var results = new ObjectOpenHashSet(); + for (var entry : namespaceToNodeMap.entrySet()) { + // Entries without children are files, not folders + if (!entry.getValue().children.isEmpty()) { + results.add(entry.getKey()); + } + } + return results; + } else return null; }