Minecraft/mc-core
Archived
0
Fork 0
Code Activity

единый чанк для тестов

Browse Source
This commit is contained in:
DmitriyMX
2018-12-23 13:51:11 +03:00
parent 26368a5616
commit 6162b9ab07
6 changed files with 47 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
anvil-loader/src/test/java/mc/world/anvil/RegionTest.java
View File

@@ -42,20 +42,18 @@ class RegionTest {
for (int x = 0; x < 16; x++) { for (int x = 0; x < 16; x++) {
for (int z = 0; z < 16; z++) { for (int z = 0; z < 16; z++) {
Block block = chunkSection.getBlockLocal(x, y, z); Block block = chunkSection.getBlockLocal(x, y, z);
if (x == 0 && z == 0) { String msg = String.format("coords: %d %d %d", x, y, z);
assertEquals(BlockType.STONE, block.getBlockType(), String.format("coords: %d %d %d", x, y, z));
} else if (x == 15 && z == 0) { if (y == 0) {
assertEquals(BlockType.GRANITE, block.getBlockType(), String.format("coords: %d %d %d", x, y, z)); // @formatter:off
} else if (x == 15 && z == 15) { if (x == 0 && z == 0) assertEquals(BlockType.STONE, block.getBlockType(), msg);
assertEquals(BlockType.DIORITE, block.getBlockType(), String.format("coords: %d %d %d", x, y, z)); else if (x == 15 && z == 0) assertEquals(BlockType.GRANITE, block.getBlockType(), msg);
} else if (x == 0 && z == 15) { else if (x == 0 && z == 15) assertEquals(BlockType.POLISHED_GRANITE, block.getBlockType(), msg);
assertEquals(BlockType.ANDESITE, block.getBlockType(), String.format("coords: %d %d %d", x, y, z)); else if (x == 15 && z == 15) assertEquals(BlockType.DIORITE, block.getBlockType(), msg);
} else if (y == 0){ else assertEquals(BlockType.BEDROCK, block.getBlockType(), msg);
assertEquals(BlockType.BEDROCK, block.getBlockType(), String.format("coords: %d %d %d", x, y, z)); // @formatter:on
} else if (y <= 14) {
assertEquals(BlockType.DIRT, block.getBlockType(), String.format("coords: %d %d %d", x, y, z));
} else { } else {
assertEquals(BlockType.GRASS, block.getBlockType(), String.format("coords: %d %d %d", x, y, z)); assertEquals(BlockType.STONE, block.getBlockType(), msg);
} }
} }
} }
@@ -67,19 +65,13 @@ class RegionTest {
for (int x = 0; x < 16; x++) { for (int x = 0; x < 16; x++) {
for (int z = 0; z < 16; z++) { for (int z = 0; z < 16; z++) {
Block block = chunkSection.getBlockLocal(x, y, z); Block block = chunkSection.getBlockLocal(x, y, z);
if (x == 0 && z == 0) { String msg = String.format("coords: %d %d %d", x, y, z);
assertEquals(BlockType.STONE, block.getBlockType(), String.format("coords: %d %d %d", x, y, z));
} else if (x == 15 && z == 0) { // @formatter:off
assertEquals(BlockType.GRANITE, block.getBlockType(), String.format("coords: %d %d %d", x, y, z)); if (y == 0) assertEquals(BlockType.DIRT, block.getBlockType(), msg);
} else if (x == 15 && z == 15) { else if (y == 1) assertEquals(BlockType.GRASS, block.getBlockType(), msg);
assertEquals(BlockType.DIORITE, block.getBlockType(), String.format("coords: %d %d %d", x, y, z)); else assertEquals(BlockType.AIR, block.getBlockType(), msg);
} else if (x == 0 && z == 15) { // @formatter:on
assertEquals(BlockType.ANDESITE, block.getBlockType(), String.format("coords: %d %d %d", x, y, z));
} else if (x == 0 || x == 15 || z == 0 || z == 15) {
assertEquals(BlockType.ORE_DIAMOND, block.getBlockType(), String.format("coords: %d %d %d", x, y, z));
} else {
assertEquals(BlockType.AIR, block.getBlockType(), String.format("coords: %d %d %d", x, y, z));
}
} }
} }
} }

