GH-37 Implement /withdraw command for physical banknote withdrawal

buildSrc/src/main/kotlin/Versions.kt

@@ -1,6 +1,6 @@
 object Versions {
 
-    const val SPIGOT_API = "1.19.4-R0.1-SNAPSHOT"
+    const val PAPER_API = "1.19.4-R0.1-SNAPSHOT"
 
     const val OKAERI_CONFIGS = "5.0.5"
     const val LITE_COMMANDS = "3.10.5"

eternaleconomy-api/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly("org.spigotmc:spigot-api:${Versions.SPIGOT_API}")
+    compileOnly("org.spigotmc:spigot-api:${Versions.PAPER_API}")
     api("org.jetbrains:annotations:${Versions.JETBRAINS_ANNOTATIONS}")
 }
 

eternaleconomy-core/build.gradle.kts

@@ -11,12 +11,20 @@ plugins {
     id("me.champeau.jmh")
 }
 
+
+repositories {
+    maven {
+        name = "papermc"
+        url = uri("https://repo.papermc.io/repository/maven-public/")
+    }
+}
+
 dependencies {
     // api module
     implementation(project(":eternaleconomy-api"))
 
-    // spigot-api
-    compileOnly("org.spigotmc:spigot-api:${Versions.SPIGOT_API}")
+    // paper-api
+    compileOnly("io.papermc.paper:paper-api:${Versions.PAPER_API}")
 
     // eternalcode commons
     implementation("com.eternalcode:eternalcode-commons-adventure:${Versions.ETERNALCODE_COMMONS}")
@@ -40,15 +48,16 @@ dependencies {
     implementation("com.eternalcode:multification-okaeri:${Versions.MULTIFICATION}")
 
     // kyori
-    implementation("net.kyori:adventure-platform-bukkit:${Versions.ADVENTURE_PLATFORM_BUKKIT}")
-    implementation("net.kyori:adventure-text-minimessage:${Versions.ADVENTURE_API}")
+//    implementation("net.kyori:adventure-platform-bukkit:${Versions.ADVENTURE_PLATFORM_BUKKIT}")
+//    implementation("net.kyori:adventure-text-minimessage:${Versions.ADVENTURE_API}")
 
     // vault
     compileOnly("com.github.MilkBowl:VaultAPI:${Versions.VAULT_API}")
 
     // okaeri configs
     implementation("eu.okaeri:okaeri-configs-yaml-snakeyaml:${Versions.OKAERI_CONFIGS}")
     implementation("eu.okaeri:okaeri-configs-serdes-commons:${Versions.OKAERI_CONFIGS}")
+    implementation("eu.okaeri:okaeri-configs-serdes-bukkit:${Versions.OKAERI_CONFIGS}")
 
     compileOnly("me.clip:placeholderapi:${Versions.PLACEHOLDER_API}")
 
@@ -87,6 +96,9 @@ bukkit {
 
 tasks.runServer {
     minecraftVersion("1.21.8")
+    downloadPlugins {
+        url("https://github.com/MilkBowl/Vault/releases/download/1.7.3/Vault.jar")
+    }
 }
 
 tasks.shadowJar {
@@ -103,7 +115,7 @@ tasks.shadowJar {
         "eu.okaeri",
         "panda",
         "org.yaml",
-        "net.kyori",
+//        "net.kyori",
         "com.eternalcode.commons",
         "net.jodah",
     ).forEach { relocate(it, prefix) }

eternaleconomy-core/src/main/java/com/eternalcode/economy/EconomyBukkitPlugin.java

@@ -11,47 +11,53 @@
 import com.eternalcode.economy.account.database.AccountRepository;
 import com.eternalcode.economy.account.database.AccountRepositoryImpl;
 import com.eternalcode.economy.bridge.BridgeManager;
-import com.eternalcode.economy.command.impl.admin.AdminAddCommand;
-import com.eternalcode.economy.command.impl.admin.AdminBalanceCommand;
-import com.eternalcode.economy.command.impl.admin.AdminRemoveCommand;
-import com.eternalcode.economy.command.impl.admin.AdminResetCommand;
-import com.eternalcode.economy.command.impl.admin.AdminSetCommand;
 import com.eternalcode.economy.command.argument.AccountArgument;
+import com.eternalcode.economy.command.argument.PriceArgumentResolver;
 import com.eternalcode.economy.command.context.AccountContext;
 import com.eternalcode.economy.command.cooldown.CommandCooldownEditor;
 import com.eternalcode.economy.command.cooldown.CommandCooldownMessage;
 import com.eternalcode.economy.command.handler.InvalidUsageHandlerImpl;
 import com.eternalcode.economy.command.handler.MissingPermissionHandlerImpl;
-import com.eternalcode.economy.command.message.InvalidBigDecimalMessage;
 import com.eternalcode.economy.command.impl.MoneyBalanceCommand;
 import com.eternalcode.economy.command.impl.MoneyTransferCommand;
-import com.eternalcode.economy.database.DatabaseManager;
-import com.eternalcode.economy.leaderboard.LeaderboardCommand;
+import com.eternalcode.economy.command.impl.admin.AdminAddCommand;
+import com.eternalcode.economy.command.impl.admin.AdminBalanceCommand;
+import com.eternalcode.economy.command.impl.admin.AdminRemoveCommand;
+import com.eternalcode.economy.command.impl.admin.AdminResetCommand;
+import com.eternalcode.economy.command.impl.admin.AdminSetCommand;
+import com.eternalcode.economy.command.message.InvalidBigDecimalMessage;
 import com.eternalcode.economy.command.validator.notsender.NotSender;
 import com.eternalcode.economy.command.validator.notsender.NotSenderValidator;
 import com.eternalcode.economy.config.ConfigService;
 import com.eternalcode.economy.config.implementation.CommandsConfig;
 import com.eternalcode.economy.config.implementation.PluginConfig;
 import com.eternalcode.economy.config.implementation.messages.MessageConfig;
+import com.eternalcode.economy.database.DatabaseManager;
 import com.eternalcode.economy.format.DecimalFormatter;
 import com.eternalcode.economy.format.DecimalFormatterImpl;
+import com.eternalcode.economy.leaderboard.LeaderboardCommand;
 import com.eternalcode.economy.multification.NoticeBroadcastHandler;
 import com.eternalcode.economy.multification.NoticeHandler;
 import com.eternalcode.economy.multification.NoticeService;
 import com.eternalcode.economy.vault.VaultEconomyProvider;
+import com.eternalcode.economy.withdraw.WithdrawCommand;
+import com.eternalcode.economy.withdraw.WithdrawItemService;
+import com.eternalcode.economy.withdraw.WithdrawService;
+import com.eternalcode.economy.withdraw.WithdrawSetItemCommand;
+import com.eternalcode.economy.withdraw.controller.WithdrawAnvilController;
+import com.eternalcode.economy.withdraw.controller.WithdrawController;
 import com.eternalcode.multification.notice.Notice;
 import com.eternalcode.multification.notice.NoticeBroadcast;
 import com.google.common.base.Stopwatch;
 import dev.rollczi.litecommands.LiteCommands;
+import dev.rollczi.litecommands.argument.ArgumentKey;
 import dev.rollczi.litecommands.bukkit.LiteBukkitFactory;
 import dev.rollczi.litecommands.jakarta.LiteJakartaExtension;
 import dev.rollczi.litecommands.message.LiteMessages;
 import jakarta.validation.constraints.Positive;
 import java.io.File;
 import java.math.BigDecimal;
 import java.time.Duration;
-import net.kyori.adventure.platform.AudienceProvider;
-import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.milkbowl.vault.economy.Economy;
 import org.bukkit.Server;
@@ -64,7 +70,7 @@ public class EconomyBukkitPlugin extends JavaPlugin {
 
     private static final String PLUGIN_STARTED = "EternalEconomy has been enabled in %dms.";
 
-    private AudienceProvider audienceProvider;
+    // private AudienceProvider audienceProvider;
     private DatabaseManager databaseManager;
 
     private LiteCommands<CommandSender> liteCommands;
@@ -74,7 +80,7 @@ public void onEnable() {
         Stopwatch started = Stopwatch.createStarted();
         Server server = this.getServer();
 
-        this.audienceProvider = BukkitAudiences.create(this);
+        // this.audienceProvider = BukkitAudiences.create(this);
         MiniMessage miniMessage = MiniMessage.builder()
             .postProcessor(new AdventureUrlPostProcessor())
             .postProcessor(new AdventureLegacyColorPostProcessor())
@@ -86,9 +92,10 @@ public void onEnable() {
         ConfigService configService = new ConfigService();
         MessageConfig messageConfig = configService.create(MessageConfig.class, new File(dataFolder, "messages.yml"));
         PluginConfig pluginConfig = configService.create(PluginConfig.class, new File(dataFolder, "config.yml"));
-        CommandsConfig commandsConfig = configService.create(CommandsConfig.class, new File(dataFolder, "commands.yml"));
+        CommandsConfig commandsConfig =
+            configService.create(CommandsConfig.class, new File(dataFolder, "commands.yml"));
 
-        NoticeService noticeService = new NoticeService(messageConfig, this.audienceProvider, miniMessage);
+        NoticeService noticeService = new NoticeService(messageConfig, miniMessage);
 
         Scheduler scheduler = EconomySchedulerAdapter.getAdaptiveScheduler(this);
 
@@ -101,13 +108,19 @@ public void onEnable() {
         DecimalFormatter decimalFormatter = new DecimalFormatterImpl(pluginConfig);
         AccountPaymentService accountPaymentService = new AccountPaymentService(accountManager, pluginConfig);
 
+        WithdrawItemService withdrawItemService = new WithdrawItemService(this, pluginConfig, decimalFormatter, miniMessage);
+        WithdrawService withdrawService = new WithdrawService(
+            server, noticeService, pluginConfig, decimalFormatter,
+            withdrawItemService, accountPaymentService, accountManager, miniMessage);
+
         VaultEconomyProvider vaultEconomyProvider =
             new VaultEconomyProvider(this, decimalFormatter, accountPaymentService, accountManager);
         server.getServicesManager().register(Economy.class, vaultEconomyProvider, this, ServicePriority.Highest);
 
         this.liteCommands = LiteBukkitFactory.builder("eternaleconomy", this, server)
-            .extension(new LiteJakartaExtension<>(), settings -> settings
-                .violationMessage(Positive.class, BigDecimal.class, new InvalidBigDecimalMessage<>(noticeService))
+            .extension(
+                new LiteJakartaExtension<>(), settings -> settings
+                    .violationMessage(Positive.class, BigDecimal.class, new InvalidBigDecimalMessage<>(noticeService))
             )
 
             .annotations(extension -> extension.validator(
@@ -119,10 +132,11 @@ public void onEnable() {
             .invalidUsage(new InvalidUsageHandlerImpl(noticeService))
 
             .message(LiteMessages.COMMAND_COOLDOWN, new CommandCooldownMessage(noticeService, commandsConfig))
-            .message(LiteMessages.INVALID_NUMBER, (invocation, amount)  -> noticeService.create()
-                .notice(messageConfig.positiveNumberRequired)
-                .placeholder("{AMOUNT}", amount)
-                .viewer(invocation.sender()))
+            .message(
+                LiteMessages.INVALID_NUMBER, (invocation, amount) -> noticeService.create()
+                    .notice(messageConfig.positiveNumberRequired)
+                    .placeholder("{AMOUNT}", amount)
+                    .viewer(invocation.sender()))
             .editorGlobal(new CommandCooldownEditor(commandsConfig))
 
             .commands(
@@ -131,6 +145,8 @@ public void onEnable() {
                 new AdminSetCommand(accountPaymentService, decimalFormatter, noticeService),
                 new AdminResetCommand(accountPaymentService, noticeService),
                 new AdminBalanceCommand(noticeService, decimalFormatter),
+                new WithdrawSetItemCommand(withdrawService),
+                new WithdrawCommand(withdrawService, noticeService, decimalFormatter),
                 new MoneyBalanceCommand(noticeService, decimalFormatter),
                 new MoneyTransferCommand(accountPaymentService, decimalFormatter, noticeService, pluginConfig),
                 new EconomyReloadCommand(configService, noticeService),
@@ -140,15 +156,23 @@ public void onEnable() {
             .context(Account.class, new AccountContext(accountManager, messageConfig))
             .argument(Account.class, new AccountArgument(accountManager, noticeService, server))
 
+            .argument(
+                BigDecimal.class,
+                ArgumentKey.of(PriceArgumentResolver.KEY),
+                new PriceArgumentResolver(pluginConfig, messageConfig))
+
             .result(Notice.class, new NoticeHandler(noticeService))
             .result(NoticeBroadcast.class, new NoticeBroadcastHandler())
 
             .build();
 
         server.getPluginManager().registerEvents(new AccountController(accountManager), this);
 
+        server.getPluginManager().registerEvents(new WithdrawController(withdrawService, withdrawItemService), this);
+        server.getPluginManager().registerEvents(new WithdrawAnvilController(withdrawItemService, noticeService), this);
+
         BridgeManager bridgeManager = new BridgeManager(
-            this.getDescription(),
+            this.getPluginMeta(),
             accountManager,
             decimalFormatter,
             server,
@@ -163,9 +187,9 @@ public void onEnable() {
 
     @Override
     public void onDisable() {
-        if (this.audienceProvider != null) {
-            this.audienceProvider.close();
-        }
+        // if (this.audienceProvider != null) {
+        //     this.audienceProvider.close();
+        // }
 
         if (this.liteCommands != null) {
             this.liteCommands.unregister();

eternaleconomy-core/src/main/java/com/eternalcode/economy/EconomyPermissionConstant.java

@@ -8,9 +8,11 @@ public class EconomyPermissionConstant {
     public static final String ADMIN_REMOVE_PERMISSION = "eternaleconomy.admin.remove";
     public static final String ADMIN_SET_PERMISSION = "eternaleconomy.admin.set";
     public static final String ADMIN_RELOAD_PERMISSION = "eternaleconomy.admin.reload";
+    public static final String ADMIN_ITEM_PERMISSION = "eternaleconomy.admin.item";
 
     public static final String PLAYER_BALANCE_PERMISSION = "eternaleconomy.player.balance";
     public static final String PLAYER_BALANCE_OTHER_PERMISSION = "eternaleconomy.player.balance.other";
     public static final String PLAYER_PAY_PERMISSION = "eternaleconomy.player.pay";
     public static final String PLAYER_BALANCE_TOP_PERMISSION = "eternaleconomy.player.balance.top";
+    public static final String PLAYER_WITHDRAW_PERMISSION = "eternaleconomy.player.withdraw";
 }

eternaleconomy-core/src/main/java/com/eternalcode/economy/bridge/BridgeManager.java

@@ -3,6 +3,7 @@
 import com.eternalcode.economy.account.AccountManager;
 import com.eternalcode.economy.bridge.placeholderapi.PlaceholderEconomyExpansion;
 import com.eternalcode.economy.format.DecimalFormatter;
+import io.papermc.paper.plugin.configuration.PluginMeta;
 import java.util.logging.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
@@ -12,7 +13,7 @@
 
 public class BridgeManager {
 
-    private final PluginDescriptionFile pluginDescriptionFile;
+    private final PluginMeta pluginMeta;
 
     private final AccountManager accountManager;
     private final DecimalFormatter decimalFormatter;
@@ -22,14 +23,14 @@ public class BridgeManager {
     private final Logger logger;
 
     public BridgeManager(
-        PluginDescriptionFile pluginDescriptionFile,
+        PluginMeta pluginMeta,
         AccountManager accountManager,
         DecimalFormatter decimalFormatter,
         Server server,
         Plugin plugin,
         Logger logger
     ) {
-        this.pluginDescriptionFile = pluginDescriptionFile;
+        this.pluginMeta = pluginMeta;
         this.accountManager = accountManager;
         this.decimalFormatter = decimalFormatter;
         this.server = server;
@@ -44,7 +45,7 @@ public void init() {
         Bukkit.getScheduler().runTask(this.plugin, () -> {
             this.setupBridge("PlaceholderAPI", () -> {
                 PlaceholderEconomyExpansion placeholderEconomyExpansion = new PlaceholderEconomyExpansion(
-                    this.pluginDescriptionFile,
+                    this.pluginMeta,
                     this.accountManager,
                     this.decimalFormatter
                 );

eternaleconomy-core/src/main/java/com/eternalcode/economy/bridge/placeholderapi/PlaceholderEconomyExpansion.java

@@ -4,42 +4,42 @@
 import com.eternalcode.economy.account.AccountManager;
 import com.eternalcode.economy.bridge.BridgeInitializer;
 import com.eternalcode.economy.format.DecimalFormatter;
+import io.papermc.paper.plugin.configuration.PluginMeta;
 import java.util.UUID;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.plugin.PluginDescriptionFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class PlaceholderEconomyExpansion extends PlaceholderExpansion implements BridgeInitializer {
 
-    private final PluginDescriptionFile pluginDescriptionFile;
+    private final PluginMeta pluginMeta;
     private final AccountManager accountManager;
     private final DecimalFormatter decimalFormatter;
 
     public PlaceholderEconomyExpansion(
-        PluginDescriptionFile pluginDescriptionFile,
+        PluginMeta pluginMeta,
         AccountManager accountManager,
         DecimalFormatter decimalFormatter
     ) {
-        this.pluginDescriptionFile = pluginDescriptionFile;
+        this.pluginMeta = pluginMeta;
         this.accountManager = accountManager;
         this.decimalFormatter = decimalFormatter;
     }
 
     @Override
     public @NotNull String getIdentifier() {
-        return this.pluginDescriptionFile.getName().toLowerCase();
+        return this.pluginMeta.getName().toLowerCase();
     }
 
     @Override
     public @NotNull String getAuthor() {
-        return this.pluginDescriptionFile.getAuthors().get(0);
+        return this.pluginMeta.getAuthors().get(0);
     }
 
     @Override
     public @NotNull String getVersion() {
-        return this.pluginDescriptionFile.getVersion();
+        return this.pluginMeta.getVersion();
     }
 
     @Override