Merge branch 'main' of https://github.com/AtlasMediaGroup/TotalFreedomMod into RELEASE-2021.06

# Conflicts:
#	pom.xml

.github/dependabot.yml

@@ -0,0 +1,19 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+
+  # Maintain Maven Updates
+  - package-ecosystem: "maven" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+      
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/maven.yml

@@ -8,10 +8,20 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    # Java 11 Builds
     - uses: actions/checkout@v1
-    - name: Set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
         java-version: 11
     - name: Build with Maven
       run: mvn -B package --file pom.xml
+
+    # Java 16 Builds
+    - uses: actions/checkout@v1
+    - name: Set up JDK 16
+      uses: actions/setup-java@v1
+      with:
+        java-version: 16
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

.travis.yml

@@ -1,13 +0,0 @@
-language: java
-jdk:
-  - oraclejdk11
-  - openjdk11
-notifications:
-  email: false
-addons:
-  apt:
-    packages:
-      - sshpass
-script: mvn clean install
-after_success:
-  - ./travis-upload.sh

README.md

@@ -1,4 +1,4 @@
-# TotalFreedomMod [![Build Status](https://travis-ci.com/AtlasMediaGroup/TotalFreedomMod.svg?branch=development)](https://travis-ci.com/AtlasMediaGroup/TotalFreedomMod) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/29c0f964da304666bd654bc7b1d556db)](https://www.codacy.com/gh/AtlasMediaGroup/TotalFreedomMod/dashboard?utm_source=github.com&utm_medium=referral&utm_content=AtlasMediaGroup/TotalFreedomMod&utm_campaign=Badge_Grade)
+# TotalFreedomMod [![Maven-Build](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/maven.yml/badge.svg)](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/maven.yml) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/29c0f964da304666bd654bc7b1d556db)](https://www.codacy.com/gh/AtlasMediaGroup/TotalFreedomMod/dashboard?utm_source=github.com&utm_medium=referral&utm_content=AtlasMediaGroup/TotalFreedomMod&utm_campaign=Badge_Grade) [![CodeQL](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/codeql-analysis.yml)
 
 TotalFreedomMod is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](https://totalfreedom.me/). However, you are more than welcome to adapt the source for your own server.
 
@@ -14,4 +14,4 @@ For information on our security policy and reporting an issue, please see [SECUR
 
 ### Compiling
 
-You need Maven to build. You'd also need to set the JDK version to Java 8 as that is the current standard as of now.
+You need Maven to build. You'd also need to set the JDK version to Java 11 as that is the current standard as of now.

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>me.totalfreedom</groupId>
     <artifactId>TotalFreedomMod</artifactId>
-    <version>2021.05</version>
+    <version>2021.06-RC01</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -39,11 +39,6 @@
     </scm>
 
     <repositories>
-        <repository>
-            <id>apache-snapshots</id>
-            <url>https://repository.apache.org/content/repositories/snapshots/</url>
-        </repository>
-
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
@@ -114,11 +109,6 @@
             <id>ess-repo</id>
             <url>https://ci.ender.zone/plugin/repository/everything/</url>
         </repository>
-
-        <repository>
-            <id>mattmalec-repo</id>
-            <url>https://repo.mattmalec.com/repository/releases</url>
-        </repository>
     </repositories>
 
     <dependencies>
@@ -154,7 +144,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>2.2.1</version>
+            <version>1.8</version>
             <scope>compile</scope>
         </dependency>
 
@@ -173,9 +163,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.github.TotalFreedomMC</groupId>
+            <groupId>com.github.AtlasMediaGroup</groupId>
             <artifactId>TF-LibsDisguises</artifactId>
-            <version>48f01cf2fe</version>
+            <version>5a340341b0</version>
             <scope>provided</scope>
         </dependency>
 
@@ -196,21 +186,21 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>4.3.0_277</version>
+            <version>4.2.1_255</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>net.coreprotect</groupId>
             <artifactId>coreprotect</artifactId>
-            <version>19.5</version>
+            <version>19.3</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
             <artifactId>worldguard-bukkit</artifactId>
-            <version>7.0.5</version>
+            <version>7.0.4</version>
             <scope>provided</scope>
         </dependency>
 
@@ -269,26 +259,12 @@
             <version>3.1.1</version>
             <scope>compile</scope>
         </dependency>
-
-        <dependency>
-            <groupId>com.mattmalec</groupId>
-            <artifactId>Pterodactyl4J</artifactId>
-            <version>2.BETA_47</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-shade-plugin</artifactId>
-            <version>3.3.0-SNAPSHOT</version>
-        </dependency>
-
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
             <version>5.4.2</version>
             <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>org.eclipse.sisu</groupId>
             <artifactId>org.eclipse.sisu.inject</artifactId>
@@ -323,7 +299,7 @@
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
-                <version>4.0.5</version>
+                <version>4.0.2</version>
                 <executions>
                     <execution>
                         <id>get-the-git-infos</id>
@@ -436,12 +412,10 @@
             </plugin>
 
             <!-- Shade -->
-            <!-- NOTE: This should only be temporary. This will need to be updated when a stable build comes out
-            that supports Java 16 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0-SNAPSHOT</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -453,7 +427,8 @@
                             <relocations>
                                 <relocation>
                                     <pattern>io.papermc.lib</pattern>
-                                    <shadedPattern>me.totalfreedom.totalfreedommod.paperlib</shadedPattern>
+                                    <shadedPattern>me.totalfreedom.totalfreedommod.paperlib
+                                    </shadedPattern> <!-- Replace this -->
                                 </relocation>
                                 <relocation>
                                     <pattern>org.bstats</pattern>
@@ -471,7 +446,6 @@
                                     <include>com.github.speedxx:Mojangson</include>
                                     <include>org.bstats:bstats-bukkit</include>
                                     <include>org.jetbrains:annotations</include>
-                                    <include>com.mattmalec:Pterodactyl4J</include>
                                 </includes>
                             </artifactSet>
                         </configuration>

src/main/java/me/totalfreedom/totalfreedommod/Pterodactyl.java

@@ -1,30 +1,26 @@
 package me.totalfreedom.totalfreedommod;
 
-import com.mattmalec.pterodactyl4j.Permission;
-import com.mattmalec.pterodactyl4j.PowerAction;
-import com.mattmalec.pterodactyl4j.PteroAction;
-import com.mattmalec.pterodactyl4j.PteroBuilder;
-import com.mattmalec.pterodactyl4j.application.entities.ApplicationUser;
-import com.mattmalec.pterodactyl4j.application.entities.PteroApplication;
-import com.mattmalec.pterodactyl4j.application.managers.UserAction;
-import com.mattmalec.pterodactyl4j.client.entities.ClientServer;
-import com.mattmalec.pterodactyl4j.client.entities.ClientSubuser;
-import com.mattmalec.pterodactyl4j.client.entities.PteroClient;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
 import joptsimple.internal.Strings;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import me.totalfreedom.totalfreedommod.util.Response;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.ParseException;
 
 public class Pterodactyl extends FreedomService
 {
+
     public final String URL = ConfigEntry.PTERO_URL.getString();
+    private final String SERVER_KEY = ConfigEntry.PTERO_SERVER_KEY.getString();
     private final String ADMIN_KEY = ConfigEntry.PTERO_ADMIN_KEY.getString();
-    private final String CLIENT_KEY = ConfigEntry.PTERO_CLIENT_KEY.getString();
-    private final String IDENTIFIER = ConfigEntry.PTERO_SERVER_UUID.getString();
-    private final PteroApplication adminAPI = PteroBuilder.createApplication(URL, ADMIN_KEY);
-    private final PteroClient clientAPI = PteroBuilder.createClient(URL, CLIENT_KEY);
-    private final ClientServer server = clientAPI.retrieveServerByIdentifier(IDENTIFIER).execute();
+    private final List<String> SERVER_HEADERS = Arrays.asList("Accept:Application/vnd.pterodactyl.v1+json", "Content-Type:application/json", "Authorization:Bearer " + SERVER_KEY);
+    private final List<String> ADMIN_HEADERS = Arrays.asList("Accept:Application/vnd.pterodactyl.v1+json", "Content-Type:application/json", "Authorization:Bearer " + ADMIN_KEY);
 
     private boolean enabled = !Strings.isNullOrEmpty(URL);
 
@@ -47,60 +43,163 @@ public class Pterodactyl extends FreedomService
 
         if (!admin.isActive() || admin.getRank() != Rank.SENIOR_ADMIN)
         {
-            FLog.debug("Disabling Pterodactyl account");
+            FLog.debug("Disabling ptero acc");
             removeAccountFromServer(id);
             return;
         }
 
-        FLog.debug("Enabling Pterodactyl account");
+        FLog.debug("Enabling ptero acc");
         addAccountToServer(id);
     }
 
+    @SuppressWarnings("unchecked")
     public String createAccount(String username, String password)
     {
-        UserAction action = adminAPI.getUserManager().createUser()
-                .setUserName(username)
-                .setEmail(username.toLowerCase() + "@" + ConfigEntry.PTERO_DEFAULT_EMAIL_DOMAIN.getString())
-                .setFirstName(username)
-                .setLastName("\u200E") // Required - make it appear empty
-                .setPassword(password);
+        JSONObject json = new JSONObject();
+        json.put("username", username);
+        json.put("password", password);
+        json.put("email", username.toLowerCase() + "@" + ConfigEntry.PTERO_DEFAULT_EMAIL_DOMAIN.getString());
+        json.put("first_name", username);
+        json.put("last_name", "\u200E"); // required, so I made it appear empty
+
+        Response response;
+        JSONObject jsonResponse;
+        try
+        {
+            response = FUtil.sendRequest(URL + "/api/application/users", "POST", ADMIN_HEADERS, json.toJSONString());
+            jsonResponse = response.getJSONMessage();
+        }
+        catch (IOException | ParseException e)
+        {
+            FLog.severe(e);
+            return null;
+        }
+
+        return ((JSONObject)jsonResponse.get("attributes")).get("id").toString();
 
-        return action.execute().getId();
     }
 
-    public void deleteAccount(String id)
+    public boolean deleteAccount(String id)
     {
-        ApplicationUser username = adminAPI.retrieveUserById(id).execute();
-        PteroAction<Void> action = adminAPI.getUserManager().deleteUser(username);
-        action.execute();
+        JSONObject json = new JSONObject();
+        try
+        {
+            return FUtil.sendRequest(URL + "/api/application/users/" + id, "DELETE", ADMIN_HEADERS, json.toJSONString()).getCode() == 204;
+        }
+        catch (IOException e)
+        {
+            FLog.severe(e);
+            return false;
+        }
     }
 
+    @SuppressWarnings("unchecked")
     public void addAccountToServer(String id)
     {
-        ApplicationUser username = adminAPI.retrieveUserById(id).execute();
-        String email = username.getEmail();
-        PteroAction<ClientServer> server = clientAPI.retrieveServerByIdentifier(IDENTIFIER);
-        server.execute().getSubuserManager().createUser()
-                .setEmail(email)
-                .setPermissions(Permission.CONTROL_PERMISSIONS).execute();
+        String url = URL + "/api/client/servers/" + ConfigEntry.PTERO_SERVER_UUID.getString() + "/users";
+
+        JSONObject userData = getUserData(id);
+        if (userData == null)
+        {
+            FLog.severe("The Pterodactyl user with the ID of " + id + " was not found");
+            return;
+        }
+
+        JSONObject json = new JSONObject();
+        json.put("email", userData.get("email").toString());
+        json.put("permissions", Arrays.asList("control.console", "control.start", "control.restart", "control.stop", "control.kill"));
+
+        try
+        {
+            FUtil.sendRequest(url, "POST", SERVER_HEADERS, json.toJSONString());
+        }
+        catch (IOException e)
+        {
+            FLog.severe(e);
+        }
     }
 
     public void removeAccountFromServer(String id)
     {
-        ApplicationUser username = adminAPI.retrieveUserById(id).execute();
-        PteroAction<ClientServer> server = clientAPI.retrieveServerByIdentifier(IDENTIFIER);
-        ClientSubuser clientSubuser = server.execute().getSubuser(username.getUUID()).retrieve().execute();
-        server.execute().getSubuserManager().deleteUser(clientSubuser).execute();
+        JSONObject userData = getUserData(id);
+        if (userData == null)
+        {
+            FLog.severe("The Pterodactyl user with the ID of " + id + " was not found");
+            return;
+        }
+
+        String url = URL + "/api/client/servers/" + ConfigEntry.PTERO_SERVER_UUID.getString() + "/users/" + userData.get("uuid");
+
+        try
+        {
+            FUtil.sendRequest(url, "DELETE", SERVER_HEADERS, null);
+        }
+        catch (IOException e)
+        {
+            FLog.severe(e);
+        }
     }
 
-    public void stopServer()
+    public JSONObject getUserData(String id)
     {
-        clientAPI.setPower(server, PowerAction.STOP).execute();
+        Response response;
+        JSONObject jsonResponse;
+        try
+        {
+            response = FUtil.sendRequest(URL + "/api/application/users/" + id, "GET", ADMIN_HEADERS, null);
+            jsonResponse = response.getJSONMessage();
+
+        }
+        catch (IOException | ParseException e)
+        {
+            FLog.severe(e);
+            return null;
+        }
+
+        return (JSONObject)jsonResponse.get("attributes");
+
     }
 
-    public void restartServer()
+    // API patch function on users doesnt work rn, it throws 500 errors, so it's probably not written yet
+    @SuppressWarnings("unchecked")
+    public void setPassword(String id, String password)
     {
-        clientAPI.setPower(server, PowerAction.RESTART).execute();
+        JSONObject json = new JSONObject();
+        json.put("password", password);
+
+        try
+        {
+            FUtil.sendRequest(URL + "/api/application/users/" + id, "PATCH", ADMIN_HEADERS, json.toJSONString());
+        }
+        catch (IOException e)
+        {
+            FLog.severe(e);
+        }
+    }
+
+    public String getURL()
+    {
+        return URL;
+    }
+
+    public String getServerKey()
+    {
+        return SERVER_KEY;
+    }
+
+    public String getAdminKey()
+    {
+        return ADMIN_KEY;
+    }
+
+    public List<String> getServerHeaders()
+    {
+        return SERVER_HEADERS;
+    }
+
+    public List<String> getAdminHeaders()
+    {
+        return ADMIN_HEADERS;
     }
 
     public boolean isEnabled()

src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java

@@ -77,13 +77,26 @@ public class Command_cage extends FreedomCommand
                 }
                 case "block":
                 {
-                    if (Material.matchMaterial(args[2]) != null)
+                    if (args.length >= 3)
                     {
-                        outerMaterial = Material.matchMaterial(args[2]);
-                        break;
+                        // Checks the validity of the Material and checks if it's a block.
+                        // This is incredibly inefficient, as Spigot's isBlock() method in Material is an actual
+                        // nightmare of switch-cases.
+                        if (Material.matchMaterial(args[2]) != null && Material.matchMaterial(args[2]).isBlock())
+                        {
+                            outerMaterial = Material.matchMaterial(args[2]);
+                            break;
+                        }
+                        else
+                        {
+                            msg("Invalid block!", ChatColor.RED);
+                            return true;
+                        }
+                    }
+                    else
+                    {
+                        return false;
                     }
-                    msg("Invalid block!", ChatColor.RED);
-                    break;
                 }
                 default:
                 {

src/main/java/me/totalfreedom/totalfreedommod/command/Command_cleanchat.java

@@ -8,7 +8,7 @@ import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
 @CommandParameters(description = "Clears the chat.", usage = "/<command>", aliases = "cc")
-public class Command_clearchat extends FreedomCommand
+public class Command_cleanchat extends FreedomCommand
 {
 
     @Override
@@ -27,4 +27,4 @@ public class Command_clearchat extends FreedomCommand
         FUtil.adminAction(sender.getName(), "Cleared chat", true);
         return true;
     }
-}
+}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_panel.java

