> listenerListMap = new HashMap<>();
- public void register(UltiToolsPlugin plugin, Class listenerClass) {
- Listener listener = plugin.getContext().getBean(listenerClass);
- register(plugin, listener);
- }
-
- @Deprecated
public void register(UltiToolsPlugin plugin, Listener listener) {
listenerListMap.computeIfAbsent(plugin, k -> new ArrayList<>());
Bukkit.getServer().getPluginManager().registerEvents(listener, UltiTools.getInstance());
@@ -48,14 +42,6 @@ public class ListenerManager {
}
}
- public void registerAll(UltiToolsPlugin plugin) {
- for (String listenerBean : plugin.getContext().getBeanNamesForType(Listener.class)) {
- Listener listener = plugin.getContext().getBean(listenerBean, Listener.class);
- if (listener.getClass().getAnnotation(EventListener.class).manualRegister()) continue;
- register(plugin, listener);
- }
- }
-
public void unregister(Listener listener) {
HandlerList.unregisterAll(listener);
}
diff --git a/UltiTools-API/src/main/java/com/ultikits/ultitools/manager/PluginManager.java b/UltiTools-API/src/main/java/com/ultikits/ultitools/manager/PluginManager.java
index 98e0952..1e53725 100755
--- a/UltiTools-API/src/main/java/com/ultikits/ultitools/manager/PluginManager.java
+++ b/UltiTools-API/src/main/java/com/ultikits/ultitools/manager/PluginManager.java
@@ -9,15 +9,11 @@ import com.ultikits.ultitools.utils.CommonUtils;
import lombok.Getter;
import org.bukkit.Bukkit;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.core.annotation.AnnotationUtils;
import java.io.File;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.URLDecoder;
+import java.net.*;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
@@ -33,7 +29,7 @@ public class PluginManager {
public void init() throws IOException {
String currentPath = System.getProperty("user.dir");
- String path = currentPath + File.separator + "plugins" + File.separator + "UltiTools" + File.separator + "plugins";
+ String path = currentPath+ File.separator + "plugins" + File.separator + "UltiTools" + File.separator + "plugins";
File pluginFolder = new File(path);
File[] plugins = pluginFolder.listFiles((file) -> file.getName().endsWith(".jar"));
@@ -84,7 +80,7 @@ public class PluginManager {
}
boolean result = invokeRegisterSelf(plugin);
if (result) {
- registerBukkit(plugin, true);
+ registerBukkit(plugin);
}
return result;
}
@@ -112,7 +108,7 @@ public class PluginManager {
}
boolean result = invokeRegisterSelf(plugin);
if (result) {
- registerBukkit(plugin, false);
+ registerBukkit(plugin);
}
return result;
}
@@ -142,7 +138,7 @@ public class PluginManager {
}
boolean result = invokeRegisterSelf(plugin);
if (result) {
- registerBukkit(plugin, false);
+ registerBukkit(plugin);
}
return result;
}
@@ -178,10 +174,7 @@ public class PluginManager {
try {
@SuppressWarnings("resource")
URLClassLoader classLoader = new URLClassLoader(
- new URL[]{
- new URL(URLDecoder.decode(pluginJar.toURI().toASCIIString(), "UTF-8")),
- CommonUtils.getServerJar()
- },
+ new URL[]{new URL(URLDecoder.decode(pluginJar.toURI().toASCIIString(), "UTF-8"))},
UltiTools.getInstance().getPluginClassLoader()
);
try (JarFile jarFile = new JarFile(pluginJar)) {
@@ -218,21 +211,6 @@ public class PluginManager {
private boolean invokeRegisterSelf(UltiToolsPlugin plugin) {
- for (UltiToolsPlugin plugin1 : pluginList) {
- if (!plugin1.getMainClass().equals(plugin.getMainClass())) {
- continue;
- }
- if (plugin1.isNewerVersionThan(plugin)) {
- Bukkit.getLogger().log(
- Level.WARNING,
- String.format("[UltiTools-API] %s load failed！There is already a new version！", plugin.getPluginName())
- );
- plugin.getContext().close();
- return false;
- } else if (plugin.isNewerVersionThan(plugin1)) {
- plugin1.unregisterSelf();
- }
- }
if (plugin.getMinUltiToolsVersion() > UltiTools.getPluginVersion()) {
Bukkit.getLogger().log(
Level.WARNING,
@@ -243,6 +221,7 @@ public class PluginManager {
}
try {
boolean registerSelf = plugin.registerSelf();
+ registerBukkit(plugin);
if (registerSelf) {
pluginList.add(plugin);
Bukkit.getLogger().log(
@@ -265,14 +244,10 @@ public class PluginManager {
}
private UltiToolsPlugin initializePlugin(Class pluginClass, Object... constructorArgs) {
- URLClassLoader urlClassLoader = new URLClassLoader(
- new URL[]{CommonUtils.getServerJar()},
- pluginClass.getClassLoader()
- );
AnnotationConfigApplicationContext pluginContext = new AnnotationConfigApplicationContext();
pluginContext.setParent(UltiTools.getInstance().getContext());
pluginContext.registerShutdownHook();
- pluginContext.setClassLoader(urlClassLoader);
+ pluginContext.setClassLoader(pluginClass.getClassLoader());
pluginContext.registerBean(pluginClass, constructorArgs);
pluginContext.refresh();
UltiToolsPlugin plugin = pluginContext.getBean(pluginClass);
@@ -282,26 +257,18 @@ public class PluginManager {
return plugin;
}
- private void registerBukkit(UltiToolsPlugin plugin, boolean flag) {
- EnableAutoRegister annotation = AnnotationUtils.findAnnotation(plugin.getClass(), EnableAutoRegister.class);
- if (annotation == null) {
+ private void registerBukkit(UltiToolsPlugin plugin) {
+ if (!plugin.getClass().isAnnotationPresent(EnableAutoRegister.class)) {
return;
}
+ EnableAutoRegister annotation = plugin.getClass().getAnnotation(EnableAutoRegister.class);
String[] packages = CommonUtils.getPluginPackages(plugin);
for (String packageName : packages) {
if (annotation.cmdExecutor()) {
- if (flag) {
- UltiTools.getInstance().getCommandManager().registerAll(plugin);
- } else {
- UltiTools.getInstance().getCommandManager().registerAll(plugin, packageName);
- }
+ UltiTools.getInstance().getCommandManager().registerAll(plugin, packageName);
}
if (annotation.eventListener()) {
- if (flag) {
- UltiTools.getInstance().getListenerManager().registerAll(plugin);
- } else {
- UltiTools.getInstance().getListenerManager().registerAll(plugin, packageName);
- }
+ UltiTools.getInstance().getListenerManager().registerAll(plugin, packageName);
}
}
}
diff --git a/UltiTools-API/src/main/java/com/ultikits/ultitools/utils/CommonUtils.java b/UltiTools-API/src/main/java/com/ultikits/ultitools/utils/CommonUtils.java
index 199e48e..68c6685 100644
--- a/UltiTools-API/src/main/java/com/ultikits/ultitools/utils/CommonUtils.java
+++ b/UltiTools-API/src/main/java/com/ultikits/ultitools/utils/CommonUtils.java
@@ -6,16 +6,12 @@ import cn.hutool.json.JSONUtil;
import com.ultikits.ultitools.UltiTools;
import com.ultikits.ultitools.abstracts.UltiToolsPlugin;
import com.ultikits.ultitools.annotations.EnableAutoRegister;
-import org.bukkit.Bukkit;
import org.springframework.context.annotation.ComponentScan;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
-import java.net.URL;
import java.nio.charset.StandardCharsets;
-import java.security.CodeSource;
-import java.security.ProtectionDomain;
public class CommonUtils {
@@ -58,12 +54,4 @@ public class CommonUtils {
return packages;
}
- public static URL getServerJar() {
- ProtectionDomain protectionDomain = Bukkit.class.getProtectionDomain();
- CodeSource codeSource = protectionDomain.getCodeSource();
- if (codeSource == null) {
- return null;
- }
- return codeSource.getLocation();
- }
}
diff --git a/UltiTools-API/src/main/java/com/ultikits/ultitools/utils/Metrics.java b/UltiTools-API/src/main/java/com/ultikits/ultitools/utils/Metrics.java
deleted file mode 100644
index f26f011..0000000
--- a/UltiTools-API/src/main/java/com/ultikits/ultitools/utils/Metrics.java
+++ /dev/null
@@ -1,713 +0,0 @@
-package com.ultikits.ultitools.utils;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonPrimitive;
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.RegisteredServiceProvider;
-import org.bukkit.plugin.ServicePriority;
-
-import javax.net.ssl.HttpsURLConnection;
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.concurrent.Callable;
-import java.util.logging.Level;
-import java.util.zip.GZIPOutputStream;
-
-/**
- * bStats collects some data for plugin authors.
- *
- * Check out https://bStats.org/ to learn more about bStats!
- */
-@SuppressWarnings({"WeakerAccess", "unused"})
-public class Metrics {
-
- // The version of this bStats class
- public static final int B_STATS_VERSION = 1;
- // The url to which the data is sent
- private static final String URL = "https://bStats.org/submitData/bukkit";
- // Should failed requests be logged?
- private static boolean logFailedRequests;
- // Should the sent data be logged?
- private static boolean logSentData;
- // Should the response text be logged?
- private static boolean logResponseStatusText;
- // The uuid of the server
- private static String serverUUID;
-
- static {
- // 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', '.', 'b', 'u', 'k', 'k', 'i', 't'});
- final String examplePackage = new String(new byte[]{'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
- }
- }
-
- // The plugin
- private final Plugin plugin;
- // The plugin id
- private final int pluginId;
- // A list with all custom charts
- private final List charts = new ArrayList<>();
- // Is bStats enabled on this server?
- private boolean enabled;
-
- /**
- * Class constructor.
- *
- * @param plugin The plugin which stats should be submitted.
- * @param pluginId The id of the plugin.
- * It can be found at What is my plugin id?
- */
- public Metrics(Plugin plugin, int pluginId) {
- if (plugin == null) {
- throw new IllegalArgumentException("Plugin cannot be null!");
- }
- this.plugin = plugin;
- this.pluginId = pluginId;
-
- // Get the config file
- File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
- File configFile = new File(bStatsFolder, "config.yml");
- YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
-
- // Check if the config file exists
- if (!config.isSet("serverUuid")) {
-
- // Add default values
- config.addDefault("enabled", true);
- // Every server gets it's unique random id.
- config.addDefault("serverUuid", UUID.randomUUID().toString());
- // Should failed request be logged?
- config.addDefault("logFailedRequests", false);
- // Should the sent data be logged?
- config.addDefault("logSentData", false);
- // Should the response text be logged?
- config.addDefault("logResponseStatusText", false);
-
- // Inform the server owners about bStats
- config.options().header(
- "bStats collects some data for plugin authors like how many servers are using their plugins.\n" +
- "To honor their work, you should not disable it.\n" +
- "This has nearly no effect on the server performance!\n" +
- "Check out https://bStats.org/ to learn more :)"
- ).copyDefaults(true);
- try {
- config.save(configFile);
- } catch (IOException ignored) {
- }
- }
-
- // Load the data
- enabled = config.getBoolean("enabled", true);
- serverUUID = config.getString("serverUuid");
- logFailedRequests = config.getBoolean("logFailedRequests", false);
- logSentData = config.getBoolean("logSentData", false);
- logResponseStatusText = config.getBoolean("logResponseStatusText", false);
-
- if (enabled) {
- boolean found = false;
- // Search for all other bStats Metrics classes to see if we are the first one
- for (Class service : Bukkit.getServicesManager().getKnownServices()) {
- try {
- service.getField("B_STATS_VERSION"); // Our identifier :)
- found = true; // We aren't the first
- break;
- } catch (NoSuchFieldException ignored) {
- }
- }
- // Register our service
- Bukkit.getServicesManager().register(Metrics.class, this, plugin, ServicePriority.Normal);
- if (!found) {
- // We are the first!
- startSubmitting();
- }
- }
- }
-
- /**
- * Sends the data to the bStats server.
- *
- * @param plugin Any plugin. It's just used to get a logger instance.
- * @param data The data to send.
- * @throws Exception If the request failed.
- */
- private static void sendData(Plugin plugin, JsonObject data) throws Exception {
- if (data == null) {
- throw new IllegalArgumentException("Data cannot be null!");
- }
- if (Bukkit.isPrimaryThread()) {
- throw new IllegalAccessException("This method must not be called from the main thread!");
- }
- if (logSentData) {
- plugin.getLogger().info("Sending data to bStats: " + data);
- }
- HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
-
- // Compress the data to save bandwidth
- byte[] compressedData = compress(data.toString());
-
- // Add headers
- connection.setRequestMethod("POST");
- connection.addRequestProperty("Accept", "application/json");
- connection.addRequestProperty("Connection", "close");
- connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
- connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
- connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format
- connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
-
- // Send data
- connection.setDoOutput(true);
- 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) {
- plugin.getLogger().info("Sent data to bStats and received response: " + builder);
- }
- }
-
- /**
- * Gzips the given String.
- *
- * @param str The string to gzip.
- * @return The gzipped String.
- * @throws IOException If the compression failed.
- */
- private static byte[] compress(final String str) throws IOException {
- if (str == null) {
- return null;
- }
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- try (GZIPOutputStream gzip = new GZIPOutputStream(outputStream)) {
- gzip.write(str.getBytes(StandardCharsets.UTF_8));
- }
- return outputStream.toByteArray();
- }
-
- /**
- * Checks if bStats is enabled.
- *
- * @return Whether bStats is enabled or not.
- */
- public boolean isEnabled() {
- return enabled;
- }
-
- /**
- * Adds a custom chart.
- *
- * @param chart The chart to add.
- */
- public void addCustomChart(CustomChart chart) {
- if (chart == null) {
- throw new IllegalArgumentException("Chart cannot be null!");
- }
- charts.add(chart);
- }
-
- /**
- * Starts the Scheduler which submits our data every 30 minutes.
- */
- private void startSubmitting() {
- final Timer timer = new Timer(true); // We use a timer cause the Bukkit scheduler is affected by server lags
- timer.scheduleAtFixedRate(new TimerTask() {
- @Override
- public void run() {
- if (!plugin.isEnabled()) { // Plugin was disabled
- timer.cancel();
- return;
- }
- // Nevertheless we want our code to run in the Bukkit main thread, so we have to use the Bukkit scheduler
- // Don't be afraid! The connection to the bStats server is still async, only the stats collection is sync ;)
- Bukkit.getScheduler().runTask(plugin, () -> submitData());
- }
- }, 1000 * 60 * 5, 1000 * 60 * 30);
- // Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough time to start
- // WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted!
- // WARNING: Just don't do it!
- }
-
- /**
- * Gets the plugin specific data.
- * This method is called using Reflection.
- *
- * @return The plugin specific data.
- */
- public JsonObject getPluginData() {
- JsonObject data = new JsonObject();
-
- String pluginName = plugin.getDescription().getName();
- String pluginVersion = plugin.getDescription().getVersion();
-
- data.addProperty("pluginName", pluginName); // Append the name of the plugin
- data.addProperty("id", pluginId); // Append the id of the plugin
- data.addProperty("pluginVersion", pluginVersion); // Append the version of the plugin
- JsonArray customCharts = new JsonArray();
- for (CustomChart customChart : charts) {
- // Add the data of the custom charts
- JsonObject chart = customChart.getRequestJsonObject();
- if (chart == null) { // If the chart is null, we skip it
- continue;
- }
- customCharts.add(chart);
- }
- data.add("customCharts", customCharts);
-
- return data;
- }
-
- /**
- * Gets the server specific data.
- *
- * @return The server specific data.
- */
- private JsonObject getServerData() {
- // Minecraft specific data
- int playerAmount;
- try {
- // Around MC 1.8 the return type was changed to a collection from an array,
- // This fixes java.lang.NoSuchMethodError: org.bukkit.Bukkit.getOnlinePlayers()Ljava/util/Collection;
- Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers");
- playerAmount = onlinePlayersMethod.getReturnType().equals(Collection.class)
- ? ((Collection) onlinePlayersMethod.invoke(Bukkit.getServer())).size()
- : ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length;
- } catch (Exception e) {
- playerAmount = Bukkit.getOnlinePlayers().size(); // Just use the new method if the Reflection failed
- }
- int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
- String bukkitVersion = Bukkit.getVersion();
- String bukkitName = Bukkit.getName();
-
- // OS/Java specific data
- String javaVersion = System.getProperty("java.version");
- String osName = System.getProperty("os.name");
- String osArch = System.getProperty("os.arch");
- String osVersion = System.getProperty("os.version");
- int coreCount = Runtime.getRuntime().availableProcessors();
-
- JsonObject data = new JsonObject();
-
- data.addProperty("serverUUID", serverUUID);
-
- data.addProperty("playerAmount", playerAmount);
- data.addProperty("onlineMode", onlineMode);
- data.addProperty("bukkitVersion", bukkitVersion);
- data.addProperty("bukkitName", bukkitName);
-
- data.addProperty("javaVersion", javaVersion);
- data.addProperty("osName", osName);
- data.addProperty("osArch", osArch);
- data.addProperty("osVersion", osVersion);
- data.addProperty("coreCount", coreCount);
-
- return data;
- }
-
- /**
- * Collects the data and sends it afterwards.
- */
- private void submitData() {
- final JsonObject data = getServerData();
-
- JsonArray pluginData = new JsonArray();
- // Search for all other bStats Metrics classes to get their plugin data
- for (Class service : Bukkit.getServicesManager().getKnownServices()) {
- try {
- service.getField("B_STATS_VERSION"); // Our identifier :)
-
- for (RegisteredServiceProvider provider : Bukkit.getServicesManager().getRegistrations(service)) {
- try {
- Object plugin = provider.getService().getMethod("getPluginData").invoke(provider.getProvider());
- if (plugin instanceof JsonObject) {
- pluginData.add((JsonObject) plugin);
- } else { // old bstats version compatibility
- try {
- Class jsonObjectJsonSimple = Class.forName("org.json.simple.JSONObject");
- if (plugin.getClass().isAssignableFrom(jsonObjectJsonSimple)) {
- Method jsonStringGetter = jsonObjectJsonSimple.getDeclaredMethod("toJSONString");
- jsonStringGetter.setAccessible(true);
- String jsonString = (String) jsonStringGetter.invoke(plugin);
- JsonObject object = new JsonParser().parse(jsonString).getAsJsonObject();
- pluginData.add(object);
- }
- } catch (ClassNotFoundException e) {
- // minecraft version 1.14+
- if (logFailedRequests) {
- this.plugin.getLogger().log(Level.SEVERE, "Encountered unexpected exception", e);
- }
- }
- }
- } catch (NullPointerException | NoSuchMethodException | IllegalAccessException |
- InvocationTargetException ignored) {
- }
- }
- } catch (NoSuchFieldException ignored) {
- }
- }
-
- data.add("plugins", pluginData);
-
- // Create a new thread for the connection to the bStats server
- new Thread(() -> {
- try {
- // Send the data
- sendData(plugin, data);
- } catch (Exception e) {
- // Something went wrong! :(
- if (logFailedRequests) {
- plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(), e);
- }
- }
- }).start();
- }
-
- /**
- * Represents a custom chart.
- */
- public static abstract class CustomChart {
-
- // The id of the chart
- final String chartId;
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- */
- CustomChart(String chartId) {
- if (chartId == null || chartId.isEmpty()) {
- throw new IllegalArgumentException("ChartId cannot be null or empty!");
- }
- this.chartId = chartId;
- }
-
- private JsonObject getRequestJsonObject() {
- JsonObject chart = new JsonObject();
- chart.addProperty("chartId", chartId);
- try {
- JsonObject data = getChartData();
- if (data == null) {
- // If the data is null we don't send the chart.
- return null;
- }
- chart.add("data", data);
- } catch (Throwable t) {
- if (logFailedRequests) {
- Bukkit.getLogger().log(Level.WARNING, "Failed to get data for custom chart with id " + chartId, t);
- }
- return null;
- }
- return chart;
- }
-
- protected abstract JsonObject getChartData() throws Exception;
-
- }
-
- /**
- * Represents a custom simple pie.
- */
- public static class SimplePie extends CustomChart {
-
- private final Callable callable;
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- * @param callable The callable which is used to request the chart data.
- */
- public SimplePie(String chartId, Callable callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- protected JsonObject getChartData() throws Exception {
- JsonObject data = new JsonObject();
- String value = callable.call();
- if (value == null || value.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- data.addProperty("value", value);
- return data;
- }
- }
-
- /**
- * Represents a custom advanced pie.
- */
- public static class AdvancedPie extends CustomChart {
-
- private final Callable> callable;
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- * @param callable The callable which is used to request the chart data.
- */
- public AdvancedPie(String chartId, Callable> callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- protected JsonObject getChartData() throws Exception {
- JsonObject data = new JsonObject();
- JsonObject values = new JsonObject();
- Map map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- boolean allSkipped = true;
- for (Map.Entry entry : map.entrySet()) {
- if (entry.getValue() == 0) {
- continue; // Skip this invalid
- }
- allSkipped = false;
- values.addProperty(entry.getKey(), entry.getValue());
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- data.add("values", values);
- return data;
- }
- }
-
- /**
- * Represents a custom drilldown pie.
- */
- public static class DrilldownPie extends CustomChart {
-
- private final Callable>> callable;
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- * @param callable The callable which is used to request the chart data.
- */
- public DrilldownPie(String chartId, Callable>> callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- public JsonObject getChartData() throws Exception {
- JsonObject data = new JsonObject();
- JsonObject values = new JsonObject();
- Map> map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- boolean reallyAllSkipped = true;
- for (Map.Entry> entryValues : map.entrySet()) {
- JsonObject value = new JsonObject();
- boolean allSkipped = true;
- for (Map.Entry valueEntry : map.get(entryValues.getKey()).entrySet()) {
- value.addProperty(valueEntry.getKey(), valueEntry.getValue());
- allSkipped = false;
- }
- if (!allSkipped) {
- reallyAllSkipped = false;
- values.add(entryValues.getKey(), value);
- }
- }
- if (reallyAllSkipped) {
- // Null = skip the chart
- return null;
- }
- data.add("values", values);
- return data;
- }
- }
-
- /**
- * Represents a custom single line chart.
- */
- public static class SingleLineChart extends CustomChart {
-
- private final Callable callable;
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- * @param callable The callable which is used to request the chart data.
- */
- public SingleLineChart(String chartId, Callable callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- protected JsonObject getChartData() throws Exception {
- JsonObject data = new JsonObject();
- int value = callable.call();
- if (value == 0) {
- // Null = skip the chart
- return null;
- }
- data.addProperty("value", value);
- return data;
- }
-
- }
-
- /**
- * Represents a custom multi line chart.
- */
- public static class MultiLineChart extends CustomChart {
-
- private final Callable> callable;
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- * @param callable The callable which is used to request the chart data.
- */
- public MultiLineChart(String chartId, Callable> callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- protected JsonObject getChartData() throws Exception {
- JsonObject data = new JsonObject();
- JsonObject values = new JsonObject();
- Map map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- boolean allSkipped = true;
- for (Map.Entry entry : map.entrySet()) {
- if (entry.getValue() == 0) {
- continue; // Skip this invalid
- }
- allSkipped = false;
- values.addProperty(entry.getKey(), entry.getValue());
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- data.add("values", values);
- return data;
- }
-
- }
-
- /**
- * Represents a custom simple bar chart.
- */
- public static class SimpleBarChart extends CustomChart {
-
- private final Callable> callable;
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- * @param callable The callable which is used to request the chart data.
- */
- public SimpleBarChart(String chartId, Callable> callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- protected JsonObject getChartData() throws Exception {
- JsonObject data = new JsonObject();
- JsonObject values = new JsonObject();
- Map map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- for (Map.Entry entry : map.entrySet()) {
- JsonArray categoryValues = new JsonArray();
- categoryValues.add(new JsonPrimitive(entry.getValue()));
- values.add(entry.getKey(), categoryValues);
- }
- data.add("values", values);
- return data;
- }
-
- }
-
- /**
- * Represents a custom advanced bar chart.
- */
- public static class AdvancedBarChart extends CustomChart {
-
- private final Callable> callable;
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- * @param callable The callable which is used to request the chart data.
- */
- public AdvancedBarChart(String chartId, Callable> callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- protected JsonObject getChartData() throws Exception {
- JsonObject data = new JsonObject();
- JsonObject values = new JsonObject();
- Map map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- boolean allSkipped = true;
- for (Map.Entry entry : map.entrySet()) {
- if (entry.getValue().length == 0) {
- continue; // Skip this invalid
- }
- allSkipped = false;
- JsonArray categoryValues = new JsonArray();
- for (int categoryValue : entry.getValue()) {
- categoryValues.add(new JsonPrimitive(categoryValue));
- }
- values.add(entry.getKey(), categoryValues);
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- data.add("values", values);
- return data;
- }
- }
-
-}
diff --git a/UltiTools-API/src/main/resources/env.yml b/UltiTools-API/src/main/resources/env.yml
index 3b17b89..902c489 100644
--- a/UltiTools-API/src/main/resources/env.yml
+++ b/UltiTools-API/src/main/resources/env.yml
@@ -1,36 +1,38 @@
# This file is used to store environment variables
-version: ${project.version}
+
api-url: "https://api.v2.ultikits.com"
oss-url: "https://ultitools.oss-cn-shanghai.aliyuncs.com"
lib-path: "/lib/"
libraries:
- - "advancedslot-4.3.0.jar"
- - "adventure-api-4.13.1.jar"
- - "adventure-key-4.13.1.jar"
- - "adventure-nbt-4.13.1.jar"
- - "adventure-platform-api-4.3.2.jar"
- - "adventure-platform-bukkit-4.3.2.jar"
- - "adventure-platform-facet-4.3.2.jar"
- - "adventure-platform-viaversion-4.3.2.jar"
- - "adventure-text-serializer-bungeecord-4.3.2.jar"
- - "adventure-text-serializer-gson-4.13.1.jar"
- - "adventure-text-serializer-gson-legacy-impl-4.13.1.jar"
- - "adventure-text-serializer-legacy-4.13.1.jar"
- - "annotations-23.0.0.jar"
- - "configurablegui-4.3.0.jar"
- - "core-4.3.0.jar"
+ - "advancedslot-4.1.13.jar"
+ - "adventure-api-4.13.0.jar"
+ - "adventure-key-4.13.0.jar"
+ - "adventure-nbt-4.13.0.jar"
+ - "adventure-platform-api-4.3.0.jar"
+ - "adventure-platform-bukkit-4.3.0.jar"
+ - "adventure-platform-facet-4.3.0.jar"
+ - "adventure-platform-viaversion-4.3.0.jar"
+ - "adventure-text-serializer-bungeecord-4.3.0.jar"
+ - "adventure-text-serializer-gson-4.13.0.jar"
+ - "adventure-text-serializer-gson-legacy-impl-4.13.0.jar"
+ - "adventure-text-serializer-legacy-4.13.0.jar"
+ - "annotations-24.0.1.jar"
+ - "bukkit-1.13.1-R0.1-SNAPSHOT.jar"
+ - "bungeecord-chat-1.16-R0.4.jar"
+ - "checker-qual-3.12.0.jar"
+ - "commons-lang-2.6.jar"
+ - "configurablegui-4.1.13.jar"
+ - "core-4.1.13.jar"
+ - "error_prone_annotations-2.11.0.jar"
- "examination-api-1.3.0.jar"
- "examination-string-1.3.0.jar"
+ - "failureaccess-1.0.1.jar"
- "fastjson-1.2.83.jar"
- - "hutool-cache-5.8.25.jar"
- - "hutool-core-5.8.25.jar"
- - "hutool-cron-5.8.25.jar"
- - "hutool-crypto-5.8.25.jar"
- - "hutool-db-5.8.25.jar"
- - "hutool-http-5.8.25.jar"
- - "hutool-json-5.8.25.jar"
- - "hutool-log-5.8.25.jar"
- - "hutool-setting-5.8.25.jar"
+ - "gson-2.10.jar"
+ - "guava-31.1-jre.jar"
+ - "hamcrest-core-1.1.jar"
+ - "hutool-all-5.8.20.jar"
+ - "j2objc-annotations-1.3.jar"
- "javax.servlet-api-3.1.0.jar"
- "jetty-client-9.4.48.v20220622.jar"
- "jetty-http-9.4.48.v20220622.jar"
@@ -42,12 +44,21 @@ libraries:
- "jetty-util-ajax-9.4.48.v20220622.jar"
- "jetty-webapp-9.4.48.v20220622.jar"
- "jetty-xml-9.4.48.v20220622.jar"
- - "obliviate-invs-4.3.0.jar"
+ - "json-simple-1.1.1.jar"
+ - "jsr305-3.0.2.jar"
+ - "junit-4.10.jar"
+ - "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
+ - "lombok-1.18.24.jar"
+ - "mysql-connector-j-8.0.33.jar"
+ - "obliviate-invs-4.1.13.jar"
- "obliviate-utils-2.0.5.jar"
- - "pagination-4.3.0.jar"
+ - "pagination-4.1.13.jar"
- "placeholder-2.0.5.jar"
+ - "protobuf-java-3.21.9.jar"
- "slf4j-api-1.7.25.jar"
+ - "snakeyaml-1.33.jar"
- "spark-core-2.9.4.jar"
+ - "spigot-api-1.19.3-R0.1-SNAPSHOT.jar"
- "spring-aop-5.3.31.jar"
- "spring-beans-5.3.31.jar"
- "spring-context-5.3.31.jar"
@@ -55,10 +66,10 @@ libraries:
- "spring-expression-5.3.31.jar"
- "spring-jcl-5.3.31.jar"
- "string-2.0.5.jar"
- - "UniversalScheduler-0.1.6.jar"
+ - "VaultAPI-1.7.jar"
- "version-detection-2.0.5.jar"
- "websocket-api-9.4.48.v20220622.jar"
- "websocket-client-9.4.48.v20220622.jar"
- "websocket-common-9.4.48.v20220622.jar"
- "websocket-server-9.4.48.v20220622.jar"
- - "websocket-servlet-9.4.48.v20220622.jar"
+ - "websocket-servlet-9.4.48.v20220622.jar"
\ No newline at end of file
diff --git a/UltiTools-API/src/main/resources/lang/en.json b/UltiTools-API/src/main/resources/lang/en.json
index ba07e2a..5a195eb 100644
--- a/UltiTools-API/src/main/resources/lang/en.json
+++ b/UltiTools-API/src/main/resources/lang/en.json
@@ -28,7 +28,7 @@
" 简介：": " Intro:",
"======== 第%d页 ========": "======== Page %d ========",
"安装失败！": "Install Failed!",
- "安装成功！请重启服务器！请务必删除旧版本模块！": "Installed! Please restart the server! Please be sure to delete the old version module!",
+ "安装成功！请重启服务器！": "Installed! Please restart the server!",
"========|插件安装帮助|========": "========|Plugin Install Help|========",
"/upm list [页数] - 查看可用插件列表": "/upm list [page] - View available plugin list",
"/upm install [插件] - 安装最新插件": "/upm install [plugin] - Install latest plugin",
diff --git a/UltiTools-API/src/main/resources/plugin.yml b/UltiTools-API/src/main/resources/plugin.yml
index 03990ae..225f2ec 100755
--- a/UltiTools-API/src/main/resources/plugin.yml
+++ b/UltiTools-API/src/main/resources/plugin.yml
@@ -4,8 +4,5 @@ main: com.ultikits.ultitools.UltiTools
api-version: 1.13
prefix: UltiTools
authors: [ wisdomme ]
-load: POSTWORLD
+load: STARTUP
depend: [ Vault, PlaceholderAPI ]
-softdepend:
- - Vault
- - PlaceholderAPI