Updated NoteBlockLib

Author: RaphiMC

build.gradle

@@ -24,7 +24,7 @@ repositories {
 }
 
 dependencies {
-    include "net.raphimc:NoteBlockLib:2.1.2"
+    include "net.raphimc:NoteBlockLib:2.1.3"
     include "com.formdev:flatlaf:3.4.1"
     include "net.lenni0451.commons:swing:1.5.1"
     include "org.lwjgl:lwjgl:3.3.3"

src/main/java/net/raphimc/noteblocktool/frames/EditFrame.java

@@ -94,13 +94,14 @@ private void initComponents() {
             JButton apply = new JButton("Save");
             apply.addActionListener(e -> {
                 for (ListFrame.LoadedSong song : this.songs) {
-                    this.resamplingTab.apply(song.getSong(), song.getSong().getView());
-                    this.instrumentsTab.apply(song.getSong(), song.getSong().getView());
+                    SongView<?> view = song.getSong().getView();
+                    this.resamplingTab.apply(song.getSong(), view);
+                    this.instrumentsTab.apply(song.getSong(), view);
                     if (this.customInstrumentsTab != null) {
-                        this.customInstrumentsTab.apply(song.getSong(), song.getSong().getView());
+                        this.customInstrumentsTab.apply(song.getSong(), view);
                     }
-                    this.notesTab.apply(song.getSong(), song.getSong().getView());
-                    this.metadataTab.apply(song.getSong(), song.getSong().getView());
+                    this.notesTab.apply(song.getSong(), view);
+                    this.metadataTab.apply(song.getSong(), view);
                 }
                 JOptionPane.showMessageDialog(this, "Saved all changes", "Saved", JOptionPane.INFORMATION_MESSAGE);
                 for (ListFrame.LoadedSong song : this.songs) this.songRefreshConsumer.accept(song);
@@ -113,7 +114,7 @@ private void initComponents() {
                 this.resamplingTab.apply(song.getSong(), view);
                 this.instrumentsTab.apply(song.getSong(), view);
                 if (this.customInstrumentsTab != null) {
-                    this.customInstrumentsTab.apply(null, view);
+                    this.customInstrumentsTab.apply(song.getSong(), view);
                 }
                 this.notesTab.apply(song.getSong(), view);
                 SongPlayerFrame.open(song, view);

src/main/java/net/raphimc/noteblocktool/frames/edittabs/CustomInstrumentsTab.java

@@ -18,7 +18,6 @@
 package net.raphimc.noteblocktool.frames.edittabs;
 
 import net.raphimc.noteblocklib.format.nbs.model.NbsCustomInstrument;
-import net.raphimc.noteblocklib.format.nbs.model.NbsData;
 import net.raphimc.noteblocklib.format.nbs.model.NbsNote;
 import net.raphimc.noteblocklib.model.Song;
 import net.raphimc.noteblocklib.model.SongView;
@@ -73,12 +72,6 @@ public void apply(Song<?, ?, ?> song, SongView<?> view) {
                 }
             }
         });
-
-        if (song != null) {
-            for (NbsCustomInstrument customInstrument : replacements.keySet()) {
-                ((NbsData) song.getData()).getCustomInstruments().remove(customInstrument);
-            }
-        }
     }
 
 }