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

Optimize packet searching

Browse Source
This commit is contained in:
HugoDaBosss 2016-03-11 11:48:42 +01:00
parent 3511f9a7b2
commit afe18379e0
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/us/myles/ViaVersion/packets/PacketType.java
View File

@ -172,11 +172,11 @@ public enum PacketType {
} }
public static PacketType findNewPacket(State state, Direction direction, int id) { public static PacketType findNewPacket(State state, Direction direction, int id) {
return newids.get(toLong((short)direction.ordinal(), (short) state.ordinal(), id)); return newids.get(toShort((short) id, (short)direction.ordinal(), (short) state.ordinal()));
} }
public static PacketType findOldPacket(State state, Direction direction, int id) { public static PacketType findOldPacket(State state, Direction direction, int id) {
return oldids.get(toLong((short)direction.ordinal(), (short) state.ordinal(), id)); return oldids.get(toShort((short) id, (short)direction.ordinal(), (short) state.ordinal()));
} }
public static PacketType getIncomingPacket(State state, int id) { public static PacketType getIncomingPacket(State state, int id) {
@ -187,17 +187,16 @@ public enum PacketType {
return findOldPacket(state, Direction.OUTGOING, id); return findOldPacket(state, Direction.OUTGOING, id);
} }
private static long toLong(short a, short b, int c) { private static short toShort(short id, short direction, short state) {
int d = (a << 16) | (b & 0xFFFF); return (short) ((id & 0x00FF) | (direction<<8) & 0x0F00 | (state << 12) & 0xF000);
return (long) c << 32 | d & 0xFFFFFFFFL;
} }
private static HashMap<Long, PacketType> oldids = new HashMap<Long, PacketType>(); private static HashMap<Short, PacketType> oldids = new HashMap<Short, PacketType>();
private static HashMap<Long, PacketType> newids = new HashMap<Long, PacketType>(); private static HashMap<Short, PacketType> newids = new HashMap<Short, PacketType>();
static { static {
for(PacketType pt : PacketType.values()) { for(PacketType pt : PacketType.values()) {
oldids.put(toLong((short)pt.getDirection().ordinal(), (short)pt.getState().ordinal(), pt.getPacketID()), pt); oldids.put(toShort((short) pt.getPacketID(), (short)pt.getDirection().ordinal(), (short)pt.getState().ordinal()), pt);
newids.put(toLong((short)pt.getDirection().ordinal(), (short)pt.getState().ordinal(), pt.getNewPacketID()), pt); newids.put(toShort((short) pt.getNewPacketID(), (short)pt.getDirection().ordinal(), (short)pt.getState().ordinal()), pt);
} }
} }