From 9ea4c8fe20eab309b6eddecae5e42a390c70399f Mon Sep 17 00:00:00 2001 From: boy0001 Date: Sat, 21 Feb 2015 13:49:25 +1100 Subject: [PATCH] hu --- .../plot/generator/HybridPlotManager.java | 244 ++++++------------ .../plot/generator/HybridUtils.java | 168 ++++++++++++ .../plot/util/BlockManager.java | 4 +- .../plot/util/MainUtil.java | 4 + .../plot/util/bukkit/BukkitUtil.java | 12 +- 5 files changed, 261 insertions(+), 171 deletions(-) create mode 100644 PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java index 4b5aa26ad..dce6340fc 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java @@ -24,13 +24,6 @@ import java.io.File; import java.util.ArrayList; import java.util.HashMap; -import org.bukkit.Bukkit; -import org.bukkit.Chunk; -import org.bukkit.World; -import org.bukkit.block.Biome; -import org.bukkit.block.Block; -import org.bukkit.plugin.Plugin; - import com.intellectualcrafters.jnbt.CompoundTag; import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.config.C; @@ -40,6 +33,7 @@ import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotBlock; import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotWorld; +import com.intellectualcrafters.plot.util.BlockManager; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.SchematicHandler; import com.intellectualcrafters.plot.util.TaskManager; @@ -138,8 +132,7 @@ public class HybridPlotManager extends ClassicPlotManager { return true; } - public int get_ey(final World world, final int sx, final int ex, final int sz, final int ez, final int sy) { - final int maxY = world.getMaxHeight(); + public int get_ey(final String world, final int sx, final int ex, final int sz, final int ez, final int sy) { int ey = sy; for (int x = sx; x <= ex; x++) { for (int z = sz; z <= ez; z++) { @@ -156,7 +149,7 @@ public class HybridPlotManager extends ClassicPlotManager { return ey; } - public void regenerateChunkChunk(final World world, final ChunkLoc loc) { + public void regenerateChunkChunk(final String world, final ChunkLoc loc) { final int sx = loc.x << 5; final int sz = loc.z << 5; for (int x = sx; x < (sx + 32); x++) { @@ -176,7 +169,7 @@ public class HybridPlotManager extends ClassicPlotManager { SetBlockManager.setBlockManager.update(chunks2); } - public boolean scheduleRoadUpdate(final World world) { + public boolean scheduleRoadUpdate(final String world) { if (HybridPlotManager.UPDATE) { return false; } @@ -209,93 +202,6 @@ public class HybridPlotManager extends ClassicPlotManager { return true; } - public boolean regenerateRoad(final Chunk chunk) { - final World world = chunk.getWorld(); - final int x = chunk.getX() << 4; - final int z = chunk.getZ() << 4; - final int ex = x + 15; - final int ez = z + 15; - final Location bot = new Location(world, x, 0, z); - final Location top = new Location(world, ex, 0, ez); - final HybridPlotWorld plotworld = (HybridPlotWorld) PlotSquared.getPlotWorld(world); - if (!plotworld.ROAD_SCHEMATIC_ENABLED) { - return false; - } - final PlotId id1 = getPlotId(plotworld, bot); - final PlotId id2 = getPlotId(plotworld, top); - boolean toCheck = false; - if ((id1 == null) || (id2 == null) || (id1 != id2)) { - final boolean result = chunk.load(false); - if (result) { - while (!chunk.isLoaded()) { - chunk.load(false); - } - if (id1 != null) { - final Plot p1 = MainUtil.getPlot(world, id1); - if ((p1 != null) && p1.hasOwner() && p1.settings.isMerged()) { - toCheck = true; - } - } - if ((id2 != null) && !toCheck) { - final Plot p2 = MainUtil.getPlot(world, id2); - if ((p2 != null) && p2.hasOwner() && p2.settings.isMerged()) { - toCheck = true; - } - } - final int size = plotworld.SIZE; - for (int X = 0; X < 16; X++) { - for (int Z = 0; Z < 16; Z++) { - short absX = (short) ((x + X) % size); - short absZ = (short) ((z + Z) % size); - if (absX < 0) { - absX += size; - } - if (absZ < 0) { - absZ += size; - } - final boolean gx = absX > plotworld.PATH_WIDTH_LOWER; - final boolean gz = absZ > plotworld.PATH_WIDTH_LOWER; - final boolean lx = absX < plotworld.PATH_WIDTH_UPPER; - final boolean lz = absZ < plotworld.PATH_WIDTH_UPPER; - boolean condition; - if (toCheck) { - final Location l = new Location(world, x + X, 1, z + Z); - condition = getPlotId(plotworld, l) == null; - } else { - condition = (!gx || !gz || !lx || !lz); - } - if (condition) { - final int sy = plotworld.ROAD_HEIGHT; - final ChunkLoc loc = new ChunkLoc(absX, absZ); - final HashMap blocks = plotworld.G_SCH.get(loc); - for (short y = (short) (plotworld.ROAD_HEIGHT + 1); y <= (plotworld.ROAD_HEIGHT + plotworld.SCHEMATIC_HEIGHT); y++) { - MainUtil.setBlock(world, x + X, sy + y, z + Z, 0, (byte) 0); - } - if (blocks != null) { - final HashMap datas = plotworld.G_SCH_DATA.get(loc); - if (datas == null) { - for (final Short y : blocks.keySet()) { - MainUtil.setBlock(world, x + X, sy + y, z + Z, blocks.get(y), (byte) 0); - } - } else { - for (final Short y : blocks.keySet()) { - Byte data = datas.get(y); - if (data == null) { - data = 0; - } - MainUtil.setBlock(world, x + X, sy + y, z + Z, blocks.get(y), data); - } - } - } - } - } - } - return true; - } - } - return false; - } - @Override public boolean finishPlotUnlink(final PlotWorld plotworld, final ArrayList plotIds) { final HybridPlotWorld hpw = (HybridPlotWorld) plotworld; @@ -351,7 +257,7 @@ public class HybridPlotManager extends ClassicPlotManager { final String world = plotworld.worldname; MainUtil.runners.put(plot, 1); final Plugin plugin = PlotSquared.getMain(); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.runners.remove(plot); @@ -374,27 +280,27 @@ public class HybridPlotManager extends ClassicPlotManager { if ((block.getTypeId() != wall_filling.id) || (block.getData() != wall_filling.data)) { setWallFilling(world, dpw, plot.id, new PlotBlock[] { wall_filling }); } - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { final Block block = world.getBlockAt(new Location(world, pos1.getX() - 1, dpw.WALL_HEIGHT + 1, pos1.getZ())); if ((block.getTypeId() != wall.id) || (block.getData() != wall.data)) { setWall(world, dpw, plot.id, new PlotBlock[] { wall }); } - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { if ((pos2.getX() - pos1.getX()) < 48) { MainUtil.setSimpleCuboid(world, new Location(world, pos1.getX(), 0, pos1.getZ()), new Location(world, pos2.getX() + 1, 1, pos2.getZ() + 1), new PlotBlock((short) 7, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setSimpleCuboid(world, new Location(world, pos1.getX(), dpw.PLOT_HEIGHT + 1, pos1.getZ()), new Location(world, pos2.getX() + 1, world.getMaxHeight() + 1, pos2.getZ() + 1), new PlotBlock((short) 0, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, pos1.getX(), 1, pos1.getZ()), new Location(world, pos2.getX() + 1, dpw.PLOT_HEIGHT, pos2.getZ() + 1), filling); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, pos1.getX(), dpw.PLOT_HEIGHT, pos1.getZ()), new Location(world, pos2.getX() + 1, dpw.PLOT_HEIGHT + 1, pos2.getZ() + 1), plotfloor); @@ -453,15 +359,15 @@ public class HybridPlotManager extends ClassicPlotManager { final Location min = mn; if (min == null) { MainUtil.setSimpleCuboid(world, new Location(world, pos1.getX(), 0, pos1.getZ()), new Location(world, pos2.getX() + 1, 1, pos2.getZ() + 1), new PlotBlock((short) 7, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setSimpleCuboid(world, new Location(world, pos1.getX(), dpw.PLOT_HEIGHT + 1, pos1.getZ()), new Location(world, pos2.getX() + 1, world.getMaxHeight() + 1, pos2.getZ() + 1), new PlotBlock((short) 0, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, pos1.getX(), 1, pos1.getZ()), new Location(world, pos2.getX() + 1, dpw.PLOT_HEIGHT, pos2.getZ() + 1), filling); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, pos1.getX(), dpw.PLOT_HEIGHT, pos1.getZ()), new Location(world, pos2.getX() + 1, dpw.PLOT_HEIGHT + 1, pos2.getZ() + 1), plotfloor); @@ -485,204 +391,204 @@ public class HybridPlotManager extends ClassicPlotManager { if (max.getZ() > plotMaxZ) { max.setZ(plotMaxZ); } - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setSimpleCuboid(world, new Location(world, plotMinX, 0, plotMinZ), new Location(world, min.getX() + 1, 1, min.getZ() + 1), new PlotBlock((short) 7, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setSimpleCuboid(world, new Location(world, plotMinX, dpw.PLOT_HEIGHT + 1, plotMinZ), new Location(world, min.getX() + 1, world.getMaxHeight() + 1, min.getZ() + 1), new PlotBlock((short) 0, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, plotMinX, 1, plotMinZ), new Location(world, min.getX() + 1, dpw.PLOT_HEIGHT + 1, min.getZ() + 1), filling); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, plotMinX, dpw.PLOT_HEIGHT, plotMinZ), new Location(world, min.getX() + 1, dpw.PLOT_HEIGHT + 1, min.getZ() + 1), plotfloor); } - }, 1L); + }, 1); } - }, 1L); + }, 1); } - }, 1L); + }, 1); } - }, 21L); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + }, 21); + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setSimpleCuboid(world, new Location(world, min.getX(), 0, plotMinZ), new Location(world, max.getX() + 1, 1, min.getZ() + 1), new PlotBlock((short) 7, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setSimpleCuboid(world, new Location(world, min.getX(), dpw.PLOT_HEIGHT + 1, plotMinZ), new Location(world, max.getX() + 1, world.getMaxHeight() + 1, min.getZ() + 1), new PlotBlock((short) 0, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, min.getX(), 1, plotMinZ), new Location(world, max.getX() + 1, dpw.PLOT_HEIGHT, min.getZ() + 1), filling); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, min.getX(), dpw.PLOT_HEIGHT, plotMinZ), new Location(world, max.getX() + 1, dpw.PLOT_HEIGHT + 1, min.getZ() + 1), plotfloor); } - }, 1L); + }, 1); } - }, 1L); + }, 1); } - }, 1L); + }, 1); } }, 25L); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setSimpleCuboid(world, new Location(world, max.getX(), 0, plotMinZ), new Location(world, plotMaxX + 1, 1, min.getZ() + 1), new PlotBlock((short) 7, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setSimpleCuboid(world, new Location(world, max.getX(), dpw.PLOT_HEIGHT + 1, plotMinZ), new Location(world, plotMaxX + 1, world.getMaxHeight() + 1, min.getZ() + 1), new PlotBlock((short) 0, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, max.getX(), 1, plotMinZ), new Location(world, plotMaxX + 1, dpw.PLOT_HEIGHT, min.getZ() + 1), filling); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, max.getX(), dpw.PLOT_HEIGHT, plotMinZ), new Location(world, plotMaxX + 1, dpw.PLOT_HEIGHT + 1, min.getZ() + 1), plotfloor); } - }, 1L); + }, 1); } - }, 1L); + }, 1); } - }, 1L); + }, 1); } }, 29L); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setSimpleCuboid(world, new Location(world, plotMinX, 0, min.getZ()), new Location(world, min.getX() + 1, 1, max.getZ() + 1), new PlotBlock((short) 7, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setSimpleCuboid(world, new Location(world, plotMinX, dpw.PLOT_HEIGHT + 1, min.getZ()), new Location(world, min.getX() + 1, world.getMaxHeight() + 1, max.getZ() + 1), new PlotBlock((short) 0, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, plotMinX, 1, min.getZ()), new Location(world, min.getX() + 1, dpw.PLOT_HEIGHT, max.getZ() + 1), filling); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, plotMinX, dpw.PLOT_HEIGHT, min.getZ()), new Location(world, min.getX() + 1, dpw.PLOT_HEIGHT + 1, max.getZ() + 1), plotfloor); } - }, 1L); + }, 1); } - }, 1L); + }, 1); } - }, 1L); + }, 1); } }, 33L); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setSimpleCuboid(world, new Location(world, plotMinX, 0, max.getZ()), new Location(world, min.getX() + 1, 1, plotMaxZ + 1), new PlotBlock((short) 7, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setSimpleCuboid(world, new Location(world, plotMinX, dpw.PLOT_HEIGHT + 1, max.getZ()), new Location(world, min.getX() + 1, world.getMaxHeight() + 1, plotMaxZ + 1), new PlotBlock((short) 0, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, plotMinX, 1, max.getZ()), new Location(world, min.getX() + 1, dpw.PLOT_HEIGHT, plotMaxZ + 1), filling); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, plotMinX, dpw.PLOT_HEIGHT, max.getZ()), new Location(world, min.getX() + 1, dpw.PLOT_HEIGHT + 1, plotMaxZ + 1), plotfloor); } - }, 1L); + }, 1); } - }, 1L); + }, 1); } - }, 1L); + }, 1); } }, 37L); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setSimpleCuboid(world, new Location(world, min.getX(), 0, max.getZ()), new Location(world, max.getX() + 1, 1, plotMaxZ + 1), new PlotBlock((short) 7, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setSimpleCuboid(world, new Location(world, min.getX(), dpw.PLOT_HEIGHT + 1, max.getZ()), new Location(world, max.getX() + 1, world.getMaxHeight() + 1, plotMaxZ + 1), new PlotBlock((short) 0, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, min.getX(), 1, max.getZ()), new Location(world, max.getX() + 1, dpw.PLOT_HEIGHT, plotMaxZ + 1), filling); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, min.getX(), dpw.PLOT_HEIGHT, max.getZ()), new Location(world, max.getX() + 1, dpw.PLOT_HEIGHT + 1, plotMaxZ + 1), plotfloor); } - }, 1L); + }, 1); } - }, 1L); + }, 1); } - }, 1L); + }, 1); } - }, 41L); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + }, 41); + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setSimpleCuboid(world, new Location(world, max.getX(), 0, min.getZ()), new Location(world, plotMaxX + 1, 1, max.getZ() + 1), new PlotBlock((short) 7, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setSimpleCuboid(world, new Location(world, max.getX(), dpw.PLOT_HEIGHT + 1, min.getZ()), new Location(world, plotMaxX + 1, world.getMaxHeight() + 1, max.getZ() + 1), new PlotBlock((short) 0, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, max.getX(), 1, min.getZ()), new Location(world, plotMaxX + 1, dpw.PLOT_HEIGHT, max.getZ() + 1), filling); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, max.getX(), dpw.PLOT_HEIGHT, min.getZ()), new Location(world, plotMaxX + 1, dpw.PLOT_HEIGHT + 1, max.getZ() + 1), plotfloor); } - }, 1L); + }, 1); } - }, 1L); + }, 1); } - }, 1L); + }, 1); } - }, 45L); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + }, 45); + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setSimpleCuboid(world, new Location(world, max.getX(), 0, max.getZ()), new Location(world, plotMaxX + 1, 1, plotMaxZ + 1), new PlotBlock((short) 7, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setSimpleCuboid(world, new Location(world, max.getX(), dpw.PLOT_HEIGHT + 1, max.getZ()), new Location(world, plotMaxX + 1, world.getMaxHeight() + 1, plotMaxZ + 1), new PlotBlock((short) 0, (byte) 0)); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, max.getX(), 1, max.getZ()), new Location(world, plotMaxX + 1, dpw.PLOT_HEIGHT, plotMaxZ + 1), filling); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { + TaskManager.runTaskLater(new Runnable() { @Override public void run() { MainUtil.setCuboid(world, new Location(world, max.getX(), dpw.PLOT_HEIGHT, max.getZ()), new Location(world, plotMaxX + 1, dpw.PLOT_HEIGHT + 1, plotMaxZ + 1), plotfloor); TaskManager.runTask(whenDone); } - }, 1L); + }, 1); } - }, 1L); + }, 1); } - }, 1L); + }, 1); } - }, 49L); + }, 49); } } - }, 20L); + }, 20); } - }, 20L); + }, 20); return true; } } diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java new file mode 100644 index 000000000..c47cc2977 --- /dev/null +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java @@ -0,0 +1,168 @@ +package com.intellectualcrafters.plot.generator; + +import java.io.File; +import java.util.HashMap; + +import com.intellectualcrafters.jnbt.CompoundTag; +import com.intellectualcrafters.plot.PlotSquared; +import com.intellectualcrafters.plot.object.ChunkLoc; +import com.intellectualcrafters.plot.object.Location; +import com.intellectualcrafters.plot.object.Plot; +import com.intellectualcrafters.plot.object.PlotBlock; +import com.intellectualcrafters.plot.object.PlotId; +import com.intellectualcrafters.plot.object.PlotManager; +import com.intellectualcrafters.plot.util.BlockManager; +import com.intellectualcrafters.plot.util.MainUtil; +import com.intellectualcrafters.plot.util.SchematicHandler; +import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; + +public abstract class HybridUtils { + + public boolean checkModified(final Plot plot, int requiredChanges) { + final Location bottom = MainUtil.getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1); + final Location top = MainUtil.getPlotTopLoc(plot.world, plot.id); + final int botx = bottom.getX(); + final int botz = bottom.getZ(); + final int topx = top.getX(); + final int topz = top.getZ(); + final HybridPlotWorld hpw = (HybridPlotWorld) PlotSquared.getPlotWorld(plot.world); + final PlotBlock[] air = new PlotBlock[] { new PlotBlock((short) 0, (byte) 0) }; + int changes = checkModified(requiredChanges, plot.world, botx, topx, hpw.PLOT_HEIGHT, hpw.PLOT_HEIGHT, botz, topz, hpw.TOP_BLOCK); + if (changes == -1) { + return true; + } + requiredChanges -= changes; + changes = checkModified(requiredChanges, plot.world, botx, topx, hpw.PLOT_HEIGHT + 1, hpw.PLOT_HEIGHT + 1, botz, topz, air); + if (changes == -1) { + return true; + } + requiredChanges -= changes; + changes = checkModified(requiredChanges, plot.world, botx, topx, hpw.PLOT_HEIGHT + 2, BukkitUtil.getMaxHeight(plot.world) - 1, botz, topz, air); + if (changes == -1) { + return true; + } + requiredChanges -= changes; + changes = checkModified(requiredChanges, plot.world, botx, topx, 1, hpw.PLOT_HEIGHT - 1, botz, topz, hpw.MAIN_BLOCK); + return changes == -1; + } + + public abstract int checkModified(final int threshhold, final String world, final int x1, final int x2, final int y1, final int y2, final int z1, final int z2, final PlotBlock[] blocks); + + public boolean setupRoadSchematic(final Plot plot) { + final String world = plot.world; + final Location bot = MainUtil.getPlotBottomLoc(world, plot.id); + final Location top = MainUtil.getPlotTopLoc(world, plot.id); + final HybridPlotWorld plotworld = (HybridPlotWorld) PlotSquared.getPlotWorld(world); + final int sx = (bot.getX() - plotworld.ROAD_WIDTH) + 1; + final int sz = bot.getZ() + 1; + final int sy = plotworld.ROAD_HEIGHT; + final int ex = bot.getX(); + final int ez = top.getZ(); + final int ey = get_ey(world, sx, ex, sz, ez, sy); + final Location pos1 = new Location(world, sx, sy, sz); + final Location pos2 = new Location(world, ex, ey, ez); + final int bx = sx; + final int bz = sz - plotworld.ROAD_WIDTH; + final int by = sy; + final int tx = ex; + final int tz = sz - 1; + final int ty = get_ey(world, bx, tx, bz, tz, by); + final Location pos3 = new Location(world, bx, by, bz); + final Location pos4 = new Location(world, tx, ty, tz); + final CompoundTag sideroad = SchematicHandler.getCompoundTag(world, pos1, pos2); + final CompoundTag intersection = SchematicHandler.getCompoundTag(world, pos3, pos4); + final String dir = PlotSquared.IMP.getDirectory() + File.separator + "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + plot.world + File.separator; + SchematicHandler.save(sideroad, dir + "sideroad.schematic"); + SchematicHandler.save(intersection, dir + "intersection.schematic"); + plotworld.ROAD_SCHEMATIC_ENABLED = true; + plotworld.setupSchematics(); + return true; + } + + public abstract int get_ey(final String world, final int sx, final int ex, final int sz, final int ez, final int sy); + + public abstract void regenerateChunkChunk(final String world, final ChunkLoc loc); + + public abstract boolean scheduleRoadUpdate(final String world); + + public boolean regenerateRoad(String world, final ChunkLoc chunk) { + final int x = chunk.x << 4; + final int z = chunk.z << 4; + final int ex = x + 15; + final int ez = z + 15; + final HybridPlotWorld plotworld = (HybridPlotWorld) PlotSquared.getPlotWorld(world); + if (!plotworld.ROAD_SCHEMATIC_ENABLED) { + return false; + } + PlotManager manager = PlotSquared.getPlotManager(world); + final PlotId id1 = manager.getPlotId(plotworld, x, 0, z); + final PlotId id2 = manager.getPlotId(plotworld, ex, 0, ez); + boolean toCheck = false; + if ((id1 == null) || (id2 == null) || (id1 != id2)) { + final boolean result = BukkitUtil.loadChunk(world, chunk); + if (result) { + if (id1 != null) { + final Plot p1 = MainUtil.getPlot(world, id1); + if ((p1 != null) && p1.hasOwner() && p1.settings.isMerged()) { + toCheck = true; + } + } + if ((id2 != null) && !toCheck) { + final Plot p2 = MainUtil.getPlot(world, id2); + if ((p2 != null) && p2.hasOwner() && p2.settings.isMerged()) { + toCheck = true; + } + } + final int size = plotworld.SIZE; + for (int X = 0; X < 16; X++) { + for (int Z = 0; Z < 16; Z++) { + short absX = (short) ((x + X) % size); + short absZ = (short) ((z + Z) % size); + if (absX < 0) { + absX += size; + } + if (absZ < 0) { + absZ += size; + } + final boolean gx = absX > plotworld.PATH_WIDTH_LOWER; + final boolean gz = absZ > plotworld.PATH_WIDTH_LOWER; + final boolean lx = absX < plotworld.PATH_WIDTH_UPPER; + final boolean lz = absZ < plotworld.PATH_WIDTH_UPPER; + boolean condition; + if (toCheck) { + condition = manager.getPlotId(plotworld, x + X, 1, z + Z) == null; + } else { + condition = (!gx || !gz || !lx || !lz); + } + if (condition) { + final int sy = plotworld.ROAD_HEIGHT; + final ChunkLoc loc = new ChunkLoc(absX, absZ); + final HashMap blocks = plotworld.G_SCH.get(loc); + for (short y = (short) (plotworld.ROAD_HEIGHT + 1); y <= (plotworld.ROAD_HEIGHT + plotworld.SCHEMATIC_HEIGHT); y++) { + BlockManager.manager.functionSetBlock(world, x + X, sy + y, z + Z, 0, (byte) 0); + } + if (blocks != null) { + final HashMap datas = plotworld.G_SCH_DATA.get(loc); + if (datas == null) { + for (final Short y : blocks.keySet()) { + BlockManager.manager.functionSetBlock(world, x + X, sy + y, z + Z, blocks.get(y), (byte) 0); + } + } else { + for (final Short y : blocks.keySet()) { + Byte data = datas.get(y); + if (data == null) { + data = 0; + } + BlockManager.manager.functionSetBlock(world, x + X, sy + y, z + Z, blocks.get(y), data); + } + } + } + } + } + } + return true; + } + } + return false; + } +} diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/BlockManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/BlockManager.java index 48066c706..8263868c3 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/BlockManager.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/BlockManager.java @@ -4,7 +4,7 @@ import com.intellectualcrafters.plot.object.PlotBlock; import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; public abstract class BlockManager { - private static BlockManager manager = new BukkitUtil(); + public static BlockManager manager = new BukkitUtil(); private static long state = 1; public static long nextLong() { @@ -32,6 +32,8 @@ public abstract class BlockManager { public abstract void functionSetSign(String worldname, int x, int y, int z, String[] lines); + public abstract void functionSetBlock(String worldname, int x, int y, int z, int id, byte data); + public abstract void functionSetBiomes(final String worldname, final int[] x, final int z[], final int[] biome); public static void setBiomes(final String worldname, final int[] x, final int z[], final int[] biome) { diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java index 344a28fd0..577758b33 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java @@ -961,4 +961,8 @@ public class MainUtil { } return getPlot(loc.getWorld(), id); } + + public static void setBlock(String world, int i, int j, int k, int l, byte b) { + BlockManager.setBl + } } diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitUtil.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitUtil.java index 27bb49b19..a8dfe151e 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitUtil.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitUtil.java @@ -15,6 +15,7 @@ import org.bukkit.block.Sign; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; +import com.intellectualcrafters.plot.object.ChunkLoc; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.PlotBlock; import com.intellectualcrafters.plot.util.BlockManager; @@ -24,6 +25,10 @@ public class BukkitUtil extends BlockManager { private static String lastString = null; private static World lastWorld = null; + public static boolean loadChunk(String world, ChunkLoc loc) { + return getWorld(world).getChunkAt(loc.x << 4, loc.z << 4).load(false); + } + public static Biome getBiome(final Location loc) { return getWorld(loc.getWorld()).getBiome(loc.getX(), loc.getZ()); } @@ -33,7 +38,7 @@ public class BukkitUtil extends BlockManager { } public static World getWorld(final String string) { - if (lastString == string) { + if (string == lastString) { return lastWorld; } World world = worlds.get(string); @@ -161,4 +166,9 @@ public class BukkitUtil extends BlockManager { world.setBiome(x[i], z[i], biomes[biome[i]]); } } + + @Override + public void functionSetBlock(String worldname, int x, int y, int z, int id, byte data) { + BukkitUtil.setBlock(getWorld(worldname), x, y, z, id, data); + } }