Skip to content

Conversation

@iceiix
Copy link
Owner

@iceiix iceiix commented Jan 14, 2021

Building on #469, add additional block and/or block states beyond 1.14+ to fix shifted IDs.

  • 1.15 (protocol_version >= 575), use new block states from 1.15.2
  • 1.16.1 (protocol_version >= 735), use new block states from 1.16.1
  • 1.16.2+ (protocol_version >= 751), use new block states from 1.16.2

diffs: https://gist.github.com/iceiix/086ed124fd19744140b368d06594a109

1.15 is mostly naming fixes not so much shifts, but 1.16.1 does have shifts we need to handle

@iceiix
Copy link
Owner Author

iceiix commented Jan 14, 2021

Added up to before walls, these received many new states:

-64 Brick Wall
-64 Prismarine Wall
-64 Red Sandstone Wall
-64 Mossy Stone Brick Wall
-64 Granite Wall
-64 Stone Brick Wall
-64 Nether Brick Wall
-64 Andesite Wall
-64 Red Nether Brick Wall
-64 Sandstone Wall
-64 End Stone Brick Wall
-64 Diorite Wall
+324 Brick Wall
+324 Prismarine Wall
+324 Red Sandstone Wall
+324 Mossy Stone Brick Wall
+324 Granite Wall
+324 Stone Brick Wall
+324 Nether Brick Wall
+324 Andesite Wall
+324 Red Nether Brick Wall
+324 Sandstone Wall
+324 End Stone Brick Wall
+324 Diorite Wall

instead of a bool for each direction, its tristate with none/low/tall.

@iceiix
Copy link
Owner Author

iceiix commented Jan 14, 2021

1.16.1 to 1.16.2 is comparatively simple:

 64 Red Mushroom Block
 64 Mushroom Stem
 32 Iron Bars
-2 Chain
+6 Chain
 32 Glass Pane
 1 Melon
 4 Attached Pumpkin Stem
@@ -676,8 +676,8 @@
 1 Smithing Table
 4 Stonecutter
 32 Bell
-2 Lantern
-2 Soul Lantern
+4 Lantern
+4 Soul Lantern
 32 Campfire
 32 Soul Campfire
 4 Sweet Berry Bush

Chain adds an axis, Lanterns add waterlogged

@iceiix
Copy link
Owner Author

iceiix commented Jan 14, 2021

This fixes grass (vs ferns) on 1.16.4:

Screen Shot 2021-01-14 at 12 20 50 PM

@iceiix
Copy link
Owner Author

iceiix commented Jan 15, 2021

Again not complete, but at least this fixes some of the block definitions; would have to fix #71 assets first in order to actually render new blocks, so will merge this for now

@iceiix iceiix merged commit 1713b12 into master Jan 15, 2021
@iceiix iceiix deleted the 1.16.1_blocks branch January 15, 2021 00:46
iceiix added a commit that referenced this pull request Jan 15, 2021
Adds _some _new blocks and block states, building on the version-
dependent block support added in #469. Notably, fixes grass on 1.16.4.

1.16.1+ (protocol_version >= 735)
* Add NetherGoldOre
* Add SoulFire
* Add SoulSoil, Basalt
* Add PolishedBasalt, SoulTorch, SoulWallTorch
* Add Chain

* 1.16.2+ (protocol_version >= 751)
* Add Chain axis states
iceiix added a commit that referenced this pull request Jan 15, 2021
Adds _some _new blocks and block states, building on the version-
dependent block support added in #469. Notably, fixes grass on 1.16.4.

1.16.1+ (protocol_version >= 735)
* Add NetherGoldOre
* Add SoulFire
* Add SoulSoil, Basalt
* Add PolishedBasalt, SoulTorch, SoulWallTorch
* Add Chain

1.16.2+ (protocol_version >= 751)
* Add Chain axis states
iceiix added a commit that referenced this pull request Jan 21, 2021
iceiix added a commit that referenced this pull request Jan 21, 2021
* blocks: fix soul fire/soil, exclude from <1.13, fixing #489 

* blocks: add unit tests for #467 #469 #474
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