1.7.5 release (with .zip)

README

@@ -1,10 +1,10 @@
-Minecraft Land Generator version 1.7.4
+Minecraft Land Generator version 1.7.5
 
-Updated July 8, 2013
-(BuildID: 1373344097000)
+Updated October 10, 2013
+(BuildID: 1381398906000)
 
 Original Code by Corrodias		November 2010
-Enhanced Code by Morlok8k		Feb. 2011 to Now (or at least to July 8, 2013!)
+Enhanced Code by Morlok8k		Feb. 2011 to Now (or at least to October 10, 2013!)
 Additional Code by pr0f1x		October 2011
 Additional Code/Idea by jaseg    August 2012
 
@@ -100,6 +100,9 @@ Preparing_Level : The output from the server that tells us the level it is worki
 
 Version History:
 Morlok8k:
+1.7.5
+- Added "save-all" to alternate mode 
+- Added fix for new style of java error messages
 1.7.4
 - Released Minecraft land Generator under the WTFPL.  (With the permission of Corrodias)
 1.7.3

bin/MLG-BuildID

@@ -65,3 +65,4 @@ B45C4E66E7CD97C73D55911F13E2684F=1360298939000# MLG v1.7.3
 EC40B0ECC52B37571EE65F780994CEDE=1360299846000# MLG v1.7.3
 7DC715CEFB6299AB1F64F5C7AD6476BF=1360304117000# MLG v1.7.3
 750641846428072595BB3D7657AC8EB1=1373344097000# MLG v1.7.4
+2ADFF46BCF1E77A559E6D9DB9C7586E8=1381398906000# MLG v1.7.5

bin/MinecraftLandGenerator.conf

@@ -1,6 +1,6 @@
-#Minecraft Land Generator Configuration File:  Version: 1.7.4
+#Minecraft Land Generator Configuration File:  Version: 1.7.5
 #Authors: Corrodias, Morlok8k, pr0f1x, jaseg
-#Auto-Generated: Monday, July 8, 2013 at 9:28 PM, Pacific Daylight Time
+#Auto-Generated: Thursday, October 10, 2013 at 2:55 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

src/morlok8k/MinecraftLandGenerator/Coordinates.java

@@ -1,21 +1,9 @@
 /*
-#######################################################################
-#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE              #
-#                    Version 2, December 2004                         #
-#                                                                     #
-# Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>                    #
-#                                                                     #
-# Everyone is permitted to copy and distribute verbatim or modified   #
-# copies of this license document, and changing it is allowed as long #
-# as the name is changed.                                             #
-#                                                                     #
-#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE              #
-#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION   #
-#                                                                     #
-#  0. You just DO WHAT THE FUCK YOU WANT TO.                          #
-#                                                                     #
-#######################################################################
-*/
+ * ####################################################################### # DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE # # Version 2, December 2004 # # # # Copyright (C) 2004 Sam Hocevar
+ * <sam@hocevar.net> # # # # Everyone is permitted to copy and distribute verbatim or modified # # copies of this license document, and changing it is allowed as long # # as the name is changed. # # #
+ * # DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE # # TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION # # # # 0. You just DO WHAT THE FUCK YOU WANT TO. # # #
+ * #######################################################################
+ */
 
 package morlok8k.MinecraftLandGenerator;
 
