Fix compile

This commit is contained in:
Jesse Boyd
2019-12-19 16:19:46 +00:00
parent aac30742de
commit 6a49b71cf2
48 changed files with 2649 additions and 85 deletions

View File

@ -13,8 +13,8 @@ public interface IChunkExtent<T extends IChunk> extends Extent {
/**
* Get the IChunk at a position (and cache it if it's not already)
*
* @param x
* @param z
* @param chunkX
* @param chunkZ
* @return IChunk
*/
T getOrCreateChunk(int chunkX, int chunkZ);
@ -49,8 +49,9 @@ public interface IChunkExtent<T extends IChunk> extends Extent {
return chunk.getFullBlock(x & 15, y, z & 15);
}
default BiomeType getBiome(int x, int z) {
@Override
default BiomeType getBiomeType(int x, int y, int z) {
final IChunk chunk = getOrCreateChunk(x >> 4, z >> 4);
return chunk.getBiomeType(x & 15, z & 15);
return chunk.getBiomeType(x & 15, y, z & 15);
}
}

View File

@ -116,7 +116,7 @@ public class BitSetBlocks implements IChunkSet {
}
@Override
public BiomeType getBiomeType(int x, int z) {
public BiomeType getBiomeType(int x, int y, int z) {
return null;
}

View File

@ -45,7 +45,7 @@ public class CharSetBlocks extends CharBlocks implements IChunkSet {
}
@Override
public BiomeType getBiomeType(int x, int z) {
public BiomeType getBiomeType(int x, int y, int z) {
if (biomes == null) return null;
return biomes[(z << 4) | x];
}

View File

@ -32,8 +32,8 @@ public class FallbackChunkGet implements IChunkGet {
}
@Override
public BiomeType getBiomeType(int x, int z) {
return extent.getBiomeType(bx + x, bz + z);
public BiomeType getBiomeType(int x, int y, int z) {
return extent.getBiomeType(bx + x, y, bz + z);
}
@Override

View File

@ -27,7 +27,7 @@ public enum NullChunkGet implements IChunkGet {
}
@Override
public BiomeType getBiomeType(int x, int z) {
public BiomeType getBiomeType(int x, int y, int z) {
return BiomeTypes.FOREST;
}

View File

@ -124,8 +124,8 @@ public class ChunkHolder<T extends Future<T>> implements IQueueChunk {
}
@Override
public BiomeType getBiome(ChunkHolder chunk, int x, int z) {
return chunk.chunkExisting.getBiomeType(x, z);
public BiomeType getBiome(ChunkHolder chunk, int x, int y, int z) {
return chunk.chunkExisting.getBiomeType(x, y, z);
}
@Override
@ -169,8 +169,8 @@ public class ChunkHolder<T extends Future<T>> implements IQueueChunk {
}
@Override
public BiomeType getBiome(ChunkHolder chunk, int x, int z) {
return chunk.chunkExisting.getBiomeType(x, z);
public BiomeType getBiome(ChunkHolder chunk, int x, int y, int z) {
return chunk.chunkExisting.getBiomeType(x, y, z);
}
@Override
@ -210,10 +210,10 @@ public class ChunkHolder<T extends Future<T>> implements IQueueChunk {
}
@Override
public BiomeType getBiome(ChunkHolder chunk, int x, int z) {
public BiomeType getBiome(ChunkHolder chunk, int x, int y, int z) {
chunk.getOrCreateGet();
chunk.delegate = BOTH;
return chunk.getBiomeType(x, z);
return chunk.getBiomeType(x, y, z);
}
@Override
@ -263,10 +263,10 @@ public class ChunkHolder<T extends Future<T>> implements IQueueChunk {
}
@Override
public BiomeType getBiome(ChunkHolder chunk, int x, int z) {
public BiomeType getBiome(ChunkHolder chunk, int x, int y, int z) {
chunk.getOrCreateGet();
chunk.delegate = GET;
return chunk.getBiomeType(x, z);
return chunk.getBiomeType(x, y, z);
}
@Override
@ -467,8 +467,8 @@ public class ChunkHolder<T extends Future<T>> implements IQueueChunk {
}
@Override
public BiomeType getBiomeType(int x, int z) {
return delegate.getBiome(this, x, z);
public BiomeType getBiomeType(int x, int y, int z) {
return delegate.getBiome(this, x, y, z);
}
@Override
@ -491,7 +491,7 @@ public class ChunkHolder<T extends Future<T>> implements IQueueChunk {
boolean setBlock(ChunkHolder chunk, int x, int y, int z,
BlockStateHolder holder);
BiomeType getBiome(ChunkHolder chunk, int x, int z);
BiomeType getBiome(ChunkHolder chunk, int x, int y, int z);
BlockState getBlock(ChunkHolder chunk, int x, int y, int z);

View File

@ -93,7 +93,7 @@ public enum NullChunk implements IQueueChunk {
}
@Override
public BiomeType getBiomeType(int x, int z) {
public BiomeType getBiomeType(int x, int y, int z) {
return null;
}

View File

@ -416,11 +416,11 @@ public class CharFilterBlock extends ChunkFilterBlock {
}
@Override
public BiomeType getBiomeType(int x, int z) {
public BiomeType getBiomeType(int x, int y, int z) {
if (x >> 4 == chunkX && z >> 4 == chunkZ) {
return get.getBiomeType(x & 15, z & 15);
return get.getBiomeType(x & 15, y, z & 15);
}
return getExtent().getBiomeType(x, z);
return getExtent().getBiomeType(x, y, z);
}
@Override

View File

@ -781,8 +781,8 @@ public class DelegateFilterBlock extends FilterBlock {
}
@Override
public BiomeType getBiomeType(int x, int z) {
return parent.getBiomeType(x, z);
public BiomeType getBiomeType(int x, int y, int z) {
return parent.getBiomeType(x, y, z);
}
@Deprecated

View File

@ -563,10 +563,10 @@ public class LimitExtent extends PassthroughExtent {
}
@Override
public BiomeType getBiomeType(int x, int z) {
public BiomeType getBiomeType(int x, int y, int z) {
limit.THROW_MAX_CHECKS();
try {
return getExtent().getBiomeType(x, z);
return getExtent().getBiomeType(x, y, z);
} catch (FaweException e) {
if (!limit.MAX_FAILS()) {
throw e;