Safer null checking with parsing enum value.

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

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

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

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

    <!-- Profiles are used to detect whether this is a local or Jenkins build
@@ -154,8 +154,6 @@
                <artifactId>maven-surefire-plugin</artifactId>
                <version>3.0.0-M3</version>
                <configuration>
-                    <parallel>methods</parallel>
-                    <threadCount>10</threadCount>
                    <excludes>
                        <exclude>**/TestCommandSender.java</exclude>
                        <exclude>**/TestInstanceCreator.java</exclude>
@@ -348,30 +346,9 @@
            <scope>test</scope>
        </dependency>
        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>2.0.9</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-easymock</artifactId>
-            <version>2.0.9</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-            <version>2.0.9</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>4.0.2</version>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.11.2</version>
            <scope>test</scope>
        </dependency>
        <dependency>
@@ -384,11 +361,11 @@
    <distributionManagement>
        <repository>
            <id>OnARandomBox</id>
-            <url>http://repo.onarandombox.com/content/repositories/multiverse</url>
+            <url>https://repo.onarandombox.com/content/repositories/multiverse</url>
        </repository>
        <snapshotRepository>
            <id>OnARandomBox</id>
-            <url>http://repo.onarandombox.com/content/repositories/multiverse-snapshots/</url>
+            <url>https://repo.onarandombox.com/content/repositories/multiverse-snapshots/</url>
        </snapshotRepository>
    </distributionManagement>
 </project>
@@ -107,7 +107,7 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
        teleportcooldown = 1000;
        this.version = 2.9;
        silentstart = false;
-        defaultportalsearch = false;
+        defaultportalsearch = true;
        portalsearchradius = 128;
        autopurge = true;
        idonotwanttodonate = false;
@@ -9,6 +9,7 @@ package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.enums.MVEnums;
 import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
 import org.bukkit.World.Environment;
@@ -21,6 +22,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;

 /**
 * Creates a new world and loads it.
@@ -90,23 +92,22 @@ public class CreateCommand extends MultiverseCommand {
            return;
        }

-        Environment environment = EnvironmentCommand.getEnvFromString(env);
-        if (environment == null) {
+        // Parse Environment.
+        Optional<Environment> environment = MVEnums.ENVIRONMENT.parseValue(env);
+        if (!environment.isPresent()) {
            sender.sendMessage(ChatColor.RED + "That is not a valid environment.");
            EnvironmentCommand.showEnvironments(sender);
            return;
        }

-        // If they didn't specify a type, default to NORMAL
-        if (typeString == null) {
-            typeString = "NORMAL";
-        }
-        WorldType type = EnvironmentCommand.getWorldTypeFromString(typeString);
-        if (type == null) {
+        // Parse WorldType. If they didn't specify a type, default to normal.
+        Optional<WorldType> type = MVEnums.WORLD_TYPE.parseValue(typeString == null ? "normal" : typeString);
+        if (!type.isPresent()) {
            sender.sendMessage(ChatColor.RED + "That is not a valid World Type.");
            EnvironmentCommand.showWorldTypes(sender);
            return;
        }
+
        // Determine if the generator is valid. #918
        if (generator != null) {
            List<String> genarray = new ArrayList<String>(Arrays.asList(generator.split(":")));
@@ -122,7 +123,13 @@ public class CreateCommand extends MultiverseCommand {
        }
        Command.broadcastCommandMessage(sender, "Starting creation of world '" + worldName + "'...");

-        if (this.worldManager.addWorld(worldName, environment, seed, type, allowStructures, generator, useSpawnAdjust)) {
+        if (this.worldManager.addWorld(
+                worldName,
+                environment.get(),
+                seed, type.get(),
+                allowStructures,
+                generator,
+                useSpawnAdjust)) {
            Command.broadcastCommandMessage(sender, "Complete!");
        } else {
            Command.broadcastCommandMessage(sender, "FAILED.");
@@ -8,6 +8,7 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.enums.MVEnums;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.WorldType;
@@ -68,25 +69,11 @@ public class EnvironmentCommand extends MultiverseCommand {
     *
     * @param type The WorldType as a {@link String}
     * @return The WorldType as a {@link WorldType}
+     * @deprecated Use {@link MVEnums#WORLD_TYPE} instead.
     */
+    @Deprecated
    public static WorldType getWorldTypeFromString(String type) {
-        // Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way
-        if (type.equalsIgnoreCase("normal")) {
-            type = "NORMAL";
-        } else if (type.equalsIgnoreCase("flat")) {
-            type = "FLAT";
-        } else if (type.equalsIgnoreCase("largebiomes")) {
-            type = "LARGE_BIOMES";
-        } else if (type.equalsIgnoreCase("amplified")) {
-            type = "AMPLIFIED";
-        }
-        try {
-            // Now that we've converted a potentially unfriendly value
-            // to a friendly one, get it from the ENUM!
-            return WorldType.valueOf(type);
-        } catch (IllegalArgumentException e) {
-            return null;
-        }
+        return MVEnums.WORLD_TYPE.parseValue(type).orElse(null);
    }

    /**
@@ -94,25 +81,10 @@ public class EnvironmentCommand extends MultiverseCommand {
     *
     * @param env The environment as {@link String}
     * @return The environment as {@link org.bukkit.World.Environment}
+     * @deprecated Use {@link MVEnums#ENVIRONMENT} instead.
     */
+    @Deprecated
    public static World.Environment getEnvFromString(String env) {
-        env = env.toUpperCase();
-        // Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way
-        if (env.equalsIgnoreCase("HELL") || env.equalsIgnoreCase("NETHER"))
-            env = "NETHER";
-
-        if (env.equalsIgnoreCase("END") || env.equalsIgnoreCase("THEEND") || env.equalsIgnoreCase("STARWARS"))
-            env = "THE_END";
-
-        if (env.equalsIgnoreCase("NORMAL") || env.equalsIgnoreCase("WORLD"))
-            env = "NORMAL";
-
-        try {
-            // Now that we've converted a potentially unfriendly value
-            // to a friendly one, get it from the ENUM!
-            return World.Environment.valueOf(env);
-        } catch (IllegalArgumentException e) {
-            return null;
-        }
+        return MVEnums.ENVIRONMENT.parseValue(env).orElse(null);
    }
 }
