Add Reloadable to parent interface/class

Ghost-chu · Ghost-chu · commit 5b1e4fdee7bd · 2021-09-08T14:56:07.000+08:00
diff --git a/src/main/java/org/maxgamer/quickshop/economy/Economy.java b/src/main/java/org/maxgamer/quickshop/economy/Economy.java
@@ -28,6 +28,8 @@
 import org.jetbrains.annotations.Nullable;
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.util.Util;
+import org.maxgamer.quickshop.util.reload.ReloadResult;
+import org.maxgamer.quickshop.util.reload.ReloadStatus;
 
 import java.util.UUID;
 
@@ -141,4 +143,13 @@ public boolean isValid() {
         return plugin;
     }
 
+    /**
+     * Callback for reloading
+     *
+     * @return Reloading success
+     */
+    @Override
+    public ReloadResult reloadModule() throws Exception {
+        return ReloadResult.builder().status(ReloadStatus.SUCCESS).build()
+    }
 }
diff --git a/src/main/java/org/maxgamer/quickshop/economy/EconomyCore.java b/src/main/java/org/maxgamer/quickshop/economy/EconomyCore.java
@@ -24,13 +24,14 @@
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.maxgamer.quickshop.util.reload.Reloadable;
 
 import java.util.UUID;
 
 /**
  * @author netherfoam Represents an economy.
  */
