Support static Chunks in EmptyRegions

asked by #11

anvil/empty_region.py

@@ -1,5 +1,6 @@
 from typing import Union, List, BinaryIO
 from .empty_chunk import EmptyChunk
+from .chunk import Chunk
 from .empty_section import EmptySection
 from .block import Block
 from .errors import OutOfBoundsCoordinates
@@ -204,7 +205,13 @@ def save(self, file: Union[str, BinaryIO]=None) -> bytes:
                 chunks_data.append(None)
                 continue
             chunk_data = BytesIO()
-            chunk.save().write_file(buffer=chunk_data)
+            if isinstance(chunk, Chunk):
+                nbt_data = nbt.NBTFile()
+                nbt_data.tags.append(nbt.TAG_Int(name='DataVersion', value=chunk.version))
+                nbt_data.tags.append(chunk.data)
+            else:
+                nbt_data = chunk.save()
+            nbt_data.write_file(buffer=chunk_data)
             chunk_data.seek(0)
             chunk_data = zlib.compress(chunk_data.read())
             chunks_data.append(chunk_data)

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name='anvil-parser',
-    version='0.6.3',
+    version='0.6.4',
     author='mat',
     description='A Minecraft anvil file format parser',
     long_description=long_description,

tests/test_mixed_chunk_types.py

@@ -0,0 +1,26 @@
+import context as _
+from anvil import Chunk, EmptyChunk, EmptyRegion, Block, Region
+import random
+
+def test_mixed_chunk_types():
+    colors = ['red', 'orange', 'yellow', 'green']
+
+    region = EmptyRegion(0, 0)
+
+    chunk = EmptyChunk(0, 0)
+    empty_chunk = EmptyChunk(1, 0)
+    for i, color in enumerate(colors):
+        chunk.set_block(Block(color), i, 0, 0)
+        empty_chunk.set_block(Block(color), i, 0, 0)
+
+    chunk = Chunk(chunk.save())
+
+    region.add_chunk(chunk)
+    region.add_chunk(empty_chunk)
+
+    region = Region(region.save())
+
+    for i in range(2):
+        chunk = region.get_chunk(i, 0)
+        for i, color in enumerate(colors):
+            assert chunk.get_block(i, 0, 0).id == color