Skip to content

Commit 0d3db19

Browse files
author
2908803755@qq.com
committed
Drop PlotSquared v4&v5 integration
1 parent 211b201 commit 0d3db19

File tree

4 files changed

+94
-313
lines changed

4 files changed

+94
-313
lines changed

pom.xml

Lines changed: 1 addition & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -702,22 +702,11 @@
702702
</exclusion>
703703
</exclusions>
704704
</dependency>
705-
<!-- <dependency>-->
706-
<!-- <groupId>org.maxgamer.quickshop.integration</groupId>-->
707-
<!-- <artifactId>PlotSquared5</artifactId>-->
708-
<!-- <version>1.1</version>-->
709-
<!-- <exclusions>-->
710-
<!-- <exclusion>-->
711-
<!-- <groupId>*</groupId>-->
712-
<!-- <artifactId>*</artifactId>-->
713-
<!-- </exclusion>-->
714-
<!-- </exclusions>-->
715-
<!-- </dependency>-->
716705
<!--PlotSquared 6 Core-->
717706
<dependency>
718707
<groupId>com.plotsquared</groupId>
719708
<artifactId>PlotSquared-Core</artifactId>
720-
<version>6.0.8-SNAPSHOT</version>
709+
<version>6.1.2</version>
721710
<scope>provided</scope>
722711
<!--We just need the core jar-->
723712
<exclusions>
@@ -727,52 +716,6 @@
727716
</exclusion>
728717
</exclusions>
729718
</dependency>
730-
<!--PlotSquared 4-->
731-
<dependency>
732-
<groupId>com.github.intellectualsite</groupId>
733-
<artifactId>PlotSquared4</artifactId>
734-
<version>4</version>
735-
<scope>system</scope>
736-
<systemPath>${project.basedir}/lib/PlotSquared4-Bukkit-4.4.jar</systemPath>
737-
<exclusions>
738-
<exclusion>
739-
<artifactId>worldedit-core</artifactId>
740-
<groupId>com.sk89q.worldedit</groupId>
741-
</exclusion>
742-
<exclusion>
743-
<artifactId>snakeyaml</artifactId>
744-
<groupId>org.yaml</groupId>
745-
</exclusion>
746-
<exclusion>
747-
<artifactId>Jenkins4J</artifactId>
748-
<groupId>com.github.Sauilitired</groupId>
749-
</exclusion>
750-
<exclusion>
751-
<artifactId>okhttp</artifactId>
752-
<groupId>com.squareup.okhttp3</groupId>
753-
</exclusion>
754-
<exclusion>
755-
<artifactId>okio</artifactId>
756-
<groupId>com.squareup.okio</groupId>
757-
</exclusion>
758-
<exclusion>
759-
<artifactId>kotlin-stdlib</artifactId>
760-
<groupId>org.jetbrains.kotlin</groupId>
761-
</exclusion>
762-
<exclusion>
763-
<artifactId>text-serializer-gson</artifactId>
764-
<groupId>net.kyori</groupId>
765-
</exclusion>
766-
<exclusion>
767-
<artifactId>gson</artifactId>
768-
<groupId>com.google.code.gson</groupId>
769-
</exclusion>
770-
<exclusion>
771-
<artifactId>lombok</artifactId>
772-
<groupId>org.projectlombok</groupId>
773-
</exclusion>
774-
</exclusions>
775-
</dependency>
776719
<dependency>
777720
<groupId>com.bekvon.bukkit.residence</groupId>
778721
<artifactId>Residence</artifactId>

