[WIP] Initial 1.16 block work #1791
Merged
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
|
can't wait to regen my nether with all these blocks rendered. Thanks for working on this! |
- Add ancient debris - Add basalt - Add polished basalt - Add soul campfire
Minecraft 1.16.1 loves writing these in singleplayer, and they cause a whole bunch of corruption warnings if we don't handle them in a special way like this.
Previously, walls were all numbered at 21000+. This is bad because our blockmap is an array, so this caused our blockmap to take up 80 MiB of RAM in each worker process. This commit changes the wall numbering, and exploits some bitmasking to have the wall check run in constant time no matter how many walls there are. This is done with a simple mask and xor to check the prefix. RAM usage for the blockmap thus drops to like 44 MiB. This is in preparation for adding more walls for 1.16.
- don't redundantly declare a side image when it's the same as top - change wood blocks to get textures from a dict
Member
Author
|
Not everything has been added yet but I think we can probably merge this now, better than leaving it hanging here |
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.
I've settled for using blockids 1000 and above for this.
Ancient debris
Basalt
Polished Basalt
Soul Campfire
Blackstone block
Netherite block
the rest