Move to 1.13

ezeiger92 · Nov 12, 2018 · b8ced94 · b8ced94
1 parent 683f816
commit b8ced94
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 43 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.tyrannyofheaven.bukkit</groupId>
   <artifactId>zPermissions</artifactId>
-  <version>1.4-SNAPSHOT</version>
+  <version>1.5-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>zPermissions</name>
@@ -24,8 +24,8 @@
       <url>http://maven.tyrannyofheaven.org</url>
     </repository>
     <repository>
-      <id>sk89q-mvn2</id>
-      <url>http://mvn2.sk89q.com/repo</url>
+      <id>sk89q-maven</id>
+      <url>http://maven.sk89q.com/repo/</url>
     </repository>
     <repository>
       <id>vault-repo</id>
@@ -49,9 +49,36 @@
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>worldguard</artifactId>
-      <version>5.9</version>
+      <groupId>com.sk89q.worldedit</groupId>
+      <artifactId>worldedit-bukkit</artifactId>
+      <version>7.0.0-SNAPSHOT</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>js</artifactId>
+          <groupId>rhino</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jchronic</artifactId>
+          <groupId>com.sk89q</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>truezip</artifactId>
+          <groupId>de.schlichtherle</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jlibnoise</artifactId>
+          <groupId>com.sk89q.lib</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>dummypermscompat</artifactId>
+          <groupId>com.sk89q</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.sk89q.worldguard</groupId>
+      <artifactId>worldguard-legacy</artifactId>
+      <version>7.0.0-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>iconomy</artifactId>
@@ -69,25 +96,14 @@
           <artifactId>commandbook</artifactId>
           <groupId>com.sk89q</groupId>
         </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>worldedit</artifactId>
-      <version>5.6.2</version>
-      <exclusions>
         <exclusion>
-          <artifactId>js</artifactId>
-          <groupId>rhino</groupId>
+          <artifactId>jlibnoise</artifactId>
+          <groupId>com.sk89q.lib</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>jchronic</artifactId>
+          <artifactId>dummypermscompat</artifactId>
           <groupId>com.sk89q</groupId>
         </exclusion>
-        <exclusion>
-          <artifactId>truezip</artifactId>
-          <groupId>de.schlichtherle</groupId>
-        </exclusion>
       </exclusions>
     </dependency>
     <dependency>

diff --git a/repo/com/sk89q/worldguard/5.9/worldguard-5.9.jar b/repo/com/sk89q/worldguard/5.9/worldguard-5.9.jar
diff --git a/repo/com/sk89q/worldguard/5.9/worldguard-5.9.pom b/repo/com/sk89q/worldguard/5.9/worldguard-5.9.pom
diff --git a/repo/com/sk89q/worldguard/maven-metadata-local.xml b/repo/com/sk89q/worldguard/maven-metadata-local.xml
diff --git a/src/main/java/org/tyrannyofheaven/bukkit/zPermissions/region/WorldGuardRegionStrategy.java b/src/main/java/org/tyrannyofheaven/bukkit/zPermissions/region/WorldGuardRegionStrategy.java
@@ -32,6 +32,9 @@
 import org.tyrannyofheaven.bukkit.zPermissions.ZPermissionsCore;
 
 import com.google.common.collect.Iterables;
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.bukkit.BukkitWorld;
+import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.managers.RegionManager;
@@ -89,9 +92,10 @@ public void shutdown() {
     @Override
     public Set<String> getRegions(Location location, Player player) {
         if (isEnabled()) {
-            RegionManager rm = worldGuardPlugin.getRegionManager(location.getWorld());
+
+            RegionManager rm = WorldGuard.getInstance().getPlatform().getRegionContainer().get(new BukkitWorld(location.getWorld()));
             if (rm != null) {
-                ApplicableRegionSet ars = rm.getApplicableRegions(location);
+                ApplicableRegionSet ars = rm.getApplicableRegions(BlockVector.toBlockPoint(location.getX(), location.getY(), location.getZ()));
                 // Note, sorted from high to low priority, i.e. reverse application order
                 List<ProtectedRegion> sorted = new ArrayList<>();
                 Iterables.addAll(sorted, ars);

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -5,6 +5,7 @@ description: Superperms implementation with Bukkit database backend
 author: ZerothAngel
 database: false
 load: STARTUP
+api-version: 1.13
 
 commands:
   permissions: