From 3e10f180793b597dbf126be81e1c549cf71c7af9 Mon Sep 17 00:00:00 2001 From: fernferret Date: Mon, 10 Oct 2011 13:02:29 -0600 Subject: [PATCH] Add a bunch of examples, add loadworld to the plugin.yml --- .../commands/ConfirmCommand.java | 1 + .../MultiverseCore/commands/CoordCommand.java | 1 + .../MultiverseCore/commands/DebugCommand.java | 1 + .../commands/DeleteCommand.java | 1 + .../commands/EnvironmentCommand.java | 1 + .../commands/GeneratorCommand.java | 1 + .../MultiverseCore/commands/HelpCommand.java | 1 + .../commands/ImportCommand.java | 3 ++ .../MultiverseCore/commands/InfoCommand.java | 2 ++ .../MultiverseCore/commands/ListCommand.java | 15 +++++++--- .../MultiverseCore/commands/LoadCommand.java | 1 + .../commands/ModifyAddCommand.java | 3 ++ .../commands/ModifyClearCommand.java | 3 ++ .../commands/ModifyRemoveCommand.java | 3 ++ .../commands/ModifySetCommand.java | 28 ++++++++++++++++++- .../MultiverseCore/commands/PurgeCommand.java | 6 ++++ .../commands/ReloadCommand.java | 4 ++- .../commands/RemoveCommand.java | 3 +- .../commands/SetSpawnCommand.java | 7 ++++- .../MultiverseCore/enums/AddProperties.java | 2 +- .../MultiverseCore/enums/SetProperties.java | 2 +- src/main/resources/plugin.yml | 24 +++++++++------- 22 files changed, 93 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ConfirmCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ConfirmCommand.java index b51a234e..bd4ce09b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ConfirmCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ConfirmCommand.java @@ -23,6 +23,7 @@ public class ConfirmCommand extends MultiverseCommand { this.setArgRange(0, 0); this.addKey("mvconfirm"); this.addKey("mv confirm"); + this.addCommandExample("/mv confirm"); this.setPermission("multiverse.core.confirm", "If you have not been prompted to use this, it will not do anything.", PermissionDefault.OP); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java index a45732d5..c4aa175b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java @@ -32,6 +32,7 @@ public class CoordCommand extends MultiverseCommand { this.addKey("mv coord"); this.addKey("mvcoord"); this.addKey("mvco"); + this.addCommandExample("/mv coord"); this.setPermission("multiverse.core.coord", "Returns detailed information on the Players where abouts.", PermissionDefault.OP); this.worldManager = this.plugin.getMVWorldManager(); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java index 74ad5795..a633f89b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java @@ -25,6 +25,7 @@ public class DebugCommand extends MultiverseCommand { this.addKey("mv debug"); this.addKey("mv d"); this.addKey("mvdebug"); + this.addCommandExample("/mv debug " + ChatColor.GOLD + "2"); this.setPermission("multiverse.core.debug", "Spams the console a bunch.", PermissionDefault.OP); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java index 6d2d5df5..14805d94 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java @@ -24,6 +24,7 @@ public class DeleteCommand extends MultiverseCommand { this.setArgRange(1, 1); this.addKey("mvdelete"); this.addKey("mv delete"); + this.addCommandExample("/mv create " + ChatColor.GOLD + "MyWorld"); this.setPermission("multiverse.core.delete", "Deletes a world on your server. " + ChatColor.RED + "PERMANENTLY.", PermissionDefault.OP); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/EnvironmentCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/EnvironmentCommand.java index c1a9a22f..09ab6bec 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/EnvironmentCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/EnvironmentCommand.java @@ -25,6 +25,7 @@ public class EnvironmentCommand extends MultiverseCommand { this.addKey("mv env"); this.addKey("mv environment"); this.addKey("mv environments"); + this.addCommandExample("/mv env"); this.setPermission("multiverse.core.list.environments", "Lists valid known environments.", PermissionDefault.OP); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/GeneratorCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/GeneratorCommand.java index 6aaa13eb..23e71541 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/GeneratorCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/GeneratorCommand.java @@ -28,6 +28,7 @@ public class GeneratorCommand extends MultiverseCommand { this.addKey("mvgenerators"); this.addKey("mv gens"); this.addKey("mvgens"); + this.addCommandExample("/mv generators"); this.setPermission("multiverse.core.generator", "Returns a list of Loaded Generator Plugins.", PermissionDefault.OP); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/HelpCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/HelpCommand.java index 357a65b8..cfa9c6c9 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/HelpCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/HelpCommand.java @@ -32,6 +32,7 @@ public class HelpCommand extends MultiverseCommand { this.addKey("mv help"); this.addKey("mvsearch"); this.addKey("mv search"); + this.addCommandExample("/mv help ?"); this.setPermission("multiverse.help", "Displays a nice help menu.", PermissionDefault.TRUE); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java index 4574b5cc..61a3b1f5 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java @@ -28,6 +28,9 @@ public class ImportCommand extends MultiverseCommand { this.addKey("mvimport"); this.addKey("mvim"); this.addKey("mv import"); + this.addCommandExample("/mv import " + ChatColor.GOLD + "gargamel" + ChatColor.GREEN + " normal"); + this.addCommandExample("/mv import " + ChatColor.GOLD + "hell_world" + ChatColor.GREEN + " nether"); + this.addCommandExample("/mv import " + ChatColor.GOLD + "CleanRoom" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " CleanRoomGenerator"); this.setPermission("multiverse.core.import", "Imports a new world of the specified type.", PermissionDefault.OP); this.worldManager = this.plugin.getMVWorldManager(); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java index e7519bf2..13dc812d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java @@ -34,6 +34,8 @@ public class InfoCommand extends MultiverseCommand { this.addKey("mvinfo"); this.addKey("mvi"); this.addKey("mv info"); + this.addCommandExample("/mv info " + ChatColor.GOLD + "1"); + this.addCommandExample("/mv info " + ChatColor.GOLD + "3"); this.setPermission("multiverse.core.info", "Returns detailed information on the world.", PermissionDefault.OP); this.worldManager = this.plugin.getMVWorldManager(); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java index 07d10cdb..ef6aee55 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java @@ -40,9 +40,7 @@ public class ListCommand extends MultiverseCommand { String output = ChatColor.LIGHT_PURPLE + "Worlds which you can view:\n"; for (MultiverseWorld world : this.plugin.getMVWorldManager().getMVWorlds()) { - if (world.isHidden()) { - continue; - } + if (p != null && (!this.plugin.getMVPerms().canEnterWorld(p, world))) { continue; } @@ -56,7 +54,16 @@ public class ListCommand extends MultiverseCommand { } else if (env == Environment.SKYLANDS) { color = ChatColor.AQUA; } - output += world.getColoredWorldString() + ChatColor.WHITE + " - " + color + world.getEnvironment() + " \n"; + String outputCache = world.getColoredWorldString() + ChatColor.WHITE + " - " + color + world.getEnvironment() + " \n"; + if (world.isHidden()) { + // TODO: Add an actual permission for this. + if (p != null && !p.isOp()) { + continue; + } + // Prefix hidden worlds with an "[H]" + outputCache = ChatColor.GRAY + "[H]" + outputCache; + } + output += outputCache; } String[] response = output.split("\n"); diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/LoadCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/LoadCommand.java index 662da4e3..63f9e88d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/LoadCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/LoadCommand.java @@ -23,6 +23,7 @@ public class LoadCommand extends MultiverseCommand { this.setArgRange(1, 1); this.addKey("mvload"); this.addKey("mv load"); + this.addCommandExample("/mv load " + ChatColor.GREEN + "MyUnloadedWorld"); this.setPermission("multiverse.core.load", "Loads a world into Multiverse.", PermissionDefault.OP); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java index f1592dd3..e4dfed8b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java @@ -33,6 +33,9 @@ public class ModifyAddCommand extends MultiverseCommand { this.addKey("mvmadd"); this.addKey("mv modify add"); this.addKey("mvmodify add"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "add " + ChatColor.GREEN + "sheep " + ChatColor.RED + "animals"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "add " + ChatColor.GREEN + "creeper " + ChatColor.RED + "monsters"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "add " + ChatColor.GREEN + "MyWorld " + ChatColor.RED + "worldblacklist"); this.setPermission("multiverse.core.modify.add", "Modify various aspects of worlds. See the help wiki for how to use this command properly. If you do not include a world, the current world will be used.", PermissionDefault.OP); this.worldManager = this.plugin.getMVWorldManager(); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java index 0fbd7e97..b95e42f0 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java @@ -30,6 +30,9 @@ public class ModifyClearCommand extends MultiverseCommand { this.addKey("mvmclear"); this.addKey("mv modify clear"); this.addKey("mvmodify clear"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "clear " + ChatColor.RED + "animals"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "clear " + ChatColor.RED + "monsters"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "clear " + ChatColor.RED + "worldblacklist"); this.setPermission("multiverse.core.modify.clear", "Removes all values from a property. This will work on properties that contain lists.", PermissionDefault.OP); this.worldManager = this.plugin.getMVWorldManager(); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java index 75642573..e76bf7b8 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java @@ -34,6 +34,9 @@ public class ModifyRemoveCommand extends MultiverseCommand { this.addKey("mvmdelete"); this.addKey("mv modify delete"); this.addKey("mvmodify delete"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "remove " + ChatColor.GREEN + "sheep " + ChatColor.RED + "animals"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "remove " + ChatColor.GREEN + "creeper " + ChatColor.RED + "monsters"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "remove " + ChatColor.GREEN + "MyWorld " + ChatColor.RED + "worldblacklist"); this.setPermission("multiverse.core.modify.remove", "Modify various aspects of worlds. See the help wiki for how to use this command properly. If you do not include a world, the current world will be used.", PermissionDefault.OP); this.worldManager = this.plugin.getMVWorldManager(); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java index c0fec64c..6fad6fdc 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java @@ -25,17 +25,43 @@ public class ModifySetCommand extends MultiverseCommand { super(plugin); this.setName("Modify a World (Set a value)"); this.setCommandUsage("/mv modify" + ChatColor.GREEN + " set {PROPERTY} {VALUE}" + ChatColor.GOLD + " [WORLD]"); - this.setArgRange(2, 3); + this.setArgRange(1, 3); this.addKey("mvm set"); this.addKey("mvmset"); this.addKey("mv modify set"); this.addKey("mvmodify set"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "mode " + ChatColor.RED + "creative"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "animals " + ChatColor.RED + "false"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "monsters " + ChatColor.RED + "false"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "alias " + ChatColor.RED + "MyWorld"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "color " + ChatColor.RED + "green"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "curr " + ChatColor.RED + "3"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "price " + ChatColor.RED + "5"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "scale " + ChatColor.RED + "1.2"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "memory " + ChatColor.RED + "true"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "diff " + ChatColor.RED + "hard"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "hunger " + ChatColor.RED + "false"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "hidden " + ChatColor.RED + "true"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "pvp " + ChatColor.RED + "false"); + this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "spawn"); this.setPermission("multiverse.core.modify.set", "Modify various aspects of worlds. See the help wiki for how to use this command properly. If you do not include a world, the current world will be used.", PermissionDefault.OP); this.worldManager = this.plugin.getMVWorldManager(); } @Override public void runCommand(CommandSender sender, List args) { + // Special case for spawn: + if (args.size() == 1) { + if (args.get(0).equalsIgnoreCase("spawn")) { + SetSpawnCommand c = new SetSpawnCommand(this.plugin); + c.setWorldSpawn(sender); + + } else { + sender.sendMessage("Spawn is the only param with no" + ChatColor.GREEN + " VALUE"); + sender.sendMessage("Type " + ChatColor.GREEN + "/mv modify ?" + ChatColor.WHITE + " For help."); + } + return; + } // We NEED a world from the command line Player p = null; if (sender instanceof Player) { diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/PurgeCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/PurgeCommand.java index 9038635a..ece40bfd 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/PurgeCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/PurgeCommand.java @@ -30,6 +30,12 @@ public class PurgeCommand extends MultiverseCommand { this.setArgRange(1, 2); this.addKey("mvpurge"); this.addKey("mv purge"); + this.addCommandExample("/mv purge " + ChatColor.GREEN + "all"); + this.addCommandExample("/mv purge " + ChatColor.GOLD + "all " + ChatColor.GREEN + "all"); + this.addCommandExample("/mv purge " + ChatColor.GREEN + "monsters"); + this.addCommandExample("/mv purge " + ChatColor.GOLD + "all " + ChatColor.GREEN + "animals"); + this.addCommandExample("/mv purge " + ChatColor.GOLD + "MyWorld " + ChatColor.GREEN + "squid"); + this.addCommandExample("/mv purge " + ChatColor.GOLD + "MyWorld_nether " + ChatColor.GREEN + "ghast"); this.setPermission("multiverse.core.purge", "Removed the specified type of mob from the specified world.", PermissionDefault.OP); this.worldManager = this.plugin.getMVWorldManager(); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java index 9121e329..3d0202d2 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java @@ -25,6 +25,7 @@ public class ReloadCommand extends MultiverseCommand { this.setArgRange(0, 0); this.addKey("mvreload"); this.addKey("mv reload"); + this.addCommandExample("/mv reload"); this.setPermission("multiverse.core.reload", "Reloads worlds.yml and config.yml.", PermissionDefault.OP); } @@ -34,11 +35,12 @@ public class ReloadCommand extends MultiverseCommand { this.plugin.loadConfigs(); this.plugin.getMVWorldManager().loadWorlds(true); - // Create the event List configsLoaded = new ArrayList(); configsLoaded.add("Multiverse-Core - config.yml"); configsLoaded.add("Multiverse-Core - worlds.yml"); + // Create the event MVConfigReloadEvent configReload = new MVConfigReloadEvent(configsLoaded); + // Fire it off this.plugin.getServer().getPluginManager().callEvent(configReload); for (String s : configReload.getAllConfigsLoaded()) { sender.sendMessage(s); diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java index 0fad7b7d..2324dfa1 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java @@ -23,7 +23,8 @@ public class RemoveCommand extends MultiverseCommand { this.setArgRange(1, 1); this.addKey("mvremove"); this.addKey("mv remove"); - this.setPermission("multiverse.core.remove", "Unloads a world from Multiverse and removes it from worlds.yml, this does NOT remove the world folder.", PermissionDefault.OP); + this.addCommandExample("/mv remove " + ChatColor.GREEN + "MyWorld"); + this.setPermission("multiverse.core.remove", "Unloads a world from Multiverse and removes it from worlds.yml, this does NOT DELETE the world folder.", PermissionDefault.OP); } @Override diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/SetSpawnCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/SetSpawnCommand.java index 47a69ee2..69d22888 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/SetSpawnCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/SetSpawnCommand.java @@ -30,11 +30,16 @@ public class SetSpawnCommand extends MultiverseCommand { this.addKey("mv set spawn"); this.addKey("mv setspawn"); this.addKey("mvset spawn"); + this.addCommandExample("/mv set spawn"); this.setPermission("multiverse.core.spawn.set", "Sets the spawn for the current world.", PermissionDefault.OP); } @Override public void runCommand(CommandSender sender, List args) { + setWorldSpawn(sender); + } + + protected void setWorldSpawn(CommandSender sender) { if (sender instanceof Player) { Player p = (Player) sender; Location l = p.getLocation(); @@ -45,7 +50,7 @@ public class SetSpawnCommand extends MultiverseCommand { sender.sendMessage("Spawn was set to: " + LocationManipulation.strCoords(p.getLocation())); } else { w.setSpawnLocation(l.getBlockX(), l.getBlockY(), l.getBlockZ()); - sender.sendMessage("Multiverse does not know about this world, only X,Y and Z set. Please import it to set the spawn fully."); + sender.sendMessage("Multiverse does not know about this world, only X,Y and Z set. Please import it to set the spawn fully (Pitch/Yaws)."); } } else { diff --git a/src/main/java/com/onarandombox/MultiverseCore/enums/AddProperties.java b/src/main/java/com/onarandombox/MultiverseCore/enums/AddProperties.java index 0391b724..b5d63489 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/enums/AddProperties.java +++ b/src/main/java/com/onarandombox/MultiverseCore/enums/AddProperties.java @@ -13,5 +13,5 @@ package com.onarandombox.MultiverseCore.enums; * @author fernferret */ public enum AddProperties { - blockblacklist, playerwhitelist, playerblacklist, worldblacklist, animals, monsters + worldblacklist, animals, monsters } diff --git a/src/main/java/com/onarandombox/MultiverseCore/enums/SetProperties.java b/src/main/java/com/onarandombox/MultiverseCore/enums/SetProperties.java index fc16c8ba..a9968657 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/enums/SetProperties.java +++ b/src/main/java/com/onarandombox/MultiverseCore/enums/SetProperties.java @@ -15,5 +15,5 @@ package com.onarandombox.MultiverseCore.enums; public enum SetProperties { alias, animals, monsters, pvp, scaling, aliascolor, color, respawn, currency, curr, price, scale, spawnmemory, memory, weather, storm, - gamemode, mode, hunger, difficulty, diff, hidden + gamemode, mode, hunger, difficulty, diff, hidden, spawn } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 8bf3cc89..6d0ce874 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -155,31 +155,31 @@ commands: usage: | / [world] mvenv: - description: Tells the user all possible world types. + description: Tells the user all possible environment types. usage: | / mvv: - description: Prints out version invo. + description: Prints out version info. usage: | / mvversion: - description: Prints out version invo. + description: Prints out version info. usage: | / mvco: - description: Prints out version invo. + description: Displays the player's coordinates. usage: | / mvh: - description: Prints out version invo. + description: Displays the Multiverse Help. usage: | / mvsearch: - description: Prints out version invo. + description: Displays the Multiverse Help. usage: | / mvhelp: - description: Prints out version invo. + description: Displays the Multiverse Help. usage: | / mvdebug: @@ -187,10 +187,14 @@ commands: usage: | / mvgenerators: - description: Turns on debugging. + description: Displays all found world generators. usage: | / mvgens: - description: Turns on debugging. + description: Displays all found world generators. usage: | - / \ No newline at end of file + / + mvload: + description: Loads a world into Multiverse. + usage: | + /