spilt api interface (part 3)

Ghost-chu · Ghost-chu · commit abfb0fe821da · 2021-10-07T16:15:51.000+08:00
diff --git a/src/main/java/org/maxgamer/quickshop/api/database/DatabaseHelper.java b/src/main/java/org/maxgamer/quickshop/api/database/DatabaseHelper.java
@@ -5,7 +5,6 @@
 import org.jetbrains.annotations.Nullable;
 import org.maxgamer.quickshop.api.shop.Shop;
 import org.maxgamer.quickshop.database.DataType;
-import org.maxgamer.quickshop.database.WarpedResultSet;
 
 import java.sql.SQLException;
 import java.util.UUID;
diff --git a/src/main/java/org/maxgamer/quickshop/api/database/WarpedResultSet.java b/src/main/java/org/maxgamer/quickshop/api/database/WarpedResultSet.java
@@ -0,0 +1,28 @@
+/*
+ * This file is a part of project QuickShop, the name is WarpedResultSet.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.database;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public interface WarpedResultSet {
+    void close() throws SQLException;
+    ResultSet getResultSet();
+}
diff --git a/src/main/java/org/maxgamer/quickshop/api/permission/PermissionProvider.java b/src/main/java/org/maxgamer/quickshop/api/permission/PermissionProvider.java
@@ -21,7 +21,6 @@
 
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
-import org.maxgamer.quickshop.permission.PermissionInformationContainer;
 
 public interface PermissionProvider {
     /**
@@ -41,15 +40,4 @@ public interface PermissionProvider {
     @NotNull
     String getName();
 
-    /**
-     * Get the debug infos in provider
-     *
-     * @param sender     CommandSender
-     * @param permission The permission want to check
-     * @return Debug Infos
-     */
-    @NotNull
-    PermissionInformationContainer getDebugInfo(
-            @NotNull CommandSender sender, @NotNull String permission);
-
 }
diff --git a/src/main/java/org/maxgamer/quickshop/api/shop/Info.java b/src/main/java/org/maxgamer/quickshop/api/shop/Info.java
@@ -0,0 +1,40 @@
+package org.maxgamer.quickshop.api.shop;
+
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public interface Info {
+    /**
+     * @return ShopAction action, Get shop action.
+     */
+    @NotNull ShopAction getAction();
+
+    void setAction(@NotNull ShopAction action);
+
+    /**
+     * @return ItemStack iStack, Get Shop's selling/buying item's ItemStack.
+     */
+    @NotNull ItemStack getItem();
+
+    /**
+     * @return Location loc, Get shop's location,
+     */
+    @NotNull Location getLocation();
+
+    /**
+     * @return Block signBlock, Get block of shop's sign, may return the null.
+     */
+    @Nullable Block getSignBlock();
+
+    /**
+     * Get shop is or not has changed.
+     *
+     * @param shop, The need checked with this shop.
+     * @return hasChanged
+     */
+    boolean hasChanged(@NotNull Shop shop);
+
+}
diff --git a/src/main/java/org/maxgamer/quickshop/api/shop/Shop.java b/src/main/java/org/maxgamer/quickshop/api/shop/Shop.java
@@ -32,8 +32,9 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.maxgamer.quickshop.QuickShop;
-import org.maxgamer.quickshop.shop.*;
 import org.maxgamer.quickshop.api.chat.ComponentPackage;
+import org.maxgamer.quickshop.shop.ShopSignPersistentDataType;
+import org.maxgamer.quickshop.shop.ShopSignStorage;
 
 import java.util.List;
 import java.util.Objects;
@@ -246,14 +247,14 @@ default List<ComponentPackage> getSignText(String locale) {
      * @return Shop moderators
      */
     @NotNull
-    JavaShopModerator getModerator();
+    ShopModerator getModerator();
 
     /**
      * Set new shop's moderators
      *
      * @param shopModerator New moderators team you want set
      */
-    void setModerator(@NotNull JavaShopModerator shopModerator);
+    void setModerator(@NotNull ShopModerator shopModerator);
 
     /**
      * Get shop's owner UUID
diff --git a/src/main/java/org/maxgamer/quickshop/api/shop/ShopAction.java b/src/main/java/org/maxgamer/quickshop/api/shop/ShopAction.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.maxgamer.quickshop.shop;
+package org.maxgamer.quickshop.api.shop;
 
 public enum ShopAction {
     // buy = trading create = creating shop cancelled = stopped
diff --git a/src/main/java/org/maxgamer/quickshop/api/shop/ShopManager.java b/src/main/java/org/maxgamer/quickshop/api/shop/ShopManager.java
@@ -8,8 +8,6 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.maxgamer.quickshop.shop.Info;
-import org.maxgamer.quickshop.shop.JavaShopChunk;
 
 import java.util.*;
 
@@ -30,7 +28,7 @@ public interface ShopManager {
      *
      * @return a map of World - Chunk - Shop
      */
-    @NotNull Map<String, Map<JavaShopChunk, Map<Location, Shop>>> getShops();
+    @NotNull Map<String, Map<ShopChunk, Map<Location, Shop>>> getShops();
 
     /**
      * Returns a new shop iterator object, allowing iteration over shops easily, instead of sorting
@@ -63,7 +61,7 @@ public interface ShopManager {
      * @param world The name of the world (case sensitive) to get the list of shops from
      * @return a map of Chunk - Shop
      */
-    @Nullable Map<JavaShopChunk, Map<Location, Shop>> getShops(@NotNull String world);
+    @Nullable Map<ShopChunk, Map<Location, Shop>> getShops(@NotNull String world);
 
     /**
      * Create a shop use Shop and Info object.
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Create.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Create.java
@@ -30,8 +30,8 @@
 import org.jetbrains.annotations.Nullable;
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.api.command.CommandHandler;
-import org.maxgamer.quickshop.shop.Info;
-import org.maxgamer.quickshop.shop.ShopAction;
+import org.maxgamer.quickshop.shop.JavaInfo;
+import org.maxgamer.quickshop.api.shop.ShopAction;
 import org.maxgamer.quickshop.util.MsgUtil;
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.holder.Result;
@@ -148,7 +148,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
 
             // Send creation menu.
             plugin.getShopManager().getActions().put(sender.getUniqueId(),
-                    new Info(b.getLocation(), ShopAction.CREATE, item, b.getRelative(sender.getFacing().getOppositeFace())));
+                    new JavaInfo(b.getLocation(), ShopAction.CREATE, item, b.getRelative(sender.getFacing().getOppositeFace())));
             plugin.getShopManager().handleChat(sender, price);
             return;
         }
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_SuperCreate.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_SuperCreate.java
@@ -28,8 +28,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.api.command.CommandHandler;
-import org.maxgamer.quickshop.shop.Info;
-import org.maxgamer.quickshop.shop.ShopAction;
+import org.maxgamer.quickshop.shop.JavaInfo;
+import org.maxgamer.quickshop.api.shop.ShopAction;
 import org.maxgamer.quickshop.util.Util;
 
 import java.util.Collections;
@@ -62,7 +62,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
                 return;
             }
             // Send creation menu.
-            final Info info = new Info(b.getLocation(), ShopAction.CREATE, sender.getInventory().getItemInMainHand(), b.getRelative(sender.getFacing().getOppositeFace()));
+            final JavaInfo info = new JavaInfo(b.getLocation(), ShopAction.CREATE, sender.getInventory().getItemInMainHand(), b.getRelative(sender.getFacing().getOppositeFace()));
 
             plugin.getShopManager().getActions().put(sender.getUniqueId(), info);
             plugin.text().of(sender, "how-much-to-trade-for", Util.getItemStackName(item), Integer.toString(plugin.isAllowStack() && QuickShop.getPermissionManager().hasPermission(sender, "quickshop.create.stacks") ? item.getAmount() : 1)).send();
diff --git a/src/main/java/org/maxgamer/quickshop/database/AbstractDatabaseCore.java b/src/main/java/org/maxgamer/quickshop/database/AbstractDatabaseCore.java
@@ -81,13 +81,13 @@ synchronized DatabaseConnection getConnection() {
      *
      * @return Impl name
      */
-    abstract @NotNull String getName();
+    public abstract @NotNull String getName();
 
     /**
      * Getting DatabaseCore owned by
      *
      * @return Owned by
      */
-    abstract @NotNull Plugin getPlugin();
+    public abstract @NotNull Plugin getPlugin();
 
 }
diff --git a/src/main/java/org/maxgamer/quickshop/database/JavaDatabaseHelper.java b/src/main/java/org/maxgamer/quickshop/database/JavaDatabaseHelper.java
@@ -26,7 +26,7 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.api.database.DatabaseHelper;
 import org.maxgamer.quickshop.api.shop.Shop;