@@ -8,6 +8,9 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.display.ColorAlternator;
+import com.onarandombox.MultiverseCore.display.ContentDisplay;
+import com.onarandombox.MultiverseCore.display.settings.MapDisplaySettings;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.GameRule;
@@ -16,7 +19,9 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

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

 /**
 * Allows management of Anchor Destinations.
@@ -68,15 +73,23 @@ public class GamerulesCommand extends MultiverseCommand {
            }
        }

-        final StringBuilder gameRules = new StringBuilder();
-        for (final String gameRule : world.getGameRules()) {
-            if (gameRules.length() != 0) {
-                gameRules.append(ChatColor.WHITE).append(", ");
+        ContentDisplay.forContent(getGameRuleMap(world))
+                .header("=== Gamerules for %s%s%s ===", ChatColor.AQUA, world.getName(), ChatColor.WHITE)
+                .colorTool(ColorAlternator.with(ChatColor.GREEN, ChatColor.GOLD))
+                .setting(MapDisplaySettings.OPERATOR, ": ")
+                .show(sender);
+    }
+
+    private Map<String, Object> getGameRuleMap(World world) {
+        Map<String, Object> gameRuleMap = new HashMap<>();
+        for (GameRule<?> rule : GameRule.values()) {
+            Object value = world.getGameRuleValue(rule);
+            if (value == null) {
+                gameRuleMap.put(rule.getName(), "null");
+                continue;
            }
-            gameRules.append(ChatColor.AQUA).append(gameRule).append(ChatColor.WHITE).append(": ");
-            gameRules.append(ChatColor.GREEN).append(world.getGameRuleValue(GameRule.getByName(gameRule)));
+            gameRuleMap.put(rule.getName(), value);
        }
-        sender.sendMessage("=== Gamerules for " + ChatColor.AQUA + world.getName() + ChatColor.WHITE + " ===");
-        sender.sendMessage(gameRules.toString());
+        return gameRuleMap;
    }
 }
@@ -40,24 +40,16 @@ public class HelpCommand extends PaginatedCoreCommand<Command> {

    @Override
    protected List<Command> getFilteredItems(List<Command> availableItems, String filter) {
+        String expression = "(?i).*" + cleanFilter(filter) + ".*";
        List<Command> filtered = new ArrayList<Command>();

        for (Command c : availableItems) {
-            if (stitchThisString(c.getKeyStrings()).matches("(?i).*" + filter + ".*")) {
+            if (stitchThisString(c.getKeyStrings()).matches(expression)
+                    || c.getCommandName().matches(expression)
+                    || c.getCommandDesc().matches(expression)
+                    || c.getCommandUsage().matches(expression)
+                    || c.getCommandExamples().stream().anyMatch(eg -> eg.matches(expression))) {
                filtered.add(c);
-            } else if (c.getCommandName().matches("(?i).*" + filter + ".*")) {
-                filtered.add(c);
-            } else if (c.getCommandDesc().matches("(?i).*" + filter + ".*")) {
-                filtered.add(c);
-            } else if (c.getCommandUsage().matches("(?i).*" + filter + ".*")) {
-                filtered.add(c);
-            } else {
-                for (String example : c.getCommandExamples()) {
-                    if (example.matches("(?i).*" + filter + ".*")) {
-                        filtered.add(c);
-                        break;
-                    }
-                }
            }
        }
        return filtered;
@@ -9,6 +9,7 @@ package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.enums.MVEnums;
 import com.onarandombox.MultiverseCore.utils.WorldNameChecker;
 import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
@@ -20,6 +21,7 @@ import org.bukkit.permissions.PermissionDefault;
 import java.io.File;
 import java.util.Collection;
 import java.util.List;
+import java.util.Optional;

 /**
 * Imports a new world of the specified type.
@@ -106,8 +108,8 @@ public class ImportCommand extends MultiverseCommand {
        }

        String env = args.get(1);
-        Environment environment = EnvironmentCommand.getEnvFromString(env);
-        if (environment == null) {
+        Optional<Environment> environment = MVEnums.ENVIRONMENT.parseValue(env);
+        if (!environment.isPresent()) {
            sender.sendMessage(ChatColor.RED + "That is not a valid environment.");
            EnvironmentCommand.showEnvironments(sender);
            return;
@@ -128,10 +130,18 @@ public class ImportCommand extends MultiverseCommand {
            sender.sendMessage("For a list of available world types, type: " + ChatColor.AQUA + "/mvenv");
        } else {
            Command.broadcastCommandMessage(sender, String.format("Starting import of world '%s'...", worldName));
-            if (this.worldManager.addWorld(worldName, environment, null, null, null, generator, useSpawnAdjust))
+            if (this.worldManager.addWorld(worldName,
+                    environment.get(),
+                    null,
+                    null,
+                    null,
+                    generator,
+                    useSpawnAdjust)) {
                Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Complete!");
-            else
+            }
+            else {
                Command.broadcastCommandMessage(sender, ChatColor.RED + "Failed!");
+            }
        }
    }
 }
@@ -9,122 +9,111 @@ package com.onarandombox.MultiverseCore.commands;

 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 org.bukkit.ChatColor;
-import org.bukkit.World.Environment;
+import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
+import org.jetbrains.annotations.NotNull;

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

 /**
 * Displays a listing of all worlds that a player can enter.
 */
-public class ListCommand extends PaginatedCoreCommand<String> {
+public class ListCommand extends MultiverseCommand {

    public ListCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("World Listing");
-        this.setCommandUsage("/mv list [page]");
+        this.setCommandUsage("/mv list [filter] [page]");
        this.setArgRange(0, 2);
        this.addKey("mvlist");
        this.addKey("mvl");
        this.addKey("mv list");
        this.setPermission("multiverse.core.list.worlds", "Displays a listing of all worlds that you can enter.", PermissionDefault.OP);
-        this.setItemsPerPage(8); // SUPPRESS CHECKSTYLE: MagicNumberCheck
-    }
-
-    private List<String> getFancyWorldList(Player p) {
-        List<String> worldList = new ArrayList<String>();
-        for (MultiverseWorld world : this.plugin.getMVWorldManager().getMVWorlds()) {
-
-            if (p != null && (!this.plugin.getMVPerms().canEnterWorld(p, world))) {
-                continue;
-            }
-
-            ChatColor color = ChatColor.GOLD;
-            Environment env = world.getEnvironment();
-            if (env == Environment.NETHER) {
-                color = ChatColor.RED;
-            } else if (env == Environment.NORMAL) {
-                color = ChatColor.GREEN;
-            } else if (env == Environment.THE_END) {
-                color = ChatColor.AQUA;
-            }
-            StringBuilder builder = new StringBuilder();
-            builder.append(world.getColoredWorldString()).append(ChatColor.WHITE);
-            builder.append(" - ").append(color).append(world.getEnvironment());
-            if (world.isHidden()) {
-                if (p == null || this.plugin.getMVPerms().hasPermission(p, "multiverse.core.modify", true)) {
-                    // Prefix hidden worlds with an "[H]"
-                    worldList.add(ChatColor.GRAY + "[H]" + builder.toString());
-                }
-            } else {
-                worldList.add(builder.toString());
-            }
-        }
-        for (String name : this.plugin.getMVWorldManager().getUnloadedWorlds()) {
-            if (p == null || this.plugin.getMVPerms().hasPermission(p, "multiverse.access." + name, true)) {
-                worldList.add(ChatColor.GRAY + name + " - UNLOADED");
-            }
-        }
-        return worldList;
-    }
-
-    @Override
-    protected List<String> getFilteredItems(List<String> availableItems, String filter) {
-        List<String> filtered = new ArrayList<String>();
-
-        for (String s : availableItems) {
-            if (s.matches("(?i).*" + filter + ".*")) {
-                filtered.add(s);
-            }
-        }
-        return filtered;
-    }
-
-    @Override
-    protected String getItemText(String item) {
-        return item;
    }

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        sender.sendMessage(ChatColor.LIGHT_PURPLE + "====[ Multiverse World List ]====");
-        Player p = null;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-        }
+        ContentFilter filter = ContentFilter.DEFAULT;
+        int page = 1;

