LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

textures: try more than the most recent Minecraft

Browse Source 
We can try each jar in descending order of versions until we actually
find one that works. This fixes #1328.

Future work might move the "if self.jar is not None" higher up in the
function so that we don't keep re-checking the overviewer dir and texture
path for files that we will then not use at all for some reason.
This commit is contained in:
Nicolas F
2019-07-04 15:27:58 +02:00
parent 7d1a04b0fe
commit 1e8735328e
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
overviewer_core/textures.py
View File

@@ -276,7 +276,7 @@ class Textures(object):
# method. # method.
versions = [] versions = []
most_recent_version = [0,0,0] available_versions = []
for version in versions: for version in versions:
# Look for the latest non-snapshot that is at least 1.8. This # Look for the latest non-snapshot that is at least 1.8. This
# version is only compatible with >=1.8, and we cannot in general # version is only compatible with >=1.8, and we cannot in general
@@ -294,11 +294,14 @@ class Textures(object):
if versionparts < [1,8]: if versionparts < [1,8]:
continue continue
if versionparts > most_recent_version: available_versions.append(versionparts)
most_recent_version = versionparts
if most_recent_version != [0,0,0]: available_versions.sort(reverse=True)
if verbose: logging.info("Most recent version >=1.8.0: {0}. Searching it for the file...".format(most_recent_version)) if not available_versions:
if verbose: logging.info("Did not find any non-snapshot minecraft jars >=1.8.0")
while(available_versions):
most_recent_version = available_versions.pop(0)
if verbose: logging.info("Trying {0}. Searching it for the file...".format(".".join(str(x) for x in most_recent_version)))
jarname = ".".join(str(x) for x in most_recent_version) jarname = ".".join(str(x) for x in most_recent_version)
jarpath = os.path.join(versiondir, jarname, jarname + ".jar") jarpath = os.path.join(versiondir, jarname, jarname + ".jar")
@@ -315,8 +318,6 @@ class Textures(object):
pass pass
if verbose: logging.info("Did not find file {0} in jar {1}".format(filename, jarpath)) if verbose: logging.info("Did not find file {0} in jar {1}".format(filename, jarpath))
else:
if verbose: logging.info("Did not find any non-snapshot minecraft jars >=1.8.0")
# Last ditch effort: look for the file is stored in with the overviewer # Last ditch effort: look for the file is stored in with the overviewer
# installation. We include a few files that aren't included with Minecraft # installation. We include a few files that aren't included with Minecraft