🚧 Fix withdraw and deposit, and add reason

Maxlego08 · Maxlego08 · commit 110abc4ce56d · 2025-08-09T15:53:36.000+02:00
diff --git a/changelog.md b/changelog.md
@@ -42,6 +42,10 @@
 
 # Unreleased
 
+- Fixed withdraw and deposit action with zEssentials
+- Added reason for withdraw and deposit action
+- Improve update checker [#183](https://github.com/Maxlego08/zMenu/pull/183)
+
 # 1.1.0.2
 
 - Added [toast](https://docs.zmenu.dev/configurations/actions#toast) action
diff --git a/src/main/java/fr/maxlego08/menu/loader/actions/CurrencyDepositLoader.java b/src/main/java/fr/maxlego08/menu/loader/actions/CurrencyDepositLoader.java
@@ -19,6 +19,7 @@ public Action load(String path, TypedMapAccessor accessor, File file) {
         String bigDecimal = accessor.getString("amount");
         Currencies currencies = Currencies.valueOf(accessor.getString("currency", Currencies.VAULT.name()).toUpperCase());
         String economyName = accessor.getString("economy", null);
-        return new CurrencyDepositAction(bigDecimal, currencies, economyName);
+        String reason = accessor.getString("reason", "no reason");
+        return new CurrencyDepositAction(bigDecimal, currencies, economyName, reason);
     }
 }
diff --git a/src/main/java/fr/maxlego08/menu/loader/actions/CurrencyWithdrawLoader.java b/src/main/java/fr/maxlego08/menu/loader/actions/CurrencyWithdrawLoader.java
@@ -19,6 +19,7 @@ public Action load(String path, TypedMapAccessor accessor, File file) {
         String bigDecimal = accessor.getString("amount");
         Currencies currencies = Currencies.valueOf(accessor.getString("currency", Currencies.VAULT.name()).toUpperCase());
         String economyName = accessor.getString("economy", null);
-        return new CurrencyWithdrawAction(bigDecimal, currencies, economyName);
+        String reason = accessor.getString("reason", "no reason");
+        return new CurrencyWithdrawAction(bigDecimal, currencies, economyName, reason);
     }
 }
diff --git a/src/main/java/fr/maxlego08/menu/loader/deluxemenu/DeluxeMenuCommandUtils.java b/src/main/java/fr/maxlego08/menu/loader/deluxemenu/DeluxeMenuCommandUtils.java
@@ -9,35 +9,15 @@
 import fr.maxlego08.menu.api.requirement.Action;
 import fr.maxlego08.menu.api.requirement.Permissible;
 import fr.maxlego08.menu.api.sound.SoundOption;
