From 727d120e7019d129668a1ccad14b4a32744f392c Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Wed, 9 Jan 2019 16:15:34 +0000 Subject: [PATCH] Regenallroads: - remove the "estimated time" as it's just not remotely correct, nor would it be correct if it were based on actual chunk number - fix the air to be pasted above the road when using regenallroads --- .../plot/commands/RegenAllRoads.java | 10 +- .../plot/generator/HybridUtils.java | 108 ++++++++++-------- 2 files changed, 61 insertions(+), 57 deletions(-) diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java index 87549270b..9edf20a62 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java @@ -5,15 +5,11 @@ import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.C; import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotManager; import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; -import com.github.intellectualsites.plotsquared.plot.object.ChunkLoc; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotManager; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import java.util.Set; - @CommandDeclaration(command = "regenallroads", description = "Regenerate all roads in the map using the set road schematic", aliases = {"rgar"}, usage = "/plot regenallroads [height]", @@ -46,13 +42,13 @@ import java.util.Set; MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD); return false; } - Set chunks = ChunkManager.manager.getChunkChunks(name); + //Set chunks = ChunkManager.manager.getChunkChunks(name); MainUtil .sendMessage(player, "&cIf no schematic is set, the following will not do anything"); MainUtil.sendMessage(player, "&7 - To set a schematic, stand in a plot and use &c/plot createroadschematic"); - MainUtil.sendMessage(player, "&6Potential chunks to update: &7" + (chunks.size() * 1024)); - MainUtil.sendMessage(player, "&6Estimated time: &7" + chunks.size() + " seconds"); + //MainUtil.sendMessage(player, "&6Potential chunks to update: &7" + (chunks.size() * 1024)); + //MainUtil.sendMessage(player, "&6Estimated time: &7" + chunks.size() + " seconds"); boolean result = HybridUtils.manager.scheduleRoadUpdate(area, height); if (!result) { MainUtil.sendMessage(player, diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java index 1e37c81bd..d4b800d65 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java @@ -11,6 +11,7 @@ import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis; import com.sk89q.jnbt.CompoundTag; import com.sk89q.worldedit.world.block.BaseBlock; +import com.sk89q.worldedit.world.block.BlockTypes; import java.io.File; import java.util.*; @@ -23,6 +24,7 @@ public abstract class HybridUtils { public static Set chunks = new HashSet<>(); public static PlotArea area; public static boolean UPDATE = false; + private static BaseBlock air = BlockTypes.AIR.getDefaultState().toBaseBlock(); public abstract void analyzeRegion(String world, RegionWrapper region, RunnableVal whenDone); @@ -161,57 +163,55 @@ public abstract class HybridUtils { // CANCEL TASK } else { final Runnable task = this; - TaskManager.runTaskAsync(new Runnable() { - @Override public void run() { - try { - if (chunks.size() < 1024) { - if (!regions.isEmpty()) { - Iterator iterator = regions.iterator(); - ChunkLoc loc = iterator.next(); - iterator.remove(); - PlotSquared.debug("&3Updating .mcr: " + loc.x + ", " + loc.z - + " (aprrox 1024 chunks)"); - PlotSquared.debug(" - Remaining: " + regions.size()); - chunks.addAll(getChunks(loc)); - System.gc(); - } + TaskManager.runTaskAsync(() -> { + try { + if (chunks.size() < 1024) { + if (!regions.isEmpty()) { + Iterator iterator = regions.iterator(); + ChunkLoc loc = iterator.next(); + iterator.remove(); + PlotSquared.debug("&3Updating .mcr: " + loc.x + ", " + loc.z + + " (aprrox 1024 chunks)"); + PlotSquared.debug(" - Remaining: " + regions.size()); + chunks.addAll(getChunks(loc)); + System.gc(); } - if (!chunks.isEmpty()) { - TaskManager.IMP.sync(new RunnableVal() { - @Override public void run(Object value) { - long start = System.currentTimeMillis(); - Iterator iterator = chunks.iterator(); - while (System.currentTimeMillis() - start < 20 - && !chunks.isEmpty()) { - final ChunkLoc chunk = iterator.next(); - iterator.remove(); - regenerateRoad(area, chunk, extend); - } - } - }); - } - } catch (Exception e) { - e.printStackTrace(); - Iterator iterator = regions.iterator(); - ChunkLoc loc = iterator.next(); - iterator.remove(); - PlotSquared.debug( - "&c[ERROR]&7 Could not update '" + area.worldname + "/region/r." - + loc.x + "." + loc.z + ".mca' (Corrupt chunk?)"); - int sx = loc.x << 5; - int sz = loc.z << 5; - for (int x = sx; x < sx + 32; x++) { - for (int z = sz; z < sz + 32; z++) { - ChunkManager.manager - .unloadChunk(area.worldname, new ChunkLoc(x, z), true, - true); - } - } - PlotSquared.debug("&d - Potentially skipping 1024 chunks"); - PlotSquared.debug("&d - TODO: recommend chunkster if corrupt"); } - GlobalBlockQueue.IMP.addTask(() -> TaskManager.runTaskLater(task, 20)); + if (!chunks.isEmpty()) { + TaskManager.IMP.sync(new RunnableVal() { + @Override public void run(Object value) { + long start = System.currentTimeMillis(); + Iterator iterator = chunks.iterator(); + while (System.currentTimeMillis() - start < 20 + && !chunks.isEmpty()) { + final ChunkLoc chunk = iterator.next(); + iterator.remove(); + regenerateRoad(area, chunk, extend); + } + } + }); + } + } catch (Exception e) { + e.printStackTrace(); + Iterator iterator = regions.iterator(); + ChunkLoc loc = iterator.next(); + iterator.remove(); + PlotSquared.debug( + "&c[ERROR]&7 Could not update '" + area.worldname + "/region/r." + + loc.x + "." + loc.z + ".mca' (Corrupt chunk?)"); + int sx = loc.x << 5; + int sz = loc.z << 5; + for (int x = sx; x < sx + 32; x++) { + for (int z = sz; z < sz + 32; z++) { + ChunkManager.manager + .unloadChunk(area.worldname, new ChunkLoc(x, z), true, + true); + } + } + PlotSquared.debug("&d - Potentially skipping 1024 chunks"); + PlotSquared.debug("&d - TODO: recommend chunkster if corrupt"); } + GlobalBlockQueue.IMP.addTask(() -> TaskManager.runTaskLater(task, 20)); }); } } @@ -283,6 +283,7 @@ public abstract class HybridUtils { } public boolean regenerateRoad(final PlotArea area, final ChunkLoc chunk, int extend) { + PlotSquared.log(chunk); int x = chunk.x << 4; int z = chunk.z << 4; int ex = x + 15; @@ -353,8 +354,15 @@ public abstract class HybridUtils { for (int y = 0; y < blocks.length; y++) { if (blocks[y] != null) { BaseBlock block = blocks[y]; - queue.setBlock(x + X + plotWorld.ROAD_OFFSET_X, minY + y, - z + Z + plotWorld.ROAD_OFFSET_Z, block); + if (block != null) { + queue + .setBlock(x + X + plotWorld.ROAD_OFFSET_X, minY + y, + z + Z + plotWorld.ROAD_OFFSET_Z, block); + } else if (y <= extend) { + queue + .setBlock(x + X + plotWorld.ROAD_OFFSET_X, minY + y, + z + Z + plotWorld.ROAD_OFFSET_Z, air); + } } } }