Merged in dtt-c-render
Conflicts: src/overviewer.h
This commit is contained in:
18
world.py
18
world.py
@@ -64,7 +64,7 @@ class World(object):
|
||||
"""Does world-level preprocessing to prepare for QuadtreeGen
|
||||
worlddir is the path to the minecraft world
|
||||
"""
|
||||
|
||||
|
||||
mincol = maxcol = minrow = maxrow = 0
|
||||
|
||||
def __init__(self, worlddir, useBiomeData=False,regionlist=None, lighting=False):
|
||||
@@ -79,7 +79,7 @@ class World(object):
|
||||
for x, y, regionfile in self._iterate_regionfiles():
|
||||
mcr = nbt.MCRFileReader(regionfile)
|
||||
mcr.get_chunk_info()
|
||||
regions[regionfile] = mcr
|
||||
regions[regionfile] = (mcr,os.path.getmtime(regionfile))
|
||||
regionfiles[(x,y)] = (x,y,regionfile)
|
||||
self.regionfiles = regionfiles
|
||||
self.regions = regions
|
||||
@@ -118,8 +118,6 @@ class World(object):
|
||||
_, _, regionfile = self.regionfiles.get((chunkX//32, chunkY//32),(None,None,None));
|
||||
return regionfile
|
||||
|
||||
|
||||
|
||||
def load_from_region(self,filename, x, y):
|
||||
nbt = self.load_region(filename).load_chunk(x, y)
|
||||
if nbt is None:
|
||||
@@ -128,11 +126,15 @@ class World(object):
|
||||
return nbt.read_all()
|
||||
|
||||
|
||||
#filo region cache
|
||||
def load_region(self,filename):
|
||||
#return nbt.MCRFileReader(filename)
|
||||
return self.regions[filename]
|
||||
#used to reload a changed region
|
||||
def reload_region(self,filename):
|
||||
self.regions[filename] = (nbt.MCRFileReader(filename),os.path.getmtime(regionfile))
|
||||
|
||||
def load_region(self,filename):
|
||||
return self.regions[filename][0]
|
||||
|
||||
def get_region_mtime(self,filename):
|
||||
return self.regions[filename][1]
|
||||
|
||||
def convert_coords(self, chunkx, chunky):
|
||||
"""Takes a coordinate (chunkx, chunky) where chunkx and chunky are
|
||||
|
||||
Reference in New Issue
Block a user