Release 2.15.2

Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.2 to 3.11.3

item-nbt-api/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>de.tr7zw</groupId>
     <artifactId>item-nbt-parent</artifactId>
-    <version>2.15.0</version>
+    <version>2.15.2</version>
   </parent>
 
   <artifactId>item-nbt-api</artifactId>
@@ -18,6 +18,12 @@
 	    <version>4.0.26</version>
 	    <scope>provided</scope>
 	</dependency>
+	<dependency>
+	  <groupId>org.bstats</groupId>
+	  <artifactId>bstats-bukkit</artifactId>
+	  <version>3.1.0</version>
+	  <scope>compile</scope>
+	</dependency>
   </dependencies>
 
   <build>
@@ -34,7 +40,13 @@
         <artifactId>maven-shade-plugin</artifactId>
         <version>3.6.0</version>
         <configuration>
-          <createDependencyReducedPom>false</createDependencyReducedPom>
+	        <relocations>
+	          <relocation>
+	            <pattern>org.bstats</pattern>
+	            <shadedPattern>de.tr7zw.changeme.nbtapi.utils.metrics</shadedPattern>
+	          </relocation>
+	        </relocations>
+          <createDependencyReducedPom>true</createDependencyReducedPom>
           <transformers>
             <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
               <resource>LICENSE</resource>

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/NBTReflectionUtil.java

@@ -12,6 +12,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import java.util.logging.Level;
 
 import org.bukkit.Bukkit;
 import org.bukkit.block.BlockState;
@@ -19,11 +20,15 @@ import org.bukkit.entity.Entity;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.DynamicOps;
+
 import de.tr7zw.changeme.nbtapi.utils.DataFixerUtil;
 import de.tr7zw.changeme.nbtapi.utils.GsonWrapper;
 import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
+import de.tr7zw.changeme.nbtapi.utils.ReflectionUtil;
 import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ClassWrapper;
-import de.tr7zw.changeme.nbtapi.utils.nmsmappings.MojangToMapping;
+import de.tr7zw.changeme.nbtapi.utils.nmsmappings.CodecHelper;
 import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ObjectCreator;
 import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ReflectionMethod;
 
@@ -41,6 +46,10 @@ public class NBTReflectionUtil {
     private static Field field_handle = null;
     private static Object type_custom_data = null;
     private static Object registry_access = null;
+    public static Codec<Object> itemstack_codec = null;
+    public static DynamicOps<Object> nbtOps = null;
+    public static DynamicOps<Object> nbtRegistryOps = null;
+    public static Object problemReporter = null;
 
     static {
         try {
@@ -57,15 +66,22 @@ public class NBTReflectionUtil {
         }
         if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_20_R4)) {
             try {
-                Field typeField = ClassWrapper.NMS_DATACOMPONENTS.getClazz().getDeclaredField(
-                        MojangToMapping.getMapping().get("net.minecraft.core.component.DataComponents#CUSTOM_DATA"));
+                Field typeField = ReflectionUtil.getMappedField(ClassWrapper.NMS_DATACOMPONENTS.getClazz(), "net.minecraft.core.component.DataComponents#CUSTOM_DATA");
                 type_custom_data = typeField.get(null);
-            } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
-
+            } catch (Exception e) {
+                MinecraftVersion.getLogger().log(Level.WARNING,
+                        "Unable to find DataComponents#CUSTOM_DATA, NBTApi will not be able to read/write custom data on 1.20+",
+                        e);
             }
             try {
                 Object nmsServer = ReflectionMethod.NMSSERVER_GETSERVER.run(Bukkit.getServer());
                 registry_access = ReflectionMethod.NMSSERVER_GETREGISTRYACCESS.run(nmsServer);
+                itemstack_codec = (Codec<Object>) ReflectionUtil.getMappedField(ClassWrapper.NMS_ITEMSTACK.getClazz(), "net.minecraft.world.item.ItemStack#CODEC").get(null);
+                nbtOps = (DynamicOps<Object>) ReflectionUtil.getMappedField(ClassWrapper.NMS_NBTOPS.getClazz(), "net.minecraft.nbt.NbtOps#INSTANCE").get(null);
+                if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R5)) {
+                    nbtRegistryOps = (DynamicOps<Object>) ReflectionMethod.GET_SERIALIZATION_CONTEXT.run(registry_access, nbtOps);
+                    problemReporter = ReflectionUtil.getMappedField(ClassWrapper.NMS_PROBLEM_REPORTER.getClazz(), "net.minecraft.util.ProblemReporter#DISCARDING").get(null);
+                }
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -214,8 +230,9 @@ public class NBTReflectionUtil {
      * @return NMS ItemStack
      */
     public static Object convertNBTCompoundtoNMSItem(NBTCompound nbtcompound) {
+        Object nmsComp = null;
         try {
-            Object nmsComp = getToCompount(nbtcompound.getCompound(), nbtcompound);
+            nmsComp = getToCompount(nbtcompound.getCompound(), nbtcompound);
             if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_20_R4)) {
                 if (nbtcompound.hasTag("DataVersion", NBTType.NBTTagInt)) {
                     int dataVersion = nbtcompound.getInteger("DataVersion");
@@ -226,7 +243,9 @@ public class NBTReflectionUtil {
                 } else if (nbtcompound.hasTag("tag") || nbtcompound.hasTag("Count")) {
                     nmsComp = DataFixerUtil.fixUpRawItemData(nmsComp, DataFixerUtil.VERSION1_20_4, DataFixerUtil.getCurrentVersion());
                 }
-                if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R4)) {
+                if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R5)) {
+                    return CodecHelper.convertNbtToItemStack(nmsComp);
+                } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R4)) {
                     Optional<Object> opt = (Optional<Object>) ReflectionMethod.NMSITEM_LOAD_MODERN.run(null,
                             registry_access, nmsComp);
                     return opt.orElse(null);
@@ -239,7 +258,7 @@ public class NBTReflectionUtil {
                 return ReflectionMethod.NMSITEM_CREATESTACK.run(null, nmsComp);
             }
         } catch (Exception e) {
-            throw new NbtApiException("Exception while converting NBTCompound to NMS ItemStack!", e);
+            throw new NbtApiException("Exception while converting NBTCompound to NMS ItemStack! " + nmsComp, e);
         }
     }
 