-public interface EconomyCore {
+public interface EconomyCore extends Reloadable {
     /**
      * Deposits a given amount of money from thin air to the given username.
      *
diff --git a/src/main/java/org/maxgamer/quickshop/economy/Economy_GemsEconomy.java b/src/main/java/org/maxgamer/quickshop/economy/Economy_GemsEconomy.java
@@ -32,11 +32,10 @@
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
-import org.maxgamer.quickshop.util.reload.Reloadable;
 
 import java.util.UUID;
 
-public class Economy_GemsEconomy implements EconomyCore, Reloadable {
+public class Economy_GemsEconomy implements EconomyCore {
 
     private final QuickShop plugin;
     private boolean allowLoan;
diff --git a/src/main/java/org/maxgamer/quickshop/economy/Economy_TNE.java b/src/main/java/org/maxgamer/quickshop/economy/Economy_TNE.java
@@ -33,12 +33,11 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
-import org.maxgamer.quickshop.util.reload.Reloadable;
 
 import java.math.BigDecimal;
 import java.util.UUID;
 
-public class Economy_TNE implements EconomyCore, Reloadable {
+public class Economy_TNE implements EconomyCore {
 
     private final QuickShop plugin;
     private boolean allowLoan;
diff --git a/src/main/java/org/maxgamer/quickshop/economy/Economy_Vault.java b/src/main/java/org/maxgamer/quickshop/economy/Economy_Vault.java
@@ -36,13 +36,12 @@
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
-import org.maxgamer.quickshop.util.reload.Reloadable;
 
 import java.util.Objects;
 import java.util.UUID;
 import java.util.logging.Level;
 
-public class Economy_Vault implements EconomyCore, Listener, Reloadable {
+public class Economy_Vault implements EconomyCore, Listener {
 
     private static final String errorMsg =
             "QuickShop received an error when processing Economy response, THIS NOT A QUICKSHOP FAULT, you might need ask help with your Economy Provider plugin (%s) author.";
diff --git a/src/main/java/org/maxgamer/quickshop/integration/IntegratedPlugin.java b/src/main/java/org/maxgamer/quickshop/integration/IntegratedPlugin.java
@@ -22,8 +22,9 @@
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import org.maxgamer.quickshop.util.reload.Reloadable;
 
-public interface IntegratedPlugin {
+public interface IntegratedPlugin extends Reloadable {
     /**
      * Return the integrated plugin name.
      * For example, Residence
diff --git a/src/main/java/org/maxgamer/quickshop/integration/advancedregionmarket/AdvancedShopRegionMarketIntegration.java b/src/main/java/org/maxgamer/quickshop/integration/advancedregionmarket/AdvancedShopRegionMarketIntegration.java
@@ -41,6 +41,8 @@
 import org.maxgamer.quickshop.integration.IntegrationStage;
 import org.maxgamer.quickshop.integration.QSIntegratedPlugin;
 import org.maxgamer.quickshop.shop.Shop;
+import org.maxgamer.quickshop.util.reload.ReloadResult;
+import org.maxgamer.quickshop.util.reload.ReloadStatus;
 
 import java.util.*;
 import java.util.logging.Level;
@@ -174,4 +176,14 @@ public void onShopNeedDeletion(RestoreRegionEvent event) {
     public void onShopNeedDeletion(RemoveRegionEvent event) {
         handleDeletion(event.getRegion());
     }
+
+    /**
+     * Callback for reloading
+     *
+     * @return Reloading success
+     */
+    @Override
+    public ReloadResult reloadModule() throws Exception {
+        return ReloadResult.builder().status(ReloadStatus.SUCCESS).build();
+    }
 }
diff --git a/src/main/java/org/maxgamer/quickshop/integration/factionsuuid/FactionsUUIDIntegration.java b/src/main/java/org/maxgamer/quickshop/integration/factionsuuid/FactionsUUIDIntegration.java
@@ -33,12 +33,11 @@
 import org.maxgamer.quickshop.integration.QSIntegratedPlugin;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
-import org.maxgamer.quickshop.util.reload.Reloadable;
 
 import java.util.List;
 
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class FactionsUUIDIntegration extends QSIntegratedPlugin implements Reloadable {
+public class FactionsUUIDIntegration extends QSIntegratedPlugin {
     private List<String> createFlags;
 
     private List<String> tradeFlags;
diff --git a/src/main/java/org/maxgamer/quickshop/integration/griefprevention/GriefPreventionIntegration.java b/src/main/java/org/maxgamer/quickshop/integration/griefprevention/GriefPreventionIntegration.java
@@ -38,15 +38,14 @@
 import org.maxgamer.quickshop.shop.Shop;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
-import org.maxgamer.quickshop.util.reload.Reloadable;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class GriefPreventionIntegration extends QSIntegratedPlugin implements Reloadable {
+public class GriefPreventionIntegration extends QSIntegratedPlugin {
 
     final GriefPrevention griefPrevention = GriefPrevention.instance;
 
diff --git a/src/main/java/org/maxgamer/quickshop/integration/iridiumskyblock/IridiumSkyblockIntegration.java b/src/main/java/org/maxgamer/quickshop/integration/iridiumskyblock/IridiumSkyblockIntegration.java
@@ -39,13 +39,12 @@
 import org.maxgamer.quickshop.shop.Shop;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
-import org.maxgamer.quickshop.util.reload.Reloadable;
 
 import java.util.List;
 import java.util.Optional;
 
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class IridiumSkyblockIntegration extends QSIntegratedPlugin implements Listener, Reloadable {
+public class IridiumSkyblockIntegration extends QSIntegratedPlugin implements Listener {
 
     private boolean onlyOwnerCanCreateShop;
 
diff --git a/src/main/java/org/maxgamer/quickshop/integration/lands/LandsIntegration.java b/src/main/java/org/maxgamer/quickshop/integration/lands/LandsIntegration.java
@@ -38,13 +38,12 @@
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
-import org.maxgamer.quickshop.util.reload.Reloadable;
 
 import java.util.Map;
 import java.util.UUID;
 
 @IntegrationStage
-public class LandsIntegration extends QSIntegratedPlugin implements Listener, Reloadable {
+public class LandsIntegration extends QSIntegratedPlugin implements Listener {
 
     private boolean ignoreDisabledWorlds;
     private boolean whitelist;
diff --git a/src/main/java/org/maxgamer/quickshop/integration/plotsquared/PlotSquaredIntegrationV4.java b/src/main/java/org/maxgamer/quickshop/integration/plotsquared/PlotSquaredIntegrationV4.java
@@ -39,15 +39,14 @@
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
-import org.maxgamer.quickshop.util.reload.Reloadable;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 @SuppressWarnings("DuplicatedCode")
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class PlotSquaredIntegrationV4 extends QSIntegratedPlugin implements Listener, Reloadable {
+public class PlotSquaredIntegrationV4 extends QSIntegratedPlugin implements Listener {
     private boolean whiteList;
     private boolean deleteUntrusted;
     private BooleanFlag createFlag;
diff --git a/src/main/java/org/maxgamer/quickshop/integration/plotsquared/PlotSquaredIntegrationV6.java b/src/main/java/org/maxgamer/quickshop/integration/plotsquared/PlotSquaredIntegrationV6.java
@@ -57,7 +57,6 @@
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
-import org.maxgamer.quickshop.util.reload.Reloadable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -66,7 +65,7 @@
 
 @SuppressWarnings("DuplicatedCode")
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class PlotSquaredIntegrationV6 extends QSIntegratedPlugin implements Reloadable {
+public class PlotSquaredIntegrationV6 extends QSIntegratedPlugin {
     private boolean whiteList;
     private boolean deleteUntrusted;
     private QuickshopCreateFlag createFlag;
diff --git a/src/main/java/org/maxgamer/quickshop/integration/residence/ResidenceIntegration.java b/src/main/java/org/maxgamer/quickshop/integration/residence/ResidenceIntegration.java
@@ -32,14 +32,13 @@
 import org.maxgamer.quickshop.integration.QSIntegratedPlugin;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
-import org.maxgamer.quickshop.util.reload.Reloadable;
 
 import java.util.List;
 import java.util.Map;
 
 @SuppressWarnings("DuplicatedCode")
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class ResidenceIntegration extends QSIntegratedPlugin implements Reloadable {
+public class ResidenceIntegration extends QSIntegratedPlugin {
     private static final String createFlag = "quickshop-create";
     private static final String tradeFlag = "quickshop-trade";
     private List<String> createLimits;
diff --git a/src/main/java/org/maxgamer/quickshop/integration/superiorskyblock/SuperiorSkyblock2Integration.java b/src/main/java/org/maxgamer/quickshop/integration/superiorskyblock/SuperiorSkyblock2Integration.java
@@ -38,12 +38,11 @@
 import org.maxgamer.quickshop.shop.Shop;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
-import org.maxgamer.quickshop.util.reload.Reloadable;
 
 import java.util.Map;
 
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class SuperiorSkyblock2Integration extends QSIntegratedPlugin implements Listener, Reloadable {
+public class SuperiorSkyblock2Integration extends QSIntegratedPlugin implements Listener {
     private boolean onlyOwnerCanCreateShop;
     private boolean deleteShopOnMemberLeave;
 
diff --git a/src/main/java/org/maxgamer/quickshop/integration/towny/TownyIntegration.java b/src/main/java/org/maxgamer/quickshop/integration/towny/TownyIntegration.java
@@ -44,15 +44,14 @@
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
-import org.maxgamer.quickshop.util.reload.Reloadable;
 
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
 
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class TownyIntegration extends QSIntegratedPlugin implements Listener, Reloadable {
+public class TownyIntegration extends QSIntegratedPlugin implements Listener {
     private List<TownyFlags> createFlags;
 
     private List<TownyFlags> tradeFlags;
diff --git a/src/main/java/org/maxgamer/quickshop/integration/worldguard/WorldGuardIntegration.java b/src/main/java/org/maxgamer/quickshop/integration/worldguard/WorldGuardIntegration.java
@@ -41,14 +41,13 @@
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
-import org.maxgamer.quickshop.util.reload.Reloadable;
 
 import java.util.List;
 import java.util.logging.Level;
 
 @SuppressWarnings("DuplicatedCode")
 @IntegrationStage(loadStage = IntegrateStage.onLoadAfter)
-public class WorldGuardIntegration extends QSIntegratedPlugin implements Reloadable {
+public class WorldGuardIntegration extends QSIntegratedPlugin {
     private final StateFlag createFlag = createOrGet("quickshop-create", false);
     private final StateFlag tradeFlag = createOrGet("quickshop-trade", true);
     private List<WorldGuardFlags> createFlags;
diff --git a/src/main/java/org/maxgamer/quickshop/listener/BlockListener.java b/src/main/java/org/maxgamer/quickshop/listener/BlockListener.java
@@ -48,14 +48,13 @@
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
-import org.maxgamer.quickshop.util.reload.Reloadable;
 
 /**
  * BlockListener to listening events about block events
  *
  * @author KaiNoMood, Ghost_chu, sandtechnology
  */
-public class BlockListener extends ProtectionListenerBase implements Reloadable {
+public class BlockListener extends ProtectionListenerBase {
     private boolean update_sign_when_inventory_moving;
 
     public BlockListener(@NotNull final QuickShop plugin, @Nullable final Cache cache) {
diff --git a/src/main/java/org/maxgamer/quickshop/listener/ChatListener.java b/src/main/java/org/maxgamer/quickshop/listener/ChatListener.java
@@ -24,6 +24,8 @@
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.util.Util;
+import org.maxgamer.quickshop.util.reload.ReloadResult;
+import org.maxgamer.quickshop.util.reload.ReloadStatus;
 
 /**
  * @author Netherfoam
@@ -50,4 +52,13 @@ public void onChat(AsyncPlayerChatEvent e) {
         e.setCancelled(true);
     }
 
+    /**
+     * Callback for reloading
+     *
+     * @return Reloading success
+     */
+    @Override
+    public ReloadResult reloadModule() throws Exception {
+        return ReloadResult.builder().status(ReloadStatus.SUCCESS).build();
+    }
 }
diff --git a/src/main/java/org/maxgamer/quickshop/listener/ChunkListener.java b/src/main/java/org/maxgamer/quickshop/listener/ChunkListener.java
@@ -26,6 +26,8 @@
 import org.bukkit.event.world.ChunkUnloadEvent;
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.shop.Shop;
+import org.maxgamer.quickshop.util.reload.ReloadResult;
+import org.maxgamer.quickshop.util.reload.ReloadStatus;
 
 import java.util.Map;
 
@@ -64,4 +66,14 @@ public void onChunkUnload(ChunkUnloadEvent e) {
             }
         }
     }
+
+    /**
+     * Callback for reloading
+     *
+     * @return Reloading success
+     */
+    @Override
+    public ReloadResult reloadModule() throws Exception {
+        return ReloadResult.builder().status(ReloadStatus.SUCCESS).build();
+    }
 }
diff --git a/src/main/java/org/maxgamer/quickshop/listener/ClearLaggListener.java b/src/main/java/org/maxgamer/quickshop/listener/ClearLaggListener.java
@@ -26,6 +26,8 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.shop.DisplayItem;
 import org.maxgamer.quickshop.util.Util;
+import org.maxgamer.quickshop.util.reload.ReloadResult;
+import org.maxgamer.quickshop.util.reload.ReloadStatus;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -56,4 +58,13 @@ public void plugin(me.minebuilders.clearlag.events.EntityRemoveEvent clearlaggEv
         Util.debugLog("Prevent " + pendingExclude.size() + " displays removal by ClearLagg.");
     }
 
+    /**
+     * Callback for reloading
+     *
+     * @return Reloading success
+     */
+    @Override
+    public ReloadResult reloadModule() throws Exception {
+        return ReloadResult.builder().status(ReloadStatus.SUCCESS).build();
+    }
 }
diff --git a/src/main/java/org/maxgamer/quickshop/listener/CustomInventoryListener.java b/src/main/java/org/maxgamer/quickshop/listener/CustomInventoryListener.java
@@ -26,6 +26,8 @@
 import org.bukkit.event.inventory.InventoryMoveItemEvent;
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.util.holder.QuickShopPreviewGUIHolder;
+import org.maxgamer.quickshop.util.reload.ReloadResult;
+import org.maxgamer.quickshop.util.reload.ReloadStatus;
 
 public class CustomInventoryListener extends QSListener {
 
@@ -60,4 +62,14 @@ public void invEvent(InventoryDragEvent e) {
             e.setCancelled(true);
         }
     }
+
+    /**
+     * Callback for reloading
+     *
+     * @return Reloading success
+     */
+    @Override
+    public ReloadResult reloadModule() throws Exception {
+        return ReloadResult.builder().status(ReloadStatus.SUCCESS).build();
+    }
 }
diff --git a/src/main/java/org/maxgamer/quickshop/listener/DisplayProtectionListener.java b/src/main/java/org/maxgamer/quickshop/listener/DisplayProtectionListener.java
diff --git a/src/main/java/org/maxgamer/quickshop/listener/EconomySetupListener.java b/src/main/java/org/maxgamer/quickshop/listener/EconomySetupListener.java
diff --git a/src/main/java/org/maxgamer/quickshop/listener/InternalListener.java b/src/main/java/org/maxgamer/quickshop/listener/InternalListener.java
diff --git a/src/main/java/org/maxgamer/quickshop/listener/PlayerListener.java b/src/main/java/org/maxgamer/quickshop/listener/PlayerListener.java
diff --git a/src/main/java/org/maxgamer/quickshop/listener/PluginListener.java b/src/main/java/org/maxgamer/quickshop/listener/PluginListener.java
diff --git a/src/main/java/org/maxgamer/quickshop/listener/ProtectionListenerBase.java b/src/main/java/org/maxgamer/quickshop/listener/ProtectionListenerBase.java
diff --git a/src/main/java/org/maxgamer/quickshop/listener/QSListener.java b/src/main/java/org/maxgamer/quickshop/listener/QSListener.java
diff --git a/src/main/java/org/maxgamer/quickshop/listener/WorldListener.java b/src/main/java/org/maxgamer/quickshop/listener/WorldListener.java
