AstralTransRocketries/pymclevel
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added: Biomes are now exported into schematic files.

Browse Source 
Biomes array is indexed z, x

When importing, biomes are only copied on request.
This commit is contained in:
David Vierra 2013-01-11 17:37:37 -10:00
parent 5865930613
commit 2725e1e94f
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
block_copy.py
View File

@ -47,7 +47,7 @@ def adjustCopyParameters(destLevel, sourceLevel, sourceBox, destinationPoint):
def copyBlocksFromIter(destLevel, sourceLevel, sourceBox, destinationPoint, blocksToCopy=None, entities=True, create=False): def copyBlocksFromIter(destLevel, sourceLevel, sourceBox, destinationPoint, blocksToCopy=None, entities=True, create=False, biomes=False):
""" copy blocks between two infinite levels by looping through the """ copy blocks between two infinite levels by looping through the
destination's chunks. make a sub-box of the source level for each chunk destination's chunks. make a sub-box of the source level for each chunk
and copy block and entities in the sub box to the dest chunk.""" and copy block and entities in the sub box to the dest chunk."""
@ -134,13 +134,16 @@ def copyBlocksFromIter(destLevel, sourceLevel, sourceBox, destinationPoint, bloc
eTag = TileEntity.copyWithOffset(tileEntityTag, copyOffset) eTag = TileEntity.copyWithOffset(tileEntityTag, copyOffset)
destLevel.addTileEntity(eTag) destLevel.addTileEntity(eTag)
if biomes and hasattr(destChunk, 'Biomes') and hasattr(sourceChunk, 'Biomes'):
destChunk.Biomes[destSlices[:2]] = sourceChunk.Biomes[sourceSlices[:2]]
destChunk.chunkChanged() destChunk.chunkChanged()
log.info("Duration: {0}".format(datetime.now() - startTime)) log.info("Duration: {0}".format(datetime.now() - startTime))
log.info("Copied {0} entities and {1} tile entities".format(e, t)) log.info("Copied {0} entities and {1} tile entities".format(e, t))
def copyBlocksFrom(destLevel, sourceLevel, sourceBox, destinationPoint, blocksToCopy=None, entities=True, create=False): def copyBlocksFrom(destLevel, sourceLevel, sourceBox, destinationPoint, blocksToCopy=None, entities=True, create=False, biomes=False):
return exhaust(copyBlocksFromIter(destLevel, sourceLevel, sourceBox, destinationPoint, blocksToCopy, entities, create)) return exhaust(copyBlocksFromIter(destLevel, sourceLevel, sourceBox, destinationPoint, blocksToCopy, entities, create, biomes))

21
schematic.py
View File

@ -98,6 +98,8 @@ class MCSchematic (EntityLevel):
self.root_tag["Data"].value = self.root_tag["Data"].value.reshape(h, l, w) self.root_tag["Data"].value = self.root_tag["Data"].value.reshape(h, l, w)
if "Biomes" in self.root_tag:
self.root_tag["Biomes"].value.shape = (l, w)
else: else:
assert shape is not None assert shape is not None
@ -113,6 +115,8 @@ class MCSchematic (EntityLevel):
self._Blocks = zeros((shape[1], shape[2], shape[0]), 'uint16') self._Blocks = zeros((shape[1], shape[2], shape[0]), 'uint16')
root_tag["Data"] = nbt.TAG_Byte_Array(zeros((shape[1], shape[2], shape[0]), uint8)) root_tag["Data"] = nbt.TAG_Byte_Array(zeros((shape[1], shape[2], shape[0]), uint8))
root_tag["Biomes"] = nbt.TAG_Byte_Array(zeros((shape[2], shape[0]), uint8))
self.root_tag = root_tag self.root_tag = root_tag
self.root_tag["Data"].value &= 0xF # discard high bits self.root_tag["Data"].value &= 0xF # discard high bits
@ -198,6 +202,10 @@ class MCSchematic (EntityLevel):
self.root_tag["Materials"] = nbt.TAG_String() self.root_tag["Materials"] = nbt.TAG_String()
self.root_tag["Materials"].value = val self.root_tag["Materials"].value = val
@property
def Biomes(self):
return swapaxes(self.root_tag["Biomes"].value, 0, 1)
@classmethod @classmethod
def _isTagLevel(cls, root_tag): def _isTagLevel(cls, root_tag):
return "Schematic" == root_tag.name return "Schematic" == root_tag.name
@ -343,6 +351,15 @@ class MCSchematic (EntityLevel):
return chest return chest
def getChunk(self, cx, cz):
chunk = super(MCSchematic, self).getChunk(cx, cz)
if "Biomes" in self.root_tag:
x = cx << 4
z = cz << 4
chunk.Biomes = self.Biomes[x:x + 16, z:z + 16]
return chunk
class INVEditChest(MCSchematic): class INVEditChest(MCSchematic):
Width = 1 Width = 1
Height = 1 Height = 1
@ -523,7 +540,7 @@ def extractSchematicFromIter(sourceLevel, box, entities=True):
newbox, destPoint = p newbox, destPoint = p
tempSchematic = MCSchematic(shape=box.size, mats=sourceLevel.materials) tempSchematic = MCSchematic(shape=box.size, mats=sourceLevel.materials)
for i in tempSchematic.copyBlocksFromIter(sourceLevel, newbox, destPoint, entities=entities): for i in tempSchematic.copyBlocksFromIter(sourceLevel, newbox, destPoint, entities=entities, biomes=True):
yield i yield i
yield tempSchematic yield tempSchematic
@ -557,7 +574,7 @@ def extractZipSchematicFromIter(sourceLevel, box, zipfilename=None, entities=Tru
tempSchematic = ZipSchematic(zipfilename, create=True) tempSchematic = ZipSchematic(zipfilename, create=True)
tempSchematic.materials = sourceLevel.materials tempSchematic.materials = sourceLevel.materials
for i in tempSchematic.copyBlocksFromIter(sourceLevel, sourceBox, destPoint, entities=entities, create=True): for i in tempSchematic.copyBlocksFromIter(sourceLevel, sourceBox, destPoint, entities=entities, create=True, biomes=True):
yield i yield i
tempSchematic.Width, tempSchematic.Height, tempSchematic.Length = sourceBox.size tempSchematic.Width, tempSchematic.Height, tempSchematic.Length = sourceBox.size