Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-05 18:20:17 +01:00
Code Issues Projects Releases Wiki Activity

use short

Browse Source
This commit is contained in:
creeper123123321 2019-01-15 13:15:34 -02:00
parent de11f1f90b
commit fa1b56a7cf
No known key found for this signature in database
GPG Key ID: 0AC57D54786721D1
1 changed files with 22 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/storage/BlockConnectionStorage.java
View File

@ -10,10 +10,10 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class BlockConnectionStorage extends StoredObject { public class BlockConnectionStorage extends StoredObject {
private Map<Long, Map<Long, Short>> blockStorage = createLongObjectMap(); private Map<Long, Map<Short, Short>> blockStorage = createLongObjectMap();
private static Class<?> fastUtilLongObjectHashMap; private static Class<?> fastUtilLongObjectHashMap;
private static Class<?> fastUtilLongShortHashMap; private static Class<?> fastUtilShortShortHashMap;
private static Class<?> nettyLongObjectHashMap; private static Class<?> nettyLongObjectHashMap;
static { static {
@ -21,19 +21,17 @@ public class BlockConnectionStorage extends StoredObject {
fastUtilLongObjectHashMap = Class.forName("it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap"); fastUtilLongObjectHashMap = Class.forName("it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap");
Via.getPlatform().getLogger().info("Using FastUtil Long2ObjectOpenHashMap for block connections"); Via.getPlatform().getLogger().info("Using FastUtil Long2ObjectOpenHashMap for block connections");
} catch (ClassNotFoundException ignored) { } catch (ClassNotFoundException ignored) {
}
try {
fastUtilLongShortHashMap = Class.forName("it.unimi.dsi.fastutil.longs.Long2ShortOpenHashMap");
Via.getPlatform().getLogger().info("Using FastUtil Long2ShortOpenHashMap for block connections");
} catch (ClassNotFoundException ignored) {
}
if (fastUtilLongShortHashMap == null && fastUtilLongObjectHashMap == null) {
try { try {
nettyLongObjectHashMap = Class.forName("io.netty.util.collection.LongObjectHashMap"); nettyLongObjectHashMap = Class.forName("io.netty.util.collection.LongObjectHashMap");
Via.getPlatform().getLogger().info("Using Netty LongObjectHashMap for block connections"); Via.getPlatform().getLogger().info("Using Netty LongObjectHashMap for block connections");
} catch (ClassNotFoundException ignored) { } catch (ClassNotFoundException ignored2) {
} }
} }
try {
fastUtilShortShortHashMap = Class.forName("it.unimi.dsi.fastutil.shorts.Short2ShortOpenHashMap");
Via.getPlatform().getLogger().info("Using FastUtil Short2ShortOpenHashMap for block connections");
} catch (ClassNotFoundException ignored) {
}
} }
public BlockConnectionStorage(UserConnection user) { public BlockConnectionStorage(UserConnection user) {
@ -42,20 +40,20 @@ public class BlockConnectionStorage extends StoredObject {
public void store(Position position, int blockState) { public void store(Position position, int blockState) {
long pair = getChunkIndex(position); long pair = getChunkIndex(position);
Map<Long, Short> map = getChunkMap(pair); Map<Short, Short> map = getChunkMap(pair);
map.put(encodeBlockPos(position), (short) blockState); map.put(encodeBlockPos(position), (short) blockState);
} }
public int get(Position position) { public int get(Position position) {
long pair = getChunkIndex(position); long pair = getChunkIndex(position);
Map<Long, Short> map = getChunkMap(pair); Map<Short, Short> map = getChunkMap(pair);
long blockPositon = encodeBlockPos(position); short blockPosition = encodeBlockPos(position);
return map.containsKey(blockPositon) ? map.get(blockPositon) : 0; return map.containsKey(blockPosition) ? map.get(blockPosition) : 0;
} }
public void remove(Position position) { public void remove(Position position) {
long pair = getChunkIndex(position); long pair = getChunkIndex(position);
Map<Long, Short> map = getChunkMap(pair); Map<Short, Short> map = getChunkMap(pair);
map.remove(encodeBlockPos(position)); map.remove(encodeBlockPos(position));
if (map.isEmpty()) { if (map.isEmpty()) {
blockStorage.remove(pair); blockStorage.remove(pair);
@ -70,10 +68,10 @@ public class BlockConnectionStorage extends StoredObject {
blockStorage.remove(getChunkIndex(x, z)); blockStorage.remove(getChunkIndex(x, z));
} }
private Map<Long, Short> getChunkMap(long index) { private Map<Short, Short> getChunkMap(long index) {
Map<Long, Short> map = blockStorage.get(index); Map<Short, Short> map = blockStorage.get(index);
if (map == null) { if (map == null) {
map = createLongShortMap(); map = createShortShortMap();
blockStorage.put(index, map); blockStorage.put(index, map);
} }
return map; return map;
@ -87,11 +85,11 @@ public class BlockConnectionStorage extends StoredObject {
return getChunkIndex(position.getX().intValue(), position.getZ().intValue()); return getChunkIndex(position.getX().intValue(), position.getZ().intValue());
} }
private long encodeBlockPos(int x, int y, int z) { private short encodeBlockPos(int x, int y, int z) {
return (((long) x & 0x3FFFFFF) << 38) | ((y & 0xFFF) << 26) | (z & 0x3FFFFFF); return (short) (y << 8 | x & 0xF << 4 | z & 0xF);
} }
private long encodeBlockPos(Position pos) { private short encodeBlockPos(Position pos) {
return encodeBlockPos(pos.getX().intValue(), pos.getY().intValue(), pos.getZ().intValue()); return encodeBlockPos(pos.getX().intValue(), pos.getY().intValue(), pos.getZ().intValue());
} }
@ -113,24 +111,10 @@ public class BlockConnectionStorage extends StoredObject {
return new HashMap<>(); return new HashMap<>();
} }
private Map<Long, Short> createLongShortMap() { private Map<Short, Short> createShortShortMap() {
if (fastUtilLongShortHashMap != null) { if (fastUtilShortShortHashMap != null) {
try { try {
return (Map<Long, Short>) fastUtilLongShortHashMap.getConstructor().newInstance(); return (Map<Short, Short>) fastUtilShortShortHashMap.getConstructor().newInstance();
} catch (IllegalAccessException | InstantiationException | InvocationTargetException | NoSuchMethodException e) {
e.printStackTrace();
}
}
if (fastUtilLongObjectHashMap != null) {
try {
return (Map<Long, Short>) fastUtilLongObjectHashMap.getConstructor().newInstance();
} catch (IllegalAccessException | InstantiationException | InvocationTargetException | NoSuchMethodException e) {
e.printStackTrace();
}
}
if (nettyLongObjectHashMap != null) {
try {
return (Map<Long, Short>) nettyLongObjectHashMap.getConstructor().newInstance();
} catch (IllegalAccessException | InstantiationException | InvocationTargetException | NoSuchMethodException e) { } catch (IllegalAccessException | InstantiationException | InvocationTargetException | NoSuchMethodException e) {
e.printStackTrace(); e.printStackTrace();
} }