Closed PotatoCraft-Studio#518, Impl per shop tax account

Ghost-chu · Ghost-chu · commit 5866103f73a7 · 2021-10-02T15:46:02.000+08:00
diff --git a/src/main/java/org/maxgamer/quickshop/command/CommandManager.java b/src/main/java/org/maxgamer/quickshop/command/CommandManager.java
@@ -316,6 +316,11 @@ public CommandManager(QuickShop plugin) {
                 .permission("quickshop.currency")
                 .executor(new SubCommand_Currency(plugin))
                 .build());
+        registerCmd(CommandContainer.builder()
+                .prefix("taxaccount")
+                .permission("quickshop.taxaccount")
+                .executor(new SubCommand_TaxAccount(plugin))
+                .build());
 //        registerCmd(CommandContainer.builder()
 //                .prefix("backup")
 //                .permission("quickshop.backup")
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_TaxAccount.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_TaxAccount.java
@@ -0,0 +1,80 @@
+/*
+ * This file is a part of project QuickShop, the name is SubCommand_Currency.java
+ *  Copyright (C) PotatoCraft Studio and contributors
+ *
+ *  This program is free software: you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package org.maxgamer.quickshop.command.subcommand;
+
+import lombok.AllArgsConstructor;
+import org.bukkit.Bukkit;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.util.BlockIterator;
+import org.jetbrains.annotations.NotNull;
+import org.maxgamer.quickshop.QuickShop;
+import org.maxgamer.quickshop.command.CommandHandler;
+import org.maxgamer.quickshop.shop.Shop;
+import org.maxgamer.quickshop.util.Util;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+@AllArgsConstructor
+public class SubCommand_TaxAccount implements CommandHandler<Player> {
+
+    private final QuickShop plugin;
+
+    @Override
+    public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @NotNull String[] cmdArg) {
+        BlockIterator bIt = new BlockIterator(sender, 10);
+
+        while (bIt.hasNext()) {
+            final Block b = bIt.next();
+            final Shop shop = plugin.getShopManager().getShop(b.getLocation());
+
+
+            if (shop != null) {
+                if (shop.getModerator().isModerator(sender.getUniqueId()) || QuickShop.getPermissionManager().hasPermission(sender, "quickshop.other.taxaccount")) {
+                    if (cmdArg.length < 1) {
+                        shop.setTaxAccount(null);
+                        plugin.text().of(sender, "taxaccount-unset").send();
+                        return;
+                    }
+                    if(Util.isUUID(cmdArg[0]))
+                        shop.setTaxAccount(UUID.fromString(cmdArg[0]));
+                    else
+                        shop.setTaxAccount(Bukkit.getOfflinePlayer(cmdArg[0]).getUniqueId());
+                    plugin.text().of(sender, "taxaccount-unset", cmdArg[0]).send();
+                    return;
+                } else {
+                    plugin.text().of(sender, "not-managed-shop").send();
+                }
+                return;
+            }
+        }
+        plugin.text().of(sender, "not-looking-at-shop").send();
+    }
+
+    @NotNull
+    @Override
+    public List<String> onTabComplete(
+            @NotNull Player sender, @NotNull String commandLabel, @NotNull String[] cmdArg) {
+        return Collections.emptyList();
+    }
+
+}
diff --git a/src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java b/src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java
@@ -116,6 +116,7 @@ private ContainerShop(@NotNull ContainerShop s) {
         this.inventoryPreview = null;
         this.currency = s.currency;
         this.disableDisplay = s.disableDisplay;
+        this.taxAccount = s.taxAccount;
         initDisplayItem();
     }
 
@@ -143,7 +144,8 @@ public ContainerShop(
             @NotNull ShopType type,
             @NotNull YamlConfiguration extra,
             @Nullable String currency,
-            @NotNull boolean disableDisplay) {
+            boolean disableDisplay,
+            @Nullable UUID taxAccount) {
         Util.ensureThread(false);
         this.location = location;
         this.price = price;
@@ -171,6 +173,7 @@ public ContainerShop(
         this.extra = extra;
         this.currency = currency;
         this.disableDisplay = disableDisplay;
+        this.taxAccount = taxAccount;
         initDisplayItem();
         this.dirty = false;
         updateShopData();
@@ -181,6 +184,7 @@ private void updateShopData() {
         if (section.getString("currency") != null) {
             this.currency = section.getString("currency");
             section.set("currency", null);
+            Util.debugLog("Shop "+this+" currency data upgrade successful.");
         }
         setExtra(plugin, section);
         setDirty();
@@ -191,6 +195,13 @@ public boolean isDisableDisplay() {
         return disableDisplay;
     }
 
+    @Override
+    public void setDisableDisplay(boolean disabled) {
+        this.disableDisplay = disabled;
+        setDirty();
+        update();
+    }
+
     @Override
     @Nullable
     public UUID getTaxAccount() {
@@ -201,6 +212,13 @@ public UUID getTaxAccount() {
         return null;
     }
 
+    @Override
+    public void setTaxAccount(@Nullable UUID taxAccount) {
+        this.taxAccount = taxAccount;
+        setDirty();
+        update();
+    }
+
     private void initDisplayItem() {
         Util.ensureThread(false);
         if (plugin.isDisplay()) {
diff --git a/src/main/java/org/maxgamer/quickshop/shop/Shop.java b/src/main/java/org/maxgamer/quickshop/shop/Shop.java
@@ -501,12 +501,25 @@ default String[] getSignText() {
      */
     boolean isDisableDisplay();
 
