EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 15:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Basic plot swapping

Browse Source
This commit is contained in:
boy0001 2015-02-23 18:08:49 +11:00
parent e044c0dd04
commit 3b52b7909a
3 changed files with 104 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Set.java
View File

@ -235,6 +235,7 @@ public class Set extends SubCommand {
} }
} }
manager.setComponent(plotworld, plot.id, component, blocks); manager.setComponent(plotworld, plot.id, component, blocks);
MainUtil.update(loc);
MainUtil.sendMessage(plr, C.GENERATING_COMPONENT); MainUtil.sendMessage(plr, C.GENERATING_COMPONENT);
return true; return true;
} }

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java
View File

@ -37,7 +37,7 @@ public abstract class ClassicPlotManager extends SquarePlotManager {
public boolean setFloor(final PlotWorld plotworld, final PlotId plotid, final PlotBlock[] blocks) { public boolean setFloor(final PlotWorld plotworld, final PlotId plotid, final PlotBlock[] blocks) {
final ClassicPlotWorld dpw = (ClassicPlotWorld) plotworld; final ClassicPlotWorld dpw = (ClassicPlotWorld) plotworld;
final Location pos1 = MainUtil.getPlotBottomLoc(plotworld.worldname, plotid).add(1, 0, 1); final Location pos1 = MainUtil.getPlotBottomLoc(plotworld.worldname, plotid).add(1, 0, 1);
final Location pos2 = MainUtil.getPlotTopLoc(plotworld.worldname, plotid); final Location pos2 = MainUtil.getPlotTopLoc(plotworld.worldname, plotid).add(1, 0, 1);
pos1.setY(dpw.PLOT_HEIGHT); pos1.setY(dpw.PLOT_HEIGHT);
pos2.setY(dpw.PLOT_HEIGHT + 1); pos2.setY(dpw.PLOT_HEIGHT + 1);
MainUtil.setCuboid(plotworld.worldname, pos1, pos2, blocks); MainUtil.setCuboid(plotworld.worldname, pos1, pos2, blocks);

119
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitChunkManager.java
View File

@ -48,6 +48,7 @@ import com.intellectualcrafters.plot.object.BlockLoc;
import com.intellectualcrafters.plot.object.ChunkLoc; import com.intellectualcrafters.plot.object.ChunkLoc;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotBlock;
import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotId;
import com.intellectualcrafters.plot.object.RegionWrapper; import com.intellectualcrafters.plot.object.RegionWrapper;
import com.intellectualcrafters.plot.object.entity.EntityWrapper; import com.intellectualcrafters.plot.object.entity.EntityWrapper;
@ -198,9 +199,9 @@ public class BukkitChunkManager extends ChunkManager {
chunks.add(chunk); chunks.add(chunk);
chunk.load(false); chunk.load(false);
saveEntitiesIn(chunk, region); saveEntitiesIn(chunk, region);
restoreEntities(world, relX, relZ);
} }
} }
restoreEntities(world, relX, relZ);
// Copy blocks // Copy blocks
final MutableInt mx = new MutableInt(sx); final MutableInt mx = new MutableInt(sx);
final Integer currentIndex = index.toInteger(); final Integer currentIndex = index.toInteger();
@ -388,6 +389,10 @@ public class BukkitChunkManager extends ChunkManager {
} }
public static void saveEntitiesIn(final Chunk chunk, final RegionWrapper region) { public static void saveEntitiesIn(final Chunk chunk, final RegionWrapper region) {
saveEntitiesIn(chunk, region, 0, 0);
}
public static void saveEntitiesIn(final Chunk chunk, final RegionWrapper region, int offset_x, int offset_z) {
for (final Entity entity : chunk.getEntities()) { for (final Entity entity : chunk.getEntities()) {
final Location loc = BukkitUtil.getLocation(entity); final Location loc = BukkitUtil.getLocation(entity);
final int x = loc.getX(); final int x = loc.getX();
@ -399,6 +404,8 @@ public class BukkitChunkManager extends ChunkManager {
continue; continue;
} }
final EntityWrapper wrap = new EntityWrapper(entity, (short) 2); final EntityWrapper wrap = new EntityWrapper(entity, (short) 2);
wrap.x += offset_x;
wrap.x += offset_z;
entities.add(wrap); entities.add(wrap);
} }
} }
@ -597,8 +604,12 @@ public class BukkitChunkManager extends ChunkManager {
} }
} }
} }
public static void saveBlocks(final World world, final int maxY, final int x, final int z) { public static void saveBlocks(final World world, final int maxY, final int x, final int z) {
saveBlocks(world, maxY, x, z, 0, 0);
}
public static void saveBlocks(final World world, final int maxY, int x, int z, int offset_x, int offset_z) {
final HashMap<Short, Short> ids = new HashMap<>(); final HashMap<Short, Short> ids = new HashMap<>();
final HashMap<Short, Byte> datas = new HashMap<>(); final HashMap<Short, Byte> datas = new HashMap<>();
for (short y = 1; y < maxY; y++) { for (short y = 1; y < maxY; y++) {
@ -613,13 +624,13 @@ public class BukkitChunkManager extends ChunkManager {
BlockLoc bl; BlockLoc bl;
switch (id) { switch (id) {
case 54: case 54:
bl = new BlockLoc(x, y, z); bl = new BlockLoc(x + offset_x, y, z + offset_z);
final InventoryHolder chest = (InventoryHolder) block.getState(); final InventoryHolder chest = (InventoryHolder) block.getState();
final ItemStack[] inventory = chest.getInventory().getContents().clone(); final ItemStack[] inventory = chest.getInventory().getContents().clone();
chestContents.put(bl, inventory); chestContents.put(bl, inventory);
break; break;
case 52: case 52:
bl = new BlockLoc(x, y, z); bl = new BlockLoc(x + offset_x, y, z + offset_z);
final CreatureSpawner spawner = (CreatureSpawner) block.getState(); final CreatureSpawner spawner = (CreatureSpawner) block.getState();
final String type = spawner.getCreatureTypeId(); final String type = spawner.getCreatureTypeId();
if ((type != null) && (type.length() != 0)) { if ((type != null) && (type.length() != 0)) {
@ -627,7 +638,7 @@ public class BukkitChunkManager extends ChunkManager {
} }
break; break;
case 137: case 137:
bl = new BlockLoc(x, y, z); bl = new BlockLoc(x + offset_x, y, z + offset_z);
final CommandBlock cmd = (CommandBlock) block.getState(); final CommandBlock cmd = (CommandBlock) block.getState();
final String string = cmd.getCommand(); final String string = cmd.getCommand();
if ((string != null) && (string.length() > 0)) { if ((string != null) && (string.length() > 0)) {
@ -637,14 +648,14 @@ public class BukkitChunkManager extends ChunkManager {
case 63: case 63:
case 68: case 68:
case 323: case 323:
bl = new BlockLoc(x, y, z); bl = new BlockLoc(x + offset_x, y, z + offset_z);
final Sign sign = (Sign) block.getState(); final Sign sign = (Sign) block.getState();
sign.getLines(); sign.getLines();
signContents.put(bl, sign.getLines().clone()); signContents.put(bl, sign.getLines().clone());
break; break;
case 61: case 61:
case 62: case 62:
bl = new BlockLoc(x, y, z); bl = new BlockLoc(x + offset_x, y, z + offset_z);
final Furnace furnace = (Furnace) block.getState(); final Furnace furnace = (Furnace) block.getState();
final short burn = furnace.getBurnTime(); final short burn = furnace.getBurnTime();
final short cook = furnace.getCookTime(); final short cook = furnace.getCookTime();
@ -655,19 +666,19 @@ public class BukkitChunkManager extends ChunkManager {
} }
break; break;
case 23: case 23:
bl = new BlockLoc(x, y, z); bl = new BlockLoc(x + offset_x, y, z + offset_z);
final Dispenser dispenser = (Dispenser) block.getState(); final Dispenser dispenser = (Dispenser) block.getState();
final ItemStack[] invDis = dispenser.getInventory().getContents().clone(); final ItemStack[] invDis = dispenser.getInventory().getContents().clone();
dispenserContents.put(bl, invDis); dispenserContents.put(bl, invDis);
break; break;
case 158: case 158:
bl = new BlockLoc(x, y, z); bl = new BlockLoc(x + offset_x, y, z + offset_z);
final Dropper dropper = (Dropper) block.getState(); final Dropper dropper = (Dropper) block.getState();
final ItemStack[] invDro = dropper.getInventory().getContents().clone(); final ItemStack[] invDro = dropper.getInventory().getContents().clone();
dropperContents.put(bl, invDro); dropperContents.put(bl, invDro);
break; break;
case 117: case 117:
bl = new BlockLoc(x, y, z); bl = new BlockLoc(x + offset_x, y, z + offset_z);
final BrewingStand brewingStand = (BrewingStand) block.getState(); final BrewingStand brewingStand = (BrewingStand) block.getState();
final short time = (short) brewingStand.getBrewingTime(); final short time = (short) brewingStand.getBrewingTime();
if (time > 0) { if (time > 0) {
@ -677,19 +688,19 @@ public class BukkitChunkManager extends ChunkManager {
brewingStandContents.put(bl, invBre); brewingStandContents.put(bl, invBre);
break; break;
case 25: case 25:
bl = new BlockLoc(x, y, z); bl = new BlockLoc(x + offset_x, y, z + offset_z);
final NoteBlock noteBlock = (NoteBlock) block.getState(); final NoteBlock noteBlock = (NoteBlock) block.getState();
final Note note = noteBlock.getNote(); final Note note = noteBlock.getNote();
noteBlockContents.put(bl, note); noteBlockContents.put(bl, note);
break; break;
case 138: case 138:
bl = new BlockLoc(x, y, z); bl = new BlockLoc(x + offset_x, y, z + offset_z);
final Beacon beacon = (Beacon) block.getState(); final Beacon beacon = (Beacon) block.getState();
final ItemStack[] invBea = beacon.getInventory().getContents().clone(); final ItemStack[] invBea = beacon.getInventory().getContents().clone();
beaconContents.put(bl, invBea); beaconContents.put(bl, invBea);
break; break;
case 84: case 84:
bl = new BlockLoc(x, y, z); bl = new BlockLoc(x + offset_x, y, z + offset_z);
final Jukebox jukebox = (Jukebox) block.getState(); final Jukebox jukebox = (Jukebox) block.getState();
final Material playing = jukebox.getPlaying(); final Material playing = jukebox.getPlaying();
if (playing != null) { if (playing != null) {
@ -697,13 +708,13 @@ public class BukkitChunkManager extends ChunkManager {
} }
break; break;
case 154: case 154:
bl = new BlockLoc(x, y, z); bl = new BlockLoc(x + offset_x, y, z + offset_z);
final Hopper hopper = (Hopper) block.getState(); final Hopper hopper = (Hopper) block.getState();
final ItemStack[] invHop = hopper.getInventory().getContents().clone(); final ItemStack[] invHop = hopper.getInventory().getContents().clone();
hopperContents.put(bl, invHop); hopperContents.put(bl, invHop);
break; break;
case 397: case 397:
bl = new BlockLoc(x, y, z); bl = new BlockLoc(x + offset_x, y, z + offset_z);
final Skull skull = (Skull) block.getState(); final Skull skull = (Skull) block.getState();
final String o = skull.getOwner(); final String o = skull.getOwner();
final byte skulltype = getOrdinal(SkullType.values(), skull.getSkullType()); final byte skulltype = getOrdinal(SkullType.values(), skull.getSkullType());
@ -713,7 +724,7 @@ public class BukkitChunkManager extends ChunkManager {
break; break;
case 176: case 176:
case 177: case 177:
bl = new BlockLoc(x, y, z); bl = new BlockLoc(x + offset_x, y, z + offset_z);
final Banner banner = (Banner) block.getState(); final Banner banner = (Banner) block.getState();
final byte base = getOrdinal(DyeColor.values(), banner.getBaseColor()); final byte base = getOrdinal(DyeColor.values(), banner.getBaseColor());
final ArrayList<Byte[]> types = new ArrayList<>(); final ArrayList<Byte[]> types = new ArrayList<>();
@ -762,8 +773,82 @@ public class BukkitChunkManager extends ChunkManager {
return BukkitUtil.getWorld(world).getChunkAt(loc.x, loc.z).load(false); return BukkitUtil.getWorld(world).getChunkAt(loc.x, loc.z).load(false);
} }
public static void swapChunk(World world, Chunk pos1, Chunk pos2, RegionWrapper r1, RegionWrapper r2) {
System.out.print("SWAPPING: " + pos1 +" and " + pos2);
initMaps();
int relX = (pos2.getX() - pos1.getX()) << 4;
int relZ = (pos2.getZ() - pos1.getZ()) << 4;
saveEntitiesIn(pos1, r1, relX, relZ);
saveEntitiesIn(pos2, r2, -relX, -relZ);
int sx = pos1.getX() << 4;
int sz = pos1.getX() << 4;
int maxY = world.getMaxHeight();
for (int x = sx; x< sx + 15; x++) {
for (int z = sz; z< sz + 15; z++) {
saveBlocks(world, maxY, sx, sz, relX, relZ);
for (int y = 0; y < maxY; y++) {
Block block1 = world.getBlockAt(x, y, z);
int id1 = block1.getTypeId();
byte data1 = block1.getData();
int xx = x + relX;
int zz = z + relZ;
Block block2 = world.getBlockAt(xx, y, zz);
int id2 = block1.getTypeId();
byte data2 = block1.getData();
if (id1 == 0) {
if (id2 != 0) {
BukkitSetBlockManager.setBlockManager.set(world, x, y, z, id2, data2);
}
}
else if (id2 == 0) {
if (id1 != 0) {
BukkitSetBlockManager.setBlockManager.set(world, xx, y, zz, id1, data1);
}
}
else if (id1 == id2) {
if (data1 != data2) {
block1.setData(data2);
block2.setData(data1);
}
}
else {
BukkitSetBlockManager.setBlockManager.set(world, x, y, z, id2, data2);
BukkitSetBlockManager.setBlockManager.set(world, xx, y, zz, id1, data1);
}
}
}
}
restoreBlocks(world, 0, 0);
restoreEntities(world, 0, 0);
}
@Override @Override
public void swap(final String world, final PlotId id, final PlotId plotid) { public void swap(final String worldname, final PlotId pos1, final PlotId pos2) {
Location bot1 = MainUtil.getPlotBottomLoc(worldname, pos1).add(1, 0, 1);
Location top1 = MainUtil.getPlotTopLoc(worldname, pos1);
Location bot2 = MainUtil.getPlotBottomLoc(worldname, pos2).add(1, 0, 1);
Location top2 = MainUtil.getPlotTopLoc(worldname, pos2);
final RegionWrapper region1 = new RegionWrapper(bot1.getX(), top1.getX(), bot1.getZ(), top1.getZ());
final RegionWrapper region2 = new RegionWrapper(bot2.getX(), top2.getX(), bot2.getZ(), top2.getZ());
final World world = Bukkit.getWorld(bot1.getWorld());
final int relX = bot2.getX() - bot1.getX();
final int relZ = bot2.getZ() - bot1.getZ();
for (int x = bot1.getX() >> 4; x <= top1.getX() >> 4; x++) {
for (int z = bot1.getZ() >> 4; z <= top1.getZ() >> 4; z++) {
Chunk chunk1 = world.getChunkAt(x, z);
Chunk chunk2 = world.getChunkAt(x + (relX >> 4), z + (relZ >> 4));
swapChunk(world, chunk1, chunk2, region1, region2);
}
}
// FIXME swap plots // FIXME swap plots
} }
} }