diff --git a/common/src/main/java/net/infumia/pack/FileResourceMergerDefault.java b/common/src/main/java/net/infumia/pack/FileResourceMergerDefault.java index 1dbe5fa..a9ec2fe 100644 --- 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 merge(final Collection resources) final MultiMap atlases = new MultiMap<>(); final MultiMap models = new MultiMap<>(); + final HashSet remainings = new HashSet<>(); for (final FileResource resource : simplified) { if (resource instanceof FileResourceAtlas) { final Atlas atlas = ((FileResourceAtlas) resource).atlas; @@ -32,6 +33,9 @@ public Collection merge(final Collection resources) models.put(model.key(), model); } // TODO: portlek, Merge more things. + else { + remainings.add(resource); + } } final Collection mergedAtlases = new HashSet<>(atlases.keys().size()); @@ -81,6 +85,7 @@ public Collection merge(final Collection resources) mergedResources.addAll( mergedModels.stream().map(FileResources::model).collect(Collectors.toSet()) ); + mergedResources.addAll(remainings); return mergedResources; }