make it rain augm + many fixes

Took 1 hour 50 minutes

Author: Oribuin

.idea/codeStyles/Project.xml

@@ -30,7 +30,9 @@ public static <T extends FishEventHandler, Z extends Event> void callEvents(Map<
         applicable.keySet().removeIf(x -> !x.applicable(event));
 
         // Sort the events by their priority and call them
-        applicable.entrySet().stream().map(x -> new MutableEventWrapper<>(x, event)).sorted(MutableEventWrapper::compare).forEachOrdered(x -> x.type().callEvent(event, x.level()));
+        applicable.entrySet().stream().map(x -> new MutableEventWrapper<>(x, event))
+                .sorted(MutableEventWrapper::compare)
+                .forEachOrdered(x -> x.type().callEvent(event, x.level()));
     }
 
     /**

src/main/java/dev/oribuin/fishing/api/event/FishEventHandler.java

@@ -7,6 +7,7 @@
 import dev.oribuin.fishing.api.event.impl.FishGenerateEvent;
 import dev.oribuin.fishing.api.event.impl.FishGutEvent;
 import dev.oribuin.fishing.api.event.impl.InitialFishCatchEvent;
+import org.bukkit.event.player.PlayerFishEvent;
 
 /**
  * A global list of methods that can be used to modify all the relevant events in the plugin
@@ -77,4 +78,11 @@ default void onFishGut(FishGutEvent event, int level) {}
      */
     default void onConditionCheck(ConditionCheckEvent event, int level) {}
 
+    /**
+     * The functionality provided when a fish bites the rod before it is caught
+     * @param event The fishing event 
+     * @param level The level of the ability that was used, if applicable (0 if not)
+     */
+    default void onBite(PlayerFishEvent event, int level) {}
+    
 }

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