src/main/java/org/maxgamer/quickshop/integration/JavaIntegrationManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.maxgamer.quickshop.integration.griefprevention.GriefPreventionIntegration;
3131
import org.maxgamer.quickshop.integration.iridiumskyblock.IridiumSkyblockIntegration;
3232
import org.maxgamer.quickshop.integration.lands.LandsIntegration;
33+
import org.maxgamer.quickshop.integration.plotsquared.PlotSquaredIntegrationV6;
3334
import org.maxgamer.quickshop.integration.residence.ResidenceIntegration;
3435
import org.maxgamer.quickshop.integration.superiorskyblock.SuperiorSkyblock2Integration;
3536
import org.maxgamer.quickshop.integration.towny.TownyIntegration;
@@ -49,7 +50,7 @@ public class JavaIntegrationManager extends QuickShopInstanceHolder implements I
4950
INTEGRATION_MAPPING.put("Factions", FactionsUUIDIntegration.class);
5051
INTEGRATION_MAPPING.put("GriefPrevention", GriefPreventionIntegration.class);
5152
INTEGRATION_MAPPING.put("Lands", LandsIntegration.class);
52-
//INTEGRATION_MAPPING.put("PlotSquared", PlotSquaredIntegrationProxy.class);
53+
INTEGRATION_MAPPING.put("PlotSquared", PlotSquaredIntegrationV6.class);
5354
INTEGRATION_MAPPING.put("Residence", ResidenceIntegration.class);
5455
INTEGRATION_MAPPING.put("Towny", TownyIntegration.class);
5556
INTEGRATION_MAPPING.put("WorldGuard", WorldGuardIntegration.class);
Lines changed: 91 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,91 @@
1-
/*
2-
* This file is a part of project QuickShop, the name is PlotSquaredIntegrationProxy.java
3-
* Copyright (C) PotatoCraft Studio and contributors
4-
*
5-
* This program is free software: you can redistribute it and/or modify it
6-
* under the terms of the GNU General Public License as published by the
7-
* Free Software Foundation, either version 3 of the License, or
8-
* (at your option) any later version.
9-
*
10-
* This program is distributed in the hope that it will be useful, but WITHOUT
11-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12-
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
13-
* for more details.
14-
*
15-
* You should have received a copy of the GNU General Public License
16-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
17-
*
18-
*/
19-
20-
package org.maxgamer.quickshop.integration.plotsquared;
21-
22-
import org.bukkit.Location;
23-
import org.bukkit.entity.Player;
24-
import org.jetbrains.annotations.NotNull;
25-
import org.maxgamer.quickshop.QuickShop;
26-
import org.maxgamer.quickshop.api.integration.IntegrateStage;
27-
import org.maxgamer.quickshop.api.integration.IntegrationStage;
28-
import org.maxgamer.quickshop.integration.AbstractQSIntegratedPlugin;
29-
import org.maxgamer.quickshop.util.Util;
30-
import org.maxgamer.quickshop.util.reload.ReloadResult;
31-
32-
@IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
33-
public class PlotSquaredIntegrationProxy extends AbstractQSIntegratedPlugin {
34-
private final AbstractQSIntegratedPlugin plotSquared;
35-
36-
public PlotSquaredIntegrationProxy(QuickShop instance) {
37-
super(instance);
38-
if (plugin.getServer().getPluginManager().getPlugin("PlotSquared").getClass().getPackage().getName().contains("intellectualsite")) {
39-
plotSquared = new PlotSquaredIntegrationV4(plugin);
40-
} else if (false && Util.isClassAvailable("com.plotsquared.core.configuration.Caption")) {
41-
// //Write reload logic for it
42-
// plotSquared = new PlotSquaredIntegrationV5(plugin) {
43-
// @Override
44-
// public ReloadResult reloadModule() throws Exception {
45-
// loadConfiguration();
46-
// return super.reloadModule();
47-
// }
48-
// };
49-
// plugin.getReloadManager().register(plotSquared);
50-
} else {
51-
plotSquared = new PlotSquaredIntegrationV6(plugin);
52-
}
53-
}
54-
55-
@Override
56-
public @NotNull String getName() {
57-
return plotSquared.getName();
58-
}
59-
60-
@Override
61-
public boolean canCreateShopHere(@NotNull Player player, @NotNull Location location) {
62-
return plotSquared.canCreateShopHere(player, location);
63-
}
64-
65-
@Override
66-
public boolean canTradeShopHere(@NotNull Player player, @NotNull Location location) {
67-
return plotSquared.canCreateShopHere(player, location);
68-
}
69-
70-
@Override
71-
public boolean canDeleteShopHere(@NotNull Player player, @NotNull Location location) {
72-
return plotSquared.canDeleteShopHere(player, location);
73-
}
74-
75-
@Override
76-
public void load() {
77-
plotSquared.load();
78-
}
79-
80-
@Override
81-
public void unload() {
82-
plotSquared.unload();
83-
}
84-
85-
@Override
86-
public ReloadResult reloadModule() throws Exception {
87-
return plotSquared.reloadModule();
88-
}
89-
}
1+
///*
2+
// * This file is a part of project QuickShop, the name is PlotSquaredIntegrationProxy.java
3+
// * Copyright (C) PotatoCraft Studio and contributors
4+
// *
5+
// * This program is free software: you can redistribute it and/or modify it
6+
// * under the terms of the GNU General Public License as published by the
7+
// * Free Software Foundation, either version 3 of the License, or
8+
// * (at your option) any later version.
9+
// *
10+
// * This program is distributed in the hope that it will be useful, but WITHOUT
11+
// * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12+
// * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
13+
// * for more details.
14+
// *
15+
// * You should have received a copy of the GNU General Public License
16+
// * along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
// *
18+
// */
19+
//
20+
//package org.maxgamer.quickshop.integration.plotsquared;
21+
//
22+
//import org.bukkit.Location;
23+
//import org.bukkit.entity.Player;
24+
//import org.jetbrains.annotations.NotNull;
25+
//import org.maxgamer.quickshop.QuickShop;
26+
//import org.maxgamer.quickshop.api.integration.IntegrateStage;
27+
//import org.maxgamer.quickshop.api.integration.IntegrationStage;
28+
//import org.maxgamer.quickshop.integration.AbstractQSIntegratedPlugin;
29+
//import org.maxgamer.quickshop.util.reload.ReloadResult;
30+
//
31+
//@IntegrationStage(loadStage = IntegrateStage.onEnableAfter)
32+
//public class PlotSquaredIntegrationProxy extends AbstractQSIntegratedPlugin {
33+
// private final AbstractQSIntegratedPlugin plotSquared;
34+
//
35+
// public PlotSquaredIntegrationProxy(QuickShop instance) {
36+
// super(instance);
37+
// if (plugin.getServer().getPluginManager().getPlugin("PlotSquared").getClass().getPackage().getName().contains("intellectualsite")) {
38+
// // plotSquared = new PlotSquaredIntegrationV4(plugin);
39+
// // } else if (false && Util.isClassAvailable("com.plotsquared.core.configuration.Caption")) {
40+
//// //Write reload logic for it
41+
//// plotSquared = new PlotSquaredIntegrationV5(plugin) {
42+
//// @Override
43+
//// public ReloadResult reloadModule() throws Exception {
44+
//// loadConfiguration();
45+
//// return super.reloadModule();
46+
//// }
47+
//// };
48+
//// plugin.getReloadManager().register(plotSquared);
49+
// //} else {
50+
// plotSquared = new PlotSquaredIntegrationV6(plugin);
51+
// } else {
52+
// plotSquared = null;
53+
// }
54+
// //}
55+
// }
56+
//
57+
// @Override
58+
// public @NotNull String getName() {
59+
// return plotSquared.getName();
60+
// }
61+
//
62+
// @Override
63+
// public boolean canCreateShopHere(@NotNull Player player, @NotNull Location location) {
64+
// return plotSquared.canCreateShopHere(player, location);
65+
// }
66+
//
67+
// @Override
68+
// public boolean canTradeShopHere(@NotNull Player player, @NotNull Location location) {
69+
// return plotSquared.canCreateShopHere(player, location);
70+
// }
71+
//
72+
// @Override
73+
// public boolean canDeleteShopHere(@NotNull Player player, @NotNull Location location) {
74+
// return plotSquared.canDeleteShopHere(player, location);
75+
// }
76+
//
77+
// @Override
78+
// public void load() {
79+
// plotSquared.load();
80+
// }
81+
//
82+
// @Override
83+
// public void unload() {
84+
// plotSquared.unload();
85+
// }
86+
//
87+
// @Override
88+
// public ReloadResult reloadModule() throws Exception {
89+
// return plotSquared.reloadModule();
90+
// }
91+
//}

0 commit comments

Comments
 (0)