Try to fix travis config

Better naming conventions

.travis.yml

@@ -0,0 +1,11 @@
+language: java
+jdk:
+  - oraclejdk8
+deploy:
+  provider: releases
+  api_key: $GITHUB_KEY
+  file_glob: true
+  file: "*/staffchat*.jar"
+  skip_cleanup: true
+  on:
+    tags: true

README.md

@@ -1,5 +1,7 @@
-# StaffChat
+# [StaffChat](https://oskar3123.github.io/StaffChat)
-Simple and highly configurable staff chat
+![Build status](https://api.travis-ci.org/oskar3123/StaffChat.svg?branch=master "Build status")
+
+Simple and highly configurable staffchat
 
 ## Download
-You can download the binary from the [Spigot resource page](https://www.spigotmc.org/resources/37804/)
+You can download the plugin from the [Spigot resource page](https://www.spigotmc.org/resources/37804/) or via the [GitHub releases](https://github.com/oskar3123/StaffChat/releases)

_config.yml

@@ -0,0 +1,2 @@
+theme: jekyll-theme-cayman
+show_downloads: true

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>me.oskar3123</groupId>
     <artifactId>staffchat</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
 
     <repositories>
         <repository>
@@ -43,6 +43,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>

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

@@ -23,11 +23,11 @@ public class BungeeMain extends Plugin
 
     public void onEnable()
     {
+        new MetricsLite(this);
         saveDefaultConfig();
         if (!reloadConfig())
         {
             getLogger().severe("Could not load config file, using defaults.");
-            return;
         }
         registerCommands();
         registerEvents();

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

@@ -0,0 +1,385 @@
+package me.oskar3123.staffchat.bungee;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+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.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;
+
+/**
+ * bStats collects some data for plugin authors.
+ *
+ * Check out https://bStats.org/ to learn more about bStats!
+ */
+@SuppressWarnings("all")
+public class MetricsLite {
+
+    static {
+        // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D
+        final String defaultPackage = 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)) {
+            throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
+        }
+    }
+
+    // The version of this bStats class
+    public static final int B_STATS_VERSION = 1;
+
+    // The url to which the data is sent
+    private static final String URL = "https://bStats.org/submitData/bungeecord";
+
+    // The plugin
+    private final Plugin plugin;
+
+    // Is bStats enabled on this server?
+    private boolean enabled;
+
+    // The uuid of the server
+    private String serverUUID;
+
+    // Should failed requests be logged?
+    private boolean logFailedRequests = false;
+
+    // A list with all known metrics class objects including this one
+    private static final List<Object> knownMetricsInstances = new ArrayList<>();
+
+    public MetricsLite(Plugin plugin) {
+        this.plugin = plugin;
+
+        try {
+            loadConfig();
+        } 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) {
+            return;
+        }
+
+        Class<?> usedMetricsClass = getFirstBStatsClass();
+        if (usedMetricsClass == null) {
+            // Failed to get first metrics class
+            return;
+        }
+        if (usedMetricsClass == getClass()) {
+            // We are the first! :)
+            linkMetrics(this);
+            startSubmitting();
+        } else {
+            // We aren't the first so we link to the first metrics class
+            try {
+                usedMetricsClass.getMethod("linkMetrics", Object.class).invoke(null,this);
+            } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+                if (logFailedRequests) {
+                    plugin.getLogger().log(Level.WARNING, "Failed to link to first metrics class " + usedMetricsClass.getName() + "!", e);
+                }
+            }
+        }
+    }
+
+    /**
+     * Links an other metrics class with this class.
+     * This method is called using Reflection.
+     *
+     * @param metrics An object of the metrics class to link.
+     */
+    public static void linkMetrics(Object metrics) {
+        knownMetricsInstances.add(metrics);
+    }
+
+    /**
+     * Gets the plugin specific data.
+     * This method is called using Reflection.
+     *
+     * @return The plugin specific data.
+     */
+    public JsonObject getPluginData() {
+        JsonObject data = new JsonObject();
+
+        String pluginName = plugin.getDescription().getName();
+        String pluginVersion = plugin.getDescription().getVersion();
+
+        data.addProperty("pluginName", pluginName);
+        data.addProperty("pluginVersion", pluginVersion);
+
+        JsonArray customCharts = new JsonArray();
+        data.add("customCharts", customCharts);
+
+        return data;
+    }
+
+    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() {
+            @Override
+            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 ;)
+                TaskScheduler scheduler = plugin.getProxy().getScheduler();
+                scheduler.schedule(plugin, new Runnable() {
+                    @Override
+                    public void run() {
+                        submitData();
+                    }
+                }, 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
+        // WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted!
+        // WARNING: Just don't do it!
+    }
+
+    /**
+     * Gets the server specific data.
+     *
+     * @return The server specific data.
+     */
+    private JsonObject getServerData() {
+        // Minecraft specific data
+        int playerAmount = plugin.getProxy().getOnlineCount();
+        playerAmount = playerAmount > 500 ? 500 : playerAmount;
+        int onlineMode = plugin.getProxy().getConfig().isOnlineMode() ? 1 : 0;
+        String bungeecordVersion = plugin.getProxy().getVersion();
+        int managedServers = plugin.getProxy().getServers().size();
+
+        // OS/Java specific data
+        String javaVersion = System.getProperty("java.version");
+        String osName = System.getProperty("os.name");
+        String osArch = System.getProperty("os.arch");
+        String osVersion = System.getProperty("os.version");
+        int coreCount = Runtime.getRuntime().availableProcessors();
+
+        JsonObject data = new JsonObject();
+
+        data.addProperty("serverUUID", serverUUID);
+
+        data.addProperty("playerAmount", playerAmount);
+        data.addProperty("managedServers", managedServers);
+        data.addProperty("onlineMode", onlineMode);
+        data.addProperty("bungeecordVersion", bungeecordVersion);
+
+        data.addProperty("javaVersion", javaVersion);
+        data.addProperty("osName", osName);
+        data.addProperty("osArch", osArch);
+        data.addProperty("osVersion", osVersion);
+        data.addProperty("coreCount", coreCount);
+
+        return data;
+    }
+
+    /**
+     * Collects the data and sends it afterwards.
+     */
+    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) {
+            try {
+                Object plugin = metrics.getClass().getMethod("getPluginData").invoke(metrics);
+                if (plugin instanceof JsonObject) {
+                    pluginData.add((JsonObject) plugin);
+                }
+            } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }
+        }
+
+        data.add("plugins", pluginData);
+
+        // Create a new thread for the connection to the bStats server
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    // Send the data
+                    sendData(data);
+                } catch (Exception e) {
+                    // Something went wrong! :(
+                    if (logFailedRequests) {
+                        plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats!", e);
+                    }
+                }
+            }
+        }).start();
+    }
+
+    /**
+     * Loads the bStats configuration.
+     *
+     * @throws IOException If something did not work :(
+     */
+    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()) {
+            writeFile(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!",
+                    "#Check out https://bStats.org/ to learn more :)",
+                    "enabled: true",
+                    "serverUuid: \"" + UUID.randomUUID().toString() + "\"",
+                    "logFailedRequests: false");
+        }
+
+        Configuration configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(configFile);
+
+        // Load configuration
+        enabled = configuration.getBoolean("enabled", true);
+        serverUUID = configuration.getString("serverUuid");
+        logFailedRequests = configuration.getBoolean("logFailedRequests", false);
+    }
+
+    /**
+     * Gets the first bStat Metrics class.
+     *
+     * @return The first bStats metrics class.
+     */
+    private Class<?> getFirstBStatsClass() {
+        Path configPath = plugin.getDataFolder().toPath().getParent().resolve("bStats");
+        configPath.toFile().mkdirs();
+        File tempFile = new File(configPath.toFile(), "temp.txt");
+
+        try {
+            String className = readFile(tempFile);
+            if (className != null) {
+                try {
+                    // Let's check if a class with the given name exists.
+                    return Class.forName(className);
+                } catch (ClassNotFoundException ignored) { }
+            }
+            writeFile(tempFile, getClass().getName());
+            return getClass();
+        } catch (IOException e) {
+            if (logFailedRequests) {
+                plugin.getLogger().log(Level.WARNING, "Failed to get first bStats class!", e);
+            }
+            return null;
+        }
+    }
+
+    /**
+     * Reads the first line of the file.
+     *
+     * @param file The file to read. Cannot be null.
+     * @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 {
+        if (!file.exists()) {
+            return null;
+        }
+        try (
+                FileReader fileReader = new FileReader(file);
+                BufferedReader bufferedReader =  new BufferedReader(fileReader);
+        ) {
+            return bufferedReader.readLine();
+        }
+    }
+
+    /**
+     * Writes a String to a file. It also adds a note for the user,
+     *
+     * @param file The file to write to. Cannot be null.
+     * @param lines The lines to write.
+     * @throws IOException If something did not work :(
+     */
+    private void writeFile(File file, String... lines) throws IOException {
+        if (!file.exists()) {
+            file.createNewFile();
+        }
+        try (
+                FileWriter fileWriter = new FileWriter(file);
+                BufferedWriter bufferedWriter = new BufferedWriter(fileWriter)
+        ) {
+            for (String line : lines) {
+                bufferedWriter.write(line);
+                bufferedWriter.newLine();
+            }
+        }
+    }
+
+    /**
+     * Sends the data to the bStats server.
+     *
+     * @param data The data to send.
+     * @throws Exception If the request failed.
+     */
+    private static void sendData(JsonObject data) throws Exception {
+        if (data == null) {
+            throw new IllegalArgumentException("Data cannot be null");
+        }
+
+        HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
+
+        // Compress the data to save bandwidth
+        byte[] compressedData = compress(data.toString());
+
+        // Add headers
+        connection.setRequestMethod("POST");
+        connection.addRequestProperty("Accept", "application/json");
+        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("User-Agent", "MC-Server/" + B_STATS_VERSION);
+
+        // Send data
+        connection.setDoOutput(true);
+        DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
+        outputStream.write(compressedData);
+        outputStream.flush();
+        outputStream.close();
+
+        connection.getInputStream().close(); // We don't care about the response - Just send our data :)
+    }
+
+    /**
+     * Gzips the given String.
+     *
+     * @param str The string to gzip.
+     * @return The gzipped String.
+     * @throws IOException If the compression failed.
+     */
+    private static byte[] compress(final String str) throws IOException {
+        if (str == null) {
+            return null;
+        }
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
+        gzip.write(str.getBytes("UTF-8"));
+        gzip.close();
+        return outputStream.toByteArray();
+    }
+
+}

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

@@ -11,20 +11,20 @@ import net.md_5.bungee.config.Configuration;
 public class BungeeStaffChatCommand extends Command
 {
 
-    private BungeeMain main;
+    private BungeeMain plugin;
     private Configuration config;
 
-    public BungeeStaffChatCommand(BungeeMain main)
+    public BungeeStaffChatCommand(BungeeMain plugin)
     {
         super("staffchat");
-        this.main = main;
+        this.plugin = plugin;
-        config = main.getConfig();
+        config = plugin.getConfig();
     }
 
     public void execute(CommandSender sender, String[] args)
     {
         BaseComponent[] noPerm = txt(config.getString("messages.prefix") + config.getString("messages.nopermission"));
-        if (!sender.hasPermission(main.commandPerm))
+        if (!sender.hasPermission(plugin.commandPerm))
         {
             sender.sendMessage(noPerm);
             return;
@@ -36,7 +36,7 @@ public class BungeeStaffChatCommand extends Command
         }
         if (args[0].equalsIgnoreCase("reload"))
         {
-            if (sender.hasPermission(main.reloadPerm))
+            if (sender.hasPermission(plugin.reloadPerm))
             {
                 reload(sender);
             }
@@ -52,8 +52,8 @@ public class BungeeStaffChatCommand extends Command
     private void help(CommandSender sender, String label)
     {
         String prefix = config.getString("messages.prefix");
-        sender.sendMessage(txt(prefix + "Version " + main.getDescription().getVersion() + ", made by oskar3123"));
+        sender.sendMessage(txt(prefix + "Version " + plugin.getDescription().getVersion() + ", made by oskar3123"));
-        if (sender.hasPermission(main.reloadPerm))
+        if (sender.hasPermission(plugin.reloadPerm))
         {
             sender.sendMessage(txt(prefix + "/" + label + " reload - Reloads the config file"));
         }
@@ -61,8 +61,8 @@ public class BungeeStaffChatCommand extends Command
 
     private void reload(CommandSender sender)
     {
-        main.reloadConfig();
+        plugin.reloadConfig();
-        config = main.getConfig();
+        config = plugin.getConfig();
         sender.sendMessage(txt(config.getString("messages.prefix") + config.getString("messages.reloaded")));
     }
 

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

@@ -13,11 +13,11 @@ import net.md_5.bungee.event.EventHandler;
 public class BungeeChatListener implements Listener
 {
 
-    private BungeeMain main;
+    private BungeeMain plugin;
 
-    public BungeeChatListener(BungeeMain main)
+    public BungeeChatListener(BungeeMain plugin)
     {
-        this.main = main;
+        this.plugin = plugin;
     }
 
     @EventHandler
@@ -29,12 +29,12 @@ public class BungeeChatListener implements Listener
         }
 
         ProxiedPlayer player = (ProxiedPlayer) event.getSender();
-        if (!player.hasPermission(main.usePerm))
+        if (!player.hasPermission(plugin.usePerm))
         {
             return;
         }
 
-        Configuration config = main.getConfig();
+        Configuration config = plugin.getConfig();
         String character = config.getString("settings.character");
         if (!event.getMessage().startsWith(character))
         {
@@ -46,10 +46,10 @@ public class BungeeChatListener implements Listener
         format = format.replaceAll("\\{MESSAGE\\}", event.getMessage().substring(character.length()).trim());
         final BaseComponent[] message = txt(format);
 
-        main.getProxy().getPlayers().stream()
+        plugin.getProxy().getPlayers().stream()
-                .filter(p -> p.hasPermission(main.seePerm))
+                .filter(p -> p.hasPermission(plugin.seePerm))
                 .forEach(p -> p.sendMessage(message));
-        main.getLogger().info(ChatColor.stripColor(clr(format)));
+        plugin.getLogger().info(ChatColor.stripColor(clr(format)));
 
         event.setCancelled(true);
     }

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

@@ -15,6 +15,7 @@ public class Main extends JavaPlugin
 
     public void onEnable()
     {
+        new MetricsLite(this);
         saveDefaultConfig();
         registerCommands();
         registerEvents();

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

@@ -0,0 +1,293 @@
+package me.oskar3123.staffchat.spigot;
+
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.YamlConfiguration;
+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;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.UUID;
+import java.util.logging.Level;
+import java.util.zip.GZIPOutputStream;
+
+/**
+ * bStats collects some data for plugin authors.
+ *
+ * Check out https://bStats.org/ to learn more about bStats!
+ */
+@SuppressWarnings("all")
+public class MetricsLite {
+
+    static {
+        // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D
+        final String defaultPackage = 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)) {
+            throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
+        }
+    }
+
+    // The version of this bStats class
+    public static final int B_STATS_VERSION = 1;
+
+    // The url to which the data is sent
+    private static final String URL = "https://bStats.org/submitData/bukkit";
+
+    // Should failed requests be logged?
+    private static boolean logFailedRequests;
+
+    // The uuid of the server
+    private static String serverUUID;
+
+    // The plugin
+    private final JavaPlugin plugin;
+
+    /**
+     * Class constructor.
+     *
+     * @param plugin The plugin which stats should be submitted.
+     */
+    public MetricsLite(JavaPlugin plugin) {
+        if (plugin == null) {
+            throw new IllegalArgumentException("Plugin cannot be null!");
+        }
+        this.plugin = plugin;
+
+        // Get the config file
+        File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
+        File configFile = new File(bStatsFolder, "config.yml");
+        YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
+
+        // Check if the config file exists
+        if (!config.isSet("serverUuid")) {
+
+            // Add default values
+            config.addDefault("enabled", true);
+            // Every server gets it's unique random id.
+            config.addDefault("serverUuid", UUID.randomUUID().toString());
+            // Should failed request be logged?
+            config.addDefault("logFailedRequests", false);
+
+            // Inform the server owners about bStats
+            config.options().header(
+                    "bStats collects some data for plugin authors like how many servers are using their plugins.\n" +
+                            "To honor their work, you should not disable it.\n" +
+                            "This has nearly no effect on the server performance!\n" +
+                            "Check out https://bStats.org/ to learn more :)"
+            ).copyDefaults(true);
+            try {
+                config.save(configFile);
+            } catch (IOException ignored) { }
+        }
+
+        // Load the data
+        serverUUID = config.getString("serverUuid");
+        logFailedRequests = config.getBoolean("logFailedRequests", false);
+        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()) {
+                try {
+                    service.getField("B_STATS_VERSION"); // Our identifier :)
+                    found = true; // We aren't the first
+                    break;
+                } catch (NoSuchFieldException ignored) { }
+            }
+            // Register our service
+            Bukkit.getServicesManager().register(MetricsLite.class, this, plugin, ServicePriority.Normal);
+            if (!found) {
+                // We are the first!
+                startSubmitting();
+            }
+        }
+    }
+
+    /**
+     * Starts the Scheduler which submits our data every 30 minutes.
+     */
+    private void startSubmitting() {
+        final Timer timer = new Timer(true); // We use a timer cause the Bukkit scheduler is affected by server lags
+        timer.scheduleAtFixedRate(new TimerTask() {
+            @Override
+            public void run() {
+                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
+                // 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() {
+                        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
+        // 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.
+     * This method is called using Reflection.
+     *
+     * @return The plugin specific data.
+     */
+    public JSONObject getPluginData() {
+        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.put("pluginVersion", pluginVersion); // Append the version of the plugin
+        JSONArray customCharts = new JSONArray();
+        data.put("customCharts", customCharts);
+
+        return data;
+    }
+
+    /**
+     * Gets the server specific data.
+     *
+     * @return The server specific data.
+     */
+    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);
+
+        // OS/Java specific data
+        String javaVersion = System.getProperty("java.version");
+        String osName = System.getProperty("os.name");
+        String osArch = System.getProperty("os.arch");
+        String osVersion = System.getProperty("os.version");
+        int coreCount = Runtime.getRuntime().availableProcessors();
+
+        JSONObject data = new JSONObject();
+
+        data.put("serverUUID", serverUUID);
+
+        data.put("playerAmount", playerAmount);
+        data.put("onlineMode", onlineMode);
+        data.put("bukkitVersion", bukkitVersion);
+
+        data.put("javaVersion", javaVersion);
+        data.put("osName", osName);
+        data.put("osArch", osArch);
+        data.put("osVersion", osVersion);
+        data.put("coreCount", coreCount);
+
+        return data;
+    }
+
+    /**
+     * Collects the data and sends it afterwards.
+     */
+    private void submitData() {
+        final JSONObject data = getServerData();
+
+        JSONArray pluginData = new JSONArray();
+        // Search for all other bStats Metrics classes to get their plugin data
+        for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
+            try {
+                service.getField("B_STATS_VERSION"); // Our identifier :)
+            } catch (NoSuchFieldException ignored) {
+                continue; // Continue "searching"
+            }
+            // Found one!
+            try {
+                pluginData.add(service.getMethod("getPluginData").invoke(Bukkit.getServicesManager().load(service)));
+            } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }
+        }
+
+        data.put("plugins", pluginData);
+
+        // Create a new thread for the connection to the bStats server
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    // Send the data
+                    sendData(data);
+                } catch (Exception e) {
+                    // Something went wrong! :(
+                    if (logFailedRequests) {
+                        plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(), e);
+                    }
+                }
+            }
+        }).start();
+    }
+
+    /**
+     * Sends the data to the bStats server.
+     *
+     * @param data The data to send.
+     * @throws Exception If the request failed.
+     */
+    private static void sendData(JSONObject data) throws Exception {
+        if (data == null) {
+            throw new IllegalArgumentException("Data cannot be null!");
+        }
+        if (Bukkit.isPrimaryThread()) {
+            throw new IllegalAccessException("This method must not be called from the main thread!");
+        }
+        HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
+
+        // Compress the data to save bandwidth
+        byte[] compressedData = compress(data.toString());
+
+        // Add headers
+        connection.setRequestMethod("POST");
+        connection.addRequestProperty("Accept", "application/json");
+        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("User-Agent", "MC-Server/" + B_STATS_VERSION);
+
+        // Send data
+        connection.setDoOutput(true);
+        DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
+        outputStream.write(compressedData);
+        outputStream.flush();
+        outputStream.close();
+
+        connection.getInputStream().close(); // We don't care about the response - Just send our data :)
+    }
+
+    /**
+     * Gzips the given String.
+     *
+     * @param str The string to gzip.
+     * @return The gzipped String.
+     * @throws IOException If the compression failed.
+     */
+    private static byte[] compress(final String str) throws IOException {
+        if (str == null) {
+            return null;
+        }
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
+        gzip.write(str.getBytes("UTF-8"));
+        gzip.close();
+        return outputStream.toByteArray();
+    }
+
+}

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

@@ -10,20 +10,20 @@ import org.bukkit.configuration.file.FileConfiguration;
 public class StaffChatCommand implements CommandExecutor
 {
 
-    private Main main;
+    private Main plugin;
     private FileConfiguration config;
 
-    public StaffChatCommand(Main main)
+    public StaffChatCommand(Main plugin)
     {
-        this.main = main;
+        this.plugin = plugin;
-        config = main.getConfig();
+        config = plugin.getConfig();
     }
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args)
     {
         String noPerm = clr(config.getString("messages.prefix") + config.getString("messages.nopermission"));
-        if (!sender.hasPermission(main.commandPerm))
+        if (!sender.hasPermission(plugin.commandPerm))
         {
             sender.sendMessage(noPerm);
             return true;
@@ -35,7 +35,7 @@ public class StaffChatCommand implements CommandExecutor
         }
         if (args[0].equalsIgnoreCase("reload"))
         {
-            if (sender.hasPermission(main.reloadPerm))
+            if (sender.hasPermission(plugin.reloadPerm))
             {
                 reload(sender);
             }
@@ -52,8 +52,8 @@ public class StaffChatCommand implements CommandExecutor
     private void help(CommandSender sender, String label)
     {
         String prefix = clr(config.getString("messages.prefix"));
-        sender.sendMessage(prefix + "Version " + main.getDescription().getVersion() + ", made by oskar3123");
+        sender.sendMessage(prefix + "Version " + plugin.getDescription().getVersion() + ", made by oskar3123");
-        if (sender.hasPermission(main.reloadPerm))
+        if (sender.hasPermission(plugin.reloadPerm))
         {
             sender.sendMessage(prefix + "/" + label + " reload - Reloads the config file");
         }
@@ -61,8 +61,8 @@ public class StaffChatCommand implements CommandExecutor
 
     private void reload(CommandSender sender)
     {
-        main.reloadConfig();
+        plugin.reloadConfig();
-        config = main.getConfig();
+        config = plugin.getConfig();
         sender.sendMessage(clr(config.getString("messages.prefix") + config.getString("messages.reloaded")));
     }
 

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

@@ -12,22 +12,22 @@ import org.bukkit.event.player.AsyncPlayerChatEvent;
 public class ChatListener implements Listener
 {
 
-    private Main main;
+    private Main plugin;
 
-    public ChatListener(Main main)
+    public ChatListener(Main plugin)
     {
-        this.main = main;
+        this.plugin = plugin;
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void chat(AsyncPlayerChatEvent event)
     {
-        if (!event.getPlayer().hasPermission(main.usePerm))
+        if (!event.getPlayer().hasPermission(plugin.usePerm))
         {
             return;
         }
 
-        FileConfiguration config = main.getConfig();
+        FileConfiguration config = plugin.getConfig();
         String character = config.getString("settings.character");
         if (!event.getMessage().startsWith(character))
         {
@@ -37,20 +37,15 @@ public class ChatListener implements Listener
         String format = config.getString("settings.format");
         format = format.replaceAll("\\{NAME\\}", event.getPlayer().getName());
         format = format.replaceAll("\\{MESSAGE\\}", event.getMessage().substring(character.length()).trim());
-        format = clr(format);
+        format = ChatColor.translateAlternateColorCodes('&', format);
         final String message = format;
 
         Bukkit.getOnlinePlayers().stream()
-                .filter(p -> p.hasPermission(main.seePerm))
+                .filter(p -> p.hasPermission(plugin.seePerm))
                 .forEach(p -> p.sendMessage(message));
-        main.getLogger().info(ChatColor.stripColor(message));
+        plugin.getLogger().info(ChatColor.stripColor(message));
 
         event.setCancelled(true);
     }
 
-    private String clr(String string)
-    {
-        return ChatColor.translateAlternateColorCodes('&', string);
-    }
-
 }

src/main/resources/bungee.yml

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

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: StaffChat
 authors: [oskar3123]
 main: me.oskar3123.staffchat.spigot.Main
-version: 1.1.0
+version: 1.1.2
 
 commands:
   staffchat: