totem fixes

Took 23 minutes

Author: Oribuin

src/main/java/dev/oribuin/fishing/api/event/def/TotemEvents.java

@@ -15,10 +15,17 @@
 public interface TotemEvents {
 
     /**
-     * The functionality provided when a player activates a fishing totem ability
+     * The functionality provided when a player activates the fishing totem
      *
      * @param event The event that was called when a player activates a totem
      */
     default void onActivate(TotemActivateEvent event) {}
 
+    /**
+     * The functionality provided when the fishing totem deactivates
+     *
+     * @param event The event that was called when the totem deactivates
+     */
+    default void onDeactivate(TotemActivateEvent event) {}
+    
 }

src/main/java/dev/oribuin/fishing/api/event/impl/FishCatchEvent.java

@@ -3,6 +3,7 @@
 import dev.oribuin.fishing.model.augment.Augment;
 import dev.oribuin.fishing.model.augment.AugmentRegistry;
 import dev.oribuin.fishing.model.fish.Fish;
+import dev.oribuin.fishing.model.fish.Tier;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.FishHook;
 import org.bukkit.entity.Player;
@@ -25,6 +26,10 @@ public class FishCatchEvent extends PlayerEvent implements Cancellable {
     private final ItemStack rod;
     private final FishHook hook;
     private Fish fish;
+    
+    private final int baseEntropy;
+    private final int baseFishExp;
+    private final float baseNaturalExp;
     private int entropy;
     private int fishExp;
     private float naturalExp;
@@ -47,9 +52,15 @@ public FishCatchEvent(@NotNull Player who, @NotNull ItemStack rod, @NotNull Fish
         this.rod = rod;
         this.hook = hook;
         this.fish = fish;
-        this.entropy = fish.tier().entropy();
-        this.fishExp = fish.tier().fishExp();
-        this.naturalExp = fish.tier().naturalExp();
+        
+        // Set the base values for the fish
+        Tier tier = this.fish.tier();
+        this.baseEntropy = tier.entropy();
+        this.entropy = tier.entropy();
+        this.baseFishExp = tier.fishExp();
+        this.fishExp = tier.fishExp();
+        this.baseNaturalExp = tier.naturalExp();
+        this.naturalExp = tier.naturalExp();
     }
 
     /**
@@ -63,7 +74,7 @@ public Map<Augment, Integer> augments() {
 
     /**
      * The fishing rod the player is using to catch the fish
-     *
+     *-
      * @return The fishing rod {@link ItemStack}
      */
     public @NotNull ItemStack rod() {
@@ -96,6 +107,15 @@ public Map<Augment, Integer> augments() {
     public void fish(@Nullable Fish fish) {
         this.fish = fish;
     }
+    
+    /**
+     * The base amount of entropy the fish gives
+     *
+     * @return The base amount of entropy the fish gives
+     */
+    public int baseEntropy() {
+        return baseEntropy;
+    }
 
     /**
      * The amount of entropy the fish gives
@@ -114,6 +134,15 @@ public int entropy() {
     public void entropy(int entropy) {
         this.entropy = entropy;
     }
+    
+    /**
+     * The base amount of plugin experience the fish gives
+     *
+     * @return The base amount of experience the fish gives
+     */
+    public int baseFishExp() {
+        return baseFishExp;
+    }
 
     /**
      * The amount of plugin experience the fish gives
@@ -132,6 +161,15 @@ public int fishExp() {
     public void fishExp(int fishExp) {
         this.fishExp = fishExp;
     }
+    
+    /**
+     * The base minecraft experience the fish gives
+     *
+     * @return The base minecraft experience the fish gives
+     */
+    public float baseNaturalExp() {
+        return baseNaturalExp;
+    }
 
     /**
      * The base minecraft experience the fish gives

src/main/java/dev/oribuin/fishing/api/event/impl/TotemDeactivateEvent.java

@@ -0,0 +1,80 @@
+package dev.oribuin.fishing.api.event.impl;
+
+import dev.oribuin.fishing.model.totem.Totem;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * This event is called when a player activates a fishing totem
+ */
+public class TotemDeactivateEvent extends Event implements Cancellable {
+
+    private static final HandlerList HANDLERS = new HandlerList();
+    private final Totem totem;
+    private boolean cancelled;
+
+    /**
+     * Define a new Totem Deactivate Event, This is called when a totem deactivates by running out of time.
+     *
+     * @param totem     The {@link Totem} that is being deactivated
+     */
+    public TotemDeactivateEvent(@NotNull Totem totem) {
+        super(!Bukkit.isPrimaryThread());
+
+        this.totem = totem;
+    }
+
+    /**
+     * Get the totem that is being deactivated
+     *
+     * @return The totem that is being deactivated
+     */
+    public @NotNull Totem totem() {
+        return this.totem;
+    }
+    
+    /**
+     * Get the handlers for this event class
+     *
+     * @return The handlers for this event class
+     */
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return HANDLERS;
+    }
+
+    /**
+     * Get the handlers for this event class
+     *
+     * @return The handlers for this event class
+     */
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
+
+    /**
+     * Check if the event is cancelled
+     *
+     * @return If the event is cancelled
+     */
+    @Override
+    public boolean isCancelled() {
+        return this.cancelled;
+    }
+
+    /**
+     * Set the event to be cancelled
+     *
+     * @param b If the event should be cancelled
+     */
+    @Override
+    public void setCancelled(boolean b) {
+        this.cancelled = b;
+    }
+
+}

src/main/java/dev/oribuin/fishing/listener/FishListener.java

@@ -37,7 +37,7 @@ public void onFish(PlayerFishEvent event) {
         FishManager manager = this.plugin.getManager(FishManager.class);
 
         // If caught no fish, do nothing
-        List<Fish> caught = manager.tryCatch(event.getPlayer(), hand, event.getHook());
+        List<Fish> caught = manager.tryCatch(event);
         if (caught.isEmpty()) return;
 
         // Add the fish into the player inventory

src/main/java/dev/oribuin/fishing/manager/FishManager.java

@@ -12,6 +12,8 @@
 import dev.rosewood.rosegarden.manager.Manager;
 import org.bukkit.entity.FishHook;
 import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
@@ -31,32 +33,41 @@ public void reload() {
     /**
      * Try to catch a fish from the tier based on the player's fishing rod and fishhook
      *
-     * @param player The player to check
-     * @param rod    The fishing rod the player is using
-     * @param hook   The fishhook the player is using
+     * @param event The initial player fish event to catch the fish
      *
      * @return The fish the player caught
      */
-    public List<Fish> tryCatch(Player player, ItemStack rod, FishHook hook) {
+    public List<Fish> tryCatch(PlayerFishEvent event) {
+        if (event.getHand() == null) return new ArrayList<>();
+
         List<Fish> result = new ArrayList<>();
+        ItemStack rod = event.getPlayer().getInventory().getItem(event.getHand());
         Map<Augment, Integer> augments = AugmentRegistry.from(rod);
+        Totem nearest = this.rosePlugin.getManager(TotemManager.class).getClosestActive(event.getHook().getLocation());
 
-        InitialFishCatchEvent event = new InitialFishCatchEvent(player, rod, hook);
+        FishEventHandler.callEvents(augments, event);
+        
+        if (nearest != null) {
+            FishEventHandler.callEvents(nearest.upgrades(), event);
+        }
+        
+        if (event.isCancelled()) return result; // Cancel the event if it is cancelled
+        
+        InitialFishCatchEvent catchEvent = new InitialFishCatchEvent(event.getPlayer(), rod, event.getHook());
 
         // Run the augments onInitialCatch method
-        FishEventHandler.callEvents(augments, event);
+        FishEventHandler.callEvents(augments, catchEvent);
 
         // Run Totem Stuff
-        Totem nearest = FishingPlugin.get().getManager(TotemManager.class).getClosestActive(hook.getLocation());
         if (nearest != null) {
-            FishEventHandler.callEvents(nearest.upgrades(), event);
+            FishEventHandler.callEvents(nearest.upgrades(), catchEvent);
         }
 
         // Cancel the event if it is cancelled
-        if (event.isCancelled()) return result;
+        if (catchEvent.isCancelled()) return result;
 
-        for (int i = 0; i < event.getAmountToCatch(); i++) {
-            result.add(this.generateFish(augments, player, rod, hook));
+        for (int i = 0; i < catchEvent.getAmountToCatch(); i++) {
+            result.add(this.generateFish(augments, event.getPlayer().getPlayer(), rod, event.getHook()));
         }
 
         return result;

src/main/java/dev/oribuin/fishing/model/augment/impl/AugmentEnlightened.java

@@ -14,7 +14,7 @@
  */
 public class AugmentEnlightened extends Augment {
 
-    private String formula = "(%entropy% + %level%) * 0.03";
+    private String formula = "(%xp% + %level%) * 0.03";
 
     /**
      * Create a new type of augment with a name and description.
@@ -37,7 +37,7 @@ public AugmentEnlightened() {
      */
     @Override
     public void onFishCatch(FishCatchEvent event, int level) {
-        StringPlaceholders plc = StringPlaceholders.of("level", level, "xp", event.fishExp());
+        StringPlaceholders plc = StringPlaceholders.of("level", level, "xp", event.baseFishExp());
         double xp = FishUtils.evaluate(plc.apply(this.formula));
         event.fishExp((int) xp);
     }

src/main/java/dev/oribuin/fishing/model/augment/impl/AugmentIntuition.java

@@ -40,7 +40,7 @@ public AugmentIntuition() {
      */
     @Override
     public void onFishCatch(FishCatchEvent event, int level) {
-        StringPlaceholders plc = StringPlaceholders.of("level", level, "entropy", event.entropy());
+        StringPlaceholders plc = StringPlaceholders.of("level", level, "entropy", event.baseEntropy());
         double entropy = FishUtils.evaluate(plc.apply(this.formula));
         event.entropy((int) entropy);
     }

src/main/java/dev/oribuin/fishing/model/totem/Totem.java

@@ -3,6 +3,9 @@
 import com.destroystokyo.paper.ParticleBuilder;
 import dev.oribuin.fishing.FishingPlugin;
 import dev.oribuin.fishing.api.Propertied;
+import dev.oribuin.fishing.api.event.FishEventHandler;
+import dev.oribuin.fishing.api.event.impl.TotemActivateEvent;
+import dev.oribuin.fishing.api.event.impl.TotemDeactivateEvent;
 import dev.oribuin.fishing.api.task.AsyncTicker;
 import dev.oribuin.fishing.manager.TotemManager;
 import dev.oribuin.fishing.model.item.ItemConstruct;
@@ -124,13 +127,18 @@ public void tickAsync() {
             this.rotation = 0;
             this.entity.setHeadRotations(Rotations.ZERO);
             this.update(); // Update the totem
+
+            // Call the totem activate event on upgrades
+            FishEventHandler.callEvents(this.upgrades, new TotemDeactivateEvent(this));
         }
     }
 
     /**
      * Activate the totem for the player to use
+     *
+     * @param player The activating player
      */
-    public void activate() {
+    public void activate(Player player) {
         if (this.onCooldown()) {
             FishingPlugin.get().getLogger().warning("Failed to activate totem, The totem is on cooldown.");
             return;
@@ -140,6 +148,9 @@ public void activate() {
         this.setProperty(TOTEM_ACTIVE, true);
         this.setProperty(TOTEM_LAST_ACTIVE, System.currentTimeMillis());
         this.update();
+
+        // Call the totem activate event on upgrades
+        FishEventHandler.callEvents(this.upgrades, new TotemActivateEvent(this, player));
     }
 
     /**
@@ -335,7 +346,7 @@ public boolean withinRadius(Location location) {
         // Radius will be in a circle around the center
         if (location.getWorld() != this.center.getWorld()) return false;
 
-        return location.distance(this.center) <= UpgradeRegistry.RADIUS_UPGRADE.calculateRadius(this); 
+        return location.distance(this.center) <= UpgradeRegistry.RADIUS_UPGRADE.calculateRadius(this);
     }
 
     /**

src/main/java/dev/oribuin/fishing/model/totem/upgrade/impl/UpgradeTotemRadius.java

@@ -46,7 +46,9 @@ public StringPlaceholders placeholders(Totem totem) {
     }
 
     /**
-     * Calculate the radius of the totem based on the level of the upgrade
+     * Calculate the radius of the totem based on the level of the upgrade.
+     * <p>
+     * Radius is divided by 2 so it acts as a radius instead of a diameter.
      *
      * @param totem The totem to calculate the radius for
      *
@@ -55,7 +57,7 @@ public StringPlaceholders placeholders(Totem totem) {
     public int calculateRadius(Totem totem) {
         Integer level = totem.getProperty(this.key(), this.defaultLevel());
         StringPlaceholders plc = StringPlaceholders.of("level", level);
-        return (int) FishUtils.evaluate(plc.apply(this.radiusFormula));
+        return (int) FishUtils.evaluate(plc.apply(this.radiusFormula)) / 2;
     }
 
     /**