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

Bit more cleanup for schematic handling.

Browse Source
This commit is contained in:
wizjany 2019-06-21 11:07:03 -04:00
parent a3d23fdcea
commit 902754ce8a
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,9 +162,9 @@ public class SpongeSchematicReader extends NBTSchematicReader {
region = new CuboidRegion(origin, origin.add(width, height, length).subtract(BlockVector3.ONE)); region = new CuboidRegion(origin, origin.add(width, height, length).subtract(BlockVector3.ONE));
} }
int paletteMax = requireTag(schematic, "PaletteMax", IntTag.class).getValue(); IntTag paletteMaxTag = getTag(schematic, "PaletteMax", IntTag.class);
Map<String, Tag> paletteObject = requireTag(schematic, "Palette", CompoundTag.class).getValue(); Map<String, Tag> paletteObject = requireTag(schematic, "Palette", CompoundTag.class).getValue();
if (paletteObject.size() != paletteMax) { if (paletteMaxTag != null && paletteObject.size() != paletteMaxTag.getValue()) {
throw new IOException("Block palette size does not match expected size."); throw new IOException("Block palette size does not match expected size.");
} }
@ -206,15 +206,17 @@ public class SpongeSchematicReader extends NBTSchematicReader {
for (Map<String, Tag> tileEntity : tileEntityTags) { for (Map<String, Tag> tileEntity : tileEntityTags) {
int[] pos = requireTag(tileEntity, "Pos", IntArrayTag.class).getValue(); int[] pos = requireTag(tileEntity, "Pos", IntArrayTag.class).getValue();
final BlockVector3 pt = BlockVector3.at(pos[0], pos[1], pos[2]); final BlockVector3 pt = BlockVector3.at(pos[0], pos[1], pos[2]);
Map<String, Tag> values = Maps.newHashMap(tileEntity);
values.put("x", new IntTag(pt.getBlockX()));
values.put("y", new IntTag(pt.getBlockY()));
values.put("z", new IntTag(pt.getBlockZ()));
values.put("id", values.get("Id"));
values.remove("Id");
values.remove("Pos");
if (fixer != null) { if (fixer != null) {
Map<String, Tag> values = Maps.newHashMap(tileEntity);
values.put("x", new IntTag(pt.getBlockX()));
values.put("y", new IntTag(pt.getBlockY()));
values.put("z", new IntTag(pt.getBlockZ()));
values.put("id", values.get("Id"));
values.remove("Id");
values.remove("Pos");
tileEntity = fixer.fixUp(DataFixer.FixTypes.BLOCK_ENTITY, new CompoundTag(values), dataVersion).getValue(); tileEntity = fixer.fixUp(DataFixer.FixTypes.BLOCK_ENTITY, new CompoundTag(values), dataVersion).getValue();
} else {
tileEntity = values;
} }
tileEntitiesMap.put(pt, tileEntity); tileEntitiesMap.put(pt, tileEntity);
} }
@ -234,7 +236,7 @@ public class SpongeSchematicReader extends NBTSchematicReader {
while (true) { while (true) {
value |= (blocks[i] & 127) << (varintLength++ * 7); value |= (blocks[i] & 127) << (varintLength++ * 7);
if (varintLength > 5) { if (varintLength > 5) {
throw new RuntimeException("VarInt too big (probably corrupted data)"); throw new IOException("VarInt too big (probably corrupted data)");
} }
if ((blocks[i] & 128) != 128) { if ((blocks[i] & 128) != 128) {
i++; i++;
@ -284,9 +286,8 @@ public class SpongeSchematicReader extends NBTSchematicReader {
if (maxTag.getValue() != paletteTag.getValue().size()) { if (maxTag.getValue() != paletteTag.getValue().size()) {
throw new IOException("Biome palette size does not match expected size."); throw new IOException("Biome palette size does not match expected size.");
} }
Map<String, Tag> paletteEntries = paletteTag.getValue();
for (Entry<String, Tag> palettePart : paletteEntries.entrySet()) { for (Entry<String, Tag> palettePart : paletteTag.getValue().entrySet()) {
String key = palettePart.getKey(); String key = palettePart.getKey();
if (fixer != null) { if (fixer != null) {
key = fixer.fixUp(DataFixer.FixTypes.BIOME, key, dataVersion); key = fixer.fixUp(DataFixer.FixTypes.BIOME, key, dataVersion);
@ -318,7 +319,7 @@ public class SpongeSchematicReader extends NBTSchematicReader {
while (true) { while (true) {
bVal |= (biomes[biomeJ] & 127) << (varIntLength++ * 7); bVal |= (biomes[biomeJ] & 127) << (varIntLength++ * 7);
if (varIntLength > 5) { if (varIntLength > 5) {
throw new RuntimeException("VarInt too big (probably corrupted data)"); throw new IOException("VarInt too big (probably corrupted data)");
} }
if (((biomes[biomeJ] & 128) != 128)) { if (((biomes[biomeJ] & 128) != 128)) {
biomeJ++; biomeJ++;