mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2025-07-04 03:56:41 +00:00
Implement restoring biomes, entities, and extended world heights (#1316)
This commit is contained in:
Jordan
GitHub
@ -41,9 +41,7 @@ import java.util.Map;
|
||||
|
||||
public class AnvilChunk implements Chunk {
|
||||
|
||||
//FAWE start - use CBT > CT
|
||||
private final CompoundBinaryTag rootTag;
|
||||
//FAWE end
|
||||
private final byte[][] blocks;
|
||||
private final byte[][] blocksAdd;
|
||||
private final byte[][] data;
|
||||
@ -52,9 +50,6 @@ public class AnvilChunk implements Chunk {
|
||||
|
||||
private Map<BlockVector3, CompoundBinaryTag> tileEntities;
|
||||
|
||||
|
||||
//FAWE start
|
||||
|
||||
/**
|
||||
* Construct the chunk with a compound tag.
|
||||
*
|
||||
@ -66,7 +61,6 @@ public class AnvilChunk implements Chunk {
|
||||
public AnvilChunk(CompoundTag tag) throws DataException {
|
||||
this(tag.asBinaryTag());
|
||||
}
|
||||
//FAWE end
|
||||
|
||||
/**
|
||||
* Construct the chunk with a compound tag.
|
||||
@ -84,7 +78,6 @@ public class AnvilChunk implements Chunk {
|
||||
blocksAdd = new byte[16][16 * 16 * 8];
|
||||
data = new byte[16][16 * 16 * 8];
|
||||
|
||||
//FAWE start - use *BinaryTag > *Tag
|
||||
ListBinaryTag sections = NbtUtils.getChildTag(rootTag, "Sections", BinaryTagTypes.LIST);
|
||||
|
||||
for (BinaryTag rawSectionTag : sections) {
|
||||
@ -135,7 +128,6 @@ public class AnvilChunk implements Chunk {
|
||||
}
|
||||
}
|
||||
}
|
||||
//FAWE end
|
||||
|
||||
private int getBlockID(BlockVector3 position) throws DataException {
|
||||
int x = position.getX() - rootX * 16;
|
||||
@ -201,7 +193,6 @@ public class AnvilChunk implements Chunk {
|
||||
* Used to load the tile entities.
|
||||
*/
|
||||
private void populateTileEntities() throws DataException {
|
||||
//FAWE start - use *BinaryTag > *Tag
|
||||
ListBinaryTag tags = NbtUtils.getChildTag(rootTag, "TileEntities", BinaryTagTypes.LIST);
|
||||
|
||||
tileEntities = new HashMap<>();
|
||||
@ -248,7 +239,6 @@ public class AnvilChunk implements Chunk {
|
||||
tileEntities.put(vec, values.build());
|
||||
}
|
||||
}
|
||||
//FAWE end
|
||||
|
||||
/**
|
||||
* Get the map of tags keyed to strings for a block's tile entity data. May
|
||||
@ -260,7 +250,6 @@ public class AnvilChunk implements Chunk {
|
||||
* @throws DataException thrown if there is a data error
|
||||
*/
|
||||
@Nullable
|
||||
//FAWE start - use *BinaryTag > * Tag
|
||||
private CompoundBinaryTag getBlockTileEntity(BlockVector3 position) throws DataException {
|
||||
if (tileEntities == null) {
|
||||
populateTileEntities();
|
||||
@ -289,6 +278,5 @@ public class AnvilChunk implements Chunk {
|
||||
|
||||
return state.toBaseBlock();
|
||||
}
|
||||
//FAWE end
|
||||
|
||||
}
|
||||
|
||||
@ -21,22 +21,29 @@ package com.sk89q.worldedit.world.chunk;
|
||||
|
||||
import com.fastasyncworldedit.core.util.NbtUtils;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.entity.BaseEntity;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.registry.state.Property;
|
||||
import com.sk89q.worldedit.util.concurrency.LazyReference;
|
||||
import com.sk89q.worldedit.util.nbt.BinaryTag;
|
||||
import com.sk89q.worldedit.util.nbt.BinaryTagTypes;
|
||||
import com.sk89q.worldedit.util.nbt.CompoundBinaryTag;
|
||||
import com.sk89q.worldedit.util.nbt.IntBinaryTag;
|
||||
import com.sk89q.worldedit.util.nbt.ListBinaryTag;
|
||||
import com.sk89q.worldedit.world.DataException;
|
||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||
import com.sk89q.worldedit.world.biome.BiomeTypes;
|
||||
import com.sk89q.worldedit.world.block.BaseBlock;
|
||||
import com.sk89q.worldedit.world.block.BlockState;
|
||||
import com.sk89q.worldedit.world.block.BlockType;
|
||||
import com.sk89q.worldedit.world.block.BlockTypes;
|
||||
import com.sk89q.worldedit.world.entity.EntityTypes;
|
||||
import com.sk89q.worldedit.world.storage.InvalidFormatException;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
@ -44,17 +51,15 @@ import java.util.Map;
|
||||
*/
|
||||
public class AnvilChunk13 implements Chunk {
|
||||
|
||||
//FAWE start - CBT > CT
|
||||
private final CompoundBinaryTag rootTag;
|
||||
//FAWE end
|
||||
protected final CompoundBinaryTag rootTag;
|
||||
private final BlockState[][] blocks;
|
||||
private final int rootX;
|
||||
private final int rootZ;
|
||||
|
||||
//FAWE start - biome and entity restore
|
||||
protected BiomeType[] biomes;
|
||||
//FAWE end
|
||||
private Map<BlockVector3, CompoundBinaryTag> tileEntities;
|
||||
|
||||
|
||||
//FAWE start
|
||||
//FAWE start - biome and entity restore
|
||||
private List<BaseEntity> entities;
|
||||
//FAWE end
|
||||
|
||||
/**
|
||||
* Construct the chunk with a compound tag.
|
||||
@ -67,7 +72,6 @@ public class AnvilChunk13 implements Chunk {
|
||||
public AnvilChunk13(CompoundTag tag) throws DataException {
|
||||
this(tag.asBinaryTag());
|
||||
}
|
||||
//FAWE end
|
||||
|
||||
/**
|
||||
* Construct the chunk with a compound tag.
|
||||
@ -78,12 +82,8 @@ public class AnvilChunk13 implements Chunk {
|
||||
public AnvilChunk13(CompoundBinaryTag tag) throws DataException {
|
||||
rootTag = tag;
|
||||
|
||||
rootX = NbtUtils.getChildTag(rootTag, "xPos", BinaryTagTypes.INT).value();
|
||||
rootZ = NbtUtils.getChildTag(rootTag, "zPos", BinaryTagTypes.INT).value();
|
||||
|
||||
blocks = new BlockState[16][];
|
||||
|
||||
//FAWE start - use *BinaryTag > *Tag
|
||||
ListBinaryTag sections = NbtUtils.getChildTag(rootTag, "Sections", BinaryTagTypes.LIST);
|
||||
|
||||
for (BinaryTag rawSectionTag : sections) {
|
||||
@ -132,7 +132,6 @@ public class AnvilChunk13 implements Chunk {
|
||||
}
|
||||
palette[paletteEntryId] = blockState;
|
||||
}
|
||||
//FAWE end
|
||||
|
||||
// parse block states
|
||||
long[] blockStatesSerialized = NbtUtils.getChildTag(sectionTag, "BlockStates", BinaryTagTypes.LONG_ARRAY).value();
|
||||
@ -191,7 +190,6 @@ public class AnvilChunk13 implements Chunk {
|
||||
if (rootTag.get("TileEntities") == null) {
|
||||
return;
|
||||
}
|
||||
//FAWE start - use *BinaryTag > *Tag
|
||||
ListBinaryTag tags = NbtUtils.getChildTag(rootTag, "TileEntities", BinaryTagTypes.LIST);
|
||||
|
||||
for (BinaryTag tag : tags) {
|
||||
@ -208,7 +206,6 @@ public class AnvilChunk13 implements Chunk {
|
||||
BlockVector3 vec = BlockVector3.at(x, y, z);
|
||||
tileEntities.put(vec, t);
|
||||
}
|
||||
//FAWE end
|
||||
}
|
||||
|
||||
/**
|
||||
@ -221,7 +218,6 @@ public class AnvilChunk13 implements Chunk {
|
||||
* @throws DataException thrown if there is a data error
|
||||
*/
|
||||
@Nullable
|
||||
//FAWE start - use *BinaryTag > *Tag
|
||||
private CompoundBinaryTag getBlockTileEntity(BlockVector3 position) throws DataException {
|
||||
if (tileEntities == null) {
|
||||
populateTileEntities();
|
||||
@ -234,9 +230,11 @@ public class AnvilChunk13 implements Chunk {
|
||||
|
||||
@Override
|
||||
public BaseBlock getBlock(BlockVector3 position) throws DataException {
|
||||
int x = position.getX() - rootX * 16;
|
||||
//FAWE start - simplified
|
||||
int x = position.getX() & 15;
|
||||
int y = position.getY();
|
||||
int z = position.getZ() - rootZ * 16;
|
||||
int z = position.getZ() & 15;
|
||||
//FAWE end
|
||||
|
||||
int section = y >> 4;
|
||||
int yIndex = y & 0x0F;
|
||||
@ -256,6 +254,61 @@ public class AnvilChunk13 implements Chunk {
|
||||
|
||||
return state.toBaseBlock();
|
||||
}
|
||||
//FAWE start - biome and entity restore
|
||||
|
||||
@Override
|
||||
public BiomeType getBiome(final BlockVector3 position) throws DataException {
|
||||
if (biomes == null) {
|
||||
populateBiomes();
|
||||
}
|
||||
int rx = position.getX() & 15;
|
||||
int rz = position.getZ() & 15;
|
||||
return biomes[rz << 4 | rx];
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BaseEntity> getEntities() throws DataException {
|
||||
if (entities == null) {
|
||||
populateEntities();
|
||||
}
|
||||
return entities;
|
||||
}
|
||||
|
||||
/**
|
||||
* Used to load the biomes.
|
||||
*/
|
||||
private void populateEntities() throws DataException {
|
||||
entities = new ArrayList<>();
|
||||
if (rootTag.get("Entities") == null) {
|
||||
return;
|
||||
}
|
||||
ListBinaryTag tags = NbtUtils.getChildTag(rootTag, "Entities", BinaryTagTypes.LIST);
|
||||
|
||||
for (BinaryTag tag : tags) {
|
||||
if (!(tag instanceof CompoundBinaryTag)) {
|
||||
throw new InvalidFormatException("CompoundTag expected in Entities");
|
||||
}
|
||||
|
||||
CompoundBinaryTag t = (CompoundBinaryTag) tag;
|
||||
|
||||
entities.add(new BaseEntity(EntityTypes.get(t.getString("id")), LazyReference.computed(t)));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Used to load the biomes.
|
||||
*/
|
||||
private void populateBiomes() throws DataException {
|
||||
biomes = new BiomeType[256];
|
||||
if (rootTag.get("Biomes") == null) {
|
||||
return;
|
||||
}
|
||||
int[] stored = NbtUtils.getChildTag(rootTag, "Biomes", BinaryTagTypes.INT_ARRAY).value();
|
||||
for (int i = 0; i < 256; i++) {
|
||||
biomes[i] = BiomeTypes.getLegacy(stored[i]);
|
||||
}
|
||||
}
|
||||
//FAWE end
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,82 @@
|
||||
/*
|
||||
* WorldEdit, a Minecraft world manipulation toolkit
|
||||
* Copyright (C) sk89q <http://www.sk89q.com>
|
||||
* Copyright (C) WorldEdit team and contributors
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.sk89q.worldedit.world.chunk;
|
||||
|
||||
import com.fastasyncworldedit.core.util.NbtUtils;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.util.nbt.BinaryTagTypes;
|
||||
import com.sk89q.worldedit.util.nbt.CompoundBinaryTag;
|
||||
import com.sk89q.worldedit.world.DataException;
|
||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||
import com.sk89q.worldedit.world.biome.BiomeTypes;
|
||||
|
||||
/**
|
||||
* The chunk format for Minecraft 1.15 and newer
|
||||
*/
|
||||
//FAWE start - biome and entity restore
|
||||
public class AnvilChunk15 extends AnvilChunk13 {
|
||||
//FAWE end
|
||||
|
||||
/**
|
||||
* Construct the chunk with a compound tag.
|
||||
*
|
||||
* @param tag the tag to read
|
||||
* @throws DataException on a data error
|
||||
* @deprecated Use {@link #AnvilChunk15(CompoundBinaryTag)}
|
||||
*/
|
||||
@Deprecated
|
||||
public AnvilChunk15(CompoundTag tag) throws DataException {
|
||||
super(tag);
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct the chunk with a compound tag.
|
||||
*
|
||||
* @param tag the tag to read
|
||||
* @throws DataException on a data error
|
||||
*/
|
||||
public AnvilChunk15(CompoundBinaryTag tag) throws DataException {
|
||||
super(tag);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BiomeType getBiome(final BlockVector3 position) throws DataException {
|
||||
if (biomes == null) {
|
||||
populateBiomes();
|
||||
}
|
||||
int x = (position.getX() & 15) >> 2;
|
||||
int y = position.getY() >> 2;
|
||||
int z = (position.getZ() & 15) >> 2;
|
||||
return biomes[y << 4 | z << 2 | x];
|
||||
}
|
||||
|
||||
private void populateBiomes() throws DataException {
|
||||
biomes = new BiomeType[1024];
|
||||
if (rootTag.get("Biomes") == null) {
|
||||
return;
|
||||
}
|
||||
int[] stored = NbtUtils.getChildTag(rootTag, "Biomes", BinaryTagTypes.INT_ARRAY).value();
|
||||
for (int i = 0; i < 1024; i++) {
|
||||
biomes[i] = BiomeTypes.getLegacy(stored[i]);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -28,9 +28,7 @@ import com.sk89q.worldedit.world.storage.InvalidFormatException;
|
||||
/**
|
||||
* The chunk format for Minecraft 1.16 and newer
|
||||
*/
|
||||
public class AnvilChunk16 extends AnvilChunk13 {
|
||||
|
||||
//FAWE start
|
||||
public class AnvilChunk16 extends AnvilChunk15 {
|
||||
|
||||
/**
|
||||
* Construct the chunk with a compound tag.
|
||||
@ -53,7 +51,6 @@ public class AnvilChunk16 extends AnvilChunk13 {
|
||||
public AnvilChunk16(CompoundBinaryTag tag) throws DataException {
|
||||
super(tag);
|
||||
}
|
||||
//FAWE end
|
||||
|
||||
@Override
|
||||
protected void readBlockStates(BlockState[] palette, long[] blockStatesSerialized, BlockState[] chunkSectionBlocks) throws
|
||||
|
||||
@ -0,0 +1,314 @@
|
||||
/*
|
||||
* WorldEdit, a Minecraft world manipulation toolkit
|
||||
* Copyright (C) sk89q <http://www.sk89q.com>
|
||||
* Copyright (C) WorldEdit team and contributors
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.sk89q.worldedit.world.chunk;
|
||||
|
||||
import com.fastasyncworldedit.core.util.NbtUtils;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.entity.BaseEntity;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.registry.state.Property;
|
||||
import com.sk89q.worldedit.util.concurrency.LazyReference;
|
||||
import com.sk89q.worldedit.util.nbt.BinaryTag;
|
||||
import com.sk89q.worldedit.util.nbt.BinaryTagTypes;
|
||||
import com.sk89q.worldedit.util.nbt.CompoundBinaryTag;
|
||||
import com.sk89q.worldedit.util.nbt.IntBinaryTag;
|
||||
import com.sk89q.worldedit.util.nbt.ListBinaryTag;
|
||||
import com.sk89q.worldedit.world.DataException;
|
||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||
import com.sk89q.worldedit.world.biome.BiomeTypes;
|
||||
import com.sk89q.worldedit.world.block.BaseBlock;
|
||||
import com.sk89q.worldedit.world.block.BlockState;
|
||||
import com.sk89q.worldedit.world.block.BlockType;
|
||||
import com.sk89q.worldedit.world.block.BlockTypes;
|
||||
import com.sk89q.worldedit.world.entity.EntityTypes;
|
||||
import com.sk89q.worldedit.world.storage.InvalidFormatException;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
/**
|
||||
* The chunk format for Minecraft 1.17
|
||||
*/
|
||||
public class AnvilChunk17 implements Chunk {
|
||||
|
||||
private final CompoundBinaryTag rootTag;
|
||||
private final Supplier<CompoundBinaryTag> entityTagSupplier;
|
||||
private BiomeType[] biomes;
|
||||
private BlockState[][] blocks;
|
||||
private Map<BlockVector3, CompoundBinaryTag> tileEntities;
|
||||
private List<BaseEntity> entities;
|
||||
// initialise with default values
|
||||
private int minSectionPosition = 0;
|
||||
private int maxSectionPosition = 15;
|
||||
private int sectionCount = 16;
|
||||
|
||||
/**
|
||||
* Construct the chunk with a compound tag.
|
||||
*
|
||||
* @param tag the tag to read
|
||||
* @throws DataException on a data error
|
||||
* @deprecated Use {@link #AnvilChunk17(CompoundBinaryTag, Supplier)}
|
||||
*/
|
||||
@Deprecated
|
||||
public AnvilChunk17(CompoundTag tag, Supplier<CompoundTag> entitiesTag) throws DataException {
|
||||
this(tag.asBinaryTag(), () -> {
|
||||
CompoundTag compoundTag = entitiesTag.get();
|
||||
if (compoundTag == null) {
|
||||
return null;
|
||||
}
|
||||
return compoundTag.asBinaryTag();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct the chunk with a compound tag.
|
||||
*
|
||||
* @param tag the tag to read
|
||||
* @param entityTag supplier for the entity compound tag found in the entities folder mca files. Not accessed unless
|
||||
* {@link #getEntities()} is called
|
||||
* @throws DataException on a data error
|
||||
*/
|
||||
public AnvilChunk17(CompoundBinaryTag tag, Supplier<CompoundBinaryTag> entityTag) throws DataException {
|
||||
rootTag = tag;
|
||||
entityTagSupplier = entityTag;
|
||||
|
||||
blocks = new BlockState[16][]; // initialise with default length
|
||||
|
||||
ListBinaryTag sections = NbtUtils.getChildTag(rootTag, "Sections", BinaryTagTypes.LIST);
|
||||
|
||||
for (BinaryTag rawSectionTag : sections) {
|
||||
if (!(rawSectionTag instanceof CompoundBinaryTag)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
CompoundBinaryTag sectionTag = (CompoundBinaryTag) rawSectionTag;
|
||||
if (sectionTag.get("Y") == null || sectionTag.get("BlockStates") == null) {
|
||||
continue; // Empty section.
|
||||
}
|
||||
|
||||
int y = NbtUtils.getChildTag(sectionTag, "Y", BinaryTagTypes.BYTE).value();
|
||||
updateSectionIndexRange(y);
|
||||
|
||||
// parse palette
|
||||
ListBinaryTag paletteEntries = sectionTag.getList("Palette", BinaryTagTypes.COMPOUND);
|
||||
int paletteSize = paletteEntries.size();
|
||||
if (paletteSize == 0) {
|
||||
continue;
|
||||
}
|
||||
BlockState[] palette = new BlockState[paletteSize];
|
||||
for (int paletteEntryId = 0; paletteEntryId < paletteSize; paletteEntryId++) {
|
||||
CompoundBinaryTag paletteEntry = (CompoundBinaryTag) paletteEntries.get(paletteEntryId);
|
||||
BlockType type = BlockTypes.get(paletteEntry.getString("Name"));
|
||||
if (type == null) {
|
||||
throw new InvalidFormatException("Invalid block type: " + paletteEntry.getString("Name"));
|
||||
}
|
||||
BlockState blockState = type.getDefaultState();
|
||||
if (paletteEntry.get("Properties") != null) {
|
||||
CompoundBinaryTag properties = NbtUtils.getChildTag(paletteEntry, "Properties", BinaryTagTypes.COMPOUND);
|
||||
for (Property<?> property : blockState.getStates().keySet()) {
|
||||
if (properties.get(property.getName()) != null) {
|
||||
String value = properties.getString(property.getName());
|
||||
try {
|
||||
blockState = getBlockStateWith(blockState, property, value);
|
||||
} catch (IllegalArgumentException e) {
|
||||
throw new InvalidFormatException("Invalid block state for " + blockState
|
||||
.getBlockType()
|
||||
.getId() + ", " + property.getName() + ": " + value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
palette[paletteEntryId] = blockState;
|
||||
}
|
||||
|
||||
// parse block states
|
||||
long[] blockStatesSerialized = NbtUtils.getChildTag(sectionTag, "BlockStates", BinaryTagTypes.LONG_ARRAY).value();
|
||||
|
||||
BlockState[] chunkSectionBlocks = new BlockState[4096];
|
||||
blocks[y - minSectionPosition] = chunkSectionBlocks;
|
||||
|
||||
readBlockStates(palette, blockStatesSerialized, chunkSectionBlocks);
|
||||
}
|
||||
}
|
||||
|
||||
private void updateSectionIndexRange(int layer) {
|
||||
if (layer >= minSectionPosition && layer <= maxSectionPosition) {
|
||||
return;
|
||||
}
|
||||
if (layer < minSectionPosition) {
|
||||
int diff = minSectionPosition - layer;
|
||||
sectionCount += diff;
|
||||
BlockState[][] tmpBlocks = new BlockState[sectionCount][];
|
||||
System.arraycopy(blocks, 0, tmpBlocks, diff, blocks.length);
|
||||
blocks = tmpBlocks;
|
||||
minSectionPosition = layer;
|
||||
} else {
|
||||
int diff = layer - maxSectionPosition;
|
||||
sectionCount += diff;
|
||||
BlockState[][] tmpBlocks = new BlockState[sectionCount][];
|
||||
System.arraycopy(blocks, 0, tmpBlocks, 0, blocks.length);
|
||||
blocks = tmpBlocks;
|
||||
maxSectionPosition = layer;
|
||||
}
|
||||
}
|
||||
|
||||
protected void readBlockStates(BlockState[] palette, long[] blockStatesSerialized, BlockState[] chunkSectionBlocks) throws
|
||||
InvalidFormatException {
|
||||
PackedIntArrayReader reader = new PackedIntArrayReader(blockStatesSerialized);
|
||||
for (int blockPos = 0; blockPos < chunkSectionBlocks.length; blockPos++) {
|
||||
int index = reader.get(blockPos);
|
||||
if (index >= palette.length) {
|
||||
throw new InvalidFormatException("Invalid block state table entry: " + index);
|
||||
}
|
||||
chunkSectionBlocks[blockPos] = palette[index];
|
||||
}
|
||||
}
|
||||
|
||||
private <T> BlockState getBlockStateWith(BlockState source, Property<T> property, String value) {
|
||||
return source.with(property, property.getValueFor(value));
|
||||
}
|
||||
|
||||
/**
|
||||
* Used to load the tile entities.
|
||||
*/
|
||||
private void populateTileEntities() throws DataException {
|
||||
tileEntities = new HashMap<>();
|
||||
if (rootTag.get("TileEntities") == null) {
|
||||
return;
|
||||
}
|
||||
ListBinaryTag tags = NbtUtils.getChildTag(rootTag, "TileEntities", BinaryTagTypes.LIST);
|
||||
|
||||
for (BinaryTag tag : tags) {
|
||||
if (!(tag instanceof CompoundBinaryTag)) {
|
||||
throw new InvalidFormatException("CompoundTag expected in TileEntities");
|
||||
}
|
||||
|
||||
CompoundBinaryTag t = (CompoundBinaryTag) tag;
|
||||
|
||||
int x = ((IntBinaryTag) t.get("x")).value();
|
||||
int y = ((IntBinaryTag) t.get("y")).value();
|
||||
int z = ((IntBinaryTag) t.get("z")).value();
|
||||
|
||||
BlockVector3 vec = BlockVector3.at(x, y, z);
|
||||
tileEntities.put(vec, t);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the map of tags keyed to strings for a block's tile entity data. May
|
||||
* return null if there is no tile entity data. Not public yet because
|
||||
* what this function returns isn't ideal for usage.
|
||||
*
|
||||
* @param position the position
|
||||
* @return the compound tag for that position, which may be null
|
||||
* @throws DataException thrown if there is a data error
|
||||
*/
|
||||
@Nullable
|
||||
private CompoundBinaryTag getBlockTileEntity(BlockVector3 position) throws DataException {
|
||||
if (tileEntities == null) {
|
||||
populateTileEntities();
|
||||
}
|
||||
|
||||
return tileEntities.get(position);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BaseBlock getBlock(BlockVector3 position) throws DataException {
|
||||
int x = position.getX() & 15;
|
||||
int y = position.getY();
|
||||
int z = position.getZ() & 15;
|
||||
|
||||
int section = y >> 4;
|
||||
int yIndex = y & 0x0F;
|
||||
|
||||
if (section < minSectionPosition || section > maxSectionPosition) {
|
||||
throw new DataException("Chunk does not contain position " + position);
|
||||
}
|
||||
|
||||
BlockState[] sectionBlocks = blocks[section - minSectionPosition];
|
||||
BlockState state = sectionBlocks != null ? sectionBlocks[(yIndex << 8) | (z << 4) | x] : BlockTypes.AIR.getDefaultState();
|
||||
|
||||
CompoundBinaryTag tileEntity = getBlockTileEntity(position);
|
||||
|
||||
if (tileEntity != null) {
|
||||
return state.toBaseBlock(tileEntity);
|
||||
}
|
||||
|
||||
return state.toBaseBlock();
|
||||
}
|
||||
|
||||
@Override
|
||||
public BiomeType getBiome(final BlockVector3 position) throws DataException {
|
||||
if (biomes == null) {
|
||||
populateBiomes();
|
||||
}
|
||||
int x = (position.getX() & 15) >> 2;
|
||||
int y = (position.getY() - (minSectionPosition << 4)) >> 2; // normalize
|
||||
int z = (position.getZ() & 15) >> 2;
|
||||
return biomes[y << 4 | z << 2 | x];
|
||||
}
|
||||
|
||||
private void populateBiomes() throws DataException {
|
||||
biomes = new BiomeType[64 * blocks.length];
|
||||
if (rootTag.get("Biomes") == null) {
|
||||
return;
|
||||
}
|
||||
int[] stored = NbtUtils.getChildTag(rootTag, "Biomes", BinaryTagTypes.INT_ARRAY).value();
|
||||
for (int i = 0; i < 1024; i++) {
|
||||
biomes[i] = BiomeTypes.getLegacy(stored[i]);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BaseEntity> getEntities() throws DataException {
|
||||
if (entities == null) {
|
||||
populateEntities();
|
||||
}
|
||||
return entities;
|
||||
}
|
||||
|
||||
/**
|
||||
* Used to load the biomes.
|
||||
*/
|
||||
private void populateEntities() throws DataException {
|
||||
entities = new ArrayList<>();
|
||||
CompoundBinaryTag entityTag;
|
||||
if (entityTagSupplier == null || (entityTag = entityTagSupplier.get()) == null) {
|
||||
return;
|
||||
}
|
||||
ListBinaryTag tags = NbtUtils.getChildTag(entityTag, "Entities", BinaryTagTypes.LIST);
|
||||
|
||||
for (BinaryTag tag : tags) {
|
||||
if (!(tag instanceof CompoundBinaryTag)) {
|
||||
throw new InvalidFormatException("CompoundTag expected in Entities");
|
||||
}
|
||||
|
||||
CompoundBinaryTag t = (CompoundBinaryTag) tag;
|
||||
|
||||
entities.add(new BaseEntity(EntityTypes.get(t.getString("id")), LazyReference.computed(t)));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -19,10 +19,18 @@
|
||||
|
||||
package com.sk89q.worldedit.world.chunk;
|
||||
|
||||
import com.sk89q.worldedit.entity.BaseEntity;
|
||||
import com.sk89q.worldedit.entity.Entity;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.util.Location;
|
||||
import com.sk89q.worldedit.world.DataException;
|
||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||
import com.sk89q.worldedit.world.block.BaseBlock;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* A 16 by 16 block chunk.
|
||||
*/
|
||||
@ -37,4 +45,25 @@ public interface Chunk {
|
||||
*/
|
||||
BaseBlock getBlock(BlockVector3 position) throws DataException;
|
||||
|
||||
//FAWE start - biome and entity restore
|
||||
/**
|
||||
* Get a biome.
|
||||
*
|
||||
* @param position the position of the block
|
||||
* @return block the block
|
||||
* @throws DataException thrown on data error
|
||||
*/
|
||||
default BiomeType getBiome(BlockVector3 position) throws DataException {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the stored entities.
|
||||
* @return list of stored entities
|
||||
*/
|
||||
default List<BaseEntity> getEntities() throws DataException {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
//FAWE end
|
||||
|
||||
}
|
||||
|
||||
@ -43,9 +43,7 @@ import java.util.Map;
|
||||
*/
|
||||
public class OldChunk implements Chunk {
|
||||
|
||||
//FAWE start
|
||||
private final CompoundBinaryTag rootTag;
|
||||
//FAWE end
|
||||
private final byte[] blocks;
|
||||
private final byte[] data;
|
||||
private final int rootX;
|
||||
@ -53,8 +51,6 @@ public class OldChunk implements Chunk {
|
||||
|
||||
private Map<BlockVector3, CompoundBinaryTag> tileEntities;
|
||||
|
||||
//FAWE start
|
||||
|
||||
/**
|
||||
* Construct the chunk with a compound tag.
|
||||
*
|
||||
@ -66,7 +62,6 @@ public class OldChunk implements Chunk {
|
||||
public OldChunk(CompoundTag tag) throws DataException {
|
||||
this(tag.asBinaryTag());
|
||||
}
|
||||
//FAWE end
|
||||
|
||||
/**
|
||||
* Construct the chunk with a compound tag.
|
||||
@ -74,7 +69,6 @@ public class OldChunk implements Chunk {
|
||||
* @param tag the tag
|
||||
* @throws DataException if there is an error getting the chunk data
|
||||
*/
|
||||
//FAWE start - use *BinaryTag > *Tag
|
||||
public OldChunk(CompoundBinaryTag tag) throws DataException {
|
||||
rootTag = tag;
|
||||
|
||||
@ -211,6 +205,5 @@ public class OldChunk implements Chunk {
|
||||
|
||||
return state.toBaseBlock();
|
||||
}
|
||||
//FAWE end
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,7 @@
|
||||
/**
|
||||
* The following classes are FAWE additions:
|
||||
*
|
||||
* @see com.sk89q.worldedit.world.chunk.AnvilChunk15
|
||||
* @see com.sk89q.worldedit.world.chunk.AnvilChunk17
|
||||
*/
|
||||
package com.sk89q.worldedit.world.chunk;
|
||||
Reference in New Issue
Block a user