Merge remote-tracking branch 'origin/breaking' into breaking

Bukkit/build.gradle

@@ -7,12 +7,13 @@ repositories {
 
 dependencies {
     compile project(':Core')
+    testCompile project(':Core')
     compile 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
     compile(group: 'com.sk89q.worldedit', name: 'worldedit-bukkit', version: '7.0.0-SNAPSHOT')
-    compile("net.milkbowl.vault:VaultAPI:1.6") {
+    compile("net.milkbowl.vault:VaultAPI:1.7") {
         exclude module: 'bukkit'
     }
-    compileOnly 'org.projectlombok:lombok:1.16.18'
+    compileOnly 'org.projectlombok:lombok:1.18.4'
 }
 
 sourceCompatibility = 1.8
@@ -44,4 +45,4 @@ shadowJar.doLast {
         ant.checksum file: task.archivePath
 }
 
-build.dependsOn(shadowJar);
+build.dependsOn(shadowJar)

Core/build.gradle

@@ -1,10 +1,9 @@
 dependencies {
     testCompile 'junit:junit:4.12'
-    compile 'org.yaml:snakeyaml:1.16'
+    compile 'org.yaml:snakeyaml:1.23'
-    compile 'com.google.code.gson:gson:2.2.4'
+    compile 'com.google.code.gson:gson:2.8.5'
-    compileOnly 'org.projectlombok:lombok:1.16.18'
+    compileOnly 'org.projectlombok:lombok:1.18.4'
 }
-
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
@@ -21,7 +20,8 @@ processResources {
 
 jar.archiveName = "plotsquared-api-${project.parent.version}.jar"
 jar.destinationDir = file '../mvn/com/plotsquared/plotsquared-api/' + project.parent.version
-task createPom << {
+task createPom {
+    doLast {
         pom {
             project {
                 groupId 'com.plotsquared'
@@ -36,6 +36,7 @@ task createPom << {
                 version 'latest'
             }
         }.writeTo("../mvn/com/plotsquared/plotsquared-api/latest/plotsquared-api-latest.pom")
+    }
 }
 
 task copyFiles {

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java

@@ -81,7 +81,7 @@ public class AugmentedUtils {
                 primaryMask = queue;
             }
             LocalBlockQueue secondaryMask;
-            PlotBlock air = PlotBlock.get((short) 0, (byte) 0);
+            PlotBlock air = StringPlotBlock.EVERYTHING;
             if (area.TERRAIN == 2) {
                 PlotManager manager = area.getPlotManager();
                 final boolean[][] canPlace = new boolean[16][16];

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java

@@ -10,12 +10,12 @@ import com.github.intellectualsites.plotsquared.plot.util.StringMan;
 
 public abstract class ClassicPlotWorld extends SquarePlotWorld {
 
-    public int ROAD_HEIGHT = 64;
+    public int ROAD_HEIGHT = 62;
-    public int PLOT_HEIGHT = 64;
+    public int PLOT_HEIGHT = 62;
-    public int WALL_HEIGHT = 64;
+    public int WALL_HEIGHT = 62;
     public BlockBucket MAIN_BLOCK = BlockBucket.withSingle(PlotBlock.get("stone"));
     // new PlotBlock[] {PlotBlock.get("stone")};
-    public BlockBucket TOP_BLOCK = BlockBucket.withSingle(PlotBlock.get("grass"));
+    public BlockBucket TOP_BLOCK = BlockBucket.withSingle(PlotBlock.get("grass_block"));
     //new PlotBlock[] {PlotBlock.get("grass")};
     public BlockBucket WALL_BLOCK = BlockBucket.withSingle(PlotBlock.get("stone_slab"));
     // PlotBlock.get((short) 44, (byte) 0);

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java

@@ -1169,7 +1169,7 @@ public class Plot {
         if (!isLoaded())
             return loc;
         int y =
-            isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), loc.getX(), loc.getZ()) : 64;
+            isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), loc.getX(), loc.getZ()) : 62;
         if (area.ALLOW_SIGNS) {
             y = Math.max(y, getManager().getSignLoc(area, this).getY());
         }
@@ -1182,7 +1182,7 @@ public class Plot {
         int x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX;
         int z = largest.minZ - 1;
         PlotManager manager = getManager();
-        int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), x, z) : 64;
+        int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), x, z) : 62;
         if (area.ALLOW_SIGNS && (y <= 0 || y >= 255)) {
             y = Math.max(y, manager.getSignLoc(area, this).getY() - 1);
         }
@@ -1258,7 +1258,7 @@ public class Plot {
                 x = bot.getX() + loc.x;
                 z = bot.getZ() + loc.z;
             }
-            int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(plot.getWorldName(), x, z) : 64;
+            int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(plot.getWorldName(), x, z) : 62;
             return new Location(plot.getWorldName(), x, y + 1, z);
         }
         // Side

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java

@@ -955,7 +955,7 @@ public abstract class PlotArea {
 
     public void addCluster(PlotCluster plotCluster) {
         if (this.clusters == null) {
-            this.clusters = new QuadMap<PlotCluster>(Integer.MAX_VALUE, 0, 0, 64) {
+            this.clusters = new QuadMap<PlotCluster>(Integer.MAX_VALUE, 0, 0, 62) {
                 @Override public RegionWrapper getRegion(PlotCluster value) {
                     return new RegionWrapper(value.getP1().x, value.getP2().x, value.getP1().y,
                         value.getP2().y);

build.gradle

@@ -1,3 +1,5 @@
+import org.ajoberstar.grgit.Grgit
+
 buildscript {
     repositories {
         mavenCentral()
@@ -5,30 +7,29 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.2'
-        classpath 'org.ajoberstar:grgit:1.7.0'
+        classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
     }
     configurations.all {
         resolutionStrategy {
-            force 'org.ow2.asm:asm:6.0_BETA'
+            force 'org.ow2.asm:asm:7.0'
         }
     }
 }
 
 plugins {
-    id 'maven-publish'
     id 'io.franzbecker.gradle-lombok' version '1.14'
 }
 
-group = 'com.intellectualcrafters'
+group = 'com.github.intellectualsites,plotsquared'
 
 def rootVersion = "4"
 def revision = ""
 def buildNumber = ""
 def date = ""
 ext {
-    git = org.ajoberstar.grgit.Grgit.open(file(".git"))
+    git = Grgit.open(dir: '.git')
-    date = git.head().date.format("yy.MM.dd")
+    date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
     index = 0;  // Offset to match CI
@@ -42,7 +43,7 @@ version = String.format("%s.%s%s%s", rootVersion, date, revision, buildNumber)
 
 description = rootProject.name
 if (project.hasProperty("lzNoVersion")) { // gradle build -PlzNoVersion
-    version = "unknown";
+    version = "unknown"
 }
 
 subprojects {
@@ -52,8 +53,10 @@ subprojects {
     apply plugin: 'idea'
     apply plugin: 'com.github.johnrengelman.shadow'
 
+    group = 'com.github.intellectualsites,plotsquared'
+
     lombok {
-        version = '1.18.2'
+        version = '1.18.4'
         sha256 = ""
     }
 
@@ -63,8 +66,9 @@ subprojects {
             exclude(module: 'mockito-core')
             exclude(module: 'dummypermscompat')
         }
-        compile 'com.google.guava:guava:10.0'
+        compile 'com.google.guava:guava:27.0.1-jre'
         compileOnly 'org.projectlombok:lombok:1.18.4'
+        testImplementation "junit:junit:4.12"
     }
     clean {
         delete file("../target")