diff --git a/src/main/java/client/BuddyList.java b/src/main/java/client/BuddyList.java index 10e45d5627..4ce83e62fe 100644 --- a/src/main/java/client/BuddyList.java +++ b/src/main/java/client/BuddyList.java @@ -165,7 +165,7 @@ public class BuddyList { return pendingRequests.pollLast(); } - public void addBuddyRequest(MapleClient c, int cidFrom, String nameFrom, int channelFrom) { + public void addBuddyRequest(Client c, int cidFrom, String nameFrom, int channelFrom) { put(new BuddylistEntry(nameFrom, "Default Group", cidFrom, channelFrom, false)); if (pendingRequests.isEmpty()) { c.sendPacket(PacketCreator.requestBuddylistAdd(cidFrom, c.getPlayer().getId(), nameFrom)); diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java index 8335430fa4..9a141d2c8f 100644 --- a/src/main/java/client/Character.java +++ b/src/main/java/client/Character.java @@ -152,7 +152,7 @@ public class Character extends AbstractCharacterObject { private BuddyList buddylist; private EventInstanceManager eventInstance = null; private MapleHiredMerchant hiredMerchant = null; - private MapleClient client; + private Client client; private MapleGuildCharacter mgc = null; private MaplePartyCharacter mpc = null; private Inventory[] inventory; @@ -356,7 +356,7 @@ public class Character extends AbstractCharacterObject { return getJobStyle((byte) ((this.getStr() > this.getDex()) ? 0x80 : 0x40)); } - public static Character getDefault(MapleClient c) { + public static Character getDefault(Client c) { Character ret = new Character(); ret.client = c; ret.setGMLevel(0); @@ -793,11 +793,11 @@ public class Character extends AbstractCharacterObject { allowExpGain = !allowExpGain; } - public void setClient(MapleClient c) { + public void setClient(Client c) { this.client = c; } - public void newClient(MapleClient c) { + public void newClient(Client c) { this.loggedIn = true; c.setAccountName(this.client.getAccountName());//No null's for accountName this.setClient(c); @@ -1019,7 +1019,7 @@ public class Character extends AbstractCharacterObject { private void broadcastChangeJob() { for (Character chr : map.getAllPlayers()) { - MapleClient chrC = chr.getClient(); + Client chrC = chr.getClient(); if (chrC != null) { // propagate new job 3rd-person effects (FJ, Aran 1st strike, etc) this.sendDestroyData(chrC); @@ -2108,14 +2108,14 @@ public class Character extends AbstractCharacterObject { } } - private void nextPendingRequest(MapleClient c) { + private void nextPendingRequest(Client c) { CharacterNameAndId pendingBuddyRequest = c.getPlayer().getBuddylist().pollPendingRequest(); if (pendingBuddyRequest != null) { c.sendPacket(PacketCreator.requestBuddylistAdd(pendingBuddyRequest.getId(), c.getPlayer().getId(), pendingBuddyRequest.getName())); } } - private void notifyRemoteChannel(MapleClient c, int remoteChannel, int otherCid, BuddyList.BuddyOperation operation) { + private void notifyRemoteChannel(Client c, int remoteChannel, int otherCid, BuddyList.BuddyOperation operation) { Character player = c.getPlayer(); if (remoteChannel != -1) { c.getWorldServer().buddyChanged(otherCid, player.getId(), player.getName(), c.getChannel(), operation); @@ -4614,7 +4614,7 @@ public class Character extends AbstractCharacterObject { return this.chalktext; } - public MapleClient getClient() { + public Client getClient() { return client; } @@ -4825,7 +4825,7 @@ public class Character extends AbstractCharacterObject { } } - public void exportExcludedItems(MapleClient c) { + public void exportExcludedItems(Client c) { Map> petExcluded = this.getExcluded(); for (Map.Entry> pe : petExcluded.entrySet()) { byte petIndex = this.getPetIndex(pe.getKey()); @@ -6951,7 +6951,7 @@ public class Character extends AbstractCharacterObject { updateRemainingSp(remainingSp, GameConstants.getSkillBook(job.getId())); } - public static Character loadCharFromDB(final int charid, MapleClient client, boolean channelserver) throws SQLException { + public static Character loadCharFromDB(final int charid, Client client, boolean channelserver) throws SQLException { Character ret = new Character(); ret.client = client; ret.id = charid; @@ -7182,7 +7182,7 @@ public class Character extends AbstractCharacterObject { try (ResultSet rs = ps.executeQuery()) { if (rs.next()) { - MapleClient retClient = ret.getClient(); + Client retClient = ret.getClient(); retClient.setAccountName(rs.getString("name")); retClient.setCharacterSlots(rs.getByte("characterslots")); @@ -9367,7 +9367,7 @@ public class Character extends AbstractCharacterObject { return (mesoGain); } - private int standaloneSell(MapleClient c, MapleItemInformationProvider ii, InventoryType type, short slot, short quantity) { + private int standaloneSell(Client c, MapleItemInformationProvider ii, InventoryType type, short slot, short quantity) { if (quantity == 0xFFFF || quantity == 0) { quantity = 1; } @@ -9534,7 +9534,7 @@ public class Character extends AbstractCharacterObject { } } - private void standaloneMerge(Map statups, MapleClient c, InventoryType type, short slot, Item item) { + private void standaloneMerge(Map statups, Client c, InventoryType type, short slot, Item item) { short quantity; if (item == null || (quantity = item.getQuantity()) < 1 || ii.isCash(item.getItemId()) || !ii.isUpgradeable(item.getItemId()) || hasMergeFlag(item)) { return; @@ -9885,7 +9885,7 @@ public class Character extends AbstractCharacterObject { public void announceUpdateQuest(DelayedQuestUpdate questUpdateType, Object... params) { Pair p = new Pair<>(questUpdateType, params); - MapleClient c = this.getClient(); + Client c = this.getClient(); if (c.getQM() != null || c.getCM() != null) { synchronized (npcUpdateQuests) { npcUpdateQuests.add(p); @@ -10070,12 +10070,12 @@ public class Character extends AbstractCharacterObject { } @Override - public void sendDestroyData(MapleClient client) { + public void sendDestroyData(Client client) { client.sendPacket(PacketCreator.removePlayerFromMap(this.getObjectId())); } @Override - public void sendSpawnData(MapleClient client) { + public void sendSpawnData(Client client) { if (!this.isHidden() || client.getPlayer().gmLevel() > 1) { client.sendPacket(PacketCreator.spawnPlayerMapObject(client, this, false)); diff --git a/src/main/java/client/MapleClient.java b/src/main/java/client/Client.java similarity index 97% rename from src/main/java/client/MapleClient.java rename to src/main/java/client/Client.java index 53652d7ff1..c02af35544 100644 --- a/src/main/java/client/MapleClient.java +++ b/src/main/java/client/Client.java @@ -78,8 +78,8 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; -public class MapleClient extends ChannelInboundHandlerAdapter { - private static final Logger log = LoggerFactory.getLogger(MapleClient.class); +public class Client extends ChannelInboundHandlerAdapter { + private static final Logger log = LoggerFactory.getLogger(Client.class); public static final int LOGIN_NOTLOGGEDIN = 0; public static final int LOGIN_SERVER_TRANSITION = 1; @@ -133,7 +133,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { CHANNEL } - public MapleClient(Type type, long sessionId, String remoteAddress, PacketProcessor packetProcessor, int world, int channel) { + public Client(Type type, long sessionId, String remoteAddress, PacketProcessor packetProcessor, int world, int channel) { this.type = type; this.sessionId = sessionId; this.remoteAddress = remoteAddress; @@ -142,18 +142,18 @@ public class MapleClient extends ChannelInboundHandlerAdapter { this.channel = channel; } - public static MapleClient createLoginClient(long sessionId, String remoteAddress, PacketProcessor packetProcessor, - int world, int channel) { - return new MapleClient(Type.LOGIN, sessionId, remoteAddress, packetProcessor, world, channel); + public static Client createLoginClient(long sessionId, String remoteAddress, PacketProcessor packetProcessor, + int world, int channel) { + return new Client(Type.LOGIN, sessionId, remoteAddress, packetProcessor, world, channel); } - public static MapleClient createChannelClient(long sessionId, String remoteAddress, PacketProcessor packetProcessor, - int world, int channel) { - return new MapleClient(Type.CHANNEL, sessionId, remoteAddress, packetProcessor, world, channel); + public static Client createChannelClient(long sessionId, String remoteAddress, PacketProcessor packetProcessor, + int world, int channel) { + return new Client(Type.CHANNEL, sessionId, remoteAddress, packetProcessor, world, channel); } - public static MapleClient createMock() { - return new MapleClient(null, -1,null, null, -123, -123); + public static Client createMock() { + return new Client(null, -1,null, null, -123, -123); } @Override @@ -543,7 +543,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { loggedIn = false; return 7; } - updateLoginState(MapleClient.LOGIN_LOGGEDIN); + updateLoginState(Client.LOGIN_LOGGEDIN); } finally { encoderLock.unlock(); } @@ -834,7 +834,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { try (ResultSet rs = ps.executeQuery()) { if (!rs.next()) { - throw new RuntimeException("getLoginState - MapleClient AccID: " + getAccID()); + throw new RuntimeException("getLoginState - Client AccID: " + getAccID()); } birthday = Calendar.getInstance(); @@ -848,7 +848,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { if (rs.getTimestamp("lastlogin").getTime() + 30000 < Server.getInstance().getCurrentTime()) { int accountId = accId; state = LOGIN_NOTLOGGEDIN; - updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN); // ACCID = 0, issue found thanks to Tochi & K u ssss o & Thora & Omo Oppa + updateLoginState(Client.LOGIN_NOTLOGGEDIN); // ACCID = 0, issue found thanks to Tochi & K u ssss o & Thora & Omo Oppa this.setAccID(accountId); } } @@ -960,7 +960,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { return true; } - private void disconnectInternal(boolean shutdown, boolean cashshop) {//once per MapleClient instance + private void disconnectInternal(boolean shutdown, boolean cashshop) {//once per Client instance if (player != null && player.isLoggedin() && player.getClient() != null) { final int messengerid = player.getMessenger() == null ? 0 : player.getMessenger().getId(); //final int fid = player.getFamilyId(); @@ -1039,12 +1039,12 @@ public class MapleClient extends ChannelInboundHandlerAdapter { SessionCoordinator.getInstance().closeSession(this, false); if (!serverTransition && isLoggedIn()) { - updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN); + updateLoginState(Client.LOGIN_NOTLOGGEDIN); clear(); } else { if (!Server.getInstance().hasCharacteridInTransition(this)) { - updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN); + updateLoginState(Client.LOGIN_NOTLOGGEDIN); } engines = null; // thanks Tochi for pointing out a NPE here @@ -1068,7 +1068,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { } public void setCharacterOnSessionTransitionState(int cid) { - this.updateLoginState(MapleClient.LOGIN_SERVER_TRANSITION); + this.updateLoginState(Client.LOGIN_SERVER_TRANSITION); this.inTransition = true; Server.getInstance().setCharacteridInTransition(this, cid); } @@ -1144,7 +1144,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { if (lastPong < pingedAt) { if (ioChannel.isActive()) { log.info("Disconnected {} due to idling. Reason: {}", remoteAddress, event.state()); - updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN); + updateLoginState(Client.LOGIN_NOTLOGGEDIN); disconnectSession(); } } diff --git a/src/main/java/client/MonsterBook.java b/src/main/java/client/MonsterBook.java index d0c7465883..461c51f0ba 100644 --- a/src/main/java/client/MonsterBook.java +++ b/src/main/java/client/MonsterBook.java @@ -53,7 +53,7 @@ public final class MonsterBook { } } - public void addCard(final MapleClient c, final int cardid) { + public void addCard(final Client c, final int cardid) { c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.showForeignCardEffect(c.getPlayer().getId()), false); Integer qty; diff --git a/src/main/java/client/command/Command.java b/src/main/java/client/command/Command.java index fcbe89eb7c..79966530c6 100644 --- a/src/main/java/client/command/Command.java +++ b/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; diff --git a/src/main/java/client/command/CommandsExecutor.java b/src/main/java/client/command/CommandsExecutor.java index a439dbbcb0..d80b48aac5 100644 --- a/src/main/java/client/command/CommandsExecutor.java +++ b/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())); diff --git a/src/main/java/client/command/commands/gm0/BuyBackCommand.java b/src/main/java/client/command/commands/gm0/BuyBackCommand.java index d63df2fe20..0fc257f5fb 100644 --- a/src/main/java/client/command/commands/gm0/BuyBackCommand.java +++ b/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 "); return; diff --git a/src/main/java/client/command/commands/gm0/ChangeLanguageCommand.java b/src/main/java/client/command/commands/gm0/ChangeLanguageCommand.java index df9cc0ecb7..d953d4c11a 100644 --- a/src/main/java/client/command/commands/gm0/ChangeLanguageCommand.java +++ b/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; diff --git a/src/main/java/client/command/commands/gm0/DisposeCommand.java b/src/main/java/client/command/commands/gm0/DisposeCommand.java index 0593943e0f..091d434dfc 100644 --- a/src/main/java/client/command/commands/gm0/DisposeCommand.java +++ b/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()); diff --git a/src/main/java/client/command/commands/gm0/DropLimitCommand.java b/src/main/java/client/command/commands/gm0/DropLimitCommand.java index a344a06bcb..8bcdf92d02 100644 --- a/src/main/java/client/command/commands/gm0/DropLimitCommand.java +++ b/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); diff --git a/src/main/java/client/command/commands/gm0/EnableAuthCommand.java b/src/main/java/client/command/commands/gm0/EnableAuthCommand.java index 97f6ffd366..203da7945c 100644 --- a/src/main/java/client/command/commands/gm0/EnableAuthCommand.java +++ b/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()); diff --git a/src/main/java/client/command/commands/gm0/EquipLvCommand.java b/src/main/java/client/command/commands/gm0/EquipLvCommand.java index 496fed1170..beafd307df 100644 --- a/src/main/java/client/command/commands/gm0/EquipLvCommand.java +++ b/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(); } } diff --git a/src/main/java/client/command/commands/gm0/GachaCommand.java b/src/main/java/client/command/commands/gm0/GachaCommand.java index 32de6eda95..f898dba5e0 100644 --- a/src/main/java/client/command/commands/gm0/GachaCommand.java +++ b/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 = ""; diff --git a/src/main/java/client/command/commands/gm0/GmCommand.java b/src/main/java/client/command/commands/gm0/GmCommand.java index b3f04324a2..53810d3f4f 100644 --- a/src/main/java/client/command/commands/gm0/GmCommand.java +++ b/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.", diff --git a/src/main/java/client/command/commands/gm0/HelpCommand.java b/src/main/java/client/command/commands/gm0/HelpCommand.java index f6a3b0bae9..2c32f1d80a 100644 --- a/src/main/java/client/command/commands/gm0/HelpCommand.java +++ b/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"); } } diff --git a/src/main/java/client/command/commands/gm0/JoinEventCommand.java b/src/main/java/client/command/commands/gm0/JoinEventCommand.java index 0f721272d4..ed5feba7ea 100644 --- a/src/main/java/client/command/commands/gm0/JoinEventCommand.java +++ b/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(); diff --git a/src/main/java/client/command/commands/gm0/LeaveEventCommand.java b/src/main/java/client/command/commands/gm0/LeaveEventCommand.java index 721ed32829..d1457efa33 100644 --- a/src/main/java/client/command/commands/gm0/LeaveEventCommand.java +++ b/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) { diff --git a/src/main/java/client/command/commands/gm0/MapOwnerClaimCommand.java b/src/main/java/client/command/commands/gm0/MapOwnerClaimCommand.java index 0cabe6293c..960f0c82dd 100644 --- a/src/main/java/client/command/commands/gm0/MapOwnerClaimCommand.java +++ b/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(); diff --git a/src/main/java/client/command/commands/gm0/OnlineCommand.java b/src/main/java/client/command/commands/gm0/OnlineCommand.java index 29edf19b47..1b9a2f7e10 100644 --- a/src/main/java/client/command/commands/gm0/OnlineCommand.java +++ b/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() + ":"); diff --git a/src/main/java/client/command/commands/gm0/RanksCommand.java b/src/main/java/client/command/commands/gm0/RanksCommand.java index 23682f0f4a..55a66364ce 100644 --- a/src/main/java/client/command/commands/gm0/RanksCommand.java +++ b/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> worldRanking = Server.getInstance().getWorldPlayerRanking(player.getWorld()); diff --git a/src/main/java/client/command/commands/gm0/RatesCommand.java b/src/main/java/client/command/commands/gm0/RatesCommand.java index 6764ff3a04..00f14cddfa 100644 --- a/src/main/java/client/command/commands/gm0/RatesCommand.java +++ b/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 diff --git a/src/main/java/client/command/commands/gm0/ReadPointsCommand.java b/src/main/java/client/command/commands/gm0/ReadPointsCommand.java index 368790bcc0..e71afb2269 100644 --- a/src/main/java/client/command/commands/gm0/ReadPointsCommand.java +++ b/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) { diff --git a/src/main/java/client/command/commands/gm0/ReportBugCommand.java b/src/main/java/client/command/commands/gm0/ReportBugCommand.java index 6ef44020bb..dc2f539dba 100644 --- a/src/main/java/client/command/commands/gm0/ReportBugCommand.java +++ b/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) { diff --git a/src/main/java/client/command/commands/gm0/ShowRatesCommand.java b/src/main/java/client/command/commands/gm0/ShowRatesCommand.java index 953568b443..6dd5c93b78 100644 --- a/src/main/java/client/command/commands/gm0/ShowRatesCommand.java +++ b/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"; diff --git a/src/main/java/client/command/commands/gm0/StaffCommand.java b/src/main/java/client/command/commands/gm0/StaffCommand.java index 465b455f3e..0ebc6d0e59 100644 --- a/src/main/java/client/command/commands/gm0/StaffCommand.java +++ b/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"); } } diff --git a/src/main/java/client/command/commands/gm0/StatDexCommand.java b/src/main/java/client/command/commands/gm0/StatDexCommand.java index bdcc0130c9..59660c1a9b 100644 --- a/src/main/java/client/command/commands/gm0/StatDexCommand.java +++ b/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(); diff --git a/src/main/java/client/command/commands/gm0/StatIntCommand.java b/src/main/java/client/command/commands/gm0/StatIntCommand.java index bb348728d8..abfb761e71 100644 --- a/src/main/java/client/command/commands/gm0/StatIntCommand.java +++ b/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(); diff --git a/src/main/java/client/command/commands/gm0/StatLukCommand.java b/src/main/java/client/command/commands/gm0/StatLukCommand.java index d4c44f8462..20cab06e2d 100644 --- a/src/main/java/client/command/commands/gm0/StatLukCommand.java +++ b/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(); diff --git a/src/main/java/client/command/commands/gm0/StatStrCommand.java b/src/main/java/client/command/commands/gm0/StatStrCommand.java index 34f548c51a..128ce5a825 100644 --- a/src/main/java/client/command/commands/gm0/StatStrCommand.java +++ b/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; diff --git a/src/main/java/client/command/commands/gm0/TimeCommand.java b/src/main/java/client/command/commands/gm0/TimeCommand.java index 5d80f02c84..69990f5c80 100644 --- a/src/main/java/client/command/commands/gm0/TimeCommand.java +++ b/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())); diff --git a/src/main/java/client/command/commands/gm0/ToggleExpCommand.java b/src/main/java/client/command/commands/gm0/ToggleExpCommand.java index 5e7d466718..42ff35c9db 100644 --- a/src/main/java/client/command/commands/gm0/ToggleExpCommand.java +++ b/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 diff --git a/src/main/java/client/command/commands/gm0/UptimeCommand.java b/src/main/java/client/command/commands/gm0/UptimeCommand.java index db98755aa5..75fece3174 100644 --- a/src/main/java/client/command/commands/gm0/UptimeCommand.java +++ b/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); diff --git a/src/main/java/client/command/commands/gm1/BossHpCommand.java b/src/main/java/client/command/commands/gm1/BossHpCommand.java index 5658a2164f..18b4ee58bb 100644 --- a/src/main/java/client/command/commands/gm1/BossHpCommand.java +++ b/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) { diff --git a/src/main/java/client/command/commands/gm1/BuffMeCommand.java b/src/main/java/client/command/commands/gm1/BuffMeCommand.java index 4223af3f39..ce2afba245 100644 --- a/src/main/java/client/command/commands/gm1/BuffMeCommand.java +++ b/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); diff --git a/src/main/java/client/command/commands/gm1/GotoCommand.java b/src/main/java/client/command/commands/gm1/GotoCommand.java index 587d062d71..327756871e 100644 --- a/src/main/java/client/command/commands/gm1/GotoCommand.java +++ b/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 #k. Available areas:\r\n\r\n#rTowns:#k\r\n" + GOTO_TOWNS_INFO; diff --git a/src/main/java/client/command/commands/gm1/MobHpCommand.java b/src/main/java/client/command/commands/gm1/MobHpCommand.java index 1b425f2c04..dfbdb5db53 100644 --- a/src/main/java/client/command/commands/gm1/MobHpCommand.java +++ b/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) { diff --git a/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java b/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java index 0fdf15b24b..07590d3d3f 100644 --- a/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm1/WhoDropsCommand.java b/src/main/java/client/command/commands/gm1/WhoDropsCommand.java index 782d9f4c1f..52a41220e4 100644 --- a/src/main/java/client/command/commands/gm1/WhoDropsCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm2/ApCommand.java b/src/main/java/client/command/commands/gm2/ApCommand.java index c44d19808a..ca08e7f24c 100644 --- a/src/main/java/client/command/commands/gm2/ApCommand.java +++ b/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 [] "); diff --git a/src/main/java/client/command/commands/gm2/BombCommand.java b/src/main/java/client/command/commands/gm2/BombCommand.java index 345611d196..c8987a6820 100644 --- a/src/main/java/client/command/commands/gm2/BombCommand.java +++ b/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]); diff --git a/src/main/java/client/command/commands/gm2/BuffCommand.java b/src/main/java/client/command/commands/gm2/BuffCommand.java index 424015015f..ed18d151c1 100644 --- a/src/main/java/client/command/commands/gm2/BuffCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm2/BuffMapCommand.java b/src/main/java/client/command/commands/gm2/BuffMapCommand.java index fdf9778817..c1433d30c8 100644 --- a/src/main/java/client/command/commands/gm2/BuffMapCommand.java +++ b/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); diff --git a/src/main/java/client/command/commands/gm2/ClearDropsCommand.java b/src/main/java/client/command/commands/gm2/ClearDropsCommand.java index f7ffefafbe..05c8e009fa 100644 --- a/src/main/java/client/command/commands/gm2/ClearDropsCommand.java +++ b/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"); diff --git a/src/main/java/client/command/commands/gm2/ClearSavedLocationsCommand.java b/src/main/java/client/command/commands/gm2/ClearSavedLocationsCommand.java index b3bc49632b..2fd76f829b 100644 --- a/src/main/java/client/command/commands/gm2/ClearSavedLocationsCommand.java +++ b/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) { diff --git a/src/main/java/client/command/commands/gm2/ClearSlotCommand.java b/src/main/java/client/command/commands/gm2/ClearSlotCommand.java index f6ba53a872..e53ef46090 100644 --- a/src/main/java/client/command/commands/gm2/ClearSlotCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm2/DcCommand.java b/src/main/java/client/command/commands/gm2/DcCommand.java index 8725a2010c..1ae5f093d3 100644 --- a/src/main/java/client/command/commands/gm2/DcCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm2/EmpowerMeCommand.java b/src/main/java/client/command/commands/gm2/EmpowerMeCommand.java index beb40375c4..58c52b9b47 100644 --- a/src/main/java/client/command/commands/gm2/EmpowerMeCommand.java +++ b/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) { diff --git a/src/main/java/client/command/commands/gm2/GachaListCommand.java b/src/main/java/client/command/commands/gm2/GachaListCommand.java index dbd06fa38f..4c7b416857 100644 --- a/src/main/java/client/command/commands/gm2/GachaListCommand.java +++ b/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"); } } diff --git a/src/main/java/client/command/commands/gm2/GmShopCommand.java b/src/main/java/client/command/commands/gm2/GmShopCommand.java index dd9cfd6043..6e44be08ea 100644 --- a/src/main/java/client/command/commands/gm2/GmShopCommand.java +++ b/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); } } diff --git a/src/main/java/client/command/commands/gm2/HealCommand.java b/src/main/java/client/command/commands/gm2/HealCommand.java index 1b71c8bc06..620c7ddf06 100644 --- a/src/main/java/client/command/commands/gm2/HealCommand.java +++ b/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(); } diff --git a/src/main/java/client/command/commands/gm2/HideCommand.java b/src/main/java/client/command/commands/gm2/HideCommand.java index dcba586058..33a5f9b2c3 100644 --- a/src/main/java/client/command/commands/gm2/HideCommand.java +++ b/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); diff --git a/src/main/java/client/command/commands/gm2/IdCommand.java b/src/main/java/client/command/commands/gm2/IdCommand.java index 231e12ae13..4896357499 100644 --- a/src/main/java/client/command/commands/gm2/IdCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm2/ItemCommand.java b/src/main/java/client/command/commands/gm2/ItemCommand.java index f679382a27..1492351bd5 100644 --- a/src/main/java/client/command/commands/gm2/ItemCommand.java +++ b/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) { diff --git a/src/main/java/client/command/commands/gm2/ItemDropCommand.java b/src/main/java/client/command/commands/gm2/ItemDropCommand.java index 06e3d5b5db..6f4a3e0698 100644 --- a/src/main/java/client/command/commands/gm2/ItemDropCommand.java +++ b/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) { diff --git a/src/main/java/client/command/commands/gm2/JailCommand.java b/src/main/java/client/command/commands/gm2/JailCommand.java index eac11882cf..c46bbc21d6 100644 --- a/src/main/java/client/command/commands/gm2/JailCommand.java +++ b/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 []"); diff --git a/src/main/java/client/command/commands/gm2/JobCommand.java b/src/main/java/client/command/commands/gm2/JobCommand.java index a3846d5138..011b70ae3b 100644 --- a/src/main/java/client/command/commands/gm2/JobCommand.java +++ b/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]); diff --git a/src/main/java/client/command/commands/gm2/LevelCommand.java b/src/main/java/client/command/commands/gm2/LevelCommand.java index 7a87917c5c..65e4051f96 100644 --- a/src/main/java/client/command/commands/gm2/LevelCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm2/LevelProCommand.java b/src/main/java/client/command/commands/gm2/LevelProCommand.java index 0441a518e6..20afd63b50 100644 --- a/src/main/java/client/command/commands/gm2/LevelProCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm2/LootCommand.java b/src/main/java/client/command/commands/gm2/LootCommand.java index 845962ebf7..49b576ebd6 100644 --- a/src/main/java/client/command/commands/gm2/LootCommand.java +++ b/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 items = c.getPlayer().getMap().getMapObjectsInRange(c.getPlayer().getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM)); for (MapleMapObject item : items) { MapleMapItem mapItem = (MapleMapItem) item; diff --git a/src/main/java/client/command/commands/gm2/MaxSkillCommand.java b/src/main/java/client/command/commands/gm2/MaxSkillCommand.java index 7d85807f70..84d96962cc 100644 --- a/src/main/java/client/command/commands/gm2/MaxSkillCommand.java +++ b/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 { diff --git a/src/main/java/client/command/commands/gm2/MaxStatCommand.java b/src/main/java/client/command/commands/gm2/MaxStatCommand.java index 5d6962ffb1..2252c2ee52 100644 --- a/src/main/java/client/command/commands/gm2/MaxStatCommand.java +++ b/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); diff --git a/src/main/java/client/command/commands/gm2/ReachCommand.java b/src/main/java/client/command/commands/gm2/ReachCommand.java index 6ef589081a..41b3bb3a6b 100644 --- a/src/main/java/client/command/commands/gm2/ReachCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm2/RechargeCommand.java b/src/main/java/client/command/commands/gm2/RechargeCommand.java index ede20c56d2..dd4ca799da 100644 --- a/src/main/java/client/command/commands/gm2/RechargeCommand.java +++ b/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()) { diff --git a/src/main/java/client/command/commands/gm2/ResetSkillCommand.java b/src/main/java/client/command/commands/gm2/ResetSkillCommand.java index 1805858a5d..7dbc11d850 100644 --- a/src/main/java/client/command/commands/gm2/ResetSkillCommand.java +++ b/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 { diff --git a/src/main/java/client/command/commands/gm2/SearchCommand.java b/src/main/java/client/command/commands/gm2/SearchCommand.java index cc7c442718..33c4bd06b8 100644 --- a/src/main/java/client/command/commands/gm2/SearchCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm2/SetSlotCommand.java b/src/main/java/client/command/commands/gm2/SetSlotCommand.java index 2b58e52170..b27c2b031d 100644 --- a/src/main/java/client/command/commands/gm2/SetSlotCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm2/SetStatCommand.java b/src/main/java/client/command/commands/gm2/SetStatCommand.java index f73915321d..d78f4d7ace 100644 --- a/src/main/java/client/command/commands/gm2/SetStatCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm2/SpCommand.java b/src/main/java/client/command/commands/gm2/SpCommand.java index ffca819dfe..44f62967e6 100644 --- a/src/main/java/client/command/commands/gm2/SpCommand.java +++ b/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 [] "); diff --git a/src/main/java/client/command/commands/gm2/SummonCommand.java b/src/main/java/client/command/commands/gm2/SummonCommand.java index ad7da632a7..261cfa7b4e 100644 --- a/src/main/java/client/command/commands/gm2/SummonCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm2/UnBugCommand.java b/src/main/java/client/command/commands/gm2/UnBugCommand.java index 50ec7eaf45..fb175c540d 100644 --- a/src/main/java/client/command/commands/gm2/UnBugCommand.java +++ b/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()); } } diff --git a/src/main/java/client/command/commands/gm2/UnHideCommand.java b/src/main/java/client/command/commands/gm2/UnHideCommand.java index d7398df036..1e2cd29cef 100644 --- a/src/main/java/client/command/commands/gm2/UnHideCommand.java +++ b/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); diff --git a/src/main/java/client/command/commands/gm2/UnJailCommand.java b/src/main/java/client/command/commands/gm2/UnJailCommand.java index c4ef47940f..41843f38e1 100644 --- a/src/main/java/client/command/commands/gm2/UnJailCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm2/WarpAreaCommand.java b/src/main/java/client/command/commands/gm2/WarpAreaCommand.java index b3809ab4a7..391737af17 100644 --- a/src/main/java/client/command/commands/gm2/WarpAreaCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm2/WarpCommand.java b/src/main/java/client/command/commands/gm2/WarpCommand.java index 53e90ee4e2..b579b6c9a4 100644 --- a/src/main/java/client/command/commands/gm2/WarpCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm2/WarpMapCommand.java b/src/main/java/client/command/commands/gm2/WarpMapCommand.java index cbc4069cd9..33a19d6af0 100644 --- a/src/main/java/client/command/commands/gm2/WarpMapCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm2/WhereaMiCommand.java b/src/main/java/client/command/commands/gm2/WhereaMiCommand.java index 9ac5a9b263..948407cf8d 100644 --- a/src/main/java/client/command/commands/gm2/WhereaMiCommand.java +++ b/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 chars = new HashSet<>(); diff --git a/src/main/java/client/command/commands/gm3/BanCommand.java b/src/main/java/client/command/commands/gm3/BanCommand.java index 01a616f569..f24ff3316b 100644 --- a/src/main/java/client/command/commands/gm3/BanCommand.java +++ b/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 (Please be descriptive)"); diff --git a/src/main/java/client/command/commands/gm3/ChatCommand.java b/src/main/java/client/command/commands/gm3/ChatCommand.java index 0b13070b2e..0ea9c36637 100644 --- a/src/main/java/client/command/commands/gm3/ChatCommand.java +++ b/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") + "."); diff --git a/src/main/java/client/command/commands/gm3/CheckDmgCommand.java b/src/main/java/client/command/commands/gm3/CheckDmgCommand.java index 1ca8c34906..9ec879ce1b 100644 --- a/src/main/java/client/command/commands/gm3/CheckDmgCommand.java +++ b/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) { diff --git a/src/main/java/client/command/commands/gm3/ClosePortalCommand.java b/src/main/java/client/command/commands/gm3/ClosePortalCommand.java index fafc049f64..32f55c53c3 100644 --- a/src/main/java/client/command/commands/gm3/ClosePortalCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm3/DebuffCommand.java b/src/main/java/client/command/commands/gm3/DebuffCommand.java index a7fc558f49..38533e48bc 100644 --- a/src/main/java/client/command/commands/gm3/DebuffCommand.java +++ b/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"); diff --git a/src/main/java/client/command/commands/gm3/EndEventCommand.java b/src/main/java/client/command/commands/gm3/EndEventCommand.java index d72674a098..ceb13efd91 100644 --- a/src/main/java/client/command/commands/gm3/EndEventCommand.java +++ b/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."); diff --git a/src/main/java/client/command/commands/gm3/ExpedsCommand.java b/src/main/java/client/command/commands/gm3/ExpedsCommand.java index eb5d492b17..4ecb4ebf84 100644 --- a/src/main/java/client/command/commands/gm3/ExpedsCommand.java +++ b/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 expeds = ch.getExpeditions(); diff --git a/src/main/java/client/command/commands/gm3/FaceCommand.java b/src/main/java/client/command/commands/gm3/FaceCommand.java index 13768eb78a..dbcfed049f 100644 --- a/src/main/java/client/command/commands/gm3/FaceCommand.java +++ b/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 [] "); diff --git a/src/main/java/client/command/commands/gm3/FameCommand.java b/src/main/java/client/command/commands/gm3/FameCommand.java index 68c9f2b359..0aff8275fb 100644 --- a/src/main/java/client/command/commands/gm3/FameCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm3/FlyCommand.java b/src/main/java/client/command/commands/gm3/FlyCommand.java index 9671f929ca..788fe43512 100644 --- a/src/main/java/client/command/commands/gm3/FlyCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm3/GiveMesosCommand.java b/src/main/java/client/command/commands/gm3/GiveMesosCommand.java index a59f90f032..1b5a4f8c0d 100644 --- a/src/main/java/client/command/commands/gm3/GiveMesosCommand.java +++ b/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 [] "); diff --git a/src/main/java/client/command/commands/gm3/GiveNxCommand.java b/src/main/java/client/command/commands/gm3/GiveNxCommand.java index ecb360aa6f..c68ac18e94 100644 --- a/src/main/java/client/command/commands/gm3/GiveNxCommand.java +++ b/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] [] "); diff --git a/src/main/java/client/command/commands/gm3/GiveRpCommand.java b/src/main/java/client/command/commands/gm3/GiveRpCommand.java index 2a2a88b41e..da5cb5d65d 100644 --- a/src/main/java/client/command/commands/gm3/GiveRpCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm3/GiveVpCommand.java b/src/main/java/client/command/commands/gm3/GiveVpCommand.java index 91fbe3d5f2..6bad23706a 100644 --- a/src/main/java/client/command/commands/gm3/GiveVpCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm3/HairCommand.java b/src/main/java/client/command/commands/gm3/HairCommand.java index d4be80ed8f..d531249e04 100644 --- a/src/main/java/client/command/commands/gm3/HairCommand.java +++ b/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 [] "); diff --git a/src/main/java/client/command/commands/gm3/HealMapCommand.java b/src/main/java/client/command/commands/gm3/HealMapCommand.java index bff482dc19..295e46f633 100644 --- a/src/main/java/client/command/commands/gm3/HealMapCommand.java +++ b/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) { diff --git a/src/main/java/client/command/commands/gm3/HealPersonCommand.java b/src/main/java/client/command/commands/gm3/HealPersonCommand.java index 7e03ad41b3..50dcd17601 100644 --- a/src/main/java/client/command/commands/gm3/HealPersonCommand.java +++ b/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) { diff --git a/src/main/java/client/command/commands/gm3/HpMpCommand.java b/src/main/java/client/command/commands/gm3/HpMpCommand.java index 94baeacf56..520886bdb0 100644 --- a/src/main/java/client/command/commands/gm3/HpMpCommand.java +++ b/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; diff --git a/src/main/java/client/command/commands/gm3/HurtCommand.java b/src/main/java/client/command/commands/gm3/HurtCommand.java index 3ef3a655c4..ee4dc87ce0 100644 --- a/src/main/java/client/command/commands/gm3/HurtCommand.java +++ b/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) { diff --git a/src/main/java/client/command/commands/gm3/IgnoreCommand.java b/src/main/java/client/command/commands/gm3/IgnoreCommand.java index 62183d52b5..ccd141a04a 100644 --- a/src/main/java/client/command/commands/gm3/IgnoreCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm3/IgnoredCommand.java b/src/main/java/client/command/commands/gm3/IgnoredCommand.java index 39bc60eca4..a3849c78df 100644 --- a/src/main/java/client/command/commands/gm3/IgnoredCommand.java +++ b/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."); diff --git a/src/main/java/client/command/commands/gm3/InMapCommand.java b/src/main/java/client/command/commands/gm3/InMapCommand.java index 8ad6c6bfcc..e7173b755c 100644 --- a/src/main/java/client/command/commands/gm3/InMapCommand.java +++ b/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()) { diff --git a/src/main/java/client/command/commands/gm3/KillAllCommand.java b/src/main/java/client/command/commands/gm3/KillAllCommand.java index 84c1c6b000..e7c955f8fa 100644 --- a/src/main/java/client/command/commands/gm3/KillAllCommand.java +++ b/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 monsters = map.getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER)); diff --git a/src/main/java/client/command/commands/gm3/KillCommand.java b/src/main/java/client/command/commands/gm3/KillCommand.java index 3baae93d25..aefb43e55a 100644 --- a/src/main/java/client/command/commands/gm3/KillCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm3/KillMapCommand.java b/src/main/java/client/command/commands/gm3/KillMapCommand.java index d51ab22a22..babcb59807 100644 --- a/src/main/java/client/command/commands/gm3/KillMapCommand.java +++ b/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); diff --git a/src/main/java/client/command/commands/gm3/MaxEnergyCommand.java b/src/main/java/client/command/commands/gm3/MaxEnergyCommand.java index 83045bf97e..977bb5f19f 100644 --- a/src/main/java/client/command/commands/gm3/MaxEnergyCommand.java +++ b/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)); diff --git a/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java b/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java index 756357db91..6f31badb81 100644 --- a/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java +++ b/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; diff --git a/src/main/java/client/command/commands/gm3/MonitorCommand.java b/src/main/java/client/command/commands/gm3/MonitorCommand.java index aa9f01f6dc..fd026d7894 100644 --- a/src/main/java/client/command/commands/gm3/MonitorCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm3/MonitorsCommand.java b/src/main/java/client/command/commands/gm3/MonitorsCommand.java index e6a4ef40ec..da604fb0ae 100644 --- a/src/main/java/client/command/commands/gm3/MonitorsCommand.java +++ b/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."); diff --git a/src/main/java/client/command/commands/gm3/MusicCommand.java b/src/main/java/client/command/commands/gm3/MusicCommand.java index 34f747af36..1f3f4f4557 100644 --- a/src/main/java/client/command/commands/gm3/MusicCommand.java +++ b/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) { diff --git a/src/main/java/client/command/commands/gm3/MuteMapCommand.java b/src/main/java/client/command/commands/gm3/MuteMapCommand.java index 2c6e2558dc..f442723bef 100644 --- a/src/main/java/client/command/commands/gm3/MuteMapCommand.java +++ b/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); diff --git a/src/main/java/client/command/commands/gm3/NightCommand.java b/src/main/java/client/command/commands/gm3/NightCommand.java index 26389dba9d..3dfaeb5fe3 100644 --- a/src/main/java/client/command/commands/gm3/NightCommand.java +++ b/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."); diff --git a/src/main/java/client/command/commands/gm3/NoticeCommand.java b/src/main/java/client/command/commands/gm3/NoticeCommand.java index 656ce0fdcf..083365c9af 100644 --- a/src/main/java/client/command/commands/gm3/NoticeCommand.java +++ b/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())); } diff --git a/src/main/java/client/command/commands/gm3/NpcCommand.java b/src/main/java/client/command/commands/gm3/NpcCommand.java index ce867159e3..a8489592da 100644 --- a/src/main/java/client/command/commands/gm3/NpcCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm3/OnlineTwoCommand.java b/src/main/java/client/command/commands/gm3/OnlineTwoCommand.java index f16dbc381b..cdba346eb3 100644 --- a/src/main/java/client/command/commands/gm3/OnlineTwoCommand.java +++ b/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())) { diff --git a/src/main/java/client/command/commands/gm3/OpenPortalCommand.java b/src/main/java/client/command/commands/gm3/OpenPortalCommand.java index b4466597ee..41400b5158 100644 --- a/src/main/java/client/command/commands/gm3/OpenPortalCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm3/PeCommand.java b/src/main/java/client/command/commands/gm3/PeCommand.java index 72c13f18b9..479a72ca99 100644 --- a/src/main/java/client/command/commands/gm3/PeCommand.java +++ b/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 { diff --git a/src/main/java/client/command/commands/gm3/PosCommand.java b/src/main/java/client/command/commands/gm3/PosCommand.java index 4c4611a5da..5928a351e5 100644 --- a/src/main/java/client/command/commands/gm3/PosCommand.java +++ b/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; diff --git a/src/main/java/client/command/commands/gm3/QuestCompleteCommand.java b/src/main/java/client/command/commands/gm3/QuestCompleteCommand.java index 17fa0885db..8a770bcb4c 100644 --- a/src/main/java/client/command/commands/gm3/QuestCompleteCommand.java +++ b/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){ diff --git a/src/main/java/client/command/commands/gm3/QuestResetCommand.java b/src/main/java/client/command/commands/gm3/QuestResetCommand.java index cf650179bf..dbc648a87a 100644 --- a/src/main/java/client/command/commands/gm3/QuestResetCommand.java +++ b/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){ diff --git a/src/main/java/client/command/commands/gm3/QuestStartCommand.java b/src/main/java/client/command/commands/gm3/QuestStartCommand.java index 444c9e3d07..1ddfb7fca3 100644 --- a/src/main/java/client/command/commands/gm3/QuestStartCommand.java +++ b/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){ diff --git a/src/main/java/client/command/commands/gm3/ReloadDropsCommand.java b/src/main/java/client/command/commands/gm3/ReloadDropsCommand.java index 4367379459..14b484cd70 100644 --- a/src/main/java/client/command/commands/gm3/ReloadDropsCommand.java +++ b/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"); diff --git a/src/main/java/client/command/commands/gm3/ReloadEventsCommand.java b/src/main/java/client/command/commands/gm3/ReloadEventsCommand.java index b08b24fcc6..4feeeffa1b 100644 --- a/src/main/java/client/command/commands/gm3/ReloadEventsCommand.java +++ b/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(); diff --git a/src/main/java/client/command/commands/gm3/ReloadMapCommand.java b/src/main/java/client/command/commands/gm3/ReloadMapCommand.java index e0705bc85d..99ea41e5db 100644 --- a/src/main/java/client/command/commands/gm3/ReloadMapCommand.java +++ b/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(); diff --git a/src/main/java/client/command/commands/gm3/ReloadPortalsCommand.java b/src/main/java/client/command/commands/gm3/ReloadPortalsCommand.java index c5d54e169b..44f593c801 100644 --- a/src/main/java/client/command/commands/gm3/ReloadPortalsCommand.java +++ b/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"); diff --git a/src/main/java/client/command/commands/gm3/ReloadShopsCommand.java b/src/main/java/client/command/commands/gm3/ReloadShopsCommand.java index 6bc761a7a5..8b759e7845 100644 --- a/src/main/java/client/command/commands/gm3/ReloadShopsCommand.java +++ b/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(); } } diff --git a/src/main/java/client/command/commands/gm3/RipCommand.java b/src/main/java/client/command/commands/gm3/RipCommand.java index 911af10115..0d17b6d41f 100644 --- a/src/main/java/client/command/commands/gm3/RipCommand.java +++ b/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))); } diff --git a/src/main/java/client/command/commands/gm3/SeedCommand.java b/src/main/java/client/command/commands/gm3/SeedCommand.java index 765bb4278b..9dc32d4b68 100644 --- a/src/main/java/client/command/commands/gm3/SeedCommand.java +++ b/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."); diff --git a/src/main/java/client/command/commands/gm3/SpawnCommand.java b/src/main/java/client/command/commands/gm3/SpawnCommand.java index c027512848..695f42fcc4 100644 --- a/src/main/java/client/command/commands/gm3/SpawnCommand.java +++ b/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 []"); diff --git a/src/main/java/client/command/commands/gm3/StartEventCommand.java b/src/main/java/client/command/commands/gm3/StartEventCommand.java index 9863014e33..ee890d70fb 100644 --- a/src/main/java/client/command/commands/gm3/StartEventCommand.java +++ b/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) diff --git a/src/main/java/client/command/commands/gm3/StartMapEventCommand.java b/src/main/java/client/command/commands/gm3/StartMapEventCommand.java index 202df0ab36..b269c04be6 100644 --- a/src/main/java/client/command/commands/gm3/StartMapEventCommand.java +++ b/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()); } } diff --git a/src/main/java/client/command/commands/gm3/StopMapEventCommand.java b/src/main/java/client/command/commands/gm3/StopMapEventCommand.java index 2046857b29..8b541c6996 100644 --- a/src/main/java/client/command/commands/gm3/StopMapEventCommand.java +++ b/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); } } diff --git a/src/main/java/client/command/commands/gm3/TimerAllCommand.java b/src/main/java/client/command/commands/gm3/TimerAllCommand.java index 606b30b01c..18d0d3a954 100644 --- a/src/main/java/client/command/commands/gm3/TimerAllCommand.java +++ b/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 |remove"); diff --git a/src/main/java/client/command/commands/gm3/TimerCommand.java b/src/main/java/client/command/commands/gm3/TimerCommand.java index 0d56682f80..9c7a5cfb54 100644 --- a/src/main/java/client/command/commands/gm3/TimerCommand.java +++ b/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 |remove"); diff --git a/src/main/java/client/command/commands/gm3/TimerMapCommand.java b/src/main/java/client/command/commands/gm3/TimerMapCommand.java index 540245df86..2456dd682b 100644 --- a/src/main/java/client/command/commands/gm3/TimerMapCommand.java +++ b/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 |remove"); diff --git a/src/main/java/client/command/commands/gm3/ToggleCouponCommand.java b/src/main/java/client/command/commands/gm3/ToggleCouponCommand.java index c8485103b6..03046c04ba 100644 --- a/src/main/java/client/command/commands/gm3/ToggleCouponCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm3/UnBanCommand.java b/src/main/java/client/command/commands/gm3/UnBanCommand.java index 5865424a3f..7f9cf7fe34 100644 --- a/src/main/java/client/command/commands/gm3/UnBanCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm4/BossDropRateCommand.java b/src/main/java/client/command/commands/gm4/BossDropRateCommand.java index 2f80a806d9..4cfddda6be 100644 --- a/src/main/java/client/command/commands/gm4/BossDropRateCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm4/CakeCommand.java b/src/main/java/client/command/commands/gm4/CakeCommand.java index 1aa6c99da6..16d37b99e4 100644 --- a/src/main/java/client/command/commands/gm4/CakeCommand.java +++ b/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) { diff --git a/src/main/java/client/command/commands/gm4/DropRateCommand.java b/src/main/java/client/command/commands/gm4/DropRateCommand.java index bf7399abf0..1a94e3d77e 100644 --- a/src/main/java/client/command/commands/gm4/DropRateCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm4/ExpRateCommand.java b/src/main/java/client/command/commands/gm4/ExpRateCommand.java index ab025517ac..5b363c6927 100644 --- a/src/main/java/client/command/commands/gm4/ExpRateCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm4/FishingRateCommand.java b/src/main/java/client/command/commands/gm4/FishingRateCommand.java index 4cf57d21cd..532d94f649 100644 --- a/src/main/java/client/command/commands/gm4/FishingRateCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm4/ForceVacCommand.java b/src/main/java/client/command/commands/gm4/ForceVacCommand.java index 1e7f9937f8..a9904f3455 100644 --- a/src/main/java/client/command/commands/gm4/ForceVacCommand.java +++ b/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 items = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM)); for (MapleMapObject item : items) { diff --git a/src/main/java/client/command/commands/gm4/HorntailCommand.java b/src/main/java/client/command/commands/gm4/HorntailCommand.java index c236086740..dffe66d390 100644 --- a/src/main/java/client/command/commands/gm4/HorntailCommand.java +++ b/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(); diff --git a/src/main/java/client/command/commands/gm4/ItemVacCommand.java b/src/main/java/client/command/commands/gm4/ItemVacCommand.java index 9c3311e9fd..c904956c8f 100644 --- a/src/main/java/client/command/commands/gm4/ItemVacCommand.java +++ b/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 list = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM)); for (MapleMapObject item : list) { diff --git a/src/main/java/client/command/commands/gm4/MesoRateCommand.java b/src/main/java/client/command/commands/gm4/MesoRateCommand.java index fb1eb57c90..4680c0cefc 100644 --- a/src/main/java/client/command/commands/gm4/MesoRateCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm4/PapCommand.java b/src/main/java/client/command/commands/gm4/PapCommand.java index 9b9baa029c..e423d0ba14 100644 --- a/src/main/java/client/command/commands/gm4/PapCommand.java +++ b/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 diff --git a/src/main/java/client/command/commands/gm4/PianusCommand.java b/src/main/java/client/command/commands/gm4/PianusCommand.java index 361a23dec7..0159e7229f 100644 --- a/src/main/java/client/command/commands/gm4/PianusCommand.java +++ b/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()); } diff --git a/src/main/java/client/command/commands/gm4/PinkbeanCommand.java b/src/main/java/client/command/commands/gm4/PinkbeanCommand.java index 7e1d5aa125..5b365f6f8c 100644 --- a/src/main/java/client/command/commands/gm4/PinkbeanCommand.java +++ b/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()); diff --git a/src/main/java/client/command/commands/gm4/PlayerNpcCommand.java b/src/main/java/client/command/commands/gm4/PlayerNpcCommand.java index 2c1aaaec73..491baaad68 100644 --- a/src/main/java/client/command/commands/gm4/PlayerNpcCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java b/src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java index c7c9f24763..2493b24931 100644 --- a/src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm4/PmobCommand.java b/src/main/java/client/command/commands/gm4/PmobCommand.java index e8d83e3ade..b352294b62 100644 --- a/src/main/java/client/command/commands/gm4/PmobCommand.java +++ b/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 []"); diff --git a/src/main/java/client/command/commands/gm4/PmobRemoveCommand.java b/src/main/java/client/command/commands/gm4/PmobRemoveCommand.java index 715da68206..f2abbea2a0 100644 --- a/src/main/java/client/command/commands/gm4/PmobRemoveCommand.java +++ b/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(); diff --git a/src/main/java/client/command/commands/gm4/PnpcCommand.java b/src/main/java/client/command/commands/gm4/PnpcCommand.java index 9d5206e148..6058c74def 100644 --- a/src/main/java/client/command/commands/gm4/PnpcCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java b/src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java index 8ea17ada56..bf41fee68a 100644 --- a/src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java +++ b/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(); diff --git a/src/main/java/client/command/commands/gm4/ProItemCommand.java b/src/main/java/client/command/commands/gm4/ProItemCommand.java index 2259ea391b..de710159a0 100644 --- a/src/main/java/client/command/commands/gm4/ProItemCommand.java +++ b/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 []"); diff --git a/src/main/java/client/command/commands/gm4/QuestRateCommand.java b/src/main/java/client/command/commands/gm4/QuestRateCommand.java index 7b54ec2a3c..c880d7a166 100644 --- a/src/main/java/client/command/commands/gm4/QuestRateCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm4/ServerMessageCommand.java b/src/main/java/client/command/commands/gm4/ServerMessageCommand.java index bfb1481451..2fd43e483c 100644 --- a/src/main/java/client/command/commands/gm4/ServerMessageCommand.java +++ b/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()); } diff --git a/src/main/java/client/command/commands/gm4/SetEqStatCommand.java b/src/main/java/client/command/commands/gm4/SetEqStatCommand.java index 3549ca2bf8..b4b1832871 100644 --- a/src/main/java/client/command/commands/gm4/SetEqStatCommand.java +++ b/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 []"); diff --git a/src/main/java/client/command/commands/gm4/TravelRateCommand.java b/src/main/java/client/command/commands/gm4/TravelRateCommand.java index 6d988b14d3..aabb8605aa 100644 --- a/src/main/java/client/command/commands/gm4/TravelRateCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm4/ZakumCommand.java b/src/main/java/client/command/commands/gm4/ZakumCommand.java index 74b03ad936..2360a14314 100644 --- a/src/main/java/client/command/commands/gm4/ZakumCommand.java +++ b/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++) { diff --git a/src/main/java/client/command/commands/gm5/DebugCommand.java b/src/main/java/client/command/commands/gm5/DebugCommand.java index 9523376eca..f45afbc08a 100644 --- a/src/main/java/client/command/commands/gm5/DebugCommand.java +++ b/src/main/java/client/command/commands/gm5/DebugCommand.java @@ -24,7 +24,7 @@ package client.command.commands.gm5; import client.Character; -import client.MapleClient; +import client.Client; import client.command.Command; import net.server.Server; import server.TimerManager; @@ -47,7 +47,7 @@ public class DebugCommand 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) { diff --git a/src/main/java/client/command/commands/gm5/IpListCommand.java b/src/main/java/client/command/commands/gm5/IpListCommand.java index 35a19376ab..3d3a8bfd00 100644 --- a/src/main/java/client/command/commands/gm5/IpListCommand.java +++ b/src/main/java/client/command/commands/gm5/IpListCommand.java @@ -20,7 +20,7 @@ package client.command.commands.gm5; import client.Character; -import client.MapleClient; +import client.Client; import client.command.Command; import constants.game.GameConstants; import net.server.Server; @@ -40,7 +40,7 @@ public class IpListCommand extends Command { } @Override - public void execute(MapleClient c, String[] params) { + public void execute(Client c, String[] params) { String str = "Player-IP relation:"; for (World w : Server.getInstance().getWorlds()) { diff --git a/src/main/java/client/command/commands/gm5/SetCommand.java b/src/main/java/client/command/commands/gm5/SetCommand.java index f45a853011..f42dd1fb1b 100644 --- a/src/main/java/client/command/commands/gm5/SetCommand.java +++ b/src/main/java/client/command/commands/gm5/SetCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm5; -import client.MapleClient; +import client.Client; import client.command.Command; import constants.net.ServerConstants; @@ -33,7 +33,7 @@ public class SetCommand extends Command { } @Override - public void execute(MapleClient c, String[] params) { + public void execute(Client c, String[] params) { for (int i = 0; i < params.length; i++) { ServerConstants.DEBUG_VALUES[i] = Integer.parseInt(params[i]); } diff --git a/src/main/java/client/command/commands/gm5/ShowMoveLifeCommand.java b/src/main/java/client/command/commands/gm5/ShowMoveLifeCommand.java index 6ec83ce001..d269cc956f 100644 --- a/src/main/java/client/command/commands/gm5/ShowMoveLifeCommand.java +++ b/src/main/java/client/command/commands/gm5/ShowMoveLifeCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm5; -import client.MapleClient; +import client.Client; import client.command.Command; import config.YamlConfig; @@ -33,7 +33,7 @@ public class ShowMoveLifeCommand extends Command { } @Override - public void execute(MapleClient c, String[] params) { + public void execute(Client c, String[] params) { YamlConfig.config.server.USE_DEBUG_SHOW_RCVD_MVLIFE = !YamlConfig.config.server.USE_DEBUG_SHOW_RCVD_MVLIFE; } } diff --git a/src/main/java/client/command/commands/gm5/ShowPacketsCommand.java b/src/main/java/client/command/commands/gm5/ShowPacketsCommand.java index 8e955e8043..03bf3bf49e 100644 --- a/src/main/java/client/command/commands/gm5/ShowPacketsCommand.java +++ b/src/main/java/client/command/commands/gm5/ShowPacketsCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm5; -import client.MapleClient; +import client.Client; import client.command.Command; import config.YamlConfig; @@ -33,7 +33,7 @@ public class ShowPacketsCommand extends Command { } @Override - public void execute(MapleClient c, String[] params) { + public void execute(Client c, String[] params) { YamlConfig.config.server.USE_DEBUG_SHOW_RCVD_PACKET = !YamlConfig.config.server.USE_DEBUG_SHOW_RCVD_PACKET; } } diff --git a/src/main/java/client/command/commands/gm5/ShowSessionsCommand.java b/src/main/java/client/command/commands/gm5/ShowSessionsCommand.java index 71d31c9982..6116f99d21 100644 --- a/src/main/java/client/command/commands/gm5/ShowSessionsCommand.java +++ b/src/main/java/client/command/commands/gm5/ShowSessionsCommand.java @@ -19,7 +19,7 @@ */ package client.command.commands.gm5; -import client.MapleClient; +import client.Client; import client.command.Command; import net.server.coordinator.session.SessionCoordinator; @@ -33,7 +33,7 @@ public class ShowSessionsCommand extends Command { } @Override - public void execute(MapleClient c, String[] params) { + public void execute(Client c, String[] params) { SessionCoordinator.getInstance().printSessionTrace(c); } } diff --git a/src/main/java/client/command/commands/gm6/ClearQuestCacheCommand.java b/src/main/java/client/command/commands/gm6/ClearQuestCacheCommand.java index 211a6a67e6..1fc3582286 100644 --- a/src/main/java/client/command/commands/gm6/ClearQuestCacheCommand.java +++ b/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."); diff --git a/src/main/java/client/command/commands/gm6/ClearQuestCommand.java b/src/main/java/client/command/commands/gm6/ClearQuestCommand.java index 787529009b..19c5fbb16b 100644 --- a/src/main/java/client/command/commands/gm6/ClearQuestCommand.java +++ b/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."); diff --git a/src/main/java/client/command/commands/gm6/DCAllCommand.java b/src/main/java/client/command/commands/gm6/DCAllCommand.java index 6aa0b9b8bc..f8298a4534 100644 --- a/src/main/java/client/command/commands/gm6/DCAllCommand.java +++ b/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()) { diff --git a/src/main/java/client/command/commands/gm6/EraseAllPNpcsCommand.java b/src/main/java/client/command/commands/gm6/EraseAllPNpcsCommand.java index 517c085826..6ee51ffd82 100644 --- a/src/main/java/client/command/commands/gm6/EraseAllPNpcsCommand.java +++ b/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(); } } diff --git a/src/main/java/client/command/commands/gm6/GetAccCommand.java b/src/main/java/client/command/commands/gm6/GetAccCommand.java index a12e44bcf6..00b81c69ac 100644 --- a/src/main/java/client/command/commands/gm6/GetAccCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm6/MapPlayersCommand.java b/src/main/java/client/command/commands/gm6/MapPlayersCommand.java index bf580cb018..2404bd9bc0 100644 --- a/src/main/java/client/command/commands/gm6/MapPlayersCommand.java +++ b/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(); diff --git a/src/main/java/client/command/commands/gm6/SaveAllCommand.java b/src/main/java/client/command/commands/gm6/SaveAllCommand.java index 9155cf8f9b..28df7b456f 100644 --- a/src/main/java/client/command/commands/gm6/SaveAllCommand.java +++ b/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()) { diff --git a/src/main/java/client/command/commands/gm6/ServerAddChannelCommand.java b/src/main/java/client/command/commands/gm6/ServerAddChannelCommand.java index 75615ad3f2..0f58fedea1 100644 --- a/src/main/java/client/command/commands/gm6/ServerAddChannelCommand.java +++ b/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) { diff --git a/src/main/java/client/command/commands/gm6/ServerAddWorldCommand.java b/src/main/java/client/command/commands/gm6/ServerAddWorldCommand.java index 737d419167..a177cedb48 100644 --- a/src/main/java/client/command/commands/gm6/ServerAddWorldCommand.java +++ b/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(() -> { diff --git a/src/main/java/client/command/commands/gm6/ServerRemoveChannelCommand.java b/src/main/java/client/command/commands/gm6/ServerRemoveChannelCommand.java index 35dce0e49e..16958a5e29 100644 --- a/src/main/java/client/command/commands/gm6/ServerRemoveChannelCommand.java +++ b/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) { diff --git a/src/main/java/client/command/commands/gm6/ServerRemoveWorldCommand.java b/src/main/java/client/command/commands/gm6/ServerRemoveWorldCommand.java index 9e8df91d1a..f9df512306 100644 --- a/src/main/java/client/command/commands/gm6/ServerRemoveWorldCommand.java +++ b/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; diff --git a/src/main/java/client/command/commands/gm6/SetGmLevelCommand.java b/src/main/java/client/command/commands/gm6/SetGmLevelCommand.java index 7bdb42305e..9387ac0cb8 100644 --- a/src/main/java/client/command/commands/gm6/SetGmLevelCommand.java +++ b/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 "); diff --git a/src/main/java/client/command/commands/gm6/ShutdownCommand.java b/src/main/java/client/command/commands/gm6/ShutdownCommand.java index acd7169b85..948ebe0994 100644 --- a/src/main/java/client/command/commands/gm6/ShutdownCommand.java +++ b/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 [