Upstream/SubServers-2
1
0
Fork 0
mirror of https://github.com/ME1312/SubServers-2.git synced 2024-11-25 03:35:26 +01:00
Code Issues Projects Releases Wiki Activity

Make our bukkit events async

Browse Source 
Also, #76 store signs in instance
This commit is contained in:
ME1312 2022-04-05 19:26:50 -04:00
parent 7d9de9bf6e
commit e4300e76e2
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
61 changed files with 673 additions and 1544 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/bug-report.md vendored
View File

@ -11,7 +11,7 @@ Paste in the version information from the SubServers app in question here. To ge
Here you can write about what happened that shouldn't have. If you have any errors in your console related to what happened, you should also paste those here. Here you can write about what happened that shouldn't have. If you have any errors in your console related to what happened, you should also paste those here.
### How It Happened ### How It Happened
Tell us step-by-step how to recreate the problem. This step is vital for us to determine whether or not the problem happens to everyone else too. Tell us step-by-step how to recreate the problem. This step is vital for us to determine whether the problem happens to everyone else too.
### Additional Information ### Additional Information
Here you can provide any extra details you may think useful for solving the problem. Here you can provide any extra details you may think useful for solving the problem.

2
LICENSE
View File

@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier same "printed page" as the copyright notice for easier
identification within third-party archives. identification within third-party archives.
Copyright (C) 2015-2021 ME1312 Copyright (C) 2015-2022 ME1312
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.

287
SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Metrics.java → SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Metrics.java
View File

