LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

world: add support for 20w17a blockstates

Browse Source
This commit is contained in:
Alexander Rath
2020-04-23 01:19:35 +02:00
parent dc6f8cfcbd
commit 5ff3e2b09f
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
overviewer_core/world.py
View File

@@ -1177,7 +1177,7 @@ class RegionSet(object):
self.regioncache[regionfilename] = region self.regioncache[regionfilename] = region
return region return region
def _packed_longarray_to_shorts(self, long_array, n): def _packed_longarray_to_shorts(self, long_array, n, num_palette):
bits_per_value = (len(long_array) * 64) / n bits_per_value = (len(long_array) * 64) / n
if bits_per_value < 4 or 12 < bits_per_value: if bits_per_value < 4 or 12 < bits_per_value:
raise nbt.CorruptChunkError() raise nbt.CorruptChunkError()
@@ -1244,7 +1244,24 @@ class RegionSet(object):
return result return result
def _get_blockdata_v113(self, section, unrecognized_block_types): def _packed_longarray_to_shorts_v116(self, long_array, n, num_palette):
bits_per_value = 4
while (1 << bits_per_value) < num_palette:
bits_per_value += 1
b = numpy.asarray(long_array, dtype=numpy.uint64)
result = numpy.zeros((n,), dtype=numpy.uint16)
shorts_per_long = 64 // bits_per_value
mask = (1 << bits_per_value) - 1
for i in range(shorts_per_long):
j = (n + shorts_per_long - 1 - i) // shorts_per_long
#assert j == len(result[i::shorts_per_long])
result[i::shorts_per_long] = (b[:j] >> (bits_per_value * i)) & mask
return result
def _get_blockdata_v113(self, section, unrecognized_block_types, longarray_unpacker):
# Translate each entry in the palette to a 1.2-era (block, data) int pair. # Translate each entry in the palette to a 1.2-era (block, data) int pair.
num_palette_entries = len(section['Palette']) num_palette_entries = len(section['Palette'])
translated_blocks = numpy.zeros((num_palette_entries,), dtype=numpy.uint16) # block IDs translated_blocks = numpy.zeros((num_palette_entries,), dtype=numpy.uint16) # block IDs
@@ -1259,7 +1276,7 @@ class RegionSet(object):
# Turn the BlockStates array into a 16x16x16 numpy matrix of shorts. # Turn the BlockStates array into a 16x16x16 numpy matrix of shorts.
blocks = numpy.empty((4096,), dtype=numpy.uint16) blocks = numpy.empty((4096,), dtype=numpy.uint16)
data = numpy.empty((4096,), dtype=numpy.uint8) data = numpy.empty((4096,), dtype=numpy.uint8)
block_states = self._packed_longarray_to_shorts(section['BlockStates'], 4096) block_states = longarray_unpacker(section['BlockStates'], 4096, num_palette_entries)
blocks[:] = translated_blocks[block_states] blocks[:] = translated_blocks[block_states]
data[:] = translated_data[block_states] data[:] = translated_data[block_states]
@@ -1373,6 +1390,11 @@ class RegionSet(object):
level = data[1]['Level'] level = data[1]['Level']
chunk_data = level chunk_data = level
longarray_unpacker = self._packed_longarray_to_shorts
if 'DataVersion' in data[1] and data[1]['DataVersion'] >= 2529:
# starting with 1.16 snapshot 20w17a, block states are packed differently
longarray_unpacker = self._packed_longarray_to_shorts_v116
# From the interior of a map to the edge, a chunk's status may be one of: # From the interior of a map to the edge, a chunk's status may be one of:
# - postprocessed (interior, or next to fullchunk) # - postprocessed (interior, or next to fullchunk)
# - fullchunk (next to decorated) # - fullchunk (next to decorated)
@@ -1433,7 +1455,7 @@ class RegionSet(object):
section['BlockLight'] = blocklight_expanded section['BlockLight'] = blocklight_expanded
if 'Palette' in section: if 'Palette' in section:
(blocks, data) = self._get_blockdata_v113(section, unrecognized_block_types) (blocks, data) = self._get_blockdata_v113(section, unrecognized_block_types, longarray_unpacker)
elif 'Data' in section: elif 'Data' in section:
(blocks, data) = self._get_blockdata_v112(section) (blocks, data) = self._get_blockdata_v112(section)
else: # Special case introduced with 1.14 else: # Special case introduced with 1.14