fix: allow duplicates, use a hash set to contain sound events

build: v1.1.8

Author: drtheodor

gradle.properties

@@ -9,7 +9,7 @@ yarn_mappings=1.20.1+build.10
 loader_version=0.16.10
 
 # Mod Properties
-mod_version=1.1.7
+mod_version=1.1.8
 maven_group=dev.amble.lib
 archives_base_name=amble
 mod_id=amblekit

src/main/java/dev/amble/lib/datagen/sound/AmbleSoundProvider.java

@@ -25,7 +25,7 @@
 public class AmbleSoundProvider implements DataProvider {
 
     protected final FabricDataOutput dataOutput;
-    private final Map<String, List<SoundEvent>> sounds = new HashMap<>();
+    private final Map<String, Set<SoundEventWrapper>> sounds = new HashMap<>();
     private final boolean extractVariants;
 
     public AmbleSoundProvider(FabricDataOutput dataOutput) {
@@ -37,18 +37,9 @@ public AmbleSoundProvider(FabricDataOutput dataOutput, boolean extractVariants)
         this.extractVariants = extractVariants;
     }
 
-    private boolean checkDuplicate(String name) {
-        if (sounds.containsKey(name)) {
-            AmbleKit.LOGGER.error("Duplicate sound event: {} - Duplicate will be ignored!", name);
-            return false;
-        }
-
-        return true;
-    }
-
     private boolean canAdd(String name, boolean check) {
         // you can't have duplicates in registries, nor bad ids.
-        return check && !checkDuplicate(name) && !checkName(name);
+        return check && !checkName(name);
     }
 
     public void addSound(String name, SoundEvent event) {
@@ -59,7 +50,7 @@ public void addSound(String name, boolean check, SoundEvent event) {
         if (canAdd(name, check))
             return;
 
-        sounds.computeIfAbsent(name, s -> new ArrayList<>()).add(event);
+        sounds.computeIfAbsent(name, s -> new HashSet<>()).add(new SoundEventWrapper(event));
     }
 
     public void addSound(String name, SoundEvent... events) {
@@ -70,7 +61,11 @@ public void addSound(String name, boolean check, SoundEvent... events) {
         if (canAdd(name, check))
             return;
 
-        Collections.addAll(sounds.computeIfAbsent(name, s -> new ArrayList<>()), events);
+        Set<SoundEventWrapper> set = sounds.computeIfAbsent(name, s -> new HashSet<>());
+
+        for (SoundEvent event : events) {
+            set.add(new SoundEventWrapper(event));
+        }
     }
 
     @Override
@@ -81,8 +76,13 @@ public CompletableFuture<?> run(DataWriter writer) {
             addSound(path, false, sound);
 
             if (extractVariants) {
-                path = extractPath(path);
-                addSound(path, false, sound);
+                String newPath = extractPath(path);
+
+                // event is not a variant!
+                if (newPath == null)
+                    return;
+
+                addSound(newPath, false, sound);
             }
         });
 
@@ -103,12 +103,14 @@ public String getName() {
         return "Sound Definitions";
     }
 
-    private static JsonObject serializeSounds(Iterable<SoundEvent> soundEvents) {
+    private static JsonObject serializeSounds(Iterable<SoundEventWrapper> wrappers) {
         JsonObject obj = new JsonObject();
         JsonArray sounds = new JsonArray();
 
-        for (SoundEvent soundEvent : soundEvents) {
-            sounds.add(soundEvent.getId().toString());
+        //tardis/moody/moody,tardis/moody/moody1,tardis/moody/moody2 =>
+        //tardis/moody/moody:[tardis/moody/moody, tardis/moody/moody1, tardis/moody/moody2]
+        for (SoundEventWrapper wrapper : wrappers) {
+            sounds.add(wrapper.event.getId().toString());
         }
 
         obj.add("sounds", sounds);
@@ -145,4 +147,18 @@ private static boolean checkName(String name) {
     public static Stream<SoundEvent> getSoundsFromMod(String namespace) {
         return Registries.SOUND_EVENT.stream().filter(sound -> sound.getId().getNamespace().equals(namespace));
     }
+
+    static class SoundEventWrapper {
+
+        private final SoundEvent event;
+
+        public SoundEventWrapper(SoundEvent event) {
+            this.event = event;
+        }
+
+        @Override
+        public int hashCode() {
+            return event.getId().hashCode();
+        }
+    }
 }

src/main/java/dev/amble/lib/util/StringCursor.java

@@ -1,5 +1,6 @@
 package dev.amble.lib.util;
 
+
 public class StringCursor {
 
     private final String str;
@@ -24,13 +25,24 @@ public char peekNext() {
         return this.str.charAt(cursor + step);
     }
 
+    /**
+     * @return {null} if no change was made.
+     */
     public String substring() {
-        if (step > 0)
+        if (step > 0) {
+            if (cursor == 0)
+                return null;
+
             return str.substring(this.cursor);
+        }
+
+        if (step < 0) {
+            if (cursor + 1 == str.length())
+                return null;
 
-        if (step < 0)
             return str.substring(0, this.cursor + 1);
+        }
 
-        return "";
+        return null;
     }
 }