From fac92ee9c4b43f56a419ca6aa1c884db1ec04e8f Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sat, 23 Jun 2018 18:30:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B2=20State=20BiMap=20=D0=BD=D0=B5=20=D0=BD?= =?UTF-8?q?=D1=83=D0=B6=D0=B5=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mc/core/network/proto_1_12_2/State.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/State.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/State.java index 346be91..1645ac9 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/State.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/State.java @@ -4,8 +4,7 @@ */ package mc.core.network.proto_1_12_2; -import com.google.common.collect.BiMap; -import com.google.common.collect.ImmutableBiMap; +import com.google.common.collect.ImmutableMap; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -13,37 +12,39 @@ import mc.core.network.CSPacket; import mc.core.network.SCPacket; import mc.core.network.proto_1_12_2.packets.*; +import java.util.Map; + @Slf4j @RequiredArgsConstructor public enum State { UNKNOWN(-1, null, null), HANDSHAKE(0, - ImmutableBiMap.>builder() + ImmutableMap.>builder() .put(0x00, HandshakePacket.class) .build(), null ), STATUS(1, - ImmutableBiMap.>builder() + ImmutableMap.>builder() .put(0x00, StatusRequestPacket.class) .put(0x01, PingPacket.class) .build(), - ImmutableBiMap., Integer>builder() + ImmutableMap., Integer>builder() .put(StatusResponsePacket.class, 0x00) .put(PingPacket.class, 0x01) .build() ), LOGIN(2, - ImmutableBiMap.>builder() + ImmutableMap.>builder() .put(0x00, LoginStartPacket.class) .build(), - ImmutableBiMap., Integer>builder() + ImmutableMap., Integer>builder() .put(DisconnectPacket.class, 0x00) .put(LoginSuccessPacket.class, 0x02) .build() ), PLAY(3, - ImmutableBiMap.>builder() + ImmutableMap.>builder() .put(0x00, TeleportConfirmPacket.class) .put(0x01, TabCompletePacket.class) .put(0x02, ChatMessagePacket.class) @@ -54,7 +55,7 @@ public enum State { .put(0x1A, HeldItemChangePacket.class) .put(0x1D, AnimationPacket.class) .build(), - ImmutableBiMap., Integer>builder() + ImmutableMap., Integer>builder() .put(PluginMessagePacket.class, 0x18) .put(KeepAlivePacket.class, 0x1F) .put(JoinGamePacket.class, 0x23) @@ -77,8 +78,8 @@ public enum State { @Getter private final int id; - private final BiMap> clientSidePacketsMap; - private final BiMap, Integer> serverSidePacketsMap; + private final Map> clientSidePacketsMap; + private final Map, Integer> serverSidePacketsMap; public Class getClientSidePacket(int id) { return clientSidePacketsMap.get(id);