From 6b817d6d6081c859d22a24287cc7fa6d4b13f579 Mon Sep 17 00:00:00 2001 From: Dustin Weckenbrock Date: Sun, 19 Apr 2026 11:13:52 +0200 Subject: [PATCH 1/2] refactor(syncfrog): replace deprecated registry access with new API --- .../stardust/service/SyncFrogService.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/onelitefeather/stardust/service/SyncFrogService.java b/src/main/java/net/onelitefeather/stardust/service/SyncFrogService.java index 19ba8156..3145feaf 100644 --- a/src/main/java/net/onelitefeather/stardust/service/SyncFrogService.java +++ b/src/main/java/net/onelitefeather/stardust/service/SyncFrogService.java @@ -1,6 +1,8 @@ package net.onelitefeather.stardust.service; import io.papermc.paper.event.player.PrePlayerAttackEntityEvent; +import io.papermc.paper.registry.RegistryAccess; +import io.papermc.paper.registry.RegistryKey; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import net.onelitefeather.stardust.StardustPlugin; @@ -15,7 +17,6 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.persistence.PersistentDataType; -import org.bukkit.util.StringUtil; import org.incendo.cloud.annotation.specifier.Quoted; import org.incendo.cloud.annotations.Argument; import org.incendo.cloud.annotations.Command; @@ -30,6 +31,8 @@ public class SyncFrogService implements Listener { + private static final Registry FROG_REGISTRY = RegistryAccess.registryAccess().getRegistry(RegistryKey.FROG_VARIANT); + private static final String FROG_BUCKET_NAME = "Frog Bucket"; private static final Frog.Variant DEFAULT_VARIANT = Frog.Variant.TEMPERATE; @@ -68,7 +71,7 @@ public void handlePlayerInteract(PlayerInteractEvent event) { var player = event.getPlayer(); var itemStack = event.getItem(); - if(itemStack == null) return; + if (itemStack == null) return; var clickedBlock = event.getClickedBlock(); if (clickedBlock == null) return; @@ -171,13 +174,14 @@ private ItemStack createFrogItemStack(int amount, Frog.Variant variant, Componen container.set(frogVariantKey, PersistentDataType.STRING, frogVariantName(variant)); itemStack.setItemMeta(itemMeta); + return itemStack; } private void addFrogBucketToPlayer(Player player, int amount, Component customName, Frog.Variant variant, boolean actionBarMessage) { var slot = player.getInventory().firstEmpty(); - if(slot == -1) { + if (slot == -1) { player.sendMessage(Component.translatable("plugin.inventory-full").arguments(plugin.getPrefix())); return; } @@ -200,14 +204,12 @@ private void addFrogBucketToPlayer(Player player, int amount, Component customNa @NotNull private Frog.Variant frogVariant(@Nullable String variant) { - if (variant == null) return DEFAULT_VARIANT; var key = NamespacedKey.fromString(variant.toLowerCase()); - if (key == null) return Frog.Variant.TEMPERATE; - - var frogVariant = Registry.FROG_VARIANT.get(key); + if (key == null) return DEFAULT_VARIANT; + var frogVariant = FROG_REGISTRY.get(key); return frogVariant != null ? frogVariant : DEFAULT_VARIANT; } @@ -217,9 +219,8 @@ private String frogVariantName(Frog.Variant variant) { @Suggestions(value = "frogVariants") public List frogVariants(CommandContext context, String input) { - return Registry.FROG_VARIANT.stream() - .map(Frog.Variant::getKey) - .map(NamespacedKey::value) + return FROG_REGISTRY.stream() + .map(variant -> variant.key().value()) .filter(s -> s.startsWith(input)) .toList(); } From 1832cb3fc2f53a5fcbe6a01394db34bc2295f2f0 Mon Sep 17 00:00:00 2001 From: Dustin Weckenbrock Date: Sun, 19 Apr 2026 11:17:44 +0200 Subject: [PATCH 2/2] refactor(heal): replace boolean with TriState for visual fire handling --- .../onelitefeather/stardust/command/commands/HealCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/onelitefeather/stardust/command/commands/HealCommand.java b/src/main/java/net/onelitefeather/stardust/command/commands/HealCommand.java index e586c0e7..9f4dcd2e 100644 --- a/src/main/java/net/onelitefeather/stardust/command/commands/HealCommand.java +++ b/src/main/java/net/onelitefeather/stardust/command/commands/HealCommand.java @@ -2,6 +2,7 @@ import net.kyori.adventure.text.Component; +import net.kyori.adventure.util.TriState; import net.onelitefeather.stardust.StardustPlugin; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; @@ -16,7 +17,7 @@ public class HealCommand { private static final int DEFAULT_PLAYER_FIRE_TICKS = 0; - private static final boolean DEFAULT_ENTITY_HAS_VISUAL_FIRE = false; + private static final TriState DEFAULT_ENTITY_HAS_VISUAL_FIRE = TriState.FALSE; private static final int DEFAULT_PLAYER_FOOD_LEVEL = 20; private static final float DEFAULT_PLAYER_SATURATION_LEVEL = 5.0f;