-
-        FilterObject filterObject = this.getPageAndFilter(args);
-
-        List<String> availableWorlds = new ArrayList<String>(this.getFancyWorldList(p));
-        if (filterObject.getFilter().length() > 0) {
-            availableWorlds = this.getFilteredItems(availableWorlds, filterObject.getFilter());
-            if (availableWorlds.size() == 0) {
-                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE
-                        + "No worlds matched your filter: " + ChatColor.AQUA + filterObject.getFilter());
-                return;
+        // Either page or filter.
+        if (args.size() == 1) {
+            try {
+                page = Integer.parseInt(args.get(0));
+            } catch (NumberFormatException ignore) {
+                filter = new ContentFilter(args.get(0));
            }
        }

-        if (!(sender instanceof Player)) {
-            for (String c : availableWorlds) {
-                sender.sendMessage(c);
+        // Filter then page.
+        if (args.size() == 2) {
+            filter = new ContentFilter(args.get(0));
+            try {
+                page = Integer.parseInt(args.get(1));
+            } catch (NumberFormatException ignore) {
+                sender.sendMessage(ChatColor.RED + args.get(1) + " is not valid number!");
            }
-            return;
        }

-        int totalPages = (int) Math.ceil(availableWorlds.size() / (this.itemsPerPage + 0.0));
+        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);
+    }

-        if (filterObject.getPage() > totalPages) {
-            filterObject.setPage(totalPages);
+    private Collection<String> getListContents(@NotNull CommandSender sender) {
+        Player player = (sender instanceof Player) ? (Player) sender : null;
+
+        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());
+
+        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;
+    }
+
+    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;
        }
-
-        sender.sendMessage(ChatColor.AQUA + " Page " + filterObject.getPage() + " of " + totalPages);
-
-        this.showPage(filterObject.getPage(), sender, availableWorlds);
+        return color + env.toString();
    }
 }
@@ -13,12 +13,14 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;

 import java.util.List;
