Rename QSIntegratedPlugin.java to AbstractQSIntegratedPlugin.java

Ghost-chu · Ghost-chu · commit f0cab5d26487 · 2021-10-04T12:35:45.000+08:00
diff --git a/src/integration/plotsquared/5/pom.xml b/src/integration/plotsquared/5/pom.xml
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.maxgamer</groupId>
             <artifactId>QuickShop</artifactId>
-            <version>4.0.9.2</version>
+            <version>5.0.0.0-SNAPSHOT</version>
             <!--We just need the core jar-->
             <exclusions>
                 <exclusion>
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>21.0.1</version>
+            <version>22.0.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/src/integration/plotsquared/5/src/main/java/org/maxgamer/quickshop/integration/plotsquared/PlotSquaredIntegrationV5.java b/src/integration/plotsquared/5/src/main/java/org/maxgamer/quickshop/integration/plotsquared/PlotSquaredIntegrationV5.java
@@ -35,7 +35,7 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.integration.IntegrateStage;
 import org.maxgamer.quickshop.integration.IntegrationStage;
-import org.maxgamer.quickshop.integration.QSIntegratedPlugin;
+import org.maxgamer.quickshop.integration.AbstractQSIntegratedPlugin;
 import org.maxgamer.quickshop.shop.Shop;
 import org.maxgamer.quickshop.util.Util;
 
