1.6.3 final

This commit is contained in:
Morlok8k 2012-06-12 02:37:35 -07:00
parent c6dcdaf840
commit f66041ccfe
6 changed files with 30 additions and 13 deletions

View File

@ -1,4 +1,3 @@
#Fri Dec 23 04:15:20 PST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@ -34,7 +33,7 @@ org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
@ -56,6 +55,7 @@ org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warnin
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore

6
README
View File

@ -1,10 +1,10 @@
Minecraft Land Generator version 1.6.3
Updated June 5, 2012
(BuildID: 1338951984000)
Updated June 12, 2012
(BuildID: 1339493851000)
Original Code by Corrodias November 2010
Enhanced Code by Morlok8k Feb. 2011 to Now (or at least to June 5, 2012!)
Enhanced Code by Morlok8k Feb. 2011 to Now (or at least to June 12, 2012!)
Additional Code by pr0f1x October 2011
Website: https://sites.google.com/site/minecraftlandgenerator/

View File

@ -53,3 +53,4 @@ F96F4F3862138D498B203C2848086289=1338535367000# MLG v1.6.3
6A48691EACB4E484DFFBAC8B699B0604=1338535650000# MLG v1.6.3
6125D0807B8B68763C3B8BADD08ECC8C=1338894449000# MLG v1.6.3
F00F81A5C5833DBFF95E85EFD1B8460B=1338951984000# MLG v1.6.3
A28CD4B9DE8E3CB25AB56368A4C44A51=1339493851000# MLG v1.6.3

View File

@ -1,6 +1,6 @@
#Minecraft Land Generator Configuration File: Version: 1.6.3
#Authors: Corrodias, Morlok8k, pr0f1x
#Auto-Generated: Tuesday, June 5, 2012 at 8:06 PM Pacific Daylight Time
#Auto-Generated: Tuesday, June 12, 2012 at 2:37 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

Binary file not shown.

View File

@ -140,6 +140,8 @@ public class Main {
public static String rcon_Port = "25575"; //default is 25575, we are just initializing here.
public static String rcon_Password = "test"; //default is "", but a password must be entered.
private static boolean assertsEnabled = false; //future debugging use...
//////
public static final boolean testing = false; // display more output when debugging
@ -156,6 +158,14 @@ public class Main {
*/
public static void main(String[] args) {
startTime = System.currentTimeMillis();
assert assertsEnabled = true; // Intentional side-effect!!! (This will cause a Warning, which is safe to ignore: "Possible accidental assignment in place of a comparison. A condition expression should not be reduced to an assignment")
if (assertsEnabled) {
out("assertsEnabled: " + assertsEnabled);
verbose = true;
out("Verbose mode forced!");
}
(new Main()).run(args); // Why? this avoids "static" compiling issues.
}
@ -842,6 +852,7 @@ public class Main {
}
String line = null;
String shortLine = null;
String outTmp = "";
String outTmp2 = null;
@ -870,14 +881,19 @@ public class Main {
// just so it gets a line ending after the % output finishes
while ((line = pOut.readLine()) != null) {
int posBracket = line.lastIndexOf("]");
if (posBracket != -1) {
shortLine = line.substring(posBracket + 2);
} else {
shortLine = line;
}
line = line.trim();
if (verbose) {
if (line.contains("[INFO]")) { //TODO: add to .conf
outS(line.substring(line.lastIndexOf("]") + 2));
} else {
outS(line);
}
outS(shortLine);
} else if (line.toLowerCase().contains("saving")) {
outS(shortLine);
} else if (line.contains(preparingText) || line.contains("Converting...")) {
if (line.contains("Converting...")) {
convertedMapFormattingFlag = true;
@ -928,10 +944,10 @@ public class Main {
} else if (line.contains("level 9")) { // "Preparing start region for level 9"
outP(newLine + MLG + worldName + ": " + level_9 + ":" + newLine);
} else {
outP(newLine + MLG + line.substring(line.lastIndexOf("]") + 2));
outP(newLine + MLG + shortLine);
}
} else if (line.contains("server version") || line.contains("Converting map!")) { //TODO: add to .conf
outS(line.substring(line.lastIndexOf("]") + 2));
outS(shortLine);
}
if (line.contains(doneText)) { // now this is configurable!