Archived
0

в State BiMap не нужен

This commit is contained in:
2018-06-23 18:30:04 +03:00
parent 5d3b7ebef9
commit fac92ee9c4

View File

@@ -4,8 +4,7 @@
*/ */
package mc.core.network.proto_1_12_2; package mc.core.network.proto_1_12_2;
import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableBiMap;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -13,37 +12,39 @@ import mc.core.network.CSPacket;
import mc.core.network.SCPacket; import mc.core.network.SCPacket;
import mc.core.network.proto_1_12_2.packets.*; import mc.core.network.proto_1_12_2.packets.*;
import java.util.Map;
@Slf4j @Slf4j
@RequiredArgsConstructor @RequiredArgsConstructor
public enum State { public enum State {
UNKNOWN(-1, null, null), UNKNOWN(-1, null, null),
HANDSHAKE(0, HANDSHAKE(0,
ImmutableBiMap.<Integer, Class<? extends CSPacket>>builder() ImmutableMap.<Integer, Class<? extends CSPacket>>builder()
.put(0x00, HandshakePacket.class) .put(0x00, HandshakePacket.class)
.build(), .build(),
null null
), ),
STATUS(1, STATUS(1,
ImmutableBiMap.<Integer, Class<? extends CSPacket>>builder() ImmutableMap.<Integer, Class<? extends CSPacket>>builder()
.put(0x00, StatusRequestPacket.class) .put(0x00, StatusRequestPacket.class)
.put(0x01, PingPacket.class) .put(0x01, PingPacket.class)
.build(), .build(),
ImmutableBiMap.<Class<? extends SCPacket>, Integer>builder() ImmutableMap.<Class<? extends SCPacket>, Integer>builder()
.put(StatusResponsePacket.class, 0x00) .put(StatusResponsePacket.class, 0x00)
.put(PingPacket.class, 0x01) .put(PingPacket.class, 0x01)
.build() .build()
), ),
LOGIN(2, LOGIN(2,
ImmutableBiMap.<Integer, Class<? extends CSPacket>>builder() ImmutableMap.<Integer, Class<? extends CSPacket>>builder()
.put(0x00, LoginStartPacket.class) .put(0x00, LoginStartPacket.class)
.build(), .build(),
ImmutableBiMap.<Class<? extends SCPacket>, Integer>builder() ImmutableMap.<Class<? extends SCPacket>, Integer>builder()
.put(DisconnectPacket.class, 0x00) .put(DisconnectPacket.class, 0x00)
.put(LoginSuccessPacket.class, 0x02) .put(LoginSuccessPacket.class, 0x02)
.build() .build()
), ),
PLAY(3, PLAY(3,
ImmutableBiMap.<Integer, Class<? extends CSPacket>>builder() ImmutableMap.<Integer, Class<? extends CSPacket>>builder()
.put(0x00, TeleportConfirmPacket.class) .put(0x00, TeleportConfirmPacket.class)
.put(0x01, TabCompletePacket.class) .put(0x01, TabCompletePacket.class)
.put(0x02, ChatMessagePacket.class) .put(0x02, ChatMessagePacket.class)
@@ -54,7 +55,7 @@ public enum State {
.put(0x1A, HeldItemChangePacket.class) .put(0x1A, HeldItemChangePacket.class)
.put(0x1D, AnimationPacket.class) .put(0x1D, AnimationPacket.class)
.build(), .build(),
ImmutableBiMap.<Class<? extends SCPacket>, Integer>builder() ImmutableMap.<Class<? extends SCPacket>, Integer>builder()
.put(PluginMessagePacket.class, 0x18) .put(PluginMessagePacket.class, 0x18)
.put(KeepAlivePacket.class, 0x1F) .put(KeepAlivePacket.class, 0x1F)
.put(JoinGamePacket.class, 0x23) .put(JoinGamePacket.class, 0x23)
@@ -77,8 +78,8 @@ public enum State {
@Getter @Getter
private final int id; private final int id;
private final BiMap<Integer, Class<? extends CSPacket>> clientSidePacketsMap; private final Map<Integer, Class<? extends CSPacket>> clientSidePacketsMap;
private final BiMap<Class<? extends SCPacket>, Integer> serverSidePacketsMap; private final Map<Class<? extends SCPacket>, Integer> serverSidePacketsMap;
public Class<? extends CSPacket> getClientSidePacket(int id) { public Class<? extends CSPacket> getClientSidePacket(int id) {
return clientSidePacketsMap.get(id); return clientSidePacketsMap.get(id);