Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-23 02:25:19 +01:00
Code Issues Projects Releases Wiki Activity

Optimized packet searching

Browse Source
This commit is contained in:
HugoDaBosss 2016-03-10 23:13:23 +01:00
parent 5df8a1e8e7
commit 3511f9a7b2
1 changed files with 204 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,10 @@
package us.myles.ViaVersion.packets;
import java.util.HashMap;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Table;
public enum PacketType {
/* Handshake serverbound */
HANDSHAKE(State.HANDSHAKE, Direction.INCOMING, 0x00),
@ -167,27 +172,11 @@ public enum PacketType {
}
public static PacketType findNewPacket(State state, Direction direction, int id) {
if(id == -1)
return null;
for (PacketType pt : values()) {
if (pt.getNewPacketID() == id
&& pt.getState() == state
&& pt.getDirection() == direction)
return pt;
}
return null;
return newids.get(toLong((short)direction.ordinal(), (short) state.ordinal(), id));
}
public static PacketType findOldPacket(State state, Direction direction, int id) {
if(id == -1)
return null;
for (PacketType pt : values()) {
if (pt.getPacketID() == id
&& pt.getState() == state
&& pt.getDirection() == direction)
return pt;
}
return null;
return oldids.get(toLong((short)direction.ordinal(), (short) state.ordinal(), id));
}
public static PacketType getIncomingPacket(State state, int id) {
@ -197,4 +186,19 @@ public enum PacketType {
public static PacketType getOutgoingPacket(State state, int id) {
return findOldPacket(state, Direction.OUTGOING, id);
}
private static long toLong(short a, short b, int c) {
int d = (a << 16) | (b & 0xFFFF);
return (long) c << 32 | d & 0xFFFFFFFFL;
}
private static HashMap<Long, PacketType> oldids = new HashMap<Long, PacketType>();
private static HashMap<Long, PacketType> newids = new HashMap<Long, PacketType>();
static {
for(PacketType pt : PacketType.values()) {
oldids.put(toLong((short)pt.getDirection().ordinal(), (short)pt.getState().ordinal(), pt.getPacketID()), pt);
newids.put(toLong((short)pt.getDirection().ordinal(), (short)pt.getState().ordinal(), pt.getNewPacketID()), pt);
}
}
}