Merge branch 'MV5' into spawnlocation_changes

commit 1211dfb057
Author: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date:   Tue Aug 17 16:29:31 2021 +0800

    Implement suggested improvements.

    * Use singleton pattern for DefaultContentFilter with getInstance method.
    * Have a default SendHandler.
    * Don't need streams for small dataset.
    * Private WorldListContentParser class to improve readability.

commit 562eed8255
Author: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date:   Tue Aug 17 00:26:57 2021 +0800

    Revamp content display API.

pom.xml

@@ -330,6 +330,12 @@
             <artifactId>CommandHandler</artifactId>
             <version>11</version>
         </dependency>
+        <!-- End of CommandHandler Dependency -->
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+            <version>2.4.1</version>
+        </dependency>
         <dependency>
             <groupId>com.dumptruckman.minecraft</groupId>
             <artifactId>buscript</artifactId>

src/main/java/com/onarandombox/MultiverseCore/MVWorld.java

@@ -28,7 +28,6 @@ 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;
@@ -346,7 +345,7 @@ public class MVWorld implements MultiverseWorld {
     @SerializableAs("MVNullLocation (It's a bug if you see this in your config file)")
     public static final class NullLocation extends SpawnLocation {
         public NullLocation() {
-            super(0, -1, 0);
+            super(null, 0, -1, 0);
         }
 
         @Override

src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java

@@ -7,21 +7,6 @@
 
 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;
@@ -79,11 +64,8 @@ import com.onarandombox.MultiverseCore.destination.PlayerDestination;
 import com.onarandombox.MultiverseCore.destination.WorldDestination;
 import com.onarandombox.MultiverseCore.event.MVDebugModeEvent;
 import com.onarandombox.MultiverseCore.event.MVVersionEvent;
-import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener;
 import com.onarandombox.MultiverseCore.listeners.MVChatListener;
 import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
-import com.onarandombox.MultiverseCore.listeners.MVMapListener;
-import com.onarandombox.MultiverseCore.listeners.MVPlayerChatListener;
 import com.onarandombox.MultiverseCore.listeners.MVPlayerListener;
 import com.onarandombox.MultiverseCore.listeners.MVPortalListener;
 import com.onarandombox.MultiverseCore.listeners.MVWeatherListener;
@@ -123,6 +105,20 @@ 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.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;
+
 /**
  * The implementation of the Multiverse-{@link Core}.
  */
@@ -324,17 +320,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
             // A test that had no worlds loaded was being run. This should never happen in production
         }
         this.saveMVConfig();
-        // Register async or sync player chat according to config
-        try {
-            Class.forName("org.bukkit.event.player.AsyncPlayerChatEvent");
-        } catch (ClassNotFoundException e) {
-            getMVConfig().setUseAsyncChat(false);
-        }
-        if (getMVConfig().getUseAsyncChat()) {
-            this.chatListener = new MVAsyncPlayerChatListener(this, this.playerListener);
-        } else {
-            this.chatListener = new MVPlayerChatListener(this, this.playerListener);
-        }
+
+        this.chatListener = new MVChatListener(this, this.playerListener);
         getServer().getPluginManager().registerEvents(this.chatListener, this);
 
         this.initializeBuscript();
@@ -395,7 +382,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         pm.registerEvents(this.weatherListener, this);
         pm.registerEvents(this.portalListener, this);
         pm.registerEvents(this.worldListener, this);
-        pm.registerEvents(new MVMapListener(this), this);
     }
 
     /**
@@ -850,47 +836,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @deprecated This is now deprecated, nobody needs it any longer.
-     * All logging is now done with {@link Logging}.
-     */
-    @Override
-    @Deprecated
-    public void log(Level level, String msg) {
-        Logging.log(level, msg);
-    }
-
-    /**
-     * Logs a message at the specified level.
-     *
-     * @param level The Log-{@link Level}.
-     * @param msg The message to log.
-     *
-     * @deprecated Replaced by {@link Logging}.  Please refrain from using this from a third party plugin as the
-     * messages will appear to originate from Multiverse-Core.
-     */
-    @Deprecated
-    public static void staticLog(Level level, String msg) {
-        Logging.log(level, msg);
-    }
-
-    /**
-     * Print messages to the Debug Log, if the servers in Debug Mode then we also want to print the messages to the
-     * standard Server Console.
-     *
-     * @param level The Log-{@link Level}
-     * @param msg The message
-     *
-     * @deprecated Replaced by {@link Logging}.  Please refrain from using this from a third party plugin as the
-     * messages will appear to originate from Multiverse-Core.
-     */
-    @Deprecated
-    public static void staticDebugLog(Level level, String msg) {
-        Logging.log(level, msg);
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -941,16 +886,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         return commandQueueManager;
     }
 
