updated "installing the textures" section of the docs

Also fixed docstring in textures.py for the find_file method.

docs/running.rst

@@ -229,6 +229,9 @@ is typically correct.
 Installing the Textures
 =======================
 
+.. note::
+    This procedure has changed with Minecraft 1.6's Resource Pack update.
+
 If Overviewer is running on a machine with the Minecraft client installed, it
 will automatically use the default textures from Minecraft.
 
@@ -238,20 +241,34 @@ manually. This is common for servers.
 
 If you want or need to provide your own textures, you have several options:
 
-* If you're running the Overviewer on a server, you can still put the
+* If you're running the Overviewer on a server without the client, you can run
-  minecraft.jar file (not the launcher) into the correct location and the
+  the launcher to install the client, and Overviewer will use the textures from
-  Overviewer will find and use it, thinking the client is installed, even if the
+  that.
-  rest of the client files are missing. On Linux, try a command like this::
   
-      wget -N http://s3.amazonaws.com/MinecraftDownload/minecraft.jar -P ~/.minecraft/bin/
+* You can put the client jar in the correct place manually, from a computer that
+  does have the client, to your server. The correct places are:
   
-* You can manually extract the textures folder from minecraft.jar or your favorite
+  * For Linux: ``~/.minecraft/versions/<version>/<version>.jar``
-  texture pack. If you've built the Overviewer from source or are using the
-  windows exe, place the folder in the same directory as overviewer.py or
-  overviewer.exe.
 
-* Specify any texture pack you want with the
+  * For Mac: ``~/Library/Application Support/minecraft/versions/<version>/<version>.jar``
-  :ref:`texturepath<option_texturepath>` option.
+    
+  * For Windows: ``%APPDATA%/.minecraft/versions/<version>/<version>.jar``
+
+* You can take the client jar from a computer that has the client installed, or
+  take a resource pack from a third party that contains textures, and specify it
+  with the :ref:`texturepath<option_texturepath>` option.
+    
+.. note::
+    Unfortunately we no longer have an easy wget command to run that will
+    download the official minecraft textures. The launcher is the only way to
+    download the official textures until we can figure out where they're coming
+    from.
+
+.. note::
+    Overviewer will only search for installed client *release* versions, not
+    snapshots. If you want to use a snapshot client jar for the textures,
+    you must specify it manually with the :ref:`texturepath<option_texturepath>`
+    option.
 
 If you copy your world before you render it
 -------------------------------------------

overviewer_core/textures.py

@@ -25,7 +25,6 @@ import numpy
 from PIL import Image, ImageEnhance, ImageOps, ImageDraw
 import logging
 import functools
-import glob
 
 import util
 from c_overviewer import alpha_over
@@ -122,16 +121,19 @@ class Textures(object):
         """Searches for the given file and returns an open handle to it.
         This searches the following locations in this order:
         
-        * the textures_path given in the initializer
+        * In the directory textures_path given in the initializer
-        this can be either a directory or a zip file (texture pack)
+        * In the resource pack given by textures_path
-        * The program dir (same dir as overviewer.py)
+        * The program dir (same dir as overviewer.py) for extracted textures
-        * On Darwin, in /Applications/Minecraft
+        * On Darwin, in /Applications/Minecraft for extracted textures
-        * Inside minecraft.jar, which is looked for at these locations
+        * Inside a minecraft client jar. Client jars are searched for in the
+          following location depending on platform:
         
-            * On Windows, at %APPDATA%/.minecraft/bin/minecraft.jar
+            * On Windows, at %APPDATA%/.minecraft/versions/
             * On Darwin, at
-                $HOME/Library/Application Support/minecraft/bin/minecraft.jar
+                $HOME/Library/Application Support/minecraft/versions
-            * at $HOME/.minecraft/bin/minecraft.jar
+            * at $HOME/.minecraft/versions/
+
+          Only the latest non-snapshot version >1.6 is used
 
         * The overviewer_core/data/textures dir
         
@@ -198,7 +200,7 @@ class Textures(object):
         if verbose: logging.info("Did not find the file in overviewer executable directory")
         if verbose: logging.info("Looking for installed minecraft jar files...")
 
-        # Find an installed minecraft jar file and look in it for the texture
+        # Find an installed minecraft client jar and look in it for the texture
         # file we need.
         versiondir = None
         if "APPDATA" in os.environ: