Release v1.4.0

#5: DiscordSRV support

.travis.yml

@@ -1,6 +1,6 @@
 language: java
 jdk:
-  - oraclejdk8
+  - openjdk8
 deploy:
   provider: releases
   api_key: $GITHUB_KEY

README.md

@@ -1,4 +1,4 @@
-[![Travis-CI](https://img.shields.io/travis/oskar3123/StaffChat.svg?style=flat)](https://travis-ci.org/oskar3123/StaffChat)
+[![Travis-CI](https://img.shields.io/travis/com/oskar3123/StaffChat.svg?style=flat)](https://app.travis-ci.com/github/oskar3123/StaffChat)
 [![All Release](https://img.shields.io/github/downloads/oskar3123/StaffChat/total.svg?style=flat)](https://github.com/oskar3123/StaffChat/releases/latest)
 [![Latest Release](https://img.shields.io/github/release/oskar3123/StaffChat.svg?style=flat)](https://github.com/oskar3123/StaffChat/releases/latest)
 [![Github commits (since latest release)](https://img.shields.io/github/commits-since/oskar3123/StaffChat/latest.svg?style=flat)](https://github.com/oskar3123/StaffChat/commits/master)
@@ -14,6 +14,8 @@ You can download the plugin from the [Spigot resource page](https://www.spigotmc
 
 ### Bukkit/Spigot
 
+Because the event API in 1.14+ is now strict between sync and async events you should check whether this was called synchronously or asynchronously by using `event.isAsynchronous()`
+
 ```java
 public class StaffChatListener implements Listener
 {

pom.xml

@@ -5,9 +5,10 @@
 
   <modelVersion>4.0.0</modelVersion>
 
+  <name>StaffChat</name>
   <groupId>me.oskar3123</groupId>
   <artifactId>staffchat</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+  <version>1.4.0</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -24,7 +25,16 @@
     </repository>
     <repository>
       <id>placeholderapi</id>
-            <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+      <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+    </repository>
+    <repository>
+      <id>dv8tion</id>
+      <name>m2-dv8tion</name>
+      <url>https://m2.dv8tion.net/releases</url>
+    </repository>
+    <repository>
+      <id>Scarsz-Nexus</id>
+      <url>https://nexus.scarsz.me/content/groups/public/</url>
     </repository>
   </repositories>
 
@@ -32,22 +42,33 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-            <version>1.13.2-R0.1-SNAPSHOT</version>
+      <version>1.18-R0.1-SNAPSHOT</version>
-        </dependency>
+      <scope>provided</scope>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.13.2-R0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.md-5</groupId>
       <artifactId>bungeecord-api</artifactId>
-            <version>1.13-SNAPSHOT</version>
+      <version>1.18-R0.1-SNAPSHOT</version>
+      <type>jar</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.md-5</groupId>
+      <artifactId>bungeecord-api</artifactId>
+      <version>1.18-R0.1-SNAPSHOT</version>
+      <type>javadoc</type>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>me.clip</groupId>
       <artifactId>placeholderapi</artifactId>
-            <version>2.9.2</version>
+      <version>2.11.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.discordsrv</groupId>
+      <artifactId>discordsrv</artifactId>
+      <version>1.25.1</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

src/main/java/me/oskar3123/staffchat/bungee/BungeeMain.java

@@ -1,5 +1,9 @@
 package me.oskar3123.staffchat.bungee;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
 import me.oskar3123.staffchat.bungee.command.BungeeStaffChatCommand;
 import me.oskar3123.staffchat.bungee.listener.BungeeChatListener;
 import net.md_5.bungee.api.plugin.Plugin;
@@ -7,13 +11,7 @@ import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.config.ConfigurationProvider;
 import net.md_5.bungee.config.YamlConfiguration;
 
-import java.io.File;
+public class BungeeMain extends Plugin {
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-
-public class BungeeMain extends Plugin
-{
 
   public final String usePerm = "staffchat.use";
   public final String seePerm = "staffchat.see";
@@ -22,47 +20,43 @@ public class BungeeMain extends Plugin
   public final BungeeChatListener chatListener = new BungeeChatListener(this);
   private Configuration config;
 
-    public void onEnable()
+  public void onEnable() {
-    {
     new MetricsLite(this);
     saveDefaultConfig();
-        if (!reloadConfig())
+    if (!reloadConfig()) {
-        {
       getLogger().severe("Could not load config file, using defaults.");
     }
     registerCommands();
     registerEvents();
   }
 
-    private void registerCommands()
+  private void registerCommands() {
-    {
     getProxy().getPluginManager().registerCommand(this, new BungeeStaffChatCommand(this));
   }
 
-    private void registerEvents()
+  private void registerEvents() {
-    {
     getProxy().getPluginManager().registerListener(this, chatListener);
   }
 
-    public boolean reloadConfig()
+  public boolean reloadConfig() {
-    {
+    try {
-        try
+      config =
-        {
+          ConfigurationProvider.getProvider(YamlConfiguration.class)
-            config = ConfigurationProvider.getProvider(YamlConfiguration.class).load(new File(getDataFolder(), "config.yml"));
+              .load(new File(getDataFolder(), "config.yml"));
       loadDefaultValues();
       return true;
-        }
+    } catch (IOException e) {
-        catch (IOException e)
+      config =
-        {
+          ConfigurationProvider.getProvider(YamlConfiguration.class)
-            config = ConfigurationProvider.getProvider(YamlConfiguration.class).load(getResourceAsStream("config.yml"));
+              .load(getResourceAsStream("config.yml"));
       loadDefaultValues();
       return false;
     }
   }
 
-    private void loadDefaultValues()
+  private void loadDefaultValues() {
-    {
+    String[] keys =
-        String[] keys = new String[] {
+        new String[] {
           "settings.character",
           "settings.format",
           "messages.prefix",
@@ -73,57 +67,46 @@ public class BungeeMain extends Plugin
           "messages.onstring",
           "messages.offstring",
         };
-        Configuration def = ConfigurationProvider.getProvider(YamlConfiguration.class).load(getResourceAsStream("config.yml"));
+    Configuration def =
-        for (String key : keys)
+        ConfigurationProvider.getProvider(YamlConfiguration.class)
-        {
+            .load(getResourceAsStream("config.yml"));
+    for (String key : keys) {
       String v = config.getString(key);
-            if (v == null || v.isEmpty())
+      if (v == null || v.isEmpty()) {
-            {
         config.set(key, def.getString(key));
       }
     }
     saveConfig();
   }
 
-    public Configuration getConfig()
+  public Configuration getConfig() {
-    {
     return config;
   }
 
-    private void saveDefaultConfig()
+  private void saveDefaultConfig() {
-    {
+    if (!getDataFolder().exists()) {
-        if (!getDataFolder().exists())
-        {
       //noinspection ResultOfMethodCallIgnored
       getDataFolder().mkdir();
     }
 
     File file = new File(getDataFolder(), "config.yml");
 
-        if (!file.exists())
+    if (!file.exists()) {
-        {
+      try (InputStream in = getResourceAsStream("config.yml")) {
-            try (InputStream in = getResourceAsStream("config.yml"))
-            {
         Files.copy(in, file.toPath());
-            }
+      } catch (IOException e) {
-            catch (IOException e)
-            {
         e.printStackTrace();
       }
     }
   }
 
-    public void saveConfig()
+  public void saveConfig() {
-    {
+    try {
-        try
+      ConfigurationProvider.getProvider(YamlConfiguration.class)
-        {
+          .save(config, new File(getDataFolder(), "config.yml"));
-            ConfigurationProvider.getProvider(YamlConfiguration.class).save(config, new File(getDataFolder(), "config.yml"));
+    } catch (IOException e) {
-        }
-        catch (IOException e)
-        {
       e.printStackTrace();
       getLogger().severe("Failed to save config");
     }
   }
-
 }

src/main/java/me/oskar3123/staffchat/bungee/MetricsLite.java

@@ -2,30 +2,39 @@ package me.oskar3123.staffchat.bungee;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.zip.GZIPOutputStream;
+import javax.net.ssl.HttpsURLConnection;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.scheduler.TaskScheduler;
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.config.ConfigurationProvider;
 import net.md_5.bungee.config.YamlConfiguration;
 
-import javax.net.ssl.HttpsURLConnection;
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.zip.GZIPOutputStream;
-
 /**
  * bStats collects some data for plugin authors.
- * <p>
+ *
- * Check out https://bStats.org/ to learn more about bStats!
+ * <p>Check out https://bStats.org/ to learn more about bStats!
  */
 @SuppressWarnings("all")
-public class MetricsLite
+public class MetricsLite {
-{
 
   // The version of this bStats class
   public static final int B_STATS_VERSION = 1;
@@ -34,14 +43,16 @@ public class MetricsLite
   // A list with all known metrics class objects including this one
   private static final List<Object> knownMetricsInstances = new ArrayList<>();
 
-    static
+  static {
-    {
+    // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick"
-        // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D
+    // ... :D
-        final String defaultPackage = new String(new byte[] {'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's'});
+    final String defaultPackage =
-        final String examplePackage = new String(new byte[] {'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
+        new String(new byte[] {'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's'});
+    final String examplePackage =
+        new String(new byte[] {'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
     // We want to make sure nobody just copy & pastes the example and use the wrong package names
-        if (MetricsLite.class.getPackage().getName().equals(defaultPackage) || MetricsLite.class.getPackage().getName().equals(examplePackage))
+    if (MetricsLite.class.getPackage().getName().equals(defaultPackage)
-        {
+        || MetricsLite.class.getPackage().getName().equals(examplePackage)) {
       throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
     }
   }
@@ -55,64 +66,54 @@ public class MetricsLite
   // Should failed requests be logged?
   private boolean logFailedRequests = false;
 
-    public MetricsLite(Plugin plugin)
+  public MetricsLite(Plugin plugin) {
-    {
     this.plugin = plugin;
 
-        try
+    try {
-        {
       loadConfig();
-        }
+    } catch (IOException e) {
-        catch (IOException e)
-        {
       // Failed to load configuration
       plugin.getLogger().log(Level.WARNING, "Failed to load bStats config!", e);
       return;
     }
 
     // We are not allowed to send data about this server :(
-        if (!enabled)
+    if (!enabled) {
-        {
       return;
     }
 
     Class<?> usedMetricsClass = getFirstBStatsClass();
-        if (usedMetricsClass == null)
+    if (usedMetricsClass == null) {
-        {
       // Failed to get first metrics class
       return;
     }
-        if (usedMetricsClass == getClass())
+    if (usedMetricsClass == getClass()) {
-        {
       // We are the first! :)
       linkMetrics(this);
       startSubmitting();
-        }
+    } else {
-        else
-        {
       // We aren't the first so we link to the first metrics class
-            try
+      try {
-            {
         usedMetricsClass.getMethod("linkMetrics", Object.class).invoke(null, this);
-            }
+      } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-            catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e)
+        if (logFailedRequests) {
-            {
+          plugin
-                if (logFailedRequests)
+              .getLogger()
-                {
+              .log(
-                    plugin.getLogger().log(Level.WARNING, "Failed to link to first metrics class " + usedMetricsClass.getName() + "!", e);
+                  Level.WARNING,
+                  "Failed to link to first metrics class " + usedMetricsClass.getName() + "!",
+                  e);
         }
       }
     }
   }
 
   /**
-     * Links an other metrics class with this class.
+   * Links an other metrics class with this class. This method is called using Reflection.
-     * This method is called using Reflection.
    *
    * @param metrics An object of the metrics class to link.
    */
-    public static void linkMetrics(Object metrics)
+  public static void linkMetrics(Object metrics) {
-    {
     knownMetricsInstances.add(metrics);
   }
 
@@ -122,10 +123,8 @@ public class MetricsLite
    * @param data The data to send.
    * @throws Exception If the request failed.
    */
-    private static void sendData(JsonObject data) throws Exception
+  private static void sendData(JsonObject data) throws Exception {
-    {
+    if (data == null) {
-        if (data == null)
-        {
       throw new IllegalArgumentException("Data cannot be null");
     }
 
@@ -140,7 +139,8 @@ public class MetricsLite
     connection.addRequestProperty("Connection", "close");
     connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
     connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
-        connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format
+    connection.setRequestProperty(
+        "Content-Type", "application/json"); // We send our data in JSON format
     connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
 
     // Send data
@@ -160,10 +160,8 @@ public class MetricsLite
    * @return The gzipped String.
    * @throws IOException If the compression failed.
    */
-    private static byte[] compress(final String str) throws IOException
+  private static byte[] compress(final String str) throws IOException {
-    {
+    if (str == null) {
-        if (str == null)
-        {
       return null;
     }
     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -174,13 +172,11 @@ public class MetricsLite
   }
 
   /**
-     * Gets the plugin specific data.
+   * Gets the plugin specific data. This method is called using Reflection.
-     * This method is called using Reflection.
    *
    * @return The plugin specific data.
    */
-    public JsonObject getPluginData()
+  public JsonObject getPluginData() {
-    {
     JsonObject data = new JsonObject();
 
     String pluginName = plugin.getDescription().getName();
@@ -195,29 +191,33 @@ public class MetricsLite
     return data;
   }
 
-    private void startSubmitting()
+  private void startSubmitting() {
-    {
     // We use a timer cause want to be independent from the server tps
     final Timer timer = new Timer(true);
-        timer.scheduleAtFixedRate(new TimerTask()
+    timer.scheduleAtFixedRate(
-        {
+        new TimerTask() {
           @Override
-            public void run()
+          public void run() {
-            {
             // The data collection (e.g. for custom graphs) is done sync
-                // Don't be afraid! The connection to the bStats server is still async, only the stats collection is sync ;)
+            // Don't be afraid! The connection to the bStats server is still async, only the stats
+            // collection is sync ;)
             TaskScheduler scheduler = plugin.getProxy().getScheduler();
-                scheduler.schedule(plugin, new Runnable()
+            scheduler.schedule(
-                {
+                plugin,
+                new Runnable() {
                   @Override
-                    public void run()
+                  public void run() {
-                    {
                     submitData();
                   }
-                }, 0L, TimeUnit.SECONDS);
+                },
+                0L,
+                TimeUnit.SECONDS);
           }
-        }, 1000 * 60 * 2, 1000 * 60 * 30);
+        },
-        // Submit the data every 30 minutes, first time after 2 minutes to give other plugins enough time to start
+        1000 * 60 * 2,
+        1000 * 60 * 30);
+    // Submit the data every 30 minutes, first time after 2 minutes to give other plugins enough
+    // time to start
     // WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted!
     // WARNING: Just don't do it!
   }
@@ -227,8 +227,7 @@ public class MetricsLite
    *
    * @return The server specific data.
    */
-    private JsonObject getServerData()
+  private JsonObject getServerData() {
-    {
     // Minecraft specific data
     int playerAmount = plugin.getProxy().getOnlineCount();
     playerAmount = playerAmount > 500 ? 500 : playerAmount;
@@ -261,53 +260,41 @@ public class MetricsLite
     return data;
   }
 
-    /**
+  /** Collects the data and sends it afterwards. */
-     * Collects the data and sends it afterwards.
+  private void submitData() {
-     */
-    private void submitData()
-    {
     final JsonObject data = getServerData();
 
     final JsonArray pluginData = new JsonArray();
     // Search for all other bStats Metrics classes to get their plugin data
-        for (Object metrics : knownMetricsInstances)
+    for (Object metrics : knownMetricsInstances) {
-        {
+      try {
-            try
-            {
         Object plugin = metrics.getClass().getMethod("getPluginData").invoke(metrics);
-                if (plugin instanceof JsonObject)
+        if (plugin instanceof JsonObject) {
-                {
           pluginData.add((JsonObject) plugin);
         }
-            }
+      } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {
-            catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored)
-            {
       }
     }
 
     data.add("plugins", pluginData);
 
     // Create a new thread for the connection to the bStats server
-        new Thread(new Runnable()
+    new Thread(
-        {
+            new Runnable() {
               @Override
-            public void run()
+              public void run() {
-            {
+                try {
-                try
-                {
                   // Send the data
                   sendData(data);
-                }
+                } catch (Exception e) {
-                catch (Exception e)
-                {
                   // Something went wrong! :(
-                    if (logFailedRequests)
+                  if (logFailedRequests) {
-                    {
                     plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats!", e);
                   }
                 }
               }
-        }).start();
+            })
+        .start();
   }
 
   /**
@@ -315,14 +302,13 @@ public class MetricsLite
    *
    * @throws IOException If something did not work :(
    */
-    private void loadConfig() throws IOException
+  private void loadConfig() throws IOException {
-    {
     Path configPath = plugin.getDataFolder().toPath().getParent().resolve("bStats");
     configPath.toFile().mkdirs();
     File configFile = new File(configPath.toFile(), "config.yml");
-        if (!configFile.exists())
+    if (!configFile.exists()) {
-        {
+      writeFile(
-            writeFile(configFile,
+          configFile,
           "#bStats collects some data for plugin authors like how many servers are using their plugins.",
           "#To honor their work, you should not disable it.",
           "#This has nearly no effect on the server performance!",
@@ -332,7 +318,8 @@ public class MetricsLite
           "logFailedRequests: false");
     }
 
-        Configuration configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(configFile);
+    Configuration configuration =
+        ConfigurationProvider.getProvider(YamlConfiguration.class).load(configFile);
 
     // Load configuration
     enabled = configuration.getBoolean("enabled", true);
@@ -345,33 +332,24 @@ public class MetricsLite
    *
    * @return The first bStats metrics class.
    */
-    private Class<?> getFirstBStatsClass()
+  private Class<?> getFirstBStatsClass() {
-    {
     Path configPath = plugin.getDataFolder().toPath().getParent().resolve("bStats");
     configPath.toFile().mkdirs();
     File tempFile = new File(configPath.toFile(), "temp.txt");
 
-        try
+    try {
-        {
       String className = readFile(tempFile);
-            if (className != null)
+      if (className != null) {
-            {
+        try {
-                try
-                {
           // Let's check if a class with the given name exists.
           return Class.forName(className);
-                }
+        } catch (ClassNotFoundException ignored) {
-                catch (ClassNotFoundException ignored)
-                {
         }
       }
       writeFile(tempFile, getClass().getName());
       return getClass();
-        }
+    } catch (IOException e) {
-        catch (IOException e)
+      if (logFailedRequests) {
-        {
-            if (logFailedRequests)
-            {
         plugin.getLogger().log(Level.WARNING, "Failed to get first bStats class!", e);
       }
       return null;
@@ -385,17 +363,12 @@ public class MetricsLite
    * @return The first line of the file or <code>null</code> if the file does not exist or is empty.
    * @throws IOException If something did not work :(
    */
-    private String readFile(File file) throws IOException
+  private String readFile(File file) throws IOException {
-    {
+    if (!file.exists()) {
-        if (!file.exists())
-        {
       return null;
     }
-        try (
+    try (FileReader fileReader = new FileReader(file);
-                FileReader fileReader = new FileReader(file);
+        BufferedReader bufferedReader = new BufferedReader(fileReader); ) {
-                BufferedReader bufferedReader = new BufferedReader(fileReader);
-        )
-        {
       return bufferedReader.readLine();
     }
   }
@@ -407,23 +380,16 @@ public class MetricsLite
    * @param lines The lines to write.
    * @throws IOException If something did not work :(
    */
-    private void writeFile(File file, String... lines) throws IOException
+  private void writeFile(File file, String... lines) throws IOException {
-    {
+    if (!file.exists()) {
-        if (!file.exists())
-        {
       file.createNewFile();
     }
-        try (
+    try (FileWriter fileWriter = new FileWriter(file);
-                FileWriter fileWriter = new FileWriter(file);
+        BufferedWriter bufferedWriter = new BufferedWriter(fileWriter)) {
-                BufferedWriter bufferedWriter = new BufferedWriter(fileWriter)
+      for (String line : lines) {
-        )
-        {
-            for (String line : lines)
-            {
         bufferedWriter.write(line);
         bufferedWriter.newLine();
       }
     }
   }
-
 }

src/main/java/me/oskar3123/staffchat/bungee/command/BungeeStaffChatCommand.java

@@ -8,53 +8,42 @@ import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Command;
 import net.md_5.bungee.config.Configuration;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 
-public class BungeeStaffChatCommand extends Command
+public class BungeeStaffChatCommand extends Command {
-{
 
-    private BungeeMain plugin;
+  private final BungeeMain plugin;
   private Configuration config;
 
-    public BungeeStaffChatCommand(BungeeMain plugin)
+  public BungeeStaffChatCommand(@NotNull BungeeMain plugin) {
-    {
     super("staffchat");
     this.plugin = plugin;
     config = plugin.getConfig();
   }
 
-    public void execute(CommandSender sender, String[] args)
+  public void execute(@NotNull CommandSender sender, @NotNull String[] args) {
-    {
+    BaseComponent[] noPerm =
-        BaseComponent[] noPerm = txt(config.getString("messages.prefix") + config.getString("messages.nopermission"));
+        txt(config.getString("messages.prefix") + config.getString("messages.nopermission"));
-        if (!sender.hasPermission(plugin.commandPerm))
+    if (!sender.hasPermission(plugin.commandPerm)) {
-        {
       sender.sendMessage(noPerm);
       return;
     }
-        if (args.length < 1)
+    if (args.length < 1) {
-        {
       help(sender, getName());
       return;
     }
-        if (args[0].equalsIgnoreCase("reload"))
+    if (args[0].equalsIgnoreCase("reload")) {
-        {
+      if (sender.hasPermission(plugin.reloadPerm)) {
-            if (sender.hasPermission(plugin.reloadPerm))
-            {
         reload(sender);
-            }
+      } else {
-            else
-            {
         sender.sendMessage(noPerm);
       }
       return;
-        }
+    } else if (args[0].equalsIgnoreCase("toggle")) {
-        else if (args[0].equalsIgnoreCase("toggle"))
+      if (sender.hasPermission(plugin.usePerm)) {
-        {
-            if (sender.hasPermission(plugin.usePerm))
-            {
         toggle(sender);
-            }
+      } else {
-            else
-            {
         sender.sendMessage(noPerm);
       }
       return;
@@ -62,53 +51,52 @@ public class BungeeStaffChatCommand extends Command
     help(sender, getName());
   }
 
-    private void playerOnly(CommandSender sender)
+  private void playerOnly(@NotNull CommandSender sender) {
-    {
+    sender.sendMessage(
-        sender.sendMessage(txt(config.getString("messages.prefix") + config.getString("messages.playeronly")));
+        txt(config.getString("messages.prefix") + config.getString("messages.playeronly")));
   }
 
-    private void help(CommandSender sender, String label)
+  private void help(@NotNull CommandSender sender, String label) {
-    {
     String prefix = config.getString("messages.prefix");
-        sender.sendMessage(txt(prefix + "Version " + plugin.getDescription().getVersion() + ", made by oskar3123"));
+    sender.sendMessage(
-        if (sender.hasPermission(plugin.usePerm))
+        txt(prefix + "Version " + plugin.getDescription().getVersion() + ", made by oskar3123"));
-        {
+    if (sender.hasPermission(plugin.usePerm)) {
       sender.sendMessage(txt(prefix + "Message prefix: " + config.getString("settings.character")));
       sender.sendMessage(txt(prefix + "/" + label + " toggle - Toggles auto staffchat"));
     }
-        if (sender.hasPermission(plugin.reloadPerm))
+    if (sender.hasPermission(plugin.reloadPerm)) {
-        {
       sender.sendMessage(txt(prefix + "/" + label + " reload - Reloads the config file"));
     }
   }
 
-    private void reload(CommandSender sender)
+  private void reload(@NotNull CommandSender sender) {
-    {
     plugin.reloadConfig();
     config = plugin.getConfig();
-        sender.sendMessage(txt(config.getString("messages.prefix") + config.getString("messages.reloaded")));
+    sender.sendMessage(
+        txt(config.getString("messages.prefix") + config.getString("messages.reloaded")));
   }
 
-    private void toggle(CommandSender sender)
+  private void toggle(@NotNull CommandSender sender) {
-    {
+    if (!(sender instanceof ProxiedPlayer)) {
-        if (!(sender instanceof ProxiedPlayer))
-        {
       playerOnly(sender);
       return;
     }
     boolean toggled = plugin.chatListener.togglePlayer(((ProxiedPlayer) sender).getUniqueId());
-        String state = toggled ? config.getString("messages.onstring") : config.getString("messages.offstring");
+    String state =
-        sender.sendMessage(txt(config.getString("messages.prefix") + String.format(config.getString("messages.toggled"), state)));
+        toggled ? config.getString("messages.onstring") : config.getString("messages.offstring");
+    sender.sendMessage(
+        txt(
+            config.getString("messages.prefix")
+                + String.format(config.getString("messages.toggled", ""), state)));
   }
 
-    private String clr(String string)
+  @Contract("_ -> new")
-    {
+  private @NotNull String clr(@NotNull String string) {
     return ChatColor.translateAlternateColorCodes('&', string);
   }
 
-    private BaseComponent[] txt(String text)
+  @Contract("_ -> new")
-    {
+  private @NotNull BaseComponent[] txt(@NotNull String text) {
     return TextComponent.fromLegacyText(clr(text));
   }
-
 }

src/main/java/me/oskar3123/staffchat/bungee/event/BungeeStaffChatEvent.java

@@ -1,54 +1,53 @@
 package me.oskar3123.staffchat.bungee.event;
 
+import java.util.Objects;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Cancellable;
 import net.md_5.bungee.api.plugin.Event;
+import org.jetbrains.annotations.NotNull;
 
-public class BungeeStaffChatEvent extends Event implements Cancellable
+public class BungeeStaffChatEvent extends Event implements Cancellable {
-{
 
-    private final String message;
   private final ProxiedPlayer player;
+
   private boolean cancelled = false;
   private String format;
+  private String message;
 
-    public BungeeStaffChatEvent(ProxiedPlayer player, String format, String message)
+  public BungeeStaffChatEvent(
-    {
+      @NotNull ProxiedPlayer player, @NotNull String format, @NotNull String message) {
     this.player = player;
     this.format = format;
     this.message = message;
   }
 
-    public String getFormat()
+  public @NotNull String getFormat() {
-    {
     return format;
   }
 
-    public void setFormat(String format)
+  public void setFormat(@NotNull String format) {
-    {
+    this.format = Objects.requireNonNull(format);
-        this.format = format;
   }
 
-    public String getMessage()
+  public @NotNull String getMessage() {
-    {
     return message;
   }
 
-    public ProxiedPlayer getPlayer()
+  public void setMessage(@NotNull String message) {
-    {
+    this.message = Objects.requireNonNull(message);
+  }
+
+  public @NotNull ProxiedPlayer getPlayer() {
     return player;
   }
 
   @Override
-    public boolean isCancelled()
+  public boolean isCancelled() {
-    {
     return cancelled;
   }
 
   @Override
-    public void setCancelled(boolean cancelled)
+  public void setCancelled(boolean cancelled) {
-    {
     this.cancelled = cancelled;
   }
-
 }

src/main/java/me/oskar3123/staffchat/bungee/listener/BungeeChatListener.java

@@ -1,5 +1,9 @@
 package me.oskar3123.staffchat.bungee.listener;
 
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
 import me.oskar3123.staffchat.bungee.BungeeMain;
 import me.oskar3123.staffchat.bungee.event.BungeeStaffChatEvent;
 import me.oskar3123.staffchat.util.StringUtils;
@@ -11,61 +15,52 @@ import net.md_5.bungee.api.event.ChatEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.event.EventHandler;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 
-import java.util.HashSet;
+public class BungeeChatListener implements Listener {
-import java.util.Set;
-import java.util.UUID;
 
-public class BungeeChatListener implements Listener
+  private final BungeeMain plugin;
-{
+  private final Set<UUID> toggledPlayers = new HashSet<>();
 
-    private BungeeMain plugin;
+  public BungeeChatListener(@NotNull BungeeMain plugin) {
-    private Set<UUID> toggledPlayers = new HashSet<>();
-
-    public BungeeChatListener(BungeeMain plugin)
-    {
     this.plugin = plugin;
   }
 
   @EventHandler
-    public void chat(ChatEvent event)
+  public void chat(@NotNull ChatEvent event) {
-    {
+    if (event.getMessage().startsWith("/")) {
-        if (event.getMessage().startsWith("/"))
-        {
       return;
     }
-        if (!(event.getSender() instanceof ProxiedPlayer))
+    if (!(event.getSender() instanceof ProxiedPlayer)) {
-        {
       return;
     }
 
     ProxiedPlayer player = (ProxiedPlayer) event.getSender();
-        if (!player.hasPermission(plugin.usePerm))
+    if (!player.hasPermission(plugin.usePerm)) {
-        {
       return;
     }
 
     Configuration config = plugin.getConfig();
-        String character = config.getString("settings.character");
+    String character = Objects.requireNonNull(config.getString("settings.character", "@"));
     boolean isToggled = toggledPlayers.contains(player.getUniqueId());
-        if (!event.getMessage().startsWith(character) && !isToggled)
+    if (!event.getMessage().startsWith(character) && !isToggled) {
-        {
       return;
     }
 
-        String format = config.getString("settings.format");
+    String format = Objects.requireNonNull(config.getString("settings.format", ""));
     String message = event.getMessage().substring(isToggled ? 0 : character.length()).trim();
 
     BungeeStaffChatEvent chatEvent = new BungeeStaffChatEvent(player, format, message);
     plugin.getProxy().getPluginManager().callEvent(chatEvent);
-        if (chatEvent.isCancelled())
+    if (chatEvent.isCancelled()) {
-        {
       return;
     }
     format = chatEvent.getFormat();
+    message = chatEvent.getMessage();
 
-        format = format.replaceAll("\\{NAME\\}", StringUtils.sanitize(player.getName()));
+    format = format.replaceAll("\\{NAME}", StringUtils.sanitize(player.getName()));
-        format = format.replaceAll("\\{MESSAGE\\}", StringUtils.sanitize(message));
+    format = format.replaceAll("\\{MESSAGE}", StringUtils.sanitize(message));
     final BaseComponent[] messageComponents = txt(format);
 
     plugin.getProxy().getPlayers().stream()
@@ -76,25 +71,22 @@ public class BungeeChatListener implements Listener
     event.setCancelled(true);
   }
 
-    private String clr(String string)
+  @Contract("_ -> new")
-    {
+  private @NotNull String clr(@NotNull String string) {
     return ChatColor.translateAlternateColorCodes('&', string);
   }
 
-    private BaseComponent[] txt(String text)
+  @Contract("_ -> new")
-    {
+  private @NotNull BaseComponent[] txt(@NotNull String text) {
     return TextComponent.fromLegacyText(clr(text));
   }
 
-    public boolean togglePlayer(UUID player)
+  public boolean togglePlayer(@NotNull UUID player) {
-    {
+    if (toggledPlayers.contains(player)) {
-        if (toggledPlayers.contains(player))
-        {
       toggledPlayers.remove(player);
       return false;
     }
     toggledPlayers.add(player);
     return true;
   }
-
 }

src/main/java/me/oskar3123/staffchat/spigot/Main.java

@@ -1,5 +1,6 @@
 package me.oskar3123.staffchat.spigot;
 
+import java.util.Optional;
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.oskar3123.staffchat.spigot.command.StaffChatCommand;
 import me.oskar3123.staffchat.spigot.listener.ChatListener;
@@ -7,8 +8,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
-public class Main extends JavaPlugin
+public class Main extends JavaPlugin {
-{
 
   public final String usePerm = "staffchat.use";
   public final String seePerm = "staffchat.see";
@@ -16,8 +16,9 @@ public class Main extends JavaPlugin
   public final String reloadPerm = "staffchat.reload";
   public final ChatListener chatListener = new ChatListener(this);
 
-    public void onEnable()
+  public void onEnable() {
-    {
+    getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
+    getServer().getMessenger().registerIncomingPluginChannel(this, "BungeeCord", chatListener);
     new MetricsLite(this);
     saveDefaultConfig();
     registerCommands();
@@ -25,35 +26,29 @@ public class Main extends JavaPlugin
   }
 
   @Override
-    public void saveDefaultConfig()
+  public void saveDefaultConfig() {
-    {
     super.saveDefaultConfig();
     getConfig().options().copyDefaults(true);
     saveConfig();
   }
 
-    private void registerCommands()
+  private void registerCommands() {
-    {
+    Optional.ofNullable(getCommand("staffchat"))
-        getCommand("staffchat").setExecutor(new StaffChatCommand(this));
+        .ifPresent(command -> command.setExecutor(new StaffChatCommand(this)));
   }
 
-    private void registerEvents()
+  private void registerEvents() {
-    {
     Bukkit.getPluginManager().registerEvents(this.chatListener, this);
   }
 
-    private boolean isPlaceholderApiEnabled()
+  private boolean isPlaceholderApiEnabled() {
-    {
     return Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI");
   }
 
-    public String replacePlaceholders(Player player, String string)
+  public String replacePlaceholders(Player player, String string) {
-    {
+    if (!isPlaceholderApiEnabled()) {
-        if (!isPlaceholderApiEnabled())
-        {
       return string;
     }
     return PlaceholderAPI.setPlaceholders(player, string);
   }
-
 }

src/main/java/me/oskar3123/staffchat/spigot/MetricsLite.java

@@ -1,13 +1,7 @@
 package me.oskar3123.staffchat.spigot;
 
-import org.bukkit.Bukkit;
+import com.google.gson.JsonArray;
-import org.bukkit.configuration.file.YamlConfiguration;
+import com.google.gson.JsonObject;
-import org.bukkit.plugin.ServicePriority;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-import javax.net.ssl.HttpsURLConnection;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -19,15 +13,19 @@ import java.util.TimerTask;
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.zip.GZIPOutputStream;
+import javax.net.ssl.HttpsURLConnection;
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.ServicePriority;
+import org.bukkit.plugin.java.JavaPlugin;
 
 /**
  * bStats collects some data for plugin authors.
- * <p>
+ *
- * Check out https://bStats.org/ to learn more about bStats!
+ * <p>Check out https://bStats.org/ to learn more about bStats!
  */
 @SuppressWarnings("all")
-public class MetricsLite
+public class MetricsLite {
-{
 
   // The version of this bStats class
   public static final int B_STATS_VERSION = 1;
@@ -38,14 +36,16 @@ public class MetricsLite
   // The uuid of the server
   private static String serverUUID;
 
-    static
+  static {
-    {
+    // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick"
-        // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D
+    // ... :D
-        final String defaultPackage = new String(new byte[] {'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's'});
+    final String defaultPackage =
-        final String examplePackage = new String(new byte[] {'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
+        new String(new byte[] {'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's'});
+    final String examplePackage =
+        new String(new byte[] {'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
     // We want to make sure nobody just copy & pastes the example and use the wrong package names
-        if (MetricsLite.class.getPackage().getName().equals(defaultPackage) || MetricsLite.class.getPackage().getName().equals(examplePackage))
+    if (MetricsLite.class.getPackage().getName().equals(defaultPackage)
-        {
+        || MetricsLite.class.getPackage().getName().equals(examplePackage)) {
       throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
     }
   }
@@ -58,10 +58,8 @@ public class MetricsLite
    *
    * @param plugin The plugin which stats should be submitted.
    */
-    public MetricsLite(JavaPlugin plugin)
+  public MetricsLite(JavaPlugin plugin) {
-    {
+    if (plugin == null) {
-        if (plugin == null)
-        {
       throw new IllegalArgumentException("Plugin cannot be null!");
     }
     this.plugin = plugin;
@@ -72,8 +70,7 @@ public class MetricsLite
     YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
 
     // Check if the config file exists
-        if (!config.isSet("serverUuid"))
+    if (!config.isSet("serverUuid")) {
-        {
 
       // Add default values
       config.addDefault("enabled", true);
@@ -83,44 +80,37 @@ public class MetricsLite
       config.addDefault("logFailedRequests", false);
 
       // Inform the server owners about bStats
-            config.options().header(
+      config
-                    "bStats collects some data for plugin authors like how many servers are using their plugins.\n" +
+          .options()
-                            "To honor their work, you should not disable it.\n" +
+          .header(
-                            "This has nearly no effect on the server performance!\n" +
+              "bStats collects some data for plugin authors like how many servers are using their plugins.\n"
-                            "Check out https://bStats.org/ to learn more :)"
+                  + "To honor their work, you should not disable it.\n"
-            ).copyDefaults(true);
+                  + "This has nearly no effect on the server performance!\n"
-            try
+                  + "Check out https://bStats.org/ to learn more :)")
-            {
+          .copyDefaults(true);
+      try {
         config.save(configFile);
-            }
+      } catch (IOException ignored) {
-            catch (IOException ignored)
-            {
       }
     }
 
     // Load the data
     serverUUID = config.getString("serverUuid");
     logFailedRequests = config.getBoolean("logFailedRequests", false);
-        if (config.getBoolean("enabled", true))
+    if (config.getBoolean("enabled", true)) {
-        {
       boolean found = false;
       // Search for all other bStats Metrics classes to see if we are the first one
-            for (Class<?> service : Bukkit.getServicesManager().getKnownServices())
+      for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
-            {
+        try {
-                try
-                {
           service.getField("B_STATS_VERSION"); // Our identifier :)
           found = true; // We aren't the first
           break;
-                }
+        } catch (NoSuchFieldException ignored) {
-                catch (NoSuchFieldException ignored)
-                {
         }
       }
       // Register our service
       Bukkit.getServicesManager().register(MetricsLite.class, this, plugin, ServicePriority.Normal);
-            if (!found)
+      if (!found) {
-            {
         // We are the first!
         startSubmitting();
       }
@@ -133,14 +123,11 @@ public class MetricsLite
    * @param data The data to send.
    * @throws Exception If the request failed.
    */
-    private static void sendData(JSONObject data) throws Exception
+  private static void sendData(JsonObject data) throws Exception {
-    {
+    if (data == null) {
-        if (data == null)
-        {
       throw new IllegalArgumentException("Data cannot be null!");
     }
-        if (Bukkit.isPrimaryThread())
+    if (Bukkit.isPrimaryThread()) {
-        {
       throw new IllegalAccessException("This method must not be called from the main thread!");
     }
     HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
@@ -154,7 +141,8 @@ public class MetricsLite
     connection.addRequestProperty("Connection", "close");
     connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
     connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
-        connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format
+    connection.setRequestProperty(
+        "Content-Type", "application/json"); // We send our data in JSON format
     connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
 
     // Send data
@@ -174,10 +162,8 @@ public class MetricsLite
    * @return The gzipped String.
    * @throws IOException If the compression failed.
    */
-    private static byte[] compress(final String str) throws IOException
+  private static byte[] compress(final String str) throws IOException {
-    {
+    if (str == null) {
-        if (str == null)
-        {
       return null;
     }
     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -187,56 +173,57 @@ public class MetricsLite
     return outputStream.toByteArray();
   }
 
-    /**
+  /** Starts the Scheduler which submits our data every 30 minutes. */
-     * Starts the Scheduler which submits our data every 30 minutes.
+  private void startSubmitting() {
-     */
+    final Timer timer =
-    private void startSubmitting()
+        new Timer(true); // We use a timer cause the Bukkit scheduler is affected by server lags
-    {
+    timer.scheduleAtFixedRate(
-        final Timer timer = new Timer(true); // We use a timer cause the Bukkit scheduler is affected by server lags
+        new TimerTask() {
-        timer.scheduleAtFixedRate(new TimerTask()
-        {
           @Override
-            public void run()
+          public void run() {
-            {
+            if (!plugin.isEnabled()) { // Plugin was disabled
-                if (!plugin.isEnabled())
-                { // Plugin was disabled
               timer.cancel();
               return;
             }
-                // Nevertheless we want our code to run in the Bukkit main thread, so we have to use the Bukkit scheduler
+            // Nevertheless we want our code to run in the Bukkit main thread, so we have to use the
-                // Don't be afraid! The connection to the bStats server is still async, only the stats collection is sync ;)
+            // Bukkit scheduler
-                Bukkit.getScheduler().runTask(plugin, new Runnable()
+            // Don't be afraid! The connection to the bStats server is still async, only the stats
-                {
+            // collection is sync ;)
+            Bukkit.getScheduler()
+                .runTask(
+                    plugin,
+                    new Runnable() {
                       @Override
-                    public void run()
+                      public void run() {
-                    {
                         submitData();
                       }
                     });
           }
-        }, 1000 * 60 * 5, 1000 * 60 * 30);
+        },
-        // Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough time to start
+        1000 * 60 * 5,
+        1000 * 60 * 30);
+    // Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough
+    // time to start
     // WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted!
     // WARNING: Just don't do it!
   }
 
   /**
-     * Gets the plugin specific data.
+   * Gets the plugin specific data. This method is called using Reflection.
-     * This method is called using Reflection.
    *
    * @return The plugin specific data.
    */
-    public JSONObject getPluginData()
+  public JsonObject getPluginData() {
-    {
+    JsonObject data = new JsonObject();
-        JSONObject data = new JSONObject();
 
     String pluginName = plugin.getDescription().getName();
     String pluginVersion = plugin.getDescription().getVersion();
 
-        data.put("pluginName", pluginName); // Append the name of the plugin
+    data.addProperty("pluginName", pluginName); // Append the name of the plugin
-        data.put("pluginVersion", pluginVersion); // Append the version of the plugin
+    data.addProperty("pluginVersion", pluginVersion); // Append the version of the plugin
-        JSONArray customCharts = new JSONArray();
+
-        data.put("customCharts", customCharts);
+    JsonArray customCharts = new JsonArray();
+    data.add("customCharts", customCharts);
 
     return data;
   }
@@ -246,13 +233,13 @@ public class MetricsLite
    *
    * @return The server specific data.
    */
-    private JSONObject getServerData()
+  private JsonObject getServerData() {
-    {
     // Minecraft specific data
     int playerAmount = Bukkit.getOnlinePlayers().size();
     int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
     String bukkitVersion = Bukkit.getVersion();
-        bukkitVersion = bukkitVersion.substring(bukkitVersion.indexOf("MC: ") + 4, bukkitVersion.length() - 1);
+    bukkitVersion =
+        bukkitVersion.substring(bukkitVersion.indexOf("MC: ") + 4, bukkitVersion.length() - 1);
 
     // OS/Java specific data
     String javaVersion = System.getProperty("java.version");
@@ -261,75 +248,69 @@ public class MetricsLite
     String osVersion = System.getProperty("os.version");
     int coreCount = Runtime.getRuntime().availableProcessors();
 
-        JSONObject data = new JSONObject();
+    JsonObject data = new JsonObject();
 
-        data.put("serverUUID", serverUUID);
+    data.addProperty("serverUUID", serverUUID);
 
-        data.put("playerAmount", playerAmount);
+    data.addProperty("playerAmount", playerAmount);
-        data.put("onlineMode", onlineMode);
+    data.addProperty("onlineMode", onlineMode);
-        data.put("bukkitVersion", bukkitVersion);
+    data.addProperty("bukkitVersion", bukkitVersion);
 
-        data.put("javaVersion", javaVersion);
+    data.addProperty("javaVersion", javaVersion);
-        data.put("osName", osName);
+    data.addProperty("osName", osName);
-        data.put("osArch", osArch);
+    data.addProperty("osArch", osArch);
-        data.put("osVersion", osVersion);
+    data.addProperty("osVersion", osVersion);
-        data.put("coreCount", coreCount);
+    data.addProperty("coreCount", coreCount);
 
     return data;
   }
 
-    /**
+  /** Collects the data and sends it afterwards. */
-     * Collects the data and sends it afterwards.
+  private void submitData() {
-     */
+    final JsonObject data = getServerData();
-    private void submitData()
-    {
-        final JSONObject data = getServerData();
 
-        JSONArray pluginData = new JSONArray();
+    JsonArray pluginData = new JsonArray();
     // Search for all other bStats Metrics classes to get their plugin data
-        for (Class<?> service : Bukkit.getServicesManager().getKnownServices())
+    for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
-        {
+      try {
-            try
-            {
         service.getField("B_STATS_VERSION"); // Our identifier :)
-            }
+      } catch (NoSuchFieldException ignored) {
-            catch (NoSuchFieldException ignored)
-            {
         continue; // Continue "searching"
       }
       // Found one!
-            try
+      try {
-            {
+        pluginData.add(
-                pluginData.add(service.getMethod("getPluginData").invoke(Bukkit.getServicesManager().load(service)));
+            (JsonObject)
-            }
+                service
-            catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored)
+                    .getMethod("getPluginData")
-            {
+                    .invoke(Bukkit.getServicesManager().load(service)));
+      } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {
       }
     }
 
-        data.put("plugins", pluginData);
+    data.add("plugins", pluginData);
 
     // Create a new thread for the connection to the bStats server
-        new Thread(new Runnable()
+    new Thread(
-        {
+            new Runnable() {
               @Override
-            public void run()
+              public void run() {
-            {
+                try {
-                try
-                {
                   // Send the data
                   sendData(data);
-                }
+                } catch (Exception e) {
-                catch (Exception e)
-                {
                   // Something went wrong! :(
-                    if (logFailedRequests)
+                  if (logFailedRequests) {
-                    {
+                    plugin
-                        plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(), e);
+                        .getLogger()
+                        .log(
+                            Level.WARNING,
+                            "Could not submit plugin stats of " + plugin.getName(),
+                            e);
                   }
                 }
               }
-        }).start();
+            })
+        .start();
   }
-
 }

src/main/java/me/oskar3123/staffchat/spigot/command/StaffChatCommand.java

@@ -1,5 +1,6 @@
 package me.oskar3123.staffchat.spigot.command;
 
+import java.util.Objects;
 import me.oskar3123.staffchat.spigot.Main;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -7,53 +8,46 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 
-public class StaffChatCommand implements CommandExecutor
+public class StaffChatCommand implements CommandExecutor {
-{
 
-    private Main plugin;
+  private final Main plugin;
   private FileConfiguration config;
 
-    public StaffChatCommand(Main plugin)
+  public StaffChatCommand(@NotNull Main plugin) {
-    {
     this.plugin = plugin;
     config = plugin.getConfig();
   }
 
   @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args)
+  public boolean onCommand(
-    {
+      @NotNull CommandSender sender,
-        String noPerm = clr(config.getString("messages.prefix") + config.getString("messages.nopermission"));
+      @NotNull Command command,
-        if (!sender.hasPermission(plugin.commandPerm))
+      @NotNull String label,
-        {
+      @NotNull String[] args) {
+    String noPerm =
+        clr(config.getString("messages.prefix") + config.getString("messages.nopermission"));
+    if (!sender.hasPermission(plugin.commandPerm)) {
       sender.sendMessage(noPerm);
       return true;
     }
-        if (args.length < 1)
+    if (args.length < 1) {
-        {
       help(sender, label);
       return true;
     }
-        if (args[0].equalsIgnoreCase("reload"))
+    if (args[0].equalsIgnoreCase("reload")) {
-        {
+      if (sender.hasPermission(plugin.reloadPerm)) {
-            if (sender.hasPermission(plugin.reloadPerm))
-            {
         reload(sender);
-            }
+      } else {
-            else
-            {
         sender.sendMessage(noPerm);
       }
       return true;
-        }
+    } else if (args[0].equalsIgnoreCase("toggle")) {
-        else if (args[0].equalsIgnoreCase("toggle"))
+      if (sender.hasPermission(plugin.usePerm)) {
-        {
-            if (sender.hasPermission(plugin.usePerm))
-            {
         toggle(sender);
-            }
+      } else {
-            else
-            {
         sender.sendMessage(noPerm);
       }
       return true;
@@ -62,48 +56,48 @@ public class StaffChatCommand implements CommandExecutor
     return true;
   }
 
-    private void playerOnly(CommandSender sender)
+  private void playerOnly(@NotNull CommandSender sender) {
-    {
+    sender.sendMessage(
-        sender.sendMessage(clr(config.getString("messages.prefix") + config.getString("messages.playeronly")));
+        clr(config.getString("messages.prefix") + config.getString("messages.playeronly")));
   }
 
-    private void help(CommandSender sender, String label)
+  private void help(@NotNull CommandSender sender, String label) {
-    {
+    String prefix = clr(Objects.requireNonNull(config.getString("messages.prefix", "")));
-        String prefix = clr(config.getString("messages.prefix"));
+    sender.sendMessage(
-        sender.sendMessage(prefix + "Version " + plugin.getDescription().getVersion() + ", made by oskar3123");
+        prefix + "Version " + plugin.getDescription().getVersion() + ", made by oskar3123");
-        if (sender.hasPermission(plugin.usePerm))
+    if (sender.hasPermission(plugin.usePerm)) {
-        {
       sender.sendMessage(prefix + "Message prefix: " + config.getString("settings.character"));
       sender.sendMessage(prefix + "/" + label + " toggle - Toggles auto staffchat");
     }
-        if (sender.hasPermission(plugin.reloadPerm))
+    if (sender.hasPermission(plugin.reloadPerm)) {
-        {
       sender.sendMessage(prefix + "/" + label + " reload - Reloads the config file");
     }
   }
 
-    private void reload(CommandSender sender)
+  private void reload(@NotNull CommandSender sender) {
-    {
     plugin.reloadConfig();
     config = plugin.getConfig();
-        sender.sendMessage(clr(config.getString("messages.prefix") + config.getString("messages.reloaded")));
+    sender.sendMessage(
+        clr(config.getString("messages.prefix") + config.getString("messages.reloaded")));
   }
 
-    private void toggle(CommandSender sender)
+  private void toggle(@NotNull CommandSender sender) {
-    {
+    if (!(sender instanceof Player)) {
-        if (!(sender instanceof Player))
-        {
       playerOnly(sender);
       return;
     }
     boolean toggled = plugin.chatListener.togglePlayer(((Player) sender).getUniqueId());
-        String state = toggled ? config.getString("messages.onstring") : config.getString("messages.offstring");
+    String state =
-        sender.sendMessage(clr(config.getString("messages.prefix") + String.format(config.getString("messages.toggled"), state)));
+        toggled ? config.getString("messages.onstring") : config.getString("messages.offstring");
+    sender.sendMessage(
+        clr(
+            config.getString("messages.prefix")
+                + String.format(
+                    Objects.requireNonNull(config.getString("messages.toggled", "")), state)));
   }
 
-    private String clr(String string)
+  @Contract("_ -> new")
-    {
+  private @NotNull String clr(@NotNull String string) {
     return ChatColor.translateAlternateColorCodes('&', string);
   }
-
 }

src/main/java/me/oskar3123/staffchat/spigot/event/StaffChatEvent.java

@@ -1,67 +1,72 @@
 package me.oskar3123.staffchat.spigot.event;
 
+import java.util.Objects;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
-public class StaffChatEvent extends Event implements Cancellable
+public class StaffChatEvent extends Event implements Cancellable {
-{
+
+  private static final HandlerList HANDLER_LIST = new HandlerList();
 
-    private static HandlerList handlerList = new HandlerList();
   private final Player player;
-    private final String message;
+
   private boolean cancelled = false;
   private String format;
+  private String message;
 
-    public StaffChatEvent(Player player, String format, String message)
+  public StaffChatEvent(
-    {
+      boolean async, @NotNull Player player, @NotNull String format, @NotNull String message) {
+    super(async);
     this.player = player;
     this.format = format;
     this.message = message;
   }
 
-    public static HandlerList getHandlerList()
+  /**
-    {
+   * Required by BungeeCord
-        return handlerList;
+   *
+   * @return the handler list
+   */
+  @SuppressWarnings("unused")
+  public static @NotNull HandlerList getHandlerList() {
+    return HANDLER_LIST;
   }
 
-    public String getFormat()
+  public @NotNull String getFormat() {
-    {
     return format;
   }
 
-    public void setFormat(String format)
+  public void setFormat(String format) {
-    {
+    this.format = Objects.requireNonNull(format);
-        this.format = format;
   }
 
-    public Player getPlayer()
+  public @NotNull String getMessage() {
-    {
-        return player;
-    }
-
-    public String getMessage()
-    {
     return message;
   }
 
-    @Override
+  public void setMessage(String message) {
-    public HandlerList getHandlers()
+    this.message = Objects.requireNonNull(message);
-    {
+  }
-        return handlerList;
+
+  public @NotNull Player getPlayer() {
+    return player;
   }
 
   @Override
-    public boolean isCancelled()
+  public @NotNull HandlerList getHandlers() {
-    {
+    return HANDLER_LIST;
+  }
+
+  @Override
+  public boolean isCancelled() {
     return cancelled;
   }
 
   @Override
-    public void setCancelled(boolean cancelled)
+  public void setCancelled(boolean cancelled) {
-    {
     this.cancelled = cancelled;
   }
-
 }

src/main/java/me/oskar3123/staffchat/spigot/listener/ChatListener.java

@@ -1,85 +1,161 @@
 package me.oskar3123.staffchat.spigot.listener;
 
+import com.google.common.io.ByteArrayDataInput;
+import com.google.common.io.ByteArrayDataOutput;
+import com.google.common.io.ByteStreams;
+import github.scarsz.discordsrv.DiscordSRV;
+import github.scarsz.discordsrv.util.DiscordUtil;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
 import me.oskar3123.staffchat.spigot.Main;
 import me.oskar3123.staffchat.spigot.event.StaffChatEvent;
 import me.oskar3123.staffchat.util.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.plugin.messaging.PluginMessageListener;
+import org.jetbrains.annotations.NotNull;
 
-import java.util.HashSet;
+public class ChatListener implements Listener, PluginMessageListener {
-import java.util.Set;
-import java.util.UUID;
 
-public class ChatListener implements Listener
+  private final Main plugin;
-{
+  private final Set<UUID> toggledPlayers = new HashSet<>();
 
-    private Main plugin;
+  public ChatListener(@NotNull Main plugin) {
-    private Set<UUID> toggledPlayers = new HashSet<>();
-
-    public ChatListener(Main plugin)
-    {
     this.plugin = plugin;
   }
 
   @EventHandler
-    public void chat(AsyncPlayerChatEvent event)
+  public void chat(@NotNull AsyncPlayerChatEvent event) {
-    {
+    if (!event.getPlayer().hasPermission(plugin.usePerm)) {
-        if (!event.getPlayer().hasPermission(plugin.usePerm))
-        {
       return;
     }
 
     FileConfiguration config = plugin.getConfig();
-        String character = config.getString("settings.character");
+    String character = Objects.requireNonNull(config.getString("settings.character", "@"));
     boolean isToggled = toggledPlayers.contains(event.getPlayer().getUniqueId());
-        if (!event.getMessage().startsWith(character) && !isToggled)
+    if (!event.getMessage().startsWith(character) && !isToggled) {
-        {
       return;
     }
 
-        String format = config.getString("settings.format");
+    String format = Objects.requireNonNull(config.getString("settings.format", ""));
     String message = event.getMessage().substring(isToggled ? 0 : character.length()).trim();
-        if (config.getBoolean("settings.replaceplaceholdersinmessage"))
+    if (config.getBoolean("settings.replaceplaceholdersinmessage")) {
-        {
       message = plugin.replacePlaceholders(event.getPlayer(), message);
     }
 
-        StaffChatEvent chatEvent = new StaffChatEvent(event.getPlayer(), format, message);
+    StaffChatEvent chatEvent =
+        new StaffChatEvent(event.isAsynchronous(), event.getPlayer(), format, message);
     Bukkit.getServer().getPluginManager().callEvent(chatEvent);
-        if (chatEvent.isCancelled())
+    if (chatEvent.isCancelled()) {
-        {
       return;
     }
     format = chatEvent.getFormat();
+    message = chatEvent.getMessage();
 
-        format = format.replaceAll("\\{NAME\\}", StringUtils.sanitize(event.getPlayer().getName()));
-        format = ChatColor.translateAlternateColorCodes('&', format);
     format = plugin.replacePlaceholders(event.getPlayer(), format);
-        format = format.replaceAll("\\{MESSAGE\\}", StringUtils.sanitize(message));
+    format = format.replaceAll("\\{NAME}", StringUtils.sanitize(event.getPlayer().getName()));
-
+    format = ChatColor.translateAlternateColorCodes('&', format);
+    format = format.replaceAll("\\{MESSAGE}", StringUtils.sanitize(message));
     final String finalMessage = format;
 
-        Bukkit.getOnlinePlayers().stream()
+    if (plugin.getConfig().getBoolean("discordsrv.enable")) {
-                .filter(p -> p.hasPermission(plugin.seePerm))
+      sendDiscordMessage(event.getPlayer(), message);
-                .forEach(p -> p.sendMessage(finalMessage));
+    }
-        plugin.getLogger().info(ChatColor.stripColor(finalMessage));
+    if (plugin.getConfig().getBoolean("settings.sendmessagestoallservers")) {
+      sendForwardPluginMessage(event.getPlayer(), finalMessage);
+    }
+    sendStaffChatMessage(finalMessage);
 
     event.setCancelled(true);
   }
 
-    public boolean togglePlayer(UUID player)
+  @Override
-    {
+  public void onPluginMessageReceived(
-        if (toggledPlayers.contains(player))
+      @NotNull String channel, @NotNull Player player, byte[] message) {
-        {
+    if (!channel.equals("BungeeCord")) {
+      return;
+    }
+    ByteArrayDataInput in = ByteStreams.newDataInput(message);
+    String subChannel = in.readUTF();
+    if (!subChannel.equals("StaffChat")) {
+      return;
+    }
+    short len = in.readShort();
+    byte[] msgbytes = new byte[len];
+    in.readFully(msgbytes);
+
+    DataInputStream msgin = new DataInputStream(new ByteArrayInputStream(msgbytes));
+    String actualMessage;
+    try {
+      actualMessage = msgin.readUTF();
+    } catch (IOException e) {
+      e.printStackTrace();
+      plugin.getLogger().severe("Failed to read plugin message from bungeecord");
+      return;
+    }
+    sendStaffChatMessage(actualMessage);
+  }
+
+  private void sendStaffChatMessage(@NotNull String message) {
+    Bukkit.getOnlinePlayers().stream()
+        .filter(p -> p.hasPermission(plugin.seePerm))
+        .forEach(p -> p.sendMessage(message));
+    plugin.getLogger().info(ChatColor.stripColor(message));
+  }
+
+  private void sendForwardPluginMessage(@NotNull Player player, @NotNull String message) {
+    ByteArrayDataOutput out = ByteStreams.newDataOutput();
+    out.writeUTF("Forward");
+    out.writeUTF("ONLINE");
+    out.writeUTF("StaffChat");
+    ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+    DataOutputStream dataStream = new DataOutputStream(byteStream);
+    try {
+      dataStream.writeUTF(message);
+    } catch (IOException e) {
+      e.printStackTrace();
+      plugin.getLogger().severe("Failed to send plugin message to bungeecord");
+      return;
+    }
+    byte[] data = byteStream.toByteArray();
+    out.writeShort(data.length);
+    out.write(data);
+    player.sendPluginMessage(plugin, "BungeeCord", out.toByteArray());
+  }
+
+  private void sendDiscordMessage(Player player, String message) {
+    if (Bukkit.getPluginManager().isPluginEnabled("DiscordSRV")) {
+      String format =
+          plugin
+              .replacePlaceholders(player, plugin.getConfig().getString("discordsrv.format", ""))
+              .replaceAll("\\{NAME}", StringUtils.sanitize(player.getName()))
+              .replaceAll("\\{MESSAGE}", StringUtils.sanitize(message));
+      DiscordUtil.sendMessage(
+          DiscordSRV.getPlugin()
+              .getOptionalTextChannel(
+                  plugin.getConfig().getString("discordsrv.channel", "staffchat")),
+          format);
+    }
+  }
+
+  public boolean togglePlayer(@NotNull UUID player) {
+    if (toggledPlayers.contains(player)) {
       toggledPlayers.remove(player);
       return false;
     }
     toggledPlayers.add(player);
     return true;
   }
-
 }

src/main/java/me/oskar3123/staffchat/util/StringUtils.java

@@ -1,13 +1,10 @@
 package me.oskar3123.staffchat.util;
 
-public class StringUtils
+public class StringUtils {
-{
 
-    public static String sanitize(String string)
+  public static String sanitize(String string) {
-    {
     string = string.replaceAll("\\\\", "\\\\\\\\");
     string = string.replaceAll("\\$", "\\\\\\$");
     return string;
   }
-
 }

src/main/resources/bungee.yml

@@ -1,4 +1,4 @@
 name: StaffChat
-authors: [oskar3123]
+author: oskar3123
 main: me.oskar3123.staffchat.bungee.BungeeMain
-version: 1.2.0
+version: 1.4.0

src/main/resources/config.yml

@@ -2,6 +2,7 @@ settings:
   character: '@'
   format: '&b{NAME}: {MESSAGE}'
   replaceplaceholdersinmessage: true
+  sendmessagestoallservers: true
 messages:
   prefix: '&7StaffChat&8> &7'
   nopermission: '&cYou don''t have permission to do that'
@@ -10,3 +11,7 @@ messages:
   toggled: 'You toggled auto staffchat %s'
   onstring: 'on'
   offstring: 'off'
+discordsrv:
+  enable: false
+  channel: 'staffchat'
+  format: '{NAME} » {MESSAGE}'

src/main/resources/plugin.yml

@@ -1,9 +1,9 @@
 name: StaffChat
-authors: [oskar3123]
+authors: [ oskar3123 ]
 main: me.oskar3123.staffchat.spigot.Main
 api-version: 1.13
-version: 1.2.0
+version: 1.4.0
-softdepend: [PlaceholderAPI]
+softdepend: [ PlaceholderAPI, DiscordSRV ]
 commands:
   staffchat:
     usage: /<command>