Merge branch 'release/1.0.13'

Author: Maxlego08

.gitignore

@@ -116,3 +116,5 @@ runs/
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
+.claude/settings.local.json
+CLAUDE.md

gradle.properties

@@ -1 +1 @@
-version=1.0.12
+version=1.0.13

readme.md

@@ -47,7 +47,7 @@ To add the Currencies API to your project using Maven, add the following to your
 <dependency>
     <groupId>fr.traqueur.currencies</groupId>
     <artifactId>currenciesapi</artifactId>
-    <version>1.0.12</version>
+    <version>1.0.13</version>
 </dependency>
 ```
 
@@ -64,7 +64,7 @@ repositories {
 }
 
 dependencies {
-    implementation("fr.traqueur.currencies:currenciesapi:1.0.12")
+    implementation("fr.traqueur.currencies:currenciesapi:1.0.13")
 }
 ```
 

src/main/java/fr/traqueur/currencies/Currencies.java

@@ -2,13 +2,13 @@
 
 import fr.traqueur.currencies.providers.*;
 import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
 
 import java.lang.reflect.Constructor;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 /**
  * The list of all the currencies that can be used in the plugin.
@@ -154,88 +154,91 @@ private boolean isDisable() {
     /**
      * Add some money to a player.
      *
-     * @param player The player to add the money.
-     * @param amount The amount of money to add.
-     * @param reason The reason of the deposit.
+     * @param playerId The UUID of the player to add the money.
+     * @param amount   The amount of money to add.
+     * @param reason   The reason of the deposit.
      */