+import java.util.regex.Pattern;

 /**
 * A generic paginated command.
 * @param <T> The type of items on the page.
 */
 public abstract class PaginatedCommand<T> extends Command {
+    private final Pattern REGEX_SPECIAL_CHARS = Pattern.compile("[.+*?\\[^\\]$(){}=!<>|:-\\\\]");
    private static final int DEFAULT_ITEMS_PER_PAGE = 9;
    /**
     * The number of items per page.
@@ -40,12 +42,23 @@ public abstract class PaginatedCommand<T> extends Command {

    /**
     * Gets filtered items.
+     *
     * @param availableItems All available items.
     * @param filter The filter-{@link String}.
     * @return A list of items that match the filter.
     */
    protected abstract List<T> getFilteredItems(List<T> availableItems, String filter);

+    /**
+     * Escape regex special characters from filter
+     *
+     * @param filter The filter-{@link String}.
+     * @return String with regex characters escaped
+     */
+    protected String cleanFilter(String filter) {
+        return REGEX_SPECIAL_CHARS.matcher(filter).replaceAll("\\\\$0");
+    }
+
    /**
     * Constructs a single string from a list of strings.
     *
@@ -0,0 +1,62 @@
+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;
+    }
+}
@@ -0,0 +1,22 @@
+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;
+}
@@ -0,0 +1,268 @@
+package com.onarandombox.MultiverseCore.display;
+
+import com.onarandombox.MultiverseCore.display.settings.DisplaySetting;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.Map;
+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%";
+
+    /**
+     * Creates a ContentDisplay.Builder for the given content.
+     *
+     * @param content The content to be displayed.
+     * @param <T> The type of the content which can be inferred.
+     * @return A new Builder.
+     */
+    public static <T> Builder<T> forContent(T content) {
+        return new Builder<>(content);
+    }
+
+    /**
+     * Creates a ContentDisplay.Builder for the given collection of content.
+     *
+     * @param content The content to be displayed.
+     * @return A new Builder.
+     */
+    public static Builder<Collection<String>> forContent(Collection<String> content) {
+        return new Builder<>(content).displayHandler(DisplayHandlers.LIST);
+    }
+
+    /**
+     * Creates a ContentDisplay.Builder for the given map of content.
+     *
+     * @param content The content to be displayed.
+     * @return A new Builder.
+     */
+    public static Builder<Map<String, Object>> forContent(Map<String, Object> content) {
+        return new Builder<>(content).displayHandler(DisplayHandlers.INLINE_MAP);
+    }
+
+    private final T contents;
+
+    private String header;
+    private 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.
+     */
+    @NotNull
+    public String getEmptyMessage() {
+        return emptyMessage;
+    }
+
+    /**
+     * @return Gets the display handler that formats and sends content to sender.
+     */
+    @NotNull
+    public DisplayHandler<T> getDisplayHandler() {
+        return displayHandler;
+    }
+
+    /**
+     * @return Gets the color tool used.
+     */
+    @NotNull
+    public ColorTool getColorTool() {
+        return colorTool;
+    }
+
+    /**
+     * @return Gets the filter used.
+     */
+    @NotNull
+    public ContentFilter getFilter() {
+        return filter;
+    }
+
+    /**
+     * Gets the value for a given setting option.
+     *
+     * @param setting   The setting option.
+     * @param <S>       The setting type.
+     * @return Value set for the given setting.
+     */
+    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);
+        }
+    }
+}
@@ -0,0 +1,153 @@
+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 +
+                '}';
+    }
+}
@@ -0,0 +1,25 @@
+package com.onarandombox.MultiverseCore.display;
+
+/**
+ * Thrown when an issue occur while formatting content.
+ */
+public class DisplayFormatException extends Exception {
+    public DisplayFormatException() {
+    }
+
+    public DisplayFormatException(String message) {
+        super(message);
+    }
+
+    public DisplayFormatException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public DisplayFormatException(Throwable cause) {
+        super(cause);
+    }
+
+    public DisplayFormatException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}
@@ -0,0 +1,68 @@
+package com.onarandombox.MultiverseCore.display;
+
+import com.google.common.base.Strings;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+
+/**
+ * Handles the formatting and sending of all content by the {@link ContentDisplay}.
+ *
+ * @param <T>   Type of content to display.
+ */
+@FunctionalInterface
+public interface DisplayHandler<T> {
+
+    /**
+     * Formats the raw content into a {@link Collection<String>} for displaying to the given sender.
+     *
+     * @param sender The {@link CommandSender} who will the content will be displayed to.
+     * @param display The responsible {@link ContentDisplay}.
+     * @return The formatted content.
+     * @throws DisplayFormatException Issue occurred while formatting content. E.g. invalid page.
+     */
+    Collection<String> format(@NotNull CommandSender sender, @NotNull ContentDisplay<T> display)
+            throws DisplayFormatException;
+
+    /**
+     * Sends the header.
+     *
+     * @param sender The {@link CommandSender} who will the header will be displayed to.
+     * @param display The responsible {@link ContentDisplay}.
+     */
+    default void sendHeader(@NotNull CommandSender sender, @NotNull ContentDisplay<T> display) {
+        if (!Strings.isNullOrEmpty(display.getHeader())) {
+            sender.sendMessage(display.getHeader());
+        }
+    }
+
+    /**
+     * Sends info such as filter and page.
+     *
+     * @param sender The {@link CommandSender} who will the sub header will be displayed to.
+     * @param display The responsible {@link ContentDisplay}.
+     */
+    default void sendSubHeader(@NotNull CommandSender sender, @NotNull ContentDisplay<T> display) {
+        if (display.getFilter().hasFilter()) {
+            sender.sendMessage(String.format("%s[ %s ]", ChatColor.GRAY, display.getFilter().getFormattedString()));
+        }
+    }
+
+    /**
+     * Sends the content.
+     *
+     * @param sender The {@link CommandSender} who will the body will be displayed to.
+     * @param display The responsible {@link ContentDisplay}.
+     * @param formattedContent The content after being formatted by {@link #format(CommandSender, ContentDisplay)}
+     */
+    default void sendBody(@NotNull CommandSender sender, @NotNull ContentDisplay<T> display,
+                          Collection<String> formattedContent) {
+        if (formattedContent == null || formattedContent.size() == 0) {
+            sender.sendMessage(display.getEmptyMessage());
+            return;
+        }
+        sender.sendMessage(formattedContent.toArray(new String[0]));
+    }
+}
@@ -0,0 +1,47 @@
+package com.onarandombox.MultiverseCore.display;
+
+import com.onarandombox.MultiverseCore.display.handlers.InlineListDisplayHandler;
+import com.onarandombox.MultiverseCore.display.handlers.InlineMapDisplayHandler;
+import com.onarandombox.MultiverseCore.display.handlers.ListDisplayHandler;
+import com.onarandombox.MultiverseCore.display.handlers.PagedListDisplayHandler;
+import com.onarandombox.MultiverseCore.display.settings.InlineDisplaySettings;
+import com.onarandombox.MultiverseCore.display.settings.PagedDisplaySettings;
+import com.onarandombox.MultiverseCore.display.settings.MapDisplaySettings;
+
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * Various implementations of {@link DisplayHandler}.
+ */
+public class DisplayHandlers {
+
+    /**
+     * Standard list display.
+     *
+     * Supported settings: none.
+     */
+    public static final DisplayHandler<Collection<String>> LIST = new ListDisplayHandler();
+
+    /**
+     * List display with paging.
+     *
+     * Supported settings: {@link PagedDisplaySettings#SHOW_PAGE}, {@link PagedDisplaySettings#LINES_PER_PAGE},
+     * {@link PagedDisplaySettings#PAGE_IN_CONSOLE}, {@link PagedDisplaySettings#DO_END_PADDING}.
+     */
+    public static final DisplayHandler<Collection<String>> PAGE_LIST = new PagedListDisplayHandler();
+
+    /**
+     * Display a list inline.
+     *
+     * Supported settings: {@link InlineDisplaySettings#SEPARATOR}.
+     */
+    public static final DisplayHandler<Collection<String>> INLINE_LIST = new InlineListDisplayHandler();
+
+    /**
+     * Display key value pair inline.
+     *
+     * Supported settings: {@link InlineDisplaySettings#SEPARATOR}, {@link MapDisplaySettings#OPERATOR}.
+     */
+    public static final DisplayHandler<Map<String, Object>> INLINE_MAP = new InlineMapDisplayHandler();
+}
@@ -0,0 +1,36 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import com.onarandombox.MultiverseCore.display.ContentDisplay;
+import com.onarandombox.MultiverseCore.display.DisplayFormatException;
+import com.onarandombox.MultiverseCore.display.DisplayHandler;
+import com.onarandombox.MultiverseCore.display.settings.InlineDisplaySettings;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+
+public class InlineListDisplayHandler implements DisplayHandler<Collection<String>> {
+
+    @Override
+    public Collection<String> format(@NotNull CommandSender sender, @NotNull ContentDisplay<Collection<String>> display)
+            throws DisplayFormatException {
+        StringBuilder builder = new StringBuilder();
+        String separator = display.getSetting(InlineDisplaySettings.SEPARATOR);
+
+        for (Iterator<String> iterator = display.getContents().iterator(); iterator.hasNext(); ) {
+            String content = iterator.next();
+            if (!display.getFilter().checkMatch(content)) {
+                continue;
+            }
+            builder.append(display.getColorTool().get()).append(content);
+            if (iterator.hasNext()) {
+                builder.append(separator);
+            }
+        }
+        return (builder.length() == 0)
+                ? Collections.singletonList(display.getEmptyMessage())
+                : Collections.singleton(builder.toString());
+    }
+}
@@ -0,0 +1,44 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import com.onarandombox.MultiverseCore.display.ContentDisplay;
+import com.onarandombox.MultiverseCore.display.DisplayFormatException;
+import com.onarandombox.MultiverseCore.display.DisplayHandler;
+import com.onarandombox.MultiverseCore.display.settings.InlineDisplaySettings;
+import com.onarandombox.MultiverseCore.display.settings.MapDisplaySettings;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+
+public class InlineMapDisplayHandler implements DisplayHandler<Map<String, Object>> {
+
+    @Override
+    public Collection<String> format(@NotNull CommandSender sender,
+                                     @NotNull ContentDisplay<Map<String, Object>> display)
+            throws DisplayFormatException {
+        StringBuilder builder = new StringBuilder();
+        String separator = display.getSetting(InlineDisplaySettings.SEPARATOR);
+        String operator = display.getSetting(MapDisplaySettings.OPERATOR);
+
+        for (Iterator<Map.Entry<String, Object>> iterator = display.getContents().entrySet().iterator(); iterator.hasNext(); ) {
+            Map.Entry<String, Object> entry = iterator.next();
+            if (!display.getFilter().checkMatch(entry.getKey()) && !display.getFilter().checkMatch(entry.getValue())) {
+                continue;
+            }
+            builder.append(display.getColorTool().get())
+                    .append(entry.getKey())
+                    .append(operator)
+                    .append(display.getColorTool().get())
+                    .append(entry.getValue());
+            if (iterator.hasNext()) {
+                builder.append(separator);
+            }
+        }
+        return (builder.length() == 0)
+                ? Collections.singletonList(display.getEmptyMessage())
+                : Collections.singleton(builder.toString());
+    }
+}
@@ -0,0 +1,22 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import com.onarandombox.MultiverseCore.display.ContentDisplay;
+import com.onarandombox.MultiverseCore.display.DisplayFormatException;
+import com.onarandombox.MultiverseCore.display.DisplayHandler;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+public class ListDisplayHandler implements DisplayHandler<Collection<String>> {
+
+    @Override
+    public Collection<String> format(@NotNull CommandSender sender, @NotNull ContentDisplay<Collection<String>> display)
+            throws DisplayFormatException {
+        return display.getContents().stream()
+                .filter(display.getFilter()::checkMatch)
+                .map(s -> (ContentDisplay.LINE_BREAK.equals(s)) ? "" : display.getColorTool().get() + s)
+                .collect(Collectors.toList());
+    }
+}
@@ -0,0 +1,105 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import com.onarandombox.MultiverseCore.display.ContentDisplay;
+import com.onarandombox.MultiverseCore.display.DisplayFormatException;
+import com.onarandombox.MultiverseCore.display.settings.PagedDisplaySettings;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.IntStream;
+
+public class PagedListDisplayHandler extends ListDisplayHandler {
+
+    @Override
+    public Collection<String> format(@NotNull CommandSender sender, @NotNull ContentDisplay<Collection<String>> display)
+            throws DisplayFormatException {
+        if (dontNeedPaging(sender, display)) {
+            return super.format(sender, display);
+        }
+
+        int pages = 1;
+        int currentLength = 0;
+        int targetPage = display.getSetting(PagedDisplaySettings.SHOW_PAGE);
+        int linesPerPage = display.getSetting(PagedDisplaySettings.LINES_PER_PAGE);
+        List<String> content = new ArrayList<>(linesPerPage);
+
+        // Calculate the paging.
+        for (String line : display.getContents()) {
+            if (!display.getFilter().checkMatch(line)) {
+                continue;
+            }
+            // When it's the next page.
+            boolean isLineBreak = ContentDisplay.LINE_BREAK.equals(line);
+            if (isLineBreak || ++currentLength > linesPerPage) {
+                pages++;
+                currentLength = 0;
+                if (isLineBreak) {
+                    continue;
+                }
+            }
+            if (pages == targetPage) {
+                // Let first line be the header when no header is defined.
+                if (display.getHeader() == null) {
+                    display.setHeader(line);
+                    currentLength--;
+                    continue;
+                }
+                content.add(display.getColorTool().get() + line);
+            }
+        }
+
+        // Page out of range.
+        if (targetPage < 1 || targetPage > pages) {
+            if (pages == 1) {
+                throw new DisplayFormatException("There is only 1 page!");
+            }
+            throw new DisplayFormatException("Please enter a page from 1 to " + pages + ".");
+        }
+
+        // No content
+        if (content.size() == 0) {
+            content.add(display.getEmptyMessage());
+        }
+
+        // Add empty lines to make output length consistent.
+        if (display.getSetting(PagedDisplaySettings.DO_END_PADDING)) {
+            IntStream.range(0, linesPerPage - content.size()).forEach(i -> content.add(""));
+        }
+        display.setSetting(PagedDisplaySettings.TOTAL_PAGE, pages);
+
+        return content;
+    }
+
+    @Override
+    public void sendSubHeader(@NotNull CommandSender sender, @NotNull ContentDisplay<Collection<String>> display) {
+        if (dontNeedPaging(sender, display)) {
+            super.sendSubHeader(sender, display);
+            return;
+        }
+
+        if (display.getFilter().hasFilter()) {
+            sender.sendMessage(String.format("%s[ Page %s of %s, %s ]",
+                    ChatColor.GRAY,
+                    display.getSetting(PagedDisplaySettings.SHOW_PAGE),
+                    display.getSetting(PagedDisplaySettings.TOTAL_PAGE),
+                    display.getFilter().getFormattedString())
+            );
+            return;
+        }
+        sender.sendMessage(String.format("%s[ Page %s of %s ]",
+                ChatColor.GRAY,
+                display.getSetting(PagedDisplaySettings.SHOW_PAGE),
+                display.getSetting(PagedDisplaySettings.TOTAL_PAGE))
+        );
+    }
+
+    private boolean dontNeedPaging(CommandSender sender, ContentDisplay<Collection<String>> display) {
+        return sender instanceof ConsoleCommandSender
+                && !display.getSetting(PagedDisplaySettings.PAGE_IN_CONSOLE);
+    }
+}
@@ -0,0 +1,19 @@
+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();
+}
@@ -0,0 +1,15 @@
+package com.onarandombox.MultiverseCore.display.settings;
+
+import com.onarandombox.MultiverseCore.display.DisplayHandler;
+import org.bukkit.ChatColor;
+
+/**
+ * Collection of {@link DisplaySetting} that are used by various {@link DisplayHandler}.
+ */
+public class InlineDisplaySettings {
+
+    /**
+     * Inline separator. E.g. '1, 2, 3'
+     */
+    public static final DisplaySetting<String> SEPARATOR = () -> ChatColor.WHITE + ", ";
+}
@@ -0,0 +1,15 @@
+package com.onarandombox.MultiverseCore.display.settings;
+
+import com.onarandombox.MultiverseCore.display.DisplayHandler;
+import org.bukkit.ChatColor;
+
+/**
+ * Collection of {@link DisplaySetting} that are used by various {@link DisplayHandler}.
+ */
+public class MapDisplaySettings {
+
+    /**
+     * The thing between a key value pair. E.g. 'Me = Smart'
+     */
+    public static final DisplaySetting<String> OPERATOR = () -> ChatColor.WHITE + " = ";
+}
@@ -0,0 +1,30 @@
+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;
+
+}
@@ -0,0 +1,20 @@
+package com.onarandombox.MultiverseCore.enums;
+
+import com.onarandombox.MultiverseCore.utils.EnumMapping;
+import org.bukkit.World;
+import org.bukkit.WorldType;
+
+public class MVEnums {
+
+    public static final EnumMapping<World.Environment> ENVIRONMENT = EnumMapping.builder(World.Environment.class)
+            .addAlias("overworld", World.Environment.NORMAL)
+            .addAlias("hell", World.Environment.NETHER)
+            .addAlias("end", World.Environment.THE_END)
+            .addAlias("starwars", World.Environment.THE_END)
+            .mapWithoutUnderscore()
+            .build();
+
+    public static final EnumMapping<WorldType> WORLD_TYPE = EnumMapping.builder(WorldType.class)
+            .mapWithoutUnderscore()
+            .build();
+}
@@ -0,0 +1,107 @@
+package com.onarandombox.MultiverseCore.utils;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+public class EnumMapping<T extends Enum<T>> {
+
+    public static <T extends Enum<T>> Builder<T> builder(Class<T> enumClass) {
+        return builder(enumClass, false);
+    }
+
+    public static <T extends Enum<T>> Builder<T> builder(Class<T> enumClass, boolean caseSensitive) {
+        return new Builder<>(enumClass, caseSensitive);
+    }
+
+    private final Class<T> enumClass;
+    private final boolean caseSensitive;
+    private final Map<String, T> enumsMap;
+
+    public EnumMapping(Class<T> enumClass, boolean caseSensitive) {
+        this.enumClass = enumClass;
+        this.caseSensitive = caseSensitive;
+        this.enumsMap = new HashMap<>();
+    }
+
+    @NotNull
+    public Optional<T> parseValue(@Nullable String value) {
+        if (value == null) {
+            return Optional.empty();
+        }
+
+        T enumType = this.enumsMap.get(caseSensitive ? value : value.toLowerCase());
+        if (enumType != null) {
+            return Optional.of(enumType);
+        }
+
+        try {
+            return Optional.of(Enum.valueOf(enumClass, value));
+        } catch (IllegalArgumentException e) {
+            return Optional.empty();
+        }
+    }
+
+    @NotNull
+    public Map<String, T> getEnumsMap() {
+        return Collections.unmodifiableMap(this.enumsMap);
+    }
+
+    public boolean isCaseSensitive() {
+        return caseSensitive;
+    }
+
+    public Class<? extends Enum<T>> getEnumClass() {
+        return enumClass;
+    }
+
+    public static class Builder<T extends Enum<T>> {
+
+        private final EnumMapping<T> enumMapping;
+
+        public Builder(Class<T> enumClass, boolean caseSensitive) {
+            this.enumMapping = new EnumMapping<>(enumClass, caseSensitive);
+            if (!this.enumMapping.caseSensitive) {
+                addLowerCaseMap();
+            }
+        }
+
+        private void addLowerCaseMap() {
+            Arrays.stream(this.enumMapping.enumClass.getEnumConstants()).forEach(enumType -> {
+                addAlias(enumType.name(), enumType);
+            });
+        }
+
+        public Builder<T> mapWithoutUnderscore() {
+            Arrays.stream(this.enumMapping.enumClass.getEnumConstants()).forEach(enumType -> {
+                addAlias(enumType.name().replace("_", ""), enumType);
+            });
+            return this;
+        }
+
+        @NotNull
+        public Builder<T> addAlias(String aliasName, String enumString) {
+            this.enumMapping.parseValue(enumString).ifPresent(enumType -> addAlias(aliasName, enumType));
+            return this;
+        }
+
+        @NotNull
+        public Builder<T> addAlias(String aliasName, T enumType) {
+            if (!this.enumMapping.caseSensitive) {
+                aliasName = aliasName.toLowerCase();
+            }
+            this.enumMapping.enumsMap.computeIfAbsent(aliasName, name -> enumType);
+            return this;
+        }
+
+        @NotNull
+        public EnumMapping<T> build() {
+            return this.enumMapping;
+        }
+    }
+}
@@ -14,15 +14,9 @@ import org.bukkit.Server;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;

 import java.io.File;

