Add respawn anchor support.

This will break support for 1.14 and below.

* Add minidev json dependency.
* Remove use of travel agent.

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.onarandombox.multiversecore</groupId>
     <artifactId>Multiverse-Core</artifactId>
-    <version>4.2.3-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
     <name>Multiverse-Core</name>
     <description>World Management Plugin</description>
     <properties>
@@ -22,10 +22,6 @@
             <id>onarandombox</id>
             <url>http://repo.onarandombox.com/content/groups/public</url>
         </repository>
-        <repository>
-            <id>spigot</id>
-            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-        </repository>
         <repository>
             <id>vault-repo</id>
             <url>http://nexus.hc.to/content/repositories/pub_releases</url>
@@ -215,7 +211,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.1.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -264,19 +260,13 @@
             <plugin>
                 <groupId>se.eris</groupId>
                 <artifactId>notnull-instrumenter-maven-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>0.6.8</version>
                 <executions>
                     <execution>
                         <goals>
                             <goal>instrument</goal>
                             <goal>tests-instrument</goal>
                         </goals>
-                        <configuration>
-                            <notNull>
-                                <param>org.jetbrains.annotations.NotNull</param>
-                                <param>javax.validation.constraints.NotNull</param>
-                            </notNull>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -285,10 +275,10 @@
 
     <dependencies>
         <dependency>
-           <groupId>org.bukkit</groupId>
-           <artifactId>bukkit</artifactId>
-           <version>1.13.2-R0.1-SNAPSHOT</version>
-           <scope>provided</scope>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
         <!-- SerializationConfig Dependency -->
         <dependency>
@@ -317,6 +307,12 @@
             <artifactId>CommandHandler</artifactId>
             <version>11</version>
         </dependency>
+        <!-- End of CommandHandler Dependency -->
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+            <version>2.3</version>
+        </dependency>
         <dependency>
             <groupId>com.dumptruckman.minecraft</groupId>
             <artifactId>buscript</artifactId>
@@ -359,21 +355,21 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>2.0.9</version>
+            <version>2.0.0</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-easymock</artifactId>
-            <version>2.0.9</version>
+            <version>2.0.0</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito2</artifactId>
-            <version>2.0.9</version>
+            <version>2.0.0</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>

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

@@ -20,6 +20,7 @@ import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
 import me.main__.util.SerializationConfig.ChangeDeniedException;
 import me.main__.util.SerializationConfig.NoSuchPropertyException;
 import me.main__.util.SerializationConfig.VirtualProperty;
+import net.minidev.json.JSONObject;
 import org.bukkit.ChatColor;
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
@@ -28,20 +29,17 @@ import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.WorldType;
-import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.serialization.SerializableAs;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.Nullable;
-import org.json.simple.JSONObject;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import java.util.logging.Level;
 
 /**
  * The implementation of a Multiverse handled world.

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

@@ -68,7 +68,6 @@ import com.onarandombox.MultiverseCore.commands.TeleportCommand;
 import com.onarandombox.MultiverseCore.commands.UnloadCommand;
 import com.onarandombox.MultiverseCore.commands.VersionCommand;
 import com.onarandombox.MultiverseCore.commands.WhoCommand;
-import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager;
 import com.onarandombox.MultiverseCore.destination.AnchorDestination;
 import com.onarandombox.MultiverseCore.destination.BedDestination;
 import com.onarandombox.MultiverseCore.destination.CannonDestination;
@@ -205,7 +204,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
 
     // Setup our Map for our Commands using the CommandHandler.
     private CommandHandler commandHandler;
-    private CommandQueueManager commandQueueManager;
 
     private static final String LOG_TAG = "[Multiverse-Core]";
 
@@ -290,7 +288,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
 
         // Setup the command manager
         this.commandHandler = new CommandHandler(this, this.ph);
-        this.commandQueueManager = new CommandQueueManager(this);
         // Call the Function to assign all the Commands to their Class.
         this.registerCommands();
 
@@ -359,16 +356,13 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
      * Initializes the buscript javascript library.
      */
     private void initializeBuscript() {
-        buscript = null;
-
-        if (this.getMVConfig().getEnableBuscript()) {
-            try {
-                buscript = new Buscript(this);
-                // Add global variable "multiverse" to javascript environment
-                buscript.setScriptVariable("multiverse", this);
-            } catch (NullPointerException e) {
-                Logging.warning("Buscript failed to load! The script command will be disabled!");
-            }
+        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!");
         }
     }
 
