From ce251d8167b45b15075d78f198cb3f9daf9f32b1 Mon Sep 17 00:00:00 2001 From: Jitse Boonstra Date: Sat, 18 Apr 2020 13:39:10 +0200 Subject: [PATCH] Fixed tab name issue, added metrics, changed version to 2.6-SNAPSHOT --- CREDITS.md | 5 +- api/pom.xml | 2 +- .../main/java/net/jitse/npclib/NPCLib.java | 5 + .../jitse/npclib/metrics/NPCLibMetrics.java | 15 + .../main/java/org/bstats/bukkit/Metrics.java | 724 ++++++++++++++++++ nms/pom.xml | 2 +- nms/v1_10_R1/pom.xml | 2 +- .../PacketPlayOutPlayerInfoWrapper.java | 12 +- .../PacketPlayOutScoreboardTeamWrapper.java | 5 +- nms/v1_11_R1/pom.xml | 2 +- .../PacketPlayOutPlayerInfoWrapper.java | 12 +- .../PacketPlayOutScoreboardTeamWrapper.java | 5 +- nms/v1_12_R1/pom.xml | 2 +- .../PacketPlayOutPlayerInfoWrapper.java | 12 +- .../PacketPlayOutScoreboardTeamWrapper.java | 5 +- nms/v1_13_R1/pom.xml | 2 +- .../PacketPlayOutPlayerInfoWrapper.java | 12 +- .../PacketPlayOutScoreboardTeamWrapper.java | 5 +- nms/v1_13_R2/pom.xml | 2 +- .../PacketPlayOutPlayerInfoWrapper.java | 12 +- .../PacketPlayOutScoreboardTeamWrapper.java | 5 +- nms/v1_14_R1/pom.xml | 2 +- .../PacketPlayOutPlayerInfoWrapper.java | 12 +- .../PacketPlayOutScoreboardTeamWrapper.java | 5 +- nms/v1_15_R1/pom.xml | 2 +- .../PacketPlayOutPlayerInfoWrapper.java | 12 +- .../PacketPlayOutScoreboardTeamWrapper.java | 5 +- nms/v1_8_R2/pom.xml | 2 +- .../PacketPlayOutPlayerInfoWrapper.java | 11 +- .../PacketPlayOutScoreboardTeamWrapper.java | 9 +- nms/v1_8_R3/pom.xml | 2 +- .../PacketPlayOutPlayerInfoWrapper.java | 11 +- .../PacketPlayOutScoreboardTeamWrapper.java | 9 +- nms/v1_9_R1/pom.xml | 2 +- .../PacketPlayOutPlayerInfoWrapper.java | 12 +- .../PacketPlayOutScoreboardTeamWrapper.java | 5 +- nms/v1_9_R2/pom.xml | 2 +- .../PacketPlayOutPlayerInfoWrapper.java | 12 +- .../PacketPlayOutScoreboardTeamWrapper.java | 5 +- plugin/pom.xml | 2 +- pom.xml | 2 +- 41 files changed, 829 insertions(+), 143 deletions(-) create mode 100644 api/src/main/java/net/jitse/npclib/metrics/NPCLibMetrics.java create mode 100644 api/src/main/java/org/bstats/bukkit/Metrics.java diff --git a/CREDITS.md b/CREDITS.md index f9c122a..254fb58 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -12,4 +12,7 @@ This is an API made specifically for spigot servers (Minecraft). Current support I used this module of ProtocolLib to intercept packets sent by players whilst interacting with NPCs. After retrieving the data from these packets, I can call a new [NPCInteractEvent](https://github.com/JitseB/NPCLib/blob/master/commons/src/main/java/net/jitse/npclib/events/NPCInteractEvent.java). ### [MineSkin](https://mineskin.org) by Haylee Schäfer -I integrated MineSkin into NPCLib as an easy way for developers to give NPCs a custom skin without buying multiple Minecraft accounts or saving the skin data themselves. \ No newline at end of file +I integrated MineSkin into NPCLib as an easy way for developers to give NPCs a custom skin without buying multiple Minecraft accounts or saving the skin data themselves. + +### [bStats](https://bstats.org) by BtoBastian +I use bStats to see how much server are using NPCLib, keeps me motivated and gives me insight in which version are used most. You can see the statistics of NPCLib [here](https://bstats.org/plugin/bukkit/JMB-NPCLib). \ No newline at end of file diff --git a/api/pom.xml b/api/pom.xml index 58f7cd2..4bbea1a 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -8,7 +8,7 @@ npclib net.jitse - 2.5.2-SNAPSHOT + 2.6-SNAPSHOT npclib-api diff --git a/api/src/main/java/net/jitse/npclib/NPCLib.java b/api/src/main/java/net/jitse/npclib/NPCLib.java index afdad51..32de577 100644 --- a/api/src/main/java/net/jitse/npclib/NPCLib.java +++ b/api/src/main/java/net/jitse/npclib/NPCLib.java @@ -9,6 +9,7 @@ import net.jitse.npclib.api.utilities.Logger; import net.jitse.npclib.listeners.ChunkListener; import net.jitse.npclib.listeners.PacketListener; import net.jitse.npclib.listeners.PlayerListener; +import net.jitse.npclib.metrics.NPCLibMetrics; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; @@ -51,6 +52,10 @@ public final class NPCLib { // Boot the according packet listener. new PacketListener().start(this); + // Start the bStats metrics system and disable the silly relocate check. + System.setProperty("bstats.relocatecheck", "false"); + new NPCLibMetrics(this); + logger.info("Enabled for Minecraft " + versionName); } diff --git a/api/src/main/java/net/jitse/npclib/metrics/NPCLibMetrics.java b/api/src/main/java/net/jitse/npclib/metrics/NPCLibMetrics.java new file mode 100644 index 0000000..5c104f8 --- /dev/null +++ b/api/src/main/java/net/jitse/npclib/metrics/NPCLibMetrics.java @@ -0,0 +1,15 @@ +package net.jitse.npclib.metrics; + +import net.jitse.npclib.NPCLib; +import net.jitse.npclib.internal.NPCManager; +import org.bstats.bukkit.Metrics; + +public class NPCLibMetrics { + + private static final int BSTATS_PLUGIN_ID = 7214; + + public NPCLibMetrics(NPCLib instance) { + Metrics metrics = new Metrics(instance.getPlugin(), BSTATS_PLUGIN_ID); + metrics.addCustomChart(new Metrics.SingleLineChart("npcs", () -> NPCManager.getAllNPCs().size())); + } +} diff --git a/api/src/main/java/org/bstats/bukkit/Metrics.java b/api/src/main/java/org/bstats/bukkit/Metrics.java new file mode 100644 index 0000000..aca1128 --- /dev/null +++ b/api/src/main/java/org/bstats/bukkit/Metrics.java @@ -0,0 +1,724 @@ +package org.bstats.bukkit; + +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 { + + 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"; + + // 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 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(); + } + + /** + * 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; + } + } + +} \ No newline at end of file diff --git a/nms/pom.xml b/nms/pom.xml index fde9e7b..0c2f738 100644 --- a/nms/pom.xml +++ b/nms/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib - 2.5.2-SNAPSHOT + 2.6-SNAPSHOT npclib-nms diff --git a/nms/v1_10_R1/pom.xml b/nms/v1_10_R1/pom.xml index 7c5a137..d4cd075 100755 --- a/nms/v1_10_R1/pom.xml +++ b/nms/v1_10_R1/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.5.2-SNAPSHOT + 2.6-SNAPSHOT npclib-nms-v1_10_R1 diff --git a/nms/v1_10_R1/src/main/java/net/jitse/npclib/nms/v1_10_R1/packets/PacketPlayOutPlayerInfoWrapper.java b/nms/v1_10_R1/src/main/java/net/jitse/npclib/nms/v1_10_R1/packets/PacketPlayOutPlayerInfoWrapper.java index d07e54a..1135d61 100755 --- a/nms/v1_10_R1/src/main/java/net/jitse/npclib/nms/v1_10_R1/packets/PacketPlayOutPlayerInfoWrapper.java +++ b/nms/v1_10_R1/src/main/java/net/jitse/npclib/nms/v1_10_R1/packets/PacketPlayOutPlayerInfoWrapper.java @@ -9,8 +9,8 @@ import com.mojang.authlib.GameProfile; import net.minecraft.server.v1_10_R1.EnumGamemode; import net.minecraft.server.v1_10_R1.IChatBaseComponent; import net.minecraft.server.v1_10_R1.PacketPlayOutPlayerInfo; -import org.bukkit.ChatColor; +import java.util.Collections; import java.util.List; /** @@ -28,15 +28,11 @@ public class PacketPlayOutPlayerInfoWrapper { Reflection.getField(packetPlayOutPlayerInfo.getClass(), "a", PacketPlayOutPlayerInfo.EnumPlayerInfoAction.class) .set(packetPlayOutPlayerInfo, action); - Object playerInfoData = playerInfoDataConstructor.invoke(packetPlayOutPlayerInfo, - gameProfile, 1, EnumGamemode.NOT_SET, - IChatBaseComponent.ChatSerializer.b("{\"text\":\"" + ChatColor.BLUE + "[NPC] " + name + "\"}") - ); + Object playerInfoData = playerInfoDataConstructor.invoke(packetPlayOutPlayerInfo, gameProfile, 1, EnumGamemode.NOT_SET, + IChatBaseComponent.ChatSerializer.b("{\"text\":\"[NPC] " + name + "\",\"color\":\"dark_gray\"}")); Reflection.FieldAccessor fieldAccessor = Reflection.getField(packetPlayOutPlayerInfo.getClass(), "b", List.class); - List list = fieldAccessor.get(packetPlayOutPlayerInfo); - list.add(playerInfoData); - fieldAccessor.set(packetPlayOutPlayerInfo, list); + fieldAccessor.set(packetPlayOutPlayerInfo, Collections.singletonList(playerInfoData)); return packetPlayOutPlayerInfo; } diff --git a/nms/v1_10_R1/src/main/java/net/jitse/npclib/nms/v1_10_R1/packets/PacketPlayOutScoreboardTeamWrapper.java b/nms/v1_10_R1/src/main/java/net/jitse/npclib/nms/v1_10_R1/packets/PacketPlayOutScoreboardTeamWrapper.java index d8a643a..19bfcf5 100755 --- a/nms/v1_10_R1/src/main/java/net/jitse/npclib/nms/v1_10_R1/packets/PacketPlayOutScoreboardTeamWrapper.java +++ b/nms/v1_10_R1/src/main/java/net/jitse/npclib/nms/v1_10_R1/packets/PacketPlayOutScoreboardTeamWrapper.java @@ -8,6 +8,7 @@ import com.comphenix.tinyprotocol.Reflection; import net.minecraft.server.v1_10_R1.PacketPlayOutScoreboardTeam; import java.util.Collection; +import java.util.Collections; /** * @author Jitse Boonstra @@ -31,9 +32,7 @@ public class PacketPlayOutScoreboardTeamWrapper { .set(packetPlayOutScoreboardTeam, 0); Reflection.FieldAccessor collectionFieldAccessor = Reflection.getField( packetPlayOutScoreboardTeam.getClass(), "h", Collection.class); - Collection collection = collectionFieldAccessor.get(packetPlayOutScoreboardTeam); - collection.add(name); - collectionFieldAccessor.set(packetPlayOutScoreboardTeam, collection); + collectionFieldAccessor.set(packetPlayOutScoreboardTeam, Collections.singletonList(name)); return packetPlayOutScoreboardTeam; } diff --git a/nms/v1_11_R1/pom.xml b/nms/v1_11_R1/pom.xml index ee9ad93..75805b9 100755 --- a/nms/v1_11_R1/pom.xml +++ b/nms/v1_11_R1/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.5.2-SNAPSHOT + 2.6-SNAPSHOT npclib-nms-v1_11_R1 diff --git a/nms/v1_11_R1/src/main/java/net/jitse/npclib/nms/v1_11_R1/packets/PacketPlayOutPlayerInfoWrapper.java b/nms/v1_11_R1/src/main/java/net/jitse/npclib/nms/v1_11_R1/packets/PacketPlayOutPlayerInfoWrapper.java index 52413e5..c1a7c24 100755 --- a/nms/v1_11_R1/src/main/java/net/jitse/npclib/nms/v1_11_R1/packets/PacketPlayOutPlayerInfoWrapper.java +++ b/nms/v1_11_R1/src/main/java/net/jitse/npclib/nms/v1_11_R1/packets/PacketPlayOutPlayerInfoWrapper.java @@ -9,8 +9,8 @@ import com.mojang.authlib.GameProfile; import net.minecraft.server.v1_11_R1.EnumGamemode; import net.minecraft.server.v1_11_R1.IChatBaseComponent; import net.minecraft.server.v1_11_R1.PacketPlayOutPlayerInfo; -import org.bukkit.ChatColor; +import java.util.Collections; import java.util.List; /** @@ -28,15 +28,11 @@ public class PacketPlayOutPlayerInfoWrapper { Reflection.getField(packetPlayOutPlayerInfo.getClass(), "a", PacketPlayOutPlayerInfo.EnumPlayerInfoAction.class) .set(packetPlayOutPlayerInfo, action); - Object playerInfoData = playerInfoDataConstructor.invoke(packetPlayOutPlayerInfo, - gameProfile, 1, EnumGamemode.NOT_SET, - IChatBaseComponent.ChatSerializer.b("{\"text\":\"" + ChatColor.BLUE + "[NPC] " + name + "\"}") - ); + Object playerInfoData = playerInfoDataConstructor.invoke(packetPlayOutPlayerInfo, gameProfile, 1, EnumGamemode.NOT_SET, + IChatBaseComponent.ChatSerializer.b("{\"text\":\"[NPC] " + name + "\",\"color\":\"dark_gray\"}")); Reflection.FieldAccessor fieldAccessor = Reflection.getField(packetPlayOutPlayerInfo.getClass(), "b", List.class); - List list = fieldAccessor.get(packetPlayOutPlayerInfo); - list.add(playerInfoData); - fieldAccessor.set(packetPlayOutPlayerInfo, list); + fieldAccessor.set(packetPlayOutPlayerInfo, Collections.singletonList(playerInfoData)); return packetPlayOutPlayerInfo; } diff --git a/nms/v1_11_R1/src/main/java/net/jitse/npclib/nms/v1_11_R1/packets/PacketPlayOutScoreboardTeamWrapper.java b/nms/v1_11_R1/src/main/java/net/jitse/npclib/nms/v1_11_R1/packets/PacketPlayOutScoreboardTeamWrapper.java index 957b4e5..ef92b42 100755 --- a/nms/v1_11_R1/src/main/java/net/jitse/npclib/nms/v1_11_R1/packets/PacketPlayOutScoreboardTeamWrapper.java +++ b/nms/v1_11_R1/src/main/java/net/jitse/npclib/nms/v1_11_R1/packets/PacketPlayOutScoreboardTeamWrapper.java @@ -8,6 +8,7 @@ import com.comphenix.tinyprotocol.Reflection; import net.minecraft.server.v1_11_R1.PacketPlayOutScoreboardTeam; import java.util.Collection; +import java.util.Collections; /** * @author Jitse Boonstra @@ -31,9 +32,7 @@ public class PacketPlayOutScoreboardTeamWrapper { .set(packetPlayOutScoreboardTeam, 0); Reflection.FieldAccessor collectionFieldAccessor = Reflection.getField( packetPlayOutScoreboardTeam.getClass(), "h", Collection.class); - Collection collection = collectionFieldAccessor.get(packetPlayOutScoreboardTeam); - collection.add(name); - collectionFieldAccessor.set(packetPlayOutScoreboardTeam, collection); + collectionFieldAccessor.set(packetPlayOutScoreboardTeam, Collections.singletonList(name)); return packetPlayOutScoreboardTeam; } diff --git a/nms/v1_12_R1/pom.xml b/nms/v1_12_R1/pom.xml index de4b2ae..c589cee 100755 --- a/nms/v1_12_R1/pom.xml +++ b/nms/v1_12_R1/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.5.2-SNAPSHOT + 2.6-SNAPSHOT npclib-nms-v1_12_R1 diff --git a/nms/v1_12_R1/src/main/java/net/jitse/npclib/nms/v1_12_R1/packets/PacketPlayOutPlayerInfoWrapper.java b/nms/v1_12_R1/src/main/java/net/jitse/npclib/nms/v1_12_R1/packets/PacketPlayOutPlayerInfoWrapper.java index f13a0a4..4d25246 100755 --- a/nms/v1_12_R1/src/main/java/net/jitse/npclib/nms/v1_12_R1/packets/PacketPlayOutPlayerInfoWrapper.java +++ b/nms/v1_12_R1/src/main/java/net/jitse/npclib/nms/v1_12_R1/packets/PacketPlayOutPlayerInfoWrapper.java @@ -9,8 +9,8 @@ import com.mojang.authlib.GameProfile; import net.minecraft.server.v1_12_R1.EnumGamemode; import net.minecraft.server.v1_12_R1.IChatBaseComponent; import net.minecraft.server.v1_12_R1.PacketPlayOutPlayerInfo; -import org.bukkit.ChatColor; +import java.util.Collections; import java.util.List; /** @@ -28,15 +28,11 @@ public class PacketPlayOutPlayerInfoWrapper { Reflection.getField(packetPlayOutPlayerInfo.getClass(), "a", PacketPlayOutPlayerInfo.EnumPlayerInfoAction.class) .set(packetPlayOutPlayerInfo, action); - Object playerInfoData = playerInfoDataConstructor.invoke(packetPlayOutPlayerInfo, - gameProfile, 1, EnumGamemode.NOT_SET, - IChatBaseComponent.ChatSerializer.b("{\"text\":\"" + ChatColor.BLUE + "[NPC] " + name + "\"}") - ); + Object playerInfoData = playerInfoDataConstructor.invoke(packetPlayOutPlayerInfo, gameProfile, 1, EnumGamemode.NOT_SET, + IChatBaseComponent.ChatSerializer.b("{\"text\":\"[NPC] " + name + "\",\"color\":\"dark_gray\"}")); Reflection.FieldAccessor fieldAccessor = Reflection.getField(packetPlayOutPlayerInfo.getClass(), "b", List.class); - List list = fieldAccessor.get(packetPlayOutPlayerInfo); - list.add(playerInfoData); - fieldAccessor.set(packetPlayOutPlayerInfo, list); + fieldAccessor.set(packetPlayOutPlayerInfo, Collections.singletonList(playerInfoData)); return packetPlayOutPlayerInfo; } diff --git a/nms/v1_12_R1/src/main/java/net/jitse/npclib/nms/v1_12_R1/packets/PacketPlayOutScoreboardTeamWrapper.java b/nms/v1_12_R1/src/main/java/net/jitse/npclib/nms/v1_12_R1/packets/PacketPlayOutScoreboardTeamWrapper.java index 70a7b06..1af849c 100755 --- a/nms/v1_12_R1/src/main/java/net/jitse/npclib/nms/v1_12_R1/packets/PacketPlayOutScoreboardTeamWrapper.java +++ b/nms/v1_12_R1/src/main/java/net/jitse/npclib/nms/v1_12_R1/packets/PacketPlayOutScoreboardTeamWrapper.java @@ -8,6 +8,7 @@ import com.comphenix.tinyprotocol.Reflection; import net.minecraft.server.v1_12_R1.PacketPlayOutScoreboardTeam; import java.util.Collection; +import java.util.Collections; /** * @author Jitse Boonstra @@ -31,9 +32,7 @@ public class PacketPlayOutScoreboardTeamWrapper { .set(packetPlayOutScoreboardTeam, 0); Reflection.FieldAccessor collectionFieldAccessor = Reflection.getField( packetPlayOutScoreboardTeam.getClass(), "h", Collection.class); - Collection collection = collectionFieldAccessor.get(packetPlayOutScoreboardTeam); - collection.add(name); - collectionFieldAccessor.set(packetPlayOutScoreboardTeam, collection); + collectionFieldAccessor.set(packetPlayOutScoreboardTeam, Collections.singletonList(name)); return packetPlayOutScoreboardTeam; } diff --git a/nms/v1_13_R1/pom.xml b/nms/v1_13_R1/pom.xml index 7a04fa4..8c2c8a6 100755 --- a/nms/v1_13_R1/pom.xml +++ b/nms/v1_13_R1/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.5.2-SNAPSHOT + 2.6-SNAPSHOT npclib-nms-v1_13_R1 diff --git a/nms/v1_13_R1/src/main/java/net/jitse/npclib/nms/v1_13_R1/packets/PacketPlayOutPlayerInfoWrapper.java b/nms/v1_13_R1/src/main/java/net/jitse/npclib/nms/v1_13_R1/packets/PacketPlayOutPlayerInfoWrapper.java index 578efb0..2d1c7e0 100755 --- a/nms/v1_13_R1/src/main/java/net/jitse/npclib/nms/v1_13_R1/packets/PacketPlayOutPlayerInfoWrapper.java +++ b/nms/v1_13_R1/src/main/java/net/jitse/npclib/nms/v1_13_R1/packets/PacketPlayOutPlayerInfoWrapper.java @@ -9,8 +9,8 @@ import com.mojang.authlib.GameProfile; import net.minecraft.server.v1_13_R1.EnumGamemode; import net.minecraft.server.v1_13_R1.IChatBaseComponent; import net.minecraft.server.v1_13_R1.PacketPlayOutPlayerInfo; -import org.bukkit.ChatColor; +import java.util.Collections; import java.util.List; /** @@ -28,15 +28,11 @@ public class PacketPlayOutPlayerInfoWrapper { Reflection.getField(packetPlayOutPlayerInfo.getClass(), "a", PacketPlayOutPlayerInfo.EnumPlayerInfoAction.class) .set(packetPlayOutPlayerInfo, action); - Object playerInfoData = playerInfoDataConstructor.invoke(packetPlayOutPlayerInfo, - gameProfile, 1, EnumGamemode.NOT_SET, - IChatBaseComponent.ChatSerializer.b("{\"text\":\"" + ChatColor.BLUE + "[NPC] " + name + "\"}") - ); + Object playerInfoData = playerInfoDataConstructor.invoke(packetPlayOutPlayerInfo, gameProfile, 1, EnumGamemode.NOT_SET, + IChatBaseComponent.ChatSerializer.b("{\"text\":\"[NPC] " + name + "\",\"color\":\"dark_gray\"}")); Reflection.FieldAccessor fieldAccessor = Reflection.getField(packetPlayOutPlayerInfo.getClass(), "b", List.class); - List list = fieldAccessor.get(packetPlayOutPlayerInfo); - list.add(playerInfoData); - fieldAccessor.set(packetPlayOutPlayerInfo, list); + fieldAccessor.set(packetPlayOutPlayerInfo, Collections.singletonList(playerInfoData)); return packetPlayOutPlayerInfo; } diff --git a/nms/v1_13_R1/src/main/java/net/jitse/npclib/nms/v1_13_R1/packets/PacketPlayOutScoreboardTeamWrapper.java b/nms/v1_13_R1/src/main/java/net/jitse/npclib/nms/v1_13_R1/packets/PacketPlayOutScoreboardTeamWrapper.java index 71b3bb0..08c86bc 100755 --- a/nms/v1_13_R1/src/main/java/net/jitse/npclib/nms/v1_13_R1/packets/PacketPlayOutScoreboardTeamWrapper.java +++ b/nms/v1_13_R1/src/main/java/net/jitse/npclib/nms/v1_13_R1/packets/PacketPlayOutScoreboardTeamWrapper.java @@ -10,6 +10,7 @@ import net.minecraft.server.v1_13_R1.IChatBaseComponent; import net.minecraft.server.v1_13_R1.PacketPlayOutScoreboardTeam; import java.util.Collection; +import java.util.Collections; /** * @author Jitse Boonstra @@ -33,9 +34,7 @@ public class PacketPlayOutScoreboardTeamWrapper { .set(packetPlayOutScoreboardTeam, 0); Reflection.FieldAccessor collectionFieldAccessor = Reflection.getField( packetPlayOutScoreboardTeam.getClass(), "h", Collection.class); - Collection collection = collectionFieldAccessor.get(packetPlayOutScoreboardTeam); - collection.add(name); - collectionFieldAccessor.set(packetPlayOutScoreboardTeam, collection); + collectionFieldAccessor.set(packetPlayOutScoreboardTeam, Collections.singletonList(name)); return packetPlayOutScoreboardTeam; } diff --git a/nms/v1_13_R2/pom.xml b/nms/v1_13_R2/pom.xml index b5c4092..655d447 100755 --- a/nms/v1_13_R2/pom.xml +++ b/nms/v1_13_R2/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.5.2-SNAPSHOT + 2.6-SNAPSHOT npclib-nms-v1_13_R2 diff --git a/nms/v1_13_R2/src/main/java/net/jitse/npclib/nms/v1_13_R2/packets/PacketPlayOutPlayerInfoWrapper.java b/nms/v1_13_R2/src/main/java/net/jitse/npclib/nms/v1_13_R2/packets/PacketPlayOutPlayerInfoWrapper.java index 79e1fbb..7417dbc 100755 --- a/nms/v1_13_R2/src/main/java/net/jitse/npclib/nms/v1_13_R2/packets/PacketPlayOutPlayerInfoWrapper.java +++ b/nms/v1_13_R2/src/main/java/net/jitse/npclib/nms/v1_13_R2/packets/PacketPlayOutPlayerInfoWrapper.java @@ -9,8 +9,8 @@ import com.mojang.authlib.GameProfile; import net.minecraft.server.v1_13_R2.EnumGamemode; import net.minecraft.server.v1_13_R2.IChatBaseComponent; import net.minecraft.server.v1_13_R2.PacketPlayOutPlayerInfo; -import org.bukkit.ChatColor; +import java.util.Collections; import java.util.List; /** @@ -28,15 +28,11 @@ public class PacketPlayOutPlayerInfoWrapper { Reflection.getField(packetPlayOutPlayerInfo.getClass(), "a", PacketPlayOutPlayerInfo.EnumPlayerInfoAction.class) .set(packetPlayOutPlayerInfo, action); - Object playerInfoData = playerInfoDataConstructor.invoke(packetPlayOutPlayerInfo, - gameProfile, 1, EnumGamemode.NOT_SET, - IChatBaseComponent.ChatSerializer.b("{\"text\":\"" + ChatColor.BLUE + "[NPC] " + name + "\"}") - ); + Object playerInfoData = playerInfoDataConstructor.invoke(packetPlayOutPlayerInfo, gameProfile, 1, EnumGamemode.NOT_SET, + IChatBaseComponent.ChatSerializer.b("{\"text\":\"[NPC] " + name + "\",\"color\":\"dark_gray\"}")); Reflection.FieldAccessor fieldAccessor = Reflection.getField(packetPlayOutPlayerInfo.getClass(), "b", List.class); - List list = fieldAccessor.get(packetPlayOutPlayerInfo); - list.add(playerInfoData); - fieldAccessor.set(packetPlayOutPlayerInfo, list); + fieldAccessor.set(packetPlayOutPlayerInfo, Collections.singletonList(playerInfoData)); return packetPlayOutPlayerInfo; } diff --git a/nms/v1_13_R2/src/main/java/net/jitse/npclib/nms/v1_13_R2/packets/PacketPlayOutScoreboardTeamWrapper.java b/nms/v1_13_R2/src/main/java/net/jitse/npclib/nms/v1_13_R2/packets/PacketPlayOutScoreboardTeamWrapper.java index 9beae2c..d17a9be 100755 --- a/nms/v1_13_R2/src/main/java/net/jitse/npclib/nms/v1_13_R2/packets/PacketPlayOutScoreboardTeamWrapper.java +++ b/nms/v1_13_R2/src/main/java/net/jitse/npclib/nms/v1_13_R2/packets/PacketPlayOutScoreboardTeamWrapper.java @@ -10,6 +10,7 @@ import net.minecraft.server.v1_13_R2.IChatBaseComponent; import net.minecraft.server.v1_13_R2.PacketPlayOutScoreboardTeam; import java.util.Collection; +import java.util.Collections; /** * @author Jitse Boonstra @@ -33,9 +34,7 @@ public class PacketPlayOutScoreboardTeamWrapper { .set(packetPlayOutScoreboardTeam, 0); Reflection.FieldAccessor collectionFieldAccessor = Reflection.getField( packetPlayOutScoreboardTeam.getClass(), "h", Collection.class); - Collection collection = collectionFieldAccessor.get(packetPlayOutScoreboardTeam); - collection.add(name); - collectionFieldAccessor.set(packetPlayOutScoreboardTeam, collection); + collectionFieldAccessor.set(packetPlayOutScoreboardTeam, Collections.singletonList(name)); return packetPlayOutScoreboardTeam; } diff --git a/nms/v1_14_R1/pom.xml b/nms/v1_14_R1/pom.xml index 39da88c..44b2128 100755 --- a/nms/v1_14_R1/pom.xml +++ b/nms/v1_14_R1/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.5.2-SNAPSHOT + 2.6-SNAPSHOT npclib-nms-v1_14_R1 diff --git a/nms/v1_14_R1/src/main/java/net/jitse/npclib/nms/v1_14_R1/packets/PacketPlayOutPlayerInfoWrapper.java b/nms/v1_14_R1/src/main/java/net/jitse/npclib/nms/v1_14_R1/packets/PacketPlayOutPlayerInfoWrapper.java index ad8021b..279232c 100755 --- a/nms/v1_14_R1/src/main/java/net/jitse/npclib/nms/v1_14_R1/packets/PacketPlayOutPlayerInfoWrapper.java +++ b/nms/v1_14_R1/src/main/java/net/jitse/npclib/nms/v1_14_R1/packets/PacketPlayOutPlayerInfoWrapper.java @@ -9,8 +9,8 @@ import com.mojang.authlib.GameProfile; import net.minecraft.server.v1_14_R1.EnumGamemode; import net.minecraft.server.v1_14_R1.IChatBaseComponent; import net.minecraft.server.v1_14_R1.PacketPlayOutPlayerInfo; -import org.bukkit.ChatColor; +import java.util.Collections; import java.util.List; /** @@ -28,15 +28,11 @@ public class PacketPlayOutPlayerInfoWrapper { Reflection.getField(packetPlayOutPlayerInfo.getClass(), "a", PacketPlayOutPlayerInfo.EnumPlayerInfoAction.class) .set(packetPlayOutPlayerInfo, action); - Object playerInfoData = playerInfoDataConstructor.invoke(packetPlayOutPlayerInfo, - gameProfile, 1, EnumGamemode.NOT_SET, - IChatBaseComponent.ChatSerializer.b("{\"text\":\"" + ChatColor.BLUE + "[NPC] " + name + "\"}") - ); + Object playerInfoData = playerInfoDataConstructor.invoke(packetPlayOutPlayerInfo, gameProfile, 1, EnumGamemode.NOT_SET, + IChatBaseComponent.ChatSerializer.b("{\"text\":\"[NPC] " + name + "\",\"color\":\"dark_gray\"}")); Reflection.FieldAccessor fieldAccessor = Reflection.getField(packetPlayOutPlayerInfo.getClass(), "b", List.class); - List list = fieldAccessor.get(packetPlayOutPlayerInfo); - list.add(playerInfoData); - fieldAccessor.set(packetPlayOutPlayerInfo, list); + fieldAccessor.set(packetPlayOutPlayerInfo, Collections.singletonList(playerInfoData)); return packetPlayOutPlayerInfo; } diff --git a/nms/v1_14_R1/src/main/java/net/jitse/npclib/nms/v1_14_R1/packets/PacketPlayOutScoreboardTeamWrapper.java b/nms/v1_14_R1/src/main/java/net/jitse/npclib/nms/v1_14_R1/packets/PacketPlayOutScoreboardTeamWrapper.java index 234071f..1977a82 100755 --- a/nms/v1_14_R1/src/main/java/net/jitse/npclib/nms/v1_14_R1/packets/PacketPlayOutScoreboardTeamWrapper.java +++ b/nms/v1_14_R1/src/main/java/net/jitse/npclib/nms/v1_14_R1/packets/PacketPlayOutScoreboardTeamWrapper.java @@ -10,6 +10,7 @@ import net.minecraft.server.v1_14_R1.IChatBaseComponent; import net.minecraft.server.v1_14_R1.PacketPlayOutScoreboardTeam; import java.util.Collection; +import java.util.Collections; /** * @author Jitse Boonstra @@ -33,9 +34,7 @@ public class PacketPlayOutScoreboardTeamWrapper { .set(packetPlayOutScoreboardTeam, 0); Reflection.FieldAccessor collectionFieldAccessor = Reflection.getField( packetPlayOutScoreboardTeam.getClass(), "h", Collection.class); - Collection collection = collectionFieldAccessor.get(packetPlayOutScoreboardTeam); - collection.add(name); - collectionFieldAccessor.set(packetPlayOutScoreboardTeam, collection); + collectionFieldAccessor.set(packetPlayOutScoreboardTeam, Collections.singletonList(name)); return packetPlayOutScoreboardTeam; } diff --git a/nms/v1_15_R1/pom.xml b/nms/v1_15_R1/pom.xml index 261a174..3401c6e 100644 --- a/nms/v1_15_R1/pom.xml +++ b/nms/v1_15_R1/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.5.2-SNAPSHOT + 2.6-SNAPSHOT npclib-nms-v1_15_R1 diff --git a/nms/v1_15_R1/src/main/java/net/jitse/npclib/nms/v1_15_R1/packets/PacketPlayOutPlayerInfoWrapper.java b/nms/v1_15_R1/src/main/java/net/jitse/npclib/nms/v1_15_R1/packets/PacketPlayOutPlayerInfoWrapper.java index 8eb1a1f..42fe3c4 100644 --- a/nms/v1_15_R1/src/main/java/net/jitse/npclib/nms/v1_15_R1/packets/PacketPlayOutPlayerInfoWrapper.java +++ b/nms/v1_15_R1/src/main/java/net/jitse/npclib/nms/v1_15_R1/packets/PacketPlayOutPlayerInfoWrapper.java @@ -9,8 +9,8 @@ import com.mojang.authlib.GameProfile; import net.minecraft.server.v1_15_R1.EnumGamemode; import net.minecraft.server.v1_15_R1.IChatBaseComponent; import net.minecraft.server.v1_15_R1.PacketPlayOutPlayerInfo; -import org.bukkit.ChatColor; +import java.util.Collections; import java.util.List; /** @@ -28,15 +28,11 @@ public class PacketPlayOutPlayerInfoWrapper { Reflection.getField(packetPlayOutPlayerInfo.getClass(), "a", PacketPlayOutPlayerInfo.EnumPlayerInfoAction.class) .set(packetPlayOutPlayerInfo, action); - Object playerInfoData = playerInfoDataConstructor.invoke(packetPlayOutPlayerInfo, - gameProfile, 1, EnumGamemode.NOT_SET, - IChatBaseComponent.ChatSerializer.b("{\"text\":\"" + ChatColor.BLUE + "[NPC] " + name + "\"}") - ); + Object playerInfoData = playerInfoDataConstructor.invoke(packetPlayOutPlayerInfo, gameProfile, 1, EnumGamemode.NOT_SET, + IChatBaseComponent.ChatSerializer.b("{\"text\":\"[NPC] " + name + "\",\"color\":\"dark_gray\"}")); Reflection.FieldAccessor fieldAccessor = Reflection.getField(packetPlayOutPlayerInfo.getClass(), "b", List.class); - List list = fieldAccessor.get(packetPlayOutPlayerInfo); - list.add(playerInfoData); - fieldAccessor.set(packetPlayOutPlayerInfo, list); + fieldAccessor.set(packetPlayOutPlayerInfo, Collections.singletonList(playerInfoData)); return packetPlayOutPlayerInfo; } diff --git a/nms/v1_15_R1/src/main/java/net/jitse/npclib/nms/v1_15_R1/packets/PacketPlayOutScoreboardTeamWrapper.java b/nms/v1_15_R1/src/main/java/net/jitse/npclib/nms/v1_15_R1/packets/PacketPlayOutScoreboardTeamWrapper.java index 804045c..6a851fe 100644 --- a/nms/v1_15_R1/src/main/java/net/jitse/npclib/nms/v1_15_R1/packets/PacketPlayOutScoreboardTeamWrapper.java +++ b/nms/v1_15_R1/src/main/java/net/jitse/npclib/nms/v1_15_R1/packets/PacketPlayOutScoreboardTeamWrapper.java @@ -10,6 +10,7 @@ import net.minecraft.server.v1_15_R1.IChatBaseComponent; import net.minecraft.server.v1_15_R1.PacketPlayOutScoreboardTeam; import java.util.Collection; +import java.util.Collections; /** * @author Jitse Boonstra @@ -33,9 +34,7 @@ public class PacketPlayOutScoreboardTeamWrapper { .set(packetPlayOutScoreboardTeam, 0); Reflection.FieldAccessor collectionFieldAccessor = Reflection.getField( packetPlayOutScoreboardTeam.getClass(), "h", Collection.class); - Collection collection = collectionFieldAccessor.get(packetPlayOutScoreboardTeam); - collection.add(name); - collectionFieldAccessor.set(packetPlayOutScoreboardTeam, collection); + collectionFieldAccessor.set(packetPlayOutScoreboardTeam, Collections.singletonList(name)); return packetPlayOutScoreboardTeam; } diff --git a/nms/v1_8_R2/pom.xml b/nms/v1_8_R2/pom.xml index 960f6fb..8ccbee6 100755 --- a/nms/v1_8_R2/pom.xml +++ b/nms/v1_8_R2/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.5.2-SNAPSHOT + 2.6-SNAPSHOT npclib-nms-v1_8_R2 diff --git a/nms/v1_8_R2/src/main/java/net/jitse/npclib/nms/v1_8_R2/packets/PacketPlayOutPlayerInfoWrapper.java b/nms/v1_8_R2/src/main/java/net/jitse/npclib/nms/v1_8_R2/packets/PacketPlayOutPlayerInfoWrapper.java index bca9688..c05ceb6 100755 --- a/nms/v1_8_R2/src/main/java/net/jitse/npclib/nms/v1_8_R2/packets/PacketPlayOutPlayerInfoWrapper.java +++ b/nms/v1_8_R2/src/main/java/net/jitse/npclib/nms/v1_8_R2/packets/PacketPlayOutPlayerInfoWrapper.java @@ -10,6 +10,7 @@ import net.minecraft.server.v1_8_R2.IChatBaseComponent; import net.minecraft.server.v1_8_R2.PacketPlayOutPlayerInfo; import net.minecraft.server.v1_8_R2.WorldSettings; +import java.util.Collections; import java.util.List; /** @@ -23,14 +24,10 @@ public class PacketPlayOutPlayerInfoWrapper { .set(packetPlayOutPlayerInfo, action); PacketPlayOutPlayerInfo.PlayerInfoData playerInfoData = packetPlayOutPlayerInfo.new PlayerInfoData(gameProfile, 1, - WorldSettings.EnumGamemode.NOT_SET, IChatBaseComponent.ChatSerializer.a(name)); + WorldSettings.EnumGamemode.NOT_SET, IChatBaseComponent.ChatSerializer.a("{\"text\":\"[NPC] " + name + "\",\"color\":\"dark_gray\"}")); - Reflection.FieldAccessor fieldAccessor = Reflection.getField(packetPlayOutPlayerInfo.getClass(), - "b", List.class); - - List list = fieldAccessor.get(packetPlayOutPlayerInfo); - list.add(playerInfoData); - fieldAccessor.set(packetPlayOutPlayerInfo, list); + Reflection.FieldAccessor fieldAccessor = Reflection.getField(packetPlayOutPlayerInfo.getClass(), "b", List.class); + fieldAccessor.set(packetPlayOutPlayerInfo, Collections.singletonList(playerInfoData)); return packetPlayOutPlayerInfo; } diff --git a/nms/v1_8_R2/src/main/java/net/jitse/npclib/nms/v1_8_R2/packets/PacketPlayOutScoreboardTeamWrapper.java b/nms/v1_8_R2/src/main/java/net/jitse/npclib/nms/v1_8_R2/packets/PacketPlayOutScoreboardTeamWrapper.java index 89a6e7a..7c60b08 100755 --- a/nms/v1_8_R2/src/main/java/net/jitse/npclib/nms/v1_8_R2/packets/PacketPlayOutScoreboardTeamWrapper.java +++ b/nms/v1_8_R2/src/main/java/net/jitse/npclib/nms/v1_8_R2/packets/PacketPlayOutScoreboardTeamWrapper.java @@ -6,9 +6,9 @@ package net.jitse.npclib.nms.v1_8_R2.packets; import com.comphenix.tinyprotocol.Reflection; import net.minecraft.server.v1_8_R2.PacketPlayOutScoreboardTeam; -import org.bukkit.ChatColor; import java.util.Collection; +import java.util.Collections; /** * @author Jitse Boonstra @@ -28,14 +28,9 @@ public class PacketPlayOutScoreboardTeamWrapper { .set(packetPlayOutScoreboardTeam, "never"); Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "i", int.class) .set(packetPlayOutScoreboardTeam, 1); - // Could not get this working in the PacketPlayOutPlayerInfoWrapper class. - Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "c", String.class) - .set(packetPlayOutScoreboardTeam, ChatColor.BLUE + "[NPC] "); Reflection.FieldAccessor collectionFieldAccessor = Reflection.getField( packetPlayOutScoreboardTeam.getClass(), "g", Collection.class); - Collection collection = collectionFieldAccessor.get(packetPlayOutScoreboardTeam); - collection.add(name); - collectionFieldAccessor.set(packetPlayOutScoreboardTeam, collection); + collectionFieldAccessor.set(packetPlayOutScoreboardTeam, Collections.singletonList(name)); return packetPlayOutScoreboardTeam; } diff --git a/nms/v1_8_R3/pom.xml b/nms/v1_8_R3/pom.xml index f7d8d9b..f41711a 100755 --- a/nms/v1_8_R3/pom.xml +++ b/nms/v1_8_R3/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.5.2-SNAPSHOT + 2.6-SNAPSHOT npclib-nms-v1_8_R3 diff --git a/nms/v1_8_R3/src/main/java/net/jitse/npclib/nms/v1_8_R3/packets/PacketPlayOutPlayerInfoWrapper.java b/nms/v1_8_R3/src/main/java/net/jitse/npclib/nms/v1_8_R3/packets/PacketPlayOutPlayerInfoWrapper.java index 3c411df..0c6cbec 100755 --- a/nms/v1_8_R3/src/main/java/net/jitse/npclib/nms/v1_8_R3/packets/PacketPlayOutPlayerInfoWrapper.java +++ b/nms/v1_8_R3/src/main/java/net/jitse/npclib/nms/v1_8_R3/packets/PacketPlayOutPlayerInfoWrapper.java @@ -10,6 +10,7 @@ import net.minecraft.server.v1_8_R3.IChatBaseComponent; import net.minecraft.server.v1_8_R3.PacketPlayOutPlayerInfo; import net.minecraft.server.v1_8_R3.WorldSettings; +import java.util.Collections; import java.util.List; /** @@ -23,14 +24,10 @@ public class PacketPlayOutPlayerInfoWrapper { .set(packetPlayOutPlayerInfo, action); PacketPlayOutPlayerInfo.PlayerInfoData playerInfoData = packetPlayOutPlayerInfo.new PlayerInfoData(gameProfile, 1, - WorldSettings.EnumGamemode.NOT_SET, IChatBaseComponent.ChatSerializer.a(name)); + WorldSettings.EnumGamemode.NOT_SET, IChatBaseComponent.ChatSerializer.a("{\"text\":\"[NPC] " + name + "\",\"color\":\"dark_gray\"}")); - Reflection.FieldAccessor fieldAccessor = Reflection.getField(packetPlayOutPlayerInfo.getClass(), - "b", List.class); - - List list = fieldAccessor.get(packetPlayOutPlayerInfo); - list.add(playerInfoData); - fieldAccessor.set(packetPlayOutPlayerInfo, list); + Reflection.FieldAccessor fieldAccessor = Reflection.getField(packetPlayOutPlayerInfo.getClass(), "b", List.class); + fieldAccessor.set(packetPlayOutPlayerInfo, Collections.singletonList(playerInfoData)); return packetPlayOutPlayerInfo; } diff --git a/nms/v1_8_R3/src/main/java/net/jitse/npclib/nms/v1_8_R3/packets/PacketPlayOutScoreboardTeamWrapper.java b/nms/v1_8_R3/src/main/java/net/jitse/npclib/nms/v1_8_R3/packets/PacketPlayOutScoreboardTeamWrapper.java index 3b6b53c..ee94442 100755 --- a/nms/v1_8_R3/src/main/java/net/jitse/npclib/nms/v1_8_R3/packets/PacketPlayOutScoreboardTeamWrapper.java +++ b/nms/v1_8_R3/src/main/java/net/jitse/npclib/nms/v1_8_R3/packets/PacketPlayOutScoreboardTeamWrapper.java @@ -6,9 +6,9 @@ package net.jitse.npclib.nms.v1_8_R3.packets; import com.comphenix.tinyprotocol.Reflection; import net.minecraft.server.v1_8_R3.PacketPlayOutScoreboardTeam; -import org.bukkit.ChatColor; import java.util.Collection; +import java.util.Collections; /** * @author Jitse Boonstra @@ -28,14 +28,9 @@ public class PacketPlayOutScoreboardTeamWrapper { .set(packetPlayOutScoreboardTeam, "never"); Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "i", int.class) .set(packetPlayOutScoreboardTeam, 1); - // Could not get this working in the PacketPlayOutPlayerInfoWrapper class. - Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "c", String.class) - .set(packetPlayOutScoreboardTeam, ChatColor.BLUE + "[NPC] "); Reflection.FieldAccessor collectionFieldAccessor = Reflection.getField( packetPlayOutScoreboardTeam.getClass(), "g", Collection.class); - Collection collection = collectionFieldAccessor.get(packetPlayOutScoreboardTeam); - collection.add(name); - collectionFieldAccessor.set(packetPlayOutScoreboardTeam, collection); + collectionFieldAccessor.set(packetPlayOutScoreboardTeam, Collections.singletonList(name)); return packetPlayOutScoreboardTeam; } diff --git a/nms/v1_9_R1/pom.xml b/nms/v1_9_R1/pom.xml index 914a5c0..d400946 100755 --- a/nms/v1_9_R1/pom.xml +++ b/nms/v1_9_R1/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.5.2-SNAPSHOT + 2.6-SNAPSHOT npclib-nms-v1_9_R1 diff --git a/nms/v1_9_R1/src/main/java/net/jitse/npclib/nms/v1_9_R1/packets/PacketPlayOutPlayerInfoWrapper.java b/nms/v1_9_R1/src/main/java/net/jitse/npclib/nms/v1_9_R1/packets/PacketPlayOutPlayerInfoWrapper.java index 43695c7..1289f58 100755 --- a/nms/v1_9_R1/src/main/java/net/jitse/npclib/nms/v1_9_R1/packets/PacketPlayOutPlayerInfoWrapper.java +++ b/nms/v1_9_R1/src/main/java/net/jitse/npclib/nms/v1_9_R1/packets/PacketPlayOutPlayerInfoWrapper.java @@ -9,8 +9,8 @@ import com.mojang.authlib.GameProfile; import net.minecraft.server.v1_9_R1.IChatBaseComponent; import net.minecraft.server.v1_9_R1.PacketPlayOutPlayerInfo; import net.minecraft.server.v1_9_R1.WorldSettings; -import org.bukkit.ChatColor; +import java.util.Collections; import java.util.List; /** @@ -24,14 +24,10 @@ public class PacketPlayOutPlayerInfoWrapper { .set(packetPlayOutPlayerInfo, action); PacketPlayOutPlayerInfo.PlayerInfoData playerInfoData = new PacketPlayOutPlayerInfo().new PlayerInfoData(gameProfile, 1, - WorldSettings.EnumGamemode.NOT_SET, IChatBaseComponent.ChatSerializer.b("{\"text\":\"" + ChatColor.BLUE + "[NPC] " + name + "\"}")); + WorldSettings.EnumGamemode.NOT_SET, IChatBaseComponent.ChatSerializer.a("{\"text\":\"[NPC] " + name + "\",\"color\":\"dark_gray\"}")); - Reflection.FieldAccessor fieldAccessor = Reflection.getField(packetPlayOutPlayerInfo.getClass(), - "b", List.class); - - List list = fieldAccessor.get(packetPlayOutPlayerInfo); - list.add(playerInfoData); - fieldAccessor.set(packetPlayOutPlayerInfo, list); + Reflection.FieldAccessor fieldAccessor = Reflection.getField(packetPlayOutPlayerInfo.getClass(), "b", List.class); + fieldAccessor.set(packetPlayOutPlayerInfo, Collections.singletonList(playerInfoData)); return packetPlayOutPlayerInfo; } diff --git a/nms/v1_9_R1/src/main/java/net/jitse/npclib/nms/v1_9_R1/packets/PacketPlayOutScoreboardTeamWrapper.java b/nms/v1_9_R1/src/main/java/net/jitse/npclib/nms/v1_9_R1/packets/PacketPlayOutScoreboardTeamWrapper.java index 41e6873..ab8d247 100755 --- a/nms/v1_9_R1/src/main/java/net/jitse/npclib/nms/v1_9_R1/packets/PacketPlayOutScoreboardTeamWrapper.java +++ b/nms/v1_9_R1/src/main/java/net/jitse/npclib/nms/v1_9_R1/packets/PacketPlayOutScoreboardTeamWrapper.java @@ -8,6 +8,7 @@ import com.comphenix.tinyprotocol.Reflection; import net.minecraft.server.v1_9_R1.PacketPlayOutScoreboardTeam; import java.util.Collection; +import java.util.Collections; /** * @author Jitse Boonstra @@ -31,9 +32,7 @@ public class PacketPlayOutScoreboardTeamWrapper { .set(packetPlayOutScoreboardTeam, 0); Reflection.FieldAccessor collectionFieldAccessor = Reflection.getField( packetPlayOutScoreboardTeam.getClass(), "h", Collection.class); - Collection collection = collectionFieldAccessor.get(packetPlayOutScoreboardTeam); - collection.add(name); - collectionFieldAccessor.set(packetPlayOutScoreboardTeam, collection); + collectionFieldAccessor.set(packetPlayOutScoreboardTeam, Collections.singletonList(name)); return packetPlayOutScoreboardTeam; } diff --git a/nms/v1_9_R2/pom.xml b/nms/v1_9_R2/pom.xml index 58a3aea..10379bf 100755 --- a/nms/v1_9_R2/pom.xml +++ b/nms/v1_9_R2/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.5.2-SNAPSHOT + 2.6-SNAPSHOT npclib-nms-v1_9_R2 diff --git a/nms/v1_9_R2/src/main/java/net/jitse/npclib/nms/v1_9_R2/packets/PacketPlayOutPlayerInfoWrapper.java b/nms/v1_9_R2/src/main/java/net/jitse/npclib/nms/v1_9_R2/packets/PacketPlayOutPlayerInfoWrapper.java index 67afd64..21533b8 100755 --- a/nms/v1_9_R2/src/main/java/net/jitse/npclib/nms/v1_9_R2/packets/PacketPlayOutPlayerInfoWrapper.java +++ b/nms/v1_9_R2/src/main/java/net/jitse/npclib/nms/v1_9_R2/packets/PacketPlayOutPlayerInfoWrapper.java @@ -9,8 +9,8 @@ import com.mojang.authlib.GameProfile; import net.minecraft.server.v1_9_R2.IChatBaseComponent; import net.minecraft.server.v1_9_R2.PacketPlayOutPlayerInfo; import net.minecraft.server.v1_9_R2.WorldSettings; -import org.bukkit.ChatColor; +import java.util.Collections; import java.util.List; /** @@ -28,15 +28,11 @@ public class PacketPlayOutPlayerInfoWrapper { Reflection.getField(packetPlayOutPlayerInfo.getClass(), "a", PacketPlayOutPlayerInfo.EnumPlayerInfoAction.class) .set(packetPlayOutPlayerInfo, action); - Object playerInfoData = playerInfoDataConstructor.invoke(packetPlayOutPlayerInfo, - gameProfile, 1, WorldSettings.EnumGamemode.NOT_SET, - IChatBaseComponent.ChatSerializer.b("{\"text\":\"" + ChatColor.BLUE + "[NPC] " + name + "\"}") - ); + Object playerInfoData = playerInfoDataConstructor.invoke(packetPlayOutPlayerInfo, gameProfile, 1, WorldSettings.EnumGamemode.NOT_SET, + IChatBaseComponent.ChatSerializer.b("{\"text\":\"[NPC] " + name + "\",\"color\":\"dark_gray\"}")); Reflection.FieldAccessor fieldAccessor = Reflection.getField(packetPlayOutPlayerInfo.getClass(), "b", List.class); - List list = fieldAccessor.get(packetPlayOutPlayerInfo); - list.add(playerInfoData); - fieldAccessor.set(packetPlayOutPlayerInfo, list); + fieldAccessor.set(packetPlayOutPlayerInfo, Collections.singletonList(playerInfoData)); return packetPlayOutPlayerInfo; } diff --git a/nms/v1_9_R2/src/main/java/net/jitse/npclib/nms/v1_9_R2/packets/PacketPlayOutScoreboardTeamWrapper.java b/nms/v1_9_R2/src/main/java/net/jitse/npclib/nms/v1_9_R2/packets/PacketPlayOutScoreboardTeamWrapper.java index 7856b63..5d4f65a 100755 --- a/nms/v1_9_R2/src/main/java/net/jitse/npclib/nms/v1_9_R2/packets/PacketPlayOutScoreboardTeamWrapper.java +++ b/nms/v1_9_R2/src/main/java/net/jitse/npclib/nms/v1_9_R2/packets/PacketPlayOutScoreboardTeamWrapper.java @@ -8,6 +8,7 @@ import com.comphenix.tinyprotocol.Reflection; import net.minecraft.server.v1_9_R2.PacketPlayOutScoreboardTeam; import java.util.Collection; +import java.util.Collections; /** * @author Jitse Boonstra @@ -31,9 +32,7 @@ public class PacketPlayOutScoreboardTeamWrapper { .set(packetPlayOutScoreboardTeam, 0); Reflection.FieldAccessor collectionFieldAccessor = Reflection.getField( packetPlayOutScoreboardTeam.getClass(), "h", Collection.class); - Collection collection = collectionFieldAccessor.get(packetPlayOutScoreboardTeam); - collection.add(name); - collectionFieldAccessor.set(packetPlayOutScoreboardTeam, collection); + collectionFieldAccessor.set(packetPlayOutScoreboardTeam, Collections.singletonList(name)); return packetPlayOutScoreboardTeam; } diff --git a/plugin/pom.xml b/plugin/pom.xml index e4dc047..d0f0b2d 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib - 2.5.2-SNAPSHOT + 2.6-SNAPSHOT npclib-plugin diff --git a/pom.xml b/pom.xml index b479c9e..eba84fc 100755 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib - 2.5.2-SNAPSHOT + 2.6-SNAPSHOT UTF-8