-    /**
-     * Gets the log-tag.
-     *
-     * @return The log-tag
-     */
-    // TODO this should be static!
-    public String getTag() {
-        return MultiverseCore.LOG_TAG;
-    }
-
     /**
      * Shows a message that the given world is not a MultiverseWorld.
      *
@@ -1136,7 +1071,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
      * @return True if success, false if fail.
      */
     public Boolean cloneWorld(String oldName, String newName, String generator) {
-        return this.worldManager.cloneWorld(oldName, newName, generator);
+        return this.worldManager.cloneWorld(oldName, newName);
     }
 
     /**
@@ -1226,17 +1161,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         return config;
     }
 
-    /**
-     * This method is currently used by other plugins.
-     * It will be removed in 2.4
-     * @return The Multiverse config.
-     * @deprecated This is deprecated.
-     */
-    @Deprecated
-    public static MultiverseCoreConfiguration getStaticConfig() {
-        return MultiverseCoreConfiguration.getInstance();
-    }
-
     @Override
     public Buscript getScriptAPI() {
         return buscript;

src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java

@@ -48,8 +48,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     @Property
     private volatile String prefixchatformat;
     @Property
-    private volatile boolean useasyncchat;
-    @Property
     private volatile boolean teleportintercept;
     @Property
     private volatile boolean firstspawnoverride;
@@ -95,7 +93,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     protected void setDefaults() {
         // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
         enforceaccess = false;
-        useasyncchat = true;
         prefixchat = false;
         prefixchatformat = "[%world%]%chat%";
         teleportintercept = true;
@@ -322,16 +319,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
         this.teleportcooldown = teleportCooldown;
     }
 
-    @Override
-    public void setUseAsyncChat(boolean useAsyncChat) {
-        this.useasyncchat = useAsyncChat;
-    }
-
-    @Override
-    public boolean getUseAsyncChat() {
-        return this.useasyncchat;
-    }
-
     @Override
     public void setSilentStart(boolean silentStart) {
         Logging.setShowingConfig(!silentStart);

src/main/java/com/onarandombox/MultiverseCore/api/LoggablePlugin.java

@@ -1,36 +0,0 @@
-/******************************************************************************
- * 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;
-
-import com.dumptruckman.minecraft.util.Logging;
-import org.bukkit.Server;
-
-import java.util.logging.Level;
-
-/**
- * A simple API to require plugins to have a log method.
- *
- * @deprecated Replaced by {@link Logging}.
- * */
-@Deprecated
-public interface LoggablePlugin {
-    /**
-     * Logs a message at the specified level.
-     *
-     * @param level The Log-{@link Level}.
-     * @param msg   The message to log.
-     */
-    void log(Level level, String msg);
-
-    /**
-     * Gets the server instance that this plugin is attached to.
-     *
-     * @return A {@link Server} instance.
-     */
-    Server getServer();
-}

src/main/java/com/onarandombox/MultiverseCore/api/MVPlugin.java

@@ -13,7 +13,7 @@ import com.onarandombox.MultiverseCore.event.MVVersionEvent;
 /**
  * This interface is implemented by every official Multiverse-plugin.
  */
-public interface MVPlugin extends LoggablePlugin {
+public interface MVPlugin {
     /**
      * Adds This plugin's version information to the buffer and returns the new string.
      *

src/main/java/com/onarandombox/MultiverseCore/api/MVWorldManager.java

@@ -59,18 +59,6 @@ public interface MVWorldManager {
     boolean addWorld(String name, Environment env, String seedString, WorldType type, Boolean generateStructures,
                      String generator, boolean useSpawnAdjust);
 
-    /**
-     * Make a copy of a world.
-     *
-     * @param oldName            Name of world to be copied
-     * @param newName            Name of world to be created
-     * @param generator          The Custom generator plugin to use. Ignored.
-     * @return True if the world is copied successfully, false if not.
-     * @deprecated Use {@link #cloneWorld(String, String)} instead.
-     */
-    @Deprecated
-    boolean cloneWorld(String oldName, String newName, String generator);
-
     /**
      * Make a copy of a world.
      *
@@ -234,19 +222,9 @@ public interface MVWorldManager {
      */
     void loadDefaultWorlds();
 
-    /**
-     * Return the World Purger.
-     *
-     * @return A valid {@link PurgeWorlds}.
-     * @deprecated {@link PurgeWorlds} is deprecated!
-     */
-    @Deprecated
-    PurgeWorlds getWorldPurger();
-
     /**
      * Gets the {@link WorldPurger}.
      * <p>
-     * TODO: Remove {@link #getWorldPurger()} and replace it with this method.
      * @return The {@link WorldPurger} this {@link MVWorldManager} is using.
      * @see WorldPurger
      * @see SimpleWorldPurger

src/main/java/com/onarandombox/MultiverseCore/api/MultiverseCoreConfig.java

@@ -158,18 +158,6 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
      */
     boolean getEnforceAccess();
 
-    /**
-     * Sets useasyncchat.
-     * @param useAsyncChat The new value.
-     */
-    void setUseAsyncChat(boolean useAsyncChat);
-
-    /**
-     * Gets useasyncchat.
-     * @return useasyncchat.
-     */
-    boolean getUseAsyncChat();
-
     /**
      * Sets whether to suppress startup messages.
      *

src/main/java/com/onarandombox/MultiverseCore/api/MultiversePlugin.java

@@ -115,33 +115,6 @@ public abstract class MultiversePlugin extends JavaPlugin implements MVPlugin {
         return this.getCore().getCommandHandler().locateAndRunCommand(sender, allArgs);
     }
 
-    @Override
-    public void log(Level level, String msg) {
-        int debugLevel = this.getCore().getMVConfig().getGlobalDebug();
-        if ((level == Level.FINE && debugLevel >= 1) || (level == Level.FINER && debugLevel >= 2)
-                || (level == Level.FINEST && debugLevel >= 3)) {
-            debugLog.log(level, msg);
-        } else if (level != Level.FINE && level != Level.FINER && level != Level.FINEST) {
-            String message = new StringBuilder(getLogTag()).append(msg).toString();
-            this.getServer().getLogger().log(level, message);
-            debugLog.log(level, message);
-        }
-    }
-
-    private String getLogTag() {
-        if (logTag == null)
-            logTag = String.format("[%s]", this.getDescription().getName());
-        return logTag;
-    }
-
-    /**
-     * Sets the debug log-tag.
-     * @param tag The new tag.
-     */
-    protected final void setDebugLogTag(String tag) {
-        this.debugLog.setTag(tag);
-    }
-
     @Override
     public final String dumpVersionInfo(String buffer) {
         throw new UnsupportedOperationException("This is gone.");

src/main/java/com/onarandombox/MultiverseCore/commandsold/GamerulesCommand.java

@@ -8,9 +8,12 @@
 package com.onarandombox.MultiverseCore.commandsold;
 
 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 com.onarandombox.MultiverseCore.display.filters.ContentFilter;
+import com.onarandombox.MultiverseCore.display.filters.DefaultContentFilter;
+import com.onarandombox.MultiverseCore.display.filters.RegexContentFilter;
+import com.onarandombox.MultiverseCore.display.handlers.InlineSendHandler;
+import com.onarandombox.MultiverseCore.display.parsers.MapContentParser;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.GameRule;
@@ -31,8 +34,8 @@ 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.setCommandUsage("/mv gamerules" + ChatColor.GOLD + " [WORLD] [FILTER]");
+        this.setArgRange(0, 2);
         this.addKey("mv gamerules");
         this.addKey("mv rules");
         this.addKey("mvgamerules");
@@ -42,11 +45,13 @@ public class GamerulesCommand extends MultiverseCommand {
         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;
+        Player p;
+        World world;
+        ContentFilter filter = DefaultContentFilter.getInstance();
+
         if (sender instanceof Player) {
             p = (Player) sender;
         } else {
@@ -61,9 +66,20 @@ public class GamerulesCommand extends MultiverseCommand {
             return;
         }
 
-        final World world;
+        // Not the best way, need to fix with ACF soon...
         if (args.size() == 0) {
             world = p.getWorld();
+        } else if (args.size() == 1) {
+            world = Bukkit.getWorld(args.get(0));
+            if (world == null) {
+                if (p == null) {
+                    sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " World " + ChatColor.AQUA + args.get(0)
+                            + ChatColor.WHITE + " does not exist.");
+                    return;
+                }
+                world = p.getWorld();
+                filter = RegexContentFilter.fromString(args.get(0));
+            }
         } else {
             world = Bukkit.getWorld(args.get(0));
             if (world == null) {
@@ -71,23 +87,23 @@ public class GamerulesCommand extends MultiverseCommand {
                         + ChatColor.WHITE + " does not exist.");
                 return;
             }
+            filter = RegexContentFilter.fromString(args.get(1));
         }
 
-        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);
+        ContentDisplay.create()
+                .addContentParser(MapContentParser.forContent(getGameRuleMap(world))
+                        .withKeyColor(ChatColor.GREEN)
+                        .withValueColor(ChatColor.YELLOW))
+                .withSendHandler(InlineSendHandler.create()
+                        .withHeader("====[ Gamerules for %s%s%s ]====", ChatColor.AQUA, world.getName(), ChatColor.WHITE)
+                        .withFilter(filter))
+                .send(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;

src/main/java/com/onarandombox/MultiverseCore/commandsold/ListCommand.java

@@ -9,11 +9,12 @@ package com.onarandombox.MultiverseCore.commandsold;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-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 com.onarandombox.MultiverseCore.display.filters.ContentFilter;
+import com.onarandombox.MultiverseCore.display.filters.DefaultContentFilter;
+import com.onarandombox.MultiverseCore.display.filters.RegexContentFilter;
+import com.onarandombox.MultiverseCore.display.handlers.PagedSendHandler;
+import com.onarandombox.MultiverseCore.display.parsers.ContentParser;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
@@ -21,9 +22,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * Displays a listing of all worlds that a player can enter.
@@ -43,7 +42,7 @@ public class ListCommand extends MultiverseCommand {
 
     @Override
     public void runCommand(CommandSender sender, List<String> args) {
-        ContentFilter filter = ContentFilter.DEFAULT;
+        ContentFilter filter = DefaultContentFilter.getInstance();
         int page = 1;
 
         // Either page or filter.
@@ -51,13 +50,13 @@ public class ListCommand extends MultiverseCommand {
             try {
                 page = Integer.parseInt(args.get(0));
             } catch (NumberFormatException ignore) {
-                filter = new ContentFilter(args.get(0));
+                filter = RegexContentFilter.fromString(args.get(0));
             }
         }
 
         // Filter then page.
         if (args.size() == 2) {
-            filter = new ContentFilter(args.get(0));
+            filter = RegexContentFilter.fromString(args.get(0));
             try {
                 page = Integer.parseInt(args.get(1));
             } catch (NumberFormatException ignore) {
@@ -65,55 +64,57 @@ public class ListCommand extends MultiverseCommand {
             }
         }
 
-        ContentDisplay.forContent(getListContents(sender))
-                .header("%s====[ Multiverse World List ]====", ChatColor.GOLD)
-                .displayHandler(DisplayHandlers.PAGE_LIST)
-                .colorTool(ColorAlternator.with(ChatColor.AQUA, ChatColor.GOLD))
-                .filter(filter)
-                .setting(PagedDisplaySettings.SHOW_PAGE, page)
-                .show(sender);
+        ContentDisplay.create()
+                .addContentParser(new WorldListContentParser())
+                .withSendHandler(PagedSendHandler.create()
+                        .withHeader("%s====[ Multiverse World List ]====", ChatColor.GOLD)
+                        .withFilter(filter)
+                        .withTargetPage(page))
+                .send(sender);
     }
 
-    private Collection<String> getListContents(@NotNull CommandSender sender) {
-        Player player = (sender instanceof Player) ? (Player) sender : null;
+    private class WorldListContentParser implements ContentParser {
 
-        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()))
-                .collect(Collectors.toList());
+        @Override
+        public void parse(@NotNull CommandSender sender, @NotNull List<String> content) {
+            Player player = (sender instanceof Player) ? (Player) sender : null;
 
-        this.plugin.getMVWorldManager().getUnloadedWorlds().stream()
-                .filter(world -> plugin.getMVPerms().hasPermission(sender, "multiverse.access." + world, true))
-                .map(world -> ChatColor.GRAY + world + " - UNLOADED")
-                .forEach(worldList::add);
-        
-        return worldList;
-    }
+            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()))
+                    .forEach(content::add);
 
-    private boolean canSeeWorld(Player player, MultiverseWorld world) {
-        return !world.isHidden()
-                || player == null
-                || this.plugin.getMVPerms().hasPermission(player, "multiverse.core.modify", true);
-    }
-
-    private String hiddenText(MultiverseWorld world) {
-        return (world.isHidden()) ? String.format("%s[H] ", ChatColor.GRAY) : "";
-    }
-
-    private String parseColouredEnvironment(World.Environment env) {
-        ChatColor color = ChatColor.GOLD;
-        switch (env) {
-            case NETHER:
-                color = ChatColor.RED;
-                break;
-            case NORMAL:
-                color = ChatColor.GREEN;
-                break;
-            case THE_END:
-                color = ChatColor.AQUA;
-                break;
+            plugin.getMVWorldManager().getUnloadedWorlds().stream()
+                    .filter(world -> plugin.getMVPerms().hasPermission(sender, "multiverse.access." + world, true))
+                    .map(world -> ChatColor.GRAY + world + " - UNLOADED")
+                    .forEach(content::add);
+        }
+
+        private boolean canSeeWorld(Player player, MultiverseWorld world) {
+            return !world.isHidden()
+                    || player == null
+                    || plugin.getMVPerms().hasPermission(player, "multiverse.core.modify", true);
+        }
+
+        private String hiddenText(MultiverseWorld world) {
+            return (world.isHidden()) ? String.format("%s[H] ", ChatColor.GRAY) : "";
+        }
+
+        private String parseColouredEnvironment(World.Environment env) {
+            ChatColor color = ChatColor.GOLD;
+            switch (env) {
+                case NETHER:
+                    color = ChatColor.RED;
+                    break;
+                case NORMAL:
+                    color = ChatColor.GREEN;
+                    break;
+                case THE_END:
+                    color = ChatColor.AQUA;
+                    break;
+            }
+            return color + env.toString();
         }
-        return color + env.toString();
     }
 }

src/main/java/com/onarandombox/MultiverseCore/commandsold/VersionCommand.java

@@ -7,6 +7,10 @@
 
 package com.onarandombox.MultiverseCore.commandsold;
 
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.event.MVVersionEvent;
@@ -26,10 +30,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Dumps version info to the console.
  */
@@ -63,7 +63,6 @@ public class VersionCommand extends MultiverseCommand {
                 + "[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'

src/main/java/com/onarandombox/MultiverseCore/configuration/SpawnLocation.java

@@ -1,14 +1,10 @@
 package com.onarandombox.MultiverseCore.configuration;
 
-import java.lang.ref.Reference;
-import java.lang.ref.WeakReference;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.World;
-import org.bukkit.block.Block;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
 import org.bukkit.configuration.serialization.SerializableAs;
 
@@ -18,54 +14,16 @@ import org.bukkit.configuration.serialization.SerializableAs;
  */
 @SerializableAs("MVSpawnLocation")
 public class SpawnLocation extends Location implements ConfigurationSerializable {
-    private Reference<World> worldRef;
-
-    public SpawnLocation(double x, double y, double z) {
-        super(null, x, y, z);
+    public SpawnLocation(World world, double x, double y, double z) {
+        super(world, x, y, z);
     }
 
-    public SpawnLocation(double x, double y, double z, float yaw, float pitch) {
-        super(null, x, y, z, yaw, pitch);
+    public SpawnLocation(World world, double x, double y, double z, float yaw, float pitch) {
+        super(world, x, y, z, yaw, pitch);
     }
 
     public SpawnLocation(Location loc) {
-        this(loc.getX(), loc.getY(), loc.getZ(), loc.getYaw(), loc.getPitch());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public World getWorld() {
-        return (this.worldRef != null) ? this.worldRef.get() : null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setWorld(World world) {
-        this.worldRef = new WeakReference<World>(world);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Chunk getChunk() {
-        if ((this.worldRef != null) && (this.worldRef.get() != null))
-            return this.worldRef.get().getChunkAt(this);
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Block getBlock() {
-        if ((this.worldRef != null) && (this.worldRef.get() != null))
-            return this.worldRef.get().getBlockAt(this);
-        return null;
+        super(loc.getWorld(), loc.getX(), loc.getY(), loc.getZ(), loc.getYaw(), loc.getPitch());
     }
 
     /**
@@ -93,6 +51,6 @@ public class SpawnLocation extends Location implements ConfigurationSerializable
         double z = ((Number) args.get("z")).doubleValue();
         float pitch = ((Number) args.get("pitch")).floatValue();
         float yaw = ((Number) args.get("yaw")).floatValue();
-        return new SpawnLocation(x, y, z, yaw, pitch);
+        return new SpawnLocation(null, x, y, z, yaw, pitch);
     }
 }

src/main/java/com/onarandombox/MultiverseCore/display/ColorAlternator.java

@@ -1,62 +0,0 @@
-package com.onarandombox.MultiverseCore.display;
-
-import org.bukkit.ChatColor;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Helper class to switch between 2 {@link ChatColor}.
- */
-public class ColorAlternator implements ColorTool {
-
-    /**
-     * Creates a new {@link ColorAlternator} with 2 {@link ChatColor}s.
-     *
-     * @param colorThis The first color.
-     * @param colorThat The second color.
-     * @return The {@link ColorAlternator} created for you.
-     */
-    public static ColorAlternator with(@NotNull ChatColor colorThis,
-                                       @NotNull ChatColor colorThat) {
-
-        return new ColorAlternator(colorThis, colorThat);
-    }
-
-    private boolean switcher;
-    private final ChatColor thisColor;
-    private final ChatColor thatColor;
-
-    /**
-     * @param colorThis The first color.
-     * @param colorThat The second color.
-     */
-    public ColorAlternator(@NotNull ChatColor colorThis,
-                           @NotNull ChatColor colorThat) {
-
-        this.thisColor = colorThis;
-        this.thatColor = colorThat;
-    }
-
-    /**
-     * Gets the color. Everytime this method is called, it swaps the color that it returns.
-     *
-     * @return The color.
-     */
-    @Override
-    public ChatColor get() {
-        return (this.switcher ^= true) ? this.thisColor : this.thatColor;
-    }
-
-    /**
-     * @return The first color.
-     */
-    public ChatColor getThisColor() {
-        return thisColor;
-    }
-
-    /**
-     * @return The second color.
-     */
-    public ChatColor getThatColor() {
-        return thatColor;
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/display/ColorTool.java

@@ -1,22 +0,0 @@
-package com.onarandombox.MultiverseCore.display;
-
-import org.bukkit.ChatColor;
-
-/**
- * Tools to allow customisation.
- */
-@FunctionalInterface
-public interface ColorTool {
-
-    /**
-     * Gets a chat color.
-     *
-     * @return The color.
-     */
-    ChatColor get();
-
-    /**
-     * Default implementation of this interface. Returns a default white color.
-     */
-    ColorTool DEFAULT = () -> ChatColor.WHITE;
-}

src/main/java/com/onarandombox/MultiverseCore/display/ContentDisplay.java

@@ -1,268 +1,69 @@
 package com.onarandombox.MultiverseCore.display;
 
-import com.onarandombox.MultiverseCore.display.settings.DisplaySetting;
-import org.bukkit.ChatColor;
+import com.onarandombox.MultiverseCore.display.handlers.DefaultSendHandler;
+import com.onarandombox.MultiverseCore.display.handlers.SendHandler;
+import com.onarandombox.MultiverseCore.display.parsers.ContentParser;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
-import java.util.WeakHashMap;
 
 /**
  * Helps to display contents such as list and maps in a nicely formatted fashion.
- *
- * @param <T>   Type of content to display.
  */
-public class ContentDisplay<T> {
-
-    public static final String LINE_BREAK = "%br%";
+public class ContentDisplay {
 
     /**
-     * Creates a ContentDisplay.Builder for the given content.
+     * Makes a new {@link ContentDisplay} instance to use.
      *
-     * @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 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(T contents) {
-        this.contents = contents;
-    }
-
-    /**
-     * Do the actual displaying of contents to the sender.
-     *
-     * @param sender The CommandSender to show the display to.
-     */
-    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);
-    }
-
-    /**
-     * @return Gets the header to display.
-     */
-    public String getHeader() {
-        return header;
-    }
-
-    /**
-     * Sets the header text.
-     */
-    public void setHeader(@NotNull String header) {
-        this.header = header;
-    }
-
-    /**
-     * @return Gets the contents to display.
-     */
-    public T getContents() {
-        return contents;
-    }
-
-    /**
-     * @return Gets the message to display when no content is shown.
+     * @return  New {@link ContentDisplay} instance.
      */
     @NotNull
-    public String getEmptyMessage() {
-        return emptyMessage;
+    public static ContentDisplay create() {
+        return new ContentDisplay();
+    }
+
+    private final List<ContentParser> contentParsers = new ArrayList<>();
+    private SendHandler sendHandler = DefaultSendHandler.getInstance();
+
+    public ContentDisplay() {
     }
 
     /**
-     * @return Gets the display handler that formats and sends content to sender.
+     * Adds content to be displayed.
+     *
+     * @param parser    The content parser to add.
+     * @return Same {@link ContentDisplay} for method chaining.
      */
     @NotNull
-    public DisplayHandler<T> getDisplayHandler() {
-        return displayHandler;
+    public ContentDisplay addContentParser(@NotNull ContentParser parser) {
+        contentParsers.add(parser);
+        return this;
     }
 
     /**
-     * @return Gets the color tool used.
+     * Sets the handler for displaying the message to command sender.
+     *
+     * @param handler   The send handler to use.
+     * @return Same {@link ContentDisplay} for method chaining.
      */
     @NotNull
-    public ColorTool getColorTool() {
-        return colorTool;
+    public ContentDisplay withSendHandler(@NotNull SendHandler handler) {
+        sendHandler = handler;
+        return this;
     }
 
     /**
-     * @return Gets the filter used.
-     */
-    @NotNull
-    public ContentFilter getFilter() {
-        return filter;
-    }
-
-    /**
-     * Gets the value for a given setting option.
+     * Format and display the message to command sender.
      *
-     * @param setting   The setting option.
-     * @param <S>       The setting type.
-     * @return Value set for the given setting.
+     * @param sender    The target command sender to show the display to.
      */
-    public <S> S getSetting(@NotNull DisplaySetting<S> setting) {
-        return (S) settingsMap.getOrDefault(setting, setting.defaultValue());
-    }
-
-    /**
-     * Sets other specific settings that may be used by the {@link DisplayHandler}.
-     *
-     * @param setting   The settings option.
-     * @param value     The value to set.
-     * @param <S>       The type of setting.
-     */
-    public <S> void setSetting(@NotNull DisplaySetting<S> setting, S value) {
-        this.settingsMap.put(setting, value);
-    }
-
-    /**
-     * Builds a {@link ContentDisplay}.
-     *
-     * @param <T>   Type of content to display.
-     */
-    public static class Builder<T> {
-
-        private final ContentDisplay<T> display;
-
-        private Builder(T content) {
-            this.display = new ContentDisplay<>(content);
-        }
-
-        /**
-         * Sets header to be displayed.
-         *
-         * @param header        The header text.
-         * @param replacements  String formatting replacements.
-         * @return The builder.
-         */
-        @NotNull
-        public Builder<T> header(@NotNull String header, Object...replacements) {
-            this.display.header = String.format(header, replacements);
-            return this;
-        }
-
-        /**
-         * Sets the message to show when no content is available for display.
-         *
-         * @param emptyMessage  The message text.
-         * @param replacements  String formatting replacements.
-         * @return The builder.
-         */
-        @NotNull
-        public Builder<T> emptyMessage(@NotNull String emptyMessage, Object...replacements) {
-            this.display.emptyMessage = String.format(emptyMessage, replacements);
-            return this;
-        }
-
-        /**
-         * Sets the display handler that does the formatting and sending of content. <b>Required.</b>
-         *
-         * @param displayHandler    The display handler for the given content type.
-         * @return The builder.
-         */
-        @NotNull
-        public Builder<T> displayHandler(@NotNull DisplayHandler<T> displayHandler) {
-            this.display.displayHandler = displayHandler;
-            return this;
-        }
-
-        /**
-         * Sets the color tool used to make messages more colourful.
-         *
-         * @param colorTool The color tool to use.
-         * @return The builder.
-         */
-        @NotNull
-        public Builder<T> colorTool(@NotNull ColorTool colorTool) {
-            this.display.colorTool = colorTool;
-            return this;
-        }
-
-        /**
-         * Sets content filter used to match specific content to be displayed.
-         *
-         * @param filter    The filter to use.
-         * @return The builder.
-         */
-        @NotNull
-        public Builder<T> filter(@NotNull ContentFilter filter) {
-            this.display.filter = filter;
-            return this;
-        }
-
-        /**
-         * Sets other specific settings that may be used by the {@link DisplayHandler}.
-         *
-         * @param setting   The settings option.
-         * @param value     The value to set.
-         * @param <S>       The type of setting.
-         * @return The builder.
-         */
-        @NotNull
-        public <S> Builder<T> setting(@NotNull DisplaySetting<S> setting, S value) {
-            this.display.settingsMap.put(setting, value);
-            return this;
-        }
-
-        /**
-         * Validates and build the content display.
-         *
-         * @return The content display.
-         */
-        @NotNull
-        public ContentDisplay<T> build() {
-            Objects.requireNonNull(this.display.displayHandler);
-            return this.display;
-        }
-
-        /**
-         * Build and show the content to the sender.
-         *
-         * @param sender The CommandSender to show the display to.
-         */
-        public void show(CommandSender sender) {
-            this.build().show(sender);
-        }
+    public void send(@NotNull CommandSender sender) {
+        Objects.requireNonNull(sendHandler, "No send handler set for content display");
+        List<String> parsedContent = new ArrayList<>();
+        contentParsers.forEach(parser -> parser.parse(sender, parsedContent));
+        sendHandler.send(sender, parsedContent);
     }
 }

src/main/java/com/onarandombox/MultiverseCore/display/ContentFilter.java

@@ -1,153 +0,0 @@
-package com.onarandombox.MultiverseCore.display;
-
-import com.dumptruckman.minecraft.util.Logging;
-import org.bukkit.ChatColor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-/**
- * <p>Filter content and text based on regex matching.</p>
- *
- * <p>Compile regex pattern based on {@link ContentFilter#filterString}. When prefixed with 'r=',
- * use {@link ContentFilter#filterString} as the full regex pattern. Else, set to any match that
- * contains the {@link ContentFilter#filterString}.<p>
- */
-public class ContentFilter {
-
-    public static final ContentFilter DEFAULT = new ContentFilter();
-    private static final Pattern REGEX_SPECIAL_CHARS = Pattern.compile("[.+*?\\[^\\]$(){}=!<>|:-\\\\]");
-
-    private String filterString;
-    private Pattern filterPattern;
-    private boolean exactMatch;
-
-    private ContentFilter() {
-    }
-
-    /**
-     * @param filterString  The text to do matching, either plaintext or regex.
-     */
-    public ContentFilter(@NotNull String filterString) {
-        this(filterString, false);
-    }
-
-    /**
-     * @param filterString  The text to do matching, else plaintext or regex.
-     * @param exactMatch    Should check for exact match when doing regex matching.
-     */
-    public ContentFilter(@NotNull String filterString,
-                         boolean exactMatch) {
-
-        this.filterString = filterString;
-        this.exactMatch = exactMatch;
-        parseFilter();
-    }
-
-    private void parseFilter() {
-        if (filterString == null) {
-            return;
-        }
-        if (filterString.startsWith("r=")) {
-            convertToMatcher(filterString.substring(2));
-            return;
-        }
-        String cleanedFilter = REGEX_SPECIAL_CHARS.matcher(filterString.toLowerCase()).replaceAll("\\\\$0");
-        convertToMatcher("(?i).*" + cleanedFilter + ".*");
-    }
-
-    /**
-     * Compile and store the regex into a {@link Pattern}.
-     *
-     * @param regex The regex text.
-     */
-    private void convertToMatcher(@NotNull String regex) {
-        try {
-            this.filterPattern = Pattern.compile(regex);
-            Logging.finest("Parsed regex pattern: %s", this.filterPattern.toString());
-        }
-        catch (PatternSyntaxException ignored) {
-            Logging.warning("Error parsing regex: %s", filterString);
-        }
-    }
-
-    /**
-     * Do regex matching.
-     *
-     * @param text String to check regex on.
-     * @return True of matches regex pattern, false otherwise.
-     */
-    public boolean checkMatch(@Nullable Object text) {
-        if (!hasFilter()) {
-            return true;
-        }
-        if (text == null || !hasValidPattern()) {
-            return false;
-        }
-        text = ChatColor.stripColor(String.valueOf(text));
-        return (exactMatch)
-                ? filterPattern.matcher((CharSequence) text).matches()
-                : filterPattern.matcher((CharSequence) text).find();
-    }
-
-    /**
-     * Checks if a filter string is present.
-     *
-     * @return True if there is a filter string, else false.
-     */
-    public boolean hasFilter() {
-        return filterString != null;
-    }
-
-    /**
-     * Checks if regex pattern syntax is valid.
-     *
-     * @return True if valid, else false.
-     */
-    public boolean hasValidPattern() {
-        return filterPattern != null;
-    }
-
-    /**
-     * @return The filter string.
-     */
-    @Nullable
-    public String getString() {
-        return filterString;
-    }
-
-    /**
-     * @return The regex pattern.
-     */
-    @Nullable
-    public Pattern getPattern() {
-        return filterPattern;
-    }
-
-    /**
-     * @return True if filter is set to do exact matching, else false.
-     */
-    public boolean isExactMatch() {
-        return exactMatch;
-    }
-
-    /**
-     * Nicely format the filter string to be used for showing the sender.
-     *
-     * @return The formatted filter string.
-     */
-    public @NotNull String getFormattedString() {
-        return String.format("%sFilter: '%s'", ChatColor.ITALIC, filterString);
-    }
-
-    @Override
-    public String toString() {
-        return "ContentFilter{" +
-                "filterString='" + filterString + '\'' +
-                ", filterPattern=" + filterPattern +
-                ", exactMatch=" + exactMatch +
-                '}';
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/display/DisplayFormatException.java

@@ -1,25 +0,0 @@
-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);
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/display/DisplayHandler.java

@@ -1,68 +0,0 @@
-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]));
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/display/DisplayHandlers.java

@@ -1,47 +0,0 @@
-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();
-}

src/main/java/com/onarandombox/MultiverseCore/display/filters/ContentFilter.java

@@ -0,0 +1,21 @@
+package com.onarandombox.MultiverseCore.display.filters;
+
+/**
+ * Filter display content for it show only certain string.
+ */
+public interface ContentFilter {
+    /**
+     * Checks if a particular string should be displayed.
+     *
+     * @param value String to check on.
+     * @return True if should be display, false otherwise.
+     */
+    boolean checkMatch(String value);
+
+    /**
+     * Gets whether content needs to be filtered by this filter.
+     *
+     * @return True if content should be filtered, false otherwise.
+     */
+    boolean needToFilter();
+}

src/main/java/com/onarandombox/MultiverseCore/display/filters/DefaultContentFilter.java

@@ -0,0 +1,35 @@
+package com.onarandombox.MultiverseCore.display.filters;
+
+/**
+ * Default implementation of {@link ContentFilter} that doesn't filter anything.
+ */
+public class DefaultContentFilter implements ContentFilter {
+
+    public static DefaultContentFilter instance;
+
+    public static DefaultContentFilter getInstance() {
+        if (instance == null) {
+            instance = new DefaultContentFilter();
+        }
+        return instance;
+    }
+
+    private DefaultContentFilter() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean checkMatch(String value) {
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean needToFilter() {
+        return false;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/display/filters/RegexContentFilter.java

@@ -0,0 +1,99 @@
+package com.onarandombox.MultiverseCore.display.filters;
+
+import com.dumptruckman.minecraft.util.Logging;
+import com.google.common.base.Strings;
+import org.bukkit.ChatColor;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+/**
+ * Filter content and text based on regex matching.
+ */
+public class RegexContentFilter implements ContentFilter {
+
+    private static final Pattern REGEX_SPECIAL_CHARS = Pattern.compile("[.+*?\\[^\\]$(){}=!<>|:-\\\\]");
+
+    /**
+     * Compile regex pattern to create a regex filter.
+     *
+     * When prefixed with 'r=', filter string is used as the full regex pattern.
+     * Else, set to regex that contains the filterString.
+     *
+     * @param filterString  The target string to create filter.
+     * @return A new instance of {@link RegexContentFilter} with filter applied.
+     */
+    @NotNull
+    public static RegexContentFilter fromString(@Nullable String filterString) {
+        if (filterString == null) {
+            return new RegexContentFilter(null);
+        }
+        if (filterString.startsWith("r=")) {
+            return new RegexContentFilter(filterString.substring(2));
+        }
+        String cleanedFilter = REGEX_SPECIAL_CHARS.matcher(filterString.toLowerCase()).replaceAll("\\\\$0");
+        return new RegexContentFilter("(?i).*" + cleanedFilter + ".*");
+    }
+
+    private final String regexString;
+    private Pattern regexPattern;
+
+    public RegexContentFilter(@Nullable String regexString) {
+        this.regexString = regexString;
+        convertToPattern();
+    }
+
+    /**
+     * Try to compile and store the regex into a {@link Pattern}.
+     */
+    private void convertToPattern() {
+        if (Strings.isNullOrEmpty(regexString)) {
+            return;
+        }
+        try {
+            regexPattern = Pattern.compile(regexString);
+        } catch (PatternSyntaxException ignored) {
+            regexPattern = null;
+            Logging.fine("Error parsing regex: %s", regexString);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean checkMatch(String value) {
+        if (!hasValidRegex()) {
+            return false;
+        }
+        String text = ChatColor.stripColor(String.valueOf(value));
+        return regexPattern.matcher(text).find();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean needToFilter() {
+        return hasValidRegex();
+    }
+
+    public boolean hasValidRegex() {
+        return regexPattern != null;
+    }
+
+    public String getRegexString() {
+        return regexString;
+    }
+
+    public Pattern getRegexPattern() {
+        return regexPattern;
+    }
+
+    @Override
+    public String toString() {
+        return regexString;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/display/handlers/BaseSendHandler.java

@@ -0,0 +1,99 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import com.google.common.base.Strings;
+import com.onarandombox.MultiverseCore.display.filters.ContentFilter;
+import com.onarandombox.MultiverseCore.display.filters.DefaultContentFilter;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Base implementation of {@link SendHandler} with some common parameters.
+ *
+ * @param <T>   The subclass that inherited this baseclass.
+ */
+public abstract class BaseSendHandler<T extends BaseSendHandler<?>> implements SendHandler {
+
+    protected String header = "";
+    protected ContentFilter filter = DefaultContentFilter.getInstance();
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void send(@NotNull CommandSender sender, @NotNull List<String> content) {
+        sendHeader(sender);
+        List<String> filteredContent = filterContent(content);
+        if (filteredContent.isEmpty()) {
+            sender.sendMessage(String.format("%sThere is no content to display.", ChatColor.RED));
+            return;
+        }
+        sendContent(sender, filteredContent);
+    }
+
+    /**
+     * Sends the header if header is present.
+     *
+     * @param sender    The target which the header will be displayed to.
+     */
+    protected void sendHeader(CommandSender sender) {
+        if (!Strings.isNullOrEmpty(header)) {
+            sender.sendMessage(header);
+        }
+    }
+
+    /**
+     * Filter to keep only contents that matches the filter.
+     *
+     * @param content   The content to filter on.
+     * @return The filtered list of content.
+     */
+    protected List<String> filterContent(@NotNull List<String> content) {
+        if (filter.needToFilter()) {
+            return content.stream().filter(filter::checkMatch).collect(Collectors.toList());
+        }
+        return content;
+    }
+
+    /**
+     * Display the contents.
+     *
+     * @param sender    The target which the content will be displayed to.
+     * @param content   The content to display.
+     */
+    protected abstract void sendContent(@NotNull CommandSender sender, @NotNull List<String> content);
+
+    /**
+     * Sets header to be displayed.
+     *
+     * @param header        The header text.
+     * @param replacements  String formatting replacements.
+     * @return Same {@link T} for method chaining.
+     */
+    public T withHeader(@NotNull String header, @NotNull Object...replacements) {
+        this.header = String.format(header, replacements);
+        return (T) this;
+    }
+
+    /**
+     * Sets content filter used to match specific content to be displayed.
+     *
+     * @param filter    The filter to use.
+     * @return Same {@link T} for method chaining.
+     */
+    public T withFilter(@NotNull ContentFilter filter) {
+        this.filter = filter;
+        return (T) this;
+    }
+
+    public String getHeader() {
+        return header;
+    }
+
+    public ContentFilter getFilter() {
+        return filter;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/display/handlers/DefaultSendHandler.java

@@ -0,0 +1,29 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class DefaultSendHandler implements SendHandler {
+
+    private static DefaultSendHandler instance;
+
+    public static DefaultSendHandler getInstance() {
+        if (instance == null) {
+            instance = new DefaultSendHandler();
+        }
+        return instance;
+    }
+
+    private DefaultSendHandler() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void send(@NotNull CommandSender sender, @NotNull List<String> content) {
+        sender.sendMessage(content.toArray(new String[0]));
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/display/handlers/InlineListDisplayHandler.java

@@ -1,36 +0,0 @@
-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());
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/display/handlers/InlineMapDisplayHandler.java

@@ -1,44 +0,0 @@
-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());
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/display/handlers/InlineSendHandler.java

@@ -0,0 +1,53 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Display the contents in a single line.
+ */
+public class InlineSendHandler extends BaseSendHandler<InlineSendHandler> {
+
+    /**
+     * Makes a new {@link InlineSendHandler} instance to use.
+     *
+     * @return  New {@link InlineSendHandler} instance.
+     */
+    public static InlineSendHandler create() {
+        return new InlineSendHandler();
+    }
+
+    private String delimiter = ChatColor.WHITE + ", ";
+
+    public InlineSendHandler() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void sendContent(@NotNull CommandSender sender, @NotNull List<String> content) {
+        if (filter.needToFilter()) {
+            sender.sendMessage(String.format("%s[Filter '%s']", ChatColor.GRAY, filter));
+        }
+        sender.sendMessage(String.join(delimiter, content));
+    }
+
+    /**
+     * Sets the delimiter. A sequence of characters that is used to separate each of the elements in content.
+     *
+     * @param delimiter The delimiter to use.
+     * @return Same {@link InlineSendHandler} for method chaining.
+     */
+    public InlineSendHandler withDelimiter(String delimiter) {
+        this.delimiter = delimiter;
+        return this;
+    }
+
+    public String getDelimiter() {
+        return delimiter;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/display/handlers/ListDisplayHandler.java

@@ -1,22 +0,0 @@
-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());
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/display/handlers/PagedListDisplayHandler.java

@@ -1,105 +0,0 @@
-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);
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/display/handlers/PagedSendHandler.java

@@ -0,0 +1,170 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Display content as a list with optional pagination.
+ */
+public class PagedSendHandler extends BaseSendHandler<PagedSendHandler> {
+
+    /**
+     * Makes a new {@link PagedSendHandler} instance to use.
+     *
+     * @return  New {@link PagedSendHandler} instance.
+     */
+    public static PagedSendHandler create() {
+        return new PagedSendHandler();
+    }
+
+    private boolean paginate = true;
+    private boolean paginateInConsole = false;
+    private boolean padEnd = true;
+    private int linesPerPage = 8;
+    private int targetPage = 1;
+
+    public PagedSendHandler() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void sendContent(@NotNull CommandSender sender,
+                            @NotNull List<String> content) {
+
+        if (!paginate || (sender instanceof ConsoleCommandSender && !paginateInConsole)) {
+            sendNormal(sender, content);
+            return;
+        }
+        sendPaged(sender, content);
+    }
+
+    /**
+     * Send content list without pagination.
+     *
+     * @param sender    The target which the content will be displayed to.
+     * @param content   The content to display.
+     */
+    private void sendNormal(@NotNull CommandSender sender,
+                            @NotNull List<String> content) {
+
+        if (filter.needToFilter()) {
+            sender.sendMessage(String.format("%s[Filter '%s']", ChatColor.GRAY, filter));
+        }
+        sender.sendMessage(content.toArray(new String[0]));
+    }
+
+    /**
+     * Send content list with pagination.
+     *
+     * @param sender    The target which the content will be displayed to.
+     * @param content   The content to display.
+     */
+    private void sendPaged(@NotNull CommandSender sender,
+                           @NotNull List<String> content) {
+
+        int totalPages = (content.size() + linesPerPage - 1) / linesPerPage; // Basically just divide round up
+        if (targetPage < 1 || targetPage > totalPages) {
+            sender.sendMessage(String.format("%sInvalid page number. Please enter a page number between 1 and %s", ChatColor.RED, totalPages));
+            return;
+        }
+
+        if (filter.needToFilter()) {
+            sender.sendMessage(String.format("%s[Page %s of %s] [Filter '%s']", ChatColor.GRAY, targetPage, totalPages, filter));
+        } else {
+            sender.sendMessage(String.format("%s[Page %s of %s]", ChatColor.GRAY, targetPage, totalPages));
+        }
+
+        int startIndex = (targetPage - 1) * linesPerPage;
+        int pageEndIndex = startIndex + linesPerPage;
+        int endIndex = Math.min(pageEndIndex, content.size());
+        List<String> pageContent = content.subList(startIndex, endIndex);
+        if (padEnd) {
+            for (int i = 0; i < (pageEndIndex - endIndex); i++) {
+                pageContent.add("");
+            }
+        }
+        sender.sendMessage(pageContent.toArray(new String[0]));
+    }
+
+    /**
+     * Sets whether display output should be paginated.
+     *
+     * @param paginate  State of doing pagination.
+     * @return Same {@link PagedSendHandler} for method chaining.
+     */
+    public PagedSendHandler doPagination(boolean paginate) {
+        this.paginate = paginate;
+        return this;
+    }
+
+    /**
+     * Sets whether display output should be paginated if is for console output.
+     * This option will be useless of {@link PagedSendHandler#paginate} is set to false.
+     *
+     * @param paginateInConsole State of doing pagination in console.
+     * @return Same {@link PagedSendHandler} for method chaining.
+     */
+    public PagedSendHandler doPaginationInConsole(boolean paginateInConsole) {
+        this.paginateInConsole = paginateInConsole;
+        return this;
+    }
+
+    /**
+     * Sets whether empty lines should be added if content lines shown is less that {@link PagedSendHandler#linesPerPage}.
+     *
+     * @param padEnd    State of doing end padding.
+     * @return Same {@link PagedSendHandler} for method chaining.
+     */
+    public PagedSendHandler doEndPadding(boolean padEnd) {
+        this.padEnd = padEnd;
+        return this;
+    }
+
+    /**
+     * Sets the max number of lines per page. This excludes header.
+     *
+     * @param linesPerPage  The number of lines per page.
+     * @return Same {@link PagedSendHandler} for method chaining.
+     */
+    public PagedSendHandler withLinesPerPage(int linesPerPage) {
+        this.linesPerPage = linesPerPage;
+        return this;
+    }
+
+    /**
+     * Sets the page number to display.
+     *
+     * @param targetPage    The target page number to display.
+     * @return Same {@link PagedSendHandler} for method chaining.
+     */
+    public PagedSendHandler withTargetPage(int targetPage) {
+        this.targetPage = targetPage;
+        return this;
+    }
+
+    public boolean isPaginate() {
+        return paginate;
+    }
+
+    public boolean isPaginateInConsole() {
+        return paginateInConsole;
+    }
+
+    public boolean isPadEnd() {
+        return padEnd;
+    }
+
+    public int getLinesPerPage() {
+        return linesPerPage;
+    }
+
+    public int getTargetPage() {
+        return targetPage;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/display/handlers/SendHandler.java

@@ -0,0 +1,20 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Handles the sending of all content to the command sender.
+ */
+@FunctionalInterface
+public interface SendHandler {
+    /**
+     * Sends all the content to the given command sender.
+     *
+     * @param sender    The target which the content will be displayed to.
+     * @param content   The content to display.
+     */
+    void send(@NotNull CommandSender sender, @NotNull List<String> content);
+}

src/main/java/com/onarandombox/MultiverseCore/display/parsers/ContentParser.java

@@ -0,0 +1,20 @@
+package com.onarandombox.MultiverseCore.display.parsers;
+
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Parse objects into string or list of strings.
+ */
+@FunctionalInterface
+public interface ContentParser {
+    /**
+     * Parse the object to string(s) and add it to the content.
+     *
+     * @param sender    The target which the content will be displayed to.
+     * @param content   The content to display.
+     */
+    void parse(@NotNull CommandSender sender, @NotNull List<String> content);
+}

src/main/java/com/onarandombox/MultiverseCore/display/parsers/ListContentParser.java

@@ -0,0 +1,60 @@
+package com.onarandombox.MultiverseCore.display.parsers;
+
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Simple parser for list object.
+ *
+ * @param <T>   List element type.
+ */
+public class ListContentParser<T> implements ContentParser {
+
+    /**
+     * New list content parser for the given list.
+     *
+     * @param list  The list object to parse.
+     * @param <T>   List element type.
+     * @return New {@link MapContentParser} instance.
+     */
+    public static <T> ListContentParser<T> forContent(List<T> list) {
+        return new ListContentParser<>(list);
+    }
+
+    private final List<T> list;
+
+    private String format = "%s";
+
+    public ListContentParser(List<T> list) {
+        this.list = list;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void parse(@NotNull CommandSender sender, @NotNull List<String> content) {
+        list.forEach(element -> content.add(String.format(format, element)));
+    }
+
+    /**
+     * Sets the format that will be used to parse each list entry. Uses java string format pattern.
+     *
+     * @param format    The format to use.
+     * @return Same {@link ListContentParser} for method chaining.
+     */
+    public ListContentParser<T> withFormat(String format) {
+        this.format = format;
+        return this;
+    }
+
+    public List<T> getList() {
+        return list;
+    }
+
+    public String getFormat() {
+        return format;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/display/parsers/MapContentParser.java

@@ -0,0 +1,112 @@
+package com.onarandombox.MultiverseCore.display.parsers;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Simple parser for map object.
+ *
+ * @param <K>   Key type.
+ * @param <V>   Value type.
+ */
+public class MapContentParser<K, V> implements ContentParser {
+
+    /**
+     * New map content parser for the given map.
+     *
+     * @param map   The map object to parse.
+     * @param <K>   Key type.
+     * @param <V>   Value type.
+     * @return New {@link MapContentParser} instance.
+     */
+    public static <K, V> MapContentParser<K, V> forContent(Map<K, V> map) {
+        return new MapContentParser<>(map);
+    }
+
+    private final Map<K, V> map;
+
+    private String format = "%s%s%s%s%s";
+    private ChatColor keyColor = ChatColor.WHITE;
+    private ChatColor valueColor = ChatColor.WHITE;
+    private String separator = ": ";
+
+    public MapContentParser(Map<K, V> map) {
+        this.map = map;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void parse(@NotNull CommandSender sender, @NotNull List<String> content) {
+        map.forEach((k, v) -> content.add(String.format(format, keyColor, k, separator, valueColor, v)));
+    }
+
+    /**
+     * Sets the format that will be used to parse each map entry. Uses java string format pattern.
+     *
+     * @param format    The format to use.
+     * @return Same {@link MapContentParser} for method chaining.
+     */
+    public MapContentParser<K, V> withFormat(String format) {
+        this.format = format;
+        return this;
+    }
+
+    /**
+     * Sets the color for the key text.
+     *
+     * @param keyColor  The color to use.
+     * @return Same {@link MapContentParser} for method chaining.
+     */
+    public MapContentParser<K, V> withKeyColor(ChatColor keyColor) {
+        this.keyColor = keyColor;
+        return this;
+    }
+
+    /**
+     * Sets the color for the value text.
+     *
+     * @param valueColor    The color to use.
+     * @return Same {@link MapContentParser} for method chaining.
+     */
+    public MapContentParser<K, V> withValueColor(ChatColor valueColor) {
+        this.valueColor = valueColor;
+        return this;
+    }
+
+    /**
+     * Sets the separator between each key value pairing.
+     *
+     * @param separator The separator to use.
+     * @return Same {@link MapContentParser} for method chaining.
+     */
+    public MapContentParser<K, V> withSeparator(String separator) {
+        this.separator = separator;
+        return this;
+    }
+
+    public Map<K, V> getMap() {
+        return map;
+    }
+
+    public String getFormat() {
+        return format;
+    }
+
+    public ChatColor getKeyColor() {
+        return keyColor;
+    }
+
+    public ChatColor getValueColor() {
+        return valueColor;
+    }
+
+    public String getSeparator() {
+        return separator;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/display/settings/DisplaySetting.java

@@ -1,19 +0,0 @@
-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> {
-
-     /**
-      * Gets the default value of this Display Setting.
-      *
-      * @return The default value.
-      */
-     T defaultValue();
-}

src/main/java/com/onarandombox/MultiverseCore/display/settings/InlineDisplaySettings.java

@@ -1,15 +0,0 @@
-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 + ", ";
-}

src/main/java/com/onarandombox/MultiverseCore/display/settings/MapDisplaySettings.java

@@ -1,15 +0,0 @@
-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 + " = ";
-}

src/main/java/com/onarandombox/MultiverseCore/display/settings/PagedDisplaySettings.java

@@ -1,30 +0,0 @@
-package com.onarandombox.MultiverseCore.display.settings;
-
-public class PagedDisplaySettings {
-
-    /**
-     * Page to display.
-     */
-    public static final DisplaySetting<Integer> SHOW_PAGE = () -> 1;
-
-    /**
-     * Total pages available to display.
-     */
-    public static final DisplaySetting<Integer> TOTAL_PAGE = () -> 1;
-
-    /**
-     * The max number of lines per page. This excludes header.
-     */
-    public static final DisplaySetting<Integer> LINES_PER_PAGE = () -> 8;
-
-    /**
-     * Should add empty lines if content lines shown is less that {@link #LINES_PER_PAGE}.
-     */
-    public static final DisplaySetting<Boolean> DO_END_PADDING = () -> true;
-
-    /**
-     * Should display with paging when it's sent to console.
-     */
-    public static final DisplaySetting<Boolean> PAGE_IN_CONSOLE = () -> false;
-
-}

src/main/java/com/onarandombox/MultiverseCore/listeners/AsyncChatEvent.java

@@ -1,35 +0,0 @@
-package com.onarandombox.MultiverseCore.listeners;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
-
-/**
- * A wrapper for the {@link AsyncPlayerChatEvent}.
- */
-public class AsyncChatEvent implements ChatEvent {
-    private final AsyncPlayerChatEvent event;
-
-    public AsyncChatEvent(AsyncPlayerChatEvent event) {
-        this.event = event;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return event.isCancelled();
-    }
-
-    @Override
-    public String getFormat() {
-        return event.getFormat();
-    }
-
-    @Override
-    public void setFormat(String s) {
-        event.setFormat(s);
-    }
-
-    @Override
-    public Player getPlayer() {
-        return event.getPlayer();
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/listeners/ChatEvent.java

@@ -1,29 +0,0 @@
-package com.onarandombox.MultiverseCore.listeners;
-
-import org.bukkit.entity.Player;
-
-/**
- * A wrapper for the two chat-events in Bukkit.
- */
-public interface ChatEvent {
-    /**
-     * @return Whether this event is cancelled.
-     */
-    boolean isCancelled();
-
-    /**
-     * @return The format.
-     */
-    String getFormat();
-
-    /**
-     * Sets the format.
-     * @param s The new format.
-     */
-    void setFormat(String s);
-
-    /**
-     * @return The player.
-     */
-    Player getPlayer();
-}

src/main/java/com/onarandombox/MultiverseCore/listeners/MVAsyncPlayerChatListener.java

@@ -1,35 +0,0 @@
-/******************************************************************************
- * 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.listeners;
-
-import java.util.logging.Level;
-
-import com.dumptruckman.minecraft.util.Logging;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-/**
- * Multiverse's {@link org.bukkit.event.Listener} for players.
- */
-public class MVAsyncPlayerChatListener extends MVChatListener {
-    public MVAsyncPlayerChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
-        super(plugin, playerListener);
-        Logging.fine("Created AsyncPlayerChatEvent listener.");
-    }
-
-    /**
-     * This method is called when a player wants to chat.
-     * @param event The Event that was fired.
-     */
-    @EventHandler
-    public void playerChat(AsyncPlayerChatEvent event) {
-        this.playerChat(new AsyncChatEvent(event));
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/listeners/MVChatListener.java

@@ -5,12 +5,14 @@ import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 
 import org.bukkit.ChatColor;
+import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
 
 /**
  * Multiverse's {@link org.bukkit.event.Listener} for players.
  */
-public abstract class MVChatListener implements Listener {
+public class MVChatListener implements Listener {
     private final MultiverseCore plugin;
     private final MVWorldManager worldManager;
     private final MVPlayerListener playerListener;
@@ -22,10 +24,11 @@ public abstract class MVChatListener implements Listener {
     }
 
     /**
-     * This handles a {@link ChatEvent}.
-     * @param event The {@link ChatEvent}.
+     * This handles a {@link AsyncPlayerChatEvent}.
+     * @param event The {@link AsyncPlayerChatEvent}.
      */
-    public void playerChat(ChatEvent event) {
+    @EventHandler
+    public void playerChat(AsyncPlayerChatEvent event) {
         if (event.isCancelled()) {
             return;
         }

src/main/java/com/onarandombox/MultiverseCore/listeners/MVMapListener.java

@@ -1,43 +0,0 @@
-package com.onarandombox.MultiverseCore.listeners;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.server.MapInitializeEvent;
-import org.bukkit.map.MapView;
-
-/**
- * A listener for bukkit map events.
- */
-public class MVMapListener implements Listener {
-
-    private final MultiverseCore plugin;
-
-    public MVMapListener(final MultiverseCore plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * This method is called when a map is initialized.
-     * @param event The event that was fired.
-     */
-    @EventHandler
-    public void mapInitialize(final MapInitializeEvent event) {
-        for (final Player player : Bukkit.getOnlinePlayers()) {
-            if ((player.getItemInHand().getType() == Material.MAP
-                    || player.getItemInHand().getType() == Material.FILLED_MAP)
-                    && player.getItemInHand().getDurability() == event.getMap().getId()) {
-                final Location playerLoc = player.getLocation();
-                final MapView map = event.getMap();
-                map.setCenterX(playerLoc.getBlockX());
-                map.setCenterZ(playerLoc.getBlockZ());
-                map.setWorld(playerLoc.getWorld());
-                return;
-            }
-        }
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerChatListener.java

@@ -1,36 +0,0 @@
-/******************************************************************************
- * 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.listeners;
-
-import java.util.logging.Level;
-
-import com.dumptruckman.minecraft.util.Logging;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.player.PlayerChatEvent;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-/**
- * Multiverse's {@link org.bukkit.event.Listener} for players.
- */
-@SuppressWarnings("deprecation") // this exists only for downwards compatibility
-public class MVPlayerChatListener extends MVChatListener {
-    public MVPlayerChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
-        super(plugin, playerListener);
-        Logging.fine("Registered PlayerChatEvent listener.");
-    }
-
-    /**
-     * This method is called when a player wants to chat.
-     * @param event The Event that was fired.
-     */
-    @EventHandler
-    public void playerChat(PlayerChatEvent event) {
-        this.playerChat(new NormalChatEvent(event));
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/listeners/NormalChatEvent.java

@@ -1,37 +0,0 @@
-package com.onarandombox.MultiverseCore.listeners;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerChatEvent;
-
-/**
- * A wrapper for the {@link PlayerChatEvent}.
- * @deprecated This is deprecated like the {@link PlayerChatEvent}.
- */
-@Deprecated
-public class NormalChatEvent implements ChatEvent {
-    private final PlayerChatEvent event;
-
-    public NormalChatEvent(PlayerChatEvent event) {
-        this.event = event;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return event.isCancelled();
-    }
-
-    @Override
-    public String getFormat() {
-        return event.getFormat();
-    }
-
-    @Override
-    public void setFormat(String s) {
-        event.setFormat(s);
-    }
-
-    @Override
-    public Player getPlayer() {
-        return event.getPlayer();
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/utils/LocationManipulation.java

@@ -1,285 +0,0 @@
-/******************************************************************************
- * 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.utils;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.Vehicle;
-import org.bukkit.util.Vector;
-
-import java.text.DecimalFormat;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-/**
- * Utility class to manipulate locations.
- *
- * @deprecated Use instead: {@link com.onarandombox.MultiverseCore.api.LocationManipulation} and {@link SimpleLocationManipulation}.
- */
-@Deprecated
-public class LocationManipulation {
-    private LocationManipulation() { }
-
-    private static Map<String, Integer> orientationInts = new HashMap<String, Integer>();
-
-    static {
-        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
-        orientationInts.put("n", 180);
-        orientationInts.put("ne", 225);
-        orientationInts.put("e", 270);
-        orientationInts.put("se", 315);
-        orientationInts.put("s", 0);
-        orientationInts.put("sw", 45);
-        orientationInts.put("w", 90);
-        orientationInts.put("nw", 135);
-
-        // "freeze" the map:
-        orientationInts = Collections.unmodifiableMap(orientationInts);
-        // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
-    }
-
-    /**
-     * Convert a Location into a Colon separated string to allow us to store it in text.
-     * <p>
-     * WORLD:X,Y,Z:yaw:pitch
-     * <p>
-     * The corresponding String2Loc function is {@link #stringToLocation}
-     *
-     * @param location The Location to save.
-     * @return The location as a string in this format: WORLD:x,y,z:yaw:pitch
-     */
-    public static String locationToString(Location location) {
-        if (location == null) {
-            return "";
-        }
-        // We set the locale to ENGLISH here so we always save with the format:
-        // world:1.2,5.4,3.6:1.8:21.3
-        // Otherwise we blow up when parsing!
-        return String.format(Locale.ENGLISH, "%s:%.2f,%.2f,%.2f:%.2f:%.2f", location.getWorld().getName(),
-                location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
-    }
-
-    /**
-     * This method simply does some rounding, rather than forcing a call to the server to get the blockdata.
-     *
-     * @param l The location to round to the block location
-     * @return A rounded location.
-     */
-    public static Location getBlockLocation(Location l) {
-        l.setX(l.getBlockX());
-        l.setY(l.getBlockY());
-        l.setZ(l.getBlockZ());
-        return l;
-    }
-
-    /**
-     * Returns a new location from a given string. The format is as follows:
-     * <p>
-     * WORLD:X,Y,Z:yaw:pitch
-     * <p>
-     * The corresponding Location2String function is {@link #stringToLocation}
-     *
-     * @param locationString The location represented as a string (WORLD:X,Y,Z:yaw:pitch)
-     * @return A new location defined by the string or null if the string was invalid.
-     */
-    public static Location stringToLocation(String locationString) {
-        //format:
-        //world:x,y,z:pitch:yaw
-        if (locationString == null) {
-            return null;
-        }
-
-        // Split the whole string, format is:
-        // {'world', 'x,y,z'[, 'pitch', 'yaw']}
-        String[] split = locationString.split(":");
-        if (split.length < 2 || split.length > 4) { // SUPPRESS CHECKSTYLE: MagicNumberCheck
-            return null;
-        }
-        // Split the xyz string, format is:
-        // {'x', 'y', 'z'}
-        String[] xyzsplit = split[1].split(",");
-        if (xyzsplit.length != 3) {
-            return null;
-        }
-
-        // Verify the world is valid
-        World w = Bukkit.getWorld(split[0]);
-        if (w == null) {
-            return null;
-        }
-
-        try {
-            float pitch = 0;
-            float yaw = 0;
-            if (split.length >= 3) {
-                yaw = (float) Double.parseDouble(split[2]);
-            }
-            if (split.length == 4) { // SUPPRESS CHECKSTYLE: MagicNumberCheck
-                pitch = (float) Double.parseDouble(split[3]);
-            }
-            return new Location(w, Double.parseDouble(xyzsplit[0]), Double.parseDouble(xyzsplit[1]), Double.parseDouble(xyzsplit[2]), yaw, pitch);
-        } catch (NumberFormatException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Returns a colored string with the coords.
-     *
-     * @param l The {@link Location}
-     * @return The {@link String}
-     */
-    public static String strCoords(Location l) {
-        String result = "";
-        DecimalFormat df = new DecimalFormat();
-        df.setMinimumFractionDigits(0);
-        df.setMaximumFractionDigits(2);
-        result += ChatColor.WHITE + "X: " + ChatColor.AQUA + df.format(l.getX()) + " ";
-        result += ChatColor.WHITE + "Y: " + ChatColor.AQUA + df.format(l.getY()) + " ";
-        result += ChatColor.WHITE + "Z: " + ChatColor.AQUA + df.format(l.getZ()) + " ";
-        result += ChatColor.WHITE + "P: " + ChatColor.GOLD + df.format(l.getPitch()) + " ";
-        result += ChatColor.WHITE + "Y: " + ChatColor.GOLD + df.format(l.getYaw()) + " ";
-        return result;
-    }
-
-    /**
-     * Converts a location to a printable readable formatted string including pitch/yaw.
-     *
-     * @param l The {@link Location}
-     * @return The {@link String}
-     */
-    public static String strCoordsRaw(Location l) {
-        if (l == null) {
-            return "null";
-        }
-        String result = "";
-        DecimalFormat df = new DecimalFormat();
-        df.setMinimumFractionDigits(0);
-        df.setMaximumFractionDigits(2);
-        result += "X: " + df.format(l.getX()) + " ";
-        result += "Y: " + df.format(l.getY()) + " ";
-        result += "Z: " + df.format(l.getZ()) + " ";
-        result += "P: " + df.format(l.getPitch()) + " ";
-        result += "Y: " + df.format(l.getYaw()) + " ";
-        return result;
-    }
-
-    /**
-     * Return the NESW Direction a Location is facing.
-     *
-     * @param location The {@link Location}
-     * @return The NESW Direction
-     */
-    public static String getDirection(Location location) {
-        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
-        double r = (location.getYaw() % 360) + 180;
-        // Remember, these numbers are every 45 degrees with a 22.5 offset, to detect boundaries.
-        String dir;
-        if (r < 22.5)
-            dir = "n";
-        else if (r < 67.5)
-            dir = "ne";
-        else if (r < 112.5)
-            dir = "e";
-        else if (r < 157.5)
-            dir = "se";
-        else if (r < 202.5)
-            dir = "s";
-        else if (r < 247.5)
-            dir = "sw";
-        else if (r < 292.5)
-            dir = "w";
-        else if (r < 337.5)
-            dir = "nw";
-        else
-            dir = "n";
-        // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
-
-        return dir;
-    }
-
-    /**
-     * Returns the float yaw position for the given cardinal direction.
-     *
-     * @param orientation The cardinal direction
-     * @return The yaw
-     */
-    public static float getYaw(String orientation) {
-        if (orientation == null) {
-            return 0;
-        }
-        if (orientationInts.containsKey(orientation.toLowerCase())) {
-            return orientationInts.get(orientation.toLowerCase());
-        }
-        return 0;
-    }
-
-    /**
-     * Returns a speed float from a given vector.
-     *
-     * @param v The {@link Vector}
-     * @return The speed
-     */
-    public static float getSpeed(Vector v) {
-        return (float) Math.sqrt(v.getX() * v.getX() + v.getZ() * v.getZ());
-    }
-
-    // X, Y, Z
-    // -W/+E,0, -N/+S
-
-    /**
-     * Returns a translated vector from the given direction.
-     *
-     * @param v The old {@link Vector}
-     * @param direction The new direction
-     * @return The translated {@link Vector}
-     */
-    public static Vector getTranslatedVector(Vector v, String direction) {
-        if (direction == null) {
-            return v;
-        }
-        float speed = getSpeed(v);
-        float halfSpeed = (float) (speed / 2.0);
-        if (direction.equalsIgnoreCase("n")) {
-            return new Vector(0, 0, -1 * speed);
-        } else if (direction.equalsIgnoreCase("ne")) {
-            return new Vector(halfSpeed, 0, -1 * halfSpeed);
-        } else if (direction.equalsIgnoreCase("e")) {
-            return new Vector(speed, 0, 0);
-        } else if (direction.equalsIgnoreCase("se")) {
-            return new Vector(halfSpeed, 0, halfSpeed);
-        } else if (direction.equalsIgnoreCase("s")) {
-            return new Vector(0, 0, speed);
-        } else if (direction.equalsIgnoreCase("sw")) {
-            return new Vector(-1 * halfSpeed, 0, halfSpeed);
-        } else if (direction.equalsIgnoreCase("w")) {
-            return new Vector(-1 * speed, 0, 0);
-        } else if (direction.equalsIgnoreCase("nw")) {
-            return new Vector(-1 * halfSpeed, 0, -1 * halfSpeed);
-        }
-        return v;
-    }
-
-    /**
-     * Returns the next Location that a {@link Vehicle} is traveling at.
-     *
-     * @param v The {@link Vehicle}
-     * @return The {@link Location}
-     */
-    public static Location getNextBlock(Vehicle v) {
-        Vector vector = v.getVelocity();
-        Location location = v.getLocation();
-        int x = vector.getX() < 0 ? vector.getX() == 0 ? 0 : -1 : 1;
-        int z = vector.getZ() < 0 ? vector.getZ() == 0 ? 0 : -1 : 1;
-        return location.add(x, 0, z);
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/utils/MVTravelAgent.java

@@ -1,27 +0,0 @@
-/******************************************************************************
- * 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.utils;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import org.bukkit.entity.Player;
-
-/**
- * The Multiverse TravelAgent.
- */
-public class MVTravelAgent {
-    protected MVDestination destination;
-    protected MultiverseCore core;
-    protected Player player;
-
-    public MVTravelAgent(MultiverseCore multiverseCore, MVDestination d, Player p) {
-        this.destination = d;
-        this.core = multiverseCore;
-        this.player = p;
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/utils/WorldManager.java

@@ -95,16 +95,6 @@ public class WorldManager implements MVWorldManager {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     * @deprecated Use {@link #cloneWorld(String, String)} instead.
-     */
-    @Override
-    @Deprecated
-    public boolean cloneWorld(String oldName, String newName, String generator) {
-        return this.cloneWorld(oldName, newName);
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -784,16 +774,6 @@ public class WorldManager implements MVWorldManager {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     * @deprecated This is deprecated!
-     */
-    @Override
-    @Deprecated
-    public PurgeWorlds getWorldPurger() {
-        return new PurgeWorlds(plugin);
-    }
-
     /**
      * {@inheritDoc}
      */

src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/BitlyURLShortener.java

@@ -1,12 +1,12 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;
 
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
 import java.io.IOException;
 import java.util.Map;
 
+import net.minidev.json.JSONObject;
+import net.minidev.json.parser.JSONParser;
+import net.minidev.json.parser.ParseException;
+
 /**
  * A {@link URLShortener} using {@code bit.ly}. Requires an access token.
  */

src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java

@@ -7,10 +7,11 @@
 
 package com.onarandombox.MultiverseCore;
 
+import java.io.File;
+
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.configuration.SpawnLocation;
-import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener;
 import com.onarandombox.MultiverseCore.utils.MockWorldFactory;
 import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import org.bukkit.ChatColor;
@@ -38,8 +39,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.File;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -157,7 +156,7 @@ public class TestWorldProperties {
         assertTrue(mvWorld.isKeepingSpawnInMemory());
         assertTrue(mvWorld.getBedRespawn());
         assertTrue(mvWorld.getAutoLoad());
-        assertEquals(new SpawnLocation(0, 64, 0), mvWorld.getSpawnLocation());
+        assertEquals(new SpawnLocation(core.getServer().getWorld("world"), 0, 64, 0), mvWorld.getSpawnLocation());
 
         /* ****************************************** *
          *    Call some events and verify behavior
@@ -178,10 +177,10 @@ public class TestWorldProperties {
 
         // call player chat event
         core.getMVConfig().setPrefixChat(true);
-        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+        core.getChatListener().playerChat(playerChatEvent);
         verify(playerChatEvent).setFormat("[" + mvWorld.getColoredWorldString() + "]" + "format");
         core.getMVConfig().setPrefixChat(false);
-        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+        core.getChatListener().playerChat(playerChatEvent);
         verify(playerChatEvent, times(1)).setFormat(anyString()); // only ONE TIME (not the 2nd time!)
 
         // call player join events
@@ -249,7 +248,7 @@ public class TestWorldProperties {
         mvWorld.setAutoLoad(false);
         assertEquals(false, mvWorld.getAutoLoad());
         mvWorld.setSpawnLocation(new Location(mvWorld.getCBWorld(), 1, 1, 1));
-        assertEquals(new SpawnLocation(1, 1, 1), mvWorld.getSpawnLocation());
+        assertEquals(new SpawnLocation(core.getServer().getWorld("world"), 1, 1, 1), mvWorld.getSpawnLocation());
 
 
         /* ****************************************** *
@@ -272,15 +271,15 @@ public class TestWorldProperties {
 
         // call player chat event
         core.getMVConfig().setPrefixChat(true);
-        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+        core.getChatListener().playerChat(playerChatEvent);
         // never because it's hidden!
         verify(playerChatEvent, never()).setFormat(
                 "[" + mvWorld.getColoredWorldString() + "]" + "format");
         mvWorld.setHidden(false);
-        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+        core.getChatListener().playerChat(playerChatEvent);
         verify(playerChatEvent).setFormat("[" + mvWorld.getColoredWorldString() + "]" + "format");
         core.getMVConfig().setPrefixChat(false);
-        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+        core.getChatListener().playerChat(playerChatEvent);
         verify(playerChatEvent, times(1)).setFormat(anyString()); // only ONE TIME (not the 2nd time!)
         mvWorld.setHidden(true); // reset hidden-state
 
@@ -288,7 +287,7 @@ public class TestWorldProperties {
         core.getPlayerListener().playerJoin(playerJoinEvent);
         verify(mockPlayer, never()).teleport(any(Location.class));
         core.getPlayerListener().playerJoin(playerNewJoinEvent);
-        verify(mockNewPlayer).teleport(new SpawnLocation(1, 1, 1));
+        verify(mockNewPlayer).teleport(new SpawnLocation(core.getServer().getWorld("world"), 1, 1, 1));
 
         // call player respawn events
         core.getPlayerListener().playerRespawn(playerRespawnBed);
@@ -338,7 +337,7 @@ public class TestWorldProperties {
         assertEquals(false, mvWorld.isKeepingSpawnInMemory());
         assertEquals(false, mvWorld.getBedRespawn());
         assertEquals(false, mvWorld.getAutoLoad());
-        assertEquals(new SpawnLocation(1, 1, 1), mvWorld.getSpawnLocation());
+        assertEquals(new SpawnLocation(core.getServer().getWorld("world"), 1, 1, 1), mvWorld.getSpawnLocation());
     }
 
     public void createEvents(MultiverseWorld mvWorld) {