From 68c8fca67200b6a4d651c6e0c6a5e69c88686dae Mon Sep 17 00:00:00 2001 From: MattBDev <4009945+MattBDev@users.noreply.github.com> Date: Thu, 19 Sep 2019 16:43:21 -0400 Subject: [PATCH] Fixed PlotSquared compiling issues --- .../boydti/fawe/regions/general/plot/CFIRedirect.java | 8 +++++--- .../fawe/regions/general/plot/FaweChunkManager.java | 7 ++++--- .../fawe/regions/general/plot/FaweLocalBlockQueue.java | 5 +++-- .../boydti/fawe/regions/general/plot/PlotSetBiome.java | 10 ++++++---- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/CFIRedirect.java b/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/CFIRedirect.java index ac338bd82..d4ea6a302 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/CFIRedirect.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/CFIRedirect.java @@ -13,6 +13,7 @@ import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; import com.sk89q.worldedit.WorldEdit; +import java.util.concurrent.CompletableFuture; @CommandDeclaration( command = "cfi", @@ -32,7 +33,7 @@ public class CFIRedirect extends Command { } @Override - public void execute(final PlotPlayer player, String[] args, RunnableVal3 confirm, RunnableVal2 whenDone) throws CommandException { + public CompletableFuture execute(final PlotPlayer player, String[] args, RunnableVal3 confirm, RunnableVal2 whenDone) throws CommandException { checkTrue(args.length >= 1, Captions.COMMAND_SYNTAX, getUsage()); final Plot plot = check(player.getCurrentPlot(), Captions.NOT_IN_PLOT); checkTrue(plot.isOwner(player.getUUID()), Captions.NOW_OWNER); @@ -42,7 +43,8 @@ public class CFIRedirect extends Command { player.sendMessage("The command has been changed to: //cfi"); } else { player.sendMessage("Must have the `worlds` component enabled in the PlotSquared config.yml"); - return; + return CompletableFuture.completedFuture(false); } + return CompletableFuture.completedFuture(true); } -} \ No newline at end of file +} diff --git a/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/FaweChunkManager.java b/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/FaweChunkManager.java index 362f380e1..91717c269 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/FaweChunkManager.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/FaweChunkManager.java @@ -13,6 +13,7 @@ import com.sk89q.worldedit.function.operation.Operations; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.world.World; +import java.util.concurrent.CompletableFuture; public class FaweChunkManager extends ChunkManager { @@ -28,13 +29,13 @@ public class FaweChunkManager extends ChunkManager { } @Override - public boolean loadChunk(String world, ChunkLoc loc, boolean force) { + public CompletableFuture loadChunk(String world, ChunkLoc loc, boolean force) { return parent.loadChunk(world, loc, force); } @Override - public void unloadChunk(String world, ChunkLoc loc, boolean save, boolean safe) { - parent.unloadChunk(world, loc, save, safe); + public void unloadChunk(String world, ChunkLoc loc, boolean save) { + parent.unloadChunk(world, loc, save); } @Override diff --git a/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/FaweLocalBlockQueue.java b/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/FaweLocalBlockQueue.java index 621d43b90..60b97c662 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/FaweLocalBlockQueue.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/FaweLocalBlockQueue.java @@ -114,9 +114,10 @@ public class FaweLocalBlockQueue extends LocalBlockQueue { } @Override - public void enqueue() { - super.enqueue(); + public boolean enqueue() { + boolean val = super.enqueue(); IMP.enableQueue(); + return val; } @Override diff --git a/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/PlotSetBiome.java b/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/PlotSetBiome.java index cdc5497c4..08a1e0183 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/PlotSetBiome.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/PlotSetBiome.java @@ -29,6 +29,7 @@ import com.sk89q.worldedit.world.biome.Biomes; import com.sk89q.worldedit.world.registry.BiomeRegistry; import java.util.Collection; import java.util.HashSet; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.ThreadLocalRandom; @CommandDeclaration( @@ -46,12 +47,12 @@ public class PlotSetBiome extends Command { } @Override - public void execute(final PlotPlayer player, String[] args, RunnableVal3 confirm, RunnableVal2 whenDone) throws CommandException { + public CompletableFuture execute(final PlotPlayer player, String[] args, RunnableVal3 confirm, RunnableVal2 whenDone) throws CommandException { final Plot plot = check(player.getCurrentPlot(), Captions.NOT_IN_PLOT); checkTrue(plot.isOwner(player.getUUID()) || Permissions.hasPermission(player, "plots.admin.command.generatebiome"), Captions.NO_PLOT_PERMS); if (plot.getRunning() != 0) { Captions.WAIT_FOR_TIMER.send(player); - return; + return null; } checkTrue(args.length == 1, Captions.COMMAND_SYNTAX, getUsage()); final HashSet regions = plot.getRegions(); @@ -59,10 +60,10 @@ public class PlotSetBiome extends Command { Collection knownBiomes = BiomeTypes.values(); final BiomeType biome = Biomes.findBiomeByName(knownBiomes, args[0], biomeRegistry); if (biome == null) { - String biomes = StringMan.join(WorldUtil.IMP.getBiomeList(), Captions.BLOCK_LIST_SEPARATER.toString()); + String biomes = StringMan.join(WorldUtil.IMP.getBiomeList(), Captions.BLOCK_LIST_SEPARATOR.toString()); Captions.NEED_BIOME.send(player); MainUtil.sendMessage(player, Captions.SUBCOMMAND_SET_OPTIONS_HEADER.toString() + biomes); - return; + return CompletableFuture.completedFuture(false); } confirm.run(this, new Runnable() { @Override @@ -94,5 +95,6 @@ public class PlotSetBiome extends Command { } }, null); + return CompletableFuture.completedFuture(true); } }