@@ -31,9 +25,6 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class, JavaPluginLoader.class})
-@PowerMockIgnore("javax.script.*")
 public class TestDebugMode {
    TestInstanceCreator creator;
    Server mockServer;
@@ -7,35 +7,29 @@ import com.onarandombox.MultiverseCore.utils.MockWorldFactory;
 import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import org.bukkit.World;
 import org.bukkit.WorldType;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Sheep;
 import org.bukkit.entity.Zombie;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;

 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

-import static junit.framework.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;

-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class, JavaPluginLoader.class})
-@PowerMockIgnore("javax.script.*")
 public class TestEntitySpawnRules {
    TestInstanceCreator creator;
    MultiverseCore core;
@@ -157,6 +151,6 @@ public class TestEntitySpawnRules {
        when(zombie.getType()).thenReturn(EntityType.ZOMBIE);
        when(zombie.getWorld()).thenReturn(this.cbworld);

-        when(cbworld.getEntities()).thenReturn(Arrays.asList((Entity) sheep, (Entity) zombie));
+        when(cbworld.getEntities()).thenReturn(Arrays.asList(sheep, zombie));
    }
 }
@@ -2,24 +2,17 @@ package com.onarandombox.MultiverseCore;

 import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import org.bukkit.Material;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;

 import java.util.HashMap;
 import java.util.Map;

