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

Fixed some faulty logic and useless code of mine in the world name check.

Browse Source
This commit is contained in:
Gallion 2015-01-09 19:10:00 -05:00
parent 1a1b21e490
commit c57220e469
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/morlok8k/MinecraftLandGenerator/Setup.java
View File

@ -21,12 +21,8 @@ package morlok8k.MinecraftLandGenerator;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.nio.Buffer;
import java.util.logging.Level;
import java.util.logging.Logger;
/** /**
* *
@ -38,12 +34,11 @@ import java.util.logging.Logger;
public class Setup { public class Setup {
static boolean doSetup() { static boolean doSetup() {
// Declare your stuff at the beginning, yo.
final File serverPathFile; final File serverPathFile;
final BufferedReader serverPropertiesFile; final BufferedReader serverPropertiesFile;
final File levelDat; final File levelDat;
final File backupLevel; final File backupLevel;
String line = null; String line;
//---------- Verify server path //---------- Verify server path
@ -73,19 +68,18 @@ public class Setup {
line = serverPropertiesFile.readLine(); line = serverPropertiesFile.readLine();
} }
catch (IOException e) { catch (IOException e) {
return true;
} }
while (line != null) { while (line != null) {
if (line.contains("level-name")) { // Yep, that line contains it if (line.contains("level-name")) { // Yep, that line contains it
if (line.contains("#")) { // There is a comment somewhere on the line if (line.contains("#") && line.indexOf('=') < line.indexOf('#')) {
if (line.indexOf('#') > line.indexOf("level-name")) { // The comment isn't before level-name // Apparently, "#slf dghdsf #gdcfggh" is a perfectly valid world name.
if (!(line.indexOf('#') > line.indexOf('='))) { // In case only the name is commented out // In the other cases, the line is commented or invalid.
var.worldName = line.substring(line.indexOf('=') + 1, line.indexOf('#')); // Read world name until start of comment var.worldName = line.substring(line.indexOf('=') + 1);
var.worldPath = var.serverPath + var.fileSeparator + var.worldName; var.worldPath = var.serverPath + var.fileSeparator + var.worldName;
}
}
} else { // There is no comment on the line } else { // There is no comment on the line
var.worldName = line.substring(line.indexOf('=') + 1, line.length()); var.worldName = line.substring(line.indexOf('=') + 1);
var.worldPath = var.serverPath + var.fileSeparator + var.worldName; var.worldPath = var.serverPath + var.fileSeparator + var.worldName;
} }
} }
@ -93,6 +87,7 @@ public class Setup {
line = serverPropertiesFile.readLine(); line = serverPropertiesFile.readLine();
} }
catch (IOException e) { catch (IOException e) {
return true;
} }
} }
@ -150,7 +145,9 @@ public class Setup {
System.exit(1); // we got a warning or severe error System.exit(1); // we got a warning or severe error
} }
} }
catch (IOException e){} catch (IOException e){
return true;
}
Out.err("World created! Starting world generation..."); Out.err("World created! Starting world generation...");
} }
return false; return false;