-    public void deposit(OfflinePlayer player, BigDecimal amount, String reason) {
-        this.deposit(player, amount, "default", reason);
+    public void deposit(UUID playerId, BigDecimal amount, String reason) {
+        this.deposit(playerId, amount, "default", reason);
     }
 
     /**
      * Remove some money from a player.
      *
-     * @param player The player to remove the money.
-     * @param amount The amount of money to remove.
-     * @param reason The reason of the withdrawal.
+     * @param playerId The UUID of the player to remove the money.
+     * @param amount   The amount of money to remove.
+     * @param reason   The reason of the withdrawal.
      */
-    public void withdraw(OfflinePlayer player, BigDecimal amount, String reason) {
-        this.withdraw(player, amount, "default", reason);
+    public void withdraw(UUID playerId, BigDecimal amount, String reason) {
+        this.withdraw(playerId, amount, "default", reason);
     }
 
     /**
      * Add some money to a player.
      *
-     * @param player The player to add the money.
-     * @param amount The amount of money to add.
+     * @param playerId The UUID of the player to add the money.
+     * @param amount   The amount of money to add.
      */
-    public void deposit(OfflinePlayer player, BigDecimal amount) {
-        this.deposit(player, amount, "default", "No reason");
+    public void deposit(UUID playerId, BigDecimal amount) {
+        this.deposit(playerId, amount, "default", "No reason");
     }
 
     /**
      * Remove some money from a player.
      *
-     * @param player The player to remove the money.
-     * @param amount The amount of money to remove.
+     * @param playerId The UUID of the player to remove the money.
+     * @param amount   The amount of money to remove.
      */
-    public void withdraw(OfflinePlayer player, BigDecimal amount) {
-        this.withdraw(player, amount, "default", "No reason");
+    public void withdraw(UUID playerId, BigDecimal amount) {
+        this.withdraw(playerId, amount, "default", "No reason");
     }
 
     /**
      * Get the balance of a player.
      *
-     * @param player The player to get the balance.
+     * @param playerId The UUID of the player to get the balance.
      * @return The balance of the player.
      */
-    public BigDecimal getBalance(OfflinePlayer player) {
-        return getBalance(player, "default");
+    public BigDecimal getBalance(UUID playerId) {
+        return getBalance(playerId, "default");
     }
 
     /**
      * Add some money to a player.
      *
-     * @param player The player to add the money.
-     * @param amount The amount of money to add.
-     * @param reason The reason of the deposit.
+     * @param playerId     The UUID of the player to add the money.
+     * @param amount       The amount of money to add.
+     * @param currencyName The name of the currency.
+     * @param reason       The reason of the deposit.
      */
-    public void deposit(OfflinePlayer player, BigDecimal amount, String currencyName, String reason) {
+    public void deposit(UUID playerId, BigDecimal amount, String currencyName, String reason) {
         this.canBeUse(currencyName);
-        this.providers.get(currencyName).deposit(player, amount, reason);
+        this.providers.get(currencyName).deposit(playerId, amount, reason);
     }
 
     /**
      * Remove some money from a player.
      *
-     * @param player The player to remove the money.
-     * @param amount The amount of money to remove.
-     * @param reason The reason of the withdrawal.
+     * @param playerId     The UUID of the player to remove the money.
+     * @param amount       The amount of money to remove.
+     * @param currencyName The name of the currency.
+     * @param reason       The reason of the withdrawal.
      */
-    public void withdraw(OfflinePlayer player, BigDecimal amount, String currencyName, String reason) {
+    public void withdraw(UUID playerId, BigDecimal amount, String currencyName, String reason) {
         this.canBeUse(currencyName);
-        this.providers.get(currencyName).withdraw(player, amount, reason);
+        this.providers.get(currencyName).withdraw(playerId, amount, reason);
     }
 
     /**
      * Get the balance of a player.
      *
-     * @param player The player to get the balance.
+     * @param playerId     The UUID of the player to get the balance.
+     * @param currencyName The name of the currency.
      * @return The balance of the player.
      */
-    public BigDecimal getBalance(OfflinePlayer player, String currencyName) {
+    public BigDecimal getBalance(UUID playerId, String currencyName) {
         this.canBeUse(currencyName);
-        return this.providers.get(currencyName).getBalance(player);
+        return this.providers.get(currencyName).getBalance(playerId);
     }
 
     private void canBeUse(String currencyName) {
@@ -254,4 +257,4 @@ private void canBeUse(String currencyName) {
             throw new IllegalStateException("You must create the provider for the plugin " + this.name + currency + " before using it.");
         }
     }
-}
+}

src/main/java/fr/traqueur/currencies/CurrencyProvider.java

@@ -1,8 +1,7 @@
 package fr.traqueur.currencies;
 
-import org.bukkit.OfflinePlayer;
-
 import java.math.BigDecimal;
+import java.util.UUID;
 
 /**
  * Interface used to interact with a currency provider.
@@ -14,27 +13,27 @@ public interface CurrencyProvider {
     /**
      * Deposit a certain amount of currency to a player.
      *
-     * @param offlinePlayer The player to deposit the money.
-     * @param amount        The amount of currency to deposit.
-     * @param reason        The reason of the deposit.
+     * @param playerId The UUID of the player to deposit the money.
+     * @param amount   The amount of currency to deposit.
+     * @param reason   The reason of the deposit.
      */
-    void deposit(OfflinePlayer offlinePlayer, BigDecimal amount, String reason);
+    void deposit(UUID playerId, BigDecimal amount, String reason);
 
     /**
      * Withdraw a certain amount of currency from a player.
      *
-     * @param offlinePlayer The player to withdraw the money.
-     * @param amount        The amount of currency to withdraw.
-     * @param reason        The reason of the withdrawal.
+     * @param playerId The UUID of the player to withdraw the money.
+     * @param amount   The amount of currency to withdraw.
+     * @param reason   The reason of the withdrawal.
      */
-    void withdraw(OfflinePlayer offlinePlayer, BigDecimal amount, String reason);
+    void withdraw(UUID playerId, BigDecimal amount, String reason);
 
     /**
      * Get the balance of a player.
      *
-     * @param offlinePlayer The player to get the balance.
+     * @param playerId The UUID of the player to get the balance.
      * @return The balance of the player.
      */
-    BigDecimal getBalance(OfflinePlayer offlinePlayer);
+    BigDecimal getBalance(UUID playerId);
 
 }

src/main/java/fr/traqueur/currencies/providers/BeastTokenProvider.java

@@ -2,13 +2,16 @@
 
 import fr.traqueur.currencies.CurrencyProvider;
 import me.mraxetv.beasttokens.api.BeastTokensAPI;
+import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 
 import java.math.BigDecimal;
+import java.util.UUID;
 
 public class BeastTokenProvider implements CurrencyProvider {
     @Override
-    public void deposit(OfflinePlayer offlinePlayer, BigDecimal amount, String reason) {
+    public void deposit(UUID playerId, BigDecimal amount, String reason) {
+        OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(playerId);
         if (offlinePlayer.isOnline()) {
             BeastTokensAPI.getTokensManager().addTokens(offlinePlayer.getPlayer(), amount.doubleValue());
         } else {
@@ -17,7 +20,8 @@ public void deposit(OfflinePlayer offlinePlayer, BigDecimal amount, String reaso
     }
 
     @Override
-    public void withdraw(OfflinePlayer offlinePlayer, BigDecimal amount, String reason) {
+    public void withdraw(UUID playerId, BigDecimal amount, String reason) {
+        OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(playerId);
         if (offlinePlayer.isOnline()) {
             BeastTokensAPI.getTokensManager().removeTokens(offlinePlayer.getPlayer(), amount.doubleValue());
         } else {
@@ -26,7 +30,8 @@ public void withdraw(OfflinePlayer offlinePlayer, BigDecimal amount, String reas
     }
 
     @Override
-    public BigDecimal getBalance(OfflinePlayer offlinePlayer) {
+    public BigDecimal getBalance(UUID playerId) {
+        OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(playerId);
         return BigDecimal.valueOf(offlinePlayer.isOnline() ? BeastTokensAPI.getTokensManager().getTokens(offlinePlayer.getPlayer()) : BeastTokensAPI.getTokensManager().getTokens(offlinePlayer));
     }
 }

src/main/java/fr/traqueur/currencies/providers/CoinsEngineProvider.java

@@ -1,10 +1,10 @@
 package fr.traqueur.currencies.providers;
 
 import fr.traqueur.currencies.CurrencyProvider;
-import org.bukkit.OfflinePlayer;
 import su.nightexpress.coinsengine.api.CoinsEngineAPI;
 
 import java.math.BigDecimal;
+import java.util.UUID;
 
 public class CoinsEngineProvider implements CurrencyProvider {
 
@@ -15,17 +15,17 @@ public CoinsEngineProvider(String currencyName) {
     }
 
     @Override
-    public void deposit(OfflinePlayer offlinePlayer, BigDecimal amount, String reason) {
-        CoinsEngineAPI.addBalance(offlinePlayer.getUniqueId(), this.currencyName, amount.doubleValue());
+    public void deposit(UUID playerId, BigDecimal amount, String reason) {
+        CoinsEngineAPI.addBalance(playerId, this.currencyName, amount.doubleValue());
     }
 
     @Override
-    public void withdraw(OfflinePlayer offlinePlayer, BigDecimal amount, String reason) {
-        CoinsEngineAPI.removeBalance(offlinePlayer.getUniqueId(), this.currencyName, amount.doubleValue());
+    public void withdraw(UUID playerId, BigDecimal amount, String reason) {
+        CoinsEngineAPI.removeBalance(playerId, this.currencyName, amount.doubleValue());
     }
 
     @Override
-    public BigDecimal getBalance(OfflinePlayer offlinePlayer) {
-        return BigDecimal.valueOf(CoinsEngineAPI.getBalance(offlinePlayer.getUniqueId(), this.currencyName));
+    public BigDecimal getBalance(UUID playerId) {
+        return BigDecimal.valueOf(CoinsEngineAPI.getBalance(playerId, this.currencyName));
     }
 }

src/main/java/fr/traqueur/currencies/providers/EcoBitProvider.java

@@ -4,9 +4,11 @@
 import com.willfp.ecobits.currencies.Currency;
 import com.willfp.ecobits.currencies.CurrencyUtils;
 import fr.traqueur.currencies.CurrencyProvider;
+import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 
 import java.math.BigDecimal;
+import java.util.UUID;
 
 public class EcoBitProvider implements CurrencyProvider {
 
@@ -24,20 +26,23 @@ private void initialize() {
     }
 
     @Override
-    public void deposit(OfflinePlayer offlinePlayer, BigDecimal amount, String reason) {
+    public void deposit(UUID playerId, BigDecimal amount, String reason) {
         initialize();
+        OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(playerId);
         CurrencyUtils.adjustBalance(offlinePlayer, currency, amount);
     }
 
     @Override
-    public void withdraw(OfflinePlayer offlinePlayer, BigDecimal amount, String reason) {
+    public void withdraw(UUID playerId, BigDecimal amount, String reason) {
         initialize();
+        OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(playerId);
         CurrencyUtils.adjustBalance(offlinePlayer, currency, amount.negate());
     }
 
     @Override
-    public BigDecimal getBalance(OfflinePlayer offlinePlayer) {
+    public BigDecimal getBalance(UUID playerId) {
         initialize();
+        OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(playerId);
         return CurrencyUtils.getBalance(offlinePlayer, currency);
     }
 }

src/main/java/fr/traqueur/currencies/providers/ElementalGemsProvider.java

@@ -2,23 +2,23 @@
 
 import fr.traqueur.currencies.CurrencyProvider;
 import me.elementalgaming.ElementalGems.GemAPI;
-import org.bukkit.OfflinePlayer;
 
 import java.math.BigDecimal;
+import java.util.UUID;
 
 public class ElementalGemsProvider implements CurrencyProvider {
     @Override
-    public void deposit(OfflinePlayer offlinePlayer, BigDecimal amount, String reason) {
-        GemAPI.addGems(offlinePlayer.getUniqueId(), amount.doubleValue());
+    public void deposit(UUID playerId, BigDecimal amount, String reason) {
+        GemAPI.addGems(playerId, amount.doubleValue());
     }
 
     @Override
-    public void withdraw(OfflinePlayer offlinePlayer, BigDecimal amount, String reason) {
-        GemAPI.removeGems(offlinePlayer.getUniqueId(), amount.doubleValue());
+    public void withdraw(UUID playerId, BigDecimal amount, String reason) {
+        GemAPI.removeGems(playerId, amount.doubleValue());
     }
 
     @Override
-    public BigDecimal getBalance(OfflinePlayer offlinePlayer) {
-        return BigDecimal.valueOf(GemAPI.getGems(offlinePlayer.getUniqueId()));
+    public BigDecimal getBalance(UUID playerId) {
+        return BigDecimal.valueOf(GemAPI.getGems(playerId));
     }
 }

src/main/java/fr/traqueur/currencies/providers/ElementalTokensProvider.java

@@ -2,23 +2,23 @@
 
 import fr.traqueur.currencies.CurrencyProvider;
 import me.elementalgaming.ElementalTokens.TokenAPI;
-import org.bukkit.OfflinePlayer;
 
 import java.math.BigDecimal;
+import java.util.UUID;
 
 public class ElementalTokensProvider implements CurrencyProvider {
     @Override
-    public void deposit(OfflinePlayer offlinePlayer, BigDecimal amount, String reason) {
-        TokenAPI.addTokens(offlinePlayer.getUniqueId(), amount.longValue());
+    public void deposit(UUID playerId, BigDecimal amount, String reason) {
+        TokenAPI.addTokens(playerId, amount.longValue());
     }
 
     @Override
-    public void withdraw(OfflinePlayer offlinePlayer, BigDecimal amount, String reason) {
-        TokenAPI.removeTokens(offlinePlayer.getUniqueId(), amount.longValue());
+    public void withdraw(UUID playerId, BigDecimal amount, String reason) {
+        TokenAPI.removeTokens(playerId, amount.longValue());
     }
 
     @Override
-    public BigDecimal getBalance(OfflinePlayer offlinePlayer) {
-        return BigDecimal.valueOf(TokenAPI.getTokens(offlinePlayer.getUniqueId()));
+    public BigDecimal getBalance(UUID playerId) {
+        return BigDecimal.valueOf(TokenAPI.getTokens(playerId));
     }
 }