@@ -920,15 +914,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         return this.commandHandler;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Deprecated
-    public CommandQueueManager getCommandQueueManager() {
-        return commandQueueManager;
-    }
-
     /**
      * Gets the log-tag.
      *

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

@@ -56,8 +56,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     @Property
     private volatile boolean displaypermerrors;
     @Property
-    private volatile boolean enablebuscript;
-    @Property
     private volatile int globaldebug;
     @Property
     private volatile boolean silentstart;
@@ -101,7 +99,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
         teleportintercept = true;
         firstspawnoverride = true;
         displaypermerrors = true;
-        enablebuscript = true;
         globaldebug = 0;
         messagecooldown = 5000;
         teleportcooldown = 1000;
@@ -216,22 +213,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
         return this.displaypermerrors;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean getEnableBuscript() {
-        return this.enablebuscript;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setEnableBuscript(boolean enableBuscript) {
-        this.enablebuscript = enableBuscript;
-    }
-
     /**
      * {@inheritDoc}
      */

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

@@ -8,7 +8,6 @@
 package com.onarandombox.MultiverseCore.api;
 
 import buscript.Buscript;
-import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
 import com.onarandombox.MultiverseCore.utils.AnchorManager;
 import com.onarandombox.MultiverseCore.utils.MVEconomist;
