From b8a71c070cc0ea0dae205c6aa4894a9312358df9 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Sun, 12 Aug 2018 19:48:57 +0300
Subject: [PATCH] public variable to enum in PlayerSettings

---
 .../java/mc/core/player/PlayerSettings.java   | 38 +++++++++++++++----
 .../netty/handlers/PlayHandler.java           |  5 ++-
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/mc/core/player/PlayerSettings.java b/core/src/main/java/mc/core/player/PlayerSettings.java
index 0e7897c..8a7c03c 100644
--- a/core/src/main/java/mc/core/player/PlayerSettings.java
+++ b/core/src/main/java/mc/core/player/PlayerSettings.java
@@ -5,21 +5,45 @@
 package mc.core.player;
 
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 
 @Getter
 @Setter
 public class PlayerSettings {
-    public static final int CHAT_ENABLED = 0,
-                            CHAT_COMMANDS_ONLY = 1,
-                            CHAT_HIDDEN = 2;
+    @RequiredArgsConstructor
+    public enum ChatMode {
+        ENABLED(0),
+        COMMANDS_ONLY(1),
+        HIDDEN(2);
 
-    public static final int HAND_LEFT = 0,
-                            HAND_RIGHT = 1;
+        public static ChatMode getById(int id) {
+            if (id == 0) return ENABLED;
+            else if (id == 1) return COMMANDS_ONLY;
+            else return HIDDEN;
+        }
+
+        @Getter
+        private final int id;
+    }
+
+    @RequiredArgsConstructor
+    public enum Hand {
+        LEFT(0),
+        RIGHT(1);
+
+        public static Hand getById(int id) {
+            if (id == 0) return LEFT;
+            else return RIGHT;
+        }
+
+        @Getter
+        private final int id;
+    }
 
     private String locate = "en_US";
     private int viewDistance = 8;
-    private int chatMode = CHAT_ENABLED;
+    private ChatMode chatMode = ChatMode.ENABLED;
     private boolean chatColors = true;
     private boolean capeEnabled = true,
                     jacketEnabled = true,
@@ -28,5 +52,5 @@ public class PlayerSettings {
                     leftPantsLegEnabled = true,
                     rightPantsLegEnabled = true,
                     hatEnabled = true;
-    private int mainHand = HAND_RIGHT;
+    private Hand mainHand = Hand.RIGHT;
 }
diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java
index a677bb5..28e5465 100644
--- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java
+++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java
@@ -13,6 +13,7 @@ import mc.core.events.EventBusGetter;
 import mc.core.network.proto_1_12_2.TeleportManager;
 import mc.core.network.proto_1_12_2.packets.*;
 import mc.core.player.Player;
+import mc.core.player.PlayerSettings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -32,7 +33,7 @@ public class PlayHandler extends AbstractStateHandler implements PlayStateHandle
 
         player.getSettings().setLocate(packet.getLocale());
         player.getSettings().setViewDistance(packet.getViewDistance());
-        player.getSettings().setChatMode(packet.getChatMode());
+        player.getSettings().setChatMode(PlayerSettings.ChatMode.getById(packet.getChatMode()));
         player.getSettings().setChatColors(packet.isChatColors());
 
         player.getSettings().setCapeEnabled(packet.isCapeEnabled());
@@ -43,7 +44,7 @@ public class PlayHandler extends AbstractStateHandler implements PlayStateHandle
         player.getSettings().setRightPantsLegEnabled(packet.isRightPantsLegEnabled());
         player.getSettings().setHatEnabled(packet.isHatEnabled());
 
-        player.getSettings().setMainHand(packet.getMainHand());
+        player.getSettings().setMainHand(PlayerSettings.Hand.getById(packet.getMainHand()));
     }
 
     @Handler