@@ -17,9 +17,11 @@ import org.bukkit.entity.Player;
 @CommandParameters(description = "Manage your Pterodactyl panel account", usage = "/<command> <create | delete>")
 public class Command_panel extends FreedomCommand
 {
+
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
+
         if (!plugin.ptero.isEnabled())
         {
             msg("Pterodactyl integration is currently disabled.", ChatColor.RED);
@@ -30,7 +32,7 @@ public class Command_panel extends FreedomCommand
 
         if (playerData.getDiscordID() == null)
         {
-            msg("You must have a linked Discord account.", ChatColor.RED);
+            msg("You must have a linked discord account.", ChatColor.RED);
             return true;
         }
 
@@ -61,11 +63,13 @@ public class Command_panel extends FreedomCommand
             }
 
             plugin.ptero.addAccountToServer(id);
+
             admin.setPteroID(id);
             plugin.al.save(admin);
             plugin.al.updateTables();
+
             plugin.dc.sendPteroInfo(playerData, username, password);
-            msg("Successfully created your Pterodactyl account. Check your DMs from " + plugin.dc.formatBotTag() + " on Discord to get your credentials.", ChatColor.GREEN);
+            msg("Successfully created your Pterodactyl account. Check your DMs from " + plugin.dc.formatBotTag() + " on discord to get your credentials.", ChatColor.GREEN);
             return true;
         }
         else if (args[0].equalsIgnoreCase("delete"))