@@ -252,7 +271,9 @@ public class NBTReflectionUtil {
     public static NBTContainer convertNMSItemtoNBTCompound(Object nmsitem) {
         try {
             NBTContainer container;
-            if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_20_R4)) {
+            if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R5)) {
+                container = new NBTContainer(CodecHelper.convertItemStackToNbt(nmsitem));
+            } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_20_R4)) {
                 container = new NBTContainer(ReflectionMethod.NMSITEM_SAVE_MODERN.run(nmsitem, registry_access));
             } else {
                 Object answer = ReflectionMethod.NMSITEM_SAVE.run(nmsitem,
@@ -293,7 +314,16 @@ public class NBTReflectionUtil {
     public static Object getEntityNBTTagCompound(Object nmsEntity) {
         try {
             Object nbt = ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz().newInstance();
-            Object answer = ReflectionMethod.NMS_ENTITY_GET_NBT.run(nmsEntity, nbt);
+            Object answer;
+            if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R5)) {
+                Object output = ReflectionMethod.NMS_GET_TAG_VALUE_OUTPUT.run(null, problemReporter, registry_access);
+
+                ReflectionMethod.NMS_ENTITY_GET_NBT_1216.run(nmsEntity, output);
+
+                answer = ReflectionMethod.NMS_TAG_VALUE_OUTPUT_TO_TAG_COMPOUND.run(output);
+            } else {
+                answer = ReflectionMethod.NMS_ENTITY_GET_NBT.run(nmsEntity, nbt);
+            }
             if (answer == null)
                 answer = nbt;
             return answer;
@@ -311,7 +341,14 @@ public class NBTReflectionUtil {
      */
     public static Object setEntityNBTTag(Object nbtTag, Object nmsEntity) {
         try {
-            ReflectionMethod.NMS_ENTITY_SET_NBT.run(nmsEntity, nbtTag);
+            if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R5)) {
+                Object valueInputTag = ReflectionMethod.NMS_GET_TAG_VALUE_INPUT.run(null, problemReporter, registry_access, nbtTag);
+
+                ReflectionMethod.NMS_ENTITY_SET_NBT_1216.run(nmsEntity, valueInputTag);
+            } else {
+                ReflectionMethod.NMS_ENTITY_SET_NBT.run(nmsEntity, nbtTag);
+            }
+
             return nmsEntity;
         } catch (Exception ex) {
             throw new NbtApiException("Exception while setting the NBTCompound of an Entity", ex);
@@ -343,7 +380,13 @@ public class NBTReflectionUtil {
             }
 
             Object answer = null;
-            if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_20_R4)) {
+            if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R5)) {
+                Object output = ReflectionMethod.NMS_GET_TAG_VALUE_OUTPUT.run(null, problemReporter, registry_access);
+
+                ReflectionMethod.TILEENTITY_GET_NBT_1216.run(o, output);
+
+                answer = ReflectionMethod.NMS_TAG_VALUE_OUTPUT_TO_TAG_COMPOUND.run(output);
+            } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_20_R4)) {
                 answer = ReflectionMethod.TILEENTITY_GET_NBT_1205.run(o, registry_access);
             } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_18_R1)) {
                 answer = ReflectionMethod.TILEENTITY_GET_NBT_1181.run(o);
@@ -378,7 +421,11 @@ public class NBTReflectionUtil {
                 Object pos = ObjectCreator.NMS_BLOCKPOSITION.getInstance(tile.getX(), tile.getY(), tile.getZ());
                 o = ReflectionMethod.NMS_WORLD_GET_TILEENTITY.run(nmsworld, pos);
             }
-            if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_20_R4)) {
+            if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R5)) {
+                Object valueInput = ReflectionMethod.NMS_GET_TAG_VALUE_INPUT.run(null, problemReporter, registry_access, comp);
+
+                ReflectionMethod.TILEENTITY_SET_NBT_1216.run(o, valueInput);
+            } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_20_R4)) {
                 ReflectionMethod.TILEENTITY_SET_NBT_1205.run(o, comp, registry_access);
             } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_17_R1)) {
                 ReflectionMethod.TILEENTITY_SET_NBT.run(o, comp);

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/utils/DataFixerUtil.java

@@ -7,43 +7,69 @@ import com.mojang.serialization.DynamicOps;
 
 import de.tr7zw.changeme.nbtapi.NBT;
 import de.tr7zw.changeme.nbtapi.NBTCompound;
-import de.tr7zw.changeme.nbtapi.NBTContainer;
 import de.tr7zw.changeme.nbtapi.NBTReflectionUtil;
 import de.tr7zw.changeme.nbtapi.NbtApiException;
 import de.tr7zw.changeme.nbtapi.iface.ReadWriteNBT;
 import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ClassWrapper;
-import de.tr7zw.changeme.nbtapi.utils.nmsmappings.MojangToMapping;
 import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ReflectionMethod;
 
 public class DataFixerUtil {
 
-    // these values can be found in DetectedVersion inside mc
-    // Finding pre 1.12.2 values is left as an exercise for the reader, 
-    // as DetectedVersion is not a thing there
+    // https://minecraft.wiki/w/Data_version
+    public static final int VERSION1_12R1 = 1343;
+    public static final int VERSION1_16R1 = 2586;
+    public static final int VERSION1_17R1 = 2730;
+    public static final int VERSION1_18R1 = 2975;
+    public static final int VERSION1_19R1 = 3120;
+    public static final int VERSION1_19R3 = 3337;
+    public static final int VERSION1_20R1 = 3465;
+    public static final int VERSION1_20R2 = 3578;
+    public static final int VERSION1_20R3 = 3700;
+    public static final int VERSION1_20R4 = 3837;
+    public static final int VERSION1_21R1 = 3953;
+    public static final int VERSION1_21R2 = 4080;
+    public static final int VERSION1_21R3 = 4189;
+    public static final int VERSION1_21R4 = 4323;
+    public static final int VERSION1_21R5 = 4435;
+    // There was a mixup between version numbers and revisions, kept for compatibility, use the above revision numbers
+    @Deprecated
     public static final int VERSION1_12_2 = 1343;
+    @Deprecated
     public static final int VERSION1_16_5 = 2586;
+    @Deprecated
     public static final int VERSION1_17_1 = 2730;
+    @Deprecated
     public static final int VERSION1_18_2 = 2975;
+    @Deprecated
     public static final int VERSION1_19_2 = 3120;
+    @Deprecated
     public static final int VERSION1_19_4 = 3337;
+    @Deprecated
     public static final int VERSION1_20_1 = 3465;
+    @Deprecated
     public static final int VERSION1_20_2 = 3578;
+    @Deprecated
     public static final int VERSION1_20_4 = 3700;
+    @Deprecated
     public static final int VERSION1_20_5 = 3837;
+    // the 1.21 versions use Revision instead of patch versions, unlike the other above. kept for compatibility
+    @Deprecated
     public static final int VERSION1_21 = 3953;
+    @Deprecated
     public static final int VERSION1_21_2 = 4080;
+    @Deprecated
     public static final int VERSION1_21_3 = 4189;
-    public static final int VERSION1_21_5 = 4323;
+    @Deprecated
+    public static final int VERSION1_21_4 = 4323;
+    @Deprecated
+    public static final int VERSION1_21_5 = 4435;
 
     @SuppressWarnings("unchecked")
     public static Object fixUpRawItemData(Object nbt, int fromVersion, int toVersion)
             throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
         DataFixer dataFixer = (DataFixer) ReflectionMethod.GET_DATAFIXER.run(null);
-        TypeReference itemStackReference = (TypeReference) ClassWrapper.NMS_REFERENCES.getClazz()
-                .getField(MojangToMapping.getMapping().get("net.minecraft.util.datafix.fixes.References#ITEM_STACK"))
-                .get(null);
-        DynamicOps<Object> nbtOps = (DynamicOps<Object>) ClassWrapper.NMS_NBTOPS.getClazz()
-                .getField(MojangToMapping.getMapping().get("net.minecraft.nbt.NbtOps#INSTANCE")).get(null);
+        TypeReference itemStackReference = (TypeReference) ReflectionUtil.getMappedField(ClassWrapper.NMS_REFERENCES.getClazz(),"net.minecraft.util.datafix.fixes.References#ITEM_STACK").get(null);
+        DynamicOps<Object> nbtOps = (DynamicOps<Object>) ReflectionUtil.getMappedField(ClassWrapper.NMS_NBTOPS.getClazz(), "net.minecraft.nbt.NbtOps#INSTANCE").get(null);
         Dynamic<Object> fixed = dataFixer.update(itemStackReference, new Dynamic<Object>(nbtOps, nbt), fromVersion,
                 toVersion);
         return fixed.getValue();
@@ -66,32 +92,34 @@ public class DataFixerUtil {
      * @return
      */
     public static int getCurrentVersion() {
-        if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R4)) {
-            return VERSION1_21_5;
+        if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R5)) {
+            return VERSION1_21R5;
+        } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R4)) {
+            return VERSION1_21R4;
         } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R3)) {
-            return VERSION1_21_3;
+            return VERSION1_21R3;
         } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R2)) {
-            return VERSION1_21_2;
+            return VERSION1_21R2;
         } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R1)) {
-            return VERSION1_21;
+            return VERSION1_21R1;
         } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_20_R4)) {
-            return VERSION1_20_5;
+            return VERSION1_20R4;
         } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_20_R3)) {
-            return VERSION1_20_4;
+            return VERSION1_20R3;
         } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_20_R1)) {
-            return VERSION1_20_1;
+            return VERSION1_20R1;
         } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_19_R3)) {
-            return VERSION1_19_4;
+            return VERSION1_19R3;
         } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_19_R1)) {
-            return VERSION1_19_2;
+            return VERSION1_19R1;
         } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_18_R1)) {
-            return VERSION1_18_2;
+            return VERSION1_18R1;
         } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_17_R1)) {
-            return VERSION1_17_1;
+            return VERSION1_17R1;
         } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_16_R1)) {
-            return VERSION1_16_5;
+            return VERSION1_16R1;
         } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_12_R1)) {
-            return VERSION1_12_2;
+            return VERSION1_12R1;
         }
         throw new NbtApiException(
                 "Trying to update data *to* a version before 1.12.2? Something is probably going wrong, contact the plugin author.");

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/utils/Metrics.java

