Rename and clean up MapleClient

src/main/java/client/command/commands/gm6/ClearQuestCacheCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm6;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.quest.MapleQuest;
 
@@ -34,7 +34,7 @@ public class ClearQuestCacheCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         MapleQuest.clearCache();
         player.dropMessage(5, "Quest Cache Cleared.");

src/main/java/client/command/commands/gm6/ClearQuestCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm6;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.quest.MapleQuest;
 
@@ -34,7 +34,7 @@ public class ClearQuestCommand 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 include a quest ID.");

src/main/java/client/command/commands/gm6/DCAllCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm6;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import net.server.world.World;
@@ -35,7 +35,7 @@ public class DCAllCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         for (World world : Server.getInstance().getWorlds()) {
             for (Character chr : world.getPlayerStorage().getAllCharacters()) {

src/main/java/client/command/commands/gm6/EraseAllPNpcsCommand.java

@@ -23,7 +23,7 @@
 */
 package client.command.commands.gm6;
 
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.life.MaplePlayerNPC;
 
@@ -33,7 +33,7 @@ public class EraseAllPNpcsCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         MaplePlayerNPC.removeAllPlayerNPC();
     }
 }

src/main/java/client/command/commands/gm6/GetAccCommand.java

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

src/main/java/client/command/commands/gm6/MapPlayersCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm6;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import net.server.world.World;
@@ -35,7 +35,7 @@ public class MapPlayersCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         String names = "";
         int map = player.getMapId();

src/main/java/client/command/commands/gm6/SaveAllCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm6;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import net.server.world.World;
@@ -36,7 +36,7 @@ public class SaveAllCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         for (World world : Server.getInstance().getWorlds()) {
             for (Character chr : world.getPlayerStorage().getAllCharacters()) {

src/main/java/client/command/commands/gm6/ServerAddChannelCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm6;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import server.ThreadManager;
@@ -35,7 +35,7 @@ public class ServerAddChannelCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         final Character player = c.getPlayer();
         
         if (params.length < 1) {

src/main/java/client/command/commands/gm6/ServerAddWorldCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm6;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import server.ThreadManager;
@@ -35,7 +35,7 @@ public class ServerAddWorldCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         final Character player = c.getPlayer();
         
         ThreadManager.getInstance().newTask(() -> {

src/main/java/client/command/commands/gm6/ServerRemoveChannelCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm6;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import server.ThreadManager;
@@ -35,7 +35,7 @@ public class ServerRemoveChannelCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         final Character player = c.getPlayer();
         
         if (params.length < 1) {

src/main/java/client/command/commands/gm6/ServerRemoveWorldCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm6;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import server.ThreadManager;
@@ -35,7 +35,7 @@ public class ServerRemoveWorldCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         final Character player = c.getPlayer();
         
         final int rwid = Server.getInstance().getWorldsSize() - 1;

src/main/java/client/command/commands/gm6/SetGmLevelCommand.java

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

src/main/java/client/command/commands/gm6/ShutdownCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm6;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import net.server.world.World;
@@ -36,7 +36,7 @@ public class ShutdownCommand 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: !shutdown [<time>|NOW]");

src/main/java/client/command/commands/gm6/SpawnAllPNpcsCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm6;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.life.MaplePlayerNPC;
 
@@ -34,7 +34,7 @@ public class SpawnAllPNpcsCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         MaplePlayerNPC.multicastSpawnPlayerNPC(player.getMapId(), player.getWorld());
     }

src/main/java/client/command/commands/gm6/SupplyRateCouponCommand.java

@@ -20,7 +20,7 @@
 package client.command.commands.gm6;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import config.YamlConfig;
 
@@ -30,7 +30,7 @@ public class SupplyRateCouponCommand 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, "Syntax: !supplyratecoupon <yes|no>");

src/main/java/client/command/commands/gm6/WarpWorldCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm6;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.Server;
 import tools.PacketCreator;
@@ -38,7 +38,7 @@ public class WarpWorldCommand 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: !warpworld <worldid>");