LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

data/textures is now checked *last*, updated biome colors

Browse Source
This commit is contained in:
Aaron Griffith
2012-03-01 16:46:23 -05:00
parent d1c5c14ff7
commit bcc1e61b0d
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
overviewer_core/textures.py
View File

@@ -114,13 +114,15 @@ class Textures(object):
* the textures_path given in the initializer
this can be either a directory or a zip file (texture pack)
* The program dir (same dir as overviewer.py)
* The overviewer_core/data/textures dir
* On Darwin, in /Applications/Minecraft
* Inside minecraft.jar, which is looked for at these locations
* On Windows, at %APPDATA%/.minecraft/bin/minecraft.jar
* On Darwin, at $HOME/Library/Application Support/minecraft/bin/minecraft.jar
* at $HOME/.minecraft/bin/minecraft.jar
* On Windows, at %APPDATA%/.minecraft/bin/minecraft.jar
* On Darwin, at
$HOME/Library/Application Support/minecraft/bin/minecraft.jar
* at $HOME/.minecraft/bin/minecraft.jar
* The overviewer_core/data/textures dir
In all of these, files are searched for in '.', 'misc/', and
'environment/'.
@@ -163,17 +165,6 @@ class Textures(object):
if verbose: logging.info("Found %s in '%s'", filename, path)
return open(path, mode)
path = search_dir(os.path.join(programdir, "overviewer_core", "data", "textures"))
if path:
if verbose: logging.info("Found %s in '%s'", filename, path)
return open(path, mode)
elif hasattr(sys, "frozen") or imp.is_frozen("__main__"):
# windows special case, when the package dir doesn't exist
path = search_dir(os.path.join(programdir, "textures"))
if path:
if verbose: logging.info("Found %s in '%s'", filename, path)
return open(path, mode)
if sys.platform == "darwin":
path = search_dir("/Applications/Minecraft")
if path:
@@ -210,6 +201,17 @@ class Textures(object):
if path:
if verbose: logging.info("Found %s in '%s'", filename, path)
return open(path, 'rb')
path = search_dir(os.path.join(programdir, "overviewer_core", "data", "textures"))
if path:
if verbose: logging.info("Found %s in '%s'", filename, path)
return open(path, mode)
elif hasattr(sys, "frozen") or imp.is_frozen("__main__"):
# windows special case, when the package dir doesn't exist
path = search_dir(os.path.join(programdir, "textures"))
if path:
if verbose: logging.info("Found %s in '%s'", filename, path)
return open(path, mode)
raise IOError("Could not find the file `{0}'. You can either place it in the same place as overviewer.py, use --textures-path, or install the Minecraft client.".format(filename))