use list instead of set.

Infumia · Jul 16, 2024 · 153aca5 · 153aca5
1 parent 986940d
commit 153aca5
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 18 deletions.
diff --git a/common/src/main/java/net/infumia/pack/FileResourceMergerDefault.java b/common/src/main/java/net/infumia/pack/FileResourceMergerDefault.java
@@ -112,7 +112,7 @@ private Collection<FileResource> simplify(final FileResource resource) {
                 .flatMap(Collection::stream)
                 .collect(Collectors.toSet());
         } else {
-            return Collections.singleton(resource);
+            return Collections.singletonList(resource);
         }
     }
 }
diff --git a/common/src/main/java/net/infumia/pack/GlyphImageImpl.java b/common/src/main/java/net/infumia/pack/GlyphImageImpl.java
@@ -5,7 +5,7 @@
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Set;
+import java.util.List;
 import javax.imageio.ImageIO;
 import net.infumia.pack.exception.ResourceAlreadyProducedException;
 import net.infumia.pack.exception.ResourceNotProducedException;
@@ -22,7 +22,7 @@ final class GlyphImageImpl implements GlyphImage {
     private final TextureProperties properties;
 
     private Character character;
-    private Set<FontProvider> fontProviders;
+    private List<FontProvider> fontProviders;
 
     private int width = -1;
 
@@ -55,7 +55,7 @@ public void produce(final ArbitraryCharacterFactory characterFactory)
         fontProviderBuilder.file(this.texture.key());
         fontProviderBuilder.ascent(this.properties.ascent());
         fontProviderBuilder.height(this.properties.height());
-        this.fontProviders = Collections.singleton(fontProviderBuilder.build());
+        this.fontProviders = Collections.singletonList(fontProviderBuilder.build());
     }
 
     @Override
@@ -68,7 +68,7 @@ public Collection<FontProvider> fontProviders() throws ResourceNotProducedExcept
 
     @Override
     public Collection<Texture> textures() throws ResourceNotProducedException {
-        return Collections.singleton(this.texture);
+        return Collections.singletonList(this.texture);
     }
 
     @Override

diff --git a/common/src/main/java/net/infumia/pack/PackDefault.java b/common/src/main/java/net/infumia/pack/PackDefault.java
@@ -1,18 +1,18 @@
 package net.infumia.pack;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 final class PackDefault implements Pack {
 
     private final FileResourceCompiler compiler;
     private final FileResourceMerger merger;
     private final Map<String, ResourceProducer> raw = new HashMap<>();
     private final Map<String, ResourceProducer> compiled = new HashMap<>();
-    private final Set<FileResource> resources = new HashSet<>();
+    private final List<FileResource> resources = new ArrayList<>();
 
     PackDefault(final FileResourceCompiler compiler, final FileResourceMerger merger) {
         this.compiler = compiler;

diff --git a/common/src/main/java/net/infumia/pack/ResourceProducerSpacesMojang.java b/common/src/main/java/net/infumia/pack/ResourceProducerSpacesMojang.java
@@ -36,7 +36,7 @@ public void produce(final ArbitraryCharacterFactory characterFactory) {
                 length * (-1)
             );
         }
-        this.fontProviders = Collections.singleton(fontProviderBuilder.build());
+        this.fontProviders = Collections.singletonList(fontProviderBuilder.build());
     }
 
     @Override

diff --git a/language/src/main/java/net/infumia/pack/ResourceProducerImageMulticharImpl.java b/language/src/main/java/net/infumia/pack/ResourceProducerImageMulticharImpl.java
@@ -9,7 +9,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import javax.imageio.ImageIO;
 import net.infumia.pack.exception.ResourceAlreadyProducedException;
 import net.infumia.pack.exception.ResourceNotProducedException;
@@ -29,7 +28,7 @@ final class ResourceProducerImageMulticharImpl implements ResourceProducerImageM
     private final TextureProperties properties;
     private final List<String> charactersMapping;
 
-    private Set<FontProvider> fontProviders;
+    private List<FontProvider> fontProviders;
     private BufferedImage image;
 
     ResourceProducerImageMulticharImpl(
@@ -76,7 +75,7 @@ public void produce(final ArbitraryCharacterFactory characterFactory)
             mappingLines.add(builder.toString());
         }
         fontProviderBuilder.characters(mappingLines);
-        this.fontProviders = Collections.singleton(fontProviderBuilder.build());
+        this.fontProviders = Collections.singletonList(fontProviderBuilder.build());
     }
 
     @Override
@@ -86,7 +85,7 @@ public Collection<FontProvider> fontProviders() throws ResourceNotProducedExcept
 
     @Override
     public Collection<Texture> textures() throws ResourceNotProducedException {
-        return Collections.singleton(this.texture);
+        return Collections.singletonList(this.texture);
     }
 
     @Override

diff --git a/language/src/main/java/net/infumia/pack/ResourceProducerLanguageImpl.java b/language/src/main/java/net/infumia/pack/ResourceProducerLanguageImpl.java
@@ -1,11 +1,10 @@
 package net.infumia.pack;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import net.infumia.pack.exception.ResourceAlreadyProducedException;
@@ -23,7 +22,7 @@ final class ResourceProducerLanguageImpl implements ResourceProducerLanguage {
     private final Texture texture;
     private final Map<TextureProperties, ResourceProducerImageMultichar> propertiesToMultichar;
 
-    private Set<FontProvider> fontProviders;
+    private List<FontProvider> fontProviders;
 
     ResourceProducerLanguageImpl(
         final Key key,
@@ -60,7 +59,7 @@ public void produce(final ArbitraryCharacterFactory characterFactory)
         if (this.fontProviders != null) {
             throw new ResourceAlreadyProducedException();
         }
-        this.fontProviders = new HashSet<>();
+        this.fontProviders = new ArrayList<>();
         this.propertiesToMultichar.values()
             .forEach(multichar -> {
                 multichar.produce(characterFactory);
@@ -75,7 +74,7 @@ public Collection<FontProvider> fontProviders() throws ResourceNotProducedExcept
 
     @Override
     public Collection<Texture> textures() throws ResourceNotProducedException {
-        return Collections.singleton(this.texture);
+        return Collections.singletonList(this.texture);
     }
 
     private ResourceProducerImageMultichar getGlyphCollection(final int height, final int ascent) {