CPU/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Rename BEDCOLORS to BED_COLORS

Browse source
This commit is contained in:
BuildTools 2020-03-27 14:21:34 -04:00
parent 17258dcaf6
commit 7b5bb22321
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
View file

@ -51,7 +51,7 @@ public class BlockTranslator {
private static final Int2ObjectMap<BlockState> BEDROCK_TO_JAVA_BLOCK_MAP = new Int2ObjectOpenHashMap<>(); private static final Int2ObjectMap<BlockState> BEDROCK_TO_JAVA_BLOCK_MAP = new Int2ObjectOpenHashMap<>();
private static final Map<String, BlockState> JAVA_ID_BLOCK_MAP = new HashMap<>(); private static final Map<String, BlockState> JAVA_ID_BLOCK_MAP = new HashMap<>();
private static final IntSet WATERLOGGED = new IntOpenHashSet(); private static final IntSet WATERLOGGED = new IntOpenHashSet();
private static final Object2ByteOpenHashMap<BlockState> BEDCOLORS = new Object2ByteOpenHashMap<>(); private static final Object2ByteOpenHashMap<BlockState> BED_COLORS = new Object2ByteOpenHashMap<>();
private static final Map<BlockState, String> JAVA_ID_TO_BLOCK_ENTITY_MAP = new HashMap<>(); private static final Map<BlockState, String> JAVA_ID_TO_BLOCK_ENTITY_MAP = new HashMap<>();
@ -108,7 +108,7 @@ public class BlockTranslator {
JsonNode bedColor = entry.getValue().get("bed_color"); JsonNode bedColor = entry.getValue().get("bed_color");
if (bedColor != null) { if (bedColor != null) {
// Converting to byte because the final tag value is a byte. bedColor.binaryValue() returns an array // Converting to byte because the final tag value is a byte. bedColor.binaryValue() returns an array
BEDCOLORS.put(javaBlockState, (byte) bedColor.intValue()); BED_COLORS.put(javaBlockState, (byte) bedColor.intValue());
} }
if ("minecraft:water[level=0]".equals(javaId)) { if ("minecraft:water[level=0]".equals(javaId)) {
@ -208,8 +208,8 @@ public class BlockTranslator {
} }
public static byte getBedColor(BlockState state) { public static byte getBedColor(BlockState state) {
if (BEDCOLORS.containsKey(state)) { if (BED_COLORS.containsKey(state)) {
return BEDCOLORS.getByte(state); return BED_COLORS.getByte(state);
} }
return -1; return -1;
} }