-import org.maxgamer.quickshop.shop.JavaShopModerator;
+import org.maxgamer.quickshop.api.shop.ShopModerator;
 import org.maxgamer.quickshop.util.JsonUtil;
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
@@ -215,7 +215,7 @@ public void createShop(@NotNull Shop shop, @Nullable Runnable onSuccess, @Nullab
             public void edit(PreparedStatement ps) throws SQLException {
                 Location location = shop.getLocation();
                 //plugin.getDB().execute(q, owner, price, Util.serialize(item), x, y, z, world, unlimited, shopType);
-                ps.setString(1, JavaShopModerator.serialize(shop.getModerator()));
+                ps.setString(1, ShopModerator.serialize(shop.getModerator()));
                 ps.setDouble(2, shop.getPrice());
                 ps.setString(3, Util.serialize(shop.getItem()));
                 ps.setInt(4, location.getBlockX());
@@ -280,19 +280,19 @@ public void removeShop(String world, int x, int y, int z) {
 
     }
 
-    public WarpedResultSet selectAllMessages() throws SQLException {
+    public JavaWarpedResultSet selectAllMessages() throws SQLException {
         return selectTable("messages");
     }
 
-    public WarpedResultSet selectTable(String table) throws SQLException {
+    public JavaWarpedResultSet selectTable(String table) throws SQLException {
         DatabaseConnection databaseConnection = manager.getDatabase().getConnection();
         Statement st = databaseConnection.get().createStatement();
         String selectAllShops = "SELECT * FROM " + plugin.getDbPrefix() + table;
         ResultSet resultSet = st.executeQuery(selectAllShops);
-        return new WarpedResultSet(st, resultSet, databaseConnection);
+        return new JavaWarpedResultSet(st, resultSet, databaseConnection);
     }
 
-    public WarpedResultSet selectAllShops() throws SQLException {
+    public JavaWarpedResultSet selectAllShops() throws SQLException {
         return selectTable("shops");
     }
 
diff --git a/src/main/java/org/maxgamer/quickshop/database/JavaWarpedResultSet.java b/src/main/java/org/maxgamer/quickshop/database/JavaWarpedResultSet.java
@@ -25,13 +25,13 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
-public class WarpedResultSet implements AutoCloseable {
+public class JavaWarpedResultSet implements org.maxgamer.quickshop.api.database.WarpedResultSet,AutoCloseable {
     @Getter
     private final ResultSet resultSet;
     private final DatabaseConnection databaseConnection;
     private final Statement statement;
 
-    public WarpedResultSet(Statement statement, ResultSet resultSet, DatabaseConnection databaseConnection) {
+    public JavaWarpedResultSet(Statement statement, ResultSet resultSet, DatabaseConnection databaseConnection) {
         this.statement = statement;
         this.resultSet = resultSet;
         this.databaseConnection = databaseConnection;
diff --git a/src/main/java/org/maxgamer/quickshop/listener/BlockListener.java b/src/main/java/org/maxgamer/quickshop/listener/BlockListener.java
@@ -41,9 +41,9 @@
 import org.jetbrains.annotations.Nullable;
 import org.maxgamer.quickshop.Cache;
 import org.maxgamer.quickshop.QuickShop;
-import org.maxgamer.quickshop.shop.Info;
+import org.maxgamer.quickshop.api.shop.Info;
 import org.maxgamer.quickshop.api.shop.Shop;
-import org.maxgamer.quickshop.shop.ShopAction;
+import org.maxgamer.quickshop.api.shop.ShopAction;
 import org.maxgamer.quickshop.util.MsgUtil;
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.logging.container.ShopRemoveLog;
diff --git a/src/main/java/org/maxgamer/quickshop/listener/PlayerListener.java b/src/main/java/org/maxgamer/quickshop/listener/PlayerListener.java
@@ -38,10 +38,11 @@
 import org.bukkit.util.BlockIterator;
 import org.jetbrains.annotations.NotNull;
 import org.maxgamer.quickshop.QuickShop;
-import org.maxgamer.quickshop.economy.Economy;
-import org.maxgamer.quickshop.shop.Info;
+import org.maxgamer.quickshop.api.shop.Info;
 import org.maxgamer.quickshop.api.shop.Shop;
-import org.maxgamer.quickshop.shop.ShopAction;
+import org.maxgamer.quickshop.api.shop.ShopAction;
+import org.maxgamer.quickshop.economy.Economy;
+import org.maxgamer.quickshop.shop.JavaInfo;
 import org.maxgamer.quickshop.util.InteractUtil;
 import org.maxgamer.quickshop.util.MsgUtil;
 import org.maxgamer.quickshop.util.Util;
@@ -233,7 +234,7 @@ private void postTrade(PlayerInteractEvent e) {
             }
             // Add the new action
             Map<UUID, Info> actions = plugin.getShopManager().getActions();
-            Info info = new Info(shop.getLocation(), ShopAction.BUY, null, null, shop);
+            Info info = new JavaInfo(shop.getLocation(), ShopAction.BUY, null, null, shop);
             actions.put(p.getUniqueId(), info);
         }
         // Handles creating shops
@@ -286,7 +287,7 @@ else if (e.useInteractedBlock() == Event.Result.ALLOW
                 last = n;
             }
             // Send creation menu.
-            final Info info = new Info(b.getLocation(), ShopAction.CREATE, e.getItem(), last);
+            final JavaInfo info = new JavaInfo(b.getLocation(), ShopAction.CREATE, e.getItem(), last);
 
             plugin.getShopManager().getActions().put(p.getUniqueId(), info);
             plugin.text().of(p, "how-much-to-trade-for", Util.getItemStackName(Objects.requireNonNull(e.getItem())), Integer.toString(plugin.isAllowStack() && QuickShop.getPermissionManager().hasPermission(p, "quickshop.create.stacks") ? item.getAmount() : 1)).send();
diff --git a/src/main/java/org/maxgamer/quickshop/shop/JavaInfo.java b/src/main/java/org/maxgamer/quickshop/shop/JavaInfo.java
@@ -26,22 +26,24 @@
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.maxgamer.quickshop.api.shop.Info;
 import org.maxgamer.quickshop.api.shop.Shop;
+import org.maxgamer.quickshop.api.shop.ShopAction;
 
 /**
  * A class contains shop's infomations
  */
 @EqualsAndHashCode
 @ToString
-public class Info {
+public class JavaInfo implements Info {
     private final Block last;
     private final Location loc;
     private final boolean dirty;
     private ShopAction action;
     private ItemStack item;
     private Shop shop;
 
-    public Info(
+    public JavaInfo(
             @NotNull Location loc,
             @NotNull ShopAction action,
             @Nullable ItemStack item,
@@ -55,7 +57,7 @@ public Info(
         this.dirty = true;
     }
 
-    public Info(
+    public JavaInfo(
             @NotNull Location loc,
             @NotNull ShopAction action,
             @Nullable ItemStack item,
@@ -118,7 +120,7 @@ public void setAction(@NotNull ShopAction action) {
      * @param shop, The need checked with this shop.
      * @return hasChanged
      */
-    boolean hasChanged(@NotNull Shop shop) {
+    public boolean hasChanged(@NotNull Shop shop) {
         if (this.shop.isUnlimited() != shop.isUnlimited()) {
             return true;
         }
diff --git a/src/main/java/org/maxgamer/quickshop/shop/JavaShopManager.java b/src/main/java/org/maxgamer/quickshop/shop/JavaShopManager.java
diff --git a/src/main/java/org/maxgamer/quickshop/shop/ShopLoader.java b/src/main/java/org/maxgamer/quickshop/shop/ShopLoader.java
diff --git a/src/main/java/org/maxgamer/quickshop/util/MsgUtil.java b/src/main/java/org/maxgamer/quickshop/util/MsgUtil.java
diff --git a/src/main/java/org/maxgamer/quickshop/util/paste/Paste.java b/src/main/java/org/maxgamer/quickshop/util/paste/Paste.java

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`*`
`18`	`18`	`*/`
`19`	`19`
`20`		`-package org.maxgamer.quickshop.shop;`
	`20`	`+package org.maxgamer.quickshop.api.shop;`
`21`	`21`
`22`	`22`	`public enum ShopAction {`
`23`	`23`	`// buy = trading create = creating shop cancelled = stopped`
Original file line number	Diff line number	Diff line change
`@@ -81,13 +81,13 @@ synchronized DatabaseConnection getConnection() {`
`81`	`81`	`*`
`82`	`82`	`* @return Impl name`
`83`	`83`	`*/`
`84`		`- abstract @NotNull String getName();`
	`84`	`+ public abstract @NotNull String getName();`
`85`	`85`
`86`	`86`	`/**`
`87`	`87`	`* Getting DatabaseCore owned by`
`88`	`88`	`*`
`89`	`89`	`* @return Owned by`
`90`	`90`	`*/`
`91`		`- abstract @NotNull Plugin getPlugin();`
	`91`	`+ public abstract @NotNull Plugin getPlugin();`
`92`	`92`
`93`	`93`	`}`