Update to 1.21.1

Author: acrylic-style

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     id("io.papermc.paperweight.userdev") version "1.7.1"
     java
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    id("com.gradleup.shadow") version "8.3.3"
 }
 
 group = "net.azisaba.afnw"
@@ -47,11 +47,13 @@ dependencies {
     compileOnly("net.azisaba:ItemStash:1.0.0-SNAPSHOT")
     compileOnly("net.essentialsx:EssentialsX:2.20.1")
     compileOnly("io.lumine:Mythic-Dist:5.4.0")
-    compileOnly("io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT")
-    paperweight.paperDevBundle("1.20.2-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT")
+    compileOnly("net.azisaba:TAB-BukkitBridge:3.1.0")
+    compileOnly("org.jetbrains:annotations:26.0.1")
+    paperweight.paperDevBundle("1.21.1-R0.1-SNAPSHOT")
 }
 
-java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+java.toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 
 tasks {
     compileJava {

src/main/java/net/azisaba/afnw/afnwcore2/AfnwCore2.java

@@ -19,7 +19,7 @@
 import net.minecraft.world.entity.ai.attributes.RangedAttribute;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftDolphin;
+import org.bukkit.craftbukkit.entity.CraftDolphin;
 import org.bukkit.entity.Dolphin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -108,7 +108,7 @@ public void onEnable() {
     Bukkit.getScheduler().runTask(this, () -> {
       if (Bukkit.getPluginManager().isPluginEnabled("TAB")) {
         TheTAB.enable();
-        getLogger().info("TABの連携が有効になりました。");
+        getLogger().info("TABの連携が有効です。");
       } else {
         getLogger().info("TABの連携は無効です。");
       }

src/main/java/net/azisaba/afnw/afnwcore2/util/TheTAB.java

@@ -1,42 +1,24 @@
 package net.azisaba.afnw.afnwcore2.util;
 
 import net.azisaba.afnw.afnwcore2.AfnwCore2;
+import net.azisaba.tabbukkitbridge.data.DataKey;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.function.Consumer;
-import java.util.function.Function;
 
 public class TheTAB {
     private static boolean enabled = false;
 
     public static void enable() {
+        if (enabled) return;
+        enabled = true;
         try {
-            registerPlaceholder("%pvp_enabled%", 1000, player -> AfnwCore2.getPlugin(AfnwCore2.class).pvpEnabled.contains(player.getUniqueId()));
-            Class.forName("me.neznamy.tab.shared.placeholders.conditions.Condition").getMethod("finishSetups").invoke(null);
-            if (enabled) return;
-            Object tabAPI = Class.forName("me.neznamy.tab.api.TabAPI").getMethod("getInstance").invoke(null);
-            Class.forName("me.neznamy.tab.api.event.EventBus")
-                    .getMethod("register", Class.class, Consumer.class)
-                    // TODO: me.neznamy.tab.api.event.EventHandler
-                    .invoke(tabAPI, Class.forName("me.neznamy.tab.api.event.plugin.TabLoadEvent"), (Consumer<Object>) (e) -> enable());
-            enabled = true;
-        } catch (ReflectiveOperationException e) {
-            AfnwCore2.getPluginLogger().warn("Failed to execute Condition#finishSetups", e);
+            DataKey<Player, Boolean> pvpEnabled = new DataKey<>(false);
+            pvpEnabled.register(p -> true, player -> {
+                if (player == null) return false;
+                return AfnwCore2.getPlugin(AfnwCore2.class).pvpEnabled.contains(player.getUniqueId());
+            });
+            pvpEnabled.getPlaceholders().add("pvp_enabled");
+        } catch (Exception | NoClassDefFoundError e) {
+            e.printStackTrace();
         }
     }
-
-    private static void registerPlaceholder(String identifier, int refreshInterval, @NotNull Function<Player, Object> function) throws ReflectiveOperationException {
-        Object tabAPI = Class.forName("me.neznamy.tab.api.TabAPI").getMethod("getInstance").invoke(null);
-        Object placeholderManager = Class.forName("me.neznamy.tab.api.TabAPI").getMethod("getPlaceholderManager").invoke(tabAPI);
-        Class.forName("me.neznamy.tab.api.placeholder.PlaceholderManager")
-                .getMethod("registerPlayerPlaceholder", String.class, int.class, Function.class)
-                .invoke(placeholderManager, identifier, refreshInterval, (Function<Object, Object>) (obj) -> {
-                    try {
-                        return function.apply((Player) Class.forName("me.neznamy.tab.api.TabPlayer").getMethod("getPlayer").invoke(obj));
-                    } catch (ReflectiveOperationException e) {
-                        throw new RuntimeException(e);
-                    }
-                });
-    }
 }

src/main/java/net/azisaba/afnw/afnwcore2/util/item/ItemUtil.java

@@ -1,8 +1,11 @@
 package net.azisaba.afnw.afnwcore2.util.item;
 
 import net.azisaba.itemstash.ItemStash;
+import net.minecraft.core.component.DataComponents;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.item.component.CustomData;
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.Contract;
@@ -22,14 +25,28 @@ public static void addToStashIfEnabledAsync(@NotNull Plugin plugin, @NotNull UUI
         Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> addToStashIfEnabled(uuid, stack));
     }
 
+    public static @Nullable CompoundTag getCustomData(@NotNull ItemStack stack) {
+        CustomData customData = CraftItemStack.asNMSCopy(stack).get(DataComponents.CUSTOM_DATA);
+        if (customData == null) return null;
+        return customData.copyTag();
+    }
+
     public static @NotNull String getStringTag(@NotNull ItemStack stack, @NotNull String name) {
-        return CraftItemStack.asNMSCopy(stack).getOrCreateTag().getString(name);
+        CompoundTag tag = getCustomData(stack);
+        if (tag == null) return "";
+        return tag.getString(name);
+    }
+
+    public static @NotNull CompoundTag getCompoundTag(@NotNull ItemStack stack, @NotNull String name) {
+        CompoundTag tag = getCustomData(stack);
+        if (tag == null) return new CompoundTag();
+        return tag.getCompound(name);
     }
 
     @Contract("null -> null")
     public static @Nullable String getMythicType(@Nullable ItemStack stack) {
         if (stack == null) return null;
-        String s = getStringTag(stack, "MYTHIC_TYPE");
+        String s = getCompoundTag(stack, "PublicBukkitValues").getString("mythicmobs:type");
         if (s.isBlank()) return null;
         return s;
     }

src/main/resources/plugin.yml

@@ -9,7 +9,7 @@ description: That world, once again.
 depend: [ Essentials, Votifier ]
 softdepend:
   - ItemStash
-  - TAB
+  - TAB-BukkitBridge
 website: https://github.com/AfnwTeam/AfnwCore2
 
 permissions: