LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Handle minecraft.jar if it's a directory (if you've installed mods etc.)

Browse Source
This commit is contained in:
Jason Scheirer
2011-10-31 01:34:48 -07:00
parent 64e67cc827
commit 8a925ecc52
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
overviewer_core/textures.py
View File

@@ -89,7 +89,7 @@ def _find_file(filename, mode="rb", verbose=False):
jarpaths.append(os.path.join(_find_file_local_path, "minecraft.jar")) jarpaths.append(os.path.join(_find_file_local_path, "minecraft.jar"))
for jarpath in jarpaths: for jarpath in jarpaths:
if os.path.exists(jarpath): if os.path.isfile(jarpath):
jar = zipfile.ZipFile(jarpath) jar = zipfile.ZipFile(jarpath)
for jarfilename in [filename, 'misc/' + filename, 'environment/' + filename]: for jarfilename in [filename, 'misc/' + filename, 'environment/' + filename]:
try: try:
@@ -97,6 +97,12 @@ def _find_file(filename, mode="rb", verbose=False):
return jar.open(jarfilename) return jar.open(jarfilename)
except (KeyError, IOError), e: except (KeyError, IOError), e:
pass pass
elif os.path.isdir(jarpath):
for jarfilename in [filename, 'misc/' + filename, 'environment/' + filename]:
ondiskfilename = os.path.join(jarpath, jarfilename)
if os.path.isfile(ondiskfilename):
if verbose: logging.info("Found %s in '%s'", jarfilename, jarpath)
return open(ondiskfilename, 'rb')
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)) 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))