Add unmerged resources to 'remainings'

Infumia · Jul 12, 2024 · 2e779d1 · 2e779d1
1 parent 8903cf9
commit 2e779d1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/common/src/main/java/net/infumia/pack/FileResourceMergerDefault.java b/common/src/main/java/net/infumia/pack/FileResourceMergerDefault.java
@@ -23,6 +23,7 @@ public Collection<FileResource> merge(final Collection<FileResource> resources)
 
         final MultiMap<Key, Atlas> atlases = new MultiMap<>();
         final MultiMap<Key, Model> models = new MultiMap<>();
+        final HashSet<FileResource> remainings = new HashSet<>();
         for (final FileResource resource : simplified) {
             if (resource instanceof FileResourceAtlas) {
                 final Atlas atlas = ((FileResourceAtlas) resource).atlas;
@@ -32,6 +33,9 @@ public Collection<FileResource> merge(final Collection<FileResource> resources)
                 models.put(model.key(), model);
             }
             // TODO: portlek, Merge more things.
+            else {
+                remainings.add(resource);
+            }
         }
 
         final Collection<Atlas> mergedAtlases = new HashSet<>(atlases.keys().size());
@@ -81,6 +85,7 @@ public Collection<FileResource> merge(final Collection<FileResource> resources)
         mergedResources.addAll(
             mergedModels.stream().map(FileResources::model).collect(Collectors.toSet())
         );
+        mergedResources.addAll(remainings);
         return mergedResources;
     }