2.12.2 release

Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3

item-nbt-api/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>de.tr7zw</groupId>
     <artifactId>item-nbt-parent</artifactId>
-    <version>2.12.0</version>
+    <version>2.12.2</version>
   </parent>
 
   <artifactId>item-nbt-api</artifactId>
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.5.0</version>
+        <version>3.5.1</version>
         <configuration>
           <createDependencyReducedPom>false</createDependencyReducedPom>
           <transformers>

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

@@ -82,7 +82,11 @@ public class NBTReflectionUtil {
      */
     public static Object readNBT(InputStream stream) {
         try {
-            return ReflectionMethod.NBTFILE_READ.run(null, stream);
+            if(MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_20_R3)) {
+                return ReflectionMethod.NBTFILE_READV2.run(null, stream, ReflectionMethod.NBTACCOUNTER_CREATE_UNLIMITED.run(null));
+            } else {
+                return ReflectionMethod.NBTFILE_READ.run(null, stream);
+            }
         } catch (Exception e) {
             try {
                 stream.close();

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

@@ -21,7 +21,7 @@ public enum MinecraftVersion {
     MC1_7_R4(174), MC1_8_R3(183), MC1_9_R1(191), MC1_9_R2(192), MC1_10_R1(1101), MC1_11_R1(1111), MC1_12_R1(1121),
     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(1201, 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);
 
     private static MinecraftVersion version;
     private static Boolean hasGsonSupport;
@@ -36,7 +36,7 @@ public enum MinecraftVersion {
     private static Logger logger = Logger.getLogger("NBTAPI");
 
     // NBT-API Version
-    protected static final String VERSION = "2.12.0";
+    protected static final String VERSION = "2.12.2";
 
     private final int versionId;
     private final boolean mojangMapping;

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

@@ -62,6 +62,7 @@ public enum ClassWrapper {
             "net.minecraft.nbt.NbtUtils"),
     NMS_IBLOCKDATA(PackageWrapper.NMS, "IBlockData", MinecraftVersion.MC1_8_R3, null,
             "net.minecraft.world.level.block.state", "net.minecraft.world.level.block.state.BlockState"),
+    NMS_NBTACCOUNTER(PackageWrapper.NMS, "NBTReadLimiter", MinecraftVersion.MC1_20_R3, null, "net.minecraft.nbt", "net.minecraft.nbt.NbtAccounter"),
     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/MojangToMapping.java

@@ -3,6 +3,7 @@ package de.tr7zw.changeme.nbtapi.utils.nmsmappings;
 import java.util.HashMap;
 import java.util.Map;
 
+import de.tr7zw.changeme.nbtapi.NbtApiException;
 import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
 
 /**
@@ -131,13 +132,33 @@ public class MojangToMapping {
         }
 
     };
+    
+    @SuppressWarnings("serial")
+    private static Map<String, String> MC1_20R3 = new HashMap<String, String>() {
+
+        {
+            putAll(MC1_20R2);
+
+            put("net.minecraft.nbt.NbtIo#readCompressed(java.io.InputStream,net.minecraft.nbt.NbtAccounter)", "a");
+            put("net.minecraft.nbt.NbtAccounter#unlimitedHeap()", "a");
+            put("net.minecraft.world.entity.Entity#getEncodeId()", "bw");
+            put("net.minecraft.world.level.block.entity.BlockEntity#saveWithId()", "p");
+            put("net.minecraft.world.level.block.entity.BlockEntity#getBlockState()", "r");
+        }
+
+    };
+
 
     public static Map<String, String> getMapping() {
         switch (MinecraftVersion.getVersion()) {
+        case MC1_20_R3:
+            return MC1_20R3;
         case MC1_20_R2:
             return MC1_20R2;
         case MC1_20_R1:
             return MC1_20R1;
+        case MC1_19_R3:
+            return MC1_19R2;
         case MC1_19_R2:
             return MC1_19R2;
         case MC1_19_R1:
@@ -146,9 +167,11 @@ public class MojangToMapping {
             return MC1_18R2;
         case MC1_18_R1:
             return MC1_18R1;
+        case UNKNOWN:
+            return MC1_20R2; // assume it's a future version, so try the latest known mappings
         default:
-            return MC1_20R2;// throw new NbtApiException("This version of the NBTAPI is not compatible with
-                            // this server version!");
+            // this should never happen, unless a version is forgotten here(like 1.19R3 which uses the 1.19R2 mappings)
+            throw new NbtApiException("No fitting mapping found for version " + MinecraftVersion.getVersion() + ". This is a bug!");
         }
     }
 

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

@@ -237,8 +237,19 @@ public enum ReflectionMethod {
             new Since(MinecraftVersion.MC1_14_R1, "getSaveID"), new Since(MinecraftVersion.MC1_18_R1, "getEncodeId()")),
 
     NBTFILE_READ(ClassWrapper.NMS_NBTCOMPRESSEDSTREAMTOOLS, new Class[] { InputStream.class },
-            MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "a"),
+            MinecraftVersion.MC1_7_R4, MinecraftVersion.MC1_20_R2, new Since(MinecraftVersion.MC1_7_R4, "a"),
             new Since(MinecraftVersion.MC1_18_R1, "readCompressed(java.io.InputStream)")),
+
+    NBTFILE_READV2(ClassWrapper.NMS_NBTCOMPRESSEDSTREAMTOOLS,
+            new Class[] { InputStream.class, ClassWrapper.NMS_NBTACCOUNTER.getClazz() }, MinecraftVersion.MC1_20_R3,
+            new Since(MinecraftVersion.MC1_20_R3,
+                    "readCompressed(java.io.InputStream,net.minecraft.nbt.NbtAccounter)")),
+    
+    NBTACCOUNTER_CREATE_UNLIMITED(ClassWrapper.NMS_NBTACCOUNTER,
+            new Class[] {}, MinecraftVersion.MC1_20_R3,
+            new Since(MinecraftVersion.MC1_20_R3,
+                    "unlimitedHeap()")),
+    
     NBTFILE_WRITE(ClassWrapper.NMS_NBTCOMPRESSEDSTREAMTOOLS,
             new Class[] { ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), OutputStream.class }, MinecraftVersion.MC1_7_R4,
             new Since(MinecraftVersion.MC1_7_R4, "a"),

item-nbt-plugin/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.tr7zw</groupId>
     <artifactId>item-nbt-parent</artifactId>
-    <version>2.12.0</version>
+    <version>2.12.2</version>
   </parent>
   <artifactId>item-nbt-api-plugin</artifactId>
   <packaging>jar</packaging>
@@ -12,19 +12,19 @@
     <dependency>
       <groupId>de.tr7zw</groupId>
       <artifactId>item-nbt-api</artifactId>
-      <version>2.12.0</version>
+      <version>2.12.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>de.tr7zw</groupId>
       <artifactId>nbt-injector</artifactId>
-      <version>2.12.0</version>
+      <version>2.12.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>de.tr7zw</groupId>
       <artifactId>nbt-data-api</artifactId>
-      <version>2.12.0</version>
+      <version>2.12.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
@@ -39,7 +39,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.5.0</version>
+        <version>3.5.1</version>
         <configuration>
           <createDependencyReducedPom>true</createDependencyReducedPom>
           <relocations>

mappings-parser/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.tr7zw</groupId>
     <artifactId>item-nbt-parent</artifactId>
-    <version>2.12.0</version>
+    <version>2.12.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.12.0</version>
+      <version>2.12.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.20.2.txt");
+        File input = new File("minecraft_server.1.20.4.txt");
         List<String> lines = Files.readAllLines(input.toPath());
 
         Map<String, ClassWrapper> classes = new HashMap<>();

nbt-data-api/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>de.tr7zw</groupId>
     <artifactId>item-nbt-parent</artifactId>
-    <version>2.12.0</version>
+    <version>2.12.2</version>
   </parent>
 
   <artifactId>nbt-data-api</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>de.tr7zw</groupId>
       <artifactId>item-nbt-api</artifactId>
-      <version>2.12.0</version>
+      <version>2.12.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.12.0</version>
+    <version>2.12.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.12.0</version>
+      <version>2.12.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.12.0</version>
+  <version>2.12.2</version>
   <packaging>pom</packaging>
   <inceptionYear>2015</inceptionYear>
   <organization>
@@ -112,7 +112,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.3</version>
         <configuration>
           <source>8</source>
         </configuration>
@@ -141,7 +141,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>license-maven-plugin</artifactId>
-        <version>2.2.0</version>
+        <version>2.3.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.12.0</version>
+  <version>2.12.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.12.0</version>
+  <version>2.12.2</version>
 </dependency>
 ...
     <plugins>