Version 4.1.1-1.8.8-SNAPSHOT!

Bumped version to 4.1.1-SNAPSHOT for continued development.
(cherry picked from commit 1ba693ffd5)
2019-08-25 00:14:43 -04:00 · 2019-08-25 00:09:58 -04:00 · 2019-08-25 00:09:09 -04:00 · 2019-08-25 00:09:03 -04:00 · 2019-08-25 00:08:55 -04:00 · 2019-08-25 00:08:45 -04:00
50 changed files with 771 additions and 1504 deletions
@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: 💬 Multiverse Discord Server
-    url: https://discord.gg/NZtfKky
-    about: Need help with using Multiverse-Core or just want to chat with the devs? Join the Multiverse Discord Server for help!
@@ -1,56 +0,0 @@
---
-name: ❓ Help!
-about: Encountered a problem with Multiverse-Core? Not sure how to fix it?
-title: ''
-labels: 'Type: Assistance'
-assignees: ''
-
---
-
-<!-- Multiverse-Core help guide
-
-Don't write inside the arrows as they will be hidden when you post your issue.
-
-Get latest build from: http://ci.onarandombox.com/view/Multiverse/
-
-If you need help other submodules of Multiverse, go to their respective git repo:
-    Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues
-    Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues
-    Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues
-    Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues
-
-Or come join our Discord server to get help sooner: https://discord.gg/NZtfKky
-
-If you're happy to wait (or you were sent here from Discord), read on:
-
-1.  Check the Usage and FAQ pages to see if it answers your queries:
-      https://github.com/Multiverse/Multiverse-Core/wiki/Basics
-      https://github.com/Multiverse/Multiverse-Core/wiki/FAQ
-
-2.  Fill out the template.
-      This will help us understand what problem you've encountered and help us
-      find a solution.
-
-3.  When linking files, do not attach them to the post!
-      Copy and paste any logs into https://gist.github.com/ or other similar service.
-
-4.  Delete this line and all above lines before posting your issue!       -->
-
-### Information
-
-* **Server version:** <!-- Insert output of `/version` command -->
-
-* **Full output of `/mv version -p`:** <!-- Replace this with the command output's https://paste.gg/ link -->
-
-* **Server log:** <!-- Upload `logs/latest.log` to https://gist.github.com/ -->
-
-### Help request
-
-**Problem**
-<!-- What problem did you encounter? -->
-
-**What I have tried**
-<!-- What have you tried so far? -->
-
-**Screenshots**
-<!-- If relevant, include any screenshots here. -->
@@ -1,59 +0,0 @@
---
-name: 🐛 Report a Bug
-about: Report a Multiverse-Core bug. Only use this if you're 100% sure it's something wrong with Multiverse-Core - otherwise, try "Help!".
-title: ''
-labels: 'Bug: Unconfirmed'
-assignees: ''
-
---
-
-<!-- Multiverse-Core bug reporting guide
-
-Don't put anything inside this block, as it won't be included in the issue.
-
-Get latest build from: http://ci.onarandombox.com/view/Multiverse/
-
-If you are having issues with other submodules of Multiverse, go to their respective git repo:
-    Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues
-    Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues
-    Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues
-    Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues
-
-If you are reporting a bug, please follow the following steps:
-
-1.  Fill out the template in full.
-      Run the commands in the console. Don't just put "latest" as a version,
-      or we will ignore it.
-
-2.  When linking files, do not attach them to the post!
-      Copy and paste any logs into https://gist.github.com/, then paste a
-      link to them in the relevant parts of the template.
-      **DO NOT drag files into this box!**
-
-3.  Make sure not to write between the arrows, as anything there will be
-    hidden.
-
-4.  Delete this line and all above lines before posting your issue!       -->
-
-### Information
-
-* **Server version:** <!-- Insert output of `/version` command -->
-
-* **Full output of `/mv version -p`:** <!-- Replace this with the command output's https://paste.gg/ link -->
-
-* **Server log:** <!-- Upload `logs/latest.log` to https://gist.github.com/ -->
-
-### Details
-I was **`<able / not able>`** to reproduce my issue on a freshly setup and up-to-date server with the latest version of Multiverse plugins with no other plugins and with no kinds of other server or client mods.
-
-**Description**  
-<!-- Replace this with a brief summary of the bug. -->
-
-**Steps to reproduce**  
-<!-- Replace this with exactly what you did to cause the bug. -->
-
-**Expected behavior**  
-<!-- Replace this with what you expected to happen. -->
-
-**Screenshots**  
-<!-- Replace this with screenshots, if necessary. -->
@@ -1,54 +0,0 @@
---
-name: 💡 Request a Feature
-about: Suggest a feature you want to see in Multiverse-Core!
-title: ''
-labels: 'Type: Idea'
-assignees: ''
-
---
-
-<!-- Multiverse-Core feature request guide
-
-Fill out the template. Don't write inside the arrows as they will be hidden
-when you post your issue.
-
-Get latest build from: http://ci.onarandombox.com/view/Multiverse/
-
-If you are look for other submodules of Multiverse, go to their respective git repo:
-    Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues
-    Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues
-    Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues
-    Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues
-
-Not sure if your feature fits in Multiverse-Core? Feel free to ask on our Discord
-server: https://discord.gg/NZtfKky
-
-If you have a feature suggestion for Multiverse-Core, read the following tips:
-
-1.  Fill out the template.
-      This will help us understand what you're requesting and why you want us
-      to add it.
-
-2.  Keep it simple.
-      Make sure it's easy to understand what you're requesting. A good way is
-      to keep it to one request per GitHub issue, as we can then easily track
-      feature requests.
-
-3.  Check whether it has already been asked or added.
-      You can search the issue tracker to see if your feature has already been
-      requested at https://github.com/Multiverse/Multiverse-Core/issues.
-
-4.  Ask yourself: "Does this belong in Multiverse-Core?"
-      There are lots of features that we reject because most servers won't
-      need or use them. If your feature is very specific or already exists in
-      another plugin, it might not be a good fit for Multiverse-Core.
-
-5.  Delete this line and all above lines before posting your issue!       -->
-
-### Feature request
-
-**Feature description**
-<!-- What feature are you suggesting? -->
-
-**How the feature is useful**
-<!-- How is the feature useful to players, server owners and/or developers? -->
@@ -3,4 +3,5 @@ jdk:
  - oraclejdk8
 notifications:
  email: false
-dist: trusty
+before_install:
+  - sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g' ~/.m2/settings.xml
@@ -13,4 +13,4 @@ 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.
-
+ 
@@ -0,0 +1,3 @@
+machine:
+  java:
+    version: oraclejdk8
@@ -3,13 +3,12 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.onarandombox.multiversecore</groupId>
    <artifactId>Multiverse-Core</artifactId>
-    <version>4.2.3-SNAPSHOT</version>
+    <version>4.1.1-1.8.8-SNAPSHOT</version>
    <name>Multiverse-Core</name>
    <description>World Management Plugin</description>
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.build.number>UNKNOWN</project.build.number>
-        <project.bitly-access-token>bitly-access-token</project.bitly-access-token>
    </properties>

    <repositories>
@@ -34,9 +33,10 @@
            <id>minebench-repo</id>
            <url>https://repo.minebench.de/</url>
        </repository>
+        <!-- Has a copy of metrics R8-SNAPSHOT !-->
        <repository>
-            <id>CodeMC</id>
-            <url>https://repo.codemc.org/repository/maven-public</url>
+            <id>elmakers-repo</id>
+            <url>http://maven.elmakers.com/repository/</url>
        </repository>
    </repositories>

@@ -70,17 +70,6 @@
                <project.build.number>${env.BUILD_NUMBER}</project.build.number>
            </properties>
        </profile>
-        <profile>
-            <id>bitly</id>
-            <activation>
-                <property>
-                    <name>env.BITLY_ACCESS_TOKEN</name>
-                </property>
-            </activation>
-            <properties>
-                <project.bitly-access-token>${env.BITLY_ACCESS_TOKEN}</project.bitly-access-token>
-            </properties>
-        </profile>
    </profiles>

    <build>
@@ -102,44 +91,21 @@
                <version>1.4.1</version>
                <executions>
                    <execution>
-                        <id>replace-bitly-access-token</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>replace</goal>
-                        </goals>
-                        <configuration>
-                            <basedir>${project.build.sourceDirectory}</basedir>
-                            <includes>
-                                <include>com/onarandombox/MultiverseCore/utils/webpaste/BitlyURLShortener.java</include>
-                            </includes>
-                            <replacements>
-                                <replacement>
-                                    <token>bitly-access-token</token>
-                                    <value>${project.bitly-access-token}</value>
-                                </replacement>
-                            </replacements>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>replace-maven-version-number</id>
                        <phase>prepare-package</phase>
                        <goals>
                            <goal>replace</goal>
                        </goals>
-                        <configuration>
-                            <basedir>${project.build.directory}/classes</basedir>
-                            <includes>
-                                <include>plugin.yml</include>
-                            </includes>
-                            <replacements>
-                                <replacement>
-                                    <token>maven-version-number</token>
-                                    <value>${project.version}-b${project.build.number}</value>
-                                </replacement>
-                            </replacements>
-                        </configuration>
                    </execution>
                </executions>
+                <configuration>
+                    <file>target/classes/plugin.yml</file>
+                    <replacements>
+                        <replacement>
+                            <token>maven-version-number</token>
+                            <value>${project.version}-b${project.build.number}</value>
+                        </replacement>
+                    </replacements>
+                </configuration>
            </plugin>
            <!-- Jar Plugin -->
            <plugin>
@@ -237,8 +203,8 @@
                                    <shadedPattern>com.onarandombox.buscript</shadedPattern>
                                </relocation>
                                <relocation>
-                                    <pattern>org.bstats</pattern>
-                                    <shadedPattern>com.onarandombox.bstats</shadedPattern>
+                                    <pattern>org.mcstats</pattern>
+                                    <shadedPattern>com.onarandombox.mcstats</shadedPattern>
                                </relocation>
                                <relocation>
                                    <pattern>com.dumptruckman.minecraft.util.Logging</pattern>
@@ -281,7 +247,7 @@
        <dependency>
           <groupId>org.bukkit</groupId>
           <artifactId>bukkit</artifactId>
-           <version>1.13.2-R0.1-SNAPSHOT</version>
+           <version>1.8.8-R0.1-SNAPSHOT</version>
           <scope>provided</scope>
        </dependency>
        <!-- SerializationConfig Dependency -->
@@ -301,7 +267,7 @@
        <dependency>
            <groupId>net.milkbowl.vault</groupId>
            <artifactId>VaultAPI</artifactId>
-            <version>1.7</version>
+            <version>1.5</version>
            <scope>provided</scope>
        </dependency>
        <!-- End of Economy Dependency -->
@@ -317,9 +283,9 @@
            <version>2.0-SNAPSHOT</version>
        </dependency>
        <dependency>
-            <groupId>org.bstats</groupId>
-            <artifactId>bstats-bukkit</artifactId>
-            <version>1.7</version>
+            <groupId>org.mcstats.bukkit</groupId>
+            <artifactId>metrics</artifactId>
+            <version>R6</version>
            <exclusions>
                <exclusion>
                    <groupId>org.bukkit</groupId>
@@ -17,9 +17,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Level;

 import buscript.Buscript;
@@ -32,6 +34,7 @@ import com.onarandombox.MultiverseCore.api.MVPlugin;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
 import com.onarandombox.MultiverseCore.api.MultiverseMessaging;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.commands.AnchorCommand;
 import com.onarandombox.MultiverseCore.commands.CheckCommand;
@@ -93,8 +96,6 @@ import com.onarandombox.MultiverseCore.utils.MVMessaging;
 import com.onarandombox.MultiverseCore.utils.MVPermissions;
 import com.onarandombox.MultiverseCore.utils.MVPlayerSession;
 import com.onarandombox.MultiverseCore.utils.MaterialConverter;
-import com.onarandombox.MultiverseCore.utils.TestingMode;
-import com.onarandombox.MultiverseCore.utils.metrics.MetricsConfigurator;
 import com.onarandombox.MultiverseCore.utils.SimpleBlockSafety;
 import com.onarandombox.MultiverseCore.utils.SimpleLocationManipulation;
 import com.onarandombox.MultiverseCore.utils.SimpleSafeTTeleporter;
@@ -108,6 +109,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
+import org.bukkit.World.Environment;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.Configuration;
@@ -120,6 +122,7 @@ import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.java.JavaPluginLoader;
+import org.mcstats.Metrics;

 /**
 * The implementation of the Multiverse-{@link Core}.
@@ -337,29 +340,107 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        // Output a little snippet to show it's enabled.
        Logging.config("Version %s (API v%s) Enabled - By %s", this.getDescription().getVersion(), PROTOCOL, getAuthors());

-        if (getMVConfig().isShowingDonateMessage()) {
-            getLogger().config("Help dumptruckman keep this project alive. Become a patron! https://www.patreon.com/dumptruckman");
-            getLogger().config("One time donations are also appreciated: https://www.paypal.me/dumptruckman");
-        }
-    }
-
-    private void setupMetrics() {
-        if (TestingMode.isDisabled()) {
-            MetricsConfigurator.configureMetrics(this);
-        }
+        getLogger().info("Help dumptruckman keep this project alive. Become a patron! https://www.patreon.com/dumptruckman");
+        getLogger().info("One time donations are also appreciated: https://www.paypal.me/dumptruckman");
    }

    /**
     * Initializes the buscript javascript library.
     */
    private void initializeBuscript() {
+        buscript = new Buscript(this);
+        // Add global variable "multiverse" to javascript environment
+        buscript.setScriptVariable("multiverse", this);
+    }
+
+    /**
+     * Plotter for Environment-Values.
+     */
+    private static final class EnvironmentPlotter extends Metrics.Plotter {
+        private MultiverseCore core;
+        private final Environment env;
+
+        public EnvironmentPlotter(MultiverseCore core, Environment env) {
+            super(envToString(env));
+            this.core = core;
+            this.env = env;
+        }
+
+        private static String envToString(Environment env) {
+            return new StringBuilder().append(env.name().toUpperCase().charAt(0))
+                    .append(env.name().toLowerCase().substring(1)).toString();
+        }
+
+        @Override
+        public int getValue() {
+            int count = 0;
+            for (MultiverseWorld w : core.getMVWorldManager().getMVWorlds())
+                if (w.getEnvironment() == env)
+                    count++;
+            core.log(Level.FINE, String.format("Tracking %d worlds of type %s", count, env));
+            return count;
+        }
+    }
+
+    /**
+     * Plotter for Generator-Values.
+     */
+    private static final class GeneratorPlotter extends Metrics.Plotter {
+        private MultiverseCore core;
+        private final String gen;
+
+        public GeneratorPlotter(MultiverseCore core, String gen) {
+            super(gen);
+            this.core = core;
+            this.gen = gen;
+        }
+
+        @Override
+        public int getValue() {
+            int count = 0;
+            for (MultiverseWorld w : core.getMVWorldManager().getMVWorlds())
+                if (gen.equals(w.getGenerator()))
+                    count++;
+            core.log(Level.FINE, String.format("Tracking %d worlds of type %s", count, gen));
+            return count;
+        }
+    }
+
+    private void setupMetrics() {
        try {
-            buscript = new Buscript(this);
-            // Add global variable "multiverse" to javascript environment
-            buscript.setScriptVariable("multiverse", this);
-        } catch (NullPointerException e) {
-            buscript = null;
-            Logging.warning("Buscript failed to load! The script command will be disabled!");
+            Metrics m = new Metrics(this);
+
+            Metrics.Graph envGraph = m.createGraph("worlds_by_env");
+            for (Environment env : Environment.values())
+                envGraph.addPlotter(new EnvironmentPlotter(this, env));
+
+            m.addCustomData(new Metrics.Plotter("Loaded worlds") {
+                @Override
+                public int getValue() {
+                    return getMVWorldManager().getMVWorlds().size();
+                }
+            });
+            m.addCustomData(new Metrics.Plotter("Total number of worlds") {
+                @Override
+                public int getValue() {
+                    return getMVWorldManager().getMVWorlds().size()
+                            + getMVWorldManager().getUnloadedWorlds().size();
+                }
+            });
+
+            Set<String> gens = new HashSet<String>();
+            for (MultiverseWorld w : this.getMVWorldManager().getMVWorlds())
+                gens.add(w.getGenerator());
+            gens.remove(null);
+            gens.remove("null");
+            Metrics.Graph genGraph = m.createGraph("custom_gens");
+            for (String gen : gens)
+                genGraph.addPlotter(new GeneratorPlotter(this, gen));
+
+            m.start();
+            log(Level.FINE, "Metrics have run!");
+        } catch (IOException e) {
+            log(Level.WARNING, "There was an issue while enabling metrics: " + e.getMessage());
        }
    }

