Rename and clean up MapleClient

src/main/java/client/command/Command.java

@@ -23,14 +23,14 @@
 */
 package client.command;
 
-import client.MapleClient;
+import client.Client;
 
 public abstract class Command {
 
     protected int rank;
     protected String description;
 
-    public abstract void execute(MapleClient client, String[] params);
+    public abstract void execute(Client client, String[] params);
 
     public String getDescription() {
         return description;

src/main/java/client/command/CommandsExecutor.java

@@ -23,7 +23,7 @@
 */
 package client.command;
 
-import client.MapleClient;
+import client.Client;
 import client.command.commands.gm0.*;
 import client.command.commands.gm1.*;
 import client.command.commands.gm2.*;
@@ -48,7 +48,7 @@ public class CommandsExecutor {
     private static final char USER_HEADING = '@';
     private static final char GM_HEADING = '!';
     
-    public static boolean isCommand(MapleClient client, String content){
+    public static boolean isCommand(Client client, String content){
         char heading = content.charAt(0);
         if (client.getPlayer().isGM()){
             return heading == USER_HEADING || heading == GM_HEADING;
@@ -74,7 +74,7 @@ public class CommandsExecutor {
         return commandsNameDesc;
     }
     
-    public void handle(MapleClient client, String message){
+    public void handle(Client client, String message){
         if (client.tryacquireClient()) {
             try {
                 handleInternal(client, message);
@@ -86,7 +86,7 @@ public class CommandsExecutor {
         }
     }
     
-    private void handleInternal(MapleClient client, String message){
+    private void handleInternal(Client client, String message){
         if (client.getPlayer().getMapId() == 300000012) {
             client.getPlayer().yellowMessage("You do not have permission to use commands while in jail.");
             return;
@@ -121,7 +121,7 @@ public class CommandsExecutor {
         writeLog(client, message);
     }
 
-    private void writeLog(MapleClient client, String command){
+    private void writeLog(Client client, String command){
         SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy HH:mm");
         FilePrinter.print(FilePrinter.USED_COMMANDS, client.getPlayer().getName() + " used: " + command + " on "
                 + sdf.format(Calendar.getInstance().getTime()));

src/main/java/client/command/commands/gm0/BuyBackCommand.java

@@ -23,7 +23,7 @@
 */
 package client.command.commands.gm0;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import client.processor.action.BuybackProcessor;
 
@@ -33,7 +33,7 @@ public class BuyBackCommand extends Command {
     }
     
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         if (params.length < 1) {
             c.getPlayer().yellowMessage("Syntax: @buyback <info|now>");
             return;

src/main/java/client/command/commands/gm0/ChangeLanguageCommand.java

@@ -23,7 +23,7 @@
 */
 package client.command.commands.gm0;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class ChangeLanguageCommand extends Command {
@@ -32,7 +32,7 @@ public class ChangeLanguageCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         if (params.length < 1) {
             c.getPlayer().yellowMessage("Syntax: !changel <0=ptb, 1=esp, 2=eng>");
             return;

src/main/java/client/command/commands/gm0/DisposeCommand.java

@@ -23,7 +23,7 @@
 */
 package client.command.commands.gm0;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import scripting.npc.NPCScriptManager;
 import scripting.quest.QuestScriptManager;
@@ -35,7 +35,7 @@ public class DisposeCommand extends Command {
     }
     
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         NPCScriptManager.getInstance().dispose(c);
         QuestScriptManager.getInstance().dispose(c);
         c.sendPacket(PacketCreator.enableActions());

src/main/java/client/command/commands/gm0/DropLimitCommand.java

@@ -23,7 +23,7 @@
 */
 package client.command.commands.gm0;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import config.YamlConfig;
 
@@ -33,7 +33,7 @@ public class DropLimitCommand extends Command {
     }
     
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         int dropCount = c.getPlayer().getMap().getDroppedItemCount();
         if(((float) dropCount) / YamlConfig.config.server.ITEM_LIMIT_ON_MAP < 0.75f) {
             c.getPlayer().showHint("Current drop count: #b" + dropCount + "#k / #e" + YamlConfig.config.server.ITEM_LIMIT_ON_MAP + "#n", 300);

src/main/java/client/command/commands/gm0/EnableAuthCommand.java

@@ -23,7 +23,7 @@
 */
 package client.command.commands.gm0;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.coordinator.login.MapleLoginBypassCoordinator;
 
@@ -33,7 +33,7 @@ public class EnableAuthCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         if (c.tryacquireClient()) {
             try {
                 MapleLoginBypassCoordinator.getInstance().unregisterLoginBypassEntry(c.getHwid(), c.getAccID());

src/main/java/client/command/commands/gm0/EquipLvCommand.java

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

src/main/java/client/command/commands/gm0/GachaCommand.java

@@ -23,7 +23,7 @@
 */
 package client.command.commands.gm0;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.MapleItemInformationProvider;
 import server.gachapon.MapleGachapon;
@@ -34,7 +34,7 @@ public class GachaCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         MapleGachapon.Gachapon gacha = null;
         String search = c.getPlayer().getLastCommandMessage();
         String gachaName = "";

src/main/java/client/command/commands/gm0/GmCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm0;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import tools.FilePrinter;
@@ -37,7 +37,7 @@ public class GmCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         String[] tips = {
                 "Please only use @gm in emergencies or to report somebody.",
                 "To report a bug or make a suggestion, use the forum.",

src/main/java/client/command/commands/gm0/HelpCommand.java

@@ -23,7 +23,7 @@
 */
 package client.command.commands.gm0;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class HelpCommand extends Command {
@@ -32,7 +32,7 @@ public class HelpCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient client, String[] params) {
+    public void execute(Client client, String[] params) {
         client.getAbstractPlayerInteraction().openNpc(9201143, "commands");
     }
 }

src/main/java/client/command/commands/gm0/JoinEventCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm0;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.events.gm.MapleEvent;
 import server.maps.FieldLimit;
@@ -35,7 +35,7 @@ public class JoinEventCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if(!FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) {
             MapleEvent event = c.getChannelServer().getEvent();

src/main/java/client/command/commands/gm0/LeaveEventCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm0;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class LeaveEventCommand extends Command {
@@ -33,7 +33,7 @@ public class LeaveEventCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         int returnMap = player.getSavedLocation("EVENT");
         if(returnMap != -1) {

src/main/java/client/command/commands/gm0/MapOwnerClaimCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm0;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import config.YamlConfig;
 import server.maps.MapleMap;
@@ -35,7 +35,7 @@ public class MapOwnerClaimCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         if (c.tryacquireClient()) {
             try {
                 Character chr = c.getPlayer();

src/main/java/client/command/commands/gm0/OnlineCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm0;
 
 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 OnlineCommand 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(player.getWorld())) {
             player.yellowMessage("Players in Channel " + ch.getId() + ":");

src/main/java/client/command/commands/gm0/RanksCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm0;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import net.server.guild.GuildPackets;
@@ -38,7 +38,7 @@ public class RanksCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         
         List<Pair<String, Integer>> worldRanking = Server.getInstance().getWorldPlayerRanking(player.getWorld());

src/main/java/client/command/commands/gm0/RatesCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm0;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import config.YamlConfig;
 
@@ -34,7 +34,7 @@ public class RatesCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         
         // travel rates not applicable since it's intrinsically a server/environment rate rather than a character rate

src/main/java/client/command/commands/gm0/ReadPointsCommand.java

@@ -1,7 +1,7 @@
 package client.command.commands.gm0;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class ReadPointsCommand extends Command {
@@ -10,7 +10,7 @@ public class ReadPointsCommand 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) {

src/main/java/client/command/commands/gm0/ReportBugCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm0;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import tools.FilePrinter;
@@ -36,7 +36,7 @@ public class ReportBugCommand 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/gm0/ShowRatesCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm0;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import config.YamlConfig;
 
@@ -34,7 +34,7 @@ public class ShowRatesCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         String showMsg = "#eEXP RATE#n" + "\r\n";
         showMsg += "World EXP Rate: #k" + c.getWorldServer().getExpRate() + "x#k" + "\r\n";

src/main/java/client/command/commands/gm0/StaffCommand.java

@@ -23,7 +23,7 @@
 */
 package client.command.commands.gm0;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class StaffCommand extends Command {
@@ -32,7 +32,7 @@ public class StaffCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         c.getAbstractPlayerInteraction().openNpc(2010007, "credits");
     }
 }

src/main/java/client/command/commands/gm0/StatDexCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm0;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import config.YamlConfig;
 
@@ -34,7 +34,7 @@ public class StatDexCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         int remainingAp = player.getRemainingAp();
 

src/main/java/client/command/commands/gm0/StatIntCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm0;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import config.YamlConfig;
 
@@ -34,7 +34,7 @@ public class StatIntCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         int remainingAp = player.getRemainingAp();
 

src/main/java/client/command/commands/gm0/StatLukCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm0;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import config.YamlConfig;
 
@@ -34,7 +34,7 @@ public class StatLukCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         int remainingAp = player.getRemainingAp();
 

src/main/java/client/command/commands/gm0/StatStrCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm0;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import config.YamlConfig;
 
@@ -34,7 +34,7 @@ public class StatStrCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         int remainingAp = player.getRemainingAp();
         int amount;

src/main/java/client/command/commands/gm0/TimeCommand.java

@@ -23,7 +23,7 @@
 */
 package client.command.commands.gm0;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 import java.text.DateFormat;
@@ -37,7 +37,7 @@ public class TimeCommand extends Command {
     }
     
     @Override
-    public void execute(MapleClient client, String[] params) {
+    public void execute(Client client, String[] params) {
         DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
         dateFormat.setTimeZone(TimeZone.getDefault());
         client.getPlayer().yellowMessage("Cosmic Server Time: " + dateFormat.format(new Date()));

src/main/java/client/command/commands/gm0/ToggleExpCommand.java

@@ -23,7 +23,7 @@
 */
 package client.command.commands.gm0;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class ToggleExpCommand extends Command {
@@ -32,7 +32,7 @@ public class ToggleExpCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         if (c.tryacquireClient()) {
             try {
                 c.getPlayer().toggleExpGain();  // Vcoc's idea

src/main/java/client/command/commands/gm0/UptimeCommand.java

@@ -23,7 +23,7 @@
 */
 package client.command.commands.gm0;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 
@@ -33,7 +33,7 @@ public class UptimeCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         long milliseconds = System.currentTimeMillis() - Server.uptime;
         int seconds = (int) (milliseconds / 1000) % 60 ;
         int minutes = (int) ((milliseconds / (1000*60)) % 60);

src/main/java/client/command/commands/gm1/BossHpCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm1;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.life.MapleMonster;
 
@@ -34,7 +34,7 @@ public class BossHpCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         for(MapleMonster monster : player.getMap().getAllMonsters()) {
             if(monster != null && monster.isBoss() && monster.getHp() > 0) {

src/main/java/client/command/commands/gm1/BuffMeCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm1;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.SkillFactory;
 import client.command.Command;
 
@@ -34,7 +34,7 @@ public class BuffMeCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         SkillFactory.getSkill(4101004).getEffect(SkillFactory.getSkill(4101004).getMaxLevel()).applyTo(player);
         SkillFactory.getSkill(2311003).getEffect(SkillFactory.getSkill(2311003).getMaxLevel()).applyTo(player);

src/main/java/client/command/commands/gm1/GotoCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm1;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import constants.game.GameConstants;
 import server.maps.*;
@@ -72,7 +72,7 @@ public class GotoCommand 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){
             String sendStr = "Syntax: #b@goto <map name>#k. Available areas:\r\n\r\n#rTowns:#k\r\n" + GOTO_TOWNS_INFO;

src/main/java/client/command/commands/gm1/MobHpCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm1;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.life.MapleMonster;
 
@@ -34,7 +34,7 @@ public class MobHpCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         for(MapleMonster monster : player.getMap().getAllMonsters()) {
             if (monster != null && monster.getHp() > 0) {

src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm1;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.MapleItemInformationProvider;
 import server.life.MapleMonsterInformationProvider;
@@ -39,7 +39,7 @@ public class WhatDropsFromCommand 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.dropMessage(5, "Please do @whatdropsfrom <monster name>");

src/main/java/client/command/commands/gm1/WhoDropsCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm1;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.MapleItemInformationProvider;
 import server.life.MapleMonsterInformationProvider;
@@ -42,7 +42,7 @@ public class WhoDropsCommand 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.dropMessage(5, "Please do @whodrops <item name>");

src/main/java/client/command/commands/gm2/ApCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import config.YamlConfig;
 
@@ -34,7 +34,7 @@ public class ApCommand 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: !ap [<playername>] <newap>");

src/main/java/client/command/commands/gm2/BombCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import server.life.MapleLifeFactory;
@@ -36,7 +36,7 @@ public class BombCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         if (params.length > 0) {
             Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);

src/main/java/client/command/commands/gm2/BuffCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.Skill;
 import client.SkillFactory;
 import client.command.Command;
@@ -35,7 +35,7 @@ public class BuffCommand 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: !buff <buffid>");

src/main/java/client/command/commands/gm2/BuffMapCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.SkillFactory;
 import client.command.Command;
 
@@ -34,7 +34,7 @@ public class BuffMapCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         SkillFactory.getSkill(9101001).getEffect(SkillFactory.getSkill(9101001).getMaxLevel()).applyTo(player, true);
         SkillFactory.getSkill(9101002).getEffect(SkillFactory.getSkill(9101002).getMaxLevel()).applyTo(player, true);

src/main/java/client/command/commands/gm2/ClearDropsCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class ClearDropsCommand extends Command {
@@ -33,7 +33,7 @@ public class ClearDropsCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         player.getMap().clearDrops(player);
         player.dropMessage(5, "Cleared dropped items");

src/main/java/client/command/commands/gm2/ClearSavedLocationsCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.maps.SavedLocationType;
 
@@ -34,7 +34,7 @@ public class ClearSavedLocationsCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer(), victim;
         
         if (params.length > 0) {

src/main/java/client/command/commands/gm2/ClearSlotCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import client.inventory.InventoryType;
 import client.inventory.Item;
@@ -36,7 +36,7 @@ public class ClearSlotCommand 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: !clearslot <all, equip, use, setup, etc or cash.>");

src/main/java/client/command/commands/gm2/DcCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class DcCommand extends Command {
@@ -33,7 +33,7 @@ public class DcCommand 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: !dc <playername>");

src/main/java/client/command/commands/gm2/EmpowerMeCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.SkillFactory;
 import client.command.Command;
 
@@ -34,7 +34,7 @@ public class EmpowerMeCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         final int[] array = {2311003, 2301004, 1301007, 4101004, 2001002, 1101007, 1005, 2301003, 5121009, 1111002, 4111001, 4111002, 4211003, 4211005, 1321000, 2321004, 3121002};
         for (int i : array) {

src/main/java/client/command/commands/gm2/GachaListCommand.java

@@ -19,7 +19,7 @@
 */
 package client.command.commands.gm2;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 /**
@@ -32,7 +32,7 @@ public class GachaListCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         c.getAbstractPlayerInteraction().openNpc(10000, "gachaponInfo");
     }
 }

src/main/java/client/command/commands/gm2/GmShopCommand.java

@@ -23,7 +23,7 @@
 */
 package client.command.commands.gm2;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.MapleShopFactory;
 
@@ -33,7 +33,7 @@ public class GmShopCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         MapleShopFactory.getInstance().getShop(1337).sendShop(c);
     }
 }

src/main/java/client/command/commands/gm2/HealCommand.java

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

src/main/java/client/command/commands/gm2/HideCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.SkillFactory;
 import client.command.Command;
 
@@ -34,7 +34,7 @@ public class HideCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         SkillFactory.getSkill(9101004).getEffect(SkillFactory.getSkill(9101004).getMaxLevel()).applyTo(player);
 

src/main/java/client/command/commands/gm2/IdCommand.java

@@ -1,7 +1,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.ThreadManager;
 import tools.exceptions.IdTypeNotSupportedException;
@@ -30,7 +30,7 @@ public class IdCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient client, final String[] params) {
+    public void execute(Client client, final String[] params) {
         final Character player = client.getPlayer();
         if (params.length < 2) {
             player.yellowMessage("Syntax: !id <type> <query>");

src/main/java/client/command/commands/gm2/ItemCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import client.inventory.Pet;
 import client.inventory.manipulator.InventoryManipulator;
@@ -38,7 +38,7 @@ public class ItemCommand 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/gm2/ItemDropCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import client.inventory.InventoryType;
 import client.inventory.Item;
@@ -39,7 +39,7 @@ public class ItemDropCommand 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/gm2/JailCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.maps.MapleMap;
 import server.maps.MaplePortal;
@@ -35,7 +35,7 @@ public class JailCommand 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: !jail <playername> [<minutes>]");

src/main/java/client/command/commands/gm2/JobCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.MapleJob;
 import client.command.Command;
 
@@ -34,7 +34,7 @@ public class JobCommand 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) {
             int jobid = Integer.parseInt(params[0]);

src/main/java/client/command/commands/gm2/LevelCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import config.YamlConfig;
 
@@ -34,7 +34,7 @@ public class LevelCommand 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: !level <newlevel>");

src/main/java/client/command/commands/gm2/LevelProCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class LevelProCommand extends Command {
@@ -33,7 +33,7 @@ public class LevelProCommand 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: !levelpro <newlevel>");

src/main/java/client/command/commands/gm2/LootCommand.java

@@ -23,14 +23,15 @@
 */
 package client.command.commands.gm2;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
-import java.util.Arrays;
-import java.util.List;
 import server.maps.MapleMapItem;
 import server.maps.MapleMapObject;
 import server.maps.MapleMapObjectType;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class LootCommand extends Command {
 
     {
@@ -38,7 +39,7 @@ public class LootCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         List<MapleMapObject> items = c.getPlayer().getMap().getMapObjectsInRange(c.getPlayer().getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM));
         for (MapleMapObject item : items) {
             MapleMapItem mapItem = (MapleMapItem) item;

src/main/java/client/command/commands/gm2/MaxSkillCommand.java

@@ -36,7 +36,7 @@ public class MaxSkillCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         for (MapleData skill_ : MapleDataProviderFactory.getDataProvider(WZFiles.STRING).getData("Skill.img").getChildren()) {
             try {

src/main/java/client/command/commands/gm2/MaxStatCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.MapleStat;
 import client.command.Command;
 import config.YamlConfig;
@@ -35,7 +35,7 @@ public class MaxStatCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         player.loseExp(player.getExp(), false, false);
         player.setLevel(255);

src/main/java/client/command/commands/gm2/ReachCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.maps.MapleMap;
 
@@ -34,7 +34,7 @@ public class ReachCommand 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: !reach <playername>");

src/main/java/client/command/commands/gm2/RechargeCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import client.inventory.InventoryType;
 import client.inventory.Item;
@@ -37,7 +37,7 @@ public class RechargeCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
         for (Item torecharge : c.getPlayer().getInventory(InventoryType.USE).list()) {

src/main/java/client/command/commands/gm2/ResetSkillCommand.java

@@ -36,7 +36,7 @@ public class ResetSkillCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         for (MapleData skill_ : MapleDataProviderFactory.getDataProvider(WZFiles.STRING).getData("Skill.img").getChildren()) {
             try {

src/main/java/client/command/commands/gm2/SearchCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import provider.MapleData;
 import provider.MapleDataProvider;
@@ -52,7 +52,7 @@ public class SearchCommand 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: !search <type> <name>");

src/main/java/client/command/commands/gm2/SetSlotCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class SetSlotCommand extends Command {
@@ -33,7 +33,7 @@ public class SetSlotCommand 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: !setslot <newlevel>");

src/main/java/client/command/commands/gm2/SetStatCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class SetStatCommand extends Command {
@@ -33,7 +33,7 @@ public class SetStatCommand 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: !setstat <newstat>");

src/main/java/client/command/commands/gm2/SpCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import config.YamlConfig;
 
@@ -34,7 +34,7 @@ public class SpCommand 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: !sp [<playername>] <newsp>");

src/main/java/client/command/commands/gm2/SummonCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import net.server.channel.Channel;
@@ -36,7 +36,7 @@ public class SummonCommand 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: !warphere <playername>");

src/main/java/client/command/commands/gm2/UnBugCommand.java

@@ -23,7 +23,7 @@
 */
 package client.command.commands.gm2;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import tools.PacketCreator;
 
@@ -33,7 +33,7 @@ public class UnBugCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         c.getPlayer().getMap().broadcastMessage(PacketCreator.enableActions());
     }
 }

src/main/java/client/command/commands/gm2/UnHideCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.SkillFactory;
 import client.command.Command;
 
@@ -34,7 +34,7 @@ public class UnHideCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         SkillFactory.getSkill(9101004).getEffect(SkillFactory.getSkill(9101004).getMaxLevel()).applyTo(player);
 

src/main/java/client/command/commands/gm2/UnJailCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 
 public class UnJailCommand extends Command {
@@ -33,7 +33,7 @@ public class UnJailCommand 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: !unjail <playername>");

src/main/java/client/command/commands/gm2/WarpAreaCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.maps.MapleMap;
 
@@ -37,7 +37,7 @@ public class WarpAreaCommand 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: !warparea <mapid>");

src/main/java/client/command/commands/gm2/WarpCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.maps.FieldLimit;
 import server.maps.MapleMap;
@@ -36,7 +36,7 @@ public class WarpCommand 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: !warp <mapid>");

src/main/java/client/command/commands/gm2/WarpMapCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.maps.MapleMap;
 
@@ -36,7 +36,7 @@ public class WarpMapCommand 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: !warpmap <mapid>");

src/main/java/client/command/commands/gm2/WhereaMiCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm2;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.life.MapleMonster;
 import server.life.MapleNPC;
@@ -39,7 +39,7 @@ public class WhereaMiCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         
         HashSet<Character> chars = new HashSet<>();

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>");