From 3e1520ee0240e6f48103b17c4779b1b48680ba2c Mon Sep 17 00:00:00 2001 From: David Vierra Date: Tue, 20 Dec 2011 05:39:05 -1000 Subject: [PATCH] Import level classes where they're needed instead of in mclevelbase.py. This lets us run each file individually, e.g. for doctests. --- indev.py | 1 + infiniteworld.py | 2 ++ java.py | 1 + mclevelbase.py | 1 - pocket.py | 1 + schematic.py | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/indev.py b/indev.py index 6d3c5c1..77ee4eb 100644 --- a/indev.py +++ b/indev.py @@ -87,6 +87,7 @@ Spawn = "Spawn" __all__ = ["MCIndevLevel"] +from level import EntityLevel, extractLightMap class MCIndevLevel(EntityLevel): """ IMPORTANT: self.Blocks and self.Data are indexed with [x,z,y] via axis diff --git a/infiniteworld.py b/infiniteworld.py index 2024fcc..cd26977 100644 --- a/infiniteworld.py +++ b/infiniteworld.py @@ -17,6 +17,8 @@ from os.path import join, dirname, basename log = logging.getLogger(__name__) warn, error, info, debug = log.warn, log.error, log.info, log.debug +from level import MCLevel, EntityLevel, extractLightMap + #infinite Level = 'Level' BlockData = 'BlockData' diff --git a/java.py b/java.py index f2bbf26..0e3a668 100644 --- a/java.py +++ b/java.py @@ -11,6 +11,7 @@ import re log = logging.getLogger(__name__) warn, error, info, debug = log.warn, log.error, log.info, log.debug +from level import MCLevel class MCJavaLevel(MCLevel): diff --git a/mclevelbase.py b/mclevelbase.py index b77d1a7..8a56f70 100644 --- a/mclevelbase.py +++ b/mclevelbase.py @@ -110,4 +110,3 @@ else: saveFileDir = os.path.join(minecraftDir, u"saves") -from level import MCLevel, EntityLevel, extractLightMap diff --git a/pocket.py b/pocket.py index 0803eb1..d388b10 100644 --- a/pocket.py +++ b/pocket.py @@ -298,6 +298,7 @@ class PocketChunksFile(object): return coords from infiniteworld import InfdevChunk, ChunkedLevelMixin +from level import MCLevel class PocketWorld(ChunkedLevelMixin, MCLevel): Height = 128 diff --git a/schematic.py b/schematic.py index 079bb48..88710b9 100644 --- a/schematic.py +++ b/schematic.py @@ -5,6 +5,7 @@ Created on Jul 22, 2011 ''' from mclevelbase import * import shutil +from level import MCLevel, EntityLevel log = logging.getLogger(__name__) warn, error, info, debug = log.warn, log.error, log.info, log.debug