@@ -383,7 +464,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        pm.registerEvents(this.entityListener, this);
        pm.registerEvents(this.weatherListener, this);
        pm.registerEvents(this.portalListener, this);
-        log(Level.INFO, ChatColor.GREEN + "We are aware of the warning about the deprecated event. There is no alternative that allows us to do what we need to do and performance impact is negligible. It is safe to ignore.");
        pm.registerEvents(this.worldListener, this);
        pm.registerEvents(new MVMapListener(this), this);
    }
@@ -1,15 +1,13 @@
 package com.onarandombox.MultiverseCore;

-import java.util.Map;
-
-import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
+import com.dumptruckman.minecraft.util.*;
+import com.onarandombox.MultiverseCore.api.*;
 import com.onarandombox.MultiverseCore.event.MVDebugModeEvent;
-import me.main__.util.SerializationConfig.NoSuchPropertyException;
-import me.main__.util.SerializationConfig.Property;
-import me.main__.util.SerializationConfig.SerializationConfig;
+import me.main__.util.SerializationConfig.*;
 import org.bukkit.Bukkit;

+import java.util.*;
+
 /**
 * Our configuration.
 */
@@ -73,8 +71,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
    private volatile int portalsearchradius;
    @Property
    private volatile boolean autopurge;
-    @Property
-    private volatile boolean idonotwanttodonate;

    public MultiverseCoreConfiguration() {
        super();
@@ -107,7 +103,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
        defaultportalsearch = false;
        portalsearchradius = 128;
        autopurge = true;
-        idonotwanttodonate = false;
        // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
    }

@@ -353,14 +348,4 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
    public void setAutoPurgeEnabled(boolean autopurge) {
        this.autopurge = autopurge;
    }
-
-    @Override
-    public boolean isShowingDonateMessage() {
-        return !idonotwanttodonate;
-    }
-
-    @Override
-    public void setShowDonateMessage(boolean showDonateMessage) {
-        this.idonotwanttodonate = !showDonateMessage;
-    }
 }
@@ -213,18 +213,4 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
     * @param autopurge True if automatic purge should be enabled.
     */
    void setAutoPurgeEnabled(boolean autopurge);
-
-    /**
-     * Gets whether or not the donation/patreon messages are shown.
-     *
-     * @return True if donation/patreon messages should be shown.
-     */
-    boolean isShowingDonateMessage();
-
-    /**
-     * Sets whether or not the donation/patreon messages are shown.
-     *
-     * @param idonotwanttodonate True if donation/patreon messages should be shown.
-     */
-    void setShowDonateMessage(boolean idonotwanttodonate);
 }
@@ -10,7 +10,6 @@ package com.onarandombox.MultiverseCore.commands;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.GameRule;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -56,61 +55,21 @@ public class GameruleCommand extends MultiverseCommand {
            return;
        }

-        final GameRule gameRule = GameRule.getByName(args.get(0));
+        final String gameRule = args.get(0);
        final String value = args.get(1);
        final World world;
        if (args.size() == 2) {
            world = p.getWorld();
        } else {
            world = Bukkit.getWorld(args.get(2));
-            if (world == null) {
-                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " World " + ChatColor.AQUA + args.get(2)
-                        + ChatColor.WHITE + " does not exist.");
-                return;
-            }
        }

-        if (gameRule == null) {
-            sender.sendMessage(ChatColor.RED + "Failure! " + ChatColor.AQUA + args.get(0) + ChatColor.WHITE
-                    + " is not a valid gamerule.");
+        if (world.setGameRuleValue(gameRule, value)) {
+            sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule
+                    + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value);
        } else {
-            if (gameRule.getType() == Boolean.class) {
-                boolean booleanValue;
-                if (value.equalsIgnoreCase("true")) {
-                    booleanValue = true;
-                } else if (value.equalsIgnoreCase("false")) {
-                    booleanValue = false;
-                } else {
-                    sender.sendMessage(getErrorMessage(gameRule.getName(), value) + "it can only be set to true or false.");
-                    return;
-                }
-
-                if (!world.setGameRule(gameRule, booleanValue)) {
-                    sender.sendMessage(getErrorMessage(gameRule.getName(), value) + "something went wrong.");
-                    return;
-                }
-            } else if (gameRule.getType() == Integer.class) {
-                try {
-                    if (!world.setGameRule(gameRule, Integer.parseInt(value))) {
-                        throw new NumberFormatException();
-                    }
-                } catch (NumberFormatException e) {
-                    sender.sendMessage(getErrorMessage(gameRule.getName(), value) + "it can only be set to a positive integer.");
-                    return;
-                }
-            } else {
-                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule.getName()
-                        + ChatColor.WHITE + " isn't supported yet, please let us know about it.");
-                return;
-            }
-
-            sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule.getName()
-                    + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value + ChatColor.WHITE + ".");
+            sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule
+                    + ChatColor.WHITE + " cannot be set to " + ChatColor.RED + value);
        }
    }
-
-    private String getErrorMessage(String gameRule, String value) {
-        return ChatColor.RED + "Failure!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule
-                + ChatColor.WHITE + " could not be set to " + ChatColor.RED + value + ChatColor.WHITE + ", ";
-    }
 }
@@ -10,7 +10,6 @@ package com.onarandombox.MultiverseCore.commands;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.GameRule;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -61,11 +60,6 @@ public class GamerulesCommand extends MultiverseCommand {
            world = p.getWorld();
        } else {
            world = Bukkit.getWorld(args.get(0));
-            if (world == null) {
-                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " World " + ChatColor.AQUA + args.get(0)
-                        + ChatColor.WHITE + " does not exist.");
-                return;
-            }
        }

        final StringBuilder gameRules = new StringBuilder();
@@ -74,7 +68,7 @@ public class GamerulesCommand extends MultiverseCommand {
                gameRules.append(ChatColor.WHITE).append(", ");
            }
            gameRules.append(ChatColor.AQUA).append(gameRule).append(ChatColor.WHITE).append(": ");
-            gameRules.append(ChatColor.GREEN).append(world.getGameRuleValue(GameRule.getByName(gameRule)));
+            gameRules.append(ChatColor.GREEN).append(world.getGameRuleValue(gameRule));
        }
        sender.sendMessage("=== Gamerules for " + ChatColor.AQUA + world.getName() + ChatColor.WHITE + " ===");
        sender.sendMessage(gameRules.toString());
