Adds the ability for custom instruments to have the names designated in the .nbs file imported.

src/main/java/io/github/homchom/recode/mod/commands/impl/other/NBSCommand.java

@@ -8,6 +8,7 @@
 import io.github.homchom.recode.mod.features.commands.nbs.NBSDecoder;
 import io.github.homchom.recode.mod.features.commands.nbs.NBSToTemplate;
 import io.github.homchom.recode.mod.features.commands.nbs.SongData;
+import io.github.homchom.recode.mod.features.commands.nbs.alt.*;
 import io.github.homchom.recode.mod.features.commands.nbs.exceptions.OutdatedNBSException;
 import io.github.homchom.recode.sys.file.ExternalFile;
 import io.github.homchom.recode.sys.hypercube.templates.TemplateUtil;
@@ -59,6 +60,36 @@ public static void loadNbs(File file, String fileName) {
         });
     }
 
+    public static void loadNbsU(File file, String fileName) {
+        LegacyRecode.executor.submit(() -> {
+            try {
+                SongData d = NBSDecoderU.parse(file);
+                String code = new NBSToTemplate(d).convert();
+                ItemStack stack = new ItemStack(Items.NOTE_BLOCK);
+                TemplateUtil.compressTemplateNBT(stack, d.getName(), d.getAuthor(), code);
+
+                if (d.getName().length() == 0) {
+                    String name;
+                    if (d.getFileName().indexOf(".") > 0) {
+                        name = d.getFileName().substring(0, d.getFileName().lastIndexOf("."));
+                    } else {
+                        name = d.getFileName();
+                    }
+                    stack.setHoverName(Component.literal("§5SONG§7 -§f " + name));
+                } else {
+                    stack.setHoverName(Component.literal("§5SONG§7 -§f " + d.getName()));
+                }
+
+                ToasterUtil.sendToaster("NBS Loaded!", fileName, SystemToast.SystemToastId.NARRATOR_TOGGLE);
+                ItemUtil.giveCreativeItem(stack, true);
+            } catch (OutdatedNBSException e) {
+                ToasterUtil.sendToaster("§cLoading Error!", "Unsupported file version", SystemToast.SystemToastId.NARRATOR_TOGGLE);
+            } catch (IOException e) {
+                ToasterUtil.sendToaster("§cLoading Error!", "Invalid file", SystemToast.SystemToastId.NARRATOR_TOGGLE);
+            }
+        });
+    }
+
     @Override
     public void register(Minecraft mc, CommandDispatcher<FabricClientCommandSource> cd, CommandBuildContext context) {
         cd.register(ArgBuilder.literal("nbs")
@@ -73,6 +104,17 @@ public void register(Minecraft mc, CommandDispatcher<FabricClientCommandSource>
                                     return 1;
                                 })
                         )
