feat: NBT Tag matching (1.21.1) - #487
Open
ReinderN wants to merge 27 commits into
Open
Conversation
This is needed to avoid jarjar issues
…g-1.21.1 Brings the platform/ + docs/ restructure, the modular Gradle scripts, and the schema-v3 dependency lockfile onto the 1.21.1 NBT matching branch. Stays on Minecraft 1.21.1 / NeoForge 21.1.206; mod_version moves to 4.34.0. origin/1.21.1 is a single orphan commit with no history in common with this branch, so the merge needed --allow-unrelated-histories. Without a merge base git could not detect the directory rename, so it produced the union of both layouts: the whole pre-restructure tree plus the restructured one. Conflict resolution: - Removed the superseded pre-restructure layout (src/, build.gradle, gradle.properties, settings.gradle, gradle/, gradlew*, actions/, act.ps1, vscodeextension/, translation-helper/, media/, npp/, emc_experiment/, ai/, and the root docs that moved under docs/). origin/1.21.1 is the newer 1.21.1 tree, so its versions supersede the 4.28.0-era copies here. - Carried the NBT feature across by hand: the 21 files it adds were replayed into platform/minecraft/..., and the 3 files it modifies (the ANTLR grammar, ASTBuilder, and the VS Code grammar) were 3-way merged onto upstream's newer versions, all cleanly. - SFMLNbtFilteringTests moved into ca/teamdman/sfml/test/ to match upstream's test package layout; its package declaration and SFMLTestHelpers static import were updated accordingly. - The 5 remaining conflicts (.gitattributes, .gitignore, README.md and the two examples files) were all stale pre-restructure versions on our side; took origin/1.21.1's. - The feature's build.gradle change declared JMESPath. Root build.gradle is gone, so that was re-expressed through the lockfile with `sfm-propagate-changes dependency add`: jmespath/main (io.burt:jmespath-core:0.6.0) and jmespath/gson (io.burt:jmespath-gson:0.6.0), both scoped compile+runtime+bundle. Unlike the 1.19.2 branch, the NeoGradle toolchain here does write META-INF/jarjar entries, so the bundle scope takes effect for real. Verified with sfm-propagate-changes on JDK 21: all four source sets compile (0 errors) and JUnit reports 322 passed, 0 failed, including all 90 SFMLNbtFilteringTests methods.
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
1 participant
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.
No description provided.