Rename and clean up MapleClient

src/main/java/client/command/commands/gm3/BanCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import server.TimerManager;
@@ -41,7 +41,7 @@ public class BanCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 2) {
             player.yellowMessage("Syntax: !ban <IGN> <Reason> (Please be descriptive)");

src/main/java/client/command/commands/gm3/ChatCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class ChatCommand extends Command {
@@ -33,7 +33,7 @@ public class ChatCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         player.toggleWhiteChat();
         player.message("Your chat is now " + (player.getWhiteChat() ? " white" : "normal") + ".");

src/main/java/client/command/commands/gm3/CheckDmgCommand.java

@@ -25,7 +25,7 @@ package client.command.commands.gm3;
 
 import client.BuffStat;
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class CheckDmgCommand extends Command {
@@ -34,7 +34,7 @@ public class CheckDmgCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
         if (victim != null) {

src/main/java/client/command/commands/gm3/ClosePortalCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class ClosePortalCommand extends Command {
@@ -33,7 +33,7 @@ public class ClosePortalCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 1) {
             player.yellowMessage("Syntax: !closeportal <portalid>");

src/main/java/client/command/commands/gm3/DebuffCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.MapleDisease;
 import client.command.Command;
 import server.life.MobSkill;
@@ -40,7 +40,7 @@ public class DebuffCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 1) {
             player.yellowMessage("Syntax: !debuff SLOW|SEDUCE|ZOMBIFY|CONFUSE|STUN|POISON|SEAL|DARKNESS|WEAKEN|CURSE");

src/main/java/client/command/commands/gm3/EndEventCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class EndEventCommand extends Command {
@@ -33,7 +33,7 @@ public class EndEventCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         c.getChannelServer().setEvent(null);
         player.dropMessage(5, "You have ended the event. No more players may join.");

src/main/java/client/command/commands/gm3/ExpedsCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import net.server.channel.Channel;
@@ -39,7 +39,7 @@ public class ExpedsCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         for (Channel ch : Server.getInstance().getChannelsFromWorld(c.getWorld())) {
             List<MapleExpedition> expeds = ch.getExpeditions();

src/main/java/client/command/commands/gm3/FaceCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.MapleStat;
 import client.command.Command;
 import constants.inventory.ItemConstants;
@@ -36,7 +36,7 @@ public class FaceCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 1) {
             player.yellowMessage("Syntax: !face [<playername>] <faceid>");

src/main/java/client/command/commands/gm3/FameCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.MapleStat;
 import client.command.Command;
 
@@ -34,7 +34,7 @@ public class FameCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 2) {
             player.yellowMessage("Syntax: !fame <playername> <gainfame>");

src/main/java/client/command/commands/gm3/FlyCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 
@@ -34,7 +34,7 @@ public class FlyCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) { // fly option will become available for any character of that account
+    public void execute(Client c, String[] params) { // fly option will become available for any character of that account
         Character player = c.getPlayer();
         if (params.length < 1) {
             player.yellowMessage("Syntax: !fly <on/off>");

src/main/java/client/command/commands/gm3/GiveMesosCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class GiveMesosCommand extends Command {
@@ -33,7 +33,7 @@ public class GiveMesosCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 1) {
             player.yellowMessage("Syntax: !givems [<playername>] <gainmeso>");

src/main/java/client/command/commands/gm3/GiveNxCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class GiveNxCommand extends Command {
@@ -33,7 +33,7 @@ public class GiveNxCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 1) {
             player.yellowMessage("Syntax: !givenx [nx, mp, np] [<playername>] <gainnx>");

src/main/java/client/command/commands/gm3/GiveRpCommand.java

@@ -1,7 +1,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class GiveRpCommand extends Command {
@@ -10,7 +10,7 @@ public class GiveRpCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient client, String[] params) {
+    public void execute(Client client, String[] params) {
         Character player = client.getPlayer();
         if (params.length < 2) {
             player.yellowMessage("Syntax: !giverp <playername> <gainrewardpoint>");

src/main/java/client/command/commands/gm3/GiveVpCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class GiveVpCommand extends Command {
@@ -33,7 +33,7 @@ public class GiveVpCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 2) {
             player.yellowMessage("Syntax: !givevp <playername> <gainvotepoint>");

src/main/java/client/command/commands/gm3/HairCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.MapleStat;
 import client.command.Command;
 import constants.inventory.ItemConstants;
@@ -36,7 +36,7 @@ public class HairCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 1) {
             player.yellowMessage("Syntax: !hair [<playername>] <hairid>");

src/main/java/client/command/commands/gm3/HealMapCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class HealMapCommand extends Command {
@@ -33,7 +33,7 @@ public class HealMapCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         for (Character mch : player.getMap().getCharacters()) {
             if (mch != null) {

src/main/java/client/command/commands/gm3/HealPersonCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class HealPersonCommand extends Command {
@@ -33,7 +33,7 @@ public class HealPersonCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
         if (victim != null) {

src/main/java/client/command/commands/gm3/HpMpCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class HpMpCommand extends Command {
@@ -33,7 +33,7 @@ public class HpMpCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         Character victim = player;
         int statUpdate = 1;

src/main/java/client/command/commands/gm3/HurtCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class HurtCommand extends Command {
@@ -33,7 +33,7 @@ public class HurtCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
         if (victim != null) {

src/main/java/client/command/commands/gm3/IgnoreCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.packet.logging.MapleLogger;
 import net.server.Server;
@@ -36,7 +36,7 @@ public class IgnoreCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 1) {
             player.yellowMessage("Syntax: !ignore <ign>");

src/main/java/client/command/commands/gm3/IgnoredCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.packet.logging.MapleLogger;
 
@@ -34,7 +34,7 @@ public class IgnoredCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         for (Integer cid : MapleLogger.ignored) {
             player.yellowMessage(Character.getNameById(cid) + " is being ignored.");

src/main/java/client/command/commands/gm3/InMapCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class InMapCommand extends Command {
@@ -33,7 +33,7 @@ public class InMapCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         String st = "";
         for (Character chr : player.getMap().getCharacters()) {

src/main/java/client/command/commands/gm3/KillAllCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.life.MapleMonster;
 import server.maps.MapleMap;
@@ -40,7 +40,7 @@ public class KillAllCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         MapleMap map = player.getMap();
         List<MapleMapObject> monsters = map.getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER));

src/main/java/client/command/commands/gm3/KillCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import tools.PacketCreator;
@@ -35,7 +35,7 @@ public class KillCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 1) {
             player.yellowMessage("Syntax: !kill <playername>");

src/main/java/client/command/commands/gm3/KillMapCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class KillMapCommand extends Command {
@@ -33,7 +33,7 @@ public class KillMapCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         for (Character mch : player.getMap().getCharacters()) {
             mch.updateHp(0);

src/main/java/client/command/commands/gm3/MaxEnergyCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import tools.PacketCreator;
 
@@ -34,7 +34,7 @@ public class MaxEnergyCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         c.getPlayer().setDojoEnergy(10000);
         c.sendPacket(PacketCreator.getEnergy("energy", 10000));

src/main/java/client/command/commands/gm3/MaxHpMpCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class MaxHpMpCommand extends Command {
@@ -33,7 +33,7 @@ public class MaxHpMpCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         Character victim = player;
         

src/main/java/client/command/commands/gm3/MonitorCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.packet.logging.MapleLogger;
 import net.server.Server;
@@ -36,7 +36,7 @@ public class MonitorCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 1) {
             player.yellowMessage("Syntax: !monitor <ign>");

src/main/java/client/command/commands/gm3/MonitorsCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.packet.logging.MapleLogger;
 
@@ -34,7 +34,7 @@ public class MonitorsCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         for (Integer cid : MapleLogger.monitored) {
             player.yellowMessage(Character.getNameById(cid) + " is being monitored.");

src/main/java/client/command/commands/gm3/MusicCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import constants.game.GameConstants;
 import tools.PacketCreator;
@@ -44,7 +44,7 @@ public class MusicCommand extends Command {
     }
     
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         
         Character player = c.getPlayer();
         if (params.length < 1) {

src/main/java/client/command/commands/gm3/MuteMapCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class MuteMapCommand extends Command {
@@ -33,7 +33,7 @@ public class MuteMapCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (player.getMap().isMuted()) {
             player.getMap().setMuted(false);

src/main/java/client/command/commands/gm3/NightCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class NightCommand extends Command {
@@ -33,7 +33,7 @@ public class NightCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         player.getMap().broadcastNightEffect();
         player.yellowMessage("Done.");

src/main/java/client/command/commands/gm3/NoticeCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import tools.PacketCreator;
@@ -35,7 +35,7 @@ public class NoticeCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[Notice] " + player.getLastCommandMessage()));
     }

src/main/java/client/command/commands/gm3/NpcCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.life.MapleLifeFactory;
 import server.life.MapleNPC;
@@ -36,7 +36,7 @@ public class NpcCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 1) {
             player.yellowMessage("Syntax: !npc <npcid>");

src/main/java/client/command/commands/gm3/OnlineTwoCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import net.server.channel.Channel;
@@ -35,7 +35,7 @@ public class OnlineTwoCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         int total = 0;
         for (Channel ch : Server.getInstance().getChannelsFromWorld(player.getWorld())) {

src/main/java/client/command/commands/gm3/OpenPortalCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class OpenPortalCommand extends Command {
@@ -33,7 +33,7 @@ public class OpenPortalCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 1) {
             player.yellowMessage("Syntax: !openportal <portalid>");

src/main/java/client/command/commands/gm3/PeCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import io.netty.buffer.Unpooled;
 import net.PacketHandler;
@@ -45,7 +45,7 @@ public class PeCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         String packet = "";
         try {

src/main/java/client/command/commands/gm3/PosCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class PosCommand extends Command {
@@ -33,7 +33,7 @@ public class PosCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         float xpos = player.getPosition().x;
         float ypos = player.getPosition().y;

src/main/java/client/command/commands/gm3/QuestCompleteCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.quest.MapleQuest;
 
@@ -34,7 +34,7 @@ public class QuestCompleteCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         
         if (params.length < 1){

src/main/java/client/command/commands/gm3/QuestResetCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.quest.MapleQuest;
 
@@ -34,7 +34,7 @@ public class QuestResetCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         
         if (params.length < 1){

src/main/java/client/command/commands/gm3/QuestStartCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.quest.MapleQuest;
 
@@ -34,7 +34,7 @@ public class QuestStartCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         
         if (params.length < 1){

src/main/java/client/command/commands/gm3/ReloadDropsCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.life.MapleMonsterInformationProvider;
 
@@ -34,7 +34,7 @@ public class ReloadDropsCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         MapleMonsterInformationProvider.getInstance().clearDrops();
         player.dropMessage(5, "Reloaded Drops");

src/main/java/client/command/commands/gm3/ReloadEventsCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import net.server.channel.Channel;
@@ -35,7 +35,7 @@ public class ReloadEventsCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         for (Channel ch : Server.getInstance().getAllChannels()) {
             ch.reloadEventScriptManager();

src/main/java/client/command/commands/gm3/ReloadMapCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.maps.MapleMap;
 
@@ -36,7 +36,7 @@ public class ReloadMapCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         MapleMap newMap = c.getChannelServer().getMapFactory().resetMap(player.getMapId());
         int callerid = c.getPlayer().getId();

src/main/java/client/command/commands/gm3/ReloadPortalsCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import scripting.portal.PortalScriptManager;
 
@@ -34,7 +34,7 @@ public class ReloadPortalsCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         PortalScriptManager.getInstance().reloadPortalScripts();
         player.dropMessage(5, "Reloaded Portals");

src/main/java/client/command/commands/gm3/ReloadShopsCommand.java

@@ -23,7 +23,7 @@
 */
 package client.command.commands.gm3;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.MapleShopFactory;
 
@@ -34,7 +34,7 @@ public class ReloadShopsCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         MapleShopFactory.getInstance().reloadShops();
     }
 }

src/main/java/client/command/commands/gm3/RipCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import tools.PacketCreator;
@@ -35,7 +35,7 @@ public class RipCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[RIP]: " + joinStringFrom(params, 1)));
     }

src/main/java/client/command/commands/gm3/SeedCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import client.inventory.Item;
 
@@ -36,7 +36,7 @@ public class SeedCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (player.getMapId() != 910010000) {
             player.yellowMessage("This command can only be used in HPQ.");

src/main/java/client/command/commands/gm3/SpawnCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.life.MapleLifeFactory;
 import server.life.MapleMonster;
@@ -35,7 +35,7 @@ public class SpawnCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 1) {
             player.yellowMessage("Syntax: !spawn <mobid> [<mobqty>]");

src/main/java/client/command/commands/gm3/StartEventCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import server.events.gm.MapleEvent;
@@ -36,7 +36,7 @@ public class StartEventCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         int players = 50;
         if (params.length > 1)

src/main/java/client/command/commands/gm3/StartMapEventCommand.java

@@ -23,7 +23,7 @@
 */
 package client.command.commands.gm3;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class StartMapEventCommand extends Command {
@@ -32,7 +32,7 @@ public class StartMapEventCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         c.getPlayer().getMap().startEvent(c.getPlayer());
     }
 }

src/main/java/client/command/commands/gm3/StopMapEventCommand.java

@@ -23,7 +23,7 @@
 */
 package client.command.commands.gm3;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class StopMapEventCommand extends Command {
@@ -32,7 +32,7 @@ public class StopMapEventCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         c.getPlayer().getMap().setEventStarted(false);
     }
 }

src/main/java/client/command/commands/gm3/TimerAllCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import tools.PacketCreator;
 
@@ -34,7 +34,7 @@ public class TimerAllCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 1) {
             player.yellowMessage("Syntax: !timerall <seconds>|remove");

src/main/java/client/command/commands/gm3/TimerCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import tools.PacketCreator;
 
@@ -34,7 +34,7 @@ public class TimerCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 2) {
             player.yellowMessage("Syntax: !timer <playername> <seconds>|remove");

src/main/java/client/command/commands/gm3/TimerMapCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import tools.PacketCreator;
 
@@ -34,7 +34,7 @@ public class TimerMapCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 1) {
             player.yellowMessage("Syntax: !timermap <seconds>|remove");

src/main/java/client/command/commands/gm3/ToggleCouponCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 
@@ -34,7 +34,7 @@ public class ToggleCouponCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 1) {
             player.yellowMessage("Syntax: !togglecoupon <itemid>");

src/main/java/client/command/commands/gm3/UnBanCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm3;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import tools.DatabaseConnection;
 
@@ -37,7 +37,7 @@ public class UnBanCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length < 1) {
             player.yellowMessage("Syntax: !unban <playername>");