1.6.11
This commit is contained in:
Morlok8k
parent
ebfd24ad0e
commit
b5dc7d09c8
16
README
16
README
@ -1,10 +1,10 @@
|
||||
Minecraft Land Generator version 1.6.1
|
||||
Minecraft Land Generator version 1.6.11
|
||||
|
||||
Updated April 18, 2012
|
||||
(BuildID: 1334739407000)
|
||||
Updated May 2, 2012
|
||||
(BuildID: 1335956100000)
|
||||
|
||||
Original Code by Corrodias November 2010
|
||||
Enhanced Code by Morlok8k Feb. 2011 to Now (or at least to April 18, 2012!)
|
||||
Enhanced Code by Morlok8k Feb. 2011 to Now (or at least to May 2, 2012!)
|
||||
Additional Code by pr0f1x October 2011
|
||||
|
||||
Website: https://sites.google.com/site/minecraftlandgenerator/
|
||||
@ -21,12 +21,18 @@ This program is public domain, and the source code is included in the .jar file.
|
||||
The JNLP library is included (inside the .jar). It is not public domain. Its license is included, as LICENSE.TXT.
|
||||
It is also available at: http://jnbt.sourceforge.net/
|
||||
|
||||
The "unescape" method/function is also not Public Domain. Its License is the W3C® Software License, and located here: http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
|
||||
The "unescape" method/function is also not Public Domain. Its License is the W3C© Software License, and located here: http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
|
||||
Other Public Domain code has been used in this program, and references to sources are included in the comments of Minecraft Land Generator's source code.
|
||||
-----------------------------------------------
|
||||
|
||||
Version History:
|
||||
Morlok8k:
|
||||
1.6.11
|
||||
- Removed End-of-Generation ASCII-Graphic - It didn't really fit with MLG.
|
||||
- Updated Time Output.
|
||||
- Changed estimated time remaining to count all runs, not just the last four.
|
||||
- Added the time it took to complete at the end of generation.
|
||||
|
||||
1.6.1
|
||||
- Added some modifications for scripting (Mainly for a new Initial setup script)
|
||||
- Changed MLG's Y to Z. Now it matches Minecraft. Y in the game is Height.
|
||||
|
||||
@ -35,3 +35,4 @@ DA5CA69AAE6EF0D2815A597ED93DB5DB=1332833731000# MLG v1.6.05
|
||||
F1B044CD44634EDDB85DC44384CB8F0F=1334484354000# MLG v1.6.1
|
||||
36A1C89EFD4967C19AA001B64EE99C80=1334484954000# MLG v1.6.1
|
||||
891492F60015683B98CD7A4F4430AE16=1334739407000# MLG v1.6.1
|
||||
22EAF4CE6AD4089527919E8D8A5CA055=1335956100000# MLG v1.6.11
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#Minecraft Land Generator Configuration File: Version: 1.6.1
|
||||
#Minecraft Land Generator Configuration File: Version: 1.6.11
|
||||
#Authors: Corrodias, Morlok8k, pr0f1x
|
||||
#Auto-Generated: Wednesday, April 18, 2012 at 1:56 AM Pacific Daylight Time
|
||||
#Auto-Generated: Wednesday, May 2, 2012 at 3: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
|
||||
|
||||
Binary file not shown.
@ -336,7 +336,7 @@ public class Main {
|
||||
|
||||
if (doneText == null) { // MLG 1.4.0
|
||||
oldConf = true;
|
||||
} else if (preparingText == null) { // MLG 1.4.0
|
||||
} else if (preparingText == null) { // MLG 1.4.0
|
||||
oldConf = true;
|
||||
} else if (preparingLevel == null) { // MLG 1.4.5 / 1.5.0
|
||||
oldConf = true;
|
||||
@ -516,6 +516,7 @@ public class Main {
|
||||
//timeTracking[0] = timeTracking[1];
|
||||
//timeTracking[1] = timeTracking[2];
|
||||
//timeTracking[2] = timeTracking[3];
|
||||
//timeTracking[3] = System.currentTimeMillis();
|
||||
timeTracking = System.currentTimeMillis();
|
||||
|
||||
//NEW CODE:
|
||||
@ -1050,7 +1051,7 @@ public class Main {
|
||||
+ "The JNLP library is included (inside the .jar). It is not public domain. Its license is included, as LICENSE.TXT." + newLine
|
||||
+ "It is also available at: http://jnbt.sourceforge.net/" + newLine
|
||||
+ newLine
|
||||
+ "The \"unescape\" method/function is also not Public Domain. Its License is the W3C® Software License, and located here: http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231"
|
||||
+ "The \"unescape\" method/function is also not Public Domain. Its License is the W3C\u00A9 Software License, and located here: http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231"
|
||||
+ newLine
|
||||
+ "Other Public Domain code has been used in this program, and references to sources are included in the comments of " + PROG_NAME + "'s source code."
|
||||
+ newLine
|
||||
@ -2185,24 +2186,12 @@ public class Main {
|
||||
private static String displayTime(long startTimeMillis, long endTimeMillis) {
|
||||
|
||||
long millis = (endTimeMillis - startTimeMillis);
|
||||
long seconds = millis / 1000;
|
||||
long minutes = seconds / 60;
|
||||
long hours = minutes / 60;
|
||||
long days = hours / 24;
|
||||
long years = days / 365;
|
||||
|
||||
String took =
|
||||
(years > 0 ? String.format("%d Years, ", years) : "")
|
||||
+ (days > 0 ? String.format("%d Days, ", days % 365) : "")
|
||||
+ (hours > 0 ? String.format("%d Hours, ", hours % 24) : "")
|
||||
+ (minutes > 0 ? String.format("%d Minutes, ", minutes % 60) : "")
|
||||
+ String.format("%d Seconds", seconds % 60);
|
||||
|
||||
return (took);
|
||||
//I just duplicated displayTime to have a start & end times, because it just made things simpler to code.
|
||||
return (displayTime(millis));
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the time in a readable format given in Millis.
|
||||
* Returns the time in a readable format given a time in Millis.
|
||||
*
|
||||
* @param timeMillis
|
||||
* @author Morlok8k
|
||||
@ -2241,9 +2230,9 @@ public class Main {
|
||||
* <br>
|
||||
* unescape: <a href="http://www.w3.org/International/unescape.java">http://www.w3.org/International/unescape.java</a><br>
|
||||
* <br>
|
||||
* Copyright © 1997 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University). All Rights Reserved. This
|
||||
* work is distributed under the W3C® Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
* PARTICULAR PURPOSE.<br>
|
||||
* Copyright © 1997 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University). All Rights Reserved.
|
||||
* This work is distributed under the W3C® Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||
* FOR A PARTICULAR PURPOSE.<br>
|
||||
* <br>
|
||||
* [1] <a href="http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231">http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231</a>
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user