Added trumpet instruments, added NBS v6 support

Author: RaphiMC

README.md

@@ -7,8 +7,8 @@ To download the latest dev version, go to [GitHub Actions](https://github.com/Ra
 Using it is very simple, just run the jar file, and it will start a user interface. Detailed instructions can be found in the [Usage](#usage) section.
 
 ## Features
-- Reads .nbs, .mcsp2, .mid, .txt and .notebot files
-- Can export all of the above as .nbs, .mp3, .wav and .aif files
+- Can import .nbs, .mcsp2, .mid, .txt and .notebot files
+- Can export all of the above as .nbs, .txt, .mcsp2, .mp3 and .wav files
 - Work with multiple songs at once (Batch processing)
 - High performance and accurate song player
   - Lag free playback of very large songs
@@ -18,8 +18,8 @@ Using it is very simple, just run the jar file, and it will start a user interfa
   - Supports velocity and panning
   - Can handle Black MIDI files
 - Supports all NBS versions
-  - Version 0 - 5
-  - Supports undocumented features like Tempo Changers
+  - Version 0 - 6
+  - Supports Tempo Changers
 - Many tools for manipulating songs
     - Optimize songs for use in Minecraft (Transposing, Resampling)
     - Resampling songs with a different TPS

build.gradle

@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    includeInJar "net.raphimc:NoteBlockLib:3.2.0-20260212.215343-9"
+    includeInJar "net.raphimc:NoteBlockLib:3.2.0-20260320.211337-10"
     includeInJar "net.raphimc:audio-mixer:2.3.1-20260203.210117-1"
     includeInJar "org.jcraft:jorbis:0.0.17"
     includeInJar "com.formdev:flatlaf:3.7.1"

src/main/java/net/raphimc/noteblocktool/audio/SoundMap.java

@@ -36,8 +36,8 @@ public class SoundMap {
     private static final Map<String, URL> ALL_SOUND_LOCATIONS = new HashMap<>();
 
     static {
-        INSTRUMENT_SOUNDS.put(MinecraftInstrument.HARP, "harp.ogg");
-        INSTRUMENT_SOUNDS.put(MinecraftInstrument.BASS, "bass.ogg");
+        INSTRUMENT_SOUNDS.put(MinecraftInstrument.HARP, "harp2.ogg");
+        INSTRUMENT_SOUNDS.put(MinecraftInstrument.BASS, "bassattack.ogg");
         INSTRUMENT_SOUNDS.put(MinecraftInstrument.BASS_DRUM, "bd.ogg");
         INSTRUMENT_SOUNDS.put(MinecraftInstrument.SNARE, "snare.ogg");
         INSTRUMENT_SOUNDS.put(MinecraftInstrument.HAT, "hat.ogg");
@@ -52,6 +52,10 @@ public class SoundMap {
         INSTRUMENT_SOUNDS.put(MinecraftInstrument.BIT, "bit.ogg");
         INSTRUMENT_SOUNDS.put(MinecraftInstrument.BANJO, "banjo.ogg");
         INSTRUMENT_SOUNDS.put(MinecraftInstrument.PLING, "pling.ogg");
+        INSTRUMENT_SOUNDS.put(MinecraftInstrument.TRUMPET, "trumpet.ogg");
+        INSTRUMENT_SOUNDS.put(MinecraftInstrument.TRUMPET_EXPOSED, "trumpet_exposed.ogg");
+        INSTRUMENT_SOUNDS.put(MinecraftInstrument.TRUMPET_OXIDIZED, "trumpet_oxidized.ogg");
+        INSTRUMENT_SOUNDS.put(MinecraftInstrument.TRUMPET_WEATHERED, "trumpet_weathered.ogg");
 
         try {
             SoundMap.reload(new File(System.getProperty("user.home"), "Minecraft Note Block Studio/Data/Sounds"));

src/main/java/net/raphimc/noteblocktool/frames/visualizer/DropRenderer.java

@@ -108,6 +108,10 @@ public DropRenderer(final AudioSystemSongPlayer songPlayer) {
         this.instrumentColors.put(MinecraftInstrument.BIT, Color.GREEN.darker(0.8F));
         this.instrumentColors.put(MinecraftInstrument.BANJO, Color.RED.darker());
         this.instrumentColors.put(MinecraftInstrument.PLING, Color.DARK_GRAY);
+        this.instrumentColors.put(MinecraftInstrument.TRUMPET, Color.ORANGE.darker(0.9F));
+        this.instrumentColors.put(MinecraftInstrument.TRUMPET_EXPOSED, Color.ORANGE.darker(0.7F));
+        this.instrumentColors.put(MinecraftInstrument.TRUMPET_WEATHERED, Color.GREEN.darker(0.4F));
+        this.instrumentColors.put(MinecraftInstrument.TRUMPET_OXIDIZED, Color.GREEN.darker(0.2F));
 
         this.customInstrumentColors = new IdentityHashMap<>();
         final NbsCustomInstrument[] customInstruments = SongUtil.getUsedNbsCustomInstruments(this.songPlayer.getSong()).toArray(NbsCustomInstrument[]::new);