mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-06 11:58:10 +02:00
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Warning: this commit contains more mapping changes from upstream, As always, ensure that you have working backups and test this build before deployment; Developers working on paper will, yet again, need to delete their work/Minecraft/1.13.2 folder Bukkit Changes: 7fca5fd4 SPIGOT-4558: Preserve user order in the face of copied defaults in configurations 15c9b1eb Ignore spurious slot IDs sent by client, e.g. in enchanting tables 5d2a10c5 SPIGOT-3747: Add API for force loaded chunks d6dd2bb3 SPIGOT-3538: Add getHitBlockFace for ProjectileHitEvent 771db4aa SPIGOT-794: Call EntityPlaceEvent for Minecart placement 55462509 Add InventoryView#getSlotType 2f3ce5b6 Remove EntityTransformEvent and CustomItemTagContainer from draft API f04ad7b6 Make ProjectileLaunchEvent extend EntitySpawnEvent ccb85808 Define EntitySpawnEvent b8cc3ebe Add PlayerItemDamageEvent 184a495d Ease ClassLoader Deadlocks Where Possible 11ac4728 Expand Boolean Prompt Values in Conversation API aae62d51 Added getAllSessionData() to the Conversation API. 9290ff91 Add InventoryView#getInventory API 995e530f Add API to get / set base arrow damage CraftBukkit Changes:c4a67eed
SPIGOT-4556: Fix plugins closing inventory during drop events5be2ddcb
Replace version constants with methods to prevent compiler inlininga5b9c7b3
Use API method to create offset command completions2bc7d1df
SPIGOT-3747: Add API for force loaded chunksa408f375
SPIGOT-3538: Add getHitBlockFace for ProjectileHitEventb54b9409
SPIGOT-2864: Make Arrow / Item setTicksLived behave like FallingBlock79ded7a8
SPIGOT-1811: Death message not shown on respawn screenb4a4f15d
SPIGOT-943: InventoryCloseEvent called on death regardless of open inventory0afed592
SPIGOT-794: Call EntityPlaceEvent for Minecart placement2b2d084a
Add InventoryView#getSlotType01a9959a
Do not use deprecated ItemSpawnEvent constructor9642498d
SPIGOT-4547: Call EntitySpawnEvent as general spawn fallback event963f4a5f
Add PlayerItemDamageEvent63db0445
Add API to get / set base arrow damage531c25d7
Add CraftMagicNumbers.MAPPINGS_VERSION for use by NMS pluginsd05c8b14
Mappings Updatebd36e200
SPIGOT-4551: Ignore invalid attribute modifier slots Spigot Changes: 518206a1 Remove redundant trove depend 1959ad21 MC-11211,SPIGOT-4552: Fix placing double slabs at y = 255 29ab5e43 SPIGOT-3661: Allow arguments in restart-script 7cc46316 SPIGOT-852: Growth modifiers for beetroots, potatoes, carrots 82e117e1 Squelch "fatal: Resolve operation not in progress" message 0a1a68e7 Mappings Update & Patch Rebuild
696 lines
25 KiB
Diff
696 lines
25 KiB
Diff
From f1a6ed4b7cd1fe9d614bcc100d83226d9b7e529f Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
Date: Fri, 24 Mar 2017 23:56:01 -0500
|
|
Subject: [PATCH] Paper Metrics
|
|
|
|
Removes Spigot's mcstats metrics in favor of a system using bStats
|
|
|
|
To disable for privacy or other reasons go to the bStats folder in your plugins folder
|
|
and edit the config.yml file present there.
|
|
|
|
Please keep in mind the data collected is anonymous and collection should have no
|
|
tangible effect on server performance. The data is used to allow the authors of
|
|
PaperMC to track version and platform usage so that we can make better management
|
|
decisions on behalf of the project.
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
|
|
new file mode 100644
|
|
index 000000000..e257d6b36
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
|
|
@@ -0,0 +1,627 @@
|
|
+package com.destroystokyo.paper;
|
|
+
|
|
+import net.minecraft.server.MinecraftServer;
|
|
+import org.bukkit.Bukkit;
|
|
+import org.bukkit.configuration.file.YamlConfiguration;
|
|
+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.net.URL;
|
|
+import java.util.*;
|
|
+import java.util.concurrent.Callable;
|
|
+import java.util.logging.Level;
|
|
+import java.util.logging.Logger;
|
|
+import java.util.regex.Matcher;
|
|
+import java.util.regex.Pattern;
|
|
+import java.util.zip.GZIPOutputStream;
|
|
+
|
|
+/**
|
|
+ * bStats collects some data for plugin authors.
|
|
+ *
|
|
+ * Check out https://bStats.org/ to learn more about bStats!
|
|
+ */
|
|
+public class Metrics {
|
|
+
|
|
+ // 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 logger for the failed requests
|
|
+ private static Logger logger = Logger.getLogger("bStats");
|
|
+
|
|
+ // The name of the server software
|
|
+ private final String name;
|
|
+
|
|
+ // The uuid of the server
|
|
+ private final String serverUUID;
|
|
+
|
|
+ // A list with all custom charts
|
|
+ private final List<CustomChart> 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.
|
|
+ */
|
|
+ public Metrics(String name, String serverUUID, boolean logFailedRequests, Logger logger) {
|
|
+ this.name = name;
|
|
+ this.serverUUID = serverUUID;
|
|
+ Metrics.logFailedRequests = logFailedRequests;
|
|
+ Metrics.logger = logger;
|
|
+
|
|
+ // Start submitting the data
|
|
+ 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.
|
|
+ */
|
|
+ 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("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) {
|
|
+ logger.log(Level.WARNING, "Could not submit stats of " + name, 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) {
|
|
+ logger.log(Level.WARNING, "Failed to get data for custom chart with id " + chartId, 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<String> 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<String> 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<Map<String, Integer>> 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<Map<String, Integer>> callable) {
|
|
+ super(chartId);
|
|
+ this.callable = callable;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ protected JSONObject getChartData() throws Exception {
|
|
+ JSONObject data = new JSONObject();
|
|
+ JSONObject values = new JSONObject();
|
|
+ Map<String, Integer> map = callable.call();
|
|
+ if (map == null || map.isEmpty()) {
|
|
+ // Null = skip the chart
|
|
+ return null;
|
|
+ }
|
|
+ boolean allSkipped = true;
|
|
+ for (Map.Entry<String, Integer> 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<Map<String, Map<String, Integer>>> 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<Map<String, Map<String, Integer>>> callable) {
|
|
+ super(chartId);
|
|
+ this.callable = callable;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public JSONObject getChartData() throws Exception {
|
|
+ JSONObject data = new JSONObject();
|
|
+ JSONObject values = new JSONObject();
|
|
+ Map<String, Map<String, Integer>> map = callable.call();
|
|
+ if (map == null || map.isEmpty()) {
|
|
+ // Null = skip the chart
|
|
+ return null;
|
|
+ }
|
|
+ boolean reallyAllSkipped = true;
|
|
+ for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
|
|
+ JSONObject value = new JSONObject();
|
|
+ boolean allSkipped = true;
|
|
+ for (Map.Entry<String, Integer> 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<Integer> 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<Integer> 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<Map<String, Integer>> 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<Map<String, Integer>> callable) {
|
|
+ super(chartId);
|
|
+ this.callable = callable;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ protected JSONObject getChartData() throws Exception {
|
|
+ JSONObject data = new JSONObject();
|
|
+ JSONObject values = new JSONObject();
|
|
+ Map<String, Integer> map = callable.call();
|
|
+ if (map == null || map.isEmpty()) {
|
|
+ // Null = skip the chart
|
|
+ return null;
|
|
+ }
|
|
+ boolean allSkipped = true;
|
|
+ for (Map.Entry<String, Integer> 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<Map<String, Integer>> 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<Map<String, Integer>> callable) {
|
|
+ super(chartId);
|
|
+ this.callable = callable;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ protected JSONObject getChartData() throws Exception {
|
|
+ JSONObject data = new JSONObject();
|
|
+ JSONObject values = new JSONObject();
|
|
+ Map<String, Integer> map = callable.call();
|
|
+ if (map == null || map.isEmpty()) {
|
|
+ // Null = skip the chart
|
|
+ return null;
|
|
+ }
|
|
+ for (Map.Entry<String, Integer> 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<Map<String, int[]>> 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<Map<String, int[]>> callable) {
|
|
+ super(chartId);
|
|
+ this.callable = callable;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ protected JSONObject getChartData() throws Exception {
|
|
+ JSONObject data = new JSONObject();
|
|
+ JSONObject values = new JSONObject();
|
|
+ Map<String, int[]> map = callable.call();
|
|
+ if (map == null || map.isEmpty()) {
|
|
+ // Null = skip the chart
|
|
+ return null;
|
|
+ }
|
|
+ boolean allSkipped = true;
|
|
+ for (Map.Entry<String, int[]> 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;
|
|
+ }
|
|
+
|
|
+ }
|
|
+
|
|
+ static class PaperMetrics {
|
|
+ static void startMetrics() {
|
|
+ // Get the config file
|
|
+ File configFile = new File(new File((File) MinecraftServer.getServer().options.valueOf("plugins"), "bStats"), "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
|
|
+ String serverUUID = config.getString("serverUuid");
|
|
+ boolean logFailedRequests = config.getBoolean("logFailedRequests", false);
|
|
+ // Only start Metrics, if it's enabled in the config
|
|
+ if (config.getBoolean("enabled", true)) {
|
|
+ Metrics metrics = new Metrics("Paper", serverUUID, logFailedRequests, Bukkit.getLogger());
|
|
+
|
|
+ metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
|
|
+ String minecraftVersion = Bukkit.getVersion();
|
|
+ minecraftVersion = minecraftVersion.substring(minecraftVersion.indexOf("MC: ") + 4, minecraftVersion.length() - 1);
|
|
+ return minecraftVersion;
|
|
+ }));
|
|
+
|
|
+ metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
|
|
+ metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : "offline"));
|
|
+ metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown"));
|
|
+
|
|
+ metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
|
|
+ Map<String, Map<String, Integer>> map = new HashMap<>();
|
|
+ String javaVersion = System.getProperty("java.version");
|
|
+ Map<String, Integer> entry = new HashMap<>();
|
|
+ entry.put(javaVersion, 1);
|
|
+
|
|
+ // http://openjdk.java.net/jeps/223
|
|
+ // Java decided to change their versioning scheme and in doing so modified the java.version system
|
|
+ // property to return $major[.$minor][.$secuity][-ea], as opposed to 1.$major.0_$identifier
|
|
+ // we can handle pre-9 by checking if the "major" is equal to "1", otherwise, 9+
|
|
+ String majorVersion = javaVersion.split("\\.")[0];
|
|
+ String release;
|
|
+
|
|
+ int indexOf = javaVersion.lastIndexOf('.');
|
|
+
|
|
+ if (majorVersion.equals("1")) {
|
|
+ release = "Java " + javaVersion.substring(0, indexOf);
|
|
+ } else {
|
|
+ // of course, it really wouldn't be all that simple if they didn't add a quirk, now would it
|
|
+ // valid strings for the major may potentially include values such as -ea to deannotate a pre release
|
|
+ Matcher versionMatcher = Pattern.compile("\\d+").matcher(majorVersion);
|
|
+ if (versionMatcher.find()) {
|
|
+ majorVersion = versionMatcher.group(0);
|
|
+ }
|
|
+ release = "Java " + majorVersion;
|
|
+ }
|
|
+ map.put(release, entry);
|
|
+
|
|
+ return map;
|
|
+ }));
|
|
+ }
|
|
+
|
|
+ }
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
index f0473d9bf..255b8bed0 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
@@ -41,6 +41,7 @@ public class PaperConfig {
|
|
private static boolean verbose;
|
|
private static boolean fatalError;
|
|
/*========================================================================*/
|
|
+ private static boolean metricsStarted;
|
|
|
|
public static void init(File configFile) {
|
|
CONFIG_FILE = configFile;
|
|
@@ -83,6 +84,11 @@ public class PaperConfig {
|
|
for (Map.Entry<String, Command> entry : commands.entrySet()) {
|
|
MinecraftServer.getServer().server.getCommandMap().register(entry.getKey(), "Paper", entry.getValue());
|
|
}
|
|
+
|
|
+ if (!metricsStarted) {
|
|
+ Metrics.PaperMetrics.startMetrics();
|
|
+ metricsStarted = true;
|
|
+ }
|
|
}
|
|
|
|
static void readConfig(Class<?> clazz, Object instance) {
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
index 11c4d53df..fe3bad583 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
@@ -83,6 +83,7 @@ public class SpigotConfig
|
|
MinecraftServer.getServer().server.getCommandMap().register( entry.getKey(), "Spigot", entry.getValue() );
|
|
}
|
|
|
|
+ /* // Paper - Replace with our own
|
|
if ( metrics == null )
|
|
{
|
|
try
|
|
@@ -94,6 +95,7 @@ public class SpigotConfig
|
|
Bukkit.getServer().getLogger().log( Level.SEVERE, "Could not start metrics service", ex );
|
|
}
|
|
}
|
|
+ */ // Paper end
|
|
}
|
|
|
|
static void readConfig(Class<?> clazz, Object instance)
|
|
--
|
|
2.20.1
|
|
|