Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-03 07:30:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix schem save

Browse Source
This commit is contained in:
Jesse Boyd 2019-11-11 18:48:15 +00:00
parent 7aa0d9c122
commit 19a7c54341
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java
View File

@ -95,7 +95,7 @@ public class SpongeSchematicReader extends NBTSchematicReader {
private int width, height, length; private int width, height, length;
private int offsetX, offsetY, offsetZ; private int offsetX, offsetY, offsetZ;
private char[] palette, biomePalette; private char[] palette, biomePalette;
private BlockVector3 min; private BlockVector3 min = BlockVector3.ZERO;
/** /**

16
worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicWriter.java
View File

@ -20,6 +20,7 @@
package com.sk89q.worldedit.extent.clipboard.io; package com.sk89q.worldedit.extent.clipboard.io;
import com.boydti.fawe.jnbt.streamer.IntValueReader; import com.boydti.fawe.jnbt.streamer.IntValueReader;
import com.boydti.fawe.object.FaweOutputStream;
import com.boydti.fawe.util.IOUtil; import com.boydti.fawe.util.IOUtil;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
@ -133,7 +134,7 @@ public class SpongeSchematicWriter implements ClipboardWriter {
}); });
ByteArrayOutputStream blocksCompressed = new ByteArrayOutputStream(); ByteArrayOutputStream blocksCompressed = new ByteArrayOutputStream();
DataOutputStream blocksOut = new DataOutputStream(new LZ4BlockOutputStream(blocksCompressed)); FaweOutputStream blocksOut = new FaweOutputStream(new DataOutputStream(new LZ4BlockOutputStream(blocksCompressed)));
ByteArrayOutputStream tilesCompressed = new ByteArrayOutputStream(); ByteArrayOutputStream tilesCompressed = new ByteArrayOutputStream();
NBTOutputStream tilesOut = new NBTOutputStream(new LZ4BlockOutputStream(tilesCompressed)); NBTOutputStream tilesOut = new NBTOutputStream(new LZ4BlockOutputStream(tilesCompressed));
@ -141,7 +142,7 @@ public class SpongeSchematicWriter implements ClipboardWriter {
List<Integer> paletteList = new ArrayList<>(); List<Integer> paletteList = new ArrayList<>();
char[] palette = new char[BlockTypesCache.states.length]; char[] palette = new char[BlockTypesCache.states.length];
Arrays.fill(palette, Character.MAX_VALUE); Arrays.fill(palette, Character.MAX_VALUE);
int[] paletteMax = {0}; int paletteMax = 0;
int numTiles = 0; int numTiles = 0;
for (BlockVector3 pos : clipboard) { for (BlockVector3 pos : clipboard) {
BaseBlock block = pos.getFullBlock(clipboard); BaseBlock block = pos.getFullBlock(clipboard);
@ -166,12 +167,21 @@ public class SpongeSchematicWriter implements ClipboardWriter {
numTiles++; numTiles++;
tilesOut.writeTagPayload(block.getNbtData()); tilesOut.writeTagPayload(block.getNbtData());
} }
int ordinal = block.getOrdinal();
char value = palette[ordinal];
if (value == Character.MAX_VALUE) {
int size = paletteMax++;
palette[ordinal] = value = (char) size;
paletteList.add(ordinal);
}
blocksOut.writeVarInt(value);
} }
// close // close
tilesOut.close(); tilesOut.close();
blocksOut.close(); blocksOut.close();
out.writeNamedTag("PaletteMax", paletteMax[0]); out.writeNamedTag("PaletteMax", paletteMax);
out.writeLazyCompoundTag("Palette", out12 -> { out.writeLazyCompoundTag("Palette", out12 -> {
for (int i = 0; i < paletteList.size(); i++) { for (int i = 0; i < paletteList.size(); i++) {