From b8785a11100eab092a7c7a2a157d40ff01d16938 Mon Sep 17 00:00:00 2001 From: Morlok8k Date: Sat, 28 May 2011 04:31:45 -0700 Subject: [PATCH] 1.5.0 - "The Truth Is Out There" --- README | 22 ++++-- bin/MinecraftLandGenerator.jar | Bin 35661 -> 47683 bytes .../minecraft/landgenerator/Main.java | 65 ++++++++++++------ 3 files changed, 59 insertions(+), 28 deletions(-) diff --git a/README b/README index 02ff3d5..7c2080e 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ Minecraft Land Generator version 1.5.0 -Updated May 27, 2011 +Updated May 28, 2011 Original Code by Corrodias November 2010 Enhanced Code by Morlok8k Feb. 2011 to Now (or at least to the date listed above!) @@ -25,12 +25,22 @@ Version History: Morlok8k: 1.5.0 -- Supports Server Beta 1.6.4 -- Added "-a","-alt" to use alternate method (a simplier version of 1.3.0's code) -- Added world specific output for 9 dimensions (DIM-1 is the Nether, DIM-2 through DIM-9 dont exist yet, but when they do, you can configure it's text) +- Supports Server Beta 1.6.4 (& hopefully future versions as well, while remaining backward compatible.) +- Added "-a","-alt" to use alternate method (a slightly simplier version of 1.3.0's code - pure verbose only) +- Added world specific output for 9 dimensions (DIM-1 is the Nether, DIM-2 through DIM-9 dont exist yet, but if and when they do, you can configure it's text). ("Level 0", the default world, is displayed as the worlds name) - Updated Config File for these Dimensions. - Reads and outputs the Seed to the output. (If you had used text for the Seed, Minecraft converts it into a number. This outputs the number.) -- Changed the default 300 blocks to 380. The server now makes a 400x400 square block terrain instead of 320x320 +- Changed the default 300 blocks to 380. The server now makes a 400x400 square block terrain instead of 320x320. Thus it is faster because there are less loops. To use the old way, use "-i300" +- Added total Percentage done (technically, it displays the % done once the server finishes...) +- Added debugging output vars of conf file (disabled - need to re-compile source to activate) + ++ (the goal is to have MLG be configureable, so it can work on any version of the server, past or present.) + + +*** 1.4.5 (pre 1.5.0) *** +- sorry! I shouldn't release untested code... +************************* + 1.4.4 - Added ablilty to ignore [WARNING] and [SEVERE] errors with "-w" @@ -94,7 +104,7 @@ 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) -y# : set the X offset to generate land around (example: -y0) diff --git a/bin/MinecraftLandGenerator.jar b/bin/MinecraftLandGenerator.jar index 6c88b834610a8bf896ce403cf0515a8036c6bf2f..275cd97b62750e144e63992f8c0ba78c38b8bd0f 100644 GIT binary patch delta 24778 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 delta 12691 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 diff --git a/src/corrodias/minecraft/landgenerator/Main.java b/src/corrodias/minecraft/landgenerator/Main.java index db76fc9..73c10d0 100644 --- a/src/corrodias/minecraft/landgenerator/Main.java +++ b/src/corrodias/minecraft/landgenerator/Main.java @@ -43,7 +43,7 @@ import org.jnbt.Tag; public class Main { //Version Number! - private static final String VERSION = "1.4.5 (pre-1.5.0)"; + private static final String VERSION = "1.5.0"; private static final String separator = System.getProperty("file.separator"); //private static final String classpath = System.getProperty("java.class.path"); @@ -54,7 +54,7 @@ public class Main { private String javaLine = null; private String serverPath = null; private String worldPath = null; - private static String worldName = "world"; + private static String worldName = null; private static String doneText = null; private static String preparingText = null; private static String preparingLevel = null; @@ -77,6 +77,11 @@ public class Main { private static boolean ignoreWarnings = false; private static LongTag randomSeed = null; + private static final boolean testing = false; // a constant to display more output when debugging + + // REMINDER: because I always forget/mix up languages: + // "static" in java means "global" + // "final" means "constant" /** * @param args the command line arguments @@ -246,35 +251,53 @@ public class Main { preparingText = line.substring(pos + 1, end); } else if (line.substring(0, pos).toLowerCase().equals("preparing_level")) { preparingLevel = line.substring(pos + 1, end); - } else if (line.substring(0, pos).toLowerCase().equals("DIM-1")) { + } else if (line.substring(0, pos).toLowerCase().equals("dim-1")) { level_1 = line.substring(pos + 1, end); - } else if (line.substring(0, pos).toLowerCase().equals("DIM-2")) { + } else if (line.substring(0, pos).toLowerCase().equals("dim-2")) { level_2 = line.substring(pos + 1, end); - } else if (line.substring(0, pos).toLowerCase().equals("DIM-3")) { + } else if (line.substring(0, pos).toLowerCase().equals("dim-3")) { level_3 = line.substring(pos + 1, end); - } else if (line.substring(0, pos).toLowerCase().equals("DIM-4")) { + } else if (line.substring(0, pos).toLowerCase().equals("dim-4")) { level_4 = line.substring(pos + 1, end); - } else if (line.substring(0, pos).toLowerCase().equals("DIM-5")) { + } else if (line.substring(0, pos).toLowerCase().equals("dim-5")) { level_5 = line.substring(pos + 1, end); - } else if (line.substring(0, pos).toLowerCase().equals("DIM-6")) { + } else if (line.substring(0, pos).toLowerCase().equals("dim-6")) { level_6 = line.substring(pos + 1, end); - } else if (line.substring(0, pos).toLowerCase().equals("DIM-7")) { + } else if (line.substring(0, pos).toLowerCase().equals("dim-7")) { level_7 = line.substring(pos + 1, end); - } else if (line.substring(0, pos).toLowerCase().equals("DIM-8")) { + } else if (line.substring(0, pos).toLowerCase().equals("dim-8")) { level_8 = line.substring(pos + 1, end); - } else if (line.substring(0, pos).toLowerCase().equals("DIM-9")) { + } else if (line.substring(0, pos).toLowerCase().equals("dim-9")) { level_9 = line.substring(pos + 1, end); } } } in.close(); + if (testing) { + System.out.println("[TEST] Test Output: Reading of Config File "); + System.out.println("[TEST] serverPath: " + serverPath); + System.out.println("[TEST] javaLine: " + javaLine); + System.out.println("[TEST] doneText: " + doneText); + System.out.println("[TEST] preparingText: " + preparingText); + System.out.println("[TEST] preparingLevel: " + preparingLevel); + System.out.println("[TEST] level_1: " + level_1); + System.out.println("[TEST] level_2: " + level_2); + System.out.println("[TEST] level_3: " + level_3); + System.out.println("[TEST] level_4: " + level_4); + System.out.println("[TEST] level_5: " + level_5); + System.out.println("[TEST] level_6: " + level_6); + System.out.println("[TEST] level_7: " + level_7); + System.out.println("[TEST] level_8: " + level_8); + System.out.println("[TEST] level_9: " + level_9); + } + if (serverPath == null || javaLine == null) { System.err.println("MinecraftLandGenerator.conf does not contain all required properties. Please recreate it by running this application with -conf."); return; } - if (doneText == null || preparingText == null || preparingLevel == null || level_1 == null || level_9 == null) { + if ((doneText == null && preparingText == null) || (preparingLevel == null && level_1 == null)) { System.err.println("Old Version of MinecraftLandGenerator.conf found. Updating..."); try { File configUpdate = new File("MinecraftLandGenerator.conf"); @@ -465,11 +488,9 @@ public class Main { for (int currentY = 0 - yRange / 2; currentY <= yRange / 2; currentY += increment) { currentIteration++; - System.out.println(Integer.toString(currentIteration / totalIterations) + "% Done"); - System.out.println("Setting spawn to [" + Integer.toString(currentX + xOffset) + ", " + Integer.toString(currentY + yOffset) + "] (" + currentIteration + "/" + totalIterations + ")"); - - // Time Remaining estimate + + System.out.println("Setting spawn to [" + Integer.toString(currentX + xOffset) + ", " + Integer.toString(currentY + yOffset) + "] (" + currentIteration + "/" + totalIterations + ") " + Float.toString((Float.parseFloat(Integer.toString(currentIteration)) / Float.parseFloat(Integer.toString(totalIterations))) * 100) + "% Done" ); // Time Remaining estimate timeTracking[0] = timeTracking[1]; timeTracking[1] = timeTracking[2]; timeTracking[2] = timeTracking[3]; @@ -514,9 +535,8 @@ public class Main { IntTag spawnZ = (IntTag) newData.get("SpawnZ"); randomSeed = (LongTag) newData.get("RandomSeed"); - if (randomSeed.getValue() != 0) { - System.out.println("Seed: " + randomSeed.getValue()); //lets output the seed, cause why not? - } + System.out.println("Seed: " + randomSeed.getValue()); //lets output the seed, cause why not? + Integer[] ret = new Integer[]{spawnX.getValue(), spawnY.getValue(), spawnZ.getValue()}; return ret; @@ -620,8 +640,8 @@ public class Main { // So, here is a bunch of duplicate code... // Stupid compile errors... - if (alternate) { //Alternate - a replication of MLG 1.3.0's code. simplest code possible. - System.out.println("Starting server."); + if (alternate) { //Alternate - a replication (slightly stripped down) of MLG 1.3.0's code. simplest code possible. + System.out.println("Alternate Launch"); Process process = minecraft.start(); // monitor output and print to console where required. @@ -642,7 +662,6 @@ public class Main { } else { //start minecraft server normally! Process process = minecraft.start(); - System.out.println(""); if (verbose) { System.out.println("Started Server."); } @@ -689,6 +708,8 @@ public class Main { System.out.println("\r\n" + level_8 + ":"); } else if (line.contains("level 9")) { //"Preparing start region for level 9" System.out.println("\r\n" + level_9 + ":"); + } else { + System.out.println(line.substring(line.lastIndexOf("]") + 2)); } }