+    /**
+     * Set the display disable state
+     * @param disabled Has been disabled
+     */
+    void setDisableDisplay(boolean disabled);
+
     /**
      * Getting the shop tax account, it can be specific uuid or general tax account
      * @return Shop Tax Account, null if use general tax account
      */
     @Nullable
     UUID getTaxAccount();
 
+    /**
+     * Sets shop taxAccount
+     * @param taxAccount tax account, null to use general tax account
+     */
+    void setTaxAccount(@Nullable UUID taxAccount);
+
+
 
 }
diff --git a/src/main/java/org/maxgamer/quickshop/shop/ShopManager.java b/src/main/java/org/maxgamer/quickshop/shop/ShopManager.java
@@ -682,12 +682,17 @@ public void actionBuy(
         } else {
             total = e.getTotal(); // Allow addon to set it
         }
+        Trader taxAccount;
+        if(shop.getTaxAccount() != null)
+            taxAccount = new Trader(shop.getTaxAccount().toString(), Bukkit.getOfflinePlayer(shop.getTaxAccount()));
+        else
+            taxAccount = this.cacheTaxAccount;
         EconomyTransaction transaction;
         EconomyTransaction.EconomyTransactionBuilder builder = EconomyTransaction.builder()
                 .core(eco)
                 .amount(total)
                 .taxModifier(taxModifier)
-                .taxAccount(cacheTaxAccount)
+                .taxAccount(taxAccount)
                 .currency(shop.getCurrency())
                 .world(shop.getLocation().getWorld())
                 .to(buyer);
