Skip to content

Remove redundant model registration - #47

Merged
CaitlynMainer merged 2 commits into
CaitlynMainer:main-MC1.21.1from
SquidDev:squid/model-cleanup
Aug 11, 2026
Merged

Remove redundant model registration#47
CaitlynMainer merged 2 commits into
CaitlynMainer:main-MC1.21.1from
SquidDev:squid/model-cleanup

Conversation

@SquidDev

@SquidDev SquidDev commented Aug 11, 2026

Copy link
Copy Markdown
  • Move floppy color handler to live with the other items/blocks
  • Remove ModelInitialization.registerModel and all callers of it (it's just an empty method).
  • Remove NullModel — we already register a blockstate JSON using air.

There's some more cleanup to do here, just trying to avoid creating another massive PR :D. We don't need custom model implementations for drones or cables, and we could definitely move some of the the rack and net splitter model to JSON). The less custom model code we have, the easier updating to 26.2 will be.

 - Move floppy color handler to live with the other items/blocks
 - Remove ModelInitialization.registerModel and all callers of it
   (it's just an empty method).
 - Remove NullModel — we already register a blockstate JSON using air.
@SquidDev
SquidDev marked this pull request as ready for review August 11, 2026 09:53
@CaitlynMainer
CaitlynMainer merged commit 961ee26 into CaitlynMainer:main-MC1.21.1 Aug 11, 2026
1 check passed
@SquidDev
SquidDev deleted the squid/model-cleanup branch August 11, 2026 23:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants