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

Bukkit/build.gradle

@@ -22,7 +22,7 @@ dependencies {
     implementation("org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT")
     compile(group: "com.sk89q.worldedit", name: "worldedit-bukkit", version: "7.0.0")
     compile("io.papermc:paperlib:1.0.2")
-    compile(group: "com.squareup.retrofit2", name: "retrofit", version: "2.6.2")
+    compile(group: "com.squareup.retrofit2", name: "retrofit", version: "2.4.0")
     implementation("net.kyori:text-adapter-bukkit:3.0.3")
     compile("net.milkbowl.vault:VaultAPI:1.7") {
         exclude(module: "bukkit")
@@ -81,9 +81,9 @@ shadowJar {
         include(dependency(":Core"))
         // update notification stuff
         include(dependency("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT"))
-        include(dependency("com.squareup.retrofit2:retrofit:2.6.2"))
+        include(dependency("com.squareup.retrofit2:retrofit:2.4.0"))
-        include(dependency("com.squareup.okhttp3:okhttp:4.2.2"))
+        include(dependency("com.squareup.okhttp3:okhttp:3.12.0"))
-        include(dependency("com.squareup.okio:okio:2.4.1"))
+        include(dependency("com.squareup.okio:okio:2.2.2"))
         include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.50"))
         include(dependency("io.papermc:paperlib:1.0.2"))
         include(dependency("net.kyori:text-adapter-bukkit:3.0.3"))

Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitTaskManager.java

@@ -26,8 +26,12 @@ public class BukkitTaskManager extends TaskManager {
     }
 
     @Override public void taskAsync(Runnable runnable) {
-        @NotNull BukkitTask task = this.bukkitMain.getServer().getScheduler()
+        if (this.bukkitMain.isEnabled()) {
-            .runTaskAsynchronously(this.bukkitMain, runnable);
+            this.bukkitMain.getServer().getScheduler()
+                .runTaskAsynchronously(this.bukkitMain, runnable);
+        } else {
+            runnable.run();
+        }
     }
 
     @Override public void task(Runnable runnable) {

Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java

@@ -11,6 +11,7 @@ import com.github.intellectualsites.plotsquared.plot.object.schematic.PlotItem;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.MathMan;
 import com.github.intellectualsites.plotsquared.plot.util.StringComparison;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
 import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
 import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
 import com.github.intellectualsites.plotsquared.plot.util.world.BlockUtil;
@@ -304,13 +305,15 @@ import java.util.Set;
     }
 
     @Override @Nullable public String[] getSign(@NonNull final Location location) {
-        Block block = getWorld(location.getWorld())
+        Block block = getWorld(location.getWorld()).getBlockAt(location.getX(), location.getY(), location.getZ());
-            .getBlockAt(location.getX(), location.getY(), location.getZ());
+        return TaskManager.IMP.sync(new RunnableVal<String[]>() {
-        if (block.getState() instanceof Sign) {
+            @Override public void run(String[] value) {
-            Sign sign = (Sign) block.getState();
+                if (block.getState() instanceof Sign) {
-            return sign.getLines();
+                    Sign sign = (Sign) block.getState();
-        }
+                    this.value = sign.getLines();
-        return null;
+                }
+            }
+        });
     }
 
     @Override public Location getSpawn(@NonNull final PlotPlayer player) {

Core/build.gradle

@@ -5,18 +5,18 @@ def textVersion = "3.0.2"
 
 dependencies {
     implementation("org.yaml:snakeyaml:1.25")
-    implementation("com.google.code.gson:gson:2.8.6") {
+    implementation("com.google.code.gson:gson:2.8.0") {
         because("Minecraft uses GSON 2.8.0")
         force = true
     }
-    implementation("org.projectlombok:lombok:1.18.10")
+    implementation("org.projectlombok:lombok:1.18.8")
     compileOnly("org.projectlombok:lombok:1.18.8")
     testCompileOnly("org.projectlombok:lombok:1.18.8")
     annotationProcessor("org.projectlombok:lombok:1.18.8")
     testAnnotationProcessor("org.projectlombok:lombok:1.18.8")
     implementation("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT")
-    implementation("com.squareup.okhttp3:okhttp:4.2.2")
+    implementation("com.squareup.okhttp3:okhttp:3.12.0")
-    implementation("com.squareup.okio:okio:2.4.1")
+    implementation("com.squareup.okio:okio:2.2.2")
     implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.50")
 }
 

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java

@@ -20,6 +20,10 @@ import java.util.UUID;
     requiredType = RequiredType.NONE, confirmation = true) public class Owner extends SetCommand {
 
     @Override public boolean set(final PlotPlayer player, final Plot plot, String value) {
+        if (value == null || value.isEmpty()) {
+            Captions.SET_OWNER_MISSING_PLAYER.send(player);
+            return false;
+        }
         Set<Plot> plots = plot.getConnectedPlots();
         UUID uuid = null;
         String name = null;
@@ -75,20 +79,18 @@ import java.util.UUID;
         final String finalName = name;
         final UUID finalUUID = uuid;
         final boolean removeDenied = plot.isDenied(finalUUID);
-        Runnable run = new Runnable() {
+        Runnable run = () -> {
-            @Override public void run() {
+            if (plot.setOwner(finalUUID, player)) {
-                if (plot.setOwner(finalUUID, player)) {
+                if (removeDenied)
-                    if (removeDenied)
+                    plot.removeDenied(finalUUID);
-                        plot.removeDenied(finalUUID);
+                plot.setSign(finalName);
-                    plot.setSign(finalName);
+                MainUtil.sendMessage(player, Captions.SET_OWNER);
-                    MainUtil.sendMessage(player, Captions.SET_OWNER);
+                if (other != null) {
-                    if (other != null) {
+                    MainUtil.sendMessage(other, Captions.NOW_OWNER,
-                        MainUtil.sendMessage(other, Captions.NOW_OWNER,
+                        plot.getArea() + ";" + plot.getId());
-                            plot.getArea() + ";" + plot.getId());
-                    }
-                } else {
-                    MainUtil.sendMessage(player, Captions.SET_OWNER_CANCELLED);
                 }
+            } else {
+                MainUtil.sendMessage(player, Captions.SET_OWNER_CANCELLED);
             }
         };
         if (hasConfirmation(player)) {

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java

@@ -578,6 +578,7 @@ public enum Captions {
     //<editor-fold desc="Set Owner">
     SET_OWNER("$4You successfully set the plot owner", "Owner"),
     SET_OWNER_CANCELLED("$2The set owner action was cancelled", "Owner"),
+    SET_OWNER_MISSING_PLAYER("$1You need to specify a new owner. Correct usage is: $2/plot setowner <owner>", "Owner"),
     NOW_OWNER("$4You are now owner of plot %s", "Owner"),
     //</editor-fold>
     //<editor-fold desc="Signs">

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java

@@ -365,12 +365,8 @@ public class Config {
      * @throws NoSuchFieldException
      * @throws IllegalAccessException
      */
-    private static void setAccessible(Field field)
+    private static void setAccessible(Field field) {
-        throws NoSuchFieldException, IllegalAccessException {
         field.setAccessible(true);
-        Field modifiersField = Field.class.getDeclaredField("modifiers");
-        modifiersField.setAccessible(true);
-        modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
     }
 
     /**

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java

@@ -16,10 +16,10 @@ public class Settings extends Config {
 
     @Comment("These first 7 aren't configurable") // This is a comment
     @Final // Indicates that this value isn't configurable
-    public static final String ISSUES = "https://github.com/IntellectualSites/PlotSquared/issues";
+    public static String ISSUES = "https://github.com/IntellectualSites/PlotSquared/issues";
-    @Final public static final String SUGGESTION =
+    @Final public static String SUGGESTION =
         "https://github.com/IntellectualSites/PlotSquaredSuggestions";
-    @Final public static final String WIKI =
+    @Final public static String WIKI =
         "https://github.com/IntellectualSites/PlotSquared/wiki";
     @Final public static String DATE; // These values are set from P2 before loading
     @Final public static String BUILD; // These values are set from P2 before loading

build.gradle

@@ -83,7 +83,7 @@ subprojects {
             because("Minecraft uses Guava 21 as of 1.13")
         }
         compileOnly("org.jetbrains:annotations:17.0.0")
-        compileClasspath("org.projectlombok:lombok:1.18.10")
+        compileClasspath("org.projectlombok:lombok:1.18.8")
         testCompileOnly("org.projectlombok:lombok:1.18.8")
         annotationProcessor("org.projectlombok:lombok:1.18.8")
         testAnnotationProcessor("org.projectlombok:lombok:1.18.8")