From f18cb1a0e1fb85bf4acdcecc0b5e206be46ed658 Mon Sep 17 00:00:00 2001 From: Octavia Togami Date: Sun, 23 Feb 2020 17:39:30 -0800 Subject: [PATCH] Update gradle --- worldedit-bukkit/build.gradle.kts | 4 +--- .../java/com/boydti/fawe/bukkit/wrapper/state/AsyncSign.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts index 735e88e63..0a0a7be97 100644 --- a/worldedit-bukkit/build.gradle.kts +++ b/worldedit-bukkit/build.gradle.kts @@ -36,7 +36,6 @@ configurations.all { dependencies { compile("com.github.MilkBowl:VaultAPI:1.7") { isTransitive = false } "api"(project(":worldedit-core")) - api(project(":worldedit-libs:core")) "api"(project(":worldedit-libs:bukkit")) "compile"(":worldedit-adapters:") "compile"("org.spigotmcv1_14_r1:spigotmcv1_14_r1:1_14_r1") @@ -52,7 +51,7 @@ dependencies { "compileOnly"("com.sk89q:dummypermscompat:1.10") "implementation"("org.apache.logging.log4j:log4j-slf4j-impl:2.8.1") "testCompile"("org.mockito:mockito-core:1.9.0-rc1") - "compileOnly"("com.sk89q.worldguard:worldguard-bukkit:7.0.+") { + "compileOnly"("com.sk89q.worldguard:worldguard-bukkit:7.+") { exclude("com.sk89q.worldedit", "worldedit-bukkit") exclude("com.sk89q.worldedit", "worldedit-core") exclude("com.sk89q.worldedit.worldedit-libs", "bukkit") @@ -91,7 +90,6 @@ tasks.named("shadowJar") { relocate("org.apache.logging.slf4j", "com.sk89q.worldedit.log4jbridge") relocate("org.antlr.v4", "com.sk89q.worldedit.antlr4") include(dependency(":worldedit-core")) - include(dependency(":worldedit-libs:core")) include(dependency(":worldedit-libs:bukkit")) include(dependency("org.slf4j:slf4j-api")) include(dependency("org.apache.logging.log4j:log4j-slf4j-impl")) diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/state/AsyncSign.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/state/AsyncSign.java index f9b7aaee7..b3bde9636 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/state/AsyncSign.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/state/AsyncSign.java @@ -45,7 +45,7 @@ public class AsyncSign extends AsyncBlockState implements Sign { private String toJson(String oldInput) { if (oldInput == null || oldInput.isEmpty()) return ""; - return LegacyComponentSerializer.legacy().serialize(TextComponent.of(oldInput)); + return LegacyComponentSerializer.INSTANCE.serialize(TextComponent.of(oldInput)); } @Override