Upstream/FastAsyncWorldedit
1
0
Fork 0
mirror of https://github.com/boy0001/FastAsyncWorldedit.git synced 2025-01-01 14:08:11 +01:00
Code Issues Projects Releases Wiki Activity

Minor

Browse Source 
Optimize schematic save with lazycopy
Have VS undo execute async
This commit is contained in:
Jesse Boyd 2017-09-24 13:15:42 +10:00
parent b8aaeb0f8c
commit c3d12f1971
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 162 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SchematicWriter.java
View File

@ -4,7 +4,10 @@ import com.boydti.fawe.Fawe;
import com.boydti.fawe.FaweCache; import com.boydti.fawe.FaweCache;
import com.boydti.fawe.jnbt.NBTStreamer; import com.boydti.fawe.jnbt.NBTStreamer;
import com.boydti.fawe.object.clipboard.FaweClipboard; import com.boydti.fawe.object.clipboard.FaweClipboard;
import com.boydti.fawe.object.clipboard.WorldCopyClipboard;
import com.boydti.fawe.object.io.FastByteArrayOutputStream;
import com.boydti.fawe.util.ReflectionUtils; import com.boydti.fawe.util.ReflectionUtils;
import com.google.common.io.ByteStreams;
import com.sk89q.jnbt.ByteArrayTag; import com.sk89q.jnbt.ByteArrayTag;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.DoubleTag; import com.sk89q.jnbt.DoubleTag;
@ -26,12 +29,15 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard;
import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.registry.WorldData; import com.sk89q.worldedit.world.registry.WorldData;
import java.io.ByteArrayInputStream;
import java.io.DataOutput; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.zip.GZIPInputStream;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@ -155,72 +161,165 @@ public class SchematicWriter implements ClipboardWriter {
out.writeNamedTag("WEOffsetZ", (offset.getBlockZ())); out.writeNamedTag("WEOffsetZ", (offset.getBlockZ()));
out.writeNamedTag("Platform", Fawe.imp().getPlatform()); out.writeNamedTag("Platform", Fawe.imp().getPlatform());
out.writeNamedTagName("Blocks", NBTConstants.TYPE_BYTE_ARRAY); if (clipboard.IMP instanceof WorldCopyClipboard) {
out.getOutputStream().writeInt(volume); List<CompoundTag> tileEntities = new ArrayList<CompoundTag>();
clipboard.IMP.streamIds(new NBTStreamer.ByteReader() { FastByteArrayOutputStream ids = new FastByteArrayOutputStream();
@Override FastByteArrayOutputStream datas = new FastByteArrayOutputStream();
public void run(int index, int byteValue) { FastByteArrayOutputStream add = new FastByteArrayOutputStream();
try {
if (byteValue >= 256) { OutputStream idsOut = ids;//new PGZIPOutputStream(ids);
hasAdd = true; OutputStream dataOut = datas;//new PGZIPOutputStream(datas);
OutputStream addOut = add;//new PGZIPOutputStream(add);
byte[] addAcc = new byte[1];
clipboard.IMP.forEach(new FaweClipboard.BlockReader() {
int index;
@Override
public void run(int x, int y, int z, BaseBlock block) {
try {
// id
int id = block.getId();
idsOut.write(id);
// data
int data = block.getData();
dataOut.write(data);
// Nbt
CompoundTag nbt = block.getNbtData();
if (nbt != null) {
hasTile = true;
tileEntities.add(nbt);
}
// Add
if (id > 255) {
int add = id >> 8;
if (!hasAdd) {
hasAdd = true;
for (int i = 0; i < index >> 1; i++) {
addOut.write(new byte[index >> 1]);
}
}
if ((index & 1) == 1) {
addOut.write(addAcc[0] + (add << 4));
addAcc[0] = 0;
} else {
addAcc[0] = (byte) add;
}
}
// Index
index++;
} catch (IOException e) {
e.printStackTrace();
} }
if (FaweCache.hasData(byteValue)) { }
hasData = true; }, true);
} if (addAcc[0] != 0) addOut.write(addAcc[0]);
if (FaweCache.hasNBT(byteValue)) {
hasTile = true; idsOut.close();
} dataOut.close();
rawStream.writeByte(byteValue); addOut.close();
} catch (IOException e) {
e.printStackTrace(); out.writeNamedTagName("Blocks", NBTConstants.TYPE_BYTE_ARRAY);
out.getOutputStream().writeInt(volume);
try (GZIPInputStream in = new GZIPInputStream(new ByteArrayInputStream(ids.toByteArray()))) {
ByteStreams.copy(in, (OutputStream) rawStream);
}
out.writeNamedTagName("Data", NBTConstants.TYPE_BYTE_ARRAY);
out.getOutputStream().writeInt(volume);
try (GZIPInputStream in = new GZIPInputStream(new ByteArrayInputStream(datas.toByteArray()))) {
ByteStreams.copy(in, (OutputStream) rawStream);
}
if (hasAdd) {
out.writeNamedTagName("AddBlocks", NBTConstants.TYPE_BYTE_ARRAY);
int addLength = (volume + 1) >> 1;
out.getOutputStream().writeInt(addLength);
try (GZIPInputStream in = new GZIPInputStream(new ByteArrayInputStream(add.toByteArray()))) {
ByteStreams.copy(in, (OutputStream) rawStream);
} }
} }
}); if (hasTile) {
out.writeNamedTag("TileEntities", new ListTag(CompoundTag.class, tileEntities));
out.writeNamedTagName("Data", NBTConstants.TYPE_BYTE_ARRAY); } else {
out.getOutputStream().writeInt(volume); out.writeNamedEmptyList("TileEntities");
if (hasData) { }
clipboard.IMP.streamDatas(new NBTStreamer.ByteReader() { } else {
out.writeNamedTagName("Blocks", NBTConstants.TYPE_BYTE_ARRAY);
out.getOutputStream().writeInt(volume);
clipboard.IMP.streamIds(new NBTStreamer.ByteReader() {
@Override @Override
public void run(int index, int byteValue) { public void run(int index, int byteValue) {
try { try {
if (byteValue >= 256) {
hasAdd = true;
}
if (FaweCache.hasData(byteValue)) {
hasData = true;
}
if (FaweCache.hasNBT(byteValue)) {
hasTile = true;
}
rawStream.writeByte(byteValue); rawStream.writeByte(byteValue);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
}); });
} else {
for (int i = 0; i < volume; i++) {
rawStream.write(0);
}
}
if (hasAdd) { out.writeNamedTagName("Data", NBTConstants.TYPE_BYTE_ARRAY);
out.writeNamedTagName("AddBlocks", NBTConstants.TYPE_BYTE_ARRAY); out.getOutputStream().writeInt(volume);
int addLength = (volume + 1) >> 1; if (hasData) {
out.getOutputStream().writeInt(addLength); clipboard.IMP.streamDatas(new NBTStreamer.ByteReader() {
@Override
final int[] lastAdd = new int[1]; public void run(int index, int byteValue) {
final boolean[] write = new boolean[1];
clipboard.IMP.streamIds(new NBTStreamer.ByteReader() {
@Override
public void run(int index, int byteValue) {
if (write[0]) {
try { try {
rawStream.write(((byteValue >> 8) << 4) + (lastAdd[0])); rawStream.writeByte(byteValue);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} else {
lastAdd[0] = byteValue >> 8;
} }
write[0] ^= true; });
} else {
for (int i = 0; i < volume; i++) {
rawStream.write(0);
} }
}); }
if (write[0]) {
rawStream.write(lastAdd[0]); if (hasAdd) {
out.writeNamedTagName("AddBlocks", NBTConstants.TYPE_BYTE_ARRAY);
int addLength = (volume + 1) >> 1;
out.getOutputStream().writeInt(addLength);
final int[] lastAdd = new int[1];
final boolean[] write = new boolean[1];
clipboard.IMP.streamIds(new NBTStreamer.ByteReader() {
@Override
public void run(int index, int byteValue) {
if (write[0]) {
try {
rawStream.write(((byteValue >> 8) << 4) + (lastAdd[0]));
} catch (IOException e) {
e.printStackTrace();
}
} else {
lastAdd[0] = byteValue >> 8;
}
write[0] ^= true;
}
});
if (write[0]) {
rawStream.write(lastAdd[0]);
}
}
if (hasTile) {
final List<CompoundTag> tileEntities = clipboard.IMP.getTileEntities();
out.writeNamedTag("TileEntities", new ListTag(CompoundTag.class, tileEntities));
} else {
out.writeNamedEmptyList("TileEntities");
} }
} }
@ -239,13 +338,6 @@ public class SchematicWriter implements ClipboardWriter {
}); });
} }
if (hasTile) {
final List<CompoundTag> tileEntities = clipboard.IMP.getTileEntities();
out.writeNamedTag("TileEntities", new ListTag(CompoundTag.class, tileEntities));
} else {
out.writeNamedEmptyList("TileEntities");
}
List<Tag> entities = new ArrayList<Tag>(); List<Tag> entities = new ArrayList<Tag>();
for (Entity entity : clipboard.getEntities()) { for (Entity entity : clipboard.getEntities()) {
BaseEntity state = entity.getState(); BaseEntity state = entity.getState();

27
favs/src/main/java/com/thevoxelbox/voxelsniper/Sniper.java
View File

@ -461,18 +461,23 @@ public class Sniper {
public void undo(int amount) { public void undo(int amount) {
FawePlayer<Object> fp = FawePlayer.wrap(getPlayer()); FawePlayer<Object> fp = FawePlayer.wrap(getPlayer());
int count = 0; if (!fp.runAction(new Runnable() {
for (int i = 0; i < amount; i++) { @Override
if (fp.getSession().undo(null, fp.getPlayer()) == null) { public void run() {
break; int count = 0;
for (int i = 0; i < amount; i++) {
if (fp.getSession().undo(null, fp.getPlayer()) == null) {
break;
}
count++;
}
if (count > 0) {
BBC.COMMAND_UNDO_SUCCESS.send(fp);
} else {
BBC.COMMAND_UNDO_ERROR.send(fp);
}
} }
count++; }, true, false));
}
if (count > 0) {
BBC.COMMAND_UNDO_SUCCESS.send(fp);
} else {
BBC.COMMAND_UNDO_ERROR.send(fp);
}
} }
public void reset(String toolId) { public void reset(String toolId) {