LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge remote-tracking branch 'exhuma/master', PR #963

Browse Source 
Conflicts:
	overviewer.py
	overviewer_core/aux_files/genPOI.py
	overviewer_core/textures.py
This commit is contained in:
Aaron Griffith
2013-12-01 16:35:28 -05:00
parent 7bbb077704 d4f19bda76
commit e26727943f
11 changed files with 219 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
overviewer_core/aux_files/genPOI.py
View File

@@ -31,6 +31,9 @@ from overviewer_core import logger
from overviewer_core import nbt
from overviewer_core import configParser, world
LOG = logging.getLogger(__name__)
def replaceBads(s):
"Replaces bad characters with good characters!"
bads = [" ", "(", ")"]
@@ -66,7 +69,7 @@ def handleEntities(rset, outputdir, render, rname, config):
if hasattr(rset, "_pois"):
return
logging.info("Looking for entities in %r", rset)
LOG.info("Looking for entities in %r", rset)
filters = render['markers']
rset._pois = dict(TileEntities=[], Entities=[])
@@ -106,7 +109,7 @@ def handleEntities(rset, outputdir, render, rname, config):
rset._pois['TileEntities'] += data['TileEntities']
rset._pois['Entities'] += data['Entities']
logging.info("Done.")
LOG.info("Done.")
def handlePlayers(rset, render, worldpath):
if not hasattr(rset, "_pois"):
@@ -143,7 +146,7 @@ def handlePlayers(rset, render, worldpath):
if isSinglePlayer:
data = data['Data']['Player']
except IOError:
logging.warning("Skipping bad player dat file %r", playerfile)
LOG.warning("Skipping bad player dat file %r", playerfile)
continue
playername = playerfile.split(".")[0]
if isSinglePlayer:
@@ -204,7 +207,7 @@ def main():
try:
config = mw_parser.get_validated_config()
except Exception:
logging.exception("An error was encountered with your configuration. See the info below.")
LOG.exception("An error was encountered with your configuration. See the info below.")
return 1
destdir = config['outputdir']
@@ -218,7 +221,7 @@ def main():
try:
worldpath = config['worlds'][render['world']]
except KeyError:
logging.error("Render %s's world is '%s', but I could not find a corresponding entry in the worlds dictionary.",
LOG.error("Render %s's world is '%s', but I could not find a corresponding entry in the worlds dictionary.",
rname, render['world'])
return 1
render['worldname_orig'] = render['world']
@@ -233,7 +236,7 @@ def main():
rset = w.get_regionset(render['dimension'][1])
if rset == None: # indicates no such dimension was found:
logging.error("Sorry, you requested dimension '%s' for the render '%s', but I couldn't find it", render['dimension'][0], rname)
LOG.error("Sorry, you requested dimension '%s' for the render '%s', but I couldn't find it", render['dimension'][0], rname)
return 1
for f in render['markers']:
@@ -256,8 +259,8 @@ def main():
handlePlayers(rset, render, worldpath)
handleManual(rset, render['manualpois'])
logging.info("Done handling POIs")
logging.info("Writing out javascript files")
LOG.info("Done handling POIs")
LOG.info("Writing out javascript files")
markerSetDict = dict()
for (flter, rset) in markersets:
# generate a unique name for this markerset. it will not be user visible
@@ -376,7 +379,7 @@ def main():
output.write("overviewer.util.injectMarkerScript('markersDB.js');\n")
output.write("overviewer.util.injectMarkerScript('markers.js');\n")
output.write("overviewer.collections.haveSigns=true;\n")
logging.info("Done")
LOG.info("Done")
if __name__ == "__main__":
main()