From 1f8fb017a3705d42ff2ea418ca3416ef3c5bc6f3 Mon Sep 17 00:00:00 2001 From: Andrew Chin Date: Sat, 26 Feb 2011 21:59:49 -0500 Subject: [PATCH] Check to ensure level.dat has been updated Error out if level.dat has not been updated. Also, cleaned up some debugging print statements --- chunk.py | 2 +- world.py | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/chunk.py b/chunk.py index dffdc61..1749ad6 100644 --- a/chunk.py +++ b/chunk.py @@ -141,7 +141,7 @@ def find_oldimage(chunkXY, cached, cave): if key in cached[cachename]: oldimg_path = cached[cachename][key] _, oldimg = os.path.split(oldimg_path) - logging.debug("Found cached image {0}".format(oldimg)) + #logging.debug("Found cached image {0}".format(oldimg)) return oldimg, oldimg_path def check_cache(world, chunkXY, oldimg): diff --git a/world.py b/world.py index e6b8b87..8976d15 100644 --- a/world.py +++ b/world.py @@ -120,9 +120,9 @@ class WorldRenderer(object): # if mcregion, error out early until we can add support data = nbt.load(os.path.join(self.worlddir, "level.dat"))[1]['Data'] #print data - if 'version' in data and data['version'] == 19132: - logging.error("Sorry, Minecraft-Overviewer doesn't yet know how to read McRegion chunks") - #sys.exit(1) + if not ('version' in data and data['version'] == 19132): + logging.error("Sorry, This version of Minecraft-Overviewer only works with the new McRegion chunk format") + sys.exit(1) if self.useBiomeData: textures.prepareBiomeData(worlddir) @@ -292,16 +292,12 @@ class WorldRenderer(object): all_chunks = [] regions = self._find_regionfiles() - print "found %d regions" % len(regions) + logging.debug("Found %d regions",len(regions)) for region in regions: - print "region %d, %d --> %s" % region these_chunks = list(itertools.product( range(region[0]*32,region[0]*32 + 32), range(region[1]*32,region[1]*32 + 32) )) - print "region %d,%d will go from:" - print " %r" % range(region[0]*32,region[0]*32 + 32) - print " %r" % range(region[1]*32,region[1]*32 + 32) these_chunks = map(lambda x: (x[0], x[1], region[2]), these_chunks) assert(len(these_chunks) == 1024) all_chunks += these_chunks