some updates for 2.0... still working on it.

This commit is contained in:
Morlok8k 2012-10-30 10:25:41 -07:00
parent fc7d81ba0a
commit 840e6d8bc4
3 changed files with 109 additions and 109 deletions

View File

@ -584,104 +584,6 @@ public class MLG_GUI {
// Finished creation of frame
}
void start_GUI() {
// TODO: add additional start code
btnStop.setEnabled(true);
btnStart.setEnabled(false);
mntmStop.setEnabled(true);
mntmStart.setEnabled(false);
SizeSetEnable(false);
CenterPointSetEnable(false);
rdbtnSizeSquarify.setEnabled(false);
rdbtnSizeCustomSize.setEnabled(false);
rdbtnAlignRegions.setEnabled(false);
rdbtnAlignChunks.setEnabled(false);
rdbtnCenterSpawnPoint.setEnabled(false);
rdbtnCenterOther.setEnabled(false);
pgbCurPer.setIndeterminate(true);
pgbTotPer.setIndeterminate(true);
//TODO: add values from textboxes and radio buttons to the actual vars.
if (rdbtnAlignRegions.isSelected()) {
var.useChunks = false;
} else {
var.useChunks = true;
}
if (rdbtnSizeCustomSize.isSelected()) {
var.xRange = Integer.parseInt(txtSizeX.getText().trim());
var.zRange = Integer.parseInt(txtSizeZ.getText().trim());
} else {
var.xRange = 1000; // Umm... This code shouldn't run at this point in time...
var.zRange = 1000;
//TODO: add squarifying code here.
}
if (rdbtnCenterOther.isSelected()) {
var.xOffset = Integer.parseInt(txtCPX.getText().trim());
var.zOffset = Integer.parseInt(txtCPZ.getText().trim());
} else {
var.xOffset = 0;
var.zOffset = 0;
// TODO: get spawnpoint
txtCPX.setText(var.xOffset.toString());
txtCPZ.setText(var.zOffset.toString());
}
}
void stop_GUI() {
// TODO: add additional stop code
if (rdbtnSizeCustomSize.isSelected()) {
SizeSetEnable(true);
} else {
SizeSetEnable(false);
}
if (rdbtnCenterSpawnPoint.isSelected()) {
CenterPointSetEnable(false);
} else {
CenterPointSetEnable(true);
}
//rdbtnSizeSquarify.setEnabled(true);
rdbtnSizeCustomSize.setEnabled(true);
rdbtnAlignRegions.setEnabled(true);
rdbtnAlignChunks.setEnabled(true);
rdbtnCenterSpawnPoint.setEnabled(true);
rdbtnCenterOther.setEnabled(true);
mntmStop.setEnabled(false);
mntmStart.setEnabled(true);
btnStart.setEnabled(true);
btnStop.setEnabled(false);
pgbCurPer.setIndeterminate(false);
pgbTotPer.setIndeterminate(false);
}
static void MapInfo() {
// TODO: Display Map Info
@ -755,4 +657,102 @@ public class MLG_GUI {
}
void stop_GUI() {
// TODO: add additional stop code
if (rdbtnSizeCustomSize.isSelected()) {
SizeSetEnable(true);
} else {
SizeSetEnable(false);
}
if (rdbtnCenterSpawnPoint.isSelected()) {
CenterPointSetEnable(false);
} else {
CenterPointSetEnable(true);
}
//rdbtnSizeSquarify.setEnabled(true);
rdbtnSizeCustomSize.setEnabled(true);
rdbtnAlignRegions.setEnabled(true);
rdbtnAlignChunks.setEnabled(true);
rdbtnCenterSpawnPoint.setEnabled(true);
rdbtnCenterOther.setEnabled(true);
mntmStop.setEnabled(false);
mntmStart.setEnabled(true);
btnStart.setEnabled(true);
btnStop.setEnabled(false);
pgbCurPer.setIndeterminate(false);
pgbTotPer.setIndeterminate(false);
}
void start_GUI() {
// TODO: add additional start code
btnStop.setEnabled(true);
btnStart.setEnabled(false);
mntmStop.setEnabled(true);
mntmStart.setEnabled(false);
SizeSetEnable(false);
CenterPointSetEnable(false);
rdbtnSizeSquarify.setEnabled(false);
rdbtnSizeCustomSize.setEnabled(false);
rdbtnAlignRegions.setEnabled(false);
rdbtnAlignChunks.setEnabled(false);
rdbtnCenterSpawnPoint.setEnabled(false);
rdbtnCenterOther.setEnabled(false);
pgbCurPer.setIndeterminate(true);
pgbTotPer.setIndeterminate(true);
//TODO: add values from textboxes and radio buttons to the actual vars.
if (rdbtnAlignRegions.isSelected()) {
var.useChunks = false;
} else {
var.useChunks = true;
}
if (rdbtnSizeCustomSize.isSelected()) {
var.xRange = Integer.parseInt(txtSizeX.getText().trim());
var.zRange = Integer.parseInt(txtSizeZ.getText().trim());
} else {
var.xRange = 1000; // Umm... This code shouldn't run at this point in time...
var.zRange = 1000;
//TODO: add squarifying code here.
}
if (rdbtnCenterOther.isSelected()) {
var.xOffset = Integer.parseInt(txtCPX.getText().trim());
var.zOffset = Integer.parseInt(txtCPZ.getText().trim());
} else {
var.xOffset = 0;
var.zOffset = 0;
// TODO: get spawnpoint
txtCPX.setText(var.xOffset.toString());
txtCPZ.setText(var.zOffset.toString());
}
}
}