@@ -79,10 +83,18 @@ public class Command_panel extends FreedomCommand
                 return true;
             }
 
-            plugin.ptero.deleteAccount(admin.getPteroID());
+            boolean deleted = plugin.ptero.deleteAccount(admin.getPteroID());
+
+            if (!deleted)
+            {
+                msg("Failed to delete your Pterodactyl account.", ChatColor.RED);
+                return true;
+            }
+
             admin.setPteroID(null);
             plugin.al.save(admin);
             plugin.al.updateTables();
+
             msg("Successfully deleted your Pterodactyl account.", ChatColor.GREEN);
             return true;
         }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_restart.java

@@ -1,77 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import java.util.HashMap;
-import java.util.Map;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
-
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Restart the server", usage = "/<command> [reason]")
-public class Command_restart extends FreedomCommand
-{
-    private static final Map<CommandSender, String> RESTART_CONFIRM = new HashMap<>();
-
-    @Override
-    public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole)
-    {
-        if (!plugin.ptero.isEnabled())
-        {
-            msg("Pterodactyl integration is currently disabled.", ChatColor.RED);
-            return true;
-        }
-
-        String reason = "Server is restarting!";
-
-        if (args.length != 0)
-        {
-            reason = StringUtils.join(args, " ");
-        }
-
-        if (sender.getName().equals("CONSOLE"))
-        {
-            restart(reason);
-            return true;
-        }
-        else if (RESTART_CONFIRM.containsKey(sender))
-        {
-            restart(RESTART_CONFIRM.get(sender));
-            return true;
-        }
-
-        msg("Warning: You're about to restart the server. Type /restart again to confirm you want to do this.");
-
-        RESTART_CONFIRM.put(sender, reason);
-        new BukkitRunnable()
-        {
-            @Override
-            public void run()
-            {
-                if (RESTART_CONFIRM.containsKey(sender))
-                {
-                    RESTART_CONFIRM.remove(sender);
-                    msg("Restart request expired.");
-                }
-            }
-        }.runTaskLater(plugin, 15 * 20);
-        return true;
-    }
-
-    public void restart(String reason)
-    {
-        FUtil.bcastMsg("Server is restarting!", ChatColor.LIGHT_PURPLE);
-
-        for (Player player : server.getOnlinePlayers())
-        {
-            player.kickPlayer(ChatColor.LIGHT_PURPLE + reason);
-        }
-
-        RESTART_CONFIRM.remove(sender);
-        plugin.ptero.restartServer();
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_seed.java

@@ -0,0 +1,97 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.ClickEvent;
+import net.md_5.bungee.api.chat.HoverEvent;
+import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.chat.TranslatableComponent;
+import net.md_5.bungee.api.chat.hover.content.Text;
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@CommandPermissions(level = Rank.NON_OP, source = SourceType.BOTH)
+@CommandParameters(description = "Get the seed of the world you are currently in.", usage = "/seed [world]")
+public class Command_seed extends FreedomCommand
+{
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        World world;
+
+        if (args.length > 0)
+        {
+            world = server.getWorld(args[0]);
+            if (world == null)
+            {
+                msg("That world could not be found", ChatColor.RED);
+                return true;
+            }
+        }
+        else
+        {
+            // If the sender is a Player, use that world. Otherwise, use the overworld as a fallback.
+            if (!senderIsConsole)
+            {
+                world = playerSender.getWorld();
+            }
+            else
+            {
+                world = server.getWorlds().get(0);
+            }
+        }
+
+        // If the sender is not a Player, use the usual msg method to
+        if (senderIsConsole)
+        {
+            msg("Seed: [" + ChatColor.GREEN + world.getSeed() + ChatColor.WHITE + "]", ChatColor.WHITE);
+        }
+        else
+        {
+            // Gets the seed for later uses
+            String seed = String.valueOf(world.getSeed());
+
+            // This is a really stupid hack to get things to play nicely, but it works so I don't give a damn
+            BaseComponent[] components = {new TranslatableComponent("chat.copy.click")};
+            TextComponent seedAsComponent = new TextComponent(seed);
+
+            // Style the message like in vanilla Minecraft.
+            seedAsComponent.setColor(ChatColor.GREEN.asBungee());
+            seedAsComponent.setClickEvent(new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, seed));
+            seedAsComponent.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(components)));
+
+            // Enclose the seed with brackets
+            TextComponent seedString = new TextComponent("[");
+            seedString.addExtra(seedAsComponent);
+            seedString.addExtra("]");
+
+            // Send the message to the player.
+            TranslatableComponent response = new TranslatableComponent("commands.seed.success", seedString);
+            playerSender.spigot().sendMessage(response);
+        }
+        return true;
+    }
+
+    @Override
+    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
+    {
+        if (args.length == 1)
+        {
+            // Returns a list of worlds on the server and returns it
+            List<String> worlds = new ArrayList<>();
+            for (World world : server.getWorlds())
+            {
+                worlds.add(world.getName());
+            }
+            return worlds;
+        }
+
+        return null;
+    }
+}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_stop.java

