From 91c7390734cc946a113dc4fad662728882668726 Mon Sep 17 00:00:00 2001 From: N0tMyFaultOG Date: Mon, 24 Aug 2020 19:53:51 +0200 Subject: [PATCH] Fix paperlib --- worldedit-bukkit/build.gradle.kts | 4 ++-- .../adapter/mc1_14/nbt/LazyCompoundTag_1_14.java | 1 - .../adapter/mc1_15_2/BukkitAdapter_1_15_2.java | 2 -- .../fawe/bukkit/filter/WorldGuardFilter.java | 3 --- .../fawe/bukkit/listener/ChunkListener_9.java | 1 - .../sk89q/worldedit/bukkit/WorldEditPlugin.java | 15 +++------------ 6 files changed, 5 insertions(+), 21 deletions(-) diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts index 63725aa7a..dc1a1f458 100644 --- a/worldedit-bukkit/build.gradle.kts +++ b/worldedit-bukkit/build.gradle.kts @@ -50,7 +50,7 @@ dependencies { "compileOnly"("org.spigotmc:spigot:1.14.4-R0.1-SNAPSHOT") "compileOnly"("org.spigotmc:spigot:1.15.2-R0.1-SNAPSHOT") "compileOnly"("org.spigotmc:spigot:1.16.2-R0.1-SNAPSHOT") - "implementation"("io.papermc:paperlib:1.0.+") + "implementation"("io.papermc:paperlib:1.0.4") "compileOnly"("com.sk89q:dummypermscompat:1.10") { exclude("com.github.MilkBowl", "VaultAPI") } @@ -103,7 +103,7 @@ tasks.named("shadowJar") { include(dependency("org.bstats:bstats-bukkit:1.7")) } relocate("io.papermc.lib", "com.sk89q.worldedit.bukkit.paperlib") { - include(dependency("io.papermc:paperlib:1.+")) + include(dependency("io.papermc:paperlib:1.0.4")) } relocate("it.unimi.dsi.fastutil", "com.sk89q.worldedit.bukkit.fastutil") { include(dependency("it.unimi.dsi:fastutil")) diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_14/nbt/LazyCompoundTag_1_14.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_14/nbt/LazyCompoundTag_1_14.java index 6c26166f3..ef410dcad 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_14/nbt/LazyCompoundTag_1_14.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_14/nbt/LazyCompoundTag_1_14.java @@ -1,6 +1,5 @@ package com.boydti.fawe.bukkit.adapter.mc1_14.nbt; -import com.google.common.base.Suppliers; import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.ListTag; import com.sk89q.jnbt.StringTag; diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_15_2/BukkitAdapter_1_15_2.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_15_2/BukkitAdapter_1_15_2.java index 27cceceee..ff9af59c7 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_15_2/BukkitAdapter_1_15_2.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_15_2/BukkitAdapter_1_15_2.java @@ -24,8 +24,6 @@ import net.minecraft.server.v1_15_R1.DataPaletteBlock; import net.minecraft.server.v1_15_R1.DataPaletteLinear; import net.minecraft.server.v1_15_R1.GameProfileSerializer; import net.minecraft.server.v1_15_R1.IBlockData; -import net.minecraft.server.v1_15_R1.LightEngine; -import net.minecraft.server.v1_15_R1.LightEngineLayer; import net.minecraft.server.v1_15_R1.LightEngineStorage; import net.minecraft.server.v1_15_R1.NibbleArray; import net.minecraft.server.v1_15_R1.PacketPlayOutLightUpdate; diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/filter/WorldGuardFilter.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/filter/WorldGuardFilter.java index bcf5f9253..0212cdbc8 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/filter/WorldGuardFilter.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/filter/WorldGuardFilter.java @@ -4,10 +4,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static org.slf4j.LoggerFactory.getLogger; import com.boydti.fawe.Fawe; -import com.boydti.fawe.FaweAPI; -import com.boydti.fawe.object.RunnableVal; import com.boydti.fawe.regions.general.CuboidRegionFilter; -import com.boydti.fawe.util.TaskManager; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldguard.WorldGuard; diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/ChunkListener_9.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/ChunkListener_9.java index accc84b90..2c582b7d2 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/ChunkListener_9.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/ChunkListener_9.java @@ -9,7 +9,6 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.BlockPhysicsEvent; -// public class ChunkListener_9 extends ChunkListener { private Exception exception; diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java index 14820294b..ee4979ce8 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java @@ -22,7 +22,6 @@ package com.sk89q.worldedit.bukkit; import com.boydti.fawe.Fawe; import com.boydti.fawe.bukkit.FaweBukkit; -import com.boydti.fawe.config.Settings; import com.boydti.fawe.util.MainUtil; import com.google.common.base.Joiner; import com.sk89q.util.yaml.YAMLProcessor; @@ -52,6 +51,7 @@ import com.sk89q.worldedit.world.gamemode.GameModes; import com.sk89q.worldedit.world.item.ItemCategory; import com.sk89q.worldedit.world.weather.WeatherTypes; import io.papermc.lib.PaperLib; +import java.util.Optional; import org.bstats.bukkit.Metrics; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -90,7 +90,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; @@ -105,7 +104,7 @@ public class WorldEditPlugin extends JavaPlugin { //implements TabCompleter private static final Logger log = LoggerFactory.getLogger(WorldEditPlugin.class); public static final String CUI_PLUGIN_CHANNEL = "worldedit:cui"; private static WorldEditPlugin INSTANCE; - ///The BSTATS_ID needs to be modified for FAWE to prevent contaminating WorldEdit stats + // The BSTATS_ID needs to be modified for FAWE to prevent contaminating WorldEdit stats private static final int BSTATS_PLUGIN_ID = 1403; private BukkitImplAdapter bukkitAdapter; @@ -235,15 +234,7 @@ public class WorldEditPlugin extends JavaPlugin { //implements TabCompleter } // Setup metrics - if (Settings.IMP.ENABLED_COMPONENTS.BSTATS) { - new Metrics(this, BSTATS_PLUGIN_ID); - } else { - getLogger().warning("bStats is disabled. Please enable it in /plugins/FastAsyncWorldEdit/config.yml. It helps the developers to identify the features most used"); - getLogger().warning("and organize future updates better. Cheers."); - } - - // Suggest PaperMC - PaperLib.suggestPaper(this); + new Metrics(this, BSTATS_PLUGIN_ID); } private void setupPreWorldData() {