Allow removing individual instruments

Author: Lenni0451

src/main/java/net/raphimc/noteblocktool/elements/table/instrument/InstrumentsTable.java

@@ -26,22 +26,36 @@
 
 public class InstrumentsTable extends JTable {
 
+    public static final Object KEEP = new Object() {
+        @Override
+        public String toString() {
+            return "";
+        }
+    };
+    public static final Object REMOVE = new Object() {
+        @Override
+        public String toString() {
+            return "<html><i>Remove";
+        }
+    };
+
     public InstrumentsTable(final boolean addEmptyEntry) {
         super(new InstrumentsModel("Original", "Replacement"));
         this.getTableHeader().setReorderingAllowed(false);
 
-        final JComboBox<MinecraftInstrument> instruments = new JComboBox<>();
+        final JComboBox instruments = new JComboBox<>();
         if (addEmptyEntry) {
-            instruments.addItem(null);
+            instruments.addItem(KEEP);
+            instruments.addItem(REMOVE);
         }
         for (MinecraftInstrument instrument : MinecraftInstrument.values()) {
             instruments.addItem(instrument);
         }
         this.getColumnModel().getColumn(1).setCellEditor(new DefaultCellEditor(instruments));
     }
 
-    public void addRow(final String original, final MinecraftInstrument instrument) {
-        ((DefaultTableModel) this.getModel()).addRow(new Object[]{original, instrument});
+    public void addRow(final String original) {
+        ((DefaultTableModel) this.getModel()).addRow(new Object[]{original, KEEP});
     }
 
     @Override

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

@@ -27,6 +27,7 @@
 
 import javax.swing.JPanel;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -48,17 +49,22 @@ protected void initComponents(final JPanel center) {
         this.add(new FastScrollPane(this.table));
         this.usedInstruments = SongUtil.getUsedNbsCustomInstruments(this.songs.get(0).song());
         for (NbsCustomInstrument customInstrument : this.usedInstruments) {
-            this.table.addRow(customInstrument.getNameOr("No Name") + " (" + customInstrument.getSoundFilePathOr("No Sound File") + ")", null);
+            this.table.addRow(customInstrument.getNameOr("No Name") + " (" + customInstrument.getSoundFilePathOr("No Sound File") + ")");
         }
     }
 
     @Override
     public void apply(final Song song) {
         final Map<NbsCustomInstrument, MinecraftInstrument> replacements = new HashMap<>();
+        final Set<NbsCustomInstrument> remove = new HashSet<>();
         int i = 0;
         for (NbsCustomInstrument customInstrument : this.usedInstruments) {
-            final MinecraftInstrument replacement = (MinecraftInstrument) this.table.getValueAt(i, 1);
-            replacements.put(customInstrument, replacement);
+            Object rawReplacement = this.table.getValueAt(i, 1);
+            if (rawReplacement instanceof MinecraftInstrument replacement) {
+                replacements.put(customInstrument, replacement);
+            } else if (rawReplacement == InstrumentsTable.REMOVE) {
+                remove.add(customInstrument);
+            }
             i++;
         }
         song.getNotes().forEach(note -> {
@@ -67,6 +73,7 @@ public void apply(final Song song) {
                 note.setInstrument(replacement);
             }
         });
+        song.getNotes().removeIf(note -> remove.contains(note.getInstrument()));
     }
 
 }

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

@@ -27,6 +27,7 @@
 import javax.swing.JPanel;
 import java.util.EnumSet;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -53,17 +54,22 @@ protected void initComponents(final JPanel center) {
                 return a;
             });
         for (MinecraftInstrument instrument : this.usedInstruments) {
-            this.table.addRow(instrument.name(), instrument);
+            this.table.addRow(instrument.name());
         }
     }
 
     @Override
     public void apply(final Song song) {
         final Map<MinecraftInstrument, MinecraftInstrument> replacements = new HashMap<>();
+        final Set<MinecraftInstrument> remove = new HashSet<>();
         int i = 0;
         for (MinecraftInstrument instrument : this.usedInstruments) {
-            final MinecraftInstrument replacement = (MinecraftInstrument) this.table.getValueAt(i, 1);
-            replacements.put(instrument, replacement);
+            Object rawReplacement = this.table.getValueAt(i, 1);
+            if (rawReplacement instanceof MinecraftInstrument replacement) {
+                replacements.put(instrument, replacement);
+            } else if (rawReplacement == InstrumentsTable.REMOVE) {
+                remove.add(instrument);
+            }
             i++;
         }
         song.getNotes().forEach(note -> {
@@ -72,7 +78,7 @@ public void apply(final Song song) {
                 note.setInstrument(replacement);
             }
         });
-        song.getNotes().removeIf(note -> replacements.containsKey(note.getInstrument()) && replacements.get(note.getInstrument()) == null);
+        song.getNotes().removeIf(note -> remove.contains(note.getInstrument()));
     }
 
 }