Merge pull request #158 from balugaq/fix/fireproof-rune

Fireproof Rune Fixes

Author: LordIdra

src/main/java/io/github/pylonmc/pylon/base/PylonBase.java

@@ -11,13 +11,15 @@
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitTask;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Locale;
 import java.util.Set;
+import java.util.function.Consumer;
 
 @SuppressWarnings("UnstableApiUsage")
 public class PylonBase extends JavaPlugin implements PylonAddon {
@@ -68,8 +70,7 @@ public void onEnable() {
         return Material.COPPER_INGOT;
     }
 
-    @NotNull
-    public static BukkitTask runSync(@NotNull Runnable runnable) {
-        return Bukkit.getScheduler().runTask(instance, runnable);
+    public static void runSyncTimer(@NotNull Consumer<BukkitTask> task, long delay, long period) {
+        Bukkit.getScheduler().runTaskTimer(instance, task, delay, period);
     }
 }

src/main/java/io/github/pylonmc/pylon/base/content/magic/FireproofRune.java

@@ -1,13 +1,13 @@
 package io.github.pylonmc.pylon.base.content.magic;
 
 import com.destroystokyo.paper.ParticleBuilder;
-import io.github.pylonmc.pylon.base.BaseConfig;
 import io.github.pylonmc.pylon.base.content.magic.base.Rune;
+import io.github.pylonmc.pylon.core.item.builder.ItemStackBuilder;
 import io.papermc.paper.datacomponent.DataComponentTypes;
 import io.papermc.paper.datacomponent.item.DamageResistant;
 import io.papermc.paper.registry.keys.tags.DamageTypeTagKeys;
 import net.kyori.adventure.text.Component;
-import org.bukkit.FluidCollisionMode;
+import net.kyori.adventure.translation.GlobalTranslator;
 import org.bukkit.Location;
 import org.bukkit.Particle;
 import org.bukkit.Sound;
@@ -20,14 +20,31 @@
 /**
  * @author balugaq
  */
-@SuppressWarnings("UnstableApiUsage")
 public class FireproofRune extends Rune {
     public static final Component SUCCESS = Component.translatable("pylon.pylonbase.message.fireproof_result.success");
+    public static final Component TOOLTIP = Component.translatable("pylon.pylonbase.message.fireproof_result.tooltip");
+
 
     public FireproofRune(@NotNull ItemStack stack) {
         super(stack);
     }
 
+    /**
+     * Fixes #156 - Fireproof rune can be applied multiple times
+     * <p>
+     * Checks if the rune is applicable to the target item.
+     *
+     * @param event  The event
+     * @param rune   The rune item, amount may be > 1
+     * @param target The item to handle, amount may be > 1
+     * @return true if applicable, false otherwise
+     */
+    public boolean isApplicableToTarget(@NotNull PlayerDropItemEvent event, @NotNull ItemStack rune, @NotNull ItemStack target) {
+        DamageResistant data = target.getData(DataComponentTypes.DAMAGE_RESISTANT);
+        if (data == null) return true;
+        return !data.types().equals(DamageTypeTagKeys.IS_FIRE);
+    }
+
     /**
      * Handles contacting between an item and a rune.
      *
@@ -40,28 +57,30 @@ public void onContactItem(@NotNull PlayerDropItemEvent event, @NotNull ItemStack
         // As many runes as possible to consume
         int consume = Math.min(rune.getAmount(), target.getAmount());
 
-        ItemStack handle = target.asQuantity(consume);
-        handle.setData(DataComponentTypes.DAMAGE_RESISTANT, DamageResistant.damageResistant(DamageTypeTagKeys.IS_FIRE));
+        Player player = event.getPlayer();
+        ItemStack handle = ItemStackBuilder.of(target.asQuantity(consume)) // Already cloned in `asQuantity`
+                .set(DataComponentTypes.DAMAGE_RESISTANT, DamageResistant.damageResistant(DamageTypeTagKeys.IS_FIRE))
+                .lore(GlobalTranslator.render(TOOLTIP, player.locale()))
+                .build();
 
         // (N)Either left runes or targets
         int leftRunes = rune.getAmount() - consume;
         int leftTargets = target.getAmount() - consume;
 
-        Player player = event.getPlayer();
-        Location explodeLoc = player.getTargetBlockExact((int) Math.ceil(BaseConfig.RUNE_CHECK_RANGE), FluidCollisionMode.NEVER).getLocation();
+        Location explodeLoc = event.getItemDrop().getLocation();
         World world = explodeLoc.getWorld();
         if (leftRunes > 0) {
-            world.dropItemNaturally(explodeLoc, rune.asQuantity(leftRunes));
+            world.dropItemNaturally(explodeLoc, rune.asQuantity(leftRunes)).setGlowing(true);
         }
         if (leftTargets > 0) {
-            world.dropItemNaturally(explodeLoc, target.asQuantity(leftTargets));
+            world.dropItemNaturally(explodeLoc, target.asQuantity(leftTargets)).setGlowing(true);
         }
-        world.dropItemNaturally(explodeLoc, handle);
+        world.dropItemNaturally(explodeLoc, handle).setGlowing(true);
 
         // simple particles
         spawnParticle(Particle.EXPLOSION, explodeLoc, 1);
-        spawnParticle(Particle.FLAME, explodeLoc, 20);
-        spawnParticle(Particle.SMOKE, explodeLoc, 1);
+        spawnParticle(Particle.FLAME, explodeLoc, 50);
+        spawnParticle(Particle.SMOKE, explodeLoc, 40);
         world.playSound(explodeLoc, Sound.ENTITY_GENERIC_EXPLODE, 1.0f, 1.0f);
 
         target.setAmount(0);

src/main/java/io/github/pylonmc/pylon/base/content/magic/base/Rune.java

@@ -80,15 +80,19 @@ void onRuneDrop(@NotNull PlayerDropItemEvent event) {
                 return;
             }
 
+            // Fix #155 - Fireproof rune only checks proximity at the moment it's dropped
             // Force run synchronously for entity handling
-            PylonBase.runSync(() -> {
-                Block lookingAt = player.getTargetBlockExact((int) Math.ceil(BaseConfig.RUNE_CHECK_RANGE), FluidCollisionMode.NEVER);
-                if (lookingAt == null) {
-                    // The player may drop runes in the sky, skip it.
+            PylonBase.runSyncTimer(task -> {
+                if (runeEntity.isDead() || !runeEntity.isValid()) {
+                    task.cancel();
                     return;
                 }
 
-                Collection<Item> nearbyEntities = player.getWorld().getNearbyEntitiesByType(Item.class, lookingAt.getLocation(), BaseConfig.RUNE_CHECK_RANGE, item -> rune.isApplicableToTarget(event, runeStack, item.getItemStack()));
+                if (!runeEntity.isOnGround()) {
+                    return;
+                }
+
+                Collection<Item> nearbyEntities = player.getWorld().getNearbyEntitiesByType(Item.class, runeEntity.getLocation(), BaseConfig.RUNE_CHECK_RANGE, item -> rune.isApplicableToTarget(event, runeStack, item.getItemStack()));
                 Item targetEntity = nearbyEntities
                         .stream()
                         .findFirst()
@@ -105,7 +109,7 @@ void onRuneDrop(@NotNull PlayerDropItemEvent event) {
                 rune.onContactItem(event, runeStack, target);
                 runeEntity.setItemStack(runeStack);
                 targetEntity.setItemStack(target);
-            });
+            }, 1, 2);
         }
     }
 }

src/main/resources/lang/en.yml

@@ -1309,7 +1309,8 @@ message:
     working_with_reduced_efficiency: "<green>Working with reduced efficiency"
     no_sunlight: "<red>No sunlight"
   fireproof_result:
-    success: "Your item has been fire-proofed"
+    tooltip: "<red><bold>Fire-proofed"
+    success: "<red>Your item has been fire-proofed"
 
 gui:
   fluid-selector-title: "Select Fluid"