LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

make 20w17a blockstate code cleaner

Browse Source
This commit is contained in:
Alexander Rath
2020-05-22 10:27:47 +02:00
parent 5ff3e2b09f
commit 9e7bd98410
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
overviewer_core/world.py
View File

@@ -23,6 +23,7 @@ import re
import locale import locale
import numpy import numpy
import math
from . import nbt from . import nbt
from . import cache from . import cache
@@ -1245,9 +1246,7 @@ class RegionSet(object):
return result return result
def _packed_longarray_to_shorts_v116(self, long_array, n, num_palette): def _packed_longarray_to_shorts_v116(self, long_array, n, num_palette):
bits_per_value = 4 bits_per_value = max(4, math.ceil(math.log2(num_palette)))
while (1 << bits_per_value) < num_palette:
bits_per_value += 1
b = numpy.asarray(long_array, dtype=numpy.uint64) b = numpy.asarray(long_array, dtype=numpy.uint64)
result = numpy.zeros((n,), dtype=numpy.uint16) result = numpy.zeros((n,), dtype=numpy.uint16)
@@ -1256,7 +1255,6 @@ class RegionSet(object):
for i in range(shorts_per_long): for i in range(shorts_per_long):
j = (n + shorts_per_long - 1 - i) // 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 result[i::shorts_per_long] = (b[:j] >> (bits_per_value * i)) & mask
return result return result
@@ -1391,7 +1389,7 @@ class RegionSet(object):
chunk_data = level chunk_data = level
longarray_unpacker = self._packed_longarray_to_shorts longarray_unpacker = self._packed_longarray_to_shorts
if 'DataVersion' in data[1] and data[1]['DataVersion'] >= 2529: if data[1].get('DataVersion', 0) >= 2529:
# starting with 1.16 snapshot 20w17a, block states are packed differently # starting with 1.16 snapshot 20w17a, block states are packed differently
longarray_unpacker = self._packed_longarray_to_shorts_v116 longarray_unpacker = self._packed_longarray_to_shorts_v116