@@ -20,6 +20,7 @@ public class Command_stop extends FreedomCommand
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
+
         String reason = "Server is going offline, come back in about 20 seconds.";
 
         if (args.length != 0)
@@ -38,6 +39,7 @@ public class Command_stop extends FreedomCommand
             return true;
         }
 
+
         msg("Warning: You're about to stop the server. Type /stop again to confirm you want to do this.");
 
         STOP_CONFIRM.put(sender, reason);
@@ -67,13 +69,6 @@ public class Command_stop extends FreedomCommand
 
         STOP_CONFIRM.remove(sender);
 
-        if (plugin.ptero.isEnabled())
-        {
-            plugin.ptero.stopServer();
-        }
-        else
-        {
-            server.shutdown();
-        }
+        server.shutdown();
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java

@@ -91,7 +91,7 @@ public enum ConfigEntry
     PTERO_DEFAULT_EMAIL_DOMAIN(String.class, "ptero.default_email_domain"),
     PTERO_SERVER_UUID(String.class, "ptero.server_uuid"),
     PTERO_ADMIN_KEY(String.class, "ptero.admin_key"),
-    PTERO_CLIENT_KEY(String.class, "ptero.client_key"),
+    PTERO_SERVER_KEY(String.class, "ptero.server_key"),
     //
     SHOP_ENABLED(Boolean.class, "shop.enabled"),
     SHOP_TITLE(String.class, "shop.title"),

