more event stuff

Author: Robin

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

@@ -14,7 +14,7 @@
  * @param <T>      The event type to be registered with the function
  */
 public record EventWrapper<T extends Event>(Class<T> event, BiConsumer<T, Integer> function, EventPriority order) {
-
+    
     /**
      * Call the function that was registered with the event, This will cast the event to the correct type
      *

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

@@ -3,7 +3,6 @@
 import org.bukkit.event.Event;
 import org.bukkit.event.EventPriority;
 
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.BiConsumer;
@@ -22,17 +21,14 @@ public abstract class FishEventHandler implements FishingEvents {
      * @param event The {@link Event} to call
      * @param <T>   The event type to call
      */
-    public static <T extends FishEventHandler> void callEvents(Map<T, Integer> values, Event event) {
+    public static <T extends FishEventHandler, Z extends Event> void callEvents(Map<T, Integer> values, Z event) {
         if (!event.callEvent()) return; // Call the event through bukkit to allow other plugins to listen to the event
 
         Map<T, Integer> applicable = new HashMap<>(values);
-        applicable.keySet().removeIf(x -> !x.events().containsKey(event.getClass()));
+        applicable.keySet().removeIf(x -> !x.applicable(event));
 
-        applicable.entrySet()
-                .stream()
-                .map(x -> new MutableEventWrapper<>(x, event))
-                .sorted(Comparator.comparingInt(o -> o.wrapper().order().getSlot()))
-                .forEach(x -> x.wrapper().accept(event, x.level()));
+        // 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()));
     }
 
     /**
@@ -41,16 +37,13 @@ public static <T extends FishEventHandler> void callEvents(Map<T, Integer> value
      * @param event The {@link Event} to call
      * @param level The level of the event
      * @param <T>   The event type to call
-     *
-     * @return The event that was called
      */
     @SuppressWarnings("unchecked")
-    public <T extends Event> T callEvent(T event, int level) {
+    public <T extends Event> void callEvent(T event, int level) {
         EventWrapper<?> wrapper = this.events.get(event.getClass());
-        if (wrapper == null) return event;
+        if (wrapper == null) return;
 
         ((EventWrapper<T>) wrapper).function().accept(event, level);
-        return event;
     }
 
     /**

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

@@ -1,8 +1,6 @@
 package dev.oribuin.fishing.api.event;
 
-import com.google.common.base.Supplier;
 import dev.oribuin.fishing.model.augment.Augment;
-import dev.oribuin.fishing.model.augment.AugmentRegistry;
 import org.bukkit.event.Event;
 
 import java.util.Map;
@@ -13,7 +11,7 @@
 public class MutableEventWrapper<T extends FishEventHandler> {
 
     private final T type;
-    private final int level;
+    private final Integer level;
     private final EventWrapper<?> wrapper;
 
     /**
@@ -25,7 +23,7 @@ public class MutableEventWrapper<T extends FishEventHandler> {
      *
      * @see FishEventHandler#callEvents(Map, Event) Where this is used
      */
-    public MutableEventWrapper(T type, int level, Event event) {
+    public MutableEventWrapper(T type, Integer level, Event event) {
         this.type = type;
         this.level = level;
         this.wrapper = type.getWrapper(event.getClass());
@@ -43,6 +41,17 @@ public MutableEventWrapper(Map.Entry<T, Integer> entry, Event event) {
         this(entry.getKey(), entry.getValue(), event);
     }
 
+    /**
+     * Compare the priority of two events to determine which one should be called first
+     *
+     * @param other The other event to compare
+     *
+     * @return The comparison of the two events
+     */
+    public int compare(MutableEventWrapper<T> other) {
+        return Integer.compare(this.wrapper.order().getSlot(), other.wrapper().order().getSlot());
+    }
+
     /**
      * Get the augment that was registered
      *
@@ -57,7 +66,7 @@ public T type() {
      *
      * @return The level of the augment that was registered
      */
-    public int level() {
+    public Integer level() {
         return level;
     }
 

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

@@ -14,6 +14,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
+import org.bukkit.event.Event;
 import org.jetbrains.annotations.NotNull;
 
 import java.nio.file.Path;
@@ -193,6 +194,19 @@ public final StringPlaceholders placeholders() {
                 .build();
     }
 
+    /**
+     * Call an event from the handler's registered events, This will not take priority into account.
+     *
+     * @param event The {@link Event} to call
+     * @param level The level of the event
+     */
+    @Override
+    public <T extends Event> void callEvent(T event, int level) {
+        if (!this.enabled) return;
+        
+        super.callEvent(event, level);
+    }
+
     /**
      * Information about the augment which will be displayed in top of the augment configuration file
      *

src/main/java/dev/oribuin/fishing/model/totem/upgrade/TotemUpgrade.java

@@ -3,38 +3,27 @@
 import dev.oribuin.fishing.api.event.FishEventHandler;
 import dev.oribuin.fishing.config.Configurable;
 import dev.oribuin.fishing.model.economy.Cost;
+import dev.oribuin.fishing.model.item.ItemConstruct;
 import dev.oribuin.fishing.model.totem.Totem;
+import org.bukkit.Material;
 import org.jetbrains.annotations.NotNull;
 
 import java.nio.file.Path;
 
 public abstract class TotemUpgrade extends FishEventHandler implements Configurable {
-
-    /**
-     * The name of the totem upgrade to be displayed to the player
-     *
-     * @return The name of the upgrade
-     */
-    public abstract String name();
-
-    /**
-     * Apply the upgrade to the totem object
-     *
-     * @param totem The totem object to apply the upgrade to
-     * @param level The level of the upgrade
-     */
-    public void applyTo(Totem totem, int level) {
+    
+    protected final String name;
+    private boolean enabled;
+    private ItemConstruct icon;
+    private int maxLevel;
+    
+    public TotemUpgrade(String name) {
+        this.name = name;
+        this.enabled = true;
+        this.icon = ItemConstruct.of(Material.STONE); // TODO: Change this to a custom item
+        this.maxLevel = 1;
     }
-
-    /**
-     * Get the cost of the upgrade for a specific level
-     *
-     * @param level The level of the upgrade
-     *
-     * @return The cost of the upgrade
-     */
-    public abstract Cost costFor(int level);
-
+    
     /**
      * The path to the configuration file to be loaded. All paths will be relative to the {@link #parentFolder()},
      * If you wish to overwrite this functionality, override the {@link #parentFolder()} method
@@ -43,7 +32,7 @@ public void applyTo(Totem totem, int level) {
      */
     @Override
     public @NotNull Path configPath() {
-        return Path.of("totem", "upgrade", this.name().toLowerCase() + ".yml");
+        return Path.of("totem", "upgrade", this.name.toLowerCase() + ".yml");
     }
 
 }

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

@@ -19,49 +19,8 @@ public class UpgradeTotemRadius extends TotemUpgrade implements Configurable {
 
     private final Map<Integer, Tier> tiers = new HashMap<>();
 
-    /**
-     * The name of the totem upgrade to be displayed to the player
-     *
-     * @return The name of the upgrade
-     */
-    @Override
-    public String name() {
-        return "Radius";
-    }
-
-    /**
-     * Apply the upgrade to the totem object
-     *
-     * @param totem The totem object to apply the upgrade to
-     * @param level The level of the upgrade
-     */
-    @Override
-    public void applyTo(Totem totem, int level) {
-        Tier tier = this.tiers.get(level);
-        if (tier == null) {
-            FishingPlugin.get().getLogger().warning("Failed to apply upgrade: " + this.name() + " to totem, The tier does not exist.");
-            return;
-        }
-
-        totem.radius(tier.newRadius());
-    }
-
-    /**
-     * Get the cost of the upgrade for a specific level
-     *
-     * @param level The level of the upgrade
-     *
-     * @return The cost of the upgrade
-     */
-    @Override
-    public Cost costFor(int level) {
-        Tier tier = this.tiers.get(level);
-        if (tier == null) {
-            FishingPlugin.get().getLogger().warning("Failed to get cost for upgrade: " + this.name() + ", The tier does not exist.");
-            return new Cost(CurrencyRegistry.ENTROPY, 0);
-        }
-
-        return this.tiers.get(level).cost();
+    public UpgradeTotemRadius() {
+        super("radius");
     }
 
     /**
@@ -108,7 +67,7 @@ public void loadSettings(@NotNull CommentedConfigurationSection config) {
                 int level = Integer.parseInt(key);
                 this.tiers.put(level, new Tier(Cost.of(this.pullSection(section, "cost")), newRadius));
             } catch (IllegalArgumentException ex) {
-                FishingPlugin.get().getLogger().warning("Failed to load tier: " + key + " in upgrade: " + this.name() + ", The tier must be a number.");
+                FishingPlugin.get().getLogger().warning("Failed to load tier: " + key + " in upgrade: " + this.name + ", The tier must be a number.");
             }
         });
     }