src/main/java/land/chipmunk/chipmunkmod/song/Instrument.java

@@ -30,20 +30,24 @@ public class Instrument {
     public final int offset;
     public final String sound;
 
-    protected Instrument (final int id, final String name, final int offset, final String sound) {
+    private Instrument (final int id, final String name, final int offset, final String sound) {
         this.id = id;
         this.name = name;
         this.offset = offset;
         this.sound = sound;
     }
 
-    protected Instrument (final int id, final String name, final int offset) {
+    private Instrument (final int id, final String name, final int offset) {
         this.id = id;
         this.name = name;
         this.offset = offset;
         this.sound = "block.note_block." + name;
     }
 
+    public static Instrument of (final String sound) {
+        return new Instrument(-1, null, 0, sound);
+    }
+
     public static Instrument fromId (final int id) {
         return VALUES[id];
     }

src/main/java/land/chipmunk/chipmunkmod/song/NBSConverter.java

@@ -4,9 +4,6 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
-
-import net.minecraft.resources.Identifier;
-import net.minecraft.util.Util;
 import net.minecraft.world.phys.Vec3;
 
 public class NBSConverter {
@@ -78,9 +75,9 @@ public class NBSConverter {
         }
 
         final ArrayList<NBSNote> nbsNotes = new ArrayList<>();
-        int tick = -1;
+        short tick = -1;
         while (true) {
-            final int tickJumps = Short.toUnsignedInt(buffer.getShort());
+            final int tickJumps = buffer.getShort();
             if (tickJumps == 0) break;
             tick += tickJumps;
 
@@ -123,12 +120,12 @@ public class NBSConverter {
         if (buffer.hasRemaining()) {
             final byte customInstrumentCount = buffer.get();
             for (int i = 0; i < customInstrumentCount; i++) {
-                final String name = getString(buffer, bytes.length);
+                final NBSCustomInstrument customInstrument = new NBSCustomInstrument();
-                final String file = getString(buffer, bytes.length);
+                customInstrument.name = getString(buffer, bytes.length);
-                final byte pitch = buffer.get();
+                customInstrument.file = getString(buffer, bytes.length);
-                final boolean visible = buffer.get() != 0; // "Press piano key"
+                customInstrument.pitch = buffer.get();
-
+                customInstrument.key = buffer.get() != 0;
-                customInstruments.add(new NBSCustomInstrument(name, file, pitch, visible));
+                customInstruments.add(customInstrument);
             }
         }
 
@@ -148,10 +145,12 @@ public class NBSConverter {
                 key = (double) ((note.key * 100) + note.pitch) / 100;
             } else {
                 final int index = note.instrument - vanillaInstrumentCount;
-                if (index >= customInstruments.size()) continue;
-                final NBSCustomInstrument customInstrument = customInstruments.get(index);
 
-                instrument = customInstrument;
+                if (index >= customInstruments.size()) continue;
+
+                final NBSCustomInstrument customInstrument = customInstruments.get(index);
+                instrument = Instrument.of(customInstrument.name);
+
                 key = (note.key) + (customInstrument.pitch + (double) note.pitch / 100);
             }
 
@@ -221,26 +220,10 @@ public class NBSConverter {
         public byte stereo = 100;
     }
 
-    private static class NBSCustomInstrument extends Instrument {
+    private static class NBSCustomInstrument {
-        public final byte pitch;
+        public String name;
-        public final boolean visible;
+        public String file;
-
+        public byte pitch = 0;
-        public NBSCustomInstrument(final String name, final String optionalPath, final byte pitch, final boolean visible) {
+        public boolean key = false;
-            // some implementations straight up just don't save the path, so we perform conversions on name on those
-            final String path = optionalPath.isBlank() ? name : optionalPath;
-            String sound = Util.sanitizeName(path, Identifier::isAllowedInIdentifier)
-                .replaceFirst("\\.ogg$", "")
-                .replaceFirst("^minecraft/", "")
-                .replaceFirst("\\d+$", "")
-                .replace('/', '.');
-
-            // if there's no path, it's probably a note block sound
-            // this happens when you have trumpets saved in a v5 format NBS for example
-            if (!sound.contains(".")) sound = "block.note_block." + sound;
-
-            super(-1, name, 0, sound);
-            this.pitch = pitch;
-            this.visible = visible;
-        }
     }
 }