Repository navigation
Respect NBS vanilla instrument counts when skipping custom notes - #6689
Open
c8dhjp4tyv-bit wants to merge 1 commit into
Open
c8dhjp4tyv-bit wants to merge 1 commit into
c8dhjp4tyv-bit wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
NBS files record their vanilla instrument count. With a count of 10, instrument 10 is custom, but Meteor currently plays it as iron xylophone because the header count is discarded.
Read that count and skip custom notes before looking up their Minecraft instrument. Keep 10 as the default for the original format. Consume the note's velocity, panning and pitch before skipping it so later notes stay aligned.
Format reference: https://noteblock.studio/nbs
Validation
10 standalone Java 25 regression cases passed using the actual decoder, Song and Note classes with real Guava and minimal Minecraft/module test doubles. Generated binary fixtures cover NBS versions 0-5, custom instruments below ID 16, modern 16-instrument files, ID 255, alternate/zero counts and v4 note metadata. The original code failed 9 of these cases.
Full Gradle build was blocked by unavailable dependencies. No in-game testing was performed. Prepared with AI assistance.