Minecraft/mc-core
Archived
0
Fork 0
Code Activity

Block: getBlockType() -> getType()

Browse Source
This commit is contained in:
DmitriyMX
2018-12-25 10:27:06 +03:00
parent 3ecaa87b0a
commit 969ecdac36
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/mc/core/world/block/Block.java
View File

@@ -3,6 +3,6 @@ package mc.core.world.block;
public interface Block {
int getLight();
void setLight(int light);
BlockType getBlockType();
BlockType getType();
BlockLocation getLocation();
}

2
proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java
View File

@@ -171,7 +171,7 @@ public class ChunkDataPacket implements SCPacket {
for (int z = 0; z < 16; z++) {
for (int x = 0; x < 16; x++) {
Block block = chunkSection.getBlock(x, y, z);
int blockState = serializeBlockState(block.getBlockType());
int blockState = serializeBlockState(block.getType());
int currentIndexPaletteBlock;
if (!palette.contains(blockState)) {

4
simple_world/src/test/java/mc/world/simple/SimpleChunkSectionTest.java
View File

@@ -33,9 +33,9 @@ class SimpleChunkSectionTest {
for (int z = 0; z < 16; z++) {
Block block = chunkSection.getBlock(x, y, z);
if (y > layersBlock.size()-1) {
assertEquals(block.getBlockType(), BlockType.AIR);
assertEquals(block.getType(), BlockType.AIR);
} else {
assertEquals(block.getBlockType(), layersBlock.get(y));
assertEquals(block.getType(), layersBlock.get(y));
}
}
}