spilt api interface (part 5)

Author: Ghost-chu

src/main/java/org/maxgamer/quickshop/QuickShop.java

@@ -45,12 +45,15 @@
 import org.jetbrains.annotations.Nullable;
 import org.maxgamer.quickshop.api.QuickShopAPI;
 import org.maxgamer.quickshop.api.chat.QuickChat;
+import org.maxgamer.quickshop.api.command.CommandManager;
 import org.maxgamer.quickshop.api.compatibility.CompatibilityManager;
+import org.maxgamer.quickshop.api.database.DatabaseHelper;
 import org.maxgamer.quickshop.api.economy.EconomyCore;
 import org.maxgamer.quickshop.api.integration.IntegrateStage;
 import org.maxgamer.quickshop.api.integration.IntegrationManager;
 import org.maxgamer.quickshop.api.localization.text.TextManager;
 import org.maxgamer.quickshop.api.shop.AbstractDisplayItem;
+import org.maxgamer.quickshop.api.shop.ItemMatcher;
 import org.maxgamer.quickshop.api.shop.Shop;
 import org.maxgamer.quickshop.api.shop.ShopManager;
 import org.maxgamer.quickshop.chat.platform.minedown.BungeeQuickChat;
@@ -73,7 +76,6 @@
 import org.maxgamer.quickshop.util.config.ConfigurationFixer;
 import org.maxgamer.quickshop.util.envcheck.*;
 import org.maxgamer.quickshop.util.matcher.item.BukkitItemMatcherImpl;
-import org.maxgamer.quickshop.api.shop.ItemMatcher;
 import org.maxgamer.quickshop.util.matcher.item.QuickShopItemMatcherImpl;
 import org.maxgamer.quickshop.util.reload.ReloadManager;
 import org.maxgamer.quickshop.util.reporter.error.RollbarErrorReporter;
@@ -96,16 +98,14 @@
 public class QuickShop extends JavaPlugin implements QuickShopAPI {
 
     /* Public QuickShop API */
-    @Getter
     private final JavaCompatibilityManager compatibilityTool = new JavaCompatibilityManager(this);
     private JavaIntegrationManager integrationHelper;
-    @Getter
     private JavaDatabaseHelper databaseHelper;
-    @Getter
     private JavaCommandManager commandManager;
     private ItemMatcher itemMatcher;
     private JavaShopManager shopManager;
     private JavaTextManager textManager;
+    private boolean priceChangeRequiresFee = false;
     /* Public QuickShop API End */
 
     /**
@@ -197,12 +197,7 @@ public class QuickShop extends JavaPlugin implements QuickShopAPI {
      */
     @Getter
     private PermissionChecker permissionChecker;
-    /**
-     * Whether we players are charged a fee to change the price on their shop (To help deter endless
-     * undercutting
-     */
-    @Getter
-    private boolean priceChangeRequiresFee = false;
+
     /**
      * The error reporter to help devs report errors to Sentry.io
      */
@@ -1992,6 +1987,11 @@ public boolean isLimit() {
         return this.limit;
     }
 
+    @Override
+    public DatabaseHelper getDatabaseHelper() {
+        return this.databaseHelper;
+    }
+
     @Override
     public TextManager getTextManager() {
         return this.textManager;
@@ -2001,4 +2001,14 @@ public TextManager getTextManager() {
     public ItemMatcher getItemMatcher() {
         return this.itemMatcher;
     }
+
+    @Override
+    public boolean isPriceChangeRequiresFee() {
+        return this.priceChangeRequiresFee;
+    }
+
+    @Override
+    public CommandManager getCommandManager() {
+        return this.commandManager;
+    }
 }

src/main/java/org/maxgamer/quickshop/api/QuickShopAPI.java

@@ -1,5 +1,6 @@
 package org.maxgamer.quickshop.api;
 
+import org.maxgamer.quickshop.api.command.CommandManager;
 import org.maxgamer.quickshop.api.compatibility.CompatibilityManager;
 import org.maxgamer.quickshop.api.database.DatabaseHelper;
 import org.maxgamer.quickshop.api.localization.text.TextManager;
@@ -24,4 +25,8 @@ public interface QuickShopAPI {
 
     ItemMatcher getItemMatcher();
 
+    boolean isPriceChangeRequiresFee();
+
+    CommandManager getCommandManager();
+
 }

src/main/java/org/maxgamer/quickshop/command/JavaCommandManager.java

@@ -43,7 +43,7 @@
 
 @Data
 @SuppressWarnings("unchecked")
-public class JavaCommandManager implements TabCompleter, CommandExecutor {
+public class JavaCommandManager implements CommandManager, TabCompleter, CommandExecutor {
     private static final String[] EMPTY_ARGS = new String[0];
     private final Set<CommandContainer> cmds = Sets.newCopyOnWriteArraySet(); //Because we open to allow register, so this should be thread-safe
     private final QuickShop plugin;
@@ -347,6 +347,7 @@ public JavaCommandManager(QuickShop plugin) {
      * @param container The command container to register
      * @throws IllegalStateException Will throw the error if register conflict.
      */
+    @Override
     public void registerCmd(@NotNull CommandContainer container) {
         if (cmds.contains(container)) {
             Util.debugLog("Dupe subcommand registering: " + container);
@@ -362,6 +363,7 @@ public void registerCmd(@NotNull CommandContainer container) {
      *
      * @param container The command container to unregister
      */
+    @Override
     public void unregisterCmd(@NotNull CommandContainer container) {
         cmds.remove(container);
     }
@@ -371,6 +373,7 @@ public void unregisterCmd(@NotNull CommandContainer container) {
      *
      * @return All registered commands.
      */
+    @Override
     @NotNull
     public List<CommandContainer> getRegisteredCommands() {
         return new ArrayList<>(this.getCmds());
@@ -442,11 +445,13 @@ public boolean onCommand(
     /**
      * Method for capturing generic type
      */
-    private <T1, T2 extends T1> T2 capture(T1 type) {
+    @Override
+    public <T1, T2 extends T1> T2 capture(T1 type) {
         return (T2) type;
     }
 
-    private boolean checkPermissions(CommandSender sender, String commandLabel, String[] cmdArg, List<String> permissionList, CommandManager.PermissionType permissionType, CommandManager.Action action) {
+    @Override
+    public boolean checkPermissions(CommandSender sender, String commandLabel, String[] cmdArg, List<String> permissionList, CommandManager.PermissionType permissionType, CommandManager.Action action) {
         if (permissionList == null || permissionList.isEmpty()) {
             return true;
         }
@@ -490,7 +495,8 @@ private boolean checkPermissions(CommandSender sender, String commandLabel, Stri
     }
 
 
-    private boolean isAdapt(CommandContainer container, CommandSender sender) {
+    @Override
+    public boolean isAdapt(CommandContainer container, CommandSender sender) {
         return container.getExecutorType().isInstance(sender);
     }
 

src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Help.java

@@ -44,7 +44,7 @@ private void sendHelp(@NotNull CommandSender s, @NotNull String commandLabel) {
         plugin.text().of(s, "command.description.title").send();
 
         commandPrintingLoop:
-        for (CommandContainer container : plugin.getCommandManager().getCmds()) {
+        for (CommandContainer container : plugin.getCommandManager().getRegisteredCommands()) {
             if (!container.isHidden()) {
                 boolean passed = false;
                 //selectivePermissions

src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_ROOT.java

@@ -46,7 +46,7 @@ public void onCommand(@NotNull CommandSender sender, @NotNull String commandLabe
     public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] strings) {
         final List<String> candidate = new ArrayList<>();
 
-        for (CommandContainer container : plugin.getCommandManager().getCmds()) {
+        for (CommandContainer container : plugin.getCommandManager().getRegisteredCommands()) {
             if (!container.getPrefix().startsWith(strings[0])
                     && !container.getPrefix().equals(strings[0])) {
                 continue;