@@ -87,15 +86,6 @@ public interface Core {
      */
     CommandHandler getCommandHandler();
 
-    /**
-     * Manager for command that requires /mv confirm before execution.
-     *
-     * @return A non-null {@link CommandQueueManager}.
-     * @deprecated To be moved to new command manager in 5.0.0
-     */
-    @Deprecated
-    CommandQueueManager getCommandQueueManager();
-
     /**
      * Gets the factory class responsible for loading many different destinations
      * on demand.

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

@@ -86,18 +86,6 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
      */
     boolean getDisplayPermErrors();
 
-    /**
-     * Sets enableBuscript.
-     * @param enableBuscript The new value.
-     */
-    void setEnableBuscript(boolean enableBuscript);
-
-    /**
-     * Gets enableBuscript.
-     * @return enableBuscript.
-     */
-    boolean getEnableBuscript();
-
     /**
      * Sets firstSpawnOverride.
      * @param firstSpawnOverride The new value.

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

@@ -33,7 +33,7 @@ public class ConfirmCommand extends MultiverseCommand {
 
     @Override
     public void runCommand(CommandSender sender, List<String> args) {
-        this.plugin.getCommandQueueManager().runQueuedCommand(sender);
+        this.plugin.getCommandHandler().confirmQueuedCommand(sender);
     }
 
 }

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

@@ -8,11 +8,9 @@
 package com.onarandombox.MultiverseCore.commands;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,24 +35,11 @@ public class DeleteCommand extends MultiverseCommand {
     public void runCommand(CommandSender sender, List<String> args) {
         String worldName = args.get(0);
 
-        this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
-                sender,
-                deleteRunnable(sender, worldName),
-                String.format("Are you sure you want to delete world '%s'? You cannot undo this action.", worldName)
-        ));
-    }
-
-    private Runnable deleteRunnable(@NotNull CommandSender sender,
-                                    @NotNull String worldName) {
-
-        return () -> {
-            sender.sendMessage(String.format("Deleting world '%s'...", worldName));
-            if (this.plugin.getMVWorldManager().deleteWorld(worldName)) {
-                sender.sendMessage(String.format("%sWorld %s was deleted!", ChatColor.GREEN, worldName));
-                return;
-            }
-            sender.sendMessage(String.format("%sThere was an issue deleting '%s'! Please check console for errors.",
-                    ChatColor.RED, worldName));
-        };
+        Class<?>[] paramTypes = {String.class};
+        List<Object> objectArgs = new ArrayList<Object>(args);
+        this.plugin.getCommandHandler()
+                   .queueCommand(sender, "mvdelete", "deleteWorld", objectArgs,
+                                 paramTypes, ChatColor.GREEN + "World '" + worldName + "' Deleted!",
+                                 ChatColor.RED + "World '" + worldName + "' could NOT be deleted!");
     }
 }

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

@@ -8,11 +8,9 @@
 package com.onarandombox.MultiverseCore.commands;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,30 +37,17 @@ public class RegenCommand extends MultiverseCommand {
 
     @Override
     public void runCommand(CommandSender sender, List<String> args) {
-        String worldName = args.get(0);
-        boolean useseed = (!(args.size() == 1));
-        boolean randomseed = (args.size() == 2 && args.get(1).equalsIgnoreCase("-s"));
+        Boolean useseed = (!(args.size() == 1));
+        Boolean randomseed = (args.size() == 2 && args.get(1).equalsIgnoreCase("-s"));
         String seed = (args.size() == 3) ? args.get(2) : "";
 
-        this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
-                sender,
-                doWorldRegen(sender, worldName, useseed, randomseed, seed),
-                String.format("Are you sure you want to regen '%s'? You cannot undo this action.", worldName)
-        ));
-    }
-
-    private Runnable doWorldRegen(@NotNull CommandSender sender,
-                                  @NotNull String worldName,
-                                  boolean useSeed,
-                                  boolean randomSeed,
-                                  @NotNull String seed) {
-
-        return () -> {
-            if (this.plugin.getMVWorldManager().regenWorld(worldName, useSeed, randomSeed, seed)) {
-                sender.sendMessage(ChatColor.GREEN + "World Regenerated!");
-                return;
-            }
-            sender.sendMessage(ChatColor.RED + "World could NOT be regenerated!");
-        };
+        Class<?>[] paramTypes = {String.class, Boolean.class, Boolean.class, String.class};
+        List<Object> objectArgs = new ArrayList<Object>();
+        objectArgs.add(args.get(0));
+        objectArgs.add(useseed);
+        objectArgs.add(randomseed);
+        objectArgs.add(seed);
+        this.plugin.getCommandHandler().queueCommand(sender, "mvregen", "regenWorld", objectArgs,
+                paramTypes, ChatColor.GREEN + "World Regenerated!", ChatColor.RED + "World could NOT be regenerated!");
     }
 }

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

@@ -11,7 +11,6 @@ import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.Teleporter;
 import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
 import com.onarandombox.MultiverseCore.destination.CustomTeleporterDestination;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
 import com.onarandombox.MultiverseCore.destination.InvalidDestination;
@@ -166,27 +165,24 @@ public class TeleportCommand extends MultiverseCommand {
         if (result == TeleportResult.FAIL_UNSAFE) {
             Logging.fine("Could not teleport " + teleportee.getName()
                     + " to " + plugin.getLocationManipulation().strCoordsRaw(d.getLocation(teleportee)));
-
+            Logging.fine("Queueing Command");
+            Class<?>[] paramTypes = { CommandSender.class, Player.class, Location.class };
+            List<Object> items = new ArrayList<Object>();
+            items.add(teleporter);
+            items.add(teleportee);
+            items.add(d.getLocation(teleportee));
             String player = "you";
             if (!teleportee.equals(teleporter)) {
                 player = teleportee.getName();
             }
-
-            this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
-                    sender,
-                    doUnsafeTeleport(teleporter, teleportee, d.getLocation(teleportee)),
-                    String.format("%sMultiverse %sdid not teleport %s%s %sto %s%s %sbecause it was unsafe. Would you like to try anyway?",
-                            ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, player, ChatColor.WHITE, ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE),
-                    UNSAFE_TELEPORT_EXPIRE_DELAY
-            ));
+            String message = String.format("%sMultiverse %sdid not teleport %s%s %sto %s%s %sbecause it was unsafe.",
+                    ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, player, ChatColor.WHITE, ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE);
+            this.plugin.getCommandHandler().queueCommand(sender, "mvteleport", "teleportPlayer", items,
+                    paramTypes, message, "Would you like to try anyway?", "", "", UNSAFE_TELEPORT_EXPIRE_DELAY);
         }
         // else: Player was teleported successfully (or the tp event was fired I should say)
     }
 
-    private Runnable doUnsafeTeleport(CommandSender teleporter, Player player, Location location) {
-        return () -> this.plugin.getSafeTTeleporter().safelyTeleport(teleporter, player, location, false);
-    }
-
     private boolean checkSendPermissions(CommandSender teleporter, Player teleportee, MVDestination destination) {
         if (teleporter.equals(teleportee)) {
             if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.teleport.self." + destination.getIdentifier(), true)) {

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

@@ -64,7 +64,6 @@ public class VersionCommand extends MultiverseCommand {
                 + "[Multiverse-Core]   teleportintercept: " + plugin.getMVConfig().getTeleportIntercept() + '\n'
                 + "[Multiverse-Core]   firstspawnoverride: " + plugin.getMVConfig().getFirstSpawnOverride() + '\n'
                 + "[Multiverse-Core]   displaypermerrors: " + plugin.getMVConfig().getDisplayPermErrors() + '\n'
-                + "[Multiverse-Core]   enablebuscript: " + plugin.getMVConfig().getEnableBuscript() + '\n'
                 + "[Multiverse-Core]   globaldebug: " + plugin.getMVConfig().getGlobalDebug() + '\n'
                 + "[Multiverse-Core]   silentstart: " + plugin.getMVConfig().getSilentStart() + '\n'
                 + "[Multiverse-Core]   messagecooldown: " + plugin.getMessaging().getCooldown() + '\n'

src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/CommandQueueManager.java

@@ -1,158 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commandtools.queue;
-
-import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.block.data.type.CommandBlock;
-import org.bukkit.command.BlockCommandSender;
-import org.bukkit.command.CommandSender;
-import org.bukkit.scheduler.BukkitTask;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Map;
-import java.util.WeakHashMap;
-
-/**
- * Managers the queuing of dangerous commands that needs to use '/mv confirm' before executing.
- */
-public class CommandQueueManager {
-
-    private static final long TICKS_PER_SECOND = 20;
-    private static final DummyCommandBlockSender COMMAND_BLOCK = new DummyCommandBlockSender();
-
-    private final MultiverseCore plugin;
-    private final Map<CommandSender, QueuedCommand> queuedCommandMap;
-
-    public CommandQueueManager(@NotNull MultiverseCore plugin) {
-        this.plugin = plugin;
-        this.queuedCommandMap = new WeakHashMap<>();
-    }
-
-    /**
-     * Adds a queue command into queue.
-     *
-     * @param queuedCommand The queue command to add.
-     */
-    public void addToQueue(QueuedCommand queuedCommand) {
-        CommandSender targetSender = parseSender(queuedCommand.getSender());
-
-        // Since only one command is stored in queue per sender, we remove the old one.
-        this.removeFromQueue(targetSender);
-
-        Logging.finer("Add new command to queue for sender %s.", targetSender);
-        this.queuedCommandMap.put(targetSender, queuedCommand);
-        queuedCommand.setExpireTask(runExpireLater(queuedCommand));
-
-        queuedCommand.getSender().sendMessage(queuedCommand.getPrompt());
-        queuedCommand.getSender().sendMessage(String.format("Run %s/mv confirm %sto continue. This will expire in %s seconds.",
-                ChatColor.GREEN, ChatColor.WHITE, queuedCommand.getValidDuration()));
-    }
-
-    /**
-     * Expire task that remove {@link QueuedCommand} from queue after valid duration defined.
-     *
-     * @param queuedCommand Command to run the expire task on.
-     * @return The expire {@link BukkitTask}.
-     */
-    @NotNull
-    private BukkitTask runExpireLater(@NotNull QueuedCommand queuedCommand) {
-        return Bukkit.getScheduler().runTaskLater(
-                this.plugin,
-                expireRunnable(queuedCommand),
-                queuedCommand.getValidDuration() * TICKS_PER_SECOND
-        );
-    }
-
-    /**
-     * Runnable responsible for expiring the queued command.
-     *
-     * @param queuedCommand Command to create the expire task on.
-     * @return The expire runnable.
-     */
-    @NotNull
-    private Runnable expireRunnable(@NotNull QueuedCommand queuedCommand) {
-        return () -> {
-            CommandSender targetSender = parseSender(queuedCommand.getSender());
-            QueuedCommand matchingQueuedCommand = this.queuedCommandMap.get(targetSender);
-            if (!queuedCommand.equals(matchingQueuedCommand) || queuedCommand.getExpireTask().isCancelled()) {
-                // To be safe, but this shouldn't happen since we cancel old commands before add new once.
-                Logging.finer("This is an old queue command already.");
-                return;
-            }
-            queuedCommand.getSender().sendMessage("Your queued command has expired.");
-            this.queuedCommandMap.remove(queuedCommand.getSender());
-        };
-    }
-
-    /**
-     * Runs the command in queue for the given sender, if any.
-     *
-     * @param sender    {@link CommandSender} that confirmed the command.
-     * @return True if queued command ran successfully, else false.
-     */
-    public boolean runQueuedCommand(@NotNull CommandSender sender) {
-        CommandSender targetSender = parseSender(sender);
-        QueuedCommand queuedCommand = this.queuedCommandMap.get(targetSender);
-        if (queuedCommand == null) {
-            sender.sendMessage(ChatColor.RED + "You do not have any commands in queue.");
-            return false;
-        }
-        Logging.finer("Running queued command...");
-        queuedCommand.getAction().run();
-        return removeFromQueue(targetSender);
-    }
-
-    /**
-     * Since only one command is stored in queue per sender, we remove the old one.
-     *
-     * @param sender    The {@link CommandSender} that executed the command.
-     * @return True if queue command is removed from sender successfully, else false.
-     */
-    public boolean removeFromQueue(@NotNull CommandSender sender) {
-        CommandSender targetSender = parseSender(sender);
-        QueuedCommand previousCommand = this.queuedCommandMap.remove(targetSender);
-        if (previousCommand == null) {
-            Logging.finer("No queue command to remove for sender %s.", targetSender.getName());
-            return false;
-        }
-        previousCommand.getExpireTask().cancel();
-        Logging.finer("Removed queue command for sender %s.", targetSender.getName());
-        return true;
-    }
-
-    /**
-     * To allow all CommandBlocks to be a common sender with use of {@link DummyCommandBlockSender}.
-     * So confirm command can be used for a queue command on another command block.
-     *
-     * @param sender    The sender to parse.
-     * @return The sender, or if its a command block, a {@link DummyCommandBlockSender}.
-     */
-    @NotNull
-    private CommandSender parseSender(@NotNull CommandSender sender) {
-        Logging.fine(sender.getClass().getName());
-        if (isCommandBlock(sender)) {
-            Logging.finer("Is command block.");
-            return COMMAND_BLOCK;
-        }
-        return sender;
-    }
-
-    /**
-     * Check if sender is a command block.
-     *
-     * @param sender    The sender to check on.
-     * @return True if sender is a command block, else false.
-     */
-    private boolean isCommandBlock(@NotNull CommandSender sender) {
-        return sender instanceof BlockCommandSender
-                && ((BlockCommandSender) sender).getBlock().getBlockData() instanceof CommandBlock;
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/DummyCommandBlockSender.java

@@ -1,104 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.queue;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionAttachment;
-import org.bukkit.permissions.PermissionAttachmentInfo;
-import org.bukkit.plugin.Plugin;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Set;
-
-/**
- * Used by {@link CommandQueueManager}, so different commands block can be recognised as one.
- */
-class DummyCommandBlockSender implements CommandSender {
-
-    @Override
-    public void sendMessage(@NotNull String message) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void sendMessage(@NotNull String[] messages) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @NotNull Server getServer() {
-        return Bukkit.getServer();
-    }
-
-    @Override
-    public @NotNull String getName() {
-        return "DummyCommandBlockSender";
-    }
-
-    @Override
-    public boolean isPermissionSet(@NotNull String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean isPermissionSet(@NotNull Permission perm) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasPermission(@NotNull String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasPermission(@NotNull Permission perm) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @NotNull PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @NotNull PermissionAttachment addAttachment(@NotNull Plugin plugin) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @Nullable PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value, int ticks) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @Nullable PermissionAttachment addAttachment(@NotNull Plugin plugin, int ticks) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void removeAttachment(@NotNull PermissionAttachment attachment) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void recalculatePermissions() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @NotNull Set<PermissionAttachmentInfo> getEffectivePermissions() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean isOp() {
-        return true;
-    }
-
-    @Override
-    public void setOp(boolean value) {
-        throw new UnsupportedOperationException();
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/QueuedCommand.java

@@ -1,86 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commandtools.queue;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.scheduler.BukkitTask;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Represents a single command used in {@link CommandQueueManager} for confirming before running potentially
- * dangerous action.
- */
-public class QueuedCommand {
-
-    private static final String DEFAULT_PROMPT_MESSAGE = "The command you are trying to run is deemed dangerous.";
-    private static final int DEFAULT_VALID_TIME = 10;
-
-    private final CommandSender sender;
-    private final Runnable action;
-    private final String prompt;
-    private final int validDuration;
-    private BukkitTask expireTask;
-
-    public QueuedCommand(CommandSender sender, Runnable action) {
-        this(sender, action, DEFAULT_PROMPT_MESSAGE, DEFAULT_VALID_TIME);
-    }
-
-    public QueuedCommand(CommandSender sender, Runnable action, String prompt) {
-        this(sender, action, prompt, DEFAULT_VALID_TIME);
-    }
-
-    public QueuedCommand(CommandSender sender, Runnable action, int validDuration) {
-        this(sender, action, DEFAULT_PROMPT_MESSAGE, validDuration);
-    }
-
-    /**
-     * Creates a new queue command, to be registered at {@link CommandQueueManager#addToQueue(QueuedCommand)}.
-     *
-     * @param sender        The sender that ran the command needed for confirmation.
-     * @param action        The logic to execute upon confirming.
-     * @param prompt        Question to ask sender to confirm.
-     * @param validDuration Duration in which the command is valid for confirm in seconds.
-     */
-    public QueuedCommand(CommandSender sender, Runnable action, String prompt, int validDuration) {
-        this.sender = sender;
-        this.action = action;
-        this.prompt = prompt;
-        this.validDuration = validDuration;
-    }
-
-    @NotNull
-    CommandSender getSender() {
-        return sender;
-    }
-
-    @NotNull
-    String getPrompt() {
-        return prompt;
-    }
-
-    int getValidDuration() {
-        return validDuration;
-    }
-
-    @NotNull
-    Runnable getAction() {
-        return action;
-    }
-
-    @NotNull
-    BukkitTask getExpireTask() {
-        return expireTask;
-    }
-
-    void setExpireTask(@NotNull BukkitTask expireTask) {
-        if (this.expireTask != null) {
-            throw new IllegalStateException("This queue command already has an expire task. You can't register twice!");
-        }
-        this.expireTask = expireTask;
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/package-info.java

@@ -1,4 +0,0 @@
-/**
- * Manager queuing of dangerous commands in need of confirmation.
- */
-package com.onarandombox.MultiverseCore.commandtools.queue;

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

@@ -22,8 +22,6 @@ public class EntryFee extends SerializationConfig {
     @Nullable
     private Material currency;
 
-    private final Material DISABLED_MATERIAL = Material.AIR;
-
     public EntryFee() {
         super();
     }
@@ -53,9 +51,6 @@ public class EntryFee extends SerializationConfig {
      */
     @Nullable
     public Material getCurrency() {
-        if (currency == null || currency.equals(DISABLED_MATERIAL)) {
-            return null;
-        }
         return currency;
     }
 

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

@@ -314,15 +314,7 @@ public class MVPlayerListener implements Listener {
                     + "' because enforceaccess is off.");
         }
         if (!plugin.getMVConfig().isUsingDefaultPortalSearch()) {
-            try {
-                Class.forName("org.bukkit.TravelAgent");
-                if (event.getPortalTravelAgent() != null) {
-                    event.getPortalTravelAgent().setSearchRadius(plugin.getMVConfig().getPortalSearchRadius());
-                }
-            } catch (ClassNotFoundException ignore) {
-                Logging.fine("TravelAgent not available for PlayerPortalEvent for " + event.getPlayer().getName());
-            }
-
+            event.setSearchRadius(this.plugin.getMVConfig().getPortalSearchRadius());
         }
     }
 

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

@@ -1,111 +0,0 @@
-package com.onarandombox.MultiverseCore.utils;
-
-import java.util.logging.Level;
-
-import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
-import com.onarandombox.MultiverseCore.destination.CannonDestination;
-import org.bukkit.Location;
-import org.bukkit.TravelAgent;
-import org.bukkit.event.player.PlayerPortalEvent;
-
-public class BukkitTravelAgent implements TravelAgent {
-    private final MVTravelAgent agent;
-
-    public BukkitTravelAgent(MVTravelAgent agent) {
-        this.agent = agent;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public BukkitTravelAgent setSearchRadius(int radius) {
-        return this;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getSearchRadius() {
-        return 0;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public BukkitTravelAgent setCreationRadius(int radius) {
-        return this;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getCreationRadius() {
-        return 0;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean getCanCreatePortal() {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setCanCreatePortal(boolean create) {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Location findOrCreate(Location location) {
-        return this.getSafeLocation();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Location findPortal(Location location) {
-        return this.getSafeLocation();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean createPortal(Location location) {
-        return false;
-    }
-
-    private Location getSafeLocation() {
-        // At this time, these can never use the velocity.
-        if (agent.destination instanceof CannonDestination) {
-            Logging.fine("Using Stock TP method. This cannon will have 0 velocity");
-        }
-        SafeTTeleporter teleporter = agent.core.getSafeTTeleporter();
-        Location newLoc = agent.destination.getLocation(agent.player);
-        if (agent.destination.useSafeTeleporter()) {
-            newLoc = teleporter.getSafeLocation(agent.player, agent.destination);
-        }
-        if (newLoc == null) {
-            return agent.player.getLocation();
-        }
-        return newLoc;
-
-    }
-
-    public void setPortalEventTravelAgent(PlayerPortalEvent event) {
-        event.setPortalTravelAgent(this);
-        event.useTravelAgent(true);
-    }
-}

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

@@ -6,16 +6,10 @@ import org.bukkit.event.player.PlayerRespawnEvent;
 
 import java.lang.reflect.Method;
 
-/**
- * A utility class to enable version specific minecraft features.
- */
 public class CompatibilityLayer {
 
     private static Method checkAnchorSpawn;
 
-    /**
-     * Initialise the reflection methods.
-     */
     public static void init() {
         try {
             checkAnchorSpawn = PlayerRespawnEvent.class.getDeclaredMethod("isAnchorSpawn");
@@ -43,4 +37,4 @@ public class CompatibilityLayer {
         }
         return false;
     }
-}
+}

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

@@ -1,27 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.utils;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import org.bukkit.entity.Player;
-
-/**
- * The Multiverse TravelAgent.
- */
-public class MVTravelAgent {
-    protected MVDestination destination;
-    protected MultiverseCore core;
-    protected Player player;
-
-    public MVTravelAgent(MultiverseCore multiverseCore, MVDestination d, Player p) {
-        this.destination = d;
-        this.core = multiverseCore;
-        this.player = p;
-    }
-}

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

@@ -40,15 +40,6 @@ public class SimpleLocationManipulation implements LocationManipulation {
         orientationInts.put("w", 90);
         orientationInts.put("nw", 135);
 
-        orientationInts.put("north", 180);
-        orientationInts.put("northeast", 225);
-        orientationInts.put("east", 270);
-        orientationInts.put("southeast", 315);
-        orientationInts.put("south", 0);
-        orientationInts.put("southwest", 45);
-        orientationInts.put("west", 90);
-        orientationInts.put("northwest", 135);
-
         // "freeze" the map:
         ORIENTATION_INTS = Collections.unmodifiableMap(orientationInts);
         // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck

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

@@ -1,8 +1,8 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;
 
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
+import net.minidev.json.JSONObject;
+import net.minidev.json.parser.JSONParser;
+import net.minidev.json.parser.ParseException;
 
 import java.io.IOException;
 import java.util.Map;

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

@@ -1,8 +1,8 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;
 
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
+import net.minidev.json.JSONObject;
+import net.minidev.json.parser.JSONParser;
+import net.minidev.json.parser.ParseException;
 
 import java.io.IOException;
 import java.util.HashMap;

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

@@ -1,8 +1,9 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;
 
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
+
+import net.minidev.json.JSONObject;
+import net.minidev.json.parser.JSONParser;
+import net.minidev.json.parser.ParseException;
 
 import java.io.IOException;
 import java.util.Map;

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

@@ -1,9 +1,9 @@
 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 net.minidev.json.JSONArray;
+import net.minidev.json.JSONObject;
+import net.minidev.json.parser.JSONParser;
+import net.minidev.json.parser.ParseException;
 
 import java.io.IOException;
 import java.util.HashMap;

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

@@ -50,10 +50,6 @@ public class TestEntryFeeConversion {
         WorldProperties props = new WorldProperties(config);
         assertNull(props.entryfee.getCurrency());
 
-        entryFee.put("currency", 0);
-        props = new WorldProperties(config);
-        assertNull(props.entryfee.getCurrency());
-
         entryFee.put("currency", 1);
         props = new WorldProperties(config);
         assertEquals(Material.STONE, props.entryfee.getCurrency());

src/test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java

@@ -214,18 +214,11 @@ public class TestInstanceCreator {
             serverfield.set(core, mockServer);
 
             // Set buscript
-            Buscript buscript;
+            Buscript buscript = PowerMockito.spy(new Buscript(core));
             Field buscriptfield = MultiverseCore.class.getDeclaredField("buscript");
             buscriptfield.setAccessible(true);
-
-            try {
-                buscript = PowerMockito.spy(new Buscript(core));
-                when(buscript.getPlugin()).thenReturn(core);
-            } catch (NullPointerException e) {
-                buscript = null;
-            }
-
             buscriptfield.set(core, buscript);
+            when(buscript.getPlugin()).thenReturn(core);
 
             // Set worldManager
             WorldManager wm = PowerMockito.spy(new WorldManager(core));