Move some methods into ShopManager, exact EconomyFormatter

Author: Ghost-chu

src/main/java/org/maxgamer/quickshop/api/annotations/Unstable.java

@@ -0,0 +1,33 @@
+/*
+ * This file is a part of project QuickShop, the name is Unstable.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.api.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * The annotation that marks the unstable apis (maybe removed/changed in future)
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.METHOD, ElementType.TYPE})
+@Inherited
+@Deprecated
+public @interface Unstable {
+}

src/main/java/org/maxgamer/quickshop/api/shop/ShopManager.java

@@ -1,3 +1,22 @@
+/*
+ * This file is a part of project QuickShop, the name is ShopManager.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.api.shop;
 
 import org.bukkit.Chunk;
@@ -8,12 +27,14 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.maxgamer.quickshop.api.annotations.Unstable;
 
 import java.util.*;
 
 /**
  * The manager that managing shops
  */
+@SuppressWarnings("ALL")
 public interface ShopManager {
 
     /**
@@ -77,11 +98,22 @@ public interface ShopManager {
     /**
      * Format the price use economy system
      *
-     * @param d price
+     * @param d        price
+     * @param currency currency
+     * @param world    shop world
      * @return formated price
      */
     @Nullable String format(double d, @NotNull World world, @Nullable String currency);
 
+    /**
+     * Format the price use economy system
+     *
+     * @param d    price
+     * @param shop The shop
+     * @return formated price
+     */
+    @Nullable String format(double d, @NotNull Shop shop);
+
     /**
      * Gets a shop in a specific location
      *
@@ -206,7 +238,39 @@ public interface ShopManager {
 
     /**
      * Getting the Shop Price Limiter
+     *
      * @return The shop price limiter
      */
+    @NotNull
     PriceLimiter getPriceLimiter();
+
+    /**
+     * Send a purchaseSuccess message for a player.
+     *
+     * @param purchaser Target player
+     * @param shop      Target shop
+     * @param amount    Trading item amounts.
+     */
+    @Unstable
+    void sendPurchaseSuccess(@NotNull UUID purchaser, @NotNull Shop shop, int amount);
+
+    /**
+     * Send a sellSuccess message for a player.
+     *
+     * @param seller Target player
+     * @param shop   Target shop
+     * @param amount Trading item amounts.
+     */
+    @Unstable
+    void sendSellSuccess(@NotNull UUID seller, @NotNull Shop shop, int amount);
+
+    /**
+     * Send a shop infomation to a player.
+     *
+     * @param p    Target player
+     * @param shop The shop
+     */
+    @Unstable
+    void sendShopInfo(@NotNull Player p, @NotNull Shop shop) ;
+
 }

src/main/java/org/maxgamer/quickshop/economy/Economy_GemsEconomy.java

@@ -31,7 +31,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.api.economy.AbstractEconomy;
-import org.maxgamer.quickshop.util.Util;
+import org.maxgamer.quickshop.util.economyformatter.BuiltInEconomyFormatter;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
 
@@ -46,10 +46,12 @@ public class Economy_GemsEconomy extends AbstractEconomy {
     @Getter
     @Setter
     private GemsEconomyAPI api;
+    private final BuiltInEconomyFormatter formatter;
 
     public Economy_GemsEconomy(@NotNull QuickShop plugin) {
         super();
         this.plugin = plugin;
+        this.formatter = new BuiltInEconomyFormatter(plugin);
         plugin.getReloadManager().register(this);
         init();
         setupEconomy();
@@ -125,7 +127,7 @@ private String formatInternal(double balance, @NotNull World world, @Nullable St
             return "Error";
         }
 
-        return Util.format(balance, true, world, currency);
+        return this.formatter.getInternalFormat(balance, currency);
     }
 
     /**

src/main/java/org/maxgamer/quickshop/economy/Economy_Vault.java

@@ -36,6 +36,7 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.api.economy.AbstractEconomy;
 import org.maxgamer.quickshop.util.Util;
+import org.maxgamer.quickshop.util.economyformatter.BuiltInEconomyFormatter;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
 
@@ -54,11 +55,13 @@ public class Economy_Vault extends AbstractEconomy implements Listener {
     @Setter
     @Nullable
     private net.milkbowl.vault.economy.Economy vault;
+    private final BuiltInEconomyFormatter formatter;
 
 
     public Economy_Vault(@NotNull QuickShop plugin) {
         super();
         this.plugin = plugin;
+        this.formatter = new BuiltInEconomyFormatter(plugin);
         plugin.getReloadManager().register(this);
         init();
         setupEconomy();
@@ -170,7 +173,7 @@ private String formatInternal(double balance) {
             return "Error";
         }
 
-        return Util.format(balance, true, plugin.getServer().getWorlds().get(0), (String) null);
+        return this.formatter.getInternalFormat(balance, null);
     }
 
     @Override

src/main/java/org/maxgamer/quickshop/listener/PlayerListener.java

@@ -187,7 +187,7 @@ private void postTrade(PlayerInteractEvent e) {
             shop.onClick();
             this.playClickSound(e.getPlayer());
             // Text menu
-            MsgUtil.sendShopInfo(p, shop);
+            plugin.getShopManager().sendShopInfo(p, shop);
             shop.setSignText();
 
             final AbstractEconomy eco = plugin.getEconomy();

src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java

@@ -753,10 +753,10 @@ public List<ComponentPackage> getSignText(@NotNull String locale) {
         String line4;
         if (this.isStackingShop()) {
             line4 = plugin.text().of("signs.stack-price",
-                    Util.format(this.getPrice(), this), Integer.toString(item.getAmount()),
+                    plugin.getShopManager().format(this.getPrice(), this), Integer.toString(item.getAmount()),
                     Util.getItemStackName(item)).forLocale();
         } else {
-            line4 = plugin.text().of("signs.price", Util.format(this.getPrice(), this)).forLocale();
+            line4 = plugin.text().of("signs.price", plugin.getShopManager().format(this.getPrice(), this)).forLocale();
         }
         lines.add(new ComponentPackage(TextComponent.fromLegacyText(line4)));
         return lines;