src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java

@@ -1,7 +1,5 @@
 package me.totalfreedom.totalfreedommod.player;
 
-import java.util.ArrayList;
-import java.util.List;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.caging.CageData;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
@@ -16,8 +14,12 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class FPlayer
 {
+
     public static final long AUTO_PURGE_TICKS = 5L * 60L * 20L;
 
 
@@ -247,7 +249,7 @@ public class FPlayer
     public void startArrowShooter(TotalFreedomMod plugin)
     {
         this.stopArrowShooter();
-        this.mp44ScheduleTask = new ArrowShooter(this.player).runTaskTimer(plugin, 1L, 1L);
+        this.mp44ScheduleTask = new ArrowShooter(getPlayer()).runTaskTimer(plugin, 1L, 1L);
         this.mp44Firing = true;
     }
 
@@ -709,8 +711,11 @@ public class FPlayer
         @Override
         public void run()
         {
-            Arrow shot = player.launchProjectile(Arrow.class);
-            shot.setVelocity(shot.getVelocity().multiply(2.0));
+            if (player != null)
+            {
+                Arrow shot = player.launchProjectile(Arrow.class);
+                shot.setVelocity(shot.getVelocity().multiply(2.0));
+            }
         }
     }
 }

src/main/resources/config.yml

@@ -85,23 +85,18 @@ discord:
   # Owner role ID
   server_owner_role_id: ''
 
-# Pterodactyl (requires Discord verification to be enabled)
+# Pterodactyl
 ptero:
   # URL - do not leave a trailing forward slash
   url: ''
   # The default email domain used to set email addresses for new users - do not include the @
   default_email_domain: 'example.com'
-  # Long Server UUID (for example: abf9a712-6c5a-4504-b4bc-37f1061b8801)
-  # Do NOT give the short Server UUID
+  # Server UUID
   server_uuid: ''
   # Admin panel API key
-  # Create this key by going to Settings > Application API > Create New
-  # Make sure you give it Users and Servers permissions
   admin_key: ''
-  # Client API key
-  # Create a new user and add them as a subuser to the server with all control privileges.
-  # Then, login to the new user account and go to User Settings. Click on API Credentials and create a new one.
-  client_key: ''
+  # Server API key
+  server_key: ''
 
 # The shop
 shop: