spilt api interface (part 7, fix build)

Ghost-chu · Ghost-chu · commit 74e35456ebad · 2021-10-07T17:01:34.000+08:00
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Info.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Info.java
@@ -27,7 +27,7 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.api.command.CommandHandler;
 import org.maxgamer.quickshop.api.shop.Shop;
-import org.maxgamer.quickshop.shop.JavaShopChunk;
+import org.maxgamer.quickshop.api.shop.ShopChunk;
 import org.maxgamer.quickshop.util.MsgUtil;
 
 import java.util.Map;
@@ -46,7 +46,7 @@ public void onCommand(@NotNull CommandSender sender, @NotNull String commandLabe
         worlds = 0;
         int nostock = 0;
 
-        for (Map<JavaShopChunk, Map<Location, Shop>> inWorld :
+        for (Map<ShopChunk, Map<Location, Shop>> inWorld :
                 plugin.getShopManager().getShops().values()) {
             worlds++;
 
diff --git a/src/main/java/org/maxgamer/quickshop/integration/lands/LandsIntegration.java b/src/main/java/org/maxgamer/quickshop/integration/lands/LandsIntegration.java
@@ -32,9 +32,9 @@
 import org.jetbrains.annotations.NotNull;
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.api.integration.IntegrationStage;
-import org.maxgamer.quickshop.integration.AbstractQSIntegratedPlugin;
 import org.maxgamer.quickshop.api.shop.Shop;
-import org.maxgamer.quickshop.shop.JavaShopChunk;
+import org.maxgamer.quickshop.api.shop.ShopChunk;
+import org.maxgamer.quickshop.integration.AbstractQSIntegratedPlugin;
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.logging.container.ShopRemoveLog;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
@@ -100,13 +100,13 @@ public void onLandsPermissionChanges(LandUntrustPlayerEvent event) {
 
     private void deleteShopInLand(Land land, UUID target) {
         //Getting all shop with world-chunk-shop mapping
-        for (Map.Entry<String, Map<JavaShopChunk, Map<Location, Shop>>> entry : plugin.getShopManager().getShops().entrySet()) {
+        for (Map.Entry<String, Map<ShopChunk, Map<Location, Shop>>> entry : plugin.getShopManager().getShops().entrySet()) {
             //Matching world
             World world = plugin.getServer().getWorld(entry.getKey());
             if (world != null) {
                 //Matching chunk
-                for (Map.Entry<JavaShopChunk, Map<Location, Shop>> chunkedShopEntry : entry.getValue().entrySet()) {
-                    JavaShopChunk shopChunk = chunkedShopEntry.getKey();
+                for (Map.Entry<ShopChunk, Map<Location, Shop>> chunkedShopEntry : entry.getValue().entrySet()) {
+                    ShopChunk shopChunk = chunkedShopEntry.getKey();
                     if (land.hasChunk(world, shopChunk.getX(), shopChunk.getZ())) {
                         //Matching Owner and delete it
                         Map<Location, Shop> shops = chunkedShopEntry.getValue();
diff --git a/src/main/java/org/maxgamer/quickshop/integration/towny/TownyIntegration.java b/src/main/java/org/maxgamer/quickshop/integration/towny/TownyIntegration.java
@@ -39,9 +39,9 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.api.integration.IntegrateStage;
 import org.maxgamer.quickshop.api.integration.IntegrationStage;
-import org.maxgamer.quickshop.integration.AbstractQSIntegratedPlugin;
 import org.maxgamer.quickshop.api.shop.Shop;
-import org.maxgamer.quickshop.shop.JavaShopChunk;
+import org.maxgamer.quickshop.api.shop.ShopChunk;
+import org.maxgamer.quickshop.integration.AbstractQSIntegratedPlugin;
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
@@ -108,13 +108,13 @@ public void deleteShops(UUID owner, Town town) {
             worldName = town.getWorld().getName();
         }
         //Getting all shop with world-chunk-shop mapping
-        for (Map.Entry<String, Map<JavaShopChunk, Map<Location, Shop>>> entry : plugin.getShopManager().getShops().entrySet()) {
+        for (Map.Entry<String, Map<ShopChunk, Map<Location, Shop>>> entry : plugin.getShopManager().getShops().entrySet()) {
             //Matching world
             if (worldName.equals(entry.getKey())) {
                 World world = Bukkit.getWorld(entry.getKey());
                 if (world != null) {
                     //Matching Location
-                    for (Map.Entry<JavaShopChunk, Map<Location, Shop>> chunkedShopEntry : entry.getValue().entrySet()) {
+                    for (Map.Entry<ShopChunk, Map<Location, Shop>> chunkedShopEntry : entry.getValue().entrySet()) {
                         Map<Location, Shop> shopMap = chunkedShopEntry.getValue();
                         for (Shop shop : shopMap.values()) {
                             //Matching Owner
@@ -143,13 +143,13 @@ public void purgeShops(TownBlock townBlock) {
         String worldName;
         worldName = townBlock.getWorld().getName();
         //Getting all shop with world-chunk-shop mapping
-        for (Map.Entry<String, Map<JavaShopChunk, Map<Location, Shop>>> entry : plugin.getShopManager().getShops().entrySet()) {
+        for (Map.Entry<String, Map<ShopChunk, Map<Location, Shop>>> entry : plugin.getShopManager().getShops().entrySet()) {
             //Matching world
             if (worldName.equals(entry.getKey())) {
                 World world = Bukkit.getWorld(entry.getKey());
                 if (world != null) {
                     //Matching Location
-                    for (Map.Entry<JavaShopChunk, Map<Location, Shop>> chunkedShopEntry : entry.getValue().entrySet()) {
+                    for (Map.Entry<ShopChunk, Map<Location, Shop>> chunkedShopEntry : entry.getValue().entrySet()) {
                         Map<Location, Shop> shopMap = chunkedShopEntry.getValue();
                         for (Shop shop : shopMap.values()) {
                             //Matching Owner
diff --git a/src/main/java/org/maxgamer/quickshop/listener/PluginListener.java b/src/main/java/org/maxgamer/quickshop/listener/PluginListener.java
@@ -24,6 +24,7 @@
 import org.bukkit.event.server.PluginDisableEvent;
 import org.bukkit.event.server.PluginEnableEvent;
 import org.maxgamer.quickshop.QuickShop;
+import org.maxgamer.quickshop.api.compatibility.CompatibilityManager;
 import org.maxgamer.quickshop.api.integration.IntegratedPlugin;
 import org.maxgamer.quickshop.api.integration.IntegrationManager;
 import org.maxgamer.quickshop.util.Util;
@@ -37,16 +38,16 @@ public class PluginListener extends AbstractQSListener {
 
     private static final Set<String> COMPATIBILITY_MODULE_LIST = JavaCompatibilityManager.getModuleMapping().keySet();
     private IntegrationManager integrationHelper;
-    private JavaCompatibilityManager compatibilityManager;
+    private CompatibilityManager compatibilityManager;
 
     public PluginListener(QuickShop plugin) {
         super(plugin);
         init();
     }
 
     private void init() {
-        //integrationHelper = plugin.getIntegrationHelper();
-        compatibilityManager = plugin.getCompatibilityTool();
+        integrationHelper = plugin.getIntegrationHelper();
+        compatibilityManager = plugin.getCompatibilityManager();
     }
 
 
diff --git a/src/main/java/org/maxgamer/quickshop/listener/WorldListener.java b/src/main/java/org/maxgamer/quickshop/listener/WorldListener.java
@@ -28,7 +28,7 @@
 import org.bukkit.event.world.WorldUnloadEvent;
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.api.shop.Shop;
-import org.maxgamer.quickshop.shop.JavaShopChunk;
+import org.maxgamer.quickshop.api.shop.ShopChunk;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
 
@@ -54,17 +54,17 @@ public void onWorldLoad(WorldLoadEvent e) {
 
         plugin.getShopLoader().loadShops(world.getName());
         // New world data
-        final Map<JavaShopChunk, Map<Location, Shop>> inWorld = new ConcurrentHashMap<>(1);
+        final Map<ShopChunk, Map<Location, Shop>> inWorld = new ConcurrentHashMap<>(1);
         // Old world data
-        final Map<JavaShopChunk, Map<Location, Shop>> oldInWorld =
+        final Map<ShopChunk, Map<Location, Shop>> oldInWorld =
                 plugin.getShopManager().getShops(world.getName());
         // Nothing in the old world, therefore we don't care. No locations to
         // update.
         if (oldInWorld == null) {
             return;
         }
 
-        for (Entry<JavaShopChunk, Map<Location, Shop>> oldInChunk : oldInWorld.entrySet()) {
+        for (Entry<ShopChunk, Map<Location, Shop>> oldInChunk : oldInWorld.entrySet()) {
             final Map<Location, Shop> inChunk = new ConcurrentHashMap<>(1);
             // Put the new chunk were the old chunk was
             inWorld.put(oldInChunk.getKey(), inChunk);
diff --git a/src/main/java/org/maxgamer/quickshop/permission/BukkitPermsProvider.java b/src/main/java/org/maxgamer/quickshop/permission/BukkitPermsProvider.java
@@ -47,7 +47,6 @@ public boolean hasPermission(@NotNull CommandSender sender, @NotNull String perm
      * @param permission The permission want to check
      * @return Debug Infos
      */
-    @Override
     public @NotNull PermissionInformationContainer getDebugInfo(
             @NotNull CommandSender sender, @NotNull String permission) {
         return new PermissionInformationContainer(sender, permission, null, null);
diff --git a/src/main/java/org/maxgamer/quickshop/permission/PermissionManager.java b/src/main/java/org/maxgamer/quickshop/permission/PermissionManager.java
@@ -58,8 +58,9 @@ public boolean hasPermission(@NotNull CommandSender sender, @NotNull String perm
             boolean result = provider.hasPermission(sender, permission);
             if (Util.isDevMode()) {
                 try {
-                    PermissionInformationContainer container = provider.getDebugInfo(sender, permission);
-                    Util.debugLog("Node: [" + container.getPermission() + "]; Result: [" + result + "]; Sender: [" + container.getSender().getName() + "]");
+                    //PermissionInformationContainer container = (PermissionInformationContainer) provider.getClass().getDeclaredMethod("getDebugInfo", CommandSender.class, String.class).invoke(provider,sender,permission);
+                     //       PermissionInformationContainer container = provider.getDebugInfo(sender, permission);
+                    Util.debugLog("Node: [" + permission + "]; Result: [" + result + "]; Sender: [" + sender.getName() + "]");
                 } catch (Exception th) {
                     Util.debugLog("Exception threw when getting debug messages.");
                     MsgUtil.debugStackTrace(th.getStackTrace());
diff --git a/src/main/java/org/maxgamer/quickshop/permission/VaultPermissionProvider.java b/src/main/java/org/maxgamer/quickshop/permission/VaultPermissionProvider.java
@@ -72,7 +72,6 @@ public boolean hasPermission(@NotNull CommandSender sender, @NotNull String perm
      * @param permission The permission want to check
      * @return Debug Infos
      */
-    @Override
     public @NotNull PermissionInformationContainer getDebugInfo(
             @NotNull CommandSender sender, @NotNull String permission) {
         if (sender instanceof Server) {
diff --git a/src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java b/src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java
@@ -145,7 +145,7 @@ public ContainerShop(
             @NotNull Location location,
             double price,
             @NotNull ItemStack item,
-            @NotNull JavaShopModerator moderator,
+            @NotNull ShopModerator moderator,
             boolean unlimited,
             @NotNull ShopType type,
             @NotNull YamlConfiguration extra,
diff --git a/src/main/java/org/maxgamer/quickshop/shop/JavaPriceLimiter.java b/src/main/java/org/maxgamer/quickshop/shop/JavaPriceLimiter.java
@@ -24,6 +24,8 @@
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.maxgamer.quickshop.QuickShop;
+import org.maxgamer.quickshop.api.shop.PriceLimiter;
+import org.maxgamer.quickshop.api.shop.PriceLimiterCheckResult;
 import org.maxgamer.quickshop.api.shop.PriceLimiterStatus;
 import org.maxgamer.quickshop.util.CalculateUtil;
 import org.maxgamer.quickshop.util.Util;
@@ -34,14 +36,15 @@
 
 @AllArgsConstructor
 @Data
-public class JavaPriceLimiter {
+public class JavaPriceLimiter implements PriceLimiter {
     private double minPrice;
     private double maxPrice;
     private boolean allowFreeShop;
     private boolean wholeNumberOnly;
 
+    @Override
     @NotNull
-    public JavaPriceLimiterCheckResult check(@NotNull ItemStack stack, double price) {
+    public PriceLimiterCheckResult check(@NotNull ItemStack stack, double price) {
         if (Double.isInfinite(price) || Double.isNaN(price)) {
             return new JavaPriceLimiterCheckResult(PriceLimiterStatus.NOT_VALID, minPrice, maxPrice);
         }
diff --git a/src/main/java/org/maxgamer/quickshop/shop/JavaShopManager.java b/src/main/java/org/maxgamer/quickshop/shop/JavaShopManager.java
@@ -81,7 +81,6 @@ public class JavaShopManager implements ShopManager, Reloadable {
     private Trader cacheTaxAccount;
     @Getter
     private Trader cacheUnlimitedShopAccount;
-    @Getter
     private JavaPriceLimiter priceLimiter;
     //private boolean useFastShopSearchAlgorithm;
     private boolean useOldCanBuildAlgorithm;
@@ -1391,6 +1390,11 @@ public void migrateOwnerToUnlimitedShopOwner(Shop shop) {
         shop.setSignText();
     }
 
+    @Override
+    public PriceLimiter getPriceLimiter() {
+        return this.priceLimiter;
+    }
+
     public class ShopIterator implements Iterator<Shop> {
 
         private final Iterator<Map<ShopChunk, Map<Location, Shop>>> worlds;
diff --git a/src/main/java/org/maxgamer/quickshop/shop/ShopLoader.java b/src/main/java/org/maxgamer/quickshop/shop/ShopLoader.java
@@ -35,9 +35,10 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.maxgamer.quickshop.QuickShop;
+import org.maxgamer.quickshop.api.database.WarpedResultSet;
 import org.maxgamer.quickshop.api.shop.Shop;
+import org.maxgamer.quickshop.api.shop.ShopModerator;
 import org.maxgamer.quickshop.api.shop.ShopType;
-import org.maxgamer.quickshop.database.JavaWarpedResultSet;
 import org.maxgamer.quickshop.util.JsonUtil;
 import org.maxgamer.quickshop.util.Timer;
 import org.maxgamer.quickshop.util.Util;
@@ -87,7 +88,7 @@ public void loadShops(@Nullable String worldName) {
         int loadAfterChunkLoaded = 0;
         int loadAfterWorldLoaded = 0;
         List<Shop> pendingLoadShops = new ArrayList<>();
-        try (JavaWarpedResultSet warpRS = plugin.getDatabaseHelper().selectAllShops(); ResultSet rs = warpRS.getResultSet()) {
+        try (WarpedResultSet warpRS = plugin.getDatabaseHelper().selectAllShops(); ResultSet rs = warpRS.getResultSet()) {
             this.plugin.getLogger().info("Loading shops from the database...");
             while (rs.next()) {
                 ShopRawDatabaseInfo origin = new ShopRawDatabaseInfo(rs);
@@ -344,7 +345,7 @@ public synchronized void recoverFromFile(@NotNull String fileContent) {
     public List<ShopRawDatabaseInfo> getOriginShopsInDatabase() {
         errors = 0;
         List<ShopRawDatabaseInfo> shopRawDatabaseInfoList = new ArrayList<>();
-        try (JavaWarpedResultSet warpRS = plugin.getDatabaseHelper().selectAllShops(); ResultSet rs = warpRS.getResultSet()) {
+        try (WarpedResultSet warpRS = plugin.getDatabaseHelper().selectAllShops(); ResultSet rs = warpRS.getResultSet()) {
             this.plugin.getLogger().info("Getting shops from the database...");
             while (rs.next()) {
                 ShopRawDatabaseInfo origin = new ShopRawDatabaseInfo(rs);
@@ -439,7 +440,7 @@ public class ShopDatabaseInfo {
 
         private Location location;
 
-        private JavaShopModerator moderators;
+        private ShopModerator moderators;
 
         private double price;
 
@@ -496,8 +497,8 @@ public class ShopDatabaseInfo {
             }
         }
 
-        private @Nullable JavaShopModerator deserializeModerator(@NotNull String moderatorJson, AtomicBoolean needUpdate) {
-            JavaShopModerator shopModerator;
+        private @Nullable ShopModerator deserializeModerator(@NotNull String moderatorJson, AtomicBoolean needUpdate) {
+            ShopModerator shopModerator;
             if (Util.isUUID(moderatorJson)) {
                 Util.debugLog("Updating old shop data... for " + moderatorJson);
                 shopModerator = new JavaShopModerator(UUID.fromString(moderatorJson)); // New one
diff --git a/src/main/java/org/maxgamer/quickshop/util/MsgUtil.java b/src/main/java/org/maxgamer/quickshop/util/MsgUtil.java
@@ -46,9 +46,9 @@
 import org.jetbrains.annotations.Nullable;
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.ServiceInjector;
-import org.maxgamer.quickshop.database.JavaWarpedResultSet;
-import org.maxgamer.quickshop.event.ShopControlPanelOpenEvent;
+import org.maxgamer.quickshop.api.database.WarpedResultSet;
 import org.maxgamer.quickshop.api.shop.Shop;
+import org.maxgamer.quickshop.event.ShopControlPanelOpenEvent;
 import org.maxgamer.quickshop.localization.game.game.GameLanguage;
 import org.maxgamer.quickshop.localization.game.game.MojangGameLanguageImpl;
 import org.maxgamer.quickshop.util.logging.container.PluginGlobalAlertLog;
@@ -285,7 +285,7 @@ public static void loadPotioni18n() {
      */
     public static void loadTransactionMessages() {
         OUTGOING_MESSAGES.clear(); // Delete old messages
-        try (JavaWarpedResultSet warpRS = plugin.getDatabaseHelper().selectAllMessages(); ResultSet rs = warpRS.getResultSet()) {
+        try (WarpedResultSet warpRS = plugin.getDatabaseHelper().selectAllMessages(); ResultSet rs = warpRS.getResultSet()) {
             while (rs.next()) {
                 String owner = rs.getString("owner");
                 UUID ownerUUID;
diff --git a/src/main/java/org/maxgamer/quickshop/util/PermissionChecker.java b/src/main/java/org/maxgamer/quickshop/util/PermissionChecker.java
@@ -180,9 +180,9 @@ public void onTestEvent(BlockBreakEvent event) {
                 }
             }
         }, plugin);
-        plugin.getCompatibilityTool().toggleProtectionListeners(false, player);
+        plugin.getCompatibilityManager().toggleProtectionListeners(false, player);
         this.eventManager.callEvent(beMainHand);
-        plugin.getCompatibilityTool().toggleProtectionListeners(true, player);
+        plugin.getCompatibilityManager().toggleProtectionListeners(true, player);
 
         return isCanBuild;
     }
diff --git a/src/main/java/org/maxgamer/quickshop/util/envcheck/EnvironmentChecker.java b/src/main/java/org/maxgamer/quickshop/util/envcheck/EnvironmentChecker.java
@@ -384,7 +384,7 @@ public ResultContainer gamerVersionSupportTest() {
 
     @EnvCheckEntry(name = "PacketListenerAPI Conflict Test", priority = 10)
     public ResultContainer plapiConflictTest() {
-        if (plugin.isDisplay() && AbstractDisplayItem.getNowUsing() == DisplayType.VIRTUALITEM && Bukkit.getPluginManager().isPluginEnabled("ProtocolLib") && Bukkit.getPluginManager().isPluginEnabled("PacketListenerAPI")) {
+        if (plugin.isDisplayEnabled() && AbstractDisplayItem.getNowUsing() == DisplayType.VIRTUALITEM && Bukkit.getPluginManager().isPluginEnabled("ProtocolLib") && Bukkit.getPluginManager().isPluginEnabled("PacketListenerAPI")) {
             return new ResultContainer(CheckResult.WARNING, "Virtual DisplayItem may stop working on your server. We are already aware that [PacketListenerAPI] and [ProtocolLib] are conflicting. (QuickShops requirement to send fake items). If your display is not showing, please uninstall [PacketListenerAPI].");
         }
         return new ResultContainer(CheckResult.PASSED, "Passed checks");
