Adds permission node to bypass fly enforcement (#2469 )

Merge pull request #2675 from Multiverse/replace_travis_badge
Replace Travis Badge with Github Actions.
2021-08-03 20:01:47 +08:00 · 2021-07-22 10:12:35 +08:00 · 2021-07-21 22:11:09 -04:00 · 2021-07-19 20:14:17 -04:00 · 2021-07-19 20:12:25 -04:00 · 2021-07-19 10:31:31 +08:00
140 changed files with 5156 additions and 5161 deletions
@@ -0,0 +1,22 @@
+name: Maven CI/CD
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build_and_test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
@@ -1,6 +0,0 @@
-language: java
-jdk:
-  - oraclejdk8
-notifications:
-  email: false
-dist: trusty
@@ -0,0 +1,6 @@
+Copyright (c) 2011, The Multiverse Team All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of the The Multiverse Team nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
@@ -1,11 +1,43 @@
+![Multiverse 2](config/multiverse2-long.png)
+
+[![Maven CI/CD](https://github.com/Multiverse/Multiverse-Core/actions/workflows/build.yml/badge.svg)](https://github.com/Multiverse/Multiverse-Core/actions/workflows/build.yml)
+[![Release](https://img.shields.io/nexus/r/com.onarandombox.multiversecore/Multiverse-Core?label=release&server=https%3A%2F%2Frepo.onarandombox.com%2F)](https://dev.bukkit.org/projects/multiverse-core)
+[![Dev builds](https://img.shields.io/nexus/s/com.onarandombox.multiversecore/Multiverse-Core?label=dev%20builds&server=http%3A%2F%2Frepo.onarandombox.com%2F)](https://ci.onarandombox.com/job/Multiverse-Core/)
+[![Discord](https://img.shields.io/discord/325459248047980545?label=discord&logo=discord)](https://discord.gg/NZtfKky)
+[![Support me on Patreon](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Ddumptruckman%26type%3Dpatrons&style=flat)](https://patreon.com/dumptruckman)
+
+About
+========
+[Multiverse](https://dev.bukkit.org/projects/multiverse-core) was created at the dawn of Bukkit multiworld support. It has since then grown into a **complete world management solution!** Multiverse provides the easiest to use world management solution for your Minecraft server, big or small, and with great addons like [Portals](https://dev.bukkit.org/projects/multiverse-portals) and [NetherPortals](https://dev.bukkit.org/projects/multiverse-netherportals/), what's not to love!
+<br><br>
+Now it's time to create your very own Multiverse server, do check out our [Wiki](https://github.com/Multiverse/Multiverse-Core/wiki) and [Usage Guide](https://github.com/Multiverse/Multiverse-Core/wiki/Basics) to get started. Feel free to hop onto our [Discord](https://discord.gg/NZtfKky) if you have any question or just want to have a chat with us!
+
+### Amazing sub-modules available:
+* [Multiverse-NetherPortals](https://github.com/Multiverse/Multiverse-NetherPortals) -> Have separate nether and end worlds for each of your overworlds!
+* [Multiverse-Portals](https://github.com/Multiverse/Multiverse-Portals) -> Make custom portals to go to any destination!
+* [Multiverse-Inventories](https://github.com/Multiverse/Multiverse-Inventories) -> Have separated players stats and inventories per world or per group of worlds.
+* [Multiverse-SignPortals](https://github.com/Multiverse/Multiverse-SignPortals) -> Signs as teleprompters!
+
 Building
 ========
 Simply build the source with maven:
-
-    $ mvn install
-
+```
+$ mvn install
+```
 More details are available on the [build instructions wiki page](https://github.com/Multiverse/Multiverse-Core/wiki/Building).

+
+Contributing
+=======
+**Want to help improve Multiverse?** There are several ways you can support and contribute to the project.
+* Take a look at our "Bug: Unconfirmed" issues, where you can find issues that need extra testing and investigation.
+* Want others to love Multiverse too? You can join the [Multiverse Discord community](https://discord.gg/NZtfKky) and help others with issues and setup!
+* A Multiverse guru? You can update our [Wiki](https://github.com/Multiverse/Multiverse-Core/wiki) with your latest tip, tricks and guides! The wiki open for all to edit and improve.
+* Love coding? You could look at ["State: Open to PR"](https://github.com/Multiverse/Multiverse-Core/labels/State%3A%20Open%20to%20PR) and ["Resolution: Accepted"](https://github.com/Multiverse/Multiverse-Core/labels/Resolution%3A%20Accepted) issues. We're always happy to receive bug fixes and feature additions as [pull requests](https://www.freecodecamp.org/news/how-to-make-your-first-pull-request-on-github-3/).
+* If you'd like to make a financial contribution to the project, do consider joining our [patreon](https://www.patreon.com/dumptruckman) or make a one-time donation [here](https://paypal.me/dumptruckman)!
+
+Additionally, we would like to give a big thanks to everyone that has supported Multiverse over the years, as well as those in the years to come. Thank you!
+
 License
 =======
 Copyright (c) 2011, The Multiverse Team All rights reserved.
@@ -13,4 +45,3 @@ Copyright (c) 2011, The Multiverse Team All rights reserved.
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

 Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of the The Multiverse Team nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.onarandombox.multiversecore</groupId>
    <artifactId>Multiverse-Core</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>4.3.1-SNAPSHOT</version>
    <name>Multiverse-Core</name>
    <description>World Management Plugin</description>
    <properties>
@@ -13,42 +13,34 @@
    </properties>

    <repositories>
-        <!-- Spigot -->
+      <!-- Spigot -->
        <repository>
            <id>spigot-repo</id>
            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
        </repository>
        <repository>
            <id>onarandombox</id>
-            <url>http://repo.onarandombox.com/content/groups/public</url>
+            <url>https://repo.onarandombox.com/content/groups/public</url>
        </repository>
        <repository>
            <id>spigot</id>
            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
        </repository>
        <repository>
-            <id>vault-repo</id>
-            <url>http://nexus.hc.to/content/repositories/pub_releases</url>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
        </repository>
        <repository>
            <id>minebench-repo</id>
            <url>https://repo.minebench.de/</url>
        </repository>
-        <repository>
-            <id>CodeMC</id>
-            <url>https://repo.codemc.org/repository/maven-public</url>
-        </repository>
-        <repository>
-            <id>aikar</id>
-            <url>https://repo.aikar.co/content/groups/aikar/</url>
-        </repository>
    </repositories>

    <pluginRepositories>
        <pluginRepository>
            <id>doodleproject-repo</id>
            <name>DoodleProject Maven 2 Repository</name>
-            <url>http://doodleproject.sourceforge.net/maven2/release</url>
+            <url>https://doodleproject.sourceforge.net/maven2/release</url>
            <releases>
                <enabled>true</enabled>
            </releases>
@@ -57,7 +49,7 @@

    <ciManagement>
        <system>jenkins</system>
-        <url>http://ci.onarandombox.com</url>
+        <url>https://ci.onarandombox.com</url>
    </ciManagement>

    <!-- Profiles are used to detect whether this is a local or Jenkins build
@@ -162,8 +154,6 @@
                <artifactId>maven-surefire-plugin</artifactId>
                <version>3.0.0-M3</version>
                <configuration>
-                    <parallel>methods</parallel>
-                    <threadCount>10</threadCount>
                    <excludes>
                        <exclude>**/TestCommandSender.java</exclude>
                        <exclude>**/TestInstanceCreator.java</exclude>
@@ -227,11 +217,16 @@
                            <goal>shade</goal>
                        </goals>
                        <configuration>
+                            <minimizeJar>true</minimizeJar>
                            <relocations>
                                <relocation>
                                    <pattern>me.main__.util</pattern>
                                    <shadedPattern>com.onarandombox.serializationconfig</shadedPattern>
                                </relocation>
+                                <relocation>
+                                    <pattern>com.pneumaticraft.commandhandler</pattern>
+                                    <shadedPattern>com.onarandombox.commandhandler</shadedPattern>
+                                </relocation>
                                <relocation>
                                    <pattern>buscript</pattern>
                                    <shadedPattern>com.onarandombox.buscript</shadedPattern>
@@ -256,14 +251,6 @@
                                    <pattern>de.themoep.idconverter</pattern>
                                    <shadedPattern>com.onarandombox.idconverter</shadedPattern>
                                </relocation>
-                                <relocation>
-                                    <pattern>co.aikar.commands</pattern>
-                                    <shadedPattern>com.onarandombox.acf</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>co.aikar.locales</pattern>
-                                    <shadedPattern>com.onarandombox.locales</shadedPattern>
-                                </relocation>
                            </relocations>
                        </configuration>
                    </execution>
@@ -313,7 +300,7 @@
        <!-- End of SerializationConfig Dependency -->
        <!-- Start of Economy Dependency -->
        <dependency>
-            <groupId>net.milkbowl.vault</groupId>
+            <groupId>com.github.MilkBowl</groupId>
            <artifactId>VaultAPI</artifactId>
            <version>1.7</version>
            <scope>provided</scope>
@@ -321,9 +308,9 @@
        <!-- End of Economy Dependency -->
        <!-- Start of CommandHandler Dependency -->
        <dependency>
-            <groupId>co.aikar</groupId>
-            <artifactId>acf-paper</artifactId>
-            <version>0.5.0-SNAPSHOT</version>
+            <groupId>com.pneumaticraft.commandhandler</groupId>
+            <artifactId>CommandHandler</artifactId>
+            <version>11</version>
        </dependency>
        <dependency>
            <groupId>com.dumptruckman.minecraft</groupId>
@@ -333,13 +320,7 @@
        <dependency>
            <groupId>org.bstats</groupId>
            <artifactId>bstats-bukkit</artifactId>
-            <version>1.8</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bukkit</groupId>
-                    <artifactId>bukkit</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>2.2.1</version>
        </dependency>
        <dependency>
            <groupId>com.dumptruckman.minecraft</groupId>
@@ -365,30 +346,9 @@
            <scope>test</scope>
        </dependency>
        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>2.0.9</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-easymock</artifactId>
-            <version>2.0.9</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-            <version>2.0.9</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>4.0.2</version>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.11.2</version>
            <scope>test</scope>
        </dependency>
        <dependency>
@@ -400,12 +360,12 @@
    </dependencies>
    <distributionManagement>
        <repository>
-            <id>benergy10</id>
-            <url>http://repo.benergy10.dev/repository/minecraft/</url>
+            <id>OnARandomBox</id>
+            <url>https://repo.onarandombox.com/content/repositories/multiverse</url>
        </repository>
        <snapshotRepository>
-            <id>benergy10</id>
-            <url>http://repo.benergy10.dev/repository/minecraft-snapshots/</url>
+            <id>OnARandomBox</id>
+            <url>https://repo.onarandombox.com/content/repositories/multiverse-snapshots/</url>
        </snapshotRepository>
    </distributionManagement>
 </project>
@@ -28,6 +28,7 @@ import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.WorldType;
+import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.serialization.SerializableAs;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
@@ -36,11 +37,11 @@ import org.bukkit.util.Vector;
 import org.jetbrains.annotations.Nullable;
 import org.json.simple.JSONObject;

-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.logging.Level;

 /**
 * The implementation of a Multiverse handled world.
@@ -336,7 +337,8 @@ public class MVWorld implements MultiverseWorld {

    private Permission permission;
    private Permission exempt;
-    private Permission ignoreperm;
+    private Permission ignoregamemodeperm;
+    private Permission ignoreflyperm;
    private Permission limitbypassperm;

    /**
@@ -389,8 +391,10 @@ public class MVWorld implements MultiverseWorld {
    private void initPerms() {
        this.permission = new Permission("multiverse.access." + this.getName(), "Allows access to " + this.getName(), PermissionDefault.OP);
        // This guy is special. He shouldn't be added to any parent perms.
-        this.ignoreperm = new Permission("mv.bypass.gamemode." + this.getName(),
+        this.ignoregamemodeperm = new Permission("mv.bypass.gamemode." + this.getName(),
                "Allows players with this permission to ignore gamemode changes.", PermissionDefault.FALSE);
+        this.ignoreflyperm = new Permission("mv.bypass.fly." + this.getName(),
+                "Allows players with this permission to ignore fly changes.", PermissionDefault.FALSE);

        this.exempt = new Permission("multiverse.exempt." + this.getName(),
                "A player who has this does not pay to enter this world, or use any MV portals in it " + this.getName(), PermissionDefault.OP);
@@ -400,13 +404,15 @@ public class MVWorld implements MultiverseWorld {
        try {
            this.plugin.getServer().getPluginManager().addPermission(this.permission);
            this.plugin.getServer().getPluginManager().addPermission(this.exempt);
-            this.plugin.getServer().getPluginManager().addPermission(this.ignoreperm);
+            this.plugin.getServer().getPluginManager().addPermission(this.ignoregamemodeperm);
+            this.plugin.getServer().getPluginManager().addPermission(this.ignoreflyperm);
            this.plugin.getServer().getPluginManager().addPermission(this.limitbypassperm);
            // Add the permission and exempt to parents.
            this.addToUpperLists(this.permission);

            // Add ignore to it's parent:
-            this.ignoreperm.addParent("mv.bypass.gamemode.*", true);
+            this.ignoregamemodeperm.addParent("mv.bypass.gamemode.*", true);
+            this.ignoreflyperm.addParent("mv.bypass.fly.*", true);
            // Add limit bypass to it's parent
            this.limitbypassperm.addParent("mv.bypass.playerlimit.*", true);
        } catch (IllegalArgumentException e) {
@@ -1132,14 +1138,6 @@ public class MVWorld implements MultiverseWorld {
        return this.props.getBedRespawn();
    }

-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Collection<String> getAllPropertyTypes() {
-        return this.props.serialize().keySet();
-    }
-
    /**
     * {@inheritDoc}
     */
@@ -7,6 +7,21 @@

 package com.onarandombox.MultiverseCore;

+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+
 import buscript.Buscript;
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MVWorld.NullLocation;
@@ -18,8 +33,42 @@ import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
 import com.onarandombox.MultiverseCore.api.MultiverseMessaging;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
-import com.onarandombox.MultiverseCore.commandtools.MVCommandManager;
-import com.onarandombox.MultiverseCore.commandtools.flag.CoreFlags;
+import com.onarandombox.MultiverseCore.commands.AnchorCommand;
+import com.onarandombox.MultiverseCore.commands.CheckCommand;
+import com.onarandombox.MultiverseCore.commands.CloneCommand;
+import com.onarandombox.MultiverseCore.commands.ConfigCommand;
+import com.onarandombox.MultiverseCore.commands.ConfirmCommand;
+import com.onarandombox.MultiverseCore.commands.CoordCommand;
+import com.onarandombox.MultiverseCore.commands.CreateCommand;
+import com.onarandombox.MultiverseCore.commands.DebugCommand;
+import com.onarandombox.MultiverseCore.commands.DeleteCommand;
+import com.onarandombox.MultiverseCore.commands.EnvironmentCommand;
+import com.onarandombox.MultiverseCore.commands.GameruleCommand;
+import com.onarandombox.MultiverseCore.commands.GamerulesCommand;
+import com.onarandombox.MultiverseCore.commands.GeneratorCommand;
+import com.onarandombox.MultiverseCore.commands.HelpCommand;
+import com.onarandombox.MultiverseCore.commands.ImportCommand;
+import com.onarandombox.MultiverseCore.commands.InfoCommand;
+import com.onarandombox.MultiverseCore.commands.ListCommand;
+import com.onarandombox.MultiverseCore.commands.LoadCommand;
+import com.onarandombox.MultiverseCore.commands.ModifyAddCommand;
+import com.onarandombox.MultiverseCore.commands.ModifyClearCommand;
+import com.onarandombox.MultiverseCore.commands.ModifyCommand;
+import com.onarandombox.MultiverseCore.commands.ModifyRemoveCommand;
+import com.onarandombox.MultiverseCore.commands.ModifySetCommand;
+import com.onarandombox.MultiverseCore.commands.PurgeCommand;
+import com.onarandombox.MultiverseCore.commands.RegenCommand;
+import com.onarandombox.MultiverseCore.commands.ReloadCommand;
+import com.onarandombox.MultiverseCore.commands.RemoveCommand;
+import com.onarandombox.MultiverseCore.commands.ScriptCommand;
+import com.onarandombox.MultiverseCore.commands.SetSpawnCommand;
+import com.onarandombox.MultiverseCore.commands.SilentCommand;
+import com.onarandombox.MultiverseCore.commands.SpawnCommand;
+import com.onarandombox.MultiverseCore.commands.TeleportCommand;
+import com.onarandombox.MultiverseCore.commands.UnloadCommand;
+import com.onarandombox.MultiverseCore.commands.VersionCommand;
+import com.onarandombox.MultiverseCore.commands.WhoCommand;
+import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager;
 import com.onarandombox.MultiverseCore.destination.AnchorDestination;
 import com.onarandombox.MultiverseCore.destination.BedDestination;
 import com.onarandombox.MultiverseCore.destination.CannonDestination;
@@ -46,20 +95,22 @@ import com.onarandombox.MultiverseCore.utils.MVMessaging;
 import com.onarandombox.MultiverseCore.utils.MVPermissions;
 import com.onarandombox.MultiverseCore.utils.MVPlayerSession;
 import com.onarandombox.MultiverseCore.utils.MaterialConverter;
+import com.onarandombox.MultiverseCore.utils.TestingMode;
+import com.onarandombox.MultiverseCore.utils.metrics.MetricsConfigurator;
 import com.onarandombox.MultiverseCore.utils.SimpleBlockSafety;
 import com.onarandombox.MultiverseCore.utils.SimpleLocationManipulation;
 import com.onarandombox.MultiverseCore.utils.SimpleSafeTTeleporter;
-import com.onarandombox.MultiverseCore.utils.TestingMode;
 import com.onarandombox.MultiverseCore.utils.UnsafeCallWrapper;
 import com.onarandombox.MultiverseCore.utils.VaultHandler;
 import com.onarandombox.MultiverseCore.utils.WorldManager;
-import com.onarandombox.MultiverseCore.utils.metrics.MetricsConfigurator;
+import com.pneumaticraft.commandhandler.CommandHandler;
 import me.main__.util.SerializationConfig.NoSuchPropertyException;
 import me.main__.util.SerializationConfig.SerializationConfig;
 import org.bukkit.ChatColor;
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
+import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.Configuration;
 import org.bukkit.configuration.ConfigurationSection;
@@ -72,19 +123,6 @@ import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.java.JavaPluginLoader;

-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-
 /**
 * The implementation of the Multiverse-{@link Core}.
 */
@@ -166,7 +204,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
    }

    // Setup our Map for our Commands using the CommandHandler.
-    private MVCommandManager commandManager;
+    private CommandHandler commandHandler;
+    private CommandQueueManager commandQueueManager;

    private static final String LOG_TAG = "[Multiverse-Core]";

@@ -218,9 +257,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        // Setup our SafeTTeleporter
        this.safeTTeleporter = new SimpleSafeTTeleporter(this);
        this.unsafeCallWrapper = new UnsafeCallWrapper(this);
-        // Setup our static classes
+        // Setup our CompatibilityLayer
        CompatibilityLayer.init();
-        CoreFlags.setCoreInstance(this);
    }


@@ -250,7 +288,13 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        // Setup Permissions, we'll do an initial check for the Permissions plugin then fall back on isOP().
        this.ph = new MVPermissions(this);

-        // Initialize the Destination factory
+        // Setup the command manager
+        this.commandHandler = new CommandHandler(this, this.ph);
+        this.commandQueueManager = new CommandQueueManager(this);
+        // Call the Function to assign all the Commands to their Class.
+        this.registerCommands();
+
+        // Initialize the Destination factor AFTER the commands
        this.initializeDestinationFactory();

        this.playerSessions = new HashMap<String, MVPlayerSession>();
@@ -296,9 +340,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        this.initializeBuscript();
        this.setupMetrics();

-        // Setup commands
-        this.commandManager = new MVCommandManager(this);
-
        // Output a little snippet to show it's enabled.
        Logging.config("Version %s (API v%s) Enabled - By %s", this.getDescription().getVersion(), PROTOCOL, getAuthors());

@@ -326,7 +367,9 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                // Add global variable "multiverse" to javascript environment
                buscript.setScriptVariable("multiverse", this);
            } catch (NullPointerException e) {
-                Logging.warning("Buscript failed to load! The script command will be disabled!");
+                Logging.warning("Buscript failed to load! The script command will be disabled! " +
+                        "If you would like not to see this message, " +
+                        "use `/mv conf enablebuscript false` to disable Buscript from loading.");
            }
        }
    }
@@ -706,6 +749,51 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        return this.messaging;
    }

+    /**
+     * Register Multiverse-Core commands to Command Manager.
+     */
+    private void registerCommands() {
+        // Intro Commands
+        this.commandHandler.registerCommand(new HelpCommand(this));
+        this.commandHandler.registerCommand(new VersionCommand(this));
+        this.commandHandler.registerCommand(new ListCommand(this));
+        this.commandHandler.registerCommand(new InfoCommand(this));
+        this.commandHandler.registerCommand(new CreateCommand(this));
+        this.commandHandler.registerCommand(new CloneCommand(this));
+        this.commandHandler.registerCommand(new ImportCommand(this));
+        this.commandHandler.registerCommand(new ReloadCommand(this));
+        this.commandHandler.registerCommand(new SetSpawnCommand(this));
+        this.commandHandler.registerCommand(new CoordCommand(this));
+        this.commandHandler.registerCommand(new TeleportCommand(this));
+        this.commandHandler.registerCommand(new WhoCommand(this));
+        this.commandHandler.registerCommand(new SpawnCommand(this));
+        // Dangerous Commands
+        this.commandHandler.registerCommand(new UnloadCommand(this));
+        this.commandHandler.registerCommand(new LoadCommand(this));
+        this.commandHandler.registerCommand(new RemoveCommand(this));
+        this.commandHandler.registerCommand(new DeleteCommand(this));
+        this.commandHandler.registerCommand(new RegenCommand(this));
+        this.commandHandler.registerCommand(new ConfirmCommand(this));
+        // Modification commands
+        this.commandHandler.registerCommand(new ModifyCommand(this));
+        this.commandHandler.registerCommand(new PurgeCommand(this));
+        this.commandHandler.registerCommand(new ModifyAddCommand(this));
+        this.commandHandler.registerCommand(new ModifySetCommand(this));
+        this.commandHandler.registerCommand(new ModifyRemoveCommand(this));
+        this.commandHandler.registerCommand(new ModifyClearCommand(this));
+        this.commandHandler.registerCommand(new ConfigCommand(this));
+        this.commandHandler.registerCommand(new AnchorCommand(this));
+        // Misc Commands
+        this.commandHandler.registerCommand(new EnvironmentCommand(this));
+        this.commandHandler.registerCommand(new DebugCommand(this));
+        this.commandHandler.registerCommand(new SilentCommand(this));
+        this.commandHandler.registerCommand(new GeneratorCommand(this));
+        this.commandHandler.registerCommand(new CheckCommand(this));
+        this.commandHandler.registerCommand(new ScriptCommand(this));
+        this.commandHandler.registerCommand(new GameruleCommand(this));
+        this.commandHandler.registerCommand(new GamerulesCommand(this));
+    }
+
    /**
     * {@inheritDoc}
     */
@@ -736,6 +824,30 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        return this.ph;
    }

+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String commandLabel, String[] args) {
+        if (!this.isEnabled()) {
+            sender.sendMessage("This plugin is Disabled!");
+            return true;
+        }
+        ArrayList<String> allArgs = new ArrayList<String>(Arrays.asList(args));
+        allArgs.add(0, command.getName());
+        try {
+            return this.commandHandler.locateAndRunCommand(sender, allArgs, getMVConfig().getDisplayPermErrors());
+        } catch (Exception e) {
+            e.printStackTrace();
+            sender.sendMessage(ChatColor.RED + "An internal error occurred when attempting to perform this command.");
+            if (sender.isOp())
+                sender.sendMessage(ChatColor.RED + "Details were printed to the server console and logs, please add that to your bug report.");
+            else
+                sender.sendMessage(ChatColor.RED + "Try again and contact the server owner or an admin if this problem persists.");
+            return true;
+        }
+    }
+
    /**
     * {@inheritDoc}
     *
@@ -804,11 +916,19 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {

    /**
     * {@inheritDoc}
-     * @return
     */
    @Override
-    public MVCommandManager getMVCommandManager() {
-        return commandManager;
+    public CommandHandler getCommandHandler() {
+        return this.commandHandler;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    @Deprecated
+    public CommandQueueManager getCommandQueueManager() {
+        return commandQueueManager;
    }

    /**
@@ -875,6 +995,18 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        return this.destFactory;
    }

+    /**
+     * This is a convenience method to allow the QueuedCommand system to call it. You should NEVER call this directly.
+     *
+     * @param teleporter The Person requesting that the teleport should happen.
+     * @param p          Player The Person being teleported.
+     * @param l          The potentially unsafe location.
+     */
+    public void teleportPlayer(CommandSender teleporter, Player p, Location l) {
+        // This command is the override, and MUST NOT TELEPORT SAFELY
+        this.getSafeTTeleporter().safelyTeleport(teleporter, p, l, false);
+    }
+
    /**
     * Gets the server's root-folder as {@link File}.
     *
@@ -973,6 +1105,50 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        return this.saveMVConfig() && this.saveWorldConfig();
    }

+    /**
+     * NOT deprecated for the time as queued commands use this.
+     * However, this is not in the API and other plugins should therefore not use it.
+     *
+     * @param name World to delete
+     * @return True if success, false if fail.
+     */
+    public Boolean deleteWorld(String name) {
+        return this.worldManager.deleteWorld(name);
+    }
+
+    /**
+     * NOT deprecated for the time as queued commands use this.
+     * However, this is not in the API and other plugins should therefore not use it.
+     *
+     * @param oldName   World to copy
+     * @param newName   World to create
+     * @param generator The Custom generator plugin to use.
+     * @return True if success, false if fail.
+     */
+    public Boolean cloneWorld(String oldName, String newName, String generator) {
+        return this.worldManager.cloneWorld(oldName, newName, generator);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @deprecated This is deprecated! Do not use!
+     */
+    @Override
+    @Deprecated
+    public Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed) {
+        return this.worldManager.regenWorld(name, useNewSeed, randomSeed, seed, false);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @deprecated This is deprecated! Do not use!
+     */
+    @Override
+    @Deprecated
+    public Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed, Boolean keepGameRules) {
+        return this.worldManager.regenWorld(name, useNewSeed, randomSeed, seed, keepGameRules);
+    }
+
    /**
     * {@inheritDoc}
     */
@@ -96,7 +96,7 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
        enforceaccess = false;
        useasyncchat = true;
-        prefixchat = true;
+        prefixchat = false;
        prefixchatformat = "[%world%]%chat%";
        teleportintercept = true;
        firstspawnoverride = true;
@@ -107,7 +107,7 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
        teleportcooldown = 1000;
        this.version = 2.9;
        silentstart = false;
-        defaultportalsearch = false;
+        defaultportalsearch = true;
        portalsearchradius = 128;
        autopurge = true;
        idonotwanttodonate = false;
@@ -8,7 +8,7 @@
 package com.onarandombox.MultiverseCore.api;

 import buscript.Buscript;
-import com.onarandombox.MultiverseCore.commandtools.MVCommandManager;
+import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
 import com.onarandombox.MultiverseCore.utils.AnchorManager;
 import com.onarandombox.MultiverseCore.utils.MVEconomist;
@@ -18,6 +18,7 @@ import com.onarandombox.MultiverseCore.utils.SimpleBlockSafety;
 import com.onarandombox.MultiverseCore.utils.SimpleLocationManipulation;
 import com.onarandombox.MultiverseCore.utils.SimpleSafeTTeleporter;
 import com.onarandombox.MultiverseCore.utils.VaultHandler;
+import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.entity.Player;

 /**
@@ -79,12 +80,21 @@ public interface Core {
    MVPermissions getMVPerms();

    /**
-     * Multiverse uses {@link MVCommandManager} to make adding and using commands
+     * Multiverse uses {@link CommandHandler} to make adding and using commands
     * a piece of cake.
     *
-     * @return A non-null {@link MVCommandManager}.
+     * @return A non-null {@link CommandHandler}.
     */
-    MVCommandManager getMVCommandManager();
+    CommandHandler getCommandHandler();
+
+    /**
+     * Manager for command that requires /mv confirm before execution.
+     *
+     * @return A non-null {@link CommandQueueManager}.
+     * @deprecated To be moved to new command manager in 5.0.0
+     */
+    @Deprecated
+    CommandQueueManager getCommandQueueManager();

    /**
     * Gets the factory class responsible for loading many different destinations
@@ -115,6 +125,39 @@ public interface Core {
     */
    AnchorManager getAnchorManager();

+    /**
+     * Previously used by queued commands to regenerate a world on a delay.
+     * Do not use api method for any other purpose.
+     *
+     * @param name          Name of the world to regenerate
+     * @param useNewSeed    If a new seed should be used
+     * @param randomSeed    If the new seed should be random
+     * @param seed          The seed of the world.
+     *
+     * @return True if success, false if fail.
+     *
+     * @deprecated Use {@link MVWorldManager#regenWorld(String, boolean, boolean, String, boolean)} instead.
+     */
+    @Deprecated
+    Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed);
+
+    /**
+     * Used by queued commands to regenerate a world on a delay.
+     * Do not use api method for any other purpose.
+     *
+     * @param name          Name of the world to regenerate
+     * @param useNewSeed    If a new seed should be used
+     * @param randomSeed    If the new seed should be random
+     * @param seed          The seed of the world.
+     * @param keepGameRules If GameRules should be kept on world regen.
+     *
+     * @return True if success, false if fail.
+     *
+     * @deprecated Use {@link MVWorldManager#regenWorld(String, boolean, boolean, String, boolean)} instead.
+     */
+    @Deprecated
+    Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed, Boolean keepGameRules);
+
    /**
     * Decrements the number of plugins that have specifically hooked into core.
     */
@@ -0,0 +1,20 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.api;
+
+/**
+ * A fancy text.
+ */
+public interface FancyText {
+    /**
+     * Gets the {@link String}-representation of this {@link FancyText}.
+     *
+     * @return The {@link String}-representation of this {@link FancyText}.
+     */
+    String getFancyText();
+}
@@ -40,14 +40,6 @@ public interface LocationManipulation {
     */
    Location stringToLocation(String locationString);

-    /**
-     * Returns a colored string with x, y, z axis.
-     *
-     * @param l The {@link Location}
-     * @return The {@link String}
-     */
-    String strAxis(Location l);
-
    /**
     * Returns a colored string with the coords.
     *
@@ -7,7 +7,6 @@

 package com.onarandombox.MultiverseCore.api;

-import com.onarandombox.MultiverseCore.enums.WorldValidationResult;
 import com.onarandombox.MultiverseCore.utils.PurgeWorlds;
 import com.onarandombox.MultiverseCore.utils.SimpleWorldPurger;
 import org.bukkit.World;
@@ -175,6 +174,16 @@ public interface MVWorldManager {
     */
    MultiverseWorld getMVWorld(String name);

+    /**
+     * Returns a {@link MultiverseWorld} if the world with name given exists, and null if it does not.
+     * This will search optionally for alias names.
+     *
+     * @param name          The name or optionally the alias of the world to get.
+     * @param checkAliases  Indicates whether to check for world alias name.
+     * @return A {@link MultiverseWorld} or null.
+     */
+    MultiverseWorld getMVWorld(String name, boolean checkAliases);
+
    /**
     * Returns a {@link MultiverseWorld} if it exists, and null if it does not.
     *
@@ -184,13 +193,24 @@ public interface MVWorldManager {
    MultiverseWorld getMVWorld(World world);

    /**
-     * Checks to see if the given name is a valid {@link MultiverseWorld}.
+     * Checks to see if the given name is a valid {@link MultiverseWorld}
+     * Searches based on world name AND alias.
     *
     * @param name The name or alias of the world to check.
     * @return True if the world exists, false if not.
     */
    boolean isMVWorld(String name);

+    /**
+     * Checks to see if the given name is a valid {@link MultiverseWorld}.
+     * Optionally searches by alias is specified.
+     *
+     * @param name          The name or alias of the world to check.
+     * @param checkAliases  Indicates whether to check for world alias name.
+     * @return True if the world exists, false if not.
+     */
+    boolean isMVWorld(String name, boolean checkAliases);
+
    /**
     * Checks to see if the given world is a valid {@link MultiverseWorld}.
     *
@@ -293,15 +313,28 @@ public interface MVWorldManager {
    /**
     * Regenerates a world.
     *
-     * @param name Name of the world to regenerate
-     * @param useNewSeed If a new seed should be used
-     * @param randomSeed IF the new seed should be random
-     * @param seed The seed of the world.
+     * @param name          Name of the world to regenerate
+     * @param useNewSeed    If a new seed should be used
+     * @param randomSeed    If the new seed should be random
+     * @param seed          The seed of the world.
     *
     * @return True if success, false if fail.
     */
    boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed);

+    /**
+     * Regenerates a world.
+     *
+     * @param name          Name of the world to regenerate
+     * @param useNewSeed    If a new seed should be used
+     * @param randomSeed    If the new seed should be random
+     * @param seed          The seed of the world.
+     * @param keepGameRules If GameRules should be kept on world regen.
+     *
+     * @return True if success, false if fail.
+     */
+    boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed, boolean keepGameRules);
+
    boolean isKeepingSpawnInMemory(World world);
    
    /**
@@ -317,18 +350,9 @@ public interface MVWorldManager {
    boolean hasUnloadedWorld(String name, boolean includeLoaded);

    /**
-     * Check if a world name is a possible importable world folder.
+     * Get all the possible worlds that Multiverse has detected to be importable.
     *
-     * @param worldName Name of the world you want to check.
-     * @return True if world is valid, false otherwise.
+     * @return A collection of world names that are deemed importable.
     */
-    boolean isValidWorld(String worldName);
-
-    /**
-     * Check if a world name is a possible importable world folder.
-     *
-     * @param worldName Name of the world you want to check.
-     * @return WorldValidationResult.VALID if world is valid, else the reason why its not valid.
-     */
-    WorldValidationResult validateWorld(String worldName);
+    Collection<String> getPotentialWorlds();
 }
@@ -1,14 +1,20 @@
 package com.onarandombox.MultiverseCore.api;

-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.utils.DebugLog;
-import org.bukkit.plugin.java.JavaPlugin;
-
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;

+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.utils.DebugLog;
+import com.pneumaticraft.commandhandler.CommandHandler;
+
 /**
 * Make things easier for MV-Plugins!
 */
@@ -90,6 +96,25 @@ public abstract class MultiversePlugin extends JavaPlugin implements MVPlugin {
     */
    protected abstract void onPluginEnable();

+    /**
+     * You can register commands here.
+     * @param handler The CommandHandler.
+     */
+    protected abstract void registerCommands(CommandHandler handler);
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!this.isEnabled()) {
+            sender.sendMessage("This plugin is Disabled!");
+            return true;
+        }
+
+        ArrayList<String> allArgs = new ArrayList<String>(args.length + 1);
+        allArgs.add(command.getName());
+        allArgs.addAll(Arrays.asList(args));
+        return this.getCore().getCommandHandler().locateAndRunCommand(sender, allArgs);
+    }
+
    @Override
    public void log(Level level, String msg) {
        int debugLevel = this.getCore().getMVConfig().getGlobalDebug();
@@ -16,10 +16,10 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.WorldType;
+import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.Permission;
 import org.jetbrains.annotations.Nullable;

-import java.util.Collection;
 import java.util.List;

 /**
@@ -651,13 +651,6 @@ public interface MultiverseWorld {
     */
    List<String> getWorldBlacklist();

-    /**
-     * Gets all the names of all properties that can be SET.
-     *
-     * @return All property names in list.
-     */
-    Collection<String> getAllPropertyTypes();
-
    /**
     * Gets all the names of all properties that can be SET.
     *
@@ -1,13 +0,0 @@
-package com.onarandombox.MultiverseCore.api;
-
-import org.bukkit.command.CommandSender;
-
-import java.util.List;
-
-public interface PermissionsInterface {
-    public boolean hasPermission(CommandSender sender, String node, boolean isOpRequired);
-
-    public boolean hasAnyPermission(CommandSender sender, List<String> allPermissionStrings, boolean opRequired);
-
-    public boolean hasAllPermission(CommandSender sender, List<String> allPermissionStrings, boolean opRequired);
-}
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,127 +7,156 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Flags;
-import co.aikar.commands.annotation.Single;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.commandtools.context.PageFilter;
-import com.onarandombox.MultiverseCore.displaytools.ColorAlternator;
-import com.onarandombox.MultiverseCore.displaytools.ContentDisplay;
-import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers;
-import com.onarandombox.MultiverseCore.displaytools.DisplaySettings;
-import com.onarandombox.MultiverseCore.utils.AnchorManager;
 import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;

 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
-import java.util.Set;

-@CommandAlias("mv")
-@Subcommand("anchors")
-public class AnchorCommand extends MultiverseCoreCommand {
-
-    private final AnchorManager anchorManager;
+/**
+ * Allows management of Anchor Destinations.
+ */
+public class AnchorCommand extends PaginatedCoreCommand<String> {

    public AnchorCommand(MultiverseCore plugin) {
        super(plugin);
-        this.anchorManager = plugin.getAnchorManager();
+        this.setName("Create, Delete and Manage Anchor Destinations.");
+        this.setCommandUsage("/mv anchor " + ChatColor.GREEN + "{name}" + ChatColor.GOLD + " [-d]");
+        this.setArgRange(0, 2);
+        this.addKey("mv anchor");
+        this.addKey("mv anchors");
+        this.addKey("mvanchor");
+        this.addKey("mvanchors");
+        this.addCommandExample("/mv anchor " + ChatColor.GREEN + "awesomething");
+        this.addCommandExample("/mv anchor " + ChatColor.GREEN + "otherthing");
+        this.addCommandExample("/mv anchor " + ChatColor.GREEN + "awesomething " + ChatColor.RED + "-d");
+        this.addCommandExample("/mv anchors ");
+        this.setPermission("multiverse.core.anchor.list", "Allows a player to list all anchors.", PermissionDefault.OP);
+        this.addAdditonalPermission(new Permission("multiverse.core.anchor.create",
+                "Allows a player to create anchors.", PermissionDefault.OP));
+        this.addAdditonalPermission(new Permission("multiverse.core.anchor.delete",
+                "Allows a player to delete anchors.", PermissionDefault.OP));
+        this.setItemsPerPage(8); // SUPPRESS CHECKSTYLE: MagicNumberCheck
    }

-    @Subcommand("create")
-    @CommandPermission("multiverse.core.anchor.create")
-    @Syntax("<name>")
-    @Description("Create a new anchor point.")
-    public void onCreateAnchorCommand(@NotNull Player player,
-
-                                      @NotNull
-                                      @Syntax("<name>")
-                                      @Description("Name of your new anchor.")
-                                      @Flags("type=anchor name")
-                                      @Single String anchorName) {
-
-        player.sendMessage((this.plugin.getAnchorManager().saveAnchorLocation(anchorName, player.getLocation()))
-
-                ? String.format("Anchor '%s%s%s' was successfully %s created!",
-                ChatColor.AQUA, anchorName, ChatColor.WHITE, ChatColor.GREEN)
-
-                : String.format("%sThere was an error creating anchor '%s'! Check console for errors.",
-                ChatColor.RED, anchorName));
-
+    private List<String> getFancyAnchorList(Player p) {
+        List<String> anchorList = new ArrayList<String>();
+        ChatColor color = ChatColor.GREEN;
+        for (String anchor : this.plugin.getAnchorManager().getAnchors(p)) {
+            anchorList.add(color + anchor);
+            color = (color == ChatColor.GREEN) ? ChatColor.GOLD : ChatColor.GREEN;
+        }
+        return anchorList;
    }

-    @Subcommand("delete")
-    @CommandPermission("multiverse.core.anchor.delete")
-    @Syntax("<anchor>")
-    @CommandCompletion("@anchors")
-    @Description("Delete an existing anchor point.")
-    public void onDeleteAnchorCommand(@NotNull CommandSender sender,
-
-                                      @NotNull
-                                      @Syntax("<name>")
-                                      @Description("Name of anchor you want to delete.")
-                                      @Flags("type=anchor name")
-                                      @Single String anchorName) {
-
-        sender.sendMessage((this.plugin.getAnchorManager().deleteAnchor(anchorName))
-
-                ? String.format("Anchor '%s%s%s' was successfully %s deleted!",
-                ChatColor.AQUA, anchorName, ChatColor.WHITE, ChatColor.RED)
-
-                : String.format("%sThere was an error deleting anchor '%s'! Check console for errors.",
-                ChatColor.RED, anchorName));
-    }
-
-    @Subcommand("list")
-    @CommandPermission("multiverse.core.anchor.list")
-    @Syntax("[filter] [page]")
-    @Description("View a list of current anchors.")
-    public void onListAnchorCommand(@NotNull CommandSender sender,
-                                    @NotNull PageFilter pageFilter) {
-
-        new ContentDisplay.Builder<Collection<String>>()
-                .sender(sender)
-                .header("%s====[ Multiverse Anchor List ]====", ChatColor.LIGHT_PURPLE)
-                .contents(buildAnchorList(sender))
-                .emptyMessage("You do not any anchors set. See /mv anchors create to get started!")
-                .displayHandler(DisplayHandlers.PAGE_LIST)
-                .colorTool(ColorAlternator.with(ChatColor.YELLOW, ChatColor.DARK_AQUA))
-                .setting(DisplaySettings.SHOW_PAGE, pageFilter.getPage())
-                .display();
-    }
-
-    private List<String> buildAnchorList(@NotNull CommandSender sender) {
-        Set<String> anchors = (sender instanceof Player)
-                ? this.anchorManager.getAnchors((Player) sender)
-                : this.anchorManager.getAllAnchors();
-
-        List<String> anchorContent = new ArrayList<>();
-        for (String anchor : anchors) {
-            Location anchorLocation = this.anchorManager.getAnchorLocation(anchor);
-            World world = anchorLocation.getWorld(); // this.plugin.getMVWorldManager().getMVWorld();
-
-            String locationString = ChatColor.RED + "!!INVALID!!";
-            if (world != null) {
-                MultiverseWorld mvWorld = this.plugin.getMVWorldManager().getMVWorld(world);
-                locationString = (mvWorld == null)
-                        ? String.format("%s%s !!NOT MULTIVERSE WORLD!!", ChatColor.RED, world.getName())
-                        : String.format("%s - %s", mvWorld.getColoredWorldString(), this.plugin.getLocationManipulation().strAxis(anchorLocation));
-            }
-            anchorContent.add(String.format("%s: %s", anchor, locationString));
+    private void showList(CommandSender sender, List<String> args) {
+        if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.list", true)) {
+            sender.sendMessage(ChatColor.RED + "You don't have the permission to list anchors!");
+            return;
        }

-        return anchorContent;
+        sender.sendMessage(ChatColor.LIGHT_PURPLE + "====[ Multiverse Anchor List ]====");
+        Player p = null;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        }
+
+
+        FilterObject filterObject = this.getPageAndFilter(args);
+
+        List<String> availableAnchors = new ArrayList<String>(this.getFancyAnchorList(p));
+        if (filterObject.getFilter().length() > 0) {
+            availableAnchors = this.getFilteredItems(availableAnchors, filterObject.getFilter());
+            if (availableAnchors.size() == 0) {
+                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE
+                        + "No anchors matched your filter: " + ChatColor.AQUA + filterObject.getFilter());
+                return;
+            }
+        } else {
+            if (availableAnchors.size() == 0) {
+                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE + "No anchors were defined.");
+                return;
+            }
+        }
+
+
+        if (!(sender instanceof Player)) {
+            for (String c : availableAnchors) {
+                sender.sendMessage(c);
+            }
+            return;
+        }
+
+        int totalPages = (int) Math.ceil(availableAnchors.size() / (this.itemsPerPage + 0.0));
+
+        if (filterObject.getPage() > totalPages) {
+            filterObject.setPage(totalPages);
+        } else if (filterObject.getPage() < 1) {
+            filterObject.setPage(1);
+        }
+
+        sender.sendMessage(ChatColor.AQUA + " Page " + filterObject.getPage() + " of " + totalPages);
+
+        this.showPage(filterObject.getPage(), sender, availableAnchors);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (args.size() == 0) {
+            this.showList(sender, args);
+            return;
+        }
+        if (args.size() == 1 && (this.getPageAndFilter(args).getPage() != 1 || args.get(0).equals("1"))) {
+            this.showList(sender, args);
+            return;
+        }
+        if (args.size() == 2 && args.get(1).equalsIgnoreCase("-d")) {
+            if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.delete", true)) {
+                sender.sendMessage(ChatColor.RED + "You don't have the permission to delete anchors!");
+            } else {
+                if (this.plugin.getAnchorManager().deleteAnchor(args.get(0))) {
+                    sender.sendMessage("Anchor '" + args.get(0) + "' was successfully " + ChatColor.RED + "deleted!");
+                } else {
+                    sender.sendMessage("Anchor '" + args.get(0) + "' was " + ChatColor.RED + " NOT " + ChatColor.WHITE + "deleted!");
+                }
+            }
+            return;
+        }
+
+        if (!(sender instanceof Player)) {
+            sender.sendMessage("You must be a player to create Anchors.");
+            return;
+        }
+
+        if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.create", true)) {
+            sender.sendMessage(ChatColor.RED + "You don't have the permission to create anchors!");
+        } else {
+            Player player = (Player) sender;
+            if (this.plugin.getAnchorManager().saveAnchorLocation(args.get(0), player.getLocation())) {
+                sender.sendMessage("Anchor '" + args.get(0) + "' was successfully " + ChatColor.GREEN + "created!");
+            } else {
+                sender.sendMessage("Anchor '" + args.get(0) + "' was " + ChatColor.RED + " NOT " + ChatColor.WHITE + "created!");
+            }
+        }
+    }
+
+    @Override
+    protected List<String> getFilteredItems(List<String> availableItems, String filter) {
+        List<String> filtered = new ArrayList<String>();
+        for (String s : availableItems) {
+            if (s.matches("(?i).*" + filter + ".*")) {
+                filtered.add(s);
+            }
+        }
+        return filtered;
+    }
+
+    @Override
+    protected String getItemText(String item) {
+        return item;
    }
 }
@@ -1,64 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commandtools.context.RequiredPlayer;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-@CommandAlias("mv")
-public class BedCommand extends MultiverseCoreCommand {
-
-    public BedCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @Subcommand("bed")
-    @CommandPermission("multiverse.core.bed.self")
-    @Description("Takes your current respawn point.")
-    public void onBedCommand(@NotNull Player player) {
-        doBedRespawn(player, player);
-    }
-
-    @Subcommand("bed")
-    @CommandPermission("multiverse.core.bed.other")
-    @Syntax("[player]")
-    @CommandCompletion("@players")
-    @Description("Takes another player to their respawn location.")
-    public void onOtherBedCommand(@NotNull CommandSender sender,
-
-                                  @Syntax("[player]")
-                                  @Description("Target player to teleport to respawn location.")
-                                  @NotNull RequiredPlayer player) {
-
-        doBedRespawn(sender, player.get());
-    }
-
-    private void doBedRespawn(@NotNull CommandSender sender,
-                              @NotNull Player player) {
-
-        Location bedLocation = player.getBedSpawnLocation();
-        if (bedLocation == null) {
-            sender.sendMessage(String.format("%sYou do not have a respawn point set!", ChatColor.RED));
-            return;
-        }
-        sender.sendMessage((player.teleport(bedLocation))
-                ? "You have been teleported to your respawn point!"
-                : String.format("%sThere was an error teleporting you to your respawn point.", ChatColor.RED));
-    }
-}
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,42 +7,52 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.commandtools.context.RequiredPlayer;
+import com.onarandombox.MultiverseCore.destination.InvalidDestination;
+import com.onarandombox.MultiverseCore.utils.MVPermissions;
+import com.onarandombox.MultiverseCore.utils.PlayerFinder;
+import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;

-@CommandAlias("mv")
-public class CheckCommand extends MultiverseCoreCommand {
+import java.util.List;
+/**
+ * Checks to see if a player can go to a destination.
+ */
+public class CheckCommand extends MultiverseCommand {

    public CheckCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("Help you validate your multiverse settings");
+        this.setCommandUsage("/mv check " + ChatColor.GREEN + "{PLAYER} {DESTINATION}");
+        this.setArgRange(2, 2);
+        this.addKey("mv check");
+        this.addKey("mvcheck");
+        this.addCommandExample("/mv check " + ChatColor.GREEN + "fernferret " + ChatColor.LIGHT_PURPLE + "w:MyWorld");
+        this.addCommandExample("/mv check " + ChatColor.GREEN + "Rigby90 " + ChatColor.LIGHT_PURPLE + "p:MyPortal");
+        this.addCommandExample("/mv check " + ChatColor.GREEN + "lithium3141 " + ChatColor.LIGHT_PURPLE + "ow:WarpName");
+        this.setPermission("multiverse.core.debug", "Checks to see if a player can go to a destination. Prints debug if false.", PermissionDefault.OP);
    }

-    @Subcommand("check")
-    @CommandPermission("multiverse.core.debug")
-    @Syntax("<player> <destination>")
-    @CommandCompletion("@players @destinations|@MVWorlds")
-    @Description("Checks to see if a player can go to a destination. Prints debug if false.")
-    public void onCheckCommand(@NotNull CommandSender sender,
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        Player p = PlayerFinder.get(args.get(0), sender);
+        if (p == null) {
+            sender.sendMessage("Could not find player " + ChatColor.GREEN + args.get(0));
+            sender.sendMessage("Are they online?");
+            return;
+        }
+        MVDestination dest = this.plugin.getDestFactory().getDestination(args.get(1));
+        if (dest instanceof InvalidDestination) {
+            sender.sendMessage(String.format("You asked if '%s' could go to %s%s%s,",
+                    args.get(0), ChatColor.GREEN, args.get(0), ChatColor.WHITE));
+            sender.sendMessage("but I couldn't find a Destination of that name? Did you type it correctly?");
+            return;
+        }

-                               @NotNull
-                               @Syntax("<player>")
-                               @Description("Player to check destination on.")
-                               RequiredPlayer player,
-
-                               @NotNull
-                               @Syntax("<destination>")
-                               @Description("A destination location, e.g. a world name.")
-                               MVDestination destination) {
-
-        this.plugin.getMVPerms().tellMeWhyICantDoThis(sender, player.get(), destination);
+        MVPermissions perms = this.plugin.getMVPerms();
+        perms.tellMeWhyICantDoThis(sender, p, dest);
    }
 }
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,46 +7,49 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Conditions;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Flags;
-import co.aikar.commands.annotation.Single;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
-import com.onarandombox.MultiverseCore.MultiverseCore;
+import java.util.List;
+
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.permissions.PermissionDefault;

-@CommandAlias("mv")
-public class CloneCommand extends MultiverseCoreCommand {
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+
+/**
+ * Creates a clone of a world.
+ */
+public class CloneCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;

    public CloneCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("Clone World");
+        this.setCommandUsage("/mv clone" + ChatColor.GREEN + " {TARGET} {NAME}" + ChatColor.GOLD + " -g [GENERATOR[:ID]]");
+        this.setArgRange(2, 4); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        this.addKey("mvclone");
+        this.addKey("mvcl");
+        this.addKey("mv cl");
+        this.addKey("mv clone");
+        this.addCommandExample("/mv clone " + ChatColor.GOLD + "world" + ChatColor.GREEN + " world_backup");
+        this.addCommandExample("/mv clone " + ChatColor.GOLD + "skyblock_pristine" + ChatColor.GREEN + " skyblock");
+        this.setPermission("multiverse.core.clone", "Clones a world.", PermissionDefault.OP);
+        this.worldManager = this.plugin.getMVWorldManager();
    }

-    @Subcommand("clone")
-    @CommandPermission("multiverse.core.clone")
-    @Syntax("<world> <name>")
-    @CommandCompletion("@MVWorlds|@unloadedWorlds @empty")
-    @Description("Clones a world.")
-    public void onCloneCommand(@NotNull CommandSender sender,
-
-                               @NotNull
-                               @Syntax("<world>")
-                               @Description("Current multiverse world.")
-                               @Conditions("isWorldInConfig") String worldName,
-
-                               @NotNull
-                               @Syntax("<name>")
-                               @Description("New cloned world name.")
-                               @Single @Flags("trim") @Conditions("creatableWorldName") String newWorldName) {
-
-        sender.sendMessage((this.plugin.getMVWorldManager().cloneWorld(worldName, newWorldName))
-                ? String.format("%sWorld cloned!", ChatColor.GREEN)
-                : String.format("%sWorld could not be cloned! See console for more details.", ChatColor.RED));
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        String oldName = args.get(0);
+	    if (!this.worldManager.hasUnloadedWorld(oldName, true)) {
+            // If no world was found, we can't clone.
+            sender.sendMessage("Sorry, Multiverse doesn't know about world " + oldName + ", so we can't clone it!");
+            sender.sendMessage("Check the " + ChatColor.GREEN + "/mv list" + ChatColor.WHITE + " command to verify it is listed.");
+            return;
+        }
+        if (this.plugin.getMVWorldManager().cloneWorld(oldName, args.get(1))) {
+            sender.sendMessage(ChatColor.GREEN + "World cloned!");
+        } else {
+            sender.sendMessage(ChatColor.RED + "World could NOT be cloned!");
+        }
    }
 }
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,88 +7,66 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Single;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
-import co.aikar.commands.annotation.Values;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.displaytools.ColorAlternator;
-import com.onarandombox.MultiverseCore.displaytools.ContentDisplay;
-import com.onarandombox.MultiverseCore.displaytools.ContentFilter;
-import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.permissions.PermissionDefault;

+import java.util.List;
 import java.util.Map;

-@CommandAlias("mv")
-@Subcommand("config")
-@CommandPermission("multiverse.core.config")
-public class ConfigCommand extends MultiverseCoreCommand {
-
+/**
+ * Allows you to set Global MV Variables.
+ */
+public class ConfigCommand extends MultiverseCommand {
    public ConfigCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("Configuration");
+        this.setCommandUsage("/mv config " + ChatColor.GREEN + "{PROPERTY} {VALUE}");
+        this.setArgRange(1, 2);
+        this.addKey("mv config");
+        this.addKey("mvconfig");
+        this.addKey("mv conf");
+        this.addKey("mvconf");
+        this.addCommandExample("/mv config show");
+        this.addCommandExample("/mv config " + ChatColor.GREEN + "debug" + ChatColor.AQUA + " 3");
+        this.addCommandExample("/mv config " + ChatColor.GREEN + "enforceaccess" + ChatColor.AQUA + " false");
+        this.setPermission("multiverse.core.config", "Allows you to set Global MV Variables.", PermissionDefault.OP);
    }

-    @Subcommand("list")
-    @Syntax("[filter]")
-    @Description("Show multiverse config values.")
-    public void onShowCommand(@NotNull CommandSender sender,
-                              @NotNull ContentFilter filter) {
-
-        new ContentDisplay.Builder<Map<String, Object>>()
-                .sender(sender)
-                .header("%s===[ Multiverse Config ]===", ChatColor.LIGHT_PURPLE)
-                .contents(this.plugin.getMVConfig().serialize())
-                .emptyMessage("No config values found.")
-                .displayHandler(DisplayHandlers.INLINE_MAP)
-                .colorTool(ColorAlternator.with(ChatColor.GREEN, ChatColor.GOLD))
-                .filter(filter)
-                .display();
-    }
-
-    @Subcommand("set")
-    @Syntax("<property> <value>")
-    @CommandCompletion("@MVConfigs")
-    @Description("Set Global MV Variables.")
-    public void onSetCommand(@NotNull CommandSender sender,
-
-                             @NotNull
-                             @Syntax("<property>")
-                             @Description("Config option.")
-                             @Values("@MVConfigs") String property,
-
-                             @NotNull
-                             @Syntax("<value>")
-                             @Description("New value for the given config option.")
-                             @Single String value) {
-
-        property = property.toLowerCase();
-
-        if (!this.plugin.getMVConfig().setConfigProperty(property, value)) {
-            sender.sendMessage(String.format("%sSetting '%s' to '%s' failed!", ChatColor.RED, property, value));
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (args.size() <= 1) {
+            StringBuilder builder = new StringBuilder();
+            Map<String, Object> serializedConfig = this.plugin.getMVConfig().serialize();
+            for (Map.Entry<String, Object> entry : serializedConfig.entrySet()) {
+                builder.append(ChatColor.GREEN);
+                builder.append(entry.getKey());
+                builder.append(ChatColor.WHITE).append(" = ").append(ChatColor.GOLD);
+                builder.append(entry.getValue().toString());
+                builder.append(ChatColor.WHITE).append(", ");
+            }
+            String message = builder.toString();
+            message = message.substring(0, message.length() - 2);
+            sender.sendMessage(message);
+            return;
+        }
+        if (!this.plugin.getMVConfig().setConfigProperty(args.get(0).toLowerCase(), args.get(1))) {
+            sender.sendMessage(String.format("%sSetting '%s' to '%s' failed!", ChatColor.RED, args.get(0).toLowerCase(), args.get(1)));
            return;
        }

-        if (!this.plugin.saveMVConfigs()) {
-            sender.sendMessage(String.format("%sFailed to save config! Check your console for details.", ChatColor.RED));
-            return;
+        // special rule
+        if (args.get(0).equalsIgnoreCase("firstspawnworld")) {
+            // Don't forget to set the world!
+            this.plugin.getMVWorldManager().setFirstSpawnWorld(args.get(1));
        }

-        // special rule, don't forget to set the world!
-        //TODO API: Potentially should move to MultiverseCore#loadConfigs method
-        if (property.equalsIgnoreCase("firstspawnworld")) {
-            this.plugin.getMVWorldManager().setFirstSpawnWorld(value);
+        if (this.plugin.saveMVConfigs()) {
+            sender.sendMessage(ChatColor.GREEN + "SUCCESS!" + ChatColor.WHITE + " Values were updated successfully!");
+            this.plugin.loadConfigs();
+        } else {
+            sender.sendMessage(ChatColor.RED + "FAIL!" + ChatColor.WHITE + " Check your console for details!");
        }
-
-        sender.sendMessage(String.format("%sSuccess! %sConfig option %s%s %sis now set to %s%s%s.",
-                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, property, ChatColor.WHITE, ChatColor.GREEN, value, ChatColor.WHITE));
-
-        this.plugin.loadConfigs();
    }
 }
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,25 +7,33 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.permissions.PermissionDefault;

-@CommandAlias("mv")
-public class ConfirmCommand extends MultiverseCoreCommand {
+import java.util.List;
+
+/**
+ * Confirms actions.
+ */
+public class ConfirmCommand extends MultiverseCommand {

    public ConfirmCommand(MultiverseCore plugin) {
        super(plugin);
+        // Any command that is dangerous should require op
+        this.setName("Confirms a command that could destroy life, the universe and everything.");
+        this.setCommandUsage("/mv confirm");
+        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);
+
    }

-    @Subcommand("confirm")
-    @CommandPermission("multiverse.core.confirm")
-    @Description("Confirms dangerous commands before executing them.")
-    public void onConfirmCommand(@NotNull CommandSender sender) {
-        this.plugin.getMVCommandManager().getQueueManager().runQueuedCommand(sender);
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        this.plugin.getCommandQueueManager().runQueuedCommand(sender);
    }
+
 }
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,69 +7,64 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.InvalidCommandArgument;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.commandtools.context.RequiredPlayer;
 import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.permissions.PermissionDefault;

-@CommandAlias("mv")
-public class CoordCommand extends MultiverseCoreCommand {
+import java.text.DecimalFormat;
+import java.util.List;
+
+/**
+ * Returns detailed information on the Players where abouts.
+ */
+public class CoordCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;

    public CoordCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("Coordinates");
+        this.setCommandUsage("/mv coord");
+        this.setArgRange(0, 0);
+        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();
    }

-    @Subcommand("coord|coordinate")
-    @CommandPermission("multiverse.core.coord.self")
-    @Description("Detailed information on your own where abouts.")
-    public void onCoordCommand(@NotNull Player player) {
-        showCoordInfo(player, player);
-    }
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // Check if the command was sent from a Player.
+        if (sender instanceof Player) {
+            Player p = (Player) sender;
+            World world = p.getWorld();

-    @Subcommand("coord|coordinate")
-    @CommandPermission("multiverse.core.coord.other")
-    @Syntax("[player]")
-    @CommandCompletion("@players")
-    @Description("Detailed information on the player's where abouts.")
-    public void onOtherCoordCommand(@NotNull CommandSender sender,
+            if (!this.worldManager.isMVWorld(world.getName())) {
+                this.plugin.showNotMVWorldMessage(sender, world.getName());
+                return;
+            }

-                                    @NotNull
-                                    @Syntax("[player]")
-                                    @Description("Player you want coordinate info of.")
-                                    RequiredPlayer player) {
+            MultiverseWorld mvworld = this.worldManager.getMVWorld(world.getName());

-        showCoordInfo(sender, player.get());
-    }
-
-    private void showCoordInfo(@NotNull CommandSender sender,
-                               @NotNull Player player) {
-
-        MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(player.getWorld());
-        if (world == null) {
-            throw new InvalidCommandArgument("Player is not in a multiverse world.");
+            p.sendMessage(ChatColor.AQUA + "--- Location Information ---");
+            p.sendMessage(ChatColor.AQUA + "World: " + ChatColor.WHITE + world.getName());
+            p.sendMessage(ChatColor.AQUA + "Alias: " + mvworld.getColoredWorldString());
+            p.sendMessage(ChatColor.AQUA + "World Scale: " + ChatColor.WHITE + mvworld.getScaling());
+            DecimalFormat df = new DecimalFormat();
+            df.setMinimumFractionDigits(0);
+            df.setMaximumFractionDigits(2);
+            p.sendMessage(ChatColor.AQUA + "Coordinates: " + ChatColor.WHITE + plugin.getLocationManipulation().strCoords(p.getLocation()));
+            p.sendMessage(ChatColor.AQUA + "Direction: " + ChatColor.WHITE + plugin.getLocationManipulation().getDirection(p.getLocation()));
+            p.sendMessage(ChatColor.AQUA + "Block: " + ChatColor.WHITE + world.getBlockAt(p.getLocation()).getType());
+        } else {
+            sender.sendMessage("This command needs to be used from a Player.");
        }
-
-        String name = player.equals(sender)
-                ? ""
-                : String.format("for %s%s%s",ChatColor.YELLOW, player.getName(), ChatColor.AQUA);
-
-        sender.sendMessage(String.format("%s--- Location Information %s---", ChatColor.AQUA, name));
-        sender.sendMessage(String.format("%sWorld: %s%s", ChatColor.AQUA, ChatColor.WHITE,  world.getName()));
-        sender.sendMessage(String.format("%sAlias: %s%s", ChatColor.AQUA, ChatColor.WHITE,  world.getColoredWorldString()));
-        sender.sendMessage(String.format("%sWorld Scale: %s%s", ChatColor.AQUA, ChatColor.WHITE, world.getScaling()));
-        sender.sendMessage(String.format("%sCoordinates: %s%s", ChatColor.AQUA, ChatColor.WHITE, this.plugin.getLocationManipulation().strCoords(player.getLocation())));
-        sender.sendMessage(String.format("%sWorld Scale: %s%s", ChatColor.AQUA, ChatColor.WHITE, world.getScaling()));
-        sender.sendMessage(String.format("%sDirection: %s%s", ChatColor.AQUA, ChatColor.WHITE, this.plugin.getLocationManipulation().getDirection(player.getLocation())));
-        sender.sendMessage(String.format("%sBlock: %s%s", ChatColor.AQUA, ChatColor.WHITE, world.getCBWorld().getBlockAt(player.getLocation()).getType()));
    }
 }
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,77 +7,125 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Conditions;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Flags;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagGroup;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagResult;
-import com.onarandombox.MultiverseCore.commandtools.flag.CoreFlags;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
+import org.bukkit.World.Environment;
+import org.bukkit.WorldType;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.bukkit.permissions.PermissionDefault;

-import static org.bukkit.World.*;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;

-@CommandAlias("mv")
-public class CreateCommand extends MultiverseCoreCommand {
+/**
+ * Creates a new world and loads it.
+ */
+public class CreateCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;

    public CreateCommand(MultiverseCore plugin) {
        super(plugin);
-        this.setFlagGroup(FlagGroup.of(
-                CoreFlags.WORLD_TYPE,
-                CoreFlags.SEED,
-                CoreFlags.GENERATOR,
-                CoreFlags.GENERATE_STRUCTURES,
-                CoreFlags.SPAWN_ADJUST
-        ));
+        this.setName("Create World");
+        this.setCommandUsage(String.format("/mv create %s{NAME} {ENV} %s-s [SEED] -g [GENERATOR[:ID]] -t [WORLDTYPE] [-n] -a [true|false]",
+                ChatColor.GREEN, ChatColor.GOLD));
+        this.setArgRange(2, 11); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        this.addKey("mvcreate");
+        this.addKey("mvc");
+        this.addKey("mv create");
+        this.setPermission("multiverse.core.create", "Creates a new world and loads it.", PermissionDefault.OP);
+        this.addCommandExample("/mv create " + ChatColor.GOLD + "world" + ChatColor.GREEN + " normal");
+        this.addCommandExample("/mv create " + ChatColor.GOLD + "lavaland" + ChatColor.RED + " nether");
+        this.addCommandExample("/mv create " + ChatColor.GOLD + "starwars" + ChatColor.AQUA + " end");
+        this.addCommandExample("/mv create " + ChatColor.GOLD + "flatroom" + ChatColor.GREEN + " normal" + ChatColor.AQUA + " -t flat");
+        this.addCommandExample("/mv create " + ChatColor.GOLD + "gargamel" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " -s gargamel");
+        this.addCommandExample("/mv create " + ChatColor.GOLD + "moonworld" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " -g BukkitFullOfMoon");
+        this.worldManager = this.plugin.getMVWorldManager();
    }
-
-    @Subcommand("create")
-    @CommandPermission("multiverse.core.create")
-    @Syntax("<name> <env> -s [seed] -g [generator[:id]] -t [worldtype] [-n] -a [true|false]")
-    @CommandCompletion("@empty @environments @flags")
-    @Description("Creates a new world and loads it.")
-    public void onCreateCommand(@NotNull CommandSender sender,
-
-                                @NotNull
-                                @Syntax("<name>")
-                                @Description("New world name.")
-                                @Flags("trim")
-                                @Conditions("creatableWorldName") String worldName,
-
-                                @NotNull
-                                @Syntax("<env>")
-                                @Description("The world's environment. See: /mv env")
-                                Environment environment,
-
-                                @Nullable
-                                @Syntax("[world-flags]")
-                                @Description("Other world settings. See: http://gg.gg/nn8bl")
-                                String[] flagsArray) {
-
-        FlagResult flags = this.getFlagGroup().calculateResult(flagsArray);
-
-        Command.broadcastCommandMessage(sender, String.format("Starting creation of world '%s'...", worldName));
-        Command.broadcastCommandMessage(sender, (this.plugin.getMVWorldManager().addWorld(
-                worldName,
-                environment,
-                // TODO API: Should Allow FlagResult object to be passed directly
-                flags.getValue(CoreFlags.SEED),
-                flags.getValue(CoreFlags.WORLD_TYPE),
-                flags.getValue(CoreFlags.GENERATE_STRUCTURES),
-                flags.getValue(CoreFlags.GENERATOR),
-                flags.getValue(CoreFlags.SPAWN_ADJUST))
-        )
-                ? String.format("%sComplete!", ChatColor.GREEN)
-                : String.format("%sFailed! See console for errors.", ChatColor.RED));
+	
+	private String trimWorldName(String userInput) {
+        // Removes relative paths.
+        return userInput.replaceAll("^[./\\\\]+", "");
    }
-}
+	
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        String worldName = trimWorldName(args.get(0));
+        File worldFile = new File(this.plugin.getServer().getWorldContainer(), worldName);
+        String env = args.get(1);
+        String seed = CommandHandler.getFlag("-s", args);
+        String generator = CommandHandler.getFlag("-g", args);
+        boolean allowStructures = true;
+        String structureString = CommandHandler.getFlag("-a", args);
+        if (structureString != null) {
+            allowStructures = Boolean.parseBoolean(structureString);
+        }
+        String typeString = CommandHandler.getFlag("-t", args);
+        boolean useSpawnAdjust = true;
+        for (String s : args) {
+            if (s.equalsIgnoreCase("-n")) {
+                useSpawnAdjust = false;
+            }
+        }
+		
+		// Make sure the world name doesn't contain the words 'plugins' and '.dat'
+		if(worldName.contains("plugins")||worldName.contains(".dat")){
+			sender.sendMessage(ChatColor.RED + "Multiverse cannot create a world that contains 'plugins' or '.dat'");
+            return;
+		}
+		
+        if (this.worldManager.isMVWorld(worldName)) {
+            sender.sendMessage(ChatColor.RED + "Multiverse cannot create " + ChatColor.GOLD + ChatColor.UNDERLINE
+                    + "another" + ChatColor.RESET + ChatColor.RED + " world named " + worldName);
+            return;
+        }
+
+        if (worldFile.exists()) {
+            sender.sendMessage(ChatColor.RED + "A Folder/World already exists with this name!");
+            sender.sendMessage(ChatColor.RED + "If you are confident it is a world you can import with /mvimport");
+            return;
+        }
+
+        Environment environment = EnvironmentCommand.getEnvFromString(env);
+        if (environment == null) {
+            sender.sendMessage(ChatColor.RED + "That is not a valid environment.");
+            EnvironmentCommand.showEnvironments(sender);
+            return;
+        }
+
+        // If they didn't specify a type, default to NORMAL
+        if (typeString == null) {
+            typeString = "NORMAL";
+        }
+        WorldType type = EnvironmentCommand.getWorldTypeFromString(typeString);
+        if (type == null) {
+            sender.sendMessage(ChatColor.RED + "That is not a valid World Type.");
+            EnvironmentCommand.showWorldTypes(sender);
+            return;
+        }
+        // Determine if the generator is valid. #918
+        if (generator != null) {
+            List<String> genarray = new ArrayList<String>(Arrays.asList(generator.split(":")));
+            if (genarray.size() < 2) {
+                // If there was only one arg specified, pad with another empty one.
+                genarray.add("");
+            }
+            if (this.worldManager.getChunkGenerator(genarray.get(0), genarray.get(1), "test") == null) {
+                // We have an invalid generator.
+                sender.sendMessage("Invalid generator! '" + generator + "'. " + ChatColor.RED + "Aborting world creation.");
+                return;
+            }
+        }
+        Command.broadcastCommandMessage(sender, "Starting creation of world '" + worldName + "'...");
+
+        if (this.worldManager.addWorld(worldName, environment, seed, type, allowStructures, generator, useSpawnAdjust)) {
+            Command.broadcastCommandMessage(sender, "Complete!");
+        } else {
+            Command.broadcastCommandMessage(sender, "FAILED.");
+        }
+    }
+}
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,85 +7,61 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.InvalidCommandArgument;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Single;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.permissions.PermissionDefault;

-@CommandAlias("mv")
-@CommandPermission("multiverse.core.debug")
-public class DebugCommand extends MultiverseCoreCommand {
+import java.util.List;
+import java.util.logging.Level;
+
+/**
+ * Enables debug-information.
+ */
+public class DebugCommand extends MultiverseCommand {

    public DebugCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("Turn Debug on/off?");
+        this.setCommandUsage("/mv debug" + ChatColor.GOLD + " [1|2|3|off|silent]");
+        this.setArgRange(0, 1);
+        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);
    }

-    @Subcommand("debug")
-    @CommandPermission("multiverse.core.debug")
-    @Description("Show the current debug level.")
-    public void onShowDebugCommand(@NotNull CommandSender sender) {
-        displayDebugMode(sender);
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (args.size() == 1) {
+            if (args.get(0).equalsIgnoreCase("off")) {
+                plugin.getMVConfig().setGlobalDebug(0);
+            } else {
+                try {
+                    int debugLevel = Integer.parseInt(args.get(0));
+                    if (debugLevel > 3 || debugLevel < 0) {
+                        throw new NumberFormatException();
+                    }
+                    plugin.getMVConfig().setGlobalDebug(debugLevel);
+                } catch (NumberFormatException e) {
+                    sender.sendMessage(ChatColor.RED + "Error" + ChatColor.WHITE
+                            + " setting debug level. Please use a number 0-3 " + ChatColor.AQUA + "(3 being many many messages!)");
+                }
+            }
+            plugin.saveMVConfigs();
+        }
+        this.displayDebugMode(sender);
    }

-    @Subcommand("debug")
-    @CommandPermission("multiverse.core.debug")
-    @Syntax("<level>")
-    @CommandCompletion("@toggles|@range:3")
-    @Description("Change debug level.")
-    public void onChangeDebugCommand(@NotNull CommandSender sender,
-
-                                     @NotNull
-                                     @Syntax("<level>")
-                                     @Description("Set debug mode level, 0 to 3.")
-                                     @Single String debugLevel) {
-
-        int parsedLevel = parseDebugLevel(debugLevel);
-        if (parsedLevel == -1) {
-            throw new InvalidCommandArgument("No such debug level. Please use a number from 0 to 3.");
-        }
-
-        this.plugin.getMVConfig().setGlobalDebug(parsedLevel);
-        if (!this.plugin.saveMVConfigs()) {
-            sender.sendMessage(String.format("%sError saving changes to config! See console for more info.", ChatColor.RED));
-        }
-
-        displayDebugMode(sender);
-    }
-
-    private int parseDebugLevel(@NotNull String debugLevel) {
-        if (debugLevel.equalsIgnoreCase("off")) {
-            return 0;
-        }
-        if (debugLevel.equalsIgnoreCase("on")) {
-            return 1;
-        }
-
-        try {
-            int parsedLevel = Integer.parseInt(debugLevel);
-            return (parsedLevel > 3 || parsedLevel < 0) ? -1 : parsedLevel;
-        }
-        catch (NumberFormatException ignored) {
-            return -1;
-        }
-    }
-
-    private void displayDebugMode(@NotNull CommandSender sender) {
-        int debugLevel = this.plugin.getMVConfig().getGlobalDebug();
+    private void displayDebugMode(CommandSender sender) {
+        final int debugLevel = plugin.getMVConfig().getGlobalDebug();
        if (debugLevel == 0) {
-            sender.sendMessage(String.format("Multiverse Debug mode is %soff", ChatColor.RED));
-        }
-        else {
-            sender.sendMessage(String.format("Multiverse Debug mode at level %s%s", ChatColor.GREEN, debugLevel));
-            Logging.fine("Multiverse debug mode enabled!");
+            sender.sendMessage("Multiverse Debug mode is " + ChatColor.RED + "OFF");
+        } else {
+            sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + debugLevel);
+            Logging.fine("Multiverse Debug ENABLED");
        }
    }
 }
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,48 +7,41 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Conditions;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Flags;
-import co.aikar.commands.annotation.Single;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
 import org.jetbrains.annotations.NotNull;

-@CommandAlias("mv")
-public class DeleteCommand extends MultiverseCoreCommand {
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Deletes worlds.
+ */
+public class DeleteCommand extends MultiverseCommand {

    public DeleteCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("Delete World");
+        this.setCommandUsage("/mv delete" + ChatColor.GREEN + " {WORLD}");
+        this.setArgRange(1, 1);
+        this.addKey("mvdelete");
+        this.addKey("mv delete");
+        this.addCommandExample("/mv delete " + ChatColor.GOLD + "MyWorld");
+        this.setPermission("multiverse.core.delete", "Deletes a world on your server. " + ChatColor.RED + "PERMANENTLY.", PermissionDefault.OP);
    }

-    @Subcommand("delete")
-    @CommandPermission("multiverse.core.delete")
-    @Syntax("<world>")
-    @CommandCompletion("@MVWorlds|@unloadedWorlds")
-    @Description("Deletes a world on your server PERMANENTLY.")
-    public void onDeleteCommand(@NotNull CommandSender sender,
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        String worldName = args.get(0);

-                                @NotNull
-                                @Syntax("<world>")
-                                @Description("Multiverse world you want to delete.")
-                                @Flags("trim")
-                                @Conditions("isWorldInConfig|validWorldFolder")
-                                @Single String worldName) {
-
-        this.plugin.getMVCommandManager().getQueueManager().addToQueue(new QueuedCommand.Builder()
-                .sender(sender)
-                .action(deleteRunnable(sender, worldName))
-                .prompt("Are you sure you want to delete world '%s'?", worldName)
-                .build()
-        );
+        this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
+                sender,
+                deleteRunnable(sender, worldName),
+                String.format("Are you sure you want to delete world '%s'? You cannot undo this action.", worldName)
+        ));
    }

    private Runnable deleteRunnable(@NotNull CommandSender sender,
@@ -56,9 +49,12 @@ public class DeleteCommand extends MultiverseCoreCommand {

        return () -> {
            sender.sendMessage(String.format("Deleting world '%s'...", worldName));
-            sender.sendMessage((this.plugin.getMVWorldManager().deleteWorld(worldName))
-                    ? String.format("%sWorld %s was deleted!", ChatColor.GREEN, worldName)
-                    : String.format("%sThere was an issue deleting '%s'! Please check console for errors.", ChatColor.RED, worldName));
+            if (this.plugin.getMVWorldManager().deleteWorld(worldName)) {
+                sender.sendMessage(String.format("%sWorld %s was deleted!", ChatColor.GREEN, worldName));
+                return;
+            }
+            sender.sendMessage(String.format("%sThere was an issue deleting '%s'! Please check console for errors.",
+                    ChatColor.RED, worldName));
        };
    }
 }
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,28 +7,32 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.WorldType;
 import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;

-@CommandAlias("mv")
-public class EnvironmentCommand extends MultiverseCoreCommand {
+import java.util.List;
+
+/**
+ * Lists valid known environments.
+ */
+public class EnvironmentCommand extends MultiverseCommand {

    public EnvironmentCommand(MultiverseCore plugin) {
        super(plugin);
-    }
-
-    @Subcommand("env|environments")
-    @CommandPermission("multiverse.core.list.environments")
-    @Description("Lists valid known environments and world types.")
-    public void onEnvironmentCommand(CommandSender sender) {
-        showEnvironments(sender);
-        sender.sendMessage("");
-        showWorldTypes(sender);
+        this.setName("List Environments");
+        this.setCommandUsage("/mv env");
+        this.setArgRange(0, 0);
+        this.addKey("mvenv");
+        this.addKey("mv env");
+        this.addKey("mv type");
+        this.addKey("mv environment");
+        this.addKey("mv environments");
+        this.addCommandExample("/mv env");
+        this.setPermission("multiverse.core.list.environments", "Lists valid known environments/world types.", PermissionDefault.OP);
    }

    /**
@@ -37,19 +41,78 @@ public class EnvironmentCommand extends MultiverseCoreCommand {
     * @param sender The {@link CommandSender}.
     */
    public static void showEnvironments(CommandSender sender) {
-        sender.sendMessage(String.format("%sValid Environments are:", ChatColor.YELLOW));
-        sender.sendMessage(String.format("%sNORMAL%s, %sNETHER %sor %sEND",
-                ChatColor.GREEN, ChatColor.WHITE, ChatColor.RED, ChatColor.WHITE, ChatColor.AQUA));
+        sender.sendMessage(ChatColor.YELLOW + "Valid Environments are:");
+        sender.sendMessage(ChatColor.GREEN + "NORMAL");
+        sender.sendMessage(ChatColor.RED + "NETHER");
+        sender.sendMessage(ChatColor.AQUA + "END");
    }
-
    /**
     * Shows all valid known world types to a {@link CommandSender}.
     *
     * @param sender The {@link CommandSender}.
     */
    public static void showWorldTypes(CommandSender sender) {
-        sender.sendMessage(String.format("%sValid World Types are:", ChatColor.YELLOW));
-        sender.sendMessage(String.format("%sNORMAL%s, %sFLAT%s, %sLARGEBIOMES %sor %sAMPLIFIED",
-                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, ChatColor.WHITE, ChatColor.RED, ChatColor.WHITE, ChatColor.GOLD));
+        sender.sendMessage(ChatColor.YELLOW + "Valid World Types are:");
+        sender.sendMessage(String.format("%sNORMAL%s, %sFLAT, %sLARGEBIOMES %sor %sVERSION_1_1",
+                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, ChatColor.RED, ChatColor.WHITE, ChatColor.GOLD));
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        EnvironmentCommand.showEnvironments(sender);
+        EnvironmentCommand.showWorldTypes(sender);
+    }
+
+    /**
+     * Converts a {@link String} into a {@link WorldType}.
+     *
+     * @param type The WorldType as a {@link String}
+     * @return The WorldType as a {@link WorldType}
+     */
+    public static WorldType getWorldTypeFromString(String type) {
+        // Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way
+        if (type.equalsIgnoreCase("normal")) {
+            type = "NORMAL";
+        } else if (type.equalsIgnoreCase("flat")) {
+            type = "FLAT";
+        } else if (type.equalsIgnoreCase("largebiomes")) {
+            type = "LARGE_BIOMES";
+        } else if (type.equalsIgnoreCase("amplified")) {
+            type = "AMPLIFIED";
+        }
+        try {
+            // Now that we've converted a potentially unfriendly value
+            // to a friendly one, get it from the ENUM!
+            return WorldType.valueOf(type);
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Converts a {@link String} into an {@link org.bukkit.World.Environment}.
+     *
+     * @param env The environment as {@link String}
+     * @return The environment as {@link org.bukkit.World.Environment}
+     */
+    public static World.Environment getEnvFromString(String env) {
+        env = env.toUpperCase();
+        // 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";
+
+        if (env.equalsIgnoreCase("END") || env.equalsIgnoreCase("THEEND") || env.equalsIgnoreCase("STARWARS"))
+            env = "THE_END";
+
+        if (env.equalsIgnoreCase("NORMAL") || env.equalsIgnoreCase("WORLD"))
+            env = "NORMAL";
+
+        try {
+            // Now that we've converted a potentially unfriendly value
+            // to a friendly one, get it from the ENUM!
+            return World.Environment.valueOf(env);
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
    }
 }
@@ -1,106 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Flags;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.commandtools.context.GameRuleProperty;
-import com.onarandombox.MultiverseCore.displaytools.ColorAlternator;
-import com.onarandombox.MultiverseCore.displaytools.ContentDisplay;
-import com.onarandombox.MultiverseCore.displaytools.ContentFilter;
-import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers;
-import com.onarandombox.MultiverseCore.displaytools.DisplaySettings;
-import org.bukkit.ChatColor;
-import org.bukkit.GameRule;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-@CommandAlias("mv")
-@Subcommand("gamerule")
-public class GameRuleCommand extends MultiverseCoreCommand {
-
-    public GameRuleCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @Subcommand("list")
-    @CommandPermission("multiverse.core.gamerule.list")
-    @Syntax("[world] [filter]")
-    @CommandCompletion("@MVWorlds")
-    @Description("See the list gamerules values for a given world.")
-    public void onGameRulesCommand(@NotNull CommandSender sender,
-
-                                   @NotNull
-                                   @Syntax("[world]")
-                                   @Description("World you want to see game rule info.")
-                                   @Flags("other,defaultself, fallbackself") MultiverseWorld world,
-
-                                   @NotNull ContentFilter filter) {
-
-        new ContentDisplay.Builder<Map<String, Object>>()
-                .sender(sender)
-                .header("=== Gamerules for %s%s%s ===", ChatColor.AQUA, world.getName(), ChatColor.WHITE)
-                .contents(getGameRuleMap(world))
-                .displayHandler(DisplayHandlers.INLINE_MAP)
-                .colorTool(ColorAlternator.with(ChatColor.GREEN, ChatColor.GOLD))
-                .setting(DisplaySettings.OPERATOR, ": ")
-                .filter(filter)
-                .display();
-    }
-
-    private Map<String, Object> getGameRuleMap(MultiverseWorld world) {
-        return new HashMap<String, Object>() {{
-            Arrays.stream(GameRule.values())
-                    .forEach(gr -> {
-                        Object value = world.getCBWorld().getGameRuleValue(gr);
-                        if (value != null) {
-                            put(gr.getName(), value.toString());
-                        }
-                    });
-        }};
-    }
-
-    @Subcommand("set")
-    @CommandPermission("multiverse.core.gamerule.set")
-    @Syntax("<rule> <value> [world]")
-    @CommandCompletion("@gameRules @empty @MVWorlds")
-    @Description("Allows a player to set a gamerule for a given world.")
-    public <T> void onGameRuleChangeCommand(@NotNull CommandSender sender,
-                                            @NotNull Player player,
-
-                                            @Syntax("<rule> <value>")
-                                            @Description("Game rule property and value you want to change to.")
-                                            @NotNull GameRuleProperty<T> property,
-
-                                            @Syntax("[world]")
-                                            @Description("World you want to set this game rule.")
-                                            @NotNull @Flags("other,defaultself") MultiverseWorld world) {
-
-        sender.sendMessage((world.getCBWorld().setGameRule(property.getGameRule(), property.getValue()))
-
-                ? String.format("%sSuccess! %sGamerule %s%s%s was set to %s%s%s.",
-                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, property.getGameRule().getName(),
-                ChatColor.WHITE, ChatColor.GREEN, property.getValue(), ChatColor.WHITE)
-
-                : String.format("%sFailure! Gamerule %s%s%s could not be set to %s%s%s.",
-                ChatColor.RED, ChatColor.AQUA, property.getGameRule().getName(),
-                ChatColor.RED, ChatColor.DARK_RED, property.getValue(), ChatColor.RED));
-    }
-}
@@ -0,0 +1,116 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.GameRule;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Allows management of Anchor Destinations.
+ */
+public class GameruleCommand extends MultiverseCommand {
+
+    public GameruleCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Set a Minecraft Game Rule for a World.");
+        this.setCommandUsage("/mv gamerule " + ChatColor.GREEN + "{RULE} {VALUE}" + ChatColor.GOLD + " [WORLD]");
+        this.setArgRange(2, 3);
+        this.addKey("mv gamerule");
+        this.addKey("mv rule");
+        this.addKey("mvgamerule");
+        this.addKey("mvrule");
+        this.addCommandExample("/mv gamerule " + ChatColor.GREEN + "doMobLoot false");
+        this.addCommandExample("/mvrule " + ChatColor.GREEN + "keepInventory true " + ChatColor.RED + "world_nether");
+        this.setPermission("multiverse.core.gamerule.set", "Allows a player to set a gamerule.", PermissionDefault.OP);
+    }
+
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // We NEED a world from the command line
+        final Player p;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        } else {
+            p = null;
+        }
+
+        if (args.size() == 2 && p == null) {
+            sender.sendMessage("From the command line, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        final GameRule gameRule = GameRule.getByName(args.get(0));
+        final String value = args.get(1);
+        final World world;
+        if (args.size() == 2) {
+            world = p.getWorld();
+        } else {
+            world = Bukkit.getWorld(args.get(2));
+            if (world == null) {
+                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " World " + ChatColor.AQUA + args.get(2)
+                        + ChatColor.WHITE + " does not exist.");
+                return;
+            }
+        }
+
+        if (gameRule == null) {
+            sender.sendMessage(ChatColor.RED + "Failure! " + ChatColor.AQUA + args.get(0) + ChatColor.WHITE
+                    + " is not a valid gamerule.");
+        } else {
+            if (gameRule.getType() == Boolean.class) {
+                boolean booleanValue;
+                if (value.equalsIgnoreCase("true")) {
+                    booleanValue = true;
+                } else if (value.equalsIgnoreCase("false")) {
+                    booleanValue = false;
+                } else {
+                    sender.sendMessage(getErrorMessage(gameRule.getName(), value) + "it can only be set to true or false.");
+                    return;
+                }
+
+                if (!world.setGameRule(gameRule, booleanValue)) {
+                    sender.sendMessage(getErrorMessage(gameRule.getName(), value) + "something went wrong.");
+                    return;
+                }
+            } else if (gameRule.getType() == Integer.class) {
+                try {
+                    if (!world.setGameRule(gameRule, Integer.parseInt(value))) {
+                        throw new NumberFormatException();
+                    }
+                } catch (NumberFormatException e) {
+                    sender.sendMessage(getErrorMessage(gameRule.getName(), value) + "it can only be set to a positive integer.");
+                    return;
+                }
+            } else {
+                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule.getName()
+                        + ChatColor.WHITE + " isn't supported yet, please let us know about it.");
+                return;
+            }
+
+            sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule.getName()
+                    + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value + ChatColor.WHITE + ".");
+        }
+    }
+
+    private String getErrorMessage(String gameRule, String value) {
+        return ChatColor.RED + "Failure!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule
+                + ChatColor.WHITE + " could not be set to " + ChatColor.RED + value + ChatColor.WHITE + ", ";
+    }
+}
@@ -0,0 +1,95 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.display.ColorAlternator;
+import com.onarandombox.MultiverseCore.display.ContentDisplay;
+import com.onarandombox.MultiverseCore.display.settings.MapDisplaySettings;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.GameRule;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Allows management of Anchor Destinations.
+ */
+public class GamerulesCommand extends MultiverseCommand {
+
+    public GamerulesCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("List the Minecraft Game Rules for a World.");
+        this.setCommandUsage("/mv gamerules" + ChatColor.GOLD + " [WORLD]");
+        this.setArgRange(0, 1);
+        this.addKey("mv gamerules");
+        this.addKey("mv rules");
+        this.addKey("mvgamerules");
+        this.addKey("mvrules");
+        this.addCommandExample("/mv gamerules");
+        this.addCommandExample("/mvrules " + ChatColor.RED + "world_nether");
+        this.setPermission("multiverse.core.gamerule.list", "Allows a player to list gamerules.", PermissionDefault.OP);
+    }
+
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // We NEED a world from the command line
+        final Player p;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        } else {
+            p = null;
+        }
+
+        if (args.size() == 0 && p == null) {
+            sender.sendMessage("From the command line, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        final World world;
+        if (args.size() == 0) {
+            world = p.getWorld();
+        } else {
+            world = Bukkit.getWorld(args.get(0));
+            if (world == null) {
+                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " World " + ChatColor.AQUA + args.get(0)
+                        + ChatColor.WHITE + " does not exist.");
+                return;
+            }
+        }
+
+        ContentDisplay.forContent(getGameRuleMap(world))
+                .header("=== Gamerules for %s%s%s ===", ChatColor.AQUA, world.getName(), ChatColor.WHITE)
+                .colorTool(ColorAlternator.with(ChatColor.GREEN, ChatColor.GOLD))
+                .setting(MapDisplaySettings.OPERATOR, ": ")
+                .show(sender);
+    }
+
+    private Map<String, Object> getGameRuleMap(World world) {
+        Map<String, Object> gameRuleMap = new HashMap<>();
+        for (GameRule<?> rule : GameRule.values()) {
+            Object value = world.getGameRuleValue(rule);
+            if (value == null) {
+                gameRuleMap.put(rule.getName(), "null");
+                continue;
+            }
+            gameRuleMap.put(rule.getName(), value);
+        }
+        return gameRuleMap;
+    }
+}
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,39 +7,54 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commandtools.flag.CoreFlags;
-import com.onarandombox.MultiverseCore.displaytools.ColorAlternator;
-import com.onarandombox.MultiverseCore.displaytools.ContentDisplay;
-import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.permissions.PermissionDefault;
+import org.bukkit.plugin.Plugin;

-import java.util.Collection;
+import java.util.ArrayList;
+import java.util.List;

-@CommandAlias("mv")
-public class GeneratorCommand extends MultiverseCoreCommand {
+/**
+ * Returns a list of loaded generator plugins.
+ */
+public class GeneratorCommand extends MultiverseCommand {

    public GeneratorCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("World Information");
+        this.setCommandUsage("/mv generators");
+        this.setArgRange(0, 0);
+        this.addKey("mv generators");
+        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);
    }

-    @Subcommand("gens|generators")
-    @CommandPermission("multiverse.core.generator")
-    @Description("Shows a list of Loaded Generator Plugins.")
-    public void onGeneratorCommand(@NotNull CommandSender sender) {
-        new ContentDisplay.Builder<Collection<String>>()
-                .sender(sender)
-                .header("%s--- Available Generator Plugins ---", ChatColor.GOLD)
-                .contents(CoreFlags.GENERATOR.suggestValue())
-                .emptyMessage("%sYou do not have any generator plugins installed.", ChatColor.RED)
-                .displayHandler(DisplayHandlers.INLINE_LIST)
-                .colorTool(ColorAlternator.with(ChatColor.AQUA, ChatColor.WHITE))
-                .display();
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        Logging.info("PLEASE IGNORE the 'Plugin X does not contain any generators' message below!");
+        Plugin[] plugins = this.plugin.getServer().getPluginManager().getPlugins();
+        List<String> generators = new ArrayList<String>();
+        for (Plugin p : plugins) {
+            if (p.isEnabled() && p.getDefaultWorldGenerator("world", "") != null) {
+                generators.add(p.getDescription().getName());
+            }
+        }
+        sender.sendMessage(ChatColor.AQUA + "--- Loaded Generator Plugins ---");
+        String loadedGens = "";
+        boolean altColor = false;
+        for (String s : generators) {
+            loadedGens += (altColor ? ChatColor.YELLOW : ChatColor.WHITE) + s + " ";
+            altColor = !altColor;
+        }
+        if (loadedGens.length() == 0) {
+            loadedGens = ChatColor.RED + "No Generator Plugins found.";
+        }
+        sender.sendMessage(loadedGens);
    }
 }
@@ -0,0 +1,98 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.pneumaticraft.commandhandler.Command;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Displays a nice help menu.
+ */
+public class HelpCommand extends PaginatedCoreCommand<Command> {
+
+    public HelpCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Get Help with Multiverse");
+        this.setCommandUsage("/mv " + ChatColor.GOLD + "[FILTER] [PAGE #]");
+        this.setArgRange(0, 2);
+        this.addKey("mv");
+        this.addKey("mvh");
+        this.addKey("mvhelp");
+        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);
+        this.setItemsPerPage(7); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+    }
+
+    @Override
+    protected List<Command> getFilteredItems(List<Command> availableItems, String filter) {
+        String expression = "(?i).*" + cleanFilter(filter) + ".*";
+        List<Command> filtered = new ArrayList<Command>();
+
+        for (Command c : availableItems) {
+            if (stitchThisString(c.getKeyStrings()).matches(expression)
+                    || c.getCommandName().matches(expression)
+                    || c.getCommandDesc().matches(expression)
+                    || c.getCommandUsage().matches(expression)
+                    || c.getCommandExamples().stream().anyMatch(eg -> eg.matches(expression))) {
+                filtered.add(c);
+            }
+        }
+        return filtered;
+    }
+
+    @Override
+    protected String getItemText(Command item) {
+        return ChatColor.AQUA + item.getCommandUsage();
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        sender.sendMessage(ChatColor.AQUA + "====[ Multiverse Help ]====");
+
+        FilterObject filterObject = this.getPageAndFilter(args);
+
+        List<Command> availableCommands = new ArrayList<Command>(this.plugin.getCommandHandler().getCommands(sender));
+        if (filterObject.getFilter().length() > 0) {
+            availableCommands = this.getFilteredItems(availableCommands, filterObject.getFilter());
+            if (availableCommands.size() == 0) {
+                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE
+                        + "No commands matched your filter: " + ChatColor.AQUA + filterObject.getFilter());
+                return;
+            }
+        }
+
+        if (!(sender instanceof Player)) {
+            sender.sendMessage(ChatColor.AQUA + " Add a '" + ChatColor.DARK_PURPLE + "?" + ChatColor.AQUA + "' after a command to see more about it.");
+            for (Command c : availableCommands) {
+                sender.sendMessage(ChatColor.AQUA + c.getCommandUsage());
+            }
+            return;
+        }
+
+        int totalPages = (int) Math.ceil(availableCommands.size() / (this.itemsPerPage + 0.0));
+
+        if (filterObject.getPage() > totalPages) {
+            filterObject.setPage(totalPages);
+        }
+
+        sender.sendMessage(ChatColor.AQUA + " Page " + filterObject.getPage() + " of " + totalPages);
+        sender.sendMessage(ChatColor.AQUA + " Add a '" + ChatColor.DARK_PURPLE + "?" + ChatColor.AQUA + "' after a command to see more about it.");
+
+        this.showPage(filterObject.getPage(), sender, availableCommands);
+    }
+}
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,66 +7,131 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Conditions;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagGroup;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagResult;
-import com.onarandombox.MultiverseCore.commandtools.flag.CoreFlags;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.utils.WorldNameChecker;
+import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
+import org.bukkit.World.Environment;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.bukkit.permissions.PermissionDefault;

-import static org.bukkit.World.*;
+import java.io.File;
+import java.util.Collection;
+import java.util.List;

-@CommandAlias("mv")
-public class ImportCommand extends MultiverseCoreCommand {
+/**
+ * Imports a new world of the specified type.
+ */
+public class ImportCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;

    public ImportCommand(MultiverseCore plugin) {
        super(plugin);
-        this.setFlagGroup(FlagGroup.of(CoreFlags.GENERATOR, CoreFlags.SPAWN_ADJUST));
+        this.setName("Import World");
+        this.setCommandUsage("/mv import" + ChatColor.GREEN + " {NAME} {ENV}" + ChatColor.GOLD + " -g [GENERATOR[:ID]] [-n]");
+        this.setArgRange(1, 5); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        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("To import a world that uses a generator, you'll need the generator:");
+        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();
    }

-    @Subcommand("import")
-    @CommandPermission("multiverse.core.import")
-    @Syntax("<name> <env> -g [generator[:id]] [-n]")
-    @CommandCompletion("@potentialWorlds @environments @flags")
-    @Description("Imports a new world into multiverse.")
-    public void onImportCommand(@NotNull CommandSender sender,
+    private String getPotentialWorldStrings() {
+        final Collection<String> potentialWorlds = this.worldManager.getPotentialWorlds();
+        StringBuilder worldList = new StringBuilder();
+        ChatColor currColor = ChatColor.WHITE;

-                                @Syntax("<name>")
-                                @Description("Folder name of the world.")
-                                @NotNull @co.aikar.commands.annotation.Flags("trim") @Conditions("importableWorldName") String worldName,
+        for (String world : potentialWorlds) {
+            worldList.append(currColor).append(world).append(' ');
+            currColor = currColor == ChatColor.WHITE ? ChatColor.YELLOW : ChatColor.WHITE;
+        }

-                                @NotNull
-                                @Syntax("<env>")
-                                @Description("The world's environment. See: /mv env")
-                                Environment environment,
-
-                                @Nullable
-                                @Syntax("-g [generator[:id]] [-n]")
-                                @Description("Other world settings. See: http://gg.gg/nn8c2")
-                                String[] flagsArray) {
-
-        FlagResult flags = this.getFlagGroup().calculateResult(flagsArray);
-
-        Command.broadcastCommandMessage(sender, String.format("Starting import of world '%s'...", worldName));
-        Command.broadcastCommandMessage(sender, (this.plugin.getMVWorldManager().addWorld(worldName,
-                environment,
-                null,
-                null,
-                null,
-                flags.getValue(CoreFlags.GENERATOR),
-                flags.getValue(CoreFlags.SPAWN_ADJUST))
-        )
-                ? String.format("%sComplete!", ChatColor.GREEN)
-                : String.format("%sFailed! See console for more details.", ChatColor.RED));
+        return worldList.toString();
    }
-}
+    
+    private String trimWorldName(String userInput) {
+        // Removes relative paths.
+        return userInput.replaceAll("^[./\\\\]+", "");
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        String worldName = trimWorldName(args.get(0));
+
+        if (worldName.toLowerCase().equals("--list") || worldName.toLowerCase().equals("-l")) {
+            String worldList = this.getPotentialWorldStrings();
+            if (worldList.length() > 2) {
+                sender.sendMessage(ChatColor.AQUA + "====[ These look like worlds ]====");
+                sender.sendMessage(worldList);
+            } else {
+                sender.sendMessage(ChatColor.RED + "No potential worlds found. Sorry!");
+            }
+            return;
+        }
+        // Since we made an exception for the list, we have to make sure they have at least 2 params:
+        // Note the exception is --list, which is covered above.
+        if (args.size() == 1 || worldName.length() < 1) {
+            this.showHelp(sender);
+            return;
+        }
+		
+		// Make sure the world name doesn't contain the words 'plugins' and '.dat'
+		if(worldName.contains("plugins")||worldName.contains(".dat")){
+			sender.sendMessage(ChatColor.RED + "Multiverse cannot create a world that contains 'plugins' or '.dat'");
+            return;
+		}
+
+        // Make sure we don't already know about this world.
+        if (this.worldManager.isMVWorld(worldName)) {
+            sender.sendMessage(ChatColor.GREEN + "Multiverse" + ChatColor.WHITE
+                    + " already knows about '" + ChatColor.AQUA + worldName + ChatColor.WHITE + "'!");
+            return;
+        }
+
+        File worldFile = new File(this.plugin.getServer().getWorldContainer(), worldName);
+
+        String generator = CommandHandler.getFlag("-g", args);
+        boolean useSpawnAdjust = true;
+        for (String s : args) {
+            if (s.equalsIgnoreCase("-n")) {
+                useSpawnAdjust = false;
+            }
+        }
+
+        String env = args.get(1);
+        Environment environment = EnvironmentCommand.getEnvFromString(env);
+        if (environment == null) {
+            sender.sendMessage(ChatColor.RED + "That is not a valid environment.");
+            EnvironmentCommand.showEnvironments(sender);
+            return;
+        }
+
+        if (!worldFile.exists()) {
+            sender.sendMessage(ChatColor.RED + "FAILED.");
+            String worldList = this.getPotentialWorldStrings();
+            sender.sendMessage("That world folder does not exist. These look like worlds to me:");
+            sender.sendMessage(worldList);
+        } else if (!WorldNameChecker.isValidWorldFolder(worldFile)) {
+            sender.sendMessage(ChatColor.RED + "FAILED.");
+            sender.sendMessage(String.format("'%s' does not appear to be a world. It is lacking a .dat file.",
+                                             worldName));
+        } else if (env == null) {
+            sender.sendMessage(ChatColor.RED + "FAILED.");
+            sender.sendMessage("That world environment did not exist.");
+            sender.sendMessage("For a list of available world types, type: " + ChatColor.AQUA + "/mvenv");
+        } else {
+            Command.broadcastCommandMessage(sender, String.format("Starting import of world '%s'...", worldName));
+            if (this.worldManager.addWorld(worldName, environment, null, null, null, generator, useSpawnAdjust))
+                Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Complete!");
+            else
+                Command.broadcastCommandMessage(sender, ChatColor.RED + "Failed!");
+        }
+    }
+}
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,141 +7,268 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Default;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Flags;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.FancyText;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.displaytools.ColorAlternator;
-import com.onarandombox.MultiverseCore.displaytools.ContentDisplay;
-import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers;
-import com.onarandombox.MultiverseCore.displaytools.DisplaySettings;
+import com.onarandombox.MultiverseCore.utils.FancyColorScheme;
+import com.onarandombox.MultiverseCore.utils.FancyHeader;
+import com.onarandombox.MultiverseCore.utils.FancyMessage;
 import org.bukkit.ChatColor;
-import org.bukkit.World;
+import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;

 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;

-@CommandAlias("mv")
-public class InfoCommand extends MultiverseCoreCommand {
+// Will use when we can compile with JDK 6
+//import com.sun.xml.internal.ws.util.StringUtils;
+
+/**
+ * Returns detailed information about a world.
+ */
+public class InfoCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;

    public InfoCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("World Information");
+        this.setCommandUsage("/mv info" + ChatColor.GOLD + " [WORLD] [PAGE]");
+        this.setArgRange(0, 2);
+        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();
    }

-    @Subcommand("info")
-    @CommandPermission("multiverse.core.info")
-    @Syntax("[world] [page]")
-    @CommandCompletion("@MVWorlds @range:1-5")
-    @Description("Display detailed information of the world.")
-    public void onInfoCommand(@NotNull CommandSender sender,
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // Check if the command was sent from a Player.
+        String worldName = "";
+        int pageNum = 0;

-                              @NotNull
-                              @Syntax("[world]")
-                              @Description("World you want to see info.")
-                              @Flags("other,defaultself,fallbackself") MultiverseWorld world,
+        if (args.size() == 0) {
+            if (sender instanceof Player) {
+                Player p = (Player) sender;
+                worldName = p.getWorld().getName();
+            } else {
+                sender.sendMessage("You must enter a" + ChatColor.LIGHT_PURPLE + " world" + ChatColor.WHITE + " from the console!");
+                return;
+            }
+        } else if (args.size() == 1) {
+            if (this.worldManager.isMVWorld(args.get(0))) {
+                // then we have a world!
+                worldName = args.get(0);
+            } else if (this.worldManager.getUnloadedWorlds().contains(args.get(0))) {
+                sender.sendMessage("That world exists, but it is unloaded!");
+                sender.sendMessage(String.format("You can load it with: %s/mv load %s", ChatColor.AQUA, args.get(0)));
+                return;
+            } else {
+                if (sender instanceof Player) {
+                    Player p = (Player) sender;
+                    worldName = p.getWorld().getName();
+                    try {
+                        pageNum = Integer.parseInt(args.get(0)) - 1;
+                    } catch (NumberFormatException e) {
+                        sender.sendMessage("That world does not exist.");
+                        return;
+                    }
+                } else {
+                    sender.sendMessage("You must enter a" + ChatColor.LIGHT_PURPLE + " world" + ChatColor.WHITE + " from the console!");
+                    return;
+                }
+            }
+        } else if (args.size() == 2) {
+            worldName = args.get(0);
+            try {
+                pageNum = Integer.parseInt(args.get(1)) - 1;
+            } catch (NumberFormatException e) {
+                pageNum = 0;
+            }
+        }

-                              @Syntax("[page]")
-                              @Description("Info page to display.")
-                              @Default("1") int page) {
-
-        new ContentDisplay.Builder<Collection<String>>()
-                .sender(sender)
-                .contents(buildWorldInfoContent(world))
-                .displayHandler(DisplayHandlers.PAGE_LIST)
-                .colorTool(ColorAlternator.with(ChatColor.YELLOW, ChatColor.AQUA)).setting(DisplaySettings.SHOW_PAGE, page)
-                .display();
+        if (this.worldManager.isMVWorld(worldName)) {
+            Player p = null;
+            if (sender instanceof Player) {
+                p = (Player) sender;
+            }
+            showPage(pageNum, sender, this.buildEntireCommand(this.worldManager.getMVWorld(worldName), p));
+        } else if (this.worldManager.getUnloadedWorlds().contains(worldName)) {
+            sender.sendMessage("That world exists, but it is unloaded!");
+            sender.sendMessage(String.format("You can load it with: %s/mv load %s", ChatColor.AQUA, worldName));
+        } else if (this.plugin.getServer().getWorld(worldName) != null) {
+            sender.sendMessage("That world exists, but Multiverse does not know about it!");
+            sender.sendMessage("You can import it with" + ChatColor.AQUA + "/mv import " + ChatColor.GREEN + worldName + ChatColor.LIGHT_PURPLE + "{ENV}");
+            sender.sendMessage("For available environments type " + ChatColor.GREEN + "/mv env");
+        }
    }

-    private List<String> buildWorldInfoContent(MultiverseWorld world) {
-        List<String> contents = new ArrayList<>(38);
-
+    private List<List<FancyText>> buildEntireCommand(MultiverseWorld world, Player p) {
+        List<FancyText> message = new ArrayList<FancyText>();
+        List<List<FancyText>> worldInfo = new ArrayList<List<FancyText>>();
        // Page 1
-        contents.add(parseHeader("General Info"));
-        contents.add(String.format("World Name: %s%s", ChatColor.WHITE, world.getName()));
-        contents.add(String.format("World Alias: %s%s", ChatColor.WHITE,  world.getColoredWorldString()));
-        contents.add(String.format("Game Mode: %s%s", ChatColor.WHITE, world.getGameMode().toString()));
-        contents.add(String.format("Difficulty: %s%s", ChatColor.WHITE, world.getDifficulty().toString()));
-        contents.add(String.format("Spawn Location: %s%s", ChatColor.WHITE, this.plugin.getLocationManipulation().strCoords(world.getSpawnLocation())));
-        contents.add(String.format("World Seed: %s%s", ChatColor.WHITE, world.getSeed()));
-        String priceString = (world.getPrice() == 0)
-                ? String.format("%sFREE!", ChatColor.GREEN)
-                : plugin.getEconomist().formatPrice(-world.getPrice(), world.getCurrency());
-        contents.add(String.format((world.getPrice() >= 0)
-                ? "Price to enter this world: %s%s"
-                : "Reward for entering this world: %s%s", ChatColor.WHITE, priceString));
-        World respawnWorld = world.getRespawnToWorld();
-        MultiverseWorld respawn = this.plugin.getMVWorldManager().getMVWorld(respawnWorld);
-        String respawnWorldString = (respawn != null)
-                ? respawn.getColoredWorldString()
-                : ChatColor.RED + "!!INVALID!!";
-        contents.add(String.format("Players will respawn in: %s%s", ChatColor.WHITE, respawnWorldString));
-        contents.add(ContentDisplay.LINE_BREAK);
+        FancyColorScheme colors = new FancyColorScheme(ChatColor.AQUA, ChatColor.AQUA, ChatColor.GOLD, ChatColor.WHITE);
+        message.add(new FancyHeader("General Info", colors));
+        message.add(new FancyMessage("World Name: ", world.getName(), colors));
+        message.add(new FancyMessage("World UID: ", world.getCBWorld().getUID().toString(), colors));
+        message.add(new FancyMessage("World Alias: ", world.getColoredWorldString(), colors));
+        message.add(new FancyMessage("Game Mode: ", world.getGameMode().toString(), colors));
+        message.add(new FancyMessage("Difficulty: ", world.getDifficulty().toString(), colors));

+        //message.add(new FancyMessage("Game Mode: ", StringUtils.capitalize(world.getGameMode().toString()), colors));
+        Location spawn = world.getSpawnLocation();
+        message.add(new FancyMessage("Spawn Location: ", plugin.getLocationManipulation().strCoords(spawn), colors));
+        message.add(new FancyMessage("World Scale: ", String.valueOf(world.getScaling()), colors));
+        message.add(new FancyMessage("World Seed: ", String.valueOf(world.getSeed()), colors));
+        if (world.getPrice() > 0) {
+            message.add(new FancyMessage("Price to enter this world: ",
+                    plugin.getEconomist().formatPrice(world.getPrice(), world.getCurrency()),
+                    colors));
+        } else if (world.getPrice() < 0) {
+            message.add(new FancyMessage("Reward for entering this world: ",
+                    plugin.getEconomist().formatPrice(-world.getPrice(), world.getCurrency()),
+                    colors));
+        } else {
+            message.add(new FancyMessage("Price to enter this world: ", ChatColor.GREEN + "FREE!", colors));
+        }
+
+        if (world.getRespawnToWorld() != null) {
+            MultiverseWorld respawn = this.worldManager.getMVWorld(world.getRespawnToWorld());
+            if (respawn != null) {
+                message.add(new FancyMessage("Players will respawn in: ", respawn.getColoredWorldString(), colors));
+            } else {
+                message.add(new FancyMessage("Players will respawn in: ", ChatColor.RED + "!!INVALID!!", colors));
+            }
+
+        }
+
+        worldInfo.add(message);
        // Page 2
-        contents.add(parseHeader("More World Settings"));
-        contents.add(String.format("World UID: %s%s", ChatColor.WHITE, world.getCBWorld().getUID()));
-        contents.add(String.format("World Type: %s%s", ChatColor.WHITE, world.getWorldType().toString()));
-        contents.add(String.format("World Scale: %s%s", ChatColor.WHITE, world.getScaling()));
-        contents.add(String.format("Generator: %s%s", ChatColor.WHITE, world.getGenerator()));
-        contents.add(String.format("Structures: %s%s", ChatColor.WHITE, world.getCBWorld().canGenerateStructures()));
-        contents.add(String.format("Weather: %s%s", ChatColor.WHITE, world.isWeatherEnabled()));
-        contents.add(String.format("Players will get hungry: %s%s", ChatColor.WHITE, world.getHunger()));
-        contents.add(String.format("Keep spawn in memory: %s%s", ChatColor.WHITE, world.isKeepingSpawnInMemory()));
-        contents.add(ContentDisplay.LINE_BREAK);
-
+        message = new ArrayList<FancyText>();
+        message.add(new FancyHeader("More World Settings", colors));
+        message.add(new FancyMessage("World Type: ", world.getWorldType().toString(), colors));
+        message.add(new FancyMessage("Generator: ", world.getGenerator(), colors));
+        message.add(new FancyMessage("Structures: ", world.getCBWorld().canGenerateStructures() + "", colors));
+        message.add(new FancyMessage("Weather: ", world.isWeatherEnabled() + "", colors));
+        message.add(new FancyMessage("Players will get hungry: ", world.getHunger() + "", colors));
+        message.add(new FancyMessage("Keep spawn in memory: ", world.isKeepingSpawnInMemory() + "", colors));
+        message.add(new FancyHeader("PVP Settings", colors));
+        message.add(new FancyMessage("Multiverse Setting: ", world.isPVPEnabled() + "", colors));
+        message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getPVP() + "", colors));
+        worldInfo.add(message);
        // Page 3
-        contents.add(parseHeader("PVP Settings"));
-        contents.add(String.format("Multiverse Setting: %s%s", ChatColor.WHITE, world.isPVPEnabled()));
-        contents.add(String.format("Bukkit Setting: %s%s", ChatColor.WHITE, world.getCBWorld().getPVP()));
-        contents.add(ContentDisplay.LINE_BREAK);
+        message = new ArrayList<FancyText>();
+        message.add(new FancyHeader("Monster Settings", colors));
+        message.add(new FancyMessage("Multiverse Setting: ", world.canMonstersSpawn() + "", colors));
+        message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getAllowMonsters() + "", colors));
+        if (world.getMonsterList().size() > 0) {
+            if (world.canMonstersSpawn()) {
+                message.add(new FancyMessage("Monsters that" + ChatColor.RED + " CAN NOT "
+                        + ChatColor.GREEN + "spawn: ", toCommaSeperated(world.getMonsterList()), colors));
+            } else {
+                message.add(new FancyMessage("Monsters that" + ChatColor.GREEN + " CAN SPAWN: ", toCommaSeperated(world.getMonsterList()), colors));
+            }
+        } else {
+            message.add(new FancyMessage("Monsters that CAN spawn: ", world.canMonstersSpawn() ? "ALL" : "NONE", colors));
+        }
+        worldInfo.add(message);

        // Page 4
-        contents.add(parseHeader("Monster Settings"));
-        contents.add(String.format("Multiverse Setting: %s%s", ChatColor.WHITE, world.canMonstersSpawn()));
-        contents.add(String.format("Bukkit Setting: %s%s", ChatColor.WHITE, world.getCBWorld().getAllowMonsters()));
-        contents.add((world.canMonstersSpawn())
-                ? String.format("Monsters that %scannot spawn: %s%s", ChatColor.RED, ChatColor.WHITE, toCommaSeparated(world.getMonsterList()))
-                : String.format("Monsters that %scan spawn: %s%s", ChatColor.GREEN, ChatColor.WHITE, toCommaSeparated(world.getMonsterList())));
-        contents.add(ContentDisplay.LINE_BREAK);
+        message = new ArrayList<FancyText>();
+        message.add(new FancyHeader("Animal Settings", colors));
+        message.add(new FancyMessage("Multiverse Setting: ", world.canAnimalsSpawn() + "", colors));
+        message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getAllowAnimals() + "", colors));
+        if (world.getAnimalList().size() > 0) {
+            if (world.canAnimalsSpawn()) {
+                message.add(new FancyMessage("Animals that" + ChatColor.RED + " CAN NOT "
+                        + ChatColor.GREEN + "spawn: ", toCommaSeperated(world.getAnimalList()), colors));
+            } else {
+                message.add(new FancyMessage("Animals that" + ChatColor.GREEN + " CAN SPAWN: ", toCommaSeperated(world.getAnimalList()), colors));
+            }
+        } else {
+            message.add(new FancyMessage("Animals that CAN spawn: ", world.canAnimalsSpawn() ? "ALL" : "NONE", colors));
+        }
+        worldInfo.add(message);

-        // Page 5
-        contents.add(parseHeader("Animal Settings"));
-        contents.add(String.format("Multiverse Setting: %s%s", ChatColor.WHITE, world.canAnimalsSpawn()));
-        contents.add(String.format("Bukkit Setting: %s%s", ChatColor.WHITE, world.getCBWorld().getAllowAnimals()));
-        contents.add((world.canAnimalsSpawn())
-                ? String.format("Animals that %scannot spawn: %s%s", ChatColor.RED, ChatColor.WHITE, toCommaSeparated(world.getAnimalList()))
-                : String.format("Animals that %scan spawn: %s%s", ChatColor.GREEN, ChatColor.WHITE, toCommaSeparated(world.getAnimalList())));
-
-        return contents;
+        return worldInfo;
    }

-    private String parseHeader(String header) {
-        return String.format("%s===[ %s %s]===", ChatColor.AQUA, header, ChatColor.AQUA);
-    }
-
-    private static String toCommaSeparated(List<String> list) {
+    private static String toCommaSeperated(List<String> list) {
        if (list == null || list.size() == 0) {
-            return ChatColor.GRAY + ChatColor.ITALIC.toString() + "none";
+            return "";
        }
        if (list.size() == 1) {
            return list.get(0);
        }
+        String result = list.get(0);

-        StringBuilder result = new StringBuilder(list.get(0));
        for (int i = 1; i < list.size() - 1; i++) {
-            result.append(", ").append(list.get(i));
+            result += ", " + list.get(i);
        }
-        result.append(" and ").append(list.get(list.size() - 1));
-
-        return result.toString();
+        result += " and " + list.get(list.size() - 1);
+        return result;
    }
+
+    /**
+     * Gets a "positive" or "negative" {@link ChatColor}.
+     *
+     * @param positive Whether this {@link ChatColor} should be "positive".
+     * @return The {@link ChatColor}.
+     */
+    protected ChatColor getChatColor(boolean positive) {
+        return positive ? ChatColor.GREEN : ChatColor.RED;
+    }
+
+    private static void showPage(int page, CommandSender sender, List<List<FancyText>> doc) {
+        page = page < 0 ? 0 : page;
+        page = page > doc.size() - 1 ? doc.size() - 1 : page;
+        boolean altColor = false;
+        boolean appendedPageNum = false;
+        if (sender instanceof Player) {
+            List<FancyText> list = doc.get(page);
+            for (FancyText fancyT : list) {
+                if (fancyT instanceof FancyMessage) {
+                    FancyMessage text = (FancyMessage) fancyT;
+                    text.setAltColor(altColor);
+                    altColor = !altColor;
+                    sender.sendMessage(text.getFancyText());
+                } else if (fancyT instanceof FancyHeader) {
+                    FancyHeader text = (FancyHeader) fancyT;
+                    if (!appendedPageNum) {
+                        text.appendText(ChatColor.DARK_PURPLE + " [ Page " + (page + 1) + " of " + doc.size() + " ]");
+                        appendedPageNum = true;
+                    }
+                    sender.sendMessage(text.getFancyText());
+                    altColor = false;
+                }
+            }
+
+        } else {
+            for (List<FancyText> list : doc) {
+                for (FancyText fancyT : list) {
+                    if (fancyT instanceof FancyMessage) {
+                        FancyMessage text = (FancyMessage) fancyT;
+                        text.setAltColor(altColor);
+                        altColor = !altColor;
+                        sender.sendMessage(text.getFancyText());
+                    } else {
+                        FancyText text = fancyT;
+                        if (appendedPageNum) {
+                            sender.sendMessage(" ");
+                        } else {
+                            appendedPageNum = true;
+                        }
+                        sender.sendMessage(text.getFancyText());
+                        altColor = false;
+                    }
+                }
+            }
+        }
+    }
+
 }
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,70 +7,87 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.commandtools.context.PageFilter;
-import com.onarandombox.MultiverseCore.displaytools.ColorAlternator;
-import com.onarandombox.MultiverseCore.displaytools.ContentDisplay;
-import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers;
-import com.onarandombox.MultiverseCore.displaytools.DisplaySettings;
+import com.onarandombox.MultiverseCore.display.ColorAlternator;
+import com.onarandombox.MultiverseCore.display.ContentDisplay;
+import com.onarandombox.MultiverseCore.display.ContentFilter;
+import com.onarandombox.MultiverseCore.display.DisplayHandlers;
+import com.onarandombox.MultiverseCore.display.settings.PagedDisplaySettings;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
 import org.jetbrains.annotations.NotNull;

-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;

-@CommandAlias("mv")
-public class ListCommand extends MultiverseCoreCommand {
+/**
+ * Displays a listing of all worlds that a player can enter.
+ */
+public class ListCommand extends MultiverseCommand {

    public ListCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("World Listing");
+        this.setCommandUsage("/mv list [filter] [page]");
+        this.setArgRange(0, 2);
+        this.addKey("mvlist");
+        this.addKey("mvl");
+        this.addKey("mv list");
+        this.setPermission("multiverse.core.list.worlds", "Displays a listing of all worlds that you can enter.", PermissionDefault.OP);
    }

-    @Subcommand("list")
-    @CommandPermission("multiverse.core.list.worlds")
-    @Syntax("[filter] [page]")
-    @Description("Displays a listing of all worlds that you can enter.")
-    public void onListCommand(@NotNull CommandSender sender,
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        ContentFilter filter = ContentFilter.DEFAULT;
+        int page = 1;

-                              @NotNull PageFilter pageFilter) {
+        // Either page or filter.
+        if (args.size() == 1) {
+            try {
+                page = Integer.parseInt(args.get(0));
+            } catch (NumberFormatException ignore) {
+                filter = new ContentFilter(args.get(0));
+            }
+        }

-        new ContentDisplay.Builder<Collection<String>>()
-                .sender(sender)
+        // Filter then page.
+        if (args.size() == 2) {
+            filter = new ContentFilter(args.get(0));
+            try {
+                page = Integer.parseInt(args.get(1));
+            } catch (NumberFormatException ignore) {
+                sender.sendMessage(ChatColor.RED + args.get(1) + " is not valid number!");
+            }
+        }
+
+        ContentDisplay.forContent(getListContents(sender))
                .header("%s====[ Multiverse World List ]====", ChatColor.GOLD)
-                .contents(getListContents(sender))
                .displayHandler(DisplayHandlers.PAGE_LIST)
                .colorTool(ColorAlternator.with(ChatColor.AQUA, ChatColor.GOLD))
-                .setting(DisplaySettings.SHOW_PAGE, pageFilter.getPage())
-                .display();
+                .filter(filter)
+                .setting(PagedDisplaySettings.SHOW_PAGE, page)
+                .show(sender);
    }

-    private List<String> getListContents(@NotNull CommandSender sender) {
+    private Collection<String> getListContents(@NotNull CommandSender sender) {
        Player player = (sender instanceof Player) ? (Player) sender : null;
-        List<String> worldList =  new ArrayList<>();

-        this.plugin.getMVWorldManager().getMVWorlds().stream()
+        List<String> worldList = this.plugin.getMVWorldManager().getMVWorlds().stream()
                .filter(world -> player == null || plugin.getMVPerms().canEnterWorld(player, world))
                .filter(world -> canSeeWorld(player, world))
                .map(world -> hiddenText(world) + world.getColoredWorldString() + " - " + parseColouredEnvironment(world.getEnvironment()))
-                .sorted()
-                .forEach(worldList::add);
+                .collect(Collectors.toList());

        this.plugin.getMVWorldManager().getUnloadedWorlds().stream()
                .filter(world -> plugin.getMVPerms().hasPermission(sender, "multiverse.access." + world, true))
                .map(world -> ChatColor.GRAY + world + " - UNLOADED")
-                .sorted()
                .forEach(worldList::add);
-
+        
        return worldList;
    }

@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,43 +7,36 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Conditions;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Flags;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.permissions.PermissionDefault;

-@CommandAlias("mv")
-public class LoadCommand extends MultiverseCoreCommand {
+import java.util.List;
+
+/**
+ * Loads a world into Multiverse.
+ */
+public class LoadCommand extends MultiverseCommand {

    public LoadCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("Load World");
+        this.setCommandUsage("/mv load" + ChatColor.GREEN + " {WORLD}");
+        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);
    }

-    @Subcommand("load")
-    @CommandPermission("multiverse.core.load")
-    @Syntax("<world>")
-    @CommandCompletion("@unloadedWorlds")
-    @Description("Loads a world. World must be already in worlds.yml, else please use /mv import.")
-    public void onLoadCommand(@NotNull CommandSender sender,
-
-                              @NotNull
-                              @Syntax("<world>")
-                              @Description("Name of world you want to load.")
-                              @Flags("type=world name")
-                              @Conditions("isUnloadedWorld") String worldName) {
-
-        if (!this.plugin.getMVWorldManager().loadWorld(worldName)) {
-            sender.sendMessage(String.format("Error trying to load world '%s'!", worldName));
-            return;
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (this.plugin.getMVWorldManager().loadWorld(args.get(0))) {
+            Command.broadcastCommandMessage(sender, "Loaded world '" + args.get(0) + "'!");
+        } else {
+            sender.sendMessage("Error trying to load world '" + args.get(0) + "'!");
        }
-        Command.broadcastCommandMessage(sender, String.format("Loaded world '%s'!", worldName));
    }
 }
@@ -0,0 +1,95 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.enums.Action;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+// This will contain all the properties that support the ADD/REMOVE
+// Anything not in here will only support the SET action
+
+/**
+ * Used to modify various aspects of worlds.
+ */
+public class ModifyAddCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;
+
+    public ModifyAddCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Modify a World (Add a value)");
+        this.setCommandUsage("/mv modify " + ChatColor.GREEN + "add {VALUE} {PROPERTY}" + ChatColor.GOLD + " [WORLD] ");
+        this.setArgRange(2, 3);
+        this.addKey("mvm add");
+        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();
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // We NEED a world from the command line
+        Player p = null;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        }
+
+        if (args.size() == 2 && p == null) {
+            sender.sendMessage(ChatColor.RED + "From the console, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        MultiverseWorld world;
+        String value = args.get(0);
+        String property = args.get(1);
+
+        if (args.size() == 2) {
+            world = this.worldManager.getMVWorld(p.getWorld().getName());
+        } else {
+            world = this.worldManager.getMVWorld(args.get(2));
+        }
+
+        if (world == null) {
+            sender.sendMessage("That world does not exist!");
+            return;
+        }
+
+        if (!ModifyCommand.validateAction(Action.Add, property)) {
+            sender.sendMessage("Sorry, you can't ADD to " + property);
+            sender.sendMessage("Please visit our Github Wiki for more information: https://goo.gl/OMGwzx");
+            return;
+        }
+
+        // TODO fix this
+        if (world.addToVariable(property, value)) {
+            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA
+                    + value + ChatColor.WHITE + " was " + ChatColor.GREEN + "added to " + ChatColor.GREEN + property);
+            if (!plugin.saveWorldConfig()) {
+                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+            }
+        } else {
+            sender.sendMessage(value + " could not be added to " + property);
+        }
+    }
+}
@@ -0,0 +1,92 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.enums.Action;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Removes all values from a world-property.
+ */
+public class ModifyClearCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;
+
+    public ModifyClearCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Modify a World (Clear a property)");
+        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " clear {PROPERTY}" + ChatColor.GOLD + " [WORLD]");
+        this.setArgRange(1, 2);
+        this.addKey("mvm clear");
+        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();
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // We NEED a world from the command line
+        Player p = null;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        }
+        if (args.size() == 1 && p == null) {
+            sender.sendMessage(ChatColor.RED + "From the console, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        MultiverseWorld world;
+        String property = args.get(0);
+
+        if (args.size() == 1) {
+            world = this.worldManager.getMVWorld(p.getWorld().getName());
+        } else {
+            world = this.worldManager.getMVWorld(args.get(1));
+        }
+
+        if (world == null) {
+            sender.sendMessage("That world does not exist!");
+            return;
+        }
+
+        if (!ModifyCommand.validateAction(Action.Clear, property)) {
+            sender.sendMessage("Sorry, you can't use CLEAR with " + property);
+            sender.sendMessage("Please visit our Github Wiki for more information: https://goo.gl/q1h01S");
+            return;
+        }
+        // TODO fix this
+        if (world.clearList(property)) {
+            sender.sendMessage(property + " was cleared. It contains 0 values now.");
+            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + property + ChatColor.WHITE + " was "
+                    + ChatColor.GREEN + "CLEARED" + ChatColor.WHITE + ". It contains " + ChatColor.LIGHT_PURPLE + "0" + ChatColor.WHITE + " values now.");
+            if (!plugin.saveWorldConfig()) {
+                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+            }
+        } else {
+            sender.sendMessage(ChatColor.RED + "Error: " + ChatColor.GOLD + property
+                    + ChatColor.WHITE + " was " + ChatColor.GOLD + "NOT" + ChatColor.WHITE + " cleared.");
+        }
+    }
+
+}
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,228 +7,70 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.InvalidCommandArgument;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Conditions;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Flags;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.displaytools.ContentDisplay;
-import com.onarandombox.MultiverseCore.displaytools.ContentFilter;
-import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers;
-import com.onarandombox.MultiverseCore.enums.EnglishChatColor;
-import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
+import com.onarandombox.MultiverseCore.enums.Action;
+import com.onarandombox.MultiverseCore.enums.AddProperties;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;

-import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;

-@CommandAlias("mv")
-@Subcommand("modify")
-//TODO API: Think why properties method for MultiverseWorld is deprecated.
-public class ModifyCommand extends MultiverseCoreCommand {
+/**
+ * Used to modify various aspects of worlds.
+ */
+public class ModifyCommand extends MultiverseCommand {

    public ModifyCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("Modify a World");
+        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " {set|add|remove|clear} ...");
+        this.setArgRange(2, 3);
+        this.addKey("mvm");
+        this.addKey("mvmodify");
+        this.addKey("mv modify");
+        Map<String, Boolean> children = new HashMap<String, Boolean>();
+        children.put("multiverse.core.modify.add", true);
+        children.put("multiverse.core.modify.modify", true);
+        children.put("multiverse.core.modify.clear", true);
+        children.put("multiverse.core.modify.remove", true);
+        Permission modify = new Permission("multiverse.core.modify",
+                "Modify various aspects of worlds. It requires add/set/clear/remove. See the examples below", PermissionDefault.OP, children);
+        this.addCommandExample(ChatColor.AQUA + "/mv modify set ?");
+        this.addCommandExample(ChatColor.GREEN + "/mv modify add ?");
+        this.addCommandExample(ChatColor.BLUE + "/mv modify clear ?");
+        this.addCommandExample(ChatColor.RED + "/mv modify remove ?");
+        this.setPermission(modify);
    }

-    @Subcommand("set")
-    @CommandPermission("multiverse.core.modify.set")
-    @Syntax("<property> <value> [world]")
-    @CommandCompletion("@setProperties @empty @MVWorlds")
-    @Description("Modify various aspects of worlds by setting a property. For more info; https://tinyurl.com/nehhzp6")
-    public void onModifySetCommand(@NotNull CommandSender sender,
-
-                                   @NotNull
-                                   @Syntax("<property>")
-                                   @Description("Property option key.")
-                                   @Flags("type=property")
-                                   @Conditions("validAddProperty:set") String property,
-
-                                   @NotNull
-                                   @Syntax("<value>")
-                                   @Description("New property value.")
-                                   @Flags("type=property value") String value,
-
-                                   @NotNull
-                                   @Syntax("[world]")
-                                   @Description("World that you want property change to apply.")
-                                   @Flags("other,defaultself") MultiverseWorld world) {
-
-        if ((property.equalsIgnoreCase("aliascolor")
-                || property.equalsIgnoreCase("color"))
-                && !EnglishChatColor.isValidAliasColor(value)) {
-            sender.sendMessage(String.format("%s'%s' is not a valid color. Please pick one of the following:",
-                    ChatColor.RED, value));
-            sender.sendMessage(EnglishChatColor.getAllColors());
-            return;
-        }
-
-        try {
-            if (!world.setPropertyValue(property, value)) {
-                sender.sendMessage(ChatColor.RED + world.getPropertyHelp(property));
-                return;
-            }
-        }
-        catch (PropertyDoesNotExistException e) {
-            sender.sendMessage(String.format("%sSorry, You can't set '%s%s%s'!", ChatColor.RED, ChatColor.GRAY, property, ChatColor.RED));
-            sender.sendMessage(String.format("Valid world-properties: %s", world.getAllPropertyNames()));
-            return;
-        }
-
-        sender.sendMessage(String.format("%sSuccess! %sProperty %s%s %swas set to %s%s%s.",
-                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, property, ChatColor.WHITE, ChatColor.GREEN, value, ChatColor.WHITE));
-        saveWorldConfig();
-    }
-
-    @Subcommand("add")
-    @CommandPermission("multiverse.core.modify.add")
-    @Syntax("<property> <value> [world]")
-    @CommandCompletion("@addProperties @empty @MVWorlds")
-    @Description("Modify various aspects of worlds by adding a property. For more info: https://tinyurl.com/nehhzp6")
-    public void onModifyAddCommand(@NotNull CommandSender sender,
-
-                                   @NotNull
-                                   @Syntax("<property>")
-                                   @Description("Property option key.")
-                                   @Flags("type=property")
-                                   @Conditions("validAddProperty:add") String property,
-
-                                   @NotNull
-                                   @Syntax("<value>")
-                                   @Description("Property value to add.")
-                                   @Flags("type=property value") String value,
-
-                                   @NotNull
-                                   @Syntax("[world]")
-                                   @Description("World that you want property change to apply.")
-                                   @Flags("other,defaultself") MultiverseWorld world) {
-
-        if (!world.addToVariable(property, value)) {
-            sender.sendMessage(String.format("%s %scould not be added to %s%s%s.",
-                    value, ChatColor.RED, ChatColor.AQUA, property, ChatColor.RED));
-            return;
-        }
-
-        sender.sendMessage(String.format("%sSuccess! %s%s%s was added to %s%s%s.",
-                ChatColor.GREEN, ChatColor.AQUA, value, ChatColor.WHITE, ChatColor.GREEN, property, ChatColor.WHITE));
-
-        saveWorldConfig();
-    }
-
-    @Subcommand("remove")
-    @CommandPermission("multiverse.core.modify.remove")
-    @Syntax("<property> <value> [world]")
-    @CommandCompletion("@addProperties @empty @MVWorlds")
-    @Description("Modify various aspects of worlds by removing a property. For more info: https://tinyurl.com/nehhzp6")
-    public void onModifyRemoveCommand(@NotNull CommandSender sender,
-
-                                      @NotNull
-                                      @Syntax("<property>")
-                                      @Description("Property option key.")
-                                      @Flags("type=property")
-                                      @Conditions("validAddProperty:remove") String property,
-
-                                      @NotNull
-                                      @Syntax("<value>")
-                                      @Description("Property value to remove.")
-                                      @Flags("type=property value") String value,
-
-                                      @NotNull
-                                      @Syntax("[world]")
-                                      @Description("World that you want property change to apply.")
-                                      @Flags("other,defaultself") MultiverseWorld world) {
-
-        if (!world.removeFromVariable(property, value)) {
-            sender.sendMessage(String.format("%sThere was an error removing %s%s%s from %s%s%s!",
-                    ChatColor.RED, ChatColor.GRAY, value, ChatColor.RED, ChatColor.GRAY, property, ChatColor.RED));
-            return;
-        }
-
-        sender.sendMessage(String.format("%sSuccess! %s%s%s was %sremoved %sfrom %s%s%s.",
-                ChatColor.GREEN, ChatColor.AQUA, value, ChatColor.WHITE, ChatColor.RED, ChatColor.WHITE, ChatColor.GREEN, property, ChatColor.WHITE));
-
-        saveWorldConfig();
-    }
-
-    @Subcommand("clear")
-    @CommandPermission("multiverse.core.modify.clear")
-    @Syntax("<property> <value> [world]")
-    @CommandCompletion("@addProperties @empty @MVWorlds")
-    @Description("Modify various aspects of worlds by clearing a property. For more info: https://tinyurl.com/nehhzp6")
-    public void onModifyClearCommand(@NotNull CommandSender sender,
-
-                                     @NotNull
-                                     @Syntax("<property>")
-                                     @Description("Property option key.")
-                                     @Flags("type=property") @Conditions("validAddProperty:clear") String property,
-
-                                     @NotNull
-                                     @Syntax("[world]")
-                                     @Description("World that you want property be cleared.")
-                                     @Flags("other,defaultself") MultiverseWorld world) {
-
-        if (!world.clearList(property)) {
-            sender.sendMessage(String.format("%sThere was an error clearing %s%s%s.",
-                    ChatColor.RED, ChatColor.GOLD, property, ChatColor.RED));
-        }
-
-        sender.sendMessage(String.format("%s%s%s was cleared. It contains 0 values now.",
-                ChatColor.GOLD, property, ChatColor.WHITE));
-
-        saveWorldConfig();
-    }
-
-    @Subcommand("list")
-    @CommandPermission("multiverse.core.modify.list")
-    @Syntax("[world] [filter]")
-    @CommandCompletion("@MVWorlds")
-    @Description("Show properties available to set.")
-    public void onModifyListCommand(@NotNull CommandSender sender,
-
-                                     @NotNull
-                                     @Syntax("[world]")
-                                     @Description("World that you want to see current property values set.")
-                                     @Flags("other,defaultself,fallbackself") MultiverseWorld world,
-
-                                     @NotNull ContentFilter filter) {
-
-        new ContentDisplay.Builder<Map<String, Object>>()
-                .sender(sender)
-                .header("%s===[ Property Values for %s%s ]===", ChatColor.GOLD, world.getColoredWorldString(), ChatColor.GOLD)
-                .contents(generateModifyList(world))
-                .emptyMessage("No properties found.")
-                .displayHandler(DisplayHandlers.INLINE_MAP)
-                .filter(filter)
-                .display();
-    }
-
-    private Map<String, Object> generateModifyList(MultiverseWorld world) {
-        Collection<String> properties = world.getAllPropertyTypes();
-        Map<String, Object> propMap = new HashMap<>(properties.size());
-        for (String property : properties) {
-            String value;
+    /**
+     * Validates the specified action.
+     *
+     * @param action The {@link Action}.
+     * @param property The property.
+     * @return Whether this action is valid.
+     */
+    protected static boolean validateAction(Action action, String property) {
+        if (action != Action.Set) {
            try {
-                value = world.getPropertyValue(property);
-            } catch (PropertyDoesNotExistException ignored) {
-                value = String.format("%s!!INAVLID!!", ChatColor.RED);
+                AddProperties.valueOf(property);
+                return true;
+            } catch (IllegalArgumentException e) {
+                return false;
            }
-            propMap.put(property, value);
        }
-        return propMap;
+        return false;
    }

-    private void saveWorldConfig() {
-        if (!this.plugin.saveWorldConfig()) {
-            throw new InvalidCommandArgument("There was an issue saving worlds.yml! Your changes will only be temporary.", false);
-        }
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // This is just a place holder. The real commands are in:
+        // ModifyAddCommand
+        // ModifyRemoveCommand
+        // ModifySetCommand
+        // ModifyClearCommand
    }
 }
@@ -0,0 +1,97 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.enums.Action;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Removes values from a world-property.
+ */
+public class ModifyRemoveCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;
+
+    public ModifyRemoveCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Modify a World (Remove a value)");
+        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " remove {PROPERTY} {VALUE}" + ChatColor.GOLD + " [WORLD]");
+        this.setArgRange(2, 3);
+        this.addKey("mvm remove");
+        this.addKey("mvmremove");
+        this.addKey("mv modify remove");
+        this.addKey("mvmodify remove");
+        this.addKey("mvm delete");
+        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();
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // We NEED a world from the command line
+        Player p = null;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        }
+
+        if (args.size() == 2 && p == null) {
+            sender.sendMessage(ChatColor.RED + "From the console, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        MultiverseWorld world;
+        String value = args.get(0);
+        String property = args.get(1);
+
+        if (args.size() == 2) {
+            world = this.worldManager.getMVWorld(p.getWorld().getName());
+        } else {
+            world = this.worldManager.getMVWorld(args.get(2));
+        }
+
+        if (world == null) {
+            sender.sendMessage("That world does not exist!");
+            return;
+        }
+
+        if (!ModifyCommand.validateAction(Action.Remove, property)) {
+            sender.sendMessage("Sorry, you can't REMOVE anything from" + property);
+            sender.sendMessage("Please visit our Github Wiki for more information: https://goo.gl/OMGwzx");
+            return;
+        }
+        // TODO fix this
+        if (world.removeFromVariable(property, value)) {
+            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + value + ChatColor.WHITE
+                    + " was " + ChatColor.RED + "removed from " + ChatColor.GREEN + property);
+            if (!plugin.saveWorldConfig()) {
+                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+            }
+        } else {
+            sender.sendMessage(ChatColor.RED + "There was an error removing " + ChatColor.GRAY
+                    + value + ChatColor.WHITE + " from " + ChatColor.GOLD + property);
+        }
+    }
+
+}
@@ -0,0 +1,125 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.enums.EnglishChatColor;
+import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Used to set world-properties.
+ */
+public class ModifySetCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;
+
+    public ModifySetCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.worldManager = this.plugin.getMVWorldManager();
+        this.setName("Modify a World (Set a value)");
+        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " set {PROPERTY} {VALUE}" + ChatColor.GOLD + " [WORLD]");
+        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 + "heal " + ChatColor.RED + "true");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "adjustspawn " + 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);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // Special case for spawn:
+        if (args.size() == 1) {
+            if (!(sender instanceof Player)) {
+                sender.sendMessage("You must be a player to set the" + ChatColor.GREEN + " spawn");
+                return;
+            }
+            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) {
+            p = (Player) sender;
+        }
+
+        if (args.size() == 2 && p == null) {
+            sender.sendMessage("From the command line, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        MultiverseWorld world;
+        String value = args.get(1);
+        String property = args.get(0);
+
+        if (args.size() == 2) {
+            world = this.worldManager.getMVWorld(p.getWorld().getName());
+        } else {
+            world = this.worldManager.getMVWorld(args.get(2));
+        }
+
+        if (world == null) {
+            sender.sendMessage("That world does not exist!");
+            return;
+        }
+
+        if ((property.equalsIgnoreCase("aliascolor") || property.equalsIgnoreCase("color")) && !EnglishChatColor.isValidAliasColor(value)) {
+            sender.sendMessage(value + " is not a valid color. Please pick one of the following:");
+            sender.sendMessage(EnglishChatColor.getAllColors());
+            return;
+        }
+        try {
+            if (world.setPropertyValue(property, value)) {
+                sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Property " + ChatColor.AQUA + property
+                        + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value);
+                if (!plugin.saveWorldConfig()) {
+                    sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+                }
+            } else {
+                sender.sendMessage(ChatColor.RED + world.getPropertyHelp(property));
+            }
+        } catch (PropertyDoesNotExistException e) {
+            sender.sendMessage(ChatColor.RED + "Sorry, You can't set: '" + ChatColor.GRAY + property + ChatColor.RED + "'");
+            sender.sendMessage("Valid world-properties: " + world.getAllPropertyNames());
+        }
+    }
+}
@@ -0,0 +1,40 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MultiverseMessaging;
+import com.pneumaticraft.commandhandler.Command;
+import org.bukkit.command.CommandSender;
+
+import java.util.List;
+
+/**
+ * A generic Multiverse-command.
+ */
+public abstract class MultiverseCommand extends Command {
+
+    /**
+     * The reference to the core.
+     */
+    protected MultiverseCore plugin;
+    /**
+     * The reference to {@link MultiverseMessaging}.
+     */
+    protected MultiverseMessaging messaging;
+
+    public MultiverseCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.plugin = plugin;
+        this.messaging = this.plugin.getMessaging();
+    }
+
+    @Override
+    public abstract void runCommand(CommandSender sender, List<String> args);
+
+}
@@ -0,0 +1,177 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.pneumaticraft.commandhandler.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * A generic paginated command.
+ * @param <T> The type of items on the page.
+ */
+public abstract class PaginatedCommand<T> extends Command {
+    private final Pattern REGEX_SPECIAL_CHARS = Pattern.compile("[.+*?\\[^\\]$(){}=!<>|:-\\\\]");
+    private static final int DEFAULT_ITEMS_PER_PAGE = 9;
+    /**
+     * The number of items per page.
+     */
+    protected int itemsPerPage = DEFAULT_ITEMS_PER_PAGE;
+
+    public PaginatedCommand(JavaPlugin plugin) {
+        super(plugin);
+    }
+
+    /**
+     * Set the number of items per page.
+     *
+     * @param items The new number of items per page.
+     */
+    protected void setItemsPerPage(int items) {
+        itemsPerPage = items;
+    }
+
+    /**
+     * Gets filtered items.
+     *
+     * @param availableItems All available items.
+     * @param filter The filter-{@link String}.
+     * @return A list of items that match the filter.
+     */
+    protected abstract List<T> getFilteredItems(List<T> availableItems, String filter);
+
+    /**
+     * Escape regex special characters from filter
+     *
+     * @param filter The filter-{@link String}.
+     * @return String with regex characters escaped
+     */
+    protected String cleanFilter(String filter) {
+        return REGEX_SPECIAL_CHARS.matcher(filter).replaceAll("\\\\$0");
+    }
+
+    /**
+     * Constructs a single string from a list of strings.
+     *
+     * @param list The {@link List} of strings.
+     * @return A single {@link String}.
+     */
+    protected String stitchThisString(List<String> list) {
+        StringBuilder builder = new StringBuilder();
+        for (String s : list) {
+            builder.append(s);
+            builder.append(' ');
+        }
+        return builder.toString();
+    }
+
+    /**
+     * Shows a page.
+     *
+     * @param page The number of the page to show.
+     * @param sender The {@link CommandSender} that wants to see the page.
+     * @param cmds The items that should be displayed on the page.
+     */
+    protected void showPage(int page, CommandSender sender, List<T> cmds) {
+        // Ensure the page is at least 1.
+        page = (page <= 0) ? 1 : page;
+        int start = (page - 1) * itemsPerPage;
+        int end = start + itemsPerPage;
+
+        for (int i = start; i < end; i++) {
+            // For consistancy, print some extra lines if it's a player:
+            if (i < cmds.size()) {
+                sender.sendMessage(this.getItemText(cmds.get(i)));
+            } else if (sender instanceof Player) {
+                sender.sendMessage(" ");
+            }
+        }
+    }
+
+    /**
+     * Converts an item into a string.
+     *
+     * @param item The item.
+     * @return A {@link String}.
+     */
+    protected abstract String getItemText(T item);
+
+    /**
+     * Constructs a {@link FilterObject} from a {@link List} of arguments.
+     *
+     * @param args The {@link List} of arguments.
+     * @return The {@link FilterObject}.
+     */
+    protected FilterObject getPageAndFilter(List<String> args) {
+        int page = 1;
+
+        String filter = "";
+
+        if (args.size() == 0) {
+            filter = "";
+            page = 1;
+        } else if (args.size() == 1) {
+            try {
+                page = Integer.parseInt(args.get(0));
+            } catch (NumberFormatException ex) {
+                filter = args.get(0);
+                page = 1;
+            }
+        } else if (args.size() == 2) {
+            filter = args.get(0);
+            try {
+                page = Integer.parseInt(args.get(1));
+            } catch (NumberFormatException ex) {
+                page = 1;
+            }
+        }
+        return new FilterObject(page, filter);
+    }
+
+    /**
+     * "Key-Object" containing information about the page and the filter that were requested.
+     */
+    protected class FilterObject {
+        private Integer page;
+        private String filter;
+
+        public FilterObject(Integer page, String filter) {
+            this.page = page;
+            this.filter = filter;
+        }
+
+        /**
+         * Gets the page.
+         * @return The page.
+         */
+        public Integer getPage() {
+            return this.page;
+        }
+
+        /**
+         * Sets the page.
+         *
+         * @param page The new page.
+         */
+        public void setPage(int page) {
+            this.page = page;
+        }
+
+        /**
+         * Gets the filter.
+         * @return The filter.
+         */
+        public String getFilter() {
+            return this.filter;
+        }
+    }
+}
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -8,13 +8,19 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand;

-public abstract class MultiverseCoreCommand extends MultiverseCommand {
+/**
+ * A generic paginated Multiverse-command.
+ * @param <T> The type of items on the page.
+ */
+public abstract class PaginatedCoreCommand<T> extends PaginatedCommand<T> {
+    /**
+     * The reference to the core.
+     */
+    protected MultiverseCore plugin;

-    protected final MultiverseCore plugin;
-
-    protected MultiverseCoreCommand(MultiverseCore plugin) {
+    public PaginatedCoreCommand(MultiverseCore plugin) {
+        super(plugin);
        this.plugin = plugin;
    }
 }
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,77 +7,86 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Flags;
-import co.aikar.commands.annotation.Split;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.api.WorldPurger;
+import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;

-import java.util.Arrays;
-import java.util.Collection;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;

-@CommandAlias("mv")
-public class PurgeCommand extends MultiverseCoreCommand {
+/**
+ * Removes a type of mob from a world.
+ */
+public class PurgeCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;

    public PurgeCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("Purge World of Creatures");
+        this.setCommandUsage("/mv purge" + ChatColor.GOLD + " [WORLD|all] " + ChatColor.GREEN + "{all|animals|monsters|MOBNAME}");
+        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();
    }

-    @Subcommand("purgeall")
-    @CommandPermission("multiverse.core.purge.all")
-    @Syntax("<all|animals|monsters|mobname>")
-    @CommandCompletion("all|animals|monsters|@livingEntities")
-    @Description("Removed the specified type of mob from all worlds.")
-    public void onPurgeAllCommand(@NotNull CommandSender sender,
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        Player p = null;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        }
+        if (args.size() == 1 && p == null) {
+            sender.sendMessage("This command requires a WORLD when being run from the console!");
+            sender.sendMessage(this.getCommandUsage());
+            return;
+        }
+        String worldName = null;
+        String deathName = null;
+        if (args.size() == 1) {
+            worldName = p.getWorld().getName();
+            deathName = args.get(0);
+        } else {
+            worldName = args.get(0);
+            deathName = args.get(1);
+        }

-                                  @NotNull
-                                  @Syntax("<entities>")
-                                  @Description("Entity types that you want to remove from all worlds.")
-                                  @Split(",") String[] targetEntities) {
+        if (!worldName.equalsIgnoreCase("all") && !this.worldManager.isMVWorld(worldName)) {
+            this.plugin.showNotMVWorldMessage(sender, worldName);
+            sender.sendMessage("It cannot be purged.");
+            return;
+        }

-        doPurge(sender, this.plugin.getMVWorldManager().getMVWorlds(), targetEntities);
-    }
+        List<MultiverseWorld> worldsToRemoveEntitiesFrom = new ArrayList<MultiverseWorld>();
+        // Handle all case any user who names a world "all" should know better...
+        if (worldName.equalsIgnoreCase("all")) {
+            worldsToRemoveEntitiesFrom.addAll(this.worldManager.getMVWorlds());
+        } else {
+            worldsToRemoveEntitiesFrom.add(this.worldManager.getMVWorld(worldName));
+        }

-    @Subcommand("purge")
-    @CommandPermission("multiverse.core.purge")
-    @Syntax("<all|animals|monsters|mobname>")
-    @CommandCompletion("@MVWorlds|all|animals|monsters|@livingEntities all|animals|monsters|@livingEntities")
-    @Description("Removed the specified type of mob from the specified world.")
-    public void onPurgeCommand(@NotNull CommandSender sender,
-
-                               @NotNull
-                               @Syntax("[world]")
-                               @Description("World that you want to remove entities.")
-                               @Flags("other,defaultself,fallbackself") MultiverseWorld world,
-
-                               @NotNull
-                               @Syntax("<entities>")
-                               @Description("Entity types that you want to remove from a world.")
-                               @Split(",") String[] targetEntities) {
-
-        doPurge(sender, Collections.singleton(world), targetEntities);
-    }
-
-    private void doPurge(@NotNull CommandSender sender,
-                         @NotNull Collection<MultiverseWorld> targetWorlds,
-                         @NotNull String[] targetEntities) {
-
-        List<String> thingsToKill = Arrays.stream(targetEntities)
-                .map(String::toUpperCase)
-                .collect(Collectors.toList());
-
-        targetWorlds.forEach(w -> this.plugin.getMVWorldManager()
-                .getTheWorldPurger()
-                .purgeWorld(w, thingsToKill, false, false, sender));
+        WorldPurger purger = this.worldManager.getTheWorldPurger();
+        ArrayList<String> thingsToKill = new ArrayList<String>();
+        if (deathName.equalsIgnoreCase("all") || deathName.equalsIgnoreCase("animals") || deathName.equalsIgnoreCase("monsters")) {
+            thingsToKill.add(deathName.toUpperCase());
+        } else {
+            Collections.addAll(thingsToKill, deathName.toUpperCase().split(","));
+        }
+        for (MultiverseWorld w : worldsToRemoveEntitiesFrom) {
+            purger.purgeWorld(w, thingsToKill, false, false, sender);
+        }
    }
 }
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,75 +7,63 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Flags;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagGroup;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagResult;
-import com.onarandombox.MultiverseCore.commandtools.flag.CoreFlags;
 import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
+import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;

-@CommandAlias("mv")
-public class RegenCommand extends MultiverseCoreCommand {
+import java.util.List;
+
+/**
+ * Regenerates a world.
+ */
+public class RegenCommand extends MultiverseCommand {

    public RegenCommand(MultiverseCore plugin) {
        super(plugin);
-        this.setFlagGroup(FlagGroup.of(CoreFlags.RANDOM_SEED));
+        this.setName("Regenerates a World");
+        this.setCommandUsage("/mv regen" + ChatColor.GREEN + " {WORLD}" + ChatColor.GOLD + " [-s [SEED]] [--keep-gamerules]");
+        this.setArgRange(1, 4);
+        this.addKey("mvregen");
+        this.addKey("mv regen");
+        this.addCommandExample("You can use the -s with no args to get a new seed:");
+        this.addCommandExample("/mv regen " + ChatColor.GREEN + "MyWorld" + ChatColor.GOLD + " -s");
+        this.addCommandExample("or specifiy a seed to get that one:");
+        this.addCommandExample("/mv regen " + ChatColor.GREEN + "MyWorld" + ChatColor.GOLD + " -s" + ChatColor.AQUA + " gargamel");
+        this.setPermission("multiverse.core.regen", "Regenerates a world on your server. The previous state will be lost "
+                + ChatColor.RED + "PERMANENTLY.", PermissionDefault.OP);
    }

-    @Subcommand("regen")
-    @CommandPermission("multiverse.core.regen")
-    @Syntax("<world> [-s [seed]]")
-    @CommandCompletion("@MVWorlds @worldFlags:-s")
-    @Description("Regenerates a world on your server. The previous state will be lost PERMANENTLY.")
-    public void onRegenCommand(@NotNull CommandSender sender,
-
-                               @NotNull
-                               @Syntax("<world>")
-                               @Description("World that you want to regen.")
-                               @Flags("other") MultiverseWorld world,
-
-                               @Nullable
-                               @Syntax("[-s [seed]]")
-                               @Description("Other world settings. See: http://gg.gg/nn8lk")
-                               String[] flagsArray) {
-
-        FlagResult flags = this.getFlagGroup().calculateResult(flagsArray);
-
-        this.plugin.getMVCommandManager().getQueueManager().addToQueue(new QueuedCommand.Builder()
-                .sender(sender)
-                .action(regenRunnable(sender, world, flags))
-                .prompt("Are you sure you want to regen world '%s'?", world.getColoredWorldString())
-                .build()
-        );
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        String worldName = args.get(0);
+        boolean useseed = (!(args.size() == 1));
+        boolean randomseed = (args.size() == 2 && args.get(1).equalsIgnoreCase("-s"));
+        String seed = (args.size() == 3) ? args.get(2) : "";
+        boolean keepGamerules = CommandHandler.hasFlag("--keep-gamerules", args);
+        this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
+                sender,
+                doWorldRegen(sender, worldName, useseed, randomseed, seed, keepGamerules),
+                String.format("Are you sure you want to regen '%s'? You cannot undo this action.", worldName)
+        ));
    }

-    private Runnable regenRunnable(@NotNull CommandSender sender,
-                                   @NotNull MultiverseWorld world,
-                                   @NotNull FlagResult flags) {
+    private Runnable doWorldRegen(@NotNull CommandSender sender,
+                                  @NotNull String worldName,
+                                  boolean useSeed,
+                                  boolean randomSeed,
+                                  @NotNull String seed,
+                                  boolean keepGamerules) {

        return () -> {
-            sender.sendMessage(String.format("Regening world '%s'...", world.getName()));
-
-            //TODO: API should allow regen of unloaded worlds.
-            sender.sendMessage((this.plugin.getMVWorldManager().regenWorld(
-                    world.getName(),
-                    !flags.isDefaulted(CoreFlags.RANDOM_SEED),
-                    !flags.isByUserInput(CoreFlags.RANDOM_SEED),
-                    flags.getValue(CoreFlags.RANDOM_SEED))
-            )
-                    ? String.format("%sWorld Regenerated!", ChatColor.GREEN)
-                    : String.format("%sWorld could not be regenerated!", ChatColor.RED));
+            if (this.plugin.getMVWorldManager().regenWorld(worldName, useSeed, randomSeed, seed, keepGamerules)) {
+                sender.sendMessage(ChatColor.GREEN + "World Regenerated!");
+                return;
+            }
+            sender.sendMessage(ChatColor.RED + "World could NOT be regenerated!");
        };
    }
 }
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,44 +7,52 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.event.MVConfigReloadEvent;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.permissions.PermissionDefault;

 import java.util.ArrayList;
 import java.util.List;

-@CommandAlias("mv")
-public class ReloadCommand extends MultiverseCoreCommand {
+/**
+ * Reloads worlds.yml and config.yml.
+ */
+public class ReloadCommand extends MultiverseCommand {

-    public ReloadCommand(@NotNull MultiverseCore plugin) {
+    public ReloadCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("Reload Configs");
+        this.setCommandUsage("/mv reload");
+        this.setArgRange(0, 0);
+        this.addKey("mvreload");
+        this.addKey("mvr");
+        this.addKey("mv reload");
+        this.addCommandExample("/mv reload");
+        this.setPermission("multiverse.core.reload", "Reloads worlds.yml and config.yml.", PermissionDefault.OP);
    }

-    @Subcommand("reload")
-    @CommandPermission("multiverse.core.reload")
-    @Description("Reloads config files for all multiverse modules.")
-    public void onReloadCommand(@NotNull CommandSender sender) {
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
        sender.sendMessage(ChatColor.GOLD + "Reloading all Multiverse Plugin configs...");
        this.plugin.loadConfigs();
        this.plugin.getAnchorManager().loadAnchors();
        this.plugin.getMVWorldManager().loadWorlds(true);

-        List<String> configsLoaded = new ArrayList<>();
+        List<String> configsLoaded = new ArrayList<String>();
        configsLoaded.add("Multiverse-Core - config.yml");
        configsLoaded.add("Multiverse-Core - worlds.yml");
        configsLoaded.add("Multiverse-Core - anchors.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);
+        }

-        configReload.getAllConfigsLoaded().forEach(sender::sendMessage);
-        sender.sendMessage(String.format("%sReload Complete!", ChatColor.GREEN));
+        sender.sendMessage(ChatColor.GREEN + "Reload Complete!");
    }
+
 }
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,43 +7,36 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Conditions;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Flags;
-import co.aikar.commands.annotation.Single;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.permissions.PermissionDefault;

-@CommandAlias("mv")
-public class RemoveCommand extends MultiverseCoreCommand {
+import java.util.List;
+
+/**
+ * Unloads a world and removes it from the config.
+ */
+public class RemoveCommand extends MultiverseCommand {

    public RemoveCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("Remove World");
+        this.setCommandUsage("/mv remove" + ChatColor.GREEN + " {WORLD}");
+        this.setArgRange(1, 1);
+        this.addKey("mvremove");
+        this.addKey("mv remove");
+        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);
    }

-    @Subcommand("remove")
-    @CommandPermission("multiverse.core.remove")
-    @CommandCompletion("@MVWorlds|@unloadedWorlds")
-    @Syntax("<world>")
-    @Description("Unloads a world from Multiverse and removes it from worlds.yml, this does NOT DELETE the world folder.")
-    public void onRemoveCommand(@NotNull CommandSender sender,
-
-                                @NotNull
-                                @Syntax("<world>")
-                                @Description("World you want to remove from mv's knowledge.")
-                                @Flags("type=world name")
-                                @Conditions("isWorldInConfig")
-                                @Single String worldName) {
-
-        sender.sendMessage((this.plugin.getMVWorldManager().removeWorldFromConfig(worldName))
-                ? String.format("World '%s' is removed from config!", worldName)
-                : String.format("%sError trying to remove world from config!", ChatColor.RED));
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (this.plugin.getMVWorldManager().removeWorldFromConfig(args.get(0))) {
+            sender.sendMessage("World removed from config!");
+        } else {
+            sender.sendMessage("Error trying to remove world from config!");
+        }
    }
 }
@@ -1,25 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import co.aikar.commands.annotation.CommandAlias;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.displaytools.ColorAlternator;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-public class RootCommand extends MultiverseCoreCommand {
-
-    public RootCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @CommandAlias("mv")
-    public void onRootCommand(@NotNull CommandSender sender) {
-        this.plugin.getMVCommandManager().showPluginInfo(
-                sender,
-                this.plugin.getDescription(),
-                ColorAlternator.with(ChatColor.GOLD, ChatColor.YELLOW),
-                "mv"
-        );
-    }
-}
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,57 +7,52 @@

 package com.onarandombox.MultiverseCore.commands;

-import buscript.Buscript;
-import co.aikar.commands.InvalidCommandArgument;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commandtools.context.RequiredPlayer;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;

 import java.io.File;
+import java.util.List;

-@CommandAlias("mv")
-public class ScriptCommand extends MultiverseCoreCommand {
+/**
+ * States who is in what world.
+ */
+public class ScriptCommand extends MultiverseCommand {

    public ScriptCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("Runs a script.");
+        this.setCommandUsage("/mv script" + ChatColor.GOLD + " {script} [target]");
+        this.setArgRange(1, 2);
+        this.addKey("mv script");
+        this.addKey("mvscript");
+        this.addCommandExample(String.format("/mv script %sscript.txt", ChatColor.GOLD));
+        this.addCommandExample(String.format("/mv script %stest.txt %ssomeplayer", ChatColor.GOLD, ChatColor.GREEN));
+        this.setPermission("multiverse.core.script", "Runs a script.", PermissionDefault.OP);
    }

-    @Subcommand("script")
-    @CommandPermission("multiverse.core.script")
-    @Syntax("<script> <player>")
-    @CommandCompletion("@scripts @players")
-    @Description("Runs a script.")
-    public void onScriptCommand(@NotNull CommandSender sender,
-
-                                @NotNull
-                                @Syntax("<script>")
-                                @Description("Script name that you want to run.")
-                                String targetScript,
-
-                                @NotNull
-                                @Syntax("<player>")
-                                @Description("Player that you want to execute the script on.")
-                                RequiredPlayer player) {
-
-        Buscript scriptAPI = this.plugin.getScriptAPI();
-        if (scriptAPI == null) {
-            throw new InvalidCommandArgument("Buscript failed to load while server was starting! Scripts cannot be run.", false);
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (plugin.getScriptAPI() == null) {
+            sender.sendMessage("Buscript failed to load while the server was starting. Scripts cannot be run.");
+            return;
        }
-
-        File file = new File(scriptAPI.getScriptFolder(), targetScript);
+        File file = new File(plugin.getScriptAPI().getScriptFolder(), args.get(0));
        if (!file.exists()) {
-            throw new InvalidCommandArgument("That script file does not exist in the Multiverse-Core scripts directory!");
+            sender.sendMessage("That script file does not exist in the Multiverse-Core scripts directory!");
+            return;
        }
-
-        scriptAPI.executeScript(file, targetScript, player.get());
+        Player player = null;
+        if (sender instanceof Player) {
+            player = (Player) sender;
+        }
+        String target = null;
+        if (args.size() == 2) {
+            target = args.get(1);
+        }
+        plugin.getScriptAPI().executeScript(file, target, player);
        sender.sendMessage(String.format("Script '%s%s%s' finished!", ChatColor.GOLD, file.getName(), ChatColor.WHITE));
    }
 }
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,16 +7,6 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.BaseCommand;
-import co.aikar.commands.InvalidCommandArgument;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Flags;
-import co.aikar.commands.annotation.Optional;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.BlockSafety;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
@@ -25,146 +15,134 @@ import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.bukkit.permissions.PermissionDefault;

-public class SetSpawnCommand extends MultiverseCoreCommand {
+import java.util.List;
+import org.bukkit.Bukkit;

+/**
+ * Sets the spawn for a world.
+ */
+public class SetSpawnCommand extends MultiverseCommand {
    public SetSpawnCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("Set World Spawn");
+        this.setCommandUsage("/mv setspawn");
+        this.setArgRange(0, 6);
+        this.addKey("mvsetspawn");
+        this.addKey("mvsets");
+        this.addKey("mvss");
+        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);
    }

-    @CommandAlias("mv")
-    public class SetSpawn extends BaseCommand {
-
-        @Subcommand("setspawn")
-        @CommandPermission("multiverse.core.spawn.set")
-        @Syntax("[world x y z [yaw pitch]]")
-        @CommandCompletion("@MVWorlds @location:x @location:y @location:z @location:yaw @location:pitch")
-        @Description("Sets the spawn for the current world.")
-        public void onSetSpawnCommand(@NotNull CommandSender sender,
-                                      @Nullable @Optional Player player,
-
-                                      @NotNull
-                                      @Syntax("[world x y z [yaw pitch]]")
-                                      @Description("New location of spawn.")
-                                      @Flags("other,defaultself") MultiverseWorld world,
-
-                                      @Nullable @Optional Double x,
-                                      @Nullable @Optional Double y,
-                                      @Nullable @Optional Double z,
-                                      @Nullable @Optional Float yaw,
-                                      @Nullable @Optional Float pitch) {
-
-            doSpawnSet(sender, world, parseLocation(player, world, x, y, z, yaw, pitch));
-        }
-
-        @Subcommand("modify set spawn")
-        @CommandPermission("multiverse.core.spawn.set")
-        @Syntax("[world x y z [yaw pitch]]")
-        @CommandCompletion("@MVWorlds @location:x @location:y @location:z @location:yaw @location:pitch")
-        @Description("Sets the spawn for the current world.")
-        public void onModifySetSpawnCommand(@NotNull CommandSender sender,
-                                            @Nullable @Optional Player player,
-
-                                            @NotNull
-                                            @Syntax("[world x y z [yaw pitch]]")
-                                            @Description("New location of spawn.")
-                                            @Flags("other,defaultself") MultiverseWorld world,
-
-                                            @Nullable @Optional Double x,
-                                            @Nullable @Optional Double y,
-                                            @Nullable @Optional Double z,
-                                            @Nullable @Optional Float yaw,
-                                            @Nullable @Optional Float pitch) {
-
-            doSpawnSet(sender, world, parseLocation(player, world, x, y, z, yaw, pitch));
+    /**
+     * Dispatches the user's command depending on the number of parameters
+     * @param sender The player who executes the command, may be console as well.
+     * @param args Command line parameters
+     */
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (args.isEmpty()) {
+            setWorldSpawn(sender);
+        } else if (args.size() == 4) {
+            setWorldSpawn(sender, args.get(0), args.get(1), args.get(2), args.get(3));
+        } else if (args.size() == 6) {
+            setWorldSpawn(sender, args.get(0), args.get(1), args.get(2), args.get(3), args.get(4), args.get(5));
+        } else {
+            sender.sendMessage("Use no arguments for your current location, or world/x/y/z, or world/x/y/z/yaw/pitch!");
        }
    }

-    @CommandAlias("mvsetspawn")
-    public class AliasSetSpawn extends BaseCommand {
-
-        @CommandAlias("mvsetspawn")
-        @CommandPermission("multiverse.core.spawn.set")
-        @Syntax("[world x y z [yaw pitch]]")
-        @CommandCompletion("@MVWorlds @location:x @location:y @location:z @location:yaw @location:pitch @empty")
-        @Description("Sets the spawn for the current world.")
-        public void onAliasSetSpawnCommand(@NotNull CommandSender sender,
-                                           @Nullable @Optional Player player,
-
-                                           @NotNull
-                                           @Syntax("[world x y z [yaw pitch]]")
-                                           @Description("New location of spawn.")
-                                           @Flags("other,defaultself") MultiverseWorld world,
-
-                                           @Nullable @Optional Double x,
-                                           @Nullable @Optional Double y,
-                                           @Nullable @Optional Double z,
-                                           @Nullable @Optional Float yaw,
-                                           @Nullable @Optional Float pitch) {
-            doSpawnSet(sender, world, parseLocation(player, world, x, y, z, yaw, pitch));
+    /**
+     * Set the world spawn when no parameters are given
+     * @param sender The {@link CommandSender} who executes the command. 
+     *               Everything not a {@link Player}, e.g. console, gets rejected, as we can't get coordinates from there.
+     */
+    protected void setWorldSpawn(CommandSender sender) {
+        if (sender instanceof Player) {
+            Player p = (Player) sender;
+            Location l = p.getLocation();
+            World w = p.getWorld();
+            setWorldSpawn(sender, w, l);
+        } else {
+            sender.sendMessage("You need to give coordinates to use this command from the console!");
        }
    }
-
-    @NotNull
-    private Location parseLocation(@Nullable Player player,
-                                   @NotNull MultiverseWorld world,
-                                   @Nullable Double x,
-                                   @Nullable Double y,
-                                   @Nullable Double z,
-                                   @Nullable Float yaw,
-                                   @Nullable Float pitch) {
-
-        if (x == null) {
-            if (player == null) {
-                throw new InvalidCommandArgument("You need to specify a location from console.");
-            }
-            return player.getLocation();
-        }
-        if (y == null) {
-            throw new InvalidCommandArgument("You need to specify y and z axis as well.");
-        }
-        if (z == null) {
-            throw new InvalidCommandArgument("You need to specify z axis as well.");
-        }
-        if (yaw == null) {
-            return new Location(world.getCBWorld(), x, y, z);
-        }
-        if (pitch == null) {
-            throw new InvalidCommandArgument("You need to specify pitch as well.");
-        }
-
-        return new Location(world.getCBWorld(), x, y, z, yaw, pitch);
+    
+    /**
+     * Set the world spawn when 4 parameters are given
+     * @param sender The {@link CommandSender} who executes the command
+     * @param world The world to set the spawn in
+     * @param x X-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param y Y-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param z Z-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     */
+    protected void setWorldSpawn(CommandSender sender, String world, String x, String y, String z) {
+        setWorldSpawn(sender, world, x, y, z, "0", "0");
    }

-    private void doSpawnSet(@NotNull CommandSender sender,
-                            @NotNull MultiverseWorld world,
-                            @NotNull Location location) {
-
-        World bukkitWorld = location.getWorld();
+    /**
+     * Set the world spawn when 6 parameters are given
+     * @param sender The {@link CommandSender} who executes the command
+     * @param world The world to set the spawn in
+     * @param x X-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param y Y-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param z Z-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param yaw Yaw a newly spawned player should look at (as a {@link String} as it's from the command line, gets parsed into a float)
+     * @param pitch Pitch a newly spawned player should look at (as a {@link String} as it's from the command line, gets parsed into a float)
+     */
+    protected void setWorldSpawn(CommandSender sender, String world, String x, String y, String z, String yaw, String pitch) {
+        double dx, dy, dz;
+        float fpitch, fyaw;
+        World bukkitWorld = Bukkit.getWorld(world);
        if (bukkitWorld == null) {
-            sender.sendMessage("No world found for the spawn location your tried to set.");
+            sender.sendMessage("World " + world + " is unknown!");
            return;
        }
-
-        world.setSpawnLocation(location);
-        BlockSafety blockSafety = this.plugin.getBlockSafety();
-        if (!blockSafety.playerCanSpawnHereSafely(location) && world.getAdjustSpawn()) {
-            sender.sendMessage("It looks like that location would normally be unsafe. But I trust you.");
-            sender.sendMessage("I'm turning off the Safe-T-Teleporter for spawns to this world.");
-            sender.sendMessage(String.format("If you want turn this back on, just do %s/mv modify set adjustspawn true %s", ChatColor.AQUA, world.getName()));
-            world.setAdjustSpawn(false);
+        try {
+            dx = Double.parseDouble(x);
+            dy = Double.parseDouble(y);
+            dz = Double.parseDouble(z);
+            fpitch = Float.parseFloat(pitch);
+            fyaw = Float.parseFloat(yaw);
+        } catch (NumberFormatException ex) {
+            sender.sendMessage("All coordinates must be numeric");
+            return;
        }
+        Location l = new Location(bukkitWorld, dx, dy, dz, fyaw, fpitch);
+        setWorldSpawn(sender, bukkitWorld, l);
+    }

-        sender.sendMessage((sender instanceof Player && ((Player) sender).getWorld().equals(world.getCBWorld()))
-                ? "Spawn of this world is set to:"
-                : String.format("Spawn for %s is set to:",  world.getColoredWorldString()));
-
-        sender.sendMessage(plugin.getLocationManipulation().strCoords(location));
-
-        if (!plugin.saveWorldConfig()) {
-            sender.sendMessage(String.format("%sThere was an issue saving worlds.yml!  Your changes will only be temporary!", ChatColor.RED));
+    /**
+     * Does the actual spawn-setting-work.
+     *
+     * @param sender The {@link CommandSender} that's setting the spawn.
+     * @param w The {@link World} to set the spawn in
+     * @param l The {@link Location} to set the spawn to
+     */
+    private void setWorldSpawn(CommandSender sender, World w, Location l) {
+        MultiverseWorld foundWorld = this.plugin.getMVWorldManager().getMVWorld(w.getName());
+        if (foundWorld != null) {
+            foundWorld.setSpawnLocation(l);
+            BlockSafety bs = this.plugin.getBlockSafety();
+            if (!bs.playerCanSpawnHereSafely(l) && foundWorld.getAdjustSpawn()) {
+                sender.sendMessage("It looks like that location would normally be unsafe. But I trust you.");
+                sender.sendMessage("I'm turning off the Safe-T-Teleporter for spawns to this world.");
+                sender.sendMessage("If you want this turned back on just do:");
+                sender.sendMessage(ChatColor.AQUA + "/mvm set adjustspawn true " + foundWorld.getAlias());
+                foundWorld.setAdjustSpawn(false);
+            }
+            sender.sendMessage("Spawn was set to: " + plugin.getLocationManipulation().strCoords(l));
+            if (!plugin.saveWorldConfig()) {
+                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+            }
+        } 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 (Pitch/Yaws).");
        }
    }
 }
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,50 +7,46 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.permissions.PermissionDefault;

-@CommandAlias("mv")
-public class SilentCommand extends MultiverseCoreCommand {
+import java.util.List;
+
+/**
+ * Enables debug-information.
+ */
+public class SilentCommand extends MultiverseCommand {

    public SilentCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("Turn silent mode on/off?");
+        this.setCommandUsage("/mv silent" + ChatColor.GOLD + " [true|false|on|off]");
+        this.setArgRange(0, 1);
+        this.addKey("mv silent");
+        this.addKey("mvsilent");
+        this.addCommandExample("/mv silent " + ChatColor.GOLD + "true");
+        this.setPermission("multiverse.core.silent", "Reduces the amount of startup messages.", PermissionDefault.OP);
    }

-    @Subcommand("silent")
-    @CommandPermission("multiverse.core.silent")
-    @Description("Show current state of silent mode.")
-    public void onShowSilentCommand(@NotNull CommandSender sender) {
-        displaySilentMode(sender);
-    }
-
-    @Subcommand("silent")
-    @CommandPermission("multiverse.core.silent")
-    @Syntax("<true|false>")
-    @CommandCompletion("true|false")
-    @Description("Reduces the amount of startup messages.")
-    public void onChangeSilentCommand(@NotNull CommandSender sender,
-                                      boolean silent) {
-
-        plugin.getMVConfig().setSilentStart(silent);
-        if (!plugin.saveMVConfigs()) {
-            sender.sendMessage(String.format("%sFailed to save config! Check your console for details.", ChatColor.RED));
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (args.size() == 1) {
+            if (args.get(0).equalsIgnoreCase("on")) {
+                args.set(0, "true");
+            }
+            plugin.getMVConfig().setSilentStart(Boolean.valueOf(args.get(0)));
+            plugin.saveMVConfigs();
        }
-
-        displaySilentMode(sender);
+        this.displaySilentMode(sender);
    }

    private void displaySilentMode(CommandSender sender) {
-        sender.sendMessage((plugin.getMVConfig().getSilentStart())
-                ? String.format("Multiverse Silent Start mode is %sOn", ChatColor.GREEN)
-                : String.format("Multiverse Silent Start mode is %sOff", ChatColor.RED));
+        if (plugin.getMVConfig().getSilentStart()) {
+            sender.sendMessage("Multiverse Silent Start mode is " + ChatColor.GREEN + "ON");
+        } else {
+            sender.sendMessage("Multiverse Silent Start mode is " + ChatColor.RED + "OFF");
+        }
    }
 }
@@ -0,0 +1,42 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Takes the player to the latest bed he's slept in.
+ */
+public class SleepCommand extends MultiverseCommand {
+
+    public SleepCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Go to Sleep");
+        this.setCommandUsage("/mv sleep");
+        this.setArgRange(0, 0);
+        this.addKey("mv sleep");
+        this.setPermission("multiverse.core.sleep", "Takes you the latest bed you've slept in (Currently BROKEN).", PermissionDefault.OP);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        Player p = null;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        }
+
+        if (p == null) {
+            return;
+        }
+    }
+}
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,68 +7,85 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.commandtools.context.RequiredPlayer;
+import com.onarandombox.MultiverseCore.utils.PlayerFinder;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;

-@CommandAlias("mv")
-public class SpawnCommand extends MultiverseCoreCommand {
+import java.util.List;
+
+/**
+ * Teleports a player to the spawn.
+ */
+public class SpawnCommand extends MultiverseCommand {

    public SpawnCommand(MultiverseCore plugin) {
        super(plugin);
+        Permission otherPerm = new Permission("multiverse.core.spawn.other",
+                "Teleports another player to the spawn of the world they are in.", PermissionDefault.OP);
+        this.setName("Spawn");
+        this.setCommandUsage("/mv spawn" + ChatColor.GOLD + " [PLAYER]");
+        this.setArgRange(0, 1);
+        this.addKey("mvspawn");
+        this.addKey("mv spawn");
+        this.addKey("mvs");
+        this.setPermission("multiverse.core.spawn.self", "Teleports you to the Spawn Point of the world you are in.", PermissionDefault.OP);
+        this.addAdditonalPermission(otherPerm);
+
    }

-    @Subcommand("spawn")
-    @CommandPermission("multiverse.core.spawn.self")
-    @Description("Teleport yourself to the spawn of the world.")
-    public void onSpawnCommand(@NotNull Player player) {
-        doSpawn(player, player);
-    }
-
-    @CommandAlias("spawn")
-    @CommandPermission("multiverse.core.spawn.other")
-    @Syntax("[player]")
-    @CommandCompletion("@players")
-    @Description("Teleport another player to the spawn of the world they are in.")
-    public void onSpawnCommand(@NotNull CommandSender sender,
-
-                               @NotNull
-                               @Syntax("[player]")
-                               @Description("Target player to teleport to spawn.")
-                               RequiredPlayer player) {
-
-        doSpawn(sender, player.get());
-    }
-
-    private void doSpawn(@NotNull CommandSender sender,
-                         @NotNull Player player) {
-
-        MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(player.getWorld());
-        Location spawnLocation = (world == null) ? player.getWorld().getSpawnLocation() : world.getSpawnLocation();
-
-        this.plugin.getSafeTTeleporter().safelyTeleport(player, player, spawnLocation, false);
-
-        if (sender.equals(player)) {
-            player.sendMessage("Teleported to this world's spawn.");
-            return;
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        Player player = null;
+        if (sender instanceof Player) {
+            player = (Player) sender;
        }
+        // If a persons name was passed in, you must be A. the console, or B have permissions
+        if (args.size() == 1) {
+            if (player != null && !this.plugin.getMVPerms().hasPermission(player, "multiverse.core.spawn.other", true)) {
+                sender.sendMessage("You don't have permission to teleport another player to spawn. (multiverse.core.spawn.other)");
+                return;
+            }
+            Player target = PlayerFinder.get(args.get(0), sender);
+            if (target != null) {
+                target.sendMessage("Teleporting to this world's spawn...");
+                spawnAccurately(target);

-        String senderName = (sender instanceof ConsoleCommandSender)
-                ? String.format("%sconsole%s", ChatColor.LIGHT_PURPLE, ChatColor.RESET)
-                : String.format("%s%s%s", ChatColor.YELLOW, sender.getName(), ChatColor.RESET);
+                if (player != null) {
+                    target.sendMessage("You were teleported by: " + ChatColor.YELLOW + player.getName());
+                } else {
+                    target.sendMessage("You were teleported by: " + ChatColor.LIGHT_PURPLE + "the console");
+                }
+            } else {
+                sender.sendMessage(args.get(0) + " is not logged on right now!");
+            }
+        } else {
+            if (player != null && !this.plugin.getMVPerms().hasPermission(player, "multiverse.core.spawn.self", true)) {
+                sender.sendMessage("You don't have permission to teleport yourself to spawn. (multiverse.core.spawn.self)");
+                return;
+            }
+            if (player != null) {
+                player.sendMessage("Teleporting to this world's spawn...");
+                spawnAccurately(player);
+            } else {
+                sender.sendMessage("From the console, you must provide a PLAYER.");
+            }
+        }
+    }

-        player.sendMessage("You were teleported by " + senderName + "to spawn.");
+    private void spawnAccurately(Player player) {
+        MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(player.getWorld().getName());
+        Location spawnLocation;
+        if (world != null) {
+            spawnLocation = world.getSpawnLocation();
+        } else {
+            spawnLocation = player.getWorld().getSpawnLocation();
+        }
+        this.plugin.getSafeTTeleporter().safelyTeleport(player, player, spawnLocation, false);
    }
 }
@@ -1,79 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import co.aikar.commands.BaseCommand;
-import co.aikar.commands.CommandHelp;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.HelpCommand;
-import com.onarandombox.MultiverseCore.displaytools.ColorAlternator;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-public class SubModulesCommand {
-
-    public static class NetherPortals extends BaseCommand {
-
-        @HelpCommand
-        @CommandAlias("mvnp")
-        @CommandPermission("multiverse.core.submodules")
-        @Description("Suggest download for Multiverse-NetherPortals.")
-        public void onSuggestCommand(@NotNull CommandSender sender,
-                                     @NotNull CommandHelp help) {
-
-            suggestDownload(
-                    sender,
-                    "Multiverse-NetherPortals",
-                    ColorAlternator.with(ChatColor.DARK_PURPLE, ChatColor.LIGHT_PURPLE),
-                    "https://dev.bukkit.org/projects/multiverse-netherportals"
-            );
-        }
-    }
-
-    public static class Portals extends BaseCommand {
-
-        @HelpCommand
-        @CommandAlias("mvp")
-        @CommandPermission("multiverse.core.submodules")
-        @Description("Suggest download for Multiverse-Portals.")
-        public void onSuggestCommand(@NotNull CommandSender sender,
-                                     @NotNull CommandHelp help) {
-
-            suggestDownload(
-                    sender,
-                    "Multiverse-Portals",
-                    ColorAlternator.with(ChatColor.DARK_RED, ChatColor.RED),
-                    "https://dev.bukkit.org/projects/multiverse-portals"
-            );
-        }
-    }
-
-    public static class Inventories extends BaseCommand {
-
-        @HelpCommand
-        @CommandAlias("mvinv")
-        @CommandPermission("multiverse.core.submodules")
-        @Description("Suggest download for Multiverse-Inventories.")
-        public void onSuggestCommand(@NotNull CommandSender sender,
-                                     @NotNull CommandHelp help) {
-
-            suggestDownload(
-                    sender,
-                    "Multiverse-Inventories",
-                    ColorAlternator.with(ChatColor.DARK_AQUA, ChatColor.AQUA),
-                    "https://dev.bukkit.org/projects/multiverse-inventories"
-            );
-        }
-    }
-
-    private static void suggestDownload(@NotNull CommandSender sender,
-                                        @NotNull String pluginName,
-                                        @NotNull ColorAlternator colours,
-                                        @NotNull String downloadLink) {
-
-        sender.sendMessage(String.format("%s%s%s is not installed on this server. You can learn more and download it at:",
-                colours.getThisColor(), pluginName, ChatColor.WHITE));
-        sender.sendMessage(String.format("%s%s", colours.getThatColor(), downloadLink));
-    }
-}
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,215 +7,193 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.BaseCommand;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Flags;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.api.Teleporter;
+import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
 import com.onarandombox.MultiverseCore.destination.CustomTeleporterDestination;
+import com.onarandombox.MultiverseCore.destination.DestinationFactory;
 import com.onarandombox.MultiverseCore.destination.InvalidDestination;
 import com.onarandombox.MultiverseCore.destination.WorldDestination;
 import com.onarandombox.MultiverseCore.enums.TeleportResult;
 import com.onarandombox.MultiverseCore.event.MVTeleportEvent;
+import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
+import com.onarandombox.MultiverseCore.utils.PlayerFinder;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
+import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;

-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;

-public class TeleportCommand extends MultiverseCoreCommand {
-
-    private final SafeTTeleporter playerTeleporter;
-
-    private static final int UNSAFE_TELEPORT_EXPIRE_DELAY = 300; // In ticks
+/**
+ * Used to teleport players.
+ */
+public class TeleportCommand extends MultiverseCommand {
+    private SafeTTeleporter playerTeleporter;

    public TeleportCommand(MultiverseCore plugin) {
        super(plugin);
+        Permission menu = new Permission("multiverse.teleport.*", "Allows you to display the teleport menu.", PermissionDefault.OP);
+
+        this.setName("Teleport");
+        this.setCommandUsage("/mv tp " + ChatColor.GOLD + "[PLAYER]" + ChatColor.GREEN + " {DESTINATION}");
+        this.setArgRange(1, 2);
+        this.addKey("mvtp");
+        this.addKey("mv tp");
        this.playerTeleporter = this.plugin.getSafeTTeleporter();
+        this.setPermission(menu);
    }

-    @CommandAlias("mv")
-    public class Teleport extends BaseCommand {
+    private static final int UNSAFE_TELEPORT_EXPIRE_DELAY = 15;

-        @Subcommand("tp|teleport")
-        @Syntax("[player] <destination>")
-        @CommandCompletion("@players|@MVWorlds:playerOnly|@destinations:playerOnly @players|@MVWorlds|@destinations")
-        @Description("Allows you to the teleport to a location on your server!")
-        public void doTeleportCommand(@NotNull CommandSender sender,
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        CommandSender teleporter = sender;
+        Player teleportee = null;

-                                      @Syntax("[player]")
-                                      @Description("Target player to teleport.")
-                                      @NotNull @Flags("other,defaultself,fallbackself") Player player,
+        String destinationName;

-                                      @Syntax("<destination>")
-                                      @Description("Location, can be a world name.")
-                                      @NotNull @Flags("type=destination") String destinationName) {
+        if (args.size() == 2) {
+            teleportee = PlayerFinder.get(args.get(0), sender);
+            if (teleportee == null) {
+                this.messaging.sendMessage(sender, String.format("Sorry, I couldn't find player: %s%s",
+                        ChatColor.GOLD, args.get(0)), false);
+                return;
+            }
+            destinationName = args.get(1);

-            doTeleport(sender, player, destinationName);
+        } else {
+            destinationName = args.get(0);
+            if (!(sender instanceof Player)) {
+                this.messaging.sendMessage(sender, String.format("From the console, you must specify a player to teleport"), false);
+                return;
+            }
+            teleportee = (Player) sender;
        }

-        @Override
-        public Set<String> getRequiredPermissions() {
-            return destPerms();
-        }
-    }
+        DestinationFactory df = this.plugin.getDestFactory();
+        MVDestination d = df.getPlayerAwareDestination(teleportee, destinationName);

-    public class AliasTeleport extends BaseCommand {
-
-        @CommandAlias("mvtp")
-        @Syntax("[player] <destination>")
-        @CommandCompletion("@players|@MVWorlds:playerOnly|@destinations:playerOnly @MVWorlds|@destinations")
-        @Description("Alias for /mv tp")
-        public void doTeleportCommand(@NotNull CommandSender sender,
-
-                                      @Syntax("[player]")
-                                      @Description("Target player to teleport.")
-                                      @NotNull @Flags("other,defaultself,fallbackself") Player player,
-
-                                      @Syntax("<destination>")
-                                      @Description("Location, can be a world name.")
-                                      @NotNull @Flags("type=destination") String destinationName) {
-
-            doTeleport(sender, player, destinationName);
-        }
-
-        @Override
-        public Set<String> getRequiredPermissions() {
-            return destPerms();
-        }
-    }
-
-    private Set<String> destPerms() {
-        return this.plugin.getDestFactory().getPermissions();
-    }
-
-    private void doTeleport(@NotNull CommandSender teleporter,
-                            @NotNull Player teleportee,
-                            @NotNull String destinationName) {
-
-        MVDestination destination = this.plugin.getDestFactory().getPlayerAwareDestination(teleportee, destinationName);
-
-        MVTeleportEvent teleportEvent = new MVTeleportEvent(destination, teleportee, teleporter, true);
+        MVTeleportEvent teleportEvent = new MVTeleportEvent(d, teleportee, teleporter, true);
        this.plugin.getServer().getPluginManager().callEvent(teleportEvent);
        if (teleportEvent.isCancelled()) {
            Logging.fine("Someone else cancelled the MVTeleport Event!!!");
            return;
        }

-        if (destination instanceof InvalidDestination) {
-            teleporter.sendMessage(String.format("Multiverse does not know how to take you to %s%s", ChatColor.RED, destinationName));
+        if (d != null && d instanceof InvalidDestination) {
+            this.messaging.sendMessage(sender, String.format("Multiverse does not know how to take you to %s%s",
+                    ChatColor.RED, destinationName), false);
            return;
        }

-        if (!this.checkSendPermissions(teleporter, teleportee, destination)) {
+        if (!this.checkSendPermissions(teleporter, teleportee, d)) {
            return;
        }

-        if (this.plugin.getMVConfig().getEnforceAccess() && !this.plugin.getMVPerms().canEnterDestination(teleportee, destination)) {
-            teleporter.sendMessage((teleportee.equals(teleporter))
-                    ? "Doesn't look like you're allowed to go " + ChatColor.RED + "there..."
-                    : "Doesn't look like you're allowed to send " + ChatColor.GOLD + teleportee.getName() + ChatColor.WHITE + " to " + ChatColor.RED + "there...");
+        if (plugin.getMVConfig().getEnforceAccess() && teleporter != null && !this.plugin.getMVPerms().canEnterDestination(teleporter, d)) {
+            if (teleportee.equals(teleporter)) {
+                teleporter.sendMessage("Doesn't look like you're allowed to go " + ChatColor.RED + "there...");
+            } else {
+                teleporter.sendMessage("Doesn't look like you're allowed to send " + ChatColor.GOLD
+                        + teleportee.getName() + ChatColor.WHITE + " to " + ChatColor.RED + "there...");
+            }
+            return;
+        } else if (teleporter != null && !this.plugin.getMVPerms().canTravelFromLocation(teleporter, d.getLocation(teleportee))) {
+            if (teleportee.equals(teleporter)) {
+                this.messaging.sendMessage(teleporter, String.format("DOH! Doesn't look like you can get to %s%s %sfrom where you are...",
+                        ChatColor.GREEN, d.toString(), ChatColor.WHITE), false);
+            } else {
+                this.messaging.sendMessage(teleporter, String.format("DOH! Doesn't look like %s%s %scan get to %sTHERE from where they are...",
+                        ChatColor.GREEN, ((Player) teleporter).getWorld().getName(), ChatColor.WHITE, ChatColor.RED), false);
+            }
            return;
        }

-        if (!this.plugin.getMVPerms().canTravelFromLocation(teleporter, destination.getLocation(teleportee))) {
-            teleporter.sendMessage((teleportee.equals(teleporter))
-                    ? String.format("Doh! Doesn't look like you can get to %s%s %sfrom where you are...",
-                    ChatColor.GREEN, destination.toString(), ChatColor.WHITE)
-                    : String.format("Doh! Doesn't look like %s%s %scan get to %sTHERE from where they are...",
-                    ChatColor.GREEN, ((Player) teleporter).getWorld().getName(), ChatColor.WHITE, ChatColor.RED));
-            return;
+        // Special check to verify if players are tryint to teleport to the same
+        // WORLDDestination as the world they're in, that they ALSO have multiverse.core.spawn.self
+
+        if (d instanceof WorldDestination) {
+            World w = d.getLocation(teleportee).getWorld();
+            if (teleportee.getWorld().equals(w)) {
+                if (teleporter.equals(teleportee)) {
+                    if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.core.spawn.self", true)) {
+                        this.messaging.sendMessages(teleporter, new String[]{
+                                String.format("Sorry you don't have permission to go to the world spawn!"),
+                                String.format("%s  (multiverse.core.spawn.self)",
+                                        ChatColor.RED) }, false);
+                        return;
+                    }
+                } else {
+                    if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.core.spawn.other", true)) {
+                        this.messaging.sendMessages(teleporter, new String[]{
+                                String.format("Sorry you don't have permission to send %s to the world spawn!",
+                                        teleportee.getDisplayName()),
+                                String.format("%s  (multiverse.core.spawn.other)",
+                                        ChatColor.RED) }, false);
+                        return;
+                    }
+                }
+            }
        }

-        // Special check to verify if players are trying to teleport to the same WORLD Destination
-        // as the world they're in, that they ALSO have multiverse.core.spawn.self
-        if (destination instanceof WorldDestination
-                && teleportee.getWorld().equals(destination.getLocation(teleportee).getWorld())
-                && !checkSpawnPermissions(teleporter, teleportee)) {
+        if (d.getLocation(teleportee) == null) {
+            this.messaging.sendMessage(teleporter, "Sorry Boss, I tried everything, but just couldn't teleport ya there!", false);
            return;
        }
-
-        if (destination.getLocation(teleportee) == null) {
-            teleporter.sendMessage("Sorry Boss, I tried everything, but just couldn't teleport ya there!");
-            return;
-        }
-
-        Teleporter teleportObject = (destination instanceof CustomTeleporterDestination)
-                ? ((CustomTeleporterDestination) destination).getTeleporter()
-                : this.playerTeleporter;
-
-        TeleportResult result = teleportObject.teleport(teleporter, teleportee, destination);
+        Teleporter teleportObject = (d instanceof CustomTeleporterDestination) ?
+                ((CustomTeleporterDestination)d).getTeleporter() : this.playerTeleporter;
+        TeleportResult result = teleportObject.teleport(teleporter, teleportee, d);
        if (result == TeleportResult.FAIL_UNSAFE) {
-            Logging.fine("Could not teleport %s to %s.",
-                    teleportee.getName(), this.plugin.getLocationManipulation().strCoordsRaw(destination.getLocation(teleportee)));
+            Logging.fine("Could not teleport " + teleportee.getName()
+                    + " to " + plugin.getLocationManipulation().strCoordsRaw(d.getLocation(teleportee)));

-            this.plugin.getMVCommandManager().getQueueManager().addToQueue(new QueuedCommand.Builder()
-                    .sender(teleporter)
-                    .action(unsafeTeleportRunnable(teleporter, teleportee, destination.getLocation(teleportee)))
-                    .prompt("The location you are trying to teleport to is deemed unsafe, do you still want to try?")
-                    .validDuration(UNSAFE_TELEPORT_EXPIRE_DELAY)
-                    .build()
-            );
+            String player = "you";
+            if (!teleportee.equals(teleporter)) {
+                player = teleportee.getName();
+            }
+
+            this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
+                    sender,
+                    doUnsafeTeleport(teleporter, teleportee, d.getLocation(teleportee)),
+                    String.format("%sMultiverse %sdid not teleport %s%s %sto %s%s %sbecause it was unsafe. Would you like to try anyway?",
+                            ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, player, ChatColor.WHITE, ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE),
+                    UNSAFE_TELEPORT_EXPIRE_DELAY
+            ));
        }
-
        // else: Player was teleported successfully (or the tp event was fired I should say)
    }

-    private boolean checkSendPermissions(@NotNull CommandSender teleporter,
-                                         @NotNull Player teleportee,
-                                         @NotNull MVDestination destination) {
+    private Runnable doUnsafeTeleport(CommandSender teleporter, Player player, Location location) {
+        return () -> this.plugin.getSafeTTeleporter().safelyTeleport(teleporter, player, location, false);
+    }

+    private boolean checkSendPermissions(CommandSender teleporter, Player teleportee, MVDestination destination) {
        if (teleporter.equals(teleportee)) {
            if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.teleport.self." + destination.getIdentifier(), true)) {
-                teleporter.sendMessage(String.format("%sYou don't have permission to teleport %syourself %sto a %s%s %sDestination", ChatColor.WHITE, ChatColor.AQUA, ChatColor.WHITE, ChatColor.RED, destination.getType(), ChatColor.WHITE));
-                teleporter.sendMessage(String.format("%s   (multiverse.teleport.self.%s)", ChatColor.RED, destination.getIdentifier()));
+                this.messaging.sendMessages(teleporter, new String[]{
+                        String.format("%sYou don't have permission to teleport %syourself %sto a %s%s %sDestination",
+                                ChatColor.WHITE, ChatColor.AQUA, ChatColor.WHITE, ChatColor.RED, destination.getType(), ChatColor.WHITE),
+                        String.format("%s   (multiverse.teleport.self.%s)",
+                                ChatColor.RED, destination.getIdentifier()) }, false);
                return false;
            }
-            return true;
-        }
-        if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.teleport.other." + destination.getIdentifier(), true)) {
-            teleporter.sendMessage(String.format("You don't have permission to teleport another player to a %s%s Destination.", ChatColor.GREEN, destination.getType()));
-            teleporter.sendMessage(String.format("%s(multiverse.teleport.other.%s)", ChatColor.RED, destination.getIdentifier()));
-            return false;
-        }
-        return true;
-    }
-
-    private boolean checkSpawnPermissions(@NotNull CommandSender teleporter,
-                                          @NotNull Player teleportee) {
-
-        if (teleporter.equals(teleportee)) {
-            if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.core.spawn.self", true)) {
-                teleporter.sendMessage(String.format("Sorry you don't have permission to go to the world spawn!"));
-                teleporter.sendMessage(String.format("%s  (multiverse.core.spawn.self)", ChatColor.RED));
+        } else {
+            if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.teleport.other." + destination.getIdentifier(), true)) {
+                this.messaging.sendMessages(teleporter, new String[]{
+                        String.format("You don't have permission to teleport another player to a %s%s Destination.",
+                                ChatColor.GREEN, destination.getType()),
+                        String.format("%s(multiverse.teleport.other.%s)",
+                                ChatColor.RED, destination.getIdentifier()) }, false);
                return false;
            }
-            return true;
-        }
-
-        if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.core.spawn.other", true)) {
-            teleporter.sendMessage(String.format("Sorry you don't have permission to send %s to the world spawn!", teleportee.getDisplayName()));
-            teleporter.sendMessage(String.format("%s  (multiverse.core.spawn.other)", ChatColor.RED));
-            return false;
        }
        return true;
    }
-
-    @NotNull
-    private Runnable unsafeTeleportRunnable(@NotNull CommandSender teleporter,
-                                            @NotNull Player teleportee,
-                                            @NotNull Location location) {
-
-        return () -> this.plugin.getSafeTTeleporter().safelyTeleport(teleporter, teleportee, location, false);
-    }
 }
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,44 +7,36 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Flags;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.permissions.PermissionDefault;

-@CommandAlias("mv")
-public class UnloadCommand extends MultiverseCoreCommand {
+import java.util.List;
+
+/**
+ * Unloads worlds from Multiverse.
+ */
+public class UnloadCommand extends MultiverseCommand {

    public UnloadCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("Unload World");
+        this.setCommandUsage("/mv unload" + ChatColor.GREEN + " {WORLD}");
+        this.setArgRange(1, 1);
+        this.addKey("mvunload");
+        this.addKey("mv unload");
+        this.setPermission("multiverse.core.unload",
+                "Unloads a world from Multiverse. This does NOT remove the world folder. This does NOT remove it from the config file.", PermissionDefault.OP);
    }

-    @Subcommand("unload")
-    @CommandPermission("multiverse.core.unload")
-    @Syntax("<world>")
-    @CommandCompletion("@MVWorlds")
-    @Description("Unloads a world from Multiverse. This does NOT remove the world folder. This does NOT remove it from the config file.")
-    public void onUnloadCommand(@NotNull CommandSender sender,
-
-                                @NotNull
-                                @Syntax("<world>")
-                                @Description("Name of world you want to unload.")
-                                @Flags("other") MultiverseWorld world) {
-
-        //TODO API: Should be able to use MVWorld object directly
-        if (!this.plugin.getMVWorldManager().unloadWorld(world.getName())) {
-            sender.sendMessage(String.format("Error unloading world '%s'! See console for more details.",
-                    world.getColoredWorldString()));
-            return;
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (this.plugin.getMVWorldManager().unloadWorld(args.get(0))) {
+            Command.broadcastCommandMessage(sender, "Unloaded world '" + args.get(0) + "'!");
+        } else {
+            sender.sendMessage("Error trying to unload world '" + args.get(0) + "'!");
        }
-        Command.broadcastCommandMessage(sender,  String.format("Unloaded world '%s'!", world.getColoredWorldString()));
    }
 }
@@ -1,37 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import co.aikar.commands.CommandHelp;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.HelpCommand;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.jetbrains.annotations.NotNull;
-
-@CommandAlias("mv")
-public class UsageCommand extends MultiverseCoreCommand {
-
-    public UsageCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @HelpCommand
-    @Subcommand("help")
-    @CommandPermission("multiverse.core.help")
-    @Syntax("[filter] [page]")
-    @CommandCompletion("@subCommands:mv")
-    @Description("Show Multiverse-Core Command usage.")
-    public void onUsageCommand(@NotNull CommandHelp help) {
-        this.plugin.getMVCommandManager().showUsage(help);
-    }
-}
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,16 +7,8 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagGroup;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagResult;
-import com.onarandombox.MultiverseCore.commandtools.flag.CoreFlags;
 import com.onarandombox.MultiverseCore.event.MVVersionEvent;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteFailedException;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteService;
@@ -25,82 +17,95 @@ import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
 import com.onarandombox.MultiverseCore.utils.webpaste.URLShortener;
 import com.onarandombox.MultiverseCore.utils.webpaste.URLShortenerFactory;
 import com.onarandombox.MultiverseCore.utils.webpaste.URLShortenerType;
+import com.pneumaticraft.commandhandler.CommandHandler;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.scheduler.BukkitRunnable;
-import org.jetbrains.annotations.NotNull;

 import java.io.File;
-import java.util.Arrays;
+import java.util.List;
 import java.util.Map;

-@CommandAlias("mv")
-public class VersionCommand extends MultiverseCoreCommand {
-
+/**
+ * Dumps version info to the console.
+ */
+public class VersionCommand extends MultiverseCommand {
    private static final URLShortener SHORTENER = URLShortenerFactory.getService(URLShortenerType.BITLY);

    public VersionCommand(MultiverseCore plugin) {
        super(plugin);
-        this.setFlagGroup(FlagGroup.of(
-                CoreFlags.PASTE_SERVICE_TYPE,
-                CoreFlags.INCLUDE_PLUGIN_LIST
-        ));
+        this.setName("Multiverse Version");
+        this.setCommandUsage("/mv version " + ChatColor.GOLD + "[-b|-h|-p] [--include-plugin-list]");
+        this.setArgRange(0, 2);
+        this.addKey("mv version");
+        this.addKey("mvver");
+        this.addKey("mvv");
+        this.addKey("mvversion");
+        this.setPermission(
+                "multiverse.core.version",
+                "Dumps version info to the console, optionally to pastebin.com with -b, to hastebin.com using -h, or to paste.gg with -p.",
+                PermissionDefault.OP)
+        ;
    }

-    @Subcommand("version")
-    @CommandPermission("multiverse.core.version")
-    @Syntax("--paste [pastebin|hastebin|pastegg] [--include-plugin-list]")
-    @CommandCompletion("@flags")
-    @Description("Dumps version info to the console, optionally to pastal service.")
-    public void onVersionCommand(@NotNull CommandSender sender,
-
-                                 @NotNull
-                                 @Syntax("[paste-service]")
-                                 @Description("Website to upload your version info to.")
-                                 String[] flagsArray) {
-
-        FlagResult flags = FlagResult.parse(flagsArray, this.getFlagGroup());
-
-        MVVersionEvent versionEvent = new MVVersionEvent();
-        this.addVersionInfoToEvent(versionEvent);
-        this.plugin.getServer().getPluginManager().callEvent(versionEvent);
-
-        if (flags.getValue(CoreFlags.INCLUDE_PLUGIN_LIST)) {
-            versionEvent.appendVersionInfo('\n' + "Plugins: " + getPluginList());
-            versionEvent.putDetailedVersionInfo("plugins.txt", "Plugins: " + getPluginList());
-        }
-
-        String versionInfo = versionEvent.getVersionInfo();
-        versionEvent.putDetailedVersionInfo("version.txt", versionInfo);
-
-        Map<String, String> files = versionEvent.getDetailedVersionInfo();
-
-        logToConsole(versionInfo);
-
-        PasteServiceType pasteType = flags.getValue(CoreFlags.PASTE_SERVICE_TYPE);
-        if (pasteType == PasteServiceType.NONE && !(sender instanceof ConsoleCommandSender)) {
-            sender.sendMessage("Version info dumped to console! Please check your server logs.");
-            return;
-        }
-
-        BukkitRunnable logPoster = new BukkitRunnable() {
-            @Override
-            public void run() {
-                String pasteUrl = postToService(pasteType, true, versionInfo, files);
-                sender.sendMessage("Version info dumped here: " + ChatColor.GREEN + pasteUrl);
-            }
-        };
-
-        // Run the log posting operation asynchronously, since we don't know how long it will take.
-        logPoster.runTaskAsynchronously(this.plugin);
+    private String getLegacyString() {
+        return "[Multiverse-Core] Multiverse-Core Version: " + this.plugin.getDescription().getVersion() + '\n'
+                + "[Multiverse-Core] Bukkit Version: " + this.plugin.getServer().getVersion() + '\n'
+                + "[Multiverse-Core] Loaded Worlds: " + this.plugin.getMVWorldManager().getMVWorlds() + '\n'
+                + "[Multiverse-Core] Multiverse Plugins Loaded: " + this.plugin.getPluginCount() + '\n'
+                +"[Multiverse-Core] Economy being used: " + plugin.getEconomist().getEconomyName() + '\n'
+                + "[Multiverse-Core] Permissions Plugin: " + this.plugin.getMVPerms().getType() + '\n'
+                + "[Multiverse-Core] Dumping Config Values: (version " + this.plugin.getMVConfig().getVersion() + ")" + '\n'
+                + "[Multiverse-Core]   enforceaccess: " + plugin.getMVConfig().getEnforceAccess() + '\n'
+                + "[Multiverse-Core]   prefixchat: " + plugin.getMVConfig().getPrefixChat() + '\n'
+                + "[Multiverse-Core]   prefixchatformat: " + plugin.getMVConfig().getPrefixChatFormat() + '\n'
+                + "[Multiverse-Core]   useasyncchat: " + plugin.getMVConfig().getUseAsyncChat() + '\n'
+                + "[Multiverse-Core]   teleportintercept: " + plugin.getMVConfig().getTeleportIntercept() + '\n'
+                + "[Multiverse-Core]   firstspawnoverride: " + plugin.getMVConfig().getFirstSpawnOverride() + '\n'
+                + "[Multiverse-Core]   displaypermerrors: " + plugin.getMVConfig().getDisplayPermErrors() + '\n'
+                + "[Multiverse-Core]   enablebuscript: " + plugin.getMVConfig().getEnableBuscript() + '\n'
+                + "[Multiverse-Core]   globaldebug: " + plugin.getMVConfig().getGlobalDebug() + '\n'
+                + "[Multiverse-Core]   silentstart: " + plugin.getMVConfig().getSilentStart() + '\n'
+                + "[Multiverse-Core]   messagecooldown: " + plugin.getMessaging().getCooldown() + '\n'
+                + "[Multiverse-Core]   version: " + plugin.getMVConfig().getVersion() + '\n'
+                + "[Multiverse-Core]   firstspawnworld: " + plugin.getMVConfig().getFirstSpawnWorld() + '\n'
+                + "[Multiverse-Core]   teleportcooldown: " + plugin.getMVConfig().getTeleportCooldown() + '\n'
+                + "[Multiverse-Core]   defaultportalsearch: " + plugin.getMVConfig().isUsingDefaultPortalSearch() + '\n'
+                + "[Multiverse-Core]   portalsearchradius: " + plugin.getMVConfig().getPortalSearchRadius() + '\n'
+                + "[Multiverse-Core]   autopurge: " + plugin.getMVConfig().isAutoPurgeEnabled() + '\n'
+                + "[Multiverse-Core] Special Code: FRN002" + '\n';
    }

-    private void logToConsole(String versionInfo) {
-        Arrays.stream(versionInfo.split("\\r?\\n"))
-                .filter(line -> !line.isEmpty())
-                .forEach(this.plugin.getServer().getLogger()::info);
+    private String getMarkdownString() {
+        return "# Multiverse-Core" + '\n'
+                + "## Overview" + '\n'
+                + "| Name | Value |" + '\n'
+                + "| --- | --- |" + '\n'
+                + "| Multiverse-Core Version | `" + this.plugin.getDescription().getVersion() + "` |" + '\n'
+                + "| Bukkit Version | `" + this.plugin.getServer().getVersion() + "` |" + '\n'
+                + "| Loaded Worlds | `" + this.plugin.getMVWorldManager().getMVWorlds() + "` |" + '\n'
+                + "| Multiverse Plugins Loaded | `" + this.plugin.getPluginCount() + "` |" + '\n'
+                + "| Economy being used | `" + plugin.getEconomist().getEconomyName() + "` |" + '\n'
+                + "| Permissions Plugin | `" + this.plugin.getMVPerms().getType() + "` |" + '\n'
+                + "## Parsed Config" + '\n'
+                + "These are what Multiverse thought the in-memory values of the config were." + "\n\n"
+                + "| Config Key  | Value |" + '\n'
+                + "| --- | --- |" + '\n'
+                + "| version | `" + this.plugin.getMVConfig().getVersion() + "` |" + '\n'
+                + "| messagecooldown | `" + plugin.getMessaging().getCooldown() + "` |" + '\n'
+                + "| teleportcooldown | `" + plugin.getMVConfig().getTeleportCooldown() + "` |" + '\n'
+                + "| worldnameprefix | `" + plugin.getMVConfig().getPrefixChat() + "` |" + '\n'
+                + "| worldnameprefixFormat | `" + plugin.getMVConfig().getPrefixChatFormat() + "` |" + '\n'
+                + "| enforceaccess | `" + plugin.getMVConfig().getEnforceAccess() + "` |" + '\n'
+                + "| displaypermerrors | `" + plugin.getMVConfig().getDisplayPermErrors() + "` |" + '\n'
+                + "| teleportintercept | `" + plugin.getMVConfig().getTeleportIntercept() + "` |" + '\n'
+                + "| firstspawnoverride | `" + plugin.getMVConfig().getFirstSpawnOverride() + "` |" + '\n'
+                + "| firstspawnworld | `" + plugin.getMVConfig().getFirstSpawnWorld() + "` |" + '\n'
+                + "| debug | `" + plugin.getMVConfig().getGlobalDebug() + "` |" + '\n';
    }

    private void addVersionInfoToEvent(MVVersionEvent event) {
@@ -108,7 +113,7 @@ public class VersionCommand extends MultiverseCoreCommand {
        event.appendVersionInfo(this.getLegacyString());

        // add the legacy file, but as markdown so it's readable
-        // TODO API: Readd this in 5.0.0
+        // TODO Readd this in 5.0.0
        // event.putDetailedVersionInfo("version.md", this.getMarkdownString());

        // add config.yml
@@ -120,6 +125,69 @@ public class VersionCommand extends MultiverseCoreCommand {
        event.putDetailedVersionInfo("multiverse-core/worlds.yml", worldsFile);
    }

+    @Override
+    public void runCommand(final CommandSender sender, final List<String> args) {
+        // Check if the command was sent from a Player.
+        if (sender instanceof Player) {
+            sender.sendMessage("Version info dumped to console. Please check your server logs.");
+        }
+
+        MVVersionEvent versionEvent = new MVVersionEvent();
+
+        this.addVersionInfoToEvent(versionEvent);
+        this.plugin.getServer().getPluginManager().callEvent(versionEvent);
+
+        if (CommandHandler.hasFlag("--include-plugin-list", args)) {
+            versionEvent.appendVersionInfo('\n' + "Plugins: " + getPluginList());
+            versionEvent.putDetailedVersionInfo("plugins.txt", "Plugins: " + getPluginList());
+        }
+
+        final String versionInfo = versionEvent.getVersionInfo();
+        versionEvent.putDetailedVersionInfo("version.txt", versionInfo);
+
+        final Map<String, String> files = versionEvent.getDetailedVersionInfo();
+
+        // log to console
+        String[] lines = versionInfo.split("\\r?\\n");
+        for (String line : lines) {
+            if (!line.isEmpty()) {
+                this.plugin.getServer().getLogger().info(line);
+            }
+        }
+
+        BukkitRunnable logPoster = new BukkitRunnable() {
+            @Override
+            public void run() {
+                if (args.size() > 0) {
+                    String pasteUrl;
+                    if (CommandHandler.hasFlag("-b", args)) {
+                        // private post to pastebin
+                        pasteUrl = postToService(PasteServiceType.PASTEBIN, true, versionInfo, files);
+                    } else if (CommandHandler.hasFlag("-g", args)) {
+                        // private post to github
+                        pasteUrl = postToService(PasteServiceType.GITHUB, true, versionInfo, files);
+                    } else if (CommandHandler.hasFlag("-h", args)) {
+                        // private post to hastebin
+                        pasteUrl = postToService(PasteServiceType.HASTEBIN, true, versionInfo, files);
+                    } else if (CommandHandler.hasFlag("-p", args)) {
+                        // private post to paste.gg
+                        pasteUrl = postToService(PasteServiceType.PASTEGG, true, versionInfo, files);
+                    } else {
+                        return;
+                    }
+
+                    if (!(sender instanceof ConsoleCommandSender)) {
+                        sender.sendMessage("Version info dumped here: " + ChatColor.GREEN + pasteUrl);
+                    }
+                    Logging.info("Version info dumped here: %s", pasteUrl);
+                }
+            }
+        };
+
+        // Run the log posting operation asynchronously, since we don't know how long it will take.
+        logPoster.runTaskAsynchronously(this.plugin);
+    }
+
    /**
     * Send the current contents of this.pasteBinBuffer to a web service.
     *
@@ -133,51 +201,25 @@ public class VersionCommand extends MultiverseCoreCommand {
        PasteService ps = PasteServiceFactory.getService(type, isPrivate);

        try {
-            String result = (ps.supportsMultiFile())
-                    ? ps.postData(pasteFiles)
-                    : ps.postData(pasteData);
+            String result;
+            if (ps.supportsMultiFile()) {
+                result = ps.postData(pasteFiles);
+            } else {
+                result = ps.postData(pasteData);
+            }

-            return (SHORTENER != null) ? SHORTENER.shorten(result) : result;
-        }
-        catch (PasteFailedException e) {
+            if (SHORTENER != null) return SHORTENER.shorten(result);
+            return result;
+        } catch (PasteFailedException e) {
            e.printStackTrace();
-            return String.format("%sError posting to service.", ChatColor.RED);
-        }
-        catch (NullPointerException e) {
+            return "Error posting to service.";
+        } catch (NullPointerException e) {
            e.printStackTrace();
-            return String.format("%sThat service isn't supported yet.", ChatColor.RED);
+            return "That service isn't supported yet.";
        }
    }

-    private String getLegacyString() {
-        return "[Multiverse-Core] Multiverse-Core Version: " + this.plugin.getDescription().getVersion() + '\n'
-                + "[Multiverse-Core] Bukkit Version: " + this.plugin.getServer().getVersion() + '\n'
-                + "[Multiverse-Core] Loaded Worlds: " + this.plugin.getMVWorldManager().getMVWorlds() + '\n'
-                + "[Multiverse-Core] Multiverse Plugins Loaded: " + this.plugin.getPluginCount() + '\n'
-                + "[Multiverse-Core] Economy being used: " + plugin.getEconomist().getEconomyName() + '\n'
-                + "[Multiverse-Core] Permissions Plugin: " + this.plugin.getMVPerms().getType() + '\n'
-                + "[Multiverse-Core] Dumping Config Values: (version " + this.plugin.getMVConfig().getVersion() + ")" + '\n'
-                + "[Multiverse-Core]   enforceaccess: " + this.plugin.getMVConfig().getEnforceAccess() + '\n'
-                + "[Multiverse-Core]   prefixchat: " + this.plugin.getMVConfig().getPrefixChat() + '\n'
-                + "[Multiverse-Core]   prefixchatformat: " + this.plugin.getMVConfig().getPrefixChatFormat() + '\n'
-                + "[Multiverse-Core]   useasyncchat: " + this.plugin.getMVConfig().getUseAsyncChat() + '\n'
-                + "[Multiverse-Core]   teleportintercept: " + this.plugin.getMVConfig().getTeleportIntercept() + '\n'
-                + "[Multiverse-Core]   firstspawnoverride: " + this.plugin.getMVConfig().getFirstSpawnOverride() + '\n'
-                + "[Multiverse-Core]   displaypermerrors: " + this.plugin.getMVConfig().getDisplayPermErrors() + '\n'
-                + "[Multiverse-Core]   globaldebug: " + this.plugin.getMVConfig().getGlobalDebug() + '\n'
-                + "[Multiverse-Core]   enablebuscript: " + plugin.getMVConfig().getEnableBuscript() + '\n'
-                + "[Multiverse-Core]   silentstart: " + this.plugin.getMVConfig().getSilentStart() + '\n'
-                + "[Multiverse-Core]   messagecooldown: " + this.plugin.getMessaging().getCooldown() + '\n'
-                + "[Multiverse-Core]   version: " + this.plugin.getMVConfig().getVersion() + '\n'
-                + "[Multiverse-Core]   firstspawnworld: " + this.plugin.getMVConfig().getFirstSpawnWorld() + '\n'
-                + "[Multiverse-Core]   teleportcooldown: " + this.plugin.getMVConfig().getTeleportCooldown() + '\n'
-                + "[Multiverse-Core]   defaultportalsearch: " +this. plugin.getMVConfig().isUsingDefaultPortalSearch() + '\n'
-                + "[Multiverse-Core]   portalsearchradius: " + this.plugin.getMVConfig().getPortalSearchRadius() + '\n'
-                + "[Multiverse-Core]   autopurge: " +this. plugin.getMVConfig().isAutoPurgeEnabled() + '\n'
-                + "[Multiverse-Core] Special Code: FRN002" + '\n';
-    }
-
    private String getPluginList() {
-        return StringUtils.join(this.plugin.getServer().getPluginManager().getPlugins(), ", ");
+        return StringUtils.join(plugin.getServer().getPluginManager().getPlugins(), ", ");
    }
 }
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
 * Multiverse 2 is licensed under the BSD License.                            *
 * For more information please check the README.md file included              *
 * with this project.                                                         *
@@ -7,123 +7,112 @@

 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Conditions;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Flags;
-import co.aikar.commands.annotation.Optional;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.commandtools.context.PageFilter;
-import com.onarandombox.MultiverseCore.displaytools.ContentDisplay;
-import com.onarandombox.MultiverseCore.displaytools.ContentFilter;
-import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers;
-import com.onarandombox.MultiverseCore.displaytools.DisplaySettings;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.bukkit.permissions.PermissionDefault;

 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;

-@CommandAlias("mv")
-public class WhoCommand extends MultiverseCoreCommand {
+/**
+ * States who is in what world.
+ */
+public class WhoCommand extends MultiverseCommand {
+
+    private MVWorldManager worldManager;

    public WhoCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("Who?");
+        this.setCommandUsage("/mv who" + ChatColor.GOLD + " [WORLD|--all]");
+        this.setArgRange(0, 1);
+        this.addKey("mv who");
+        this.addKey("mvw");
+        this.addKey("mvwho");
+        this.addCommandExample("/mv who");
+        this.addCommandExample(String.format("/mv who %s--all", ChatColor.GREEN));
+        this.addCommandExample(String.format("/mv who %smyworld", ChatColor.GOLD));
+        this.setPermission("multiverse.core.list.who", "States who is in what world.", PermissionDefault.OP);
+        this.worldManager = this.plugin.getMVWorldManager();
    }

-    @Subcommand("whoall")
-    @CommandPermission("multiverse.core.list.who.all")
-    @Syntax("[filter]")
-    public void onWhoAllCommand(@NotNull CommandSender sender,
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // If this command was sent from a Player then we need to check Permissions
+        Player p = null;
+        // By default, show all from the console
+        boolean showAll = true;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+            showAll = false;
+        }

-                                @NotNull
-                                @Syntax("[filter] [page]")
-                                @Description("Filter and paging.")
-                                PageFilter pageFilter) {
+        final Collection onlinePlayers = plugin.getServer().getOnlinePlayers();
+        final Collection<Player> visiblePlayers = new HashSet<Player>(onlinePlayers.size());
+        for (final Object player : onlinePlayers) {
+            if (player instanceof Player && (p == null || p.canSee((Player) player))) {
+                visiblePlayers.add((Player) player);
+            }
+        }

-        Player player = (sender instanceof Player) ? (Player) sender : null;
-        Set<Player> visiblePlayers = getVisiblePlayers(player);
+        if (args.size()  == 1) {
+            if (args.get(0).equalsIgnoreCase("--all") || args.get(0).equalsIgnoreCase("-a")) {
+                showAll = true;
+            } else {
+                // single world mode
+                MultiverseWorld world = this.worldManager.getMVWorld(args.get(0));
+                if (world == null) {
+                    sender.sendMessage(ChatColor.RED + "That world does not exist.");
+                    return;
+                }

-        new ContentDisplay.Builder<Collection<String>>()
-                .sender(sender)
-                .header("%s--- Worlds and their players --- %s%s/%s", ChatColor.GOLD, ChatColor.AQUA, visiblePlayers.size(), this.plugin.getServer().getMaxPlayers())
-                .contents(buildAllWorlds(player, visiblePlayers))
-                .displayHandler(DisplayHandlers.PAGE_LIST)
-                .filter(pageFilter.getFilter())
-                .setting(DisplaySettings.SHOW_PAGE, pageFilter.getPage())
-                .display();
+                if (!this.plugin.getMVPerms().canEnterWorld(p, world)) {
+                    sender.sendMessage(ChatColor.RED + "You aren't allowed to access to this world!");
+                    return;
+                }
+
+                sender.sendMessage(String.format("%s--- Players in %s%s ---", ChatColor.AQUA,
+                        world.getColoredWorldString(), ChatColor.AQUA));
+                sender.sendMessage(this.buildPlayerString(world, p, visiblePlayers));
+                return;
+            }
+        }
+
+        // multiworld mode
+        sender.sendMessage(ChatColor.AQUA + "--- Worlds and their players --- "
+                + visiblePlayers.size() + "/" + plugin.getServer().getMaxPlayers());
+        boolean shownOne = false;
+        for (MultiverseWorld world : this.worldManager.getMVWorlds()) {
+            if (this.plugin.getMVPerms().canEnterWorld(p, world)) { // only show world if the player can access it
+                if (showAll || !world.getCBWorld().getPlayers().isEmpty()) { // either show all or show if the world is not empty
+                    sender.sendMessage(String.format("%s%s - %s", world.getColoredWorldString(), ChatColor.WHITE, buildPlayerString(world, p, visiblePlayers)));
+                    shownOne = true;
+                }
+            }
+        }
+        if (!shownOne) {
+            sender.sendMessage("No worlds found.");
+        }
+        return;
    }

-    @Subcommand("who")
-    @CommandPermission("multiverse.core.list.who")
-    @Syntax("[world] [filter]")
-    @CommandCompletion("@MVWorlds")
-    public void onWhoCommand(@NotNull CommandSender sender,
-                             @Nullable @Optional Player player,
-
-                             @NotNull
-                             @Syntax("[world]")
-                             @Description("World to show player list.")
-                             @Flags("other,defaultself,fallbackself")
-                             @Conditions("hasWorldAccess") MultiverseWorld world,
-
-                             @NotNull
-                             @Syntax("[filter]")
-                             @Description("Filter the player names.")
-                             ContentFilter filter) {
-
-        Set<Player> visiblePlayers = getVisiblePlayers(player);
-
-        new ContentDisplay.Builder<Collection<String>>()
-                .sender(sender)
-                .header("%s===[ Players in %s%s ]===", ChatColor.AQUA, world.getColoredWorldString(), ChatColor.AQUA)
-                .contents(buildPlayerList(world, visiblePlayers))
-                .emptyMessage("%sNo players found.", ChatColor.GRAY)
-                .displayHandler(DisplayHandlers.PAGE_LIST)
-                //TODO: Filter
-                .display();
-    }
-
-    private List<String> buildAllWorlds(@Nullable Player player,
-                                        @NotNull Set<Player> visiblePlayers) {
-
-        return this.plugin.getMVWorldManager().getMVWorlds().stream()
-                .filter(world -> player == null || this.plugin.getMVPerms().canEnterWorld(player, world))
-                .map(world -> getPLayersInWorld(world, visiblePlayers))
-                .collect(Collectors.toList());
-    }
-
-    private String getPLayersInWorld(@NotNull MultiverseWorld world,
-                                     @NotNull Set<Player> visiblePlayers) {
-
-        return String.format("%s%s - %s",
-                world.getColoredWorldString(), ChatColor.WHITE, buildPlayerList(world, visiblePlayers));
-    }
-
-    @NotNull
-    private List<String> buildPlayerList(@NotNull MultiverseWorld world,
-                                         @NotNull Set<Player> visiblePlayers) {
-
-        return world.getCBWorld().getPlayers().stream()
-            .filter(visiblePlayers::contains)
-            .map(Player::getDisplayName)
-            .collect(Collectors.toList());
-    }
-
-    @NotNull
-    private Set<Player> getVisiblePlayers(@Nullable Player player) {
-        return this.plugin.getServer().getOnlinePlayers().stream()
-                .filter(targetPLayer -> player == null || player.canSee(targetPLayer))
-                .collect(Collectors.toSet());
+    private static String buildPlayerString(MultiverseWorld world, Player viewer, final Collection<Player> visiblePlayers) {
+        // Retrieve the players in this world
+        List<Player> players = world.getCBWorld().getPlayers();
+        StringBuilder playerBuilder = new StringBuilder();
+        for (Player player : players) {
+            // If the viewer is the console or the viewier is allowed to see the player, show them.
+            // Make sure we're also ONLY showing online players.
+            // Since we already checked visible players, we'll just make sure who we're about to show is in that.
+            if (visiblePlayers.contains(player))
+                playerBuilder.append(player.getDisplayName()).append(", ");
+        }
+        String bString = playerBuilder.toString();
+        return (bString.length() == 0) ? "No players found." : bString.substring(0, bString.length() - 2);
    }
 }
@@ -1,4 +1,4 @@
 /**
- * Where all the commands are.
+ * This package contains all Commands.
 */
-package com.onarandombox.MultiverseCore.commands;
+package com.onarandombox.MultiverseCore.commands;
@@ -1,323 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commandtools;
-
-import buscript.Buscript;
-import co.aikar.commands.BukkitCommandCompletionContext;
-import co.aikar.commands.CommandIssuer;
-import co.aikar.commands.PaperCommandCompletions;
-import co.aikar.commands.RegisteredCommand;
-import co.aikar.commands.RootCommand;
-import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.commandtools.flag.CommandFlag;
-import com.onarandombox.MultiverseCore.commandtools.flag.CommandFlag.ValueRequirement;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagGroup;
-import com.onarandombox.MultiverseCore.enums.AddProperties;
-import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
-import org.bukkit.GameRule;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.text.DecimalFormat;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * Generate tab-complete suggestion.
- */
-public class MVCommandCompletions extends PaperCommandCompletions {
-
-    private final MultiverseCore plugin;
-    private final MVWorldManager worldManager;
-
-    private static final DecimalFormat df = new DecimalFormat();
-
-    static {
-        df.setMinimumFractionDigits(0);
-        df.setMaximumFractionDigits(2);
-    }
-
-    public MVCommandCompletions(@NotNull MVCommandManager manager,
-                                @NotNull MultiverseCore plugin) {
-        super(manager);
-        this.plugin = plugin;
-        this.worldManager = plugin.getMVWorldManager();
-
-        registerAsyncCompletion("flags", this::suggestFlags);
-        registerAsyncCompletion("scripts", this::suggestScripts);
-        registerAsyncCompletion("subCommands", this::suggestSubCommands);
-        registerAsyncCompletion("MVWorlds", this::suggestMVWorlds);
-        registerAsyncCompletion("unloadedWorlds", this::suggestUnloadedWorlds);
-        registerAsyncCompletion("potentialWorlds", this::suggestPotentialWorlds);
-        registerAsyncCompletion("location", this::suggestLocation);
-        registerAsyncCompletion("destinations", this::suggestDestinations);
-        registerAsyncCompletion("anchors", this::suggestAnchors);
-        registerStaticCompletion("MVConfigs", this::suggestMVConfig);
-        registerStaticCompletion("gameRules", this::suggestGameRules);
-        registerStaticCompletion("environments", this::suggestEnvironments);
-        registerStaticCompletion("setProperties", this::suggestSetProperties);
-        registerStaticCompletion("addProperties", this::suggestAddProperties);
-        registerStaticCompletion("livingEntities", this::suggestEntities);
-        registerStaticCompletion("pasteTypes", this::suggestPasteTypes);
-        registerStaticCompletion("toggles", this::suggestToggles);
-    }
-
-    @NotNull
-    private Collection<String> suggestFlags(@NotNull BukkitCommandCompletionContext context) {
-        final MultiverseCommand command = MVCommandReflect.getCommandCompletionContextCommand(context);
-        if (command == null) {
-            Logging.warning("Unable to parse flags as MultiverseCommand not found!");
-            return Collections.emptyList();
-        }
-
-        FlagGroup flagGroup = command.getFlagGroup();
-        String[] args = context.getContextValue(String[].class);
-        CommandFlag<?> flag = (args.length <= 1) ? null : flagGroup.getByKey(args[args.length - 2]);
-
-        if (flag == null || flag.getValueRequirement() == ValueRequirement.NONE) {
-            // suggest new flags.
-            return getRemainingFlagIdentifiers(flagGroup, args);
-        }
-
-        Collection<String> flagSuggestions = flag.suggestValue();
-
-        if (flag.getValueRequirement() == ValueRequirement.OPTIONAL) {
-            // suggest new flags and values.
-            flagSuggestions.addAll(getRemainingFlagIdentifiers(flagGroup, args));
-            return flagSuggestions;
-        }
-        // suggest new values.
-        return flagSuggestions == null ? Collections.emptySet() : flagSuggestions;
-    }
-
-    private Collection<String> getRemainingFlagIdentifiers(FlagGroup flagGroup, String[] args) {
-        Set<String> identifiersRemaining = new HashSet<>(flagGroup.getFlagIdentifiers());
-        identifiersRemaining.removeAll(Arrays.asList(args));
-        return identifiersRemaining;
-    }
-
-    @NotNull
-    private Collection<String> suggestScripts(@NotNull BukkitCommandCompletionContext context) {
-        Buscript scriptAPI = this.plugin.getScriptAPI();
-        if (scriptAPI == null) {
-            return Collections.emptyList();
-        }
-
-        return Arrays.stream(scriptAPI.getScriptFolder().listFiles())
-                .unordered()
-                .filter(File::isFile)
-                .map(File::getName)
-                .filter(fileName -> !fileName.equals("scripts.bin"))
-                .collect(Collectors.toList());
-    }
-
-    @NotNull
-    private Collection<String> suggestSubCommands(@NotNull BukkitCommandCompletionContext context) {
-        String rootCmdName = context.getConfig();
-        if (rootCmdName == null) {
-            return Collections.emptyList();
-        }
-
-        RootCommand rootCommand = this.plugin.getMVCommandManager().getRegisteredRootCommands().stream()
-                .unordered()
-                .filter(c -> c.getCommandName().equals(rootCmdName))
-                .findFirst()
-                .orElse(null);
-
-        if (rootCommand == null) {
-            return Collections.emptyList();
-        }
-
-        return rootCommand.getSubCommands().entries().stream()
-                .unordered()
-                .filter(entry -> checkPerms(context.getIssuer(), entry.getValue()))
-                .map(Map.Entry::getKey)
-                .filter(cmdName -> !cmdName.startsWith("__"))
-                .collect(Collectors.toList());
-    }
-
-    private boolean checkPerms(@NotNull CommandIssuer issuer,
-                               @NotNull RegisteredCommand<?> cmd) {
-
-        return this.plugin.getMVCommandManager().hasPermission(issuer, cmd.getRequiredPermissions());
-    }
-
-    @NotNull
-    private Collection<String> suggestMVWorlds(@NotNull BukkitCommandCompletionContext context) {
-        if (isPlayerOnly(context)) {
-            return Collections.emptyList();
-        }
-
-        return this.worldManager.getMVWorlds().parallelStream()
-                .unordered()
-                .map(MultiverseWorld::getName)
-                .collect(Collectors.toList());
-    }
-
-    @NotNull
-    private Collection<String> suggestUnloadedWorlds(@NotNull BukkitCommandCompletionContext context) {
-        if (isPlayerOnly(context)) {
-            return Collections.emptyList();
-        }
-
-        return this.worldManager.getUnloadedWorlds();
-    }
-
-    @NotNull
-    private Collection<String> suggestPotentialWorlds(@NotNull BukkitCommandCompletionContext context) {
-        if (isPlayerOnly(context)) {
-            return Collections.emptyList();
-        }
-
-        Collection<MultiverseWorld> worlds = this.worldManager.getMVWorlds();
-        Set<String> knownWorlds = worlds.parallelStream()
-                .unordered()
-                .map(MultiverseWorld::getName)
-                .collect(Collectors.toCollection(() -> new HashSet<>(worlds.size())));
-
-        return Arrays.stream(this.plugin.getServer().getWorldContainer().listFiles()).parallel()
-                .unordered()
-                .filter(File::isDirectory)
-                .filter(file -> !knownWorlds.contains(file.getName()))
-                .map(File::getName)
-                .filter(this.worldManager::isValidWorld)
-                .collect(Collectors.toList());
-    }
-
-    @NotNull
-    private Collection<String> suggestLocation(@NotNull BukkitCommandCompletionContext context) {
-        if (isPlayerOnly(context)) {
-            return Collections.emptyList();
-        }
-
-        Player player = context.getPlayer();
-        if (player == null) {
-            return Collections.emptyList();
-        }
-
-        DecimalFormat df = new DecimalFormat();
-        df.setMinimumFractionDigits(0);
-        df.setMaximumFractionDigits(2);
-
-        Location playerLocation = player.getLocation();
-        double coordValue;
-        switch (context.getConfig()) {
-            case "x":
-                coordValue = playerLocation.getX();
-                break;
-            case "y":
-                coordValue = playerLocation.getY();
-                break;
-            case "z":
-                coordValue = playerLocation.getZ();
-                break;
-            case "yaw":
-                coordValue = playerLocation.getYaw();
-                break;
-            case "pitch":
-                coordValue = playerLocation.getPitch();
-                break;
-            default:
-                return Collections.emptyList();
-        }
-
-        return Collections.singletonList(df.format(coordValue));
-    }
-
-    @NotNull
-    private Collection<String> suggestDestinations(@NotNull BukkitCommandCompletionContext context) {
-        if (isPlayerOnly(context)) {
-            return Collections.emptyList();
-        }
-
-        return this.plugin.getDestFactory().getIdentifiers().parallelStream()
-                .unordered()
-                .filter(id -> !id.isEmpty())
-                .map(id -> id + ":")
-                .collect(Collectors.toList());
-    }
-
-    @NotNull
-    private Collection<String> suggestAnchors(@NotNull BukkitCommandCompletionContext context) {
-        if (isPlayerOnly(context)) {
-            return Collections.emptyList();
-        }
-
-        return this.plugin.getAnchorManager().getAnchors(context.getPlayer());
-    }
-
-    private boolean isPlayerOnly(@NotNull BukkitCommandCompletionContext context) {
-        String config = context.getConfig();
-        return config != null && context.getPlayer() == null && config.equals("playerOnly");
-    }
-
-    @NotNull
-    private Collection<String> suggestMVConfig() {
-        final Set<String> configOptions = this.plugin.getMVConfig().serialize().keySet();
-        configOptions.remove("version");
-        return configOptions;
-    }
-
-    @NotNull
-    private Collection<String> suggestGameRules() {
-        return Arrays.stream(GameRule.values())
-                .map(GameRule::getName)
-                .collect(Collectors.toList());
-    }
-
-    @NotNull
-    private Collection<String> suggestEnvironments() {
-        return Arrays.stream(World.Environment.values())
-                .map(e -> e.toString().toLowerCase())
-                .collect(Collectors.toList());
-    }
-
-    private Collection<String> suggestSetProperties() {
-        return this.worldManager.getMVWorlds().iterator().next().getAllPropertyTypes();
-    }
-
-    @NotNull
-    private Collection<String> suggestAddProperties() {
-        return Arrays.stream(AddProperties.values())
-                .map(p -> p.toString().toLowerCase())
-                .collect(Collectors.toList());
-    }
-
-    @NotNull
-    private Collection<String> suggestEntities() {
-        return Arrays.stream(EntityType.values())
-                .filter(e -> e.isAlive() && e.isSpawnable())
-                .map(e -> e.toString().toLowerCase())
-                .collect(Collectors.toList());
-    }
-
-    @NotNull
-    private Collection<String> suggestPasteTypes() {
-        return Arrays.stream(PasteServiceType.values())
-                .filter(pt -> pt != PasteServiceType.GITHUB && pt != PasteServiceType.NONE)
-                .map(p -> p.toString().toLowerCase())
-                .collect(Collectors.toList());
-    }
-
-    @NotNull
-    private Collection<String> suggestToggles() {
-        return Arrays.asList("on", "off");
-    }
-}
@@ -1,196 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commandtools;
-
-import co.aikar.commands.BukkitCommandExecutionContext;
-import co.aikar.commands.BukkitCommandIssuer;
-import co.aikar.commands.BukkitConditionContext;
-import co.aikar.commands.CommandConditions;
-import co.aikar.commands.ConditionContext;
-import co.aikar.commands.ConditionFailedException;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.enums.AddProperties;
-import com.onarandombox.MultiverseCore.enums.WorldValidationResult;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Args input validation.
- */
-public class MVCommandConditions {
-
-    private final MultiverseCore plugin;
-    private final MVWorldManager worldManager;
-
-    public MVCommandConditions(@NotNull MultiverseCore plugin,
-                               @NotNull CommandConditions<BukkitCommandIssuer, BukkitCommandExecutionContext, BukkitConditionContext> conditions) {
-
-        this.plugin = plugin;
-        this.worldManager = plugin.getMVWorldManager();
-
-        conditions.addCondition(String.class, "isMVWorld", this::checkIsMVWorld);
-        conditions.addCondition(String.class, "isUnloadedWorld", this::checkIsUnloadedWorld);
-        conditions.addCondition(String.class, "isWorldInConfig", this::checkIsWorldInConfig);
-        conditions.addCondition(String.class, "creatableWorldName", this::checkCreatableWorldName);
-        conditions.addCondition(String.class, "importableWorldName", this::checkImportableWorldName);
-        conditions.addCondition(String.class, "validWorldFolder", this::checkValidWorldFolder);
-        conditions.addCondition(String.class, "validAddProperty", this::checkValidAddProperty);
-        conditions.addCondition(MultiverseWorld.class, "hasWorldAccess", this::checkHasWorldAccess);
-    }
-
-    private void checkIsMVWorld(@NotNull ConditionContext<BukkitCommandIssuer> context,
-                                @NotNull BukkitCommandExecutionContext executionContext,
-                                @NotNull String worldName) {
-
-        if (!this.worldManager.isMVWorld(worldName)) {
-            throw new ConditionFailedException(String.format("World '%s' not found.", worldName));
-        }
-    }
-
-    private void checkIsUnloadedWorld(@NotNull ConditionContext<BukkitCommandIssuer> context,
-                                      @NotNull BukkitCommandExecutionContext executionContext,
-                                      @NotNull String worldName) {
-
-        if (this.worldManager.isMVWorld(worldName)) {
-            throw new ConditionFailedException(String.format("World '%s' is already loaded.", worldName));
-        }
-
-        if (!this.worldManager.getUnloadedWorlds().contains(worldName)) {
-            if (this.worldManager.isValidWorld(worldName)) {
-                CommandSender sender = executionContext.getSender();
-                sender.sendMessage(String.format("%sMultiverse does not know about world '%s' yet. Please import it with %s/mv import %s <env>%s.",
-                        ChatColor.RED, worldName, ChatColor.AQUA, worldName, ChatColor.RED));
-                sender.sendMessage(String.format("See %s/mv help import %sfor more info.",
-                        ChatColor.AQUA, ChatColor.WHITE));
-                throw new ConditionFailedException();
-            }
-            throw new ConditionFailedException(String.format("World '%s' not found.", worldName));
-        }
-    }
-
-    private void checkIsWorldInConfig(@NotNull ConditionContext<BukkitCommandIssuer> context,
-                                      @NotNull BukkitCommandExecutionContext executionContext,
-                                      @NotNull String worldName) {
-
-        if (!this.worldManager.hasUnloadedWorld(worldName, true)) {
-            throw new ConditionFailedException(String.format("World '%s' not found.", worldName));
-        }
-    }
-
-    private void checkCreatableWorldName(@NotNull ConditionContext<BukkitCommandIssuer> context,
-                                         @NotNull BukkitCommandExecutionContext executionContext,
-                                         @NotNull String worldName) {
-
-        if (this.worldManager.isMVWorld(worldName)) {
-            throw new ConditionFailedException(String.format("%sMultiverse cannot create %sanother %s%sworld named '%s'.",
-                    ChatColor.RED, ChatColor.GOLD, ChatColor.RESET, ChatColor.RED, worldName));
-        }
-
-        WorldValidationResult validationResult = this.worldManager.validateWorld(worldName);
-        validateWorldNameResult(validationResult);
-
-        if (validationResult != WorldValidationResult.DOES_NOT_EXIST && validationResult != WorldValidationResult.NOT_A_DIRECTORY) {
-            CommandSender sender = executionContext.getSender();
-            if (validationResult == WorldValidationResult.VALID) {
-                sender.sendMessage(String.format("%sWorld Folder '%s' already look like a world to me! You can try importing it with %s/mv import%s.",
-                        ChatColor.RED, worldName, ChatColor.AQUA, ChatColor.RED));
-                sender.sendMessage(String.format("See %s/mv help import %sfor more info.",
-                        ChatColor.AQUA, ChatColor.WHITE));
-                throw new ConditionFailedException();
-            }
-
-            sender.sendMessage(String.format("%sA folder already exists with this name!", ChatColor.RED));
-            throw new ConditionFailedException();
-        }
-    }
-
-    private void checkImportableWorldName(@NotNull ConditionContext<BukkitCommandIssuer> context,
-                                          @NotNull BukkitCommandExecutionContext executionContext,
-                                          @NotNull String worldName) {
-
-        if (this.worldManager.isMVWorld(worldName)) {
-            executionContext.getSender().sendMessage(String.format("%sMultiverse %s already knows about %s%s%s!",
-                    ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, worldName, ChatColor.WHITE));
-            throw new ConditionFailedException();
-        }
-
-        checkValidWorldFolder(context, executionContext, worldName);
-    }
-
-    private void checkValidWorldFolder(@NotNull ConditionContext<BukkitCommandIssuer> context,
-                                       @NotNull BukkitCommandExecutionContext executionContext,
-                                       @NotNull String worldName) {
-
-        WorldValidationResult validationResult = this.worldManager.validateWorld(worldName);
-        validateWorldNameResult(validationResult);
-        validateWorldFolderResult(validationResult, worldName);
-    }
-
-    private void validateWorldNameResult(WorldValidationResult validationResult) {
-        switch (validationResult) {
-            case NAME_BLACKLISTED:
-                throw new ConditionFailedException("World should not be in reserved server folders.");
-            case NAME_CONTAINS_DAT:
-                throw new ConditionFailedException("Multiverse cannot have a world name that contains '.dat'.");
-            case NAME_INVALID:
-                throw new ConditionFailedException("World name should not contain spaces or special characters! Please rename your world folder.");
-        }
-    }
-
-    private void validateWorldFolderResult(@NotNull WorldValidationResult validationResult,
-                                           @NotNull String worldName) {
-        switch (validationResult) {
-            case DOES_NOT_EXIST:
-            case NOT_A_DIRECTORY:
-                throw new ConditionFailedException(String.format("World folder '%s' does not exist.", worldName));
-            case FOLDER_LACK_DAT:
-                throw new ConditionFailedException(String.format("'%s' does not appear to be a world! It is lacking .dat file.", worldName));
-        }
-    }
-
-    private void checkValidAddProperty (@NotNull ConditionContext<BukkitCommandIssuer> context,
-                                        @NotNull BukkitCommandExecutionContext executionContext,
-                                        @NotNull String property) {
-
-        String actionType = context.getConfig();
-        if (actionType.equalsIgnoreCase("set")) {
-            return;
-        }
-
-        try {
-            AddProperties.valueOf(property);
-        }
-        catch (IllegalArgumentException e) {
-            CommandSender sender = executionContext.getSender();
-            sender.sendMessage(String.format("%sSorry, you can't use %s with '%s'.",
-                    ChatColor.RED, actionType, property));
-            sender.sendMessage(String.format("%sPlease visit our Github Wiki for more information: https://goo.gl/q1h01S",
-                    ChatColor.AQUA));
-            throw new ConditionFailedException();
-        }
-    }
-
-    private void checkHasWorldAccess(@NotNull ConditionContext<BukkitCommandIssuer> context,
-                                     @NotNull BukkitCommandExecutionContext executionContext,
-                                     @NotNull MultiverseWorld world) {
-
-        Player player = executionContext.getPlayer();
-        if (player == null) {
-            return;
-        }
-
-        if (!this.plugin.getMVPerms().canEnterWorld(player, world)) {
-            throw new ConditionFailedException(String.format("You aren't allowed to access to world '%s%s'!",
-                    world.getColoredWorldString(), ChatColor.RED));
-        }
-    }
-}
@@ -1,416 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commandtools;
-
-import co.aikar.commands.BukkitCommandExecutionContext;
-import co.aikar.commands.InvalidCommandArgument;
-import co.aikar.commands.PaperCommandContexts;
-import co.aikar.commands.annotation.Values;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.commands.EnvironmentCommand;
-import com.onarandombox.MultiverseCore.commandtools.context.GameRuleProperty;
-import com.onarandombox.MultiverseCore.commandtools.context.PageFilter;
-import com.onarandombox.MultiverseCore.commandtools.context.RequiredPlayer;
-import com.onarandombox.MultiverseCore.destination.InvalidDestination;
-import com.onarandombox.MultiverseCore.displaytools.ContentFilter;
-import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.GameRule;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- * Parse args into objects.
- */
-public class MVCommandContexts extends PaperCommandContexts {
-
-    private final MultiverseCore plugin;
-    private final MVWorldManager worldManager;
-
-    private static final Pattern UUID_REGEX = Pattern.compile("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[34][0-9a-fA-F]{3}-[89ab][0-9a-fA-F]{3}-[0-9a-fA-F]{12}");
-    private static final Pattern TRIM_REGEX = Pattern.compile("^[./\\\\]+");
-
-    public MVCommandContexts(@NotNull MVCommandManager manager,
-                             @NotNull MultiverseCore plugin) {
-
-        super(manager);
-        this.plugin = plugin;
-        this.worldManager = plugin.getMVWorldManager();
-
-        registerContext(RequiredPlayer.class, this::deriveRequiredPlayer);
-        registerIssuerOnlyContext(Player.class, this::derivePlayer);
-
-        registerIssuerAwareContext(MultiverseWorld.class, this::deriveMultiverseWorld);
-        registerContext(World.Environment.class, this::deriveEnvironment);
-        registerIssuerAwareContext(GameRuleProperty.class, this::deriveGameRuleProperty);
-        registerIssuerAwareContext(MVDestination.class, this::deriveMVDestination);
-        registerIssuerAwareContext(PasteServiceType.class, this::derivePasteServiceType);
-        registerOptionalContext(String.class, this::deriveString);
-        registerIssuerAwareContext(ContentFilter.class, this::deriveContentFilter);
-        registerOptionalContext(PageFilter.class, this::derivePageFilter);
-    }
-
-    @NotNull
-    private Player derivePlayer(@NotNull BukkitCommandExecutionContext context) {
-        Player player = context.getPlayer();
-        if (player == null) {
-            throw new InvalidCommandArgument("You must be a player to run this command.");
-        }
-        return player;
-    }
-
-    @NotNull
-    private RequiredPlayer deriveRequiredPlayer(BukkitCommandExecutionContext context) {
-        String playerIdentifier = context.getFirstArg();
-        Player player = getPlayerFromValue(context.getSender(), playerIdentifier);
-        if (player == null) {
-            throw new InvalidCommandArgument("Invalid player name '" + playerIdentifier + "'!");
-        }
-        return new RequiredPlayer(player);
-    }
-
-    @Nullable
-    private MultiverseWorld deriveMultiverseWorld(@NotNull BukkitCommandExecutionContext context) {
-        if (!context.hasFlag("other")) {
-            return getPlayerWorld(
-                    context.getPlayer(),
-                    context.isOptional()
-                    , "You cannot run this command from console."
-            );
-        }
-
-        String worldName = context.getFirstArg();
-        if (worldName == null) {
-            if (context.hasFlag("defaultself")) {
-                return getPlayerWorld(
-                        context.getPlayer(),
-                        context.isOptional()
-                        , "You need to specific a world name from console."
-                );
-            }
-            if (context.isOptional()) {
-                return null;
-            }
-            throw new InvalidCommandArgument("You need to specific a world name.");
-        }
-
-        MultiverseWorld world = getWorld(context.getSender(), worldName, !context.hasFlag("ignoreunload"));
-        if (world == null) {
-            if (context.hasFlag("fallbackself")) {
-                return getPlayerWorld(context.getPlayer(),
-                        context.isOptional(),
-                        String.format("World '%s' not found.", worldName));
-            }
-            if (this.worldManager.isValidWorld(worldName)) {
-                CommandSender sender = context.getSender();
-                sender.sendMessage(String.format("%sMultiverse does not know about world '%s' yet. Please import it with %s/mv import %s <env>%s.",
-                        ChatColor.RED, worldName, ChatColor.AQUA, worldName, ChatColor.RED));
-                sender.sendMessage(String.format("See %s/mv help import %sfor more info.",
-                        ChatColor.AQUA, ChatColor.WHITE));
-                throw new InvalidCommandArgument();
-            }
-            throw new InvalidCommandArgument(String.format("World '%s' not found.", worldName), false);
-        }
-
-        context.popFirstArg();
-        return world;
-    }
-
-    @Nullable
-    private MultiverseWorld getWorld(@NotNull CommandSender sender,
-                                     @NotNull String worldName,
-                                     boolean checkUnloaded) {
-
-        MultiverseWorld targetWorld = this.worldManager.getMVWorld(worldName);
-        if (targetWorld != null) {
-            return targetWorld;
-        }
-
-        //TODO: API should have a isUnloadedWorld method.
-        if (checkUnloaded && this.worldManager.getUnloadedWorlds().contains(worldName)) {
-            sender.sendMessage(String.format("%sWorld '%s' exists, but it is unloaded!", ChatColor.RED, worldName));
-            sender.sendMessage(String.format("You can load it with: %s/mv load %s", ChatColor.AQUA, worldName));
-            throw new InvalidCommandArgument();
-        }
-
-        return null;
-    }
-
-    @Nullable
-    private MultiverseWorld getPlayerWorld(@Nullable Player player,
-                                           boolean allowNull,
-                                           @NotNull String errorReason) {
-
-        if (player == null) {
-            if (allowNull) {
-                return null;
-            }
-            throw new InvalidCommandArgument(errorReason, false);
-        }
-
-        MultiverseWorld targetWorld = this.worldManager.getMVWorld(player.getWorld());
-        if (targetWorld == null) {
-            player.sendMessage(String.format("%sMultiverse doesn't know about world '%s%s%s' that '%s%s%s' is in.",
-                    ChatColor.RED, ChatColor.DARK_AQUA, player.getWorld().getName(), ChatColor.RED,
-                    ChatColor.AQUA, player.getName(), ChatColor.RED));
-
-            player.sendMessage(String.format("You need to import the world with %s/mv import %s %s",
-                    ChatColor.DARK_AQUA, player.getWorld().getName(), player.getWorld().getEnvironment()));
-
-            throw new InvalidCommandArgument();
-        }
-
-        return targetWorld;
-    }
-
-    @Nullable
-    private Player getPlayerFromSelf(@NotNull BukkitCommandExecutionContext context, String errorReason) {
-        Player self = context.getPlayer();
-        if (self == null && !context.isOptional()) {
-            throw new InvalidCommandArgument(errorReason);
-        }
-        return self;
-    }
-
-    /**
-     * Parse Player from string.
-     * Supports player name, UUID and selectors.
-     *
-     * @param sender            Sender use to parse vanilla selectors.
-     * @param playerIdentifier  Text to parse into a Player object.
-     * @return A Player object if found, null otherwise.
-     */
-    @Nullable
-    public Player getPlayerFromValue(@NotNull CommandSender sender,
-                                     @Nullable String playerIdentifier) {
-
-        if (playerIdentifier == null) {
-            return null;
-        }
-
-        Player player = getPlayerBySelector(sender, playerIdentifier);
-        if (player == null) {
-            player = Bukkit.getPlayerExact(playerIdentifier);
-        }
-        if (player == null) {
-            player = getPlayerByUUID(playerIdentifier);
-        }
-
-        return player;
-    }
-
-    @Nullable
-    private Player getPlayerBySelector(@NotNull CommandSender sender,
-                                       @NotNull String playerIdentifier) {
-
-        if (playerIdentifier.charAt(0) != '@') {
-            return null;
-        }
-
-        List<Player> matchedPlayers;
-        try {
-            matchedPlayers = this.plugin.getServer().selectEntities(sender, playerIdentifier).parallelStream()
-                    .unordered()
-                    .filter(e -> e instanceof Player)
-                    .map(e -> ((Player) e))
-                    .collect(Collectors.toList());
-        }
-        catch (IllegalArgumentException e) {
-            e.printStackTrace();
-            throw new InvalidCommandArgument(String.format("Error parsing selector '%s' for %s! See console for more details",
-                    playerIdentifier, sender.getName()));
-        }
-        if (matchedPlayers.isEmpty()) {
-            throw new InvalidCommandArgument(String.format("No player found with selector '%s' for %s",
-                    playerIdentifier, sender.getName()));
-        }
-        if (matchedPlayers.size() > 1) {
-            throw new InvalidCommandArgument(String.format("Error parsing selector '%s' for %s. ambiguous result (more than one player matched) - %s",
-                    playerIdentifier, sender.getName(), matchedPlayers.toString()));
-        }
-
-        return matchedPlayers.get(0);
-    }
-
-    @Nullable
-    private Player getPlayerByUUID(@NotNull String playerIdentifier) {
-        if (!UUID_REGEX.matcher(playerIdentifier).matches()) {
-            return null;
-        }
-        UUID playerUUID;
-        try {
-            playerUUID = UUID.fromString(playerIdentifier);
-        } catch (Exception e) {
-            return null;
-        }
-        return Bukkit.getPlayer(playerUUID);
-    }
-
-    @NotNull
-    private World.Environment deriveEnvironment(@NotNull BukkitCommandExecutionContext context) {
-        String env = context.popFirstArg();
-
-        if (env.equalsIgnoreCase("NORMAL") || env.equalsIgnoreCase("WORLD")) {
-            env = "NORMAL";
-        }
-        else if (env.equalsIgnoreCase("HELL") || env.equalsIgnoreCase("NETHER")) {
-            env = "NETHER";
-        }
-        else if (env.equalsIgnoreCase("END") || env.equalsIgnoreCase("THEEND") || env.equalsIgnoreCase("STARWARS")) {
-            env = "THE_END";
-        }
-
-        try {
-            return World.Environment.valueOf(env);
-        }
-        catch (IllegalArgumentException e) {
-            CommandSender sender = context.getSender();
-            sender.sendMessage(String.format("%s'%s' is not a valid environment.", ChatColor.RED, env));
-            EnvironmentCommand.showEnvironments(sender);
-            throw new InvalidCommandArgument(false);
-        }
-    }
-
-    @NotNull
-    private GameRuleProperty<?> deriveGameRuleProperty(@NotNull BukkitCommandExecutionContext context) {
-        int argLength = context.getArgs().size();
-        if (argLength == 0) {
-            throw new InvalidCommandArgument("You need to specify a game rule property and value to set.");
-        }
-        if (argLength == 1) {
-            throw new InvalidCommandArgument("You need to specify a value to set.");
-        }
-
-        String ruleString = context.popFirstArg();
-        GameRule<?> gameRule = GameRule.getByName(ruleString);
-        if (gameRule == null) {
-            throw new InvalidCommandArgument(String.format("'%s' is not a valid gamerule.", ruleString));
-        }
-
-        Class<?> ruleType = gameRule.getType();
-        String value = context.getFirstArg();
-        Object result = getResolver(ruleType).getContext(context);
-        if (result == null) {
-            context.getSender().sendMessage(String.format("%s'%s' is not a valid value.", ChatColor.RED, value));
-            context.getSender().sendMessage(String.format("%sValue need to be a %s", ChatColor.RED, ruleType.getTypeName()));
-            throw new InvalidCommandArgument();
-        }
-        if (result instanceof Integer && ((int) result) < 0) {
-            throw new InvalidCommandArgument("Value need to be a positive number.");
-        }
-
-        return new GameRuleProperty(gameRule, result);
-    }
-
-    @NotNull
-    private MVDestination deriveMVDestination(@NotNull BukkitCommandExecutionContext context) {
-        String destString = context.popFirstArg();
-        if (destString == null) {
-            throw new InvalidCommandArgument("Please specify a destination.");
-        }
-
-        MVDestination destination = this.plugin.getDestFactory().getDestination(destString);
-        if (destination instanceof InvalidDestination) {
-            throw new  InvalidCommandArgument(String.format("No such destination '%s' found.", destString));
-        }
-        return destination;
-    }
-
-    @Nullable
-    private String deriveString(@NotNull BukkitCommandExecutionContext context) {
-        if (context.hasAnnotation(Values.class)) {
-            return context.popFirstArg();
-        }
-
-        String string = context.popFirstArg();
-        if (string == null) {
-            if (!context.isOptional()) {
-                String argType = context.getFlagValue("type", "string");
-                throw new InvalidCommandArgument(String.format("You need to specify a %s.", argType));
-            }
-            return null;
-        }
-
-        if (context.hasFlag("trim")) {
-            return trimWorldName(string);
-        }
-
-        return string;
-    }
-
-    @NotNull
-    private String trimWorldName(@NotNull String worldName) {
-        // Removes relative paths.
-        return TRIM_REGEX.matcher(worldName).replaceAll("");
-    }
-
-    @NotNull
-    private PasteServiceType derivePasteServiceType(BukkitCommandExecutionContext context) {
-        String pasteType = context.popFirstArg();
-        if (pasteType == null) {
-            return PasteServiceType.NONE;
-        }
-
-        try {
-            return PasteServiceType.valueOf(pasteType.toUpperCase());
-        }
-        catch (IllegalArgumentException e) {
-            throw new InvalidCommandArgument(String.format("Invalid paste service type '%s'.", pasteType));
-        }
-    }
-
-    @NotNull
-    private ContentFilter deriveContentFilter(@NotNull BukkitCommandExecutionContext context) {
-        String filterString = context.popFirstArg();
-        return (filterString == null) ? ContentFilter.DEFAULT : new ContentFilter(filterString);
-    }
-
-    @NotNull
-    private PageFilter derivePageFilter(@NotNull BukkitCommandExecutionContext context) {
-        int argLength = context.getArgs().size();
-        if (argLength == 0) {
-            return new PageFilter(ContentFilter.DEFAULT, 1);
-        }
-        if (argLength == 1) {
-            String pageOrFilter = context.popFirstArg();
-            Optional<Integer> page = tryParseInt(pageOrFilter);
-            return page.map(pageNum -> new PageFilter(ContentFilter.DEFAULT, pageNum))
-                    .orElseGet(() -> new PageFilter(new ContentFilter(pageOrFilter), 1));
-        }
-
-        String filter = context.popFirstArg();
-        String pageString = context.popFirstArg();
-        Optional<Integer> page = tryParseInt(pageString);
-        if (!page.isPresent()) {
-            throw new InvalidCommandArgument(String.format("'%s' is not a number.", pageString), false);
-        }
-        return new PageFilter(new ContentFilter(filter), page.get());
-    }
-
-    private Optional<Integer> tryParseInt(String value) {
-        try {
-            return Optional.of(Integer.parseInt(value));
-        }
-        catch (NumberFormatException e) {
-            return Optional.empty();
-        }
-    }
-}
@@ -1,275 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commandtools;
-
-import co.aikar.commands.BaseCommand;
-import co.aikar.commands.CommandHelp;
-import co.aikar.commands.CommandIssuer;
-import co.aikar.commands.HelpEntry;
-import co.aikar.commands.PaperCommandManager;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commands.AnchorCommand;
-import com.onarandombox.MultiverseCore.commands.BedCommand;
-import com.onarandombox.MultiverseCore.commands.CheckCommand;
-import com.onarandombox.MultiverseCore.commands.CloneCommand;
-import com.onarandombox.MultiverseCore.commands.ConfigCommand;
-import com.onarandombox.MultiverseCore.commands.ConfirmCommand;
-import com.onarandombox.MultiverseCore.commands.CoordCommand;
-import com.onarandombox.MultiverseCore.commands.CreateCommand;
-import com.onarandombox.MultiverseCore.commands.DebugCommand;
-import com.onarandombox.MultiverseCore.commands.DeleteCommand;
-import com.onarandombox.MultiverseCore.commands.EnvironmentCommand;
-import com.onarandombox.MultiverseCore.commands.GameRuleCommand;
-import com.onarandombox.MultiverseCore.commands.GeneratorCommand;
-import com.onarandombox.MultiverseCore.commands.ImportCommand;
-import com.onarandombox.MultiverseCore.commands.InfoCommand;
-import com.onarandombox.MultiverseCore.commands.ListCommand;
-import com.onarandombox.MultiverseCore.commands.LoadCommand;
-import com.onarandombox.MultiverseCore.commands.ModifyCommand;
-import com.onarandombox.MultiverseCore.commands.PurgeCommand;
-import com.onarandombox.MultiverseCore.commands.RegenCommand;
-import com.onarandombox.MultiverseCore.commands.ReloadCommand;
-import com.onarandombox.MultiverseCore.commands.RemoveCommand;
-import com.onarandombox.MultiverseCore.commands.RootCommand;
-import com.onarandombox.MultiverseCore.commands.ScriptCommand;
-import com.onarandombox.MultiverseCore.commands.SetSpawnCommand;
-import com.onarandombox.MultiverseCore.commands.SilentCommand;
-import com.onarandombox.MultiverseCore.commands.SpawnCommand;
-import com.onarandombox.MultiverseCore.commands.SubModulesCommand;
-import com.onarandombox.MultiverseCore.commands.TeleportCommand;
-import com.onarandombox.MultiverseCore.commands.UnloadCommand;
-import com.onarandombox.MultiverseCore.commands.UsageCommand;
-import com.onarandombox.MultiverseCore.commands.VersionCommand;
-import com.onarandombox.MultiverseCore.commands.WhoCommand;
-import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager;
-import com.onarandombox.MultiverseCore.displaytools.ColorAlternator;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-/**
- * Heart of Multiverse Command Handler.
- */
-public class MVCommandManager extends PaperCommandManager {
-
-    private final MultiverseCore plugin;
-    private final CommandQueueManager commandQueueManager;
-    private final Map<String, BaseCommand> subModuleRootCommands;
-
-    private static final Pattern PERMISSION_SPLIT = Pattern.compile(",");
-
-    public MVCommandManager(@NotNull MultiverseCore plugin) {
-        super(plugin);
-        this.plugin = plugin;
-        this.commandQueueManager = new CommandQueueManager(plugin);
-        this.subModuleRootCommands = new HashMap<>(3);
-        new MVCommandConditions(plugin, getCommandConditions());
-
-        // Setup help command
-        enableUnstableAPI("help");
-        setDefaultHelpPerPage(6);
-
-        // General plugin command
-        registerCommand(new RootCommand(this.plugin));
-        registerCommand(new UsageCommand(this.plugin));
-        registerCommand(new VersionCommand(this.plugin));
-
-        // World commands
-        registerCommand(new CreateCommand(this.plugin));
-        registerCommand(new ImportCommand(this.plugin));
-        registerCommand(new LoadCommand(this.plugin));
-        registerCommand(new UnloadCommand(this.plugin));
-        registerCommand(new RemoveCommand(this.plugin));
-        registerCommand(new CloneCommand(this.plugin));
-        registerCommand(new RegenCommand(this.plugin));
-        registerCommand(new DeleteCommand(this.plugin));
-        registerCommand(new ConfirmCommand(this.plugin));
-
-        // Properties management commands
-        registerCommand(new ConfigCommand(this.plugin));
-        registerCommand(new GameRuleCommand(this.plugin));
-        registerCommand(new ModifyCommand(this.plugin));
-        registerCommand(new SetSpawnCommand(this.plugin));
-        registerCommand(new PurgeCommand(this.plugin));
-
-        // Show information commands
-        registerCommand(new InfoCommand(this.plugin));
-        registerCommand(new CoordCommand(this.plugin));
-        registerCommand(new EnvironmentCommand(this.plugin));
-        registerCommand(new GeneratorCommand(this.plugin));
-        registerCommand(new ListCommand(this.plugin));
-        registerCommand(new WhoCommand(this.plugin));
-
-        // Teleport commands
-        registerCommand(new TeleportCommand(this.plugin));
-        registerCommand(new AnchorCommand(this.plugin));
-        registerCommand(new BedCommand(this.plugin));
-        registerCommand(new SpawnCommand(this.plugin));
-
-        // Misc commands
-        registerCommand(new DebugCommand(this.plugin));
-        registerCommand(new CheckCommand(this.plugin));
-        registerCommand(new ReloadCommand(this.plugin));
-        registerCommand(new SilentCommand(this.plugin));
-        registerCommand(new ScriptCommand(this.plugin));
-
-        // Sub-modules
-        addAvailableSubModule("mvnp", new SubModulesCommand.NetherPortals());
-        addAvailableSubModule("mvp", new SubModulesCommand.Portals());
-        addAvailableSubModule("mvinv", new SubModulesCommand.Inventories());
-    }
-
-    /**
-     * Use for download link suggestion for sub-module
-     *
-     * @param moduleName  A sub-module for Multiverse.
-     * @param cmd         Command to register.
-     */
-    private void addAvailableSubModule(@NotNull String moduleName,
-                                       @NotNull BaseCommand cmd) {
-
-        subModuleRootCommands.put(moduleName, cmd);
-        registerCommand(cmd);
-    }
-
-    /**
-     * Replace suggest download with actual command from sub-module.
-     *
-     * @param moduleName  A sub-module for Multiverse.
-     * @param cmd         Command to register.
-     */
-    public void registerSubModule(@NotNull String moduleName,
-                                  @NotNull BaseCommand cmd) {
-
-        unregisterCommand(subModuleRootCommands.remove(moduleName));
-        registerCommand(cmd);
-    }
-
-    @Override
-    public synchronized MVCommandContexts getCommandContexts() {
-        if (this.contexts == null) {
-            this.contexts = new MVCommandContexts(this, plugin);
-        }
-        return (MVCommandContexts) this.contexts;
-    }
-
-    @Override
-    public synchronized MVCommandCompletions getCommandCompletions() {
-        if (this.completions == null) {
-            this.completions = new MVCommandCompletions(this, plugin);
-        }
-        return (MVCommandCompletions) this.completions;
-    }
-
-    /**
-     * Change default implementation to be able to choose from OR / AND
-     */
-    @Override
-    public boolean hasPermission(@NotNull CommandIssuer issuer,
-                                 @Nullable Set<String> permissions) {
-
-        if (permissions == null || permissions.isEmpty()) {
-            return true;
-        }
-
-        return (permissions.contains("AND"))
-                ? andPermissionCheck(issuer, permissions)
-                : orPermissionCheck(issuer, permissions);
-    }
-
-    private boolean orPermissionCheck(@NotNull CommandIssuer issuer,
-                                      @NotNull Set<String> permissions) {
-
-        return permissions.stream()
-                .unordered()
-                .anyMatch(permission -> hasPermission(issuer, permission));
-    }
-
-    private boolean andPermissionCheck(@NotNull CommandIssuer issuer,
-                                       @NotNull Set<String> permissions) {
-
-        return permissions.stream()
-                .unordered()
-                .allMatch(permission -> hasPermission(issuer, permission));
-    }
-
-    /**
-     * Change default implementation to be able to choose from OR / AND
-     */
-    @Override
-    public boolean hasPermission(@NotNull CommandIssuer issuer,
-                                 @Nullable String permission) {
-
-        if (permission == null || permission.isEmpty()) {
-            return true;
-        }
-        if (permission.startsWith("AND:")) {
-            return Arrays.stream(PERMISSION_SPLIT.split(permission.substring(4)))
-                    .unordered()
-                    .allMatch(issuer::hasPermission);
-        }
-        return Arrays.stream(PERMISSION_SPLIT.split(permission))
-                .unordered()
-                .anyMatch(issuer::hasPermission);
-    }
-
-    /**
-     * Gets {@link CommandQueueManager}.
-     *
-     * @return {@link CommandQueueManager}.
-     */
-    public CommandQueueManager getQueueManager() {
-        return commandQueueManager;
-    }
-
-    /**
-     * Standardise usage command formatting for all mv modules.
-     *
-     * @param help The target {@link CommandHelp}.
-     */
-    public void showUsage(@NotNull CommandHelp help) {
-        List<HelpEntry> entries = help.getHelpEntries();
-
-        if (entries.size() == 1) {
-            this.plugin.getMVCommandManager().getHelpFormatter().showDetailedHelp(help, entries.get(0));
-            return;
-        }
-
-        help.showHelp();
-    }
-
-    /**
-     * Standardise root command for all mv modules.
-     *
-     * @param sender       Sender to send the info to.
-     * @param description  mv-module's description and info.
-     * @param color        Special colour for each mv-module.
-     * @param rootCmd      mv-module's root command name.
-     */
-    public void showPluginInfo(@NotNull CommandSender sender,
-                               @NotNull PluginDescriptionFile description,
-                               @NotNull ColorAlternator color,
-                               @NotNull String rootCmd) {
-
-        sender.sendMessage(String.format("%s%s %s| %sv%s",
-                color.getThisColor(), description.getName(), ChatColor.DARK_GRAY,
-                color.getThatColor(), description.getVersion()));
-
-        sender.sendMessage(String.format("%sSee %s/%s help %sfor commands available.",
-                ChatColor.DARK_GREEN, ChatColor.GREEN, rootCmd, ChatColor.DARK_GREEN));
-    }
-}
@@ -1,23 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools;
-
-import co.aikar.commands.CommandCompletionContext;
-import co.aikar.commands.RegisteredCommand;
-import com.onarandombox.MultiverseCore.utils.ReflectHelper;
-
-import java.lang.reflect.Field;
-
-public class MVCommandReflect {
-
-    private static final Field commandScope;
-    private static final Field commandField;
-
-    static {
-        commandField = ReflectHelper.getField(CommandCompletionContext.class, "command");
-        commandScope = ReflectHelper.getField(RegisteredCommand.class, "scope");
-    }
-
-    public static MultiverseCommand getCommandCompletionContextCommand(CommandCompletionContext context) {
-        RegisteredCommand registeredCommand = ReflectHelper.getFieldValue(context, commandField);
-        return ReflectHelper.getFieldValue(registeredCommand, commandScope);
-    }
-}
@@ -1,21 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools;
-
-import co.aikar.commands.BaseCommand;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagGroup;
-
-public class MultiverseCommand extends BaseCommand {
-
-    private FlagGroup flagGroup;
-
-    public MultiverseCommand() {
-        super();
-    }
-
-    public FlagGroup getFlagGroup() {
-        return flagGroup;
-    }
-
-    public void setFlagGroup(FlagGroup flagGroup) {
-        this.flagGroup = flagGroup;
-    }
-}
@@ -1,39 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commandtools.context;
-
-import org.bukkit.GameRule;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Single key value pair for a game rule.
- *
- * @param <T> Type of GameRule property.
- */
-public class GameRuleProperty<T> {
-
-    private final GameRule<T> gameRule;
-    private final T value;
-
-    public GameRuleProperty(@NotNull GameRule<T> gameRule,
-                            @NotNull T value) {
-
-        this.gameRule = gameRule;
-        this.value = value;
-    }
-
-    @NotNull
-    public GameRule<T> getGameRule() {
-        return gameRule;
-    }
-
-    @NotNull
-    public T getValue() {
-        return value;
-    }
-}
@@ -1,34 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commandtools.context;
-
-import com.onarandombox.MultiverseCore.displaytools.ContentFilter;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Filter and paging.
- */
-public class PageFilter {
-    private final ContentFilter filter;
-    private final int page;
-
-    public PageFilter(@NotNull ContentFilter filter,
-                      int page) {
-        this.filter = filter;
-        this.page = page;
-    }
-
-    @NotNull
-    public ContentFilter getFilter() {
-        return filter;
-    }
-
-    public int getPage() {
-        return page;
-    }
-}
@@ -1,16 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.context;
-
-import org.bukkit.entity.Player;
-
-public class RequiredPlayer {
-
-    private final Player player;
-
-    public RequiredPlayer(Player player) {
-        this.player = player;
-    }
-
-    public Player get() {
-        return player;
-    }
-}
@@ -1,4 +0,0 @@
-/**
- * Classes derived from parsing command args and context.
- */
-package com.onarandombox.MultiverseCore.commandtools.context;
@@ -1,162 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
-/**
- * <p>Represents a flag that can be used in commands. This works as a key value pair.</p>
- *
- * <p>Key is the {@link #identifier} and {@link #aliases} set.</p>
- * <p>Value is the {@link T} parsed based on 3 scenarios during command input:</p>
- * <ol>
- *     <li>Flag completely not present. {@link #getDefaultValue()}</li>
- *     <li>Flag key present but no value. {@link #getValue()}</li>
- *     <li>Flag key and value present. {@link #getValue(String)}</li>
- * </ol>
- *
- * @param <T>   The flag Type.
- */
-public abstract class CommandFlag<T> {
-
-    protected final String name;
-    protected final String identifier;
-    protected final Class<T> type;
-    protected final ValueRequirement valueRequirement;
-    protected final Collection<String> aliases;
-
-    protected CommandFlag(@NotNull String name,
-                          @NotNull String identifier,
-                          @NotNull Class<T> type,
-                          @NotNull ValueRequirement valueRequirement) {
-
-        this.name = name;
-        this.identifier = identifier;
-        this.type = type;
-        this.valueRequirement = valueRequirement;
-        this.aliases = new ArrayList<>();
-    }
-
-    /**
-     * Gets name of the Command Flag.
-     *
-     * @return The Command Flag name.
-     */
-    @NotNull
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * Gets identifier of the Command Flag.
-     *
-     * @return The Command Flag identifier.
-     */
-    @NotNull
-    public String getIdentifier() {
-        return this.identifier;
-    }
-
-    /**
-     * Gets {@link T} Type of the Command Flag.
-     *
-     * @return The Command Flag type.
-     */
-    @NotNull
-    public Class<T> getType() {
-        return this.type;
-    }
-
-    /**
-     * Gets the requirements of this Command Flag user input value.
-     *
-     * @return The {@link ValueRequirement}.
-     */
-    @NotNull
-    public ValueRequirement getValueRequirement() {
-        return this.valueRequirement;
-    }
-
-    /**
-     * Gets all the alternative key identifiers set for this Command Flag.
-     *
-     * @return Collection of aliases.
-     */
-    @NotNull
-    public Collection<String> getAliases() {
-        return this.aliases;
-    }
-
-    /**
-     * Add alternative key identifiers for this Command Flag.
-     *
-     * @param aliases   Alias(es) to be added.
-     * @return A {@link CommandFlag}.
-     */
-    public CommandFlag<T> addAliases(String...aliases) {
-        Collections.addAll(this.aliases, aliases);
-        return this;
-    }
-
-    /**
-     * Tab-complete suggestion for this Command Flag values.
-     *
-     * @return Collection of suggested values available.
-     */
-    public abstract Collection<String> suggestValue();
-
-    /**
-     * When this Command Flag can get value by a user input.
-     *
-     * @return The {@link T} value.
-     */
-    public abstract T getValue(@NotNull String input) throws FlagParseFailedException;
-
-    /**
-     * When this Command Flag user input value is null/not present.
-     *
-     * @return The {@link T} value.
-     */
-    public T getValue() throws FlagParseFailedException {
-        return null;
-    }
-
-    /**
-     * When this Command Flag is not present in command input.
-     *
-     * @return The {@link T} value.
-     */
-    public T getDefaultValue() {
-        return null;
-    }
-
-    @Override
-    public String toString() {
-        return "CommandFlag{" +
-                "name='" + name + '\'' +
-                ", identifier='" + identifier + '\'' +
-                ", type=" + type +
-                ", valueRequirement=" + valueRequirement +
-                ", aliases=" + aliases +
-                '}';
-    }
-
-    public enum ValueRequirement {
-        /**
-         * No user input needed for value.
-         */
-        NONE,
-
-        /**
-         * User input for value is optional.
-         */
-        OPTIONAL,
-
-        /**
-         * User input is required for Command Flag value.
-         */
-        REQUIRED
-    }
-}
@@ -1,221 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-import co.aikar.commands.InvalidCommandArgument;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
-import org.bukkit.Bukkit;
-import org.bukkit.WorldType;
-import org.bukkit.plugin.Plugin;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.stream.Collectors;
-
-public class CoreFlags {
-
-    private static MultiverseCore multiverse;
-
-    public static void setCoreInstance(MultiverseCore plugin) {
-        multiverse = plugin;
-    }
-
-    /**
-     * Flag for custom seed.
-     */
-    public static final CommandFlag<String> SEED = new RequiredCommandFlag<String>
-            ("Seed", "--seed", String.class) {
-        @Override
-        public Collection<String> suggestValue() {
-            return Collections.singleton(String.valueOf(new Random().nextLong()));
-        }
-
-        @Override
-        public String getValue(@NotNull String input) throws FlagParseFailedException {
-            return input;
-        }
-    }.addAliases("-s");
-
-    /**
-     * Flag for custom seed. No value means random seed.
-     */
-    public static final CommandFlag<String> RANDOM_SEED = new OptionalCommandFlag<String>
-            ("Seed", "--seed", String.class) {
-        @Override
-        public Collection<String> suggestValue() {
-            return Collections.singletonList(String.valueOf(new Random().nextLong()));
-        }
-
-        @Override
-        public String getValue(@NotNull String input) throws FlagParseFailedException {
-            return input;
-        }
-    }.addAliases("-s");
-
-    /**
-     * Flag for world type used.
-     */
-    public static final CommandFlag<WorldType> WORLD_TYPE = new RequiredCommandFlag<WorldType>
-            ("WorldType", "--type", WorldType.class) {
-
-        private final Map<String, WorldType> typeAlias = new HashMap<String, WorldType>(4){{
-            put("normal", WorldType.NORMAL);
-            put("flat", WorldType.FLAT);
-            put("largebiomes", WorldType.LARGE_BIOMES);
-            put("amplified", WorldType.AMPLIFIED);
-        }};
-
-        @Override
-        public Collection<String> suggestValue() {
-            return typeAlias.keySet();
-        }
-
-        @Override
-        public WorldType getValue(@NotNull String input) throws FlagParseFailedException {
-            WorldType type = typeAlias.get(input);
-            if (type != null) {
-                return type;
-            }
-            try {
-                return WorldType.valueOf(input.toUpperCase());
-            }
-            catch (IllegalArgumentException e) {
-                throw new FlagParseFailedException("'%s' is not a valid. See /mv env for available World Type.", input);
-            }
-        }
-
-        @Override
-        public WorldType getDefaultValue() {
-            return WorldType.NORMAL;
-        }
-    }.addAliases("-t");
-
-    /**
-     * Flag for world generator.
-     */
-    public static final CommandFlag<String> GENERATOR = new RequiredCommandFlag<String>
-            ("Generator", "--gen", String.class) {
-        @Override
-        public Collection<String> suggestValue() {
-            return Arrays.stream(Bukkit.getServer().getPluginManager().getPlugins())
-                    .filter(Plugin::isEnabled)
-                    .filter(plugin -> multiverse.getUnsafeCallWrapper().wrap(
-                            () -> plugin.getDefaultWorldGenerator("world", ""),
-                            plugin.getName(),
-                            "Get generator"
-                    ) != null)
-                    .map(plugin -> plugin.getDescription().getName())
-                    .collect(Collectors.toList());
-        }
-
-        @Override
-        public String getValue(@NotNull String input) throws FlagParseFailedException {
-            String[] genArray = input.split(":");
-            String generator = genArray[0];
-            String generatorId = (genArray.length > 1) ? genArray[1] : "";
-            try {
-                if (multiverse.getMVWorldManager().getChunkGenerator(generator, generatorId, "test") == null) {
-                    throw new Exception();
-                }
-            } catch (Exception e) {
-                throw new FlagParseFailedException("Invalid generator string '%s'. See /mv gens for available generators.", input);
-            }
-            return input;
-        }
-    }.addAliases("-g");
-
-    /**
-     * Flag to toggle if world should generate structures.
-     */
-    public static final CommandFlag<Boolean> GENERATE_STRUCTURES = new RequiredCommandFlag<Boolean>
-            ("GenerateStructures", "--structures", Boolean.class) {
-        @Override
-        public Collection<String> suggestValue() {
-            return Arrays.asList("true", "false");
-        }
-
-        @Override
-        public Boolean getValue(@NotNull String input) throws FlagParseFailedException {
-            return input.equalsIgnoreCase("true");
-        }
-
-        @Override
-        public Boolean getDefaultValue() {
-            return true;
-        }
-    }.addAliases("--structure", "-a");
-
-    /**
-     * Flag to toggle if world spawn should be adjusted.
-     */
-    public static final CommandFlag<Boolean> SPAWN_ADJUST = new NoValueCommandFlag<Boolean>
-            ("AdjustSpawn", "--dont-adjust-spawn", Boolean.class) {
-        @Override
-        public Boolean getValue() throws FlagParseFailedException {
-            return false;
-        }
-
-        @Override
-        public Boolean getDefaultValue() {
-            return true;
-        }
-    }.addAliases("-n");
-
-    /**
-     * Flag to specify a paste service.
-     */
-    public static final CommandFlag<PasteServiceType> PASTE_SERVICE_TYPE = new OptionalCommandFlag<PasteServiceType>
-            ("PasteServiceType", "--paste", PasteServiceType.class) {
-
-        private final List<String> pasteTypes = Arrays.stream(PasteServiceType.values())
-                .filter(pt -> pt != PasteServiceType.NONE)
-                .map(p -> p.toString().toLowerCase())
-                .collect(Collectors.toList());
-
-        @Override
-        public Collection<String> suggestValue() {
-            return pasteTypes;
-        }
-
-        @Override
-        public PasteServiceType getValue(@NotNull String input) throws FlagParseFailedException {
-            try {
-                return PasteServiceType.valueOf(input.toUpperCase());
-            }
-            catch (IllegalArgumentException e) {
-                throw new InvalidCommandArgument(String.format("Invalid paste service type '%s'.", input));
-            }
-        }
-
-        @Override
-        public PasteServiceType getValue() throws FlagParseFailedException {
-            return PasteServiceType.PASTEGG;
-        }
-
-        @Override
-        public PasteServiceType getDefaultValue() {
-            return PasteServiceType.NONE;
-        }
-    }.addAliases("-p");
-
-    /**
-     * Flag to toggle if plugin list should be included.
-     */
-    public static final CommandFlag<Boolean> INCLUDE_PLUGIN_LIST = new NoValueCommandFlag<Boolean>
-            ("IncludePlugins", "--include-plugin-list", Boolean.class) {
-        @Override
-        public Boolean getValue() throws FlagParseFailedException {
-            return true;
-        }
-
-        @Override
-        public Boolean getDefaultValue() {
-            return true;
-        }
-    }.addAliases("-pl");
-}
@@ -1,59 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class FlagGroup {
-
-    public static FlagGroup of(CommandFlag<?>...flags) {
-        return new FlagGroup(flags);
-    }
-
-    private final List<String> flagIdentifiers;
-    private final Map<String, CommandFlag<?>> flagKeyMap;
-
-    private FlagGroup(CommandFlag<?>[] commandFlags) {
-        this.flagIdentifiers = new ArrayList<>(commandFlags.length);
-        this.flagKeyMap = new HashMap<>();
-        for (CommandFlag<?> flag : commandFlags) {
-            addFlag(flag);
-        }
-    }
-
-    private void addFlag(CommandFlag<?> flag) {
-        this.flagIdentifiers.add(flag.getIdentifier());
-        this.flagKeyMap.put(flag.getIdentifier(), flag);
-        for (String flagAlias : flag.getAliases()) {
-            this.flagKeyMap.put(flagAlias, flag);
-        }
-    }
-
-    @NotNull
-    public FlagResult calculateResult(String[] args) {
-        return FlagResult.parse(args,this);
-    }
-
-    @Nullable
-    public CommandFlag<?> getByKey(String key) {
-        return this.flagKeyMap.get(key);
-    }
-
-    @NotNull
-    public Collection<String> getFlagIdentifiers() {
-        return flagIdentifiers;
-    }
-
-    @Override
-    public String toString() {
-        return "FlagGroup{" +
-                "flagIdentifiers=" + flagIdentifiers +
-                ", keyFlagMap=" + flagKeyMap +
-                '}';
-    }
-}
@@ -1,13 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-import co.aikar.commands.InvalidCommandArgument;
-
-public class FlagParseFailedException extends InvalidCommandArgument {
-
-    public FlagParseFailedException() {
-    }
-
-    public FlagParseFailedException(String message, Object...replacements) {
-        super(String.format(message, replacements), true);
-    }
-}
@@ -1,146 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static com.onarandombox.MultiverseCore.commandtools.flag.CommandFlag.ValueRequirement;
-
-public class FlagResult {
-
-    public static FlagResult parse(@Nullable String[] args,
-                                   @NotNull FlagGroup flagGroup) throws FlagParseFailedException {
-
-        FlagResult flagResult = new FlagResult();
-
-        // No args to parse.
-        if (args == null || args.length <= 0) {
-            return flagResult;
-        }
-
-        // First arg must be a flag.
-        CommandFlag<?> currentFlag = flagGroup.getByKey(args[0]);
-        boolean completed = false;
-
-        // Parse the arguments.
-        for (int i = 1, argsLength = args.length; i <= argsLength; i++) {
-            // Don't allow null flag obviously.
-            if (currentFlag == null) {
-                throw new FlagParseFailedException("%s is not a valid flag.", args[i-1]);
-            }
-            // THis ensures that flag is not null during final parse.
-            if (i >= argsLength) {
-                break;
-            }
-
-            CommandFlag<?> nextFlag = flagGroup.getByKey(args[i]);
-
-            switch (currentFlag.getValueRequirement()) {
-                case NONE:
-                    // Arg must be a flag key.
-                    flagResult.add(currentFlag, currentFlag.getValue(), false);
-                    currentFlag = nextFlag;
-                    break;
-                case OPTIONAL:
-                    // Arg can be a flag key or value.
-                    if (nextFlag != null) {
-                        // It's a key.
-                        flagResult.add(currentFlag, currentFlag.getValue(), false);
-                        currentFlag = nextFlag;
-                        break;
-                    }
-                    // It's a value.
-                    flagResult.add(currentFlag, currentFlag.getValue(args[i]), true);
-                    if (i == argsLength - 1) {
-                        completed = true;
-                        break;
-                    }
-                    currentFlag = flagGroup.getByKey(args[++i]);
-                    break;
-                case REQUIRED:
-                    // Arg must be a flag value.
-                    if (nextFlag != null) {
-                        // It's a key.
-                        throw new FlagParseFailedException("%s flag '%s' requires a value input.",
-                                currentFlag.getName(), currentFlag.getIdentifier());
-                    }
-                    // It's a value.
-                    flagResult.add(currentFlag, currentFlag.getValue(args[i]), true);
-                    if (i == argsLength - 1) {
-                        completed = true;
-                        break;
-                    }
-                    currentFlag = flagGroup.getByKey(args[++i]);
-                    break;
-            }
-        }
-
-        // Parse final flag.
-        if (!completed) {
-            if (currentFlag.getValueRequirement() == ValueRequirement.REQUIRED) {
-                throw new FlagParseFailedException("%s flag '%s' requires a value input.",
-                        currentFlag.getName(), currentFlag.getIdentifier());
-            }
-            flagResult.add(currentFlag, currentFlag.getValue(), false);
-        }
-
-        return flagResult;
-    }
-
-    private final Map<CommandFlag<?>, SingleFlagResult<?>> resultMap;
-
-    public FlagResult() {
-        resultMap = new HashMap<>();
-    }
-
-    private void add(CommandFlag<?> flag, Object value, boolean fromInput) {
-        resultMap.put(flag, new SingleFlagResult<>(value, fromInput));
-    }
-
-    public <T> T getValue(CommandFlag<T> flag) {
-        SingleFlagResult<?> result = resultMap.get(flag);
-        if (result == null) {
-            return flag.getDefaultValue();
-        }
-        return (T) result.value;
-    }
-
-    public boolean isByUserInput(CommandFlag<?> flag) {
-        SingleFlagResult<?> result = resultMap.get(flag);
-        if (result == null) {
-            return false;
-        }
-        return result.fromInput;
-    }
-
-    public boolean isDefaulted(CommandFlag<?> flag) {
-        return resultMap.get(flag) != null;
-    }
-
-    @Override
-    public String toString() {
-        return "FlagResult{" +
-                "resultMap=" + resultMap +
-                '}';
-    }
-
-    private class SingleFlagResult<T> {
-        private final T value;
-        private final boolean fromInput;
-
-        private SingleFlagResult(T value, boolean fromInput) {
-            this.fromInput = fromInput;
-            this.value = value;
-        }
-
-        @Override
-        public String toString() {
-            return "SingleFlagResult{" +
-                    "value=" + value +
-                    ", fromInput=" + fromInput +
-                    '}';
-        }
-    }
-}
@@ -1,37 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-import java.util.Collections;
-
-/**
- * Command Flag with {@link ValueRequirement#NONE}.
- * This flag will always not require a user input to parse value.
- *
- * @param <T>   The flag Type.
- */
-public abstract class NoValueCommandFlag<T> extends CommandFlag<T> {
-
-    public NoValueCommandFlag(String name, String identifier, Class<T> type) {
-        super(name, identifier, type, ValueRequirement.NONE);
-    }
-
-    /**
-     * {@link NoValueCommandFlag} will always not require a user input to parse value.
-     * Thus, no value suggestion needed.
-     */
-    @Override
-    public final Collection<String> suggestValue() {
-        return Collections.emptyList();
-    }
-
-    /**
-     * {@link NoValueCommandFlag} will always not require a user input to parse value.
-     * Thus, this operation is not allowed.
-     */
-    @Override
-    public final T getValue(@NotNull String input) throws FlagParseFailedException {
-        throw new FlagParseFailedException("%s flag '%s' does not require a value.", this.name, this.identifier);
-    }
-}
@@ -1,13 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-/**
- * Command Flag with {@link ValueRequirement#OPTIONAL}.
- *
- * @param <T>   The flag Type.
- */
-public abstract class OptionalCommandFlag<T> extends CommandFlag<T> {
-
-    public OptionalCommandFlag(String name, String identifier, Class<T> type) {
-        super(name, identifier, type, ValueRequirement.OPTIONAL);
-    }
-}
@@ -1,23 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-/**
- * Command Flag with {@link ValueRequirement#REQUIRED}.
- * This flag will always require a user input to parse value.
- *
- * @param <T>   The flag Type.
- */
-public abstract class RequiredCommandFlag<T> extends CommandFlag<T> {
-
-    public RequiredCommandFlag(String name, String identifier, Class<T> type) {
-        super(name, identifier, type, ValueRequirement.REQUIRED);
-    }
-
-    /**
-     * {@link RequiredCommandFlag} will always require a user input to parse value.
-     * Thus, this operation is not allowed.
-     */
-    @Override
-    public final T getValue() throws FlagParseFailedException {
-        throw new FlagParseFailedException("%s flag '%s' requires a value input.", this.name, this.identifier);
-    }
-}
@@ -1,4 +0,0 @@
-/**
- * Main classes used to manage commands.
- */
-package com.onarandombox.MultiverseCore.commandtools;
@@ -11,6 +11,8 @@ import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
+import org.bukkit.block.data.type.CommandBlock;
+import org.bukkit.command.BlockCommandSender;
 import org.bukkit.command.CommandSender;
 import org.bukkit.scheduler.BukkitTask;
 import org.jetbrains.annotations.NotNull;
@@ -19,10 +21,16 @@ import java.util.Map;
 import java.util.WeakHashMap;

 /**
- * Queue dangerous commands, with the need to use '/mv confirm' before executing.
+ * <p>Manages the queuing of dangerous commands that require {@code /mv confirm} before executing.</p>
+ *
+ * <p>Each sender can only have one command in queue at any given time. When a queued command is added
+ * for a sender that already has a command in queue, it will replace the old queued command.</p>
 */
 public class CommandQueueManager {

+    private static final long TICKS_PER_SECOND = 20;
+    private static final DummyCommandBlockSender COMMAND_BLOCK = new DummyCommandBlockSender();
+
    private final MultiverseCore plugin;
    private final Map<CommandSender, QueuedCommand> queuedCommandMap;

@@ -31,35 +39,30 @@ public class CommandQueueManager {
        this.queuedCommandMap = new WeakHashMap<>();
    }

+    /**
+     * Adds a {@link QueuedCommand} into queue.
+     *
+     * @param queuedCommand The queued command to add.
+     */
    public void addToQueue(QueuedCommand queuedCommand) {
-        CommandSender sender = queuedCommand.getSender();
-        this.cancelPreviousInQueue(sender);
-        this.queuedCommandMap.put(sender, queuedCommand);
+        CommandSender targetSender = parseSender(queuedCommand.getSender());

+        // Since only one command is stored in queue per sender, we remove the old one.
+        this.removeFromQueue(targetSender);
+
+        Logging.finer("Add new command to queue for sender %s.", targetSender);
+        this.queuedCommandMap.put(targetSender, queuedCommand);
        queuedCommand.setExpireTask(runExpireLater(queuedCommand));

-        sender.sendMessage(queuedCommand.getPrompt());
-        sender.sendMessage(String.format("Run %s/mv confirm %sto continue.", ChatColor.GREEN, ChatColor.WHITE));
+        queuedCommand.getSender().sendMessage(queuedCommand.getPrompt());
+        queuedCommand.getSender().sendMessage(String.format("Run %s/mv confirm %sto continue. This will expire in %s seconds.",
+                ChatColor.GREEN, ChatColor.WHITE, queuedCommand.getValidDuration()));
    }

    /**
-     * Since only one command is stored in queue per sender, we remove the old one.
+     * Expire task that removes a {@link QueuedCommand} from queue after valid duration defined.
     *
-     * @param sender {@link CommandSender} that executed the command.
-     */
-    private void cancelPreviousInQueue(@NotNull CommandSender sender) {
-        QueuedCommand previousCommand = queuedCommandMap.get(sender);
-        if (previousCommand == null) {
-            return;
-        }
-        previousCommand.getExpireTask().cancel();
-        this.queuedCommandMap.remove(sender);
-    }
-
-    /**
-     * Expire task that remove {@link QueuedCommand} from queue after expiry.
-     *
-     * @param queuedCommand  Command to run the expire task on.
+     * @param queuedCommand Command to run the expire task on.
     * @return The expire {@link BukkitTask}.
     */
    @NotNull
@@ -67,19 +70,27 @@ public class CommandQueueManager {
        return Bukkit.getScheduler().runTaskLater(
                this.plugin,
                expireRunnable(queuedCommand),
-                queuedCommand.getValidDuration()
+                queuedCommand.getValidDuration() * TICKS_PER_SECOND
        );
    }

+    /**
+     * Runnable responsible for expiring the queued command.
+     *
+     * @param queuedCommand Command to create the expire task on.
+     * @return The expire runnable.
+     */
    @NotNull
    private Runnable expireRunnable(@NotNull QueuedCommand queuedCommand) {
        return () -> {
-            QueuedCommand matchingQueuedCommand = this.queuedCommandMap.get(queuedCommand.getSender());
-            if (!queuedCommand.equals(matchingQueuedCommand)) {
-                Logging.finer("This is an old command already.");
+            CommandSender targetSender = parseSender(queuedCommand.getSender());
+            QueuedCommand matchingQueuedCommand = this.queuedCommandMap.get(targetSender);
+            if (!queuedCommand.equals(matchingQueuedCommand) || queuedCommand.getExpireTask().isCancelled()) {
+                // To be safe, but this shouldn't happen since we cancel old commands before add new once.
+                Logging.finer("This is an old queue command already.");
                return;
            }
-            Logging.finer("Command has expired, removing...");
+            queuedCommand.getSender().sendMessage("Your queued command has expired.");
            this.queuedCommandMap.remove(queuedCommand.getSender());
        };
    }
@@ -87,21 +98,64 @@ public class CommandQueueManager {
    /**
     * Runs the command in queue for the given sender, if any.
     *
-     * @param sender {@link CommandSender} that confirmed the command.
-     * @return True of queued command ran successfully, false otherwise.
+     * @param sender    {@link CommandSender} that confirmed the command.
+     * @return True if queued command ran successfully, else false.
     */
    public boolean runQueuedCommand(@NotNull CommandSender sender) {
-        CommandSender targetSender = QueuedCommand.parseSender(sender);
+        CommandSender targetSender = parseSender(sender);
        QueuedCommand queuedCommand = this.queuedCommandMap.get(targetSender);
        if (queuedCommand == null) {
-            sender.sendMessage("You do not have any commands in queue.");
+            sender.sendMessage(ChatColor.RED + "You do not have any commands in queue.");
            return false;
        }
-
        Logging.finer("Running queued command...");
        queuedCommand.getAction().run();
-        queuedCommand.getExpireTask().cancel();
-        this.queuedCommandMap.remove(targetSender);
+        return removeFromQueue(targetSender);
+    }
+
+    /**
+     * Since only one command is stored in queue per sender, we remove the old one.
+     *
+     * @param sender    The {@link CommandSender} that executed the command.
+     * @return True if queue command is removed from sender successfully, else false.
+     */
+    public boolean removeFromQueue(@NotNull CommandSender sender) {
+        CommandSender targetSender = parseSender(sender);
+        QueuedCommand previousCommand = this.queuedCommandMap.remove(targetSender);
+        if (previousCommand == null) {
+            Logging.finer("No queue command to remove for sender %s.", targetSender.getName());
+            return false;
+        }
+        previousCommand.getExpireTask().cancel();
+        Logging.finer("Removed queue command for sender %s.", targetSender.getName());
        return true;
    }
+
+    /**
+     * To allow all CommandBlocks to be a common sender with use of {@link DummyCommandBlockSender}.
+     * So confirm command can be used for a queued command on another command block.
+     *
+     * @param sender    The sender to parse.
+     * @return The sender, or if its a command block, a {@link DummyCommandBlockSender}.
+     */
+    @NotNull
+    private CommandSender parseSender(@NotNull CommandSender sender) {
+        Logging.fine(sender.getClass().getName());
+        if (isCommandBlock(sender)) {
+            Logging.finer("Is command block.");
+            return COMMAND_BLOCK;
+        }
+        return sender;
+    }
+
+    /**
+     * Checks if the sender is a command block.
+     *
+     * @param sender    The sender to check.
+     * @return True if sender is a command block, else false.
+     */
+    private boolean isCommandBlock(@NotNull CommandSender sender) {
+        return sender instanceof BlockCommandSender
+                && ((BlockCommandSender) sender).getBlock().getBlockData() instanceof CommandBlock;
+    }
 }
@@ -94,7 +94,7 @@ class DummyCommandBlockSender implements CommandSender {

    @Override
    public boolean isOp() {
-        return true;
+        throw new UnsupportedOperationException();
    }

    @Override
@@ -7,116 +7,80 @@

 package com.onarandombox.MultiverseCore.commandtools.queue;

-import com.dumptruckman.minecraft.util.Logging;
-import org.bukkit.block.data.type.CommandBlock;
-import org.bukkit.command.BlockCommandSender;
 import org.bukkit.command.CommandSender;
 import org.bukkit.scheduler.BukkitTask;
 import org.jetbrains.annotations.NotNull;

 /**
- * Represents a single command in {@link CommandQueueManager}.
+ * Represents a single command used in {@link CommandQueueManager} for confirming before running potentially
+ * dangerous action.
 */
 public class QueuedCommand {

-    private static final DummyCommandBlockSender COMMAND_BLOCK = new DummyCommandBlockSender();
    private static final String DEFAULT_PROMPT_MESSAGE = "The command you are trying to run is deemed dangerous.";
-    private static final int DEFAULT_VALID_TIME = 200;  // In ticks, 20 ticks = 1s
+    private static final int DEFAULT_VALID_TIME = 10;

-    /**
-     * To allow all CommandBlocks to be a common sender with use of {@link DummyCommandBlockSender}.
-     * So confirm command can be used for a queue command on another command block.
-     */
-    @NotNull
-    static CommandSender parseSender(@NotNull CommandSender sender) {
-        Logging.fine(sender.getClass().getName());
-        if (isCommandBlock(sender)) {
-            Logging.finer("Is command block.");
-            return COMMAND_BLOCK;
-        }
-        return sender;
-    }
-
-    /**
-     * Check if sender is a command block.
-     */
-    static boolean isCommandBlock(@NotNull CommandSender sender) {
-        return sender instanceof BlockCommandSender
-                && ((BlockCommandSender) sender).getBlock().getBlockData() instanceof CommandBlock;
-    }
-
-    private CommandSender sender;
-    private String prompt = DEFAULT_PROMPT_MESSAGE;
-    private int validDuration = DEFAULT_VALID_TIME;
-    private Runnable action;
+    private final CommandSender sender;
+    private final Runnable action;
+    private final String prompt;
+    private final int validDuration;
    private BukkitTask expireTask;

-    private QueuedCommand() { }
+    public QueuedCommand(CommandSender sender, Runnable action) {
+        this(sender, action, DEFAULT_PROMPT_MESSAGE, DEFAULT_VALID_TIME);
+    }
+
+    public QueuedCommand(CommandSender sender, Runnable action, String prompt) {
+        this(sender, action, prompt, DEFAULT_VALID_TIME);
+    }
+
+    public QueuedCommand(CommandSender sender, Runnable action, int validDuration) {
+        this(sender, action, DEFAULT_PROMPT_MESSAGE, validDuration);
+    }
+
+    /**
+     * Creates a new queue command, to be registered at {@link CommandQueueManager#addToQueue(QueuedCommand)}.
+     *
+     * @param sender        The sender that ran the command needed for confirmation.
+     * @param action        The logic to execute upon confirming.
+     * @param prompt        Question to ask sender to confirm.
+     * @param validDuration Duration in which the command is valid for confirm in seconds.
+     */
+    public QueuedCommand(CommandSender sender, Runnable action, String prompt, int validDuration) {
+        this.sender = sender;
+        this.action = action;
+        this.prompt = prompt;
+        this.validDuration = validDuration;
+    }

    @NotNull
-    public CommandSender getSender() {
+    CommandSender getSender() {
        return sender;
    }

    @NotNull
-    public String getPrompt() {
+    String getPrompt() {
        return prompt;
    }

-    public int getValidDuration() {
+    int getValidDuration() {
        return validDuration;
    }

    @NotNull
-    public Runnable getAction() {
+    Runnable getAction() {
        return action;
    }

    @NotNull
-    public BukkitTask getExpireTask() {
+    BukkitTask getExpireTask() {
        return expireTask;
    }

-    public void setExpireTask(@NotNull BukkitTask expireTask) {
+    void setExpireTask(@NotNull BukkitTask expireTask) {
+        if (this.expireTask != null) {
+            throw new IllegalStateException("This queue command already has an expire task. You can't register twice!");
+        }
        this.expireTask = expireTask;
    }
-
-    public static class Builder {
-
-        private final QueuedCommand command;
-
-        @NotNull
-        public Builder() {
-            this.command = new QueuedCommand();
-        }
-
-        @NotNull
-        public Builder sender(@NotNull CommandSender sender) {
-            this.command.sender = sender;
-            return this;
-        }
-
-        @NotNull
-        public Builder action(@NotNull Runnable action) {
-            this.command.action = action;
-            return this;
-        }
-
-        @NotNull
-        public Builder prompt(@NotNull String prompt, Object...replacements) {
-            this.command.prompt = String.format(prompt, replacements);
-            return this;
-        }
-
-        @NotNull
-        public Builder validDuration(int validDuration) {
-            this.command.validDuration = validDuration;
-            return this;
-        }
-
-        @NotNull
-        public QueuedCommand build() {
-            return this.command;
-        }
-    }
 }
@@ -7,10 +7,14 @@

 package com.onarandombox.MultiverseCore.destination;

-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.commands.TeleportCommand;
 import com.onarandombox.MultiverseCore.utils.PermissionTools;
+import com.onarandombox.MultiverseCore.utils.PlayerFinder;
+import com.pneumaticraft.commandhandler.Command;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
@@ -19,49 +23,68 @@ import org.jetbrains.annotations.Nullable;

 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.regex.Pattern;

-/** A factory class that will create destinations from specific strings. */
+/**
+ * A factory class that will create destinations from specific strings.
+ */
 public class DestinationFactory {
-    private final MultiverseCore plugin;
-    private final Map<String, Class<? extends MVDestination>> destList;
-    private final Set<String> destPermissions;
-    private final PermissionTools permTools;

    private static final Pattern CANNON_PATTERN = Pattern.compile("(?i)cannon-[\\d]+(\\.[\\d]+)?");

+    private MultiverseCore plugin;
+    private Map<String, Class<? extends MVDestination>> destList;
+    private Command teleportCommand;
+
    public DestinationFactory(MultiverseCore plugin) {
        this.plugin = plugin;
-        this.destList = new HashMap<>();
-        this.destPermissions = new HashSet<>();
-        this.permTools = new PermissionTools(plugin);
+        this.destList = new HashMap<String, Class<? extends MVDestination>>();
+        List<Command> cmds = this.plugin.getCommandHandler().getAllCommands();
+        for (Command c : cmds) {
+            if (c instanceof TeleportCommand) {
+                this.teleportCommand = c;
+            }
+        }
    }

-    public MVDestination getPlayerAwareDestination(@Nullable Player teleportee,
+    /**
+     * Parse a destination that has relation to sender, such as a cannon or player destination.
+     *
+     * @param teleportee        The player that is going to be teleported.
+     * @param destinationName   The destination to parse.
+     * @return A non-null MVDestination
+     */
+    @NotNull
+    public MVDestination getPlayerAwareDestination(@NotNull Player teleportee,
                                                   @NotNull String destinationName) {

-        if (teleportee == null) {
+        // Prioritise world, in the event that a world is named after a player online.
+        if (Bukkit.getWorld(destinationName) != null) {
            return getDestination(destinationName);
        }

+        Player targetPlayer = PlayerFinder.get(destinationName, teleportee);
+        if (targetPlayer != null) {
+            return getDestination("pl:" + targetPlayer.getName());
+        }
+
        if (CANNON_PATTERN.matcher(destinationName).matches()) {
            return getDestination(parseCannonDest(teleportee, destinationName));
        }

-        Player targetPlayer = this.plugin.getMVCommandManager()
-                .getCommandContexts()
-                .getPlayerFromValue(teleportee, destinationName);
-
-        if (targetPlayer != null) {
-            return getDestination("pl:" + targetPlayer.getName());
-        }
-
        return getDestination(destinationName);
    }

+    /**
+     * Parses a cannon destination.
+     *
+     * @param teleportee        The player that is going to be teleported.
+     * @param destinationName   The destination to parse.
+     * @return A destination string.
+     */
+    @NotNull
    private String parseCannonDest(@NotNull Player teleportee,
                                   @NotNull String destinationName) {

@@ -125,32 +148,32 @@ public class DestinationFactory {
        if (identifier.equals("")) {
            identifier = "w";
        }
-
-        addDestPerm("multiverse.teleport.self." + identifier,
-                "Permission to teleport yourself for the " + identifier + " destination.");
-        addDestPerm("multiverse.teleport.other." + identifier,
-                "Permission to teleport other for the " + identifier + " destination.");
-
+        Permission self = this.plugin.getServer().getPluginManager().getPermission("multiverse.teleport.self." + identifier);
+        Permission other = this.plugin.getServer().getPluginManager().getPermission("multiverse.teleport.other." + identifier);
+        PermissionTools pt = new PermissionTools(this.plugin);
+        if (self == null) {
+            self = new Permission("multiverse.teleport.self." + identifier,
+                    "Permission to teleport yourself for the " + identifier + " destination.", PermissionDefault.OP);
+            this.plugin.getServer().getPluginManager().addPermission(self);
+            pt.addToParentPerms("multiverse.teleport.self." + identifier);
+        }
+        if (other == null) {
+            other = new Permission("multiverse.teleport.other." + identifier,
+                    "Permission to teleport others for the " + identifier + " destination.", PermissionDefault.OP);
+            this.plugin.getServer().getPluginManager().addPermission(other);
+            pt.addToParentPerms("multiverse.teleport.other." + identifier);
+        }
+        this.teleportCommand.addAdditonalPermission(self);
+        this.teleportCommand.addAdditonalPermission(other);
        return true;
    }

-    private void addDestPerm(String permNode, String description) {
-        if (this.plugin.getServer().getPluginManager().getPermission(permNode) != null) {
-            Logging.fine("Destination permission node " + permNode + " already added.");
-            return;
-        }
-
-        Permission perm = new Permission(permNode, description, PermissionDefault.OP);
-        this.plugin.getServer().getPluginManager().addPermission(perm);
-        permTools.addToParentPerms(permNode);
-        destPermissions.add(permNode);
-    }
-
-    public Collection<String> getIdentifiers() {
-        return destList.keySet();
-    }
-
-    public Set<String> getPermissions() {
-        return destPermissions;
+    /**
+     * Gets all the {@link MVDestination} identifiers registered.
+     *
+     * @return A collection of destination identifiers.
+     */
+    public Collection<String> getRegisteredIdentifiers() {
+        return this.destList.keySet();
    }
 }
@@ -1,4 +1,4 @@
-package com.onarandombox.MultiverseCore.displaytools;
+package com.onarandombox.MultiverseCore.display;

 import org.bukkit.ChatColor;
 import org.jetbrains.annotations.NotNull;
@@ -1,10 +1,11 @@
-package com.onarandombox.MultiverseCore.displaytools;
+package com.onarandombox.MultiverseCore.display;

 import org.bukkit.ChatColor;

 /**
 * Tools to allow customisation.
 */
+@FunctionalInterface
 public interface ColorTool {

    /**
@@ -1,8 +1,9 @@
-package com.onarandombox.MultiverseCore.displaytools;
+package com.onarandombox.MultiverseCore.display;

+import com.onarandombox.MultiverseCore.display.settings.DisplaySetting;
+import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;

 import java.util.Collection;
 import java.util.Map;
@@ -18,33 +19,66 @@ public class ContentDisplay<T> {

    public static final String LINE_BREAK = "%br%";

-    private CommandSender sender;
+    /**
+     * Creates a ContentDisplay.Builder for the given content.
+     *
+     * @param content The content to be displayed.
+     * @param <T> The type of the content which can be inferred.
+     * @return A new Builder.
+     */
+    public static <T> Builder<T> forContent(T content) {
+        return new Builder<>(content);
+    }
+
+    /**
+     * Creates a ContentDisplay.Builder for the given collection of content.
+     *
+     * @param content The content to be displayed.
+     * @return A new Builder.
+     */
+    public static Builder<Collection<String>> forContent(Collection<String> content) {
+        return new Builder<>(content).displayHandler(DisplayHandlers.LIST);
+    }
+
+    /**
+     * Creates a ContentDisplay.Builder for the given map of content.
+     *
+     * @param content The content to be displayed.
+     * @return A new Builder.
+     */
+    public static Builder<Map<String, Object>> forContent(Map<String, Object> content) {
+        return new Builder<>(content).displayHandler(DisplayHandlers.INLINE_MAP);
+    }
+
+    private final T contents;
+
    private String header;
-    private T contents;
    private String emptyMessage = "No matching content to display.";
    private DisplayHandler<T> displayHandler;
    private ColorTool colorTool = ColorTool.DEFAULT;
    private ContentFilter filter = ContentFilter.DEFAULT;
    private final Map<DisplaySetting<?>, Object> settingsMap = new WeakHashMap<>();

-    private ContentDisplay() { }
-
-    /**
-     * Do the actual displaying of contents to the sender.
-     */
-    public void send() {
-        Collection<String> formattedContent = (this.contents == null) ? null : this.displayHandler.format(this);
-        this.displayHandler.sendHeader(this);
-        this.displayHandler.sendSubHeader(this);
-        this.displayHandler.sendBody(this, formattedContent);
+    private ContentDisplay(T contents) {
+        this.contents = contents;
    }

    /**
-     * @return Gets the target sender.
+     * Do the actual displaying of contents to the sender.
+     *
+     * @param sender The CommandSender to show the display to.
     */
-    @NotNull
-    public CommandSender getSender() {
-        return sender;
+    public void show(@NotNull CommandSender sender) {
+        Collection<String> formattedContent;
+        try {
+            formattedContent = (this.contents == null) ? null : this.displayHandler.format(sender, this);
+        } catch (DisplayFormatException e) {
+            sender.sendMessage(String.format("%sError: %s", ChatColor.RED, e.getMessage()));
+            return;
+        }
+        this.displayHandler.sendHeader(sender, this);
+        this.displayHandler.sendSubHeader(sender, this);
+        this.displayHandler.sendBody(sender, this, formattedContent);
    }

    /**
@@ -131,20 +165,8 @@ public class ContentDisplay<T> {

        private final ContentDisplay<T> display;

-        public Builder() {
-            this.display = new ContentDisplay<>();
-        }
-
-        /**
-         * Sets target sender to display message to. <b>Required.</b>
-         *
-         * @param sender The target sender.
-         * @return The builder.
-         */
-        @NotNull
-        public Builder<T> sender(@NotNull CommandSender sender) {
-            this.display.sender = sender;
-            return this;
+        private Builder(T content) {
+            this.display = new ContentDisplay<>(content);
        }

        /**
@@ -160,18 +182,6 @@ public class ContentDisplay<T> {
            return this;
        }

-        /**
-         * Sets content to be displayed.
-         *
-         * @param contents  The contents.
-         * @return The builder.
-         */
-        @NotNull
-        public Builder<T> contents(@Nullable T contents) {
-            this.display.contents = contents;
-            return this;
-        }
-
        /**
         * Sets the message to show when no content is available for display.
         *
@@ -242,16 +252,17 @@ public class ContentDisplay<T> {
         */
        @NotNull
        public ContentDisplay<T> build() {
-            Objects.requireNonNull(this.display.sender);
            Objects.requireNonNull(this.display.displayHandler);
            return this.display;
        }

        /**
-         * Build and send the contents to the sender.
+         * Build and show the content to the sender.
+         *
+         * @param sender The CommandSender to show the display to.
         */
-        public void display() {
-            this.build().send();
+        public void show(CommandSender sender) {
+            this.build().show(sender);
        }
    }
 }
@@ -1,4 +1,4 @@
-package com.onarandombox.MultiverseCore.displaytools;
+package com.onarandombox.MultiverseCore.display;

 import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.ChatColor;
@@ -139,7 +139,7 @@ public class ContentFilter {
     * @return The formatted filter string.
     */
    public @NotNull String getFormattedString() {
-        return String.format("%sFilter: '%s'%s", ChatColor.ITALIC, filterString, ChatColor.RESET);
+        return String.format("%sFilter: '%s'", ChatColor.ITALIC, filterString);
    }

    @Override
@@ -0,0 +1,25 @@
+package com.onarandombox.MultiverseCore.display;
+
+/**
+ * Thrown when an issue occur while formatting content.
+ */
+public class DisplayFormatException extends Exception {
+    public DisplayFormatException() {
+    }
+
+    public DisplayFormatException(String message) {
+        super(message);
+    }
+
+    public DisplayFormatException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public DisplayFormatException(Throwable cause) {
+        super(cause);
+    }
+
+    public DisplayFormatException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}
@@ -0,0 +1,68 @@
+package com.onarandombox.MultiverseCore.display;
+
+import com.google.common.base.Strings;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+
+/**
+ * Handles the formatting and sending of all content by the {@link ContentDisplay}.
+ *
+ * @param <T>   Type of content to display.
+ */
+@FunctionalInterface
+public interface DisplayHandler<T> {
+
+    /**
+     * Formats the raw content into a {@link Collection<String>} for displaying to the given sender.
+     *
+     * @param sender The {@link CommandSender} who will the content will be displayed to.
+     * @param display The responsible {@link ContentDisplay}.
+     * @return The formatted content.
+     * @throws DisplayFormatException Issue occurred while formatting content. E.g. invalid page.
+     */
+    Collection<String> format(@NotNull CommandSender sender, @NotNull ContentDisplay<T> display)
+            throws DisplayFormatException;
+
+    /**
+     * Sends the header.
+     *
+     * @param sender The {@link CommandSender} who will the header will be displayed to.
+     * @param display The responsible {@link ContentDisplay}.
+     */
+    default void sendHeader(@NotNull CommandSender sender, @NotNull ContentDisplay<T> display) {
+        if (!Strings.isNullOrEmpty(display.getHeader())) {
+            sender.sendMessage(display.getHeader());
+        }
+    }
+
+    /**
+     * Sends info such as filter and page.
+     *
+     * @param sender The {@link CommandSender} who will the sub header will be displayed to.
+     * @param display The responsible {@link ContentDisplay}.
+     */
+    default void sendSubHeader(@NotNull CommandSender sender, @NotNull ContentDisplay<T> display) {
+        if (display.getFilter().hasFilter()) {
+            sender.sendMessage(String.format("%s[ %s ]", ChatColor.GRAY, display.getFilter().getFormattedString()));
+        }
+    }
+
+    /**
+     * Sends the content.
+     *
+     * @param sender The {@link CommandSender} who will the body will be displayed to.
+     * @param display The responsible {@link ContentDisplay}.
+     * @param formattedContent The content after being formatted by {@link #format(CommandSender, ContentDisplay)}
+     */
+    default void sendBody(@NotNull CommandSender sender, @NotNull ContentDisplay<T> display,
+                          Collection<String> formattedContent) {
+        if (formattedContent == null || formattedContent.size() == 0) {
+            sender.sendMessage(display.getEmptyMessage());
+            return;
+        }
+        sender.sendMessage(formattedContent.toArray(new String[0]));
+    }
+}
@@ -0,0 +1,47 @@
+package com.onarandombox.MultiverseCore.display;
+
+import com.onarandombox.MultiverseCore.display.handlers.InlineListDisplayHandler;
+import com.onarandombox.MultiverseCore.display.handlers.InlineMapDisplayHandler;
+import com.onarandombox.MultiverseCore.display.handlers.ListDisplayHandler;
+import com.onarandombox.MultiverseCore.display.handlers.PagedListDisplayHandler;
+import com.onarandombox.MultiverseCore.display.settings.InlineDisplaySettings;
+import com.onarandombox.MultiverseCore.display.settings.PagedDisplaySettings;
+import com.onarandombox.MultiverseCore.display.settings.MapDisplaySettings;
+
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * Various implementations of {@link DisplayHandler}.
+ */
+public class DisplayHandlers {
+
+    /**
+     * Standard list display.
+     *
+     * Supported settings: none.
+     */
+    public static final DisplayHandler<Collection<String>> LIST = new ListDisplayHandler();
+
+    /**
+     * List display with paging.
+     *
+     * Supported settings: {@link PagedDisplaySettings#SHOW_PAGE}, {@link PagedDisplaySettings#LINES_PER_PAGE},
+     * {@link PagedDisplaySettings#PAGE_IN_CONSOLE}, {@link PagedDisplaySettings#DO_END_PADDING}.
+     */
+    public static final DisplayHandler<Collection<String>> PAGE_LIST = new PagedListDisplayHandler();
+
+    /**
+     * Display a list inline.
+     *
+     * Supported settings: {@link InlineDisplaySettings#SEPARATOR}.
+     */
+    public static final DisplayHandler<Collection<String>> INLINE_LIST = new InlineListDisplayHandler();
+
+    /**
+     * Display key value pair inline.
+     *
+     * Supported settings: {@link InlineDisplaySettings#SEPARATOR}, {@link MapDisplaySettings#OPERATOR}.
+     */
+    public static final DisplayHandler<Map<String, Object>> INLINE_MAP = new InlineMapDisplayHandler();
+}
@@ -0,0 +1,36 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import com.onarandombox.MultiverseCore.display.ContentDisplay;
+import com.onarandombox.MultiverseCore.display.DisplayFormatException;
+import com.onarandombox.MultiverseCore.display.DisplayHandler;
+import com.onarandombox.MultiverseCore.display.settings.InlineDisplaySettings;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+
+public class InlineListDisplayHandler implements DisplayHandler<Collection<String>> {
+
+    @Override
+    public Collection<String> format(@NotNull CommandSender sender, @NotNull ContentDisplay<Collection<String>> display)
+            throws DisplayFormatException {
+        StringBuilder builder = new StringBuilder();
+        String separator = display.getSetting(InlineDisplaySettings.SEPARATOR);
+
+        for (Iterator<String> iterator = display.getContents().iterator(); iterator.hasNext(); ) {
+            String content = iterator.next();
+            if (!display.getFilter().checkMatch(content)) {
+                continue;
+            }
+            builder.append(display.getColorTool().get()).append(content);
+            if (iterator.hasNext()) {
+                builder.append(separator);
+            }
+        }
+        return (builder.length() == 0)
+                ? Collections.singletonList(display.getEmptyMessage())
+                : Collections.singleton(builder.toString());
+    }
+}
@@ -0,0 +1,44 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import com.onarandombox.MultiverseCore.display.ContentDisplay;
+import com.onarandombox.MultiverseCore.display.DisplayFormatException;
+import com.onarandombox.MultiverseCore.display.DisplayHandler;
+import com.onarandombox.MultiverseCore.display.settings.InlineDisplaySettings;
+import com.onarandombox.MultiverseCore.display.settings.MapDisplaySettings;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+
+public class InlineMapDisplayHandler implements DisplayHandler<Map<String, Object>> {
+
+    @Override
+    public Collection<String> format(@NotNull CommandSender sender,
+                                     @NotNull ContentDisplay<Map<String, Object>> display)
+            throws DisplayFormatException {
+        StringBuilder builder = new StringBuilder();
+        String separator = display.getSetting(InlineDisplaySettings.SEPARATOR);
+        String operator = display.getSetting(MapDisplaySettings.OPERATOR);
+
+        for (Iterator<Map.Entry<String, Object>> iterator = display.getContents().entrySet().iterator(); iterator.hasNext(); ) {
+            Map.Entry<String, Object> entry = iterator.next();
+            if (!display.getFilter().checkMatch(entry.getKey()) && !display.getFilter().checkMatch(entry.getValue())) {
+                continue;
+            }
+            builder.append(display.getColorTool().get())
+                    .append(entry.getKey())
+                    .append(operator)
+                    .append(display.getColorTool().get())
+                    .append(entry.getValue());
+            if (iterator.hasNext()) {
+                builder.append(separator);
+            }
+        }
+        return (builder.length() == 0)
+                ? Collections.singletonList(display.getEmptyMessage())
+                : Collections.singleton(builder.toString());
+    }
+}
@@ -0,0 +1,22 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import com.onarandombox.MultiverseCore.display.ContentDisplay;
+import com.onarandombox.MultiverseCore.display.DisplayFormatException;
+import com.onarandombox.MultiverseCore.display.DisplayHandler;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+public class ListDisplayHandler implements DisplayHandler<Collection<String>> {
+
+    @Override
+    public Collection<String> format(@NotNull CommandSender sender, @NotNull ContentDisplay<Collection<String>> display)
+            throws DisplayFormatException {
+        return display.getContents().stream()
+                .filter(display.getFilter()::checkMatch)
+                .map(s -> (ContentDisplay.LINE_BREAK.equals(s)) ? "" : display.getColorTool().get() + s)
+                .collect(Collectors.toList());
+    }
+}
@@ -0,0 +1,105 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import com.onarandombox.MultiverseCore.display.ContentDisplay;
+import com.onarandombox.MultiverseCore.display.DisplayFormatException;
+import com.onarandombox.MultiverseCore.display.settings.PagedDisplaySettings;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.IntStream;
+
+public class PagedListDisplayHandler extends ListDisplayHandler {
+
+    @Override
+    public Collection<String> format(@NotNull CommandSender sender, @NotNull ContentDisplay<Collection<String>> display)
+            throws DisplayFormatException {
+        if (dontNeedPaging(sender, display)) {
+            return super.format(sender, display);
+        }
+
+        int pages = 1;
+        int currentLength = 0;
+        int targetPage = display.getSetting(PagedDisplaySettings.SHOW_PAGE);
+        int linesPerPage = display.getSetting(PagedDisplaySettings.LINES_PER_PAGE);
+        List<String> content = new ArrayList<>(linesPerPage);
+
+        // Calculate the paging.
+        for (String line : display.getContents()) {
+            if (!display.getFilter().checkMatch(line)) {
+                continue;
+            }
+            // When it's the next page.
+            boolean isLineBreak = ContentDisplay.LINE_BREAK.equals(line);
+            if (isLineBreak || ++currentLength > linesPerPage) {
+                pages++;
+                currentLength = 0;
+                if (isLineBreak) {
+                    continue;
+                }
+            }
+            if (pages == targetPage) {
+                // Let first line be the header when no header is defined.
+                if (display.getHeader() == null) {
+                    display.setHeader(line);
+                    currentLength--;
+                    continue;
+                }
+                content.add(display.getColorTool().get() + line);
+            }
+        }
+
+        // Page out of range.
+        if (targetPage < 1 || targetPage > pages) {
+            if (pages == 1) {
+                throw new DisplayFormatException("There is only 1 page!");
+            }
+            throw new DisplayFormatException("Please enter a page from 1 to " + pages + ".");
+        }
+
+        // No content
+        if (content.size() == 0) {
+            content.add(display.getEmptyMessage());
+        }
+
+        // Add empty lines to make output length consistent.
+        if (display.getSetting(PagedDisplaySettings.DO_END_PADDING)) {
+            IntStream.range(0, linesPerPage - content.size()).forEach(i -> content.add(""));
+        }
+        display.setSetting(PagedDisplaySettings.TOTAL_PAGE, pages);
+
+        return content;
+    }
+
+    @Override
+    public void sendSubHeader(@NotNull CommandSender sender, @NotNull ContentDisplay<Collection<String>> display) {
+        if (dontNeedPaging(sender, display)) {
+            super.sendSubHeader(sender, display);
+            return;
+        }
+
+        if (display.getFilter().hasFilter()) {
+            sender.sendMessage(String.format("%s[ Page %s of %s, %s ]",
+                    ChatColor.GRAY,
+                    display.getSetting(PagedDisplaySettings.SHOW_PAGE),
+                    display.getSetting(PagedDisplaySettings.TOTAL_PAGE),
+                    display.getFilter().getFormattedString())
+            );
+            return;
+        }
+        sender.sendMessage(String.format("%s[ Page %s of %s ]",
+                ChatColor.GRAY,
+                display.getSetting(PagedDisplaySettings.SHOW_PAGE),
+                display.getSetting(PagedDisplaySettings.TOTAL_PAGE))
+        );
+    }
+
+    private boolean dontNeedPaging(CommandSender sender, ContentDisplay<Collection<String>> display) {
+        return sender instanceof ConsoleCommandSender
+                && !display.getSetting(PagedDisplaySettings.PAGE_IN_CONSOLE);
+    }
+}
@@ -1,10 +1,13 @@
-package com.onarandombox.MultiverseCore.displaytools;
+package com.onarandombox.MultiverseCore.display.settings;
+
+import com.onarandombox.MultiverseCore.display.DisplayHandler;

 /**
 * Represents a setting option that can be used by {@link DisplayHandler}.
 *
 * @param <T>
 */
+@FunctionalInterface
 public interface DisplaySetting<T> {

     /**
@@ -0,0 +1,15 @@
+package com.onarandombox.MultiverseCore.display.settings;
+
+import com.onarandombox.MultiverseCore.display.DisplayHandler;
+import org.bukkit.ChatColor;
+
+/**
+ * Collection of {@link DisplaySetting} that are used by various {@link DisplayHandler}.
+ */
+public class InlineDisplaySettings {
+
+    /**
+     * Inline separator. E.g. '1, 2, 3'
+     */
+    public static final DisplaySetting<String> SEPARATOR = () -> ChatColor.WHITE + ", ";
+}
@@ -0,0 +1,15 @@
+package com.onarandombox.MultiverseCore.display.settings;
+
+import com.onarandombox.MultiverseCore.display.DisplayHandler;
+import org.bukkit.ChatColor;
+
+/**
+ * Collection of {@link DisplaySetting} that are used by various {@link DisplayHandler}.
+ */
+public class MapDisplaySettings {
+
+    /**
+     * The thing between a key value pair. E.g. 'Me = Smart'
+     */
+    public static final DisplaySetting<String> OPERATOR = () -> ChatColor.WHITE + " = ";
+}
@@ -1,11 +1,6 @@
-package com.onarandombox.MultiverseCore.displaytools;
+package com.onarandombox.MultiverseCore.display.settings;

-import org.bukkit.ChatColor;
-
-/**
- * Collection of {@link DisplaySetting} that are used by various {@link DisplayHandler}.
- */
-public class DisplaySettings {
+public class PagedDisplaySettings {

    /**
     * Page to display.
@@ -32,13 +27,4 @@ public class DisplaySettings {
     */
    public static final DisplaySetting<Boolean> PAGE_IN_CONSOLE = () -> false;

-    /**
-     * Inline separator. E.g. '1, 2, 3'
-     */
-    public static final DisplaySetting<String> SEPARATOR = () -> ChatColor.WHITE + ", ";
-
-    /**
-     * The thing between a key value pair. E.g. 'Me = Smart'
-     */
-    public static final DisplaySetting<String> OPERATOR = () -> ChatColor.WHITE + " = ";
 }
@@ -1,60 +0,0 @@
-package com.onarandombox.MultiverseCore.displaytools;
-
-import com.google.common.base.Strings;
-import org.bukkit.ChatColor;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-
-/**
- * Handles the formatting and sending of all content by the {@link ContentDisplay}.
- *
- * @param <T>   Type of content to display.
- */
-public interface DisplayHandler<T> {
-
-    /**
-     * Formats the raw content into a {@link Collection<String>} for displaying to sender.
-     *
-     * @param display   The responsible {@link ContentDisplay}.
-     * @return The formatted content.
-     */
-    Collection<String> format(@NotNull ContentDisplay<T> display);
-
-    /**
-     * Sends the header.
-     *
-     * @param display   The responsible {@link ContentDisplay}.
-     */
-    default void sendHeader(@NotNull ContentDisplay<T> display) {
-        if (!Strings.isNullOrEmpty(display.getHeader())) {
-            display.getSender().sendMessage(display.getHeader());
-        }
-    }
-
-    /**
-     * Sends info such as filter and page.
-     *
-     * @param display   The responsible {@link ContentDisplay}.
-     */
-    default void sendSubHeader(@NotNull ContentDisplay<T> display) {
-        if (display.getFilter().hasFilter()) {
-            display.getSender().sendMessage(String.format("%s[ %s ]",
-                    ChatColor.GRAY, display.getFilter().getFormattedString()));
-        }
-    }
-
-    /**
-     * Sends the content.
-     *
-     * @param display           The responsible {@link ContentDisplay}.
-     * @param formattedContent  The content after being formatted by {@link #format(ContentDisplay)}
-     */
-    default void sendBody(@NotNull ContentDisplay<T> display, Collection<String> formattedContent) {
-        if (formattedContent == null || formattedContent.size() == 0) {
-            display.getSender().sendMessage(display.getEmptyMessage());
-            return;
-        }
-        display.getSender().sendMessage(formattedContent.toArray(new String[0]));
-    }
-}
@@ -1,175 +0,0 @@
-package com.onarandombox.MultiverseCore.displaytools;
-
-import co.aikar.commands.InvalidCommandArgument;
-import org.bukkit.ChatColor;
-import org.bukkit.command.ConsoleCommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-/**
- * Various implementations of {@link DisplayHandler}.
- */
-public class DisplayHandlers {
-
-    /**
-     * Standard list display.
-     *
-     * Supported settings: none.
-     */
-    public static final DisplayHandler<Collection<String>> LIST = display -> display.getContents().stream()
-            .filter(display.getFilter()::checkMatch)
-            .map(s -> (ContentDisplay.LINE_BREAK.equals(s)) ? "" : display.getColorTool().get() + s)
-            .collect(Collectors.toList());
-
-    /**
-     * List display with paging.
-     *
-     * Supported settings: {@link DisplaySettings#SHOW_PAGE}, {@link DisplaySettings#LINES_PER_PAGE},
-     * {@link DisplaySettings#PAGE_IN_CONSOLE}, {@link DisplaySettings#DO_END_PADDING}.
-     */
-    public static final DisplayHandler<Collection<String>> PAGE_LIST = new DisplayHandler<Collection<String>>() {
-        @Override
-        public Collection<String> format(@NotNull ContentDisplay<Collection<String>> display) {
-            if (dontNeedPaging(display)) {
-                return LIST.format(display);
-            }
-
-            int pages = 1;
-            int currentLength = 0;
-            int targetPage = display.getSetting(DisplaySettings.SHOW_PAGE);
-            int linesPerPage = display.getSetting(DisplaySettings.LINES_PER_PAGE);
-            List<String> content = new ArrayList<>(linesPerPage);
-
-            // Calculate the paging.
-            for (String line : display.getContents()) {
-                if (!display.getFilter().checkMatch(line)) {
-                    continue;
-                }
-                // When it's the next page.
-                boolean isLineBreak = ContentDisplay.LINE_BREAK.equals(line);
-                if (isLineBreak || currentLength++ > linesPerPage) {
-                    pages++;
-                    currentLength = 0;
-                    if (isLineBreak) {
-                        continue;
-                    }
-                }
-                if (pages == targetPage) {
-                    // Let first line be the header when no header is defined.
-                    if (display.getHeader() == null) {
-                        display.setHeader(line);
-                        currentLength--;
-                        continue;
-                    }
-                    content.add(display.getColorTool().get() + line);
-                }
-            }
-
-            // Page out of range.
-            if (targetPage < 1 || targetPage > pages) {
-                if (pages == 1) {
-                    throw new InvalidCommandArgument("There is only 1 page!");
-                }
-                throw new InvalidCommandArgument("Please enter a page from 1 to " + pages + ".");
-            }
-
-            // Add empty lines to make output length consistent.
-            if (display.getSetting(DisplaySettings.DO_END_PADDING)) {
-                IntStream.range(0, linesPerPage - content.size()).forEach(i -> content.add(""));
-            }
-            display.setSetting(DisplaySettings.TOTAL_PAGE, pages);
-
-            return content;
-        }
-
-        @Override
-        public void sendSubHeader(@NotNull ContentDisplay<Collection<String>> display) {
-            if (dontNeedPaging(display)) {
-                LIST.sendSubHeader(display);
-                return;
-            }
-
-            if (display.getFilter().hasFilter()) {
-                display.getSender().sendMessage(String.format("%s[ Page %s of %s, %s ]",
-                        ChatColor.GRAY,
-                        display.getSetting(DisplaySettings.SHOW_PAGE),
-                        display.getSetting(DisplaySettings.TOTAL_PAGE),
-                        display.getFilter().getFormattedString())
-                );
-                return;
-            }
-            display.getSender().sendMessage(String.format("%s[ Page %s of %s ]",
-                    ChatColor.GRAY,
-                    display.getSetting(DisplaySettings.SHOW_PAGE),
-                    display.getSetting(DisplaySettings.TOTAL_PAGE))
-            );
-        }
-
-        private boolean dontNeedPaging(ContentDisplay<Collection<String>> display) {
-            return display.getSender() instanceof ConsoleCommandSender
-                    && !display.getSetting(DisplaySettings.PAGE_IN_CONSOLE);
-        }
-    };
-
-    /**
-     * Display a list inline.
-     *
-     * Supported settings: {@link DisplaySettings#SEPARATOR}.
-     */
-    public static final DisplayHandler<Collection<String>> INLINE_LIST = display -> {
-        StringBuilder builder = new StringBuilder();
-        String separator = display.getSetting(DisplaySettings.SEPARATOR);
-
-        for (Iterator<String> iterator = display.getContents().iterator(); iterator.hasNext(); ) {
-            String content = iterator.next();
-            if (!display.getFilter().checkMatch(content)) {
-                continue;
-            }
-            builder.append(display.getColorTool().get()).append(content);
-            if (iterator.hasNext()) {
-                builder.append(separator);
-            }
-        }
-        return (builder.length() == 0)
-                ? Collections.singletonList(display.getEmptyMessage())
-                : Collections.singleton(builder.toString());
-    };
-
-    /**
-     * Display key value pair inline.
-     *
-     * Supported settings: {@link DisplaySettings#SEPARATOR}, {@link DisplaySettings#OPERATOR}.
-     */
-    public static final DisplayHandler<Map<String, Object>> INLINE_MAP = display -> {
-        StringBuilder builder = new StringBuilder();
-        String separator = display.getSetting(DisplaySettings.SEPARATOR);
-        String operator = display.getSetting(DisplaySettings.OPERATOR);
-
-        for (Iterator<Entry<String, Object>> iterator = display.getContents().entrySet().iterator(); iterator.hasNext(); ) {
-            Entry<String, Object> entry = iterator.next();
-            if (!display.getFilter().checkMatch(entry.getKey()) && !display.getFilter().checkMatch(entry.getValue())) {
-                continue;
-            }
-            builder.append(display.getColorTool().get())
-                    .append(entry.getKey())
-                    .append(operator)
-                    .append(display.getColorTool().get())
-                    .append(entry.getValue());
-            if (iterator.hasNext()) {
-                builder.append(separator);
-            }
-        }
-        return (builder.length() == 0)
-                ? Collections.singletonList(display.getEmptyMessage())
-                : Collections.singleton(builder.toString());
-    };
-}
Author	SHA1	Message	Date
Ben Woo	f989d9614a	Adds permission node to bypass fly enforcement (#2469 )	2021-08-03 20:01:47 +08:00
Ben Woo	1a8a97daf1	Merge pull request #2675 from Multiverse/replace_travis_badge Replace Travis Badge with Github Actions.	2021-07-22 10:12:35 +08:00
nicegamer7	d9dffa8e6d	replace travis badge	2021-07-21 22:11:09 -04:00
nicegamer7	973588defb	Merge pull request #2175 from JLLeitschuh/fix/JLL/use_https_to_resolve_dependencies [SECURITY] Use HTTPS to resolve dependencies in Maven Build	2021-07-19 20:14:17 -04:00
nicegamer7	c704c1ca3a	Merge branch 'main' into fix/JLL/use_https_to_resolve_dependencies	2021-07-19 20:12:25 -04:00
Ben Woo	c33a268b91	Merge pull request #2672 from Multiverse/fix_java16_tests Fix Tests on Java 16 and code cleanup.	2021-07-19 10:31:31 +08:00
Kermina Awad	9821f1d9c8	clean up test files	2021-07-18 13:51:53 -04:00
Kermina Awad	be6e0b67be	don't run tests in parallel	2021-07-18 13:22:04 -04:00
Kermina Awad	b9b1fa6164	remove PowerMockito	2021-07-18 13:17:15 -04:00
Kermina Awad	28585dd6f9	remove unnecessary stub	2021-07-18 13:12:09 -04:00
Ben Woo	47ca7b821b	Move to GitHub actions (#2671 ) * Remove use of travis. * Add basic github action maven build.	2021-07-17 09:31:20 +08:00
nicegamer7	9ce2dfd100	Merge pull request #2445 from benwoo1110/fix-help Fix issue where special chars cause PatternSyntaxException	2021-07-16 09:51:21 -04:00
Ben Woo	473ccd09d7	Don't need to toLowerCase filter.	2021-07-16 21:38:57 +08:00
Ben WooandJeremy Wood	cc2e1d44b2	Implement new content display system. (#2584 ) * Implement new content display system. * Add @FunctionalInterface annotation to displaytools interfaces. * Use static factory method to create Builder with contents. * Use T for generic type since it's static method. * Rename Builder#display to show and require CommandSender. * Rename package from displaytools to display. * Move DisplayHandler impls into their own package. * Overload ContentDisplay#forContent with defaults for list and map. * Pass CommandSender to send command. This system is much more versatile when a single ContentDisplay instance can be used for multiple players. * Rename ContentDisplay#send to #show. * Split DisplaySettings into separate classes. Co-authored-by: Jeremy Wood <farachan@gmail.com>	2021-07-07 10:25:07 +08:00
Jeremy Wood	2e8f159d38	Merge pull request #2666 from Multiverse/https Ensure https is used for repository.	2021-07-06 14:12:46 -04:00
Jeremy Wood	6581d16125	Merge pull request #2519 from Multiverse/readme-update Update readme with more project details	2021-07-06 13:59:35 -04:00
Jeremy Wood	562bc56e83	Merge pull request #2664 from ccuser44/main Create LICENSE.md	2021-07-06 13:56:16 -04:00
Ben Woo	4493cd7916	Ensure https is used for repository.	2021-07-06 23:27:53 +08:00
nicegamer7	1cd9e45915	Merge pull request #2663 from Multiverse/fix-portal-search Set defaultportalsearch to true by default.	2021-07-05 15:16:01 -04:00
ccuser44	acb6bc6dd6	Create LICENSE.md	2021-07-05 11:39:50 +03:00
Ben Woo	b7b17c5d21	Set defaultportalsearch to true by default.	2021-07-05 11:28:52 +08:00
Jeremy Wood	bbd9211845	Bump version to 4.3.1-SNAPSHOT for continued development.	2021-06-23 15:47:52 -04:00
Jeremy Wood	fc6796e20f	Release version 4.3.0.	2021-06-23 08:56:24 -04:00
Jeremy Wood	6040a27126	Merge pull request #2635 from Multiverse/fix/version_cmd_perms Change default permission for version command. Seriously wth.	2021-06-04 13:00:39 -04:00
Jeremy Wood	1c483148dc	Change default permission for version command. Seriously wth.	2021-06-04 13:00:04 -04:00
nicegamer7	128442c062	Merge pull request #2622 from Multiverse/queue-system-cleanup Queue system cleanup	2021-05-16 11:29:23 -04:00
Kermina Awad	141854f076	correct some javadoc typos	2021-05-16 11:21:20 -04:00
xSavior_of_God	f72cc6764b	Fix creation and import Exploit (#2353 ) Through this fix you can avoid deleting of important folders.	2021-05-16 12:56:14 +08:00
benwoo1110	d95ecfaa8e	Update some CommandQueueManager docs to be clearer.	2021-04-28 14:01:30 +08:00
benwoo1110	6c96f4e974	Ensure DummyCommandBlockSender isnt used for Op.	2021-04-28 13:58:43 +08:00
Ben Woo	28cee291c6	Merge pull request #2581 from Multiverse/regen-keep-gamerules Add ability to keep gamerules setting on world regen.	2021-04-28 10:43:09 +08:00
Ben Woo	155f32c00f	Add ability to keep gamerules on world regen.	2021-04-27 23:44:24 +08:00
Ben Woo	071ba05d81	Merge pull request #2585 from Multiverse/Revamp-queue-command- Implement new queue command system.	2021-04-27 23:10:59 +08:00
Ben Woo	2ee5aea06b	Merge pull request #2580 from Multiverse/per-search-and-reflect Improve portal search radius	2021-04-27 10:57:46 +08:00
Ben Woo	3bb8de6d33	Improve portal search radius. * Fix portal search radius not respected after travel agent removed. * Set portal search radius for entity entering portals.	2021-04-26 22:52:24 +08:00
Ben Woo	79ac01da34	Merge pull request #2619 from Multiverse/general_cleanup General Cleanup	2021-04-25 11:55:56 +08:00
Kermina Awad	6e4fbb0ece	correct a copy-paste error introduced in #2588	2021-04-24 14:51:24 -04:00
Kermina Awad	167ed5e0d3	update VaultAPI repo	2021-04-24 14:49:28 -04:00
Kermina Awad	91f3304f78	add to Buscript failed to load message	2021-04-24 14:13:40 -04:00
Kermina Awad	7928e73a32	enable minimizeJar for maven-shade-plugin	2021-04-24 14:08:25 -04:00
Kermina Awad	d61d186544	update bStats Metrics class	2021-04-24 14:08:09 -04:00
nicegamer7	dc356e88d0	Merge pull request #2582 from Multiverse/unload-message Update unload message logging.	2021-04-24 13:49:12 -04:00
Kermina Awad	d0d5574580	update unload message logging another time	2021-04-24 13:48:09 -04:00
Ben Woo	29617059b3	Merge pull request #2611 from Turbotailz/patch-1 Make prefixchat config option default to 'false'	2021-04-06 13:10:02 +08:00
Sam Goodger	bf05fc81dd	Make prefixchat config option default to 'false' This may seem like a really negligible change but having this option default to `true` actually causes a lot of pain for support in other plugins that deal with prefixes (LuckPerms and Essentials being the main victims). Users always come in guns blazing, screaming at us because they don't know how to remove the world name from their chat. It's such a simple solution, yet no one thinks that of all plugins, it would be Multiverse that is tainting their beloved chat format. Please consider updating this default setting. It will save a lot of us trouble in the future 🙏	2021-04-06 14:19:38 +10:00
nicegamer7	a2c5bf70f0	Merge pull request #2597 from Multiverse/cleanup Cleanup	2021-03-18 10:52:28 -04:00
benwoo1110	ea19006465	Fix selector log level.	2021-03-18 16:40:47 +08:00
benwoo1110	89f685ff9a	Add missing javadocs in DestinationFactory.	2021-03-10 17:45:39 +08:00
benwoo1110	ecc76033dc	Remove redundant line that was moved to WorldNameChecker.	2021-03-10 17:41:56 +08:00
Ben Woo	e843b0711d	Merge pull request #2590 from Multiverse/small-wm-updates Small WorldManager updates	2021-03-10 06:41:18 +08:00
Ben Woo	eddfaf7df0	Merge pull request #2593 from Multiverse/destination-id Add method to get registered destination identifiers.	2021-03-10 06:39:31 +08:00
nicegamer7	d1150ab5f8	Merge pull request #2591 from Multiverse/uuid-regex Make UUID regex less restrictive.	2021-03-09 09:46:33 -05:00
benwoo1110	cc3996ca76	Implement new queue command system.	2021-03-09 20:54:42 +08:00
benwoo1110	1965aecfba	Add method to get registered destination identifiers.	2021-03-09 20:05:23 +08:00
benwoo1110	ce34ae44d8	Make UUID regex less restrictive.	2021-03-09 11:48:26 +08:00
benwoo1110	f5a2d7bc47	Add getPotentialWorlds method to WorldManager.	2021-03-09 10:40:46 +08:00
benwoo1110	24295025ef	Add option to lookup mvworlds without checking for aliases.	2021-03-09 10:35:42 +08:00
Ben Woo	e3f56f6498	Merge pull request #2586 from Multiverse/reflect-helper Add ReflectHelper class to better facilitate various reflection actions.	2021-03-09 01:18:29 +08:00
Ben Woo	bd0c3cff3f	Merge pull request #2587 from Multiverse/player-desination Player destination	2021-03-09 00:32:20 +08:00
Ben Woo	7c4ab035a0	Merge pull request #2588 from Multiverse/world-name-check Implement new WorldNameChecker	2021-03-09 00:31:58 +08:00
Ben Woo	2593080f77	Merge pull request #2567 from Multiverse/player-utils Add support to find players based on name, UUID or selectors.	2021-03-09 00:29:22 +08:00
benwoo1110	0d4595d511	Implement new WorldNameChecker for better preliminary checks of world name.	2021-03-08 18:03:35 +08:00
benwoo1110	bf820c2c27	Add getPlayerAwareDestination to DestinationFactory.	2021-03-08 17:09:03 +08:00
benwoo1110	a12718d354	Add ReflectHelper class to better facilitate various reflection actions.	2021-03-08 16:25:33 +08:00
benwoo1110	b23c1ae606	Update unload message logging.	2021-03-04 16:00:53 +08:00
benwoo1110	62b789dff5	Add support to find players based on name, UUID or selectors.	2021-02-21 16:47:13 +08:00
benwoo1110	9741b1794c	Update readme with more project details	2020-12-31 00:42:22 +08:00
benwoo1110	5d3d732c25	Fix issue where special chars cause PatternSyntaxException Escape regex special chars for help command	2020-10-09 12:19:32 +08:00
Jonathan Leitschuh	59b6522d59	Use HTTPS instead of HTTP to resolve dependencies This fixes a security vulnerability in this project where the `pom.xml` files were configuring Maven to resolve dependencies over HTTP instead of HTTPS. Signed-off-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>	2020-02-11 09:04:52 -05:00