AstralTransRocketries/MinecraftLandGenerator
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

another minor change - makes xx% output nicer by rewriting existing line.

Browse Source
This commit is contained in:
Morlok8k 2012-08-01 20:30:27 -07:00
parent d50178faeb
commit cdf14f9f4f
1 changed files with 76 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/corrodias/minecraft/landgenerator/MLG_Server.java
View File

@ -39,7 +39,7 @@ public class MLG_Server {
BufferedReader pOut = BufferedReader pOut =
new BufferedReader(new InputStreamReader(process.getInputStream())); new BufferedReader(new InputStreamReader(process.getInputStream()));
String line; String line;
while ((line = pOut.readLine()) != null) { while ((line = pOut.readLine()) != null) { // readLine() returns null when the process exits
line = line.trim(); //Trim spaces off the beginning and end, if any. line = line.trim(); //Trim spaces off the beginning and end, if any.
@ -53,7 +53,7 @@ public class MLG_Server {
} }
} }
// readLine() returns null when the process exits // End while loop
} else { // start minecraft server normally! } else { // start minecraft server normally!
Process process = Main.minecraft.start(); Process process = Main.minecraft.start();
@ -80,20 +80,9 @@ public class MLG_Server {
OutputStream outputStream = process.getOutputStream(); // moved here to remove some redundancy OutputStream outputStream = process.getOutputStream(); // moved here to remove some redundancy
/*
2012-02-29 03:50:28 [INFO] Converting map!
Scanning folders...
Total conversion count is 9
2012-02-29 03:50:29 [INFO] Converting... 8%
2012-02-29 03:50:30 [INFO] Converting... 9%
2012-02-29 03:50:31 [INFO] Converting... 10%
2012-02-29 03:50:32 [INFO] Converting... 12%
2012-02-29 03:50:33 [INFO] Converting... 13%
*/
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) 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 // just so it gets a line ending after the % output finishes
while ((line = pOut.readLine()) != null) { while ((line = pOut.readLine()) != null) { // readLine() returns null when the process exits
int posBracket = line.lastIndexOf("]"); int posBracket = line.lastIndexOf("]");
if (posBracket != -1) { if (posBracket != -1) {
@ -107,28 +96,30 @@ public class MLG_Server {
if (Main.verbose) { if (Main.verbose) {
Main.outS(shortLine); Main.outS(shortLine);
} else if (line.toLowerCase().contains("saving")) { //} else if (line.toLowerCase().contains("saving")) { //this was just clutter
Main.outS(shortLine); // Main.outS(shortLine);
} else if (line.contains(Main.preparingText) || line.contains("Converting...")) { } else if (line.contains(Main.preparingText) || line.contains("Converting...")) {
if (line.contains("Converting...")) { if (line.contains("Converting...")) {
convertedMapFormattingFlag = true; convertedMapFormattingFlag = true;
} }
outTmp2 = line.substring(line.length() - 3, line.length()); outTmp2 = line.substring(line.length() - 3, line.length());
outTmp2 = outTmp2.trim(); //we are removing extra spaces here outTmp2 = outTmp2.trim(); //we are removing extra spaces here
if (outTmp.equals(outTmp2)) {
//if (outTmp.equals(outTmp2)) {
//instead of printing the same number, we add another dot //instead of printing the same number, we add another dot
Main.outP("."); //Main.outP(".");
} else { //} else {
outTmp = outTmp2; outTmp = outTmp2;
if (prepTextFirst) { if (prepTextFirst) {
Main.outP(Main.MLG + outTmp + "..."); Main.outP(Main.MLG + outTmp + "...");
prepTextFirst = false; prepTextFirst = false;
} else { } else {
Main.outP(" " + outTmp + "..."); //Main.outP(" " + outTmp + "...");
Main.outP("\r" + Main.MLG + outTmp + "..."); //here we use \r to go back to the previous line, and rewrite it
} }
} //}
} else if (line.contains(Main.preparingLevel)) { } else if (line.contains(Main.preparingLevel)) {
prepTextFirst = true; prepTextFirst = true;
@ -139,25 +130,35 @@ public class MLG_Server {
} }
if (line.contains("level 0")) { // "Preparing start region for level 0" if (line.contains("level 0")) { // "Preparing start region for level 0"
Main.outP(Main.MLG + Main.worldName + ": " + Main.level_0 + ":" + Main.newLine); Main.outP(Main.MLG + Main.worldName + ": " + Main.level_0 + ":"
+ Main.newLine);
} else if (line.contains("level 1")) { // "Preparing start region for level 1" } else if (line.contains("level 1")) { // "Preparing start region for level 1"
Main.outP(Main.newLine + Main.MLG + Main.worldName + ": " + Main.level_1 + ":" + Main.newLine); Main.outP(Main.newLine + Main.MLG + Main.worldName + ": " + Main.level_1
+ ":" + Main.newLine);
} else if (line.contains("level 2")) { // "Preparing start region for level 2" } else if (line.contains("level 2")) { // "Preparing start region for level 2"
Main.outP(Main.newLine + Main.MLG + Main.worldName + ": " + Main.level_2 + ":" + Main.newLine); Main.outP(Main.newLine + Main.MLG + Main.worldName + ": " + Main.level_2
+ ":" + Main.newLine);
} else if (line.contains("level 3")) { // "Preparing start region for level 3" } else if (line.contains("level 3")) { // "Preparing start region for level 3"
Main.outP(Main.newLine + Main.MLG + Main.worldName + ": " + Main.level_3 + ":" + Main.newLine); Main.outP(Main.newLine + Main.MLG + Main.worldName + ": " + Main.level_3
+ ":" + Main.newLine);
} else if (line.contains("level 4")) { // "Preparing start region for level 4" } else if (line.contains("level 4")) { // "Preparing start region for level 4"
Main.outP(Main.newLine + Main.MLG + Main.worldName + ": " + Main.level_4 + ":" + Main.newLine); Main.outP(Main.newLine + Main.MLG + Main.worldName + ": " + Main.level_4
+ ":" + Main.newLine);
} else if (line.contains("level 5")) { // "Preparing start region for level 5" } else if (line.contains("level 5")) { // "Preparing start region for level 5"
Main.outP(Main.newLine + Main.MLG + Main.worldName + ": " + Main.level_5 + ":" + Main.newLine); Main.outP(Main.newLine + Main.MLG + Main.worldName + ": " + Main.level_5
+ ":" + Main.newLine);
} else if (line.contains("level 6")) { // "Preparing start region for level 6" } else if (line.contains("level 6")) { // "Preparing start region for level 6"
Main.outP(Main.newLine + Main.MLG + Main.worldName + ": " + Main.level_6 + ":" + Main.newLine); Main.outP(Main.newLine + Main.MLG + Main.worldName + ": " + Main.level_6
+ ":" + Main.newLine);
} else if (line.contains("level 7")) { // "Preparing start region for level 7" } else if (line.contains("level 7")) { // "Preparing start region for level 7"
Main.outP(Main.newLine + Main.MLG + Main.worldName + ": " + Main.level_7 + ":" + Main.newLine); Main.outP(Main.newLine + Main.MLG + Main.worldName + ": " + Main.level_7
+ ":" + Main.newLine);
} else if (line.contains("level 8")) { // "Preparing start region for level 8" } else if (line.contains("level 8")) { // "Preparing start region for level 8"
Main.outP(Main.newLine + Main.MLG + Main.worldName + ": " + Main.level_8 + ":" + Main.newLine); Main.outP(Main.newLine + Main.MLG + Main.worldName + ": " + Main.level_8
+ ":" + Main.newLine);
} else if (line.contains("level 9")) { // "Preparing start region for level 9" } else if (line.contains("level 9")) { // "Preparing start region for level 9"
Main.outP(Main.newLine + Main.MLG + Main.worldName + ": " + Main.level_9 + ":" + Main.newLine); Main.outP(Main.newLine + Main.MLG + Main.worldName + ": " + Main.level_9
+ ":" + Main.newLine);
} else { } else {
Main.outP(Main.newLine + Main.MLG + shortLine); Main.outP(Main.newLine + Main.MLG + shortLine);
} }
@ -293,7 +294,7 @@ public class MLG_Server {
outputStream.close(); outputStream.close();
} }
// readLine() returns null when the process exits // while loop has finished now.
return serverSuccess; return serverSuccess;
} }