Compare commits

..
6 Commits
Author SHA1 Message Date
tr7zw 5bdddc134a Release 2.16.1 2026-09-17 20:06:29 +02:00
tr7zw 733b871c09 Merge pull request #359 from tr7zw/dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.16.0
Bump org.apache.maven.plugins:maven-compiler-plugin from 3.15.0 to 3.16.0
2026-09-17 20:04:44 +02:00
tr7zw bc48239fdd Start 2.16.1-SNAPSHOT 2026-09-16 18:52:12 +02:00
tr7zw f182204b2f Merge pull request #360 from NriotHrreion/fix/paper-26.3-as-bukkit-mirror
Add Minecraft 26.3 item stack compatibility
2026-09-16 18:51:06 +02:00
NriotHrreion a424ce1e85 Add Minecraft 26.3 item stack compatibility 2026-09-16 14:44:15 +08:00
dependabot[bot] c881566c14 Bump org.apache.maven.plugins:maven-compiler-plugin
Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.15.0 to 3.16.0.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.15.0...maven-compiler-plugin-3.16.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-compiler-plugin
  dependency-version: 3.16.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-09-02 23:12:40 +00:00
10 changed files with 33 additions and 17 deletions

No files matched your search

+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>de.tr7zw</groupId>
<artifactId>item-nbt-parent</artifactId>
<version>2.16.0</version>
<version>2.16.1</version>
</parent>
<artifactId>item-nbt-api</artifactId>
@@ -35,6 +35,7 @@ public class DataFixerUtil {
public static final int VERSION1_21R7 = 4671;
public static final int VERSION_26_1 = 4786;
public static final int VERSION_26_2 = 4903;
public static final int VERSION_26_3 = 5023;
// 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;
@@ -103,7 +104,9 @@ public class DataFixerUtil {
* @return
*/
public static int getCurrentVersion() {
if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC26_2)) {
if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC26_3)) {
return VERSION_26_3;
} else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC26_2)) {
return VERSION_26_2;
} else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC26_1)) {
return VERSION_26_1;
@@ -32,7 +32,8 @@ public enum MinecraftVersion {
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_21_R5(1215, true), MC1_21_R6(1216, true), MC1_21_R7(1217, true), MC26_1(260100, true), MC26_2(260200, true);
MC1_21_R5(1215, true), MC1_21_R6(1216, true), MC1_21_R7(1217, true), MC26_1(260100, true), MC26_2(260200, true),
MC26_3(260300, true);
private static MinecraftVersion version;
private static Boolean hasGsonSupport;
@@ -49,7 +50,7 @@ public enum MinecraftVersion {
private static Logger logger = Logger.getLogger("NBTAPI");
// NBT-API Version
protected static final String VERSION = "2.16.0";
protected static final String VERSION = "2.16.1";
private final int versionId;
private final boolean mojangMapping;
@@ -78,6 +79,7 @@ public enum MinecraftVersion {
this.put("1.21.11", MC1_21_R7);
this.put("26.1", MC26_1);
this.put("26.2", MC26_2);
this.put("26.3", MC26_3);
}
};
@@ -175,7 +175,8 @@ public enum ReflectionMethod {
ITEMSTACK_NMSCOPY(ClassWrapper.CRAFT_ITEMSTACK, new Class[] { ItemStack.class }, MinecraftVersion.MC1_7_R4,
new Since(MinecraftVersion.MC1_7_R4, "asNMSCopy")),
ITEMSTACK_BUKKITMIRROR(ClassWrapper.CRAFT_ITEMSTACK, new Class[] { ClassWrapper.NMS_ITEMSTACK.getClazz() },
MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "asCraftMirror")),
MinecraftVersion.MC1_7_R4,
new Since(MinecraftVersion.MC1_7_R4, resolveItemStackBukkitMirrorMethodName())),
CRAFT_WORLD_GET_HANDLE(ClassWrapper.CRAFT_WORLD, new Class[] {}, MinecraftVersion.MC1_7_R4,
new Since(MinecraftVersion.MC1_7_R4, "getHandle")),
@@ -413,6 +414,16 @@ public enum ReflectionMethod {
this(targetClass, args, addedSince, null, methodnames);
}
private static String resolveItemStackBukkitMirrorMethodName() {
try {
ClassWrapper.CRAFT_ITEMSTACK.getClazz().getDeclaredMethod("asCraftMirror",
ClassWrapper.NMS_ITEMSTACK.getClazz());
return "asCraftMirror";
} catch (NullPointerException | NoSuchMethodException | SecurityException ignored) {
return "asBukkitMirror";
}
}
/**
* Runs the method on a given target object using the given args.
*
+2 -2
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>de.tr7zw</groupId>
<artifactId>item-nbt-parent</artifactId>
<version>2.16.0</version>
<version>2.16.1</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.16.0</version>
<version>2.16.1</version>
<scope>compile</scope>
</dependency>
<dependency>
+2 -2
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>de.tr7zw</groupId>
<artifactId>item-nbt-parent</artifactId>
<version>2.16.0</version>
<version>2.16.1</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.16.0</version>
<version>2.16.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
+2 -2
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>de.tr7zw</groupId>
<artifactId>item-nbt-parent</artifactId>
<version>2.16.0</version>
<version>2.16.1</version>
</parent>
<artifactId>nbt-data-api</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>de.tr7zw</groupId>
<artifactId>item-nbt-api</artifactId>
<version>2.16.0</version>
<version>2.16.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
+2 -2
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>de.tr7zw</groupId>
<artifactId>item-nbt-parent</artifactId>
<version>2.16.0</version>
<version>2.16.1</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.16.0</version>
<version>2.16.1</version>
<scope>compile</scope>
</dependency>
<dependency>
+2 -2
View File
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.tr7zw</groupId>
<artifactId>item-nbt-parent</artifactId>
<version>2.16.0</version>
<version>2.16.1</version>
<packaging>pom</packaging>
<inceptionYear>2015</inceptionYear>
<organization>
@@ -88,7 +88,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.15.0</version>
<version>3.16.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
+2 -2
View File
@@ -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.16.0</version>
<version>2.16.1</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.16.0</version>
<version>2.16.1</version>
</dependency>
...
<plugins>