@ -1,6 +1,7 @@
package net.ME1312.SubServers.Sync.Library; package net.ME1312.SubServers.Bungee.Library;
import net.ME1312.SubServers.Sync.SubAPI; import net.ME1312.SubServers.Bungee.BungeeAPI;
import net.ME1312.SubServers.Bungee.BungeeCommon;
import gnu.trove.map.hash.TIntObjectHashMap; import gnu.trove.map.hash.TIntObjectHashMap;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ProxyServer;
@ -29,6 +30,9 @@ import java.util.logging.Level;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.zip.GZIPOutputStream; import java.util.zip.GZIPOutputStream;
/**
* SubServers BStats Metrics Implementation
*/
public class Metrics { public class Metrics {
private final Plugin plugin; private final Plugin plugin;
@ -79,7 +83,6 @@ public class Metrics {
logResponseStatusText); logResponseStatusText);
} }
/** Loads the bStats configuration. */ /** Loads the bStats configuration. */
private void loadConfig() throws IOException { private void loadConfig() throws IOException {
File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats"); File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
@ -118,15 +121,6 @@ public class Metrics {
} }
} }
/**
* Adds a custom chart.
*
* @param chart The chart to add.
*/
public void addCustomChart(CustomChart chart) {
metricsBase.addCustomChart(chart);
}
private static final AdvancedPie PLAYER_VERSIONS; private static final AdvancedPie PLAYER_VERSIONS;
static { static {
final int[] PROTOCOL_VERSIONS; final int[] PROTOCOL_VERSIONS;
@ -169,20 +163,26 @@ public class Metrics {
}); });
} }
public void appendAppData() { /**
addCustomChart(PLAYER_VERSIONS); * Add subservers platform information as custom charts
*/
public Metrics addPlatformCharts() {
return addCustomChart(new SimplePie("subservers_version", () -> BungeeAPI.getInstance().getWrapperVersion().toString())).addCustomChart(PLAYER_VERSIONS);
} }
public void appendPluginData() { /**
addCustomChart(new SimplePie("subservers_version", () -> { * Adds a custom chart.
return SubAPI.getInstance().getWrapperVersion().toString(); *
})); * @param chart The chart to add.
addCustomChart(PLAYER_VERSIONS); */
public Metrics addCustomChart(CustomChart chart) {
metricsBase.addCustomChart(chart);
return this;
} }
private void appendPlatformData(JsonObjectBuilder builder) { private void appendPlatformData(JsonObjectBuilder builder) {
builder.appendField("playerAmount", plugin.getProxy().getOnlineCount()); builder.appendField("playerAmount", plugin.getProxy().getOnlineCount());
builder.appendField("managedServers", plugin.getProxy().getServers().size()); builder.appendField("managedServers", ((BungeeCommon) plugin.getProxy()).getServersCopy().size());
builder.appendField("onlineMode", plugin.getProxy().getConfig().isOnlineMode() ? 1 : 0); builder.appendField("onlineMode", plugin.getProxy().getConfig().isOnlineMode() ? 1 : 0);
builder.appendField("bungeecordVersion", plugin.getProxy().getVersion()); builder.appendField("bungeecordVersion", plugin.getProxy().getVersion());
builder.appendField("javaVersion", System.getProperty("java.version")); builder.appendField("javaVersion", System.getProperty("java.version"));
@ -199,7 +199,7 @@ public class Metrics {
public static class MetricsBase { public static class MetricsBase {
/** The version of the Metrics class. */ /** The version of the Metrics class. */
public static final String METRICS_VERSION = "2.2.1"; public static final String METRICS_VERSION = "3.0.0";
private static final ScheduledExecutorService scheduler = private static final ScheduledExecutorService scheduler =
Executors.newScheduledThreadPool(1, task -> new Thread(task, "bStats-Metrics")); Executors.newScheduledThreadPool(1, task -> new Thread(task, "bStats-Metrics"));
@ -284,6 +284,7 @@ public class Metrics {
this.logResponseStatusText = logResponseStatusText; this.logResponseStatusText = logResponseStatusText;
checkRelocation(); checkRelocation();
if (enabled) { if (enabled) {
// WARNING: Removing the option to opt-out will get your plugin banned from bStats
startSubmitting(); startSubmitting();
} }
} }
@ -420,9 +421,9 @@ public class Metrics {
} }
} }
public static class AdvancedBarChart extends CustomChart { public static class DrilldownPie extends CustomChart {
private final Callable<Map<String, int[]>> callable; private final Callable<Map<String, Map<String, Integer>>> callable;
/** /**
* Class constructor. * Class constructor.
@ -430,99 +431,33 @@ public class Metrics {
* @param chartId The id of the chart. * @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data. * @param callable The callable which is used to request the chart data.
*/ */
public AdvancedBarChart(String chartId, Callable<Map<String, int[]>> callable) { public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) {
super(chartId); super(chartId);
this.callable = callable; this.callable = callable;
} }
@Override @Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception { public JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, int[]> map = callable.call(); Map<String, Map<String, Integer>> map = callable.call();
if (map == null || map.isEmpty()) { if (map == null || map.isEmpty()) {
// Null = skip the chart // Null = skip the chart
return null; return null;
} }
boolean reallyAllSkipped = true;
for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
JsonObjectBuilder valueBuilder = new JsonObjectBuilder();
boolean allSkipped = true; boolean allSkipped = true;
for (Map.Entry<String, int[]> entry : map.entrySet()) { for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) {
if (entry.getValue().length == 0) { valueBuilder.appendField(valueEntry.getKey(), valueEntry.getValue());
// Skip this invalid
continue;
}
allSkipped = false; allSkipped = false;
valuesBuilder.appendField(entry.getKey(), entry.getValue());
} }
if (allSkipped) { if (!allSkipped) {
// Null = skip the chart reallyAllSkipped = false;
return null; valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build());
}
return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
} }
} }
if (reallyAllSkipped) {
public static class SimpleBarChart extends CustomChart {
private final Callable<Map<String, Integer>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public SimpleBarChart(String chartId, Callable<Map<String, Integer>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Integer> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
for (Map.Entry<String, Integer> entry : map.entrySet()) {
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<Map<String, Integer>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Integer> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
boolean allSkipped = true;
for (Map.Entry<String, Integer> entry : map.entrySet()) {
if (entry.getValue() == 0) {
// Skip this invalid
continue;
}
allSkipped = false;
valuesBuilder.appendField(entry.getKey(), entry.getValue());
}
if (allSkipped) {
// Null = skip the chart // Null = skip the chart
return null; return null;
} }
@ -570,6 +505,76 @@ public class Metrics {
} }
} }
public static class MultiLineChart extends CustomChart {
private final Callable<Map<String, Integer>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Integer> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
boolean allSkipped = true;
for (Map.Entry<String, Integer> entry : map.entrySet()) {
if (entry.getValue() == 0) {
// 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<Map<String, Integer>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public SimpleBarChart(String chartId, Callable<Map<String, Integer>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Integer> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
for (Map.Entry<String, Integer> entry : map.entrySet()) {
valuesBuilder.appendField(entry.getKey(), new int[] {entry.getValue()});
}
return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
}
}
public abstract static class CustomChart { public abstract static class CustomChart {
private final String chartId; private final String chartId;
@ -604,32 +609,6 @@ public class Metrics {
protected abstract JsonObjectBuilder.JsonObject getChartData() throws Exception; protected abstract JsonObjectBuilder.JsonObject getChartData() throws Exception;
} }
public static class SingleLineChart extends CustomChart {
private final Callable<Integer> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public SingleLineChart(String chartId, Callable<Integer> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected 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 { public static class SimplePie extends CustomChart {
private final Callable<String> callable; private final Callable<String> callable;
@ -656,9 +635,9 @@ public class Metrics {
} }
} }
public static class DrilldownPie extends CustomChart { public static class AdvancedBarChart extends CustomChart {
private final Callable<Map<String, Map<String, Integer>>> callable; private final Callable<Map<String, int[]>> callable;
/** /**
* Class constructor. * Class constructor.
@ -666,33 +645,29 @@ public class Metrics {
* @param chartId The id of the chart. * @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data. * @param callable The callable which is used to request the chart data.
*/ */
public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) { public AdvancedBarChart(String chartId, Callable<Map<String, int[]>> callable) {
super(chartId); super(chartId);
this.callable = callable; this.callable = callable;
} }
@Override @Override
public JsonObjectBuilder.JsonObject getChartData() throws Exception { protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Map<String, Integer>> map = callable.call(); Map<String, int[]> map = callable.call();
if (map == null || map.isEmpty()) { if (map == null || map.isEmpty()) {
// Null = skip the chart // Null = skip the chart
return null; return null;
} }
boolean reallyAllSkipped = true;
for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
JsonObjectBuilder valueBuilder = new JsonObjectBuilder();
boolean allSkipped = true; boolean allSkipped = true;
for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) { for (Map.Entry<String, int[]> entry : map.entrySet()) {
valueBuilder.appendField(valueEntry.getKey(), valueEntry.getValue()); if (entry.getValue().length == 0) {
// Skip this invalid
continue;
}
allSkipped = false; allSkipped = false;
valuesBuilder.appendField(entry.getKey(), entry.getValue());
} }
if (!allSkipped) { if (allSkipped) {
reallyAllSkipped = false;
valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build());
}
}
if (reallyAllSkipped) {
// Null = skip the chart // Null = skip the chart
return null; return null;
} }
@ -700,6 +675,32 @@ public class Metrics {
} }
} }
public static class SingleLineChart extends CustomChart {
private final Callable<Integer> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public SingleLineChart(String chartId, Callable<Integer> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected 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();
}
}
/** /**
* An extremely simple JSON builder. * An extremely simple JSON builder.
* *

0
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/SubEvent.java → SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/SubEvent.java
View File

2
SubServers.Bungee/pom.xml
View File

@ -34,7 +34,7 @@
<dependency> <dependency>
<groupId>net.ME1312.SubData</groupId> <groupId>net.ME1312.SubData</groupId>
<artifactId>Server</artifactId> <artifactId>Server</artifactId>
<version>22w11a</version> <version>22w11c</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

17
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/JNA.java
View File

@ -4,12 +4,16 @@ package net.ME1312.SubServers.Bungee.Library.Compatibility;
import net.ME1312.SubServers.Bungee.SubAPI; import net.ME1312.SubServers.Bungee.SubAPI;
import com.google.common.io.Resources; import com.google.common.io.Resources;
import net.md_5.bungee.api.ProxyServer;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.logging.Logger;
import static java.util.logging.Level.SEVERE;
/** /**
* JNA Library Loader Class * JNA Library Loader Class
@ -29,12 +33,13 @@ public class JNA {
public static ClassLoader get() { public static ClassLoader get() {
if (JNA == null) { if (JNA == null) {
boolean announced = false; boolean announced = false;
Logger log = ProxyServer.getInstance().getLogger();
File library = new File(SubAPI.getInstance().getInternals().dir, "SubServers/Cache/Libraries"); File library = new File(SubAPI.getInstance().getInternals().dir, "SubServers/Cache/Libraries");
File jna = new File(library, "jna-" + JNA_VERSION + ".jar"); File jna = new File(library, "jna-" + JNA_VERSION + ".jar");
jna.getParentFile().mkdirs(); jna.getParentFile().mkdirs();
if (!jna.exists()) { if (!jna.exists()) {
announced = true; announced = true;
System.out.println(">> Downloading JNA Library v" + JNA_VERSION); log.info(">> Downloading JNA v" + JNA_VERSION);
try (FileOutputStream fin = new FileOutputStream(jna)) { try (FileOutputStream fin = new FileOutputStream(jna)) {
Resources.copy(new URL(JNA_DOWNLOAD.replace("$1", "jna")), fin); Resources.copy(new URL(JNA_DOWNLOAD.replace("$1", "jna")), fin);
} catch (Throwable e) { } catch (Throwable e) {
@ -45,7 +50,7 @@ public class JNA {
File platform = new File(library, "jna-platform-" + JNA_VERSION + ".jar"); File platform = new File(library, "jna-platform-" + JNA_VERSION + ".jar");
platform.getParentFile().mkdirs(); platform.getParentFile().mkdirs();
if (!platform.exists()) { if (!platform.exists()) {
if (!announced) System.out.println(">> Downloading JNA Library v" + JNA_VERSION); if (!announced) log.info(">> Downloading JNA platform v" + JNA_VERSION);
announced = true; announced = true;
try (FileOutputStream fin = new FileOutputStream(platform)) { try (FileOutputStream fin = new FileOutputStream(platform)) {
Resources.copy(new URL(JNA_DOWNLOAD.replace("$1", "jna-platform")), fin); Resources.copy(new URL(JNA_DOWNLOAD.replace("$1", "jna-platform")), fin);
@ -55,16 +60,14 @@ public class JNA {
} }
} }
if (jna.exists() && platform.exists()) { if (jna.exists() && platform.exists()) {
if (announced) System.out.println(">> Loading JNA Library"); if (announced) log.info(">> JNA download complete");
try { try {
JNA = new URLClassLoader(new URL[]{jna.toURI().toURL(), platform.toURI().toURL()}); JNA = new URLClassLoader(new URL[]{jna.toURI().toURL(), platform.toURI().toURL()});
} catch (Throwable e) { } catch (Throwable e) {
System.out.println(">> Could not load JNA Library:"); log.log(SEVERE, ">> Couldn't load JNA:", e);
e.printStackTrace();
} }
} else { } else {
System.out.println(">> Could not load JNA Library:"); log.log(SEVERE, ">> Couldn't load JNA:", new FileNotFoundException());
new FileNotFoundException().printStackTrace();
} }
} }
return JNA; return JNA;

917
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Metrics.java
View File

@ -1,917 +0,0 @@
package net.ME1312.SubServers.Bungee.Library;
import net.ME1312.SubData.Server.DataServer;
import net.ME1312.SubServers.Bungee.BungeeCommon;
import net.ME1312.SubServers.Bungee.SubAPI;
import gnu.trove.map.hash.TIntObjectHashMap;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.config.Configuration;
import net.md_5.bungee.config.ConfigurationProvider;
import net.md_5.bungee.config.YamlConfiguration;
import net.md_5.bungee.protocol.ProtocolConstants;
import javax.net.ssl.HttpsURLConnection;
import java.io.*;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.*;
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;
public class Metrics {
private final Plugin plugin;
private final MetricsBase metricsBase;
private boolean enabled;
private String serverUUID;
private boolean logErrors = false;
private boolean logSentData;
private boolean logResponseStatusText;
/**
* Creates a new Metrics instance.
*
* @param plugin Your plugin instance.
* @param serviceId The id of the service. It can be found at <a
* href="https://bstats.org/what-is-my-plugin-id">What is my plugin id?</a>
*/
public Metrics(Plugin plugin, int serviceId) {
this.plugin = plugin;
try {
loadConfig();
} catch (IOException e) {
// Failed to load configuration
plugin.getLogger().log(Level.WARNING, "Failed to load bStats config!", e);
metricsBase = null;
return;
}
metricsBase =
new MetricsBase(
"bungeecord",
serverUUID,
serviceId,
enabled,
this::appendPlatformData,
this::appendServiceData,
null,
() -> true,
(message, error) -> this.plugin.getLogger().log(Level.WARNING, message, error),
(message) -> this.plugin.getLogger().log(Level.INFO, message),
logErrors,
logSentData,
logResponseStatusText);
}
/** Loads the bStats configuration. */
private void loadConfig() throws IOException {
File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
bStatsFolder.mkdirs();
File configFile = new File(bStatsFolder, "config.yml");
if (!configFile.exists()) {
writeFile(
configFile,
"# bStats (https://bStats.org) collects some basic information for plugin authors, like how",
"# many people use their plugin and their total player count. It's recommended to keep bStats",
"# enabled, but if you're not comfortable with this, you can turn this setting off. There is no",
"# performance penalty associated with having metrics enabled, and data sent to bStats is fully",
"# anonymous.",
"enabled: true",
"serverUuid: \"" + UUID.randomUUID() + "\"",
"logFailedRequests: false",
"logSentData: false",
"logResponseStatusText: false");
}
Configuration configuration =
ConfigurationProvider.getProvider(YamlConfiguration.class).load(configFile);
// Load configuration
enabled = configuration.getBoolean("enabled", true);
serverUUID = configuration.getString("serverUuid");
logErrors = configuration.getBoolean("logFailedRequests", false);
logSentData = configuration.getBoolean("logSentData", false);
logResponseStatusText = configuration.getBoolean("logResponseStatusText", false);
}
private void writeFile(File file, String... lines) throws IOException {
try (BufferedWriter bufferedWriter = new BufferedWriter(new FileWriter(file))) {
for (String line : lines) {
bufferedWriter.write(line);
bufferedWriter.newLine();
}
}
}
/**
* Adds a custom chart.
*
* @param chart The chart to add.
*/
public void addCustomChart(CustomChart chart) {
metricsBase.addCustomChart(chart);
}
private static final AdvancedPie PLAYER_VERSIONS;
static {
final int[] PROTOCOL_VERSIONS;
final String[] PROTOCOL_NAMES;
{
TIntObjectHashMap<String> protocols = new TIntObjectHashMap<String>();
try {
for (Field f : ProtocolConstants.class.getDeclaredFields()) {
int fm = f.getModifiers();
if (Modifier.isPublic(fm) && Modifier.isStatic(fm) && Modifier.isFinal(fm) && f.getType() == int.class && f.getName().startsWith("MINECRAFT_")) {
protocols.put(f.getInt(null), f.getName().substring(10).replace('_', '.'));
}
}
} catch (Throwable e) {
e.printStackTrace();
}
PROTOCOL_VERSIONS = protocols.keys();
PROTOCOL_NAMES = new String[PROTOCOL_VERSIONS.length];
Arrays.sort(PROTOCOL_VERSIONS);
for (int i = 0; i < PROTOCOL_VERSIONS.length; ++i) {
PROTOCOL_NAMES[i] = protocols.get(PROTOCOL_VERSIONS[i]);
}
}
PLAYER_VERSIONS = new AdvancedPie("player_versions", () -> {
int[] players = new int[PROTOCOL_VERSIONS.length];
for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) {
int i = Arrays.binarySearch(PROTOCOL_VERSIONS, player.getPendingConnection().getVersion());
if (i != -1) {
++players[i];
}
}
HashMap<String, Integer> map = new HashMap<String, Integer>();
for (int i = 0; i < PROTOCOL_NAMES.length; ++i) if (players[i] != 0) {
map.put(PROTOCOL_NAMES[i], players[i]);
}
return map;
});
}
public void appendAppData() {
addCustomChart(new SingleLineChart("managed_hosts", () -> {
return SubAPI.getInstance().getHosts().size();
}));
addCustomChart(new SingleLineChart("subdata_connected", () -> {
DataServer subdata = SubAPI.getInstance().getSubDataNetwork();
return (subdata != null)? subdata.getClients().size() : 0;
}));
addCustomChart(PLAYER_VERSIONS);
}
public void appendPluginData() {
addCustomChart(new SimplePie("subservers_version", () -> {
return SubAPI.getInstance().getWrapperVersion().toString();
}));
addCustomChart(PLAYER_VERSIONS);
}
private void appendPlatformData(JsonObjectBuilder builder) {
builder.appendField("playerAmount", plugin.getProxy().getOnlineCount());
builder.appendField("managedServers", ((BungeeCommon) plugin.getProxy()).getServersCopy().size());
builder.appendField("onlineMode", plugin.getProxy().getConfig().isOnlineMode() ? 1 : 0);
builder.appendField("bungeecordVersion", plugin.getProxy().getVersion());
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());
}
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<JsonObjectBuilder> appendPlatformDataConsumer;
private final Consumer<JsonObjectBuilder> appendServiceDataConsumer;
private final Consumer<Runnable> submitTaskConsumer;
private final Supplier<Boolean> checkServiceEnabledSupplier;
private final BiConsumer<String, Throwable> errorLogger;
private final Consumer<String> infoLogger;
private final boolean logErrors;
private final boolean logSentData;
private final boolean logResponseStatusText;
private final Set<CustomChart> 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<JsonObjectBuilder> appendPlatformDataConsumer,
Consumer<JsonObjectBuilder> appendServiceDataConsumer,
Consumer<Runnable> submitTaskConsumer,
Supplier<Boolean> checkServiceEnabledSupplier,
BiConsumer<String, Throwable> errorLogger,
Consumer<String> 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<Map<String, int[]>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public AdvancedBarChart(String chartId, Callable<Map<String, int[]>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, int[]> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
boolean allSkipped = true;
for (Map.Entry<String, int[]> entry : map.entrySet()) {
if (entry.getValue().length == 0) {
// 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<Map<String, Integer>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public SimpleBarChart(String chartId, Callable<Map<String, Integer>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Integer> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
for (Map.Entry<String, Integer> entry : map.entrySet()) {
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<Map<String, Integer>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Integer> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
boolean allSkipped = true;
for (Map.Entry<String, Integer> entry : map.entrySet()) {
if (entry.getValue() == 0) {
// 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<Map<String, Integer>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public AdvancedPie(String chartId, Callable<Map<String, Integer>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Integer> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
boolean allSkipped = true;
for (Map.Entry<String, Integer> entry : map.entrySet()) {
if (entry.getValue() == 0) {
// 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<String, Throwable> 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<Integer> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public SingleLineChart(String chartId, Callable<Integer> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected 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<String> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public SimplePie(String chartId, Callable<String> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected 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<Map<String, Map<String, Integer>>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) {
super(chartId);
this.callable = callable;
}
@Override
public JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Map<String, Integer>> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
boolean reallyAllSkipped = true;
for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
JsonObjectBuilder valueBuilder = new JsonObjectBuilder();
boolean allSkipped = true;
for (Map.Entry<String, Integer> 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.
*
* <p>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.
*
* <p>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.
*
* <p>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;
}
}
}
}

9
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java
View File

@ -731,7 +731,14 @@ public final class SubProxy extends BungeeCommon implements Listener {
if (getReconnectHandler() != null && getReconnectHandler().getClass().equals(SmartFallback.class)) if (getReconnectHandler() != null && getReconnectHandler().getClass().equals(SmartFallback.class))
setReconnectHandler(new SmartFallback(config.get().getMap("Settings").getMap("Smart-Fallback", new ObjectMap<>()))); // Re-initialize Smart Fallback setReconnectHandler(new SmartFallback(config.get().getMap("Settings").getMap("Smart-Fallback", new ObjectMap<>()))); // Re-initialize Smart Fallback
if (plugin != null) new Metrics(plugin, 1406).appendAppData(); if (plugin != null) Try.none.run(() -> new Metrics(plugin, 1406)
.addCustomChart(new Metrics.SingleLineChart("managed_hosts", () -> {
return hosts.size();
})).addCustomChart(new Metrics.SingleLineChart("subdata_connected", () -> {
final SubDataServer subdata = this.subdata;
return (subdata != null)? subdata.getClients().size() : 0;
})).addCustomChart(Util.reflect(Metrics.class.getDeclaredField("PLAYER_VERSIONS"), null))
);
new Timer("SubServers.Bungee::Routine_Update_Check").schedule(new TimerTask() { new Timer("SubServers.Bungee::Routine_Update_Check").schedule(new TimerTask() {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override

1
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddHostEvent.java
View File

@ -22,6 +22,7 @@ public class SubAddHostEvent extends Event implements SubEvent {
* @param host Host to be added * @param host Host to be added
*/ */
public SubAddHostEvent(UUID player, String host) { public SubAddHostEvent(UUID player, String host) {
super(true);
Util.nullpo(host); Util.nullpo(host);
this.player = player; this.player = player;
this.host = host; this.host = host;

1
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddProxyEvent.java
View File

@ -18,6 +18,7 @@ public class SubAddProxyEvent extends Event implements SubEvent {
* @param proxy Host Being Added * @param proxy Host Being Added
*/ */
public SubAddProxyEvent(String proxy) { public SubAddProxyEvent(String proxy) {
super(true);
Util.nullpo(proxy); Util.nullpo(proxy);
this.proxy = proxy; this.proxy = proxy;
} }

1
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddServerEvent.java
View File

@ -23,6 +23,7 @@ public class SubAddServerEvent extends Event implements SubEvent {
* @param server Server Starting * @param server Server Starting
*/ */
public SubAddServerEvent(UUID player, String host, String server) { public SubAddServerEvent(UUID player, String host, String server) {
super(true);
Util.nullpo(server); Util.nullpo(server);
this.player = player; this.player = player;
this.host = host; this.host = host;

1
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreateEvent.java
View File

@ -36,6 +36,7 @@ public class SubCreateEvent extends Event implements SubEvent {
* @param port Server Port Number * @param port Server Port Number
*/ */
public SubCreateEvent(UUID player, String host, String name, String template, Version version, int port, boolean update) { public SubCreateEvent(UUID player, String host, String name, String template, Version version, int port, boolean update) {
super(true);
Util.nullpo(host, name, template, port); Util.nullpo(host, name, template, port);
this.player = player; this.player = player;
this.update = update; this.update = update;

1
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreatedEvent.java
View File

@ -37,6 +37,7 @@ public class SubCreatedEvent extends Event implements SubEvent {
* @param port Server Port Number * @param port Server Port Number
*/ */
public SubCreatedEvent(UUID player, String host, String name, String template, Version version, int port, boolean update, boolean success) { public SubCreatedEvent(UUID player, String host, String name, String template, Version version, int port, boolean update, boolean success) {
super(true);
Util.nullpo(host, name, template, port); Util.nullpo(host, name, template, port);
this.player = player; this.player = player;
this.success = success; this.success = success;

1
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubEditServerEvent.java
View File

@ -28,6 +28,7 @@ public class SubEditServerEvent extends Event implements SubEvent {
* @param edit Edit to make * @param edit Edit to make
*/ */
public SubEditServerEvent(UUID player, String server, Pair<String, ?> edit) { public SubEditServerEvent(UUID player, String server, Pair<String, ?> edit) {
super(true);
Util.nullpo(server, edit); Util.nullpo(server, edit);
ObjectMap<String> section = new ObjectMap<String>(); ObjectMap<String> section = new ObjectMap<String>();
section.set(".", edit.value()); section.set(".", edit.value());

1
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubNetworkConnectEvent.java
View File

@ -17,6 +17,7 @@ public class SubNetworkConnectEvent extends Event implements SubEvent {
* SubData Network Connect Event * SubData Network Connect Event
*/ */
public SubNetworkConnectEvent(DataClient network) { public SubNetworkConnectEvent(DataClient network) {
super(true);
Util.nullpo(network); Util.nullpo(network);
this.network = network; this.network = network;
} }

1
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubNetworkDisconnectEvent.java
View File

@ -19,6 +19,7 @@ public class SubNetworkDisconnectEvent extends Event implements SubEvent {
* SubData Network Disconnect Event * SubData Network Disconnect Event
*/ */
public SubNetworkDisconnectEvent(DataClient network, DisconnectReason reason) { public SubNetworkDisconnectEvent(DataClient network, DisconnectReason reason) {
super(true);
Util.nullpo(network, reason); Util.nullpo(network, reason);
this.network = network; this.network = network;
this.reason = reason; this.reason = reason;

1
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveHostEvent.java
View File

@ -22,6 +22,7 @@ public class SubRemoveHostEvent extends Event implements SubEvent {
* @param host Server Starting * @param host Server Starting
*/ */
public SubRemoveHostEvent(UUID player, String host) { public SubRemoveHostEvent(UUID player, String host) {
super(true);
Util.nullpo(host); Util.nullpo(host);
this.player = player; this.player = player;
this.host = host; this.host = host;

1
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveProxyEvent.java
View File

@ -18,6 +18,7 @@ public class SubRemoveProxyEvent extends Event implements SubEvent {
* @param proxy Host Being Added * @param proxy Host Being Added
*/ */
public SubRemoveProxyEvent(String proxy) { public SubRemoveProxyEvent(String proxy) {
super(true);
Util.nullpo(proxy); Util.nullpo(proxy);
this.proxy = proxy; this.proxy = proxy;
} }

1
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveServerEvent.java
View File

@ -23,6 +23,7 @@ public class SubRemoveServerEvent extends Event implements SubEvent {
* @param server Server Starting * @param server Server Starting
*/ */
public SubRemoveServerEvent(UUID player, String host, String server) { public SubRemoveServerEvent(UUID player, String host, String server) {
super(true);
Util.nullpo(server); Util.nullpo(server);
this.player = player; this.player = player;
this.host = host; this.host = host;

1
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubSendCommandEvent.java
View File

@ -26,6 +26,7 @@ public class SubSendCommandEvent extends Event implements SubEvent {
* @param target Player that will send * @param target Player that will send
*/ */
public SubSendCommandEvent(UUID player, String server, String command, UUID target) { public SubSendCommandEvent(UUID player, String server, String command, UUID target) {
super(true);
Util.nullpo(server, command); Util.nullpo(server, command);
this.player = player; this.player = player;
this.server = server; this.server = server;

1
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStartEvent.java
View File

@ -23,6 +23,7 @@ public class SubStartEvent extends Event implements SubEvent {
* @param server Server Starting * @param server Server Starting
*/ */
public SubStartEvent(UUID player, String server) { public SubStartEvent(UUID player, String server) {
super(true);
Util.nullpo(server); Util.nullpo(server);
this.player = player; this.player = player;
this.server = server; this.server = server;

1
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStartedEvent.java
View File

@ -19,6 +19,7 @@ public class SubStartedEvent extends Event implements SubEvent {
* @param server Server that Started * @param server Server that Started
*/ */
public SubStartedEvent(String server) { public SubStartedEvent(String server) {
super(true);
Util.nullpo(server); Util.nullpo(server);
this.server = server; this.server = server;
} }

1
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStopEvent.java
View File

@ -25,6 +25,7 @@ public class SubStopEvent extends Event implements SubEvent {
* @param force If it was a Forced Shutdown * @param force If it was a Forced Shutdown
*/ */
public SubStopEvent(UUID player, String server, boolean force) { public SubStopEvent(UUID player, String server, boolean force) {
super(true);
Util.nullpo(server, force); Util.nullpo(server, force);
this.player = player; this.player = player;
this.server = server; this.server = server;

1
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStoppedEvent.java
View File

@ -18,6 +18,7 @@ public class SubStoppedEvent extends Event implements SubEvent {
* @param server Server that Stopped * @param server Server that Stopped
*/ */
public SubStoppedEvent(String server) { public SubStoppedEvent(String server) {
super(true);
Util.nullpo(server); Util.nullpo(server);
this.server = server; this.server = server;
} }

36
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIRenderer.java
View File

@ -102,7 +102,7 @@ public class DefaultUIRenderer extends UIRenderer {
public void hostMenu(final int page) { public void hostMenu(final int page) {
setDownloading(ChatColor.stripColor(plugin.api.getLang("SubServers", "Interface.Host-Menu.Title"))); setDownloading(ChatColor.stripColor(plugin.api.getLang("SubServers", "Interface.Host-Menu.Title")));
plugin.api.getHosts(hosts -> plugin.api.getGroups(groups -> { plugin.api.getHosts(hosts -> plugin.api.getGroups(groups -> Bukkit.getScheduler().runTask(plugin, () -> {
setDownloading(null); setDownloading(null);
lastVisitedObjects[0] = null; lastVisitedObjects[0] = null;
lastPage = page; lastPage = page;
@ -229,12 +229,12 @@ public class DefaultUIRenderer extends UIRenderer {
Bukkit.getPlayer(player).openInventory(inv); Bukkit.getPlayer(player).openInventory(inv);
open = true; open = true;
})); })));
} }
public void hostAdmin(final String name) { public void hostAdmin(final String name) {
setDownloading(ChatColor.stripColor(plugin.api.getLang("SubServers", "Interface.Host-Admin.Title").replace("$str$", name))); setDownloading(ChatColor.stripColor(plugin.api.getLang("SubServers", "Interface.Host-Admin.Title").replace("$str$", name)));
plugin.api.getHost(name, host -> { plugin.api.getHost(name, host -> Bukkit.getScheduler().runTask(plugin, () -> {
windowHistory.add(() -> hostAdmin(name)); windowHistory.add(() -> hostAdmin(name));
if (host == null) { if (host == null) {
if (hasHistory()) back(); if (hasHistory()) back();
@ -342,7 +342,7 @@ public class DefaultUIRenderer extends UIRenderer {
Bukkit.getPlayer(this.player).openInventory(inv); Bukkit.getPlayer(this.player).openInventory(inv);
open = true; open = true;
} }
}); }));
} }
public void hostCreator(final CreatorOptions options) { public void hostCreator(final CreatorOptions options) {
@ -350,7 +350,7 @@ public class DefaultUIRenderer extends UIRenderer {
if (!options.init()) windowHistory.add(() -> hostCreator(options)); if (!options.init()) windowHistory.add(() -> hostCreator(options));
lastVisitedObjects[0] = options; lastVisitedObjects[0] = options;
plugin.api.getHost(options.getHost(), host -> { plugin.api.getHost(options.getHost(), host -> Bukkit.getScheduler().runTask(plugin, () -> {
if (host == null || !host.isAvailable() || !host.isEnabled()) { if (host == null || !host.isAvailable() || !host.isEnabled()) {
lastVisitedObjects[0] = null; lastVisitedObjects[0] = null;
if (hasHistory()) back(); if (hasHistory()) back();
@ -469,14 +469,14 @@ public class DefaultUIRenderer extends UIRenderer {
Bukkit.getPlayer(player).openInventory(inv); Bukkit.getPlayer(player).openInventory(inv);
open = true; open = true;
} }
}); }));
} }
public void hostCreatorTemplates(final int page, final CreatorOptions options) { public void hostCreatorTemplates(final int page, final CreatorOptions options) {
setDownloading(ChatColor.stripColor(plugin.api.getLang("SubServers", "Interface.Host-Creator.Edit-Template.Title").replace("$str$", options.getHost()))); setDownloading(ChatColor.stripColor(plugin.api.getLang("SubServers", "Interface.Host-Creator.Edit-Template.Title").replace("$str$", options.getHost())));
options.init(); options.init();
lastVisitedObjects[0] = options; lastVisitedObjects[0] = options;
plugin.api.getHost(options.getHost(), host -> { plugin.api.getHost(options.getHost(), host -> Bukkit.getScheduler().runTask(plugin, () -> {
if (host == null || !host.isAvailable() || !host.isEnabled()) { if (host == null || !host.isAvailable() || !host.isEnabled()) {
lastVisitedObjects[0] = null; lastVisitedObjects[0] = null;
if (hasHistory()) back(); if (hasHistory()) back();
@ -582,12 +582,12 @@ public class DefaultUIRenderer extends UIRenderer {
Bukkit.getPlayer(player).openInventory(inv); Bukkit.getPlayer(player).openInventory(inv);
open = true; open = true;
} }
}); }));
} }
public void hostPlugin(final int page, final String name) { public void hostPlugin(final int page, final String name) {
setDownloading(ChatColor.stripColor(plugin.api.getLang("SubServers", "Interface.Host-Plugin.Title").replace("$str$", name))); setDownloading(ChatColor.stripColor(plugin.api.getLang("SubServers", "Interface.Host-Plugin.Title").replace("$str$", name)));
plugin.api.getHost(name, host -> { plugin.api.getHost(name, host -> Bukkit.getScheduler().runTask(plugin, () -> {
windowHistory.add(() -> hostPlugin(page, name)); windowHistory.add(() -> hostPlugin(page, name));
if (host == null) { if (host == null) {
if (hasHistory()) back(); if (hasHistory()) back();
@ -690,12 +690,12 @@ public class DefaultUIRenderer extends UIRenderer {
Bukkit.getPlayer(player).openInventory(inv); Bukkit.getPlayer(player).openInventory(inv);
open = true; open = true;
} }
}); }));
} }
public void groupMenu(final int page) { public void groupMenu(final int page) {
setDownloading(ChatColor.stripColor(plugin.api.getLang("SubServers", "Interface.Group-Menu.Title"))); setDownloading(ChatColor.stripColor(plugin.api.getLang("SubServers", "Interface.Group-Menu.Title")));
plugin.api.getServers(servers -> { plugin.api.getServers(servers -> Bukkit.getScheduler().runTask(plugin, () -> {
setDownloading(null); setDownloading(null);
lastVisitedObjects[0] = null; lastVisitedObjects[0] = null;
lastPage = page; lastPage = page;
@ -822,14 +822,14 @@ public class DefaultUIRenderer extends UIRenderer {
Bukkit.getPlayer(player).openInventory(inv); Bukkit.getPlayer(player).openInventory(inv);
open = true; open = true;
}); }));
} }
public void serverMenu(final int page, final String host, final String group) { public void serverMenu(final int page, final String host, final String group) {
setDownloading(ChatColor.stripColor((host == null)?((group == null)?plugin.api.getLang("SubServers", "Interface.Server-Menu.Title"):((group.length() == 0)?plugin.api.getLang("SubServers", "Interface.Group-SubServer.Title-Ungrouped"):plugin.api.getLang("SubServers", "Interface.Group-SubServer.Title").replace("$str$", group))):plugin.api.getLang("SubServers", "Interface.Host-SubServer.Title").replace("$str$", host))); setDownloading(ChatColor.stripColor((host == null)?((group == null)?plugin.api.getLang("SubServers", "Interface.Server-Menu.Title"):((group.length() == 0)?plugin.api.getLang("SubServers", "Interface.Group-SubServer.Title-Ungrouped"):plugin.api.getLang("SubServers", "Interface.Group-SubServer.Title").replace("$str$", group))):plugin.api.getLang("SubServers", "Interface.Host-SubServer.Title").replace("$str$", host)));
Value<String> hostname = new Container<String>(host); Value<String> hostname = new Container<String>(host);
Value<List<Server>> servercontainer = new Container<List<Server>>(new LinkedList<Server>()); Value<List<Server>> servercontainer = new Container<List<Server>>(new LinkedList<Server>());
Runnable renderer = () -> { Runnable renderer = () -> Bukkit.getScheduler().runTask(plugin, () -> {
setDownloading(null); setDownloading(null);
lastPage = page; lastPage = page;
@ -987,7 +987,7 @@ public class DefaultUIRenderer extends UIRenderer {
Bukkit.getPlayer(player).openInventory(inv); Bukkit.getPlayer(player).openInventory(inv);
open = true; open = true;
}; });
if (host != null && host.length() > 0) { if (host != null && host.length() > 0) {
plugin.api.getHost(host, object -> { plugin.api.getHost(host, object -> {
@ -1018,7 +1018,7 @@ public class DefaultUIRenderer extends UIRenderer {
public void serverAdmin(final String name) { public void serverAdmin(final String name) {
setDownloading(ChatColor.stripColor(plugin.api.getLang("SubServers", "Interface.Server-Admin.Title").replace("$str$", name))); setDownloading(ChatColor.stripColor(plugin.api.getLang("SubServers", "Interface.Server-Admin.Title").replace("$str$", name)));
BiConsumer<Server, Host> renderer = (server, host) -> { BiConsumer<Server, Host> renderer = (server, host) -> Bukkit.getScheduler().runTask(plugin, () -> {
setDownloading(null); setDownloading(null);
lastVisitedObjects[0] = server; lastVisitedObjects[0] = server;
ItemStack block; ItemStack block;
@ -1226,7 +1226,7 @@ public class DefaultUIRenderer extends UIRenderer {
player.openInventory(inv); player.openInventory(inv);
open = true; open = true;
}; });
plugin.api.getServer(name, server -> { plugin.api.getServer(name, server -> {
windowHistory.add(() -> serverAdmin(name)); windowHistory.add(() -> serverAdmin(name));
@ -1250,7 +1250,7 @@ public class DefaultUIRenderer extends UIRenderer {
public void serverPlugin(final int page, final String name) { public void serverPlugin(final int page, final String name) {
setDownloading(ChatColor.stripColor(plugin.api.getLang("SubServers", "Interface.SubServer-Plugin.Title").replace("$str$", name))); setDownloading(ChatColor.stripColor(plugin.api.getLang("SubServers", "Interface.SubServer-Plugin.Title").replace("$str$", name)));
plugin.api.getServer(name, server -> { plugin.api.getServer(name, server -> Bukkit.getScheduler().runTask(plugin, () -> {
windowHistory.add(() -> serverPlugin(page, name)); windowHistory.add(() -> serverPlugin(page, name));
if (server == null) { if (server == null) {
if (hasHistory()) back(); if (hasHistory()) back();
@ -1353,6 +1353,6 @@ public class DefaultUIRenderer extends UIRenderer {
Bukkit.getPlayer(player).openInventory(inv); Bukkit.getPlayer(player).openInventory(inv);
open = true; open = true;
} }
}); }));
} }
} }

262
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Metrics.java
View File

@ -1,5 +1,7 @@
package net.ME1312.SubServers.Client.Bukkit.Library; package net.ME1312.SubServers.Client.Bukkit.Library;
import net.ME1312.SubServers.Client.Bukkit.SubAPI;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -23,6 +25,9 @@ import java.util.logging.Level;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.zip.GZIPOutputStream; import java.util.zip.GZIPOutputStream;
/**
* SubServers BStats Metrics Implementation
*/
public class Metrics { public class Metrics {
private final Plugin plugin; private final Plugin plugin;
@ -86,13 +91,21 @@ public class Metrics {
logResponseStatusText); logResponseStatusText);
} }
/**
* Add subservers platform information as custom charts
*/
public Metrics addPlatformCharts() {
return addCustomChart(new SimplePie("subservers_version", () -> SubAPI.getInstance().getPluginVersion().toString()));
}
/** /**
* Adds a custom chart. * Adds a custom chart.
* *
* @param chart The chart to add. * @param chart The chart to add.
*/ */
public void addCustomChart(CustomChart chart) { public Metrics addCustomChart(CustomChart chart) {
metricsBase.addCustomChart(chart); metricsBase.addCustomChart(chart);
return this;
} }
private void appendPlatformData(JsonObjectBuilder builder) { private void appendPlatformData(JsonObjectBuilder builder) {
@ -129,7 +142,7 @@ public class Metrics {
public static class MetricsBase { public static class MetricsBase {
/** The version of the Metrics class. */ /** The version of the Metrics class. */
public static final String METRICS_VERSION = "2.2.1"; public static final String METRICS_VERSION = "3.0.0";
private static final ScheduledExecutorService scheduler = private static final ScheduledExecutorService scheduler =
Executors.newScheduledThreadPool(1, task -> new Thread(task, "bStats-Metrics")); Executors.newScheduledThreadPool(1, task -> new Thread(task, "bStats-Metrics"));
@ -214,6 +227,7 @@ public class Metrics {
this.logResponseStatusText = logResponseStatusText; this.logResponseStatusText = logResponseStatusText;
checkRelocation(); checkRelocation();
if (enabled) { if (enabled) {
// WARNING: Removing the option to opt-out will get your plugin banned from bStats
startSubmitting(); startSubmitting();
} }
} }
@ -350,9 +364,9 @@ public class Metrics {
} }
} }
public static class AdvancedBarChart extends CustomChart { public static class DrilldownPie extends CustomChart {
private final Callable<Map<String, int[]>> callable; private final Callable<Map<String, Map<String, Integer>>> callable;
/** /**
* Class constructor. * Class constructor.
@ -360,99 +374,33 @@ public class Metrics {
* @param chartId The id of the chart. * @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data. * @param callable The callable which is used to request the chart data.
*/ */
public AdvancedBarChart(String chartId, Callable<Map<String, int[]>> callable) { public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) {
super(chartId); super(chartId);
this.callable = callable; this.callable = callable;
} }
@Override @Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception { public JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, int[]> map = callable.call(); Map<String, Map<String, Integer>> map = callable.call();
if (map == null || map.isEmpty()) { if (map == null || map.isEmpty()) {
// Null = skip the chart // Null = skip the chart
return null; return null;
} }
boolean reallyAllSkipped = true;
for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
JsonObjectBuilder valueBuilder = new JsonObjectBuilder();
boolean allSkipped = true; boolean allSkipped = true;
for (Map.Entry<String, int[]> entry : map.entrySet()) { for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) {
if (entry.getValue().length == 0) { valueBuilder.appendField(valueEntry.getKey(), valueEntry.getValue());
// Skip this invalid
continue;
}
allSkipped = false; allSkipped = false;
valuesBuilder.appendField(entry.getKey(), entry.getValue());
} }
if (allSkipped) { if (!allSkipped) {
// Null = skip the chart reallyAllSkipped = false;
return null; valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build());
}
return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
} }
} }
if (reallyAllSkipped) {
public static class SimpleBarChart extends CustomChart {
private final Callable<Map<String, Integer>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public SimpleBarChart(String chartId, Callable<Map<String, Integer>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Integer> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
for (Map.Entry<String, Integer> entry : map.entrySet()) {
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<Map<String, Integer>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Integer> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
boolean allSkipped = true;
for (Map.Entry<String, Integer> entry : map.entrySet()) {
if (entry.getValue() == 0) {
// Skip this invalid
continue;
}
allSkipped = false;
valuesBuilder.appendField(entry.getKey(), entry.getValue());
}
if (allSkipped) {
// Null = skip the chart // Null = skip the chart
return null; return null;
} }
@ -500,6 +448,76 @@ public class Metrics {
} }
} }
public static class MultiLineChart extends CustomChart {
private final Callable<Map<String, Integer>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Integer> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
boolean allSkipped = true;
for (Map.Entry<String, Integer> entry : map.entrySet()) {
if (entry.getValue() == 0) {
// 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<Map<String, Integer>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public SimpleBarChart(String chartId, Callable<Map<String, Integer>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Integer> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
for (Map.Entry<String, Integer> entry : map.entrySet()) {
valuesBuilder.appendField(entry.getKey(), new int[] {entry.getValue()});
}
return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
}
}
public abstract static class CustomChart { public abstract static class CustomChart {
private final String chartId; private final String chartId;
@ -534,32 +552,6 @@ public class Metrics {
protected abstract JsonObjectBuilder.JsonObject getChartData() throws Exception; protected abstract JsonObjectBuilder.JsonObject getChartData() throws Exception;
} }
public static class SingleLineChart extends CustomChart {
private final Callable<Integer> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public SingleLineChart(String chartId, Callable<Integer> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected 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 { public static class SimplePie extends CustomChart {
private final Callable<String> callable; private final Callable<String> callable;
@ -586,9 +578,9 @@ public class Metrics {
} }
} }
public static class DrilldownPie extends CustomChart { public static class AdvancedBarChart extends CustomChart {
private final Callable<Map<String, Map<String, Integer>>> callable; private final Callable<Map<String, int[]>> callable;
/** /**
* Class constructor. * Class constructor.
@ -596,33 +588,29 @@ public class Metrics {
* @param chartId The id of the chart. * @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data. * @param callable The callable which is used to request the chart data.
*/ */
public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) { public AdvancedBarChart(String chartId, Callable<Map<String, int[]>> callable) {
super(chartId); super(chartId);
this.callable = callable; this.callable = callable;
} }
@Override @Override
public JsonObjectBuilder.JsonObject getChartData() throws Exception { protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Map<String, Integer>> map = callable.call(); Map<String, int[]> map = callable.call();
if (map == null || map.isEmpty()) { if (map == null || map.isEmpty()) {
// Null = skip the chart // Null = skip the chart
return null; return null;
} }
boolean reallyAllSkipped = true;
for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
JsonObjectBuilder valueBuilder = new JsonObjectBuilder();
boolean allSkipped = true; boolean allSkipped = true;
for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) { for (Map.Entry<String, int[]> entry : map.entrySet()) {
valueBuilder.appendField(valueEntry.getKey(), valueEntry.getValue()); if (entry.getValue().length == 0) {
// Skip this invalid
continue;
}
allSkipped = false; allSkipped = false;
valuesBuilder.appendField(entry.getKey(), entry.getValue());
} }
if (!allSkipped) { if (allSkipped) {
reallyAllSkipped = false;
valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build());
}
}
if (reallyAllSkipped) {
// Null = skip the chart // Null = skip the chart
return null; return null;
} }
@ -630,6 +618,32 @@ public class Metrics {
} }
} }
public static class SingleLineChart extends CustomChart {
private final Callable<Integer> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public SingleLineChart(String chartId, Callable<Integer> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected 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();
}
}
/** /**
* An extremely simple JSON builder. * An extremely simple JSON builder.
* *

6
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Placeholders.java
View File

@ -591,9 +591,9 @@ public final class Placeholders {
} }
public final class Cache { public final class Cache {
private Map<String, Proxy> proxies = Collections.emptyMap(); private Map<String, Proxy> proxies = new TreeMap<>();
private Map<String, Host> hosts = Collections.emptyMap(); private Map<String, Host> hosts = new TreeMap<>();
private Map<String, Server> servers = Collections.emptyMap(); private Map<String, Server> servers = new TreeMap<>();
private Proxy master = null; private Proxy master = null;
private Listener events = new Events(); private Listener events = new Events();

42
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/SignState.java Normal file
View File

@ -0,0 +1,42 @@
package net.ME1312.SubServers.Client.Bukkit.Library;
import net.ME1312.SubServers.Client.Common.Network.API.Server;
import net.ME1312.SubServers.Client.Common.Network.API.SubServer;
public enum SignState {
UNKNOWN(0, "Signs.Text.Unknown"),
OFFLINE(1, "Signs.Text.Offline"),
STARTING(3, "Signs.Text.Starting"),
ONLINE(4, "Signs.Text.Online"),
STOPPING(2, "Signs.Text.Stopping"),
;
public final byte priority;
public final String text;
SignState(int priority, String text) {
this.priority = (byte) priority;
this.text = text;
}
public static SignState determine(SubServer server) {
if (!server.isRunning()) {
return SignState.OFFLINE;
} else if (server.isStopping()) {
return SignState.STOPPING;
} else if (server.isOnline()) {
return SignState.ONLINE;
} else {
return SignState.STARTING;
}
}
public static SignState determine(Server server) {
if (server instanceof SubServer) {
return determine((SubServer) server);
} else if (server.getSubData()[0] == null) {
return SignState.UNKNOWN;
} else {
return SignState.ONLINE;
}
}
}

8
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java
View File

@ -115,9 +115,7 @@ public class SubProtocol extends SubDataProtocol {
return instance; return instance;
} }
@SuppressWarnings("deprecation")
private Logger getLogger(int channel) { private Logger getLogger(int channel) {
SubPlugin plugin = SubAPI.getInstance().getInternals();
Logger log = Logger.getAnonymousLogger(); Logger log = Logger.getAnonymousLogger();
log.setUseParentHandlers(false); log.setUseParentHandlers(false);
log.addHandler(new Handler() { log.addHandler(new Handler() {
@ -127,13 +125,9 @@ public class SubProtocol extends SubDataProtocol {
@Override @Override
public void publish(LogRecord record) { public void publish(LogRecord record) {
if (open) { if (open) {
if (plugin.isEnabled()) {
Bukkit.getScheduler().runTask(plugin, () -> Bukkit.getLogger().log(record.getLevel(), prefix + " > " + record.getMessage(), record.getParameters()));
} else {
Bukkit.getLogger().log(record.getLevel(), prefix + " > " + record.getMessage(), record.getParameters()); Bukkit.getLogger().log(record.getLevel(), prefix + " > " + record.getMessage(), record.getParameters());
} }
} }
}
@Override @Override
public void flush() { public void flush() {
@ -193,7 +187,7 @@ public class SubProtocol extends SubDataProtocol {
public SubDataClient open(Logger logger, InetAddress address, int port) throws IOException { public SubDataClient open(Logger logger, InetAddress address, int port) throws IOException {
SubPlugin plugin = SubAPI.getInstance().getInternals(); SubPlugin plugin = SubAPI.getInstance().getInternals();
return open(event -> { return open(event -> {
if (plugin.isEnabled()) Bukkit.getScheduler().runTask(plugin, event); if (plugin.isEnabled()) Bukkit.getScheduler().runTaskAsynchronously(plugin, event);
else event.run(); else event.run();
}, logger, address, port); }, logger, address, port);
} }

6
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubCommand.java
View File

@ -63,7 +63,7 @@ public final class SubCommand extends Command {
if (sender.hasPermission("subservers.command")) { if (sender.hasPermission("subservers.command")) {
if (args.length > 0) { if (args.length > 0) {
if (args[0].equalsIgnoreCase("help") || args[0].equalsIgnoreCase("?")) { if (args[0].equalsIgnoreCase("help") || args[0].equalsIgnoreCase("?")) {
sender.sendMessage(printHelp(sender, label)); sender.sendMessage(printHelp(label));
} else if (args[0].equalsIgnoreCase("version") || args[0].equalsIgnoreCase("ver")) { } else if (args[0].equalsIgnoreCase("version") || args[0].equalsIgnoreCase("ver")) {
sender.sendMessage(plugin.api.getLang("SubServers", "Command.Version").replace("$str$", "SubServers.Client.Bukkit")); sender.sendMessage(plugin.api.getLang("SubServers", "Command.Version").replace("$str$", "SubServers.Client.Bukkit"));
sender.sendMessage(ChatColor.WHITE + " " + Platform.getSystemName() + ' ' + Platform.getSystemVersion() + ((Platform.getSystemBuild() != null)?" (" + Platform.getSystemBuild() + ')':"") + ((!Platform.getSystemArchitecture().equals("unknown"))?" [" + Platform.getSystemArchitecture() + ']':"") + ChatColor.RESET + ','); sender.sendMessage(ChatColor.WHITE + " " + Platform.getSystemName() + ' ' + Platform.getSystemVersion() + ((Platform.getSystemBuild() != null)?" (" + Platform.getSystemBuild() + ')':"") + ((!Platform.getSystemArchitecture().equals("unknown"))?" [" + Platform.getSystemArchitecture() + ']':"") + ChatColor.RESET + ',');
@ -838,7 +838,7 @@ public final class SubCommand extends Command {
if (plugin.gui != null && sender instanceof Player && sender.hasPermission("subservers.interface")) { if (plugin.gui != null && sender instanceof Player && sender.hasPermission("subservers.interface")) {
plugin.gui.getRenderer((Player) sender).newUI(); plugin.gui.getRenderer((Player) sender).newUI();
} else { } else {
sender.sendMessage(printHelp(sender, label)); sender.sendMessage(printHelp(label));
} }
} }
} else if (args.length > 0 && (args[0].equalsIgnoreCase("tp") || args[0].equalsIgnoreCase("teleport"))) { } else if (args.length > 0 && (args[0].equalsIgnoreCase("tp") || args[0].equalsIgnoreCase("teleport"))) {
@ -1118,7 +1118,7 @@ public final class SubCommand extends Command {
} }
} }
private String[] printHelp(CommandSender sender, String label) { private String[] printHelp(String label) {
return new String[]{ return new String[]{
plugin.api.getLang("SubServers", "Command.Help.Header"), plugin.api.getLang("SubServers", "Command.Help.Header"),
plugin.api.getLang("SubServers", "Command.Help.Help").replace("$str$", label.toLowerCase() + " help"), plugin.api.getLang("SubServers", "Command.Help.Help").replace("$str$", label.toLowerCase() + " help"),

13
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java
View File

@ -52,6 +52,7 @@ public final class SubPlugin extends JavaPlugin {
public SubProtocol subprotocol; public SubProtocol subprotocol;
public UIHandler gui = null; public UIHandler gui = null;
public SubSigns signs = null;
public final Version version; public final Version version;
public final SubAPI api = new SubAPI(this); public final SubAPI api = new SubAPI(this);
public final Placeholders phi = new Placeholders(this); public final Placeholders phi = new Placeholders(this);
@ -130,7 +131,7 @@ public final class SubPlugin extends JavaPlugin {
gui = new DefaultUIHandler(this); gui = new DefaultUIHandler(this);
if (api.access.value > NO_COMMANDS.value && !config.get().getMap("Settings").getBoolean("API-Only-Mode", false)) { if (api.access.value > NO_COMMANDS.value && !config.get().getMap("Settings").getBoolean("API-Only-Mode", false)) {
Bukkit.getPluginManager().registerEvents(new SubSigns(this, new File(dir, "signs.dat")), this); signs = new SubSigns(this, new File(dir, "signs.dat"));
CommandMap cmd = Util.reflect(Bukkit.getServer().getClass().getDeclaredField("commandMap"), Bukkit.getServer()); CommandMap cmd = Util.reflect(Bukkit.getServer().getClass().getDeclaredField("commandMap"), Bukkit.getServer());
cmd.register("subservers", new SubCommand(this, "subservers")); cmd.register("subservers", new SubCommand(this, "subservers"));
@ -176,9 +177,9 @@ public final class SubPlugin extends JavaPlugin {
if (notifyPlugins) { if (notifyPlugins) {
List<Runnable> listeners = api.reloadListeners; List<Runnable> listeners = api.reloadListeners;
if (listeners.size() > 0) { if (listeners.size() > 0) {
for (Object obj : listeners) { for (Runnable listener : listeners) {
try { try {
((Runnable) obj).run(); listener.run();
} catch (Throwable e) { } catch (Throwable e) {
new InvocationTargetException(e, "Problem reloading plugin").printStackTrace(); new InvocationTargetException(e, "Problem reloading plugin").printStackTrace();
} }
@ -206,10 +207,10 @@ public final class SubPlugin extends JavaPlugin {
} catch (IOException e) { } catch (IOException e) {
Bukkit.getLogger().info("SubData > Connection was unsuccessful, retrying in " + reconnect + " seconds"); Bukkit.getLogger().info("SubData > Connection was unsuccessful, retrying in " + reconnect + " seconds");
Bukkit.getScheduler().runTaskLater(SubPlugin.this, this, reconnect * 20); Bukkit.getScheduler().runTaskLater(SubPlugin.this, this, reconnect * 20L);
} }
} }
}, (disconnect == null)?0:reconnect * 20); }, (disconnect == null)?0:reconnect * 20L);
} }
} }
@ -230,7 +231,7 @@ public final class SubPlugin extends JavaPlugin {
} }
subdata.clear(); subdata.clear();
subdata.put(0, null); subdata.put(0, null);
SubSigns.save(); if (signs != null) signs.save();
} catch (IOException | InterruptedException e) { } catch (IOException | InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }

135
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubSigns.java
View File

@ -7,6 +7,7 @@ import net.ME1312.SubServers.Client.Bukkit.Event.SubStartedEvent;
import net.ME1312.SubServers.Client.Bukkit.Event.SubStopEvent; import net.ME1312.SubServers.Client.Bukkit.Event.SubStopEvent;
import net.ME1312.SubServers.Client.Bukkit.Event.SubStoppedEvent; import net.ME1312.SubServers.Client.Bukkit.Event.SubStoppedEvent;
import net.ME1312.SubServers.Client.Bukkit.Library.Compatibility.OfflineBlock; import net.ME1312.SubServers.Client.Bukkit.Library.Compatibility.OfflineBlock;
import net.ME1312.SubServers.Client.Bukkit.Library.SignState;
import net.ME1312.SubServers.Client.Common.Network.API.Host; import net.ME1312.SubServers.Client.Common.Network.API.Host;
import net.ME1312.SubServers.Client.Common.Network.API.Server; import net.ME1312.SubServers.Client.Common.Network.API.Server;
import net.ME1312.SubServers.Client.Common.Network.API.SubServer; import net.ME1312.SubServers.Client.Common.Network.API.SubServer;
@ -37,20 +38,21 @@ import java.util.function.Supplier;
* SubServers Signs Class * SubServers Signs Class
*/ */
public class SubSigns implements Listener { public class SubSigns implements Listener {
private static final HashMap<OfflineBlock, String> data = new HashMap<OfflineBlock, String>(); private final HashMap<OfflineBlock, String> data = new HashMap<OfflineBlock, String>();
private static final HashMap<String, Location> locations = new HashMap<String, Location>(); private final HashMap<String, Location> locations = new HashMap<String, Location>();
private static HashMap<Location, Supplier<?>> signs = new HashMap<Location, Supplier<?>>(); private HashMap<Location, Supplier<?>> signs = new HashMap<Location, Supplier<?>>();
private static File file; private final File file;
private final SubPlugin plugin; private final SubPlugin plugin;
private boolean active = false; private boolean active = false;
SubSigns(SubPlugin plugin, File file) throws IOException { SubSigns(SubPlugin plugin, File file) throws IOException {
this.plugin = plugin; this.plugin = plugin;
SubSigns.file = file; this.file = file;
load(); this.load();
Bukkit.getPluginManager().registerEvents(this, plugin);
} }
public static void save() throws IOException { public void save() throws IOException {
if (!data.isEmpty() || (file.exists() && !file.delete())) { if (!data.isEmpty() || (file.exists() && !file.delete())) {
FileOutputStream raw = new FileOutputStream(file, false); FileOutputStream raw = new FileOutputStream(file, false);
EscapedOutputStream escaped = new EscapedOutputStream(raw, '\u001B', '\u0003'); EscapedOutputStream escaped = new EscapedOutputStream(raw, '\u001B', '\u0003');
@ -130,11 +132,11 @@ public class SubSigns implements Listener {
Supplier<?> translator = translate(name); Supplier<?> translator = translate(name);
Location location = e.getBlock().getLocation(); Location location = e.getBlock().getLocation();
HashMap<Location, Supplier<?>> signs = new HashMap<Location, Supplier<?>>(SubSigns.signs); HashMap<Location, Supplier<?>> signs = new HashMap<Location, Supplier<?>>(this.signs);
signs.put(location, translator); signs.put(location, translator);
SubSigns.data.put(new OfflineBlock(location), name); this.data.put(new OfflineBlock(location), name);
SubSigns.signs = signs; this.signs = signs;
SubSigns.locations.put(name.toLowerCase(), location); this.locations.put(name.toLowerCase(), location);
listen(); listen();
refresh(e.getBlock(), translator); refresh(e.getBlock(), translator);
@ -178,6 +180,30 @@ public class SubSigns implements Listener {
} }
} }
@EventHandler(priority = EventPriority.MONITOR)
public void refresh(SubStartEvent e) {
refresh(e.getServer());
}
@EventHandler(priority = EventPriority.MONITOR)
public void refresh(SubStartedEvent e) {
refresh(e.getServer());
}
@EventHandler(priority = EventPriority.MONITOR)
public void refresh(SubStopEvent e) {
refresh(e.getServer());
}
@EventHandler(priority = EventPriority.MONITOR)
public void refresh(SubStoppedEvent e) {
refresh(e.getServer());
}
private void refresh(String name) {
refresh(plugin.phi.cache.getSubServer(name));
}
private void refresh(SubServer server) { private void refresh(SubServer server) {
if (server != null && plugin.lang != null) { if (server != null && plugin.lang != null) {
Location location = locations.get(server.getName().toLowerCase()); Location location = locations.get(server.getName().toLowerCase());
@ -195,56 +221,20 @@ public class SubSigns implements Listener {
} }
} }
private enum Text {
UNKNOWN(0, "Signs.Text.Unknown"),
OFFLINE(1, "Signs.Text.Offline"),
STARTING(3, "Signs.Text.Starting"),
ONLINE(4, "Signs.Text.Online"),
STOPPING(2, "Signs.Text.Stopping"),
;
private final byte priority;
private final String text;
Text(int priority, String text) {
this.priority = (byte) priority;
this.text = text;
}
private static Text determine(SubServer server) {
if (!server.isRunning()) {
return Text.OFFLINE;
} else if (server.isStopping()) {
return Text.STOPPING;
} else if (server.isOnline()) {
return Text.ONLINE;
} else {
return Text.STARTING;
}
}
private static Text determine(Server server) {
if (server instanceof SubServer) {
return determine((SubServer) server);
} else if (server.getSubData()[0] == null) {
return Text.UNKNOWN;
} else {
return Text.ONLINE;
}
}
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private void refresh(Block block, Supplier<?> translator) { private void refresh(Block block, Supplier<?> translator) {
Bukkit.getScheduler().runTask(plugin, () -> {
if (block.getState() instanceof Sign) { if (block.getState() instanceof Sign) {
Object object = translator.get(); Object object = translator.get();
String name; String name;
int players = 0; int players = 0;
Sign sign = (Sign) block.getState(); Sign sign = (Sign) block.getState();
Text state = Text.UNKNOWN; SignState state = SignState.UNKNOWN;
if (object instanceof Server) { if (object instanceof Server) {
Server server = (Server) object; Server server = (Server) object;
state = Text.determine(server); state = SignState.determine(server);
name = server.getDisplayName(); name = server.getDisplayName();
players = server.getRemotePlayers().size(); players = server.getRemotePlayers().size();
@ -252,10 +242,10 @@ public class SubSigns implements Listener {
Pair<String, List<Server>> group = (Pair<String, List<Server>>) object; Pair<String, List<Server>> group = (Pair<String, List<Server>>) object;
name = group.key(); name = group.key();
Text incoming; SignState incoming;
for (Server server : group.value()) { for (Server server : group.value()) {
players += server.getRemotePlayers().size(); players += server.getRemotePlayers().size();
incoming = Text.determine(server); incoming = SignState.determine(server);
if (incoming.priority > state.priority) if (incoming.priority > state.priority)
state = incoming; state = incoming;
} }
@ -263,10 +253,10 @@ public class SubSigns implements Listener {
Host host = (Host) object; Host host = (Host) object;
name = host.getDisplayName(); name = host.getDisplayName();
Text incoming; SignState incoming;
for (SubServer server : host.getSubServers().values()) { for (SubServer server : host.getSubServers().values()) {
players += server.getRemotePlayers().size(); players += server.getRemotePlayers().size();
incoming = Text.determine(server); incoming = SignState.determine(server);
if (incoming.priority > state.priority) if (incoming.priority > state.priority)
state = incoming; state = incoming;
} }
@ -282,8 +272,9 @@ public class SubSigns implements Listener {
} else { } else {
sign.setLine(i, ""); sign.setLine(i, "");
} }
Bukkit.getScheduler().runTask(plugin, sign::update); sign.update();
} }
});
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@ -307,12 +298,12 @@ public class SubSigns implements Listener {
return; return;
} }
Text incoming, state = Text.UNKNOWN; SignState incoming, state = SignState.UNKNOWN;
List<Server> selected = new ArrayList<>(); List<Server> selected = new ArrayList<>();
for (Server server : servers) { for (Server server : servers) {
incoming = Text.determine(server); incoming = SignState.determine(server);
if (incoming != Text.STOPPING) { if (incoming != SignState.STOPPING) {
if (incoming == Text.OFFLINE) { if (incoming == SignState.OFFLINE) {
SubServer subserver = (SubServer) server; SubServer subserver = (SubServer) server;
if (!subserver.isEnabled() || !subserver.isAvailable() || subserver.getCurrentIncompatibilities().size() != 0) continue; if (!subserver.isEnabled() || !subserver.isAvailable() || subserver.getCurrentIncompatibilities().size() != 0) continue;
} }
@ -329,7 +320,7 @@ public class SubSigns implements Listener {
if (selected.size() > 0) { if (selected.size() > 0) {
Server server = selected.get(new Random().nextInt(selected.size())); Server server = selected.get(new Random().nextInt(selected.size()));
if (state == Text.OFFLINE) { if (state == SignState.OFFLINE) {
((SubServer) server).start(); ((SubServer) server).start();
} else { } else {
player.sendMessage(plugin.api.getLang("SubServers", "Command.Teleport").replace("$name$", player.getName()).replace("$str$", server.getDisplayName())); player.sendMessage(plugin.api.getLang("SubServers", "Command.Teleport").replace("$name$", player.getName()).replace("$str$", server.getDisplayName()));
@ -350,9 +341,9 @@ public class SubSigns implements Listener {
String name = data.remove(new OfflineBlock(location)); String name = data.remove(new OfflineBlock(location));
if (name != null) locations.remove(name.toLowerCase()); if (name != null) locations.remove(name.toLowerCase());
HashMap<Location, Supplier<?>> signs = new HashMap<Location, Supplier<?>>(SubSigns.signs); HashMap<Location, Supplier<?>> signs = new HashMap<Location, Supplier<?>>(this.signs);
signs.remove(location); signs.remove(location);
SubSigns.signs = signs; this.signs = signs;
player.sendMessage(plugin.api.getLang("SubServers", "Signs.Delete")); player.sendMessage(plugin.api.getLang("SubServers", "Signs.Delete"));
} else { } else {
@ -360,24 +351,4 @@ public class SubSigns implements Listener {
} }
} }
} }
@EventHandler(priority = EventPriority.MONITOR)
public void start(SubStartEvent e) {
refresh(plugin.phi.cache.getSubServer(e.getServer()));
}
@EventHandler(priority = EventPriority.MONITOR)
public void started(SubStartedEvent e) {
refresh(plugin.phi.cache.getSubServer(e.getServer()));
}
@EventHandler(priority = EventPriority.MONITOR)
public void stopping(SubStopEvent e) {
refresh(plugin.phi.cache.getSubServer(e.getServer()));
}
@EventHandler(priority = EventPriority.MONITOR)
public void stopped(SubStoppedEvent e) {
refresh(plugin.phi.cache.getSubServer(e.getServer()));
}
} }

2
SubServers.Client/Common/pom.xml
View File

@ -24,7 +24,7 @@
<dependency> <dependency>
<groupId>net.ME1312.SubData</groupId> <groupId>net.ME1312.SubData</groupId>
<artifactId>Client</artifactId> <artifactId>Client</artifactId>
<version>22w11a</version> <version>22w11c</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>

4
SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/Metrics.java
View File

@ -22,9 +22,7 @@ import java.util.*;
import java.util.zip.GZIPOutputStream; import java.util.zip.GZIPOutputStream;
/** /**
* bStats collects some data for plugin authors. * SubServers BStats Metrics Implementation
*
* Check out https://bStats.org/ to learn more about bStats!
*/ */
public class Metrics { public class Metrics {

4
SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java
View File

@ -178,9 +178,9 @@ public final class SubPlugin {
if (notifyPlugins) { if (notifyPlugins) {
List<Runnable> listeners = api.reloadListeners; List<Runnable> listeners = api.reloadListeners;
if (listeners.size() > 0) { if (listeners.size() > 0) {
for (Object obj : listeners) { for (Runnable listener : listeners) {
try { try {
((Runnable) obj).run(); listener.run();
} catch (Throwable e) { } catch (Throwable e) {
new InvocationTargetException(e, "Problem reloading plugin").printStackTrace(); new InvocationTargetException(e, "Problem reloading plugin").printStackTrace();
} }

6
SubServers.Console/pom.xml
View File

@ -33,6 +33,12 @@
<version>1.8-SNAPSHOT</version> <version>1.8-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>net.ME1312.SubServers</groupId>
<artifactId>SubServers.Bungee.Common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>net.ME1312.SubServers</groupId> <groupId>net.ME1312.SubServers</groupId>
<artifactId>SubServers.Bungee</artifactId> <artifactId>SubServers.Bungee</artifactId>

2
SubServers.Console/src/net/ME1312/SubServers/Console/ConsolePlugin.java
View File

@ -37,7 +37,7 @@ public final class ConsolePlugin extends Plugin implements Listener {
getProxy().getPluginManager().registerCommand(this, new ConsoleCommand.AUTO_POPOUT(this, "apopout")); getProxy().getPluginManager().registerCommand(this, new ConsoleCommand.AUTO_POPOUT(this, "apopout"));
getProxy().getPluginManager().registerCommand(this, new ConsoleCommand.AUTO_POPOUT(this, "autopopout")); getProxy().getPluginManager().registerCommand(this, new ConsoleCommand.AUTO_POPOUT(this, "autopopout"));
new Metrics(this, 3853).appendPluginData(); new Metrics(this, 3853).addPlatformCharts();
try { try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

10
SubServers.Host/src/net/ME1312/SubServers/Host/Library/Compatibility/JNA.java
View File

@ -34,7 +34,7 @@ public class JNA {
File jna = new File(library, "jna-" + JNA_VERSION + ".jar"); File jna = new File(library, "jna-" + JNA_VERSION + ".jar");
jna.getParentFile().mkdirs(); jna.getParentFile().mkdirs();
if (!jna.exists()) { if (!jna.exists()) {
log.info.println("Downloading JNA Library v" + JNA_VERSION); log.info.println("Downloading JNA v" + JNA_VERSION);
announced = true; announced = true;
try (InputStream in = new URL(JNA_DOWNLOAD.replace("$1", "jna")).openStream()) { try (InputStream in = new URL(JNA_DOWNLOAD.replace("$1", "jna")).openStream()) {
Files.copy(in, jna.toPath(), StandardCopyOption.REPLACE_EXISTING); Files.copy(in, jna.toPath(), StandardCopyOption.REPLACE_EXISTING);
@ -46,7 +46,7 @@ public class JNA {
File platform = new File(library, "jna-platform-" + JNA_VERSION + ".jar"); File platform = new File(library, "jna-platform-" + JNA_VERSION + ".jar");
platform.getParentFile().mkdirs(); platform.getParentFile().mkdirs();
if (!platform.exists()) { if (!platform.exists()) {
if (!announced) log.info.println("Downloading JNA Library v" + JNA_VERSION); if (!announced) log.info.println("Downloading JNA platform v" + JNA_VERSION);
announced = true; announced = true;
try (InputStream in = new URL(JNA_DOWNLOAD.replace("$1", "jna-platform")).openStream()) { try (InputStream in = new URL(JNA_DOWNLOAD.replace("$1", "jna-platform")).openStream()) {
Files.copy(in, platform.toPath(), StandardCopyOption.REPLACE_EXISTING); Files.copy(in, platform.toPath(), StandardCopyOption.REPLACE_EXISTING);
@ -56,15 +56,15 @@ public class JNA {
} }
} }
if (jna.exists() && platform.exists()) { if (jna.exists() && platform.exists()) {
if (announced) log.info.println("Loading JNA Library"); if (announced) log.info.println("JNA download complete");
try { try {
JNA = new URLClassLoader(new URL[]{jna.toURI().toURL(), platform.toURI().toURL()}); JNA = new URLClassLoader(new URL[]{jna.toURI().toURL(), platform.toURI().toURL()});
} catch (Throwable e) { } catch (Throwable e) {
log.error.println("Could not load JNA Library:"); log.error.println("Couldn't load JNA:");
log.error.println(e); log.error.println(e);
} }
} else { } else {
log.error.println("Could not load JNA Library:"); log.error.println("Couldn't load JNA:");
log.error.println(new FileNotFoundException()); log.error.println(new FileNotFoundException());
} }
} }

4
SubServers.Host/src/net/ME1312/SubServers/Host/Library/Metrics.java
View File

@ -20,9 +20,7 @@ import java.util.regex.Pattern;
import java.util.zip.GZIPOutputStream; import java.util.zip.GZIPOutputStream;
/** /**
* bStats collects some data for plugin authors. * SubServers BStats Metrics Implementation
*
* Check out https://bStats.org/ to learn more about bStats!
*/ */
public class Metrics { public class Metrics {

2
SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInExReload.java
View File

@ -28,7 +28,7 @@ public class PacketInExReload implements PacketObjectIn<Integer> {
@Override @Override
public void receive(SubDataSender client, ObjectMap<Integer> data) { public void receive(SubDataSender client, ObjectMap<Integer> data) {
Logger log = Try.all.get(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection()), null); Logger log = Try.all.get(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection()), null);
if (data != null && data.contains(0x0000)) log.warning("Received request for a plugin reload: " + data.getString(0x0000)); if (data != null && data.contains(0x0000)) log.warning("Received request for an app reload: " + data.getString(0x0000));
// else log.warning("Received request for a plugin reload"); // else log.warning("Received request for a plugin reload");
new Thread(() -> { new Thread(() -> {
try { try {

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddHostEvent.java
View File

@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event; package net.ME1312.SubServers.Sync.Event;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.SubServers.Bungee.Library.SubEvent;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddProxyEvent.java
View File

@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event; package net.ME1312.SubServers.Sync.Event;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.SubServers.Bungee.Library.SubEvent;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddServerEvent.java
View File

@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event; package net.ME1312.SubServers.Sync.Event;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.SubServers.Bungee.Library.SubEvent;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreateEvent.java
View File

@ -2,8 +2,8 @@ package net.ME1312.SubServers.Sync.Event;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.SubServers.Bungee.Library.SubEvent;
import net.ME1312.SubServers.Client.Common.Network.API.SubServer; import net.ME1312.SubServers.Client.Common.Network.API.SubServer;
import net.ME1312.SubServers.Sync.Library.SubEvent;
import net.ME1312.SubServers.Sync.SubAPI; import net.ME1312.SubServers.Sync.SubAPI;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreatedEvent.java
View File

@ -2,8 +2,8 @@ package net.ME1312.SubServers.Sync.Event;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.SubServers.Bungee.Library.SubEvent;
import net.ME1312.SubServers.Client.Common.Network.API.SubServer; import net.ME1312.SubServers.Client.Common.Network.API.SubServer;
import net.ME1312.SubServers.Sync.Library.SubEvent;
import net.ME1312.SubServers.Sync.SubAPI; import net.ME1312.SubServers.Sync.SubAPI;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubEditServerEvent.java
View File

@ -5,7 +5,7 @@ import net.ME1312.Galaxi.Library.Container.Pair;
import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Map.ObjectMapValue; import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.SubServers.Bungee.Library.SubEvent;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkConnectEvent.java
View File

@ -2,7 +2,7 @@ package net.ME1312.SubServers.Sync.Event;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.DataClient;
import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.SubServers.Bungee.Library.SubEvent;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkDisconnectEvent.java
View File

@ -3,7 +3,7 @@ package net.ME1312.SubServers.Sync.Event;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.DataClient;
import net.ME1312.SubData.Client.Library.DisconnectReason; import net.ME1312.SubData.Client.Library.DisconnectReason;
import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.SubServers.Bungee.Library.SubEvent;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveHostEvent.java
View File

@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event; package net.ME1312.SubServers.Sync.Event;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.SubServers.Bungee.Library.SubEvent;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveProxyEvent.java
View File

@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event; package net.ME1312.SubServers.Sync.Event;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.SubServers.Bungee.Library.SubEvent;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveServerEvent.java
View File

@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event; package net.ME1312.SubServers.Sync.Event;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.SubServers.Bungee.Library.SubEvent;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubSendCommandEvent.java
View File

@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event; package net.ME1312.SubServers.Sync.Event;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.SubServers.Bungee.Library.SubEvent;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartEvent.java
View File

@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event; package net.ME1312.SubServers.Sync.Event;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.SubServers.Bungee.Library.SubEvent;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartedEvent.java
View File

@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event; package net.ME1312.SubServers.Sync.Event;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.SubServers.Bungee.Library.SubEvent;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStopEvent.java
View File

@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event; package net.ME1312.SubServers.Sync.Event;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.SubServers.Bungee.Library.SubEvent;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStoppedEvent.java
View File

@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event; package net.ME1312.SubServers.Sync.Event;
import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.SubServers.Bungee.Library.SubEvent;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

5
SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java
View File

@ -17,13 +17,13 @@ import net.ME1312.SubServers.Bungee.BungeeCommon;
import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger; import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
import net.ME1312.SubServers.Bungee.Library.Fallback.FallbackState; import net.ME1312.SubServers.Bungee.Library.Fallback.FallbackState;
import net.ME1312.SubServers.Bungee.Library.Fallback.SmartFallback; import net.ME1312.SubServers.Bungee.Library.Fallback.SmartFallback;
import net.ME1312.SubServers.Bungee.Library.Metrics;
import net.ME1312.SubServers.Client.Common.Network.Packet.PacketDisconnectPlayer; import net.ME1312.SubServers.Client.Common.Network.Packet.PacketDisconnectPlayer;
import net.ME1312.SubServers.Sync.Event.SubAddServerEvent; import net.ME1312.SubServers.Sync.Event.SubAddServerEvent;
import net.ME1312.SubServers.Sync.Event.SubRemoveServerEvent; import net.ME1312.SubServers.Sync.Event.SubRemoveServerEvent;
import net.ME1312.SubServers.Sync.Event.SubStartEvent; import net.ME1312.SubServers.Sync.Event.SubStartEvent;
import net.ME1312.SubServers.Sync.Event.SubStoppedEvent; import net.ME1312.SubServers.Sync.Event.SubStoppedEvent;
import net.ME1312.SubServers.Sync.Library.ConfigUpdater; import net.ME1312.SubServers.Sync.Library.ConfigUpdater;
import net.ME1312.SubServers.Sync.Library.Metrics;
import net.ME1312.SubServers.Sync.Network.Packet.PacketExSyncPlayer; import net.ME1312.SubServers.Sync.Network.Packet.PacketExSyncPlayer;
import net.ME1312.SubServers.Sync.Network.SubProtocol; import net.ME1312.SubServers.Sync.Network.SubProtocol;
import net.ME1312.SubServers.Sync.Server.CachedPlayer; import net.ME1312.SubServers.Sync.Server.CachedPlayer;
@ -267,7 +267,8 @@ public final class ExProxy extends BungeeCommon implements Listener {
if (getReconnectHandler() != null && getReconnectHandler().getClass().equals(SmartFallback.class)) if (getReconnectHandler() != null && getReconnectHandler().getClass().equals(SmartFallback.class))
setReconnectHandler(new SmartFallback(config.get().getMap("Settings").getMap("Smart-Fallback", new ObjectMap<>()))); // Re-initialize Smart Fallback setReconnectHandler(new SmartFallback(config.get().getMap("Settings").getMap("Smart-Fallback", new ObjectMap<>()))); // Re-initialize Smart Fallback
if (plugin != null) new Metrics(plugin, 1461).appendAppData();
if (plugin != null) Try.none.run(() -> new Metrics(plugin, 1461).addCustomChart(Util.reflect(Metrics.class.getDeclaredField("PLAYER_VERSIONS"), null)));
new Timer("SubServers.Sync::Routine_Update_Check").schedule(new TimerTask() { new Timer("SubServers.Sync::Routine_Update_Check").schedule(new TimerTask() {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override

7
SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/SubEvent.java
View File

@ -1,7 +0,0 @@
package net.ME1312.SubServers.Sync.Library;
/**
* SubEvent Layout Class
*/
public interface SubEvent {
}

2
SubServers.Sync/velocity/pom.xml
View File

@ -22,7 +22,7 @@
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId> <artifactId>log4j-core</artifactId>
<version>2.16.0</version> <version>2.17.2</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

2
SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/ExProxy.java
View File

@ -230,7 +230,7 @@ public class ExProxy {
if (config.get().getMap("Settings").getMap("Smart-Fallback", new ObjectMap<>()).getBoolean("Enabled", true)) if (config.get().getMap("Settings").getMap("Smart-Fallback", new ObjectMap<>()).getBoolean("Enabled", true))
proxy.getEventManager().register(this, new SmartFallback(config.get().getMap("Settings").getMap("Smart-Fallback", new ObjectMap<>()))); proxy.getEventManager().register(this, new SmartFallback(config.get().getMap("Settings").getMap("Smart-Fallback", new ObjectMap<>())));
metrics.make(this, 11953).appendAppData(); Try.none.run(() -> metrics.make(this, 11953).addCustomChart(Util.reflect(Metrics.class.getDeclaredField("PLAYER_VERSIONS"), null)));
new Timer("SubServers.Sync::Routine_Update_Check").schedule(new TimerTask() { new Timer("SubServers.Sync::Routine_Update_Check").schedule(new TimerTask() {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override

283
SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Library/Metrics.java
View File

@ -29,6 +29,9 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.zip.GZIPOutputStream; import java.util.zip.GZIPOutputStream;
/**
* SubServers BStats Metrics Implementation
*/
public class Metrics { public class Metrics {
/** A factory to create new Metrics classes. */ /** A factory to create new Metrics classes. */
@ -116,17 +119,6 @@ public class Metrics {
} }
} }
/**
* Adds a custom chart.
*
* @param chart The chart to add.
*/
public void addCustomChart(CustomChart chart) {
if (metricsBase != null) {
metricsBase.addCustomChart(chart);
}
}
private static final AdvancedPie PLAYER_VERSIONS; private static final AdvancedPie PLAYER_VERSIONS;
static { static {
final ProtocolVersion[] PROTOCOLS = ProtocolVersion.SUPPORTED_VERSIONS.toArray(new ProtocolVersion[0]); final ProtocolVersion[] PROTOCOLS = ProtocolVersion.SUPPORTED_VERSIONS.toArray(new ProtocolVersion[0]);
@ -149,15 +141,23 @@ public class Metrics {
}); });
} }
public void appendAppData() { /**
addCustomChart(PLAYER_VERSIONS); * Add subservers platform information as custom charts
*/
public Metrics addPlatformCharts() {
return addCustomChart(new SimplePie("subservers_version", () -> SubAPI.getInstance().getPluginVersion().toString())).addCustomChart(PLAYER_VERSIONS);
} }
public void appendPluginData() { /**
addCustomChart(new SimplePie("subservers_version", () -> { * Adds a custom chart.
return SubAPI.getInstance().getPluginVersion().toString(); *
})); * @param chart The chart to add.
addCustomChart(PLAYER_VERSIONS); */
public Metrics addCustomChart(CustomChart chart) {
if (metricsBase != null) {
metricsBase.addCustomChart(chart);
}
return this;
} }
private void appendPlatformData(JsonObjectBuilder builder) { private void appendPlatformData(JsonObjectBuilder builder) {
@ -182,7 +182,7 @@ public class Metrics {
public static class MetricsBase { public static class MetricsBase {
/** The version of the Metrics class. */ /** The version of the Metrics class. */
public static final String METRICS_VERSION = "2.2.1"; public static final String METRICS_VERSION = "3.0.0";
private static final ScheduledExecutorService scheduler = private static final ScheduledExecutorService scheduler =
Executors.newScheduledThreadPool(1, task -> new Thread(task, "bStats-Metrics")); Executors.newScheduledThreadPool(1, task -> new Thread(task, "bStats-Metrics"));
@ -267,6 +267,7 @@ public class Metrics {
this.logResponseStatusText = logResponseStatusText; this.logResponseStatusText = logResponseStatusText;
checkRelocation(); checkRelocation();
if (enabled) { if (enabled) {
// WARNING: Removing the option to opt-out will get your plugin banned from bStats
startSubmitting(); startSubmitting();
} }
} }
@ -403,9 +404,9 @@ public class Metrics {
} }
} }
public static class AdvancedBarChart extends CustomChart { public static class DrilldownPie extends CustomChart {
private final Callable<Map<String, int[]>> callable; private final Callable<Map<String, Map<String, Integer>>> callable;
/** /**
* Class constructor. * Class constructor.
@ -413,99 +414,33 @@ public class Metrics {
* @param chartId The id of the chart. * @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data. * @param callable The callable which is used to request the chart data.
*/ */
public AdvancedBarChart(String chartId, Callable<Map<String, int[]>> callable) { public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) {
super(chartId); super(chartId);
this.callable = callable; this.callable = callable;
} }
@Override @Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception { public JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, int[]> map = callable.call(); Map<String, Map<String, Integer>> map = callable.call();
if (map == null || map.isEmpty()) { if (map == null || map.isEmpty()) {
// Null = skip the chart // Null = skip the chart
return null; return null;
} }
boolean reallyAllSkipped = true;
for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
JsonObjectBuilder valueBuilder = new JsonObjectBuilder();
boolean allSkipped = true; boolean allSkipped = true;
for (Map.Entry<String, int[]> entry : map.entrySet()) { for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) {
if (entry.getValue().length == 0) { valueBuilder.appendField(valueEntry.getKey(), valueEntry.getValue());
// Skip this invalid
continue;
}
allSkipped = false; allSkipped = false;
valuesBuilder.appendField(entry.getKey(), entry.getValue());
} }
if (allSkipped) { if (!allSkipped) {
// Null = skip the chart reallyAllSkipped = false;
return null; valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build());
}
return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
} }
} }
if (reallyAllSkipped) {
public static class SimpleBarChart extends CustomChart {
private final Callable<Map<String, Integer>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public SimpleBarChart(String chartId, Callable<Map<String, Integer>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Integer> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
for (Map.Entry<String, Integer> entry : map.entrySet()) {
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<Map<String, Integer>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Integer> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
boolean allSkipped = true;
for (Map.Entry<String, Integer> entry : map.entrySet()) {
if (entry.getValue() == 0) {
// Skip this invalid
continue;
}
allSkipped = false;
valuesBuilder.appendField(entry.getKey(), entry.getValue());
}
if (allSkipped) {
// Null = skip the chart // Null = skip the chart
return null; return null;
} }
@ -553,6 +488,76 @@ public class Metrics {
} }
} }
public static class MultiLineChart extends CustomChart {
private final Callable<Map<String, Integer>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Integer> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
boolean allSkipped = true;
for (Map.Entry<String, Integer> entry : map.entrySet()) {
if (entry.getValue() == 0) {
// 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<Map<String, Integer>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public SimpleBarChart(String chartId, Callable<Map<String, Integer>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Integer> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
for (Map.Entry<String, Integer> entry : map.entrySet()) {
valuesBuilder.appendField(entry.getKey(), new int[] {entry.getValue()});
}
return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
}
}
public abstract static class CustomChart { public abstract static class CustomChart {
private final String chartId; private final String chartId;
@ -587,32 +592,6 @@ public class Metrics {
protected abstract JsonObjectBuilder.JsonObject getChartData() throws Exception; protected abstract JsonObjectBuilder.JsonObject getChartData() throws Exception;
} }
public static class SingleLineChart extends CustomChart {
private final Callable<Integer> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public SingleLineChart(String chartId, Callable<Integer> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected 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 { public static class SimplePie extends CustomChart {
private final Callable<String> callable; private final Callable<String> callable;
@ -639,9 +618,9 @@ public class Metrics {
} }
} }
public static class DrilldownPie extends CustomChart { public static class AdvancedBarChart extends CustomChart {
private final Callable<Map<String, Map<String, Integer>>> callable; private final Callable<Map<String, int[]>> callable;
/** /**
* Class constructor. * Class constructor.
@ -649,33 +628,29 @@ public class Metrics {
* @param chartId The id of the chart. * @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data. * @param callable The callable which is used to request the chart data.
*/ */
public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) { public AdvancedBarChart(String chartId, Callable<Map<String, int[]>> callable) {
super(chartId); super(chartId);
this.callable = callable; this.callable = callable;
} }
@Override @Override
public JsonObjectBuilder.JsonObject getChartData() throws Exception { protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
Map<String, Map<String, Integer>> map = callable.call(); Map<String, int[]> map = callable.call();
if (map == null || map.isEmpty()) { if (map == null || map.isEmpty()) {
// Null = skip the chart // Null = skip the chart
return null; return null;
} }
boolean reallyAllSkipped = true;
for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
JsonObjectBuilder valueBuilder = new JsonObjectBuilder();
boolean allSkipped = true; boolean allSkipped = true;
for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) { for (Map.Entry<String, int[]> entry : map.entrySet()) {
valueBuilder.appendField(valueEntry.getKey(), valueEntry.getValue()); if (entry.getValue().length == 0) {
// Skip this invalid
continue;
}
allSkipped = false; allSkipped = false;
valuesBuilder.appendField(entry.getKey(), entry.getValue());
} }
if (!allSkipped) { if (allSkipped) {
reallyAllSkipped = false;
valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build());
}
}
if (reallyAllSkipped) {
// Null = skip the chart // Null = skip the chart
return null; return null;
} }
@ -683,6 +658,32 @@ public class Metrics {
} }
} }
public static class SingleLineChart extends CustomChart {
private final Callable<Integer> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public SingleLineChart(String chartId, Callable<Integer> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected 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();
}
}
/** /**
* An extremely simple JSON builder. * An extremely simple JSON builder.
* *