From a8821be3dba2ca4944511ed3b047ad8767c6c642 Mon Sep 17 00:00:00 2001 From: Pim van der Loos Date: Fri, 6 Oct 2017 16:43:09 +0200 Subject: [PATCH] - Fixed elytra duplication exploit. - Fixed equipping elytra without permissions bug. - Color codes in config now case insensitive. - Removed armoredelytra.give permission node. (use armoredelytra.give.) - Added bStats for stats. --- pom.xml | 135 ++-- .../armoredElytra/ArmoredElytra.java | 38 +- .../armoredElytra/EventHandlers.java | 66 +- .../nl/pim16aap2/armoredElytra/Metrics.java | 678 ++++++++++++++++++ src/main/resources/config.yml | 13 +- src/main/resources/plugin.yml | 6 +- 6 files changed, 821 insertions(+), 115 deletions(-) create mode 100644 src/main/java/nl/pim16aap2/armoredElytra/Metrics.java diff --git a/pom.xml b/pom.xml index e21fb8b..710d066 100644 --- a/pom.xml +++ b/pom.xml @@ -1,62 +1,75 @@ - 4.0.0 - nl.pim16aap2 - ArmoredElytra - 1.7.3-SNAPSHOT - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - - - - - - org.spigotmc - spigot-api - 1.11.2-R0.1-SNAPSHOT - provided - - - - org.spigotmc - spigot-api - 1.12.1-R0.1-SNAPSHOT - provided - - - - - org.bukkit - craftbukkit - 1.11.2-R0.1-SNAPSHOT - provided - - - - org.bukkit - craftbukkit - 1.12-R0.1-SNAPSHOT - provided - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - + + 4.0.0 + nl.pim16aap2 + ArmoredElytra + 1.9-SNAPSHOT + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + bstats-repo + http://repo.bstats.org/content/repositories/releases/ + + + + + + + + + org.spigotmc + spigot-api + 1.11.2-R0.1-SNAPSHOT + provided + + + + + org.bstats + bstats-bukkit + 1.2 + + + + org.spigotmc + spigot-api + 1.12.1-R0.1-SNAPSHOT + provided + + + + + org.bukkit + craftbukkit + 1.11.2-R0.1-SNAPSHOT + provided + + + + org.bukkit + craftbukkit + 1.12-R0.1-SNAPSHOT + provided + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + diff --git a/src/main/java/nl/pim16aap2/armoredElytra/ArmoredElytra.java b/src/main/java/nl/pim16aap2/armoredElytra/ArmoredElytra.java index aed52e1..017bfe4 100644 --- a/src/main/java/nl/pim16aap2/armoredElytra/ArmoredElytra.java +++ b/src/main/java/nl/pim16aap2/armoredElytra/ArmoredElytra.java @@ -32,6 +32,7 @@ public class ArmoredElytra extends JavaPlugin implements Listener private String usageDeniedMessage; private String elytraReceivedMessage; private boolean checkForUpdates; + private boolean allowStats; private boolean upToDate; private String elytraName; private String elytraLore; @@ -40,20 +41,6 @@ public class ArmoredElytra extends JavaPlugin implements Listener public void onEnable() { FileConfiguration config = this.getConfig(); - config.addDefault("leatherRepair", 6); - config.addDefault("goldRepair", 5); - config.addDefault("ironRepair", 4); - config.addDefault("diamondsRepair", 3); - config.addDefault("allowCurses", true); - config.addDefault("allowedEnchantments", new String[]{"DURABILITY","PROTECTION_FIRE","PROTECTION_EXPLOSIONS", - "PROTECTION_PROJECTILE","PROTECTION_ENVIRONMENTAL","THORNS"}); - config.addDefault("usageDeniedMessage", "&CYou do not have the required permissions to wear %ARMOR_TIER% armored elytras!"); - config.addDefault("elytraReceivedMessage", "&2A(n) %ARMOR_TIER% armored elytra has been bestowed upon you!"); - - config.addDefault("elytraName", "%ARMOR_TIER% Armored Elytra"); - config.addDefault("elytraLore", "&DElytra with %ARMOR_TIER% level protection."); - - config.addDefault("checkForUpdates", true); saveDefaultConfig(); LEATHER_TO_FULL = config.getInt("leatherRepair", 6); @@ -63,13 +50,14 @@ public class ArmoredElytra extends JavaPlugin implements Listener cursesAllowed = config.getBoolean("allowCurses", true); List list = config.getStringList("allowedEnchantments"); allowedEnchants = list.toArray(new String[0]); - - usageDeniedMessage = config.getString("usageDeniedMessage").replaceAll("(&([a-f0-9]))", "\u00A7$2");; - elytraReceivedMessage = config.getString("elytraReceivedMessage").replaceAll("(&([a-f0-9]))", "\u00A7$2");; - elytraName = config.getString("elytraName").replaceAll("(&([a-f0-9]))", "\u00A7$2");; - elytraLore = config.getString("elytraLore").replaceAll("(&([a-f0-9]))", "\u00A7$2");; - + + usageDeniedMessage = config.getString("usageDeniedMessage").replaceAll("&((?i)[0-9a-fk-or])", "\u00A7$1"); + elytraReceivedMessage = config.getString("elytraReceivedMessage").replaceAll("&((?i)[0-9a-fk-or])", "\u00A7$1"); + elytraName = config.getString("elytraName").replaceAll("&((?i)[0-9a-fk-or])", "\u00A7$1"); + elytraLore = config.getString("elytraLore").replaceAll("&((?i)[0-9a-fk-or])", "\u00A7$1"); + checkForUpdates = config.getBoolean("checkForUpdates"); + allowStats = config.getBoolean("allowStats"); usageDeniedMessage = (Objects.equals(usageDeniedMessage, new String("NONE")) ? null : usageDeniedMessage); elytraReceivedMessage = (Objects.equals(elytraReceivedMessage, new String("NONE")) ? null : elytraReceivedMessage); @@ -97,6 +85,16 @@ public class ArmoredElytra extends JavaPlugin implements Listener } } + if (allowStats) + { + myLogger(Level.INFO, "Enabling stats!"); + @SuppressWarnings("unused") + Metrics metrics = new Metrics(this); + } else + { + myLogger(Level.INFO, "Stats disabled, not laoding stats :("); + } + config.options().copyDefaults(true); saveConfig(); diff --git a/src/main/java/nl/pim16aap2/armoredElytra/EventHandlers.java b/src/main/java/nl/pim16aap2/armoredElytra/EventHandlers.java index 95f4d9a..0f93bfe 100644 --- a/src/main/java/nl/pim16aap2/armoredElytra/EventHandlers.java +++ b/src/main/java/nl/pim16aap2/armoredElytra/EventHandlers.java @@ -13,6 +13,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.event.inventory.InventoryCloseEvent; import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.AnvilInventory; @@ -213,7 +214,7 @@ public class EventHandlers implements Listener { // If there is an elytra in the final slot (it is unenchantable by default, so we can reasonably expect it to be an enchanted elytra) // and the player selects it, let the player transfer it to their inventory. - if (anvilInventory.getItem(2).getType() == Material.ELYTRA) + if (anvilInventory.getItem(2).getType() == Material.ELYTRA && anvilInventory.getItem(0) != null && anvilInventory.getItem(1) != null) { if (e.isShiftClick()) { @@ -436,6 +437,43 @@ public class EventHandlers implements Listener } } + // Player closes their inventory. Also checks for whether they are allowed to wear the armored elytra they are wearing. + // This is done again here because there are ways to bypass permission check when equipping. + @EventHandler + public void onInventoryClose(InventoryCloseEvent e) + { + verifyArmorInChestSlot((Player) e.getPlayer()); + } + + // Check if the player is allowed to wear the armored elytra based on their permissions. + public void verifyArmorInChestSlot(Player player) + { + ItemStack chestplate = player.getInventory().getChestplate(); + // If the player equips a new chestplate. + if (player.getInventory().getChestplate() != null) + { + // If that chestplate is an (armored) elytra. + if (chestplate.getType() == Material.ELYTRA && isArmoredElytra(chestplate)) + { + int armorTier = nbtEditor.getArmorTier(chestplate); + if ((chestplate.getDurability() >= chestplate.getType().getMaxDurability())) + { + plugin.messagePlayer(player, ChatColor.RED + "You cannot equip this elytra! Please repair it in an anvil first."); + unenquipChestPlayer(player); + } else if ((armorTier == 1 && !player.hasPermission("armoredelytra.wear.leather")) || + (armorTier == 2 && !player.hasPermission("armoredelytra.wear.gold")) || + (armorTier == 3 && !player.hasPermission("armoredelytra.wear.chain")) || + (armorTier == 4 && !player.hasPermission("armoredelytra.wear.iron")) || + (armorTier == 5 && !player.hasPermission("armoredelytra.wear.diamond"))) + { + plugin.usageDeniedMessage(player, armorTier); + unenquipChestPlayer(player); + } + player.updateInventory(); + } + } + } + // Check if the player is trying to equip a broken elytra (and prevent that). @EventHandler @@ -449,31 +487,7 @@ public class EventHandlers implements Listener @Override public void run() { - ItemStack chestplate = player.getInventory().getChestplate(); - // If the player equips a new chestplate. - if (player.getInventory().getChestplate() != null) - { - // If that chestplate is an (armored) elytra. - if (chestplate.getType() == Material.ELYTRA && isArmoredElytra(chestplate)) - { - int armorTier = nbtEditor.getArmorTier(chestplate); - if ((chestplate.getDurability() >= chestplate.getType().getMaxDurability())) - { - plugin.messagePlayer(player, ChatColor.RED + "You cannot equip this elytra! Please repair it in an anvil first."); - unenquipChestPlayer(player); - } else if ((armorTier == 1 && !player.hasPermission("armoredelytra.wear.leather")) || - (armorTier == 2 && !player.hasPermission("armoredelytra.wear.gold")) || - (armorTier == 3 && !player.hasPermission("armoredelytra.wear.chain")) || - (armorTier == 4 && !player.hasPermission("armoredelytra.wear.iron")) || - (armorTier == 5 && !player.hasPermission("armoredelytra.wear.diamond"))) - { - plugin.usageDeniedMessage(player, armorTier); - unenquipChestPlayer(player); - } - player.updateInventory(); - e.setCancelled(true); - } - } + verifyArmorInChestSlot(player); } }.runTaskLater(this.plugin, 1); } diff --git a/src/main/java/nl/pim16aap2/armoredElytra/Metrics.java b/src/main/java/nl/pim16aap2/armoredElytra/Metrics.java new file mode 100644 index 0000000..2d828ee --- /dev/null +++ b/src/main/java/nl/pim16aap2/armoredElytra/Metrics.java @@ -0,0 +1,678 @@ +package nl.pim16aap2.armoredElytra; + +import org.bukkit.Bukkit; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.entity.Player; +import org.bukkit.plugin.RegisteredServiceProvider; +import org.bukkit.plugin.ServicePriority; +import org.bukkit.plugin.java.JavaPlugin; +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; + +import javax.net.ssl.HttpsURLConnection; +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Timer; +import java.util.TimerTask; +import java.util.UUID; +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! + */ +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!"); + } + } + } + + // 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; + + // The uuid of the server + private static String serverUUID; + + // The plugin + private final JavaPlugin plugin; + + // A list with all custom charts + private final List charts = new ArrayList<>(); + + /** + * Class constructor. + * + * @param plugin The plugin which stats should be submitted. + */ + public Metrics(JavaPlugin plugin) { + if (plugin == null) { + throw new IllegalArgumentException("Plugin cannot be null!"); + } + this.plugin = plugin; + + // Get the config file + File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats"); + File configFile = new File(bStatsFolder, "config.yml"); + YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile); + + // Check if the config file exists + if (!config.isSet("serverUuid")) { + + // Add default values + config.addDefault("enabled", true); + // Every server gets it's unique random id. + config.addDefault("serverUuid", UUID.randomUUID().toString()); + // Should failed request be logged? + config.addDefault("logFailedRequests", false); + + // Inform the server owners about bStats + config.options().header( + "bStats collects some data for plugin authors like how many servers are using their plugins.\n" + + "To honor their work, you should not disable it.\n" + + "This has nearly no effect on the server performance!\n" + + "Check out https://bStats.org/ to learn more :)" + ).copyDefaults(true); + try { + config.save(configFile); + } catch (IOException ignored) { } + } + + // Load the data + serverUUID = config.getString("serverUuid"); + logFailedRequests = config.getBoolean("logFailedRequests", false); + if (config.getBoolean("enabled", true)) { + 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(); + } + } + } + + /** + * 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, new Runnable() { + @Override + public void run() { + submitData(); + } + }); + } + }, 1000*60*5, 1000*60*30); + // Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough time to start + // WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted! + // WARNING: Just don't do it! + } + + /** + * Gets the plugin specific data. + * This method is called using Reflection. + * + * @return The plugin specific data. + */ + @SuppressWarnings("unchecked") + public JSONObject getPluginData() { + JSONObject data = new JSONObject(); + + String pluginName = plugin.getDescription().getName(); + String pluginVersion = plugin.getDescription().getVersion(); + + data.put("pluginName", pluginName); // Append the name of the plugin + data.put("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.put("customCharts", customCharts); + + return data; + } + + /** + * Gets the server specific data. + * + * @return The server specific data. + */ + @SuppressWarnings("unchecked") + 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 = org.bukkit.Bukkit.getVersion(); + bukkitVersion = bukkitVersion.substring(bukkitVersion.indexOf("MC: ") + 4, bukkitVersion.length() - 1); + + // 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.put("serverUUID", serverUUID); + + data.put("playerAmount", playerAmount); + data.put("onlineMode", onlineMode); + data.put("bukkitVersion", bukkitVersion); + + data.put("javaVersion", javaVersion); + data.put("osName", osName); + data.put("osArch", osArch); + data.put("osVersion", osVersion); + data.put("coreCount", coreCount); + + return data; + } + + /** + * Collects the data and sends it afterwards. + */ + @SuppressWarnings("unchecked") + 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 { + pluginData.add(provider.getService().getMethod("getPluginData").invoke(provider.getProvider())); + } catch (NullPointerException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { } + } + } catch (NoSuchFieldException ignored) { } + } + + data.put("plugins", pluginData); + + // Create a new thread for the connection to the bStats server + new Thread(new Runnable() { + @Override + public void run() { + try { + // Send the data + sendData(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 data The data to send. + * @throws Exception If the request failed. + */ + private static void sendData(JSONObject data) throws Exception { + if (data == null) { + throw new IllegalArgumentException("Data cannot be null!"); + } + if (Bukkit.isPrimaryThread()) { + throw new IllegalAccessException("This method must not be called from the main thread!"); + } + HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection(); + + // Compress the data to save bandwidth + byte[] compressedData = compress(data.toString()); + + // Add headers + connection.setRequestMethod("POST"); + connection.addRequestProperty("Accept", "application/json"); + connection.addRequestProperty("Connection", "close"); + connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request + connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length)); + connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format + connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION); + + // Send data + connection.setDoOutput(true); + DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream()); + outputStream.write(compressedData); + outputStream.flush(); + outputStream.close(); + + connection.getInputStream().close(); // We don't care about the response - Just send our data :) + } + + /** + * Gzips the given String. + * + * @param str The string to gzip. + * @return The gzipped String. + * @throws IOException If the compression failed. + */ + private static byte[] compress(final String str) throws IOException { + if (str == null) { + return null; + } + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + GZIPOutputStream gzip = new GZIPOutputStream(outputStream); + gzip.write(str.getBytes("UTF-8")); + gzip.close(); + return outputStream.toByteArray(); + } + + /** + * Represents a custom chart. + */ + public static abstract class CustomChart { + + // The id of the chart + final String chartId; + + /** + * Class constructor. + * + * @param chartId The id of the chart. + */ + CustomChart(String chartId) { + if (chartId == null || chartId.isEmpty()) { + throw new IllegalArgumentException("ChartId cannot be null or empty!"); + } + this.chartId = chartId; + } + + @SuppressWarnings("unchecked") + private JSONObject getRequestJsonObject() { + JSONObject chart = new JSONObject(); + chart.put("chartId", chartId); + try { + JSONObject data = getChartData(); + if (data == null) { + // If the data is null we don't send the chart. + return null; + } + chart.put("data", data); + } catch (Throwable t) { + if (logFailedRequests) { + 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; + } + + @SuppressWarnings("unchecked") + @Override + protected JSONObject getChartData() throws Exception { + JSONObject data = new JSONObject(); + String value = callable.call(); + if (value == null || value.isEmpty()) { + // Null = skip the chart + return null; + } + data.put("value", value); + return data; + } + } + + /** + * Represents a custom advanced pie. + */ + public static class AdvancedPie extends CustomChart { + + private final Callable> 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; + } + + @SuppressWarnings("unchecked") + @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.put(entry.getKey(), entry.getValue()); + } + if (allSkipped) { + // Null = skip the chart + return null; + } + data.put("values", values); + return data; + } + } + + /** + * Represents a custom drilldown pie. + */ + public static class DrilldownPie extends CustomChart { + + private final Callable>> 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; + } + + @SuppressWarnings("unchecked") + @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.put(valueEntry.getKey(), valueEntry.getValue()); + allSkipped = false; + } + if (!allSkipped) { + reallyAllSkipped = false; + values.put(entryValues.getKey(), value); + } + } + if (reallyAllSkipped) { + // Null = skip the chart + return null; + } + data.put("values", values); + return data; + } + } + + /** + * Represents a custom single line chart. + */ + public static class SingleLineChart extends CustomChart { + + private final Callable 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; + } + + @SuppressWarnings("unchecked") + @Override + protected JSONObject getChartData() throws Exception { + JSONObject data = new JSONObject(); + int value = callable.call(); + if (value == 0) { + // Null = skip the chart + return null; + } + data.put("value", value); + return data; + } + + } + + /** + * Represents a custom multi line chart. + */ + public static class MultiLineChart extends CustomChart { + + private final Callable> 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; + } + + @SuppressWarnings("unchecked") + @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.put(entry.getKey(), entry.getValue()); + } + if (allSkipped) { + // Null = skip the chart + return null; + } + data.put("values", values); + return data; + } + + } + + /** + * Represents a custom simple bar chart. + */ + public static class SimpleBarChart extends CustomChart { + + private final Callable> 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; + } + + @SuppressWarnings("unchecked") + @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(entry.getValue()); + values.put(entry.getKey(), categoryValues); + } + data.put("values", values); + return data; + } + + } + + /** + * Represents a custom advanced bar chart. + */ + public static class AdvancedBarChart extends CustomChart { + + private final Callable> 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; + } + + @SuppressWarnings("unchecked") + @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(categoryValue); + } + values.put(entry.getKey(), categoryValues); + } + if (allSkipped) { + // Null = skip the chart + return null; + } + data.put("values", values); + return data; + } + + } +} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index b1cb799..ba0befe 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -10,6 +10,8 @@ allowCurses: true # List of enchantments that are allowed to be put on an armored elytra. # If you do not want to allow any enchantments, remove them all and add "NONE" +# You can find supported enchantments here: +# https://hub.spigotmc.org/javadocs/spigot/org/bukkit/enchantments/Enchantment.html allowedEnchantments: # - NONE - DURABILITY @@ -21,17 +23,20 @@ allowedEnchantments: # Message players receive when they lack the required permissions to wear a certain armor tier. "NONE" = no message. # %ARMOR_TIER% is replaced by the name of the armor tier. -usageDeniedMessage: "You do not have the required permissions to wear %ARMOR_TIER% armored elytras!" +usageDeniedMessage: 'You do not have the required permissions to wear %ARMOR_TIER% armored elytras!' # Message players receive when they are given an armored elytra using commands. "NONE" = no message. # %ARMOR_TIER% is replaced by the name of the armor tier. -elytraReceivedMessage: "A(n) %ARMOR_TIER% armored elytra has been bestowed upon you!" +elytraReceivedMessage: '&2A(n) %ARMOR_TIER% armored elytra has been bestowed upon you!' # The name of armored elytras. %ARMOR_TIER% is replaced by the name of the armor tier. elytraName: '%ARMOR_TIER% Armored Elytra' # The lore of armored elytras. "NONE" = no lore. %ARMOR_TIER% is replaced by the name of the armor tier. -elytraLore: Elytra with %ARMOR_TIER% level protection. +elytraLore: 'Elytra with %ARMOR_TIER% level protection' # Allow this plugin to check for updates on startup. It will not download new versions! -checkForUpdates: true \ No newline at end of file +checkForUpdates: true + +# Allow this plugin to send (anonymised) stats using bStats. +allowStats: true \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index b5593b8..a8c22fa 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,13 +1,11 @@ name: ArmoredElytra main: nl.pim16aap2.armoredElytra.ArmoredElytra -version: 1.7.3 +version: 1.9 author: Pim commands: ArmoredElytra: description: Give an armored elytra of the specified tier. usage: /ArmoredElytra [receiver] - permission: armoredelytra.give - permission-message: You do not have the armoredelytra.give permission node. permissions: armoredelytra.wear.leather: description: Allow the player to wear leather tier armored elytras. @@ -30,4 +28,4 @@ permissions: armoredelytra.give.diamond: description: Allow the player to spawn in diamond tier armored elytras. armoredElytra.admin: - description: Receive a message upon joining the game if this plugin is out of date. \ No newline at end of file + description: Receive a message if this plugin is out of date when joining the server. \ No newline at end of file