diff --git a/pom.xml b/pom.xml
index e34fe08..89ff44b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
Limbo
Limbo
- 0.3.2-ALPHA
+ 0.3.3-ALPHA
src
@@ -53,7 +53,7 @@
- ${project.artifactId}-${project.version}-1.16.2
+ ${project.artifactId}-${project.version}-1.16.3
diff --git a/src/com/loohp/limbo/File/FileConfiguration.java b/src/com/loohp/limbo/File/FileConfiguration.java
index ce4ec9e..b27435d 100644
--- a/src/com/loohp/limbo/File/FileConfiguration.java
+++ b/src/com/loohp/limbo/File/FileConfiguration.java
@@ -18,26 +18,30 @@ import com.loohp.limbo.Utils.YamlOrder;
public class FileConfiguration {
+ File file;
+
Map mapping;
String header;
- public FileConfiguration(File file) {
+ public FileConfiguration(File file) throws FileNotFoundException {
+ this.file = file;
if (file.exists()) {
- try {
- reloadConfig(new FileInputStream(file));
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- }
+ reloadConfig();
} else {
mapping = new LinkedHashMap<>();
}
}
+ @Deprecated
public FileConfiguration(InputStream input){
reloadConfig(input);
}
- public FileConfiguration reloadConfig(InputStream input) {
+ public FileConfiguration reloadConfig() throws FileNotFoundException {
+ return reloadConfig(new FileInputStream(file));
+ }
+
+ private FileConfiguration reloadConfig(InputStream input) {
Yaml yml = new Yaml();
mapping = yml.load(input);
return this;
@@ -76,7 +80,7 @@ public class FileConfiguration {
}
map = map1;
}
- if (value == null) {
+ if (value != null) {
map.put(tree[tree.length - 1], (T) value);
} else {
map.remove(tree[tree.length - 1]);
@@ -93,9 +97,13 @@ public class FileConfiguration {
customRepresenter.setPropertyUtils(customProperty);
Yaml yaml = new Yaml(customRepresenter, options);
+ if (file.getParentFile() != null) {
+ file.getParentFile().mkdirs();
+ }
+
PrintWriter pw = new PrintWriter(file, StandardCharsets.UTF_8.toString());
if (header != null) {
- pw.println(header);
+ pw.println("#" + header.replace("\n", "\n#"));
}
yaml.dump(mapping, pw);
pw.flush();
diff --git a/src/com/loohp/limbo/File/ServerProperties.java b/src/com/loohp/limbo/File/ServerProperties.java
index 0beb8d2..dc80abf 100644
--- a/src/com/loohp/limbo/File/ServerProperties.java
+++ b/src/com/loohp/limbo/File/ServerProperties.java
@@ -17,8 +17,6 @@ import com.loohp.limbo.World.World;
public class ServerProperties {
- public static final String JSON_BASE_RESPONSE = "{\"version\":{\"name\":\"%VERSION%\",\"protocol\":%PROTOCOL%},\"players\":{\"max\":%MAXPLAYERS%,\"online\":%ONLINECLIENTS%},\"description\":%MOTD%,%FAVICON%\"modinfo\":{\"type\":\"FML\",\"modList\":[]}}";
-
File file;
int maxPlayers;
int serverPort;
@@ -146,10 +144,6 @@ public class ServerProperties {
return allowFlight;
}
- public static String getJsonBaseResponse() {
- return JSON_BASE_RESPONSE;
- }
-
public String getMotdJson() {
return motdJson;
}
diff --git a/src/com/loohp/limbo/Limbo.java b/src/com/loohp/limbo/Limbo.java
index e33efc9..2d5d6ad 100644
--- a/src/com/loohp/limbo/Limbo.java
+++ b/src/com/loohp/limbo/Limbo.java
@@ -2,11 +2,13 @@ package com.loohp.limbo;
import java.awt.GraphicsEnvironment;
import java.awt.image.BufferedImage;
+import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.net.URL;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
@@ -36,6 +38,7 @@ import com.loohp.limbo.Events.EventsManager;
import com.loohp.limbo.File.ServerProperties;
import com.loohp.limbo.GUI.GUI;
import com.loohp.limbo.Location.Location;
+import com.loohp.limbo.Metrics.Metrics;
import com.loohp.limbo.Permissions.PermissionsManager;
import com.loohp.limbo.Player.Player;
import com.loohp.limbo.Plugins.LimboPlugin;
@@ -97,8 +100,8 @@ public class Limbo {
//===========================
- public final String serverImplementationVersion = "1.16.2";
- public final int serverImplmentationProtocol = 751;
+ public final String serverImplementationVersion = "1.16.3";
+ public final int serverImplmentationProtocol = 753;
private ServerConnection server;
private Console console;
@@ -118,6 +121,8 @@ public class Limbo {
private DimensionRegistry dimensionRegistry;
+ private Metrics metrics;
+
public AtomicInteger entityIdCount = new AtomicInteger();
@SuppressWarnings("deprecation")
@@ -136,6 +141,8 @@ public class Limbo {
console = new Console(System.in, System.out, System.err);
}
+ console.sendMessage("Loading Limbo Version " + new BufferedReader(new InputStreamReader(Limbo.class.getClassLoader().getResourceAsStream("META-INF/MANIFEST.MF"))).lines().filter(each -> each.startsWith("Limbo-Version:")).findFirst().orElse("Limbo-Version: unknown").substring(14).trim());
+
String spName = "server.properties";
File sp = new File(spName);
if (!sp.exists()) {
@@ -283,6 +290,8 @@ public class Limbo {
server = new ServerConnection(properties.getServerIp(), properties.getServerPort());
+ metrics = new Metrics();
+
console.run();
}
@@ -354,6 +363,10 @@ public class Limbo {
return console;
}
+ public Metrics getMetrics() {
+ return metrics;
+ }
+
public Set getPlayers() {
return new HashSet<>(playersByUUID.values());
}
diff --git a/src/com/loohp/limbo/Metrics/Metrics.java b/src/com/loohp/limbo/Metrics/Metrics.java
index 53654c2..82fb9c6 100644
--- a/src/com/loohp/limbo/Metrics/Metrics.java
+++ b/src/com/loohp/limbo/Metrics/Metrics.java
@@ -4,6 +4,7 @@ import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URL;
@@ -15,6 +16,7 @@ import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
import java.util.UUID;
+import java.util.concurrent.Callable;
import java.util.zip.GZIPOutputStream;
import javax.net.ssl.HttpsURLConnection;
@@ -33,944 +35,969 @@ import com.loohp.limbo.File.FileConfiguration;
@SuppressWarnings("unchecked")
public class Metrics {
- 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 (Metrics.class.getPackage().getName().equals(defaultPackage) || Metrics.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;
-
- // A list with all custom charts
- private final List charts = new ArrayList<>();
-
- /**
- * Class constructor.
- */
- public Metrics() {
-
- // Get the config file
- File configFile = new File(new File("plugins", "bStats"), "config.yml");
- FileConfiguration config = new FileConfiguration(configFile);
-
- // Check if the config file exists
- if (config.get("serverUuid", String.class) == null) {
-
- // Add default values
- config.set("enabled", true);
- // Every server gets it's unique random id.
- config.set("serverUuid", UUID.randomUUID().toString());
- // Should failed request be logged?
- config.set("logFailedRequests", false);
-
- // Inform the server owners about bStats
- config.setHeader(
- "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 :)"
- );
- try {
- config.saveConfig(configFile);
- } catch (IOException ignored) {}
- }
-
- // Load the data
- serverUUID = config.get("serverUuid", String.class);
- logFailedRequests = config.get("logFailedRequests", Boolean.class);
- if (config.get("enabled", Boolean.class)) {
- startSubmitting();
- }
- }
-
- /**
- * Adds a custom chart.
- *
- * @param chart The chart to add.
- */
- public void addCustomChart(CustomChart chart) {
- if (chart == null) {
- throw new IllegalArgumentException("Chart cannot be null!");
- }
- charts.add(chart);
- }
-
- /**
- * Starts the Scheduler which submits our data every 30 minutes.
- */
- private void startSubmitting() {
- final Timer timer = new Timer(true);
- timer.scheduleAtFixedRate(new TimerTask() {
- @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.
- *
- * @return The plugin specific data.
- */
- public JSONObject getPluginData() {
- JSONObject data = new JSONObject();
-
- String pluginName = "Limbo";
- String pluginVersion = new BufferedReader(new InputStreamReader(Limbo.class.getClassLoader().getResourceAsStream("META-INF/MANIFEST.MF"))).lines().filter(each -> each.startsWith("Limbo-Version:")).findFirst().orElse("Limbo-Version: unknown").substring(14).trim();
-
- data.put("pluginName", pluginName); // Append the name of the plugin
- data.put("pluginVersion", pluginVersion); // Append the version of the plugin
- JSONArray customCharts = new JSONArray();
- for (CustomChart customChart : charts) {
- // Add the data of the custom charts
- JSONObject chart = customChart.getRequestJsonObject();
- if (chart == null) { // If the chart is null, we skip it
- continue;
- }
- customCharts.add(chart);
- }
- data.put("customCharts", customCharts);
-
- return data;
- }
-
- /**
- * Gets the server specific data.
- *
- * @return The server specific data.
- */
- private JSONObject getServerData() {
- // Minecraft specific data
- int playerAmount = Limbo.getInstance().getPlayers().size();
- int onlineMode = 0;
- String limboVersion = Limbo.getInstance().serverImplementationVersion;
- limboVersion = limboVersion.substring(limboVersion.indexOf("MC: ") + 4, limboVersion.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("limboVersion", limboVersion);
-
- 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();
- pluginData.add(this.getPluginData());
- data.put("plugins", pluginData);
-
- // Create a new thread for the connection to the bStats server
- new Thread(() -> {
- try {
- // Send the data
- sendData(data);
- } catch (Exception e) {
- // Something went wrong! :(
- if (logFailedRequests) {
- System.err.println("Could not submit stats for Limbo " + e);
- }
- }
- }, "Limbo Metrics Submission Thread").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!");
- }
- 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();
- }
-
- /**
- * Represents a custom chart.
- */
- public static abstract class CustomChart {
-
- // The id of the chart
- protected final String chartId;
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- */
- public CustomChart(String chartId) {
- if (chartId == null || chartId.isEmpty()) {
- throw new IllegalArgumentException("ChartId cannot be null or empty!");
- }
- this.chartId = chartId;
- }
-
- protected JSONObject getRequestJsonObject() {
- JSONObject chart = new JSONObject();
- chart.put("chartId", chartId);
- try {
- JSONObject data = getChartData();
- if (data == null) {
- // If the data is null we don't send the chart.
- return null;
- }
- chart.put("data", data);
- } catch (Throwable t) {
- if (logFailedRequests) {
- System.err.println("Failed to get data for custom chart with id " + chartId + t);
- }
- return null;
- }
- return chart;
- }
-
- protected abstract JSONObject getChartData();
-
- }
-
- /**
- * Represents a custom simple pie.
- */
- public static abstract class SimplePie extends CustomChart {
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- */
- public SimplePie(String chartId) {
- super(chartId);
- }
-
- /**
- * Gets the value of the pie.
- *
- * @return The value of the pie.
- */
- public abstract String getValue();
-
- @Override
- protected JSONObject getChartData() {
- JSONObject data = new JSONObject();
- String value = getValue();
- if (value == null || value.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- data.put("value", value);
- return data;
- }
- }
-
- /**
- * Represents a custom advanced pie.
- */
- public static abstract class AdvancedPie extends CustomChart {
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- */
- public AdvancedPie(String chartId) {
- super(chartId);
- }
-
- /**
- * Gets the values of the pie.
- *
- * @param valueMap Just an empty map. The only reason it exists is to make your life easier.
- * You don't have to create a map yourself!
- * @return The values of the pie.
- */
- public abstract HashMap getValues(HashMap valueMap);
-
- @Override
- protected JSONObject getChartData() {
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
- HashMap map = getValues(new HashMap());
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- boolean allSkipped = true;
- for (Map.Entry entry : map.entrySet()) {
- if (entry.getValue() == 0) {
- continue; // Skip this invalid
- }
- allSkipped = false;
- values.put(entry.getKey(), entry.getValue());
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- data.put("values", values);
- return data;
- }
- }
-
- /**
- * Represents a custom single line chart.
- */
- public static abstract class SingleLineChart extends CustomChart {
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- */
- public SingleLineChart(String chartId) {
- super(chartId);
- }
-
- /**
- * Gets the value of the chart.
- *
- * @return The value of the chart.
- */
- public abstract int getValue();
-
- @Override
- protected JSONObject getChartData() {
- JSONObject data = new JSONObject();
- int value = getValue();
- if (value == 0) {
- // Null = skip the chart
- return null;
- }
- data.put("value", value);
- return data;
- }
-
- }
-
- /**
- * Represents a custom multi line chart.
- */
- public static abstract class MultiLineChart extends CustomChart {
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- */
- public MultiLineChart(String chartId) {
- super(chartId);
- }
-
- /**
- * Gets the values of the chart.
- *
- * @param valueMap Just an empty map. The only reason it exists is to make your life easier.
- * You don't have to create a map yourself!
- * @return The values of the chart.
- */
- public abstract HashMap getValues(HashMap valueMap);
-
- @Override
- protected JSONObject getChartData() {
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
- HashMap map = getValues(new HashMap());
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- boolean allSkipped = true;
- for (Map.Entry entry : map.entrySet()) {
- if (entry.getValue() == 0) {
- continue; // Skip this invalid
- }
- allSkipped = false;
- values.put(entry.getKey(), entry.getValue());
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- data.put("values", values);
- return data;
- }
-
- }
-
- /**
- * Represents a custom simple bar chart.
- */
- public static abstract class SimpleBarChart extends CustomChart {
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- */
- public SimpleBarChart(String chartId) {
- super(chartId);
- }
-
- /**
- * Gets the value of the chart.
- *
- * @param valueMap Just an empty map. The only reason it exists is to make your life easier.
- * You don't have to create a map yourself!
- * @return The value of the chart.
- */
- public abstract HashMap getValues(HashMap valueMap);
-
- @Override
- protected JSONObject getChartData() {
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
- HashMap map = getValues(new HashMap());
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- for (Map.Entry entry : map.entrySet()) {
- JSONArray categoryValues = new JSONArray();
- categoryValues.add(entry.getValue());
- values.put(entry.getKey(), categoryValues);
- }
- data.put("values", values);
- return data;
- }
-
- }
-
- /**
- * Represents a custom advanced bar chart.
- */
- public static abstract class AdvancedBarChart extends CustomChart {
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- */
- public AdvancedBarChart(String chartId) {
- super(chartId);
- }
-
- /**
- * Gets the value of the chart.
- *
- * @param valueMap Just an empty map. The only reason it exists is to make your life easier.
- * You don't have to create a map yourself!
- * @return The value of the chart.
- */
- public abstract HashMap getValues(HashMap valueMap);
-
- @Override
- protected JSONObject getChartData() {
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
- HashMap map = getValues(new HashMap());
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- boolean allSkipped = true;
- for (Map.Entry entry : map.entrySet()) {
- if (entry.getValue().length == 0) {
- continue; // Skip this invalid
- }
- allSkipped = false;
- JSONArray categoryValues = new JSONArray();
- for (int categoryValue : entry.getValue()) {
- categoryValues.add(categoryValue);
- }
- values.put(entry.getKey(), categoryValues);
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- data.put("values", values);
- return data;
- }
-
- }
-
- /**
- * Represents a custom simple map chart.
- */
- public static abstract class SimpleMapChart extends CustomChart {
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- */
- public SimpleMapChart(String chartId) {
- super(chartId);
- }
-
- /**
- * Gets the value of the chart.
- *
- * @return The value of the chart.
- */
- public abstract Country getValue();
-
- @Override
- protected JSONObject getChartData() {
- JSONObject data = new JSONObject();
- Country value = getValue();
-
- if (value == null) {
- // Null = skip the chart
- return null;
- }
- data.put("value", value.getCountryIsoTag());
- return data;
- }
-
- }
-
- /**
- * Represents a custom advanced map chart.
- */
- public static abstract class AdvancedMapChart extends CustomChart {
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- */
- public AdvancedMapChart(String chartId) {
- super(chartId);
- }
-
- /**
- * Gets the value of the chart.
- *
- * @param valueMap Just an empty map. The only reason it exists is to make your life easier.
- * You don't have to create a map yourself!
- * @return The value of the chart.
- */
- public abstract HashMap getValues(HashMap valueMap);
-
- @Override
- protected JSONObject getChartData() {
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
- HashMap map = getValues(new HashMap());
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- boolean allSkipped = true;
- for (Map.Entry entry : map.entrySet()) {
- if (entry.getValue() == 0) {
- continue; // Skip this invalid
- }
- allSkipped = false;
- values.put(entry.getKey().getCountryIsoTag(), entry.getValue());
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- data.put("values", values);
- return data;
- }
-
- }
-
- /**
- * A enum which is used for custom maps.
- */
- public enum Country {
-
- /**
- * bStats will use the country of the server.
- */
- AUTO_DETECT("AUTO", "Auto Detected"),
-
- ANDORRA("AD", "Andorra"),
- UNITED_ARAB_EMIRATES("AE", "United Arab Emirates"),
- AFGHANISTAN("AF", "Afghanistan"),
- ANTIGUA_AND_BARBUDA("AG", "Antigua and Barbuda"),
- ANGUILLA("AI", "Anguilla"),
- ALBANIA("AL", "Albania"),
- ARMENIA("AM", "Armenia"),
- NETHERLANDS_ANTILLES("AN", "Netherlands Antilles"),
- ANGOLA("AO", "Angola"),
- ANTARCTICA("AQ", "Antarctica"),
- ARGENTINA("AR", "Argentina"),
- AMERICAN_SAMOA("AS", "American Samoa"),
- AUSTRIA("AT", "Austria"),
- AUSTRALIA("AU", "Australia"),
- ARUBA("AW", "Aruba"),
- ALAND_ISLANDS("AX", "Åland Islands"),
- AZERBAIJAN("AZ", "Azerbaijan"),
- BOSNIA_AND_HERZEGOVINA("BA", "Bosnia and Herzegovina"),
- BARBADOS("BB", "Barbados"),
- BANGLADESH("BD", "Bangladesh"),
- BELGIUM("BE", "Belgium"),
- BURKINA_FASO("BF", "Burkina Faso"),
- BULGARIA("BG", "Bulgaria"),
- BAHRAIN("BH", "Bahrain"),
- BURUNDI("BI", "Burundi"),
- BENIN("BJ", "Benin"),
- SAINT_BARTHELEMY("BL", "Saint Barthélemy"),
- BERMUDA("BM", "Bermuda"),
- BRUNEI("BN", "Brunei"),
- BOLIVIA("BO", "Bolivia"),
- BONAIRE_SINT_EUSTATIUS_AND_SABA("BQ", "Bonaire, Sint Eustatius and Saba"),
- BRAZIL("BR", "Brazil"),
- BAHAMAS("BS", "Bahamas"),
- BHUTAN("BT", "Bhutan"),
- BOUVET_ISLAND("BV", "Bouvet Island"),
- BOTSWANA("BW", "Botswana"),
- BELARUS("BY", "Belarus"),
- BELIZE("BZ", "Belize"),
- CANADA("CA", "Canada"),
- COCOS_ISLANDS("CC", "Cocos Islands"),
- THE_DEMOCRATIC_REPUBLIC_OF_CONGO("CD", "The Democratic Republic Of Congo"),
- CENTRAL_AFRICAN_REPUBLIC("CF", "Central African Republic"),
- CONGO("CG", "Congo"),
- SWITZERLAND("CH", "Switzerland"),
- COTE_D_IVOIRE("CI", "Côte d'Ivoire"),
- COOK_ISLANDS("CK", "Cook Islands"),
- CHILE("CL", "Chile"),
- CAMEROON("CM", "Cameroon"),
- CHINA("CN", "China"),
- COLOMBIA("CO", "Colombia"),
- COSTA_RICA("CR", "Costa Rica"),
- CUBA("CU", "Cuba"),
- CAPE_VERDE("CV", "Cape Verde"),
- CURACAO("CW", "Curaçao"),
- CHRISTMAS_ISLAND("CX", "Christmas Island"),
- CYPRUS("CY", "Cyprus"),
- CZECH_REPUBLIC("CZ", "Czech Republic"),
- GERMANY("DE", "Germany"),
- DJIBOUTI("DJ", "Djibouti"),
- DENMARK("DK", "Denmark"),
- DOMINICA("DM", "Dominica"),
- DOMINICAN_REPUBLIC("DO", "Dominican Republic"),
- ALGERIA("DZ", "Algeria"),
- ECUADOR("EC", "Ecuador"),
- ESTONIA("EE", "Estonia"),
- EGYPT("EG", "Egypt"),
- WESTERN_SAHARA("EH", "Western Sahara"),
- ERITREA("ER", "Eritrea"),
- SPAIN("ES", "Spain"),
- ETHIOPIA("ET", "Ethiopia"),
- FINLAND("FI", "Finland"),
- FIJI("FJ", "Fiji"),
- FALKLAND_ISLANDS("FK", "Falkland Islands"),
- MICRONESIA("FM", "Micronesia"),
- FAROE_ISLANDS("FO", "Faroe Islands"),
- FRANCE("FR", "France"),
- GABON("GA", "Gabon"),
- UNITED_KINGDOM("GB", "United Kingdom"),
- GRENADA("GD", "Grenada"),
- GEORGIA("GE", "Georgia"),
- FRENCH_GUIANA("GF", "French Guiana"),
- GUERNSEY("GG", "Guernsey"),
- GHANA("GH", "Ghana"),
- GIBRALTAR("GI", "Gibraltar"),
- GREENLAND("GL", "Greenland"),
- GAMBIA("GM", "Gambia"),
- GUINEA("GN", "Guinea"),
- GUADELOUPE("GP", "Guadeloupe"),
- EQUATORIAL_GUINEA("GQ", "Equatorial Guinea"),
- GREECE("GR", "Greece"),
- SOUTH_GEORGIA_AND_THE_SOUTH_SANDWICH_ISLANDS("GS", "South Georgia And The South Sandwich Islands"),
- GUATEMALA("GT", "Guatemala"),
- GUAM("GU", "Guam"),
- GUINEA_BISSAU("GW", "Guinea-Bissau"),
- GUYANA("GY", "Guyana"),
- HONG_KONG("HK", "Hong Kong"),
- HEARD_ISLAND_AND_MCDONALD_ISLANDS("HM", "Heard Island And McDonald Islands"),
- HONDURAS("HN", "Honduras"),
- CROATIA("HR", "Croatia"),
- HAITI("HT", "Haiti"),
- HUNGARY("HU", "Hungary"),
- INDONESIA("ID", "Indonesia"),
- IRELAND("IE", "Ireland"),
- ISRAEL("IL", "Israel"),
- ISLE_OF_MAN("IM", "Isle Of Man"),
- INDIA("IN", "India"),
- BRITISH_INDIAN_OCEAN_TERRITORY("IO", "British Indian Ocean Territory"),
- IRAQ("IQ", "Iraq"),
- IRAN("IR", "Iran"),
- ICELAND("IS", "Iceland"),
- ITALY("IT", "Italy"),
- JERSEY("JE", "Jersey"),
- JAMAICA("JM", "Jamaica"),
- JORDAN("JO", "Jordan"),
- JAPAN("JP", "Japan"),
- KENYA("KE", "Kenya"),
- KYRGYZSTAN("KG", "Kyrgyzstan"),
- CAMBODIA("KH", "Cambodia"),
- KIRIBATI("KI", "Kiribati"),
- COMOROS("KM", "Comoros"),
- SAINT_KITTS_AND_NEVIS("KN", "Saint Kitts And Nevis"),
- NORTH_KOREA("KP", "North Korea"),
- SOUTH_KOREA("KR", "South Korea"),
- KUWAIT("KW", "Kuwait"),
- CAYMAN_ISLANDS("KY", "Cayman Islands"),
- KAZAKHSTAN("KZ", "Kazakhstan"),
- LAOS("LA", "Laos"),
- LEBANON("LB", "Lebanon"),
- SAINT_LUCIA("LC", "Saint Lucia"),
- LIECHTENSTEIN("LI", "Liechtenstein"),
- SRI_LANKA("LK", "Sri Lanka"),
- LIBERIA("LR", "Liberia"),
- LESOTHO("LS", "Lesotho"),
- LITHUANIA("LT", "Lithuania"),
- LUXEMBOURG("LU", "Luxembourg"),
- LATVIA("LV", "Latvia"),
- LIBYA("LY", "Libya"),
- MOROCCO("MA", "Morocco"),
- MONACO("MC", "Monaco"),
- MOLDOVA("MD", "Moldova"),
- MONTENEGRO("ME", "Montenegro"),
- SAINT_MARTIN("MF", "Saint Martin"),
- MADAGASCAR("MG", "Madagascar"),
- MARSHALL_ISLANDS("MH", "Marshall Islands"),
- MACEDONIA("MK", "Macedonia"),
- MALI("ML", "Mali"),
- MYANMAR("MM", "Myanmar"),
- MONGOLIA("MN", "Mongolia"),
- MACAO("MO", "Macao"),
- NORTHERN_MARIANA_ISLANDS("MP", "Northern Mariana Islands"),
- MARTINIQUE("MQ", "Martinique"),
- MAURITANIA("MR", "Mauritania"),
- MONTSERRAT("MS", "Montserrat"),
- MALTA("MT", "Malta"),
- MAURITIUS("MU", "Mauritius"),
- MALDIVES("MV", "Maldives"),
- MALAWI("MW", "Malawi"),
- MEXICO("MX", "Mexico"),
- MALAYSIA("MY", "Malaysia"),
- MOZAMBIQUE("MZ", "Mozambique"),
- NAMIBIA("NA", "Namibia"),
- NEW_CALEDONIA("NC", "New Caledonia"),
- NIGER("NE", "Niger"),
- NORFOLK_ISLAND("NF", "Norfolk Island"),
- NIGERIA("NG", "Nigeria"),
- NICARAGUA("NI", "Nicaragua"),
- NETHERLANDS("NL", "Netherlands"),
- NORWAY("NO", "Norway"),
- NEPAL("NP", "Nepal"),
- NAURU("NR", "Nauru"),
- NIUE("NU", "Niue"),
- NEW_ZEALAND("NZ", "New Zealand"),
- OMAN("OM", "Oman"),
- PANAMA("PA", "Panama"),
- PERU("PE", "Peru"),
- FRENCH_POLYNESIA("PF", "French Polynesia"),
- PAPUA_NEW_GUINEA("PG", "Papua New Guinea"),
- PHILIPPINES("PH", "Philippines"),
- PAKISTAN("PK", "Pakistan"),
- POLAND("PL", "Poland"),
- SAINT_PIERRE_AND_MIQUELON("PM", "Saint Pierre And Miquelon"),
- PITCAIRN("PN", "Pitcairn"),
- PUERTO_RICO("PR", "Puerto Rico"),
- PALESTINE("PS", "Palestine"),
- PORTUGAL("PT", "Portugal"),
- PALAU("PW", "Palau"),
- PARAGUAY("PY", "Paraguay"),
- QATAR("QA", "Qatar"),
- REUNION("RE", "Reunion"),
- ROMANIA("RO", "Romania"),
- SERBIA("RS", "Serbia"),
- RUSSIA("RU", "Russia"),
- RWANDA("RW", "Rwanda"),
- SAUDI_ARABIA("SA", "Saudi Arabia"),
- SOLOMON_ISLANDS("SB", "Solomon Islands"),
- SEYCHELLES("SC", "Seychelles"),
- SUDAN("SD", "Sudan"),
- SWEDEN("SE", "Sweden"),
- SINGAPORE("SG", "Singapore"),
- SAINT_HELENA("SH", "Saint Helena"),
- SLOVENIA("SI", "Slovenia"),
- SVALBARD_AND_JAN_MAYEN("SJ", "Svalbard And Jan Mayen"),
- SLOVAKIA("SK", "Slovakia"),
- SIERRA_LEONE("SL", "Sierra Leone"),
- SAN_MARINO("SM", "San Marino"),
- SENEGAL("SN", "Senegal"),
- SOMALIA("SO", "Somalia"),
- SURINAME("SR", "Suriname"),
- SOUTH_SUDAN("SS", "South Sudan"),
- SAO_TOME_AND_PRINCIPE("ST", "Sao Tome And Principe"),
- EL_SALVADOR("SV", "El Salvador"),
- SINT_MAARTEN_DUTCH_PART("SX", "Sint Maarten (Dutch part)"),
- SYRIA("SY", "Syria"),
- SWAZILAND("SZ", "Swaziland"),
- TURKS_AND_CAICOS_ISLANDS("TC", "Turks And Caicos Islands"),
- CHAD("TD", "Chad"),
- FRENCH_SOUTHERN_TERRITORIES("TF", "French Southern Territories"),
- TOGO("TG", "Togo"),
- THAILAND("TH", "Thailand"),
- TAJIKISTAN("TJ", "Tajikistan"),
- TOKELAU("TK", "Tokelau"),
- TIMOR_LESTE("TL", "Timor-Leste"),
- TURKMENISTAN("TM", "Turkmenistan"),
- TUNISIA("TN", "Tunisia"),
- TONGA("TO", "Tonga"),
- TURKEY("TR", "Turkey"),
- TRINIDAD_AND_TOBAGO("TT", "Trinidad and Tobago"),
- TUVALU("TV", "Tuvalu"),
- TAIWAN("TW", "Taiwan"),
- TANZANIA("TZ", "Tanzania"),
- UKRAINE("UA", "Ukraine"),
- UGANDA("UG", "Uganda"),
- UNITED_STATES_MINOR_OUTLYING_ISLANDS("UM", "United States Minor Outlying Islands"),
- UNITED_STATES("US", "United States"),
- URUGUAY("UY", "Uruguay"),
- UZBEKISTAN("UZ", "Uzbekistan"),
- VATICAN("VA", "Vatican"),
- SAINT_VINCENT_AND_THE_GRENADINES("VC", "Saint Vincent And The Grenadines"),
- VENEZUELA("VE", "Venezuela"),
- BRITISH_VIRGIN_ISLANDS("VG", "British Virgin Islands"),
- U_S__VIRGIN_ISLANDS("VI", "U.S. Virgin Islands"),
- VIETNAM("VN", "Vietnam"),
- VANUATU("VU", "Vanuatu"),
- WALLIS_AND_FUTUNA("WF", "Wallis And Futuna"),
- SAMOA("WS", "Samoa"),
- YEMEN("YE", "Yemen"),
- MAYOTTE("YT", "Mayotte"),
- SOUTH_AFRICA("ZA", "South Africa"),
- ZAMBIA("ZM", "Zambia"),
- ZIMBABWE("ZW", "Zimbabwe");
-
- private String isoTag;
- private String name;
-
- Country(String isoTag, String name) {
- this.isoTag = isoTag;
- this.name = name;
- }
-
- /**
- * Gets the name of the country.
- *
- * @return The name of the country.
- */
- public String getCountryName() {
- return name;
- }
-
- /**
- * Gets the iso tag of the country.
- *
- * @return The iso tag of the country.
- */
- public String getCountryIsoTag() {
- return isoTag;
- }
-
- /**
- * Gets a country by it's iso tag.
- *
- * @param isoTag The iso tag of the county.
- * @return The country with the given iso tag or null if unknown.
- */
- public static Country byIsoTag(String isoTag) {
- for (Country country : Country.values()) {
- if (country.getCountryIsoTag().equals(isoTag)) {
- return country;
- }
- }
- return null;
- }
-
- /**
- * Gets a country by a locale.
- *
- * @param locale The locale.
- * @return The country from the giben locale or null if unknown country or
- * if the locale does not contain a country.
- */
- public static Country byLocale(Locale locale) {
- return byIsoTag(locale.getCountry());
- }
-
- }
+ // 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/server-implementation";
+
+ // Should failed requests be logged?
+ private static boolean logFailedRequests = false;
+
+ // The name of the server software
+ private final String name;
+
+ // The uuid of the server
+ private final String serverUUID;
+
+ private final String limboVersion;
+
+ // A list with all custom charts
+ private final List charts = new ArrayList<>();
+
+ /**
+ * Class constructor.
+ *
+ * @param name The name of the server software.
+ * @param serverUUID The uuid of the server.
+ * @param logFailedRequests Whether failed requests should be logged or not.
+ * @param logger The logger for the failed requests.
+ * @throws FileNotFoundException
+ */
+ public Metrics() throws FileNotFoundException {
+ name = "Limbo";
+
+ // Get the config file
+ File configFile = new File("plugins/bStats", "config.yml");
+ FileConfiguration config = new FileConfiguration(configFile);
+
+ // Check if the config file exists
+ if (config.get("serverUuid", String.class) == null) {
+
+ // Add default values
+ config.set("enabled", true);
+ // Every server gets it's unique random id.
+ config.set("serverUuid", UUID.randomUUID().toString());
+ // Should failed request be logged?
+ config.set("logFailedRequests", false);
+
+ // Inform the server owners about bStats
+ config.setHeader(
+ "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 :)"
+ );
+ try {
+ config.saveConfig(configFile);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ limboVersion = new BufferedReader(new InputStreamReader(Limbo.class.getClassLoader().getResourceAsStream("META-INF/MANIFEST.MF"))).lines().filter(each -> each.startsWith("Limbo-Version:")).findFirst().orElse("Limbo-Version: unknown").substring(14).trim();
+
+ // Load the data
+ serverUUID = config.get("serverUuid", String.class);
+ logFailedRequests = config.get("logFailedRequests", Boolean.class);
+ if (config.get("enabled", Boolean.class)) {
+ startSubmitting();
+ }
+
+ addCustomChart(new Metrics.SingleLineChart("players", new Callable() {
+ @Override
+ public Integer call() throws Exception {
+ return Limbo.getInstance().getPlayers().size();
+ }
+ }));
+
+ addCustomChart(new Metrics.SimplePie("limbo_version", new Callable() {
+ @Override
+ public String call() throws Exception {
+ return limboVersion;
+ }
+ }));
+ }
+
+ /**
+ * Adds a custom chart.
+ *
+ * @param chart The chart to add.
+ */
+ public void addCustomChart(CustomChart chart) {
+ if (chart == null) {
+ throw new IllegalArgumentException("Chart cannot be null!");
+ }
+ charts.add(chart);
+ }
+
+ /**
+ * Starts the Scheduler which submits our data every 30 minutes.
+ */
+ private void startSubmitting() {
+ final Timer timer = new Timer(true);
+ timer.scheduleAtFixedRate(new TimerTask() {
+ @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.
+ *
+ * @return The plugin specific data.
+ */
+ private JSONObject getPluginData() {
+ JSONObject data = new JSONObject();
+
+ data.put("pluginName", name); // Append the name of the server software
+ JSONArray customCharts = new JSONArray();
+ for (CustomChart customChart : charts) {
+ // Add the data of the custom charts
+ JSONObject chart = customChart.getRequestJsonObject();
+ if (chart == null) { // If the chart is null, we skip it
+ continue;
+ }
+ customCharts.add(chart);
+ }
+ data.put("customCharts", customCharts);
+
+ return data;
+ }
+
+ /**
+ * Gets the server specific data.
+ *
+ * @return The server specific data.
+ */
+ private JSONObject getServerData() {
+ // OS specific data
+ 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", Limbo.getInstance().getPlayers().size());
+ 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();
+ pluginData.add(getPluginData());
+ data.put("plugins", pluginData);
+
+ try {
+ // We are still in the Thread of the timer, so nothing get blocked :)
+ sendData(data);
+ } catch (Exception e) {
+ // Something went wrong! :(
+ if (logFailedRequests) {
+ Limbo.getInstance().getConsole().sendMessage("Could not submit stats of " + name + "\n" + e);
+ }
+ }
+ }
+
+ /**
+ * 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();
+ }
+
+ /**
+ * Represents a custom chart.
+ */
+ public static abstract class CustomChart {
+
+ // The id of the chart
+ final String chartId;
+
+ /**
+ * Class constructor.
+ *
+ * @param chartId The id of the chart.
+ */
+ CustomChart(String chartId) {
+ if (chartId == null || chartId.isEmpty()) {
+ throw new IllegalArgumentException("ChartId cannot be null or empty!");
+ }
+ this.chartId = chartId;
+ }
+
+ private JSONObject getRequestJsonObject() {
+ JSONObject chart = new JSONObject();
+ chart.put("chartId", chartId);
+ try {
+ JSONObject data = getChartData();
+ if (data == null) {
+ // If the data is null we don't send the chart.
+ return null;
+ }
+ chart.put("data", data);
+ } catch (Throwable t) {
+ if (logFailedRequests) {
+ Limbo.getInstance().getConsole().sendMessage("Failed to get data for custom chart with id " + chartId + "\n" + t);
+ }
+ return null;
+ }
+ return chart;
+ }
+
+ protected abstract JSONObject getChartData() throws Exception;
+
+ }
+
+ /**
+ * Represents a custom simple pie.
+ */
+ public static class SimplePie extends CustomChart {
+
+ private final Callable callable;
+
+ /**
+ * Class constructor.
+ *
+ * @param chartId The id of the chart.
+ * @param callable The callable which is used to request the chart data.
+ */
+ public SimplePie(String chartId, Callable callable) {
+ super(chartId);
+ this.callable = callable;
+ }
+
+ @Override
+ protected JSONObject getChartData() throws Exception {
+ JSONObject data = new JSONObject();
+ String value = callable.call();
+ if (value == null || value.isEmpty()) {
+ // Null = skip the chart
+ return null;
+ }
+ data.put("value", value);
+ return data;
+ }
+ }
+
+ /**
+ * Represents a custom advanced pie.
+ */
+ public static class AdvancedPie extends CustomChart {
+
+ private final Callable> callable;
+
+ /**
+ * Class constructor.
+ *
+ * @param chartId The id of the chart.
+ * @param callable The callable which is used to request the chart data.
+ */
+ public AdvancedPie(String chartId, Callable> callable) {
+ super(chartId);
+ this.callable = callable;
+ }
+
+ @Override
+ protected JSONObject getChartData() throws Exception {
+ JSONObject data = new JSONObject();
+ JSONObject values = new JSONObject();
+ Map map = callable.call();
+ if (map == null || map.isEmpty()) {
+ // Null = skip the chart
+ return null;
+ }
+ boolean allSkipped = true;
+ for (Map.Entry entry : map.entrySet()) {
+ if (entry.getValue() == 0) {
+ continue; // Skip this invalid
+ }
+ allSkipped = false;
+ values.put(entry.getKey(), entry.getValue());
+ }
+ if (allSkipped) {
+ // Null = skip the chart
+ return null;
+ }
+ data.put("values", values);
+ return data;
+ }
+ }
+
+ /**
+ * Represents a custom drilldown pie.
+ */
+ public static class DrilldownPie extends CustomChart {
+
+ private final Callable>> callable;
+
+ /**
+ * Class constructor.
+ *
+ * @param chartId The id of the chart.
+ * @param callable The callable which is used to request the chart data.
+ */
+ public DrilldownPie(String chartId, Callable>> callable) {
+ super(chartId);
+ this.callable = callable;
+ }
+
+ @Override
+ public JSONObject getChartData() throws Exception {
+ JSONObject data = new JSONObject();
+ JSONObject values = new JSONObject();
+ Map> map = callable.call();
+ if (map == null || map.isEmpty()) {
+ // Null = skip the chart
+ return null;
+ }
+ boolean reallyAllSkipped = true;
+ for (Map.Entry> entryValues : map.entrySet()) {
+ JSONObject value = new JSONObject();
+ boolean allSkipped = true;
+ for (Map.Entry valueEntry : map.get(entryValues.getKey()).entrySet()) {
+ value.put(valueEntry.getKey(), valueEntry.getValue());
+ allSkipped = false;
+ }
+ if (!allSkipped) {
+ reallyAllSkipped = false;
+ values.put(entryValues.getKey(), value);
+ }
+ }
+ if (reallyAllSkipped) {
+ // Null = skip the chart
+ return null;
+ }
+ data.put("values", values);
+ return data;
+ }
+ }
+
+ /**
+ * Represents a custom single line chart.
+ */
+ public static class SingleLineChart extends CustomChart {
+
+ private final Callable callable;
+
+ /**
+ * Class constructor.
+ *
+ * @param chartId The id of the chart.
+ * @param callable The callable which is used to request the chart data.
+ */
+ public SingleLineChart(String chartId, Callable callable) {
+ super(chartId);
+ this.callable = callable;
+ }
+
+ @Override
+ protected JSONObject getChartData() throws Exception {
+ JSONObject data = new JSONObject();
+ int value = callable.call();
+ if (value == 0) {
+ // Null = skip the chart
+ return null;
+ }
+ data.put("value", value);
+ return data;
+ }
+
+ }
+
+ /**
+ * Represents a custom multi line chart.
+ */
+ public static class MultiLineChart extends CustomChart {
+
+ private final Callable> callable;
+
+ /**
+ * Class constructor.
+ *
+ * @param chartId The id of the chart.
+ * @param callable The callable which is used to request the chart data.
+ */
+ public MultiLineChart(String chartId, Callable> callable) {
+ super(chartId);
+ this.callable = callable;
+ }
+
+ @Override
+ protected JSONObject getChartData() throws Exception {
+ JSONObject data = new JSONObject();
+ JSONObject values = new JSONObject();
+ Map map = callable.call();
+ if (map == null || map.isEmpty()) {
+ // Null = skip the chart
+ return null;
+ }
+ boolean allSkipped = true;
+ for (Map.Entry entry : map.entrySet()) {
+ if (entry.getValue() == 0) {
+ continue; // Skip this invalid
+ }
+ allSkipped = false;
+ values.put(entry.getKey(), entry.getValue());
+ }
+ if (allSkipped) {
+ // Null = skip the chart
+ return null;
+ }
+ data.put("values", values);
+ return data;
+ }
+
+ }
+
+ /**
+ * Represents a custom simple bar chart.
+ */
+ public static class SimpleBarChart extends CustomChart {
+
+ private final Callable> callable;
+
+ /**
+ * Class constructor.
+ *
+ * @param chartId The id of the chart.
+ * @param callable The callable which is used to request the chart data.
+ */
+ public SimpleBarChart(String chartId, Callable> callable) {
+ super(chartId);
+ this.callable = callable;
+ }
+
+ @Override
+ protected JSONObject getChartData() throws Exception {
+ JSONObject data = new JSONObject();
+ JSONObject values = new JSONObject();
+ Map map = callable.call();
+ if (map == null || map.isEmpty()) {
+ // Null = skip the chart
+ return null;
+ }
+ for (Map.Entry entry : map.entrySet()) {
+ JSONArray categoryValues = new JSONArray();
+ categoryValues.add(entry.getValue());
+ values.put(entry.getKey(), categoryValues);
+ }
+ data.put("values", values);
+ return data;
+ }
+
+ }
+
+ /**
+ * Represents a custom advanced bar chart.
+ */
+ public static class AdvancedBarChart extends CustomChart {
+
+ private final Callable> callable;
+
+ /**
+ * Class constructor.
+ *
+ * @param chartId The id of the chart.
+ * @param callable The callable which is used to request the chart data.
+ */
+ public AdvancedBarChart(String chartId, Callable> callable) {
+ super(chartId);
+ this.callable = callable;
+ }
+
+ @Override
+ protected JSONObject getChartData() throws Exception {
+ JSONObject data = new JSONObject();
+ JSONObject values = new JSONObject();
+ Map map = callable.call();
+ if (map == null || map.isEmpty()) {
+ // Null = skip the chart
+ return null;
+ }
+ boolean allSkipped = true;
+ for (Map.Entry entry : map.entrySet()) {
+ if (entry.getValue().length == 0) {
+ continue; // Skip this invalid
+ }
+ allSkipped = false;
+ JSONArray categoryValues = new JSONArray();
+ for (int categoryValue : entry.getValue()) {
+ categoryValues.add(categoryValue);
+ }
+ values.put(entry.getKey(), categoryValues);
+ }
+ if (allSkipped) {
+ // Null = skip the chart
+ return null;
+ }
+ data.put("values", values);
+ return data;
+ }
+
+ }
+
+ /**
+ * Represents a custom simple map chart.
+ */
+ public static abstract class SimpleMapChart extends CustomChart {
+
+ /**
+ * Class constructor.
+ *
+ * @param chartId The id of the chart.
+ */
+ public SimpleMapChart(String chartId) {
+ super(chartId);
+ }
+
+ /**
+ * Gets the value of the chart.
+ *
+ * @return The value of the chart.
+ */
+ public abstract Country getValue();
+
+ @Override
+ protected JSONObject getChartData() {
+ JSONObject data = new JSONObject();
+ Country value = getValue();
+
+ if (value == null) {
+ // Null = skip the chart
+ return null;
+ }
+ data.put("value", value.getCountryIsoTag());
+ return data;
+ }
+
+ }
+
+ /**
+ * Represents a custom advanced map chart.
+ */
+ public static abstract class AdvancedMapChart extends CustomChart {
+
+ /**
+ * Class constructor.
+ *
+ * @param chartId The id of the chart.
+ */
+ public AdvancedMapChart(String chartId) {
+ super(chartId);
+ }
+
+ /**
+ * Gets the value of the chart.
+ *
+ * @param valueMap Just an empty map. The only reason it exists is to make your life easier.
+ * You don't have to create a map yourself!
+ * @return The value of the chart.
+ */
+ public abstract HashMap getValues(HashMap valueMap);
+
+ @Override
+ protected JSONObject getChartData() {
+ JSONObject data = new JSONObject();
+ JSONObject values = new JSONObject();
+ HashMap map = getValues(new HashMap());
+ if (map == null || map.isEmpty()) {
+ // Null = skip the chart
+ return null;
+ }
+ boolean allSkipped = true;
+ for (Map.Entry entry : map.entrySet()) {
+ if (entry.getValue() == 0) {
+ continue; // Skip this invalid
+ }
+ allSkipped = false;
+ values.put(entry.getKey().getCountryIsoTag(), entry.getValue());
+ }
+ if (allSkipped) {
+ // Null = skip the chart
+ return null;
+ }
+ data.put("values", values);
+ return data;
+ }
+
+ }
+
+ /**
+ * A enum which is used for custom maps.
+ */
+ public enum Country {
+
+ /**
+ * bStats will use the country of the server.
+ */
+ AUTO_DETECT("AUTO", "Auto Detected"),
+
+ ANDORRA("AD", "Andorra"),
+ UNITED_ARAB_EMIRATES("AE", "United Arab Emirates"),
+ AFGHANISTAN("AF", "Afghanistan"),
+ ANTIGUA_AND_BARBUDA("AG", "Antigua and Barbuda"),
+ ANGUILLA("AI", "Anguilla"),
+ ALBANIA("AL", "Albania"),
+ ARMENIA("AM", "Armenia"),
+ NETHERLANDS_ANTILLES("AN", "Netherlands Antilles"),
+ ANGOLA("AO", "Angola"),
+ ANTARCTICA("AQ", "Antarctica"),
+ ARGENTINA("AR", "Argentina"),
+ AMERICAN_SAMOA("AS", "American Samoa"),
+ AUSTRIA("AT", "Austria"),
+ AUSTRALIA("AU", "Australia"),
+ ARUBA("AW", "Aruba"),
+ ALAND_ISLANDS("AX", "Åland Islands"),
+ AZERBAIJAN("AZ", "Azerbaijan"),
+ BOSNIA_AND_HERZEGOVINA("BA", "Bosnia and Herzegovina"),
+ BARBADOS("BB", "Barbados"),
+ BANGLADESH("BD", "Bangladesh"),
+ BELGIUM("BE", "Belgium"),
+ BURKINA_FASO("BF", "Burkina Faso"),
+ BULGARIA("BG", "Bulgaria"),
+ BAHRAIN("BH", "Bahrain"),
+ BURUNDI("BI", "Burundi"),
+ BENIN("BJ", "Benin"),
+ SAINT_BARTHELEMY("BL", "Saint Barthélemy"),
+ BERMUDA("BM", "Bermuda"),
+ BRUNEI("BN", "Brunei"),
+ BOLIVIA("BO", "Bolivia"),
+ BONAIRE_SINT_EUSTATIUS_AND_SABA("BQ", "Bonaire, Sint Eustatius and Saba"),
+ BRAZIL("BR", "Brazil"),
+ BAHAMAS("BS", "Bahamas"),
+ BHUTAN("BT", "Bhutan"),
+ BOUVET_ISLAND("BV", "Bouvet Island"),
+ BOTSWANA("BW", "Botswana"),
+ BELARUS("BY", "Belarus"),
+ BELIZE("BZ", "Belize"),
+ CANADA("CA", "Canada"),
+ COCOS_ISLANDS("CC", "Cocos Islands"),
+ THE_DEMOCRATIC_REPUBLIC_OF_CONGO("CD", "The Democratic Republic Of Congo"),
+ CENTRAL_AFRICAN_REPUBLIC("CF", "Central African Republic"),
+ CONGO("CG", "Congo"),
+ SWITZERLAND("CH", "Switzerland"),
+ COTE_D_IVOIRE("CI", "Côte d'Ivoire"),
+ COOK_ISLANDS("CK", "Cook Islands"),
+ CHILE("CL", "Chile"),
+ CAMEROON("CM", "Cameroon"),
+ CHINA("CN", "China"),
+ COLOMBIA("CO", "Colombia"),
+ COSTA_RICA("CR", "Costa Rica"),
+ CUBA("CU", "Cuba"),
+ CAPE_VERDE("CV", "Cape Verde"),
+ CURACAO("CW", "Curaçao"),
+ CHRISTMAS_ISLAND("CX", "Christmas Island"),
+ CYPRUS("CY", "Cyprus"),
+ CZECH_REPUBLIC("CZ", "Czech Republic"),
+ GERMANY("DE", "Germany"),
+ DJIBOUTI("DJ", "Djibouti"),
+ DENMARK("DK", "Denmark"),
+ DOMINICA("DM", "Dominica"),
+ DOMINICAN_REPUBLIC("DO", "Dominican Republic"),
+ ALGERIA("DZ", "Algeria"),
+ ECUADOR("EC", "Ecuador"),
+ ESTONIA("EE", "Estonia"),
+ EGYPT("EG", "Egypt"),
+ WESTERN_SAHARA("EH", "Western Sahara"),
+ ERITREA("ER", "Eritrea"),
+ SPAIN("ES", "Spain"),
+ ETHIOPIA("ET", "Ethiopia"),
+ FINLAND("FI", "Finland"),
+ FIJI("FJ", "Fiji"),
+ FALKLAND_ISLANDS("FK", "Falkland Islands"),
+ MICRONESIA("FM", "Micronesia"),
+ FAROE_ISLANDS("FO", "Faroe Islands"),
+ FRANCE("FR", "France"),
+ GABON("GA", "Gabon"),
+ UNITED_KINGDOM("GB", "United Kingdom"),
+ GRENADA("GD", "Grenada"),
+ GEORGIA("GE", "Georgia"),
+ FRENCH_GUIANA("GF", "French Guiana"),
+ GUERNSEY("GG", "Guernsey"),
+ GHANA("GH", "Ghana"),
+ GIBRALTAR("GI", "Gibraltar"),
+ GREENLAND("GL", "Greenland"),
+ GAMBIA("GM", "Gambia"),
+ GUINEA("GN", "Guinea"),
+ GUADELOUPE("GP", "Guadeloupe"),
+ EQUATORIAL_GUINEA("GQ", "Equatorial Guinea"),
+ GREECE("GR", "Greece"),
+ SOUTH_GEORGIA_AND_THE_SOUTH_SANDWICH_ISLANDS("GS", "South Georgia And The South Sandwich Islands"),
+ GUATEMALA("GT", "Guatemala"),
+ GUAM("GU", "Guam"),
+ GUINEA_BISSAU("GW", "Guinea-Bissau"),
+ GUYANA("GY", "Guyana"),
+ HONG_KONG("HK", "Hong Kong"),
+ HEARD_ISLAND_AND_MCDONALD_ISLANDS("HM", "Heard Island And McDonald Islands"),
+ HONDURAS("HN", "Honduras"),
+ CROATIA("HR", "Croatia"),
+ HAITI("HT", "Haiti"),
+ HUNGARY("HU", "Hungary"),
+ INDONESIA("ID", "Indonesia"),
+ IRELAND("IE", "Ireland"),
+ ISRAEL("IL", "Israel"),
+ ISLE_OF_MAN("IM", "Isle Of Man"),
+ INDIA("IN", "India"),
+ BRITISH_INDIAN_OCEAN_TERRITORY("IO", "British Indian Ocean Territory"),
+ IRAQ("IQ", "Iraq"),
+ IRAN("IR", "Iran"),
+ ICELAND("IS", "Iceland"),
+ ITALY("IT", "Italy"),
+ JERSEY("JE", "Jersey"),
+ JAMAICA("JM", "Jamaica"),
+ JORDAN("JO", "Jordan"),
+ JAPAN("JP", "Japan"),
+ KENYA("KE", "Kenya"),
+ KYRGYZSTAN("KG", "Kyrgyzstan"),
+ CAMBODIA("KH", "Cambodia"),
+ KIRIBATI("KI", "Kiribati"),
+ COMOROS("KM", "Comoros"),
+ SAINT_KITTS_AND_NEVIS("KN", "Saint Kitts And Nevis"),
+ NORTH_KOREA("KP", "North Korea"),
+ SOUTH_KOREA("KR", "South Korea"),
+ KUWAIT("KW", "Kuwait"),
+ CAYMAN_ISLANDS("KY", "Cayman Islands"),
+ KAZAKHSTAN("KZ", "Kazakhstan"),
+ LAOS("LA", "Laos"),
+ LEBANON("LB", "Lebanon"),
+ SAINT_LUCIA("LC", "Saint Lucia"),
+ LIECHTENSTEIN("LI", "Liechtenstein"),
+ SRI_LANKA("LK", "Sri Lanka"),
+ LIBERIA("LR", "Liberia"),
+ LESOTHO("LS", "Lesotho"),
+ LITHUANIA("LT", "Lithuania"),
+ LUXEMBOURG("LU", "Luxembourg"),
+ LATVIA("LV", "Latvia"),
+ LIBYA("LY", "Libya"),
+ MOROCCO("MA", "Morocco"),
+ MONACO("MC", "Monaco"),
+ MOLDOVA("MD", "Moldova"),
+ MONTENEGRO("ME", "Montenegro"),
+ SAINT_MARTIN("MF", "Saint Martin"),
+ MADAGASCAR("MG", "Madagascar"),
+ MARSHALL_ISLANDS("MH", "Marshall Islands"),
+ MACEDONIA("MK", "Macedonia"),
+ MALI("ML", "Mali"),
+ MYANMAR("MM", "Myanmar"),
+ MONGOLIA("MN", "Mongolia"),
+ MACAO("MO", "Macao"),
+ NORTHERN_MARIANA_ISLANDS("MP", "Northern Mariana Islands"),
+ MARTINIQUE("MQ", "Martinique"),
+ MAURITANIA("MR", "Mauritania"),
+ MONTSERRAT("MS", "Montserrat"),
+ MALTA("MT", "Malta"),
+ MAURITIUS("MU", "Mauritius"),
+ MALDIVES("MV", "Maldives"),
+ MALAWI("MW", "Malawi"),
+ MEXICO("MX", "Mexico"),
+ MALAYSIA("MY", "Malaysia"),
+ MOZAMBIQUE("MZ", "Mozambique"),
+ NAMIBIA("NA", "Namibia"),
+ NEW_CALEDONIA("NC", "New Caledonia"),
+ NIGER("NE", "Niger"),
+ NORFOLK_ISLAND("NF", "Norfolk Island"),
+ NIGERIA("NG", "Nigeria"),
+ NICARAGUA("NI", "Nicaragua"),
+ NETHERLANDS("NL", "Netherlands"),
+ NORWAY("NO", "Norway"),
+ NEPAL("NP", "Nepal"),
+ NAURU("NR", "Nauru"),
+ NIUE("NU", "Niue"),
+ NEW_ZEALAND("NZ", "New Zealand"),
+ OMAN("OM", "Oman"),
+ PANAMA("PA", "Panama"),
+ PERU("PE", "Peru"),
+ FRENCH_POLYNESIA("PF", "French Polynesia"),
+ PAPUA_NEW_GUINEA("PG", "Papua New Guinea"),
+ PHILIPPINES("PH", "Philippines"),
+ PAKISTAN("PK", "Pakistan"),
+ POLAND("PL", "Poland"),
+ SAINT_PIERRE_AND_MIQUELON("PM", "Saint Pierre And Miquelon"),
+ PITCAIRN("PN", "Pitcairn"),
+ PUERTO_RICO("PR", "Puerto Rico"),
+ PALESTINE("PS", "Palestine"),
+ PORTUGAL("PT", "Portugal"),
+ PALAU("PW", "Palau"),
+ PARAGUAY("PY", "Paraguay"),
+ QATAR("QA", "Qatar"),
+ REUNION("RE", "Reunion"),
+ ROMANIA("RO", "Romania"),
+ SERBIA("RS", "Serbia"),
+ RUSSIA("RU", "Russia"),
+ RWANDA("RW", "Rwanda"),
+ SAUDI_ARABIA("SA", "Saudi Arabia"),
+ SOLOMON_ISLANDS("SB", "Solomon Islands"),
+ SEYCHELLES("SC", "Seychelles"),
+ SUDAN("SD", "Sudan"),
+ SWEDEN("SE", "Sweden"),
+ SINGAPORE("SG", "Singapore"),
+ SAINT_HELENA("SH", "Saint Helena"),
+ SLOVENIA("SI", "Slovenia"),
+ SVALBARD_AND_JAN_MAYEN("SJ", "Svalbard And Jan Mayen"),
+ SLOVAKIA("SK", "Slovakia"),
+ SIERRA_LEONE("SL", "Sierra Leone"),
+ SAN_MARINO("SM", "San Marino"),
+ SENEGAL("SN", "Senegal"),
+ SOMALIA("SO", "Somalia"),
+ SURINAME("SR", "Suriname"),
+ SOUTH_SUDAN("SS", "South Sudan"),
+ SAO_TOME_AND_PRINCIPE("ST", "Sao Tome And Principe"),
+ EL_SALVADOR("SV", "El Salvador"),
+ SINT_MAARTEN_DUTCH_PART("SX", "Sint Maarten (Dutch part)"),
+ SYRIA("SY", "Syria"),
+ SWAZILAND("SZ", "Swaziland"),
+ TURKS_AND_CAICOS_ISLANDS("TC", "Turks And Caicos Islands"),
+ CHAD("TD", "Chad"),
+ FRENCH_SOUTHERN_TERRITORIES("TF", "French Southern Territories"),
+ TOGO("TG", "Togo"),
+ THAILAND("TH", "Thailand"),
+ TAJIKISTAN("TJ", "Tajikistan"),
+ TOKELAU("TK", "Tokelau"),
+ TIMOR_LESTE("TL", "Timor-Leste"),
+ TURKMENISTAN("TM", "Turkmenistan"),
+ TUNISIA("TN", "Tunisia"),
+ TONGA("TO", "Tonga"),
+ TURKEY("TR", "Turkey"),
+ TRINIDAD_AND_TOBAGO("TT", "Trinidad and Tobago"),
+ TUVALU("TV", "Tuvalu"),
+ TAIWAN("TW", "Taiwan"),
+ TANZANIA("TZ", "Tanzania"),
+ UKRAINE("UA", "Ukraine"),
+ UGANDA("UG", "Uganda"),
+ UNITED_STATES_MINOR_OUTLYING_ISLANDS("UM", "United States Minor Outlying Islands"),
+ UNITED_STATES("US", "United States"),
+ URUGUAY("UY", "Uruguay"),
+ UZBEKISTAN("UZ", "Uzbekistan"),
+ VATICAN("VA", "Vatican"),
+ SAINT_VINCENT_AND_THE_GRENADINES("VC", "Saint Vincent And The Grenadines"),
+ VENEZUELA("VE", "Venezuela"),
+ BRITISH_VIRGIN_ISLANDS("VG", "British Virgin Islands"),
+ U_S__VIRGIN_ISLANDS("VI", "U.S. Virgin Islands"),
+ VIETNAM("VN", "Vietnam"),
+ VANUATU("VU", "Vanuatu"),
+ WALLIS_AND_FUTUNA("WF", "Wallis And Futuna"),
+ SAMOA("WS", "Samoa"),
+ YEMEN("YE", "Yemen"),
+ MAYOTTE("YT", "Mayotte"),
+ SOUTH_AFRICA("ZA", "South Africa"),
+ ZAMBIA("ZM", "Zambia"),
+ ZIMBABWE("ZW", "Zimbabwe");
+
+ private String isoTag;
+ private String name;
+
+ Country(String isoTag, String name) {
+ this.isoTag = isoTag;
+ this.name = name;
+ }
+
+ /**
+ * Gets the name of the country.
+ *
+ * @return The name of the country.
+ */
+ public String getCountryName() {
+ return name;
+ }
+
+ /**
+ * Gets the iso tag of the country.
+ *
+ * @return The iso tag of the country.
+ */
+ public String getCountryIsoTag() {
+ return isoTag;
+ }
+
+ /**
+ * Gets a country by it's iso tag.
+ *
+ * @param isoTag The iso tag of the county.
+ * @return The country with the given iso tag or null if unknown.
+ */
+ public static Country byIsoTag(String isoTag) {
+ for (Country country : Country.values()) {
+ if (country.getCountryIsoTag().equals(isoTag)) {
+ return country;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Gets a country by a locale.
+ *
+ * @param locale The locale.
+ * @return The country from the giben locale or null if unknown country or
+ * if the locale does not contain a country.
+ */
+ public static Country byLocale(Locale locale) {
+ return byIsoTag(locale.getCountry());
+ }
+
+ }
}
\ No newline at end of file
diff --git a/src/com/loohp/limbo/Plugins/PluginManager.java b/src/com/loohp/limbo/Plugins/PluginManager.java
index 47f4f81..dac9978 100644
--- a/src/com/loohp/limbo/Plugins/PluginManager.java
+++ b/src/com/loohp/limbo/Plugins/PluginManager.java
@@ -43,6 +43,7 @@ public class PluginManager {
if (name.endsWith("plugin.yml") || name.endsWith("limbo.yml")) {
found = true;
+ @SuppressWarnings("deprecation")
FileConfiguration pluginYaml = new FileConfiguration(zip);
String main = pluginYaml.get("main", String.class);
String pluginName = pluginYaml.get("name", String.class);