1.6.1

README

@@ -1,9 +1,9 @@
-Minecraft Land Generator version 1.6.05
+Minecraft Land Generator version 1.6.1
 
-Updated March 27, 2012
+Updated April 15, 2012
 
 Original Code by Corrodias		November 2010
-Enhanced Code by Morlok8k		Feb. 2011 to Now (or at least to March 27, 2012!)
+Enhanced Code by Morlok8k		Feb. 2011 to Now (or at least to April 15, 2012!)
 Additional Code by pr0f1x		October 2011
 
 Website: https://sites.google.com/site/minecraftlandgenerator/
@@ -13,7 +13,7 @@ Source: https://github.com/Morlok8k/MinecraftLandGenerator
 -----------------------------------------------
 
 This program lets you generate an area of land with your Minecraft Beta SMP server (and is prossibly future-proof for newer versions). You set up your java command line and minecraft server paths in the MinecraftLandGenerator.conf file, set up the server's server.properties file with the name of the world you wish to use, and then run this program.
-When a Minecraft server is launched, it automatically generates chunks within a square area of 25x25 chunks (400x400 blocks), centered on the current spawn point (formally 20x20 chunks, 320x320 blocks). When provided X and Y ranges as arguments, this program will launch the server repeatedly, editing the level.dat file between sessions, to generate large amounts of land without players having to explore them. The generated land will have about the X and Y ranges as requested by the arguments, though it will not be exact due to the spawn point typically not on the border of a chunk. (Because of this, MLG by default adds a slight overlap with each pass - 380x380 blocks) You can use the -x and -y switches to override the spawn offset and center the land generation on a different point.
+When a Minecraft server is launched, it automatically generates chunks within a square area of 25x25 chunks (400x400 blocks), centered on the current spawn point (formally 20x20 chunks, 320x320 blocks). When provided X and Z ranges as arguments, this program will launch the server repeatedly, editing the level.dat file between sessions, to generate large amounts of land without players having to explore them. The generated land will have about the X and Z ranges as requested by the arguments, though it will not be exact due to the spawn point typically not on the border of a chunk. (Because of this, MLG by default adds a slight overlap with each pass - 380x380 blocks) You can use the -x and -z switches to override the spawn offset and center the land generation on a different point.
 The program makes a backup of level.dat as level_backup.dat before editing, and restores the backup at the end. In the event that a level_backup.dat file already exists, the program will refuse to proceed, leaving the user to determine why the level_backup.dat file exists and whether they would rather restore it or delete it, which must be done manually.
 
 This program is public domain, and the source code is included in the .jar file.  (If accidently missing, like in 1.3.0 and 1.4.0, it is always available at Github.)
@@ -26,6 +26,13 @@ Other Public Domain code has been used in this program, and references to source
 
 Version History:
 Morlok8k:
+1.6.1
+- Added some modifications for scripting  (Mainly for a new Initial setup script)
+- Changed MLG's Y to Z.  Now it matches Minecraft.  Y in the game is Height.
+- Renamed -y switch to -z.  MLG will remain backwards compatible if you use the old -y switch.
+- Updated -printspawn to show X,Y,Z
+- Added End-of-Generation ASCII-Graphic
+
 1.6.05
 - MLG displays if the server is converting the Map format, when not in verbose mode. (McRegion -> Anvil, or Chunk-File -> McRegion)
 - Minor fixes/edits/typos
@@ -126,11 +133,11 @@ However, Since beta 1.9 and Minecraft 1.0, the nether or the end is no longer ge
 
 -----------------------------------------------
 
-Usage: java -jar MinecraftLandGenerator.jar x y [serverpath] [switches]
+Usage: java -jar MinecraftLandGenerator.jar x z [serverpath] [switches]
 
 Arguments:
               x : X range to generate
-              y : Y range to generate
+              z : Z range to generate
      serverpath : the path to the directory in which the server runs (takes precedence over the config file setting)
 
 Switches:
@@ -139,9 +146,9 @@ Switches:
              -w : Ignore [WARNING] and [SEVERE] messages.
            -alt : alternate server launch sequence
              -a : same as -alt
-            -i# : override the iteration spawn offset increment (default 300) (example: -i100)
+            -i# : override the iteration spawn offset increment (default 380) (example: -i100)
-            -x# : set the X offset to generate land around (example: -x0)
+            -x# : set the X offset to generate land around (example: -x0 or -x1000 or -x-500)
-            -y# : set the X offset to generate land around (example: -y0)
+            -z# : set the Z offset to generate land around (example: -z0 or -z1000 or -z-500)
 
 Other options:
   java -jar MinecraftLandGenerator.jar -update
@@ -157,7 +164,7 @@ Other options:
 
   java -jar MinecraftLandGenerator.jar -readme readme.txt
   java -jar MinecraftLandGenerator.jar -readme
-        Generates a readme file using supplied name or the default MLG-Readme.txt
+        Generates a readme file using supplied name or the default _MLG_Readme.txt
 
   java -jar MinecraftLandGenerator.jar -downloadfile http://example.com/file.txt
         Downloads whatever file from the internet you give it.

bin/MLG-BuildID

@@ -32,3 +32,4 @@ A5882424B11003537756204DD7EC0DED=1330941087000# MLG v1.6.05
 6239928969FC1027A89AF17D82952F5B=1330941366000# MLG v1.6.05
 E65AC7BA69362EA559901E336C85F22F=1332833070000# MLG v1.6.05
 DA5CA69AAE6EF0D2815A597ED93DB5DB=1332833731000# MLG v1.6.05
+F1B044CD44634EDDB85DC44384CB8F0F=1334484354000# MLG v1.6.1

bin/MinecraftLandGenerator.conf

@@ -1,6 +1,6 @@
-#Minecraft Land Generator Configuration File:  Version: 1.6.05
+#Minecraft Land Generator Configuration File:  Version: 1.6.1
 #Authors: Corrodias, Morlok8k, pr0f1x
-#Auto-Generated: Tuesday, March 27, 2012 at 12:35 AM Pacific Daylight Time
+#Auto-Generated: Sunday, April 15, 2012 at 3:05 AM Pacific Daylight Time
 
 #Line to run server:
 Java=java -Djava.awt.headless=true -Djline.terminal=jline.UnsupportedTerminal -Duser.language=en -Xms1024m -Xmx1024m -Xincgc -jar minecraft_server.jar nogui

scripts/MLG_Initial_Setup_(Linux).sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+BINDIR=$(dirname "$(readlink -fn "$0")")
+cd "$BINDIR"
+
+java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -update
+java -jar MinecraftLandGenerator.jar -readme _MLG_Readme.txt
+java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -downloadlist MLG_Update_Files.txt
+java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -downloadfile https://s3.amazonaws.com/MinecraftDownload/launcher/minecraft_server.jar
+java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -conf
+java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar 0 0 -w

scripts/MLG_Initial_Setup_(Mac).command

@@ -0,0 +1,9 @@
+#!/bin/bash
+cd "$(dirname "$0")"
+
+exec java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -update
+exec java -jar MinecraftLandGenerator.jar -readme _MLG_Readme.txt
+exec java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -downloadlist MLG_Update_Files.txt
+exec java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -downloadfile https://s3.amazonaws.com/MinecraftDownload/launcher/minecraft_server.jar
+exec java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -conf
+exec java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar 0 0 -w

scripts/MLG_Initial_Setup_(Windows).cmd

@@ -0,0 +1,12 @@
+@echo off
+SET BINDIR=%~dp0
+CD /D "%BINDIR%"
+
+java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -update
+java -jar MinecraftLandGenerator.jar -readme _MLG_Readme.txt
+java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -downloadlist MLG_Update_Files.txt
+java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -downloadfile https://s3.amazonaws.com/MinecraftDownload/launcher/minecraft_server.jar
+java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -conf
+java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar 0 0 -w
+
+pause

scripts/MLG_Printspawn_(Linux).sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+BINDIR=$(dirname "$(readlink -fn "$0")")
+cd "$BINDIR"
+
+java -jar MinecraftLandGenerator.jar -printspawn

