Merge remote-tracking branch 'original/main'

pom.xml

@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.github.steveice10</groupId>
       <artifactId>mcprotocollib</artifactId>
-      <version>1.19.4-math2-SNAPSHOT</version>
+      <version>1.20-1-SNAPSHOT</version>
     </dependency>
 
     <dependency>

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

@@ -27,7 +27,7 @@ public class Instrument {
     this.id = id;
     this.name = name;
     this.offset = offset;
-    this.sound = name;
+    this.sound = sound;
   }
 
   private Instrument (int id, String name, int offset) {

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

@@ -164,7 +164,7 @@ public class NBSConverter {
         if (index >= customInstruments.size()) continue;
         NBSCustomInstrument customInstrument = customInstruments.get(index);
         instrument = Instrument.of(customInstrument.name);
-        // key += customInstrument.pitch;
+        key += customInstrument.pitch;
       }
 
       if (key < 33 || key > 57) {