Rename and clean up MapleClient

src/main/java/client/command/commands/gm4/BossDropRateCommand.java

@@ -20,7 +20,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import tools.PacketCreator;
 
@@ -34,7 +34,7 @@ public class BossDropRateCommand 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: !bossdroprate <newrate>");

src/main/java/client/command/commands/gm4/CakeCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 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 CakeCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         MapleMonster monster = MapleLifeFactory.getMonster(9400606);
         if (params.length == 1) {

src/main/java/client/command/commands/gm4/DropRateCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import tools.PacketCreator;
 
@@ -34,7 +34,7 @@ public class DropRateCommand 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: !droprate <newrate>");

src/main/java/client/command/commands/gm4/ExpRateCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import tools.PacketCreator;
 
@@ -34,7 +34,7 @@ public class ExpRateCommand 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: !exprate <newrate>");

src/main/java/client/command/commands/gm4/FishingRateCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import tools.PacketCreator;
 
@@ -34,7 +34,7 @@ public class FishingRateCommand 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: !fishrate <newrate>");

src/main/java/client/command/commands/gm4/ForceVacCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import client.inventory.Pet;
 import client.inventory.manipulator.InventoryManipulator;
@@ -42,7 +42,7 @@ public class ForceVacCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         List<MapleMapObject> items = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM));
         for (MapleMapObject item : items) {

src/main/java/client/command/commands/gm4/HorntailCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.maps.MapleMap;
 
@@ -36,7 +36,7 @@ public class HorntailCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         final Point targetPoint = player.getPosition();
         final MapleMap targetMap = player.getMap();

src/main/java/client/command/commands/gm4/ItemVacCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.maps.MapleMapObject;
 import server.maps.MapleMapObjectType;
@@ -38,7 +38,7 @@ public class ItemVacCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         List<MapleMapObject> list = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM));
         for (MapleMapObject item : list) {

src/main/java/client/command/commands/gm4/MesoRateCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import tools.PacketCreator;
 
@@ -34,7 +34,7 @@ public class MesoRateCommand 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: !mesorate <newrate>");

src/main/java/client/command/commands/gm4/PapCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.life.MapleLifeFactory;
 
@@ -34,7 +34,7 @@ public class PapCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         
         // thanks Conrad for noticing mobid typo here

src/main/java/client/command/commands/gm4/PianusCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.life.MapleLifeFactory;
 
@@ -34,7 +34,7 @@ public class PianusCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         player.getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(8510000), player.getPosition());
     }

src/main/java/client/command/commands/gm4/PinkbeanCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.life.MapleLifeFactory;
 
@@ -34,7 +34,7 @@ public class PinkbeanCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         player.getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(8820001), player.getPosition());
 

src/main/java/client/command/commands/gm4/PlayerNpcCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.life.MaplePlayerNPC;
 
@@ -34,7 +34,7 @@ public class PlayerNpcCommand 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: !playernpc <playername>");

src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.life.MaplePlayerNPC;
 
@@ -34,7 +34,7 @@ public class PlayerNpcRemoveCommand 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: !playernpcremove <playername>");

src/main/java/client/command/commands/gm4/PmobCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.channel.Channel;
 import server.life.MapleLifeFactory;
@@ -43,7 +43,7 @@ public class PmobCommand 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: !pmob <mobid> [<mobtime>]");

src/main/java/client/command/commands/gm4/PmobRemoveCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.channel.Channel;
 import server.maps.MapleMap;
@@ -45,7 +45,7 @@ public class PmobRemoveCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
 
         int mapId = player.getMapId();

src/main/java/client/command/commands/gm4/PnpcCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.channel.Channel;
 import server.life.MapleLifeFactory;
@@ -44,7 +44,7 @@ public class PnpcCommand 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: !pnpc <npcid>");

src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import net.server.channel.Channel;
 import server.maps.MapleMap;
@@ -45,7 +45,7 @@ public class PnpcRemoveCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         
         int mapId = player.getMapId();

src/main/java/client/command/commands/gm4/ProItemCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import client.inventory.Equip;
 import client.inventory.InventoryType;
@@ -39,7 +39,7 @@ public class ProItemCommand 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: !proitem <itemid> <stat value> [<spdjmp value>]");

src/main/java/client/command/commands/gm4/QuestRateCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import tools.PacketCreator;
 
@@ -34,7 +34,7 @@ public class QuestRateCommand 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: !questrate <newrate>");

src/main/java/client/command/commands/gm4/ServerMessageCommand.java

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

src/main/java/client/command/commands/gm4/SetEqStatCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import client.inventory.Equip;
 import client.inventory.Inventory;
@@ -37,7 +37,7 @@ public class SetEqStatCommand 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: !seteqstat <stat value> [<spdjmp value>]");

src/main/java/client/command/commands/gm4/TravelRateCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import tools.PacketCreator;
 
@@ -34,7 +34,7 @@ public class TravelRateCommand 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: !travelrate <newrate>");

src/main/java/client/command/commands/gm4/ZakumCommand.java

@@ -24,7 +24,7 @@
 package client.command.commands.gm4;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.command.Command;
 import server.life.MapleLifeFactory;
 
@@ -34,7 +34,7 @@ public class ZakumCommand extends Command {
     }
 
     @Override
-    public void execute(MapleClient c, String[] params) {
+    public void execute(Client c, String[] params) {
         Character player = c.getPlayer();
         player.getMap().spawnFakeMonsterOnGroundBelow(MapleLifeFactory.getMonster(8800000), player.getPosition());
         for (int x = 8800003; x < 8800011; x++) {