Fix loading from topmost resource pack

lukebemishprojects · Jan 4, 2024 · f817258 · f817258
1 parent 8723559
commit f817258
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/common/src/main/java/dev/lukebemish/dynamicassetgenerator/api/ResourceGenerationContext.java b/common/src/main/java/dev/lukebemish/dynamicassetgenerator/api/ResourceGenerationContext.java
@@ -199,13 +199,14 @@ static ResourceGenerationContext.ResourceSource of(PackType type, Supplier<Strea
 
                 @Override
                 public @Nullable IoSupplier<InputStream> getResource(@NonNull ResourceLocation location) {
+                    IoSupplier<InputStream> found = null;
                     for (PackResources pack : packs.get()) {
                         IoSupplier<InputStream> resource = pack.getResource(type, location);
                         if (resource != null) {
-                            return resource;
+                            found = resource;
                         }
                     }
-                    return null;
+                    return found;
                 }
 
                 @Override
@@ -217,6 +218,7 @@ public List<IoSupplier<InputStream>> getResourceStack(@NonNull ResourceLocation
                             out.add(resource);
                         }
                     }
+                    Collections.reverse(out);
                     return out;
                 }
 
@@ -227,9 +229,7 @@ public Map<ResourceLocation, IoSupplier<InputStream>> listResources(@NonNull Str
                         for (String namespace : pack.getNamespaces(type)) {
                             pack.listResources(type, namespace, path, (rl, s) -> {
                                 if (filter.test(rl)) {
-                                    if (!resources.containsKey(rl)) {
-                                        resources.put(rl, s);
-                                    }
+                                    resources.put(rl, s);
                                 }
                             });
                         }
@@ -250,6 +250,9 @@ public Map<ResourceLocation, List<IoSupplier<InputStream>>> listResourceStacks(@
                             });
                         }
                     }
+                    for (var list : resources.values()) {
+                        Collections.reverse(list);
+                    }
                     return resources;
                 }