Real 1.20.6 release

Spliterash · Spliterash · commit 402095fe4cd0 · 2024-06-12T10:14:47.000+03:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,7 +24,7 @@ allprojects {
     apply(plugin = "java-library");
     apply(plugin = "io.freefair.lombok")
 
-    version = "2.1.1"
+    version = "2.1.2"
 
     repositories {
         mavenCentral()
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
     compileOnly("com.github.MilkBowl:VaultAPI:1.7")
     compileOnly("com.github.koca2000:NoteBlockAPI:1.6.1")
 
-    api("com.github.cryptomorin:XSeries:9.8.0")
+    api("com.github.cryptomorin:XSeries:11.0.0")
     api("io.github.bananapuncher714:nbteditor:7.19.0")
     api("org.bstats:bstats-bukkit:3.0.2")
 
diff --git a/plugin/src/main/java/ru/spliterash/musicbox/Lang.java b/plugin/src/main/java/ru/spliterash/musicbox/Lang.java
@@ -37,9 +37,6 @@ public enum Lang {
                     "&7Оригинальный автор: &b{original_author}"
             )
     ),
-    NEW_INSTRUMENT(
-            "&cThis song contains instrument, available in 1.14",
-            "&cЭта музыка содержит инструменты, доступные только в 1.14"),
     GUI_TITLE("&l&3MusicBox &8{container} &0{page}&7/&0{last_page}"),
     FOLDER_FORMAT("&e{folder}"),
     CURRENT_PLAYNING(
diff --git a/plugin/src/main/java/ru/spliterash/musicbox/customPlayers/objects/jukebox/JukeboxPlayer.java b/plugin/src/main/java/ru/spliterash/musicbox/customPlayers/objects/jukebox/JukeboxPlayer.java
@@ -43,8 +43,6 @@ public static void onJukeboxClick(Jukebox jukebox, ItemStack clickedItem, Player
             return;
         MusicBoxSong song = MusicBoxSongManager.findByItem(clickedItem).orElse(null);
         if (song == null) {
-            if (MusicBoxSongManager.tryReplaceLegacyItem(e.getPlayer(), clickedItem))
-                e.setCancelled(true);
             return;
         }
 
diff --git a/plugin/src/main/java/ru/spliterash/musicbox/song/MusicBoxSong.java b/plugin/src/main/java/ru/spliterash/musicbox/song/MusicBoxSong.java
@@ -3,12 +3,13 @@
 import com.cryptomorin.xseries.XMaterial;
 import com.xxmicloxx.NoteBlockAPI.model.Song;
 import com.xxmicloxx.NoteBlockAPI.utils.NBSDecoder;
-import io.github.bananapuncher714.nbteditor.NBTEditor;
 import lombok.Getter;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import ru.spliterash.musicbox.Lang;
 import ru.spliterash.musicbox.utils.*;
+import ru.spliterash.musicbox.utils.nbt.NBTFactory;
+import ru.spliterash.musicbox.utils.nbt.NbtConstants;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
@@ -27,14 +28,12 @@ public class MusicBoxSong {
     private final short length;
     private final float speed;
     private transient WeakReference<Song> songReference;
-    private final boolean newInstruments;
     private final int hash;
 
     MusicBoxSong(File songFile, MusicBoxSongContainer container) {
         this.file = songFile;
         this.container = container;
         Song song = getSong();
-        this.newInstruments = SongUtils.containsNewInstrument(song);
         this.name = StringUtils.t(StringUtils.getOrEmpty(song.getTitle(), () -> FileUtils.getFilename(file.getName())));
         this.length = song.getLength();
         this.speed = song.getSpeed();
@@ -43,7 +42,7 @@ public class MusicBoxSong {
         hoverMap.put("{length}", time);
         hoverMap.put("{author}", song.getAuthor());
         hoverMap.put("{original_author}", song.getOriginalAuthor());
-        hoverMap.put("{name}",getName());
+        hoverMap.put("{name}", getName());
     }
 
     public int getDuration() {
@@ -67,13 +66,10 @@ public ItemStack getSongStack(XMaterial material, String itemName, List<String>
         ItemMeta meta = stack.getItemMeta();
         meta.setDisplayName(itemName);
         List<String> list = ArrayUtils.replaceOrRemove(Lang.SONG_LORE.toList(), hoverMap);
-        if (newInstruments) {
-            list.add(Lang.NEW_INSTRUMENT.toString());
-        }
         list.addAll(extraLines);
         meta.setLore(list);
         stack.setItemMeta(meta);
-        stack = NBTEditor.set(stack, getHash(), MusicBoxSongManager.NBT_NAME);
+        stack = NBTFactory.NBT_HANDLER.setNbt(stack, NbtConstants.NBT_NAME, getHash());
         if (glow)
             stack = ItemUtils.glow(stack);
         return stack;
diff --git a/plugin/src/main/java/ru/spliterash/musicbox/song/MusicBoxSongManager.java b/plugin/src/main/java/ru/spliterash/musicbox/song/MusicBoxSongManager.java
@@ -1,16 +1,15 @@
 package ru.spliterash.musicbox.song;
 
-import io.github.bananapuncher714.nbteditor.NBTEditor;
 import lombok.Getter;
 import lombok.experimental.UtilityClass;
-import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import ru.spliterash.musicbox.Lang;
-import ru.spliterash.musicbox.song.songContainers.types.SongContainer;
 import ru.spliterash.musicbox.song.songContainers.SongContainerFactory;
 import ru.spliterash.musicbox.song.songContainers.factory.FolderContainerFactory;
 import ru.spliterash.musicbox.song.songContainers.factory.ListContainerFactory;
 import ru.spliterash.musicbox.song.songContainers.factory.SingletonContainerFactory;
+import ru.spliterash.musicbox.song.songContainers.types.SongContainer;
+import ru.spliterash.musicbox.utils.nbt.NBTFactory;
+import ru.spliterash.musicbox.utils.nbt.NbtConstants;
 
 import java.io.File;
 import java.util.*;
@@ -20,10 +19,6 @@
 
 public class MusicBoxSongManager {
     public final String MASTER_CONTAINER = "MASTER";
-    /**
-     * NBT тег чтобы определить является ли пластинка кастомной
-     */
-    public final String NBT_NAME = "musicBoxSongHash";
     private final Set<SongContainerFactory<?>> factorySet = new HashSet<>();
     @Getter
     private final SongContainer masterContainer = new MasterContainer();
@@ -82,7 +77,7 @@ public Optional<MusicBoxSong> findSongByHash(int hash) {
     public Optional<MusicBoxSong> findByItem(ItemStack stack) {
         if (stack == null)
             return Optional.empty();
-        int hash = NBTEditor.getInt(stack, NBT_NAME);
+        int hash = NBTFactory.NBT_HANDLER.getNbt(stack, NbtConstants.NBT_NAME);
         if (hash != 0)
             return findSongByHash(hash);
         else
@@ -93,25 +88,6 @@ public Optional<MusicBoxSongContainer> findContainerById(int id) {
         return Optional.of(rootContainer.findById(id));
     }
 
-    public boolean tryReplaceLegacyItem(Player player, ItemStack stack) {
-        if (stack == null)
-            return false;
-        String musicBoxLegacyTagValue = NBTEditor.getString(stack, "musicbox");
-        if (musicBoxLegacyTagValue == null)
-            return false;
-        MusicBoxSong song = findByName(musicBoxLegacyTagValue).orElse(null);
-        if (song == null) {
-            player.sendMessage(Lang.LEGACY_DISC_NOT_FOUND.toString("{song}", musicBoxLegacyTagValue));
-        } else {
-            player.getInventory().remove(stack);
-            player.getInventory().addItem(song.getSongStack());
-            player.sendMessage(Lang.LEGACY_DISC_REPLACE.toString());
-        }
-        return true;
-    }
-
-    // Ломбук не умеет на лету обрабатывать UtilityClass
-
     /**
      * Имплементация контейнера, содержащая всё что только есть
      */
diff --git a/plugin/src/main/java/ru/spliterash/musicbox/utils/ItemUtils.java b/plugin/src/main/java/ru/spliterash/musicbox/utils/ItemUtils.java
@@ -2,7 +2,6 @@
 
 import com.cryptomorin.xseries.XEnchantment;
 import com.cryptomorin.xseries.XMaterial;
-import io.github.bananapuncher714.nbteditor.NBTEditor;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
@@ -20,7 +19,7 @@
 
 @UtilityClass
 public class ItemUtils {
-    private final Enchantment enchantment = XEnchantment.PROTECTION_EXPLOSIONS.getEnchant();
+    private final Enchantment enchantment = XEnchantment.BLAST_PROTECTION.getEnchant();
 
     public ItemStack glow(ItemStack stack) {
         ItemMeta meta = stack.getItemMeta();
diff --git a/plugin/src/main/java/ru/spliterash/musicbox/utils/nbt/BukkitNbtHandler.java b/plugin/src/main/java/ru/spliterash/musicbox/utils/nbt/BukkitNbtHandler.java
@@ -0,0 +1,31 @@
+package ru.spliterash.musicbox.utils.nbt;
+
+import org.bukkit.NamespacedKey;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.tags.ItemTagType;
+import org.jetbrains.annotations.Nullable;
+import ru.spliterash.musicbox.MusicBox;
+
+public class BukkitNbtHandler implements NBTHandler {
+    @Override
+    public ItemStack setNbt(ItemStack item, String key, Integer value) {
+        ItemStack newItem = item.clone();
+
+        ItemMeta meta = newItem.getItemMeta();
+        meta.getCustomTagContainer().setCustomTag(new NamespacedKey(MusicBox.getInstance(), key), ItemTagType.INTEGER, value);
+        newItem.setItemMeta(meta);
+
+        return newItem;
+    }
+
+    @Override
+    public @Nullable int getNbt(ItemStack item, String key) {
+        ItemMeta meta = item.getItemMeta();
+        Integer value = meta.getCustomTagContainer().getCustomTag(new NamespacedKey(MusicBox.getInstance(), key), ItemTagType.INTEGER);
+        if (value == null)
+            value = 0;
+
+        return value;
+    }
+}
diff --git a/plugin/src/main/java/ru/spliterash/musicbox/utils/nbt/NBTFactory.java b/plugin/src/main/java/ru/spliterash/musicbox/utils/nbt/NBTFactory.java
@@ -0,0 +1,19 @@
+package ru.spliterash.musicbox.utils.nbt;
+
+import ru.spliterash.musicbox.minecraft.nms.NMSUtils;
+
+public class NBTFactory {
+    public static final NBTHandler NBT_HANDLER;
+
+    static {
+        String raw = NMSUtils.getRawVersion();
+        int iV = NMSUtils.parseMajorVersion(raw);
+
+        if (iV >= 13) {
+            NBT_HANDLER = new BukkitNbtHandler();
+        } else {
+            NBT_HANDLER = new NbtEditorHandler();
+        }
+    }
+
+}
diff --git a/plugin/src/main/java/ru/spliterash/musicbox/utils/nbt/NBTHandler.java b/plugin/src/main/java/ru/spliterash/musicbox/utils/nbt/NBTHandler.java
@@ -0,0 +1,9 @@
+package ru.spliterash.musicbox.utils.nbt;
+
+import org.bukkit.inventory.ItemStack;
+
+public interface NBTHandler {
+    ItemStack setNbt(ItemStack item, String key, Integer value);
+
+    int getNbt(ItemStack item, String key);
+}
diff --git a/plugin/src/main/java/ru/spliterash/musicbox/utils/nbt/NbtConstants.java b/plugin/src/main/java/ru/spliterash/musicbox/utils/nbt/NbtConstants.java
@@ -0,0 +1,5 @@
+package ru.spliterash.musicbox.utils.nbt;
+
+public class NbtConstants {
+    public static final String NBT_NAME = "song_hash";
+}
diff --git a/plugin/src/main/java/ru/spliterash/musicbox/utils/nbt/NbtEditorHandler.java b/plugin/src/main/java/ru/spliterash/musicbox/utils/nbt/NbtEditorHandler.java
@@ -0,0 +1,16 @@
+package ru.spliterash.musicbox.utils.nbt;
+
+import io.github.bananapuncher714.nbteditor.NBTEditor;
+import org.bukkit.inventory.ItemStack;
+
+public class NbtEditorHandler implements NBTHandler {
+    @Override
+    public ItemStack setNbt(ItemStack item, String key, Integer value) {
+        return NBTEditor.set(item, value, key);
+    }
+
+    @Override
+    public int getNbt(ItemStack item, String key) {
+        return NBTEditor.getInt(item, key);
+    }
+}
diff --git a/settings.gradle b/settings.gradle
@@ -1,7 +1,6 @@
 rootProject.name = 'MusicBox'
 
 include "plugin"
-include "modern_plugin"
 include "nms:shared"
 include "nms:versions:12"
 include "nms:versions:13-16"

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,6 @@ public static void onJukeboxClick(Jukebox jukebox, ItemStack clickedItem, Player`
`43`	`43`	`return;`
`44`	`44`	`MusicBoxSong song = MusicBoxSongManager.findByItem(clickedItem).orElse(null);`
`45`	`45`	`if (song == null) {`
`46`		`- if (MusicBoxSongManager.tryReplaceLegacyItem(e.getPlayer(), clickedItem))`
`47`		`- e.setCancelled(true);`
`48`	`46`	`return;`
`49`	`47`	`}`
`50`	`48`