Apple
/
Geyser
forked from GeyserMC/Geyser
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix most block palette issues. Others are due to the mappings

This commit is contained in:
SupremeMortal 2019-12-31 23:24:54 +00:00
parent 94851ef4b8
commit d686a009d1
No known key found for this signature in database
GPG Key ID: DDBB25F8EE4FA29A
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
View File

@ -28,6 +28,8 @@ public class BlockTranslator {
private static final Int2IntMap JAVA_TO_BEDROCK_LIQUID_MAP = new Int2IntOpenHashMap(); private static final Int2IntMap JAVA_TO_BEDROCK_LIQUID_MAP = new Int2IntOpenHashMap();
private static final Int2ObjectMap<BlockState> BEDROCK_TO_JAVA_LIQUID_MAP = new Int2ObjectOpenHashMap<>(); private static final Int2ObjectMap<BlockState> BEDROCK_TO_JAVA_LIQUID_MAP = new Int2ObjectOpenHashMap<>();
private static final int BLOCK_STATE_VERSION = 17760256;
static { static {
/* Load block palette */ /* Load block palette */
InputStream stream = Toolbox.getResource("bedrock/runtime_block_states.dat"); InputStream stream = Toolbox.getResource("bedrock/runtime_block_states.dat");
@ -99,7 +101,10 @@ public class BlockTranslator {
private static CompoundTag buildBedrockState(JsonNode node) { private static CompoundTag buildBedrockState(JsonNode node) {
CompoundTagBuilder tagBuilder = CompoundTag.builder(); CompoundTagBuilder tagBuilder = CompoundTag.builder();
tagBuilder.stringTag("name", node.get("bedrock_identifier").textValue()); tagBuilder.stringTag("name", node.get("bedrock_identifier").textValue())
.intTag("version", BlockTranslator.BLOCK_STATE_VERSION);
CompoundTagBuilder statesBuilder = CompoundTag.builder();
// check for states // check for states
if (node.has("bedrock_states")) { if (node.has("bedrock_states")) {
@ -110,17 +115,17 @@ public class BlockTranslator {
JsonNode stateValue = stateEntry.getValue(); JsonNode stateValue = stateEntry.getValue();
switch (stateValue.getNodeType()) { switch (stateValue.getNodeType()) {
case BOOLEAN: case BOOLEAN:
tagBuilder.booleanTag(stateEntry.getKey(), stateValue.booleanValue()); statesBuilder.booleanTag(stateEntry.getKey(), stateValue.booleanValue());
continue; continue;
case STRING: case STRING:
tagBuilder.stringTag(stateEntry.getKey(), stateValue.textValue()); statesBuilder.stringTag(stateEntry.getKey(), stateValue.textValue());
continue; continue;
case NUMBER: case NUMBER:
tagBuilder.intTag(stateEntry.getKey(), stateValue.intValue()); statesBuilder.intTag(stateEntry.getKey(), stateValue.intValue());
} }
} }
} }
return tagBuilder.build("block"); return tagBuilder.tag(statesBuilder.build("states")).build("block");
} }
public static int getBedrockBlockId(BlockState state) { public static int getBedrockBlockId(BlockState state) {