Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-07 19:31:57 +01:00
Code Issues Projects Releases Wiki Activity

More refactoring on MVWorld

Browse Source
This commit is contained in:
Eric Stokes 2011-06-26 11:38:36 -06:00
parent 0a88c086f4
commit 04c6024616
1 changed files with 58 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/com/onarandombox/MultiverseCore/MVWorld.java
View File

@ -1,11 +1,11 @@
package com.onarandombox.MultiverseCore; package com.onarandombox.MultiverseCore;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.World.Environment; import org.bukkit.World.Environment;
import org.bukkit.generator.ChunkGenerator;
import org.bukkit.util.config.Configuration; import org.bukkit.util.config.Configuration;
public class MVWorld { public class MVWorld {
@ -35,10 +35,11 @@ public class MVWorld {
public List<String> editBlacklist; // Contain a list of Players/Groups which cannot edit this World. (Place/Destroy Blocks) public List<String> editBlacklist; // Contain a list of Players/Groups which cannot edit this World. (Place/Destroy Blocks)
public List<String> worldBlacklist; // Contain a list of Worlds which Players cannot use to Portal to this World. public List<String> worldBlacklist; // Contain a list of Worlds which Players cannot use to Portal to this World.
public HashMap<String, List<String>> masterList;
public Double scaling; // How stretched/compressed distances are public Double scaling; // How stretched/compressed distances are
/** /**
* The generator as a string. This is used only for reporting. * The generator as a string. This is used only for reporting. ex: BukkitFullOfMoon:GenID
* ex: BukkitFullOfMoon:GenID
*/ */
private String generator; private String generator;
@ -74,12 +75,12 @@ public class MVWorld {
this.setMonsters(config.getBoolean("worlds." + this.name + ".monsters.spawn", true)); this.setMonsters(config.getBoolean("worlds." + this.name + ".monsters.spawn", true));
this.getMobExceptions(); this.getMobExceptions();
this.playerWhitelist = config.getStringList("worlds." + this.name + ".playerWhitelist", this.playerWhitelist); this.playerWhitelist = config.getStringList("worlds." + this.name + ".playerwhitelist", this.playerWhitelist);
this.playerBlacklist = config.getStringList("worlds." + this.name + ".playerBlacklist", this.playerBlacklist); this.playerBlacklist = config.getStringList("worlds." + this.name + ".playerblacklist", this.playerBlacklist);
this.worldBlacklist = config.getStringList("worlds." + this.name + ".worldBlacklist", this.worldBlacklist); this.worldBlacklist = config.getStringList("worlds." + this.name + ".worldblacklist", this.worldBlacklist);
this.blockBlacklist = config.getIntList("worlds." + this.name + ".blockBlacklist", this.blockBlacklist); this.blockBlacklist = config.getIntList("worlds." + this.name + ".blockblacklist", this.blockBlacklist);
this.editWhitelist = config.getStringList("worlds." + this.name + ".editWhitelist", this.editWhitelist); this.editWhitelist = config.getStringList("worlds." + this.name + ".editwhitelist", this.editWhitelist);
this.editBlacklist = config.getStringList("worlds." + this.name + ".editBlacklist", this.editBlacklist); this.editBlacklist = config.getStringList("worlds." + this.name + ".editblacklist", this.editBlacklist);
config.save(); config.save();
// The following 3 lines will add some sample data to new worlds created. // The following 3 lines will add some sample data to new worlds created.
@ -108,12 +109,19 @@ public class MVWorld {
} }
private void initLists() { private void initLists() {
this.masterList = new HashMap<String, List<String>>();
this.blockBlacklist = new ArrayList<Integer>(); this.blockBlacklist = new ArrayList<Integer>();
// Only int list, we don't need to add it to the masterlist
this.playerWhitelist = new ArrayList<String>(); this.playerWhitelist = new ArrayList<String>();
this.masterList.put("playerwhitelist", this.playerWhitelist);
this.playerBlacklist = new ArrayList<String>(); this.playerBlacklist = new ArrayList<String>();
this.masterList.put("playerblacklist", this.playerBlacklist);
this.editWhitelist = new ArrayList<String>(); this.editWhitelist = new ArrayList<String>();
this.masterList.put("editwhitelist", this.editWhitelist);
this.editBlacklist = new ArrayList<String>(); this.editBlacklist = new ArrayList<String>();
this.masterList.put("editblacklist", this.editBlacklist);
this.worldBlacklist = new ArrayList<String>(); this.worldBlacklist = new ArrayList<String>();
this.masterList.put("worldblacklist", this.worldBlacklist);
} }
public void addSampleData() { public void addSampleData() {
@ -153,30 +161,53 @@ public class MVWorld {
return false; return false;
} }
public boolean setVariable(String name, String value) { // This has been checked, see 3 lines below.
// The booleans public boolean addToList(String list, String value) {
try { if (this.masterList.keySet().contains(list)) {
boolean boolValue = Boolean.parseBoolean(value);
this.masterList.get(list).add(value);
this.config.setProperty("worlds." + this.name + "." + list.toLowerCase(), this.blockBlacklist);
this.config.save();
return true;
}
return false;
}
public boolean addToList(String list, Integer value) {
if (list.equalsIgnoreCase("blockblacklist")) {
this.blockBlacklist.add(value);
this.config.setProperty("worlds." + this.name + ".blockblacklist", this.blockBlacklist);
}
return false;
}
public boolean setVariable(String name, boolean value) {
if (name.equalsIgnoreCase("pvp")) { if (name.equalsIgnoreCase("pvp")) {
this.setPvp(boolValue); this.setPvp(value);
} else if (name.equalsIgnoreCase("animals")) { } else if (name.equalsIgnoreCase("animals")) {
this.setAnimals(boolValue); this.setAnimals(value);
} else if (name.equalsIgnoreCase("monsters")) { } else if (name.equalsIgnoreCase("monsters")) {
this.setMonsters(boolValue); this.setMonsters(value);
} else { } else {
return false; return false;
} }
return true; return true;
} catch (Exception e) {
} }
public boolean setVariable(String name, double value) {
if (name.equalsIgnoreCase("scaling")) {
this.setScaling(value);
return true;
}
return false;
}
public boolean setVariable(String name, String value) {
// The Doubles // The Doubles
try { try {
double doubleValue = Double.parseDouble(value); double doubleValue = Double.parseDouble(value);
if (name.equalsIgnoreCase("scaling")) {
this.setScaling(doubleValue);
return true;
}
} catch (Exception e) { } catch (Exception e) {
} }