@@ -52,7 +52,8 @@ public FishCatchEvent(@NotNull Player who, @NotNull ItemStack rod, @NotNull Fish
         this.rod = rod;
         this.hook = hook;
         this.fish = fish;
-        
+        this.cancelled = false;
+
         // Set the base values for the fish
         Tier tier = this.fish.tier();
         this.baseEntropy = tier.entropy();

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

@@ -1,12 +1,12 @@
 package dev.oribuin.fishing.api.event.impl;
 
 import dev.oribuin.fishing.FishingPlugin;
+import dev.oribuin.fishing.manager.TierManager;
 import dev.oribuin.fishing.model.augment.Augment;
 import dev.oribuin.fishing.model.augment.AugmentRegistry;
-import dev.oribuin.fishing.manager.TierManager;
+import dev.oribuin.fishing.model.condition.ConditionRegistry;
 import dev.oribuin.fishing.model.fish.Fish;
 import dev.oribuin.fishing.model.fish.Tier;
-import dev.oribuin.fishing.model.condition.ConditionRegistry;
 import dev.oribuin.fishing.util.FishUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.FishHook;
@@ -101,10 +101,14 @@ public void generate() {
                 .filter(x -> ConditionRegistry.check(x, player, rod, hook))
                 .toList();
 
+        System.out.println("Total fish that can be caught: " + canCatch.size());
         if (canCatch.isEmpty()) return;
 
         // Pick a random fish from the list
-        this.fish = canCatch.get(FishUtils.RANDOM.nextInt(canCatch.size()));
+        int index = FishUtils.RANDOM.nextInt(canCatch.size());
+        System.out.println("Chosen Index: " + index);
+        this.fish = canCatch.get(index);
+        System.out.println("Chosen Fish: " + this.fish);
     }
 
     /**

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

@@ -2,21 +2,28 @@
 
 import dev.oribuin.fishing.FishingPlugin;
 import dev.oribuin.fishing.api.event.FishEventHandler;
+import dev.oribuin.fishing.api.event.def.FishingEvents;
 import dev.oribuin.fishing.api.event.impl.FishCatchEvent;
-import dev.oribuin.fishing.model.augment.AugmentRegistry;
+import dev.oribuin.fishing.api.event.impl.InitialFishCatchEvent;
 import dev.oribuin.fishing.manager.DataManager;
 import dev.oribuin.fishing.manager.FishManager;
 import dev.oribuin.fishing.manager.LocaleManager;
-import dev.oribuin.fishing.model.economy.CurrencyRegistry;
+import dev.oribuin.fishing.manager.TotemManager;
+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.totem.Totem;
 import dev.oribuin.fishing.storage.Fisher;
+import net.kyori.adventure.text.Component;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class FishListener implements Listener {
 
@@ -30,16 +37,46 @@ public FishListener(FishingPlugin plugin) {
 
     @EventHandler(ignoreCancelled = true)
     public void onFish(PlayerFishEvent event) {
-        if (event.getState() != PlayerFishEvent.State.CAUGHT_FISH) return;
         if (event.getHand() == null) return;
 
         ItemStack hand = event.getPlayer().getInventory().getItem(event.getHand()).clone();
+        Map<Augment, Integer> augments = AugmentRegistry.from(hand);
+
+        switch (event.getState()) {
+            case CAUGHT_FISH -> this.catchNewFish(event, hand, augments);
+            // todo: allow bite actual modification
+        }
+
+    }
+
+    /**
+     * Catch a new type of fish 
+     *
+     * @param event The catching event
+     */
+    private void catchNewFish(PlayerFishEvent event, ItemStack rod, Map<Augment, Integer> augments) {
         FishManager manager = this.plugin.getManager(FishManager.class);
+        TotemManager totemProvider = this.plugin.getManager(TotemManager.class);
 
         // If caught no fish, do nothing
-        List<Fish> caught = manager.tryCatch(event);
-        if (caught.isEmpty()) return;
+        List<Fish> caught = new ArrayList<>();
+        InitialFishCatchEvent catchEvent = new InitialFishCatchEvent(event.getPlayer(), rod, event.getHook());
+        Totem nearest = totemProvider.getClosestActive(event.getHook().getLocation());
 
+        // Run the augments onInitialCatch method
+        FishEventHandler.callEvents(augments, catchEvent);
+
+        // Run Totem Stuff
+        if (nearest != null) {
+            FishEventHandler.callEvents(nearest.upgrades(), catchEvent);
+        }
+
+        // Cancel the event if it is cancelled
+        if (catchEvent.isCancelled()) return;
+
+        for (int i = 0; i < catchEvent.getAmountToCatch(); i++) {
+            caught.add(manager.generateFish(augments, event.getPlayer().getPlayer(), rod, event.getHook()));
+        }
         // Add the fish into the player inventory
         float naturalExp = event.getExpToDrop();
         int newFishExp = 0;
@@ -48,11 +85,11 @@ public void onFish(PlayerFishEvent event) {
         for (Fish fish : caught) {
             if (fish == null) continue;
 
-            FishCatchEvent fishCatchEvent = new FishCatchEvent(event.getPlayer(), hand, event.getHook(), fish);
+            FishCatchEvent fishCatchEvent = new FishCatchEvent(event.getPlayer(), rod, event.getHook(), fish);
             fishCatchEvent.naturalExp(naturalExp); // Set the base experience gained
+            fishCatchEvent.callEvent(); // call through bukkit
 
-            FishEventHandler.callEvents(AugmentRegistry.from(hand), fishCatchEvent);
-            
+            FishEventHandler.callEvents(augments, fishCatchEvent);
             if (fishCatchEvent.isCancelled()) continue; // If the event is cancelled, do nothing
 
             // Use the event values because they could have been modified
@@ -61,10 +98,11 @@ public void onFish(PlayerFishEvent event) {
             newEntropy += fishCatchEvent.entropy();
 
             // Tell the player they caught a fish
-            event.getPlayer().sendMessage("You caught a " + fish.displayName() + "!"); // TODO: Replace with locale message
             //            locale.sendMessage(event.getPlayer(), "fish-caught", StringPlaceholders.of("fish", fish.displayName()));
 
             ItemStack resultItem = fish.createItemStack();
+            Component message = Component.text("You have caught a ").append(resultItem.displayName()); // TODO: Replace with locale message
+            event.getPlayer().sendMessage(message);
 
             // Give the fish to the player
             PlayerInventory inv = event.getPlayer().getInventory();
@@ -75,7 +113,7 @@ public void onFish(PlayerFishEvent event) {
 
             inv.addItem(resultItem);
         }
-        
+
         Fisher fisher = this.plugin.getManager(DataManager.class).get(event.getPlayer().getUniqueId());
         if (fisher == null) return;
 

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

@@ -1,6 +1,5 @@
 package dev.oribuin.fishing.manager;
 
-import dev.oribuin.fishing.FishingPlugin;
 import dev.oribuin.fishing.api.event.FishEventHandler;
 import dev.oribuin.fishing.api.event.impl.FishGenerateEvent;
 import dev.oribuin.fishing.api.event.impl.InitialFishCatchEvent;
@@ -10,9 +9,9 @@
 import dev.oribuin.fishing.model.totem.Totem;
 import dev.rosewood.rosegarden.RosePlugin;
 import dev.rosewood.rosegarden.manager.Manager;
+import org.bukkit.Bukkit;
 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;
 
@@ -44,32 +43,24 @@ public List<Fish> tryCatch(PlayerFishEvent event) {
         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());
-
-        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, catchEvent);
-        
+
         // Run Totem Stuff
         if (nearest != null) {
             FishEventHandler.callEvents(nearest.upgrades(), catchEvent);
         }
-         
+
         // Cancel the event if it is cancelled
         if (catchEvent.isCancelled()) return result;
 
         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/manager/FishManager.java

@@ -12,6 +12,7 @@
 import dev.rosewood.rosegarden.config.CommentedFileConfiguration;
 import dev.rosewood.rosegarden.utils.StringPlaceholders;
 import org.apache.commons.lang3.StringUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.event.Event;
@@ -20,6 +21,9 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.logging.Logger;
 
 /**
  * Augments are upgrades that can be crafted and applied to fishing rods to give them unique abilities to help the player produce more fish.
@@ -30,6 +34,9 @@
  */
 public abstract class Augment extends FishEventHandler implements Configurable {
 
+    protected final Random random = ThreadLocalRandom.current();
+    
+    protected final Logger logger;
     private final String name;
     private boolean enabled;
     private List<String> description;
@@ -58,6 +65,8 @@ public Augment(String name, String... description) {
         this.displayLine = "&c" + StringUtils.capitalize(this.name.replace("_", " ")) + " %level_roman%";
         this.permission = "fishing.augment." + name;
         this.price = Cost.of(CurrencyRegistry.ENTROPY, 25000);
+        
+        this.logger = Logger.getLogger("fishing-augment:" + this.name);
     }
 
     /**

src/main/java/dev/oribuin/fishing/model/augment/Augment.java

@@ -10,6 +10,7 @@
 import dev.oribuin.fishing.model.augment.impl.AugmentHotspot;
 import dev.oribuin.fishing.model.augment.impl.AugmentIndulge;
 import dev.oribuin.fishing.model.augment.impl.AugmentIntuition;
+import dev.oribuin.fishing.model.augment.impl.AugmentMakeItRain;
 import dev.oribuin.fishing.model.augment.impl.AugmentRainDance;
 import dev.oribuin.fishing.util.math.RomanNumber;
 import dev.rosewood.rosegarden.utils.HexUtils;
@@ -48,13 +49,14 @@ private AugmentRegistry() {}
 
     static {
         register(AugmentBiomeBlend::new);
-        register(AugmentRainDance::new);
-        register(AugmentHotspot::new);
-        register(AugmentGenius::new);
-        register(AugmentIntuition::new);
-        register(AugmentFineSlicing::new);
         register(AugmentEnlightened::new);
+        register(AugmentFineSlicing::new);
+        register(AugmentGenius::new);
+        register(AugmentHotspot::new);
         register(AugmentIndulge::new);
+        register(AugmentIntuition::new);
+        register(AugmentMakeItRain::new);
+        register(AugmentRainDance::new);
     }
 
     /**

src/main/java/dev/oribuin/fishing/model/augment/AugmentRegistry.java

@@ -47,7 +47,7 @@ public void onConditionCheck(ConditionCheckEvent event, int level) {
 
         StringPlaceholders plc = StringPlaceholders.of("level", level);
         double chance = FishUtils.evaluate(plc.apply(this.chanceFormula));
-        if (Math.random() > chance) return;
+        if (this.random.nextDouble(100) <= chance) return;
 
         event.result(true);
     }