NBTReflection - fix failing on Spigot

- Ref #769

Author: ShaneBeee

src/main/java/com/shanebeestudios/skbee/api/nbt/NBTApi.java

@@ -19,6 +19,7 @@
 import de.tr7zw.changeme.nbtapi.utils.DataFixerUtil;
 import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
 import org.apache.commons.lang3.ArrayUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
@@ -44,6 +45,8 @@ public class NBTApi {
     private static boolean ENABLED;
     public static final boolean HAS_ITEM_COMPONENTS = Skript.isRunningMinecraft(1, 20, 5);
     static final String TAG_NAME = HAS_ITEM_COMPONENTS ? "components" : "tag";
+    @SuppressWarnings("deprecation")
+    private static final int DATA_VERSION = Bukkit.getUnsafe().getDataVersion();
 
     /**
      * Initialize this NBT API
@@ -866,10 +869,10 @@ public static void addNBTToEntity(Entity entity, NBTCompound compound) {
      * @return ItemStack from NBT
      */
     public static ItemStack convertNBTtoItem(@NotNull NBTCompound nbtcompound) {
-        if (!nbtcompound.hasTag("DataVersion") || nbtcompound.getInteger("DataVersion") != NBTReflection.getDataVersion()) {
+        if (!nbtcompound.hasTag("DataVersion") || nbtcompound.getInteger("DataVersion") != getDataVersion()) {
             int dataVersion = nbtcompound.hasTag("DataVersion") ? nbtcompound.getInteger("DataVersion") : DataFixerUtil.VERSION1_20_4;
             try {
-                ReadWriteNBT fixedItemNBT = DataFixerUtil.fixUpItemData(nbtcompound, dataVersion, NBTReflection.getDataVersion());
+                ReadWriteNBT fixedItemNBT = DataFixerUtil.fixUpItemData(nbtcompound, dataVersion, getDataVersion());
                 return NBTItem.convertNBTtoItem((NBTCompound) fixedItemNBT);
             } catch (NoSuchFieldException | IllegalAccessException e) {
                 throw new RuntimeException(e);
@@ -878,4 +881,13 @@ public static ItemStack convertNBTtoItem(@NotNull NBTCompound nbtcompound) {
         return NBTItem.convertNBTtoItem(nbtcompound);
     }
 
+    /**
+     * Get the Minecraft DataVersion
+     *
+     * @return DataVersion from MC
+     */
+    public static int getDataVersion() {
+        return NBTApi.DATA_VERSION;
+    }
+
 }

src/main/java/com/shanebeestudios/skbee/api/nbt/NBTCustomItemStack.java

@@ -41,7 +41,7 @@ private static NBTCompound getContainer(NBTCompound itemContainer, boolean isFul
         if (isFull) {
             // TODO temp solution until NBT API handles this
             // DataVersion is used for deserializing and running thru DataFixerUpper
-            itemContainer.setInteger("DataVersion", NBTReflection.getDataVersion());
+            itemContainer.setInteger("DataVersion", NBTApi.getDataVersion());
             // TODO end
             return itemContainer;
         }

src/main/java/com/shanebeestudios/skbee/api/nbt/NBTReflection.java

@@ -15,9 +15,6 @@
 @SuppressWarnings({"SequencedCollectionMethodCanBeUsed", "CallToPrintStackTrace", "DataFlowIssue"})
 public class NBTReflection {
 
-    @SuppressWarnings("deprecation")
-    private static final int DATA_VERSION = Bukkit.getUnsafe().getDataVersion();
-
     // Classes
     private static Class<?> CRAFT_ITEM_STACK_CLASS;
 
@@ -70,15 +67,6 @@ public class NBTReflection {
         }
     }
 
-    /**
-     * Get the Minecraft DataVersion
-     *
-     * @return DataVersion from MC
-     */
-    public static int getDataVersion() {
-        return DATA_VERSION;
-    }
-
     /**
      * Get the vanilla version of NBT of an item
      * <br>This will show components which don't normally show in NBT

src/main/java/com/shanebeestudios/skbee/elements/nbt/expressions/ExprNbtCompound.java

@@ -81,6 +81,8 @@
 @Since("1.6.0")
 public class ExprNbtCompound extends PropertyExpression<Object, NBTCompound> {
 
+    // My reflection requires Paper/Mojmap. I cant be bothered to re-write this for Spigot
+    private static final boolean HAS_VANILLA_NBT = Skript.classExists("net.minecraft.server.level.ServerPlayer") && NBTApi.HAS_ITEM_COMPONENTS;
     private static final boolean ALLOW_UNSAFE_OPERATIONS = SkBee.getPlugin().getPluginConfig().NBT_ALLOW_UNSAFE_OPERATIONS;
 
     static {
@@ -101,7 +103,11 @@ public boolean init(Expression<?> @NotNull [] exprs, int matchedPattern, @NotNul
         Expression<?> expr = LiteralUtils.defendExpression(exprs[0]);
         setExpr(expr);
         this.isFullItem = parseResult.hasTag("full");
-        this.isVanilla = parseResult.hasTag("vanilla") && NBTApi.HAS_ITEM_COMPONENTS;
+        this.isVanilla = parseResult.hasTag("vanilla");
+        if (this.isVanilla && !HAS_VANILLA_NBT) {
+            Skript.error("Vanilla NBT requires a PaperMC server (or any other MojMapped server).");
+            return false;
+        }
         this.isCustom = parseResult.hasTag("custom");
         this.isCopy = parseResult.hasTag("copy");
         this.isFile = matchedPattern == 1;