Merge branch 'master' of https://github.com/tr7zw/Item-NBT-API

Release 2.15.4
Merge pull request #339 from tr7zw/dependabot/maven/org.apache.maven.plugins-maven-source-plugin-3.4.0
2026-11-14 21:02:10 -05:00 · 2025-12-09 18:44:38 +01:00 · 2025-12-09 18:44:30 +01:00 · 2025-12-09 18:43:18 +01:00 · 2025-12-09 18:37:52 +01:00 · 2025-12-09 18:36:41 +01:00
10 changed files with 37 additions and 15 deletions
@@ -5,7 +5,7 @@
  <parent>
    <groupId>de.tr7zw</groupId>
    <artifactId>item-nbt-parent</artifactId>
-    <version>2.15.3</version>
+    <version>2.15.4</version>
  </parent>

  <artifactId>item-nbt-api</artifactId>
@@ -32,6 +32,7 @@ public class DataFixerUtil {
    public static final int VERSION1_21R4 = 4323;
    public static final int VERSION1_21R5 = 4435;
    public static final int VERSION1_21R6 = 4554;
+    public static final int VERSION1_21R7 = 4671;
    // 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;
@@ -93,6 +94,9 @@ public class DataFixerUtil {
     * @return
     */
    public static int getCurrentVersion() {
+        if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R7)) {
+            return VERSION1_21R7;
+        }else 
        if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R6)) {
            return VERSION1_21R6;
        }else if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_21_R5)) {
@@ -31,7 +31,7 @@ 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_R5(1215, true), MC1_21_R6(1216, true), MC1_21_R7(1217, true);

    private static MinecraftVersion version;
    private static Boolean hasGsonSupport;
@@ -48,7 +48,7 @@ public enum MinecraftVersion {
    private static Logger logger = Logger.getLogger("NBTAPI");

    // NBT-API Version
-    protected static final String VERSION = "2.15.3";
+    protected static final String VERSION = "2.15.4";

    private final int versionId;
    private final boolean mojangMapping;
@@ -300,9 +300,27 @@ public class MojangToMapping {
        }

    };
+    
+    @SuppressWarnings("serial")
+    private static Map<String, String> MC1_21R7 = new HashMap<String, String>() {
+
+        {
+            putAll(MC1_21R6);
+
+            put("net.minecraft.nbt.NbtAccounter#unlimitedHeap()", "c");
+            put("net.minecraft.server.MinecraftServer#registryAccess()", "bc");
+            put("net.minecraft.world.entity.Entity#getEncodeId()", "ca");
+            put("net.minecraft.util.datafix.fixes.References#ITEM_STACK", "x");
+
+        }
+
+    };
+

    public static Map<String, String> getMapping() {
        switch (MinecraftVersion.getVersion()) {
+        case MC1_21_R7:
+            return MC1_21R7;
        case MC1_21_R6:
            return MC1_21R6;
        case MC1_21_R5:
@@ -4,7 +4,7 @@
  <parent>
    <groupId>de.tr7zw</groupId>
    <artifactId>item-nbt-parent</artifactId>
-    <version>2.15.3</version>
+    <version>2.15.4</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.3</version>
+      <version>2.15.4</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <groupId>de.tr7zw</groupId>
    <artifactId>item-nbt-parent</artifactId>
-    <version>2.15.3</version>
+    <version>2.15.4</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.3</version>
+      <version>2.15.4</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
@@ -5,7 +5,7 @@
  <parent>
    <groupId>de.tr7zw</groupId>
    <artifactId>item-nbt-parent</artifactId>
-    <version>2.15.3</version>
+    <version>2.15.4</version>
  </parent>

  <artifactId>nbt-data-api</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>de.tr7zw</groupId>
      <artifactId>item-nbt-api</artifactId>
-      <version>2.15.3</version>
+      <version>2.15.4</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <groupId>de.tr7zw</groupId>
    <artifactId>item-nbt-parent</artifactId>
-    <version>2.15.3</version>
+    <version>2.15.4</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.3</version>
+      <version>2.15.4</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
@@ -3,7 +3,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>de.tr7zw</groupId>
  <artifactId>item-nbt-parent</artifactId>
-  <version>2.15.3</version>
+  <version>2.15.4</version>
  <packaging>pom</packaging>
  <inceptionYear>2015</inceptionYear>
  <organization>
@@ -97,7 +97,7 @@
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-source-plugin</artifactId>
-        <version>3.3.1</version>
+        <version>3.4.0</version>
        <executions>
          <execution>
            <id>attach-sources</id>
@@ -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.3</version>
+  <version>2.15.4</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.3</version>
+  <version>2.15.4</version>
 </dependency>
 ...
    <plugins>
Author	SHA1	Message	Date
tr7zw	309455ecfc	Merge branch 'master' of https://github.com/tr7zw/Item-NBT-API	2025-12-09 18:44:38 +01:00
tr7zw	22c0b0385b	Release 2.15.4	2025-12-09 18:44:30 +01:00
tr7zw	bc6bd56ce9	Merge pull request #339 from tr7zw/dependabot/maven/org.apache.maven.plugins-maven-source-plugin-3.4.0 Bump org.apache.maven.plugins:maven-source-plugin from 3.3.1 to 3.4.0	2025-12-09 18:43:18 +01:00
tr7zw	fcdf0929f9	Add 1.21.11 support	2025-12-09 18:37:52 +01:00
tr7zw	e1c6ce2575	Start 2.15.4-SNAPSHOT	2025-12-09 18:36:41 +01:00
dependabot[bot]	2fcc1d82ab	Bump org.apache.maven.plugins:maven-source-plugin from 3.3.1 to 3.4.0 Bumps [org.apache.maven.plugins:maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.3.1 to 3.4.0. - [Release notes](https://github.com/apache/maven-source-plugin/releases) - [Commits](https://github.com/apache/maven-source-plugin/compare/maven-source-plugin-3.3.1...maven-source-plugin-3.4.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-source-plugin dependency-version: 3.4.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-12-02 02:01:29 +00:00