feat: Add structs, protocols, macros, and library blocks to SFML - #489
Open
ReinderN wants to merge 37 commits into
Open
feat: Add structs, protocols, macros, and library blocks to SFML#489ReinderN wants to merge 37 commits into
ReinderN wants to merge 37 commits into
Conversation
ReinderN
force-pushed
the
feature/library-and-definitions
branch
from
January 26, 2026 17:27
2ff2fcc to
e141081
Compare
…-definitions Brings the platform/ + docs/ restructure, the modular Gradle scripts, and the schema-v3 dependency lockfile onto the library/struct/macro/protocol branch. Conflict resolution: - The feature's new files were added under src/ while origin/1.19.2 renamed that tree to platform/minecraft/src/. Kept them at the new locations, including the library/ and struct/ game tests that git had auto-resolved at the stale path. - 23 of the 33 content conflicts were line-ending-only on our side (the branch had rewritten CRLF files as LF without changing them); those took the origin/1.19.2 version so the newer work is not clobbered. - Adopted upstream's registry renames (BUFFER_ITEM -> BUFFER, MANAGER_BLOCK -> MANAGER, CABLE_BLOCK -> CABLE, DISK_ITEM -> DISK, PRINTING_PRESS_BLOCK_ENTITY -> PRINTING_PRESS, ...) and its move of the registration classes to ca.teamdman.sfm.common.registry.registration, re-adding the library entries on top. The feature's own LIBRARY_* symbols keep their names. - LocalizationKeys was dissolved upstream into per-class @SFMLocalizationDatagen entries. Moved the feature's 9 entries onto their owning classes: StructDefinitionLinter, UnusedDefinitionLinter, LibraryBlock and LibraryBlockEntity. - Adapted the library code to upstream's BlockPos data structures: LabelPositionHolder.getPositions now returns BlockPosSet, and BlockPosMap.keysAsBlockPosSet was replaced by positions(). - The two explosion game tests, SFMBlockNetworkGrowTests and the tough cable facade blocks were modify/delete conflicts where our side had only changed line endings; accepted upstream's deletion or rewrite. Verified with sfm-propagate-changes: all four source sets compile (main 601, gametest, datagen, test) and JUnit reports 267 passed, 0 failed.
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.