BIN
anvil-loader/src/test/resources/region/r.0.0.mca
View File

Binary file not shown.

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

@@ -1,5 +1,7 @@
package mc.core.world.block; package mc.core.world.block;
//TODO избавится от этого "аппендикса"
@Deprecated
public class BlockFactory { public class BlockFactory {
public Block create(BlockType blockType, int x, int y, int z) { public Block create(BlockType blockType, int x, int y, int z) {

1
core/src/main/java/mc/core/world/block/BlockType.java
View File

@@ -13,6 +13,7 @@ public enum BlockType {
AIR(0, 0), AIR(0, 0),
STONE(1, 0), STONE(1, 0),
GRANITE(1, 1), GRANITE(1, 1),
POLISHED_GRANITE(1, 2),
DIORITE(1, 3), DIORITE(1, 3),
ANDESITE(1, 5), ANDESITE(1, 5),
GRASS(2, 0), GRASS(2, 0),

37
proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacketTest.java
View File

@@ -80,26 +80,40 @@ class ChunkDataPacketTest {
if (height == 0) { if (height == 0) {
when(chunkSection.getBlockLocal(anyInt(), anyInt(), anyInt())).thenAnswer(invocation -> { when(chunkSection.getBlockLocal(anyInt(), anyInt(), anyInt())).thenAnswer(invocation -> {
Object[] args = invocation.getArguments(); Object[] args = invocation.getArguments();
int x = (int) args[0]; final int x = (int) args[0];
int y = (int) args[1]; final int y = (int) args[1];
int z = (int) args[2]; final int z = (int) args[2];
BlockFactory blockFactory = new BlockFactory(); BlockFactory blockFactory = new BlockFactory();
if (y == 0) return blockFactory.create(BlockType.BEDROCK, x, y, z); if (y == 0) {
else return blockFactory.create(BlockType.DIRT, x, y, z); // @formatter:off
if (x == 0 && z == 0) return blockFactory.create(BlockType.STONE, x, y, z);
else if (x == 15 && z == 0) return blockFactory.create(BlockType.GRANITE, x, y, z);
else if (x == 0 && z == 15) return blockFactory.create(BlockType.POLISHED_GRANITE, x, y, z);
else if (x == 15 && z == 15) return blockFactory.create(BlockType.DIORITE, x, y, z);
else return blockFactory.create(BlockType.BEDROCK, x, y, z);
// @formatter:on
} else {
return blockFactory.create(BlockType.STONE, x, y, z);
}
}); });
} else { } else {
when(chunkSection.getBlockLocal(anyInt(), anyInt(), anyInt())).thenAnswer(invocation -> { when(chunkSection.getBlockLocal(anyInt(), anyInt(), anyInt())).thenAnswer(invocation -> {
Object[] args = invocation.getArguments(); Object[] args = invocation.getArguments();
int x = (int) args[0]; final int x = (int) args[0];
int y = (int) args[1]; final int y = (int) args[1];
int z = (int) args[2]; final int z = (int) args[2];
BlockFactory blockFactory = new BlockFactory(); BlockFactory blockFactory = new BlockFactory();
if (y < 15) return blockFactory.create(BlockType.DIRT, x, y, z); if (y == 0) {
else return blockFactory.create(BlockType.GRASS, x, y, z); return blockFactory.create(BlockType.DIRT, x, y, z);
} else if (y == 1) {
return blockFactory.create(BlockType.GRASS, x, y, z);
} else {
return blockFactory.create(BlockType.AIR, x, y, z);
}
}); });
} }
@@ -135,7 +149,8 @@ class ChunkDataPacketTest {
testDataBlock(expectedDumbChunkSection, actualDumbChunkSection, numberSection); testDataBlock(expectedDumbChunkSection, actualDumbChunkSection, numberSection);
// Block and Sky light // Block and Sky light
testLight(expectedDumbChunkSection, actualDumbChunkSection, numberSection); // DISABLE //
//testLight(expectedDumbChunkSection, actualDumbChunkSection, numberSection);
} }
} }

BIN
proto_1.12.2/src/test/resources/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.bin
View File

Binary file not shown.