scripts/MLG_Printspawn_(Mac).command

@@ -0,0 +1,4 @@
+#!/bin/bash
+cd "$(dirname "$0")"
+
+java -jar MinecraftLandGenerator.jar -printspawn

scripts/MLG_Printspawn_(Windows).cmd

@@ -0,0 +1,5 @@
+@echo off
+SET BINDIR=%~dp0
+CD /D "%BINDIR%"
+
+java -jar MinecraftLandGenerator.jar -printspawn

scripts/MLG_Update_Files.txt

@@ -0,0 +1,23 @@
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/MLG_Update_Files.txt
+###RECHECK###
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/Run_MLG_%28Linux%29.sh
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/Run_MLG_%28Mac%29.command
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/Run_MLG_%28Windows%29.cmd
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/Run_Server_%28Linux%29.sh
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/Run_Server_%28Mac%29.command
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/Run_Server_%28Windows%29.cmd
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/Update_MLG_%28Linux%29.sh
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/Update_MLG_%28Mac%29.command
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/Update_MLG_%28Windows%29.cmd
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/Update_Server_%28Linux%29.sh
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/Update_Server_%28Mac%29.command
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/Update_Server_%28Windows%29.cmd
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/Update_MLG_Extra_Files_%28Linux%29.sh
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/Update_MLG_Extra_Files_%28Mac%29.command
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/Update_MLG_Extra_Files_%28Windows%29.cmd
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/MLG_Printspawn_%28Linux%29.sh
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/MLG_Printspawn_%28Mac%29.command
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/MLG_Printspawn_%28Windows%29.cmd
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/MLG_Initial_Setup_%28Linux%29.sh
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/MLG_Initial_Setup_%28Mac%29.command
+https://raw.github.com/Morlok8k/MinecraftLandGenerator/master/scripts/MLG_Initial_Setup_%28Windows%29.cmd

scripts/Run_MLG_(Linux).sh

@@ -1,4 +1,6 @@
 #!/bin/sh
+BINDIR=$(dirname "$(readlink -fn "$0")")
+cd "$BINDIR"
 
 java -client -showversion -Djava.awt.headless=true -jar MinecraftLandGenerator.jar 2000 2000
 

scripts/Run_MLG_(Windows).cmd

@@ -1,3 +1,5 @@
 @echo off
+SET BINDIR=%~dp0
+CD /D "%BINDIR%"
 
 java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar 2000 2000

scripts/Run_Server_(Linux).sh

@@ -1,3 +1,5 @@
 #!/bin/sh
+BINDIR=$(dirname "$(readlink -fn "$0")")
+cd "$BINDIR"
 
 java -client -showversion -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Xms1024m -Xmx1024m -Xincgc -jar minecraft_server.jar

scripts/Run_Server_(Windows).cmd

@@ -1,3 +1,5 @@
 @echo off
+SET BINDIR=%~dp0
+CD /D "%BINDIR%"
 
 java -client -showversion -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Xms1024m -Xmx1024m -Xincgc -jar minecraft_server.jar

scripts/Update_MLG_(Linux).sh

@@ -1,5 +1,8 @@
 #!/bin/sh
+BINDIR=$(dirname "$(readlink -fn "$0")")
+cd "$BINDIR"
 
 java -client -showversion -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -update
+java -jar MinecraftLandGenerator.jar -readme _MLG_Readme.txt
 
 #rm server.log

scripts/Update_MLG_(Mac).command

@@ -1,8 +1,4 @@
 #!/bin/bash
 cd "$(dirname "$0")"
 exec java -Djava.awt.headless=true -Xms1024m -Xmx1024m -Xincgc -jar MinecraftLandGenerator.jar -update
-
+exec java -jar MinecraftLandGenerator.jar -readme _MLG_Readme.txt
-
-
-
-

scripts/Update_MLG_(Windows).cmd

@@ -1,3 +1,6 @@
 @echo off
+SET BINDIR=%~dp0
+CD /D "%BINDIR%"
 
 java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -update
+java -jar MinecraftLandGenerator.jar -readme _MLG_Readme.txt

