From 85a179ad472619efe3af0a81b390c492bea8ec5f Mon Sep 17 00:00:00 2001
From: MagicBot <MagicBot@magicbane.com>
Date: Thu, 28 Mar 2024 05:09:04 -0400
Subject: [PATCH] More itembase refactor

---
 src/engine/gameManager/ChatManager.java | 60 +------------------------
 1 file changed, 2 insertions(+), 58 deletions(-)

diff --git a/src/engine/gameManager/ChatManager.java b/src/engine/gameManager/ChatManager.java
index 6e882416..ca1aa00c 100644
--- a/src/engine/gameManager/ChatManager.java
+++ b/src/engine/gameManager/ChatManager.java
@@ -606,7 +606,7 @@ public enum ChatManager {
         if (item != null) //Steal
             if (success) {
                 String name = "";
-                if (item.getItemBase().getUUID() == 7)
+                if (item.template.item_type.equals(Enum.ItemType.GOLD))
                     name = amount + " gold ";
                 else {
                     String vowels = "aeiou";
@@ -619,7 +619,7 @@ public enum ChatManager {
                             name = "a " + iName + ' ';
                 }
                 textToThief = "You have stolen " + name + "from " + tar.getFirstName() + '!';
-                textToVictim = sender.getFirstName() + "is caught with thier hands in your pocket!";
+                textToVictim = sender.getFirstName() + "is caught with their hands in your pocket!";
                 //textToOthers = sender.getFirstName() + " steals " + name + "from " + target.getFirstName() + ".";
             } else
                 textToThief = "Your attempt at stealing failed..."; //textToVictim = sender.getFirstName() + " fails to steal from you.";
@@ -673,22 +673,6 @@ public enum ChatManager {
         sendInfoMsgToPlayer(pc, text, 1);
     }
 
-    public static void chatCommanderError(PlayerCharacter pc, String text) {
-        sendErrorMsgToPlayer(pc, text, 3);
-    }
-
-    public static void chatNationError(PlayerCharacter pc, String text) {
-        sendErrorMsgToPlayer(pc, text, 5);
-    }
-
-    public static void chatLeaderError(PlayerCharacter pc, String text) {
-        sendErrorMsgToPlayer(pc, text, 6);
-    }
-
-    public static void chatShoutError(PlayerCharacter pc, String text) {
-        sendErrorMsgToPlayer(pc, text, 7);
-    }
-
     public static void chatInfoError(PlayerCharacter pc, String text) {
         sendErrorMsgToPlayer(pc, text, 10);
     }
@@ -713,35 +697,16 @@ public enum ChatManager {
         sendErrorMsgToPlayer(pc, text, 16);
     }
 
-    public static void chatEmoteError(PlayerCharacter pc, String text) {
-        sendErrorMsgToPlayer(pc, text, 17);
-    }
-
     public static void chatTellError(PlayerCharacter pc, String text) {
         sendErrorMsgToPlayer(pc, text, 19);
     }
 
     // Send Info Message to channels
-    public static void chatCommanderInfo(PlayerCharacter pc, String text) {
-        chatSystem(pc, text, 3, 2);
-    }
-
-    public static void chatNationInfo(PlayerCharacter pc, String text) {
-        chatSystem(pc, text, 5, 2);
-    }
 
     public static void chatNationInfo(Guild nation, String text) {
         chatSystemGuild(nation, text, 5, 2);
     }
 
-    public static void chatLeaderInfo(PlayerCharacter pc, String text) {
-        chatSystem(pc, text, 6, 2);
-    }
-
-    public static void chatShoutInfo(PlayerCharacter pc, String text) {
-        chatSystem(pc, text, 7, 2);
-    }
-
     public static void chatInfoInfo(PlayerCharacter pc, String text) {
         chatSystem(pc, text, 10, 2);
     }
@@ -750,30 +715,14 @@ public enum ChatManager {
         chatSystem(pc, text, 12, 2);
     }
 
-    public static void chatICInfo(PlayerCharacter pc, String text) {
-        chatSystem(pc, text, 13, 2);
-    }
-
     public static void chatGroupInfo(PlayerCharacter pc, String text) {
         chatSystem(pc, text, 14, 2);
     }
 
-    public static void chatCityInfo(PlayerCharacter pc, String text) {
-        chatSystem(pc, text, 15, 2);
-    }
-
     public static void chatSayInfo(PlayerCharacter pc, String text) {
         chatSystem(pc, text, 16, 2);
     }
 
-    public static void chatEmoteInfo(PlayerCharacter pc, String text) {
-        chatSystem(pc, text, 17, 2);
-    }
-
-    public static void chatTellInfo(PlayerCharacter pc, String text) {
-        chatSystem(pc, text, 19, 2);
-    }
-
     public static void chatGroupInfoCanSee(PlayerCharacter pc, String text) {
         HashSet<AbstractWorldObject> distroList = null;
 
@@ -857,11 +806,6 @@ public enum ChatManager {
         DispatchMessage.dispatchMsgToAll(msg);
     }
 
-    public static void chatInfo(String text) {
-        HashSet<AbstractWorldObject> distroList = ChatManager.getAllPlayers(null);
-        chatSystemSend(distroList, text, 1, 2);
-    }
-
     public static ChatSystemMsg CombatInfo(AbstractWorldObject source, AbstractWorldObject target) {
         String text = "The " + target.getName() + " attacks " + source.getName();
         ChatSystemMsg msg = new ChatSystemMsg(null, text);