View File

@ -153,8 +153,7 @@ public class Main {
//return;
FileRead.readArrayListCoordLog(var.worldPath + var.fileSeparator
+ "MinecraftLandGenerator.log"); // we read the .log just for any resume data, if any.
FileRead.readArrayListCoordLog(var.worldPath + var.fileSeparator + var.logFile); // we read the .log just for any resume data, if any.
System.gc(); //run the garbage collector - hopefully free up some memory!
@ -195,8 +194,7 @@ public class Main {
return;
}
FileWrite.AppendTxtFile(var.worldPath + var.fileSeparator
+ "MinecraftLandGenerator.log",
FileWrite.AppendTxtFile(var.worldPath + var.fileSeparator + var.logFile,
"# " + var.PROG_NAME + " " + var.VERSION + " - " + SelfAware.JVMinfo()
+ var.newLine + "# " + var.MC_Server_Version + var.newLine
+ "# Started: " + var.dateFormat.format(generationStartTimeTracking)
@ -216,9 +214,8 @@ public class Main {
final Coordinates spawn = SpawnPoint.getSpawn(serverLevel);
Out.out("Spawn point detected: [X,Y,Z] " + spawn);
FileWrite.AppendTxtFile(var.worldPath + var.fileSeparator
+ "MinecraftLandGenerator.log", "# Seed: " + var.randomSeed + var.newLine
+ "# Spawn: " + spawn.toString() + var.newLine);
FileWrite.AppendTxtFile(var.worldPath + var.fileSeparator + var.logFile, "# Seed: "
+ var.randomSeed + var.newLine + "# Spawn: " + spawn.toString() + var.newLine);
boolean overridden = false;
if (var.xOffset == null) {
@ -329,8 +326,7 @@ public class Main {
//get existing list, and remove this list from launchList
final ArrayList<Coordinates> removeList =
FileRead.readArrayListCoordLog(var.worldPath + var.fileSeparator
+ "MinecraftLandGenerator.log");
FileRead.readArrayListCoordLog(var.worldPath + var.fileSeparator + var.logFile);
if (!(removeList.isEmpty())) {
Arraylist.arrayListRemove(launchList, removeList);
@ -384,8 +380,8 @@ public class Main {
if (serverSuccess) {
// Write the current Coordinates to log file!
FileWrite.AppendTxtFile(var.worldPath + var.fileSeparator
+ "MinecraftLandGenerator.log", xyz.toString() + var.newLine);
FileWrite.AppendTxtFile(var.worldPath + var.fileSeparator + var.logFile,
xyz.toString() + var.newLine);
} else {
System.exit(1); // we got a warning or severe error
}

View File

@ -275,4 +275,8 @@ public class var {
/** Chunks or Regions? */
public static boolean useChunks = true;
/** Log File */
public static String logFile = "MinecraftLandGenerator.log";
}