@@ -1,881 +0,0 @@
-/*
- * This Metrics class was auto-generated and can be copied into your project if you are
- * not using a build tool like Gradle or Maven for dependency management.
- *
- * IMPORTANT: You are not allowed to modify this class, except changing the package.
- *
- * Disallowed modifications include but are not limited to:
- *  - Remove the option for users to opt-out
- *  - Change the frequency for data submission
- *  - Obfuscate the code (every obfuscator should allow you to make an exception for specific files)
- *  - Reformat the code (if you use a linter, add an exception)
- *
- * Violations will result in a ban of your plugin and account from bStats.
- */
-package de.tr7zw.changeme.nbtapi.utils;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-import java.util.logging.Level;
-import java.util.stream.Collectors;
-import java.util.zip.GZIPOutputStream;
-import javax.net.ssl.HttpsURLConnection;
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.java.JavaPlugin;
-
-public class Metrics {
-
-  private final Plugin plugin;
-
-  private final MetricsBase metricsBase;
-
-  /**
-   * Creates a new Metrics instance.
-   *
-   * @param plugin Your plugin instance.
-   * @param serviceId The id of the service. It can be found at <a
-   *     href="https://bstats.org/what-is-my-plugin-id">What is my plugin id?</a>
-   */
-  public Metrics(JavaPlugin plugin, int serviceId) {
-    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);
-    if (!config.isSet("serverUuid")) {
-      config.addDefault("enabled", true);
-      config.addDefault("serverUuid", UUID.randomUUID().toString());
-      config.addDefault("logFailedRequests", false);
-      config.addDefault("logSentData", false);
-      config.addDefault("logResponseStatusText", false);
-      // Inform the server owners about bStats
-      config
-          .options()
-          .header(
-              "bStats (https://bStats.org) collects some basic information for plugin authors, like how\n"
-                  + "many people use their plugin and their total player count. It's recommended to keep bStats\n"
-                  + "enabled, but if you're not comfortable with this, you can turn this setting off. There is no\n"
-                  + "performance penalty associated with having metrics enabled, and data sent to bStats is fully\n"
-                  + "anonymous.")
-          .copyDefaults(true);
-      try {
-        config.save(configFile);
-      } catch (IOException ignored) {
-      }
-    }
-    // Load the data
-    boolean enabled = config.getBoolean("enabled", true);
-    String serverUUID = config.getString("serverUuid");
-    boolean logErrors = config.getBoolean("logFailedRequests", false);
-    boolean logSentData = config.getBoolean("logSentData", false);
-    boolean logResponseStatusText = config.getBoolean("logResponseStatusText", false);
-    metricsBase =
-        new MetricsBase(
-            "bukkit",
-            serverUUID,
-            serviceId,
-            enabled,
-            this::appendPlatformData,
-            this::appendServiceData,
-            submitDataTask -> Bukkit.getScheduler().runTask(plugin, submitDataTask),
-            plugin::isEnabled,
-            (message, error) -> this.plugin.getLogger().log(Level.WARNING, message, error),
-            (message) -> this.plugin.getLogger().log(Level.INFO, message),
-            logErrors,
-            logSentData,
-            logResponseStatusText);
-  }
-
-  /** Shuts down the underlying scheduler service. */
-  public void shutdown() {
-    metricsBase.shutdown();
-  }
-
-  /**
-   * Adds a custom chart.
-   *
-   * @param chart The chart to add.
-   */
-  public void addCustomChart(CustomChart chart) {
-    metricsBase.addCustomChart(chart);
-  }
-
-  private void appendPlatformData(JsonObjectBuilder builder) {
-    builder.appendField("playerAmount", getPlayerAmount());
-    builder.appendField("onlineMode", Bukkit.getOnlineMode() ? 1 : 0);
-    builder.appendField("bukkitVersion", Bukkit.getVersion());
-    builder.appendField("bukkitName", Bukkit.getName());
-    builder.appendField("javaVersion", System.getProperty("java.version"));
-    builder.appendField("osName", System.getProperty("os.name"));
-    builder.appendField("osArch", System.getProperty("os.arch"));
-    builder.appendField("osVersion", System.getProperty("os.version"));
-    builder.appendField("coreCount", Runtime.getRuntime().availableProcessors());
-  }
-
-  private void appendServiceData(JsonObjectBuilder builder) {
-    builder.appendField("pluginVersion", plugin.getDescription().getVersion());
-  }
-
-  private int getPlayerAmount() {
-    try {
-      // Around MC 1.8 the return type was changed from an array to a collection,
-      // This fixes java.lang.NoSuchMethodError:
-      // org.bukkit.Bukkit.getOnlinePlayers()Ljava/util/Collection;
-      Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers");
-      return onlinePlayersMethod.getReturnType().equals(Collection.class)
-          ? ((Collection<?>) onlinePlayersMethod.invoke(Bukkit.getServer())).size()
-          : ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length;
-    } catch (Exception e) {
-      // Just use the new method if the reflection failed
-      return Bukkit.getOnlinePlayers().size();
-    }
-  }
-
-  public static class MetricsBase {
-
-    /** The version of the Metrics class. */
-    public static final String METRICS_VERSION = "3.0.2";
-
-    private static final String REPORT_URL = "https://bStats.org/api/v2/data/%s";
-
-    private final ScheduledExecutorService scheduler;
-
-    private final String platform;
-
-    private final String serverUuid;
-
-    private final int serviceId;
-
-    private final Consumer<JsonObjectBuilder> appendPlatformDataConsumer;
-
-    private final Consumer<JsonObjectBuilder> appendServiceDataConsumer;
-
-    private final Consumer<Runnable> submitTaskConsumer;
-
-    private final Supplier<Boolean> checkServiceEnabledSupplier;
-
-    private final BiConsumer<String, Throwable> errorLogger;
-
-    private final Consumer<String> infoLogger;
-
-    private final boolean logErrors;
-
-    private final boolean logSentData;
-
-    private final boolean logResponseStatusText;
-
-    private final Set<CustomChart> customCharts = new HashSet<>();
-
-    private final boolean enabled;
-
-    /**
-     * Creates a new MetricsBase class instance.
-     *
-     * @param platform The platform of the service.
-     * @param serviceId The id of the service.
-     * @param serverUuid The server uuid.
-     * @param enabled Whether or not data sending is enabled.
-     * @param appendPlatformDataConsumer A consumer that receives a {@code JsonObjectBuilder} and
-     *     appends all platform-specific data.
-     * @param appendServiceDataConsumer A consumer that receives a {@code JsonObjectBuilder} and
-     *     appends all service-specific data.
-     * @param submitTaskConsumer A consumer that takes a runnable with the submit task. This can be
-     *     used to delegate the data collection to a another thread to prevent errors caused by
-     *     concurrency. Can be {@code null}.
-     * @param checkServiceEnabledSupplier A supplier to check if the service is still enabled.
-     * @param errorLogger A consumer that accepts log message and an error.
-     * @param infoLogger A consumer that accepts info log messages.
-     * @param logErrors Whether or not errors should be logged.
-     * @param logSentData Whether or not the sent data should be logged.
-     * @param logResponseStatusText Whether or not the response status text should be logged.
-     */
-    public MetricsBase(
-        String platform,
-        String serverUuid,
-        int serviceId,
-        boolean enabled,
-        Consumer<JsonObjectBuilder> appendPlatformDataConsumer,
-        Consumer<JsonObjectBuilder> appendServiceDataConsumer,
-        Consumer<Runnable> submitTaskConsumer,
-        Supplier<Boolean> checkServiceEnabledSupplier,
-        BiConsumer<String, Throwable> errorLogger,
-        Consumer<String> infoLogger,
-        boolean logErrors,
-        boolean logSentData,
-        boolean logResponseStatusText) {
-      ScheduledThreadPoolExecutor scheduler =
-          new ScheduledThreadPoolExecutor(1, task -> new Thread(task, "bStats-Metrics"));
-      // We want delayed tasks (non-periodic) that will execute in the future to be
-      // cancelled when the scheduler is shutdown.
-      // Otherwise, we risk preventing the server from shutting down even when
-      // MetricsBase#shutdown() is called
-      scheduler.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
-      this.scheduler = scheduler;
-      this.platform = platform;
-      this.serverUuid = serverUuid;
-      this.serviceId = serviceId;
-      this.enabled = enabled;
-      this.appendPlatformDataConsumer = appendPlatformDataConsumer;
-      this.appendServiceDataConsumer = appendServiceDataConsumer;
-      this.submitTaskConsumer = submitTaskConsumer;
-      this.checkServiceEnabledSupplier = checkServiceEnabledSupplier;
-      this.errorLogger = errorLogger;
-      this.infoLogger = infoLogger;
-      this.logErrors = logErrors;
-      this.logSentData = logSentData;
-      this.logResponseStatusText = logResponseStatusText;
-      checkRelocation();
-      if (enabled) {
-        // WARNING: Removing the option to opt-out will get your plugin banned from
-        // bStats
-        startSubmitting();
-      }
-    }
-
-    public void addCustomChart(CustomChart chart) {
-      this.customCharts.add(chart);
-    }
-
-    public void shutdown() {
-      scheduler.shutdown();
-    }
-
-    private void startSubmitting() {
-      final Runnable submitTask =
-          () -> {
-            if (!enabled || !checkServiceEnabledSupplier.get()) {
-              // Submitting data or service is disabled
-              scheduler.shutdown();
-              return;
-            }
-            if (submitTaskConsumer != null) {
-              submitTaskConsumer.accept(this::submitData);
-            } else {
-              this.submitData();
-            }
-          };
-      // Many servers tend to restart at a fixed time at xx:00 which causes an uneven
-      // distribution of requests on the
-      // bStats backend. To circumvent this problem, we introduce some randomness into
-      // the initial and second delay.
-      // WARNING: You must not modify and part of this Metrics class, including the
-      // submit delay or frequency!
-      // WARNING: Modifying this code will get your plugin banned on bStats. Just
-      // don't do it!
-      long initialDelay = (long) (1000 * 60 * (3 + Math.random() * 3));
-      long secondDelay = (long) (1000 * 60 * (Math.random() * 30));
-      scheduler.schedule(submitTask, initialDelay, TimeUnit.MILLISECONDS);
-      scheduler.scheduleAtFixedRate(
-          submitTask, initialDelay + secondDelay, 1000 * 60 * 30, TimeUnit.MILLISECONDS);
-    }
-
-    private void submitData() {
-      final JsonObjectBuilder baseJsonBuilder = new JsonObjectBuilder();
-      appendPlatformDataConsumer.accept(baseJsonBuilder);
-      final JsonObjectBuilder serviceJsonBuilder = new JsonObjectBuilder();
-      appendServiceDataConsumer.accept(serviceJsonBuilder);
-      JsonObjectBuilder.JsonObject[] chartData =
-          customCharts.stream()
-              .map(customChart -> customChart.getRequestJsonObject(errorLogger, logErrors))
-              .filter(Objects::nonNull)
-              .toArray(JsonObjectBuilder.JsonObject[]::new);
-      serviceJsonBuilder.appendField("id", serviceId);
-      serviceJsonBuilder.appendField("customCharts", chartData);
-      baseJsonBuilder.appendField("service", serviceJsonBuilder.build());
-      baseJsonBuilder.appendField("serverUUID", serverUuid);
-      baseJsonBuilder.appendField("metricsVersion", METRICS_VERSION);
-      JsonObjectBuilder.JsonObject data = baseJsonBuilder.build();
-      scheduler.execute(
-          () -> {
-            try {
-              // Send the data
-              sendData(data);
-            } catch (Exception e) {
-              // Something went wrong! :(
-              if (logErrors) {
-                errorLogger.accept("Could not submit bStats metrics data", e);
-              }
-            }
-          });
-    }
-
-    private void sendData(JsonObjectBuilder.JsonObject data) throws Exception {
-      if (logSentData) {
-        infoLogger.accept("Sent bStats metrics data: " + data.toString());
-      }
-      String url = String.format(REPORT_URL, platform);
-      HttpsURLConnection connection = (HttpsURLConnection) new URL(url).openConnection();
-      // Compress the data to save bandwidth
-      byte[] compressedData = compress(data.toString());
-      connection.setRequestMethod("POST");
-      connection.addRequestProperty("Accept", "application/json");
-      connection.addRequestProperty("Connection", "close");
-      connection.addRequestProperty("Content-Encoding", "gzip");
-      connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
-      connection.setRequestProperty("Content-Type", "application/json");
-      connection.setRequestProperty("User-Agent", "Metrics-Service/1");
-      connection.setDoOutput(true);
-      try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) {
-        outputStream.write(compressedData);
-      }
-      StringBuilder builder = new StringBuilder();
-      try (BufferedReader bufferedReader =
-          new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
-        String line;
-        while ((line = bufferedReader.readLine()) != null) {
-          builder.append(line);
-        }
-      }
-      if (logResponseStatusText) {
-        infoLogger.accept("Sent data to bStats and received response: " + builder);
-      }
-    }
-
-    /** Checks that the class was properly relocated. */
-    private void checkRelocation() {
-      // You can use the property to disable the check in your test environment
-      if (System.getProperty("bstats.relocatecheck") == null
-          || !System.getProperty("bstats.relocatecheck").equals("false")) {
-        // Maven's Relocate is clever and changes strings, too. So we have to use this
-        // little "trick" ... :D
-        final String defaultPackage =
-            new String(new byte[] {'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's'});
-        final String examplePackage =
-            new String(new byte[] {'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
-        // We want to make sure no one just copy & pastes the example and uses the wrong
-        // package names
-        if (MetricsBase.class.getPackage().getName().startsWith(defaultPackage)
-            || MetricsBase.class.getPackage().getName().startsWith(examplePackage)) {
-          throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
-        }
-      }
-    }
-
-    /**
-     * Gzips the given string.
-     *
-     * @param str The string to gzip.
-     * @return The gzipped string.
-     */
-    private static byte[] compress(final String str) throws IOException {
-      if (str == null) {
-        return null;
-      }
-      ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-      try (GZIPOutputStream gzip = new GZIPOutputStream(outputStream)) {
-        gzip.write(str.getBytes(StandardCharsets.UTF_8));
-      }
-      return outputStream.toByteArray();
-    }
-  }
-
-  public static class SimplePie extends CustomChart {
-
-    private final Callable<String> callable;
-
-    /**
-     * Class constructor.
-     *
-     * @param chartId The id of the chart.
-     * @param callable The callable which is used to request the chart data.
-     */
-    public SimplePie(String chartId, Callable<String> callable) {
-      super(chartId);
-      this.callable = callable;
-    }
-
-    @Override
-    protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
-      String value = callable.call();
-      if (value == null || value.isEmpty()) {
-        // Null = skip the chart
-        return null;
-      }
-      return new JsonObjectBuilder().appendField("value", value).build();
-    }
-  }
-
-  public static class MultiLineChart extends CustomChart {
-
-    private final Callable<Map<String, Integer>> callable;
-
-    /**
-     * Class constructor.
-     *
-     * @param chartId The id of the chart.
-     * @param callable The callable which is used to request the chart data.
-     */
-    public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
-      super(chartId);
-      this.callable = callable;
-    }
-
-    @Override
-    protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
-      JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
-      Map<String, Integer> map = callable.call();
-      if (map == null || map.isEmpty()) {
-        // Null = skip the chart
-        return null;
-      }
-      boolean allSkipped = true;
-      for (Map.Entry<String, Integer> entry : map.entrySet()) {
-        if (entry.getValue() == 0) {
-          // Skip this invalid
-          continue;
-        }
-        allSkipped = false;
-        valuesBuilder.appendField(entry.getKey(), entry.getValue());
-      }
-      if (allSkipped) {
-        // Null = skip the chart
-        return null;
-      }
-      return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
-    }
-  }
-
-  public static class AdvancedPie extends CustomChart {
-
-    private final Callable<Map<String, Integer>> callable;
-
-    /**
-     * Class constructor.
-     *
-     * @param chartId The id of the chart.
-     * @param callable The callable which is used to request the chart data.
-     */
-    public AdvancedPie(String chartId, Callable<Map<String, Integer>> callable) {
-      super(chartId);
-      this.callable = callable;
-    }
-
-    @Override
-    protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
-      JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
-      Map<String, Integer> map = callable.call();
-      if (map == null || map.isEmpty()) {
-        // Null = skip the chart
-        return null;
-      }
-      boolean allSkipped = true;
-      for (Map.Entry<String, Integer> entry : map.entrySet()) {
-        if (entry.getValue() == 0) {
-          // Skip this invalid
-          continue;
-        }
-        allSkipped = false;
-        valuesBuilder.appendField(entry.getKey(), entry.getValue());
-      }
-      if (allSkipped) {
-        // Null = skip the chart
-        return null;
-      }
-      return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
-    }
-  }
-
-  public static class SimpleBarChart extends CustomChart {
-
-    private final Callable<Map<String, Integer>> callable;
-
-    /**
-     * Class constructor.
-     *
-     * @param chartId The id of the chart.
-     * @param callable The callable which is used to request the chart data.
-     */
-    public SimpleBarChart(String chartId, Callable<Map<String, Integer>> callable) {
-      super(chartId);
-      this.callable = callable;
-    }
-
-    @Override
-    protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
-      JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
-      Map<String, Integer> map = callable.call();
-      if (map == null || map.isEmpty()) {
-        // Null = skip the chart
-        return null;
-      }
-      for (Map.Entry<String, Integer> entry : map.entrySet()) {
-        valuesBuilder.appendField(entry.getKey(), new int[] {entry.getValue()});
-      }
-      return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
-    }
-  }
-
-  public static class AdvancedBarChart extends CustomChart {
-
-    private final Callable<Map<String, int[]>> callable;
-
-    /**
-     * Class constructor.
-     *
-     * @param chartId The id of the chart.
-     * @param callable The callable which is used to request the chart data.
-     */
-    public AdvancedBarChart(String chartId, Callable<Map<String, int[]>> callable) {
-      super(chartId);
-      this.callable = callable;
-    }
-
-    @Override
-    protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
-      JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
-      Map<String, int[]> map = callable.call();
-      if (map == null || map.isEmpty()) {
-        // Null = skip the chart
-        return null;
-      }
-      boolean allSkipped = true;
-      for (Map.Entry<String, int[]> entry : map.entrySet()) {
-        if (entry.getValue().length == 0) {
-          // Skip this invalid
-          continue;
-        }
-        allSkipped = false;
-        valuesBuilder.appendField(entry.getKey(), entry.getValue());
-      }
-      if (allSkipped) {
-        // Null = skip the chart
-        return null;
-      }
-      return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
-    }
-  }
-
-  public static class DrilldownPie extends CustomChart {
-
-    private final Callable<Map<String, Map<String, Integer>>> callable;
-
-    /**
-     * Class constructor.
-     *
-     * @param chartId The id of the chart.
-     * @param callable The callable which is used to request the chart data.
-     */
-    public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) {
-      super(chartId);
-      this.callable = callable;
-    }
-
-    @Override
-    public JsonObjectBuilder.JsonObject getChartData() throws Exception {
-      JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
-      Map<String, Map<String, Integer>> map = callable.call();
-      if (map == null || map.isEmpty()) {
-        // Null = skip the chart
-        return null;
-      }
-      boolean reallyAllSkipped = true;
-      for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
-        JsonObjectBuilder valueBuilder = new JsonObjectBuilder();
-        boolean allSkipped = true;
-        for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) {
-          valueBuilder.appendField(valueEntry.getKey(), valueEntry.getValue());
-          allSkipped = false;
-        }
-        if (!allSkipped) {
-          reallyAllSkipped = false;
-          valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build());
-        }
-      }
-      if (reallyAllSkipped) {
-        // Null = skip the chart
-        return null;
-      }
-      return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
-    }
-  }
-
-  public abstract static class CustomChart {
-
-    private final String chartId;
-
-    protected CustomChart(String chartId) {
-      if (chartId == null) {
-        throw new IllegalArgumentException("chartId must not be null");
-      }
-      this.chartId = chartId;
-    }
-
-    public JsonObjectBuilder.JsonObject getRequestJsonObject(
-        BiConsumer<String, Throwable> errorLogger, boolean logErrors) {
-      JsonObjectBuilder builder = new JsonObjectBuilder();
-      builder.appendField("chartId", chartId);
-      try {
-        JsonObjectBuilder.JsonObject data = getChartData();
-        if (data == null) {
-          // If the data is null we don't send the chart.
-          return null;
-        }
-        builder.appendField("data", data);
-      } catch (Throwable t) {
-        if (logErrors) {
-          errorLogger.accept("Failed to get data for custom chart with id " + chartId, t);
-        }
-        return null;
-      }
-      return builder.build();
-    }
-
-    protected abstract JsonObjectBuilder.JsonObject getChartData() throws Exception;
-  }
-
-  public static class SingleLineChart extends CustomChart {
-
-    private final Callable<Integer> callable;
-
-    /**
-     * Class constructor.
-     *
-     * @param chartId The id of the chart.
-     * @param callable The callable which is used to request the chart data.
-     */
-    public SingleLineChart(String chartId, Callable<Integer> callable) {
-      super(chartId);
-      this.callable = callable;
-    }
-
-    @Override
-    protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
-      int value = callable.call();
-      if (value == 0) {
-        // Null = skip the chart
-        return null;
-      }
-      return new JsonObjectBuilder().appendField("value", value).build();
-    }
-  }
-
-  /**
-   * An extremely simple JSON builder.
-   *
-   * <p>While this class is neither feature-rich nor the most performant one, it's sufficient enough
-   * for its use-case.
-   */
-  public static class JsonObjectBuilder {
-
-    private StringBuilder builder = new StringBuilder();
-
-    private boolean hasAtLeastOneField = false;
-
-    public JsonObjectBuilder() {
-      builder.append("{");
-    }
-
-    /**
-     * Appends a null field to the JSON.
-     *
-     * @param key The key of the field.
-     * @return A reference to this object.
-     */
-    public JsonObjectBuilder appendNull(String key) {
-      appendFieldUnescaped(key, "null");
-      return this;
-    }
-
-    /**
-     * Appends a string field to the JSON.
-     *
-     * @param key The key of the field.
-     * @param value The value of the field.
-     * @return A reference to this object.
-     */
-    public JsonObjectBuilder appendField(String key, String value) {
-      if (value == null) {
-        throw new IllegalArgumentException("JSON value must not be null");
-      }
-      appendFieldUnescaped(key, "\"" + escape(value) + "\"");
-      return this;
-    }
-
-    /**
-     * Appends an integer field to the JSON.
-     *
-     * @param key The key of the field.
-     * @param value The value of the field.
-     * @return A reference to this object.
-     */
-    public JsonObjectBuilder appendField(String key, int value) {
-      appendFieldUnescaped(key, String.valueOf(value));
-      return this;
-    }
-
-    /**
-     * Appends an object to the JSON.
-     *
-     * @param key The key of the field.
-     * @param object The object.
-     * @return A reference to this object.
-     */
-    public JsonObjectBuilder appendField(String key, JsonObject object) {
-      if (object == null) {
-        throw new IllegalArgumentException("JSON object must not be null");
-      }
-      appendFieldUnescaped(key, object.toString());
-      return this;
-    }
-
-    /**
-     * Appends a string array to the JSON.
-     *
-     * @param key The key of the field.
-     * @param values The string array.
-     * @return A reference to this object.
-     */
-    public JsonObjectBuilder appendField(String key, String[] values) {
-      if (values == null) {
-        throw new IllegalArgumentException("JSON values must not be null");
-      }
-      String escapedValues =
-          Arrays.stream(values)
-              .map(value -> "\"" + escape(value) + "\"")
-              .collect(Collectors.joining(","));
-      appendFieldUnescaped(key, "[" + escapedValues + "]");
-      return this;
-    }
-
-    /**
-     * Appends an integer array to the JSON.
-     *
-     * @param key The key of the field.
-     * @param values The integer array.
-     * @return A reference to this object.
-     */
-    public JsonObjectBuilder appendField(String key, int[] values) {
-      if (values == null) {
-        throw new IllegalArgumentException("JSON values must not be null");
-      }
-      String escapedValues =
-          Arrays.stream(values).mapToObj(String::valueOf).collect(Collectors.joining(","));
-      appendFieldUnescaped(key, "[" + escapedValues + "]");
-      return this;
-    }
-
-    /**
-     * Appends an object array to the JSON.
-     *
-     * @param key The key of the field.
-     * @param values The integer array.
-     * @return A reference to this object.
-     */
-    public JsonObjectBuilder appendField(String key, JsonObject[] values) {
-      if (values == null) {
-        throw new IllegalArgumentException("JSON values must not be null");
-      }
-      String escapedValues =
-          Arrays.stream(values).map(JsonObject::toString).collect(Collectors.joining(","));
-      appendFieldUnescaped(key, "[" + escapedValues + "]");
-      return this;
-    }
-
-    /**
-     * Appends a field to the object.
-     *
-     * @param key The key of the field.
-     * @param escapedValue The escaped value of the field.
-     */
-    private void appendFieldUnescaped(String key, String escapedValue) {
-      if (builder == null) {
-        throw new IllegalStateException("JSON has already been built");
-      }
-      if (key == null) {
-        throw new IllegalArgumentException("JSON key must not be null");
-      }
-      if (hasAtLeastOneField) {
-        builder.append(",");
-      }
-      builder.append("\"").append(escape(key)).append("\":").append(escapedValue);
-      hasAtLeastOneField = true;
-    }
-
-    /**
-     * Builds the JSON string and invalidates this builder.
-     *
-     * @return The built JSON string.
-     */
-    public JsonObject build() {
-      if (builder == null) {
-        throw new IllegalStateException("JSON has already been built");
-      }
-      JsonObject object = new JsonObject(builder.append("}").toString());
-      builder = null;
-      return object;
-    }
-
-    /**
-     * Escapes the given string like stated in https://www.ietf.org/rfc/rfc4627.txt.
-     *
-     * <p>This method escapes only the necessary characters '"', '\'. and '\u0000' - '\u001F'.
-     * Compact escapes are not used (e.g., '\n' is escaped as "\u000a" and not as "\n").
-     *
-     * @param value The value to escape.
-     * @return The escaped value.
-     */
-    private static String escape(String value) {
-      final StringBuilder builder = new StringBuilder();
-      for (int i = 0; i < value.length(); i++) {
-        char c = value.charAt(i);
-        if (c == '"') {
-          builder.append("\\\"");
-        } else if (c == '\\') {
-          builder.append("\\\\");
-        } else if (c <= '\u000F') {
-          builder.append("\\u000").append(Integer.toHexString(c));
-        } else if (c <= '\u001F') {
-          builder.append("\\u00").append(Integer.toHexString(c));
-        } else {
-          builder.append(c);
-        }
-      }
-      return builder.toString();
-    }
-
-    /**
-     * A super simple representation of a JSON object.
-     *
-     * <p>This class only exists to make methods of the {@link JsonObjectBuilder} type-safe and not
-     * allow a raw string inputs for methods like {@link JsonObjectBuilder#appendField(String,
-     * JsonObject)}.
-     */
-    public static class JsonObject {
-
-      private final String value;
-
-      private JsonObject(String value) {
-        this.value = value;
-      }
-
-      @Override
-      public String toString() {
-        return value;
-      }
-    }
-  }
-}

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/utils/MinecraftVersion.java

