valueEntry : map.get(entryValues.getKey()).entrySet()) {
- valueBuilder.appendField(valueEntry.getKey(), valueEntry.getValue());
- allSkipped = false;
- }
- if (!allSkipped) {
- reallyAllSkipped = false;
- valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build());
- }
- }
- if (reallyAllSkipped) {
- // Null = skip the chart
- return null;
- }
- return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
- }
- }
-
- /**
- * An extremely simple JSON builder.
- *
- * While this class is neither feature-rich nor the most performant one, it's sufficient enough
- * for its use-case.
- */
- public static class JsonObjectBuilder {
-
- private StringBuilder builder = new StringBuilder();
-
- private boolean hasAtLeastOneField = false;
-
- public JsonObjectBuilder() {
- builder.append("{");
- }
-
- /**
- * Appends a null field to the JSON.
- *
- * @param key The key of the field.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendNull(String key) {
- appendFieldUnescaped(key, "null");
- return this;
- }
-
- /**
- * Appends a string field to the JSON.
- *
- * @param key The key of the field.
- * @param value The value of the field.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, String value) {
- if (value == null) {
- throw new IllegalArgumentException("JSON value must not be null");
- }
- appendFieldUnescaped(key, "\"" + escape(value) + "\"");
- return this;
- }
-
- /**
- * Appends an integer field to the JSON.
- *
- * @param key The key of the field.
- * @param value The value of the field.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, int value) {
- appendFieldUnescaped(key, String.valueOf(value));
- return this;
- }
-
- /**
- * Appends an object to the JSON.
- *
- * @param key The key of the field.
- * @param object The object.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, JsonObject object) {
- if (object == null) {
- throw new IllegalArgumentException("JSON object must not be null");
- }
- appendFieldUnescaped(key, object.toString());
- return this;
- }
-
- /**
- * Appends a string array to the JSON.
- *
- * @param key The key of the field.
- * @param values The string array.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, String[] values) {
- if (values == null) {
- throw new IllegalArgumentException("JSON values must not be null");
- }
- String escapedValues =
- Arrays.stream(values)
- .map(value -> "\"" + escape(value) + "\"")
- .collect(Collectors.joining(","));
- appendFieldUnescaped(key, "[" + escapedValues + "]");
- return this;
- }
-
- /**
- * Appends an integer array to the JSON.
- *
- * @param key The key of the field.
- * @param values The integer array.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, int[] values) {
- if (values == null) {
- throw new IllegalArgumentException("JSON values must not be null");
- }
- String escapedValues =
- Arrays.stream(values).mapToObj(String::valueOf).collect(Collectors.joining(","));
- appendFieldUnescaped(key, "[" + escapedValues + "]");
- return this;
- }
-
- /**
- * Appends an object array to the JSON.
- *
- * @param key The key of the field.
- * @param values The integer array.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, JsonObject[] values) {
- if (values == null) {
- throw new IllegalArgumentException("JSON values must not be null");
- }
- String escapedValues =
- Arrays.stream(values).map(JsonObject::toString).collect(Collectors.joining(","));
- appendFieldUnescaped(key, "[" + escapedValues + "]");
- return this;
- }
-
- /**
- * Appends a field to the object.
- *
- * @param key The key of the field.
- * @param escapedValue The escaped value of the field.
- */
- private void appendFieldUnescaped(String key, String escapedValue) {
- if (builder == null) {
- throw new IllegalStateException("JSON has already been built");
- }
- if (key == null) {
- throw new IllegalArgumentException("JSON key must not be null");
- }
- if (hasAtLeastOneField) {
- builder.append(",");
- }
- builder.append("\"").append(escape(key)).append("\":").append(escapedValue);
- hasAtLeastOneField = true;
- }
-
- /**
- * Builds the JSON string and invalidates this builder.
- *
- * @return The built JSON string.
- */
- public JsonObject build() {
- if (builder == null) {
- throw new IllegalStateException("JSON has already been built");
- }
- JsonObject object = new JsonObject(builder.append("}").toString());
- builder = null;
- return object;
- }
-
- /**
- * Escapes the given string like stated in https://www.ietf.org/rfc/rfc4627.txt.
- *
- *
This method escapes only the necessary characters '"', '\'. and '\u0000' - '\u001F'.
- * Compact escapes are not used (e.g., '\n' is escaped as "\u000a" and not as "\n").
- *
- * @param value The value to escape.
- * @return The escaped value.
- */
- private static String escape(String value) {
- final StringBuilder builder = new StringBuilder();
- for (int i = 0; i < value.length(); i++) {
- char c = value.charAt(i);
- if (c == '"') {
- builder.append("\\\"");
- } else if (c == '\\') {
- builder.append("\\\\");
- } else if (c <= '\u000F') {
- builder.append("\\u000").append(Integer.toHexString(c));
- } else if (c <= '\u001F') {
- builder.append("\\u00").append(Integer.toHexString(c));
- } else {
- builder.append(c);
- }
- }
- return builder.toString();
- }
-
- /**
- * A super simple representation of a JSON object.
- *
- *
This class only exists to make methods of the {@link JsonObjectBuilder} type-safe and not
- * allow a raw string inputs for methods like {@link JsonObjectBuilder#appendField(String,
- * JsonObject)}.
- */
- public static class JsonObject {
-
- private final String value;
-
- private JsonObject(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return value;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/straight8/rambeau/metrics/SpigotMetrics.java b/src/main/java/com/straight8/rambeau/metrics/SpigotMetrics.java
deleted file mode 100644
index 09e3b81..0000000
--- a/src/main/java/com/straight8/rambeau/metrics/SpigotMetrics.java
+++ /dev/null
@@ -1,847 +0,0 @@
-package com.straight8.rambeau.metrics;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-import java.util.logging.Level;
-import java.util.stream.Collectors;
-import java.util.zip.GZIPOutputStream;
-import javax.net.ssl.HttpsURLConnection;
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.java.JavaPlugin;
-
-public class SpigotMetrics {
-
- private final Plugin plugin;
- private final MetricsBase metricsBase;
-
- /**
- * Creates a new Metrics instance.
- *
- * @param plugin Your plugin instance.
- * @param serviceId The id of the service. It can be found at What is my plugin id?
- */
- public SpigotMetrics(JavaPlugin plugin, int serviceId) {
- 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);
- if (!config.isSet("serverUuid")) {
- config.addDefault("enabled", true);
- config.addDefault("serverUuid", UUID.randomUUID().toString());
- config.addDefault("logFailedRequests", false);
- config.addDefault("logSentData", false);
- config.addDefault("logResponseStatusText", false);
- // Inform the server owners about bStats
- config
- .options()
- .header(
- "bStats (https://bStats.org) collects some basic information for plugin authors, like how\n"
- + "many people use their plugin and their total player count. It's recommended to keep bStats\n"
- + "enabled, but if you're not comfortable with this, you can turn this setting off. There is no\n"
- + "performance penalty associated with having metrics enabled, and data sent to bStats is fully\n"
- + "anonymous.")
- .copyDefaults(true);
- try {
- config.save(configFile);
- } catch (IOException ignored) {
- }
- }
- // Load the data
- boolean enabled = config.getBoolean("enabled", true);
- String serverUUID = config.getString("serverUuid");
- boolean logErrors = config.getBoolean("logFailedRequests", false);
- boolean logSentData = config.getBoolean("logSentData", false);
- boolean logResponseStatusText = config.getBoolean("logResponseStatusText", false);
- metricsBase =
- new MetricsBase(
- "bukkit",
- serverUUID,
- serviceId,
- enabled,
- this::appendPlatformData,
- this::appendServiceData,
- submitDataTask -> Bukkit.getScheduler().runTask(plugin, submitDataTask),
- plugin::isEnabled,
- (message, error) -> this.plugin.getLogger().log(Level.WARNING, message, error),
- (message) -> this.plugin.getLogger().log(Level.INFO, message),
- logErrors,
- logSentData,
- logResponseStatusText);
- }
-
- /**
- * Adds a custom chart.
- *
- * @param chart The chart to add.
- */
- public void addCustomChart(CustomChart chart) {
- metricsBase.addCustomChart(chart);
- }
-
- private void appendPlatformData(JsonObjectBuilder builder) {
- builder.appendField("playerAmount", getPlayerAmount());
- builder.appendField("onlineMode", Bukkit.getOnlineMode() ? 1 : 0);
- builder.appendField("bukkitVersion", Bukkit.getVersion());
- builder.appendField("bukkitName", Bukkit.getName());
- builder.appendField("javaVersion", System.getProperty("java.version"));
- builder.appendField("osName", System.getProperty("os.name"));
- builder.appendField("osArch", System.getProperty("os.arch"));
- builder.appendField("osVersion", System.getProperty("os.version"));
- builder.appendField("coreCount", Runtime.getRuntime().availableProcessors());
- }
-
- private void appendServiceData(JsonObjectBuilder builder) {
- builder.appendField("pluginVersion", plugin.getDescription().getVersion());
- }
-
- private int getPlayerAmount() {
- try {
- // Around MC 1.8 the return type was changed from an array to a collection,
- // This fixes java.lang.NoSuchMethodError:
- // org.bukkit.Bukkit.getOnlinePlayers()Ljava/util/Collection;
- Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers");
- return onlinePlayersMethod.getReturnType().equals(Collection.class)
- ? ((Collection) onlinePlayersMethod.invoke(Bukkit.getServer())).size()
- : ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length;
- } catch (Exception e) {
- // Just use the new method if the reflection failed
- return Bukkit.getOnlinePlayers().size();
- }
- }
-
- public static class MetricsBase {
-
- /** The version of the Metrics class. */
- public static final String METRICS_VERSION = "2.2.1";
-
- private static final ScheduledExecutorService scheduler =
- Executors.newScheduledThreadPool(1, task -> new Thread(task, "bStats-Metrics"));
-
- private static final String REPORT_URL = "https://bStats.org/api/v2/data/%s";
-
- private final String platform;
-
- private final String serverUuid;
-
- private final int serviceId;
-
- private final Consumer appendPlatformDataConsumer;
-
- private final Consumer appendServiceDataConsumer;
-
- private final Consumer submitTaskConsumer;
-
- private final Supplier checkServiceEnabledSupplier;
-
- private final BiConsumer errorLogger;
-
- private final Consumer infoLogger;
-
- private final boolean logErrors;
-
- private final boolean logSentData;
-
- private final boolean logResponseStatusText;
-
- private final Set customCharts = new HashSet<>();
-
- private final boolean enabled;
-
- /**
- * Creates a new MetricsBase class instance.
- *
- * @param platform The platform of the service.
- * @param serviceId The id of the service.
- * @param serverUuid The server uuid.
- * @param enabled Whether or not data sending is enabled.
- * @param appendPlatformDataConsumer A consumer that receives a {@code JsonObjectBuilder} and
- * appends all platform-specific data.
- * @param appendServiceDataConsumer A consumer that receives a {@code JsonObjectBuilder} and
- * appends all service-specific data.
- * @param submitTaskConsumer A consumer that takes a runnable with the submit task. This can be
- * used to delegate the data collection to a another thread to prevent errors caused by
- * concurrency. Can be {@code null}.
- * @param checkServiceEnabledSupplier A supplier to check if the service is still enabled.
- * @param errorLogger A consumer that accepts log message and an error.
- * @param infoLogger A consumer that accepts info log messages.
- * @param logErrors Whether or not errors should be logged.
- * @param logSentData Whether or not the sent data should be logged.
- * @param logResponseStatusText Whether or not the response status text should be logged.
- */
- public MetricsBase(
- String platform,
- String serverUuid,
- int serviceId,
- boolean enabled,
- Consumer appendPlatformDataConsumer,
- Consumer appendServiceDataConsumer,
- Consumer submitTaskConsumer,
- Supplier checkServiceEnabledSupplier,
- BiConsumer errorLogger,
- Consumer infoLogger,
- boolean logErrors,
- boolean logSentData,
- boolean logResponseStatusText) {
- this.platform = platform;
- this.serverUuid = serverUuid;
- this.serviceId = serviceId;
- this.enabled = enabled;
- this.appendPlatformDataConsumer = appendPlatformDataConsumer;
- this.appendServiceDataConsumer = appendServiceDataConsumer;
- this.submitTaskConsumer = submitTaskConsumer;
- this.checkServiceEnabledSupplier = checkServiceEnabledSupplier;
- this.errorLogger = errorLogger;
- this.infoLogger = infoLogger;
- this.logErrors = logErrors;
- this.logSentData = logSentData;
- this.logResponseStatusText = logResponseStatusText;
- checkRelocation();
- if (enabled) {
- startSubmitting();
- }
- }
-
- public void addCustomChart(CustomChart chart) {
- this.customCharts.add(chart);
- }
-
- private void startSubmitting() {
- final Runnable submitTask =
- () -> {
- if (!enabled || !checkServiceEnabledSupplier.get()) {
- // Submitting data or service is disabled
- scheduler.shutdown();
- return;
- }
- if (submitTaskConsumer != null) {
- submitTaskConsumer.accept(this::submitData);
- } else {
- this.submitData();
- }
- };
- // Many servers tend to restart at a fixed time at xx:00 which causes an uneven distribution
- // of requests on the
- // bStats backend. To circumvent this problem, we introduce some randomness into the initial
- // and second delay.
- // WARNING: You must not modify and part of this Metrics class, including the submit delay or
- // frequency!
- // WARNING: Modifying this code will get your plugin banned on bStats. Just don't do it!
- long initialDelay = (long) (1000 * 60 * (3 + Math.random() * 3));
- long secondDelay = (long) (1000 * 60 * (Math.random() * 30));
- scheduler.schedule(submitTask, initialDelay, TimeUnit.MILLISECONDS);
- scheduler.scheduleAtFixedRate(
- submitTask, initialDelay + secondDelay, 1000 * 60 * 30, TimeUnit.MILLISECONDS);
- }
-
- private void submitData() {
- final JsonObjectBuilder baseJsonBuilder = new JsonObjectBuilder();
- appendPlatformDataConsumer.accept(baseJsonBuilder);
- final JsonObjectBuilder serviceJsonBuilder = new JsonObjectBuilder();
- appendServiceDataConsumer.accept(serviceJsonBuilder);
- JsonObjectBuilder.JsonObject[] chartData =
- customCharts.stream()
- .map(customChart -> customChart.getRequestJsonObject(errorLogger, logErrors))
- .filter(Objects::nonNull)
- .toArray(JsonObjectBuilder.JsonObject[]::new);
- serviceJsonBuilder.appendField("id", serviceId);
- serviceJsonBuilder.appendField("customCharts", chartData);
- baseJsonBuilder.appendField("service", serviceJsonBuilder.build());
- baseJsonBuilder.appendField("serverUUID", serverUuid);
- baseJsonBuilder.appendField("metricsVersion", METRICS_VERSION);
- JsonObjectBuilder.JsonObject data = baseJsonBuilder.build();
- scheduler.execute(
- () -> {
- try {
- // Send the data
- sendData(data);
- } catch (Exception e) {
- // Something went wrong! :(
- if (logErrors) {
- errorLogger.accept("Could not submit bStats metrics data", e);
- }
- }
- });
- }
-
- private void sendData(JsonObjectBuilder.JsonObject data) throws Exception {
- if (logSentData) {
- infoLogger.accept("Sent bStats metrics data: " + data.toString());
- }
- String url = String.format(REPORT_URL, platform);
- HttpsURLConnection connection = (HttpsURLConnection) new URL(url).openConnection();
- // Compress the data to save bandwidth
- byte[] compressedData = compress(data.toString());
- connection.setRequestMethod("POST");
- connection.addRequestProperty("Accept", "application/json");
- connection.addRequestProperty("Connection", "close");
- connection.addRequestProperty("Content-Encoding", "gzip");
- connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
- connection.setRequestProperty("Content-Type", "application/json");
- connection.setRequestProperty("User-Agent", "Metrics-Service/1");
- connection.setDoOutput(true);
- try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) {
- outputStream.write(compressedData);
- }
- StringBuilder builder = new StringBuilder();
- try (BufferedReader bufferedReader =
- new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
- String line;
- while ((line = bufferedReader.readLine()) != null) {
- builder.append(line);
- }
- }
- if (logResponseStatusText) {
- infoLogger.accept("Sent data to bStats and received response: " + builder);
- }
- }
-
- /** Checks that the class was properly relocated. */
- private void checkRelocation() {
- // You can use the property to disable the check in your test environment
- if (System.getProperty("bstats.relocatecheck") == null
- || !System.getProperty("bstats.relocatecheck").equals("false")) {
- // 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 no one just copy & pastes the example and uses the wrong package
- // names
- if (MetricsBase.class.getPackage().getName().startsWith(defaultPackage)
- || MetricsBase.class.getPackage().getName().startsWith(examplePackage)) {
- throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
- }
- }
- }
-
- /**
- * Gzips the given string.
- *
- * @param str The string to gzip.
- * @return The gzipped string.
- */
- private static byte[] compress(final String str) throws IOException {
- if (str == null) {
- return null;
- }
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- try (GZIPOutputStream gzip = new GZIPOutputStream(outputStream)) {
- gzip.write(str.getBytes(StandardCharsets.UTF_8));
- }
- return outputStream.toByteArray();
- }
- }
-
- 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 JsonObjectBuilder.JsonObject getChartData() throws Exception {
- JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
- 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) {
- // Skip this invalid
- continue;
- }
- allSkipped = false;
- valuesBuilder.appendField(entry.getKey(), entry.getValue());
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
- }
- }
-
- 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 JsonObjectBuilder.JsonObject getChartData() throws Exception {
- JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
- Map map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- for (Map.Entry entry : map.entrySet()) {
- valuesBuilder.appendField(entry.getKey(), new int[] {entry.getValue()});
- }
- return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
- }
- }
-
- 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 JsonObjectBuilder.JsonObject getChartData() throws Exception {
- JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
- 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) {
- // Skip this invalid
- continue;
- }
- allSkipped = false;
- valuesBuilder.appendField(entry.getKey(), entry.getValue());
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
- }
- }
-
- 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 JsonObjectBuilder.JsonObject getChartData() throws Exception {
- JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
- 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) {
- // Skip this invalid
- continue;
- }
- allSkipped = false;
- valuesBuilder.appendField(entry.getKey(), entry.getValue());
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
- }
- }
-
- public abstract static class CustomChart {
-
- private final String chartId;
-
- protected CustomChart(String chartId) {
- if (chartId == null) {
- throw new IllegalArgumentException("chartId must not be null");
- }
- this.chartId = chartId;
- }
-
- public JsonObjectBuilder.JsonObject getRequestJsonObject(
- BiConsumer errorLogger, boolean logErrors) {
- JsonObjectBuilder builder = new JsonObjectBuilder();
- builder.appendField("chartId", chartId);
- try {
- JsonObjectBuilder.JsonObject data = getChartData();
- if (data == null) {
- // If the data is null we don't send the chart.
- return null;
- }
- builder.appendField("data", data);
- } catch (Throwable t) {
- if (logErrors) {
- errorLogger.accept("Failed to get data for custom chart with id " + chartId, t);
- }
- return null;
- }
- return builder.build();
- }
-
- protected abstract JsonObjectBuilder.JsonObject getChartData() throws Exception;
- }
-
- 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 JsonObjectBuilder.JsonObject getChartData() throws Exception {
- int value = callable.call();
- if (value == 0) {
- // Null = skip the chart
- return null;
- }
- return new JsonObjectBuilder().appendField("value", value).build();
- }
- }
-
- 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 JsonObjectBuilder.JsonObject getChartData() throws Exception {
- String value = callable.call();
- if (value == null || value.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- return new JsonObjectBuilder().appendField("value", value).build();
- }
- }
-
- 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 JsonObjectBuilder.JsonObject getChartData() throws Exception {
- JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
- Map> map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- boolean reallyAllSkipped = true;
- for (Map.Entry> entryValues : map.entrySet()) {
- JsonObjectBuilder valueBuilder = new JsonObjectBuilder();
- boolean allSkipped = true;
- for (Map.Entry valueEntry : map.get(entryValues.getKey()).entrySet()) {
- valueBuilder.appendField(valueEntry.getKey(), valueEntry.getValue());
- allSkipped = false;
- }
- if (!allSkipped) {
- reallyAllSkipped = false;
- valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build());
- }
- }
- if (reallyAllSkipped) {
- // Null = skip the chart
- return null;
- }
- return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
- }
- }
-
- /**
- * An extremely simple JSON builder.
- *
- * While this class is neither feature-rich nor the most performant one, it's sufficient enough
- * for its use-case.
- */
- public static class JsonObjectBuilder {
-
- private StringBuilder builder = new StringBuilder();
-
- private boolean hasAtLeastOneField = false;
-
- public JsonObjectBuilder() {
- builder.append("{");
- }
-
- /**
- * Appends a null field to the JSON.
- *
- * @param key The key of the field.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendNull(String key) {
- appendFieldUnescaped(key, "null");
- return this;
- }
-
- /**
- * Appends a string field to the JSON.
- *
- * @param key The key of the field.
- * @param value The value of the field.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, String value) {
- if (value == null) {
- throw new IllegalArgumentException("JSON value must not be null");
- }
- appendFieldUnescaped(key, "\"" + escape(value) + "\"");
- return this;
- }
-
- /**
- * Appends an integer field to the JSON.
- *
- * @param key The key of the field.
- * @param value The value of the field.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, int value) {
- appendFieldUnescaped(key, String.valueOf(value));
- return this;
- }
-
- /**
- * Appends an object to the JSON.
- *
- * @param key The key of the field.
- * @param object The object.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, JsonObject object) {
- if (object == null) {
- throw new IllegalArgumentException("JSON object must not be null");
- }
- appendFieldUnescaped(key, object.toString());
- return this;
- }
-
- /**
- * Appends a string array to the JSON.
- *
- * @param key The key of the field.
- * @param values The string array.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, String[] values) {
- if (values == null) {
- throw new IllegalArgumentException("JSON values must not be null");
- }
- String escapedValues =
- Arrays.stream(values)
- .map(value -> "\"" + escape(value) + "\"")
- .collect(Collectors.joining(","));
- appendFieldUnescaped(key, "[" + escapedValues + "]");
- return this;
- }
-
- /**
- * Appends an integer array to the JSON.
- *
- * @param key The key of the field.
- * @param values The integer array.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, int[] values) {
- if (values == null) {
- throw new IllegalArgumentException("JSON values must not be null");
- }
- String escapedValues =
- Arrays.stream(values).mapToObj(String::valueOf).collect(Collectors.joining(","));
- appendFieldUnescaped(key, "[" + escapedValues + "]");
- return this;
- }
-
- /**
- * Appends an object array to the JSON.
- *
- * @param key The key of the field.
- * @param values The integer array.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, JsonObject[] values) {
- if (values == null) {
- throw new IllegalArgumentException("JSON values must not be null");
- }
- String escapedValues =
- Arrays.stream(values).map(JsonObject::toString).collect(Collectors.joining(","));
- appendFieldUnescaped(key, "[" + escapedValues + "]");
- return this;
- }
-
- /**
- * Appends a field to the object.
- *
- * @param key The key of the field.
- * @param escapedValue The escaped value of the field.
- */
- private void appendFieldUnescaped(String key, String escapedValue) {
- if (builder == null) {
- throw new IllegalStateException("JSON has already been built");
- }
- if (key == null) {
- throw new IllegalArgumentException("JSON key must not be null");
- }
- if (hasAtLeastOneField) {
- builder.append(",");
- }
- builder.append("\"").append(escape(key)).append("\":").append(escapedValue);
- hasAtLeastOneField = true;
- }
-
- /**
- * Builds the JSON string and invalidates this builder.
- *
- * @return The built JSON string.
- */
- public JsonObject build() {
- if (builder == null) {
- throw new IllegalStateException("JSON has already been built");
- }
- JsonObject object = new JsonObject(builder.append("}").toString());
- builder = null;
- return object;
- }
-
- /**
- * Escapes the given string like stated in https://www.ietf.org/rfc/rfc4627.txt.
- *
- *
This method escapes only the necessary characters '"', '\'. and '\u0000' - '\u001F'.
- * Compact escapes are not used (e.g., '\n' is escaped as "\u000a" and not as "\n").
- *
- * @param value The value to escape.
- * @return The escaped value.
- */
- private static String escape(String value) {
- final StringBuilder builder = new StringBuilder();
- for (int i = 0; i < value.length(); i++) {
- char c = value.charAt(i);
- if (c == '"') {
- builder.append("\\\"");
- } else if (c == '\\') {
- builder.append("\\\\");
- } else if (c <= '\u000F') {
- builder.append("\\u000").append(Integer.toHexString(c));
- } else if (c <= '\u001F') {
- builder.append("\\u00").append(Integer.toHexString(c));
- } else {
- builder.append(c);
- }
- }
- return builder.toString();
- }
-
- /**
- * A super simple representation of a JSON object.
- *
- *
This class only exists to make methods of the {@link JsonObjectBuilder} type-safe and not
- * allow a raw string inputs for methods like {@link JsonObjectBuilder#appendField(String,
- * JsonObject)}.
- */
- public static class JsonObject {
-
- private final String value;
-
- private JsonObject(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return value;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/straight8/rambeau/metrics/VelocityMetrics.java b/src/main/java/com/straight8/rambeau/metrics/VelocityMetrics.java
deleted file mode 100644
index 5c93f8f..0000000
--- a/src/main/java/com/straight8/rambeau/metrics/VelocityMetrics.java
+++ /dev/null
@@ -1,1026 +0,0 @@
-package com.straight8.rambeau.metrics;
-
-import com.google.inject.Inject;
-import com.velocitypowered.api.plugin.PluginContainer;
-import com.velocitypowered.api.plugin.PluginDescription;
-import com.velocitypowered.api.plugin.annotation.DataDirectory;
-import com.velocitypowered.api.proxy.ProxyServer;
-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.io.InputStreamReader;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.zip.GZIPOutputStream;
-import javax.net.ssl.HttpsURLConnection;
-
-import org.slf4j.Logger;
-
-public class VelocityMetrics {
-
- /** A factory to create new Metrics classes. */
- public static class Factory {
-
- private final ProxyServer server;
-
- private final Logger logger;
-
- private final Path dataDirectory;
-
- // The constructor is not meant to be called by the user.
- // The instance is created using Dependency Injection
- @Inject
- private Factory(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory) {
- this.server = server;
- this.logger = logger;
- this.dataDirectory = dataDirectory;
- }
-
- /**
- * Creates a new Metrics class.
- *
- * @param plugin The plugin instance.
- * @param serviceId The id of the service. It can be found at What is my plugin id?
- *
Not to be confused with Velocity's {@link PluginDescription#getId()} method!
- * @return A Metrics instance that can be used to register custom charts.
- *
The return value can be ignored, when you do not want to register custom charts.
- */
- public VelocityMetrics make(Object plugin, int serviceId) {
- return new VelocityMetrics(plugin, server, logger, dataDirectory, serviceId);
- }
- }
-
- private final PluginContainer pluginContainer;
-
- private final ProxyServer server;
-
- private MetricsBase metricsBase;
-
- private VelocityMetrics(Object plugin, ProxyServer server, Logger logger, Path dataDirectory, int serviceId) {
- pluginContainer =
- server
- .getPluginManager()
- .fromInstance(plugin)
- .orElseThrow(
- () -> new IllegalArgumentException("The provided instance is not a plugin"));
- this.server = server;
- File configFile = dataDirectory.getParent().resolve("bStats").resolve("config.txt").toFile();
- MetricsConfig config;
- try {
- config = new MetricsConfig(configFile, true);
- } catch (IOException e) {
- logger.error("Failed to create bStats config", e);
- return;
- }
- metricsBase =
- new MetricsBase(
- "velocity",
- config.getServerUUID(),
- serviceId,
- config.isEnabled(),
- this::appendPlatformData,
- this::appendServiceData,
- task -> server.getScheduler().buildTask(plugin, task).schedule(),
- () -> true,
- logger::warn,
- logger::info,
- config.isLogErrorsEnabled(),
- config.isLogSentDataEnabled(),
- config.isLogResponseStatusTextEnabled());
- if (!config.didExistBefore()) {
- // Send an info message when the bStats config file gets created for the first time
- logger.info(
- "Velocity and some of its plugins collect metrics and send them to bStats (https://bStats.org).");
- logger.info(
- "bStats collects some basic information for plugin authors, like how many people use");
- logger.info(
- "their plugin and their total player count. It's recommend to keep bStats enabled, but");
- logger.info(
- "if you're not comfortable with this, you can opt-out by editing the config.txt file in");
- logger.info("the '/plugins/bStats/' folder and setting enabled to false.");
- }
- }
-
- /**
- * Adds a custom chart.
- *
- * @param chart The chart to add.
- */
- public void addCustomChart(CustomChart chart) {
- if (metricsBase != null) {
- metricsBase.addCustomChart(chart);
- }
- }
-
- private void appendPlatformData(JsonObjectBuilder builder) {
- builder.appendField("playerAmount", server.getPlayerCount());
- builder.appendField("managedServers", server.getAllServers().size());
- builder.appendField("onlineMode", server.getConfiguration().isOnlineMode() ? 1 : 0);
- builder.appendField("velocityVersionVersion", server.getVersion().getVersion());
- builder.appendField("velocityVersionName", server.getVersion().getName());
- builder.appendField("velocityVersionVendor", server.getVersion().getVendor());
- builder.appendField("javaVersion", System.getProperty("java.version"));
- builder.appendField("osName", System.getProperty("os.name"));
- builder.appendField("osArch", System.getProperty("os.arch"));
- builder.appendField("osVersion", System.getProperty("os.version"));
- builder.appendField("coreCount", Runtime.getRuntime().availableProcessors());
- }
-
- private void appendServiceData(JsonObjectBuilder builder) {
- builder.appendField(
- "pluginVersion", pluginContainer.getDescription().getVersion().orElse("unknown"));
- }
-
- public static class MetricsBase {
-
- /** The version of the Metrics class. */
- public static final String METRICS_VERSION = "2.2.1";
-
- private static final ScheduledExecutorService scheduler =
- Executors.newScheduledThreadPool(1, task -> new Thread(task, "bStats-Metrics"));
-
- private static final String REPORT_URL = "https://bStats.org/api/v2/data/%s";
-
- private final String platform;
-
- private final String serverUuid;
-
- private final int serviceId;
-
- private final Consumer appendPlatformDataConsumer;
-
- private final Consumer appendServiceDataConsumer;
-
- private final Consumer submitTaskConsumer;
-
- private final Supplier checkServiceEnabledSupplier;
-
- private final BiConsumer errorLogger;
-
- private final Consumer infoLogger;
-
- private final boolean logErrors;
-
- private final boolean logSentData;
-
- private final boolean logResponseStatusText;
-
- private final Set customCharts = new HashSet<>();
-
- private final boolean enabled;
-
- /**
- * Creates a new MetricsBase class instance.
- *
- * @param platform The platform of the service.
- * @param serviceId The id of the service.
- * @param serverUuid The server uuid.
- * @param enabled Whether or not data sending is enabled.
- * @param appendPlatformDataConsumer A consumer that receives a {@code JsonObjectBuilder} and
- * appends all platform-specific data.
- * @param appendServiceDataConsumer A consumer that receives a {@code JsonObjectBuilder} and
- * appends all service-specific data.
- * @param submitTaskConsumer A consumer that takes a runnable with the submit task. This can be
- * used to delegate the data collection to a another thread to prevent errors caused by
- * concurrency. Can be {@code null}.
- * @param checkServiceEnabledSupplier A supplier to check if the service is still enabled.
- * @param errorLogger A consumer that accepts log message and an error.
- * @param infoLogger A consumer that accepts info log messages.
- * @param logErrors Whether or not errors should be logged.
- * @param logSentData Whether or not the sent data should be logged.
- * @param logResponseStatusText Whether or not the response status text should be logged.
- */
- public MetricsBase(
- String platform,
- String serverUuid,
- int serviceId,
- boolean enabled,
- Consumer appendPlatformDataConsumer,
- Consumer appendServiceDataConsumer,
- Consumer submitTaskConsumer,
- Supplier checkServiceEnabledSupplier,
- BiConsumer errorLogger,
- Consumer infoLogger,
- boolean logErrors,
- boolean logSentData,
- boolean logResponseStatusText) {
- this.platform = platform;
- this.serverUuid = serverUuid;
- this.serviceId = serviceId;
- this.enabled = enabled;
- this.appendPlatformDataConsumer = appendPlatformDataConsumer;
- this.appendServiceDataConsumer = appendServiceDataConsumer;
- this.submitTaskConsumer = submitTaskConsumer;
- this.checkServiceEnabledSupplier = checkServiceEnabledSupplier;
- this.errorLogger = errorLogger;
- this.infoLogger = infoLogger;
- this.logErrors = logErrors;
- this.logSentData = logSentData;
- this.logResponseStatusText = logResponseStatusText;
- checkRelocation();
- if (enabled) {
- startSubmitting();
- }
- }
-
- public void addCustomChart(CustomChart chart) {
- this.customCharts.add(chart);
- }
-
- private void startSubmitting() {
- final Runnable submitTask =
- () -> {
- if (!enabled || !checkServiceEnabledSupplier.get()) {
- // Submitting data or service is disabled
- scheduler.shutdown();
- return;
- }
- if (submitTaskConsumer != null) {
- submitTaskConsumer.accept(this::submitData);
- } else {
- this.submitData();
- }
- };
- // Many servers tend to restart at a fixed time at xx:00 which causes an uneven distribution
- // of requests on the
- // bStats backend. To circumvent this problem, we introduce some randomness into the initial
- // and second delay.
- // WARNING: You must not modify and part of this Metrics class, including the submit delay or
- // frequency!
- // WARNING: Modifying this code will get your plugin banned on bStats. Just don't do it!
- long initialDelay = (long) (1000 * 60 * (3 + Math.random() * 3));
- long secondDelay = (long) (1000 * 60 * (Math.random() * 30));
- scheduler.schedule(submitTask, initialDelay, TimeUnit.MILLISECONDS);
- scheduler.scheduleAtFixedRate(
- submitTask, initialDelay + secondDelay, 1000 * 60 * 30, TimeUnit.MILLISECONDS);
- }
-
- private void submitData() {
- final JsonObjectBuilder baseJsonBuilder = new JsonObjectBuilder();
- appendPlatformDataConsumer.accept(baseJsonBuilder);
- final JsonObjectBuilder serviceJsonBuilder = new JsonObjectBuilder();
- appendServiceDataConsumer.accept(serviceJsonBuilder);
- JsonObjectBuilder.JsonObject[] chartData =
- customCharts.stream()
- .map(customChart -> customChart.getRequestJsonObject(errorLogger, logErrors))
- .filter(Objects::nonNull)
- .toArray(JsonObjectBuilder.JsonObject[]::new);
- serviceJsonBuilder.appendField("id", serviceId);
- serviceJsonBuilder.appendField("customCharts", chartData);
- baseJsonBuilder.appendField("service", serviceJsonBuilder.build());
- baseJsonBuilder.appendField("serverUUID", serverUuid);
- baseJsonBuilder.appendField("metricsVersion", METRICS_VERSION);
- JsonObjectBuilder.JsonObject data = baseJsonBuilder.build();
- scheduler.execute(
- () -> {
- try {
- // Send the data
- sendData(data);
- } catch (Exception e) {
- // Something went wrong! :(
- if (logErrors) {
- errorLogger.accept("Could not submit bStats metrics data", e);
- }
- }
- });
- }
-
- private void sendData(JsonObjectBuilder.JsonObject data) throws Exception {
- if (logSentData) {
- infoLogger.accept("Sent bStats metrics data: " + data.toString());
- }
- String url = String.format(REPORT_URL, platform);
- HttpsURLConnection connection = (HttpsURLConnection) new URL(url).openConnection();
- // Compress the data to save bandwidth
- byte[] compressedData = compress(data.toString());
- connection.setRequestMethod("POST");
- connection.addRequestProperty("Accept", "application/json");
- connection.addRequestProperty("Connection", "close");
- connection.addRequestProperty("Content-Encoding", "gzip");
- connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
- connection.setRequestProperty("Content-Type", "application/json");
- connection.setRequestProperty("User-Agent", "Metrics-Service/1");
- connection.setDoOutput(true);
- try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) {
- outputStream.write(compressedData);
- }
- StringBuilder builder = new StringBuilder();
- try (BufferedReader bufferedReader =
- new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
- String line;
- while ((line = bufferedReader.readLine()) != null) {
- builder.append(line);
- }
- }
- if (logResponseStatusText) {
- infoLogger.accept("Sent data to bStats and received response: " + builder);
- }
- }
-
- /** Checks that the class was properly relocated. */
- private void checkRelocation() {
- // You can use the property to disable the check in your test environment
- if (System.getProperty("bstats.relocatecheck") == null
- || !System.getProperty("bstats.relocatecheck").equals("false")) {
- // 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 no one just copy & pastes the example and uses the wrong package
- // names
- if (MetricsBase.class.getPackage().getName().startsWith(defaultPackage)
- || MetricsBase.class.getPackage().getName().startsWith(examplePackage)) {
- throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
- }
- }
- }
-
- /**
- * Gzips the given string.
- *
- * @param str The string to gzip.
- * @return The gzipped string.
- */
- private static byte[] compress(final String str) throws IOException {
- if (str == null) {
- return null;
- }
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- try (GZIPOutputStream gzip = new GZIPOutputStream(outputStream)) {
- gzip.write(str.getBytes(StandardCharsets.UTF_8));
- }
- return outputStream.toByteArray();
- }
- }
-
- 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 JsonObjectBuilder.JsonObject getChartData() throws Exception {
- JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
- 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) {
- // Skip this invalid
- continue;
- }
- allSkipped = false;
- valuesBuilder.appendField(entry.getKey(), entry.getValue());
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
- }
- }
-
- 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 JsonObjectBuilder.JsonObject getChartData() throws Exception {
- JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
- Map map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- for (Map.Entry entry : map.entrySet()) {
- valuesBuilder.appendField(entry.getKey(), new int[] {entry.getValue()});
- }
- return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
- }
- }
-
- 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 JsonObjectBuilder.JsonObject getChartData() throws Exception {
- JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
- 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) {
- // Skip this invalid
- continue;
- }
- allSkipped = false;
- valuesBuilder.appendField(entry.getKey(), entry.getValue());
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
- }
- }
-
- 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 JsonObjectBuilder.JsonObject getChartData() throws Exception {
- JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
- 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) {
- // Skip this invalid
- continue;
- }
- allSkipped = false;
- valuesBuilder.appendField(entry.getKey(), entry.getValue());
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
- }
- }
-
- public abstract static class CustomChart {
-
- private final String chartId;
-
- protected CustomChart(String chartId) {
- if (chartId == null) {
- throw new IllegalArgumentException("chartId must not be null");
- }
- this.chartId = chartId;
- }
-
- public JsonObjectBuilder.JsonObject getRequestJsonObject(
- BiConsumer errorLogger, boolean logErrors) {
- JsonObjectBuilder builder = new JsonObjectBuilder();
- builder.appendField("chartId", chartId);
- try {
- JsonObjectBuilder.JsonObject data = getChartData();
- if (data == null) {
- // If the data is null we don't send the chart.
- return null;
- }
- builder.appendField("data", data);
- } catch (Throwable t) {
- if (logErrors) {
- errorLogger.accept("Failed to get data for custom chart with id " + chartId, t);
- }
- return null;
- }
- return builder.build();
- }
-
- protected abstract JsonObjectBuilder.JsonObject getChartData() throws Exception;
- }
-
- 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 JsonObjectBuilder.JsonObject getChartData() throws Exception {
- int value = callable.call();
- if (value == 0) {
- // Null = skip the chart
- return null;
- }
- return new JsonObjectBuilder().appendField("value", value).build();
- }
- }
-
- 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 JsonObjectBuilder.JsonObject getChartData() throws Exception {
- String value = callable.call();
- if (value == null || value.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- return new JsonObjectBuilder().appendField("value", value).build();
- }
- }
-
- 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 JsonObjectBuilder.JsonObject getChartData() throws Exception {
- JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
- Map> map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- boolean reallyAllSkipped = true;
- for (Map.Entry> entryValues : map.entrySet()) {
- JsonObjectBuilder valueBuilder = new JsonObjectBuilder();
- boolean allSkipped = true;
- for (Map.Entry valueEntry : map.get(entryValues.getKey()).entrySet()) {
- valueBuilder.appendField(valueEntry.getKey(), valueEntry.getValue());
- allSkipped = false;
- }
- if (!allSkipped) {
- reallyAllSkipped = false;
- valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build());
- }
- }
- if (reallyAllSkipped) {
- // Null = skip the chart
- return null;
- }
- return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
- }
- }
-
- /**
- * An extremely simple JSON builder.
- *
- * While this class is neither feature-rich nor the most performant one, it's sufficient enough
- * for its use-case.
- */
- public static class JsonObjectBuilder {
-
- private StringBuilder builder = new StringBuilder();
-
- private boolean hasAtLeastOneField = false;
-
- public JsonObjectBuilder() {
- builder.append("{");
- }
-
- /**
- * Appends a null field to the JSON.
- *
- * @param key The key of the field.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendNull(String key) {
- appendFieldUnescaped(key, "null");
- return this;
- }
-
- /**
- * Appends a string field to the JSON.
- *
- * @param key The key of the field.
- * @param value The value of the field.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, String value) {
- if (value == null) {
- throw new IllegalArgumentException("JSON value must not be null");
- }
- appendFieldUnescaped(key, "\"" + escape(value) + "\"");
- return this;
- }
-
- /**
- * Appends an integer field to the JSON.
- *
- * @param key The key of the field.
- * @param value The value of the field.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, int value) {
- appendFieldUnescaped(key, String.valueOf(value));
- return this;
- }
-
- /**
- * Appends an object to the JSON.
- *
- * @param key The key of the field.
- * @param object The object.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, JsonObject object) {
- if (object == null) {
- throw new IllegalArgumentException("JSON object must not be null");
- }
- appendFieldUnescaped(key, object.toString());
- return this;
- }
-
- /**
- * Appends a string array to the JSON.
- *
- * @param key The key of the field.
- * @param values The string array.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, String[] values) {
- if (values == null) {
- throw new IllegalArgumentException("JSON values must not be null");
- }
- String escapedValues =
- Arrays.stream(values)
- .map(value -> "\"" + escape(value) + "\"")
- .collect(Collectors.joining(","));
- appendFieldUnescaped(key, "[" + escapedValues + "]");
- return this;
- }
-
- /**
- * Appends an integer array to the JSON.
- *
- * @param key The key of the field.
- * @param values The integer array.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, int[] values) {
- if (values == null) {
- throw new IllegalArgumentException("JSON values must not be null");
- }
- String escapedValues =
- Arrays.stream(values).mapToObj(String::valueOf).collect(Collectors.joining(","));
- appendFieldUnescaped(key, "[" + escapedValues + "]");
- return this;
- }
-
- /**
- * Appends an object array to the JSON.
- *
- * @param key The key of the field.
- * @param values The integer array.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, JsonObject[] values) {
- if (values == null) {
- throw new IllegalArgumentException("JSON values must not be null");
- }
- String escapedValues =
- Arrays.stream(values).map(JsonObject::toString).collect(Collectors.joining(","));
- appendFieldUnescaped(key, "[" + escapedValues + "]");
- return this;
- }
-
- /**
- * Appends a field to the object.
- *
- * @param key The key of the field.
- * @param escapedValue The escaped value of the field.
- */
- private void appendFieldUnescaped(String key, String escapedValue) {
- if (builder == null) {
- throw new IllegalStateException("JSON has already been built");
- }
- if (key == null) {
- throw new IllegalArgumentException("JSON key must not be null");
- }
- if (hasAtLeastOneField) {
- builder.append(",");
- }
- builder.append("\"").append(escape(key)).append("\":").append(escapedValue);
- hasAtLeastOneField = true;
- }
-
- /**
- * Builds the JSON string and invalidates this builder.
- *
- * @return The built JSON string.
- */
- public JsonObject build() {
- if (builder == null) {
- throw new IllegalStateException("JSON has already been built");
- }
- JsonObject object = new JsonObject(builder.append("}").toString());
- builder = null;
- return object;
- }
-
- /**
- * Escapes the given string like stated in https://www.ietf.org/rfc/rfc4627.txt.
- *
- *
This method escapes only the necessary characters '"', '\'. and '\u0000' - '\u001F'.
- * Compact escapes are not used (e.g., '\n' is escaped as "\u000a" and not as "\n").
- *
- * @param value The value to escape.
- * @return The escaped value.
- */
- private static String escape(String value) {
- final StringBuilder builder = new StringBuilder();
- for (int i = 0; i < value.length(); i++) {
- char c = value.charAt(i);
- if (c == '"') {
- builder.append("\\\"");
- } else if (c == '\\') {
- builder.append("\\\\");
- } else if (c <= '\u000F') {
- builder.append("\\u000").append(Integer.toHexString(c));
- } else if (c <= '\u001F') {
- builder.append("\\u00").append(Integer.toHexString(c));
- } else {
- builder.append(c);
- }
- }
- return builder.toString();
- }
-
- /**
- * A super simple representation of a JSON object.
- *
- *
This class only exists to make methods of the {@link JsonObjectBuilder} type-safe and not
- * allow a raw string inputs for methods like {@link JsonObjectBuilder#appendField(String,
- * JsonObject)}.
- */
- public static class JsonObject {
-
- private final String value;
-
- private JsonObject(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return value;
- }
- }
- }
-
- /**
- * A simple config for bStats.
- *
- *
This class is not used by every platform.
- */
- public static class MetricsConfig {
-
- private final File file;
-
- private final boolean defaultEnabled;
-
- private String serverUUID;
-
- private boolean enabled;
-
- private boolean logErrors;
-
- private boolean logSentData;
-
- private boolean logResponseStatusText;
-
- private boolean didExistBefore = true;
-
- public MetricsConfig(File file, boolean defaultEnabled) throws IOException {
- this.file = file;
- this.defaultEnabled = defaultEnabled;
- setupConfig();
- }
-
- public String getServerUUID() {
- return serverUUID;
- }
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public boolean isLogErrorsEnabled() {
- return logErrors;
- }
-
- public boolean isLogSentDataEnabled() {
- return logSentData;
- }
-
- public boolean isLogResponseStatusTextEnabled() {
- return logResponseStatusText;
- }
-
- /**
- * Checks whether the config file did exist before or not.
- *
- * @return If the config did exist before.
- */
- public boolean didExistBefore() {
- return didExistBefore;
- }
-
- /** Creates the config file if it does not exist and read its content. */
- private void setupConfig() throws IOException {
- if (!file.exists()) {
- // Looks like it's the first time we create it (or someone deleted it).
- didExistBefore = false;
- writeConfig();
- }
- readConfig();
- if (serverUUID == null) {
- // Found a malformed config file with no UUID. Let's recreate it.
- writeConfig();
- readConfig();
- }
- }
-
- /** Creates a config file with teh default content. */
- private void writeConfig() throws IOException {
- List configContent = new ArrayList<>();
- configContent.add(
- "# bStats (https://bStats.org) collects some basic information for plugin authors, like");
- configContent.add(
- "# how many people use their plugin and their total player count. It's recommended to keep");
- configContent.add(
- "# bStats enabled, but if you're not comfortable with this, you can turn this setting off.");
- configContent.add(
- "# There is no performance penalty associated with having metrics enabled, and data sent to");
- configContent.add("# bStats is fully anonymous.");
- configContent.add("enabled=" + defaultEnabled);
- configContent.add("server-uuid=" + UUID.randomUUID());
- configContent.add("log-errors=false");
- configContent.add("log-sent-data=false");
- configContent.add("log-response-status-text=false");
- writeFile(file, configContent);
- }
-
- /** Reads the content of the config file. */
- private void readConfig() throws IOException {
- List lines = readFile(file);
- if (lines == null) {
- throw new AssertionError("Content of newly created file is null");
- }
- enabled = getConfigValue("enabled", lines).map("true"::equals).orElse(true);
- serverUUID = getConfigValue("server-uuid", lines).orElse(null);
- logErrors = getConfigValue("log-errors", lines).map("true"::equals).orElse(false);
- logSentData = getConfigValue("log-sent-data", lines).map("true"::equals).orElse(false);
- logResponseStatusText =
- getConfigValue("log-response-status-text", lines).map("true"::equals).orElse(false);
- }
-
- /**
- * Gets a config setting from the given list of lines of the file.
- *
- * @param key The key for the setting.
- * @param lines The lines of the file.
- * @return The value of the setting.
- */
- private Optional getConfigValue(String key, List lines) {
- return lines.stream()
- .filter(line -> line.startsWith(key + "="))
- .map(line -> line.replaceFirst(Pattern.quote(key + "="), ""))
- .findFirst();
- }
-
- /**
- * Reads the text content of the given file.
- *
- * @param file The file to read.
- * @return The lines of the given file.
- */
- private List readFile(File file) throws IOException {
- if (!file.exists()) {
- return null;
- }
- try (FileReader fileReader = new FileReader(file);
- BufferedReader bufferedReader = new BufferedReader(fileReader)) {
- return bufferedReader.lines().collect(Collectors.toList());
- }
- }
-
- /**
- * Writes the given lines to the given file.
- *
- * @param file The file to write to.
- * @param lines The lines to write.
- */
- private void writeFile(File file, List lines) throws IOException {
- if (!file.exists()) {
- file.getParentFile().mkdirs();
- file.createNewFile();
- }
- try (FileWriter fileWriter = new FileWriter(file);
- BufferedWriter bufferedWriter = new BufferedWriter(fileWriter)) {
- for (String line : lines) {
- bufferedWriter.write(line);
- bufferedWriter.newLine();
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/straight8/rambeau/util/CommandPageUtils.java b/src/main/java/com/straight8/rambeau/util/CommandPageUtils.java
index 68c24ec..02430d8 100644
--- a/src/main/java/com/straight8/rambeau/util/CommandPageUtils.java
+++ b/src/main/java/com/straight8/rambeau/util/CommandPageUtils.java
@@ -3,13 +3,14 @@
import java.util.ArrayList;
import java.util.List;
import java.util.function.Function;
+import org.jspecify.annotations.NonNull;
public final class CommandPageUtils {
private CommandPageUtils() {
}
- public static final boolean isInteger(String str) {
+ public static boolean isInteger(String str) {
try {
Integer.valueOf(str);
return true;
@@ -18,7 +19,7 @@ public static final boolean isInteger(String str) {
}
}
- public static final List getNextInteger(String argument, int maxPage) {
+ public static @NonNull List getNextInteger(@NonNull String argument, int maxPage) {
List options = new ArrayList<>();
int curNr;
if (argument.isEmpty()) {
@@ -26,7 +27,7 @@ public static final List getNextInteger(String argument, int maxPage) {
} else if (!isInteger(argument)) {
return options;
} else {
- curNr = Integer.valueOf(argument);
+ curNr = Integer.parseInt(argument);
}
if (curNr * 10 > maxPage) {
return options;
@@ -42,7 +43,7 @@ public static final List getNextInteger(String argument, int maxPage) {
return options;
}
- public static List getPage(List items, int page, int perPage) {
+ public static @NonNull List getPage(@NonNull List items, int page, int perPage) {
page = page - 1; // 0-starting page
List list = new ArrayList<>();
int startItem = page * perPage;
@@ -56,14 +57,14 @@ public static List getPage(List items, int page, int perPage) {
return list;
}
- public static final String getSpacingFor(String name, int maxLength, boolean isPlayer) {
+ public static @NonNull String getSpacingFor(String name, int maxLength, boolean isPlayer) {
if (isPlayer) {
return " ";
}
return " ".repeat(maxLength - name.length());
}
- public static final int getMaxNameLength(Function nameGetter, List plugins) {
+ public static int getMaxNameLength(Function nameGetter, @NonNull List plugins) {
List names = new ArrayList<>();
for (T plugin : plugins) {
names.add(nameGetter.apply(plugin));
@@ -71,7 +72,7 @@ public static final int getMaxNameLength(Function nameGetter, Lis
return getMaxNameLength(names);
}
- public static final int getMaxNameLength(List pluginNames) {
+ public static int getMaxNameLength(@NonNull List pluginNames) {
int len = 0;
for (String name : pluginNames) {
if (name.length() > len) {
@@ -80,5 +81,4 @@ public static final int getMaxNameLength(List pluginNames) {
}
return len + 1;
}
-
}
diff --git a/src/main/java/com/straight8/rambeau/util/StringUtil.java b/src/main/java/com/straight8/rambeau/util/StringUtil.java
deleted file mode 100644
index 791ea70..0000000
--- a/src/main/java/com/straight8/rambeau/util/StringUtil.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.straight8.rambeau.util;
-
-import java.util.Collection;
-
-public final class StringUtil {
-
- private StringUtil() {
- }
-
- // THE FOLLOWING TWO METHODS ARE COPIED FROM bukkit:
- // https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/browse/src/main/java/org/bukkit/util/StringUtil.java
- // copied on 24.03.2023
- /**
- * Copies all elements from the iterable collection of originals to the
- * collection provided.
- *
- * @param the collection of strings
- * @param token String to search for
- * @param originals An iterable collection of strings to filter.
- * @param collection The collection to add matches to
- * @return the collection provided that would have the elements copied
- * into
- * @throws UnsupportedOperationException if the collection is immutable
- * and originals contains a string which
- * starts with the specified
- * search string.
- * @throws IllegalArgumentException if originals contains a null element.
- * Note: the collection may be modified
- * before this is thrown
- */
- public static > T copyPartialMatches(final String token,
- final Iterable originals, final T collection)
- throws UnsupportedOperationException, IllegalArgumentException {
- for (String string : originals) {
- if (startsWithIgnoreCase(string, token)) {
- collection.add(string);
- }
- }
-
- return collection;
- }
-
- /**
- * This method uses a region to check case-insensitive equality. This
- * means the internal array does not need to be copied like a
- * toLowerCase() call would.
- *
- * @param string String to check
- * @param prefix Prefix of string to compare
- * @return true if provided string starts with, ignoring case, the prefix
- * provided
- * @throws IllegalArgumentException if string is null
- */
- public static boolean startsWithIgnoreCase(final String string, final String prefix)
- throws IllegalArgumentException, NullPointerException {
- if (string.length() < prefix.length()) {
- return false;
- }
- return string.regionMatches(true, 0, prefix, 0, prefix.length());
- }
-
-}
diff --git a/src/main/java/com/straight8/rambeau/velocity/PluginComparator.java b/src/main/java/com/straight8/rambeau/velocity/PluginComparator.java
deleted file mode 100644
index 3208cc0..0000000
--- a/src/main/java/com/straight8/rambeau/velocity/PluginComparator.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.straight8.rambeau.velocity;
-
-import com.velocitypowered.api.plugin.PluginContainer;
-
-import java.util.Comparator;
-
-public class PluginComparator implements Comparator {
-
- @Override
- public int compare(PluginContainer p1, PluginContainer p2) {
- if (!(p1 instanceof PluginContainer) || !(p2 instanceof PluginContainer)) {
- throw new ClassCastException();
- }
-
- String name1;
- String name2;
-
- if(p1.getDescription().getName().isPresent()) {
- name1 = p1.getDescription().getName().get();
- } else if(p1.getDescription().getId().equalsIgnoreCase("serverlistplus")) {
- name1 = SLPUtils.getSLPName();
- } else {
- name1 = "";
- }
-
- if(p2.getDescription().getName().isPresent()) {
- name2 = p2.getDescription().getName().get();
- } else if(p2.getDescription().getId().equalsIgnoreCase("serverlistplus")) {
- name2 = SLPUtils.getSLPName();
- } else {
- name2 = "";
- }
-
- if(name1 != null && name2 != null) {
- return name1.compareToIgnoreCase(name2);
- }
- return -1;
- }
-}
diff --git a/src/main/java/com/straight8/rambeau/velocity/PluginVersionsCmd.java b/src/main/java/com/straight8/rambeau/velocity/PluginVersionsCmd.java
deleted file mode 100644
index 7624e59..0000000
--- a/src/main/java/com/straight8/rambeau/velocity/PluginVersionsCmd.java
+++ /dev/null
@@ -1,246 +0,0 @@
-package com.straight8.rambeau.velocity;
-
-import com.straight8.rambeau.util.CommandPageUtils;
-import com.straight8.rambeau.util.StringUtil;
-import com.velocitypowered.api.command.CommandSource;
-import com.velocitypowered.api.command.RawCommand;
-import com.velocitypowered.api.plugin.PluginContainer;
-import com.velocitypowered.api.proxy.Player;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.JoinConfiguration;
-import net.kyori.adventure.text.format.NamedTextColor;
-import net.kyori.adventure.text.format.TextColor;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-public class PluginVersionsCmd implements RawCommand {
- private static final int LINES_PER_PAGE = 10;
-
- private final PluginVersionsVelocity plugin;
-
- public PluginVersionsCmd(PluginVersionsVelocity plugin) {
- this.plugin = plugin;
- }
-
- private void showUsage(Invocation invocation) {
- CommandSource source = invocation.source();
- StringBuilder sb = new StringBuilder();
- if (source.hasPermission("pluginversions.list")) {
- sb.append("/pvv list [page]");
- }
- if (source.hasPermission("pluginversions.reload")) {
- if (sb.length() > 1) {
- sb.append("\n");
- }
- sb.append("/pvv reload");
- }
- source.sendMessage(Component.text(sb.toString()));
- }
-
- @Override
- public void execute(Invocation invocation) {
- CommandSource sender = invocation.source();
- // Get the arguments after the command alias
- String[] args = invocation.arguments().split(" ");
-
- if (args.length == 0 || args[0].isEmpty()) {
- showUsage(invocation);
- return;
- }
- String cmdLowercase = args[0].toLowerCase();
-
- if (sender instanceof Player) {
- if (!sender.hasPermission("pluginversions." + cmdLowercase)) {
- String senderName = ((Player) sender).getUsername();
- sender.sendMessage(Component.text("You do not have permission to run this command"));
- this.plugin
- .log(senderName + " attempted to run command pv " + cmdLowercase + ", but lacked permissions");
- return;
- }
- }
-
- if (cmdLowercase.equals("list")) {
- List pluginList = new ArrayList<>(this.plugin.getServer().getPluginManager().getPlugins());
-
- if (pluginList.isEmpty()) {
- sender.sendMessage(Component.text("No plugins loaded"));
- return;
- }
-
- pluginList.sort(new PluginComparator());
-
- // Identify the page to display. Page 0 indicates the entire list.
- int page = 0;
- if (args.length > 1) {
- try {
- page = Integer.parseInt(args[1]);
- } catch (Exception ignored) {
- }
- }
- // Set page to 0 if illegal page was requested
- page = Math.max(page, 0);
-
- if (page > 0) {
- if (((page - 1) * LINES_PER_PAGE) < pluginList.size()) {
- String msg = plugin.getConfig().getString("page-header-format",
- "PluginVersions ===== page {page} =====");
- sender.sendMessage(Color.color(msg.replace("{page}", String.valueOf(page))));
- }
- int maxSpacing = CommandPageUtils.getMaxNameLength(plugin -> {
- Optional name = plugin.getDescription().getName();
- return name.isPresent() ? name.get() : "N/A";
- }, CommandPageUtils.getPage(pluginList, page, LINES_PER_PAGE));
- for (int i = ((page - 1) * LINES_PER_PAGE); i < pluginList.size() && i < (page * LINES_PER_PAGE); i++) {
- PluginContainer p = pluginList.get(i);
-
- String msg = plugin.getConfig().getString("enabled-version-format", "&a{name}{spacing}&e{version}");
- String spacing = CommandPageUtils.getSpacingFor(p.getDescription().getName().get(), maxSpacing,
- sender instanceof Player);
- if (p.getDescription().getName().isPresent() && p.getDescription().getVersion().isPresent()) {
- Component comp = Color
- .color(msg.replace("{name}", p.getDescription().getName().get()).replace("{version}",
- p.getDescription().getVersion().get()).replace("{spacing}", spacing));
- sender.sendMessage(comp);
- } else if (p.getDescription().getId().equalsIgnoreCase("serverlistplus")) {
- Component comp = Color.color(msg.replace("{name}", SLPUtils.getSLPName()).replace("{version}",
- SLPUtils.getSLPVersion()).replace("{spacing}", spacing));
- sender.sendMessage(comp);
- }
- }
- } else {
- int maxSpacing = CommandPageUtils.getMaxNameLength(plugin -> {
- Optional name = plugin.getDescription().getName();
- return name.isPresent() ? name.get() : "N/A";
- }, pluginList);
- for (PluginContainer p : pluginList) {
- String msg = plugin.getConfig().getString("enabled-version-format", "&a{name}{spacing}&e{version}");
- String spacing = CommandPageUtils.getSpacingFor(p.getDescription().getName().get(), maxSpacing,
- sender instanceof Player);
- if (p.getDescription().getName().isPresent() && p.getDescription().getVersion().isPresent()) {
- Component comp = Color
- .color(msg.replace("{name}", p.getDescription().getName().get()).replace("{version}",
- p.getDescription().getVersion().get()).replace("{spacing}", spacing));
- sender.sendMessage(comp);
- } else if (p.getDescription().getId().equalsIgnoreCase("serverlistplus")) {
- Component comp = Color
- .color(msg.replace("{name}", p.getDescription().getName().get()).replace("{version}",
- p.getDescription().getVersion().get()).replace("{spacing}", spacing));
- sender.sendMessage(comp);
- }
- }
- }
- // break;
- } else if (cmdLowercase.equals("reload")) {
- YamlConfig.createFiles("config");
- PluginVersionsVelocity.getInstance().ReadConfigValuesFromFile();
-
- sender.sendMessage(Component.text("Reloaded §bPluginVersions/config.yml"));
- } else {
- sender.sendMessage(Component.text("Unrecognized command option " + cmdLowercase));
- }
- }
-
- @Override
- public List suggest(Invocation invocation) {
- String[] args = invocation.arguments().split(" ");
- if ((args.length == 1 && !invocation.arguments().endsWith(" "))
- || (args.length == 0 && invocation.arguments().endsWith(" "))) {
- List options = new ArrayList<>();
- if (invocation.source().hasPermission("pluginversions.list")) {
- options.add("list");
- }
- if (invocation.source().hasPermission("pluginversions.reload")) {
- options.add("relaod");
- }
- if (args.length < 1) {
- return options;
- }
- return StringUtil.copyPartialMatches(args[0], options, new ArrayList<>());
- } else if (args[0].equalsIgnoreCase("list") && ((args.length == 2 && !invocation.arguments().endsWith(" ")) ||
- args.length == 1 && invocation.arguments().endsWith(" "))) {
- String arg = args.length == 2 ? args[1] : "";
- return CommandPageUtils.getNextInteger(arg,
- (plugin.getServer().getPluginManager().getPlugins().size() + LINES_PER_PAGE - 1) / LINES_PER_PAGE);
- } else {
- return Collections.emptyList();
- }
- }
-
- private static final char COLOR_STR = '&';
-
- private static enum Color {
- BLACK('0', NamedTextColor.BLACK),
- DARK_BLUE('1', NamedTextColor.DARK_BLUE),
- DARK_GREEN('2', NamedTextColor.DARK_GREEN),
- DARK_AQUA('3', NamedTextColor.DARK_AQUA),
- DARK_RED('4', NamedTextColor.DARK_RED),
- DARK_PURPLE('5', NamedTextColor.DARK_PURPLE),
- GOLD('6', NamedTextColor.GOLD),
- GRAY('7', NamedTextColor.GRAY),
- DARK_GRAY('8', NamedTextColor.DARK_GRAY),
- BLUE('9', NamedTextColor.BLUE),
- GREEN('a', NamedTextColor.GREEN),
- AQUA('b', NamedTextColor.AQUA),
- RED('c', NamedTextColor.RED),
- LIGHT_PURPLE('d', NamedTextColor.LIGHT_PURPLE),
- YELLOW('e', NamedTextColor.YELLOW),
- WHITE('f', NamedTextColor.WHITE),
- // MAGIC('k', NamedTextColor.MAGIC),
- BOLD('l', NamedTextColor.BLUE),
- // UNDERLINE('n', NamedTextColor.UNDERLINE),
- // ITALIC('o', NamedTextColor.ITALIC),
- // RESET('r', NamedTextColor.RESET),
- ;
-
- private static final String COLOR_CHARS;
-
- private final char c;
- private final TextColor color;
-
- private Color(char c, TextColor color) {
- this.c = c;
- this.color = color;
- }
-
- public static Component color(String msg) {
- List compList = new ArrayList<>();
- char[] charArray = msg.toCharArray();
- TextColor nextColor = NamedTextColor.WHITE;
- boolean prevHadColor = false;
- int lastEnd = -2;
- for (int i = 0; i < charArray.length - 1; i++) {
- if (prevHadColor) {
- prevHadColor = false;
- continue;
- }
- char potColorChar = charArray[i];
- char charAfter = charArray[i + 1];
- int index = COLOR_CHARS.indexOf(String.valueOf(charAfter));
- if (potColorChar == COLOR_STR && index >= 0) {
- String msgUntil = msg.substring(lastEnd + 2, i);
- compList.add(Component.text(msgUntil, nextColor));
- nextColor = values()[index].color;
- lastEnd = i;
- prevHadColor = true;
- }
- }
- if (lastEnd + 2 < msg.length()) {
- compList.add(Component.text(msg.substring(lastEnd + 2, msg.length()), nextColor));
- }
- return Component.join(JoinConfiguration.noSeparators(), compList);
- }
-
- static {
- StringBuilder colorChars = new StringBuilder();
- for (Color color : values()) {
- colorChars.append(color.c);
- }
- COLOR_CHARS = colorChars.toString();
- }
-
- }
-
-}
diff --git a/src/main/java/com/straight8/rambeau/velocity/PluginVersionsVelocity.java b/src/main/java/com/straight8/rambeau/velocity/PluginVersionsVelocity.java
deleted file mode 100644
index 9a7a7b9..0000000
--- a/src/main/java/com/straight8/rambeau/velocity/PluginVersionsVelocity.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.straight8.rambeau.velocity;
-
-import com.google.inject.Inject;
-import com.straight8.rambeau.metrics.VelocityMetrics;
-import com.velocitypowered.api.command.CommandManager;
-import com.velocitypowered.api.command.CommandMeta;
-import com.velocitypowered.api.event.Subscribe;
-import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
-import com.velocitypowered.api.plugin.Plugin;
-import com.velocitypowered.api.plugin.annotation.DataDirectory;
-import com.velocitypowered.api.proxy.ProxyServer;
-import org.slf4j.Logger;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.nio.file.Path;
-
-@Plugin(id = "pluginversions", name = "PluginVersions", version = "1.3.5", description = "List installed plugins and versions alphabetically", authors = {"drives_a_ford", "GabrielHD150", "SlimeDog"})
-public class PluginVersionsVelocity {
-
- private static PluginVersionsVelocity instance;
- private YamlConfig yamlConfig;
-
- private final Path dataDirectory;
- private final ProxyServer server;
- private final Logger logger;
-
- private boolean configurationSendMetrics = true;
- private boolean checkUpdates = true;
- private final VelocityMetrics.Factory metricsFactory;
-
- @Inject
- public PluginVersionsVelocity(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory, VelocityMetrics.Factory metricsFactory) {
- instance = this;
-
- this.server = server;
- this.logger = logger;
-
- this.dataDirectory = dataDirectory;
- this.metricsFactory = metricsFactory;
- }
-
- @Subscribe
- public void onProxyInitialization(ProxyInitializeEvent event) {
- YamlConfig.createFiles("config");
-
- try {
- this.yamlConfig = new YamlConfig(new File(this.dataDirectory.toFile(), "config.yml"));
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- }
-
- this.ReadConfigValuesFromFile();
-
- if (configurationSendMetrics) {
-
- // All you have to do is adding the following two lines in your onProxyInitialization method.
- // You can find the plugin ids of your plugins on the page https://bstats.org/what-is-my-plugin-id
- metricsFactory.make(this, 13032);
- }
-
- CommandManager commandManager = server.getCommandManager();
- CommandMeta meta = commandManager.metaBuilder("pluginversions")
- // Specify other aliases (optional)
- .aliases("pluginversionsvelocity")
- .aliases("pvv")
- .build();
-
- commandManager.register(meta, new PluginVersionsCmd(this));
-
- if (checkUpdates) {
- new UpdateChecker(this, (response, version)-> {
- switch (response) {
- case LATEST: {
- this.logger.info("Running latest version!");
- break;
- }
- case UNAVAILABLE: {
- this.logger.info("Unable to check for new version");
- break;
- }
- case FOUND_NEW: {
- this.logger.warn("Running outdated version! New version available:" + version);
- break;
- }
- }
- }).check();
- }
- }
-
- public static PluginVersionsVelocity getInstance() {
- return instance;
- }
-
- public YamlConfig getConfig() {
- return yamlConfig;
- }
-
- public void ReadConfigValuesFromFile() {
- YamlConfig configNode = this.yamlConfig;
-
- // Optimized the code to read the configuration options
- configurationSendMetrics = configNode.getBoolean("enable-metrics", true);
- checkUpdates = configNode.getBoolean("check-for-updates", true);
- }
-
- public void log(String logString) {
- this.logger.info("[PluginVersions] " + logString);
- }
-
- public ProxyServer getServer() {
- return server;
- }
-
- public File getDataFolder() {
- return this.dataDirectory.toFile();
- }
-
- public InputStream getResourceAsStream(String name) {
- return this.getClass().getClassLoader().getResourceAsStream(name);
- }
-}
diff --git a/src/main/java/com/straight8/rambeau/velocity/SLPUtils.java b/src/main/java/com/straight8/rambeau/velocity/SLPUtils.java
deleted file mode 100644
index 54dfe92..0000000
--- a/src/main/java/com/straight8/rambeau/velocity/SLPUtils.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.straight8.rambeau.velocity;
-
-import net.minecrell.serverlistplus.core.CoreDescription;
-import net.minecrell.serverlistplus.core.ServerListPlusCore;
-
-public class SLPUtils {
-
- public static String getSLPName() {
- CoreDescription info = CoreDescription.load(ServerListPlusCore.getInstance());
-
- return info.getName();
- }
-
- public static String getSLPVersion() {
- CoreDescription info = CoreDescription.load(ServerListPlusCore.getInstance());
-
- return info.getVersion();
- }
-}
diff --git a/src/main/java/com/straight8/rambeau/velocity/UpdateChecker.java b/src/main/java/com/straight8/rambeau/velocity/UpdateChecker.java
deleted file mode 100644
index ebdb608..0000000
--- a/src/main/java/com/straight8/rambeau/velocity/UpdateChecker.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.straight8.rambeau.velocity;
-
-import com.google.common.io.Resources;
-import com.google.common.net.HttpHeaders;
-import com.straight8.rambeau.bungee.PluginVersionsBungee;
-
-import javax.net.ssl.HttpsURLConnection;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.Charset;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BiConsumer;
-
-public class UpdateChecker {
- private static final String SPIGOT_URL = "https://api.spigotmc.org/legacy/update.php?resource=70927";
-
- private final PluginVersionsVelocity plugin;
-
- private final String currentVersion;
-
- private final BiConsumer versionResponse;
-
- public UpdateChecker(PluginVersionsVelocity plugin, BiConsumer consumer) {
- this.plugin = plugin;
- this.currentVersion = "1.1.0";
- this.versionResponse = consumer;
- }
-
- public void check() {
- plugin.getServer().getScheduler().buildTask(this.plugin, () -> {
- try {
- HttpURLConnection httpURLConnection = (HttpsURLConnection) new URL(SPIGOT_URL).openConnection();
- httpURLConnection.setRequestMethod("GET");
- httpURLConnection.setRequestProperty(HttpHeaders.USER_AGENT, "Mozilla/5.0");
-
- String fetchedVersion = Resources.toString(httpURLConnection.getURL(), Charset.defaultCharset());
-
- boolean latestVersion = fetchedVersion.equalsIgnoreCase(this.currentVersion);
-
- plugin.getServer().getScheduler().buildTask(this.plugin, () -> this.versionResponse.accept(latestVersion ? VersionResponse.LATEST : VersionResponse.FOUND_NEW, latestVersion ? this.currentVersion : fetchedVersion)).schedule();
- } catch (IOException exception) {
- exception.printStackTrace();
- plugin.getServer().getScheduler().buildTask(this.plugin, () -> this.versionResponse.accept(VersionResponse.UNAVAILABLE, null)).schedule();
- }
- }).schedule();
- }
-
- public enum VersionResponse {
- LATEST,
- FOUND_NEW,
- UNAVAILABLE
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/straight8/rambeau/velocity/YamlConfig.java b/src/main/java/com/straight8/rambeau/velocity/YamlConfig.java
deleted file mode 100644
index abd589d..0000000
--- a/src/main/java/com/straight8/rambeau/velocity/YamlConfig.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package com.straight8.rambeau.velocity;
-
-import org.yaml.snakeyaml.Yaml;
-
-import java.io.*;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-public class YamlConfig {
- private static final String DELIMITER = ".";
- private final String currentPath;
- private final String name;
- private final Map map;
-
- public static void createFiles(String file) {
- if (!PluginVersionsVelocity.getInstance().getDataFolder().exists()) {
- PluginVersionsVelocity.getInstance().getDataFolder().mkdir();
- }
-
- File fileconfig = new File(PluginVersionsVelocity.getInstance().getDataFolder(), file+".yml");
- if (!fileconfig.exists()) {
- try (InputStream in = PluginVersionsVelocity.getInstance().getResourceAsStream(file+".yml")) {
- Files.copy(in, fileconfig.toPath());
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
-
- public YamlConfig(File file) throws FileNotFoundException {
- this(new Yaml().load(new FileInputStream(file)), "");
- }
-
- private YamlConfig(Map map, String currentPath) {
- this.map = map;
- this.currentPath = currentPath;
- String[] split = currentPath.split(Pattern.quote(DELIMITER));
- this.name = split[split.length - 1]; // last part
- }
-
- public Collection getKeys(boolean deep) {
- if (deep) {
- throw new IllegalStateException("Deep keys are not supported at this time");
- }
- return map.keySet();
- }
-
- public Map getValues(boolean deep) {
- if (!deep) {
- throw new IllegalStateException("Shallow values are not supported at this time");
- }
- return map;
- }
-
- public boolean contains(String path) {
- Map curMap = map;
- Object result;
- String[] split = path.split(Pattern.quote(DELIMITER));
- int counter = 0;
- for (String curPath : split) {
- counter++;
- result = curMap.get(curPath);
- if (!(result instanceof Map)) {
- return counter >= split.length; // not found
-// contains
- }
- curMap = (Map) result; // unchecked
- }
- return true; // result is a map
- }
-
- public boolean contains(String path, boolean ignoreDefault) {
- return contains(path); // TODO - better
- }
-
- public boolean isSet(String path) {
- return contains(path); // TODO - better
- }
-
- public String getCurrentPath() {
- return currentPath;
- }
-
- public String getName() {
- return name;
- }
-
- public Object get(String path) {
- Map curMap = map;
- Object result = null;
- String[] split = path.split(Pattern.quote(DELIMITER));
- int counter = 0;
- for (String curPath : split) {
- counter++;
- result = curMap.get(curPath);
- if (!(result instanceof Map)) {
- if (counter < split.length) {
- return null; // not found
- }
- return result;
- }
- curMap = (Map) result; // unchecked
- }
- return result;
- }
-
- public Object get(String path, Object def) {
- Object o = get(path);
- return o == null ? def : o;
- }
-
- public String getString(String path) {
- Object o = get(path);
- return o == null ? null : String.valueOf(o);
- }
-
- public String getString(String path, String def) {
- String str = getString(path);
- return str == null ? def : str;
- }
-
- public int getInt(String path) {
- return getInt(path, 0);
- }
-
- public int getInt(String path, int def) {
- if (!contains(path) && !isSet(path)) {
- return def;
- }
- try {
- return Integer.parseInt(getString(path));
- } catch (NumberFormatException e) {
- return def;
- }
- }
-
- public boolean getBoolean(String path) {
- return getBoolean(path, false);
- }
-
- public boolean getBoolean(String path, boolean def) {
- if (!contains(path) && !isSet(path)) {
- return def;
- }
- try {
- return Boolean.parseBoolean(getString(path));
- } catch (NumberFormatException e) {
- return def;
- }
- }
-
- public double getDouble(String path) {
- return getDouble(path, 0.0D);
- }
-
- public double getDouble(String path, double def) {
- if (!contains(path) && !isSet(path)) {
- return def;
- }
- try {
- return Double.parseDouble(getString(path));
- } catch (NumberFormatException e) {
- return def;
- }
- }
-
- public long getLong(String path) {
- return getLong(path, 0L);
- }
-
- public long getLong(String path, long def) {
- if (!contains(path) && !isSet(path)) {
- return def;
- }
- try {
- return Long.parseLong(getString(path));
- } catch (NumberFormatException e) {
- return def;
- }
- }
-
- public List getList(String path) {
- if (!contains(path)) {
- return null;
- }
- Object o = get(path);
- if (o instanceof List) {
- return (List) o;
- }
- return null;
- }
-
- public List getList(String path, List def) {
- List list = getList(path);
- return list == null ? def : list;
- }
-
- public List getStringList(String path) {
- List list = getList(path);
- if (list == null || list.isEmpty()) {
- return new ArrayList<>(); // empty list
- }
- if (list.get(0) instanceof String) {
- return (List) list; // unchecked
- }
- return new ArrayList<>();
- }
-
- public YamlConfig getConfigurationSection(String path) {
- Object res = get(path);
- if (res instanceof Map) {
- return new YamlConfig((Map) res, currentPath + DELIMITER + path); // unchecked
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/src/main/resources/bungee.yml b/src/main/resources/bungee.yml
deleted file mode 100644
index 153762b..0000000
--- a/src/main/resources/bungee.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: PluginVersions
-version: ${project.version}
-main: com.straight8.rambeau.bungee.PluginVersionsBungee
-description: List installed plugins and versions alphabetically
-authors: [drives_a_ford, GabrielHD150, SlimeDog]
\ No newline at end of file
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 389e898..3f982b0 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -11,12 +11,6 @@
#
enable-metrics: true
-# Check for updates.
-#
-check-for-updates: true
-# Update source may be either Hangar (default) or SpigotMC.
-update-source: Hangar
-
# When executed at the console,
# {spacing} will enable tabular output (in-game does not support tabular output).
# To disable tabular output at the console, replace "{spacing}" with " " in the format strings.
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 8723466..01e2f8b 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -4,16 +4,16 @@
name: PluginVersions
version: ${project.version}
-api-version: 1.13
+api-version: 1.21.11
main: com.straight8.rambeau.bukkit.PluginVersionsBukkit
description: List installed plugins and versions alphabetically
-authors: [mart-r, GabrielHD150, SlimeDog]
+authors: [ mart-r, GabrielHD150, SlimeDog ]
commands:
pluginversions:
description: Commands for PluginVersions
usage: list | reload
- aliases: [pv]
+ aliases: [ pv ]
pluginversions list:
description: List loaded plugins and versions
usage: [page]