Fix build and add default method for reloadModule

Also write reload logic for PlotSquaredIntegrationV5

Author: sandtechnology

src/integration/plotsquared/5/src/main/java/org/maxgamer/quickshop/integration/plotsquared/PlotSquaredIntegrationV5.java

@@ -47,16 +47,19 @@
 @SuppressWarnings("DuplicatedCode")
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
 public class PlotSquaredIntegrationV5 extends QSIntegratedPlugin {
-    private final boolean whiteList;
-    private final boolean deleteUntrusted;
+    private boolean whiteList;
+    private boolean deleteUntrusted;
     private QuickshopCreateFlag createFlag;
     private QuickshopTradeFlag tradeFlag;
 
     public PlotSquaredIntegrationV5(QuickShop plugin) {
         super(plugin);
+        loadConfiguration();
+    }
+
+    protected void loadConfiguration() {
         this.whiteList = plugin.getConfig().getBoolean("integration.plotsquared.whitelist-mode");
         this.deleteUntrusted = plugin.getConfig().getBoolean("integration.plotsquared.delete-when-user-untrusted");
-
     }
 
     @Override

src/main/java/org/maxgamer/quickshop/integration/fabledskyblock/FabledIntegration.java

@@ -40,6 +40,7 @@ public class FabledIntegration extends QSIntegratedPlugin {
 
     public FabledIntegration(QuickShop plugin) {
         super(plugin);
+        plugin.getReloadManager().register(this);
         loadConfiguration();
         registerListener();
     }

src/main/java/org/maxgamer/quickshop/integration/plotsquared/PlotSquaredIntegrationProxy.java

@@ -28,25 +28,27 @@
 import org.maxgamer.quickshop.integration.QSIntegratedPlugin;
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
-import org.maxgamer.quickshop.util.reload.ReloadStatus;
 
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
 public class PlotSquaredIntegrationProxy extends QSIntegratedPlugin {
-    private static QSIntegratedPlugin plotSquared;
+    private final QSIntegratedPlugin plotSquared;
 
     public PlotSquaredIntegrationProxy(QuickShop instance) {
         super(instance);
-    }
-
-    private void initInstance() {
-        if (plotSquared == null) {
-            if (plugin.getServer().getPluginManager().getPlugin("PlotSquared").getClass().getPackage().getName().contains("intellectualsite")) {
-                plotSquared = new PlotSquaredIntegrationV4(plugin);
-            } else if (Util.isClassAvailable("com.plotsquared.core.configuration.Caption")) {
-                plotSquared = new PlotSquaredIntegrationV5(plugin);
-            } else {
-                plotSquared = new PlotSquaredIntegrationV6(plugin);
-            }
+        if (plugin.getServer().getPluginManager().getPlugin("PlotSquared").getClass().getPackage().getName().contains("intellectualsite")) {
+            plotSquared = new PlotSquaredIntegrationV4(plugin);
+        } else if (Util.isClassAvailable("com.plotsquared.core.configuration.Caption")) {
+            //Write reload logic for it
+            plotSquared = new PlotSquaredIntegrationV5(plugin) {
+                @Override
+                public ReloadResult reloadModule() throws Exception {
+                    loadConfiguration();
+                    return super.reloadModule();
+                }
+            };
+            plugin.getReloadManager().register(plotSquared);
+        } else {
+            plotSquared = new PlotSquaredIntegrationV6(plugin);
         }
     }
 
@@ -82,7 +84,6 @@ public void unload() {
 
     @Override
     public ReloadResult reloadModule() throws Exception {
-        initInstance();
-        return ReloadResult.builder().status(ReloadStatus.SUCCESS).build();
+        return plotSquared.reloadModule();
     }
 }

src/main/java/org/maxgamer/quickshop/integration/worldguard/WorldGuardIntegration.java

@@ -58,6 +58,7 @@ public class WorldGuardIntegration extends QSIntegratedPlugin {
 
     public WorldGuardIntegration(QuickShop plugin) {
         super(plugin);
+        plugin.getReloadManager().register(this);
     }
 
     private StateFlag createOrGet(String key, boolean def) {

src/main/java/org/maxgamer/quickshop/util/reload/Reloadable.java

@@ -28,7 +28,9 @@ public interface Reloadable {
      *
      * @return Reloading success
      */
-    ReloadResult reloadModule() throws Exception;
+    default ReloadResult reloadModule() throws Exception {
+        return ReloadResult.builder().status(ReloadStatus.SUCCESS).build();
+    }
 
 
 }