scripts/Update_MLG_Extra_Files_(Linux).sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+BINDIR=$(dirname "$(readlink -fn "$0")")
+cd "$BINDIR"
+
+java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -downloadlist MLG_Update_Files.txt
+chmod +x *.sh

scripts/Update_MLG_Extra_Files_(Mac).command

@@ -0,0 +1,5 @@
+#!/bin/bash
+cd "$(dirname "$0")"
+
+java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -downloadlist MLG_Update_Files.txt
+chmod +x *.command

scripts/Update_MLG_Extra_Files_(Windows).cmd

@@ -0,0 +1,5 @@
+@echo off
+SET BINDIR=%~dp0
+CD /D "%BINDIR%"
+
+java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -downloadlist MLG_Update_Files.txt

scripts/Update_Server_(Linux).sh

@@ -1,4 +1,6 @@
 #!/bin/sh
+BINDIR=$(dirname "$(readlink -fn "$0")")
+cd "$BINDIR"
 
 java -client -showversion -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -downloadfile https://s3.amazonaws.com/MinecraftDownload/launcher/minecraft_server.jar
 

scripts/Update_Server_(Windows).cmd

@@ -1,3 +1,5 @@
 @echo off
+SET BINDIR=%~dp0
+CD /D "%BINDIR%"
 
 java -client -Djava.awt.headless=true -jar MinecraftLandGenerator.jar -downloadfile https://s3.amazonaws.com/MinecraftDownload/launcher/minecraft_server.jar

src/corrodias/minecraft/landgenerator/Main.java

