From c915594d7e66fef381df4262edcf4de9ee32a967 Mon Sep 17 00:00:00 2001
From: amyavi <144570677+amyavi@users.noreply.github.com>
Date: Sun, 6 Jul 2025 01:33:21 -0300
Subject: [PATCH] refactor: fix most deprecation warnings

---
 .../kaboom/extras/commands/CommandBroadcastVanilla.java   | 6 +++---
 .../java/pw/kaboom/extras/commands/CommandEnchantAll.java | 8 +++++++-
 src/main/java/pw/kaboom/extras/commands/CommandPing.java  | 2 +-
 .../pw/kaboom/extras/modules/player/PlayerConnection.java | 2 +-
 .../pw/kaboom/extras/modules/player/PlayerDamage.java     | 4 ++--
 src/main/resources/plugin.yml                             | 2 +-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/pw/kaboom/extras/commands/CommandBroadcastVanilla.java b/src/main/java/pw/kaboom/extras/commands/CommandBroadcastVanilla.java
index 78ea956..c7782f3 100644
--- a/src/main/java/pw/kaboom/extras/commands/CommandBroadcastVanilla.java
+++ b/src/main/java/pw/kaboom/extras/commands/CommandBroadcastVanilla.java
@@ -33,10 +33,10 @@ public final class CommandBroadcastVanilla implements CommandExecutor {
         final Component senderName = sender.name();
         final String input = String.join(" ", args);
         final Component component = LEGACY_COMPONENT_SERIALIZER.deserialize(input);
-        final Component broadcastComponent = Component.translatable("chat.type.admin")
+        final Component broadcastComponent =
+                Component.translatable("chat.type.admin", senderName, component)
                 .decorate(TextDecoration.ITALIC)
-                .color(NamedTextColor.GRAY)
-                .args(senderName, component);
+                .color(NamedTextColor.GRAY);
 
         sender.sendMessage(component);
 
diff --git a/src/main/java/pw/kaboom/extras/commands/CommandEnchantAll.java b/src/main/java/pw/kaboom/extras/commands/CommandEnchantAll.java
index 70e64e2..bd47916 100644
--- a/src/main/java/pw/kaboom/extras/commands/CommandEnchantAll.java
+++ b/src/main/java/pw/kaboom/extras/commands/CommandEnchantAll.java
@@ -1,13 +1,17 @@
 package pw.kaboom.extras.commands;
 
+import io.papermc.paper.registry.RegistryAccess;
+import io.papermc.paper.registry.RegistryKey;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Material;
+import org.bukkit.Registry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nonnull;
 
@@ -30,7 +34,9 @@ public final class CommandEnchantAll implements CommandExecutor {
             return true;
         }
 
-        for (Enchantment enchantment : Enchantment.values()) {
+        final Registry<@NotNull Enchantment> registry = RegistryAccess.registryAccess()
+                .getRegistry(RegistryKey.ENCHANTMENT);
+        for (Enchantment enchantment : registry) {
             item.addUnsafeEnchantment(enchantment, Short.MAX_VALUE);
         }
         player.sendMessage(Component
diff --git a/src/main/java/pw/kaboom/extras/commands/CommandPing.java b/src/main/java/pw/kaboom/extras/commands/CommandPing.java
index 7ef8118..bd4ba14 100644
--- a/src/main/java/pw/kaboom/extras/commands/CommandPing.java
+++ b/src/main/java/pw/kaboom/extras/commands/CommandPing.java
@@ -30,7 +30,7 @@ public final class CommandPing implements CommandExecutor {
             return true;
         }
 
-        final int ping = target.spigot().getPing();
+        final int ping = target.getPing();
         final int d = (int) Math.floor((float) ping / 100);
         NamedTextColor highlighting = NamedTextColor.WHITE;
 
diff --git a/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java b/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java
index 186ef21..41bb5fe 100644
--- a/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java
+++ b/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java
@@ -135,7 +135,7 @@ public final class PlayerConnection implements Listener {
     @EventHandler
     void onPlayerSpawn(final PlayerSpawnLocationEvent event) {
         if (RANDOMIZE_SPAWN
-                && event.getPlayer().getBedSpawnLocation() != event.getSpawnLocation()) {
+                && event.getPlayer().getRespawnLocation() != event.getSpawnLocation()) {
             final World world = event.getPlayer().getWorld();
             final ThreadLocalRandom random = ThreadLocalRandom.current();
 
diff --git a/src/main/java/pw/kaboom/extras/modules/player/PlayerDamage.java b/src/main/java/pw/kaboom/extras/modules/player/PlayerDamage.java
index 0e59960..f3c04bd 100644
--- a/src/main/java/pw/kaboom/extras/modules/player/PlayerDamage.java
+++ b/src/main/java/pw/kaboom/extras/modules/player/PlayerDamage.java
@@ -104,8 +104,8 @@ public final class PlayerDamage implements Listener {
 
             player.setHealth(20);
 
-            if (player.getBedSpawnLocation() != null) {
-                player.teleportAsync(player.getBedSpawnLocation());
+            if (player.getRespawnLocation() != null) {
+                player.teleportAsync(player.getRespawnLocation());
             } else {
                 final World world = Bukkit.getWorld("world");
                 player.teleportAsync(world.getSpawnLocation());
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index af498ea..2db20c4 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: Extras
 main: pw.kaboom.extras.Main
 description: Plugin that adds extra functionality to the server.
-api-version: '1.19'
+api-version: '1.21'
 version: master
 
 commands: