Merge pull request #49 from SkolkovoLab/pr/linked-hash-map-builders

feat: replacing HashMap with LinkedHashMap

api/src/main/java/team/unnamed/creative/ResourcePackImpl.java

@@ -29,21 +29,21 @@
 import team.unnamed.creative.metadata.Metadata;
 import team.unnamed.creative.metadata.MetadataPart;
 import team.unnamed.creative.metadata.overlays.OverlayEntry;
-import team.unnamed.creative.resources.MergeStrategy;
 import team.unnamed.creative.overlay.Overlay;
 import team.unnamed.creative.overlay.ResourceContainer;
 import team.unnamed.creative.overlay.ResourceContainerImpl;
+import team.unnamed.creative.resources.MergeStrategy;
 
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import static java.util.Objects.requireNonNull;
 
 final class ResourcePackImpl extends ResourceContainerImpl implements ResourcePack {
 
-    private final Map<String, Overlay> overlays = new HashMap<>();
+    private final Map<String, Overlay> overlays = new LinkedHashMap<>();
 
     private @Nullable Writable icon;
     private Metadata metadata;

api/src/main/java/team/unnamed/creative/font/SpaceFontProvider.java

@@ -27,7 +27,7 @@
 import net.kyori.examination.string.StringExaminer;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Stream;
@@ -121,7 +121,7 @@ public Builder advances(Map<String, Integer> entries) {
 
         public Builder advance(String character, int value) {
             if (this.advances == null) {
-                this.advances = new HashMap<>();
+                this.advances = new LinkedHashMap<>();
             }
             this.advances.put(character, value);
             return this;

api/src/main/java/team/unnamed/creative/metadata/MetadataImpl.java

@@ -31,7 +31,7 @@
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Stream;
@@ -99,7 +99,7 @@ public int hashCode() {
     }
 
     static final class BuilderImpl implements Builder {
-        private final Map<Class<?>, MetadataPart> parts = new HashMap<>();
+        private final Map<Class<?>, MetadataPart> parts = new LinkedHashMap<>();
 
         @Override
         public @NotNull Builder parts(final @NotNull Collection<MetadataPart> parts) {

api/src/main/java/team/unnamed/creative/model/ElementImpl.java

@@ -30,7 +30,7 @@
 import team.unnamed.creative.base.CubeFace;
 import team.unnamed.creative.base.Vector3Float;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Stream;
@@ -138,7 +138,7 @@ static final class BuilderImpl implements Builder {
         private Vector3Float to;
         private ElementRotation rotation = null;
         private boolean shade = DEFAULT_SHADE;
-        private Map<CubeFace, ElementFace> faces = new HashMap<>();
+        private Map<CubeFace, ElementFace> faces = new LinkedHashMap<>();
 
 
         @Override
@@ -167,7 +167,7 @@ static final class BuilderImpl implements Builder {
 
         @Override
         public @NotNull Builder faces(final @NotNull Map<CubeFace, ElementFace> faces) {
-            this.faces = new HashMap<>(requireNonNull(faces, "faces"));
+            this.faces = new LinkedHashMap<>(requireNonNull(faces, "faces"));
             return this;
         }
 

api/src/main/java/team/unnamed/creative/model/ModelImpl.java

@@ -31,7 +31,7 @@
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -152,7 +152,7 @@ static final class BuilderImpl implements Builder {
         private Key key;
         private Key parent;
         private boolean ambientOcclusion = DEFAULT_AMBIENT_OCCLUSION;
-        private Map<ItemTransform.Type, ItemTransform> display = new HashMap<>();
+        private Map<ItemTransform.Type, ItemTransform> display = new LinkedHashMap<>();
         private ModelTextures textures = ModelTextures.EMPTY;
         private GuiLight guiLight;
         private List<Element> elements = new ArrayList<>();
@@ -179,7 +179,7 @@ static final class BuilderImpl implements Builder {
         @Override
         public @NotNull Builder display(final @NotNull Map<ItemTransform.Type, ItemTransform> display) {
             requireNonNull(display, "display");
-            this.display = new HashMap<>(display);
+            this.display = new LinkedHashMap<>(display);
             return this;
         }
 

api/src/main/java/team/unnamed/creative/model/ModelTextures.java

@@ -35,7 +35,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -237,7 +237,7 @@ private Builder() {
         @Contract("_ -> this")
         public @NotNull Builder variables(final @NotNull Map<String, ModelTexture> variables) {
             requireNonNull(variables, "variables");
-            this.variables = new HashMap<>(variables);
+            this.variables = new LinkedHashMap<>(variables);
             return this;
         }
 
@@ -246,7 +246,7 @@ private Builder() {
             requireNonNull(id, "id");
             requireNonNull(texture, "texture");
             if (variables == null) {
-                variables = new HashMap<>();
+                variables = new LinkedHashMap<>();
             }
             variables.put(id, texture);
             return this;

api/src/main/java/team/unnamed/creative/overlay/ResourceContainerImpl.java

@@ -45,7 +45,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -56,17 +56,17 @@
 @ApiStatus.Internal
 public class ResourceContainerImpl implements ResourceContainer {
 
-    private final Map<Key, Atlas> atlases = new HashMap<>();
-    private final Map<Key, BlockState> blockStates = new HashMap<>();
-    private final Map<Key, Font> fonts = new HashMap<>();
-    private final Map<Key, Language> languages = new HashMap<>();
-    private final Map<Key, Model> models = new HashMap<>();
-    private final Map<String, SoundRegistry> soundRegistries = new HashMap<>();
-    private final Map<Key, Sound> sounds = new HashMap<>();
-    private final Map<Key, Texture> textures = new HashMap<>();
+    private final Map<Key, Atlas> atlases = new LinkedHashMap<>();
+    private final Map<Key, BlockState> blockStates = new LinkedHashMap<>();
+    private final Map<Key, Font> fonts = new LinkedHashMap<>();
+    private final Map<Key, Language> languages = new LinkedHashMap<>();
+    private final Map<Key, Model> models = new LinkedHashMap<>();
+    private final Map<String, SoundRegistry> soundRegistries = new LinkedHashMap<>();
+    private final Map<Key, Sound> sounds = new LinkedHashMap<>();
+    private final Map<Key, Texture> textures = new LinkedHashMap<>();
 
     // Unknown files we don't know how to parse
-    private final Map<String, Writable> files = new HashMap<>();
+    private final Map<String, Writable> files = new LinkedHashMap<>();
 
     //#region Atlases (Keyed)
     @Override
@@ -348,7 +348,7 @@ public void merge(final @NotNull ResourceContainer other, final @NotNull MergeSt
                 continue;
             }
 
-            final Map<String, String> translations = new HashMap<>(oldLanguage.translations());
+            final Map<String, String> translations = new LinkedHashMap<>(oldLanguage.translations());
             for (final Map.Entry<String, String> translation : language.translations().entrySet()) {
                 final String replaced = translations.put(translation.getKey(), translation.getValue());
                 if (replaced != null && strategy == MergeStrategy.mergeAndFailOnError()) {
@@ -386,7 +386,7 @@ public void merge(final @NotNull ResourceContainer other, final @NotNull MergeSt
                 continue;
             }
 
-            final Map<Key, SoundEvent> soundEvents = new HashMap<>();
+            final Map<Key, SoundEvent> soundEvents = new LinkedHashMap<>();
             for (final SoundEvent soundEvent : oldSoundRegistry.sounds()) {
                 soundEvents.put(soundEvent.key(), soundEvent);
             }

api/src/main/java/team/unnamed/creative/sound/SoundRegistryImpl.java

@@ -34,8 +34,9 @@
 import team.unnamed.creative.util.Keys;
 
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -55,7 +56,7 @@ final class SoundRegistryImpl implements SoundRegistry {
     ) {
         this.namespace = requireNonNull(namespace, "namespace");
         requireNonNull(sounds, "sounds");
-        this.sounds = new HashMap<>();
+        this.sounds = new LinkedHashMap<>();
         for (SoundEvent soundEvent : sounds) {
             this.sounds.put(soundEvent.key(), soundEvent);
         }
@@ -138,7 +139,7 @@ static final class BuilderImpl implements Builder {
         @Override
         public @NotNull Builder sounds(final @NotNull Collection<? extends SoundEvent> sounds) {
             requireNonNull(sounds, "sounds");
-            this.sounds = new HashSet<>(sounds);
+            this.sounds = new LinkedHashSet<>(sounds);
             return this;
         }
 

api/src/main/java/team/unnamed/creative/util/MoreCollections.java

@@ -27,7 +27,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -49,7 +49,7 @@ public static <T> List<T> immutableListOf(List<T> list) {
     public static <K, V> Map<K, V> immutableMapOf(Map<K, V> map) {
         return map.isEmpty()
                 ? Collections.emptyMap()
-                : Collections.unmodifiableMap(new HashMap<>(map));
+                : Collections.unmodifiableMap(new LinkedHashMap<>(map));
     }
 
 }

serializer-minecraft/src/main/java/team/unnamed/creative/serialize/minecraft/MinecraftResourcePackReaderImpl.java

@@ -49,6 +49,8 @@
 import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Queue;
 
@@ -77,7 +79,7 @@ private MinecraftResourcePackReaderImpl(
         // waiting for textures (because we can't know the order
         // they come in)
         // (null key means it is root resource pack)
-        Map<@Nullable String, Map<Key, Texture>> incompleteTextures = new HashMap<>();
+        Map<@Nullable String, Map<Key, Texture>> incompleteTextures = new LinkedHashMap<>();
 
         while (reader.hasNext()) {
             String path = reader.next();
@@ -212,7 +214,7 @@ private MinecraftResourcePackReaderImpl(
                     Key key = Key.key(namespace, keyOfMetadata);
                     Metadata metadata = MetadataSerializer.INSTANCE.readFromTree(parseJson(reader.stream()));
 
-                    Map<Key, Texture> incompleteTexturesThisContainer = incompleteTextures.computeIfAbsent(overlayDir, k -> new HashMap<>());
+                    Map<Key, Texture> incompleteTexturesThisContainer = incompleteTextures.computeIfAbsent(overlayDir, k -> new LinkedHashMap<>());
                     Texture texture = incompleteTexturesThisContainer.remove(key);
                     if (texture == null) {
                         // metadata was found first, put
@@ -224,7 +226,7 @@ private MinecraftResourcePackReaderImpl(
                 } else {
                     Key key = Key.key(namespace, categoryPath);
                     Writable data = reader.content().asWritable();
-                    Map<Key, Texture> incompleteTexturesThisContainer = incompleteTextures.computeIfAbsent(overlayDir, k -> new HashMap<>());
+                    Map<Key, Texture> incompleteTexturesThisContainer = incompleteTextures.computeIfAbsent(overlayDir, k -> new LinkedHashMap<>());
                     Texture waiting = incompleteTexturesThisContainer.remove(key);
 
                     if (waiting == null) {

serializer-minecraft/src/main/java/team/unnamed/creative/serialize/minecraft/ResourceCategories.java

@@ -32,15 +32,15 @@
 import team.unnamed.creative.serialize.minecraft.sound.SoundSerializer;
 
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class ResourceCategories {
 
     private static final Map<String, ResourceCategory<?>> CATEGORIES;
 
     static {
-        CATEGORIES = new HashMap<>();
+        CATEGORIES = new LinkedHashMap<>();
         registerCategory(AtlasSerializer.CATEGORY);
         registerCategory(SoundSerializer.CATEGORY);
         registerCategory(ModelSerializer.CATEGORY);

serializer-minecraft/src/main/java/team/unnamed/creative/serialize/minecraft/atlas/AtlasSourceSerializer.java

@@ -42,7 +42,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -216,7 +216,7 @@ static AtlasSource deserialize(JsonObject node) {
             @Subst("minecraft:resource")
             String paletteKeyStr = node.get("palette_key").getAsString();
             Key paletteKey = Key.key(paletteKeyStr);
-            Map<String, Key> permutations = new HashMap<>();
+            Map<String, Key> permutations = new LinkedHashMap<>();
             for (Map.Entry<String, JsonElement> entry : node.getAsJsonObject("permutations").entrySet()) {
                 @Subst("minecraft:resource")
                 String value = entry.getValue().getAsString();

serializer-minecraft/src/main/java/team/unnamed/creative/serialize/minecraft/blockstate/BlockStateSerializer.java

@@ -41,7 +41,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -95,7 +95,7 @@ public BlockState deserializeFromJson(JsonElement node, Key key) {
 
         JsonObject objectNode = node.getAsJsonObject();
 
-        Map<String, MultiVariant> variants = new HashMap<>();
+        Map<String, MultiVariant> variants = new LinkedHashMap<>();
         List<Selector> multipart = new ArrayList<>();
 
         // read variants

serializer-minecraft/src/main/java/team/unnamed/creative/serialize/minecraft/font/FontSerializer.java

@@ -46,7 +46,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -194,7 +194,7 @@ private static void writeSpace(JsonWriter writer, SpaceFontProvider provider) th
 
     private static SpaceFontProvider readSpace(JsonObject node) {
         JsonObject advancesNode = node.getAsJsonObject("advances");
-        Map<String, Integer> advances = new HashMap<>();
+        Map<String, Integer> advances = new LinkedHashMap<>();
         for (Map.Entry<String, JsonElement> advanceEntryNode : advancesNode.entrySet()) {
             String character = advanceEntryNode.getKey();
             int advance = advanceEntryNode.getValue().getAsInt();

serializer-minecraft/src/main/java/team/unnamed/creative/serialize/minecraft/language/LanguageSerializer.java

@@ -34,7 +34,7 @@
 import team.unnamed.creative.serialize.minecraft.io.JsonResourceSerializer;
 
 import java.io.IOException;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 public final class LanguageSerializer implements JsonResourceSerializer<Language>, JsonResourceDeserializer<Language> {
@@ -70,7 +70,7 @@ public void serializeToJson(Language language, JsonWriter writer) throws IOExcep
     @Override
     public Language deserializeFromJson(JsonElement node, Key key) {
         JsonObject objectNode = node.getAsJsonObject();
-        Map<String, String> translations = new HashMap<>();
+        Map<String, String> translations = new LinkedHashMap<>();
 
         for (Map.Entry<String, JsonElement> translationEntry : objectNode.entrySet()) {
             String translationKey = translationEntry.getKey();

serializer-minecraft/src/main/java/team/unnamed/creative/serialize/minecraft/metadata/LanguageMetaCodec.java

@@ -32,7 +32,7 @@
 import team.unnamed.creative.serialize.minecraft.GsonUtil;
 
 import java.io.IOException;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 final class LanguageMetaCodec implements MetadataPartCodec<LanguageMeta> {
@@ -49,7 +49,7 @@ final class LanguageMetaCodec implements MetadataPartCodec<LanguageMeta> {
 
     @Override
     public @NotNull LanguageMeta read(final @NotNull JsonObject node) {
-        Map<String, LanguageEntry> languages = new HashMap<>();
+        Map<String, LanguageEntry> languages = new LinkedHashMap<>();
 
         for (Map.Entry<String, JsonElement> entry : node.entrySet()) {
             String code = entry.getKey();