@@ -26,7 +26,7 @@ public class ListCommand extends PaginatedCoreCommand<String> {
    public ListCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("World Listing");
-        this.setCommandUsage("/mv list [page]");
+        this.setCommandUsage("/mv list");
        this.setArgRange(0, 2);
        this.addKey("mvlist");
        this.addKey("mvl");
@@ -27,7 +27,6 @@ public class ReloadCommand extends MultiverseCommand {
        this.setCommandUsage("/mv reload");
        this.setArgRange(0, 0);
        this.addKey("mvreload");
-        this.addKey("mvr");
        this.addKey("mv reload");
        this.addCommandExample("/mv reload");
        this.setPermission("multiverse.core.reload", "Reloads worlds.yml and config.yml.", PermissionDefault.OP);
@@ -35,10 +35,6 @@ public class ScriptCommand extends MultiverseCommand {

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        if (plugin.getScriptAPI() == null) {
-            sender.sendMessage("Buscript failed to load while the server was starting. Scripts cannot be run.");
-            return;
-        }
        File file = new File(plugin.getScriptAPI().getScriptFolder(), args.get(0));
        if (!file.exists()) {
            sender.sendMessage("That script file does not exist in the Multiverse-Core scripts directory!");
@@ -30,7 +30,6 @@ public class SetSpawnCommand extends MultiverseCommand {
        this.setCommandUsage("/mv setspawn");
        this.setArgRange(0, 6);
        this.addKey("mvsetspawn");
-        this.addKey("mvsets");
        this.addKey("mvss");
        this.addKey("mv set spawn");
        this.addKey("mv setspawn");
@@ -40,7 +40,7 @@ public class TeleportCommand extends MultiverseCommand {
        Permission menu = new Permission("multiverse.teleport.*", "Allows you to display the teleport menu.", PermissionDefault.OP);

        this.setName("Teleport");
-        this.setCommandUsage("/mv tp " + ChatColor.GOLD + "[PLAYER]" + ChatColor.GREEN + " {DESTINATION}");
+        this.setCommandUsage("/mv tp " + ChatColor.GOLD + "[PLAYER]" + ChatColor.GREEN + " {WORLD}");
        this.setArgRange(1, 2);
        this.addKey("mvtp");
        this.addKey("mv tp");
@@ -10,13 +10,12 @@ package com.onarandombox.MultiverseCore.commands;
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.event.MVVersionEvent;
+import com.onarandombox.MultiverseCore.utils.webpaste.BitlyURLShortener;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteFailedException;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteService;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceFactory;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
 import com.onarandombox.MultiverseCore.utils.webpaste.URLShortener;
-import com.onarandombox.MultiverseCore.utils.webpaste.URLShortenerFactory;
-import com.onarandombox.MultiverseCore.utils.webpaste.URLShortenerType;
 import com.pneumaticraft.commandhandler.CommandHandler;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
@@ -25,8 +24,10 @@ import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.util.StringUtil;

-import java.io.File;
+import java.io.*;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

@@ -34,91 +35,110 @@ import java.util.Map;
 * Dumps version info to the console.
 */
 public class VersionCommand extends MultiverseCommand {
-    private static final URLShortener SHORTENER = URLShortenerFactory.getService(URLShortenerType.BITLY);
+    private static final URLShortener SHORTENER = new BitlyURLShortener();

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

    private String getLegacyString() {
-        return "[Multiverse-Core] Multiverse-Core Version: " + this.plugin.getDescription().getVersion() + '\n'
-                + "[Multiverse-Core] Bukkit Version: " + this.plugin.getServer().getVersion() + '\n'
-                + "[Multiverse-Core] Loaded Worlds: " + this.plugin.getMVWorldManager().getMVWorlds() + '\n'
-                + "[Multiverse-Core] Multiverse Plugins Loaded: " + this.plugin.getPluginCount() + '\n'
-                +"[Multiverse-Core] Economy being used: " + plugin.getEconomist().getEconomyName() + '\n'
-                + "[Multiverse-Core] Permissions Plugin: " + this.plugin.getMVPerms().getType() + '\n'
-                + "[Multiverse-Core] Dumping Config Values: (version " + this.plugin.getMVConfig().getVersion() + ")" + '\n'
-                + "[Multiverse-Core]   enforceaccess: " + plugin.getMVConfig().getEnforceAccess() + '\n'
-                + "[Multiverse-Core]   prefixchat: " + plugin.getMVConfig().getPrefixChat() + '\n'
-                + "[Multiverse-Core]   prefixchatformat: " + plugin.getMVConfig().getPrefixChatFormat() + '\n'
-                + "[Multiverse-Core]   useasyncchat: " + plugin.getMVConfig().getUseAsyncChat() + '\n'
-                + "[Multiverse-Core]   teleportintercept: " + plugin.getMVConfig().getTeleportIntercept() + '\n'
-                + "[Multiverse-Core]   firstspawnoverride: " + plugin.getMVConfig().getFirstSpawnOverride() + '\n'
-                + "[Multiverse-Core]   displaypermerrors: " + plugin.getMVConfig().getDisplayPermErrors() + '\n'
-                + "[Multiverse-Core]   globaldebug: " + plugin.getMVConfig().getGlobalDebug() + '\n'
-                + "[Multiverse-Core]   silentstart: " + plugin.getMVConfig().getSilentStart() + '\n'
-                + "[Multiverse-Core]   messagecooldown: " + plugin.getMessaging().getCooldown() + '\n'
-                + "[Multiverse-Core]   version: " + plugin.getMVConfig().getVersion() + '\n'
-                + "[Multiverse-Core]   firstspawnworld: " + plugin.getMVConfig().getFirstSpawnWorld() + '\n'
-                + "[Multiverse-Core]   teleportcooldown: " + plugin.getMVConfig().getTeleportCooldown() + '\n'
-                + "[Multiverse-Core]   defaultportalsearch: " + plugin.getMVConfig().isUsingDefaultPortalSearch() + '\n'
-                + "[Multiverse-Core]   portalsearchradius: " + plugin.getMVConfig().getPortalSearchRadius() + '\n'
-                + "[Multiverse-Core]   autopurge: " + plugin.getMVConfig().isAutoPurgeEnabled() + '\n'
-                + "[Multiverse-Core] Special Code: FRN002" + '\n';
+        StringBuilder legacyFile = new StringBuilder();
+        legacyFile.append("[Multiverse-Core] Multiverse-Core Version: ").append(this.plugin.getDescription().getVersion()).append('\n');
+        legacyFile.append("[Multiverse-Core] Bukkit Version: ").append(this.plugin.getServer().getVersion()).append('\n');
+        legacyFile.append("[Multiverse-Core] Loaded Worlds: ").append(this.plugin.getMVWorldManager().getMVWorlds()).append('\n');
+        legacyFile.append("[Multiverse-Core] Multiverse Plugins Loaded: ").append(this.plugin.getPluginCount()).append('\n');
+        legacyFile.append("[Multiverse-Core] Economy being used: ").append(plugin.getEconomist().getEconomyName()).append('\n');
+        legacyFile.append("[Multiverse-Core] Permissions Plugin: ").append(this.plugin.getMVPerms().getType()).append('\n');
+        legacyFile.append("[Multiverse-Core] Dumping Config Values: (version ")
+                .append(this.plugin.getMVConfig().getVersion()).append(")").append('\n');
+        legacyFile.append("[Multiverse-Core]  messagecooldown: ").append(plugin.getMessaging().getCooldown()).append('\n');
+        legacyFile.append("[Multiverse-Core]  teleportcooldown: ").append(plugin.getMVConfig().getTeleportCooldown()).append('\n');
+        legacyFile.append("[Multiverse-Core]  worldnameprefix: ").append(plugin.getMVConfig().getPrefixChat()).append('\n');
+        legacyFile.append("[Multiverse-Core]  worldnameprefixFormat: ").append(plugin.getMVConfig().getPrefixChatFormat()).append('\n');
+        legacyFile.append("[Multiverse-Core]  enforceaccess: ").append(plugin.getMVConfig().getEnforceAccess()).append('\n');
+        legacyFile.append("[Multiverse-Core]  displaypermerrors: ").append(plugin.getMVConfig().getDisplayPermErrors()).append('\n');
+        legacyFile.append("[Multiverse-Core]  teleportintercept: ").append(plugin.getMVConfig().getTeleportIntercept()).append('\n');
+        legacyFile.append("[Multiverse-Core]  firstspawnoverride: ").append(plugin.getMVConfig().getFirstSpawnOverride()).append('\n');
+        legacyFile.append("[Multiverse-Core]  firstspawnworld: ").append(plugin.getMVConfig().getFirstSpawnWorld()).append('\n');
+        legacyFile.append("[Multiverse-Core]  debug: ").append(plugin.getMVConfig().getGlobalDebug()).append('\n');
+        legacyFile.append("[Multiverse-Core] Special Code: FRN002").append('\n');
+        return legacyFile.toString();
    }

    private String getMarkdownString() {
-        return "# Multiverse-Core" + '\n'
-                + "## Overview" + '\n'
-                + "| Name | Value |" + '\n'
-                + "| --- | --- |" + '\n'
-                + "| Multiverse-Core Version | `" + this.plugin.getDescription().getVersion() + "` |" + '\n'
-                + "| Bukkit Version | `" + this.plugin.getServer().getVersion() + "` |" + '\n'
-                + "| Loaded Worlds | `" + this.plugin.getMVWorldManager().getMVWorlds() + "` |" + '\n'
-                + "| Multiverse Plugins Loaded | `" + this.plugin.getPluginCount() + "` |" + '\n'
-                + "| Economy being used | `" + plugin.getEconomist().getEconomyName() + "` |" + '\n'
-                + "| Permissions Plugin | `" + this.plugin.getMVPerms().getType() + "` |" + '\n'
-                + "## Parsed Config" + '\n'
-                + "These are what Multiverse thought the in-memory values of the config were." + "\n\n"
-                + "| Config Key  | Value |" + '\n'
-                + "| --- | --- |" + '\n'
-                + "| version | `" + this.plugin.getMVConfig().getVersion() + "` |" + '\n'
-                + "| messagecooldown | `" + plugin.getMessaging().getCooldown() + "` |" + '\n'
-                + "| teleportcooldown | `" + plugin.getMVConfig().getTeleportCooldown() + "` |" + '\n'
-                + "| worldnameprefix | `" + plugin.getMVConfig().getPrefixChat() + "` |" + '\n'
-                + "| worldnameprefixFormat | `" + plugin.getMVConfig().getPrefixChatFormat() + "` |" + '\n'
-                + "| enforceaccess | `" + plugin.getMVConfig().getEnforceAccess() + "` |" + '\n'
-                + "| displaypermerrors | `" + plugin.getMVConfig().getDisplayPermErrors() + "` |" + '\n'
-                + "| teleportintercept | `" + plugin.getMVConfig().getTeleportIntercept() + "` |" + '\n'
-                + "| firstspawnoverride | `" + plugin.getMVConfig().getFirstSpawnOverride() + "` |" + '\n'
-                + "| firstspawnworld | `" + plugin.getMVConfig().getFirstSpawnWorld() + "` |" + '\n'
-                + "| debug | `" + plugin.getMVConfig().getGlobalDebug() + "` |" + '\n';
+        StringBuilder markdownString = new StringBuilder();
+        markdownString.append("# Multiverse-Core\n");
+        markdownString.append("## Overview\n");
+        markdownString.append("| Name | Value |\n");
+        markdownString.append("| --- | --- |\n");
+        markdownString.append("| Multiverse-Core Version | `").append(this.plugin.getDescription().getVersion()).append("` |\n");
+        markdownString.append("| Bukkit Version | `").append(this.plugin.getServer().getVersion()).append("` |\n");
+        //markdownString.append("| Loaded Worlds | `").append(this.plugin.getMVWorldManager().getMVWorlds()).append("` |\n");
+        markdownString.append("| Multiverse Plugins Loaded | `").append(this.plugin.getPluginCount()).append("` |\n");
+        markdownString.append("| Economy being used | `").append(plugin.getEconomist().getEconomyName()).append("` |\n");
+        markdownString.append("| Permissions Plugin | `").append(this.plugin.getMVPerms().getType()).append("` |\n");
+        markdownString.append("## Parsed Config\n");
+        markdownString.append("These are what Multiverse thought the in-memory values of the config were.\n\n");
+        markdownString.append("| Config Key  | Value |\n");
+        markdownString.append("| --- | --- |\n");
+        markdownString.append("| version | `").append(this.plugin.getMVConfig().getVersion()).append("` |\n");
+        markdownString.append("| messagecooldown | `").append(plugin.getMessaging().getCooldown()).append("` |\n");
+        markdownString.append("| teleportcooldown | `").append(plugin.getMVConfig().getTeleportCooldown()).append("` |\n");
+        markdownString.append("| worldnameprefix | `").append(plugin.getMVConfig().getPrefixChat()).append("` |\n");
+        markdownString.append("| worldnameprefixFormat | `").append(plugin.getMVConfig().getPrefixChatFormat()).append("` |\n");
+        markdownString.append("| enforceaccess | `").append(plugin.getMVConfig().getEnforceAccess()).append("` |\n");
+        markdownString.append("| displaypermerrors | `").append(plugin.getMVConfig().getDisplayPermErrors()).append("` |\n");
+        markdownString.append("| teleportintercept | `").append(plugin.getMVConfig().getTeleportIntercept()).append("` |\n");
+        markdownString.append("| firstspawnoverride | `").append(plugin.getMVConfig().getFirstSpawnOverride()).append("` |\n");
+        markdownString.append("| firstspawnworld | `").append(plugin.getMVConfig().getFirstSpawnWorld()).append("` |\n");
+        markdownString.append("| debug | `").append(plugin.getMVConfig().getGlobalDebug()).append("` |\n");
+        return markdownString.toString();
    }

-    private void addVersionInfoToEvent(MVVersionEvent event) {
-        // add the legacy version info
-        event.appendVersionInfo(this.getLegacyString());
+    private String readFile(final String filename) {
+        String result;
+        try {
+            FileReader reader = new FileReader(filename);
+            BufferedReader bufferedReader = new BufferedReader(reader);
+            String line;
+            result = "";
+            while ((line = bufferedReader.readLine()) != null) {
+                result += line + '\n';
+            }
+        } catch (FileNotFoundException e) {
+            Logging.severe("Unable to find %s. Here's the traceback: %s", filename, e.getMessage());
+            e.printStackTrace();
+            result = String.format("ERROR: Could not load: %s", filename);
+        } catch (IOException e) {
+            Logging.severe("Something bad happend when reading %s. Here's the traceback: %s", filename, e.getMessage());
+            e.printStackTrace();
+            result = String.format("ERROR: Could not load: %s", filename);
+        }
+        return result;
+    }

-        // add the legacy file, but as markdown so it's readable
-        // TODO Readd this in 5.0.0
-        // event.putDetailedVersionInfo("version.md", this.getMarkdownString());
+    private Map<String, String> getVersionFiles() {
+        Map<String, String> files = new HashMap<String, String>();

-        // add config.yml
+        // Add the legacy file, but as markdown so it's readable
+        files.put("version.md", this.getMarkdownString());
+
+        // Add the config.yml
        File configFile = new File(this.plugin.getDataFolder(), "config.yml");
-        event.putDetailedVersionInfo("multiverse-core/config.yml", configFile);
+        files.put(configFile.getName(), this.readFile(configFile.getAbsolutePath()));

-        // add worlds.yml
-        File worldsFile = new File(this.plugin.getDataFolder(), "worlds.yml");
-        event.putDetailedVersionInfo("multiverse-core/worlds.yml", worldsFile);
+        // Add the config.yml
+        File worldConfig = new File(this.plugin.getDataFolder(), "worlds.yml");
+        files.put(worldConfig.getName(), this.readFile(worldConfig.getAbsolutePath()));
+        return files;
    }

    @Override
@@ -128,26 +148,23 @@ public class VersionCommand extends MultiverseCommand {
            sender.sendMessage("Version info dumped to console. Please check your server logs.");
        }

-        MVVersionEvent versionEvent = new MVVersionEvent();
-
-        this.addVersionInfoToEvent(versionEvent);
+        MVVersionEvent versionEvent = new MVVersionEvent(this.getLegacyString(), this.getVersionFiles());
+        final Map<String, String> files = this.getVersionFiles();
        this.plugin.getServer().getPluginManager().callEvent(versionEvent);

+        String versionInfo = versionEvent.getVersionInfo();
+
        if (CommandHandler.hasFlag("--include-plugin-list", args)) {
-            versionEvent.appendVersionInfo('\n' + "Plugins: " + getPluginList());
-            versionEvent.putDetailedVersionInfo("plugins.txt", "Plugins: " + getPluginList());
+            versionInfo = versionInfo + "\nPlugins: " + getPluginList();
        }

-        final String versionInfo = versionEvent.getVersionInfo();
-        versionEvent.putDetailedVersionInfo("version.txt", versionInfo);
-
-        final Map<String, String> files = versionEvent.getDetailedVersionInfo();
+        final String data = versionInfo;

        // log to console
-        String[] lines = versionInfo.split("\\r?\\n");
+        String[] lines = data.split("\n");
        for (String line : lines) {
            if (!line.isEmpty()) {
-                this.plugin.getServer().getLogger().info(line);
+                Logging.info(line);
            }
        }

@@ -158,16 +175,10 @@ public class VersionCommand extends MultiverseCommand {
                    String pasteUrl;
                    if (CommandHandler.hasFlag("-b", args)) {
                        // private post to pastebin
-                        pasteUrl = postToService(PasteServiceType.PASTEBIN, true, versionInfo, files);
-                    } else if (CommandHandler.hasFlag("-g", args)) {
-                        // private post to github
-                        pasteUrl = postToService(PasteServiceType.GITHUB, true, versionInfo, files);
+                        pasteUrl = postToService(PasteServiceType.PASTEBIN, true, data, files);
                    } else if (CommandHandler.hasFlag("-h", args)) {
-                        // private post to hastebin
-                        pasteUrl = postToService(PasteServiceType.HASTEBIN, true, versionInfo, files);
-                    } else if (CommandHandler.hasFlag("-p", args)) {
-                        // private post to paste.gg
-                        pasteUrl = postToService(PasteServiceType.PASTEGG, true, versionInfo, files);
+                        // private post to pastebin
+                        pasteUrl = postToService(PasteServiceType.HASTEBIN, true, data, files);
                    } else {
                        return;
                    }
@@ -193,25 +204,20 @@ public class VersionCommand extends MultiverseCommand {
     * @param pasteFiles Map of filenames/contents of debug info.
     * @return URL of visible paste
     */
-    private static String postToService(PasteServiceType type, boolean isPrivate, String pasteData, Map<String, String> pasteFiles) {
+    private static String postToService(PasteServiceType type, boolean isPrivate, String pasteData,
+                                        Map<String, String> pasteFiles) {
        PasteService ps = PasteServiceFactory.getService(type, isPrivate);
-
        try {
            String result;
            if (ps.supportsMultiFile()) {
-                result = ps.postData(pasteFiles);
+                result = ps.postData(ps.encodeData(pasteFiles), ps.getPostURL());
            } else {
-                result = ps.postData(pasteData);
+                result = ps.postData(ps.encodeData(pasteData), ps.getPostURL());
            }
-
-            if (SHORTENER != null) return SHORTENER.shorten(result);
-            return result;
+            return SHORTENER.shorten(result);
        } catch (PasteFailedException e) {
-            e.printStackTrace();
-            return "Error posting to service.";
-        } catch (NullPointerException e) {
-            e.printStackTrace();
-            return "That service isn't supported yet.";
+            System.out.print(e);
+            return "Error posting to service";
        }
    }

@@ -23,7 +23,7 @@ import org.bukkit.util.Vector;
 * A bed-{@link MVDestination}.
 */
 public class BedDestination implements MVDestination {
-    public static final String OWN_BED_STRING = "playerbed";
+    public static final String OLD_BED_STRING = "b:playerbed";
    private String playername = "";
    private boolean isValid;
    private Location knownBedLoc;
@@ -46,11 +46,11 @@ public class BedDestination implements MVDestination {
        boolean validFormat = split.length >= 1 && split.length <= 2 && split[0].equals(this.getIdentifier());

        OfflinePlayer p = Bukkit.getOfflinePlayer(split[1]);
-        boolean validPlayer = p.getName() != null && !p.getName().equals(OWN_BED_STRING);
+        boolean validPlayer = (p != null);

        if (validFormat && validPlayer) this.playername = p.getName();

-        this.isValid = destination.equals("b:" + OWN_BED_STRING) || (validFormat && validPlayer);
+        this.isValid = destination.equals(OLD_BED_STRING) || (validFormat && validPlayer);

        return this.isValid;
    }
@@ -136,6 +136,6 @@ public class BedDestination implements MVDestination {

    @Override
    public String toString() {
-        return "b:" + (playername.isEmpty() ? OWN_BED_STRING : playername);
+        return playername.isEmpty() ? OLD_BED_STRING : ("b:" + playername);
    }
 }
@@ -1,16 +1,8 @@
 package com.onarandombox.MultiverseCore.event;

-import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;

-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;

 /**
@@ -21,9 +13,9 @@ public class MVVersionEvent extends Event {
    private final StringBuilder versionInfoBuilder;
    private final Map<String, String> detailedVersionInfo;

-    public MVVersionEvent() {
-        versionInfoBuilder = new StringBuilder();
-        detailedVersionInfo = new HashMap<>();
+    public MVVersionEvent(String legacyVersionInfo, Map<String, String> files) {
+        this.versionInfoBuilder = new StringBuilder(legacyVersionInfo);
+        this.detailedVersionInfo = files;
    }

    private static final HandlerList HANDLERS = new HandlerList();
@@ -57,14 +49,14 @@ public class MVVersionEvent extends Event {
     *
     * This information is used for advanced paste services that would prefer
     * to get the information as several files. Examples include config.yml or
-     * portals.yml. Note that the map returned is immutable.
+     * portals.yml.
     *
     * The keys are filenames, the values are the contents of the files.
     *
-     * @return The immutable key value mapping of files and the contents of those files.
+     * @return The key value mapping of files and the contents of those files.
     */
    public Map<String, String> getDetailedVersionInfo() {
-        return Collections.unmodifiableMap(this.detailedVersionInfo);
+        return this.detailedVersionInfo;
    }

    /**
@@ -74,46 +66,4 @@ public class MVVersionEvent extends Event {
    public void appendVersionInfo(String moreVersionInfo) {
        this.versionInfoBuilder.append(moreVersionInfo);
    }
-
-    private String readFile(final String filename) {
-        StringBuilder result;
-
-        try {
-            FileReader reader = new FileReader(filename);
-            BufferedReader bufferedReader = new BufferedReader(reader);
-            String line;
-            result = new StringBuilder();
-            while ((line = bufferedReader.readLine()) != null) {
-                result.append(line).append("\n");
-            }
-        } catch (FileNotFoundException e) {
-            Logging.severe("Unable to find %s. Here's the traceback: %s", filename, e.getMessage());
-            e.printStackTrace();
-            result = new StringBuilder(String.format("ERROR: Could not load: %s", filename));
-        } catch (IOException e) {
-            Logging.severe("Something bad happend when reading %s. Here's the traceback: %s", filename, e.getMessage());
-            e.printStackTrace();
-            result = new StringBuilder(String.format("ERROR: Could not load: %s", filename));
-        }
-
-        return result.toString();
-    }
-
-    /**
-     * Adds a file to to the detailed version-info currently saved in this event.
-     * @param fileName The name of the file.
-     * @param contents The contents of the file.
-     */
-    public void putDetailedVersionInfo(String fileName, String contents) {
-        this.detailedVersionInfo.put(fileName, contents);
-    }
-
-    /**
-     * Adds a file to to the detailed version-info currently saved in this event.
-     * @param filename The name of the file.
-     * @param file     The file.
-     */
-    public void putDetailedVersionInfo(String filename, File file) {
-        this.putDetailedVersionInfo(filename, readFile(file.getAbsolutePath()));
-    }
 }
@@ -29,7 +29,7 @@ public class MVMapListener implements Listener {
    public void mapInitialize(final MapInitializeEvent event) {
        for (final Player player : Bukkit.getOnlinePlayers()) {
            if ((player.getItemInHand().getType() == Material.MAP
-                    || player.getItemInHand().getType() == Material.FILLED_MAP)
+                    || player.getItemInHand().getType() == Material.EMPTY_MAP)
                    && player.getItemInHand().getDurability() == event.getMap().getId()) {
                final Location playerLoc = player.getLocation();
                final MapView map = event.getMap();
@@ -252,7 +252,7 @@ public class MVPlayerListener implements Listener {

        // REMEMBER! getTo MAY be NULL HERE!!!
        // If the player was actually outside of the portal, adjust the from location
-        if (event.getFrom().getWorld().getBlockAt(event.getFrom()).getType() != Material.NETHER_PORTAL) {
+        if (event.getFrom().getWorld().getBlockAt(event.getFrom()).getType() != Material.PORTAL) {
            Location newloc = this.plugin.getSafeTTeleporter().findPortalBlockNextTo(event.getFrom());
            // TODO: Fix this. Currently, we only check for PORTAL blocks. I'll have to figure out what
            // TODO: we want to do here.
@@ -71,10 +71,10 @@ public class MVPortalListener implements Listener {
        if (event.getAction() != Action.RIGHT_CLICK_BLOCK) {
            return;
        }
-        if (event.getClickedBlock().getType() != Material.END_PORTAL_FRAME) {
+        if (event.getClickedBlock().getType() != Material.ENDER_PORTAL_FRAME) {
            return;
        }
-        if (event.getItem() == null || event.getItem().getType() != Material.ENDER_EYE) {
+        if (event.getItem() == null || event.getItem().getType() != Material.EYE_OF_ENDER) {
            return;
        }
        MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getPlayer().getWorld());
@@ -16,9 +16,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
-import java.util.Arrays;
 import java.util.Comparator;
-import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
@@ -74,27 +72,14 @@ public class FileUtils {
     * @param target Target-File
     * @param log A logger that logs the operation
     *
-     * @return true if it had success
+     * @return if it had success
     */
    public static boolean copyFolder(File source, File target, Logger log) {
-        return copyFolder(source, target, null, log);
-    }
-
-    /**
-     * Helper method to copy the world-folder.
-     * @param source Source-File
-     * @param target Target-File
-     * @param excludeFiles files to ignore and not copy over to Target-File
-     * @param log A logger that logs the operation
-     *
-     * @return true if it had success
-     */
-    public static boolean copyFolder(File source, File target, List<String> excludeFiles, Logger log) {
        Path sourceDir = source.toPath();
        Path targetDir = target.toPath();

        try {
-            Files.walkFileTree(sourceDir, new CopyDirFileVisitor(sourceDir, targetDir, excludeFiles));
+            Files.walkFileTree(sourceDir, new CopyDirFileVisitor(sourceDir, targetDir));
            return true;
        } catch (IOException e) {
            log.log(Level.WARNING, "Unable to copy directory", e);
@@ -106,12 +91,10 @@ public class FileUtils {

        private final Path sourceDir;
        private final Path targetDir;
-        private final List<String> excludeFiles;

-        private CopyDirFileVisitor(Path sourceDir, Path targetDir, List<String> excludeFiles) {
+        private CopyDirFileVisitor(Path sourceDir, Path targetDir) {
            this.sourceDir = sourceDir;
            this.targetDir = targetDir;
-            this.excludeFiles = excludeFiles;
        }

        @Override
@@ -125,13 +108,9 @@ public class FileUtils {

        @Override
        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-            // Pass files that are set to ignore
-            if (excludeFiles != null && excludeFiles.contains(file.getFileName().toString()))
-                return FileVisitResult.CONTINUE;
-            // Copy the files
            Path targetFile = targetDir.resolve(sourceDir.relativize(file));
            Files.copy(file, targetFile, COPY_ATTRIBUTES);
            return FileVisitResult.CONTINUE;
        }
    }
-}
+}
@@ -14,10 +14,9 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.BlockFace;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.type.Bed;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Vehicle;
+import org.bukkit.material.Bed;

 import java.util.EnumSet;
 import java.util.Iterator;
@@ -152,13 +151,12 @@ public class SimpleBlockSafety implements BlockSafety {
     * @return The location of the other bed piece, or null if it was a jacked up bed.
     */
    private Location findOtherBedPiece(Location checkLoc) {
-        BlockData data = checkLoc.getBlock().getBlockData();
-        if (!(data instanceof Bed)) {
+        if (checkLoc.getBlock().getType() != Material.BED_BLOCK) {
            return null;
        }
-        Bed b = (Bed) data;
-
-        if (b.getPart() == Bed.Part.HEAD) {
+        // Construct a bed object at this location
+        final Bed b = new Bed(Material.BED_BLOCK, checkLoc.getBlock().getData());
+        if (b.isHeadOfBed()) {
            return checkLoc.getBlock().getRelative(b.getFacing().getOppositeFace()).getLocation();
        }
        // We shouldn't ever be looking at the foot, but here's the code for it.
@@ -211,10 +209,7 @@ public class SimpleBlockSafety implements BlockSafety {
    @Override
    public boolean isEntitiyOnTrack(Location l) {
        Material currentBlock = l.getBlock().getType();
-        return (currentBlock == Material.POWERED_RAIL
-                || currentBlock == Material.DETECTOR_RAIL
-                || currentBlock == Material.RAIL
-                || currentBlock == Material.ACTIVATOR_RAIL);
+        return (currentBlock == Material.POWERED_RAIL || currentBlock == Material.DETECTOR_RAIL || currentBlock == Material.RAILS);
    }

    /**
@@ -19,7 +19,6 @@ import com.onarandombox.MultiverseCore.api.LocationManipulation;
 import java.text.DecimalFormat;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;

 /**
@@ -53,7 +52,7 @@ public class SimpleLocationManipulation implements LocationManipulation {
        if (location == null) {
            return "";
        }
-        return String.format(Locale.ENGLISH, "%s:%.2f,%.2f,%.2f:%.2f:%.2f", location.getWorld().getName(),
+        return String.format("%s:%.2f,%.2f,%.2f:%.2f:%.2f", location.getWorld().getName(),
                location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
    }

@@ -292,19 +292,19 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
    public Location findPortalBlockNextTo(Location l) {
        Block b = l.getWorld().getBlockAt(l);
        Location foundLocation = null;
-        if (b.getType() == Material.NETHER_PORTAL) {
+        if (b.getType() == Material.PORTAL) {
            return l;
        }
-        if (b.getRelative(BlockFace.NORTH).getType() == Material.NETHER_PORTAL) {
+        if (b.getRelative(BlockFace.NORTH).getType() == Material.PORTAL) {
            foundLocation = getCloserBlock(l, b.getRelative(BlockFace.NORTH).getLocation(), foundLocation);
        }
-        if (b.getRelative(BlockFace.SOUTH).getType() == Material.NETHER_PORTAL) {
+        if (b.getRelative(BlockFace.SOUTH).getType() == Material.PORTAL) {
            foundLocation = getCloserBlock(l, b.getRelative(BlockFace.SOUTH).getLocation(), foundLocation);
        }
-        if (b.getRelative(BlockFace.EAST).getType() == Material.NETHER_PORTAL) {
+        if (b.getRelative(BlockFace.EAST).getType() == Material.PORTAL) {
            foundLocation = getCloserBlock(l, b.getRelative(BlockFace.EAST).getLocation(), foundLocation);
        }
-        if (b.getRelative(BlockFace.WEST).getType() == Material.NETHER_PORTAL) {
+        if (b.getRelative(BlockFace.WEST).getType() == Material.PORTAL) {
            foundLocation = getCloserBlock(l, b.getRelative(BlockFace.WEST).getLocation(), foundLocation);
        }
        return foundLocation;
@@ -20,7 +20,6 @@ import org.bukkit.entity.Ghast;
 import org.bukkit.entity.Golem;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Monster;
-import org.bukkit.entity.Phantom;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Slime;
 import org.bukkit.entity.Squid;
@@ -149,7 +148,7 @@ public class SimpleWorldPurger implements WorldPurger {
            if (specifiedAnimals)
                specified = true;
            negate = negateAnimals;
-        } else if (e instanceof Monster || e instanceof Ghast || e instanceof Slime || e instanceof Phantom) {
+        } else if (e instanceof Monster || e instanceof Ghast || e instanceof Slime) {
            // it's a monster
            if (specifiedMonsters && !negateMonsters) {
                Logging.finest("Removing an entity because I was told to remove all monsters in world %s: %s", e.getWorld().getName(), e);
@@ -1,18 +0,0 @@
-package com.onarandombox.MultiverseCore.utils;
-
-/**
- * A utility class that enables automated tests to flag Multiverse for testing. This allows Multiverse to not perform
- * certain behaviors such as enabled stats uploads.
- */
-public class TestingMode {
-
-    private static boolean enabled = false;
-
-    public static void enable() {
-        enabled = true;
-    }
-
-    public static boolean isDisabled() {
-        return !enabled;
-    }
-}
@@ -43,18 +43,15 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 import java.util.Stack;
-import java.util.Arrays;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
-import java.util.regex.Pattern;

 /**
 * Public facing API to add/remove Multiverse worlds.
 */
 public class WorldManager implements MVWorldManager {
    private final MultiverseCore plugin;
-    private final Pattern worldNamePattern = Pattern.compile("[a-zA-Z0-9/._-]+");
    private final WorldPurger worldPurger;
    private final Map<String, MultiverseWorld> worlds;
    private Map<String, WorldProperties> worldsFromTheConfig;
@@ -62,8 +59,6 @@ public class WorldManager implements MVWorldManager {
    private Map<String, String> defaultGens;
    private String firstSpawn;

-    private static final List<String> CLONE_IGNORE_FILES = Arrays.asList("session.lock", "uid.dat");
-
    public WorldManager(MultiverseCore core) {
        this.plugin = core;
        this.worldsFromTheConfig = new HashMap<String, WorldProperties>();
@@ -96,190 +91,6 @@ public class WorldManager implements MVWorldManager {
        }
    }

-    /**
-     * Makes cloning easier to understand and manage.
-     */
-    private class CloneHelper {
-        private String oldName;
-        private String newName;
-        private File oldWorldFile;
-        private File newWorldFile;
-        private MultiverseWorld oldWorld;
-
-        public CloneHelper(String oldName, String newName) {
-            this.oldName = oldName;
-            this.newName = newName;
-        }
-
-        /**
-         * The clone operation.
-         *
-         * @return True if clone is successful, false otherwise.
-         */
-        public boolean run() {
-            if (!validCloneParameters()) {
-                Logging.warning("Invalid clone parameters");
-                return false;
-            }
-
-            initWorldFiles();
-            if (newWorldFile.exists()) {
-                Logging.warning("Folder for new world '%s' already exists", newName);
-                return false;
-            }
-
-            oldWorld = getMVWorld(oldName);
-            if (!isOldWorldLoadable()) {
-                Logging.severe("Old world '%s' is not loadable", oldName);
-                return false;
-            }
-
-            boolean wasAutoSave = manuallySaveWorld();
-
-            if (!copyWorldFolder()) {
-                return false;
-            }
-
-            revertBackAutoSave(wasAutoSave);
-
-            return initNewCloneWorld();
-        }
-
-        /**
-         * Ensure that world with oldName can be clone to a world called newName.
-         *
-         * @return True if parameters are valid, otherwise false.
-         */
-        private boolean validCloneParameters() {
-            String originalOldName = oldName;
-           if (!isWorldFromConfig(oldName)) {
-               oldName = getWorldByAliasFromConfig(oldName);
-           }
-
-            if (oldName == null) {
-                Logging.warning("Old world '%s' does not exist", originalOldName);
-                return false;
-            }
-            if (isWorldFromConfig(newName)) {
-                Logging.warning("New world '%s' already exists", newName);
-                return false;
-            }
-            if (!isValidWorldName(newName)) {
-                Logging.warning("New world name '%s' is invalid", newName);
-                return false;
-            }
-            return true;
-        }
-
-        /**
-         * Get world folders from world container.
-         */
-        private void initWorldFiles() {
-            oldWorldFile = new File(plugin.getServer().getWorldContainer(), oldName);
-            newWorldFile = new File(plugin.getServer().getWorldContainer(), newName);
-        }
-
-        /**
-         * Ensure that old world can be loaded and saved properly.
-         *
-         * @return True if old world can be loaded successfully, false otherwise.
-         */
-        private boolean isOldWorldLoadable() {
-            if (oldWorld != null) {
-                return true;
-            }
-
-            Logging.fine("Old world '%s' is currently unloaded. Attempting to load it...", oldName);
-            WorldProperties props = worldsFromTheConfig.get(oldName);
-            boolean wasLoadSpawn = worldsFromTheConfig.get(oldName).isKeepingSpawnInMemory();
-            if (wasLoadSpawn) {
-                props.setKeepSpawnInMemory(false);
-            }
-
-            if (!loadWorld(oldName)) {
-                Logging.severe("Failed to load the old world '%s'", oldName);
-                return false;
-            }
-
-            getMVWorld(oldName).getCBWorld().setAutoSave(false);
-
-            if (!unloadWorld(oldName, true)) {
-                Logging.severe("Failed to unload the old world '%S'", oldName);
-                return false;
-            }
-
-            if (wasLoadSpawn) {
-                props.setKeepSpawnInMemory(true);
-            }
-
-            return true;
-        }
-
-        /**
-         * Duplicating old world folder to the new world folder.
-         *
-         * @return True if copy process was successful, false otherwise.
-         */
-        private boolean copyWorldFolder() {
-            Logging.fine("Copying files for world '%s'", oldName);
-            if (!FileUtils.copyFolder(oldWorldFile, newWorldFile, CLONE_IGNORE_FILES, Logging.getLogger()) || !newWorldFile.exists()) {
-                Logging.severe("Failed to copy files for world '%s', see the log info", newName);
-                return false;
-            }
-            Logging.fine("Succeeded at copying files");
-            return true;
-        }
-
-        /**
-         * Ensure world is save being copying world files.
-         *
-         * @return Previous auto-save setting for the old world.
-         */
-        private boolean manuallySaveWorld() {
-            if (oldWorld != null && oldWorld.getCBWorld().isAutoSave()) {
-                Logging.config("Saving world '%s'", oldName);
-                oldWorld.getCBWorld().setAutoSave(false);
-                oldWorld.getCBWorld().save();
-                return true;
-            }
-            return false;
-        }
-
-        private void revertBackAutoSave(boolean wasAutoSave) {
-            if (oldWorld != null && wasAutoSave) {
-                Logging.fine("Revert back to enabling auto-save");
-                oldWorld.getCBWorld().setAutoSave(true);
-            }
-        }
-
-        /**
-         * Initialize new properties with old ones.
-         */
-        private void copyPropertiesToNewWorld() {
-            WorldProperties newProps = new WorldProperties();
-            newProps.copyValues(worldsFromTheConfig.get(oldName));
-            newProps.setAlias(""); // don't keep the alias the same -- that would be useless
-            worldsFromTheConfig.put(newName, newProps);
-        }
-
-        /**
-         * Load up the newly copied clone world.
-         */
-        private boolean initNewCloneWorld() {
-            copyPropertiesToNewWorld();
-            if (!saveWorldsConfig()) {
-                Logging.severe("Failed to save worlds.yml");
-                return false;
-            }
-            if (!doLoad(newName)) {
-                Logging.severe("Failed to load the cloned world '" + newName + "'");
-                return false;
-            }
-            Logging.fine("Succeeded at loading cloned world '" + newName + "'");
-            return true;
-        }
-    }
-
    /**
     * {@inheritDoc}
     * @deprecated Use {@link #cloneWorld(String, String)} instead.
@@ -295,7 +106,105 @@ public class WorldManager implements MVWorldManager {
     */
    @Override
    public boolean cloneWorld(String oldName, String newName) {
-        return new CloneHelper(oldName, newName).run();
+        // Make sure we already know about the old world and that we don't
+        // already know about the new world.
+        if (!this.worldsFromTheConfig.containsKey(oldName)) {
+            for (Map.Entry<String, WorldProperties> entry : this.worldsFromTheConfig.entrySet()) {
+                if (oldName.equals(entry.getValue().getAlias())) {
+                    oldName = entry.getKey();
+                    break;
+                }
+            }
+            if (!this.worldsFromTheConfig.containsKey(oldName)) {
+                Logging.warning("Old world '%s' does not exist", oldName);
+                return false;
+            }
+        }
+        if (this.isMVWorld(newName)) {
+            Logging.warning("New world '%s' already exists", newName);
+            return false;
+        }
+
+        final File oldWorldFile = new File(this.plugin.getServer().getWorldContainer(), oldName);
+        final File newWorldFile = new File(this.plugin.getServer().getWorldContainer(), newName);
+
+        // Make sure the new world doesn't exist outside of multiverse.
+        if (newWorldFile.exists()) {
+            Logging.warning("File for new world '%s' already exists", newName);
+            return false;
+        }
+
+        // Load the old world... but just the metadata.
+        boolean wasJustLoaded = false;
+        boolean wasLoadSpawn = false;
+        if (this.plugin.getServer().getWorld(oldName) == null) {
+            wasJustLoaded = true;
+            WorldProperties props = this.worldsFromTheConfig.get(oldName);
+            wasLoadSpawn = props.isKeepingSpawnInMemory();
+            if (wasLoadSpawn) {
+                // No chunks please.
+                props.setKeepSpawnInMemory(false);
+            }
+            if (!this.loadWorld(oldName)) {
+                return false;
+            }
+            this.plugin.getServer().getWorld(oldName).setAutoSave(false);
+        }
+        
+        // Grab a bit of metadata from the old world.
+        MVWorld oldWorld = (MVWorld) getMVWorld(oldName);
+        Environment environment = oldWorld.getEnvironment();
+        String seedString = oldWorld.getSeed() + "";
+        WorldType worldType = oldWorld.getWorldType();
+        Boolean generateStructures = oldWorld.getCBWorld().canGenerateStructures();
+        String generator = oldWorld.getGenerator();
+        boolean useSpawnAdjust = oldWorld.getAdjustSpawn();
+        
+        // Don't need the loaded world anymore.
+        if (wasJustLoaded) {
+            this.unloadWorld(oldName, true);
+            oldWorld = null;
+            if (wasLoadSpawn) {
+                this.worldsFromTheConfig.get(oldName).setKeepSpawnInMemory(true);
+            }
+        }
+
+        boolean wasAutoSave = false;
+        if (oldWorld != null && oldWorld.getCBWorld().isAutoSave()) {
+            wasAutoSave = true;
+            Logging.config("Saving world '%s'", oldName);
+            oldWorld.getCBWorld().setAutoSave(false);
+            oldWorld.getCBWorld().save();
+        }
+        Logging.config("Copying files for world '%s'", oldName);
+        if (!FileUtils.copyFolder(oldWorldFile, newWorldFile, Logging.getLogger())) {
+            Logging.warning("Failed to copy files for world '%s', see the log info", newName);
+            return false;
+        }
+        if (oldWorld != null && wasAutoSave) {
+            oldWorld.getCBWorld().setAutoSave(true);
+        }
+
+        File uidFile = new File(newWorldFile, "uid.dat");
+        if (uidFile.exists() && !uidFile.delete()) {
+            Logging.warning("Failed to delete unique ID file for world '%s'", newName);
+            return false;
+        }
+
+        if (newWorldFile.exists()) {
+            Logging.fine("Succeeded at copying files");
+            if (this.addWorld(newName, environment, seedString, worldType, generateStructures, generator, useSpawnAdjust)) {
+                // getMVWorld() doesn't actually return an MVWorld
+                Logging.fine("Succeeded at importing world");
+                MVWorld newWorld = (MVWorld) this.getMVWorld(newName);
+                newWorld.copyValues(this.worldsFromTheConfig.get(oldName));
+                // don't keep the alias the same -- that would be useless
+                newWorld.setAlias(null);
+                return true;
+            }
+        }
+        Logging.warning("Failed to copy files for world '%s', see the log info", newName);
+        return false;
    }

    /**
@@ -316,11 +225,6 @@ public class WorldManager implements MVWorldManager {
        if (name.equalsIgnoreCase("plugins") || name.equalsIgnoreCase("logs")) {
            return false;
        }
-
-        if (!isValidWorldName(name)) {
-            return false;
-        }
-
        Long seed = null;
        WorldCreator c = new WorldCreator(name);
        if (seedString != null && seedString.length() > 0) {
@@ -503,21 +407,6 @@ public class WorldManager implements MVWorldManager {
        }
    }

-    /**
-     * Check if the world name is allowed
-     *
-     * @param name   Name of the world
-     * @return True if the world world name is valid based on regex
-     */
-    private boolean isValidWorldName(String name) {
-        if (!worldNamePattern.matcher(name).matches()) {
-            Logging.warning("Invalid world name '" + name + "'");
-            Logging.warning("World name should not contain spaces or special characters!");
-            return false;
-        }
-        return true;
-    }
-
    private void brokenWorld(String name) {
        this.plugin.log(Level.SEVERE, "The world '" + name + "' could NOT be loaded because it contains errors and is probably corrupt!");
        this.plugin.log(Level.SEVERE, "Try using Minecraft Region Fixer to repair your world! '" + name + "'");
@@ -598,13 +487,6 @@ public class WorldManager implements MVWorldManager {
     */
    @Override
    public boolean deleteWorld(String name, boolean removeFromConfig, boolean deleteWorldFolder) {
-        if (this.hasUnloadedWorld(name, false)) {
-            // Attempt to load if unloaded so we can actually delete the world
-            if (!this.doLoad(name)) {
-                return false;
-            }
-        }
-
        World world = this.plugin.getServer().getWorld(name);
        if (world == null) {
            // We can only delete loaded worlds
@@ -776,19 +658,6 @@ public class WorldManager implements MVWorldManager {
        return false;
    }

-    private boolean isWorldFromConfig(String name) {
-        return this.worldsFromTheConfig.containsKey(name);
-    }
-
-    private String getWorldByAliasFromConfig(String name) {
-        return this.worldsFromTheConfig.entrySet()
-                .stream()
-                .filter(worldEntry -> name.equals(worldEntry.getValue().getAlias()))
-                .map(Map.Entry::getKey)
-                .findFirst()
-                .orElse(null);
-    }
-
    /**
     * {@inheritDoc}
     */
@@ -1030,9 +899,6 @@ public class WorldManager implements MVWorldManager {
        return this.configWorlds;
    }

-    /**
-     * {@inheritDoc}
-     */
 	@Override
 	public boolean hasUnloadedWorld(String name, boolean includeLoaded) {
 		if (getMVWorld(name) != null) {
@@ -1,95 +0,0 @@
-package com.onarandombox.MultiverseCore.utils.metrics;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.function.Consumer;
-
-import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import org.apache.commons.lang.WordUtils;
-import org.bstats.bukkit.Metrics;
-import org.bukkit.World;
-
-public class MetricsConfigurator {
-
-    private static final int PLUGIN_ID = 7765;
-    private static final String NO_GENERATOR_NAME = "N/A";
-
-    public static void configureMetrics(MultiverseCore plugin) {
-        MetricsConfigurator configurator = new MetricsConfigurator(plugin);
-        configurator.initMetrics();
-    }
-
-    private final MultiverseCore plugin;
-    private final Metrics metrics;
-
-    private MetricsConfigurator(MultiverseCore plugin) {
-        this.plugin = plugin;
-        this.metrics = new Metrics(plugin, PLUGIN_ID);
-    }
-
-    private MVWorldManager getWorldManager() {
-        return plugin.getMVWorldManager();
-    }
-
-    private Collection<MultiverseWorld> getMVWorlds() {
-        return getWorldManager().getMVWorlds();
-    }
-
-    private void initMetrics() {
-        try {
-            addCustomGeneratorsMetric();
-            addEnvironmentsMetric();
-            addWorldCountMetric();
-
-            Logging.fine("Metrics enabled.");
-        } catch (Exception e) {
-            Logging.warning("There was an issue while enabling metrics:");
-            e.printStackTrace();
-        }
-    }
-
-    private void addCustomGeneratorsMetric() {
-        addAdvancedPieMetric("custom_generators", map -> {
-            for (MultiverseWorld w : getMVWorlds()) {
-                MetricsHelper.incrementCount(map, getGeneratorName(w));
-            }
-        });
-    }
-
-    private String getGeneratorName(MultiverseWorld world) {
-        String gen = world.getGenerator();
-        return (gen != null && !gen.equalsIgnoreCase("null")) ? gen.split(":")[0] : NO_GENERATOR_NAME;
-    }
-
-    private void addEnvironmentsMetric() {
-        addAdvancedPieMetric("environments", map -> {
-            for (MultiverseWorld w : getMVWorlds()) {
-                MetricsHelper.incrementCount(map, titleCaseEnv(w.getEnvironment()));
-            }
-        });
-    }
-
-    private String titleCaseEnv(World.Environment env) {
-        String envName = env.name().replaceAll("_+", " ");
-        return WordUtils.capitalizeFully(envName);
-    }
-
-    private void addWorldCountMetric() {
-        addMultiLineMetric("world_count", map -> {
-            int loadedWorldsCount = getMVWorlds().size();
-            map.put("Loaded worlds", loadedWorldsCount);
-            map.put("Total number of worlds", loadedWorldsCount + getWorldManager().getUnloadedWorlds().size());
-        });
-    }
-
-    private void addAdvancedPieMetric(String chartId, Consumer<Map<String, Integer>> metricsFunc) {
-        metrics.addCustomChart(MetricsHelper.createAdvancedPieChart(chartId, metricsFunc));
-    }
-
-    private void addMultiLineMetric(String chartId, Consumer<Map<String, Integer>> metricsFunc) {
-        metrics.addCustomChart(MetricsHelper.createMultiLineChart(chartId, metricsFunc));
-    }
-}
@@ -1,32 +0,0 @@
-package com.onarandombox.MultiverseCore.utils.metrics;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Consumer;
-
-import org.bstats.bukkit.Metrics;
-
-enum MetricsHelper {
-    ;
-
-    /**
-     * Adds one to the value in the given map with the given key. If the key does not exist in the map, it will be added with a value of 1.
-     */
-    static void incrementCount(Map<String, Integer> map, String key) {
-        Integer count = map.getOrDefault(key, 0);
-        map.put(key, count + 1);
-    }
-
-    static Metrics.AdvancedPie createAdvancedPieChart(String chartId, Consumer<Map<String, Integer>> metricsFunc) {
-        Map<String, Integer> map = new HashMap<>();
-        metricsFunc.accept(map);
-        return new Metrics.AdvancedPie(chartId, () -> map);
-    }
-
-    static Metrics.MultiLineChart createMultiLineChart(String chartId, Consumer<Map<String, Integer>> metricsFunc) {
-        Map<String, Integer> map = new HashMap<>();
-        metricsFunc.accept(map);
-        return new Metrics.MultiLineChart(chartId, () -> map);
-    }
-
-}
@@ -1,43 +1,19 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;

-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
 import java.io.IOException;
-import java.util.Map;

 /**
- * A {@link URLShortener} using {@code bit.ly}. Requires an access token.
+ * An {@link URLShortener} using {@code bit.ly}.
 */
-class BitlyURLShortener extends URLShortener {
-    private static final String ACCESS_TOKEN = "Bearer bitly-access-token";
-    private static final String BITLY_POST_REQUEST = "https://api-ssl.bitly.com/v4/shorten";
+public class BitlyURLShortener extends HttpAPIClient implements URLShortener {
+    private static final String GENERIC_BITLY_REQUEST_FORMAT = "https://api-ssl.bitly.com/v3/shorten?format=txt&apiKey=%s&login=%s&longUrl=%s";

-    BitlyURLShortener() {
-        super(BITLY_POST_REQUEST, ACCESS_TOKEN);
-        if (ACCESS_TOKEN.endsWith("access-token")) {
-            throw new UnsupportedOperationException();
-        }
-    }
+    // I think it's no problem that these are public
+    private static final String USERNAME = "multiverse2";
+    private static final String API_KEY = "R_9dbff4862a3bc0c4218a7d78cc10d0e0";

-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    String encodeData(String data) {
-        JSONObject json = new JSONObject();
-        json.put("domain", "j.mp");
-        json.put("long_url", data);
-        return json.toJSONString();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    String encodeData(Map<String, String> data) {
-        throw new UnsupportedOperationException();
+    public BitlyURLShortener() {
+        super(String.format(GENERIC_BITLY_REQUEST_FORMAT, API_KEY, USERNAME, "%s"));
    }

    /**
@@ -46,11 +22,13 @@ class BitlyURLShortener extends URLShortener {
    @Override
    public String shorten(String longUrl) {
        try {
-            String stringJSON = this.exec(encodeData(longUrl), ContentType.JSON);
-            return (String) ((JSONObject) new JSONParser().parse(stringJSON)).get("link");
-        } catch (IOException | ParseException e) {
+            String result = this.exec(longUrl);
+            if (!result.startsWith("http://j.mp/")) // ... then it's failed :/
+                throw new IOException(result);
+            return result;
+        } catch (IOException e) {
            e.printStackTrace();
-            return longUrl;
+            return longUrl; // sorry ...
        }
    }
 }
@@ -1,90 +0,0 @@
-package com.onarandombox.MultiverseCore.utils.webpaste;
-
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Pastes to {@code gist.github.com}. Requires an access token with the {@code gist} scope.
- */
-class GitHubPasteService extends PasteService {
-    private final boolean isPrivate;
-    // this access token must have the "gist" scope
-    private static final String ACCESS_TOKEN = "token github-access-token";
-    private static final String GITHUB_POST_REQUEST = "https://api.github.com/gists";
-
-    GitHubPasteService(boolean isPrivate) {
-        super(GITHUB_POST_REQUEST, ACCESS_TOKEN);
-        this.isPrivate = isPrivate;
-        if (ACCESS_TOKEN.endsWith("access-token")) {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    String encodeData(String data) {
-        Map<String, String> mapData = new HashMap<String, String>();
-        mapData.put("multiverse.txt", data);
-        return this.encodeData(mapData);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    String encodeData(Map<String, String> files) {
-        JSONObject root = new JSONObject();
-        root.put("description", "Multiverse-Core Debug Info");
-        root.put("public", !this.isPrivate);
-        JSONObject fileList = new JSONObject();
-        for (Map.Entry<String, String> entry : files.entrySet()) {
-            JSONObject fileObject = new JSONObject();
-            fileObject.put("content", entry.getValue());
-            fileList.put(entry.getKey(), fileObject);
-        }
-
-        root.put("files", fileList);
-        return root.toJSONString();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String postData(String data) throws PasteFailedException {
-        try {
-            String stringJSON = this.exec(encodeData(data), ContentType.JSON);
-            return (String) ((JSONObject) new JSONParser().parse(stringJSON)).get("html_url");
-        } catch (IOException | ParseException e) {
-            throw new PasteFailedException(e);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String postData(Map<String, String> data) throws PasteFailedException {
-        try {
-            String stringJSON = this.exec(encodeData(data), ContentType.JSON);
-            return (String) ((JSONObject) new JSONParser().parse(stringJSON)).get("html_url");
-        } catch (IOException | ParseException e) {
-            throw new PasteFailedException(e);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean supportsMultiFile() {
-        return true;
-    }
-}
@@ -0,0 +1,99 @@
+package com.onarandombox.MultiverseCore.utils.webpaste;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonPrimitive;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.HashMap;
+import java.util.Map;
+
+public class GithubPasteService implements PasteService {
+
+    private final boolean isPrivate;
+
+    public GithubPasteService(boolean isPrivate) {
+        this.isPrivate = isPrivate;
+    }
+
+    @Override
+    public String encodeData(String data) {
+        Map<String, String> mapData = new HashMap<String, String>();
+        mapData.put("multiverse.txt", data);
+        return this.encodeData(mapData);
+    }
+
+    @Override
+    public String encodeData(Map<String, String> files) {
+        JsonObject root = new JsonObject();
+        root.add("description", new JsonPrimitive("Multiverse-Core Debug Info"));
+        root.add("public", new JsonPrimitive(!this.isPrivate));
+        JsonObject fileList = new JsonObject();
+        for (Map.Entry<String, String> entry : files.entrySet())
+        {
+            JsonObject fileObject = new JsonObject();
+            fileObject.add("content", new JsonPrimitive(entry.getValue()));
+            fileList.add(entry.getKey(), fileObject);
+        }
+        root.add("files", fileList);
+        return root.toString();
+    }
+
+    @Override
+    public URL getPostURL() {
+        try {
+            return new URL("https://api.github.com/gists");
+            //return new URL("http://jsonplaceholder.typicode.com/posts");
+        } catch (MalformedURLException e) {
+            return null; // should never hit here
+        }
+    }
+
+    @Override
+    public String postData(String encodedData, URL url) throws PasteFailedException {
+        OutputStreamWriter wr = null;
+        BufferedReader rd = null;
+        try {
+            URLConnection conn = url.openConnection();
+            conn.setDoOutput(true);
+            wr = new OutputStreamWriter(conn.getOutputStream());
+            wr.write(encodedData);
+            wr.flush();
+
+            rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            String line;
+            String pastieUrl = "";
+            //Pattern pastiePattern = this.getURLMatchingPattern();
+            StringBuilder responseString = new StringBuilder();
+
+            while ((line = rd.readLine()) != null) {
+                responseString.append(line);
+            }
+            return new JsonParser().parse(responseString.toString()).getAsJsonObject().get("html_url").getAsString();
+        } catch (Exception e) {
+            throw new PasteFailedException(e);
+        } finally {
+            if (wr != null) {
+                try {
+                    wr.close();
+                } catch (IOException ignore) { }
+            }
+            if (rd != null) {
+                try {
+                    rd.close();
+                } catch (IOException ignore) { }
+            }
+        }
+    }
+
+    @Override
+    public boolean supportsMultiFile() {
+        return true;
+    }
+}
@@ -1,67 +1,79 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;

-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;

+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.Map;

 /**
 * Pastes to {@code hastebin.com}.
 */
-class HastebinPasteService extends PasteService {
-    private static final String HASTEBIN_POST_REQUEST = "https://hastebin.com/documents";
+public class HastebinPasteService implements PasteService {

-    HastebinPasteService() {
-        super(HASTEBIN_POST_REQUEST);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
    @Override
-    String encodeData(String data) {
+    public String encodeData(String data) {
        return data;
    }

-    /**
-     * {@inheritDoc}
-     */
    @Override
-    String encodeData(Map<String, String> data) {
+    public String encodeData(Map<String, String> data) {
        throw new UnsupportedOperationException();
    }

-    /**
-     * {@inheritDoc}
-     */
    @Override
-    public String postData(String data) throws PasteFailedException {
+    public URL getPostURL() {
        try {
-            String stringJSON = this.exec(encodeData(data), ContentType.PLAINTEXT);
-            return "https://hastebin.com/" + ((JSONObject) new JSONParser().parse(stringJSON)).get("key");
-        } catch (IOException | ParseException e) {
-            throw new PasteFailedException(e);
+            return new URL("https://hastebin.com/documents");
+        } catch (MalformedURLException e) {
+            return null; // should never hit here
        }
    }

-    /**
-     * {@inheritDoc}
-     */
    @Override
-    public String postData(Map<String, String> data) throws PasteFailedException {
+    public String postData(String encodedData, URL url) throws PasteFailedException {
+        OutputStreamWriter wr = null;
+        BufferedReader rd = null;
        try {
-            String stringJSON = this.exec(encodeData(data), ContentType.PLAINTEXT);
-            return "https://hastebin.com/" + ((JSONObject) new JSONParser().parse(stringJSON)).get("key");
-        } catch (IOException | ParseException e) {
+            URLConnection conn = url.openConnection();
+            conn.setDoOutput(true);
+
+            wr = new OutputStreamWriter(conn.getOutputStream());
+            rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+
+            wr.write(encodedData);
+            wr.flush();
+
+            String line;
+            StringBuilder responseString = new StringBuilder();
+            while ((line = rd.readLine()) != null) {
+                responseString.append(line);
+            }
+            String key = new JsonParser().parse(responseString.toString()).getAsJsonObject().get("key").getAsString();
+
+            return "https://hastebin.com/" + key;
+        } catch (Exception e) {
            throw new PasteFailedException(e);
+        } finally {
+            if (wr != null) {
+                try {
+                    wr.close();
+                } catch (IOException ignore) { }
+            }
+            if (rd != null) {
+                try {
+                    rd.close();
+                } catch (IOException ignore) { }
+            }
        }
    }

-    /**
-     * {@inheritDoc}
-     */
    @Override
    public boolean supportsMultiFile() {
        return false;
@@ -1,129 +1,50 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;

-import javax.net.ssl.HttpsURLConnection;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
+import java.net.URLConnection;

 /**
 * HTTP API-client.
 */
-abstract class HttpAPIClient {
+public abstract class HttpAPIClient {
    /**
-     * The URL for this API-request, and if necessary, the access token.
-     * If an access token is not necessary, it should be set to null.
+     * The URL for this API-request.
     */
-    private final String url;
-    private final String accessToken;
+    protected final String urlFormat;

-    /**
-     * Types of data that can be sent.
-     */
-    enum ContentType {
-        JSON,
-        PLAINTEXT,
-        URLENCODED
+    public HttpAPIClient(String urlFormat) {
+        this.urlFormat = urlFormat;
    }

-    HttpAPIClient(String url) {
-        this(url, null);
-    }
-
-    HttpAPIClient(String url, String accessToken) {
-        this.url = url;
-        this.accessToken = accessToken;
-    }
-
-    /**
-     * Returns the HTTP Content-Type header that corresponds with each ContentType.
-     * @param type The type of data.
-     * @return The HTTP Content-Type header that corresponds with the type of data.
-     */
-    private String getContentHeader(ContentType type) {
-        switch (type) {
-            case JSON:
-                return "application/json; charset=utf-8";
-            case PLAINTEXT:
-                return "text/plain; charset=utf-8";
-            case URLENCODED:
-                return "application/x-www-form-urlencoded; charset=utf-8";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + type);
-        }
-    }
-
-    /**
-     * Encode the given String data into a format suitable for transmission in an HTTP request.
-     *
-     * @param data The raw data to encode.
-     * @return A URL-encoded string.
-     */
-    abstract String encodeData(String data);
-
-    /**
-     * Encode the given Map data into a format suitable for transmission in an HTTP request.
-     *
-     * @param data The raw data to encode.
-     * @return A URL-encoded string.
-     */
-    abstract String encodeData(Map<String, String> data);
-
    /**
     * Executes this API-Request.
-     * @param payload The data that will be sent.
-     * @param type The type of data that will be sent.
+     * @param args Format-args.
     * @return The result (as text).
     * @throws IOException When the I/O-operation failed.
     */
-    final String exec(String payload, ContentType type) throws IOException {
-        BufferedReader rd = null;
-        OutputStreamWriter wr = null;
+    protected final String exec(Object... args) throws IOException {

+        URLConnection conn = new URL(String.format(this.urlFormat, args)).openConnection();
+        conn.connect();
+        StringBuilder ret = new StringBuilder();
+        BufferedReader reader = null;
        try {
-            HttpsURLConnection conn = (HttpsURLConnection) new URL(this.url).openConnection();
-            conn.setRequestMethod("POST");
-            conn.setDoOutput(true);
+            reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            while (!reader.ready()); // wait until reader is ready, may not be necessary, SUPPRESS CHECKSTYLE: EmptyStatement

-            // we can receive anything!
-            conn.addRequestProperty("Accept", "*/*");
-            // set a dummy User-Agent
-            conn.addRequestProperty("User-Agent", "placeholder");
-            // this isn't required, but is technically correct
-            conn.addRequestProperty("Content-Type", getContentHeader(type));
-            // only some API requests require an access token
-            if (this.accessToken != null) {
-                conn.addRequestProperty("Authorization", this.accessToken);
+            while (reader.ready()) {
+                ret.append(reader.readLine()).append('\n');
            }
-
-            wr = new OutputStreamWriter(conn.getOutputStream(), StandardCharsets.UTF_8.newEncoder());
-            wr.write(payload);
-            wr.flush();
-
-            String line;
-            StringBuilder responseString = new StringBuilder();
-            // this has to be initialized AFTER the data has been flushed!
-            rd = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
-
-            while ((line = rd.readLine()) != null) {
-                responseString.append(line);
-            }
-
-            return responseString.toString();
        } finally {
-            if (wr != null) {
+            if (reader != null) {
                try {
-                    wr.close();
-                } catch (IOException ignore) { }
-            }
-            if (rd != null) {
-                try {
-                    rd.close();
+                    reader.close();
                } catch (IOException ignore) { }
            }
        }
+        return ret.toString();
    }
 }
@@ -1,7 +1,7 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;

 /**
- * Thrown when pasting fails.
+ * Thrown when pasting failed.
 */
 public class PasteFailedException extends Exception {
    public PasteFailedException() {
@@ -1,90 +0,0 @@
-package com.onarandombox.MultiverseCore.utils.webpaste;
-
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Pastes to {@code paste.gg}.
- */
-class PasteGGPasteService extends PasteService {
-    private final boolean isPrivate;
-    private static final String PASTEGG_POST_REQUEST = "https://api.paste.gg/v1/pastes";
-
-    PasteGGPasteService(boolean isPrivate) {
-        super(PASTEGG_POST_REQUEST);
-        this.isPrivate = isPrivate;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    String encodeData(String data) {
-        Map<String, String> mapData = new HashMap<String, String>();
-        mapData.put("multiverse.txt", data);
-        return this.encodeData(mapData);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    String encodeData(Map<String, String> files) {
-        JSONObject root = new JSONObject();
-        root.put("name", "Multiverse-Core Debug Info");
-        root.put("visibility", this.isPrivate ? "unlisted" : "public");
-        JSONArray fileList = new JSONArray();
-        for (Map.Entry<String, String> entry : files.entrySet()) {
-            JSONObject fileObject = new JSONObject();
-            JSONObject contentObject = new JSONObject();
-            fileObject.put("name", entry.getKey());
-            fileObject.put("content", contentObject);
-            contentObject.put("format", "text");
-            contentObject.put("value", entry.getValue());
-            fileList.add(fileObject);
-        }
-
-        root.put("files", fileList);
-        return root.toJSONString();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String postData(String data) throws PasteFailedException {
-        try {
-            String stringJSON = this.exec(encodeData(data), ContentType.JSON);
-            return (String) ((JSONObject) ((JSONObject) new JSONParser().parse(stringJSON)).get("result")).get("id");
-        } catch (IOException | ParseException e) {
-            throw new PasteFailedException(e);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String postData(Map<String, String> data) throws PasteFailedException {
-        try {
-            String stringJSON = this.exec(encodeData(data), ContentType.JSON);
-            return "https://paste.gg/" + ((JSONObject) ((JSONObject) new JSONParser().parse(stringJSON)).get("result")).get("id");
-        } catch (IOException | ParseException e) {
-            throw new PasteFailedException(e);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean supportsMultiFile() {
-        return true;
-    }
-}
@@ -1,52 +1,63 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;

+import java.net.URL;
 import java.util.Map;

 /**
- * An interface to a web-based text-pasting service. Classes extending this
- * should implement its methods to send data to an online text-sharing service,
- * such as pastebin.com. Given some PasteService instance ps, a paste is accomplished by:
+ * An interface to a web-based text-pasting service. Classes implementing this
+ * interface should implement its methods to send data to an online text-sharing
+ * service, such as pastebin.com. Conventionally, a paste is accomplished by (given
+ * some PasteService instance ps):
 *
- * {@code ps.postData(someString);}
+ * {@code ps.postData(ps.encodeData(someString), ps.getPostURL());}
 *
 * Services that provide a distinction between "public" and "private" pastes
- * should implement a constructor that specifies which kind the PasteService
+ * should implement a custom constructor that specifies which kind the PasteService
 * instance is submitting; an example of this is the PastebinPasteService class.
 */
-public abstract class PasteService extends HttpAPIClient {
-    PasteService(String url) {
-        super(url);
-    }
-
-    PasteService(String url, String accessToken) {
-        super(url, accessToken);
-    }
+public interface PasteService {

    /**
-     * Post data to the Web.
+     * Encode the given String data into a format suitable for transmission in an HTTP request.
     *
-     * @param data A String to post to the web.
+     * @param data The raw data to encode.
+     * @return A URL-encoded string.
+     */
+    String encodeData(String data);
+
+    /**
+     * Encode the given Map data into a format suitable for transmission in an HTTP request.
+     *
+     * @param data The raw data to encode.
+     * @return A URL-encoded string.
+     */
+    String encodeData(Map<String, String> data);
+
+    /**
+     * Get the URL to which this paste service sends new pastes.
+     *
+     * @return The URL that will be accessed to complete the paste.
+     */
+    URL getPostURL();
+
+    /**
+     * Post encoded data to the Web.
+     *
+     * @param encodedData A URL-encoded String containing the full request to post to
+     *                    the given URL. Can be the result of calling #encodeData().
+     * @param url The URL to which to paste. Can be the result of calling #getPostURL().
     * @throws PasteFailedException When pasting/posting the data failed.
     * @return The URL at which the new paste is visible.
     */
-    public abstract String postData(String data) throws PasteFailedException;
-
-    /**
-     * Post data to the Web.
-     *
-     * @param data A Map to post to the web.
-     * @throws PasteFailedException When pasting/posting the data failed.
-     * @return The URL at which the new paste is visible.
-     */
-    public abstract String postData(Map<String, String> data) throws PasteFailedException;
+    String postData(String encodedData, URL url) throws PasteFailedException;

    /**
     * Does this service support uploading multiple files.
     *
-     * Newer services like GitHub's Gist support multi-file pastes,
-     * which allows us to upload configs in addition to the standard logs.
+     * Newer services like gist support multi-file which allows us to upload configs
+     * in addition to the standard logs.
     *
     * @return True if this service supports multiple file upload.
     */
-    public abstract boolean supportsMultiFile();
+    boolean supportsMultiFile();
 }
@@ -14,14 +14,12 @@ public class PasteServiceFactory {
     */
    public static PasteService getService(PasteServiceType type, boolean isPrivate) {
        switch(type) {
-            case PASTEGG:
-                return new PasteGGPasteService(isPrivate);
            case PASTEBIN:
                return new PastebinPasteService(isPrivate);
            case HASTEBIN:
                return new HastebinPasteService();
            case GITHUB:
-                return new GitHubPasteService(isPrivate);
+                return new GithubPasteService(isPrivate);
            default:
                return null;
        }
@@ -7,10 +7,6 @@ package com.onarandombox.MultiverseCore.utils.webpaste;
 * @see PasteServiceFactory
 */
 public enum PasteServiceType {
-    /**
-     * @see PasteGGPasteService
-     */
-    PASTEGG,
    /**
     * @see PastebinPasteService
     */
@@ -20,7 +16,7 @@ public enum PasteServiceType {
     */
    HASTEBIN,
    /**
-     * @see GitHubPasteService
+     * @see GithubPasteService
     */
    GITHUB
 }
@@ -1,19 +1,24 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;

+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.util.Map;

 /**
 * Pastes to {@code pastebin.com}.
 */
-class PastebinPasteService extends PasteService {
-    private final boolean isPrivate;
-    private static final String PASTEBIN_POST_REQUEST = "https://pastebin.com/api/api_post.php";
+public class PastebinPasteService implements PasteService {

-    PastebinPasteService(boolean isPrivate) {
-        super(PASTEBIN_POST_REQUEST);
+    private boolean isPrivate;
+
+    public PastebinPasteService(boolean isPrivate) {
        this.isPrivate = isPrivate;
    }

@@ -21,54 +26,73 @@ class PastebinPasteService extends PasteService {
     * {@inheritDoc}
     */
    @Override
-    String encodeData(String data) {
+    public URL getPostURL() {
        try {
-            return URLEncoder.encode("api_dev_key", "UTF-8") + "=" + URLEncoder.encode("d61d68d31e8e0392b59b50b277411c71", "UTF-8") +
-                    "&" + URLEncoder.encode("api_option", "UTF-8") + "=" + URLEncoder.encode("paste", "UTF-8") +
-                    "&" + URLEncoder.encode("api_paste_code", "UTF-8") + "=" + URLEncoder.encode(data, "UTF-8") +
-                    "&" + URLEncoder.encode("api_paste_private", "UTF-8") + "=" + URLEncoder.encode(this.isPrivate ? "1" : "0", "UTF-8") +
-                    "&" + URLEncoder.encode("api_paste_format", "UTF-8") + "=" + URLEncoder.encode("yaml", "UTF-8") +
-                    "&" + URLEncoder.encode("api_paste_name", "UTF-8") + "=" + URLEncoder.encode("Multiverse-Core Debug Info", "UTF-8");
+            return new URL("http://pastebin.com/api/api_post.php");
+        } catch (MalformedURLException e) {
+            return null; // should never hit here
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String encodeData(String data) {
+        try {
+            String encData = URLEncoder.encode("api_dev_key", "UTF-8") + "=" + URLEncoder.encode("d61d68d31e8e0392b59b50b277411c71", "UTF-8");
+            encData += "&" + URLEncoder.encode("api_option", "UTF-8") + "=" + URLEncoder.encode("paste", "UTF-8");
+            encData += "&" + URLEncoder.encode("api_paste_code", "UTF-8") + "=" + URLEncoder.encode(data, "UTF-8");
+            encData += "&" + URLEncoder.encode("api_paste_private", "UTF-8") + "=" + URLEncoder.encode(this.isPrivate ? "1" : "0", "UTF-8");
+            encData += "&" + URLEncoder.encode("api_paste_format", "UTF-8") + "=" + URLEncoder.encode("yaml", "UTF-8");
+            return encData;
        } catch (UnsupportedEncodingException e) {
            return ""; // should never hit here
        }
    }

-    /**
-     * {@inheritDoc}
-     */
    @Override
-    String encodeData(Map<String, String> data) {
-        throw new UnsupportedOperationException();
+    public String encodeData(Map<String, String> data) {
+        return null;
    }

    /**
     * {@inheritDoc}
     */
    @Override
-    public String postData(String data) throws PasteFailedException {
+    public String postData(String encodedData, URL url) throws PasteFailedException {
+        OutputStreamWriter wr = null;
+        BufferedReader rd = null;
        try {
-            return this.exec(encodeData(data), ContentType.URLENCODED);
-        } catch (IOException e) {
+            URLConnection conn = url.openConnection();
+            conn.setDoOutput(true);
+            wr = new OutputStreamWriter(conn.getOutputStream());
+            wr.write(encodedData);
+            wr.flush();
+
+            rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            String line;
+            String pastebinUrl = "";
+            while ((line = rd.readLine()) != null) {
+                pastebinUrl = line;
+            }
+            return pastebinUrl;
+        } catch (Exception e) {
            throw new PasteFailedException(e);
+        } finally {
+            if (wr != null) {
+                try {
+                    wr.close();
+                } catch (IOException ignore) { }
+            }
+            if (rd != null) {
+                try {
+                    rd.close();
+                } catch (IOException ignore) { }
+            }
        }
    }

-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String postData(Map<String, String> data) throws PasteFailedException {
-        try {
-            return this.exec(encodeData(data), ContentType.URLENCODED);
-        } catch (IOException e) {
-            throw new PasteFailedException(e);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
    @Override
    public boolean supportsMultiFile() {
        return false;
@@ -1,27 +1,13 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;

 /**
- * An interface to a web-based URL Shortener. Classes extending this should
- * implement its methods to shorten links using the service. Given some
- * URLShortener instance us, a URL is shortened by:
- *
- * {@code us.shorten(longUrl);}
- *
- * An example of this, is the BitlyURLShortener.
+ * URL-Shortener.
 */
-public abstract class URLShortener extends HttpAPIClient {
-    URLShortener(String url) {
-        super(url);
-    }
-
-    URLShortener(String url, String accessToken) {
-        super(url, accessToken);
-    }
-
+public interface URLShortener {
    /**
-     * Shorten a URL.
+     * Shorten an URL.
     * @param longUrl The long form.
     * @return The shortened URL.
     */
-    public abstract String shorten(String longUrl);
+    String shorten(String longUrl);
 }
@@ -1,23 +0,0 @@
-package com.onarandombox.MultiverseCore.utils.webpaste;
-
-/**
- * Used to construct {@link URLShortener}s.
- */
-public class URLShortenerFactory {
-    private URLShortenerFactory() { }
-
-    /**
-     * Constructs a new {@link URLShortener}.
-     * @param type The {@link URLShortenerType}.
-     * @return The newly created {@link URLShortener}.
-     */
-    public static URLShortener getService(URLShortenerType type) {
-        if (type == URLShortenerType.BITLY) {
-            try {
-                return new BitlyURLShortener();
-            } catch (UnsupportedOperationException ignored) {}
-        }
-
-        return null;
-    }
-}
@@ -1,14 +0,0 @@
-package com.onarandombox.MultiverseCore.utils.webpaste;
-
-/**
- * An enum containing all known {@link URLShortener}s.
- *
- * @see URLShortener
- * @see URLShortenerFactory
- */
-public enum URLShortenerType {
-    /**
-     * @see BitlyURLShortener
-     */
-    BITLY
-}
@@ -1,9 +1,7 @@
 name: Multiverse-Core
 main: com.onarandombox.MultiverseCore.MultiverseCore
-authors: ['dumptruckman', 'Rigby', 'fernferret', 'lithium3141', 'main--']
+authors: ['Rigby', 'fernferret', 'lithium3141', 'main--', 'dumptruckman']
 website: 'https://dev.bukkit.org/projects/multiverse-core'
-softdepend: ['Vault']
-api-version: 1.13
 version: maven-version-number
 commands:
  mv:
@@ -11,24 +9,34 @@ commands:
    usage: /<command>
  mvcreate:
    description: World create command
-    aliases: [mvc]
+    usage: |
+            /<command> <world> <environment>
+            /<command> creative normal -- Creates a world called 'creative' with a NORMAL environment.
+            /<command> hellworld nether -- Creates a world called 'hellworld' with a NETHER environment.
+  mvc:
+    description: World create command
    usage: |
            /<command> <world> <environment>
            /<command> creative normal -- Creates a world called 'creative' with a NORMAL environment.
            /<command> hellworld nether -- Creates a world called 'hellworld' with a NETHER environment.
  mvimport:
    description: World import command
-    aliases: [mvim]
    usage: |
-      /<command> <world> <environment> [-g generator[:id]] [-n]
-      /<command> creative normal -- Imports an existing world called 'creative' with a NORMAL environment.
-      /<command> hellworld nether -- Imports an existing world called 'hellworld' with a NETHER environment.
+            /<command> <world> <environment>
+            /<command> creative normal -- Imports an existing world called 'creative' with a NORMAL environment.
+            /<command> hellworld nether -- Imports an existing world called 'hellworld' with a NETHER environment.
+  mvim:
+    description: World import command
+    usage: |
+            /<command> <world> <environment>
+            /<command> creative normal -- Imports an existing world called 'creative' with a NORMAL environment.
+            /<command> hellworld nether -- Imports an existing world called 'hellworld' with a NETHER environment.
  mvremove:
-    description: Remove world from multiverse command
+    description: World remove command
    usage: |
            /<command> <world>
  mvdelete:
-    description: Delete world from server folders command
+    description: World delete command
    usage: |
            /<command> <world>
  mvunload:
@@ -37,75 +45,103 @@ commands:
            /<command> <world>
  mvmodify:
    description: Modify the settings of an existing world
-    aliases: [mvm]
    usage: |
-            /<command> <set|add|remove|clear> <value> <property> [world]
-            /<command> set pvp false creative -- Turns off PVP in the 'creative' world.
+            /<command> <world> <option>:<value>
+            /<command> creative pvp:false -- Turns off PVP in the 'creative' world.
  mvmset:
    description: Modify the settings of an existing world
    usage: |
-            /<command> <value> <property> [world]
-            /<command> pvp false creative -- Turns off PVP in the 'creative' world.
+            /<command> <world> <option>:<value>
+            /<command> creative pvp:false -- Turns off PVP in the 'creative' world.
  mvmadd:
    description: Modify the settings of an existing world
    usage: |
-            /<command> <value> <property> [world]
-            /<command> sheep animals world_nether -- Add sheep to animal list for 'world_nether' world.
+            /<command> <world> <option>:<value>
+            /<command> creative pvp:false -- Turns off PVP in the 'creative' world.
  mvmremove:
    description: Modify the settings of an existing world
-    aliases: [mvmdelete]
    usage: |
-            /<command> <value> <property> [world]
-            /<command> sheep animals world_nether -- remove sheep from animal list for 'world_nether' world.
+            /<command> <world> <option>:<value>
+            /<command> creative pvp:false -- Turns off PVP in the 'creative' world.
  mvmclear:
    description: Modify the settings of an existing world
    usage: |
-            /<command> <property> [world]
-            /<command> animals world_nether -- Empties animal list for 'world_nether' world.
+            /<command> <world> <option>:<value>
+            /<command> creative pvp:false -- Turns off PVP in the 'creative' world.
+  mvm:
+    description: Modify the settings of an existing world
+    usage: |
+            /<command> <world> <option>:<value>
+            /<command> creative pvp:false -- Turns off PVP in the 'creative' world.
  mvtp:
    description: Command to teleport between Worlds
    usage: |
-            /<command> [player] <destination>
+            /<command> <world>[:spawn]
            Example: /<command> creative - Teleports you to the relevant location in the 'creative' world.
+            Example: /<command> creative:spawn - Teleports you to the spawn of the 'creative' world.
  mvlist:
    description: Print list of loaded Worlds
-    aliases: [mvl]
    usage: |
-            /<command> [page]
+            /<command> [environment]
+            Example: /<command> NETHER - Shows all NETHER Worlds.
+            Example: /<command> NORMAL - Shows all NORMAL Worlds.
+  mvl:
+    description: Print list of loaded Worlds
+    usage: |
+            /<command> [environment]
            Example: /<command> NETHER - Shows all NETHER Worlds.
            Example: /<command> NORMAL - Shows all NORMAL Worlds.
  mvsetspawn:
    description: Set the spawn area for a particular world
-    aliases: [mvsets, mvss]
+    usage: /<command> -- Sets the spawn area of the current world to your location.
+  mvset:
+    description: Set the spawn area for a particular world
+    usage: /<command> -- Sets the spawn area of the current world to your location.
+  mvss:
+    description: Set the spawn area for a particular world
    usage: /<command> -- Sets the spawn area of the current world to your location.
  mvspawn:
    description: Teleport to the spawn area
-    aliases: [mvs]
-    usage: /<command> [player] -- Teleports you to the spawn area of your current world.
+    usage: /<command> -- Teleports you to the spawn area of your current world.
+  mvs:
+    description: Teleport to the spawn area
+    usage: /<command> -- Teleports you to the spawn area of your current world.
  mvcoord:
    description: Display World, Coordinates, Direction & Compression for a world.
-    aliases: [mvco]
+    usage: |
+            /<command> [world]
+            /<command> -- Shows the relevant coordinates in your current world.
+            /<command> creative -- Shows the relevant coordinates if you were in the 'creative' world.
+  mvc:
+    description: Display World, Coordinates, Direction & Compression for a world.
    usage: |
            /<command> [world]
            /<command> -- Shows the relevant coordinates in your current world.
            /<command> creative -- Shows the relevant coordinates if you were in the 'creative' world.
  mvwho:
    description: Display online users per world.
-    aliases: [mvw]
    usage: |
-            /<command> [world|--all]
+            /<command> [world]
+            /<command> -- Shows who is online in each world.
+            /<command> creative -- Shows who is online in the 'creative' world.
+  mvw:
+    description: Display online users per world.
+    usage: |
+            /<command> [world]
            /<command> -- Shows who is online in each world.
            /<command> creative -- Shows who is online in the 'creative' world.
  mvreload:
    description: Reload Configuration files.
-    aliases: [mvr]
+    usage: /<command>
+  mvr:
+    description: Reload Configuration files.
    usage: /<command>
  mvpurge:
    description: Purge the targetted world of creatures.
    usage: |
-            /<command> [WORLD|all] [all|animals|monsters|MOBNAME]
+            /<command> [world] [creatures]
            /<command> -- Purges the players world of all creatures.
-            /<command> creative all -- Purges the creative world of all Creatures.
+            /<command> creative * -- Purges the creative world of all Creatures.
            /<command> creative creeper -- Purges the creative world of all CREEPERS.
  mvconfirm:
    description: Confirms sensitive decisions like deleting a world.
@@ -113,75 +149,87 @@ commands:
            /<command>
  mvinfo:
    description: Gets world info.
-    aliases: [mvi]
    usage: |
-            /<command> [world] [page]
+            /<command> [world]
+  mvi:
+    description: Gets world info.
+    usage: |
+            /<command> [world]
  mvenv:
    description: Tells the user all possible environment types.
    usage: |
            /<command>
+  mvv:
+    description: Prints out version info.
+    usage: |
+            /<command>
  mvversion:
    description: Prints out version info.
-    aliases: [mvv, mvver]
    usage: |
-            /<command> [-b|-h|-p] [--include-plugin-list]
+            /<command>
+  mvco:
+    description: Displays the player's coordinates.
+    usage: |
+            /<command>
+  mvh:
+    description: Displays the Multiverse Help.
+    usage: |
+            /<command>
+  mvsearch:
+    description: Displays the Multiverse Help.
+    usage: |
+            /<command>
  mvhelp:
    description: Displays the Multiverse Help.
-    aliases: [mvsearch, mvh]
    usage: |
-            /<command> [filter] [page #]
+            /<command>
  mvdebug:
    description: Turns on debugging.
    usage: |
-            /<command> [1|2|3|off|silent]
+            /<command>
  mvgenerators:
    description: Displays all found world generators.
-    aliases: [mvgens]
+    usage: |
+            /<command>
+  mvgens:
+    description: Displays all found world generators.
    usage: |
            /<command>
  mvload:
    description: Loads a world into Multiverse.
    usage: |
-            /<command> <world>
+            /<command> {WORLD}
  mvregen:
    description: Regenerates a world Multiverse already knows about.
    usage: |
-            /<command> <world> [-s seed]
+            /<command> {WORLD}
  mvscript:
    description: Runs a script from the Multiverse scripts directory.
    usage: |
-            /<command> <script> [target]
+            /<command> {script} [target]
  mvclone:
    description: World clone command
-    aliases: [mvcl]
    usage: |
-            /<command> <world> <environment> [-g generator[:id]]
+            /<command> <world> <environment>
            /<command> creative grieftastic -- Creates a world called 'grieftastic' exactly identical to the world 'creative'.
  mvsilent:
    description: Reduces startup messages
    usage: |
            /<command> [true|false]
+  
  mvgamerule:
    description: Sets a gamerule.
-    aliases: [mvrule]
    usage: |
-            /<command> <rule> <value> [world]
+            /<command> {RULE} {VALUE} [WORLD]
+  mvrule:
+    description: Sets a gamerule.
+    usage: |
+            /<command> {RULE} {VALUE} [WORLD]
  mvgamerules:
-    description: Lists the gamerules
-    aliases: [mvrules]
+    description: Lists the gamerules.
    usage: |
-            /<command> [world]
-  mvanchors:
-    description: Creating and removing Anchors command
-    aliases: [mvanchor]
+            /<command> [WORLD]
+  mvrules:
+    description: Lists the gamerules.
    usage: |
-      /<command> <name> [-d]
-  mvcheck:
-    description: Validate your multiverse settings command
-    usage: |
-      /<command> <name> <destination>
-  mvconfig:
-    description: Configuration command
-    aliases: [mvconf]
-    usage: |
-      /<command> <property> <value>
+            /<command> [WORLD]
@@ -6,9 +6,6 @@ import static org.junit.Assert.assertTrue;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;

 import com.dumptruckman.minecraft.util.Logging;
 import org.junit.After;
@@ -89,34 +86,6 @@ public class FileUtilsTest {
        assertTrue(Files.isRegularFile(targetChildDirFile));
    }

-    @Test
-    public void copyFolder_excludingSomeFiles() throws Exception {
-        Path targetDir = tempDir.resolve("target");
-        Path targetFile = targetDir.resolve("parentDirFile.txt");
-        Path targetIgnoreFile = targetDir.resolve("parentIgnoreFile.txt");
-        Path targetChildDir = targetDir.resolve("childDir");
-        Path targetChildDirFile = targetChildDir.resolve("childDirFile.txt");
-        Path targetChildIgnoreFile = targetChildDir.resolve("childIgnoreFile.txt");
-
-        List<String> excludeFiles = new ArrayList<>(Arrays.asList("parentIgnoreFile.txt", "childIgnoreFile.txt"));
-
-        assertFalse(Files.isDirectory(targetDir));
-        assertFalse(Files.isRegularFile(targetFile));
-        assertFalse(Files.isRegularFile(targetIgnoreFile));
-        assertFalse(Files.isDirectory(targetChildDir));
-        assertFalse(Files.isRegularFile(targetChildDirFile));
-        assertFalse(Files.isRegularFile(targetChildIgnoreFile));
-
-        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), excludeFiles, Logging.getLogger()));
-
-        assertTrue(Files.isDirectory(targetDir));
-        assertTrue(Files.isRegularFile(targetFile));
-        assertFalse(Files.isRegularFile(targetIgnoreFile));
-        assertTrue(Files.isDirectory(targetChildDir));
-        assertTrue(Files.exists(targetChildDirFile));
-        assertFalse(Files.isRegularFile(targetChildIgnoreFile));
-    }
-
    @Test
    public void copyFolder_intoExistingFolder() throws Exception {
        Path targetDir = Files.createDirectory(tempDir.resolve("target"));
@@ -64,7 +64,6 @@ public class TestInstanceCreator {
    public static final File worldsDirectory = new File("bin/test/server");

    public boolean setUp() {
-        TestingMode.enable();
        try {
            pluginDirectory.mkdirs();
            assertTrue(pluginDirectory.exists());
Author	SHA1	Message	Date
Jeremy Wood	464eb8510a	Version 4.1.1-1.8.8-SNAPSHOT!	2019-08-25 00:14:43 -04:00
Jeremy Wood	81145fb96a	Bumped version to 4.1.1-SNAPSHOT for continued development. (cherry picked from commit `1ba693ffd5`)	2019-08-25 00:09:58 -04:00
Jeremy Wood	7a64f0613b	Release version 4.1.0. (cherry picked from commit `6ee0d8a05e`)	2019-08-25 00:09:09 -04:00
Jeremy Wood	02e4833b1a	World cloning should work once again! Resolves #1978 . (cherry picked from commit `d3ff2922fd`)	2019-08-25 00:09:03 -04:00
Jeremy Wood	78b32d3e53	Prevent importing worlds without .dat file. Fixes #1917 . (cherry picked from commit `5e2824abeb`)	2019-08-25 00:08:55 -04:00
Jeremy Wood	ec9a13aa45	Removed super dated toString in plugin main class. (cherry picked from commit `926e23bf19`)	2019-08-25 00:08:45 -04:00
Jeremy Wood	8610063307	Added --include-plugin-list to mv version command. (cherry picked from commit `841598232c`)	2019-08-25 00:08:36 -04:00
Jeremy Wood	464209f972	Now using CommandHandler 11! (cherry picked from commit `540b6abcab`)	2019-08-25 00:08:14 -04:00
Jeremy Wood	f33bd16d44	Added debug mode change event. (cherry picked from commit `38d5917915`)	2019-08-25 00:08:05 -04:00
Jeremy Wood	d21569e376	Bumped version to 4.1.0-SNAPSHOT for incoming features. (cherry picked from commit `da6bd20b42`)	2019-08-25 00:07:42 -04:00
Jeremy Wood	8ed67c5fb1	Bumped core protocol to 24. (cherry picked from commit `8859fa78fd`)	2019-08-25 00:07:34 -04:00
Jeremy Wood	e5d7f33512	Bumped version to 4.0.2-SNAPSHOT for continued development. (cherry picked from commit `4de6b9ce47`)	2019-08-25 00:07:26 -04:00
Jeremy Wood	a690516474	Release version 4.0.1. (cherry picked from commit `f595f4cdb9`)	2019-08-25 00:07:21 -04:00
Jeremy Wood	1790bb0f77	Make TravelAgent warning message a debug message. (cherry picked from commit `1581e1e009`)	2019-08-25 00:07:17 -04:00
Jeremy Wood	8f68d7fbcf	Bump version to 4.0.1 for continued development. (cherry picked from commit `32e72bb355`)	2019-08-25 00:07:10 -04:00
Jeremy Wood	d974ac15bb	Release version 4.0.0. (cherry picked from commit `950402a144`)	2019-08-25 00:07:06 -04:00
Jeremy Wood	bd1caf4c09	Bump protocol version to 23. (cherry picked from commit `20a1fcb9f5`)	2019-08-25 00:01:16 -04:00
Jeremy Wood	4d4a9c101f	Wrap the travel agent in an adapter. (cherry picked from commit `253ede1c9a`)	2019-08-25 00:01:08 -04:00
Jeremy Wood	3c1c54ae3d	Bumped version to 4.0.0-SNAPSHOT for 1.14 updates. (cherry picked from commit `d4454703e4`)	2019-08-25 00:00:57 -04:00
Jeremy Wood	24c47ab3d5	Bump version to 3.0.0 for release. (cherry picked from commit `9737b62813`)	2019-08-25 00:00:53 -04:00
Brokkonaut	4eda237b1b	Fix javadocs: it is now setCurrency(Material) instead of setCurrency(int) (cherry picked from commit `06bd1a838f`)	2019-08-25 00:00:48 -04:00
BaronyCraft	6aac64254c	allow coord arguments to setspawn command (#1975 ) * allow coord arguments to setspawn command * Implement PR changes as requested (cherry picked from commit `4343167240`)	2019-08-24 23:54:19 -04:00
Jeremy Wood	806b6e92ea	Removed commons-io as compile dependency to fix weird pom issues. (cherry picked from commit `7762aca019`)	2019-08-24 23:54:13 -04:00
Jeremy Wood	d34649a93e	Removed unnecessary json dependency. (cherry picked from commit `6ebc1188e8`)	2019-08-24 23:54:07 -04:00
Jeremy Wood	7b63c0a2b5	Don't send mvv url response to console twice when run from console. (cherry picked from commit `8b358b0955`)	2019-08-24 23:51:44 -04:00
Jeremy Wood	2e78b744f8	Added a theoretically working Hastebin option for mvv output. (cherry picked from commit `b201b09719`)	2019-08-24 23:51:36 -04:00
Jeremy Wood	8e3d942863	Disabled github paste service. (cherry picked from commit `4c9d108f08`)	2019-08-24 23:51:29 -04:00
Jeremy Wood	34e1d9b911	Removed pastie paste service. (cherry picked from commit `564a7d3684`)	2019-08-24 23:51:23 -04:00
Jeremy Wood	d5df299969	Cleaned up the pom a bit and fixed some dependency shading issues. (cherry picked from commit `aa574b6236`)	2019-08-24 23:51:15 -04:00
Jeremy Wood	bec76364aa	Fix another NPE in MaterialConverter. (cherry picked from commit `d7894eb847`)	2019-08-24 23:39:57 -04:00
Jeremy Wood	a7ba33fb3e	Fixes NPE in MaterialConverter. (cherry picked from commit `5e067fa72d`)	2019-08-24 23:39:51 -04:00
Jeremy Wood	fa3b99b5a3	Wtf... why was this still here. (cherry picked from commit `b1bf68a0ad`)	2019-08-24 23:39:45 -04:00
Jeremy Wood	f20db72dfd	Welcome to fully semantic versioning with 3.0.0-SNAPSHOT. (cherry picked from commit `89a8f24b14`)	2019-08-24 23:38:57 -04:00
Jeremy Wood	41be717b2c	Add null type annotations to MaterialConverter. (cherry picked from commit `43ecdc913a`)	2019-08-24 23:37:01 -04:00
Jeremy Wood	82457e5b79	Updated logging library to 1.1.1. (cherry picked from commit `9b88d1d491`)	2019-08-24 23:36:35 -04:00
Jeremy Wood	b341a6dd3a	Added MaterialConverter util class for type id conversions. (cherry picked from commit `606a3fa3ce`)	2019-08-24 23:30:51 -04:00
Jeremy Wood	8b241f15dc	Fixed potential NPE. (cherry picked from commit `a7cace0fdc`)	2019-08-24 23:25:15 -04:00
Jeremy Wood	ab9783047f	Removed deprecated MVConfigProperty and MVActiveConfigProperty. (cherry picked from commit `ae314108a3`)	2019-08-24 23:25:07 -04:00
Brokkonaut	fb3fe9c235	Option to disable the automatic purge of entities (#1933 ) (cherry picked from commit `d0180f05d5`)	2019-08-24 23:24:58 -04:00
Jeremy Wood	4fa3a34752	Shade in id converter. (cherry picked from commit `4552f70f7e`)	2019-08-24 23:18:53 -04:00
Jeremy Wood	5f1a13f6c4	Updated testing dependencies and maven plugins. (cherry picked from commit `4bdeacfd05`)	2019-08-24 23:18:45 -04:00
Jeremy Wood	459c37b77c	Updated Multiverse-Core for Bukkit 1.13.2. (But not actually) (cherry picked from commit `01f549f408`)	2019-08-24 23:17:42 -04:00
Jeremy Wood	1cca9580b8	Bumped protocol to 22. (cherry picked from commit `f7bbb5029b`)	2019-08-24 22:45:15 -04:00
Jeremy Wood	77df9488ed	Bumped version to 2.7.0-SNAPSHOT. (cherry picked from commit `658b5219c3`)	2019-08-24 22:45:07 -04:00
Jeremy Wood	e97c4fb238	Bumped version to 2.6.1-SNAPSHOT for continued development. (cherry picked from commit `fb505ab161`)	2019-08-24 22:45:03 -04:00
Jeremy Wood	5ba41d50d8	Version 2.6.0 release. (cherry picked from commit `284b3179ad`)	2019-08-24 22:44:59 -04:00
Jeremy Wood	478960945f	Added relativity options to ExactDestination. Implements #1892 . (cherry picked from commit `532ffacf5a`)	2019-08-24 22:44:53 -04:00
Jeremy Wood	4023b42938	Removed unnecessary for #1836 . (cherry picked from commit `2b4d386eb2`)	2019-08-24 22:44:43 -04:00
Jeremy Wood	4a7244b544	Hotfix for #1836 . (cherry picked from commit `bc20ecbe60`)	2019-08-24 22:42:25 -04:00
Jeremy Wood	b09460502a	Bumped protocol version to 21 for upcoming addition of Kotlin lib. (cherry picked from commit `4878395460`)	2019-08-24 22:42:20 -04:00
Jeremy Wood	65e0fe237d	Bump version to 2.6.0-SNAPSHOT for significant incoming changes. (cherry picked from commit `467ec809b5`)	2019-08-24 22:42:11 -04:00
Jeremy Wood	e3e548faec	Bump version to 2.5.1. (cherry picked from commit `ceb6850670`)	2019-08-24 22:42:07 -04:00
Jeremy Wood	fdee9c7e9a	Config travis and circle for Java 8. Resolves #1834 (cherry picked from commit `63abf33414`)	2019-08-24 22:42:03 -04:00
Jeremy Wood	2792001453	Build for Java 8. Might fix Travis and Circle... (cherry picked from commit `bcd7fcaee7`)	2019-08-24 22:41:59 -04:00
Jeremy Wood	537ddff634	Exclude old Bukkit from SerializationConfig. (cherry picked from commit `d18581828d`)	2019-08-24 22:38:19 -04:00
Jeremy Wood	3882164074	Testing new webhook (cherry picked from commit `54209e1535`)	2019-08-24 22:38:14 -04:00
Jeremy Wood	e79a49f7de	Updated to Buscript 2.0. This reduces the size of the plugin jar by over ONE MEGABYTE!! (cherry picked from commit `2ed59a866f`)	2019-08-24 22:38:01 -04:00
Jeremy Wood	1105aa12c8	Bumped version to 2.5.1-SNAPSHOT for continued development. (cherry picked from commit `42adfa8175`)	2019-08-24 22:35:59 -04:00
Jeremy Wood	51f582c3b5	Updated to 2.5.0 for release. (cherry picked from commit `12bcf71028`)	2019-08-24 22:35:44 -04:00
RezzedUp	67a104193a	Remove relative paths from potentially imported worlds. Before, relative paths that left the server's root directory were accepted. Now, the world name has all relative-path components trimmed off. (cherry picked from commit `da6a62b984`)	2019-08-24 22:34:43 -04:00
Jeremy Wood	d512e82a13	Updated plugin.yml. Can't believe I haven't done this sooner. (cherry picked from commit `806c5909c4`)	2019-08-24 22:34:31 -04:00
Eric Stokes	058ce5b29c	If we're gonna use TravisCI it should at least use JDK7 now. (cherry picked from commit `c00847f173`)	2019-08-24 22:34:24 -04:00
Eric Stokes	07e831f458	Added the autogenerated dependency-reduced-pom.xml to the .gitignore (cherry picked from commit `626e5d3e4b`)	2019-08-24 22:34:20 -04:00
Eric Stokes	900af0e497	Fixed deprecated assertTrue call in TestInstanceCreator (cherry picked from commit `f5e8a9c2e8`)	2019-08-24 22:31:17 -04:00
Eric Stokes	727a064a3b	Fixed deprecated use (since it's going away in 1.11) * MultiverseCore constructor shouldn't be deprecated, it just needed a fix. * Removed TestPluginLoader, it should have been mocked anyway. * New constructor takes a JavaPluginLoader instad of a PluginLoader, so we'll have to mock. You can't win, Java. If you make it `final`, I shall become more powerful than you can possibly imagine. (cherry picked from commit `3364709e53`)	2019-08-24 22:28:46 -04:00
rlf	43309dc841	Fixed failing tests (thanks @rlf) * This is the test fixing portion of PR#1746 * This fixes using a HashMap and relying on the order of the values. (cherry picked from commit `8fdc0ad3da`)	2019-08-24 22:28:31 -04:00
Eric Stokes	ff1448fb5f	Removed redundantThrows checkstyle rule, it's gone in 6.2+ See: checkstyle/checkstyle#473 (cherry picked from commit `67d172fd08`)	2019-08-24 22:26:42 -04:00
Eric Stokes	3116fe3c21	Added additional properties to the test checks for world properties (cherry picked from commit `f3a420d85c`)	2019-08-24 22:26:36 -04:00
rlf	92b6a9a6fc	Misc documentation fixes from @rlf (cherry picked from commit `aba1f05c5b`)	2019-08-24 22:26:28 -04:00
Eric Stokes	04e71d4377	Move to Java 7 (Maybe java 8 soon...) * Also bump CH to v10, which uses Java 7 * Probably don't use this build, I have to test it first... (cherry picked from commit `3db57ee1d9`)	2019-08-24 22:16:42 -04:00
httpdop	7bbd9348c2	Update dependencies and versions (cherry picked from commit `b3841adcc1`)	2019-08-24 22:15:35 -04:00
Liam	c5185c58be	Updated Vault repo New vault repo is here: http://nexus.hc.to/content/repositories/pub_releases (cherry picked from commit `0b0b3c0088`)	2019-08-24 22:14:06 -04:00
Jeremy Wood	c553062c14	Perhaps the id was important? (cherry picked from commit `a64a8d9605`)	2019-08-24 22:13:58 -04:00
Jeremy Wood	38c650c19a	Added snapshot repo to distro management. (cherry picked from commit `0a0d3ba527`)	2019-08-24 22:13:54 -04:00
Jeremy Wood	1be9974982	Moving to new version numbers - 2.5.0-SNAPSHOT (cherry picked from commit `a351fbb345`)	2019-08-24 22:13:43 -04:00
Eric Stokes	478da03d48	Fixes #1678 anchor list doesn't obey enforceaccess (cherry picked from commit `46359cfbfe`)	2019-08-24 22:13:37 -04:00
Eric Stokes	c85c68f816	Removed deprecated use of scheduleAsyncDelayedTask (cherry picked from commit `f52004cb76`)	2019-08-24 22:08:23 -04:00
Eric Stokes	f8c2221fcd	Added support for version command to upload to gist.github.com (cherry picked from commit `0e3848874a`)	2019-08-24 21:59:21 -04:00
Eric Stokes	3e58995fc8	Fixed spacing of spigotmc repo in POM (cherry picked from commit `71ba31a0f4`)	2019-08-24 21:59:09 -04:00
Eric Stokes	233fe409ec	Removed deprecated use of loadConfiguration The new method properly uses the Reader class and resolves the reason for deprecation, the lack of encoding support. (cherry picked from commit `7b1e77340b`)	2019-08-24 21:58:41 -04:00
Eric Stokes	fa34bbfc61	Fixed shortened links pointing to wiki pages that didn't exist anymore (cherry picked from commit `bebd4742b9`)	2019-08-24 21:56:16 -04:00
Eric Stokes	174fcdb1f7	#1672 Fixed typo that made animal lists behave like monster lists (cherry picked from commit `b933027523`)	2019-08-24 21:54:31 -04:00
Eric Stokes	58a489191d	#1671 Fixed lists changing not forcing validation of the elements (cherry picked from commit `bd1d852393`)	2019-08-24 21:54:19 -04:00
Eric Stokes	7cfb90759e	#1671 Fixed incorrect WorldPropertyValidator type (cherry picked from commit `648365f336`)	2019-08-24 21:54:07 -04:00
Jeremy Wood	5905b3132d	Deny import of "plugins" and "logs" folder as a world. Should fix #1655 (cherry picked from commit `d2d243caec`)	2019-08-24 21:52:32 -04:00
Jeremy Wood	0992584943	Don't accept null worlds from the server. Addresses #1649 . (cherry picked from commit `865434d1b1`)	2019-08-24 21:51:42 -04:00
Jeremy Wood	0eac36a65e	Use bukkit and not spigot api.	2019-08-24 21:47:22 -04:00