(not) 1.21.1 support

Author: acrylic-style

api/src/main/java/net/azisaba/loreeditor/api/item/ItemStack.java

@@ -38,4 +38,7 @@ public interface ItemStack {
      * @return the amount
      */
     int getCount();
+
+    @NotNull
+    ItemStack copy();
 }

api/src/main/java/net/azisaba/loreeditor/api/util/ReflectionUtil.java

@@ -25,6 +25,10 @@ public static boolean isModernNMS() {
             case "1.20.1-R0.1-SNAPSHOT":
             case "1.20.2-R0.1-SNAPSHOT":
                 return "v1_20";
+            case "1.21.1-R0.1-SNAPSHOT":
+            case "1.21.2-R0.1-SNAPSHOT":
+            case "1.21.3-R0.1-SNAPSHOT":
+                return "v1_21_1";
         }
         return Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
     }

build.gradle.kts

@@ -2,18 +2,19 @@ plugins {
     java
     `java-library`
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("com.gradleup.shadow") version "8.3.3"
+    id("io.papermc.paperweight.userdev") version "1.7.4" apply false
 }
 
 allprojects {
     group = "net.azisaba.loreeditor"
-    version = "1.1.0-SNAPSHOT"
+    version = "1.2.0"
 
     apply {
         plugin("java")
         plugin("java-library")
         plugin("maven-publish")
-        plugin("com.github.johnrengelman.shadow")
+        plugin("com.gradleup.shadow")
     }
 
     java {
@@ -47,6 +48,11 @@ allprojects {
     repositories {
         mavenCentral()
         maven { url = uri("https://hub.spigotmc.org/nexus/content/repositories/public/") }
+        maven("https://repo.papermc.io/repository/maven-public/") {
+            content {
+                includeGroup("io.papermc.paper")
+            }
+        }
         maven { url = uri("https://repo.azisaba.net/repository/maven-public/") }
         maven { url = uri("https://libraries.minecraft.net/") }
         if (properties["azisabaNmsUsername"] != null && properties["azisabaNmsPassword"] != null) {

common/src/main/java/net/azisaba/loreeditor/common/network/PacketPreHandler.java

@@ -53,9 +53,11 @@ public void channelRead(@NotNull ChannelHandlerContext ctx, @NotNull Object msg)
             if (msg.getClass().getSimpleName().contains("SetCreativeSlot")) {
                 ServerboundSetCreativeSlot packet = ServerboundSetCreativeSlot.getInstance(msg);
                 reverseProcessItemStack(packet.getItem());
+                System.out.println("Reverse processed item (creative slot): " + packet.getItem());
             } else if (msg.getClass().getSimpleName().contains("WindowClick")) {
                 ServerboundClickContainerSlot packet = ServerboundClickContainerSlot.getInstance(msg);
                 reverseProcessItemStack(packet.getItem());
+                System.out.println("Reverse processed item (window click): " + packet.getItem());
             } else if (msg.getClass().getSimpleName().contains("CloseWindow")) {
                 if (player.getOpenInventory().getType() == InventoryType.MERCHANT) {
                     // re-add lore after trading
@@ -72,7 +74,7 @@ public void channelRead(@NotNull ChannelHandlerContext ctx, @NotNull Object msg)
     public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
         // server -> client
         try {
-            if (msg.getClass().getSimpleName().contains("WindowItems")) {
+            if (msg.getClass().getSimpleName().contains("WindowItems") || msg.getClass().getSimpleName().contains("ContainerSetContent")) {
                 if (player.getOpenInventory().getType() != InventoryType.MERCHANT) {
                     ClientboundWindowItems packet = ClientboundWindowItems.getInstance(msg);
                     packet.getItems().forEach(i -> {
@@ -89,7 +91,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
                     ClientboundSetSlot packet = ClientboundSetSlot.getInstance(msg);
                     PROCESS_ITEM_PERF_COUNTER.recordStart();
                     try {
-                        processItemStack(packet.getItem());
+//                        processItemStack(packet.getItem());
                     } finally {
                         PROCESS_ITEM_PERF_COUNTER.recordEnd();
                     }
@@ -108,6 +110,7 @@ public void processItemStack(@Nullable ItemStack item) {
         if (tag == null) {
             tag = CompoundTag.getInstance(null).constructor();
         }
+        System.out.println("Processing item: " + item + " with tag: " + tag);
         if (tag.hasKeyOfType("lore_editor", 10)) {
             return;
         }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

plugin/build.gradle.kts

@@ -4,6 +4,7 @@ dependencies {
     api(project(":v1_16_R3"))
     api(project(":v1_19_R3"))
     api(project(":v1_20"))
+    api(project(":v1_21_1"))
 }
 
 tasks {

settings.gradle.kts

@@ -6,3 +6,4 @@ include("v1_15_R1")
 include("v1_16_R3")
 include("v1_19_R3")
 include("v1_20")
+include("v1_21_1")

v1_15_R1/src/main/java/net/azisaba/loreeditor/v1_15_R1/item/ItemStackImpl.java

@@ -49,4 +49,9 @@ public void setTag(@Nullable CompoundTag tag) {
     public int getCount() {
         return handle.getCount();
     }
+
+    @Override
+    public @NotNull ItemStack copy() {
+        return new ItemStackImpl(handle.cloneItemStack());
+    }
 }

v1_16_R3/src/main/java/net/azisaba/loreeditor/v1_16_R3/item/ItemStackImpl.java

@@ -49,4 +49,9 @@ public void setTag(@Nullable CompoundTag tag) {
     public int getCount() {
         return handle.getCount();
     }
+
+    @Override
+    public @NotNull ItemStack copy() {
+        return new ItemStackImpl(handle.cloneItemStack());
+    }
 }

v1_19_R3/src/main/java/net/azisaba/loreeditor/v1_19_R3/item/ItemStackImpl.java

@@ -49,4 +49,9 @@ public void setTag(@Nullable CompoundTag tag) {
     public int getCount() {
         return handle.K(); // getCount (probably)
     }
+
+    @Override
+    public @NotNull ItemStack copy() {
+        return new ItemStackImpl(handle.o());
+    }
 }