1.6.2 bugfix - %Done fix, fixed commas after "seconds", added -nowait

README

@@ -1,7 +1,7 @@
 Minecraft Land Generator version 1.6.2
 
 Updated May 24, 2012
-(BuildID: 1337852365000)
+(BuildID: 1337921188000)
 
 Original Code by Corrodias		November 2010
 Enhanced Code by Morlok8k		Feb. 2011 to Now (or at least to May 24, 2012!)
@@ -159,6 +159,8 @@ Switches:
              -w : Ignore [WARNING] and [SEVERE] messages.
            -alt : alternate server launch sequence
              -a : same as -alt
+        -nowait : don't pause for anything
+             -n : same as -nowait
             -i# : override the iteration spawn offset increment (default 380) (example: -i100)
             -x# : set the X offset to generate land around (example: -x0 or -x1000 or -x-500)
             -z# : set the Z offset to generate land around (example: -z0 or -z1000 or -z-500)

bin/MLG-BuildID

@@ -37,3 +37,4 @@ F1B044CD44634EDDB85DC44384CB8F0F=1334484354000# MLG v1.6.1
 891492F60015683B98CD7A4F4430AE16=1334739407000# MLG v1.6.1
 22EAF4CE6AD4089527919E8D8A5CA055=1335956100000# MLG v1.6.11
 6C91BF8786B4966B67ACC64EB2C4A896=1337852365000# MLG v1.6.2
+2034C9B023C1B14CEB7DCCFDA33A3C08=1337921188000# MLG v1.6.2

bin/MinecraftLandGenerator.conf

@@ -1,6 +1,6 @@
 #Minecraft Land Generator Configuration File:  Version: 1.6.2
 #Authors: Corrodias, Morlok8k, pr0f1x
-#Auto-Generated: Thursday, May 24, 2012 at 2:39 AM Pacific Daylight Time
+#Auto-Generated: Thursday, May 24, 2012 at 9:46 PM 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

src/corrodias/minecraft/landgenerator/Main.java

@@ -89,6 +89,7 @@ public class Main {
 	private Integer zOffset = null;
 	private boolean verbose = false;
 	private boolean alternate = false;
+	private static boolean dontWait = false;
 	private static boolean waitSave = false;
 	private static boolean ignoreWarnings = false;
 	private static LongTag randomSeed = null;
@@ -387,6 +388,10 @@ public class Main {
 					ignoreWarnings = true;
 					out("Notice: Warnings from Server are Ignored");
 
+				} else if (nextSwitch.equals("-nowait") || nextSwitch.equals("-n")) {
+					dontWait = true;
+					out("Notice: Not pausing for anything...");
+
 				} else if (nextSwitch.equals("-alt") || nextSwitch.equals("-a")) {
 					alternate = true;
 					out("Notice: Using Alternate Launching");
@@ -395,7 +400,7 @@ public class Main {
 					xOffset = Integer.valueOf(args[i + 2].substring(2));
 					out("Notice: X Offset: " + xOffset);
 
-				} else if (nextSwitch.startsWith("-y") || nextSwitch.equals("-z")) {		//NOTE: "-y" is just here for backwards compatibility
+				} else if (nextSwitch.startsWith("-y") || nextSwitch.startsWith("-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")) {
@@ -555,7 +560,7 @@ public class Main {
 					incrementX) {
 				curXloops++;
 				if (curXloops == 1) {
-					currentX = (((0 - xRange) / 2) + (increment / 2));
+					currentX = (((0 - xRange) / 2) + (increment / 2) + 16);
 				} else if (curXloops == xLoops) {
 					currentX = (xRange / 2) - (increment / 2);
 				}
@@ -566,7 +571,7 @@ public class Main {
 
 					curZloops++;
 					if (curZloops == 1) {
-						currentZ = (((0 - zRange) / 2) + (increment / 2));
+						currentZ = (((0 - zRange) / 2) + (increment / 2) + 16);
 					} else if (curZloops == zLoops) {
 						currentZ = (zRange / 2) - (increment / 2);
 					}
@@ -575,7 +580,7 @@ public class Main {
 					//String curY = "64";		//Y is always set to 64
 					String curZ = Integer.toString(currentZ + zOffset);
 					String percentDone =
-							Double.toString((double) (currentIteration / totalIterations) * 100);
+							Double.toString((double) ((double) currentIteration / (double) totalIterations) * 100);
 					int percentIndex =
 							((percentDone.indexOf(".") + 3) > percentDone.length()) ? percentDone
 									.length() : (percentDone.indexOf(".") + 3);		//fix index on numbers like 12.3
@@ -1839,9 +1844,13 @@ public class Main {
 	 * @author Morlok8k
 	 */
 	private static void waitTenSec(boolean output) {
+
+		if (dontWait) { return; }			//Don't wait!
+
 		if (output) {
-			outP(MLG);		//here we wait 10 sec.
+			outP(MLG);						//here we wait 10 sec.
 		}
+
 		int count = 0;
 		while (count <= 100) {
 			if (output) {
@@ -1927,7 +1936,7 @@ public class Main {
 						+ (minutes > 0 ? String.format("%d "
 								+ ((minutes % 60) == 1 ? "Minute, " : "Minutes, "), minutes % 60)
 								: "")
-						+ String.format("%d " + ((seconds % 60) == 1 ? "Second, " : "Seconds, "),
+						+ String.format("%d " + ((seconds % 60) == 1 ? "Second" : "Seconds"),
 								seconds % 60);
 
 		return (took);

src/morlok8k/minecraft/landgenerator/Readme_and_HelpInfo.java

@@ -226,6 +226,8 @@ public class Readme_and_HelpInfo {
 				+ "             -w : Ignore [WARNING] and [SEVERE] messages." + NewLine
 				+ "           -alt : alternate server launch sequence" + NewLine
 				+ "             -a : same as -alt" + NewLine
+				+ "        -nowait : don't pause for anything" + NewLine
+				+ "             -n : same as -nowait" + NewLine
 				+ "            -i# : override the iteration spawn offset increment (default 380) (example: -i100)" + NewLine
 				+ "            -x# : set the X offset to generate land around (example: -x0 or -x1000 or -x-500)" + NewLine
 				+ "            -z# : set the Z offset to generate land around (example: -z0 or -z1000 or -z-500)" + NewLine