Use the normal client location

Author: sandain

msctl

@@ -243,7 +243,7 @@ DEFAULT_VERSION_TYPE='release'
 DEFAULT_CLIENT_VERSION='$CURRENT_VERSION'
 DEFAULT_CLIENT_JAR='$CLIENT_VERSION.jar'
 DEFAULT_CLIENT_URL='https://s3.amazonaws.com/Minecraft.Download/versions/$CLIENT_VERSION/$CLIENT_VERSION.jar'
-DEFAULT_CLIENT_LOCATION=$LOCATION'/client/$CLIENT_VERSION'
+DEFAULT_CLIENT_LOCATION=$LOCATION'/.minecraft/versions/$CLIENT_VERSION'
 DEFAULT_SERVER_VERSION='$CURRENT_VERSION'
 DEFAULT_SERVER_JAR='minecraft_server.$SERVER_VERSION.jar'
 DEFAULT_SERVER_URL='https://s3.amazonaws.com/Minecraft.Download/versions/$SERVER_VERSION/minecraft_server.$SERVER_VERSION.jar'
@@ -1456,8 +1456,6 @@ overviewer() {
   mkdir -p "$MAPS_LOCATION/$1"
   # Make sure the Minecraft client is available.
   updateClientSoftware "$1"
-  CLIENT_JAR=$(getClientJar "$1")
-  CLIENT_LOCATION=$(getClientLocation "$1")
   # Make sure that the world files are actually there before mapping.
   if [ -e "$WORLDS_LOCATION/$1/server.properties" ]; then
     # Check for Overviewer settings file.
@@ -1480,7 +1478,6 @@ overviewer() {
       printf "}\n" >> $WORLDS_LOCATION/$1/overviewer-settings.py
       printf "\n" >> $WORLDS_LOCATION/$1/overviewer-settings.py
       printf "outputdir = \"$MAPS_LOCATION/$1\"\n" >> $WORLDS_LOCATION/$1/overviewer-settings.py
-      printf "texturepath = \"$CLIENT_LOCATION/$CLIENT_JAR\"\n" >> $WORLDS_LOCATION/$1/overviewer-settings.py
     fi
     # Generate the map and POI.
     $OVERVIEWER_BIN --config="$WORLDS_LOCATION/$1/overviewer-settings.py" >> "$WORLDS_LOCATION/$1/logs/overviewer.log" 2>&1