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

Added BiomeMask.java and updated minor parts of miscellaneous files

Browse Source
This commit is contained in:
MattBDev
2020-08-24 22:04:56 -04:00
parent 02886b0387
commit a9d37fc6e5
45 changed files with 595 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/Chunk.java
View File

@ -29,7 +29,7 @@ import com.sk89q.worldedit.world.block.BaseBlock;
public interface Chunk {
/**
* Get a block;
* Get a block.
*
* @param position the position of the block
* @return block the block

29
worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/OldChunk.java
View File

@ -43,19 +43,19 @@ import java.util.Map;
*/
public class OldChunk implements Chunk {
private CompoundTag rootTag;
private byte[] blocks;
private byte[] data;
private int rootX;
private int rootZ;
private final CompoundTag rootTag;
private final byte[] blocks;
private final byte[] data;
private final int rootX;
private final int rootZ;
private Map<BlockVector3, Map<String,Tag>> tileEntities;
private Map<BlockVector3, Map<String, Tag>> tileEntities;
/**
* Construct the chunk with a compound tag.
*
* @param tag the tag
* @throws DataException
* @throws DataException if there is an error getting the chunk data
*/
public OldChunk(CompoundTag tag) throws DataException {
rootTag = tag;
@ -71,7 +71,7 @@ public class OldChunk implements Chunk {
+ "to be " + size + " bytes; found " + blocks.length);
}
if (data.length != (size/2)) {
if (data.length != (size / 2)) {
throw new InvalidFormatException("Chunk block data byte array "
+ "expected to be " + size + " bytes; found " + data.length);
}
@ -80,7 +80,7 @@ public class OldChunk implements Chunk {
/**
* Used to load the tile entities.
*
* @throws DataException
* @throws DataException if there is an error getting the chunk data
*/
private void populateTileEntities() throws DataException {
List<Tag> tags = NBTUtils.getChildTag(
@ -119,6 +119,8 @@ public class OldChunk implements Chunk {
z = ((IntTag) entry.getValue()).getValue();
}
break;
default:
break;
}
values.put(entry.getKey(), entry.getValue());
@ -136,7 +138,7 @@ public class OldChunk implements Chunk {
*
* @param position the position
* @return a tag
* @throws DataException
* @throws DataException if there is an error getting the chunk data
*/
private CompoundTag getBlockTileEntity(BlockVector3 position) throws DataException {
if (tileEntities == null) {
@ -152,8 +154,11 @@ public class OldChunk implements Chunk {
@Override
public BaseBlock getBlock(BlockVector3 position) throws DataException {
if(position.getY() >= 128) return BlockTypes.VOID_AIR.getDefaultState().toBaseBlock();
int id, dataVal;
if (position.getY() >= 128) {
return BlockTypes.VOID_AIR.getDefaultState().toBaseBlock();
}
int id;
int dataVal;
int x = position.getX() - rootX * 16;
int y = position.getY();