diff --git a/docs/running.rst b/docs/running.rst index 2da1557..340f1e5 100644 --- a/docs/running.rst +++ b/docs/running.rst @@ -261,13 +261,13 @@ If you want or need to provide your own textures, you have several options: :: - VERSION=1.7.10 + VERSION=1.8 wget https://s3.amazonaws.com/Minecraft.Download/versions/${VERSION}/${VERSION}.jar -P ~/.minecraft/versions/${VERSION}/ If that's too confusing for you, then just take this single line and paste it into - a terminal to get 1.7.10 textures:: + a terminal to get 1.8 textures:: - wget https://s3.amazonaws.com/Minecraft.Download/versions/1.7.10/1.7.10.jar -P ~/.minecraft/versions/1.7.10/ + wget https://s3.amazonaws.com/Minecraft.Download/versions/1.8/1.8.jar -P ~/.minecraft/versions/1.8/ * You can also just run the launcher to install the client. diff --git a/overviewer_core/src/overviewer.h b/overviewer_core/src/overviewer.h index af5b418..d4af5d4 100644 --- a/overviewer_core/src/overviewer.h +++ b/overviewer_core/src/overviewer.h @@ -26,7 +26,7 @@ // increment this value if you've made a change to the c extesion // and want to force users to rebuild -#define OVERVIEWER_EXTENSION_VERSION 46 +#define OVERVIEWER_EXTENSION_VERSION 47 /* Python PIL, and numpy headers */ #include diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index df14a67..2ea9f43 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -252,12 +252,12 @@ class Textures(object): most_recent_version = [0,0,0] for version in versions: - # Look for the latest non-snapshot that is at least 1.6. This - # version is only compatible with >=1.6, and we cannot in general + # 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 # tell if a snapshot is more or less recent than a release. - # Allow two component names such as "1.6" and three component names - # such as "1.6.1" + # Allow two component names such as "1.8" and three component names + # such as "1.8.1" if version.count(".") not in (1,2): continue try: @@ -265,14 +265,14 @@ class Textures(object): except ValueError: continue - if versionparts < [1,7]: + if versionparts < [1,8]: continue if versionparts > most_recent_version: most_recent_version = versionparts if most_recent_version != [0,0,0]: - if verbose: logging.info("Most recent version >=1.7.0: {0}. Searching it for the file...".format(most_recent_version)) + if verbose: logging.info("Most recent version >=1.8.0: {0}. Searching it for the file...".format(most_recent_version)) jarname = ".".join(str(x) for x in most_recent_version) jarpath = os.path.join(versiondir, jarname, jarname + ".jar") @@ -290,7 +290,7 @@ class Textures(object): 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.7.0") + 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 # installation. We include a few files that aren't included with Minecraft @@ -310,7 +310,7 @@ class Textures(object): if verbose: logging.info("Found %s in '%s'", filename, path) return open(path, mode) - raise TextureException("Could not find the textures while searching for '{0}'. Try specifying the 'texturepath' option in your config file.\nSet it to the path to a Minecraft Resource pack.\nAlternately, install the Minecraft client (which includes textures)\nAlso see \n(Remember, this version of Overviewer requires a 1.7-compatible resource pack)\n(Also note that I won't automatically use snapshots; you'll have to use the texturepath option to use a snapshot jar)".format(filename)) + raise TextureException("Could not find the textures while searching for '{0}'. Try specifying the 'texturepath' option in your config file.\nSet it to the path to a Minecraft Resource pack.\nAlternately, install the Minecraft client (which includes textures)\nAlso see \n(Remember, this version of Overviewer requires a 1.8-compatible resource pack)\n(Also note that I won't automatically use snapshots; you'll have to use the texturepath option to use a snapshot jar)".format(filename)) def load_image_texture(self, filename): # Textures may be animated or in a different resolution than 16x16.