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

2025-10-31 01:23:44 +01:00 · 2019-11-10 13:26:27 +01:00
parent baca8808ee 1a923063b5
commit 009bcaf6d4
9 changed files with 45 additions and 39 deletions
--- a/Bukkit/build.gradle
+++ b/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.okhttp3:okhttp:4.2.2"))
-        include(dependency("com.squareup.okio:okio:2.4.1"))
+        include(dependency("com.squareup.retrofit2:retrofit:2.4.0"))
+        include(dependency("com.squareup.okhttp3:okhttp:3.12.0"))
+        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"))
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitTaskManager.java
+++ b/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()) {
+            this.bukkitMain.getServer().getScheduler()
                .runTaskAsynchronously(this.bukkitMain, runnable);
+        } else {
+            runnable.run();
+        }
    }

    @Override public void task(Runnable runnable) {
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
+++ b/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())
-            .getBlockAt(location.getX(), location.getY(), location.getZ());
+        Block block = getWorld(location.getWorld()).getBlockAt(location.getX(), location.getY(), location.getZ());
+        return TaskManager.IMP.sync(new RunnableVal<String[]>() {
+            @Override public void run(String[] value) {
                if (block.getState() instanceof Sign) {
                    Sign sign = (Sign) block.getState();
-            return sign.getLines();
+                    this.value = sign.getLines();
                }
-        return null;
+            }
+        });
    }

    @Override public Location getSpawn(@NonNull final PlotPlayer player) {
--- a/Core/build.gradle
+++ b/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.okio:okio:2.4.1")
+    implementation("com.squareup.okhttp3:okhttp:3.12.0")
+    implementation("com.squareup.okio:okio:2.2.2")
    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.50")
 }

--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
+++ b/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,8 +79,7 @@ import java.util.UUID;
        final String finalName = name;
        final UUID finalUUID = uuid;
        final boolean removeDenied = plot.isDenied(finalUUID);
-        Runnable run = new Runnable() {
-            @Override public void run() {
+        Runnable run = () -> {
            if (plot.setOwner(finalUUID, player)) {
                if (removeDenied)
                    plot.removeDenied(finalUUID);
@@ -89,7 +92,6 @@ import java.util.UUID;
            } else {
                MainUtil.sendMessage(player, Captions.SET_OWNER_CANCELLED);
            }
-            }
        };
        if (hasConfirmation(player)) {
            CmdConfirm.addPending(player, "/plot set owner " + value, run);
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
+++ b/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">
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java
+++ b/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)
-        throws NoSuchFieldException, IllegalAccessException {
+    private static void setAccessible(Field field) {
        field.setAccessible(true);
-        Field modifiersField = Field.class.getDeclaredField("modifiers");
-        modifiersField.setAccessible(true);
-        modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
    }

    /**
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
+++ b/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";
-    @Final public static final String SUGGESTION =
+    public static String ISSUES = "https://github.com/IntellectualSites/PlotSquared/issues";
+    @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
--- a/build.gradle
+++ b/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")