Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-22 10:36:06 +01:00
Code Issues Projects Releases Wiki Activity

Starting to support custom generators

Browse Source
This commit is contained in:
Eric Stokes 2011-06-24 18:47:31 -06:00
parent e24dc7f83a
commit a2bef29bc2
11 changed files with 205 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/onarandombox/MultiverseCore/MVPermissions.java
View File

@ -38,6 +38,7 @@ public class MVPermissions {
return result;
}
/**
* Check if a Player can teleport to the Destination world from there current world. This checks against the Worlds Blacklist
*

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

@ -5,6 +5,7 @@ import java.util.List;
import org.bukkit.World;
import org.bukkit.World.Environment;
import org.bukkit.generator.ChunkGenerator;
import org.bukkit.util.config.Configuration;
@SuppressWarnings("unused")
@ -37,7 +38,7 @@ public class MVWorld {
public Double scaling; // How stretched/compressed distances are
public MVWorld(World world, Configuration config, MultiverseCore instance, Long seed) {
public MVWorld(World world, Configuration config, MultiverseCore instance, Long seed, ChunkGenerator customGenerator) {
this.config = config;
this.plugin = instance;

155
src/com/onarandombox/MultiverseCore/MultiverseCore.java
View File

@ -35,6 +35,7 @@ import org.bukkit.entity.Squid;
import org.bukkit.entity.Zombie;
import org.bukkit.event.Event;
import org.bukkit.event.Event.Priority;
import org.bukkit.generator.ChunkGenerator;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
@ -46,8 +47,6 @@ import com.nijikokun.bukkit.Permissions.Permissions;
import com.onarandombox.MultiverseCore.command.CommandManager;
import com.onarandombox.MultiverseCore.command.QueuedCommand;
import com.onarandombox.MultiverseCore.command.commands.*;
import com.onarandombox.MultiverseCore.commands.MVModify;
import com.onarandombox.MultiverseCore.commands.MVReload;
import com.onarandombox.MultiverseCore.configuration.DefaultConfiguration;
import com.onarandombox.utils.DebugLog;
import com.onarandombox.utils.Messaging;
@ -97,6 +96,9 @@ public class MultiverseCore extends JavaPlugin {
// HashMap to contain all the Worlds which this Plugin will manage.
public HashMap<String, MVWorld> worlds = new HashMap<String, MVWorld>();
// HashMap to contain all custom generators. Plugins will have to register!
public HashMap<String, ChunkGenerator> worldGenerators = new HashMap<String, ChunkGenerator>();
// HashMap to contain information relating to the Players.
public HashMap<String, MVPlayerSession> playerSessions = new HashMap<String, MVPlayerSession>();
@ -126,7 +128,6 @@ public class MultiverseCore extends JavaPlugin {
// Setup iConomy.
setupEconomy();
// Call the Function to assign all the Commands to their Class.
setupCommands();
registerCommands();
// Start the Update Checker
@ -284,7 +285,7 @@ public class MultiverseCore extends JavaPlugin {
}
/**
* Register Heroes commands to DThielke's Command Manager.
* Register Multiverse-Core commands to DThielke's Command Manager.
*/
private void registerCommands() {
// Page 1
@ -302,23 +303,8 @@ public class MultiverseCore extends JavaPlugin {
commandManager.addCommand(new UnloadCommand(this));
commandManager.addCommand(new ConfirmCommand(this));
commandManager.addCommand(new InfoCommand(this));
}
/**
* Setup commands to the Command Handler
*/
private void setupCommands() {
// commands.put("mvcreate", new CreateCommand(this));
// commands.put("mvimport", new ImportCommand(this));
// commands.put("mvremove", new RemoveCommand(this));
commands.put("mvmodify", new MVModify(this));
// commands.put("mvtp", new TeleportCommand(this));
// commands.put("mvlist", new ListCommand(this));
// commands.put("mvsetspawn", new SetSpawnCommand(this));
// commands.put("mvspawn", new SpawnCommand(this));
// commands.put("mvcoord", new MVCoord(this));
// commands.put("mvwho", new WhoCommand(this));
commands.put("mvreload", new MVReload(this));
commandManager.addCommand(new ReloadCommand(this));
commandManager.addCommand(new ModifyCommand(this));
}
/**
@ -340,31 +326,13 @@ public class MultiverseCore extends JavaPlugin {
// Grab the initial values from the config file.
String environment = configWorlds.getString("worlds." + worldKey + ".environment", "NORMAL"); // Grab the Environment as a String.
String seedString = configWorlds.getString("worlds." + worldKey + ".seed", "");
Long seed = null;
// Work out the Environment
Environment env = getEnvFromString(environment, null);
if (env == null) {
env = Environment.NORMAL;
}
// If a seed was given we need to parse it to a Long Format.
if (seedString.length() > 0) {
// Output to the Log that we are loading a world, specify the name, environment type and seed.
log(Level.INFO, "Loading World & Settings - '" + worldKey + "' - " + environment + " with seed: " + seedString);
try {
seed = Long.parseLong(seedString);
} catch (NumberFormatException numberformatexception) {
seed = (long) seedString.hashCode();
}
} else {
// Output to the Log that we are loading a world, specify the name and environment type.
log(Level.INFO, "Loading World & Settings - '" + worldKey + "' - " + environment);
}
log(Level.INFO, "Loading World & Settings - '" + worldKey + "' - " + environment);
// If we don't have a seed then add a standard World, else add the world with the Seed.
if (seed == null) {
addWorld(worldKey, env, null);
} else {
addWorld(worldKey, env, seed);
}
addWorld(worldKey, environment, seedString);
// Increment the World Count.
count++;
}
@ -387,7 +355,7 @@ public class MultiverseCore extends JavaPlugin {
World world = this.getServer().getWorlds().get(0);
if (!this.worlds.containsKey(world.getName())) {
log.info("Loading World & Settings - '" + world.getName() + "' - " + world.getEnvironment());
addWorld(world.getName(), Environment.NORMAL, null);
addWorld(world.getName(), Environment.NORMAL, null, null);
additonalWorldsLoaded++;
}
@ -395,7 +363,7 @@ public class MultiverseCore extends JavaPlugin {
World world_nether = this.getServer().getWorld(world.getName() + "_nether");
if (world_nether != null && !this.worlds.containsKey(world_nether.getName())) {
log.info("Loading World & Settings - '" + world.getName() + "' - " + world_nether.getEnvironment());
addWorld(world_nether.getName(), Environment.NETHER, null);
addWorld(world_nether.getName(), Environment.NETHER, null, null);
additonalWorldsLoaded++;
}
@ -411,26 +379,73 @@ public class MultiverseCore extends JavaPlugin {
public long getSeed(World w) {
return ((CraftWorld) w).getHandle().worldData.b();
}
/**
*
* @param name
* @param envString
* @param seedString
* @return
*/
public boolean addWorld(String name, String envString, String seedString) {
Long seed = null;
Environment env = getEnvFromString(envString);
ChunkGenerator customGenerator = getChunkGenFromEnv(envString);
if(env == null) {
env = Environment.NORMAL;
// If the env was null, ie. not a built in one.
// AND the customGenerator is null, then someone
// screwed up... return false!
if(customGenerator == null) {
return false;
}
}
if (seedString.length() > 0) {
try {
seed = Long.parseLong(seedString);
} catch (NumberFormatException numberformatexception) {
seed = (long) seedString.hashCode();
}
}
this.addWorld(name, env, seed, customGenerator);
return true;
}
/**
* Add a new World to the Multiverse Setup.
*
* Isn't there a prettier way to do this??!!?!?!
*
* @param name World Name
* @param environment Environment Type
*/
public void addWorld(String name, Environment environment, Long seed) {
private void addWorld(String name, Environment environment, Long seed, ChunkGenerator customGenerator) {
if (seed != null) {
World world = getServer().createWorld(name, environment, seed);
worlds.put(name, new MVWorld(world, configWorlds, this, seed)); // Place the World into the HashMap.
if (customGenerator != null) {
World world = getServer().createWorld(name, environment, seed, customGenerator);
worlds.put(name, new MVWorld(world, configWorlds, this, seed, customGenerator)); // Place the World into the HashMap.
log(Level.INFO, "Loading World & Settings - '" + name + "' - CUSTOMENV with seed: " + seed);
} else {
World world = getServer().createWorld(name, environment, seed);
worlds.put(name, new MVWorld(world, configWorlds, this, seed, null)); // Place the World into the HashMap.
log(Level.INFO, "Loading World & Settings - '" + name + "' - " + environment + " with seed: " + seed);
}
} else {
World world = getServer().createWorld(name, environment);
worlds.put(name, new MVWorld(world, configWorlds, this, null)); // Place the World into the HashMap.
if (customGenerator != null) {
World world = getServer().createWorld(name, environment, customGenerator);
worlds.put(name, new MVWorld(world, configWorlds, this, null, customGenerator)); // Place the World into the HashMap.
log(Level.INFO, "Loading World & Settings - '" + name + "' - CUSTOMENV");
} else {
World world = getServer().createWorld(name, environment);
worlds.put(name, new MVWorld(world, configWorlds, this, null, null)); // Place the World into the HashMap.
log(Level.INFO, "Loading World & Settings - '" + name + "' - " + environment);
}
}
}
public void addWorld(String name, Environment environment) {
addWorld(name, environment, null);
addWorld(name, environment, null, null);
}
/**
@ -625,8 +640,7 @@ public class MultiverseCore extends JavaPlugin {
* @param env
* @return
*/
public Environment getEnvFromString(String env, CommandSender sender) {
Environment environment = null;
public Environment getEnvFromString(String env) {
// Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way
if (env.equalsIgnoreCase("HELL") || env.equalsIgnoreCase("NETHER"))
env = "NETHER";
@ -638,20 +652,30 @@ public class MultiverseCore extends JavaPlugin {
env = "NORMAL";
try {
environment = Environment.valueOf(env);
return Environment.valueOf(env);
} catch (IllegalArgumentException e) {
// Sender will be null on loadWorlds
if (sender != null) {
sender.sendMessage(ChatColor.RED + "Environment type " + env + " does not exist!");
}
return Environment.NORMAL;
// TODO: Show the player the mvenvironments command.
}
return environment;
}
public ChunkGenerator getChunkGenFromEnv(String env) {
if (worldGenerators.containsKey(env)) {
return worldGenerators.get(env);
}
return null;
}
public boolean registerEnvType(String name, ChunkGenerator generator) {
if (worldGenerators.containsKey(name)) {
return false;
}
worldGenerators.put(name, generator);
return true;
}
// TODO: Find out where to put these next 3 methods! I just stuck them here for now --FF
/**
*
@ -663,15 +687,17 @@ public class MultiverseCore extends JavaPlugin {
sender.sendMessage("If you still wish to execute " + ChatColor.RED + commandName + ChatColor.WHITE + ", please type: " + ChatColor.GREEN + "/mvconfirm " + ChatColor.GOLD + "YES");
sender.sendMessage(ChatColor.GREEN + "/mvconfirm" + ChatColor.WHITE + " will only be available for 10 seconds.");
}
/**
* Tries to fire off the command
*
* @param sender
* @return
*/
public boolean confirmQueuedCommand(CommandSender sender) {
for (QueuedCommand com : queuedCommands) {
if (com.getSender().equals(sender)) {
if(com.execute()) {
if (com.execute()) {
sender.sendMessage(com.getSuccess());
return true;
} else {
@ -682,9 +708,10 @@ public class MultiverseCore extends JavaPlugin {
}
return false;
}
/**
* Cancels(invalidates) a command that has been requested. This is called when a user types something other than 'yes' or when they try to queue a second command
* Queuing a second command will delete the first command entirely.
* Cancels(invalidates) a command that has been requested. This is called when a user types something other than 'yes' or when they try to queue a second command Queuing a second command will delete the first command entirely.
*
* @param sender
*/
public void cancelQueuedCommand(CommandSender sender) {

19
src/com/onarandombox/MultiverseCore/command/commands/CreateCommand.java
View File

@ -43,21 +43,14 @@ public class CreateCommand extends BaseCommand {
sender.sendMessage(ChatColor.RED + "If you are confident it is a world you can import with /mvimport");
return;
}
Environment environment = plugin.getEnvFromString(env, sender);
if (environment == null) {
return;
}
sender.sendMessage(ChatColor.AQUA + "Starting world creation...");
if (hasSeed) {
try {
plugin.addWorld(worldName, environment, Long.parseLong(seed));
} catch (NumberFormatException e) {
plugin.addWorld(worldName, environment, (long) seed.hashCode());
}
if (plugin.addWorld(worldName, env, seed)) {
sender.sendMessage(ChatColor.GREEN + "Complete!");
} else {
plugin.addWorld(worldName, environment);
sender.sendMessage(ChatColor.RED + "FAILED.");
if(plugin.getEnvFromString(env) == null) {
sender.sendMessage("I should show the envs I know here...");
}
}
sender.sendMessage(ChatColor.GREEN + "Complete!");
return;
}

8
src/com/onarandombox/MultiverseCore/command/commands/ImportCommand.java
View File

@ -31,13 +31,19 @@ public class ImportCommand extends BaseCommand {
return;
}
Environment env = plugin.getEnvFromString(args[1], sender);
Environment env = plugin.getEnvFromString(args[1]);
if (new File(worldName).exists() && env != null) {
sender.sendMessage(ChatColor.AQUA + "Starting world import...");
plugin.addWorld(worldName, env);
sender.sendMessage(ChatColor.GREEN + "Complete!");
return;
} else if(env == null) {
sender.sendMessage(ChatColor.RED + "FAILED.");
sender.sendMessage("I should show valid envs here...");
} else {
sender.sendMessage(ChatColor.RED + "FAILED.");
sender.sendMessage("That world folder does not exist...");
}
}

43
src/com/onarandombox/MultiverseCore/command/commands/MVPurge.java Normal file
View File

@ -0,0 +1,43 @@
package com.onarandombox.MultiverseCore.command.commands;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.onarandombox.MultiverseCore.MVCommandHandler;
import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.command.BaseCommand;
import com.onarandombox.utils.PurgeWorlds;
public class MVPurge extends BaseCommand {
public MVPurge(MultiverseCore plugin) {
super(plugin);
}
@Override
public void execute(CommandSender sender, String[] args) {
// if (!(args.length > 0)) {
// return fal;
// }
//
// if (!(sender instanceof Player)) {
// sender.sendMessage("This command needs to be used from inside the game!");
// return true;
// }
//
// Player p = (Player) sender;
// List<String> creatures = new ArrayList<String>();
//
// for (String creature : args[0].toUpperCase().split(",")) {
// creatures.add(creature);
// }
//
// new PurgeWorlds(plugin).purge(sender, p.getWorld(), creatures);
//
// return true;
}
}

22
src/com/onarandombox/MultiverseCore/command/commands/ModifyCommand.java Normal file
View File

@ -0,0 +1,22 @@
package com.onarandombox.MultiverseCore.command.commands;
import org.bukkit.command.CommandSender;
import com.onarandombox.MultiverseCore.MVCommandHandler;
import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.command.BaseCommand;
public class ModifyCommand extends BaseCommand {
public ModifyCommand(MultiverseCore plugin) {
super(plugin);
// TODO Auto-generated constructor stub
}
@Override
public void execute(CommandSender sender, String[] args) {
// TODO Auto-generated method stub
}
}

33
src/com/onarandombox/MultiverseCore/command/commands/ReloadCommand.java Normal file
View File

@ -0,0 +1,33 @@
package com.onarandombox.MultiverseCore.command.commands;
import java.util.logging.Level;
import org.bukkit.command.CommandSender;
import com.onarandombox.MultiverseCore.MVCommandHandler;
import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.command.BaseCommand;
public class ReloadCommand extends BaseCommand {
public ReloadCommand(MultiverseCore plugin) {
super(plugin);
this.name = "Reload worlds.yml";
this.description = "Reloads all worlds that are in worlds.yml. Use this if you've modified worlds.yml.";
this.usage = "/mvreload";
this.minArgs = 0;
this.maxArgs = 0;
this.identifiers.add("mvreload");
this.permission = "multiverse.world.reload";
this.requiresOp = true;
}
@Override
public void execute(CommandSender sender, String[] args) {
plugin.log(Level.INFO, "Reloading Multiverse-Core config");
plugin.loadConfigs();
plugin.loadWorlds();
plugin.log(Level.INFO, "Reload Complete!");
}
}

21
src/com/onarandombox/MultiverseCore/commands/MVModify.java
View File

@ -1,21 +0,0 @@
package com.onarandombox.MultiverseCore.commands;
import org.bukkit.command.CommandSender;
import com.onarandombox.MultiverseCore.MVCommandHandler;
import com.onarandombox.MultiverseCore.MultiverseCore;
public class MVModify extends MVCommandHandler {
public MVModify(MultiverseCore plugin) {
super(plugin);
// TODO Auto-generated constructor stub
}
@Override
public boolean perform(CommandSender sender, String[] args) {
// TODO Auto-generated method stub
return false;
}
}

42
src/com/onarandombox/MultiverseCore/commands/MVPurge.java
View File

@ -1,42 +0,0 @@
package com.onarandombox.MultiverseCore.commands;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.onarandombox.MultiverseCore.MVCommandHandler;
import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.utils.PurgeWorlds;
public class MVPurge extends MVCommandHandler {
public MVPurge(MultiverseCore plugin) {
super(plugin);
}
@Override
public boolean perform(CommandSender sender, String[] args) {
if (!(args.length > 0)) {
return false;
}
if (!(sender instanceof Player)) {
sender.sendMessage("This command needs to be used from inside the game!");
return true;
}
Player p = (Player) sender;
List<String> creatures = new ArrayList<String>();
for (String creature : args[0].toUpperCase().split(",")) {
creatures.add(creature);
}
new PurgeWorlds(plugin).purge(sender, p.getWorld(), creatures);
return true;
}
}

26
src/com/onarandombox/MultiverseCore/commands/MVReload.java
View File

@ -1,26 +0,0 @@
package com.onarandombox.MultiverseCore.commands;
import java.util.logging.Level;
import org.bukkit.command.CommandSender;
import com.onarandombox.MultiverseCore.MVCommandHandler;
import com.onarandombox.MultiverseCore.MultiverseCore;
public class MVReload extends MVCommandHandler {
public MVReload(MultiverseCore plugin) {
super(plugin);
}
@Override
public boolean perform(CommandSender sender, String[] args) {
// TODO: Implement Permissions
plugin.log(Level.INFO, "Reloading Multiverse-Core config");
plugin.loadConfigs();
plugin.loadWorlds();
plugin.log(Level.INFO, "Reload Complete!");
return true;
}
}