Upstream
/
AreaShop
mirror of https://github.com/NLthijs48/AreaShop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change WorldGuard/WorldEdit/Bukkit dependencies to file links 

- Fixes the issue that olders WorldEdit and Bukkit versions are not available on Maven anymore
- This speeds up the build a lot
This commit is contained in:
Thijs Wiefferink 2018-10-28 00:00:41 +02:00
parent 39c8eb5f73
commit c8e1ebb068
19 changed files with 61 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AreaShop/pom.xml
View File

@ -17,10 +17,6 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>${bukkit.version}</version>
<type>jar</type>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<!-- InteractiveMessenger library -->

14
Interfaces/pom.xml
View File

@ -16,22 +16,20 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>${bukkit.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>worldedit</artifactId>
<version>6.0.0-SNAPSHOT</version>
<scope>provided</scope>
<type>jar</type>
<scope>system</scope>
<version>any</version>
<systemPath>${project.basedir}/../dependencies/worldedit-6.0.0-SNAPSHOT.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>worldguard</artifactId>
<version>6.0.0-SNAPSHOT</version>
<scope>provided</scope>
<type>jar</type>
<scope>system</scope>
<version>any</version>
<systemPath>${project.basedir}/../dependencies/worldguard-6.0.0-SNAPSHOT.jar</systemPath>
</dependency>
</dependencies>

17
WorldEdit 5/pom.xml
View File

@ -16,9 +16,6 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>${bukkit.version}</version>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>me.wiefferink</groupId>
@ -29,16 +26,16 @@
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>worldedit</artifactId>
<version>5.7-SNAPSHOT</version>
<scope>provided</scope>
<type>jar</type>
<scope>system</scope>
<version>any</version>
<systemPath>${project.basedir}/../dependencies/worldedit-5.7-SNAPSHOT.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>worldguard</artifactId>
<version>6.0.0-SNAPSHOT</version>
<scope>provided</scope>
<type>jar</type>
<scope>system</scope>
<version>any</version>
<systemPath>${project.basedir}/../dependencies/worldguard-5.9.1-SNAPSHOT.jar</systemPath>
</dependency>
</dependencies>
</project>
</project>

17
WorldEdit 6/pom.xml
View File

@ -16,9 +16,6 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>${bukkit.version}</version>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>me.wiefferink</groupId>
@ -29,16 +26,16 @@
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>worldedit</artifactId>
<version>6.0.0-SNAPSHOT</version>
<scope>provided</scope>
<type>jar</type>
<scope>system</scope>
<version>any</version>
<systemPath>${project.basedir}/../dependencies/worldedit-6.0.0-SNAPSHOT.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>worldguard</artifactId>
<version>6.0.0-SNAPSHOT</version>
<scope>provided</scope>
<type>jar</type>
<scope>system</scope>
<version>any</version>
<systemPath>${project.basedir}/../dependencies/worldguard-6.0.0-SNAPSHOT.jar</systemPath>
</dependency>
</dependencies>
</project>
</project>

1
WorldEdit 6/src/main/java/me/wiefferink/areashop/handlers/WorldEditHandler6.java
View File

@ -100,7 +100,6 @@ public class WorldEditHandler6 extends WorldEditInterface {
// Build operation
BlockTransformExtent extent = new BlockTransformExtent(clipboardHolder.getClipboard(), clipboardHolder.getTransform(), editSession.getWorld().getWorldData().getBlockRegistry());
ForwardExtentCopy copy = new ForwardExtentCopy(extent, clipboard.getRegion(), clipboard.getOrigin(), editSession, origin);
copy.setRemovingEntities(true);
copy.setTransform(clipboardHolder.getTransform());
// Mask to region (for polygon and other weird shaped regions)
// TODO make this more efficient (especially for polygon regions)

5
WorldEdit 7/pom.xml
View File

@ -15,10 +15,7 @@
<dependencies>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.13-R0.1-SNAPSHOT</version>
<type>jar</type>
<optional>true</optional>
<artifactId>craftbukkit</artifactId>
</dependency>
<dependency>
<groupId>me.wiefferink</groupId>

2
WorldEdit 7/src/main/java/me/wiefferink/areashop/handlers/WorldEditHandler7.java
View File

@ -19,7 +19,6 @@ import com.sk89q.worldedit.function.operation.ForwardExtentCopy;
import com.sk89q.worldedit.function.operation.Operations;
import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
import com.sk89q.worldedit.session.ClipboardHolder;
import com.sk89q.worldedit.util.io.Closer;
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
@ -46,7 +45,6 @@ public class WorldEditHandler7 extends WorldEditInterface {
@Override
public WorldEditSelection getPlayerSelection(Player player) {
CuboidRegionSelector s;
try {
Region region = pluginInterface.getWorldEdit().getSession(player).getSelection(BukkitAdapter.adapt(player.getWorld()));
return new WorldEditSelection(

9
WorldGuard 5/pom.xml
View File

@ -16,9 +16,6 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>${bukkit.version}</version>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>me.wiefferink</groupId>
@ -29,9 +26,9 @@
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>worldguard</artifactId>
<version>5.9.1-SNAPSHOT</version>
<scope>provided</scope>
<type>jar</type>
<scope>system</scope>
<version>any</version>
<systemPath>${project.basedir}/../dependencies/worldguard-5.9.1-SNAPSHOT.jar</systemPath>
</dependency>
</dependencies>
</project>

11
WorldGuard 6/pom.xml
View File

@ -16,9 +16,6 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>${bukkit.version}</version>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>me.wiefferink</groupId>
@ -29,9 +26,9 @@
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>worldguard</artifactId>
<version>6.0.0-SNAPSHOT</version>
<scope>provided</scope>
<type>jar</type>
<scope>system</scope>
<version>any</version>
<systemPath>${project.basedir}/../dependencies/worldguard-6.0.0-SNAPSHOT.jar</systemPath>
</dependency>
</dependencies>
</project>
</project>

11
WorldGuard 6_1_3/pom.xml
View File

@ -16,9 +16,6 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>${bukkit.version}</version>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>me.wiefferink</groupId>
@ -36,9 +33,9 @@
<dependency>
<groupId>com.sk89q.worldguard</groupId>
<artifactId>worldguard-legacy</artifactId>
<version>6.1.3-SNAPSHOT</version>
<scope>provided</scope>
<type>jar</type>
<scope>system</scope>
<version>any</version>
<systemPath>${project.basedir}/../dependencies/worldguard-legacy-6.1.3-SNAPSHOT.jar</systemPath>
</dependency>
</dependencies>
</project>
</project>

15
WorldGuard 7/pom.xml
View File

@ -16,9 +16,6 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.13-R0.1-SNAPSHOT</version>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>me.wiefferink</groupId>
@ -36,16 +33,16 @@
<dependency>
<groupId>me.wiefferink</groupId>
<artifactId>areashop-worldguard-6</artifactId>
<version>WorldGuard-6</version>
<type>jar</type>
<scope>provided</scope>
<scope>system</scope>
<version>any</version>
<systemPath>${project.basedir}/../dependencies/worldguard-6.0.0-SNAPSHOT.jar</systemPath>
</dependency>
<dependency>
<groupId>me.wiefferink</groupId>
<artifactId>areashop-worldguard-6_1_3</artifactId>
<version>WorldGuard-6_1_3</version>
<type>jar</type>
<scope>provided</scope>
<scope>system</scope>
<version>any</version>
<systemPath>${project.basedir}/../dependencies/worldguard-legacy-6.1.3-SNAPSHOT.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sk89q</groupId>

BIN
dependencies/bukkit-1.8-R0.1-SNAPSHOT.jar vendored Normal file
View File

Binary file not shown.

BIN
dependencies/craftbukkit-1.8-R0.1-SNAPSHOT.jar vendored Normal file
View File

Binary file not shown.

BIN
dependencies/worldedit-5.7-SNAPSHOT.jar vendored Normal file
View File

Binary file not shown.

BIN
dependencies/worldedit-6.0.0-SNAPSHOT.jar vendored Normal file
View File

Binary file not shown.

BIN
dependencies/worldguard-5.9.1-SNAPSHOT.jar vendored Normal file
View File

Binary file not shown.

BIN
dependencies/worldguard-6.0.0-SNAPSHOT.jar vendored Normal file
View File

Binary file not shown.

BIN
dependencies/worldguard-legacy-6.1.3-SNAPSHOT.jar vendored Normal file
View File

Binary file not shown.

32
pom.xml
View File

@ -27,14 +27,6 @@
</ciManagement>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>sk89q-repo-wg</id>
<url>http://maven.sk89q.com/artifactory/repo/</url>
</repository>
<repository>
<id>vault-repo</id>
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
@ -54,7 +46,6 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<build.number>#CUSTOM</build.number>
<bukkit.version>1.8-R0.1-SNAPSHOT</bukkit.version>
</properties>
<modules>
@ -69,6 +60,29 @@
<module>AreaShop</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<scope>system</scope>
<version>any</version>
<systemPath>${project.basedir}/../dependencies/bukkit-1.8-R0.1-SNAPSHOT.jar</systemPath>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<scope>system</scope>
<version>any</version>
<systemPath>${project.basedir}/../dependencies/craftbukkit-1.8-R0.1-SNAPSHOT.jar</systemPath>
<type>jar</type>
<optional>true</optional>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>