Tag 2.12.3

Bump org.apache.maven.plugins:maven-compiler-plugin from 3.12.1 to 3.13.0

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 - 2021, tr7zw
+Copyright (c) 2015 - 2024, tr7zw
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

item-nbt-api/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>de.tr7zw</groupId>
     <artifactId>item-nbt-parent</artifactId>
-    <version>2.12.2</version>
+    <version>2.12.3</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.1</version>
+        <version>3.5.2</version>
         <configuration>
           <createDependencyReducedPom>false</createDependencyReducedPom>
           <transformers>

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

@@ -1,5 +1,7 @@
 package de.tr7zw.changeme.nbtapi.utils;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -36,11 +38,23 @@ public enum MinecraftVersion {
     private static Logger logger = Logger.getLogger("NBTAPI");
 
     // NBT-API Version
-    protected static final String VERSION = "2.12.2";
+    protected static final String VERSION = "2.12.3";
 
     private final int versionId;
     private final boolean mojangMapping;
 
+    // TODO: not nice
+    @SuppressWarnings("serial")
+    private static final Map<String, MinecraftVersion> VERSION_TO_REVISION = new HashMap<String, MinecraftVersion>() {
+        { 
+            this.put("1.20", MC1_20_R1);
+            this.put("1.20.1",  MC1_20_R1);
+            this.put("1.20.2", MC1_20_R2);
+            this.put("1.20.3", MC1_20_R3);
+            this.put("1.20.4", MC1_20_R3);
+        }
+    };
+
     MinecraftVersion(int versionId) {
         this(versionId, false);
     }
@@ -73,7 +87,11 @@ public enum MinecraftVersion {
      */
     public String getPackageName() {
         if (this == UNKNOWN) {
-            return Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
+            try {
+                return Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
+            } catch (Exception ex) {
+                // ignore, paper without remap, will fail
+            }
         }
         return this.name().replace("MC", "v");
     }
@@ -108,18 +126,22 @@ public enum MinecraftVersion {
         if (version != null) {
             return version;
         }
-        final String ver = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
-        logger.info("[NBTAPI] Found Spigot: " + ver + "! Trying to find NMS support");
         try {
+            final String ver = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
+            logger.info("[NBTAPI] Found Minecraft: " + ver + "! Trying to find NMS support");
             version = MinecraftVersion.valueOf(ver.replace("v", "MC"));
-        } catch (IllegalArgumentException ex) {
-            version = MinecraftVersion.UNKNOWN;
+        } catch (Exception ex) {
+            logger.info("[NBTAPI] Found Minecraft: " + Bukkit.getServer().getBukkitVersion().split("-")[0]
+                    + "! Trying to find NMS support");
+            version = VERSION_TO_REVISION.getOrDefault(Bukkit.getServer().getBukkitVersion().split("-")[0],
+                    MinecraftVersion.UNKNOWN);
         }
         if (version != UNKNOWN) {
             logger.info("[NBTAPI] NMS support '" + version.name() + "' loaded!");
         } else {
-            logger.warning("[NBTAPI] This Server-Version(" + ver + ") is not supported by this NBT-API Version("
-                    + VERSION + ") located in " + VersionChecker.getPlugin()
+            logger.warning("[NBTAPI] This Server-Version(" + Bukkit.getServer().getBukkitVersion()
+                    + ") is not supported by this NBT-API Version(" + VERSION + ") located in "
+                    + VersionChecker.getPlugin()
                     + ". The NBT-API will try to work as good as it can! Some functions may not work!");
         }
         init();
@@ -245,8 +267,7 @@ public enum MinecraftVersion {
             return isFoliaPresent;
         }
         try {
-            logger.info("[NBTAPI] Found Folia: "
-                    + Class.forName("io.papermc.paper.threadedregions.RegionizedServer"));
+            logger.info("[NBTAPI] Found Folia: " + Class.forName("io.papermc.paper.threadedregions.RegionizedServer"));
             isFoliaPresent = true;
         } catch (Exception ex) {
             isFoliaPresent = false;

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

@@ -4,6 +4,8 @@ import static de.tr7zw.changeme.nbtapi.utils.MinecraftVersion.getLogger;
 
 import java.util.logging.Level;
 
+import org.bukkit.Bukkit;
+
 import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
 
 /**
@@ -62,7 +64,8 @@ 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"),
+    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;
@@ -100,7 +103,11 @@ public enum ClassWrapper {
             } else if (MinecraftVersion.isForgePresent() && MinecraftVersion.getVersion() == MinecraftVersion.MC1_7_R4
                     && Forge1710Mappings.getClassMappings().get(this.name()) != null) {
                 clazz = Class.forName(clazzName = Forge1710Mappings.getClassMappings().get(this.name()));
+            } else if (packageId == PackageWrapper.CRAFTBUKKIT) {
+                // this also works for un-remapped Paper 1.20+
+                clazz = Class.forName(Bukkit.getServer().getClass().getPackage().getName() + "." + clazzName);
             } else {
+                // fallback for old versions pre mojmap and in the nms package
                 String version = MinecraftVersion.getVersion().getPackageName();
                 clazz = Class.forName(packageId.getUri() + "." + version + "." + clazzName);
             }

item-nbt-plugin/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.tr7zw</groupId>
     <artifactId>item-nbt-parent</artifactId>
-    <version>2.12.2</version>
+    <version>2.12.3</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.2</version>
+      <version>2.12.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>de.tr7zw</groupId>
       <artifactId>nbt-injector</artifactId>
-      <version>2.12.2</version>
+      <version>2.12.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>de.tr7zw</groupId>
       <artifactId>nbt-data-api</artifactId>
-      <version>2.12.2</version>
+      <version>2.12.3</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.1</version>
+        <version>3.5.2</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.2</version>
+    <version>2.12.3</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.2</version>
+      <version>2.12.3</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.12.2</version>
+    <version>2.12.3</version>
   </parent>
 
   <artifactId>nbt-data-api</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>de.tr7zw</groupId>
       <artifactId>item-nbt-api</artifactId>
-      <version>2.12.2</version>
+      <version>2.12.3</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.2</version>
+    <version>2.12.3</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.2</version>
+      <version>2.12.3</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.2</version>
+  <version>2.12.3</version>
   <packaging>pom</packaging>
   <inceptionYear>2015</inceptionYear>
   <organization>
@@ -90,7 +90,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.11.0</version>
+        <version>3.13.0</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
@@ -141,7 +141,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>license-maven-plugin</artifactId>
-        <version>2.3.0</version>
+        <version>2.4.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.2</version>
+  <version>2.12.3</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.2</version>
+  <version>2.12.3</version>
 </dependency>
 ...
     <plugins>

wiki/Converting-Minecraft-Objects-to-NBT-and-Strings.md

@@ -32,11 +32,11 @@ ReadWriteNBT nbt = NBT.parseNBT(json);
 
 ```java
 // Items
-ItemStack itemStack = NBT.nbtToItemStack(nbt);
-ItemStack[] itemStacks = NBT.nbtToItemStackArray(nbt);
+ItemStack itemStack = NBT.itemStackFromNBT(nbt);
+ItemStack[] itemStacks = NBT.itemStackArrayFromNBT(nbt);
 // Entity/Tiles
 In general "new NBTEntity(entity).mergeCompound(nbt)", but you might want to remove some data from the nbt first like the Location, uuid and entityId
 // Gameprofile
-GameProfile profile = NBT.nbtToGameProfile(nbt);
+GameProfile profile = NBT.gameProfileFromNBT(nbt);
 ```