@@ -46,7 +46,7 @@
 
 @SuppressWarnings("DuplicatedCode")
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class PlotSquaredIntegrationV5 extends QSIntegratedPlugin {
+public class PlotSquaredIntegrationV5 extends AbstractQSIntegratedPlugin {
     private boolean whiteList;
     private boolean deleteUntrusted;
     private QuickshopCreateFlag createFlag;
diff --git a/src/main/java/org/maxgamer/quickshop/integration/AbstractQSIntegratedPlugin.java b/src/main/java/org/maxgamer/quickshop/integration/AbstractQSIntegratedPlugin.java
@@ -27,9 +27,9 @@
 
 
 @IntegrationStage
-public abstract class QSIntegratedPlugin extends QuickShopInstanceHolder implements IntegratedPlugin, Listener {
+public abstract class AbstractQSIntegratedPlugin extends QuickShopInstanceHolder implements IntegratedPlugin, Listener {
 
-    public QSIntegratedPlugin(QuickShop plugin) {
+    public AbstractQSIntegratedPlugin(QuickShop plugin) {
         super(plugin);
     }
 
diff --git a/src/main/java/org/maxgamer/quickshop/integration/advancedregionmarket/AdvancedShopRegionMarketIntegration.java b/src/main/java/org/maxgamer/quickshop/integration/advancedregionmarket/AdvancedShopRegionMarketIntegration.java
@@ -39,7 +39,7 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.integration.IntegrateStage;
 import org.maxgamer.quickshop.integration.IntegrationStage;
-import org.maxgamer.quickshop.integration.QSIntegratedPlugin;
+import org.maxgamer.quickshop.integration.AbstractQSIntegratedPlugin;
 import org.maxgamer.quickshop.shop.Shop;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
@@ -48,7 +48,7 @@
 import java.util.logging.Level;
 
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class AdvancedShopRegionMarketIntegration extends QSIntegratedPlugin {
+public class AdvancedShopRegionMarketIntegration extends AbstractQSIntegratedPlugin {
     public AdvancedShopRegionMarketIntegration(QuickShop plugin) {
         super(plugin);
     }
diff --git a/src/main/java/org/maxgamer/quickshop/integration/factionsuuid/FactionsUUIDIntegration.java b/src/main/java/org/maxgamer/quickshop/integration/factionsuuid/FactionsUUIDIntegration.java
@@ -30,14 +30,14 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.integration.IntegrateStage;
 import org.maxgamer.quickshop.integration.IntegrationStage;
-import org.maxgamer.quickshop.integration.QSIntegratedPlugin;
+import org.maxgamer.quickshop.integration.AbstractQSIntegratedPlugin;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
 
 import java.util.List;
 
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class FactionsUUIDIntegration extends QSIntegratedPlugin {
+public class FactionsUUIDIntegration extends AbstractQSIntegratedPlugin {
     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
@@ -34,7 +34,7 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.integration.IntegrateStage;
 import org.maxgamer.quickshop.integration.IntegrationStage;
-import org.maxgamer.quickshop.integration.QSIntegratedPlugin;
+import org.maxgamer.quickshop.integration.AbstractQSIntegratedPlugin;
 import org.maxgamer.quickshop.shop.Shop;
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.logging.container.ShopRemoveLog;
@@ -47,7 +47,7 @@
 import java.util.Map;
 
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class GriefPreventionIntegration extends QSIntegratedPlugin {
+public class GriefPreventionIntegration extends AbstractQSIntegratedPlugin {
 
     final GriefPrevention griefPrevention = GriefPrevention.instance;
     private final List<Flag> tradeLimits = new ArrayList<>(3);
diff --git a/src/main/java/org/maxgamer/quickshop/integration/iridiumskyblock/IridiumSkyblockIntegration.java b/src/main/java/org/maxgamer/quickshop/integration/iridiumskyblock/IridiumSkyblockIntegration.java
@@ -35,7 +35,7 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.integration.IntegrateStage;
 import org.maxgamer.quickshop.integration.IntegrationStage;
-import org.maxgamer.quickshop.integration.QSIntegratedPlugin;
+import org.maxgamer.quickshop.integration.AbstractQSIntegratedPlugin;
 import org.maxgamer.quickshop.shop.Shop;
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.logging.container.ShopRemoveLog;
@@ -46,7 +46,7 @@
 import java.util.Optional;
 
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class IridiumSkyblockIntegration extends QSIntegratedPlugin implements Listener {
+public class IridiumSkyblockIntegration extends AbstractQSIntegratedPlugin 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
@@ -32,7 +32,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.integration.IntegrationStage;
-import org.maxgamer.quickshop.integration.QSIntegratedPlugin;
+import org.maxgamer.quickshop.integration.AbstractQSIntegratedPlugin;
 import org.maxgamer.quickshop.shop.Shop;
 import org.maxgamer.quickshop.shop.ShopChunk;
 import org.maxgamer.quickshop.util.Util;
@@ -44,7 +44,7 @@
 import java.util.UUID;
 
 @IntegrationStage
-public class LandsIntegration extends QSIntegratedPlugin implements Listener {
+public class LandsIntegration extends AbstractQSIntegratedPlugin implements Listener {
 
     private boolean ignoreDisabledWorlds;
     private boolean whitelist;
diff --git a/src/main/java/org/maxgamer/quickshop/integration/plotsquared/PlotSquaredIntegrationProxy.java b/src/main/java/org/maxgamer/quickshop/integration/plotsquared/PlotSquaredIntegrationProxy.java
@@ -23,15 +23,15 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.maxgamer.quickshop.QuickShop;
+import org.maxgamer.quickshop.integration.AbstractQSIntegratedPlugin;
 import org.maxgamer.quickshop.integration.IntegrateStage;
 import org.maxgamer.quickshop.integration.IntegrationStage;
-import org.maxgamer.quickshop.integration.QSIntegratedPlugin;
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class PlotSquaredIntegrationProxy extends QSIntegratedPlugin {
-    private final QSIntegratedPlugin plotSquared;
+public class PlotSquaredIntegrationProxy extends AbstractQSIntegratedPlugin {
+    private final AbstractQSIntegratedPlugin plotSquared;
 
     public PlotSquaredIntegrationProxy(QuickShop instance) {
         super(instance);
diff --git a/src/main/java/org/maxgamer/quickshop/integration/plotsquared/PlotSquaredIntegrationV4.java b/src/main/java/org/maxgamer/quickshop/integration/plotsquared/PlotSquaredIntegrationV4.java
@@ -34,7 +34,7 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.integration.IntegrateStage;
 import org.maxgamer.quickshop.integration.IntegrationStage;
-import org.maxgamer.quickshop.integration.QSIntegratedPlugin;
+import org.maxgamer.quickshop.integration.AbstractQSIntegratedPlugin;
 import org.maxgamer.quickshop.shop.Shop;
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
@@ -46,7 +46,7 @@
 
 @SuppressWarnings("DuplicatedCode")
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class PlotSquaredIntegrationV4 extends QSIntegratedPlugin implements Listener {
+public class PlotSquaredIntegrationV4 extends AbstractQSIntegratedPlugin 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
@@ -52,7 +52,7 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.integration.IntegrateStage;
 import org.maxgamer.quickshop.integration.IntegrationStage;
-import org.maxgamer.quickshop.integration.QSIntegratedPlugin;
+import org.maxgamer.quickshop.integration.AbstractQSIntegratedPlugin;
 import org.maxgamer.quickshop.shop.Shop;
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
@@ -65,7 +65,7 @@
 
 @SuppressWarnings("DuplicatedCode")
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class PlotSquaredIntegrationV6 extends QSIntegratedPlugin {
+public class PlotSquaredIntegrationV6 extends AbstractQSIntegratedPlugin {
     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
@@ -29,7 +29,7 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.integration.IntegrateStage;
 import org.maxgamer.quickshop.integration.IntegrationStage;
-import org.maxgamer.quickshop.integration.QSIntegratedPlugin;
+import org.maxgamer.quickshop.integration.AbstractQSIntegratedPlugin;
 import org.maxgamer.quickshop.util.reload.ReloadResult;
 import org.maxgamer.quickshop.util.reload.ReloadStatus;
 
@@ -38,7 +38,7 @@
 
 @SuppressWarnings("DuplicatedCode")
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class ResidenceIntegration extends QSIntegratedPlugin {
+public class ResidenceIntegration extends AbstractQSIntegratedPlugin {
     private static final String CREATE_FLAG = "quickshop-create";
     private static final String TRADE_FLAG = "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
@@ -32,9 +32,9 @@
 import org.bukkit.event.Listener;
 import org.jetbrains.annotations.NotNull;
 import org.maxgamer.quickshop.QuickShop;
+import org.maxgamer.quickshop.integration.AbstractQSIntegratedPlugin;
 import org.maxgamer.quickshop.integration.IntegrateStage;
 import org.maxgamer.quickshop.integration.IntegrationStage;
-import org.maxgamer.quickshop.integration.QSIntegratedPlugin;
 import org.maxgamer.quickshop.shop.Shop;
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.logging.container.ShopRemoveLog;
@@ -44,7 +44,7 @@
 import java.util.Map;
 
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class SuperiorSkyblock2Integration extends QSIntegratedPlugin implements Listener {
+public class SuperiorSkyblock2Integration extends AbstractQSIntegratedPlugin 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
@@ -39,7 +39,7 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.integration.IntegrateStage;
 import org.maxgamer.quickshop.integration.IntegrationStage;
-import org.maxgamer.quickshop.integration.QSIntegratedPlugin;
+import org.maxgamer.quickshop.integration.AbstractQSIntegratedPlugin;
 import org.maxgamer.quickshop.shop.Shop;
 import org.maxgamer.quickshop.shop.ShopChunk;
 import org.maxgamer.quickshop.util.Util;
@@ -52,7 +52,7 @@
 
 
 @IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
-public class TownyIntegration extends QSIntegratedPlugin implements Listener {
+public class TownyIntegration extends AbstractQSIntegratedPlugin 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
@@ -37,7 +37,7 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.integration.IntegrateStage;
 import org.maxgamer.quickshop.integration.IntegrationStage;
-import org.maxgamer.quickshop.integration.QSIntegratedPlugin;
+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;
@@ -47,7 +47,7 @@
 
 @SuppressWarnings("DuplicatedCode")
 @IntegrationStage(loadStage = IntegrateStage.onLoadAfter)
-public class WorldGuardIntegration extends QSIntegratedPlugin {
+public class WorldGuardIntegration extends AbstractQSIntegratedPlugin {
     private final StateFlag createFlag = createOrGet("quickshop-create", false);
     private final StateFlag tradeFlag = createOrGet("quickshop-trade", true);
     private List<WorldGuardFlags> createFlags;

Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,9 @@`
`27`	`27`
`28`	`28`
`29`	`29`	`@IntegrationStage`
`30`		`-public abstract class QSIntegratedPlugin extends QuickShopInstanceHolder implements IntegratedPlugin, Listener {`
	`30`	`+public abstract class AbstractQSIntegratedPlugin extends QuickShopInstanceHolder implements IntegratedPlugin, Listener {`
`31`	`31`
`32`		`- public QSIntegratedPlugin(QuickShop plugin) {`
	`32`	`+ public AbstractQSIntegratedPlugin(QuickShop plugin) {`
`33`	`33`	`super(plugin);`
`34`	`34`	`}`
`35`	`35`