+                ).then(ArgBuilder.literal("load2")
+                        .then(ArgBuilder.argument("filename", PathArgumentType.folder(ExternalFile.NBS_FILES.getPath(), true))
+                                .executes(ctx -> {
+                                    if (this.isCreative(mc)) {
+                                        File file = PathArgumentType.getPath(ctx, "filename").toFile();
+
+                                        loadNbsU(file, file.getName());
+                                    }
+                                    return 1;
+                                })
+                        )
                 )
                 .then(ArgBuilder.literal("player")
                         .executes(ctx -> {

src/main/java/io/github/homchom/recode/mod/features/commands/NbsSearchMenu.java

@@ -126,7 +126,7 @@ public void open(String... args) throws CommandSyntaxException {
                                     int length = Integer
                                         .parseInt(notearr[notearr.length - 1].split(":")[0]);
                                     SongData d = new SongData("Song " + id, "Recode", 20f,
-                                        length, notes, "", "", 1, 0, 0);
+                                        length, notes, "", "", 1, 0, 0, new String[1]);
 
                                     String code = new NBSToTemplate(d).convert();
 

src/main/java/io/github/homchom/recode/mod/features/commands/nbs/NBSDecoder.java

@@ -165,13 +165,14 @@ private static SongData parse(InputStream inputStream, File songFile) throws IOE
         customInstruments = dataInputStream.readByte();
 
         int[] customPitchList = new int[customInstruments];
+        String[] customNameList = new String[customInstruments];
 
         if (customInstruments >= 1) {
             for (int i = 0; i < customInstruments; i++) {
                 int instrumentOffset = vanillaInstruments + customInstruments;
                 int instrumentPitch = 0;
 
-                readString(dataInputStream); //Instrument name
+                customNameList[i] = readString(dataInputStream); //Instrument name
                 readString(dataInputStream); //Sound file
 
                 instrumentPitch = dataInputStream.readByte(); //Sound pitch
@@ -223,7 +224,7 @@ private static SongData parse(InputStream inputStream, File songFile) throws IOE
         }
 
 
-        return new SongData(title, author, speed, (int) Math.ceil((length + 1.0) / (4 * timeSignature)) * (4 * timeSignature), stringBuilder.toString(), file, layerStringBuilder.toString(), (loopTick + 1), loopCount, customInstruments);
+        return new SongData(title, author, speed, (int) Math.ceil((length + 1.0) / (4 * timeSignature)) * (4 * timeSignature), stringBuilder.toString(), file, layerStringBuilder.toString(), (loopTick + 1), loopCount, customInstruments, customNameList);
     }
 
     private static short readShort(DataInputStream dataInputStream) throws IOException {

src/main/java/io/github/homchom/recode/mod/features/commands/nbs/NBSToTemplate.java

@@ -16,6 +16,7 @@ public class NBSToTemplate {
     final int loopTick;
     final int loopCount;
     final int customInstrumentCount;
+    final String[] customInstrumentNames;
     String name;
     String author;
 
@@ -33,6 +34,7 @@ public NBSToTemplate(SongData song) {
         this.loopTick = song.getLoopTick();
         this.loopCount = song.getLoopCount();
         this.customInstrumentCount = song.getCustomInstrumentCount();
+        this.customInstrumentNames = song.getCustomInstrumentNames();
     }
 
     public String convert() {
@@ -43,7 +45,6 @@ public String convert() {
         StringBuilder instList = new StringBuilder();
 
         String songTempo = new BigDecimal(this.speed).stripTrailingZeros().toPlainString();
-
         if (name.length() == 0) {
             if (filename.indexOf(".") > 0) {
                 name = filename.substring(0, filename.lastIndexOf("."));
@@ -60,7 +61,6 @@ public String convert() {
         boolean chestInited = false;
         int noteCount = 0;
         boolean finalNote = false;
-
         for (int i = 0; i < songData.length; i++) {
             boolean closeChest = false;
             if (slot == 1) {
@@ -73,7 +73,6 @@ public String convert() {
             if (slot >= 27) {
                 closeChest = true;
             }
-
             if (!closeChest) {
                 String currentNote = songData[i];
                 String revertString = currentNotes.toString();
@@ -84,7 +83,6 @@ public String convert() {
                     currentNotes.append("=").append(currentNote);
                 }
                 noteCount++;
-
                 if (currentNotes.length() > 1930) {
                     currentNotes = new StringBuilder(revertString);
                     currentBlock.append(String.format(",{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"%s\"}},\"slot\":%d}", currentNotes, slot));
@@ -111,7 +109,6 @@ public String convert() {
                 } else {
                     varActionType = "AppendValue";
                 }
-
                 currentBlock.append(String.format("]},\"action\":\"%s\"},", varActionType));
                 code.append(currentBlock);
                 currentBlock.setLength(0);
@@ -124,7 +121,6 @@ public String convert() {
                 slot = 1;
             }
         }
-
         //CreateList: instrumentNames
         if (customInstrumentCount == 0) {
             code.append("{\"id\":\"block\",\"block\":\"set_var\",\"args\":{\"items\":[{\"item\":{\"id\":\"var\",\"data\":{\"name\":\"instrumentNames\",\"scope\":\"local\"}},\"slot\":0},{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"Harp\"}},\"slot\":1},{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"Bass\"}},\"slot\":2},{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"Bass Drum\"}},\"slot\":3},{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"Snare Drum\"}},\"slot\":4},{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"Click\"}},\"slot\":5},{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"Guitar\"}},\"slot\":6},{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"Flute\"}},\"slot\":7},{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"Bell\"}},\"slot\":8},{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"Chime\"}},\"slot\":9},{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"Xylophone\"}},\"slot\":10},{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"Iron Xylophone\"}},\"slot\":11},{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"Cow Bell\"}},\"slot\":12},{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"Didgeridoo\"}},\"slot\":13},{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"Bit\"}},\"slot\":14},{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"Banjo\"}},\"slot\":15},{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"Pling\"}},\"slot\":16}]},\"action\":\"CreateList\"},");
@@ -134,12 +130,22 @@ public String convert() {
             int currentSlot;
 
             currentSlot = 17;
+            int currentFails = 0;
+
             for (int currentInstID = 1; currentInstID <= customInstrumentCount; currentInstID++) {
+                String currentName = "Custom Instrument";
+                currentName = customInstrumentNames[currentInstID - 1];
+                if(currentName == null || currentName.matches("^(\\s+)$") || currentName == ""){
+                    currentFails++;
+                    currentName = "<Custom Instrument " + currentFails + ">";
+                }
+                String formatted;
                 if (currentInstID == customInstrumentCount) {
-                    instList.append(String.format("{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"<Custom Instrument #%d>\"}},\"slot\":%d}", currentInstID, currentSlot));
+                    formatted = "{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"" + currentName + "\"}},\"slot\":" + currentSlot + "}";
                 } else {
-                    instList.append(String.format("{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"<Custom Instrument #%d>\"}},\"slot\":%d},", currentInstID, currentSlot));
+                    formatted = "{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"" + currentName + "\"}},\"slot\":" + currentSlot + "},";
                 }
+                instList.append(formatted);
                 currentSlot++;
             }
             instList.append("]},\"action\":\"CreateList\"},");

src/main/java/io/github/homchom/recode/mod/features/commands/nbs/SongData.java

@@ -7,13 +7,14 @@ public class SongData {
     final int loopTick;
     final int loopCount;
     final int customInstrumentCount;
+    final String[] customInstrumentNames;
     String name;
     String author;
     float speed;
     String fileName;
     String notes;
 
-    public SongData(String name, String author, float speed, int length, String notes, String fileName, String layers, int loopTick, int loopCount, int customInstrumentCount) {
+    public SongData(String name, String author, float speed, int length, String notes, String fileName, String layers, int loopTick, int loopCount, int customInstrumentCount, String[] customInstrumentNames) {
         this.name = name;
         this.author = author;
         this.speed = speed;
@@ -24,6 +25,7 @@ public SongData(String name, String author, float speed, int length, String note
         this.loopTick = loopTick;
         this.loopCount = loopCount;
         this.customInstrumentCount = customInstrumentCount;
+        this.customInstrumentNames = customInstrumentNames;
     }
 
     public String getName() {
@@ -85,4 +87,8 @@ public int getLoopCount() {
     public int getCustomInstrumentCount() {
         return customInstrumentCount;
     }
+
+    public String[] getCustomInstrumentNames() {
+        return customInstrumentNames;
+    }
 }