Skip to content

Commit 8e76f31

Browse files
amyavimathiascode
authored andcommitted
refactor: fix most deprecation warnings
1 parent 0eb0fe2 commit 8e76f31

File tree

6 files changed

+15
-9
lines changed

6 files changed

+15
-9
lines changed

src/main/java/pw/kaboom/extras/commands/CommandBroadcastVanilla.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ public boolean onCommand(final @Nonnull CommandSender sender,
3333
final Component senderName = sender.name();
3434
final String input = String.join(" ", args);
3535
final Component component = LEGACY_COMPONENT_SERIALIZER.deserialize(input);
36-
final Component broadcastComponent = Component.translatable("chat.type.admin")
36+
final Component broadcastComponent =
37+
Component.translatable("chat.type.admin", senderName, component)
3738
.decorate(TextDecoration.ITALIC)
38-
.color(NamedTextColor.GRAY)
39-
.args(senderName, component);
39+
.color(NamedTextColor.GRAY);
4040

4141
sender.sendMessage(component);
4242

src/main/java/pw/kaboom/extras/commands/CommandEnchantAll.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
package pw.kaboom.extras.commands;
22

3+
import io.papermc.paper.registry.RegistryAccess;
4+
import io.papermc.paper.registry.RegistryKey;
35
import net.kyori.adventure.text.Component;
46
import org.bukkit.Material;
7+
import org.bukkit.Registry;
58
import org.bukkit.command.Command;
69
import org.bukkit.command.CommandExecutor;
710
import org.bukkit.command.CommandSender;
811
import org.bukkit.enchantments.Enchantment;
912
import org.bukkit.entity.Player;
1013
import org.bukkit.inventory.ItemStack;
14+
import org.jetbrains.annotations.NotNull;
1115

1216
import javax.annotation.Nonnull;
1317

@@ -30,7 +34,9 @@ public boolean onCommand(final @Nonnull CommandSender sender,
3034
return true;
3135
}
3236

33-
for (Enchantment enchantment : Enchantment.values()) {
37+
final Registry<@NotNull Enchantment> registry = RegistryAccess.registryAccess()
38+
.getRegistry(RegistryKey.ENCHANTMENT);
39+
for (Enchantment enchantment : registry) {
3440
item.addUnsafeEnchantment(enchantment, Short.MAX_VALUE);
3541
}
3642
player.sendMessage(Component

src/main/java/pw/kaboom/extras/commands/CommandPing.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public boolean onCommand(final @Nonnull CommandSender sender,
3030
return true;
3131
}
3232

33-
final int ping = target.spigot().getPing();
33+
final int ping = target.getPing();
3434
final int d = (int) Math.floor((float) ping / 100);
3535
NamedTextColor highlighting = NamedTextColor.WHITE;
3636

src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ void onPlayerLogin(final PlayerLoginEvent event) {
135135
@EventHandler
136136
void onPlayerSpawn(final PlayerSpawnLocationEvent event) {
137137
if (RANDOMIZE_SPAWN
138-
&& event.getPlayer().getBedSpawnLocation() != event.getSpawnLocation()) {
138+
&& event.getPlayer().getRespawnLocation() != event.getSpawnLocation()) {
139139
final World world = event.getPlayer().getWorld();
140140
final ThreadLocalRandom random = ThreadLocalRandom.current();
141141

src/main/java/pw/kaboom/extras/modules/player/PlayerDamage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ void onPlayerDeath(final PlayerDeathEvent event) {
104104

105105
player.setHealth(20);
106106

107-
if (player.getBedSpawnLocation() != null) {
108-
player.teleportAsync(player.getBedSpawnLocation());
107+
if (player.getRespawnLocation() != null) {
108+
player.teleportAsync(player.getRespawnLocation());
109109
} else {
110110
final World world = Bukkit.getWorld("world");
111111
player.teleportAsync(world.getSpawnLocation());

src/main/resources/plugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Extras
22
main: pw.kaboom.extras.Main
33
description: Plugin that adds extra functionality to the server.
4-
api-version: '1.19'
4+
api-version: '1.21'
55
version: master
66

77
commands:

0 commit comments

Comments
 (0)