diff --git a/README b/README index eb597c6..fd8f5ec 100644 --- a/README +++ b/README @@ -1,10 +1,10 @@ Minecraft Land Generator version 1.7.0 -Updated August 10, 2012 -(BuildID: 1344593776000) +Updated August 13, 2012 +(BuildID: 1344913241000) Original Code by Corrodias November 2010 -Enhanced Code by Morlok8k Feb. 2011 to Now (or at least to August 10, 2012!) +Enhanced Code by Morlok8k Feb. 2011 to Now (or at least to August 13, 2012!) Additional Code by pr0f1x October 2011 Website: https://sites.google.com/site/minecraftlandgenerator/ diff --git a/bin/MLG-BuildID b/bin/MLG-BuildID index a3dd111..434f1fc 100644 --- a/bin/MLG-BuildID +++ b/bin/MLG-BuildID @@ -56,3 +56,4 @@ F00F81A5C5833DBFF95E85EFD1B8460B=1338951984000# MLG v1.6.3 A28CD4B9DE8E3CB25AB56368A4C44A51=1339493851000# MLG v1.6.3 15241C4B45D9711F4AA4EF25004FEDA6=1339559312000# MLG v1.6.3 21ECF491552F4A706B7874A1C0A31534=1344593776000# MLG v1.7.0 +90F619A4A4C49A11964E3880D0EAA9DF=1344913241000# MLG v1.7.0 diff --git a/bin/MinecraftLandGenerator.conf b/bin/MinecraftLandGenerator.conf index a99432a..7f4eb0c 100644 --- a/bin/MinecraftLandGenerator.conf +++ b/bin/MinecraftLandGenerator.conf @@ -1,6 +1,6 @@ #Minecraft Land Generator Configuration File: Version: 1.7.0 #Authors: Corrodias, Morlok8k, pr0f1x -#Auto-Generated: Friday, August 10, 2012 at 3:16 AM Pacific Daylight Time +#Auto-Generated: Monday, August 13, 2012 at 8:00 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 diff --git a/bin/MinecraftLandGenerator.jar b/bin/MinecraftLandGenerator.jar index 5bb7747..2552556 100755 Binary files a/bin/MinecraftLandGenerator.jar and b/bin/MinecraftLandGenerator.jar differ diff --git a/src/morlok8k/MinecraftLandGenerator/Main.java b/src/morlok8k/MinecraftLandGenerator/Main.java index 8dd28a0..a3fddce 100644 --- a/src/morlok8k/MinecraftLandGenerator/Main.java +++ b/src/morlok8k/MinecraftLandGenerator/Main.java @@ -677,8 +677,9 @@ public class Main { new Coordinates(currentX + xOffset, 64, currentZ + zOffset); launchList.add(tempCoords); - //TODO: remove this before release: - System.out.println(tempCoords); + if (testing) { + System.out.println(tempCoords); + } } if (curZloops == 1) { diff --git a/src/morlok8k/MinecraftLandGenerator/Server.java b/src/morlok8k/MinecraftLandGenerator/Server.java index 210a520..23976d1 100644 --- a/src/morlok8k/MinecraftLandGenerator/Server.java +++ b/src/morlok8k/MinecraftLandGenerator/Server.java @@ -40,7 +40,9 @@ public class Server { final BufferedReader pOut = new BufferedReader(new InputStreamReader(process.getInputStream())); String line; - while ((line = pOut.readLine().trim()) != null) { // readLine() returns null when the process exits + while ((line = pOut.readLine()) != null) { // readLine() returns null when the process exits + + line = line.trim(); System.out.println(line); if (line.contains(Main.doneText)) { // EDITED By Morlok8k for Minecraft 1.3+ Beta @@ -81,7 +83,9 @@ public class Server { boolean convertedMapFormattingFlag = false; // This allows MLG to track if we converted a map to a new format (such as Chunk-file -> McRegion, or McRegion -> Anvil) // just so it gets a line ending after the % output finishes - while ((line = pOut.readLine().trim()) != null) { // readLine() returns null when the process exits + while ((line = pOut.readLine()) != null) { // readLine() returns null when the process exits + + line = line.trim(); 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) {