Finish update to 1.21.4

saicone · Dec 4, 2024 · 767591f · 767591f
1 parent d0eb1aa
commit 767591f
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -59,7 +59,7 @@ subprojects {
 }
 
 dependencies {
-    compileOnly 'org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.21.4-R0.1-SNAPSHOT'
     compileOnly 'it.unimi.dsi:fastutil:8.5.12'
     compileOnly('com.mojang:datafixerupper:4.1.27') { transitive = false }
 

diff --git a/rtag-block/build.gradle b/rtag-block/build.gradle
@@ -1,3 +1,3 @@
 dependencies {
-    compileOnly 'org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.21.4-R0.1-SNAPSHOT'
 }
diff --git a/rtag-entity/build.gradle b/rtag-entity/build.gradle
@@ -1,3 +1,3 @@
 dependencies {
-    compileOnly 'org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.21.4-R0.1-SNAPSHOT'
 }
diff --git a/rtag-item/build.gradle b/rtag-item/build.gradle
@@ -3,7 +3,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.21.4-R0.1-SNAPSHOT'
     compileOnly 'com.mojang:authlib:1.5.26' // 3.11.50
     compileOnly('com.mojang:datafixerupper:4.1.27') { transitive = false }
 }
diff --git a/rtag-item/src/main/java/com/saicone/rtag/item/ItemObject.java b/rtag-item/src/main/java/com/saicone/rtag/item/ItemObject.java
@@ -112,7 +112,11 @@ public class ItemObject {
                         registry$item = "g";
                         if (ServerInstance.VERSION >= 21.02f) {
                             copy = "v";
-                            setItem = "o";
+                            if (ServerInstance.VERSION >= 21.03f) {
+                                setItem = "p";
+                            } else {
+                                setItem = "o";
+                            }
                         }
                     }
                 } else {

diff --git a/rtag-plugin/build.gradle b/rtag-plugin/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation project(':rtag-entity')
     implementation project(':rtag-item')
 
-    compileOnly 'org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.21.4-R0.1-SNAPSHOT'
 }
 
 jar {

diff --git a/src/main/java/com/saicone/rtag/data/ComponentType.java b/src/main/java/com/saicone/rtag/data/ComponentType.java
@@ -35,7 +35,7 @@ public class ComponentType {
     private static final Map<String, Codec<Object>> CODECS = new HashMap<>();
 
     /**
-     * DynamicOpsNBT public instance from Minecraft code.
+     * NbtOps public instance from Minecraft code.
      */
     @ApiStatus.Experimental
     public static final DynamicOps<Object> NBT_OPS;