@@ -5,10 +5,16 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.bstats.bukkit.Metrics;
+import org.bstats.charts.DrilldownPie;
+import org.bstats.charts.SimplePie;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ClassWrapper;
+import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ReflectionMethod;
+
 /**
  * This class acts as the "Brain" of the NBTApi. It contains the main logger for
  * other classes,registers bStats and checks rather Maven shading was done
@@ -24,11 +30,14 @@ public enum MinecraftVersion {
     MC1_13_R1(1131), MC1_13_R2(1132), MC1_14_R1(1141), MC1_15_R1(1151), MC1_16_R1(1161), MC1_16_R2(1162),
     MC1_16_R3(1163), MC1_17_R1(1171), MC1_18_R1(1181, true), MC1_18_R2(1182, true), MC1_19_R1(1191, true),
     MC1_19_R2(1192, true), MC1_19_R3(1193, true), MC1_20_R1(1201, true), MC1_20_R2(1202, true), MC1_20_R3(1203, true),
-    MC1_20_R4(1204, true), MC1_21_R1(1211, true), MC1_21_R2(1212, true), MC1_21_R3(1213, true), MC1_21_R4(1214, true);
+    MC1_20_R4(1204, true), MC1_21_R1(1211, true), MC1_21_R2(1212, true), MC1_21_R3(1213, true), MC1_21_R4(1214, true), 
+    MC1_21_R5(1215, true);
 
     private static MinecraftVersion version;
     private static Boolean hasGsonSupport;
     private static Boolean isForgePresent;
+    private static Boolean isNeoForgePresent;
+    private static Boolean isFabricPresent;
     private static Boolean isFoliaPresent;
     private static boolean bStatsDisabled = false;
     private static boolean disablePackageWarning = false;
@@ -39,7 +48,7 @@ public enum MinecraftVersion {
     private static Logger logger = Logger.getLogger("NBTAPI");
 
     // NBT-API Version
-    protected static final String VERSION = "2.15.0";
+    protected static final String VERSION = "2.15.2";
 
     private final int versionId;
     private final boolean mojangMapping;
@@ -61,6 +70,9 @@ public enum MinecraftVersion {
             this.put("1.21.3", MC1_21_R2);
             this.put("1.21.4", MC1_21_R3);
             this.put("1.21.5", MC1_21_R4);
+            this.put("1.21.6", MC1_21_R5);
+            this.put("1.21.7", MC1_21_R5);
+            this.put("1.21.8", MC1_21_R5);
         }
     };
 
@@ -162,13 +174,70 @@ public enum MinecraftVersion {
     }
 
     private static void init() {
+        // Maven's Relocate is clever and changes strings, too. So we have to use this
+        // little "trick" ... :D (from bStats)
+        final String defaultPackage = new String(new byte[] { 'd', 'e', '.', 't', 'r', '7', 'z', 'w', '.', 'c', 'h',
+                'a', 'n', 'g', 'e', 'm', 'e', '.', 'n', 'b', 't', 'a', 'p', 'i', '.', 'u', 't', 'i', 'l', 's' });
+        final String reservedPackage = new String(new byte[] { 'd', 'e', '.', 't', 'r', '7', 'z', 'w', '.', 'n', 'b',
+                't', 'a', 'p', 'i', '.', 'u', 't', 'i', 'l', 's' });
         try {
             if (hasGsonSupport() && !bStatsDisabled) {
                 Plugin plugin = Bukkit.getPluginManager().getPlugin(VersionChecker.getPlugin());
                 if (plugin != null && plugin instanceof JavaPlugin) {
                     getLogger()
                             .info("[NBTAPI] Using the plugin '" + plugin.getName() + "' to create a bStats instance!");
-                    new Metrics((JavaPlugin) plugin, 1058);
+                    Metrics metrics = new Metrics((JavaPlugin) plugin, 1058);
+                    metrics.addCustomChart(new SimplePie("nbtapi_version", () -> {
+                        return VERSION;
+                    }));
+                    metrics.addCustomChart(new DrilldownPie("nms_version", () -> {
+                        Map<String, Map<String, Integer>> map = new HashMap<>();
+                        Map<String, Integer> entry = new HashMap<>();
+                        entry.put(Bukkit.getName(), 1);
+                        map.put(getVersion().name(), entry);
+                        return map;
+                    }));
+                    metrics.addCustomChart(new SimplePie("shaded", () -> {
+                        return Boolean.toString(!"NBTAPI".equals(VersionChecker.getPlugin()));
+                    }));
+                    metrics.addCustomChart(new SimplePie("server_software", () -> {
+                        return Bukkit.getName();
+                    }));
+                    metrics.addCustomChart(new SimplePie("parent_plugin", () -> {
+                        return VersionChecker.getPluginforBStats();
+                    }));
+                    metrics.addCustomChart(new SimplePie("parent_plugin_type", () -> {
+                        return VersionChecker.getPluginType();
+                    }));
+                    metrics.addCustomChart(new SimplePie("special_environment", () -> {
+                        if (isFoliaPresent()) {
+                            return "Folia";
+                        } else if (isForgePresent()) {
+                            return "Forge";
+                        } else if (isFabricPresent()) {
+                            return "Fabric";
+                        } else if (isNeoForgePresent()) {
+                            return "NeoForge";
+                        } else {
+                            return "None";
+                        }
+                    }));
+                    metrics.addCustomChart(new SimplePie("bindings_check", () -> {
+                        
+                        boolean failedBinding = false;
+                        for (ClassWrapper c : ClassWrapper.values()) {
+                            if (c.isEnabled() && c.getClazz() == null) {
+                                failedBinding = true;
+                            }
+                        }
+                        for (ReflectionMethod method : ReflectionMethod.values()) {
+                            if (method.isCompatible() && !method.isLoaded()) {
+                                failedBinding = true;
+                            }
+                        }
+                        
+                        return failedBinding ? "Failed" : "Pass";
+                    }));
                 } else if (plugin == null) {
                     getLogger().info("[NBTAPI] Unable to create a bStats instance!!");
                 }
@@ -185,12 +254,6 @@ public enum MinecraftVersion {
                     logger.log(Level.WARNING, "[NBTAPI] Error while checking for updates! Error: " + ex.getMessage());
                 }
             }).start();
-        // Maven's Relocate is clever and changes strings, too. So we have to use this
-        // little "trick" ... :D (from bStats)
-        final String defaultPackage = new String(new byte[] { 'd', 'e', '.', 't', 'r', '7', 'z', 'w', '.', 'c', 'h',
-                'a', 'n', 'g', 'e', 'm', 'e', '.', 'n', 'b', 't', 'a', 'p', 'i', '.', 'u', 't', 'i', 'l', 's' });
-        final String reservedPackage = new String(new byte[] { 'd', 'e', '.', 't', 'r', '7', 'z', 'w', '.', 'n', 'b',
-                't', 'a', 'p', 'i', '.', 'u', 't', 'i', 'l', 's' });
         if (!disablePackageWarning && MinecraftVersion.class.getPackage().getName().equals(defaultPackage)) {
             logger.warning(
                     "#########################################- NBTAPI -#########################################");
@@ -250,6 +313,22 @@ public enum MinecraftVersion {
         return hasGsonSupport;
     }
 
+    /**
+     * @return True, if Fabric is present
+     */
+    public static boolean isFabricPresent() {
+        if (isFabricPresent != null) {
+            return isFabricPresent;
+        }
+        try {
+            logger.info("[NBTAPI] Found Fabric: " + Class.forName("net.fabricmc.api.ModInitializer"));
+            isFabricPresent = true;
+        } catch (Exception ex) {
+            isFabricPresent = false;
+        }
+        return isFabricPresent;
+    }
+    
     /**
      * @return True, if Forge is present
      */
