From 057ab54d403ce756ae127032419d4096236d951a Mon Sep 17 00:00:00 2001 From: TPGamesNL Date: Sat, 30 Jan 2021 19:10:32 +0100 Subject: [PATCH] Added bStats --- .../java/com/btk5h/skriptmirror/Metrics.java | 733 ++++++++++++++++++ .../com/btk5h/skriptmirror/SkriptMirror.java | 51 ++ .../skriptmirror/skript/CondParseLater.java | 4 + .../condition/CustomConditionSection.java | 5 + .../custom/effect/CustomEffectSection.java | 5 + .../custom/event/CustomEventSection.java | 3 + .../expression/CustomExpressionSection.java | 4 + .../skript/reflect/ExprJavaCall.java | 4 + .../skript/reflect/ExprProxy.java | 5 + .../skript/reflect/sections/CondSection.java | 4 + 10 files changed, 818 insertions(+) create mode 100644 src/main/java/com/btk5h/skriptmirror/Metrics.java diff --git a/src/main/java/com/btk5h/skriptmirror/Metrics.java b/src/main/java/com/btk5h/skriptmirror/Metrics.java new file mode 100644 index 0000000..5ea162a --- /dev/null +++ b/src/main/java/com/btk5h/skriptmirror/Metrics.java @@ -0,0 +1,733 @@ +package com.btk5h.skriptmirror; + +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.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; +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 { + + 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'}); + // We want to make sure nobody just copy & pastes the example and use the wrong package names + if (Metrics.class.getPackage().getName().equals(defaultPackage) || Metrics.class.getPackage().getName().equals(examplePackage)) { + throw new IllegalStateException("bStats Metrics class has not been relocated correctly!"); + } + } + } + + // This ThreadFactory enforces the naming convention for our Threads + private final ThreadFactory threadFactory = task -> new Thread(task, "bStats-Metrics"); + + // Executor service for requests + // We use an executor service because the Bukkit scheduler is affected by server lags + private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1, threadFactory); + + // 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"; + + // Is bStats enabled on this server? + private boolean enabled; + + // 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; + + // 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<>(); + + /** + * 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(); + } + } + } + + /** + * 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 Runnable submitTask = () -> { + if (!plugin.isEnabled()) { // Plugin was disabled + scheduler.shutdown(); + 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, 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); + } + + /** + * 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(); + } + + /** + * 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(); + } + + /** + * 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/src/main/java/com/btk5h/skriptmirror/SkriptMirror.java b/src/main/java/com/btk5h/skriptmirror/SkriptMirror.java index cca27c1..a583594 100644 --- a/src/main/java/com/btk5h/skriptmirror/SkriptMirror.java +++ b/src/main/java/com/btk5h/skriptmirror/SkriptMirror.java @@ -2,11 +2,22 @@ import ch.njol.skript.Skript; import ch.njol.skript.SkriptAddon; +import ch.njol.skript.util.Version; +import com.btk5h.skriptmirror.skript.CondParseLater; +import com.btk5h.skriptmirror.skript.custom.condition.CustomConditionSection; +import com.btk5h.skriptmirror.skript.custom.effect.CustomEffectSection; +import com.btk5h.skriptmirror.skript.custom.event.CustomEventSection; +import com.btk5h.skriptmirror.skript.custom.expression.CustomExpressionSection; +import com.btk5h.skriptmirror.skript.reflect.ExprJavaCall; +import com.btk5h.skriptmirror.skript.reflect.ExprProxy; +import com.btk5h.skriptmirror.skript.reflect.sections.CondSection; import com.btk5h.skriptmirror.util.SkriptReflection; import org.bukkit.plugin.java.JavaPlugin; import java.io.IOException; import java.nio.file.Path; +import java.util.HashMap; +import java.util.Map; public class SkriptMirror extends JavaPlugin { private static SkriptMirror instance; @@ -37,6 +48,46 @@ public void onEnable() { // Disable *all* and/or warnings SkriptReflection.disableAndOrWarnings(); + + Metrics metrics = new Metrics(this, 10157); + + metrics.addCustomChart(new Metrics.DrilldownPie("skript_version", () -> { + Map> map = new HashMap<>(); + + Version version = Skript.getVersion(); + Map entry = new HashMap<>(); + entry.put(version.toString(), 1); + + map.put("" + version.getMajor() + "." + version.getMinor(), entry); + + return map; + })); + + metrics.addCustomChart(new Metrics.SimplePie("preload_enabled", + () -> "" + getConfig().getBoolean("enable-preloading"))); + metrics.addCustomChart(new Metrics.SimplePie("deferred_parsing_used", + () -> "" + CondParseLater.deferredParsingUsed)); + + metrics.addCustomChart(new Metrics.SingleLineChart("java_calls_made", () -> { + int i = ExprJavaCall.javaCallsMade; + ExprJavaCall.javaCallsMade = 0; + return i; + })); + + metrics.addCustomChart(new Metrics.SimplePie("custom_conditions_used", + () -> "" + CustomConditionSection.customConditionsUsed)); + metrics.addCustomChart(new Metrics.SimplePie("custom_effects_used", + () -> "" + CustomEffectSection.customEffectsUsed)); + metrics.addCustomChart(new Metrics.SimplePie("custom_events_used", + () -> "" + CustomEventSection.customEventsUsed)); + metrics.addCustomChart(new Metrics.SimplePie("custom_expressions_used", + () -> "" + CustomExpressionSection.customExpressionsUsed)); + + metrics.addCustomChart(new Metrics.SimplePie("proxies_used", + () -> "" + ExprProxy.proxiesUsed)); + metrics.addCustomChart(new Metrics.SimplePie("sections_used", + () -> "" + CondSection.sectionsUsed)); + } public static SkriptAddon getAddonInstance() { diff --git a/src/main/java/com/btk5h/skriptmirror/skript/CondParseLater.java b/src/main/java/com/btk5h/skriptmirror/skript/CondParseLater.java index d999f93..9cbf187 100644 --- a/src/main/java/com/btk5h/skriptmirror/skript/CondParseLater.java +++ b/src/main/java/com/btk5h/skriptmirror/skript/CondParseLater.java @@ -8,6 +8,8 @@ import org.bukkit.event.Event; public class CondParseLater extends Condition { + public static boolean deferredParsingUsed = false; + static { Skript.registerCondition(CondParseLater.class, "\\(parse[d] later\\) <.+>"); } @@ -45,6 +47,8 @@ public String toString(Event e, boolean debug) { @Override public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) { + deferredParsingUsed = true; + if (!Consent.Feature.DEFERRED_PARSING.hasConsent(SkriptUtil.getCurrentScript())) { Skript.error("This feature requires consent, because it is experimental."); return false; diff --git a/src/main/java/com/btk5h/skriptmirror/skript/custom/condition/CustomConditionSection.java b/src/main/java/com/btk5h/skriptmirror/skript/custom/condition/CustomConditionSection.java index 5b45892..0bd64b6 100644 --- a/src/main/java/com/btk5h/skriptmirror/skript/custom/condition/CustomConditionSection.java +++ b/src/main/java/com/btk5h/skriptmirror/skript/custom/condition/CustomConditionSection.java @@ -20,6 +20,9 @@ import java.util.stream.Collectors; public class CustomConditionSection extends CustomSyntaxSection { + + public static boolean customConditionsUsed = false; + static { String[] syntax = { "[(1¦local)] condition <.+>", @@ -59,6 +62,8 @@ public DataTracker getDataTracker() { @Override protected boolean init(Literal[] args, int matchedPattern, SkriptParser.ParseResult parseResult, SectionNode node, boolean isPreload) { + customConditionsUsed = true; + if (!isPreloaded) { String what; SectionNode patterns = (SectionNode) node.get("patterns"); diff --git a/src/main/java/com/btk5h/skriptmirror/skript/custom/effect/CustomEffectSection.java b/src/main/java/com/btk5h/skriptmirror/skript/custom/effect/CustomEffectSection.java index b63d014..852502a 100644 --- a/src/main/java/com/btk5h/skriptmirror/skript/custom/effect/CustomEffectSection.java +++ b/src/main/java/com/btk5h/skriptmirror/skript/custom/effect/CustomEffectSection.java @@ -20,6 +20,9 @@ import java.util.function.Supplier; public class CustomEffectSection extends CustomSyntaxSection { + + public static boolean customEffectsUsed = false; + static { String[] syntax = { "[(1¦local)] effect <.+>", @@ -57,6 +60,8 @@ public DataTracker getDataTracker() { @Override protected boolean init(Literal[] args, int matchedPattern, SkriptParser.ParseResult parseResult, SectionNode node, boolean isPreload) { + customEffectsUsed = true; + if (!isPreloaded) { SectionNode patterns = (SectionNode) node.get("patterns"); File script = (parseResult.mark & 1) == 1 ? SkriptUtil.getCurrentScript() : null; diff --git a/src/main/java/com/btk5h/skriptmirror/skript/custom/event/CustomEventSection.java b/src/main/java/com/btk5h/skriptmirror/skript/custom/event/CustomEventSection.java index bfb03f6..f73d801 100644 --- a/src/main/java/com/btk5h/skriptmirror/skript/custom/event/CustomEventSection.java +++ b/src/main/java/com/btk5h/skriptmirror/skript/custom/event/CustomEventSection.java @@ -19,6 +19,7 @@ import java.util.*; public class CustomEventSection extends CustomSyntaxSection { + public static boolean customEventsUsed = false; static { String[] syntax = { @@ -59,6 +60,8 @@ protected DataTracker getDataTracker() { @Override protected boolean init(Literal[] args, int matchedPattern, SkriptParser.ParseResult parseResult, SectionNode node, boolean isPreload) { + customEventsUsed = true; + if (!isPreloaded) { File script = (parseResult.mark & 1) == 1 ? SkriptUtil.getCurrentScript() : null; diff --git a/src/main/java/com/btk5h/skriptmirror/skript/custom/expression/CustomExpressionSection.java b/src/main/java/com/btk5h/skriptmirror/skript/custom/expression/CustomExpressionSection.java index 919cb31..6b26e81 100644 --- a/src/main/java/com/btk5h/skriptmirror/skript/custom/expression/CustomExpressionSection.java +++ b/src/main/java/com/btk5h/skriptmirror/skript/custom/expression/CustomExpressionSection.java @@ -24,6 +24,8 @@ import java.util.stream.StreamSupport; public class CustomExpressionSection extends CustomSyntaxSection { + public static boolean customExpressionsUsed = false; + static { String[] syntax = { "[(2¦local)] [(1¦(plural|non(-|[ ])single))] expression <.+>", @@ -75,6 +77,8 @@ protected DataTracker getDataTracker() { @Override protected boolean init(Literal[] args, int matchedPattern, SkriptParser.ParseResult parseResult, SectionNode node, boolean isPreload) { + customExpressionsUsed = true; + if (!isPreloaded) { String what; SectionNode patterns = (SectionNode) node.get("patterns"); diff --git a/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprJavaCall.java b/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprJavaCall.java index ce9dcf7..33a3a1d 100644 --- a/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprJavaCall.java +++ b/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprJavaCall.java @@ -35,6 +35,8 @@ import java.util.stream.Stream; public class ExprJavaCall implements Expression { + public static int javaCallsMade = 0; + private static final MethodHandles.Lookup LOOKUP = MethodHandles.publicLookup(); private static final Object[] NO_ARGS = new Object[0]; private static final Descriptor CONSTRUCTOR_DESCRIPTOR = new Descriptor(null, "", null); @@ -408,6 +410,8 @@ private Collection createCallSite(Descriptor e) { @SuppressWarnings("unchecked") private T invoke(Object target, Object[] arguments, Descriptor baseDescriptor) { + javaCallsMade++; + if (baseDescriptor == null) { return null; } diff --git a/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprProxy.java b/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprProxy.java index c0fcc98..d58003b 100644 --- a/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprProxy.java +++ b/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprProxy.java @@ -25,6 +25,9 @@ import java.util.*; public class ExprProxy extends SimpleExpression { + + public static boolean proxiesUsed = false; + static { Skript.registerExpression(ExprProxy.class, Object.class, ExpressionType.COMBINED, "[a] [new] proxy [instance] of %javatypes% (using|from) %objects%"); @@ -138,6 +141,8 @@ public String toString(Event e, boolean debug) { public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) { + proxiesUsed = true; + interfaces = SkriptUtil.defendExpression(exprs[0]); Expression var = SkriptUtil.defendExpression(exprs[1]); diff --git a/src/main/java/com/btk5h/skriptmirror/skript/reflect/sections/CondSection.java b/src/main/java/com/btk5h/skriptmirror/skript/reflect/sections/CondSection.java index 5e6d215..cef46a5 100644 --- a/src/main/java/com/btk5h/skriptmirror/skript/reflect/sections/CondSection.java +++ b/src/main/java/com/btk5h/skriptmirror/skript/reflect/sections/CondSection.java @@ -19,6 +19,8 @@ public class CondSection extends Condition { + public static boolean sectionsUsed = false; + static { Skript.registerCondition(CondSection.class, "create [new] section [with [arguments variables] %-objects%] (and store it|stored) in %objects%"); @@ -70,6 +72,8 @@ public String toString(@Nullable Event e, boolean debug) { @Override public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) { + sectionsUsed = true; + if (!shouldInit) return false;