Skip to content

Respect NBS vanilla instrument counts when skipping custom notes #6689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
c8dhjp4tyv-bit wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Respect NBS vanilla instrument counts when skipping custom notes #6689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/main/java/meteordevelopment/meteorclient/utils/notebot/decoder/NBSSongDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,10 @@ private Song parse(InputStream inputStream) throws Exception {
DataInputStream dataInputStream = new DataInputStream(inputStream);
short length = readShort(dataInputStream);
int nbsversion = 0;
int vanillaInstrumentCount = 10; // The original format has 10 vanilla instruments.
if (length == 0) {
nbsversion = dataInputStream.readByte();
dataInputStream.readByte(); // first custom instrument
nbsversion = dataInputStream.readUnsignedByte();
vanillaInstrumentCount = dataInputStream.readUnsignedByte();
if (nbsversion >= 3) {
length = readShort(dataInputStream);
}
Expand Down Expand Up @@ -91,7 +92,7 @@ private Song parse(InputStream inputStream) throws Exception {
if (jumpLayers == 0) {
break;
}
byte instrument = dataInputStream.readByte();
int instrument = dataInputStream.readUnsignedByte();

byte key = dataInputStream.readByte();
if (nbsversion >= 4) {
Expand All @@ -100,9 +101,12 @@ private Song parse(InputStream inputStream) throws Exception {
readShort(dataInputStream); // note block pitch
}

// Custom instruments start at the count stored in the file, not necessarily 16.
if (instrument >= vanillaInstrumentCount) continue;

NoteBlockInstrument inst = fromNBSInstrument(instrument);

// Probably a custom instrument. Ignore this note
// Unsupported vanilla instrument. Ignore this note
if (inst == null) continue;

Note note = new Note(inst /* instrument */, key - NOTE_OFFSET /* note */);
Expand Down
Loading