@@ -53,7 +53,7 @@ public class Main {
 
 	// Version Number!
 	private static final String PROG_NAME = "Minecraft Land Generator";
-	private static final String VERSION = "1.6.05";
+	private static final String VERSION = "1.6.1";
 	private static final String AUTHORS = "Corrodias, Morlok8k, pr0f1x";
 
 	private static final String fileSeparator = System.getProperty("file.separator");
@@ -85,9 +85,9 @@ public class Main {
 	private static String level_9 = null;
 
 	private int xRange = 0;
-	private int yRange = 0;
+	private int zRange = 0;
 	private Integer xOffset = null;
-	private Integer yOffset = null;
+	private Integer zOffset = null;
 	private boolean verbose = false;
 	private boolean alternate = false;
 	private static boolean waitSave = false;
@@ -118,7 +118,7 @@ public class Main {
 	private static ArrayList<String> timeStamps = new ArrayList<String>();
 
 	private static final String MinecraftLandGeneratorConf = "MinecraftLandGenerator.conf";
-	private static final String defaultReadmeFile = "MLG-Readme.txt";
+	private static final String defaultReadmeFile = "_MLG_Readme.txt";
 	private static final String MLG_JarFile = "MinecraftLandGenerator.jar";
 
 	private static final String github_URL =
@@ -128,6 +128,8 @@ public class Main {
 	private static final String github_MLG_BuildID_URL = github_URL + buildIDFile;
 	private static final String github_MLG_jar_URL = github_URL + MLG_JarFile;
 
+	private static Boolean recheckFlag = false;
+
 	//////
 
 	private static final boolean testing = false;	// display more output when debugging
@@ -178,12 +180,12 @@ public class Main {
 		// =====================================================================
 
 		if (args.length == 0) {
-			out("Please Enter the size of world you want.  Example: X:1000  Y:1000");
+			out("Please Enter the size of world you want.  Example: X:1000  Z:1000");
 			outP(MLG + "X:");
 			xRange = getInt("X:");
-			outP(MLG + "Y:");
+			outP(MLG + "Z:");
-			yRange = getInt("Y:");
+			zRange = getInt("Z:");
-			args = new String[] { String.valueOf(xRange), String.valueOf(yRange) };
+			args = new String[] { String.valueOf(xRange), String.valueOf(zRange) };
 
 		}
 
@@ -247,15 +249,51 @@ public class Main {
 		} else if (args[0].equalsIgnoreCase("-downloadlist")) {
 
 			if (args.length == 2) {
+				String origMD5 = "";
+				String recheckMD5 = "";
+
 				try {
 					File config = new File(args[1]);
+					try {
+						origMD5 = fileMD5(config.toString());
+					} catch (NoSuchAlgorithmException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
 					BufferedReader in = new BufferedReader(new FileReader(config));
 					String line;
 					while ((line = in.readLine()) != null) {
-						downloadFile(line, true);
+						if (line == "###RECHECK###") {
+							recheckFlag = !recheckFlag;
+						} else {
+							downloadFile(line, true);
+						}
 					}
 					in.close();
 
+					if (recheckFlag == true) {
+						try {
+							recheckMD5 = fileMD5(config.toString());
+						} catch (NoSuchAlgorithmException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
+
+						if (!origMD5.contentEquals(recheckMD5)) {
+							BufferedReader in_recheck = new BufferedReader(new FileReader(config));
+							String line_recheck;
+							while ((line_recheck = in_recheck.readLine()) != null) {
+								if (line_recheck == "###RECHECK###") {
+									recheckFlag = !recheckFlag;
+								} else {
+									downloadFile(line_recheck, true);
+								}
+							}
+							in_recheck.close();
+						}
+
+					}
+
 				} catch (FileNotFoundException ex) {
 					System.err.println(args[1] + " - File not found");
 					waitTenSec(false);
@@ -319,12 +357,12 @@ public class Main {
 		// ARGUMENTS
 		try {
 			xRange = Integer.parseInt(args[0]);
-			yRange = Integer.parseInt(args[1]);
+			zRange = Integer.parseInt(args[1]);
 		} catch (NumberFormatException ex) {
-			err("Invalid X or Y argument.");
+			err("Invalid X or Z argument.");
-			err("Please Enter the size of world you want.  Example: X:1000  Y:1000");
+			err("Please Enter the size of world you want.  Example: X:1000  Z:1000");
 			xRange = getInt("X:");
-			yRange = getInt("Y:");
+			zRange = getInt("Z:");
 
 			//return;
 		}
@@ -338,23 +376,39 @@ public class Main {
 				String nextSwitch = args[i + 2].toLowerCase();
 				if (nextSwitch.equals("-verbose") || nextSwitch.equals("-v")) {
 					verbose = true;
+					out("Notice: Verbose Mode");
+
 				} else if (nextSwitch.startsWith("-i")) {
 					increment = Integer.parseInt(args[i + 2].substring(2));
+					out("Notice: Non-Default Increment: " + increment);
+
 				} else if (nextSwitch.startsWith("-w")) {
 					ignoreWarnings = true;
+					out("Notice: Warnings from Server are Ignored");
+
 				} else if (nextSwitch.equals("-alt") || nextSwitch.equals("-a")) {
-					out("Using Alternate Launching...");
 					alternate = true;
+					out("Notice: Using Alternate Launching");
+
 				} else if (nextSwitch.startsWith("-x")) {
 					xOffset = Integer.valueOf(args[i + 2].substring(2));
-				} else if (nextSwitch.startsWith("-y")) {
+					out("Notice: X Offset: " + xOffset);
-					yOffset = Integer.valueOf(args[i + 2].substring(2));
+
+				} else if (nextSwitch.startsWith("-y") || nextSwitch.equals("-z")) {		//NOTE: "-y" is just here for backwards compatibility
+					zOffset = Integer.valueOf(args[i + 2].substring(2));
+					out("Notice: Z Offset: " + zOffset);
+					if (nextSwitch.startsWith("-y")) {
+						out("Notice: MLG now uses Z instead of Y.  Please use the -z switch instead");
+						waitTenSec(false);
+					}
+
 				} else {
 					serverPath = args[i + 2];
+					out("Notice: Attempting to use Alternate Server:" + serverPath);
 				}
 			}
 		} catch (NumberFormatException ex) {
-			err("Invalid -i switch value.");
+			err("Invalid switch value.");
 			return;
 		}
 
@@ -391,6 +445,10 @@ public class Main {
 
 			runMinecraft(verbose, alternate);
 
+			if ((xRange == 0) & (zRange == 0)) {  //If the server is launched with an X and a Z of zero, then we just shutdown MLG after the initial launch.
+				return;
+			}
+
 			out("");
 
 			File serverLevel = new File(worldPath + fileSeparator + "level.dat");
@@ -401,7 +459,8 @@ public class Main {
 			out("");
 
 			Integer[] spawn = getSpawn(serverLevel);
-			out("Spawn point detected: [" + spawn[0] + ", " + spawn[2] + "]");
+			out("Spawn point detected: [X,Y,Z] [" + spawn[0] + ", " + spawn[1] + ", " + spawn[2]
+					+ "]");
 			{
 				boolean overridden = false;
 				if (xOffset == null) {
@@ -409,32 +468,32 @@ public class Main {
 				} else {
 					overridden = true;
 				}
-				if (yOffset == null) {
+				if (zOffset == null) {
-					yOffset = spawn[2];
+					zOffset = spawn[2];
 				} else {
 					overridden = true;
 				}
 				if (overridden) {
-					out("Centering land generation on [" + xOffset + ", " + yOffset
+					out("Centering land generation on [" + xOffset + ", " + zOffset
 							+ "] due to switches.");
 				}
 			}
 			out("");
 
-			int totalIterations = (xRange / increment + 1) * (yRange / increment + 1);
+			int totalIterations = (xRange / increment + 1) * (zRange / increment + 1);
 			int currentIteration = 0;
 
 			long differenceTime = System.currentTimeMillis();
 			Long[] timeTracking =
 					new Long[] { differenceTime, differenceTime, differenceTime, differenceTime };
 			for (int currentX = 0 - xRange / 2; currentX <= xRange / 2; currentX += increment) {
-				for (int currentY = 0 - yRange / 2; currentY <= yRange / 2; currentY += increment) {
+				for (int currentZ = 0 - zRange / 2; currentZ <= zRange / 2; currentZ += increment) {
 					currentIteration++;
 
 					out("Setting spawn to ["
 							+ Integer.toString(currentX + xOffset)
 							+ ", "
-							+ Integer.toString(currentY + yOffset)
+							+ Integer.toString(currentZ + zOffset)
 							+ "] ("
 							+ currentIteration
 							+ "/"
@@ -477,7 +536,7 @@ public class Main {
 					}
 
 					// Set the spawn point
-					setSpawn(serverLevel, currentX + xOffset, 128, currentY + yOffset);
+					setSpawn(serverLevel, currentX + xOffset, 128, currentZ + zOffset);
 
 					// Launch the server
 					runMinecraft(verbose, alternate);
@@ -489,6 +548,8 @@ public class Main {
 			copyFile(backupLevel, serverLevel);
 			backupLevel.delete();
 			out("Restored original level.dat.");
+			finishedImage();
+			waitTenSec(false);
 		} catch (IOException ex) {
 			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
 		}
@@ -533,7 +594,7 @@ public class Main {
 
 	/**
 	 * Changes the spawn point in the given Alpha/Beta level to the given coordinates.<br>
-	 * Note that, in Minecraft levels, the Y coordinate is height, while Z is what may normally be thought of as Y.<br>
+	 * Note that, in Minecraft levels, the Y coordinate is height.<br>
 	 * (We picture maps from above, but the game was made from a different perspective)
 	 * 
 	 * @param level
@@ -642,7 +703,6 @@ public class Main {
 			out("Alternate Launch");
 			Process process = minecraft.start();
 
-			byte[] saveall = { 's', 'a', 'v', 'e', '-', 'a', 'l', 'l', '\r', '\n' };
 			byte[] stop = { 's', 't', 'o', 'p', '\r', '\n' };
 
 			// monitor output and print to console where required.
@@ -657,11 +717,6 @@ public class Main {
 				out(line);
 				if (line.contains(doneText)) { // EDITED By Morlok8k for Minecraft 1.3+ Beta
 					OutputStream outputStream = process.getOutputStream();
-					// removed waitSave code for alternate launch.  Not needed here.  Alt launch is basic, no frills, etc.
-
-					out("Saving server data...");
-					outputStream.write(saveall);
-					outputStream.flush();
 
 					out("Stopping server...");
 					outputStream.write(stop);
@@ -927,7 +982,8 @@ public class Main {
 		File level = new File(worldPath + fileSeparator + "level.dat");
 		try {
 			Integer[] spawn = getSpawn(level);
-			out("The current spawn point is: [" + spawn[0] + ", " + spawn[2] + "]");
+			out("The current spawn point is: [X,Y,Z] [" + spawn[0] + ", " + spawn[1] + ", "
+					+ spawn[2] + "]");
 			return true;
 		} catch (IOException ex) {
 			err("Error while reading " + level.getPath());
@@ -968,7 +1024,7 @@ public class Main {
 				+ "-----------------------------------------------" + newLine
 				+ newLine
 				+ "This program lets you generate an area of land with your Minecraft Beta SMP server (and is prossibly future-proof for newer versions). You set up your java command line and minecraft server paths in the MinecraftLandGenerator.conf file, set up the server's server.properties file with the name of the world you wish to use, and then run this program." + newLine
-				+ "When a Minecraft server is launched, it automatically generates chunks within a square area of 25x25 chunks (400x400 blocks), centered on the current spawn point (formally 20x20 chunks, 320x320 blocks). When provided X and Y ranges as arguments, this program will launch the server repeatedly, editing the level.dat file between sessions, to generate large amounts of land without players having to explore them. The generated land will have about the X and Y ranges as requested by the arguments, though it will not be exact due to the spawn point typically not on the border of a chunk. (Because of this, MLG by default adds a slight overlap with each pass - 380x380 blocks) You can use the -x and -y switches to override the spawn offset and center the land generation on a different point." + newLine
+				+ "When a Minecraft server is launched, it automatically generates chunks within a square area of 25x25 chunks (400x400 blocks), centered on the current spawn point (formally 20x20 chunks, 320x320 blocks). When provided X and Z ranges as arguments, this program will launch the server repeatedly, editing the level.dat file between sessions, to generate large amounts of land without players having to explore them. The generated land will have about the X and Z ranges as requested by the arguments, though it will not be exact due to the spawn point typically not on the border of a chunk. (Because of this, MLG by default adds a slight overlap with each pass - 380x380 blocks) You can use the -x and -z switches to override the spawn offset and center the land generation on a different point." + newLine
 				+ "The program makes a backup of level.dat as level_backup.dat before editing, and restores the backup at the end. In the event that a level_backup.dat file already exists, the program will refuse to proceed, leaving the user to determine why the level_backup.dat file exists and whether they would rather restore it or delete it, which must be done manually." + newLine
 				+ newLine
 				+ "This program is public domain, and the source code is included in the .jar file.  (If accidently missing, like in 1.3.0 and 1.4.0, it is always available at Github.)" + newLine
@@ -983,6 +1039,13 @@ public class Main {
 				+ newLine
 				+ "Version History:" + newLine
 				+ "Morlok8k:" + newLine
+				+ "1.6.1" + newLine
+				+ "- Added some modifications for scripting  (Mainly for a new Initial setup script)" + newLine
+				+ "- Changed MLG's Y to Z.  Now it matches Minecraft.  Y in the game is Height." + newLine
+				+ "- Renamed -y switch to -z.  MLG will remain backwards compatible if you use the old -y switch." + newLine
+				+ "- Updated -printspawn to show X,Y,Z" + newLine
+				+ "- Added End-of-Generation ASCII-Graphic" + newLine
+				+ newLine
 				+ "1.6.05" + newLine
 				+ "- MLG displays if the server is converting the Map format, when not in verbose mode. (McRegion -> Anvil, or Chunk-File -> McRegion)" + newLine
 				+ "- Minor fixes/edits/typos" + newLine
@@ -1114,6 +1177,13 @@ public class Main {
 		boolean success = true;
 
 		String fileName = URL.substring(URL.lastIndexOf("/") + 1, URL.length());
+
+		if (fileName.startsWith("\"")) {
+			if (fileName.substring(fileName.length() - 1, fileName.length()) == "\"") {
+				fileName = fileName.substring(1, fileName.length() - 1);
+			}
+		}
+
 		int size = 1024 * 4; // 1024 * n should be tested to get the optimum size (for download speed.)
 
 		if (fileName.equals("")) {
@@ -1615,11 +1685,11 @@ public class Main {
 		}
 
 		//@formatter:off
-		Str =	"Usage: java -jar " + MLGFileNameShort + " x y [serverpath] [switches]" + NewLine
+		Str =	"Usage: java -jar " + MLGFileNameShort + " x z [serverpath] [switches]" + NewLine
 				+ NewLine
 				+ "Arguments:" + NewLine
 				+ "              x : X range to generate" + NewLine
-				+ "              y : Y range to generate" + NewLine
+				+ "              z : Z range to generate" + NewLine
 				+ "     serverpath : the path to the directory in which the server runs (takes precedence over the config file setting)" + NewLine
 				+ NewLine
 				+ "Switches:" + NewLine
@@ -1628,9 +1698,9 @@ public class Main {
 				+ "             -w : Ignore [WARNING] and [SEVERE] messages." + NewLine
 				+ "           -alt : alternate server launch sequence" + NewLine
 				+ "             -a : same as -alt" + NewLine
-				+ "            -i# : override the iteration spawn offset increment (default 300) (example: -i100)" + NewLine
+				+ "            -i# : override the iteration spawn offset increment (default 380) (example: -i100)" + NewLine
-				+ "            -x# : set the X offset to generate land around (example: -x0)" + NewLine
+				+ "            -x# : set the X offset to generate land around (example: -x0 or -x1000 or -x-500)" + NewLine
-				+ "            -y# : set the X offset to generate land around (example: -y0)" + NewLine
+				+ "            -z# : set the Z offset to generate land around (example: -z0 or -z1000 or -z-500)" + NewLine
 				+ NewLine
 				+ "Other options:" + NewLine
 				+ "  java -jar " + MLGFileNameShort + " -update" + NewLine
@@ -2053,6 +2123,29 @@ public class Main {
 
 	}
 
+	private static void finishedImage() {
+		System.out.println(newLine + "  .l0kkKMl                     lMKkk0l.  " + newLine
+				+ ".;kMc  ;KK;  .,,lkkkkkkkl,,.  ;KK,  cMk,." + newLine
+				+ "KKxkc..lKK;.oKKxxl,;;;;lkkKKo.,KKl..ckkKK" + newLine
+				+ "Mx. ...;x0OOl'.           .'lOOOx:... .xM" + newLine
+				+ "lKKk0l. ,KK;                 ,KK, .l0xKKl" + newLine
+				+ " .'',xOxOWl                   lMOxOx,''. " + newLine
+				+ "      .,xWl                   lWx;.      " + newLine
+				+ "        lMl ,.             ., lMl        " + newLine
+				+ "        ;XO';Odl:,.. .',:ldO;'OX;        " + newLine
+				+ "         ,KK,cxkkkc...ckxkx:,KK,         " + newLine
+				+ "          lMc .,,. .o. .,,. cMl          " + newLine
+				+ "          .lO;;'  .lkl.  ';;Ol.          " + newLine
+				+ "         .;;kMk.         .kMk;;.         " + newLine
+				+ "       .lKKK0kl;;.......;,lk0KKKl.       " + newLine
+				+ "  .;llxOx;.'Ox;llxxldlxxll;xO'.;xOxll;.  " + newLine
+				+ " ,KKcll.  .l0KKl...   ...lKK0l.  .llcKK, " + newLine
+				+ " lMx'''..lXX;:X0:'.   .':OX;,XXl..'''xMl " + newLine
+				+ " .lxXk.  ,KM; .lkKKxkkKKkl. ,MK,  .kXxl. " + newLine
+				+ "    oKl;;kMk.    .,,,,;.    .kMk,,lKo    " + newLine
+				+ "    .0MMMMO'                 .OMMMMO.    ");
+	}
+
 	/* Morlok8k:
 	 * Just a note about this unescape method:
 	 * I am quite amazed at this code.  It is vastly superior to my own coding ability.