1.2

Updated currency api + multipliers api

Author: Jan Kluka

src/main/java/dev/drawethree/xprison/api/currency/model/XPrisonCurrency.java

@@ -24,6 +24,13 @@ public interface XPrisonCurrency {
      */
     double getStartingAmount();
 
+    /**
+     * Gets the maximum amount of a currency player can have
+     *
+     * @return maximum amount (cap) of a currency for player
+     */
+    double getMaxAmount();
+
     /**
      * Gets the display name of the currency (e.g., "Money", "Tokens").
      *

src/main/java/dev/drawethree/xprison/api/multipliers/XPrisonMultipliersAPI.java

@@ -1,7 +1,7 @@
 package dev.drawethree.xprison.api.multipliers;
 
+import dev.drawethree.xprison.api.currency.model.XPrisonCurrency;
 import dev.drawethree.xprison.api.multipliers.model.Multiplier;
-import dev.drawethree.xprison.api.multipliers.model.MultiplierType;
 import dev.drawethree.xprison.api.multipliers.model.PlayerMultiplier;
 import org.bukkit.entity.Player;
 
@@ -11,61 +11,34 @@
 public interface XPrisonMultipliersAPI {
 
 	/**
-	 * Gets the current global sell multiplier.
+	 * Gets the  global  multiplier for currency
 	 *
 	 * @return the global sell {@link Multiplier}
 	 */
-	Multiplier getGlobalSellMultiplier();
-
-	/**
-	 * Gets the current global token multiplier.
-	 *
-	 * @return the global token {@link Multiplier}
-	 */
-	Multiplier getGlobalTokenMultiplier();
+	Multiplier getGlobalMultiplier(XPrisonCurrency currency);
 
 	/**
 	 * Gets the player's sell multiplier.
 	 *
 	 * @param p the player
 	 * @return the {@link PlayerMultiplier} for selling
 	 */
-	PlayerMultiplier getSellMultiplier(Player p);
-
-	/**
-	 * Gets the player's token multiplier.
-	 *
-	 * @param p the player
-	 * @return the {@link PlayerMultiplier} for tokens
-	 */
-	PlayerMultiplier getTokenMultiplier(Player p);
+	PlayerMultiplier getPlayerMultiplier(Player p, XPrisonCurrency currency);
 
-	/**
-	 * Gets the player's rank multiplier.
-	 *
-	 * @param p the player
-	 * @return the {@link PlayerMultiplier} for the player's rank
-	 */
-	PlayerMultiplier getRankMultiplier(Player p);
-
-	/**
-	 * Gets the overall multiplier for a player based on the specified multiplier type.
-	 *
-	 * @param p              the player
-	 * @param multiplierType the type of multiplier (SELL / TOKENS)
-	 * @return the overall multiplier as a double
-	 */
-	double getPlayerMultiplier(Player p, MultiplierType multiplierType);
 
 	/**
 	 * Calculates the total amount to deposit after applying the player's multiplier.
 	 *
 	 * @param p       the player
 	 * @param deposit the original amount to deposit
-	 * @param type    the multiplier type (tokens or money)
+	 * @param currency    the currency affected
 	 * @return the new amount to deposit after applying multiplier
 	 */
-	default double getTotalToDeposit(Player p, double deposit, MultiplierType type) {
-		return deposit * (1.0 + this.getPlayerMultiplier(p, type));
+	default double getTotalToDeposit(Player p, double deposit, XPrisonCurrency currency) {
+		PlayerMultiplier multiplier = this.getPlayerMultiplier(p, currency);
+		if (multiplier == null) {
+			return deposit;
+		}
+		return deposit * (1.0 + multiplier.getMultiplier());
 	}
 }

src/main/java/dev/drawethree/xprison/api/multipliers/events/PlayerMultiplierReceiveEvent.java

@@ -1,6 +1,6 @@
 package dev.drawethree.xprison.api.multipliers.events;
 
-import dev.drawethree.xprison.api.multipliers.model.MultiplierType;
+import dev.drawethree.xprison.api.currency.model.XPrisonCurrency;
 import dev.drawethree.xprison.api.shared.events.player.XPrisonPlayerEvent;
 import lombok.Getter;
 import org.bukkit.entity.Player;
@@ -17,13 +17,14 @@ public final class PlayerMultiplierReceiveEvent extends XPrisonPlayerEvent {
 
 	private static final HandlerList handlers = new HandlerList();
 
+	private final XPrisonCurrency currency;
+
 	private final double multiplier;
 
 	private final TimeUnit timeUnit;
 
 	private final long duration;
 
-	private final MultiplierType type;
 
 	/**
 	 * Constructs a new PlayerMultiplierReceiveEvent.
@@ -32,14 +33,14 @@ public final class PlayerMultiplierReceiveEvent extends XPrisonPlayerEvent {
 	 * @param multiplier the multiplier value
 	 * @param timeUnit   the unit of time for the multiplier duration
 	 * @param duration   the duration of the multiplier
-	 * @param type       the type of multiplier (e.g., SELL, TOKENS)
+	 * @param currency       the currency affected
 	 */
-	public PlayerMultiplierReceiveEvent(Player player, double multiplier, TimeUnit timeUnit, long duration, MultiplierType type) {
+	public PlayerMultiplierReceiveEvent(Player player, XPrisonCurrency currency, double multiplier, TimeUnit timeUnit, long duration) {
 		super(player);
-		this.multiplier = multiplier;
+        this.currency = currency;
+        this.multiplier = multiplier;
 		this.timeUnit = timeUnit;
 		this.duration = duration;
-		this.type = type;
 	}
 
 	/**