@@ -916,7 +921,10 @@ public void actionCreate(@NotNull Player p, @NotNull Info info, @NotNull String
                 new ShopModerator(p.getUniqueId()),
                 false,
                 ShopType.SELLING,
-                new YamlConfiguration());
+                new YamlConfiguration(),
+                null,
+                false,
+                null);
         if (!bypassProtectionChecks) {
             Result result = plugin.getIntegrationHelper()
                     .callIntegrationsCanCreate(p, info.getLocation());
@@ -1043,13 +1051,18 @@ public void actionSell(
         // Money handling
         // SELLING Player -> Shop Owner
         EconomyTransaction transaction;
+        Trader taxAccount;
+        if(shop.getTaxAccount() != null)
+            taxAccount = new Trader(shop.getTaxAccount().toString(), Bukkit.getOfflinePlayer(shop.getTaxAccount()));
+        else
+            taxAccount = this.cacheTaxAccount;
         EconomyTransaction.EconomyTransactionBuilder builder = EconomyTransaction.builder()
                 .allowLoan(plugin.getConfig().getBoolean("shop.allow-economy-loan", false))
                 .core(eco)
                 .from(seller)
                 .amount(total)
                 .taxModifier(taxModifier)
-                .taxAccount(cacheTaxAccount)
+                .taxAccount(taxAccount)
                 .world(shop.getLocation().getWorld())
                 .currency(shop.getCurrency());
         if (!shop.isUnlimited()
diff --git a/src/main/java/org/maxgamer/quickshop/watcher/OngoingFeeWatcher.java b/src/main/java/org/maxgamer/quickshop/watcher/OngoingFeeWatcher.java
@@ -19,6 +19,7 @@
 
 package org.maxgamer.quickshop.watcher;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -68,14 +69,18 @@ public void run() {
                 World world = location.getWorld();
                 //We must check balance manually to avoid shop missing hell when tax account broken
                 if (allowLoan || plugin.getEconomy().getBalance(shopOwner, Objects.requireNonNull(world), shop.getCurrency()) >= cost) {
-                    Trader trader = plugin.getShopManager().getCacheTaxAccount();
+                    Trader taxAccount;
+                    if(shop.getTaxAccount() != null)
+                        taxAccount = new Trader(shop.getTaxAccount().toString(), Bukkit.getOfflinePlayer(shop.getTaxAccount()));
+                    else
+                        taxAccount = plugin.getShopManager().getCacheTaxAccount();
                     Util.mainThreadRun(() -> {
                         EconomyTransaction transaction = EconomyTransaction.builder()
                                 .allowLoan(allowLoan)
                                 .currency(shop.getCurrency())
                                 .core(plugin.getEconomy())
                                 .world(world)
-                                .to(trader == null ? null : trader.getUniqueId())
+                                .to(taxAccount == null ? null : taxAccount.getUniqueId())
                                 .from(shopOwner).build();
 
                         boolean success = transaction.failSafeCommit();
diff --git a/src/main/resources/lang-original/messages.json b/src/main/resources/lang-original/messages.json
@@ -176,7 +176,8 @@
       "ban": "&eBans a player from the shop",
       "unban": "&eUnbans a player from the shop",
       "freeze": "&eDisable or Enable shop trading",
-      "lock": "&eSwitch the shop's lock status"
+      "lock": "&eSwitch the shop's lock status",
+      "taxaccount": "&eSet the tax account that shop using"
     },
     "disabled": "&cThis command is disabled: &e{0}",
     "feature-not-enabled": "This feature is not enabled in the config file."
@@ -333,5 +334,8 @@
     "scheduled": "&aReload completed. &7(Some changes required a while to affect)"
   },
   "client-language-changed": "&aQuickShop detected your client language setting has been changed, we're now using {0} locale for you.",
-  "client-language-unsupported": "&eQuickShop doesn't support your client language, we're fallback to {0} locale now."
+  "client-language-unsupported": "&eQuickShop doesn't support your client language, we're fallback to {0} locale now.",
+  "taxaccount-set": "&aThis shop's tax account has been set to &e{0}",
+  "taxaccount-unset": "&aThis shop's tax account now following server global setting.",
+  "taxaccount-invalid": "&cTarget account not invalid, please enter a valid player name or uuid(with dashes)."
 }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -62,6 +62,7 @@ permissions:
       quickshop.staff: true
       quickshop.preview: true
       quickshop.currency: true
+      quickshop.taxaccount: true
   quickshop.moderator:
     description: The permission that provide all moderator need have permissions
     default: op
@@ -207,4 +208,10 @@ permissions:
   quickshop.showdisabled:
     description: Permission to see disabled commands in help list.
     default: op
+  quickshop.taxaccount:
+    description: Permission to use /qs taxaccount
+    default: op
+  quickshop.other.taxaccount:
+    description: Permission to use /qs taxaccount
+    default: op
 