-import fr.maxlego08.menu.requirement.actions.BroadcastAction;
-import fr.maxlego08.menu.requirement.actions.BroadcastSoundAction;
-import fr.maxlego08.menu.requirement.actions.CloseAction;
-import fr.maxlego08.menu.requirement.actions.ConnectAction;
-import fr.maxlego08.menu.requirement.actions.ConsoleCommandAction;
-import fr.maxlego08.menu.requirement.actions.CurrencyDepositAction;
-import fr.maxlego08.menu.requirement.actions.CurrencyWithdrawAction;
-import fr.maxlego08.menu.requirement.actions.InventoryAction;
-import fr.maxlego08.menu.requirement.actions.MessageAction;
-import fr.maxlego08.menu.requirement.actions.PlayerCommandAction;
-import fr.maxlego08.menu.requirement.actions.RefreshAction;
-import fr.maxlego08.menu.requirement.actions.SoundAction;
-import fr.maxlego08.menu.requirement.permissible.ZCurrencyPermissible;
-import fr.maxlego08.menu.requirement.permissible.ZItemPermissible;
-import fr.maxlego08.menu.requirement.permissible.ZPermissionPermissible;
-import fr.maxlego08.menu.requirement.permissible.ZPlaceholderPermissible;
-import fr.maxlego08.menu.requirement.permissible.ZRegexPermissible;
+import fr.maxlego08.menu.requirement.actions.*;
+import fr.maxlego08.menu.requirement.permissible.*;
 import fr.maxlego08.menu.sound.ZSoundOption;
 import fr.maxlego08.menu.zcore.utils.ZUtils;
 import fr.traqueur.currencies.Currencies;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.plugin.Plugin;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -64,8 +44,8 @@ protected List<Action> loadActions(InventoryManager inventoryManager, CommandMan
         actionMap.put("[broadcastsound]", cmd -> new BroadcastSoundAction(getSoundOption(removePrefix(cmd, "[broadcastsound]"))));
         actionMap.put("[broadcastsoundworld]", cmd -> new BroadcastSoundAction(getSoundOption(removePrefix(cmd, "[broadcastsoundworld]"))));
         actionMap.put("[sound]", cmd -> new SoundAction(getSoundOption(removePrefix(cmd, "[sound]"))));
-        actionMap.put("[takemoney]", cmd -> new CurrencyWithdrawAction(removePrefix(cmd, "[takemoney]"), Currencies.VAULT, null));
-        actionMap.put("[givemoney]", cmd -> new CurrencyDepositAction(removePrefix(cmd, "[givemoney]"), Currencies.VAULT, null));
+        actionMap.put("[takemoney]", cmd -> new CurrencyWithdrawAction(removePrefix(cmd, "[takemoney]"), Currencies.VAULT, null, "no reason"));
+        actionMap.put("[givemoney]", cmd -> new CurrencyDepositAction(removePrefix(cmd, "[givemoney]"), Currencies.VAULT, null, "no reason"));
 
         for (String command : commands) {
             CommandDelayResult result = extractAndRemoveDelay(command);
diff --git a/src/main/java/fr/maxlego08/menu/requirement/actions/CurrencyDepositAction.java b/src/main/java/fr/maxlego08/menu/requirement/actions/CurrencyDepositAction.java
@@ -13,15 +13,17 @@ public class CurrencyDepositAction extends ActionHelper {
     private final String amount;
     private final Currencies currencies;
     private final String economyName;
+    private final String reason;
 
-    public CurrencyDepositAction(String amount, Currencies currencies, String economyName) {
+    public CurrencyDepositAction(String amount, Currencies currencies, String economyName, String reason) {
         this.amount = amount;
         this.currencies = currencies;
         this.economyName = economyName;
+        this.reason = reason;
     }
 
     @Override
     protected void execute(Player player, Button button, InventoryEngine inventory, Placeholders placeholders) {
-        this.currencies.deposit(player, new BigDecimal(papi(placeholders.parse(this.amount), player)), this.economyName == null ? "default" : this.economyName);
+        this.currencies.deposit(player, new BigDecimal(papi(placeholders.parse(this.amount), player)), this.economyName == null ? "default" : this.economyName, papi(placeholders.parse(this.reason), player));
     }
 }
diff --git a/src/main/java/fr/maxlego08/menu/requirement/actions/CurrencyWithdrawAction.java b/src/main/java/fr/maxlego08/menu/requirement/actions/CurrencyWithdrawAction.java
@@ -13,15 +13,17 @@ public class CurrencyWithdrawAction extends ActionHelper {
     private final String amount;
     private final Currencies currencies;
     private final String economyName;
+    private final String reason;
 
-    public CurrencyWithdrawAction(String amount, Currencies currencies, String economyName) {
+    public CurrencyWithdrawAction(String amount, Currencies currencies, String economyName, String reason) {
         this.amount = amount;
         this.currencies = currencies;
         this.economyName = economyName;
+        this.reason = reason;
     }
 
     @Override
     protected void execute(Player player, Button button, InventoryEngine inventory, Placeholders placeholders) {
-        this.currencies.withdraw(player, new BigDecimal(papi(placeholders.parse(this.amount), player)), this.economyName == null ? "default" : this.economyName);
+        this.currencies.withdraw(player, new BigDecimal(papi(placeholders.parse(this.amount), player)), this.economyName == null ? "default" : this.economyName, papi(placeholders.parse(this.reason), player));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public Action load(String path, TypedMapAccessor accessor, File file) {`
`19`	`19`	`String bigDecimal = accessor.getString("amount");`
`20`	`20`	`Currencies currencies = Currencies.valueOf(accessor.getString("currency", Currencies.VAULT.name()).toUpperCase());`
`21`	`21`	`String economyName = accessor.getString("economy", null);`
`22`		`- return new CurrencyDepositAction(bigDecimal, currencies, economyName);`
	`22`	`+ String reason = accessor.getString("reason", "no reason");`
	`23`	`+ return new CurrencyDepositAction(bigDecimal, currencies, economyName, reason);`
`23`	`24`	`}`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,17 @@ public class CurrencyDepositAction extends ActionHelper {`
`13`	`13`	`private final String amount;`
`14`	`14`	`private final Currencies currencies;`
`15`	`15`	`private final String economyName;`
	`16`	`+ private final String reason;`
`16`	`17`
`17`		`- public CurrencyDepositAction(String amount, Currencies currencies, String economyName) {`
	`18`	`+ public CurrencyDepositAction(String amount, Currencies currencies, String economyName, String reason) {`
`18`	`19`	`this.amount = amount;`
`19`	`20`	`this.currencies = currencies;`
`20`	`21`	`this.economyName = economyName;`
	`22`	`+ this.reason = reason;`
`21`	`23`	`}`
`22`	`24`
`23`	`25`	`@Override`
`24`	`26`	`protected void execute(Player player, Button button, InventoryEngine inventory, Placeholders placeholders) {`
`25`		`- this.currencies.deposit(player, new BigDecimal(papi(placeholders.parse(this.amount), player)), this.economyName == null ? "default" : this.economyName);`
	`27`	`+ this.currencies.deposit(player, new BigDecimal(papi(placeholders.parse(this.amount), player)), this.economyName == null ? "default" : this.economyName, papi(placeholders.parse(this.reason), player));`
`26`	`28`	`}`
`27`	`29`	`}`