-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;

-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class, JavaPluginLoader.class})
-@PowerMockIgnore("javax.script.*")
 public class TestEntryFeeConversion {

    private TestInstanceCreator creator;
@@ -6,24 +6,16 @@ import org.bukkit.Server;
 import org.bukkit.World.Environment;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;

-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class, JavaPluginLoader.class })
-@PowerMockIgnore("javax.script.*")
 public class TestModifyCommand {
    TestInstanceCreator creator;
    Server mockServer;
@@ -13,8 +13,6 @@ 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 com.onarandombox.MultiverseCore.utils.WorldManager;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
@@ -36,33 +34,26 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.weather.ThunderChangeEvent;
 import org.bukkit.event.weather.WeatherChangeEvent;
-import org.bukkit.permissions.Permission;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.internal.verification.VerificationModeFactory;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;

 import java.io.File;

-import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;

-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ PluginManager.class, MultiverseCore.class, Permission.class, Bukkit.class,
-        WeatherChangeEvent.class, ThunderChangeEvent.class, AsyncPlayerChatEvent.class,
-        PlayerJoinEvent.class, PlayerRespawnEvent.class, EntityRegainHealthEvent.class,
-        FoodLevelChangeEvent.class, WorldManager.class, PluginDescriptionFile.class, JavaPluginLoader.class })
-@PowerMockIgnore("javax.script.*")
 public class TestWorldProperties {
    private TestInstanceCreator creator;
    private MultiverseCore core;
@@ -122,7 +113,7 @@ public class TestWorldProperties {
        String[] netherArgs = new String[] { "import", "world_nether", "nether" };
        core.onCommand(mockCommandSender, mockCommand, "", netherArgs);
        verify(mockCommandSender).sendMessage("Starting import of world 'world_nether'...");
-        verify(mockCommandSender, VerificationModeFactory.times(2)).sendMessage(
+        verify(mockCommandSender, times(2)).sendMessage(
                ChatColor.GREEN + "Complete!");

        assertEquals(core.getServer().getWorlds().size(), 2);
@@ -222,7 +213,7 @@ public class TestWorldProperties {
        assertTrue(mvWorld.setColor("BLACK"));
        assertFalse(mvWorld.setColor("INVALID COLOR"));
        assertEquals(ChatColor.BLACK, mvWorld.getColor());
-        assertEquals(ChatColor.BLACK.toString() + "alias" + ChatColor.WHITE.toString(), mvWorld.getColoredWorldString());
+        assertEquals(ChatColor.BLACK + "alias" + ChatColor.WHITE, mvWorld.getColoredWorldString());
        mvWorld.setPVPMode(false);
        assertEquals(false, mvWorld.isPVPEnabled());
        assertTrue(mvWorld.setScaling(2D));
@@ -329,7 +320,7 @@ public class TestWorldProperties {
        assertEquals(true, mvWorld.isHidden());
        assertEquals("alias", mvWorld.getAlias());
        assertEquals(ChatColor.GREEN, mvWorld.getColor());
-        assertEquals(ChatColor.GREEN.toString() + "alias" + ChatColor.WHITE.toString(), mvWorld.getColoredWorldString());
+        assertEquals(ChatColor.GREEN + "alias" + ChatColor.WHITE, mvWorld.getColoredWorldString());
        assertEquals(false, mvWorld.isPVPEnabled());
        assertEquals(2D, mvWorld.getScaling(), 0);
        assertSame(worldManager.getMVWorld("world_nether").getCBWorld(),
@@ -366,36 +357,36 @@ public class TestWorldProperties {
        when(mockPlayer.hasPlayedBefore()).thenReturn(true);
        when(mockPlayer.hasPermission("multiverse.access.world")).thenReturn(true);
        when(mockPlayer.getName()).thenReturn("MultiverseMan");
-        playerChatEvent = PowerMockito.mock(AsyncPlayerChatEvent.class);
+        playerChatEvent = mock(AsyncPlayerChatEvent.class);
        when(playerChatEvent.getPlayer()).thenReturn(mockPlayer);
        when(playerChatEvent.getFormat()).thenReturn("format");
        // player join
        mockNewPlayer = mock(Player.class);
        when(mockNewPlayer.hasPlayedBefore()).thenReturn(false);
-        playerJoinEvent = PowerMockito.mock(PlayerJoinEvent.class);
+        playerJoinEvent = mock(PlayerJoinEvent.class);
        when(playerJoinEvent.getPlayer()).thenReturn(mockPlayer);
-        playerNewJoinEvent = PowerMockito.mock(PlayerJoinEvent.class);
+        playerNewJoinEvent = mock(PlayerJoinEvent.class);
        when(playerNewJoinEvent.getPlayer()).thenReturn(mockNewPlayer);
        // player respawn
-        playerRespawnBed = PowerMockito.mock(PlayerRespawnEvent.class);
+        playerRespawnBed = mock(PlayerRespawnEvent.class);
        when(playerRespawnBed.getPlayer()).thenReturn(mockPlayer);
        when(playerRespawnBed.isBedSpawn()).thenReturn(true);
-        playerRespawnNormal = PowerMockito.mock(PlayerRespawnEvent.class);
+        playerRespawnNormal = mock(PlayerRespawnEvent.class);
        when(playerRespawnNormal.getPlayer()).thenReturn(mockPlayer);
        when(playerRespawnNormal.isBedSpawn()).thenReturn(false);
        //// Entity events
        mockHumanEntity = mock(HumanEntity.class);
        // entity regain health
-        entityRegainHealthEvent = PowerMockito.mock(EntityRegainHealthEvent.class);
+        entityRegainHealthEvent = mock(EntityRegainHealthEvent.class);
        when(entityRegainHealthEvent.getRegainReason()).thenReturn(RegainReason.REGEN);
        when(mockHumanEntity.getLocation()).thenReturn(new Location(world, 0, 0, 0));
        when(entityRegainHealthEvent.getEntity()).thenReturn(mockHumanEntity);
        // entity food level change event
-        entityFoodLevelChangeEvent = PowerMockito.mock(FoodLevelChangeEvent.class);
+        entityFoodLevelChangeEvent = mock(FoodLevelChangeEvent.class);
        // this won't do anything since we're not mocking a player,
        // but the plugin should be able to handle this!
        when(entityFoodLevelChangeEvent.getEntity()).thenReturn(mockHumanEntity);
-        entityFoodLevelRiseEvent = PowerMockito.mock(FoodLevelChangeEvent.class);
+        entityFoodLevelRiseEvent = mock(FoodLevelChangeEvent.class);
        when(mockPlayer.getFoodLevel()).thenReturn(2);
        when(entityFoodLevelRiseEvent.getEntity()).thenReturn(mockPlayer);
        when(entityFoodLevelRiseEvent.getFoodLevel()).thenReturn(3);
@@ -4,28 +4,21 @@ import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.api.WorldPurger;
 import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import org.bukkit.World;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Sheep;
 import org.bukkit.entity.Zombie;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;

 import java.util.Arrays;

 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;

-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class, JavaPluginLoader.class })
-@PowerMockIgnore("javax.script.*")
 public class TestWorldPurger {
    TestInstanceCreator creator;
    MultiverseCore core;
@@ -121,6 +114,6 @@ public class TestWorldPurger {
        zombie = mock(Zombie.class);
        when(zombie.getType()).thenReturn(EntityType.ZOMBIE);
        when(zombie.getWorld()).thenReturn(world);
-        when(cbworld.getEntities()).thenReturn(Arrays.asList((Entity) sheep, (Entity) zombie));
+        when(cbworld.getEntities()).thenReturn(Arrays.asList(sheep, zombie));
    }
 }
@@ -12,39 +12,30 @@ import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
 import com.onarandombox.MultiverseCore.utils.MockWorldFactory;
 import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import com.onarandombox.MultiverseCore.utils.WorldCreatorMatcher;
-import com.onarandombox.MultiverseCore.utils.WorldManager;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.Server;
 import org.bukkit.WorldCreator;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.Permission;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatchers;
-import org.mockito.Matchers;
 import org.mockito.internal.verification.VerificationModeFactory;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;

 import java.io.File;

-import static junit.framework.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;

-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ PluginManager.class, MultiverseCore.class, Permission.class, Bukkit.class, WorldManager.class,
-        PluginDescriptionFile.class, JavaPluginLoader.class })
-@PowerMockIgnore("javax.script.*")
 public class TestWorldStuff {

    private TestInstanceCreator creator;
@@ -1,7 +1,8 @@
 package com.onarandombox.MultiverseCore.utils;

-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;

 import java.io.IOException;
 import java.nio.file.Files;
@@ -10,10 +11,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

-import com.dumptruckman.minecraft.util.Logging;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;

 public class FileUtilsTest {

@@ -137,7 +136,7 @@ public class FileUtilsTest {
        assertTrue(Files.isRegularFile(targetChildDirFile));
    }

-    @Test()
+    @Test
    public void copyFolder_intoExistingFolder_whereFileExists() throws Exception {
        Path targetDir = Files.createDirectory(tempDir.resolve("target"));
        Path targetFile = Files.createFile(targetDir.resolve("parentDirFile.txt"));
@@ -21,13 +21,17 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.WeakHashMap;
-import java.util.LinkedHashMap;

-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;

 public class MockWorldFactory {

@@ -27,13 +27,9 @@ import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.java.JavaPluginLoader;
 import org.bukkit.scheduler.BukkitScheduler;
-import org.mockito.ArgumentMatchers;
+import org.mockito.internal.util.reflection.ReflectionMemberAccessor;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.powermock.api.easymock.PowerMock;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.MockGateway;
-import org.powermock.reflect.Whitebox;

 import java.io.File;
 import java.lang.reflect.Field;
@@ -44,15 +40,16 @@ import java.util.logging.Level;
 import java.util.logging.Logger;

 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.anyLong;
+import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;

 public class TestInstanceCreator {
    private MultiverseCore core;
@@ -69,28 +66,20 @@ public class TestInstanceCreator {
            pluginDirectory.mkdirs();
            assertTrue(pluginDirectory.exists());

-            MockGateway.MOCK_STANDARD_METHODS = false;
-
            // Initialize the Mock server.
            mockServer = mock(Server.class);
-            JavaPluginLoader mockPluginLoader = PowerMock.createMock(JavaPluginLoader.class);
-            Whitebox.setInternalState(mockPluginLoader, "server", mockServer);
+            JavaPluginLoader mockPluginLoader = mock(JavaPluginLoader.class);
+            new ReflectionMemberAccessor().set(JavaPluginLoader.class.getDeclaredField("server"), mockPluginLoader, mockServer);
            when(mockServer.getName()).thenReturn("TestBukkit");
            Logger.getLogger("Minecraft").setParent(Util.logger);
            when(mockServer.getLogger()).thenReturn(Util.logger);
            when(mockServer.getWorldContainer()).thenReturn(worldsDirectory);

            // Return a fake PDF file.
-            PluginDescriptionFile pdf = PowerMockito.spy(new PluginDescriptionFile("Multiverse-Core", "2.2-Test",
+            PluginDescriptionFile pdf = spy(new PluginDescriptionFile("Multiverse-Core", "2.2-Test",
                    "com.onarandombox.MultiverseCore.MultiverseCore"));
            when(pdf.getAuthors()).thenReturn(new ArrayList<String>());
-            core = PowerMockito.spy(new MultiverseCore(mockPluginLoader, pdf, pluginDirectory, new File(pluginDirectory, "testPluginFile")));
-            PowerMockito.doAnswer(new Answer<Void>() {
-                @Override
-                public Void answer(InvocationOnMock invocation) throws Throwable {
-                    return null; // don't run metrics in tests
-                }
-            }).when(core, "setupMetrics");
+            core = spy(new MultiverseCore(mockPluginLoader, pdf, pluginDirectory, new File(pluginDirectory, "testPluginFile")));

            // Let's let all MV files go to bin/test
            doReturn(pluginDirectory).when(core).getDataFolder();
@@ -103,7 +92,7 @@ public class TestInstanceCreator {
            JavaPlugin[] plugins = new JavaPlugin[] { core };

            // Mock the Plugin Manager
-            PluginManager mockPluginManager = PowerMockito.mock(PluginManager.class);
+            PluginManager mockPluginManager = mock(PluginManager.class);
            when(mockPluginManager.getPlugins()).thenReturn(plugins);
            when(mockPluginManager.getPlugin("Multiverse-Core")).thenReturn(core);
            when(mockPluginManager.getPermission(anyString())).thenReturn(null);
@@ -157,7 +146,7 @@ public class TestInstanceCreator {

            when(mockServer.getPluginManager()).thenReturn(mockPluginManager);

-            when(mockServer.createWorld(ArgumentMatchers.isA(WorldCreator.class))).thenAnswer(
+            when(mockServer.createWorld(isA(WorldCreator.class))).thenAnswer(
                    new Answer<World>() {
                        @Override
                        public World answer(InvocationOnMock invocation) throws Throwable {
@@ -219,7 +208,7 @@ public class TestInstanceCreator {
            buscriptfield.setAccessible(true);

            try {
-                buscript = PowerMockito.spy(new Buscript(core));
+                buscript = spy(new Buscript(core));
                when(buscript.getPlugin()).thenReturn(core);
            } catch (NullPointerException e) {
                buscript = null;
@@ -228,25 +217,25 @@ public class TestInstanceCreator {
            buscriptfield.set(core, buscript);

            // Set worldManager
-            WorldManager wm = PowerMockito.spy(new WorldManager(core));
+            WorldManager wm = spy(new WorldManager(core));
            Field worldmanagerfield = MultiverseCore.class.getDeclaredField("worldManager");
            worldmanagerfield.setAccessible(true);
            worldmanagerfield.set(core, wm);

            // Set playerListener
-            MVPlayerListener pl = PowerMockito.spy(new MVPlayerListener(core));
+            MVPlayerListener pl = spy(new MVPlayerListener(core));
            Field playerlistenerfield = MultiverseCore.class.getDeclaredField("playerListener");
            playerlistenerfield.setAccessible(true);
            playerlistenerfield.set(core, pl);

            // Set entityListener
-            MVEntityListener el = PowerMockito.spy(new MVEntityListener(core));
+            MVEntityListener el = spy(new MVEntityListener(core));
            Field entitylistenerfield = MultiverseCore.class.getDeclaredField("entityListener");
            entitylistenerfield.setAccessible(true);
            entitylistenerfield.set(core, el);

            // Set weatherListener
-            MVWeatherListener wl = PowerMockito.spy(new MVWeatherListener(core));
+            MVWeatherListener wl = spy(new MVWeatherListener(core));
            Field weatherlistenerfield = MultiverseCore.class.getDeclaredField("weatherListener");
            weatherlistenerfield.setAccessible(true);
            weatherlistenerfield.set(core, wl);
@@ -264,9 +253,9 @@ public class TestInstanceCreator {
            when(commandSender.getServer()).thenReturn(mockServer);
            when(commandSender.getName()).thenReturn("MockCommandSender");
            when(commandSender.isPermissionSet(anyString())).thenReturn(true);
-            when(commandSender.isPermissionSet(ArgumentMatchers.isA(Permission.class))).thenReturn(true);
+            when(commandSender.isPermissionSet(isA(Permission.class))).thenReturn(true);
            when(commandSender.hasPermission(anyString())).thenReturn(true);
-            when(commandSender.hasPermission(ArgumentMatchers.isA(Permission.class))).thenReturn(true);
+            when(commandSender.hasPermission(isA(Permission.class))).thenReturn(true);
            when(commandSender.addAttachment(core)).thenReturn(null);
            when(commandSender.isOp()).thenReturn(true);

@@ -10,8 +10,8 @@ package com.onarandombox.MultiverseCore.utils;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.Handler;
 import java.util.logging.Level;
-import java.util.logging.LogRecord;
 import java.util.logging.Logger;
+import java.util.logging.LogRecord;

 public class Util {
    private Util() {}
@@ -11,7 +11,7 @@ import org.bukkit.WorldCreator;
 import org.mockito.ArgumentMatcher;

 public class WorldCreatorMatcher implements ArgumentMatcher<WorldCreator> {
-    private WorldCreator worldCreator;
+    private final WorldCreator worldCreator;
    private boolean careAboutSeeds = false;
    private boolean careAboutGenerators = false;

@@ -0,0 +1 @@
+mock-maker-inline
Author	SHA1	Message	Date
Ben Woo	fee9b95bef	Safer null checking with parsing enum value.	2021-07-22 11:42:54 +08:00
Ben Woo	b940063104	Implement new way of mapping enums with alias.	2021-07-22 11:39:39 +08:00
Ben Woo	1a8a97daf1	Merge pull request #2675 from Multiverse/replace_travis_badge Replace Travis Badge with Github Actions.	2021-07-22 10:12:35 +08:00
nicegamer7	d9dffa8e6d	replace travis badge	2021-07-21 22:11:09 -04:00
nicegamer7	973588defb	Merge pull request #2175 from JLLeitschuh/fix/JLL/use_https_to_resolve_dependencies [SECURITY] Use HTTPS to resolve dependencies in Maven Build	2021-07-19 20:14:17 -04:00
nicegamer7	c704c1ca3a	Merge branch 'main' into fix/JLL/use_https_to_resolve_dependencies	2021-07-19 20:12:25 -04:00
Ben Woo	c33a268b91	Merge pull request #2672 from Multiverse/fix_java16_tests Fix Tests on Java 16 and code cleanup.	2021-07-19 10:31:31 +08:00
Kermina Awad	9821f1d9c8	clean up test files	2021-07-18 13:51:53 -04:00
Kermina Awad	be6e0b67be	don't run tests in parallel	2021-07-18 13:22:04 -04:00
Kermina Awad	b9b1fa6164	remove PowerMockito	2021-07-18 13:17:15 -04:00
Kermina Awad	28585dd6f9	remove unnecessary stub	2021-07-18 13:12:09 -04:00
Ben Woo	47ca7b821b	Move to GitHub actions (#2671 ) * Remove use of travis. * Add basic github action maven build.	2021-07-17 09:31:20 +08:00
nicegamer7	9ce2dfd100	Merge pull request #2445 from benwoo1110/fix-help Fix issue where special chars cause PatternSyntaxException	2021-07-16 09:51:21 -04:00
Ben Woo	473ccd09d7	Don't need to toLowerCase filter.	2021-07-16 21:38:57 +08:00
Ben WooandJeremy Wood	cc2e1d44b2	Implement new content display system. (#2584 ) * Implement new content display system. * Add @FunctionalInterface annotation to displaytools interfaces. * Use static factory method to create Builder with contents. * Use T for generic type since it's static method. * Rename Builder#display to show and require CommandSender. * Rename package from displaytools to display. * Move DisplayHandler impls into their own package. * Overload ContentDisplay#forContent with defaults for list and map. * Pass CommandSender to send command. This system is much more versatile when a single ContentDisplay instance can be used for multiple players. * Rename ContentDisplay#send to #show. * Split DisplaySettings into separate classes. Co-authored-by: Jeremy Wood <farachan@gmail.com>	2021-07-07 10:25:07 +08:00
Jeremy Wood	2e8f159d38	Merge pull request #2666 from Multiverse/https Ensure https is used for repository.	2021-07-06 14:12:46 -04:00
Jeremy Wood	6581d16125	Merge pull request #2519 from Multiverse/readme-update Update readme with more project details	2021-07-06 13:59:35 -04:00
Jeremy Wood	562bc56e83	Merge pull request #2664 from ccuser44/main Create LICENSE.md	2021-07-06 13:56:16 -04:00
Ben Woo	4493cd7916	Ensure https is used for repository.	2021-07-06 23:27:53 +08:00
nicegamer7	1cd9e45915	Merge pull request #2663 from Multiverse/fix-portal-search Set defaultportalsearch to true by default.	2021-07-05 15:16:01 -04:00
ccuser44	acb6bc6dd6	Create LICENSE.md	2021-07-05 11:39:50 +03:00
Ben Woo	b7b17c5d21	Set defaultportalsearch to true by default.	2021-07-05 11:28:52 +08:00
Jeremy Wood	bbd9211845	Bump version to 4.3.1-SNAPSHOT for continued development.	2021-06-23 15:47:52 -04:00
benwoo1110	9741b1794c	Update readme with more project details	2020-12-31 00:42:22 +08:00
benwoo1110	5d3d732c25	Fix issue where special chars cause PatternSyntaxException Escape regex special chars for help command	2020-10-09 12:19:32 +08:00
Jonathan Leitschuh	59b6522d59	Use HTTPS instead of HTTP to resolve dependencies This fixes a security vulnerability in this project where the `pom.xml` files were configuring Maven to resolve dependencies over HTTP instead of HTTPS. Signed-off-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>	2020-02-11 09:04:52 -05:00