1.21.2(3) support

Author: Spliterash

build.gradle.kts

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

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

@@ -15,7 +15,19 @@ public class JukeboxFactory {
 
         String className;
         if (iV == 21) {
-            className = START_PATH + "V21";
+            switch (raw) {
+                case "1.21":
+                case "1.21.1":
+                    className = START_PATH + "V21";
+                    break;
+                case "1.21.2":
+                case "1.21.3":
+                    className = START_PATH + "V21_2";
+                    break;
+                default:
+                    className = null;
+                    break;
+            }
         } else if (iV == 20) {
             switch (raw) {
                 case "1.20":
@@ -63,15 +75,21 @@ else if (iV == 12)
 
         if (className == null)
             throw new IllegalArgumentException("Unsupported version: " + raw);
-
+        Class<? extends IJukebox> tmpClass = null;
         try {
             //noinspection unchecked
-            clazz = (Class<? extends IJukebox>) Class.forName(className);
+            tmpClass = (Class<? extends IJukebox>) Class.forName(className);
         } catch (ClassNotFoundException e) {
             throw new RuntimeException(e);
+        } finally {
+            clazz = tmpClass;
         }
     }
 
+    public static boolean jukeboxAvailable() {
+        return clazz != null;
+    }
+
     public static IJukebox getJukebox(Jukebox jukebox) {
         try {
             return clazz.getConstructor(Jukebox.class).newInstance(jukebox);

nms/versions/21_2/build.gradle.kts

@@ -0,0 +1,10 @@
+plugins {
+    id("io.papermc.paperweight.userdev")
+}
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+}
+dependencies {
+    // 1.21.2 нет, но нарушать порядок версий у себя я не хочу, так что давайте представим что тут 1.21.2
+    paperweight.paperDevBundle("1.21.3-R0.1-SNAPSHOT")
+}

nms/versions/21_2/src/main/java/ru/spliterash/musicbox/minecraft/nms/jukebox/versions/V21_2.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_2 implements IJukebox {
+    private final JukeboxBlockEntity tileEntity;
+
+    public V21_2(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);
+    }
+}

plugin/src/main/java/ru/spliterash/musicbox/Lang.java

@@ -523,6 +523,10 @@ public enum Lang {
     SILENT_MODE_RESPONSE(
             "&6Set &b{player}&6 silent mode to {state}",
             "&6Тихий режим установлен в состояние {state}&6 для игрока &b{player}"
+    ),
+    JUKEBOX_NOT_SUPPORTED(
+            "&cCurrent version not support for jukebox play",
+            "&cТекущая версия плагина не поддерживает воспроизведение пластинок"
     );
     /**
      * Оригинальные переводы

plugin/src/main/java/ru/spliterash/musicbox/customPlayers/objects/jukebox/JukeboxPlayer.java

@@ -9,6 +9,7 @@
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
+import ru.spliterash.musicbox.Lang;
 import ru.spliterash.musicbox.MusicBox;
 import ru.spliterash.musicbox.customPlayers.abstracts.AbstractBlockPlayer;
 import ru.spliterash.musicbox.customPlayers.interfaces.IPlayList;
@@ -45,12 +46,15 @@ public static void onJukeboxClick(Jukebox jukebox, ItemStack clickedItem, Player
         if (song == null) {
             return;
         }
+        if (JukeboxFactory.jukeboxAvailable()) {
+            e.setCancelled(true);
+            e.getPlayer().getInventory().setItemInMainHand(null);
+            JukeboxFactory.getJukebox(jukebox).setJukebox(clickedItem);
 
-        e.setCancelled(true);
-        e.getPlayer().getInventory().setItemInMainHand(null);
-        JukeboxFactory.getJukebox(jukebox).setJukebox(clickedItem);
-
-        createNew(jukebox);
+            createNew(jukebox);
+        } else {
+            e.getPlayer().sendMessage(Lang.JUKEBOX_NOT_SUPPORTED.toString());
+        }
     }
 
     private static void createNew(Jukebox jukebox) {
@@ -84,7 +88,7 @@ public static void onRedstone(Jukebox box, Block source, int power) {
             JukeboxPlayer player = AbstractBlockPlayer.findByLocation(box.getLocation());
             if (player != null) {
                 player.getMusicBoxModel().startNext();
-            } else
+            } else if (JukeboxFactory.jukeboxAvailable())
                 createNew(box);
         }
     }

settings.gradle

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