Merge pull request #42 from DWCarrot/main

port to 1.21, bump version to 9.4  & reformat package version

Author: Lori3f6

build.gradle.kts

@@ -4,17 +4,17 @@ import java.util.*
 plugins {
     `java-library`
     `maven-publish`
-    id("io.papermc.paperweight.userdev") version "1.5.11"
-    id("xyz.jpenilla.run-paper") version "2.2.3" // Adds runServer and runMojangMappedServer tasks for testing
+    id("io.papermc.paperweight.userdev") version "1.7.1"
+    id("xyz.jpenilla.run-paper") version "2.3.0" // Adds runServer and runMojangMappedServer tasks for testing
 }
 
 // = = =
 
 val pluginName = "NyaaCore"
 val majorVersion = 9
-val minorVersion = 3
+val minorVersion = 4
 
-val paperApiName = "1.20.4-R0.1-SNAPSHOT"
+val paperApiName = "1.21-R0.1-SNAPSHOT"
 
 // = = =
 
@@ -31,11 +31,11 @@ val javaDocDirectory =
 group = "cat.nyaa"
 //archivesBaseName = "${pluginNameUpper}-mc$minecraftVersion"
 version =
-    "$majorVersion.$minorVersion-${getMcVersion(paperApiName)}-b$buildNumber"
+    "$majorVersion.$minorVersion"
 
 java {
-    // Configure the java toolchain. This allows gradle to auto-provision JDK 17 on systems that only have JDK 8 installed for example.
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    // Configure the java toolchain. This allows gradle to auto-provision JDK 21 on systems that only have JDK 8 installed for example.
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
 
 repositories {
@@ -51,18 +51,18 @@ repositories {
 
 dependencies {
     paperweightDevelopmentBundle(paperweight.paperDevBundle(paperApiName))
-    // paperweight.foliaDevBundle("1.20.4-R0.1-SNAPSHOT")
-    // paperweight.devBundle("com.example.paperfork", "1.20.4-R0.1-SNAPSHOT")
-    compileOnly("net.essentialsx:EssentialsX:2.19.6")      // soft dep
-    compileOnly("org.jetbrains:annotations:23.0.0")
+    // paperweight.foliaDevBundle("1.21-R0.1-SNAPSHOT")
+    // paperweight.devBundle("com.example.paperfork", "1.21-R0.1-SNAPSHOT")
+    compileOnly("net.essentialsx:EssentialsX:2.20.1")      // soft dep
+    compileOnly("org.jetbrains:annotations:24.1.0")
     // Testing
-    testImplementation(platform("org.junit:junit-bom:5.9.0"))
+    testImplementation(platform("org.junit:junit-bom:5.10.3"))
     testImplementation("org.junit.jupiter:junit-jupiter")
-    testImplementation("com.github.seeseemelk:MockBukkit-v1.19:2.132.3")
-    testImplementation("org.mockito:mockito-core:4.8.0")
-    testImplementation("org.mockito:mockito-junit-jupiter:4.8.0")
-    testImplementation("org.xerial:sqlite-jdbc:3.39.3.0")
-    testImplementation("ch.vorburger.mariaDB4j:mariaDB4j:2.6.0")
+    testImplementation("com.github.seeseemelk:MockBukkit-v1.21:3.95.1")
+    testImplementation("org.mockito:mockito-core:5.12.0")
+    testImplementation("org.mockito:mockito-junit-jupiter:5.12.0")
+    testImplementation("org.xerial:sqlite-jdbc:3.46.0.0")
+    testImplementation("ch.vorburger.mariaDB4j:mariaDB4j:3.1.0")
 }
 
 publishing {
@@ -110,16 +110,16 @@ tasks {
 
         // Set the release flag. This configures what version bytecode the compiler will emit, as well as what JDK APIs are usable.
         // See https://openjdk.java.net/jeps/247 for more information.
-        options.release.set(17)
+        options.release.set(21)
     }
     javadoc {
         with((options as StandardJavadocDocletOptions)) {
             options.encoding =
                 Charsets.UTF_8.name() // We want UTF-8 for everything
-            links("https://docs.oracle.com/en/java/javase/17/docs/api/")
+            links("https://docs.oracle.com/en/java/javase/21/docs/api/")
             links("https://guava.dev/releases/21.0/api/docs/")
             links("https://ci.md-5.net/job/BungeeCord/ws/chat/target/apidocs/")
-            links("https://jd.papermc.io/paper/1.20/")
+            links("https://jd.papermc.io/paper/1.21/")
             options.locale = "en_US"
             options.encoding = "UTF-8"
             (options as StandardJavadocDocletOptions).addBooleanOption(

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

src/main/java/cat/nyaa/nyaacore/NyaaCoreLoader.java

@@ -53,7 +53,7 @@ public void onEnable() {
             try {
                 serverVersion = SharedConstants.getCurrentVersion().getName();
             } catch (Exception e) {
-                e.printStackTrace();
+                getLogger().severe(e.getMessage());
                 Bukkit.getPluginManager().disablePlugin(this);
             }
             try {

src/main/java/cat/nyaa/nyaacore/utils/ItemStackUtils.java

@@ -14,13 +14,16 @@
 import net.minecraft.util.datafix.DataFixers;
 import net.minecraft.util.datafix.fixes.References;
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.CraftWorld;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 
 import java.io.*;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.zip.Deflater;
 import java.util.zip.DeflaterInputStream;
@@ -38,6 +41,24 @@ public final class ItemStackUtils {
             .maximumWeight(256L * 1024 * 1024).build(); // Hard Coded 256M
     private static NbtAccounter unlimitedNbtAccounter = null;
 
+    private static CraftWorld defaultWorld;
+
+    private static CraftWorld getDefaultWorld() {
+        if (defaultWorld == null) {
+            var worlds = Bukkit.getWorlds();
+            if (!worlds.isEmpty()) {
+                var first = worlds.getFirst();
+                if (first instanceof CraftWorld) {
+                    defaultWorld = (CraftWorld) first;
+                }
+            }
+            if(defaultWorld == null) {
+                throw new IllegalStateException("No world available");
+            }
+        }
+        return defaultWorld;
+    }
+
     static {
         //noinspection deprecation
         currentDataVersion = Bukkit.getUnsafe().getDataVersion();
@@ -51,14 +72,13 @@ public final class ItemStackUtils {
      * @return binary NBT representation of the item stack
      */
     public static byte[] itemToBinary(ItemStack itemStack) throws IOException {
-        net.minecraft.world.item.ItemStack nativeItemStack = CraftItemStack.asNMSCopy(itemStack);
-        CompoundTag CompoundTag = new CompoundTag();
-        nativeItemStack.save(CompoundTag);
-        CompoundTag.putInt(NYAACORE_ITEMSTACK_DATAVERSION_KEY, currentDataVersion);
-
+        net.minecraft.world.item.ItemStack nativeItemStack = CraftItemStack.unwrap(itemStack);
+        CompoundTag tagPrefix = new CompoundTag();
+        tagPrefix.putInt(NYAACORE_ITEMSTACK_DATAVERSION_KEY, currentDataVersion);
+        Tag tag = nativeItemStack.save(getDefaultWorld().getHandle().registryAccess(), tagPrefix);
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         DataOutputStream dos = new DataOutputStream(baos);
-        CompoundTag.write(dos);
+        tag.write(dos);
         byte[] outputByteArray = baos.toByteArray();
         dos.close();
         baos.close();
@@ -72,7 +92,7 @@ public static byte[] itemToBinary(ItemStack itemStack) throws IOException {
      * @param nbt binary item nbt data
      * @return constructed item
      */
-    public static ItemStack itemFromBinary(byte[] nbt) throws ReflectiveOperationException, IOException {
+    public static ItemStack itemFromBinary(byte[] nbt) throws IOException {
         return itemFromBinary(nbt, 0, nbt.length);
     }
 
@@ -103,8 +123,11 @@ public static ItemStack itemFromBinary(byte[] nbt, int offset, int len) throws I
             Dynamic<Tag> out = dataFixer_instance.update(References_ITEM_STACK, dynamicInstance, dataVersion, currentDataVersion);
             reconstructedCompoundTag = (CompoundTag) out.getValue();
         }
-        net.minecraft.world.item.ItemStack reconstructedNativeItemStack = net.minecraft.world.item.ItemStack.of(reconstructedCompoundTag);
-        return CraftItemStack.asBukkitCopy(reconstructedNativeItemStack);
+        Optional<net.minecraft.world.item.ItemStack> reconstructedNativeItemStack = net.minecraft.world.item.ItemStack.parse(getDefaultWorld().getHandle().registryAccess(), reconstructedCompoundTag);
+        if(reconstructedNativeItemStack.isEmpty()) {
+            throw new IOException("Failed to parse item from binary");
+        }
+        return CraftItemStack.asCraftMirror(reconstructedNativeItemStack.get());
     }
 
     private static byte[] compress(byte[] data) {
@@ -195,7 +218,7 @@ public static List<ItemStack> itemsFromBase64(String base64) {
                 dis.readFully(tmp);
                 ret.add(itemFromBinary(tmp));
             }
-        } catch (IOException | ReflectiveOperationException ex) {
+        } catch (IOException ex) {
             throw new RuntimeException(ex);
         }
         itemDeserializerCache.put(base64, ret.stream().map(ItemStack::clone).collect(Collectors.toList()));
@@ -222,12 +245,11 @@ public static ItemStack itemFromBase64(String base64) {
     public static String itemToJson(ItemStack itemStack) throws RuntimeException {
         CompoundTag nmsCompoundTagObj; // This will just be an empty CompoundTag instance to invoke the saveNms method
         net.minecraft.world.item.ItemStack nmsItemStackObj; // This is the net.minecraft.server.ItemStack object received from the asNMSCopy method
-        CompoundTag itemAsJsonObject; // This is the net.minecraft.server.ItemStack after being put through saveNmsItem method
+        Tag itemAsJsonObject; // This is the net.minecraft.server.ItemStack after being put through saveNmsItem method
 
         try {
-            nmsCompoundTagObj = new CompoundTag();
-            nmsItemStackObj = CraftItemStack.asNMSCopy(itemStack);
-            itemAsJsonObject = nmsItemStackObj.save(nmsCompoundTagObj);
+            nmsItemStackObj = CraftItemStack.unwrap(itemStack);
+            itemAsJsonObject = nmsItemStackObj.save(getDefaultWorld().getHandle().registryAccess());
         } catch (Throwable t) {
             throw new RuntimeException("failed to serialize itemstack to nms item", t);
         }