From 8f91d8e7ac8cdc3223202cefd420efde92162d68 Mon Sep 17 00:00:00 2001
From: P0nk <ponkcode@gmail.com>
Date: Thu, 9 Sep 2021 21:24:36 +0200
Subject: [PATCH] Rename and clean up MapleSkinColor

---
 src/main/java/client/Character.java            | 10 +++++-----
 .../{MapleSkinColor.java => SkinColor.java}    | 18 +++++++++++++-----
 .../java/client/creator/CharacterFactory.java  |  4 ++--
 .../scripting/npc/NPCConversationManager.java  |  2 +-
 4 files changed, 21 insertions(+), 13 deletions(-)
 rename src/main/java/client/{MapleSkinColor.java => SkinColor.java} (82%)

diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java
index 4d649080ce..f9e1e60cf1 100644
--- a/src/main/java/client/Character.java
+++ b/src/main/java/client/Character.java
@@ -165,7 +165,7 @@ public class Character extends AbstractCharacterObject {
     private final Pet[] pets = new Pet[3];
     private MaplePlayerShop playerShop = null;
     private MapleShop shop = null;
-    private MapleSkinColor skinColor = MapleSkinColor.NORMAL;
+    private SkinColor skinColor = SkinColor.NORMAL;
     private MapleStorage storage = null;
     private MapleTrade trade = null;
     private MonsterBook monsterbook;
@@ -5830,7 +5830,7 @@ public class Character extends AbstractCharacterObject {
         return skills.get(skill).expiration;
     }
 
-    public MapleSkinColor getSkinColor() {
+    public SkinColor getSkinColor() {
         return skinColor;
     }
 
@@ -6848,7 +6848,7 @@ public class Character extends AbstractCharacterObject {
             ret.id = rs.getInt("id");
             ret.name = rs.getString("name");
             ret.gender = rs.getInt("gender");
-            ret.skinColor = MapleSkinColor.getById(rs.getInt("skincolor"));
+            ret.skinColor = SkinColor.getById(rs.getInt("skincolor"));
             ret.face = rs.getInt("face");
             ret.hair = rs.getInt("hair");
 
@@ -6992,7 +6992,7 @@ public class Character extends AbstractCharacterObject {
                     ret.meso.set(rs.getInt("meso"));
                     ret.merchantmeso = rs.getInt("MerchantMesos");
                     ret.setGMLevel(rs.getInt("gm"));
-                    ret.skinColor = MapleSkinColor.getById(rs.getInt("skincolor"));
+                    ret.skinColor = SkinColor.getById(rs.getInt("skincolor"));
                     ret.gender = rs.getInt("gender");
                     ret.job = Job.getById(rs.getInt("job"));
                     ret.finishedDojoTutorial = rs.getInt("finishedDojoTutorial") == 1;
@@ -9285,7 +9285,7 @@ public class Character extends AbstractCharacterObject {
         search = find;
     }
 
-    public void setSkinColor(MapleSkinColor skinColor) {
+    public void setSkinColor(SkinColor skinColor) {
         this.skinColor = skinColor;
     }
 
diff --git a/src/main/java/client/MapleSkinColor.java b/src/main/java/client/SkinColor.java
similarity index 82%
rename from src/main/java/client/MapleSkinColor.java
rename to src/main/java/client/SkinColor.java
index 7014c40bb9..9c16ad0cc7 100644
--- a/src/main/java/client/MapleSkinColor.java
+++ b/src/main/java/client/SkinColor.java
@@ -21,11 +21,19 @@
 */
 package client;
 
-public enum MapleSkinColor {
-    NORMAL(0), DARK(1), BLACK(2), PALE(3), BLUE(4), GREEN(5), WHITE(9), PINK(10);
+public enum SkinColor {
+    NORMAL(0),
+    DARK(1),
+    BLACK(2),
+    PALE(3),
+    BLUE(4),
+    GREEN(5),
+    WHITE(9),
+    PINK(10);
+
     final int id;
 
-    private MapleSkinColor(int id) {
+    SkinColor(int id) {
         this.id = id;
     }
 
@@ -33,8 +41,8 @@ public enum MapleSkinColor {
         return id;
     }
 
-    public static MapleSkinColor getById(int id) {
-        for (MapleSkinColor l : MapleSkinColor.values()) {
+    public static SkinColor getById(int id) {
+        for (SkinColor l : SkinColor.values()) {
             if (l.getId() == id) {
                 return l;
             }
diff --git a/src/main/java/client/creator/CharacterFactory.java b/src/main/java/client/creator/CharacterFactory.java
index c4b64e9e3d..e35ff97747 100644
--- a/src/main/java/client/creator/CharacterFactory.java
+++ b/src/main/java/client/creator/CharacterFactory.java
@@ -21,7 +21,7 @@ package client.creator;
 
 import client.Character;
 import client.Client;
-import client.MapleSkinColor;
+import client.SkinColor;
 import client.inventory.Inventory;
 import client.inventory.InventoryType;
 import client.inventory.Item;
@@ -48,7 +48,7 @@ public abstract class CharacterFactory {
                 
                 Character newchar = Character.getDefault(c);
                 newchar.setWorld(c.getWorld());
-                newchar.setSkinColor(MapleSkinColor.getById(skin));
+                newchar.setSkinColor(SkinColor.getById(skin));
                 newchar.setGender(gender);
                 newchar.setName(name);
                 newchar.setHair(hair);
diff --git a/src/main/java/scripting/npc/NPCConversationManager.java b/src/main/java/scripting/npc/NPCConversationManager.java
index bf8c2fe5a4..9223e6ef0f 100644
--- a/src/main/java/scripting/npc/NPCConversationManager.java
+++ b/src/main/java/scripting/npc/NPCConversationManager.java
@@ -296,7 +296,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
 	}
 
 	public void setSkin(int color) {
-		getPlayer().setSkinColor(MapleSkinColor.getById(color));
+		getPlayer().setSkinColor(SkinColor.getById(color));
 		getPlayer().updateSingleStat(MapleStat.SKIN, color);
 		getPlayer().equipChanged();
 	}