1.21 support

Author: Spliterash

.github/workflows/gradle.yml

@@ -18,7 +18,7 @@ jobs:
         with:
           arguments: build
       - name: Upload Build Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: musicbox
           path: |
@@ -31,7 +31,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Download Build Artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: musicbox
           path: build/libs/

build.gradle.kts

@@ -24,7 +24,7 @@ allprojects {
     apply(plugin = "java-library");
     apply(plugin = "io.freefair.lombok")
 
-    version = "2.1.2"
+    version = "2.1.3"
 
     repositories {
         mavenCentral()
@@ -67,4 +67,5 @@ dependencies {
     api(project(":nms:versions:20_2", "reobf"))
     api(project(":nms:versions:20_3", "reobf"))
     api(project(":nms:versions:20_5", "reobf"))
+    api(project(":nms:versions:21", "reobf"))
 }

nms/src/main/java/ru/spliterash/musicbox/minecraft/nms/jukebox/JukeboxFactory.java

@@ -14,7 +14,9 @@ public class JukeboxFactory {
         int iV = NMSUtils.parseMajorVersion(raw);
 
         String className;
-        if (iV == 20) {
+        if (iV == 21) {
+            className = START_PATH + "V21";
+        } else if (iV == 20) {
             switch (raw) {
                 case "1.20":
                 case "1.20.1":

nms/versions/20_5/build.gradle.kts

@@ -4,6 +4,9 @@ plugins {
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
+repositories {
+    maven("https://repo.minebench.de") //kiory fix
+}
 dependencies {
     paperweight.paperDevBundle("1.20.5-R0.1-SNAPSHOT")
 }

nms/versions/21/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+    id("io.papermc.paperweight.userdev")
+}
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+}
+dependencies {
+    paperweight.paperDevBundle("1.21-R0.1-SNAPSHOT")
+}

nms/versions/21/src/main/java/ru/spliterash/musicbox/minecraft/nms/jukebox/versions/V21.java

@@ -0,0 +1,31 @@
+package ru.spliterash.musicbox.minecraft.nms.jukebox.versions;
+
+import net.minecraft.world.level.block.entity.JukeboxBlockEntity;
+import org.bukkit.block.Jukebox;
+import org.bukkit.craftbukkit.block.CraftJukebox;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.inventory.ItemStack;
+import ru.spliterash.musicbox.minecraft.nms.jukebox.IJukebox;
+
+public class V21 implements IJukebox {
+    private final JukeboxBlockEntity tileEntity;
+
+    public V21(Jukebox jukebox) {
+        CraftJukebox craft = (CraftJukebox) jukebox;
+        tileEntity = craft.getTileEntity();
+    }
+
+    public void setJukebox(ItemStack item) {
+        net.minecraft.world.item.ItemStack converted = CraftItemStack.asNMSCopy(item);
+        tileEntity.setSongItemWithoutPlaying(converted, 0);
+
+    }
+
+    public ItemStack getJukebox() {
+        net.minecraft.world.item.ItemStack nmsItem = tileEntity.getItem(0);
+        if (nmsItem.isEmpty())
+            return null;
+
+        return CraftItemStack.asBukkitCopy(nmsItem);
+    }
+}

settings.gradle

@@ -12,4 +12,5 @@ include "nms:versions:19_4"
 include "nms:versions:20_1"
 include "nms:versions:20_2"
 include "nms:versions:20_3"
-include "nms:versions:20_5"
+include "nms:versions:20_5"
+include "nms:versions:21"