Fix #350

Former-commit-id: 84a3c18
Ghost-chu · Feb 29, 2020 · cd41bb4 · cd41bb4
1 parent f352518
commit cd41bb4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/.../java/org/maxgamer/quickshop/PluginsIntegration/FactionsUUID/FactionsUUIDIntegration.java b/.../java/org/maxgamer/quickshop/PluginsIntegration/FactionsUUID/FactionsUUIDIntegration.java
@@ -28,9 +28,12 @@
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import org.maxgamer.quickshop.PluginsIntegration.IntegrateStage;
 import org.maxgamer.quickshop.PluginsIntegration.IntegratedPlugin;
+import org.maxgamer.quickshop.PluginsIntegration.IntegrationStage;
 import org.maxgamer.quickshop.QuickShop;
 
+@IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
 public class FactionsUUIDIntegration implements IntegratedPlugin {
   private List<String> createFlags;
   private List<String> tradeFlags;

diff --git a/src/main/java/org/maxgamer/quickshop/PluginsIntegration/Residence/ResidenceIntegration.java b/src/main/java/org/maxgamer/quickshop/PluginsIntegration/Residence/ResidenceIntegration.java
@@ -27,10 +27,13 @@
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import org.maxgamer.quickshop.PluginsIntegration.IntegrateStage;
 import org.maxgamer.quickshop.PluginsIntegration.IntegratedPlugin;
+import org.maxgamer.quickshop.PluginsIntegration.IntegrationStage;
 import org.maxgamer.quickshop.QuickShop;
 
 @SuppressWarnings("DuplicatedCode")
+@IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
 public class ResidenceIntegration implements IntegratedPlugin {
   List<String> createLimits;
   List<String> tradeLimits;

diff --git a/src/main/java/org/maxgamer/quickshop/Util/IntegrationHelper.java b/src/main/java/org/maxgamer/quickshop/Util/IntegrationHelper.java
@@ -35,7 +35,7 @@ public class IntegrationHelper {
 
   public void register(@NotNull IntegratedPlugin clazz) {
     if (!isIntegrationClass(clazz)) {
-      throw new InvaildIntegratedPluginClass();
+      throw new InvaildIntegratedPluginClass("Invaild Integration module: " + clazz.getName());
     }
     Util.debugLogHeavy("Registering " + clazz.getName());
     integrations.add(clazz);
@@ -62,9 +62,9 @@ public void callIntegrationsLoad(@NotNull IntegrateStage stage) {
                     + integratedPlugin.getName()
                     + " stage is "
                     + integratedPlugin
-                        .getClass()
-                        .getDeclaredAnnotation(IntegrationStage.class)
-                        .loadStage());
+                    .getClass()
+                    .getDeclaredAnnotation(IntegrationStage.class)
+                    .loadStage());
           }
         });
   }
@@ -82,9 +82,9 @@ public void callIntegrationsUnload(@NotNull IntegrateStage stage) {
                     + integratedPlugin.getName()
                     + " stage is "
                     + integratedPlugin
-                        .getClass()
-                        .getDeclaredAnnotation(IntegrationStage.class)
-                        .loadStage());
+                    .getClass()
+                    .getDeclaredAnnotation(IntegrationStage.class)
+                    .loadStage());
           }
         });
   }
@@ -112,6 +112,16 @@ public boolean callIntegrationsCanTrade(@NotNull Player player, @NotNull Locatio
   private boolean isIntegrationClass(@NotNull IntegratedPlugin clazz) {
     return clazz.getClass().getDeclaredAnnotation(IntegrationStage.class) != null;
   }
+
 }
 
-class InvaildIntegratedPluginClass extends IllegalArgumentException {}
+class InvaildIntegratedPluginClass extends IllegalArgumentException {
+  public InvaildIntegratedPluginClass() {
+    super();
+  }
+
+  public InvaildIntegratedPluginClass(String s) {
+    super(s);
+  }
+
+}