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.1</version>
+    <version>2.15.2</version>
   </parent>
 
   <artifactId>item-nbt-api</artifactId>

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

@@ -15,23 +15,53 @@ 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;
+    @Deprecated
     public static final int VERSION1_21_4 = 4323;
+    @Deprecated
     public static final int VERSION1_21_5 = 4435;
 
     @SuppressWarnings("unchecked")
@@ -63,33 +93,33 @@ public class DataFixerUtil {
      */
     public static int getCurrentVersion() {
         if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R5)) {
-            return VERSION1_21_5;
+            return VERSION1_21R5;
         } else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R4)) {
-            return VERSION1_21_4;
+            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/MinecraftVersion.java

@@ -48,7 +48,7 @@ public enum MinecraftVersion {
     private static Logger logger = Logger.getLogger("NBTAPI");
 
     // NBT-API Version
-    protected static final String VERSION = "2.15.1";
+    protected static final String VERSION = "2.15.2";
 
     private final int versionId;
     private final boolean mojangMapping;
@@ -72,6 +72,7 @@ public enum MinecraftVersion {
             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);
         }
     };
 

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

@@ -238,6 +238,7 @@ 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");
         }
 
     };

item-nbt-plugin/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.tr7zw</groupId>
     <artifactId>item-nbt-parent</artifactId>
-    <version>2.15.1</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.1</version>
+      <version>2.15.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

mappings-parser/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.tr7zw</groupId>
     <artifactId>item-nbt-parent</artifactId>
-    <version>2.15.1</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.1</version>
+      <version>2.15.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

nbt-data-api/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>de.tr7zw</groupId>
     <artifactId>item-nbt-parent</artifactId>
-    <version>2.15.1</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.1</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.1</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.1</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.1</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>

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.1</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.1</version>
+  <version>2.15.2</version>
 </dependency>
 ...
     <plugins>