@@ -267,6 +346,22 @@ public enum MinecraftVersion {
         }
         return isForgePresent;
     }
+    
+    /**
+     * @return True, if NeoForge is present
+     */
+    public static boolean isNeoForgePresent() {
+        if (isNeoForgePresent != null) {
+            return isNeoForgePresent;
+        }
+        try {
+            logger.info("[NBTAPI] Found NeoForge: " + Class.forName("net.neoforged.neoforge.common.NeoForge"));
+            isNeoForgePresent = true;
+        } catch (Exception ex) {
+            isNeoForgePresent = false;
+        }
+        return isNeoForgePresent;
+    }
 
     /**
      * @return True, if Folia is present

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/utils/ReflectionUtil.java

@@ -1,53 +1,24 @@
 package de.tr7zw.changeme.nbtapi.utils;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 
 import de.tr7zw.changeme.nbtapi.NbtApiException;
+import de.tr7zw.changeme.nbtapi.utils.nmsmappings.MojangToMapping;
 
 public final class ReflectionUtil {
-
-    private static Field field_modifiers;
-
-    static {
+    
+    public static Field getMappedField(Class<?> clazz, String mapping) {
+        String mojmapName = mapping.split("#")[1];
         try {
-            field_modifiers = Field.class.getDeclaredField("modifiers");
-            field_modifiers.setAccessible(true);
-        } catch (NoSuchFieldException ex) {
-            try {
-                // This hacky workaround is for newer jdk versions 11+?
-                Method fieldGetter = Class.class.getDeclaredMethod("getDeclaredFields0", boolean.class);
-                fieldGetter.setAccessible(true);
-                Field[] fields = (Field[]) fieldGetter.invoke(Field.class, false);
-                for (Field f : fields)
-                    if (f.getName().equals("modifiers")) {
-                        field_modifiers = f;
-                        field_modifiers.setAccessible(true);
-                        break;
-                    }
-            } catch (Exception e) {
-                throw new NbtApiException(e);
-            }
+            return clazz.getField(mojmapName);
+        } catch (NoSuchFieldException | SecurityException e) {
+            // not Mojamp, try remapped
         }
-        if (field_modifiers == null) {
-            throw new NbtApiException("Unable to init the modifiers Field.");
+        try {
+            return clazz.getDeclaredField(MojangToMapping.getMapping().get(mapping));
+        } catch (Exception e) {
+            throw new NbtApiException("Unable to find field " + mapping + " in class " + clazz.getName(), e);
         }
     }
 
-    public static Field makeNonFinal(Field field) throws IllegalArgumentException, IllegalAccessException {
-        int mods = field.getModifiers();
-        if (Modifier.isFinal(mods)) {
-            field_modifiers.set(field, mods & ~Modifier.FINAL);
-        }
-        return field;
-    }
-
-    public static void setFinal(Object obj, Field field, Object newValue)
-            throws IllegalArgumentException, IllegalAccessException {
-        field.setAccessible(true);
-        field = makeNonFinal(field);
-        field.set(obj, newValue);
-    }
-
 }

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/utils/VersionChecker.java

@@ -109,7 +109,20 @@ public class VersionChecker {
 
     protected static String getPlugin() {
         ClassLoader classLoader = VersionChecker.class.getClassLoader();
-        InputStream inputStream = classLoader.getResourceAsStream("plugin.yml");
+        InputStream inputStream = classLoader.getResourceAsStream("paper-plugin.yml");
+        if (inputStream != null) {
+            try (InputStreamReader reader = new InputStreamReader(inputStream)) {
+                YamlConfiguration pluginYml = YamlConfiguration.loadConfiguration(reader);
+                return pluginYml.getString("name");
+            } catch (IOException e) {
+                // ignored
+            } catch (IllegalArgumentException e) {
+                // This can happen if the paper-plugin.yml is not formatted correctly
+                MinecraftVersion.getLogger().log(Level.WARNING, "[NBTAPI] Error reading paper-plugin.yml: " + e.getMessage());
+            }
+        }
+        
+        inputStream = classLoader.getResourceAsStream("plugin.yml");
 
         if (inputStream != null) {
             try (InputStreamReader reader = new InputStreamReader(inputStream)) {
@@ -117,9 +130,67 @@ public class VersionChecker {
                 return pluginYml.getString("name");
             } catch (IOException e) {
                 // ignored
+            } catch (IllegalArgumentException e) {
+                // This can happen if the plugin.yml is not formatted correctly
+                MinecraftVersion.getLogger().log(Level.WARNING, "[NBTAPI] Error reading plugin.yml: " + e.getMessage());
             }
         }
         return NBTItem.class.getPackage().getName();
     }
+    
+    protected static String getPluginforBStats() {
+        ClassLoader classLoader = VersionChecker.class.getClassLoader();
+        InputStream inputStream = classLoader.getResourceAsStream("paper-plugin.yml");
+        if (inputStream != null) {
+            try (InputStreamReader reader = new InputStreamReader(inputStream)) {
+                YamlConfiguration pluginYml = YamlConfiguration.loadConfiguration(reader);
+                return pluginYml.getString("name");
+            } catch (IOException e) {
+                // ignored
+            } catch (IllegalArgumentException e) {
+                // This can happen if the paper-plugin.yml is not formatted correctly
+                MinecraftVersion.getLogger().log(Level.WARNING, "[NBTAPI] Error reading paper-plugin.yml: " + e.getMessage());
+            }
+        }
+        
+        inputStream = classLoader.getResourceAsStream("plugin.yml");
+
+        if (inputStream != null) {
+            try (InputStreamReader reader = new InputStreamReader(inputStream)) {
+                YamlConfiguration pluginYml = YamlConfiguration.loadConfiguration(reader);
+                return pluginYml.getString("name");
+            } catch (IOException e) {
+                // ignored
+            } catch (IllegalArgumentException e) {
+                // This can happen if the plugin.yml is not formatted correctly
+                MinecraftVersion.getLogger().log(Level.WARNING, "[NBTAPI] Error reading plugin.yml: " + e.getMessage());
+            }
+        }
+        return "UnknownPlugin";
+    }
+    
+    protected static String getPluginType() {
+        ClassLoader classLoader = VersionChecker.class.getClassLoader();
+        InputStream inputStream = classLoader.getResourceAsStream("paper-plugin.yml");
+        if (inputStream != null) {
+            try {
+                inputStream.close();
+            } catch (IOException e) {
+                // ignored
+            }
+            return "PaperPlugin";
+        }
+        
+        inputStream = classLoader.getResourceAsStream("plugin.yml");
+        if (inputStream != null) {
+            try {
+                inputStream.close();
+            } catch (IOException e) {
+                // ignored
+            }
+            return "SpigotPlugin";
+        }
+        return "UnknownPlugin";
+    }
 
 }

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/utils/nmsmappings/ClassWrapper.java

@@ -86,6 +86,18 @@ public enum ClassWrapper {
             "net.minecraft.util.datafix.fixes", "net.minecraft.util.datafix.fixes.References"),
     NMS_NBTOPS(PackageWrapper.NMS, "DynamicOpsNBT", MinecraftVersion.MC1_20_R4, null,
             "net.minecraft.nbt", "net.minecraft.nbt.NbtOps"),
+    NMS_PROBLEM_REPORTER(PackageWrapper.NMS, "ProblemReporter", MinecraftVersion.MC1_21_R5, null,
+            "net.minecraft.util", "net.minecraft.util.ProblemReporter"),
+    NMS_TAG_VALUE_INPUT(PackageWrapper.NMS, "TagValueInput", MinecraftVersion.MC1_21_R5, null,
+            "net.minecraft.world.level.storage", "net.minecraft.world.level.storage.TagValueInput"),
+    NMS_VALUE_INPUT(PackageWrapper.NMS, "ValueInput", MinecraftVersion.MC1_21_R5, null,
+            "net.minecraft.world.level.storage", "net.minecraft.world.level.storage.ValueInput"),
+    NMS_TAG_VALUE_OUTPUT(PackageWrapper.NMS, "TagValueOutput", MinecraftVersion.MC1_21_R5, null,
+            "net.minecraft.world.level.storage", "net.minecraft.world.level.storage.TagValueOutput"),
+    NMS_VALUE_OUTPUT(PackageWrapper.NMS, "ValueOutput", MinecraftVersion.MC1_21_R5, null,
+            "net.minecraft.world.level.storage", "net.minecraft.world.level.storage.ValueOutput"),
+    NMS_DYNAMICOPS(PackageWrapper.NONE, "DynamicOps", MinecraftVersion.MC1_21_R5, null,
+            "com.mojang.serialization", "com.mojang.serialization.DynamicOps"),
     GAMEPROFILE(PackageWrapper.NONE, "com.mojang.authlib.GameProfile", MinecraftVersion.MC1_8_R3, null);
 
     private Class<?> clazz;

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/utils/nmsmappings/CodecHelper.java

@@ -0,0 +1,35 @@
+package de.tr7zw.changeme.nbtapi.utils.nmsmappings;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import de.tr7zw.changeme.nbtapi.NBTReflectionUtil;
+import de.tr7zw.changeme.nbtapi.NbtApiException;
+
+public class CodecHelper {
+
+    public static Object convertItemStackToNbt(Object itemStack) {
+        Object result = null;
+        try {
+            // FIXME caching, this has 0 exception handling
+            result = NBTReflectionUtil.itemstack_codec.encodeStart(NBTReflectionUtil.nbtRegistryOps, itemStack);
+            Objects.requireNonNull(result);
+            return ((Optional<Object>)result.getClass().getMethod("result").invoke(result)).get();
+        } catch (Exception e) {
+            throw new NbtApiException("Failed to convert ItemStack to NBT. " + result + " " + itemStack, e);
+        }
+    }
+    
+    public static Object convertNbtToItemStack(Object nbt) {
+        Object result = null;
+        try {
+            // FIXME caching, this has 0 exception handling
+            result = NBTReflectionUtil.itemstack_codec.parse(NBTReflectionUtil.nbtRegistryOps, nbt);
+            Objects.requireNonNull(result);
+            return ((Optional<Object>)result.getClass().getMethod("result").invoke(result)).get();
+        } catch (Exception e) {
+            throw new NbtApiException("Failed to convert NBT to ItemStack. " + result + " " + nbt, e);
+        }
+    }
+    
+}

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/utils/nmsmappings/MojangToMapping.java

@@ -238,12 +238,57 @@ public class MojangToMapping {
             put("net.minecraft.nbt.TagType#getName()", "a");
             put("net.minecraft.nbt.CompoundTag#getList(java.lang.String)", "o");
             put("net.minecraft.world.item.ItemStack#parse(net.minecraft.core.HolderLookup$Provider,net.minecraft.nbt.Tag)", "a");
+            put("net.minecraft.world.item.ItemStack#CODEC", "b");
         }
 
     };
+    
+    @SuppressWarnings("serial")
+    private static Map<String, String> MC1_21R5 = new HashMap<String, String>() {
+
+        {
+            putAll(MC1_21R3);
+            put("net.minecraft.core.HolderLookup$Provider#createSerializationContext(com.mojang.serialization.DynamicOps)", "a");
+            put("net.minecraft.nbt.CompoundTag#getByteArray(java.lang.String)", "j");
+            put("net.minecraft.nbt.CompoundTag#getDouble(java.lang.String)", "h");
+            put("net.minecraft.nbt.CompoundTag#keySet()", "e");
+            put("net.minecraft.nbt.CompoundTag#getLong(java.lang.String)", "f");
+            put("net.minecraft.nbt.CompoundTag#getList(java.lang.String)", "o");
+            put("net.minecraft.nbt.CompoundTag#getInt(java.lang.String)", "e");
+            put("net.minecraft.nbt.CompoundTag#getCompound(java.lang.String)", "m");
+            put("net.minecraft.nbt.CompoundTag#getByte(java.lang.String)", "c");
+            put("net.minecraft.nbt.CompoundTag#getShort(java.lang.String)", "d");
+            put("net.minecraft.nbt.CompoundTag#getIntArray(java.lang.String)", "k");
+            put("net.minecraft.nbt.CompoundTag#get(java.lang.String)", "a");
+            put("net.minecraft.nbt.CompoundTag#getString(java.lang.String)", "i");
+            put("net.minecraft.nbt.CompoundTag#getFloat(java.lang.String)", "g");
+            put("net.minecraft.nbt.CompoundTag#getLongArray(java.lang.String)", "l");
+            put("net.minecraft.nbt.CompoundTag#contains(java.lang.String)", "b");
+            put("net.minecraft.nbt.ListTag#getString(int)", "m");
+            put("net.minecraft.nbt.Tag#getType()", "c");
+            put("net.minecraft.nbt.TagParser#parseCompoundFully(java.lang.String)", "a");
+            put("net.minecraft.nbt.TagType#getName()", "a");
+            put("net.minecraft.world.entity.Entity#load(net.minecraft.world.level.storage.ValueInput)", "e");
+            put("net.minecraft.world.entity.Entity#getEncodeId()", "bN");
+            put("net.minecraft.world.entity.Entity#saveWithoutId(net.minecraft.world.level.storage.ValueOutput)", "d");
+            put("net.minecraft.world.level.block.entity.BlockEntity#saveWithId(net.minecraft.world.level.storage.ValueOutput)", "d");
+            put("net.minecraft.world.level.block.entity.BlockEntity#loadWithComponents(net.minecraft.world.level.storage.ValueInput)", "b");
+            put("net.minecraft.world.level.storage.TagValueInput#create(net.minecraft.util.ProblemReporter,net.minecraft.core.HolderLookup$Provider,net.minecraft.nbt.CompoundTag)", "a");
+            put("net.minecraft.world.level.storage.TagValueOutput#createWithContext(net.minecraft.util.ProblemReporter,net.minecraft.core.HolderLookup$Provider)", "a");
+            put("net.minecraft.world.level.storage.TagValueOutput#buildResult()", "b");
+            put("net.minecraft.world.item.ItemStack#CODEC", "b");
+            put("net.minecraft.util.ProblemReporter#DISCARDING", "a");
+            put("net.minecraft.util.datafix.fixes.References#ITEM_STACK", "u");
+
+        }
+
+    };
+    
 
     public static Map<String, String> getMapping() {
         switch (MinecraftVersion.getVersion()) {
+        case MC1_21_R5:
+            return MC1_21R5;
         case MC1_21_R4:
             return MC1_21R4;
         case MC1_21_R3:

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/utils/nmsmappings/ReflectionMethod.java

@@ -5,6 +5,8 @@ import java.io.OutputStream;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.UUID;
+import java.util.stream.Collectors;
+
 import org.bukkit.inventory.ItemStack;
 
 import de.tr7zw.changeme.nbtapi.NbtApiException;
@@ -68,8 +70,8 @@ public enum ReflectionMethod {
     COMPOUND_GET_LIST_LEGACY(ClassWrapper.NMS_NBTTAGCOMPOUND, new Class[] { String.class, int.class },
             MinecraftVersion.MC1_7_R4, MinecraftVersion.MC1_21_R3, new Since(MinecraftVersion.MC1_7_R4, "getList"),
             new Since(MinecraftVersion.MC1_18_R1, "getList(java.lang.String,int)")),
-    COMPOUND_GET_LIST(ClassWrapper.NMS_NBTTAGCOMPOUND, new Class[] { String.class }, MinecraftVersion.MC1_21_R4,
-            MinecraftVersion.MC1_21_R4, new Since(MinecraftVersion.MC1_21_R4, "getList(java.lang.String)")),
+    COMPOUND_GET_LIST(ClassWrapper.NMS_NBTTAGCOMPOUND, new Class[] { String.class }, MinecraftVersion.MC1_21_R4, 
+            new Since(MinecraftVersion.MC1_21_R4, "getList(java.lang.String)")),
     // Only needed for 1.7.10 getType
     COMPOUND_OWN_TYPE_LEGACY(ClassWrapper.NMS_NBTBASE, new Class[] {}, MinecraftVersion.MC1_7_R4, MinecraftVersion.MC1_7_R4,
             new Since(MinecraftVersion.MC1_7_R4, "getTypeId")),
@@ -133,17 +135,17 @@ public enum ReflectionMethod {
     COMPOUND_HAS_KEY(ClassWrapper.NMS_NBTTAGCOMPOUND, new Class[] { String.class }, MinecraftVersion.MC1_7_R4,
             new Since(MinecraftVersion.MC1_7_R4, "hasKey"),
             new Since(MinecraftVersion.MC1_18_R1, "contains(java.lang.String)")),
-    COMPOUND_GET_TYPE(ClassWrapper.NMS_NBTTAGCOMPOUND, new Class[] { String.class }, MinecraftVersion.MC1_8_R3,
+    COMPOUND_GET_TYPE(ClassWrapper.NMS_NBTTAGCOMPOUND, new Class[] { String.class }, MinecraftVersion.MC1_8_R3, MinecraftVersion.MC1_21_R4,
             new Since(MinecraftVersion.MC1_8_R3, "b"), new Since(MinecraftVersion.MC1_9_R1, "d"),
             new Since(MinecraftVersion.MC1_15_R1, "e"), new Since(MinecraftVersion.MC1_16_R1, "d"),
             new Since(MinecraftVersion.MC1_18_R1, "getTagType(java.lang.String)")),
     COMPOUND_GET_KEYS(ClassWrapper.NMS_NBTTAGCOMPOUND, new Class[] {}, MinecraftVersion.MC1_7_R4,
             new Since(MinecraftVersion.MC1_7_R4, "c"), new Since(MinecraftVersion.MC1_13_R1, "getKeys"),
-            new Since(MinecraftVersion.MC1_18_R1, "getAllKeys()")),
+            new Since(MinecraftVersion.MC1_18_R1, "getAllKeys()"), new Since(MinecraftVersion.MC1_21_R5, "keySet()")),
     // FIXME ?!?
-    LISTCOMPOUND_GET_KEYS(ClassWrapper.NMS_NBTTAGCOMPOUND, new Class[] {}, MinecraftVersion.MC1_7_R4,
-            new Since(MinecraftVersion.MC1_7_R4, "c"), new Since(MinecraftVersion.MC1_13_R1, "getKeys"),
-            new Since(MinecraftVersion.MC1_18_R1, "getAllKeys()")),
+//    LISTCOMPOUND_GET_KEYS(ClassWrapper.NMS_NBTTAGCOMPOUND, new Class[] {}, MinecraftVersion.MC1_7_R4,
+//            new Since(MinecraftVersion.MC1_7_R4, "c"), new Since(MinecraftVersion.MC1_13_R1, "getKeys"),
+//            new Since(MinecraftVersion.MC1_18_R1, "getAllKeys()")),
     LIST_REMOVE_KEY(ClassWrapper.NMS_NBTTAGLIST, new Class[] { int.class }, MinecraftVersion.MC1_8_R3,
             new Since(MinecraftVersion.MC1_8_R3, "a"), new Since(MinecraftVersion.MC1_9_R1, "remove"),
             new Since(MinecraftVersion.MC1_18_R1, "remove(int)")),
@@ -226,11 +228,11 @@ public enum ReflectionMethod {
     CRAFT_ENTITY_GET_HANDLE(ClassWrapper.CRAFT_ENTITY, new Class[] {}, MinecraftVersion.MC1_7_R4,
             new Since(MinecraftVersion.MC1_7_R4, "getHandle")),
     NMS_ENTITY_SET_NBT(ClassWrapper.NMS_ENTITY, new Class[] { ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz() },
-            MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "f"),
+            MinecraftVersion.MC1_7_R4, MinecraftVersion.MC1_21_R4, new Since(MinecraftVersion.MC1_7_R4, "f"),
             new Since(MinecraftVersion.MC1_16_R1, "load"),
             new Since(MinecraftVersion.MC1_18_R1, "load(net.minecraft.nbt.CompoundTag)")),
     NMS_ENTITY_GET_NBT(ClassWrapper.NMS_ENTITY, new Class[] { ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz() },
-            MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "e"),
+            MinecraftVersion.MC1_7_R4, MinecraftVersion.MC1_21_R4, new Since(MinecraftVersion.MC1_7_R4, "e"),
             new Since(MinecraftVersion.MC1_12_R1, "save"),
             new Since(MinecraftVersion.MC1_18_R1, "saveWithoutId(net.minecraft.nbt.CompoundTag)")),
     NMS_ENTITY_GETSAVEID(ClassWrapper.NMS_ENTITY, new Class[] {}, MinecraftVersion.MC1_14_R1,
@@ -258,7 +260,7 @@ public enum ReflectionMethod {
 
     PARSE_NBT(ClassWrapper.NMS_MOJANGSONPARSER, new Class[] { String.class }, MinecraftVersion.MC1_7_R4,
             new Since(MinecraftVersion.MC1_7_R4, "parse"),
-            new Since(MinecraftVersion.MC1_18_R1, "parseTag(java.lang.String)")),
+            new Since(MinecraftVersion.MC1_18_R1, "parseTag(java.lang.String)"), new Since(MinecraftVersion.MC1_21_R5, "parseCompoundFully(java.lang.String)")),
     REGISTRY_KEYSET(ClassWrapper.NMS_REGISTRYSIMPLE, new Class[] {}, MinecraftVersion.MC1_11_R1,
             MinecraftVersion.MC1_13_R1, new Since(MinecraftVersion.MC1_11_R1, "keySet")),
     REGISTRY_GET(ClassWrapper.NMS_REGISTRYSIMPLE, new Class[] { Object.class }, MinecraftVersion.MC1_11_R1,
@@ -299,21 +301,41 @@ public enum ReflectionMethod {
     NMSITEM_SET(ClassWrapper.NMS_ITEMSTACK, new Class[] {ClassWrapper.NMS_DATACOMPONENTTYPE.getClazz(), Object.class}, MinecraftVersion.MC1_20_R4,
             new Since(MinecraftVersion.MC1_20_R4, "set(net.minecraft.core.component.DataComponentType,java.lang.Object)")),
     NMSITEM_SAVE_MODERN(ClassWrapper.NMS_ITEMSTACK, new Class[] { ClassWrapper.NMS_PROVIDER.getClazz() },
-            MinecraftVersion.MC1_20_R4, new Since(MinecraftVersion.MC1_20_R4, "save(net.minecraft.core.HolderLookup$Provider)")),
+            MinecraftVersion.MC1_20_R4, MinecraftVersion.MC1_21_R4, new Since(MinecraftVersion.MC1_20_R4, "save(net.minecraft.core.HolderLookup$Provider)")),
     NMSITEM_LOAD(ClassWrapper.NMS_ITEMSTACK, new Class[] { ClassWrapper.NMS_PROVIDER.getClazz(), ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz() },
             MinecraftVersion.MC1_20_R4, MinecraftVersion.MC1_21_R3, new Since(MinecraftVersion.MC1_20_R4, "parseOptional(net.minecraft.core.HolderLookup$Provider,net.minecraft.nbt.CompoundTag)")),
     NMSITEM_LOAD_MODERN(ClassWrapper.NMS_ITEMSTACK, new Class[] { ClassWrapper.NMS_PROVIDER.getClazz(), ClassWrapper.NMS_NBTBASE.getClazz() },
-            MinecraftVersion.MC1_21_R4, new Since(MinecraftVersion.MC1_20_R4, "parse(net.minecraft.core.HolderLookup$Provider,net.minecraft.nbt.Tag)")),
+            MinecraftVersion.MC1_21_R4,  MinecraftVersion.MC1_21_R4, new Since(MinecraftVersion.MC1_20_R4, "parse(net.minecraft.core.HolderLookup$Provider,net.minecraft.nbt.Tag)")),
     NMSSERVER_GETREGISTRYACCESS(ClassWrapper.NMS_SERVER, new Class[] {},
             MinecraftVersion.MC1_20_R4, new Since(MinecraftVersion.MC1_20_R4, "registryAccess()")),
     NMSSERVER_GETSERVER(ClassWrapper.CRAFT_SERVER, new Class[] {},
             MinecraftVersion.MC1_20_R4, new Since(MinecraftVersion.MC1_20_R4, "getServer()")),
-    TILEENTITY_GET_NBT_1205(ClassWrapper.NMS_TILEENTITY, new Class[] {ClassWrapper.NMS_PROVIDER.getClazz()}, MinecraftVersion.MC1_20_R4,
+    TILEENTITY_GET_NBT_1205(ClassWrapper.NMS_TILEENTITY, new Class[] {ClassWrapper.NMS_PROVIDER.getClazz()}, MinecraftVersion.MC1_20_R4, MinecraftVersion.MC1_21_R4,
             new Since(MinecraftVersion.MC1_20_R4, "saveWithId(net.minecraft.core.HolderLookup$Provider)")),
     TILEENTITY_SET_NBT_1205(ClassWrapper.NMS_TILEENTITY, new Class[] {ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), ClassWrapper.NMS_PROVIDER.getClazz() },
-            MinecraftVersion.MC1_20_R4, new Since(MinecraftVersion.MC1_20_R4, "loadWithComponents(net.minecraft.nbt.CompoundTag,net.minecraft.core.HolderLookup$Provider)")),
+            MinecraftVersion.MC1_20_R4, MinecraftVersion.MC1_21_R4, new Since(MinecraftVersion.MC1_20_R4, "loadWithComponents(net.minecraft.nbt.CompoundTag,net.minecraft.core.HolderLookup$Provider)")),
     GET_DATAFIXER(ClassWrapper.NMS_DATAFIXERS, new Class[] {}, MinecraftVersion.MC1_20_R4,
             new Since(MinecraftVersion.MC1_20_R4, "getDataFixer()")),
+    // 1.21.6 Stuff
+    GET_SERIALIZATION_CONTEXT(ClassWrapper.NMS_PROVIDER, new Class[] {ClassWrapper.NMS_DYNAMICOPS.getClazz()}, MinecraftVersion.MC1_21_R5,
+            new Since(MinecraftVersion.MC1_21_R5, "createSerializationContext(com.mojang.serialization.DynamicOps)")),
+    NMS_GET_TAG_VALUE_INPUT(ClassWrapper.NMS_TAG_VALUE_INPUT, new Class[] {ClassWrapper.NMS_PROBLEM_REPORTER.getClazz(), ClassWrapper.NMS_PROVIDER.getClazz(), ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_21_R5,
+            new Since(MinecraftVersion.MC1_21_R5, "create(net.minecraft.util.ProblemReporter,net.minecraft.core.HolderLookup$Provider,net.minecraft.nbt.CompoundTag)")),
+    NMS_GET_TAG_VALUE_OUTPUT(ClassWrapper.NMS_TAG_VALUE_OUTPUT, new Class[] {ClassWrapper.NMS_PROBLEM_REPORTER.getClazz(), ClassWrapper.NMS_PROVIDER.getClazz()}, MinecraftVersion.MC1_21_R5,
+            new Since(MinecraftVersion.MC1_21_R5, "createWithContext(net.minecraft.util.ProblemReporter,net.minecraft.core.HolderLookup$Provider)")),
+    NMS_TAG_VALUE_OUTPUT_TO_TAG_COMPOUND(ClassWrapper.NMS_TAG_VALUE_OUTPUT, new Class[] {}, MinecraftVersion.MC1_21_R5,
+            new Since(MinecraftVersion.MC1_21_R5, "buildResult()")),
+    NMS_ENTITY_SET_NBT_1216(ClassWrapper.NMS_ENTITY, new Class[] { ClassWrapper.NMS_VALUE_INPUT.getClazz() }, MinecraftVersion.MC1_21_R5,
+            new Since(MinecraftVersion.MC1_21_R5, "load(net.minecraft.world.level.storage.ValueInput)")
+    ),
+    NMS_ENTITY_GET_NBT_1216(ClassWrapper.NMS_ENTITY, new Class[] { ClassWrapper.NMS_VALUE_OUTPUT.getClazz() }, MinecraftVersion.MC1_21_R5,
+            new Since(MinecraftVersion.MC1_21_R5, "saveWithoutId(net.minecraft.world.level.storage.ValueOutput)")),
+
+    TILEENTITY_GET_NBT_1216(ClassWrapper.NMS_TILEENTITY, new Class[] {ClassWrapper.NMS_VALUE_OUTPUT.getClazz()}, MinecraftVersion.MC1_21_R5,
+            new Since(MinecraftVersion.MC1_21_R5, "saveWithId(net.minecraft.world.level.storage.ValueOutput)")),
+    TILEENTITY_SET_NBT_1216(ClassWrapper.NMS_TILEENTITY, new Class[] {ClassWrapper.NMS_VALUE_INPUT.getClazz() },
+            MinecraftVersion.MC1_21_R5,
+            new Since(MinecraftVersion.MC1_21_R5, "loadWithComponents(net.minecraft.world.level.storage.ValueInput)")),
     ;
 
     private MinecraftVersion removedAfter;
@@ -405,7 +427,8 @@ public enum ReflectionMethod {
             return method.invoke(target, args);
         } catch (Exception ex) {
             throw new NbtApiException("Error while calling the method '" + methodName + "', loaded: " + loaded
-                    + ", Enum: " + this + ", Passed Class: " + (target == null ? "null" : target.getClass()) + " Args: " + (args == null ? "null" : Arrays.toString(args)), ex);
+                    + ", Enum: " + this + ", Passed Class: " + (target == null ? "null" : target.getClass()) + " Args: " + (args == null ? "null" : Arrays.toString(args)) + 
+                    " Classes: " + (args == null ? "null" : Arrays.asList(args).stream().map(a -> a == null ? "NULL" : a.getClass().getName()).collect(Collectors.toList())), ex);
         }
     }
 

item-nbt-plugin/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.tr7zw</groupId>
     <artifactId>item-nbt-parent</artifactId>
-    <version>2.15.0</version>
+    <version>2.15.2</version>
   </parent>
   <artifactId>item-nbt-api-plugin</artifactId>
   <packaging>jar</packaging>
@@ -12,7 +12,7 @@
     <dependency>
       <groupId>de.tr7zw</groupId>
       <artifactId>item-nbt-api</artifactId>
-      <version>2.15.0</version>
+      <version>2.15.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -21,6 +21,13 @@
 	    <version>4.0.26</version>
 	    <scope>provided</scope>
 	</dependency>
+  <dependency>
+	  <groupId>org.bstats</groupId>
+	  <artifactId>bstats-bukkit</artifactId>
+	  <version>3.1.0</version>
+    <!-- Overwrite to provided -->
+	  <scope>provided</scope>
+	</dependency>
   </dependencies>
   <build>
     <resources>
@@ -41,14 +48,6 @@
               <pattern>de.tr7zw.changeme.nbtapi</pattern>
               <shadedPattern>de.tr7zw.nbtapi</shadedPattern>
             </relocation>
-            <relocation>
-              <pattern>javassist</pattern>
-              <shadedPattern>de.tr7zw.nbtinjector.javassist</shadedPattern>
-            </relocation>
-            <relocation>
-              <pattern>de.tr7zw.annotations</pattern>
-              <shadedPattern>de.tr7zw.nbtapi.utils.annotations</shadedPattern>
-            </relocation>
           </relocations>
           <transformers>
             <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

item-nbt-plugin/src/main/java/de/tr7zw/nbtapi/plugin/NBTAPI.java

@@ -200,7 +200,7 @@ public class NBTAPI extends JavaPlugin {
             } catch (Exception ex) {
                 results.put(test, ex);
                 getLogger().log(Level.WARNING, "Error during '" + test.getClass().getSimpleName() + "' test!", ex);
-            } catch (NoSuchFieldError th) { // NOSONAR
+            } catch (Throwable th) { // NOSONAR
                 getLogger().log(Level.SEVERE, "Servere error during '" + test.getClass().getSimpleName() + "' test!");
                 getLogger().warning(
                         "WARNING! This version of Item-NBT-API seems to be broken with your Spigot version! Canceled the other tests!");

item-nbt-plugin/src/main/java/de/tr7zw/nbtapi/plugin/tests/compounds/StreamTest.java

@@ -7,21 +7,21 @@ import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
 import de.tr7zw.changeme.nbtapi.NBT;
-import de.tr7zw.changeme.nbtapi.NBTContainer;
 import de.tr7zw.changeme.nbtapi.NbtApiException;
+import de.tr7zw.changeme.nbtapi.iface.ReadWriteNBT;
 import de.tr7zw.nbtapi.plugin.tests.Test;
 
 public class StreamTest implements Test {
 
     @Override
     public void test() throws Exception {
-        NBTContainer base = new NBTContainer();
+        ReadWriteNBT base = NBT.createNBTObject();
         base.getOrCreateCompound("sub").setString("hello", "world");
         ByteArrayOutputStream outStream = new ByteArrayOutputStream();
         base.getOrCreateCompound("sub").writeCompound(outStream);
         byte[] data = outStream.toByteArray();
         ByteArrayInputStream inputStream = new ByteArrayInputStream(data);
-        NBTContainer container = new NBTContainer(inputStream);
+        ReadWriteNBT container = NBT.readNBT(inputStream);
         if (!container.toString().equals(base.getOrCreateCompound("sub").toString())) {
             throw new NbtApiException("Component content did not match! " + base.getCompound("sub") + " " + container);
         }

mappings-parser/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.tr7zw</groupId>
     <artifactId>item-nbt-parent</artifactId>
-    <version>2.15.0</version>
+    <version>2.15.2</version>
   </parent>
   <artifactId>mappings-parser</artifactId>
   <packaging>jar</packaging>
@@ -12,7 +12,7 @@
     <dependency>
       <groupId>de.tr7zw</groupId>
       <artifactId>item-nbt-api</artifactId>
-      <version>2.15.0</version>
+      <version>2.15.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

mappings-parser/src/main/java/dev/tr7zw/mappingsparser/MappingsParser.java

@@ -24,7 +24,7 @@ public class MappingsParser {
     public static StringBuilder builder = new StringBuilder();
 
     public static void main(String[] args) throws IOException {
-        File input = new File("minecraft_server.1.21.4.txt");
+        File input = new File("minecraft_server.1.21.6.txt");
         List<String> lines = Files.readAllLines(input.toPath());
 
         Map<String, ClassWrapper> classes = new HashMap<>();
@@ -75,6 +75,33 @@ public class MappingsParser {
             }
             // System.out.println(currentClass + ": " + mojangName + " -> " + unmappedName);
         }
+        for(String type : MojangToMapping.getMapping().keySet()) {
+            if(type.contains("(")) {
+                continue;
+            }
+            // Field
+            String clazz = type.split("#")[0];
+            String fieldName = type.split("#")[1];
+            for (String line : lines) {
+                if (line.startsWith("#")) {
+                    continue;
+                }
+                if (!line.startsWith(" ")) {
+                    currentClass = line.split(" ")[0];
+                    continue;
+                }
+                mojangName = line.trim().split(" ")[1];
+                unmappedName = line.trim().split(" ")[3];
+                if (currentClass.equals(clazz) && mojangName.equals(fieldName)) {
+                    if (MojangToMapping.getMapping().get(type) == null) {
+                        System.out.println("Missing mapping for " + type);
+                    } else if (!MojangToMapping.getMapping().get(type)
+                            .equals(unmappedName)) {
+                        builder.append("put(\"" + type + "\", \"" + unmappedName + "\");\n");
+                    }
+                }
+            }
+        }
         System.out.println(builder);
     }
 

nbt-data-api/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>de.tr7zw</groupId>
     <artifactId>item-nbt-parent</artifactId>
-    <version>2.15.0</version>
+    <version>2.15.2</version>
   </parent>
 
   <artifactId>nbt-data-api</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>de.tr7zw</groupId>
       <artifactId>item-nbt-api</artifactId>
-      <version>2.15.0</version>
+      <version>2.15.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

nbt-injector/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.tr7zw</groupId>
     <artifactId>item-nbt-parent</artifactId>
-    <version>2.15.0</version>
+    <version>2.15.2</version>
   </parent>
   <artifactId>nbt-injector</artifactId>
   <packaging>jar</packaging>
@@ -12,7 +12,7 @@
     <dependency>
       <groupId>de.tr7zw</groupId>
       <artifactId>item-nbt-api</artifactId>
-      <version>2.15.0</version>
+      <version>2.15.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>de.tr7zw</groupId>
   <artifactId>item-nbt-parent</artifactId>
-  <version>2.15.0</version>
+  <version>2.15.2</version>
   <packaging>pom</packaging>
   <inceptionYear>2015</inceptionYear>
   <organization>
@@ -110,7 +110,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.11.2</version>
+        <version>3.11.3</version>
         <configuration>
           <source>8</source>
         </configuration>
@@ -139,7 +139,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>license-maven-plugin</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
         <configuration>
           <licenseName>mit</licenseName>
           <licenseFile>LICENSE</licenseFile>

spigot.bb

@@ -112,7 +112,7 @@ Just use the Plugin as Maven dependency and remember to add "NBTAPI" as dependen
 <dependency>
   <groupId>de.tr7zw</groupId>
   <artifactId>item-nbt-api-plugin</artifactId>
-  <version>2.15.0</version>
+  <version>2.15.2</version>
 </dependency>
 [/CODE]
 [/SPOILER]
@@ -122,7 +122,7 @@ Using this method the API gets copied into your plugin. Server owners don't have
 <dependency>
   <groupId>de.tr7zw</groupId>
   <artifactId>item-nbt-api</artifactId>
-  <version>2.15.0</version>
+  <version>2.15.2</version>
 </dependency>
 ...
     <plugins>

wiki/Using-Gradle.md

@@ -2,7 +2,7 @@ To start using NB-API, you either need to depend on its plugin version, or shade
 
 > [!IMPORTANT]
 > Plugin and shaded versions have different ``artifactId``. Make sure to correctly choose the one you need!
-
+>
 > [!IMPORTANT]
 > Alternative ways of loading the api like Libby are not supported on Discord/Github issues.
 

wiki/Using-Maven.md

@@ -2,7 +2,7 @@ To start using NB-API, you either need to depend on its plugin version, or shade
 
 > [!IMPORTANT]
 > Plugin and shaded versions have different ``artifactId``. Make sure to correctly choose the one you need!
-
+>
 > [!IMPORTANT]
 > Alternative ways of loading the api like Libby are not supported on Discord/Github issues.