@@ -196,6 +184,7 @@ public class Coordinates {
 	/* (non-Javadoc)
 	 * @see java.lang.Object#equals(java.lang.Object)
 	 */
+	@SuppressWarnings({ "unused", "null" })
 	@Override
 	public boolean equals(final Object obj) {
 		// I am overriding the inherited equals method.

src/morlok8k/MinecraftLandGenerator/Readme_and_HelpInfo.java

@@ -96,6 +96,9 @@ public class Readme_and_HelpInfo {
                 //       + "- TODO: 16/512 block selecting" + n
                 //       + "- TODO: recaculate existing coords with new code" + n
                 //       + "- TODO: change 380 to 384?" + n //TODO
+                + "1.7.5" + n
+                + "- Added \"save-all\" to alternate mode " +n
+                + "- Added fix for new style of java error messages" +n
                 + "1.7.4" + n
                 + "- Released Minecraft land Generator under the WTFPL.  (With the permission of Corrodias)" +n
                 + "1.7.3" + n

src/morlok8k/MinecraftLandGenerator/Server.java

@@ -1,21 +1,9 @@
 /*
-#######################################################################
-#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE              #
-#                    Version 2, December 2004                         #
-#                                                                     #
-# Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>                    #
-#                                                                     #
-# Everyone is permitted to copy and distribute verbatim or modified   #
-# copies of this license document, and changing it is allowed as long #
-# as the name is changed.                                             #
-#                                                                     #
-#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE              #
-#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION   #
-#                                                                     #
-#  0. You just DO WHAT THE FUCK YOU WANT TO.                          #
-#                                                                     #
-#######################################################################
-*/
+ * ####################################################################### # DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE # # Version 2, December 2004 # # # # Copyright (C) 2004 Sam Hocevar
+ * <sam@hocevar.net> # # # # Everyone is permitted to copy and distribute verbatim or modified # # copies of this license document, and changing it is allowed as long # # as the name is changed. # # #
+ * # DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE # # TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION # # # # 0. You just DO WHAT THE FUCK YOU WANT TO. # # #
+ * #######################################################################
+ */
 
 package morlok8k.MinecraftLandGenerator;
 
@@ -36,8 +24,9 @@ public class Server {
 	 * 
 	 * @return
 	 * @throws IOException
-	 * @author Corrodias
+	 * @author Corrodias, Morlok8k
 	 */
+
 	protected static boolean runMinecraft() throws IOException {
 
 		if (var.verbose) {
@@ -55,7 +44,7 @@ public class Server {
 			Out.out("Alternate Launch");
 			final Process process = var.minecraft.start();
 
-			//byte[] saveAll = { 's', 'a', 'v', 'e', '-', 'a', 'l', 'l', '\r', '\n' };
+			final byte[] saveAll = { 's', 'a', 'v', 'e', '-', 'a', 'l', 'l', '\r', '\n' };
 			final byte[] stop = { 's', 't', 'o', 'p', '\r', '\n' };
 
 			// monitor output and print to console where required.
@@ -72,6 +61,8 @@ public class Server {
 					final OutputStream outputStream = process.getOutputStream();
 
 					Out.out("Stopping server...  (Please Wait...)");
+					outputStream.write(saveAll);
+					outputStream.flush();
 					outputStream.write(stop);
 					outputStream.flush();
 
@@ -112,8 +103,16 @@ public class Server {
 
 				final int posBracket = line.indexOf("]");			//changed from .lastIndexOf to .indexOf, in case we have a custom server that outputs something with an "]".  we want the first one anyways.
 				if (posBracket != -1) {
-					shortLine = line.substring(posBracket + 2);
-					shortLine = shortLine.trim();
+					if ((posBracket + 2) >= line.length()) {
+						shortLine = line;							//On error messages with 1.7 based servers, there is a "]" at the end of the line.  caused a crash here.
+					} else {
+						shortLine = line.substring(posBracket + 2);
+					}
+
+					if (shortLine != null) {
+						shortLine = shortLine.trim();				// new version of Eclipse was giving a warning that it could be null here - it can't, since "shortLine" is based on "line" which is never null at this point.
+					}												// added this check to remove warning, as i didn't want to suppress all null warnings for runMinecraft
+
 				} else {
 					shortLine = line;
 				}

src/morlok8k/MinecraftLandGenerator/var.java

@@ -47,7 +47,7 @@ public class var {
 	public static final String PROG_NAME = "Minecraft Land Generator";
 
 	/** Version Number! */
-	public static final String VERSION = "1.7.4";
+	public static final String VERSION = "1.7.5";
 
 	/** Authors */
 	public static final String AUTHORS = "Corrodias, Morlok8k, pr0f1x, jaseg";