Switch to Maven file structure

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

@@ -0,0 +1,48 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.MapleClient;
+import client.command.Command;
+import client.processor.action.BuybackProcessor;
+
+public class BuyBackCommand extends Command {
+    {
+        setDescription("");
+    }
+    
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        if (params.length < 1) {
+            c.getPlayer().yellowMessage("Syntax: @buyback <info|now>");
+            return;
+        }
+        
+        if (params[0].contentEquals("now")) {
+            BuybackProcessor.processBuyback(c);
+        } else {
+            c.getPlayer().showBuybackInfo();
+        }
+    }
+}

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

@@ -0,0 +1,42 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.command.Command;
+import client.MapleClient;
+
+public class ChangeLanguageCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        if (params.length < 1) {
+            c.getPlayer().yellowMessage("Syntax: !changel <0=ptb, 1=esp, 2=eng>");
+            return;
+        }
+        c.setLanguage(Integer.parseInt(params[0]));
+    }
+}

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

@@ -0,0 +1,45 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.command.Command;
+import client.MapleClient;
+import scripting.npc.NPCScriptManager;
+import scripting.quest.QuestScriptManager;
+import tools.MaplePacketCreator;
+
+public class DisposeCommand extends Command {
+    {
+        setDescription("");
+    }
+    
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        NPCScriptManager.getInstance().dispose(c);
+        QuestScriptManager.getInstance().dispose(c);
+        c.announce(MaplePacketCreator.enableActions());
+        c.removeClickedNPC();
+        c.getPlayer().message("You've been disposed.");
+    }
+}

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

@@ -0,0 +1,45 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.MapleClient;
+import client.command.Command;
+import config.YamlConfig;
+
+public class DropLimitCommand extends Command {
+    {
+        setDescription("");
+    }
+    
+    @Override
+    public void execute(MapleClient 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);
+        } else {
+            c.getPlayer().showHint("Current drop count: #r" + dropCount + "#k / #e" + YamlConfig.config.server.ITEM_LIMIT_ON_MAP + "#n", 300);
+        }
+
+    }
+}

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

@@ -0,0 +1,45 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.command.Command;
+import client.MapleClient;
+import net.server.coordinator.login.MapleLoginBypassCoordinator;
+
+public class EnableAuthCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        if (c.tryacquireClient()) {
+            try {
+                MapleLoginBypassCoordinator.getInstance().unregisterLoginBypassEntry(c.getNibbleHWID(), c.getAccID());
+            } finally {
+                c.releaseClient();
+            }
+        }
+    }
+}

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

@@ -0,0 +1,38 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.command.Command;
+import client.MapleClient;
+
+public class EquipLvCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        c.getPlayer().showAllEquipFeatures();
+    }
+}

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

@@ -0,0 +1,66 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.command.Command;
+import client.MapleClient;
+import server.MapleItemInformationProvider;
+import server.gachapon.MapleGachapon;
+
+public class GachaCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleGachapon.Gachapon gacha = null;
+        String search = c.getPlayer().getLastCommandMessage();
+        String gachaName = "";
+        String [] names = {"Henesys", "Ellinia", "Perion", "Kerning City", "Sleepywood", "Mushroom Shrine", "Showa Spa Male", "Showa Spa Female", "New Leaf City", "Nautilus Harbor"};
+        int [] ids = {9100100, 9100101, 9100102, 9100103, 9100104, 9100105, 9100106, 9100107, 9100109, 9100117};
+        for (int i = 0; i < names.length; i++){
+            if (search.equalsIgnoreCase(names[i])){
+                gachaName = names[i];
+                gacha = MapleGachapon.Gachapon.getByNpcId(ids[i]);
+            }
+        }
+        if (gacha == null){
+            c.getPlayer().yellowMessage("Please use @gacha <name> where name corresponds to one of the below:");
+            for (String name : names){
+                c.getPlayer().yellowMessage(name);
+            }
+            return;
+        }
+        String talkStr = "The #b" + gachaName + "#k Gachapon contains the following items.\r\n\r\n";
+        for (int i = 0; i < 2; i++){
+            for (int id : gacha.getItems(i)){
+                talkStr += "-" + MapleItemInformationProvider.getInstance().getName(id) + "\r\n";
+            }
+        }
+        talkStr += "\r\nPlease keep in mind that there are items that are in all gachapons and are not listed here.";
+        
+        c.getAbstractPlayerInteraction().npcTalk(9010000, talkStr);
+    }
+}

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

@@ -0,0 +1,60 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.MapleCharacter;
+import client.command.Command;
+import client.MapleClient;
+import net.server.Server;
+import tools.FilePrinter;
+import tools.MaplePacketCreator;
+import tools.Randomizer;
+
+public class GmCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient 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.",
+                "Please do not use @gm to ask if a GM is online.",
+                "Do not ask if you can receive help, just state your issue.",
+                "Do not say 'I have a bug to report', just state it.",
+        };
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1 || params[0].length() < 3) { // #goodbye 'hi'
+            player.dropMessage(5, "Your message was too short. Please provide as much detail as possible.");
+            return;
+        }
+        String message = player.getLastCommandMessage();
+        Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.sendYellowTip("[GM Message]:" + MapleCharacter.makeMapleReadable(player.getName()) + ": " + message));
+        Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(1, message));
+        FilePrinter.printError(FilePrinter.COMMAND_GM, MapleCharacter.makeMapleReadable(player.getName()) + ": " + message);
+        player.dropMessage(5, "Your message '" + message + "' was sent to GMs.");
+        player.dropMessage(5, tips[Randomizer.nextInt(tips.length)]);
+    }
+}

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

@@ -0,0 +1,38 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.MapleClient;
+import client.command.Command;
+
+public class HelpCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient client, String[] params) {
+        client.getAbstractPlayerInteraction().openNpc(9201143, "commands");
+    }
+}

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

@@ -0,0 +1,67 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.MapleCharacter;
+import client.command.Command;
+import client.MapleClient;
+import server.events.gm.MapleEvent;
+import server.maps.FieldLimit;
+
+public class JoinEventCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if(!FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) {
+            MapleEvent event = c.getChannelServer().getEvent();
+            if(event != null) {
+                if(event.getMapId() != player.getMapId()) {
+                    if(event.getLimit() > 0) {
+                        player.saveLocation("EVENT");
+
+                        if(event.getMapId() == 109080000 || event.getMapId() == 109060001)
+                            player.setTeam(event.getLimit() % 2);
+
+                        event.minusLimit();
+
+                        player.saveLocationOnWarp();
+                        player.changeMap(event.getMapId());
+                    } else {
+                        player.dropMessage(5, "The limit of players for the event has already been reached.");
+                    }
+                } else {
+                    player.dropMessage(5, "You are already in the event.");
+                }
+            } else {
+                player.dropMessage(5, "There is currently no event in progress.");
+            }
+        } else {
+            player.dropMessage(5, "You are currently in a map where you can't join an event.");
+        }
+    }
+}

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

@@ -0,0 +1,59 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.MapleCharacter;
+import client.command.Command;
+import client.MapleClient;
+
+public class LeaveEventCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        int returnMap = player.getSavedLocation("EVENT");
+        if(returnMap != -1) {
+            if(player.getOla() != null) {
+                player.getOla().resetTimes();
+                player.setOla(null);
+            }
+            if(player.getFitness() != null) {
+                player.getFitness().resetTimes();
+                player.setFitness(null);
+            }
+
+            player.saveLocationOnWarp();
+            player.changeMap(returnMap);
+            if(c.getChannelServer().getEvent() != null) {
+                c.getChannelServer().getEvent().addLimit();
+            }
+        } else {
+            player.dropMessage(5, "You are not currently in an event.");
+        }
+
+    }
+}

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

@@ -0,0 +1,76 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Ronan
+*/
+package client.command.commands.gm0;
+
+import client.command.Command;
+import client.MapleCharacter;
+import client.MapleClient;
+import config.YamlConfig;
+import server.maps.MapleMap;
+
+public class MapOwnerClaimCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        if (c.tryacquireClient()) {
+            try {
+                MapleCharacter chr = c.getPlayer();
+                
+                if (YamlConfig.config.server.USE_MAP_OWNERSHIP_SYSTEM) {
+                    if (chr.getEventInstance() == null) {
+                        MapleMap map = chr.getMap();
+                        if (map.countBosses() == 0) {   // thanks Conrad for suggesting bosses prevent map leasing
+                            MapleMap ownedMap = chr.getOwnedMap();  // thanks Conrad for suggesting not unlease a map as soon as player exits it
+                            if (ownedMap != null) {
+                                ownedMap.unclaimOwnership(chr);
+
+                                if (map == ownedMap) {
+                                    chr.dropMessage(5, "This lawn is now free real estate.");
+                                    return;
+                                }
+                            }
+
+                            if (map.claimOwnership(chr)) {
+                                chr.dropMessage(5, "You have leased this lawn for a while, until you leave here or after 1 minute of inactivity.");
+                            } else {
+                                chr.dropMessage(5, "This lawn has already been leased by a player.");
+                            }
+                        } else {
+                            chr.dropMessage(5, "This lawn is currently under a boss siege.");
+                        }
+                    } else {
+                        chr.dropMessage(5, "This lawn cannot be leased.");
+                    }
+                } else {
+                    chr.dropMessage(5, "Feature unavailable.");
+                }
+            } finally {
+                c.releaseClient();
+            }
+        }
+    }
+}

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

@@ -0,0 +1,49 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.MapleCharacter;
+import client.command.Command;
+import client.MapleClient;
+import net.server.Server;
+import net.server.channel.Channel;
+
+public class OnlineCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        for (Channel ch : Server.getInstance().getChannelsFromWorld(player.getWorld())) {
+            player.yellowMessage("Players in Channel " + ch.getId() + ":");
+            for (MapleCharacter chr : ch.getPlayerStorage().getAllCharacters()) {
+                if (!chr.isGM()) {
+                    player.message(" >> " + MapleCharacter.makeMapleReadable(chr.getName()) + " is at " + chr.getMap().getMapName() + ".");
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,47 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.MapleCharacter;
+import client.command.Command;
+import client.MapleClient;
+import net.server.Server;
+import tools.MaplePacketCreator;
+
+import java.util.List;
+import tools.Pair;
+
+public class RanksCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        
+        List<Pair<String, Integer>> worldRanking = Server.getInstance().getWorldPlayerRanking(player.getWorld());
+        player.announce(MaplePacketCreator.showPlayerRanks(9010000, worldRanking));
+    }
+}

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

@@ -0,0 +1,50 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.MapleCharacter;
+import client.command.Command;
+import client.MapleClient;
+import config.YamlConfig;
+
+public class RatesCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        
+        // travel rates not applicable since it's intrinsically a server/environment rate rather than a character rate
+        String showMsg_ = "#eCHARACTER RATES#n" + "\r\n\r\n";
+        showMsg_ += "EXP Rate: #e#b" + player.getExpRate() + "x#k#n" + (player.hasNoviceExpRate() ? " - novice rate" : "") + "\r\n";
+        showMsg_ += "MESO Rate: #e#b" + player.getMesoRate() + "x#k#n" + "\r\n";
+        showMsg_ += "DROP Rate: #e#b" + player.getDropRate() + "x#k#n" + "\r\n";
+        showMsg_ += "BOSS DROP Rate: #e#b" + player.getBossDropRate() + "x#k#n" + "\r\n";
+        if(YamlConfig.config.server.USE_QUEST_RATE) showMsg_ += "QUEST Rate: #e#b" + c.getWorldServer().getQuestRate() + "x#k#n" + "\r\n";
+
+        player.showHint(showMsg_, 300);
+    }
+}

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

@@ -0,0 +1,38 @@
+package client.command.commands.gm0;
+
+import client.MapleCharacter;
+import client.MapleClient;
+import client.command.Command;
+
+public class ReadPointsCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient client, String[] params) {
+
+        MapleCharacter player = client.getPlayer();
+        if (params.length > 2) {
+            player.yellowMessage("Syntax: @points (rp|vp|all)");
+            return;
+        } else if (params.length == 0) {
+            player.yellowMessage("RewardPoints: " + player.getRewardPoints() + " | "
+                    + "VotePoints: " + player.getClient().getVotePoints());
+            return;
+        }
+
+        switch (params[0]) {
+            case "rp":
+                player.yellowMessage("RewardPoints: " + player.getRewardPoints());
+                break;
+            case "vp":
+                player.yellowMessage("VotePoints: " + player.getClient().getVotePoints());
+                break;
+            default:
+                player.yellowMessage("RewardPoints: " + player.getRewardPoints() + " | "
+                        + "VotePoints: " + player.getClient().getVotePoints());
+                break;
+        }
+    }
+}

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

@@ -0,0 +1,53 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.MapleCharacter;
+import client.command.Command;
+import client.MapleClient;
+import net.server.Server;
+import tools.FilePrinter;
+import tools.MaplePacketCreator;
+
+public class ReportBugCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+
+        if (params.length < 1) {
+            player.dropMessage(5, "Message too short and not sent. Please do @bug <bug>");
+            return;
+        }
+        String message = player.getLastCommandMessage();
+        Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.sendYellowTip("[Bug]:" + MapleCharacter.makeMapleReadable(player.getName()) + ": " + message));
+        Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(1, message));
+        FilePrinter.printError(FilePrinter.COMMAND_BUG, MapleCharacter.makeMapleReadable(player.getName()) + ": " + message);
+        player.dropMessage(5, "Your bug '" + message + "' was submitted successfully to our developers. Thank you!");
+
+    }
+}

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

@@ -0,0 +1,73 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.MapleCharacter;
+import client.command.Command;
+import client.MapleClient;
+import config.YamlConfig;
+
+public class ShowRatesCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        String showMsg = "#eEXP RATE#n" + "\r\n";
+        showMsg += "World EXP Rate: #k" + c.getWorldServer().getExpRate() + "x#k" + "\r\n";
+        showMsg += "Player EXP Rate: #k" + player.getRawExpRate() + "x#k" + "\r\n";
+        if(player.getCouponExpRate() != 1) showMsg += "Coupon EXP Rate: #k" + player.getCouponExpRate() + "x#k" + "\r\n";
+        showMsg += "EXP Rate: #e#b" + player.getExpRate() + "x#k#n" + (player.hasNoviceExpRate() ? " - novice rate" : "") + "\r\n";
+
+        showMsg += "\r\n" + "#eMESO RATE#n" + "\r\n";
+        showMsg += "World MESO Rate: #k" + c.getWorldServer().getMesoRate() + "x#k" + "\r\n";
+        showMsg += "Player MESO Rate: #k" + player.getRawMesoRate() + "x#k" + "\r\n";
+        if(player.getCouponMesoRate() != 1) showMsg += "Coupon MESO Rate: #k" + player.getCouponMesoRate() + "x#k" + "\r\n";
+        showMsg += "MESO Rate: #e#b" + player.getMesoRate() + "x#k#n" + "\r\n";
+
+        showMsg += "\r\n" + "#eDROP RATE#n" + "\r\n";
+        showMsg += "World DROP Rate: #k" + c.getWorldServer().getDropRate() + "x#k" + "\r\n";
+        showMsg += "Player DROP Rate: #k" + player.getRawDropRate() + "x#k" + "\r\n";
+        if(player.getCouponDropRate() != 1) showMsg += "Coupon DROP Rate: #k" + player.getCouponDropRate() + "x#k" + "\r\n";
+        showMsg += "DROP Rate: #e#b" + player.getDropRate() + "x#k#n" + "\r\n";
+        
+        showMsg += "\r\n" + "#eBOSS DROP RATE#n" + "\r\n";
+        showMsg += "World BOSS DROP Rate: #k" + c.getWorldServer().getBossDropRate() + "x#k" + "\r\n";
+        showMsg += "Player DROP Rate: #k" + player.getRawDropRate() + "x#k" + "\r\n";
+        if(player.getCouponDropRate() != 1) showMsg += "Coupon DROP Rate: #k" + player.getCouponDropRate() + "x#k" + "\r\n";
+        showMsg += "BOSS DROP Rate: #e#b" + player.getBossDropRate() + "x#k#n" + "\r\n";
+
+        if(YamlConfig.config.server.USE_QUEST_RATE) {
+            showMsg += "\r\n" + "#eQUEST RATE#n" + "\r\n";
+            showMsg += "World QUEST Rate: #e#b" + c.getWorldServer().getQuestRate() + "x#k#n" + "\r\n";
+        }
+        
+        showMsg += "\r\n";
+        showMsg += "World TRAVEL Rate: #e#b" + c.getWorldServer().getTravelRate() + "x#k#n" + "\r\n";
+
+        player.showHint(showMsg, 300);
+    }
+}

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

@@ -0,0 +1,38 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.MapleClient;
+import client.command.Command;
+
+public class StaffCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        c.getAbstractPlayerInteraction().openNpc(2010007, "credits");
+    }
+}

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

@@ -0,0 +1,56 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.MapleCharacter;
+import client.MapleClient;
+import client.command.Command;
+import config.YamlConfig;
+
+public class StatDexCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        int remainingAp = player.getRemainingAp();
+
+        int amount;
+        if (params.length > 0) {
+            try {
+                amount = Math.min(Integer.parseInt(params[0]), remainingAp);
+            } catch (NumberFormatException e) {
+                player.dropMessage("That is not a valid number!");
+                return;
+            }
+        } else {
+            amount = Math.min(remainingAp, YamlConfig.config.server.MAX_AP - player.getDex());
+        }
+        if (!player.assignDex(Math.max(amount, 0))) {
+            player.dropMessage("Please make sure your AP is not over " + YamlConfig.config.server.MAX_AP + " and you have enough to distribute.");
+        }
+    }
+}

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

@@ -0,0 +1,56 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import config.YamlConfig;
+
+public class StatIntCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        int remainingAp = player.getRemainingAp();
+
+        int amount;
+        if (params.length > 0) {
+            try {
+                amount = Math.min(Integer.parseInt(params[0]), remainingAp);
+            } catch (NumberFormatException e) {
+                player.dropMessage("That is not a valid number!");
+                return;
+            }
+        } else {
+            amount = Math.min(remainingAp, YamlConfig.config.server.MAX_AP - player.getInt());
+        }
+        if (!player.assignInt(Math.max(amount, 0))) {
+            player.dropMessage("Please make sure your AP is not over " + YamlConfig.config.server.MAX_AP + " and you have enough to distribute.");
+        }
+    }
+}

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

@@ -0,0 +1,56 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.MapleCharacter;
+import client.MapleClient;
+import client.command.Command;
+import config.YamlConfig;
+
+public class StatLukCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        int remainingAp = player.getRemainingAp();
+
+        int amount;
+        if (params.length > 0) {
+            try {
+                amount = Math.min(Integer.parseInt(params[0]), remainingAp);
+            } catch (NumberFormatException e) {
+                player.dropMessage("That is not a valid number!");
+                return;
+            }
+        } else {
+            amount = Math.min(remainingAp, YamlConfig.config.server.MAX_AP - player.getLuk());
+        }
+        if (!player.assignLuk(Math.max(amount, 0))) {
+            player.dropMessage("Please make sure your AP is not over " + YamlConfig.config.server.MAX_AP + " and you have enough to distribute.");
+        }
+    }
+}

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

@@ -0,0 +1,56 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import config.YamlConfig;
+
+public class StatStrCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        int remainingAp = player.getRemainingAp();
+        int amount;
+        if (params.length > 0) {
+            try {
+                amount = Math.min(Integer.parseInt(params[0]), remainingAp);
+            } catch (NumberFormatException e) {
+                player.dropMessage("That is not a valid number!");
+                return;
+            }
+        } else {
+            amount = Math.min(remainingAp, YamlConfig.config.server.MAX_AP - player.getStr());
+        }
+        
+        if (!player.assignStr(Math.max(amount, 0))) {
+            player.dropMessage("Please make sure your AP is not over " + YamlConfig.config.server.MAX_AP + " and you have enough to distribute.");
+        }
+    }
+}

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

@@ -0,0 +1,45 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.MapleClient;
+import client.command.Command;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+
+public class TimeCommand extends Command {
+    {
+        setDescription("");
+    }
+    
+    @Override
+    public void execute(MapleClient client, String[] params) {
+        DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
+        dateFormat.setTimeZone(TimeZone.getDefault());
+        client.getPlayer().yellowMessage("Cosmic Server Time: " + dateFormat.format(new Date()));
+    }
+}

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

@@ -0,0 +1,44 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Ronan
+*/
+package client.command.commands.gm0;
+
+import client.command.Command;
+import client.MapleClient;
+
+public class ToggleExpCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        if (c.tryacquireClient()) {
+            try {
+                c.getPlayer().toggleExpGain();  // Vcoc's idea
+            } finally {
+                c.releaseClient();
+            }
+        }
+    }
+}

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

@@ -0,0 +1,44 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm0;
+
+import client.command.Command;
+import client.MapleClient;
+import net.server.Server;
+
+public class UptimeCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        long milliseconds = System.currentTimeMillis() - Server.uptime;
+        int seconds = (int) (milliseconds / 1000) % 60 ;
+        int minutes = (int) ((milliseconds / (1000*60)) % 60);
+        int hours   = (int) ((milliseconds / (1000*60*60)) % 24);
+        int days    = (int) ((milliseconds / (1000*60*60*24)));
+        c.getPlayer().yellowMessage("Server has been online for " + days + " days " + hours + " hours " + minutes + " minutes and " + seconds + " seconds.");
+    }
+}

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

@@ -0,0 +1,52 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm1;
+
+import client.MapleCharacter;
+import client.command.Command;
+import client.MapleClient;
+import server.life.MapleMonster;
+
+public class BossHpCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        for(MapleMonster monster : player.getMap().getAllMonsters()) {
+            if(monster != null && monster.isBoss() && monster.getHp() > 0) {
+                long percent = monster.getHp() * 100L / monster.getMaxHp();
+                String bar = "[";
+                for (int i = 0; i < 100; i++){
+                    bar += i < percent ? "|" : ".";
+                }
+                bar += "]";
+                player.yellowMessage(monster.getName() + " (" + monster.getId() + ") has " + percent + "% HP left.");
+                player.yellowMessage("HP: " + bar);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,46 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm1;
+
+import client.MapleCharacter;
+import client.SkillFactory;
+import client.command.Command;
+import client.MapleClient;
+
+public class BuffMeCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        SkillFactory.getSkill(4101004).getEffect(SkillFactory.getSkill(4101004).getMaxLevel()).applyTo(player);
+        SkillFactory.getSkill(2311003).getEffect(SkillFactory.getSkill(2311003).getMaxLevel()).applyTo(player);
+        SkillFactory.getSkill(1301007).getEffect(SkillFactory.getSkill(1301007).getMaxLevel()).applyTo(player);
+        SkillFactory.getSkill(2301004).getEffect(SkillFactory.getSkill(2301004).getMaxLevel()).applyTo(player);
+        SkillFactory.getSkill(1005).getEffect(SkillFactory.getSkill(1005).getMaxLevel()).applyTo(player);
+        player.healHpMp();
+    }
+}

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

@@ -0,0 +1,136 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm1;
+
+import client.MapleCharacter;
+import client.command.Command;
+import client.MapleClient;
+import constants.game.GameConstants;
+import java.util.ArrayList;
+import java.util.Collections;
+import server.maps.MaplePortal;
+import server.maps.FieldLimit;
+import server.maps.MapleMap;
+import server.maps.MapleMapFactory;
+import server.maps.MapleMiniDungeonInfo;
+
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+public class GotoCommand extends Command {
+    
+    {
+        setDescription("");
+        
+        List<Entry<String, Integer>> towns = new ArrayList<>(GameConstants.GOTO_TOWNS.entrySet());
+        sortGotoEntries(towns);
+        
+        try {
+            // thanks shavit for noticing goto areas getting loaded from wz needlessly only for the name retrieval
+            
+            for (Map.Entry<String, Integer> e : towns) {
+                GOTO_TOWNS_INFO += ("'" + e.getKey() + "' - #b" + (MapleMapFactory.loadPlaceName(e.getValue())) + "#k\r\n");
+            }
+
+            List<Entry<String, Integer>> areas = new ArrayList<>(GameConstants.GOTO_AREAS.entrySet());
+            sortGotoEntries(areas);
+            for (Map.Entry<String, Integer> e : areas) {
+                GOTO_AREAS_INFO += ("'" + e.getKey() + "' - #b" + (MapleMapFactory.loadPlaceName(e.getValue())) + "#k\r\n");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            
+            GOTO_TOWNS_INFO = "(none)";
+            GOTO_AREAS_INFO = "(none)";
+        }
+        
+    }
+    
+    public static String GOTO_TOWNS_INFO = "";
+    public static String GOTO_AREAS_INFO = "";
+    
+    private static void sortGotoEntries(List<Entry<String, Integer>> listEntries) {
+        Collections.sort(listEntries, new Comparator<Entry<String, Integer>>() {
+            @Override
+            public int compare(Entry<String, Integer> e1, Entry<String, Integer> e2)
+            {
+                return e1.getValue().compareTo(e2.getValue());
+            }
+        });
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1){
+            String sendStr = "Syntax: #b@goto <map name>#k. Available areas:\r\n\r\n#rTowns:#k\r\n" + GOTO_TOWNS_INFO;
+            if (player.isGM()) {
+                sendStr += ("\r\n#rAreas:#k\r\n" + GOTO_AREAS_INFO);
+            }
+            
+            player.getAbstractPlayerInteraction().npcTalk(9000020, sendStr);
+            return;
+        }
+        
+        if (!player.isAlive()) {
+            player.dropMessage(1, "This command cannot be used when you're dead.");
+            return;
+        }
+
+        if (!player.isGM()) {
+            if (player.getEventInstance() != null || MapleMiniDungeonInfo.isDungeonMap(player.getMapId()) || FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) {
+                player.dropMessage(1, "This command can not be used in this map.");
+                return;
+            }
+        }
+
+        HashMap<String, Integer> gotomaps;
+        if (player.isGM()) {
+            gotomaps = new HashMap<>(GameConstants.GOTO_AREAS);     // distinct map registry for GM/users suggested thanks to Vcoc
+            gotomaps.putAll(GameConstants.GOTO_TOWNS);  // thanks Halcyon (UltimateMors) for pointing out duplicates on listed entries functionality
+        } else {
+            gotomaps = GameConstants.GOTO_TOWNS;
+        }
+        
+        if (gotomaps.containsKey(params[0])) {
+            MapleMap target = c.getChannelServer().getMapFactory().getMap(gotomaps.get(params[0]));
+            
+            // expedition issue with this command detected thanks to Masterrulax
+            MaplePortal targetPortal = target.getRandomPlayerSpawnpoint();
+            player.saveLocationOnWarp();
+            player.changeMap(target, targetPortal);
+        } else {
+            // detailed info on goto available areas suggested thanks to Vcoc
+            String sendStr = "Area '#r" + params[0] + "#k' is not available. Available areas:\r\n\r\n#rTowns:#k" + GOTO_TOWNS_INFO;
+            if (player.isGM()) {
+                sendStr += ("\r\n#rAreas:#k\r\n" + GOTO_AREAS_INFO);
+            }
+            
+            player.getAbstractPlayerInteraction().npcTalk(9000020, sendStr);
+        }
+    }
+}

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

@@ -0,0 +1,46 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm1;
+
+import client.MapleCharacter;
+import client.command.Command;
+import client.MapleClient;
+import server.life.MapleMonster;
+
+public class MobHpCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        for(MapleMonster monster : player.getMap().getAllMonsters()) {
+            if (monster != null && monster.getHp() > 0) {
+                player.yellowMessage(monster.getName() + " (" + monster.getId() + ") has " + monster.getHp() + " / " + monster.getMaxHp() + " HP.");
+
+            }
+        }
+    }
+}

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

@@ -0,0 +1,77 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm1;
+
+import client.MapleCharacter;
+import client.command.Command;
+import client.MapleClient;
+import server.MapleItemInformationProvider;
+import server.life.MapleMonsterInformationProvider;
+import server.life.MonsterDropEntry;
+import tools.Pair;
+
+import java.util.Iterator;
+
+public class WhatDropsFromCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.dropMessage(5, "Please do @whatdropsfrom <monster name>");
+            return;
+        }
+        String monsterName = player.getLastCommandMessage();
+        String output = "";
+        int limit = 3;
+        Iterator<Pair<Integer, String>> listIterator = MapleMonsterInformationProvider.getMobsIDsFromName(monsterName).iterator();
+        for (int i = 0; i < limit; i++) {
+            if(listIterator.hasNext()) {
+                Pair<Integer, String> data = listIterator.next();
+                int mobId = data.getLeft();
+                String mobName = data.getRight();
+                output += mobName + " drops the following items:\r\n\r\n";
+                for (MonsterDropEntry drop : MapleMonsterInformationProvider.getInstance().retrieveDrop(mobId)){
+                    try {
+                        String name = MapleItemInformationProvider.getInstance().getName(drop.itemId);
+                        if (name == null || name.equals("null") || drop.chance == 0){
+                            continue;
+                        }
+                        float chance = Math.max(1000000 / drop.chance / (!MapleMonsterInformationProvider.getInstance().isBoss(mobId) ? player.getDropRate() : player.getBossDropRate()), 1);
+                        output += "- " + name + " (1/" + (int) chance + ")\r\n";
+                    } catch (Exception ex){
+                        ex.printStackTrace();
+                        continue;
+                    }
+                }
+                output += "\r\n";
+            }
+        }
+        
+        c.getAbstractPlayerInteraction().npcTalk(9010000, output);
+    }
+}

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

@@ -0,0 +1,97 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm1;
+
+import client.MapleCharacter;
+import client.command.Command;
+import client.MapleClient;
+import server.MapleItemInformationProvider;
+import server.life.MapleMonsterInformationProvider;
+import tools.DatabaseConnection;
+import tools.Pair;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Iterator;
+
+public class WhoDropsCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.dropMessage(5, "Please do @whodrops <item name>");
+            return;
+        }
+        
+        if (c.tryacquireClient()) {
+            try {
+                String searchString = player.getLastCommandMessage();
+                String output = "";
+                Iterator<Pair<Integer, String>> listIterator = MapleItemInformationProvider.getInstance().getItemDataByName(searchString).iterator();
+                if(listIterator.hasNext()) {
+                    int count = 1;
+                    while(listIterator.hasNext() && count <= 3) {
+                        Pair<Integer, String> data = listIterator.next();
+                        output += "#b" + data.getRight() + "#k is dropped by:\r\n";
+                        try {
+                            Connection con = DatabaseConnection.getConnection();
+                            PreparedStatement ps = con.prepareStatement("SELECT dropperid FROM drop_data WHERE itemid = ? LIMIT 50");
+                            ps.setInt(1, data.getLeft());
+                            ResultSet rs = ps.executeQuery();
+                            while(rs.next()) {
+                                String resultName = MapleMonsterInformationProvider.getInstance().getMobNameFromId(rs.getInt("dropperid"));
+                                if (resultName != null) {
+                                    output += resultName + ", ";
+                                }
+                            }
+                            rs.close();
+                            ps.close();
+                            con.close();
+                        } catch (Exception e) {
+                            player.dropMessage(6, "There was a problem retrieving the required data. Please try again.");
+                            e.printStackTrace();
+                            return;
+                        }
+                        output += "\r\n\r\n";
+                        count++;
+                    }
+                } else {
+                    player.dropMessage(5, "The item you searched for doesn't exist.");
+                    return;
+                }
+                
+                c.getAbstractPlayerInteraction().npcTalk(9010000, output);
+            } finally {
+                c.releaseClient();
+            }
+        } else {
+            player.dropMessage(5, "Please wait a while for your request to be processed.");
+        }
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import config.YamlConfig;
+
+public class ApCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !ap [<playername>] <newap>");
+            return;
+        }
+
+        if (params.length < 2) {
+            int newAp = Integer.parseInt(params[0]);
+            if (newAp < 0) newAp = 0;
+            else if (newAp > YamlConfig.config.server.MAX_AP) newAp = YamlConfig.config.server.MAX_AP;
+
+            player.changeRemainingAp(newAp, false);
+        } else {
+            MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+            if (victim != null) {
+                int newAp = Integer.parseInt(params[1]);
+                if (newAp < 0) newAp = 0;
+                else if (newAp > YamlConfig.config.server.MAX_AP) newAp = YamlConfig.config.server.MAX_AP;
+
+                victim.changeRemainingAp(newAp, false);
+            } else {
+                player.message("Player '" + params[0] + "' could not be found.");
+            }
+        }
+    }
+}

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

@@ -0,0 +1,53 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import net.server.Server;
+import server.life.MapleLifeFactory;
+import tools.MaplePacketCreator;
+
+public class BombCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length > 0) {
+            MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+            if (victim != null) {
+                victim.getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(9300166), victim.getPosition());
+                Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(5, player.getName() + " used !bomb on " + victim.getName()));
+            } else {
+                player.message("Player '" + params[0] + "' could not be found on this world.");
+            }
+        } else {
+            player.getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(9300166), player.getPosition());
+        }
+    }
+}

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

@@ -0,0 +1,49 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.Skill;
+import client.SkillFactory;
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class BuffCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !buff <buffid>");
+            return;
+        }
+        int skillid = Integer.parseInt(params[0]);
+
+        Skill skill = SkillFactory.getSkill(skillid);
+        if (skill != null) skill.getEffect(skill.getMaxLevel()).applyTo(player);
+    }
+}

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

@@ -0,0 +1,46 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.SkillFactory;
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class BuffMapCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter 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);
+        SkillFactory.getSkill(9101003).getEffect(SkillFactory.getSkill(9101003).getMaxLevel()).applyTo(player, true);
+        SkillFactory.getSkill(9101008).getEffect(SkillFactory.getSkill(9101008).getMaxLevel()).applyTo(player, true);
+        SkillFactory.getSkill(1005).getEffect(SkillFactory.getSkill(1005).getMaxLevel()).applyTo(player, true);
+
+    }
+}

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

@@ -0,0 +1,41 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class ClearDropsCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        player.getMap().clearDrops(player);
+        player.dropMessage(5, "Cleared dropped items");
+    }
+}

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

@@ -0,0 +1,56 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import server.maps.SavedLocationType;
+
+public class ClearSavedLocationsCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer(), victim;
+        
+        if (params.length > 0) {
+            victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+            if (victim == null) {
+                player.message("Player '" + params[0] + "' could not be found.");
+                return;
+            }
+        } else {
+            victim = c.getPlayer();
+        }
+        
+        for (SavedLocationType type : SavedLocationType.values()) {
+            victim.clearSavedLocation(type);
+        }
+        
+        player.message("Cleared " + params[0] + "'s saved locations.");
+    }
+}

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

@@ -0,0 +1,130 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import client.inventory.Item;
+import client.inventory.MapleInventoryType;
+import client.inventory.manipulator.MapleInventoryManipulator;
+
+public class ClearSlotCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !clearslot <all, equip, use, setup, etc or cash.>");
+            return;
+        }
+        String type = params[0];
+        switch (type) {
+            case "all":
+                for (int i = 0; i < 101; i++) {
+                    Item tempItem = c.getPlayer().getInventory(MapleInventoryType.EQUIP).getItem((byte) i);
+                    if (tempItem == null)
+                        continue;
+                    MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.EQUIP, (byte) i, tempItem.getQuantity(), false, false);
+                }
+                for (int i = 0; i < 101; i++) {
+                    Item tempItem = c.getPlayer().getInventory(MapleInventoryType.USE).getItem((byte) i);
+                    if (tempItem == null)
+                        continue;
+                    MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, (byte) i, tempItem.getQuantity(), false, false);
+                }
+                for (int i = 0; i < 101; i++) {
+                    Item tempItem = c.getPlayer().getInventory(MapleInventoryType.ETC).getItem((byte) i);
+                    if (tempItem == null)
+                        continue;
+                    MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.ETC, (byte) i, tempItem.getQuantity(), false, false);
+                }
+                for (int i = 0; i < 101; i++) {
+                    Item tempItem = c.getPlayer().getInventory(MapleInventoryType.SETUP).getItem((byte) i);
+                    if (tempItem == null)
+                        continue;
+                    MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.SETUP, (byte) i, tempItem.getQuantity(), false, false);
+                }
+                for (int i = 0; i < 101; i++) {
+                    Item tempItem = c.getPlayer().getInventory(MapleInventoryType.CASH).getItem((byte) i);
+                    if (tempItem == null)
+                        continue;
+                    MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.CASH, (byte) i, tempItem.getQuantity(), false, false);
+                }
+                player.yellowMessage("All Slots Cleared.");
+                break;
+            case "equip":
+                for (int i = 0; i < 101; i++) {
+                    Item tempItem = c.getPlayer().getInventory(MapleInventoryType.EQUIP).getItem((byte) i);
+                    if (tempItem == null)
+                        continue;
+                    MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.EQUIP, (byte) i, tempItem.getQuantity(), false, false);
+                }
+                player.yellowMessage("Equipment Slot Cleared.");
+                break;
+            case "use":
+                for (int i = 0; i < 101; i++) {
+                    Item tempItem = c.getPlayer().getInventory(MapleInventoryType.USE).getItem((byte) i);
+                    if (tempItem == null)
+                        continue;
+                    MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, (byte) i, tempItem.getQuantity(), false, false);
+                }
+                player.yellowMessage("Use Slot Cleared.");
+                break;
+            case "setup":
+                for (int i = 0; i < 101; i++) {
+                    Item tempItem = c.getPlayer().getInventory(MapleInventoryType.SETUP).getItem((byte) i);
+                    if (tempItem == null)
+                        continue;
+                    MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.SETUP, (byte) i, tempItem.getQuantity(), false, false);
+                }
+                player.yellowMessage("Set-Up Slot Cleared.");
+                break;
+            case "etc":
+                for (int i = 0; i < 101; i++) {
+                    Item tempItem = c.getPlayer().getInventory(MapleInventoryType.ETC).getItem((byte) i);
+                    if (tempItem == null)
+                        continue;
+                    MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.ETC, (byte) i, tempItem.getQuantity(), false, false);
+                }
+                player.yellowMessage("ETC Slot Cleared.");
+                break;
+            case "cash":
+                for (int i = 0; i < 101; i++) {
+                    Item tempItem = c.getPlayer().getInventory(MapleInventoryType.CASH).getItem((byte) i);
+                    if (tempItem == null)
+                        continue;
+                    MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.CASH, (byte) i, tempItem.getQuantity(), false, false);
+                }
+                player.yellowMessage("Cash Slot Cleared.");
+                break;
+            default:
+                player.yellowMessage("Slot" + type + " does not exist!");
+                break;
+        }
+    }
+}

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

@@ -0,0 +1,65 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class DcCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !dc <playername>");
+            return;
+        }
+
+        MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+        if (victim == null) {
+            victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
+            if (victim == null) {
+                victim = player.getMap().getCharacterByName(params[0]);
+                if (victim != null) {
+                    try {//sometimes bugged because the map = null
+                        victim.getClient().disconnect(true, false);
+                        player.getMap().removePlayer(victim);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    return;
+                }
+            }
+        }
+        if (player.gmLevel() < victim.gmLevel()) {
+            victim = player;
+        }
+        victim.getClient().disconnect(false, false);
+    }
+}

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

@@ -0,0 +1,44 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.SkillFactory;
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class EmpowerMeCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter 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) {
+            SkillFactory.getSkill(i).getEffect(SkillFactory.getSkill(i).getMaxLevel()).applyTo(player);
+        }
+    }
+}

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

@@ -0,0 +1,38 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package client.command.commands.gm2;
+
+import client.MapleClient;
+import client.command.Command;
+
+/**
+ *
+ * @author Ronan
+ */
+public class GachaListCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        c.getAbstractPlayerInteraction().openNpc(10000, "gachaponInfo");
+    }
+}

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

@@ -0,0 +1,40 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import server.MapleShopFactory;
+
+public class GmShopCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleShopFactory.getInstance().getShop(1337).sendShop(c);
+    }
+}

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

@@ -0,0 +1,41 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class HealCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        player.healHpMp();
+    }
+
+}

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

@@ -0,0 +1,42 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.SkillFactory;
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class HideCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        SkillFactory.getSkill(9101004).getEffect(SkillFactory.getSkill(9101004).getMaxLevel()).applyTo(player);
+
+    }
+}

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

@@ -0,0 +1,105 @@
+package client.command.commands.gm2;
+
+import client.MapleCharacter;
+import client.MapleClient;
+import client.command.Command;
+import tools.exceptions.IdTypeNotSupportedException;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.*;
+import server.ThreadManager;
+
+public class IdCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    private final Map<String, String> handbookDirectory = new HashMap<>();
+    private final Map<String, HashMap<String, String>> itemMap = new HashMap<>();
+
+    public IdCommand() {
+        handbookDirectory.put("map", "handbook/Map.txt");
+        handbookDirectory.put("etc", "handbook/Etc.txt");
+        handbookDirectory.put("npc", "handbook/NPC.txt");
+        handbookDirectory.put("use", "handbook/Use.txt");
+        handbookDirectory.put("weapon", "handbook/Equip/Weapon.txt"); // TODO add more into this
+    }
+
+    @Override
+    public void execute(MapleClient client, final String[] params) {
+        final MapleCharacter player = client.getPlayer();
+        if (params.length < 2) {
+            player.yellowMessage("Syntax: !id <type> <query>");
+            return;
+        }
+        final String queryItem = joinStringArr(Arrays.copyOfRange(params, 1, params.length), " ");
+        player.yellowMessage("Querying for entry... May take some time... Please try to refine your search.");
+        Runnable queryRunnable = new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    populateIdMap(params[0].toLowerCase());
+
+                    Map<String, String> resultList = fetchResults(itemMap.get(params[0]), queryItem);
+                    StringBuilder sb = new StringBuilder();
+                    
+                    if (resultList.size() > 0) {
+                        int count = 0;
+                        for (Map.Entry<String, String> entry: resultList.entrySet()) {
+                            sb.append(String.format("Id for %s is: #b%s#k", entry.getKey(), entry.getValue()) + "\r\n");
+                            if (++count > 100) {
+                                break;
+                            }
+                        }
+                        sb.append(String.format("Results found: #r%d#k | Returned: #b%d#k/100 | Refine search query to improve time.", resultList.size(), count) + "\r\n");
+                        
+                        player.getAbstractPlayerInteraction().npcTalk(9010000, sb.toString());
+                    } else {
+                        player.yellowMessage(String.format("Id not found for item: %s, of type: %s.", queryItem, params[0]));
+                    }
+                } catch (IdTypeNotSupportedException e) {
+                    player.yellowMessage("Your query type is not supported.");
+                } catch (IOException e) {
+                    player.yellowMessage("Error reading file, please contact your administrator.");
+                }
+            }
+        };
+        
+        ThreadManager.getInstance().newTask(queryRunnable);
+    }
+
+    private void populateIdMap(String type) throws IdTypeNotSupportedException, IOException {
+        if (!handbookDirectory.containsKey(type)) {
+            throw new IdTypeNotSupportedException();
+        }
+        itemMap.put(type, new HashMap<String, String>());
+        BufferedReader reader = new BufferedReader(new FileReader(handbookDirectory.get(type)));
+        String line;
+        while ((line = reader.readLine()) != null) {
+            String[] row = line.split(" - ", 2);
+            if (row.length == 2) {
+                itemMap.get(type).put(row[1].toLowerCase(), row[0]);
+            }
+        }
+    }
+
+    private String joinStringArr(String[] arr, String separator) {
+        if (null == arr || 0 == arr.length) return "";
+        StringBuilder sb = new StringBuilder(256);
+        sb.append(arr[0]);
+        for (int i = 1; i < arr.length; i++) sb.append(separator).append(arr[i]);
+        return sb.toString();
+    }
+
+    private Map<String, String> fetchResults(Map<String, String> queryMap, String queryItem) {
+        Map<String, String> results = new HashMap<>();
+        for (String item: queryMap.keySet()) {
+            if (item.indexOf(queryItem) != -1) {
+                results.put(item, queryMap.get(item));
+            }
+        }
+        return results;
+    }
+}

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

@@ -0,0 +1,88 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import client.inventory.MaplePet;
+import client.inventory.manipulator.MapleInventoryManipulator;
+import config.YamlConfig;
+import constants.inventory.ItemConstants;
+import server.MapleItemInformationProvider;
+
+public class ItemCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !item <itemid> <quantity>");
+            return;
+        }
+
+        int itemId = Integer.parseInt(params[0]);
+        MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
+
+        if(ii.getName(itemId) == null) {
+            player.yellowMessage("Item id '" + params[0] + "' does not exist.");
+            return;
+        }
+
+        short quantity = 1;
+        if(params.length >= 2) quantity = Short.parseShort(params[1]);
+
+        if (YamlConfig.config.server.BLOCK_GENERATE_CASH_ITEM && ii.isCash(itemId)) {
+            player.yellowMessage("You cannot create a cash item with this command.");
+            return;
+        }
+
+        if (ItemConstants.isPet(itemId)) {
+                if (params.length >= 2){   // thanks to istreety & TacoBell
+                        quantity = 1;
+                        long days = Math.max(1, Integer.parseInt(params[1]));
+                        long expiration = System.currentTimeMillis() + (days * 24 * 60 * 60 * 1000);
+                        int petid = MaplePet.createPet(itemId);
+
+                        MapleInventoryManipulator.addById(c, itemId, quantity, player.getName(), petid, expiration);
+                        return;
+                } else {
+                        player.yellowMessage("Pet Syntax: !item <itemid> <expiration>");
+                        return;        
+                }
+        }
+        
+        short flag = 0;
+        if(player.gmLevel() < 3) {
+                flag |= ItemConstants.ACCOUNT_SHARING;
+                flag |= ItemConstants.UNTRADEABLE;
+        }
+        
+        MapleInventoryManipulator.addById(c, itemId, quantity, player.getName(), -1, flag, -1);
+    }
+}

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

@@ -0,0 +1,116 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import client.inventory.Item;
+import client.inventory.MapleInventoryType;
+import client.inventory.MaplePet;
+import config.YamlConfig;
+import constants.inventory.ItemConstants;
+import server.MapleItemInformationProvider;
+
+public class ItemDropCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !drop <itemid> <quantity>");
+            return;
+        }
+
+        int itemId = Integer.parseInt(params[0]);
+        MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
+
+        if(ii.getName(itemId) == null) {
+            player.yellowMessage("Item id '" + params[0] + "' does not exist.");
+            return;
+        }
+
+        short quantity = 1;
+        if(params.length >= 2) quantity = Short.parseShort(params[1]);
+
+        if (YamlConfig.config.server.BLOCK_GENERATE_CASH_ITEM && ii.isCash(itemId)) {
+            player.yellowMessage("You cannot create a cash item with this command.");
+            return;
+        }
+
+        if (ItemConstants.isPet(itemId)) {
+            if (params.length >= 2){   // thanks to istreety & TacoBell
+                quantity = 1;
+                long days = Math.max(1, Integer.parseInt(params[1]));
+                long expiration = System.currentTimeMillis() + (days * 24 * 60 * 60 * 1000);
+                int petid = MaplePet.createPet(itemId);
+
+                Item toDrop = new Item(itemId, (short) 0, quantity, petid);
+                toDrop.setExpiration(expiration);
+
+                toDrop.setOwner("");
+                if(player.gmLevel() < 3) {
+                    short f = toDrop.getFlag();
+                    f |= ItemConstants.ACCOUNT_SHARING;
+                    f |= ItemConstants.UNTRADEABLE;
+                    f |= ItemConstants.SANDBOX;
+                    
+                    toDrop.setFlag(f);
+                    toDrop.setOwner("TRIAL-MODE");
+                }
+
+                c.getPlayer().getMap().spawnItemDrop(c.getPlayer(), c.getPlayer(), toDrop, c.getPlayer().getPosition(), true, true);
+
+                return;
+            } else {
+                player.yellowMessage("Pet Syntax: !drop <itemid> <expiration>");
+                return;        
+            }
+        }
+        
+        Item toDrop;
+        if (ItemConstants.getInventoryType(itemId) == MapleInventoryType.EQUIP) {
+            toDrop = ii.getEquipById(itemId);
+        } else {
+            toDrop = new Item(itemId, (short) 0, quantity);
+        }
+
+        toDrop.setOwner(player.getName());
+        if(player.gmLevel() < 3) {
+            short f = toDrop.getFlag();
+            f |= ItemConstants.ACCOUNT_SHARING;
+            f |= ItemConstants.UNTRADEABLE;
+            f |= ItemConstants.SANDBOX;
+
+            toDrop.setFlag(f);
+            toDrop.setOwner("TRIAL-MODE");
+        }
+
+        c.getPlayer().getMap().spawnItemDrop(c.getPlayer(), c.getPlayer(), toDrop, c.getPlayer().getPosition(), true, true);
+    }
+}

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

@@ -0,0 +1,74 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import server.maps.MaplePortal;
+import server.maps.MapleMap;
+
+public class JailCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !jail <playername> [<minutes>]");
+            return;
+        }
+
+        int minutesJailed = 5;
+        if (params.length >= 2) {
+            minutesJailed = Integer.valueOf(params[1]);
+            if (minutesJailed <= 0) {
+                player.yellowMessage("Syntax: !jail <playername> [<minutes>]");
+                return;
+            }
+        }
+
+        MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+        if (victim != null) {
+            victim.addJailExpirationTime(minutesJailed * 60 * 1000);
+
+            int mapid = 300000012;
+
+            if (victim.getMapId() != mapid) {    // those gone to jail won't be changing map anyway
+                MapleMap target = c.getChannelServer().getMapFactory().getMap(mapid);
+                MaplePortal targetPortal = target.getPortal(0);
+                victim.saveLocationOnWarp();
+                victim.changeMap(target, targetPortal);
+                player.message(victim.getName() + " was jailed for " + minutesJailed + " minutes.");
+            } else {
+                player.message(victim.getName() + "'s time in jail has been extended for " + minutesJailed + " minutes.");
+            }
+
+        } else {
+            player.message("Player '" + params[0] + "' could not be found.");
+        }
+    }
+}

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

@@ -0,0 +1,67 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.MapleJob;
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class JobCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length == 1) {
+            int jobid = Integer.parseInt(params[0]);
+            if (jobid < 0 || jobid >= 2200) {
+                player.message("Jobid " + jobid + " is not available.");
+                return;
+            }
+
+            player.changeJob(MapleJob.getById(jobid));
+            player.equipChanged();
+        } else if (params.length == 2) {
+            MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+
+            if (victim != null) {
+                int jobid = Integer.parseInt(params[1]);
+                if (jobid < 0 || jobid >= 2200) {
+                    player.message("Jobid " + jobid + " is not available.");
+                    return;
+                }
+
+                victim.changeJob(MapleJob.getById(jobid));
+                player.equipChanged();
+            } else {
+                player.message("Player '" + params[0] + "' could not be found.");
+            }
+        } else {
+            player.message("Syntax: !job <job id> <opt: IGN of another person>");
+        }
+    }
+}

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

@@ -0,0 +1,53 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import config.YamlConfig;
+
+public class LevelCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !level <newlevel>");
+            return;
+        }
+
+        player.loseExp(player.getExp(), false, false);
+        player.setLevel(Math.min(Integer.parseInt(params[0]), player.getMaxClassLevel()) - 1);
+
+        player.resetPlayerRates();
+        if (YamlConfig.config.server.USE_ADD_RATES_BY_LEVEL) player.setPlayerRates();
+        player.setWorldRates();
+
+        player.levelUp(false);
+    }
+}

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

@@ -0,0 +1,46 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class LevelProCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !levelpro <newlevel>");
+            return;
+        }
+        while (player.getLevel() < Math.min(player.getMaxClassLevel(), Integer.parseInt(params[0]))) {
+            player.levelUp(false);
+        }
+    }
+}

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

@@ -0,0 +1,51 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+   @Author: Resinate
+*/
+package client.command.commands.gm2;
+
+import client.MapleClient;
+import client.command.Command;
+import java.util.Arrays;
+import java.util.List;
+import server.maps.MapleMapItem;
+import server.maps.MapleMapObject;
+import server.maps.MapleMapObjectType;
+
+public class LootCommand extends Command {
+
+    {
+        setDescription("Loots all items that belong to you.");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        List<MapleMapObject> items = c.getPlayer().getMap().getMapObjectsInRange(c.getPlayer().getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM));
+        for (MapleMapObject item : items) {
+            MapleMapItem mapItem = (MapleMapItem) item;
+            if (mapItem.getOwnerId() == c.getPlayer().getId() || mapItem.getOwnerId() == c.getPlayer().getPartyId()) {
+                c.getPlayer().pickupItem(mapItem);
+            }
+        }
+
+    }
+}

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

@@ -0,0 +1,61 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.*;
+import client.command.Command;
+import provider.MapleData;
+import provider.MapleDataProviderFactory;
+
+import java.io.File;
+
+public class MaxSkillCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        for (MapleData skill_ : MapleDataProviderFactory.getDataProvider(new File(System.getProperty("wzpath") + "/" + "String.wz")).getData("Skill.img").getChildren()) {
+            try {
+                Skill skill = SkillFactory.getSkill(Integer.parseInt(skill_.getName()));
+                player.changeSkillLevel(skill, (byte) skill.getMaxLevel(), skill.getMaxLevel(), -1);
+            } catch (NumberFormatException nfe) {
+                nfe.printStackTrace();
+                break;
+            } catch (NullPointerException npe) { }
+        }
+
+        if (player.getJob().isA(MapleJob.ARAN1) || player.getJob().isA(MapleJob.LEGEND)) {
+            Skill skill = SkillFactory.getSkill(5001005);
+            player.changeSkillLevel(skill, (byte) -1, -1, -1);
+        } else {
+            Skill skill = SkillFactory.getSkill(21001001);
+            player.changeSkillLevel(skill, (byte) -1, -1, -1);
+        }
+
+        player.yellowMessage("Skills maxed out.");
+    }
+}

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

@@ -0,0 +1,52 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.MapleStat;
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import config.YamlConfig;
+
+public class MaxStatCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        player.loseExp(player.getExp(), false, false);
+        player.setLevel(255);
+        player.resetPlayerRates();
+        if (YamlConfig.config.server.USE_ADD_RATES_BY_LEVEL) player.setPlayerRates();
+        player.setWorldRates();
+        player.updateStrDexIntLuk(Short.MAX_VALUE);
+        player.setFame(13337);
+        player.updateMaxHpMaxMp(30000, 30000);
+        player.updateSingleStat(MapleStat.LEVEL, 255);
+        player.updateSingleStat(MapleStat.FAME, 13337);
+        player.yellowMessage("Stats maxed out.");
+    }
+}

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

@@ -0,0 +1,57 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import server.maps.MapleMap;
+
+public class ReachCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !reach <playername>");
+            return;
+        }
+
+        MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+        if (victim != null && victim.isLoggedin()) {
+            if (player.getClient().getChannel() != victim.getClient().getChannel()) {
+                player.dropMessage(5, "Player '" + victim.getName() + "' is at channel " + victim.getClient().getChannel() + ".");
+            } else {
+                MapleMap map = victim.getMap();
+                player.saveLocationOnWarp();
+                player.forceChangeMap(map, map.findClosestPortal(victim.getPosition()));
+            }
+        } else {
+            player.dropMessage(6, "Unknown player.");
+        }
+    }
+}

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

@@ -0,0 +1,60 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.MapleCharacter;
+import client.command.Command;
+import client.MapleClient;
+import client.inventory.Item;
+import client.inventory.MapleInventoryType;
+import constants.inventory.ItemConstants;
+import server.MapleItemInformationProvider;
+
+public class RechargeCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
+        for (Item torecharge : c.getPlayer().getInventory(MapleInventoryType.USE).list()) {
+            if (ItemConstants.isThrowingStar(torecharge.getItemId())){
+                torecharge.setQuantity(ii.getSlotMax(c, torecharge.getItemId()));
+                c.getPlayer().forceUpdateItem(torecharge);
+            } else if (ItemConstants.isArrow(torecharge.getItemId())){
+                torecharge.setQuantity(ii.getSlotMax(c, torecharge.getItemId()));
+                c.getPlayer().forceUpdateItem(torecharge);
+            } else if (ItemConstants.isBullet(torecharge.getItemId())){
+                torecharge.setQuantity(ii.getSlotMax(c, torecharge.getItemId()));
+                c.getPlayer().forceUpdateItem(torecharge);
+            } else if (ItemConstants.isConsumable(torecharge.getItemId())){
+                torecharge.setQuantity(ii.getSlotMax(c, torecharge.getItemId()));
+                c.getPlayer().forceUpdateItem(torecharge);
+            }
+        }
+        player.dropMessage(5, "USE Recharged.");
+    }
+}

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

@@ -0,0 +1,62 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.*;
+import client.command.Command;
+import provider.MapleData;
+import provider.MapleDataProviderFactory;
+
+import java.io.File;
+
+public class ResetSkillCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        for (MapleData skill_ : MapleDataProviderFactory.getDataProvider(new File(System.getProperty("wzpath") + "/" + "String.wz")).getData("Skill.img").getChildren()) {
+            try {
+                Skill skill = SkillFactory.getSkill(Integer.parseInt(skill_.getName()));
+                player.changeSkillLevel(skill, (byte) 0, skill.getMaxLevel(), -1);
+            } catch (NumberFormatException nfe) {
+                nfe.printStackTrace();
+                break;
+            } catch (NullPointerException npe) {
+            }
+        }
+
+        if (player.getJob().isA(MapleJob.ARAN1) || player.getJob().isA(MapleJob.LEGEND)) {
+            Skill skill = SkillFactory.getSkill(5001005);
+            player.changeSkillLevel(skill, (byte) -1, -1, -1);
+        } else {
+            Skill skill = SkillFactory.getSkill(21001001);
+            player.changeSkillLevel(skill, (byte) -1, -1, -1);
+        }
+
+        player.yellowMessage("Skills reseted.");
+    }
+}

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

@@ -0,0 +1,141 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import provider.MapleData;
+import provider.MapleDataProvider;
+import provider.MapleDataProviderFactory;
+import provider.MapleDataTool;
+import server.MapleItemInformationProvider;
+import server.quest.MapleQuest;
+import tools.MaplePacketCreator;
+import tools.Pair;
+
+import java.io.File;
+import java.util.List;
+
+public class SearchCommand extends Command {
+    private static MapleData npcStringData;
+    private static MapleData mobStringData;
+    private static MapleData skillStringData;
+    private static MapleData mapStringData;
+    
+    {
+        setDescription("");
+        
+        MapleDataProvider dataProvider = MapleDataProviderFactory.getDataProvider(new File("wz/String.wz"));
+        npcStringData = dataProvider.getData("Npc.img");
+        mobStringData = dataProvider.getData("Mob.img");
+        skillStringData = dataProvider.getData("Skill.img");
+        mapStringData = dataProvider.getData("Map.img");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 2) {
+            player.yellowMessage("Syntax: !search <type> <name>");
+            return;
+        }
+        StringBuilder sb = new StringBuilder();
+
+        String search = joinStringFrom(params,1);
+        long start = System.currentTimeMillis();//for the lulz
+        MapleData data = null;
+        if (!params[0].equalsIgnoreCase("ITEM")) {
+            int searchType = 0;
+            
+            if (params[0].equalsIgnoreCase("NPC")) {
+                data = npcStringData;
+            } else if (params[0].equalsIgnoreCase("MOB") || params[0].equalsIgnoreCase("MONSTER")) {
+                data = mobStringData;
+            } else if (params[0].equalsIgnoreCase("SKILL")) {
+                data = skillStringData;
+            } else if (params[0].equalsIgnoreCase("MAP")) {
+                data = mapStringData;
+                searchType = 1;
+            } else if (params[0].equalsIgnoreCase("QUEST")) {
+                data = mapStringData;
+                searchType = 2;
+            } else {
+                sb.append("#bInvalid search.\r\nSyntax: '!search [type] [name]', where [type] is MAP, QUEST, NPC, ITEM, MOB, or SKILL.");
+            }
+            if (data != null) {
+                String name;
+                
+                if (searchType == 0) {
+                    for (MapleData searchData : data.getChildren()) {
+                        name = MapleDataTool.getString(searchData.getChildByPath("name"), "NO-NAME");
+                        if (name.toLowerCase().contains(search.toLowerCase())) {
+                            sb.append("#b").append(Integer.parseInt(searchData.getName())).append("#k - #r").append(name).append("\r\n");
+                        }
+                    }
+                } else if (searchType == 1) {
+                    String mapName, streetName;
+                    
+                    for (MapleData searchDataDir : data.getChildren()) {
+                        for (MapleData searchData : searchDataDir.getChildren()) {
+                            mapName = MapleDataTool.getString(searchData.getChildByPath("mapName"), "NO-NAME");
+                            streetName = MapleDataTool.getString(searchData.getChildByPath("streetName"), "NO-NAME");
+                            
+                            if (mapName.toLowerCase().contains(search.toLowerCase()) || streetName.toLowerCase().contains(search.toLowerCase())) {
+                                sb.append("#b").append(Integer.parseInt(searchData.getName())).append("#k - #r").append(streetName).append(" - ").append(mapName).append("\r\n");
+                            }
+                        }
+                    }
+                } else {
+                    for (MapleQuest mq : MapleQuest.getMatchedQuests(search)) {
+                        sb.append("#b").append(mq.getId()).append("#k - #r");
+                        
+                        String parentName = mq.getParentName();
+                        if (!parentName.isEmpty()) {
+                            sb.append(parentName).append(" - ");
+                        }
+                        sb.append(mq.getName()).append("\r\n");
+                    }
+                }
+            }
+        } else {
+            for (Pair<Integer, String> itemPair : MapleItemInformationProvider.getInstance().getAllItems()) {
+                if (sb.length() < 32654) {//ohlol
+                    if (itemPair.getRight().toLowerCase().contains(search.toLowerCase())) {
+                        sb.append("#b").append(itemPair.getLeft()).append("#k - #r").append(itemPair.getRight()).append("\r\n");
+                    }
+                } else {
+                    sb.append("#bCouldn't load all items, there are too many results.\r\n");
+                    break;
+                }
+            }
+        }
+        if (sb.length() == 0) {
+            sb.append("#bNo ").append(params[0].toLowerCase()).append("s found.\r\n");
+        }
+        sb.append("\r\n#kLoaded within ").append((double) (System.currentTimeMillis() - start) / 1000).append(" seconds.");//because I can, and it's free
+
+        c.getAbstractPlayerInteraction().npcTalk(9010000, sb.toString());
+    }
+}

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

@@ -0,0 +1,54 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Ronan
+*/
+package client.command.commands.gm2;
+
+import client.*;
+import client.command.Command;
+
+public class SetSlotCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !setslot <newlevel>");
+            return;
+        }
+        
+        int slots = (Integer.parseInt(params[0]) / 4) * 4;
+        for (int i = 1; i < 5; i++) {
+            int curSlots = player.getSlots(i);
+            if (slots <= -curSlots) {
+                continue;
+            }
+            
+            player.gainSlots(i, slots - curSlots, true);
+        }
+        
+        player.yellowMessage("Slots updated.");
+    }
+}

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

@@ -0,0 +1,52 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class SetStatCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !setstat <newstat>");
+            return;
+        }
+
+        try {
+            int x = Integer.parseInt(params[0]);
+
+            if (x > Short.MAX_VALUE) x = Short.MAX_VALUE;
+            else if (x < 4) x = 4;  // thanks Vcoc for pointing the minimal allowed stat value here
+
+            player.updateStrDexIntLuk(x);
+        } catch (NumberFormatException nfe) {}
+    }
+}

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

@@ -0,0 +1,65 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import config.YamlConfig;
+
+public class SpCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !sp [<playername>] <newsp>");
+            return;
+        }
+
+        if (params.length == 1) {
+            int newSp = Integer.parseInt(params[0]);
+            if (newSp < 0) newSp = 0;
+            else if (newSp > YamlConfig.config.server.MAX_AP) newSp = YamlConfig.config.server.MAX_AP;
+
+            player.updateRemainingSp(newSp);
+        } else {
+            MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+            if (victim != null) {
+                int newSp = Integer.parseInt(params[1]);
+                if (newSp < 0) newSp = 0;
+                else if (newSp > YamlConfig.config.server.MAX_AP) newSp = YamlConfig.config.server.MAX_AP;
+
+                victim.updateRemainingSp(newSp);
+
+                player.dropMessage(5, "SP given.");
+            } else {
+                player.message("Player '" + params[0] + "' could not be found.");
+            }
+        }
+    }
+}

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

@@ -0,0 +1,82 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import server.maps.MapleMap;
+import net.server.Server;
+import net.server.channel.Channel;
+
+public class SummonCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !warphere <playername>");
+            return;
+        }
+
+        MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
+        if (victim == null) {
+            //If victim isn't on current channel, loop all channels on current world.
+            
+            for (Channel ch : Server.getInstance().getChannelsFromWorld(c.getWorld())) {
+                victim = ch.getPlayerStorage().getCharacterByName(params[0]);
+                if (victim != null) {
+                    break;//We found the person, no need to continue the loop.
+                }
+            }
+        }
+        if (victim != null) {
+            if (!victim.isLoggedinWorld()) {
+                player.dropMessage(6, "Player currently not logged in or unreachable.");
+                return;
+            }
+            
+            if (player.getClient().getChannel() != victim.getClient().getChannel()) {//And then change channel if needed.
+                victim.dropMessage("Changing channel, please wait a moment.");
+                victim.getClient().changeChannel(player.getClient().getChannel());
+            }
+            
+            try {
+                for (int i = 0; i < 7; i++) {   // poll for a while until the player reconnects
+                    if (victim.isLoggedinWorld()) break;
+                    Thread.sleep(1777);
+                }
+            } catch (InterruptedException e) {}
+            
+            MapleMap map = player.getMap();
+            victim.saveLocationOnWarp();
+            victim.forceChangeMap(map, map.findClosestPortal(player.getPosition()));
+        } else {
+            player.dropMessage(6, "Unknown player.");
+        }
+    }
+}

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

@@ -0,0 +1,40 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import tools.MaplePacketCreator;
+
+public class UnBugCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        c.getPlayer().getMap().broadcastMessage(MaplePacketCreator.enableActions());
+    }
+}

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

@@ -0,0 +1,42 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.SkillFactory;
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class UnHideCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        SkillFactory.getSkill(9101004).getEffect(SkillFactory.getSkill(9101004).getMaxLevel()).applyTo(player);
+
+    }
+}

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

@@ -0,0 +1,56 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class UnJailCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !unjail <playername>");
+            return;
+        }
+
+        MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+        if (victim != null) {
+            if (victim.getJailExpirationTimeLeft() <= 0) {
+                player.message("This player is already free.");
+                return;
+            }
+            victim.removeJailExpirationTime();
+            victim.message("By lack of concrete proof you are now unjailed. Enjoy freedom!");
+            player.message(victim.getName() + " was unjailed.");
+        } else {
+            player.message("Player '" + params[0] + "' could not be found.");
+        }
+    }
+}

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

@@ -0,0 +1,68 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: MedicOP - Add warparea command
+*/
+package client.command.commands.gm2;
+
+import client.MapleCharacter;
+import client.MapleClient;
+import client.command.Command;
+import server.maps.MapleMap;
+
+import java.awt.*;
+import java.util.Collection;
+
+public class WarpAreaCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !warparea <mapid>");
+            return;
+        }
+
+        try {
+            MapleMap target = c.getChannelServer().getMapFactory().getMap(Integer.parseInt(params[0]));
+            if (target == null) {
+                player.yellowMessage("Map ID " + params[0] + " is invalid.");
+                return;
+            }
+
+            Point pos = player.getPosition();
+
+            Collection<MapleCharacter> characters = player.getMap().getAllPlayers();
+            
+            for (MapleCharacter victim : characters) {
+                if (victim.getPosition().distanceSq(pos) <= 50000) {
+                    victim.saveLocationOnWarp();
+                    victim.changeMap(target, target.getRandomPlayerSpawnpoint());
+                }
+            }
+        } catch (Exception ex) {
+            player.yellowMessage("Map ID " + params[0] + " is invalid.");
+        }
+    }
+}

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

@@ -0,0 +1,72 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import server.maps.FieldLimit;
+import server.maps.MapleMap;
+import server.maps.MapleMiniDungeonInfo;
+
+public class WarpCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !warp <mapid>");
+            return;
+        }
+
+        try {
+            MapleMap target = c.getChannelServer().getMapFactory().getMap(Integer.parseInt(params[0]));
+            if (target == null) {
+                player.yellowMessage("Map ID " + params[0] + " is invalid.");
+                return;
+            }
+            
+            if (!player.isAlive()) {
+                player.dropMessage(1, "This command cannot be used when you're dead.");
+                return;
+            }
+            
+            if (!player.isGM()) {
+                if (player.getEventInstance() != null || MapleMiniDungeonInfo.isDungeonMap(player.getMapId()) || FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) {
+                    player.dropMessage(1, "This command cannot be used in this map.");
+                    return;
+                }
+            }
+            
+            // expedition issue with this command detected thanks to Masterrulax
+            player.saveLocationOnWarp();
+            player.changeMap(target, target.getRandomPlayerSpawnpoint());
+        } catch (Exception ex) {
+            player.yellowMessage("Map ID " + params[0] + " is invalid.");
+        }
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: MedicOP - Add warpmap command
+*/
+package client.command.commands.gm2;
+
+import client.MapleCharacter;
+import client.MapleClient;
+import client.command.Command;
+import server.maps.MapleMap;
+
+import java.util.Collection;
+
+public class WarpMapCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !warpmap <mapid>");
+            return;
+        }
+
+        try {
+            MapleMap target = c.getChannelServer().getMapFactory().getMap(Integer.parseInt(params[0]));
+            if (target == null) {
+                player.yellowMessage("Map ID " + params[0] + " is invalid.");
+                return;
+            }
+
+            Collection<MapleCharacter> characters = player.getMap().getAllPlayers();
+            
+            for (MapleCharacter victim : characters) {
+                victim.saveLocationOnWarp();
+                victim.changeMap(target, target.getRandomPlayerSpawnpoint());
+            }
+        } catch (Exception ex) {
+            player.yellowMessage("Map ID " + params[0] + " is invalid.");
+        }
+    }
+}

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

@@ -0,0 +1,97 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm2;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import server.life.MapleMonster;
+import server.life.MapleNPC;
+import server.life.MaplePlayerNPC;
+import server.maps.MapleMapObject;
+import java.util.HashSet;
+
+public class WhereaMiCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        
+        HashSet<MapleCharacter> chars = new HashSet<>();
+        HashSet<MapleNPC> npcs = new HashSet<>();
+        HashSet<MaplePlayerNPC> playernpcs = new HashSet<>();
+        HashSet<MapleMonster> mobs = new HashSet<>();
+        
+        for (MapleMapObject mmo : player.getMap().getMapObjects()) {
+            if (mmo instanceof MapleNPC) {
+                MapleNPC npc = (MapleNPC) mmo;
+                npcs.add(npc);
+            } else if (mmo instanceof MapleCharacter) {
+                MapleCharacter mc = (MapleCharacter) mmo;
+                chars.add(mc);
+            } else if (mmo instanceof MapleMonster) {
+                MapleMonster mob = (MapleMonster) mmo;
+                if (mob.isAlive()) {
+                    mobs.add(mob);
+                }
+            } else if (mmo instanceof MaplePlayerNPC) {
+                MaplePlayerNPC npc = (MaplePlayerNPC) mmo;
+                playernpcs.add(npc);
+            }
+        }
+        
+        player.yellowMessage("Map ID: " + player.getMap().getId());
+        
+        player.yellowMessage("Players on this map:");
+        for (MapleCharacter chr : chars) {
+            player.dropMessage(5, ">> " + chr.getName() + " - " + chr.getId() + " - Oid: " + chr.getObjectId());
+        }
+        
+        if (!playernpcs.isEmpty()) {
+            player.yellowMessage("PlayerNPCs on this map:");
+            for (MaplePlayerNPC pnpc : playernpcs) {
+                player.dropMessage(5, ">> " + pnpc.getName() + " - Scriptid: " + pnpc.getScriptId() + " - Oid: " + pnpc.getObjectId());
+            }
+        }
+        
+        if (!npcs.isEmpty()) {
+            player.yellowMessage("NPCs on this map:");
+            for (MapleNPC npc : npcs) {
+                player.dropMessage(5, ">> " + npc.getName() + " - " + npc.getId() + " - Oid: " + npc.getObjectId());
+            }
+        }
+        
+        if (!mobs.isEmpty()) {
+            player.yellowMessage("Monsters on this map:");
+            for (MapleMonster mob : mobs) {
+                if (mob.isAlive()) {
+                    player.dropMessage(5, ">> " + mob.getName() + " - " + mob.getId() + " - Oid: " + mob.getObjectId());
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,96 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import net.server.Server;
+import server.TimerManager;
+import tools.DatabaseConnection;
+import tools.MaplePacketCreator;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+public class BanCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 2) {
+            player.yellowMessage("Syntax: !ban <IGN> <Reason> (Please be descriptive)");
+            return;
+        }
+        String ign = params[0];
+        String reason = joinStringFrom(params, 1);
+        MapleCharacter target = c.getChannelServer().getPlayerStorage().getCharacterByName(ign);
+        if (target != null) {
+            String readableTargetName = MapleCharacter.makeMapleReadable(target.getName());
+            String ip = target.getClient().getSession().getRemoteAddress().toString().split(":")[0];
+            //Ban ip
+            PreparedStatement ps = null;
+            try {
+                Connection con = DatabaseConnection.getConnection();
+                if (ip.matches("/[0-9]{1,3}\\..*")) {
+                    ps = con.prepareStatement("INSERT INTO ipbans VALUES (DEFAULT, ?, ?)");
+                    ps.setString(1, ip);
+                    ps.setString(2, String.valueOf(target.getClient().getAccID()));
+
+                    ps.executeUpdate();
+                    ps.close();
+                }
+
+                con.close();
+            } catch (SQLException ex) {
+                ex.printStackTrace();
+                c.getPlayer().message("Error occured while banning IP address");
+                c.getPlayer().message(target.getName() + "'s IP was not banned: " + ip);
+            }
+            target.getClient().banMacs();
+            reason = c.getPlayer().getName() + " banned " + readableTargetName + " for " + reason + " (IP: " + ip + ") " + "(MAC: " + c.getMacs() + ")";
+            target.ban(reason);
+            target.yellowMessage("You have been banned by #b" + c.getPlayer().getName() + " #k.");
+            target.yellowMessage("Reason: " + reason);
+            c.announce(MaplePacketCreator.getGMEffect(4, (byte) 0));
+            final MapleCharacter rip = target;
+            TimerManager.getInstance().schedule(new Runnable() {
+                @Override
+                public void run() {
+                    rip.getClient().disconnect(false, false);
+                }
+            }, 5000); //5 Seconds
+            Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.serverNotice(6, "[RIP]: " + ign + " has been banned."));
+        } else if (MapleCharacter.ban(ign, reason, false)) {
+            c.announce(MaplePacketCreator.getGMEffect(4, (byte) 0));
+            Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.serverNotice(6, "[RIP]: " + ign + " has been banned."));
+        } else {
+            c.announce(MaplePacketCreator.getGMEffect(6, (byte) 1));
+        }
+    }
+}

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

@@ -0,0 +1,41 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class ChatCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        player.toggleWhiteChat();
+        player.message("Your chat is now " + (player.getWhiteChat() ? " white" : "normal") + ".");
+    }
+}

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

@@ -0,0 +1,56 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.MapleBuffStat;
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class CheckDmgCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+        if (victim != null) {
+            int maxBase = victim.calculateMaxBaseDamage(victim.getTotalWatk());
+            Integer watkBuff = victim.getBuffedValue(MapleBuffStat.WATK);
+            Integer matkBuff = victim.getBuffedValue(MapleBuffStat.MATK);
+            Integer blessing = victim.getSkillLevel(10000000 * player.getJobType() + 12);
+            if (watkBuff == null) watkBuff = 0;
+            if (matkBuff == null) matkBuff = 0;
+
+            player.dropMessage(5, "Cur Str: " + victim.getTotalStr() + " Cur Dex: " + victim.getTotalDex() + " Cur Int: " + victim.getTotalInt() + " Cur Luk: " + victim.getTotalLuk());
+            player.dropMessage(5, "Cur WATK: " + victim.getTotalWatk() + " Cur MATK: " + victim.getTotalMagic());
+            player.dropMessage(5, "Cur WATK Buff: " + watkBuff + " Cur MATK Buff: " + matkBuff + " Cur Blessing Level: " + blessing);
+            player.dropMessage(5, victim.getName() + "'s maximum base damage (before skills) is " + maxBase);
+        } else {
+            player.message("Player '" + params[0] + "' could not be found on this world.");
+        }
+    }
+}

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

@@ -0,0 +1,44 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class ClosePortalCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !closeportal <portalid>");
+            return;
+        }
+        player.getMap().getPortal(params[0]).setPortalState(false);
+    }
+}

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

@@ -0,0 +1,118 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.MapleDisease;
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import server.life.MobSkill;
+import server.life.MobSkillFactory;
+import server.maps.MapleMapObject;
+import server.maps.MapleMapObjectType;
+
+import java.util.Arrays;
+
+public class DebuffCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !debuff SLOW|SEDUCE|ZOMBIFY|CONFUSE|STUN|POISON|SEAL|DARKNESS|WEAKEN|CURSE");
+            return;
+        }
+
+        MapleDisease disease = null;
+        MobSkill skill = null;
+
+        switch (params[0].toUpperCase()) {
+            case "SLOW":
+                disease = MapleDisease.SLOW;
+                skill = MobSkillFactory.getMobSkill(126, 7);
+                break;
+
+            case "SEDUCE":
+                disease = MapleDisease.SEDUCE;
+                skill = MobSkillFactory.getMobSkill(128, 7);
+                break;
+
+            case "ZOMBIFY":
+                disease = MapleDisease.ZOMBIFY;
+                skill = MobSkillFactory.getMobSkill(133, 1);
+                break;
+
+            case "CONFUSE":
+                disease = MapleDisease.CONFUSE;
+                skill = MobSkillFactory.getMobSkill(132, 2);
+                break;
+
+            case "STUN":
+                disease = MapleDisease.STUN;
+                skill = MobSkillFactory.getMobSkill(123, 7);
+                break;
+
+            case "POISON":
+                disease = MapleDisease.POISON;
+                skill = MobSkillFactory.getMobSkill(125, 5);
+                break;
+
+            case "SEAL":
+                disease = MapleDisease.SEAL;
+                skill = MobSkillFactory.getMobSkill(120, 1);
+                break;
+
+            case "DARKNESS":
+                disease = MapleDisease.DARKNESS;
+                skill = MobSkillFactory.getMobSkill(121, 1);
+                break;
+
+            case "WEAKEN":
+                disease = MapleDisease.WEAKEN;
+                skill = MobSkillFactory.getMobSkill(122, 1);
+                break;
+
+            case "CURSE":
+                disease = MapleDisease.CURSE;
+                skill = MobSkillFactory.getMobSkill(124, 1);
+                break;
+        }
+
+        if (disease == null) {
+            player.yellowMessage("Syntax: !debuff SLOW|SEDUCE|ZOMBIFY|CONFUSE|STUN|POISON|SEAL|DARKNESS|WEAKEN|CURSE");
+            return;
+        }
+
+        for (MapleMapObject mmo : player.getMap().getMapObjectsInRange(player.getPosition(), 777777.7, Arrays.asList(MapleMapObjectType.PLAYER))) {
+            MapleCharacter chr = (MapleCharacter) mmo;
+
+            if (chr.getId() != player.getId()) {
+                chr.giveDebuff(disease, skill);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,41 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class EndEventCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        c.getChannelServer().setEvent(null);
+        player.dropMessage(5, "You have ended the event. No more players may join.");
+    }
+}

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

@@ -0,0 +1,70 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import net.server.Server;
+import net.server.channel.Channel;
+import server.expeditions.MapleExpedition;
+
+import java.util.List;
+import java.util.Map.Entry;
+
+public class ExpedsCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        for (Channel ch : Server.getInstance().getChannelsFromWorld(c.getWorld())) {
+            List<MapleExpedition> expeds = ch.getExpeditions();
+            if (expeds.isEmpty()) {
+                player.yellowMessage("No Expeditions in Channel " + ch.getId());
+                continue;
+            }
+            player.yellowMessage("Expeditions in Channel " + ch.getId());
+            int id = 0;
+            for (MapleExpedition exped : expeds) {
+                id++;
+                player.yellowMessage("> Expedition " + id);
+                player.yellowMessage(">> Type: " + exped.getType().toString());
+                player.yellowMessage(">> Status: " + (exped.isRegistering() ? "REGISTERING" : "UNDERWAY"));
+                player.yellowMessage(">> Size: " + exped.getMembers().size());
+                player.yellowMessage(">> Leader: " + exped.getLeader().getName());
+                int memId = 2;
+                for (Entry<Integer, String> e : exped.getMembers().entrySet()) {
+                    if (exped.isLeader(e.getKey())) {
+                        continue;
+                    }
+                    player.yellowMessage(">>> Member " + memId + ": " + e.getValue());
+                    memId++;
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,76 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.MapleStat;
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import constants.inventory.ItemConstants;
+import server.MapleItemInformationProvider;
+
+public class FaceCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !face [<playername>] <faceid>");
+            return;
+        }
+
+        try {
+            if (params.length == 1) {
+                int itemId = Integer.parseInt(params[0]);
+                if (!ItemConstants.isFace(itemId) || MapleItemInformationProvider.getInstance().getName(itemId) == null) {
+                    player.yellowMessage("Face id '" + params[0] + "' does not exist.");
+                    return;
+                }
+
+                player.setFace(itemId);
+                player.updateSingleStat(MapleStat.FACE, itemId);
+                player.equipChanged();
+            } else {
+                int itemId = Integer.parseInt(params[1]);
+                if (!ItemConstants.isFace(itemId) || MapleItemInformationProvider.getInstance().getName(itemId) == null) {
+                    player.yellowMessage("Face id '" + params[1] + "' does not exist.");
+                }
+
+                MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
+                if (victim == null) {
+                    victim.setFace(itemId);
+                    victim.updateSingleStat(MapleStat.FACE, itemId);
+                    victim.equipChanged();
+                } else {
+                    player.yellowMessage("Player '" + params[0] + "' has not been found on this channel.");
+                }
+            }
+        } catch (Exception e) {
+        }
+
+    }
+}

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

@@ -0,0 +1,53 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.MapleStat;
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class FameCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 2) {
+            player.yellowMessage("Syntax: !fame <playername> <gainfame>");
+            return;
+        }
+
+        MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+        if (victim != null) {
+            victim.setFame(Integer.parseInt(params[1]));
+            victim.updateSingleStat(MapleStat.FAME, victim.getFame());
+            player.message("FAME given.");
+        } else {
+            player.message("Player '" + params[0] + "' could not be found.");
+        }
+    }
+}

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

@@ -0,0 +1,61 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import net.server.Server;
+
+public class FlyCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) { // fly option will become available for any character of that account
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !fly <on/off>");
+            return;
+        }
+
+        Integer accid = c.getAccID();
+        Server srv = Server.getInstance();
+        String sendStr = "";
+        if (params[0].equalsIgnoreCase("on")) {
+            sendStr += "Enabled Fly feature (F1). With fly active, you cannot attack.";
+            if (!srv.canFly(accid)) sendStr += " Re-login to take effect.";
+
+            srv.changeFly(c.getAccID(), true);
+        } else {
+            sendStr += "Disabled Fly feature. You can now attack.";
+            if (srv.canFly(accid)) sendStr += " Re-login to take effect.";
+
+            srv.changeFly(c.getAccID(), false);
+        }
+
+        player.dropMessage(6, sendStr);
+    }
+}

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

@@ -0,0 +1,77 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class GiveMesosCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !givems [<playername>] <gainmeso>");
+            return;
+        }
+
+        String recv_, value_;
+        long mesos_ = 0;
+        
+        if (params.length == 2) {
+            recv_ = params[0];
+            value_ = params[1];
+        } else {
+            recv_ = c.getPlayer().getName();
+            value_ = params[0];
+        }
+        
+        try {
+            mesos_ = Long.parseLong(value_);
+            if (mesos_ > Integer.MAX_VALUE) {
+                mesos_ = Integer.MAX_VALUE;
+            } else if (mesos_ < Integer.MIN_VALUE) {
+                mesos_ = Integer.MIN_VALUE;
+            }
+        } catch (NumberFormatException nfe) {
+            if (value_.contentEquals("max")) {  // "max" descriptor suggestion thanks to Vcoc
+                mesos_ = Integer.MAX_VALUE;
+            } else if (value_.contentEquals("min")) {
+                mesos_ = Integer.MIN_VALUE;
+            }
+        }
+        
+        MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv_);
+        if (victim != null) {
+            victim.gainMeso((int) mesos_, true);
+            player.message("MESO given.");
+        } else {
+            player.message("Player '" + recv_ + "' could not be found.");
+        }
+    }
+}

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

@@ -0,0 +1,83 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class GiveNxCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !givenx [nx, mp, np] [<playername>] <gainnx>");
+            return;
+        }
+
+        String recv, typeStr = "nx";
+        int value, type = 1;
+        if (params.length > 1) {
+            if (params[0].length() == 2) {
+                switch (params[0]) {
+                    case "mp":  // maplePoint
+                        type = 2;
+                        break;
+                    case "np":  // nxPrepaid
+                        type = 4;
+                        break;
+                    default:
+                        type = 1;
+                }
+                typeStr = params[0];
+                
+                if (params.length > 2) {
+                    recv = params[1];
+                    value = Integer.parseInt(params[2]);
+                } else {
+                    recv = c.getPlayer().getName();
+                    value = Integer.parseInt(params[1]);
+                }
+            } else {
+                recv = params[0];
+                value = Integer.parseInt(params[1]);
+            }
+        } else {
+            recv = c.getPlayer().getName();
+            value = Integer.parseInt(params[0]);
+        }
+
+        MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv);
+        if (victim != null) {
+            victim.getCashShop().gainCash(type, value);
+            player.message(typeStr.toUpperCase() + " given.");
+        } else {
+            player.message("Player '" + recv + "' could not be found.");
+        }
+    }
+}

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

@@ -0,0 +1,29 @@
+package client.command.commands.gm3;
+
+import client.MapleCharacter;
+import client.MapleClient;
+import client.command.Command;
+
+public class GiveRpCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient client, String[] params) {
+        MapleCharacter player = client.getPlayer();
+        if (params.length < 2) {
+            player.yellowMessage("Syntax: !giverp <playername> <gainrewardpoint>");
+            return;
+        }
+
+        MapleCharacter victim = client.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+        if (victim != null) {
+            victim.setRewardPoints(victim.getRewardPoints() + Integer.parseInt(params[1]));
+            player.message("RP given. Player " + params[0] + " now has " + victim.getRewardPoints()
+                    + " reward points." );
+        } else {
+            player.message("Player '" + params[0] + "' could not be found.");
+        }
+    }
+}

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

@@ -0,0 +1,51 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class GiveVpCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 2) {
+            player.yellowMessage("Syntax: !givevp <playername> <gainvotepoint>");
+            return;
+        }
+
+        MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+        if (victim != null) {
+            victim.getClient().addVotePoints(Integer.parseInt(params[1]));
+            player.message("VP given.");
+        } else {
+            player.message("Player '" + params[0] + "' could not be found.");
+        }
+    }
+}

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

@@ -0,0 +1,76 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.MapleStat;
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import constants.inventory.ItemConstants;
+import server.MapleItemInformationProvider;
+
+public class HairCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !hair [<playername>] <hairid>");
+            return;
+        }
+
+        try {
+            if (params.length == 1) {
+                int itemId = Integer.parseInt(params[0]);
+                if (!ItemConstants.isHair(itemId) || MapleItemInformationProvider.getInstance().getName(itemId) == null) {
+                    player.yellowMessage("Hair id '" + params[0] + "' does not exist.");
+                    return;
+                }
+
+                player.setHair(itemId);
+                player.updateSingleStat(MapleStat.HAIR, itemId);
+                player.equipChanged();
+            } else {
+                int itemId = Integer.parseInt(params[1]);
+                if (!ItemConstants.isHair(itemId) || MapleItemInformationProvider.getInstance().getName(itemId) == null) {
+                    player.yellowMessage("Hair id '" + params[1] + "' does not exist.");
+                    return;
+                }
+
+                MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
+                if (victim != null) {
+                    victim.setHair(itemId);
+                    victim.updateSingleStat(MapleStat.HAIR, itemId);
+                    victim.equipChanged();
+                } else {
+                    player.yellowMessage("Player '" + params[0] + "' has not been found on this channel.");
+                }
+            }
+        } catch (Exception e) {
+        }
+    }
+}

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

@@ -0,0 +1,45 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.MapleStat;
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class HealMapCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        for (MapleCharacter mch : player.getMap().getCharacters()) {
+            if (mch != null) {
+                mch.healHpMp();
+            }
+        }
+    }
+}

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

@@ -0,0 +1,46 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.MapleStat;
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class HealPersonCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+        if (victim != null) {
+            victim.healHpMp();
+        } else {
+            player.message("Player '" + params[0] + "' could not be found.");
+        }
+    }
+}

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

@@ -0,0 +1,56 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class HpMpCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        MapleCharacter victim = player;
+        int statUpdate = 1;
+
+        if (params.length == 2) {
+            victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+            statUpdate = Integer.valueOf(params[1]);
+        } else if (params.length == 1) {
+            statUpdate = Integer.valueOf(params[0]);
+        } else {
+            player.yellowMessage("Syntax: !hpmp [<playername>] <value>");
+        }
+
+        if (victim != null) {
+            victim.updateHpMp(statUpdate);
+        } else {
+            player.message("Player '" + params[0] + "' could not be found on this world.");
+        }
+    }
+}

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

@@ -0,0 +1,45 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class HurtCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+        if (victim != null) {
+            victim.updateHp(1);
+        } else {
+            player.message("Player '" + params[0] + "' could not be found.");
+        }
+    }
+}

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

@@ -0,0 +1,61 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import net.server.Server;
+import tools.MapleLogger;
+import tools.MaplePacketCreator;
+
+public class IgnoreCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !ignore <ign>");
+            return;
+        }
+        MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+        if (victim == null) {
+            player.message("Player '" + params[0] + "' could not be found on this world.");
+            return;
+        }
+        boolean monitored_ = MapleLogger.ignored.contains(victim.getId());
+        if (monitored_) {
+            MapleLogger.ignored.remove(victim.getId());
+        } else {
+            MapleLogger.ignored.add(victim.getId());
+        }
+        player.yellowMessage(victim.getName() + " is " + (!monitored_ ? "now being ignored." : "no longer being ignored."));
+        String message_ = player.getName() + (!monitored_ ? " has started ignoring " : " has stopped ignoring ") + victim.getName() + ".";
+        Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(5, message_));
+
+    }
+}

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

@@ -0,0 +1,43 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import tools.MapleLogger;
+
+public class IgnoredCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        for (Integer cid : MapleLogger.ignored) {
+            player.yellowMessage(MapleCharacter.getNameById(cid) + " is being ignored.");
+        }
+    }
+}

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

@@ -0,0 +1,45 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class InMapCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        String st = "";
+        for (MapleCharacter chr : player.getMap().getCharacters()) {
+            st += chr.getName() + " ";
+        }
+        player.message(st);
+
+    }
+}

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

@@ -0,0 +1,57 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import server.life.MapleMonster;
+import server.maps.MapleMap;
+import server.maps.MapleMapObject;
+import server.maps.MapleMapObjectType;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class KillAllCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        MapleMap map = player.getMap();
+        List<MapleMapObject> monsters = map.getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER));
+        int count = 0;
+        for (MapleMapObject monstermo : monsters) {
+            MapleMonster monster = (MapleMonster) monstermo;
+            if (!monster.getStats().isFriendly() && !(monster.getId() >= 8810010 && monster.getId() <= 8810018)) {
+                map.damageMonster(player, monster, Integer.MAX_VALUE);
+                count++;
+            }
+        }
+        player.dropMessage(5, "Killed " + count + " monsters.");
+    }
+}

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

@@ -0,0 +1,53 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import net.server.Server;
+import tools.MaplePacketCreator;
+
+public class KillCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !kill <playername>");
+            return;
+        }
+
+        MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+        if (victim != null) {
+            victim.updateHpMp(0);
+            Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(5, player.getName() + " used !kill on " + victim.getName()));
+        } else {
+            player.message("Player '" + params[0] + "' could not be found.");
+        }
+    }
+}

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

@@ -0,0 +1,42 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class KillMapCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        for (MapleCharacter mch : player.getMap().getCharacters()) {
+            mch.updateHp(0);
+        }
+    }
+}

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

@@ -0,0 +1,42 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import tools.MaplePacketCreator;
+
+public class MaxEnergyCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        c.getPlayer().setDojoEnergy(10000);
+        c.announce(MaplePacketCreator.getEnergy("energy", 10000));
+    }
+}

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

@@ -0,0 +1,62 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+
+public class MaxHpMpCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        MapleCharacter victim = player;
+        
+        int statUpdate = 1;
+        if (params.length >= 2) {
+            victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+            statUpdate = Integer.valueOf(params[1]);
+        } else if (params.length == 1) {
+            statUpdate = Integer.valueOf(params[0]);
+        } else {
+            player.yellowMessage("Syntax: !maxhpmp [<playername>] <value>");
+        }
+        
+        if (victim != null) {
+            int extraHp = victim.getCurrentMaxHp() - victim.getClientMaxHp();
+            int extraMp = victim.getCurrentMaxMp() - victim.getClientMaxMp();
+            statUpdate = Math.max(1 + Math.max(extraHp, extraMp), statUpdate);
+
+            int maxhpUpdate = statUpdate - extraHp;
+            int maxmpUpdate = statUpdate - extraMp;
+            victim.updateMaxHpMaxMp(maxhpUpdate, maxmpUpdate);
+        } else {
+            player.message("Player '" + params[0] + "' could not be found on this world.");
+        }
+    }
+}

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

@@ -0,0 +1,61 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import net.server.Server;
+import tools.MapleLogger;
+import tools.MaplePacketCreator;
+
+public class MonitorCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            player.yellowMessage("Syntax: !monitor <ign>");
+            return;
+        }
+        MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
+        if (victim == null) {
+            player.message("Player '" + params[0] + "' could not be found on this world.");
+            return;
+        }
+        boolean monitored = MapleLogger.monitored.contains(victim.getId());
+        if (monitored) {
+            MapleLogger.monitored.remove(victim.getId());
+        } else {
+            MapleLogger.monitored.add(victim.getId());
+        }
+        player.yellowMessage(victim.getId() + " is " + (!monitored ? "now being monitored." : "no longer being monitored."));
+        String message = player.getName() + (!monitored ? " has started monitoring " : " has stopped monitoring ") + victim.getId() + ".";
+        Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(5, message));
+
+    }
+}

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

@@ -0,0 +1,43 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import tools.MapleLogger;
+
+public class MonitorsCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        MapleCharacter player = c.getPlayer();
+        for (Integer cid : MapleLogger.monitored) {
+            player.yellowMessage(MapleCharacter.getNameById(cid) + " is being monitored.");
+        }
+    }
+}

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

@@ -0,0 +1,75 @@
+/*
+    This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+   @Author: Arthur L - Refactored command content into modules
+*/
+package client.command.commands.gm3;
+
+import client.command.Command;
+import client.MapleClient;
+import client.MapleCharacter;
+import constants.game.GameConstants;
+import tools.MaplePacketCreator;
+
+public class MusicCommand extends Command {
+    {
+        setDescription("");
+    }
+
+    private static String getSongList() {
+        String songList = "Song:\r\n";
+        for (String s : GameConstants.GAME_SONGS) {
+            songList += ("  " + s + "\r\n");
+        }
+        
+        return songList;
+    }
+    
+    @Override
+    public void execute(MapleClient c, String[] params) {
+        
+        MapleCharacter player = c.getPlayer();
+        if (params.length < 1) {
+            String sendMsg = "";
+            
+            sendMsg += "Syntax: #r!music <song>#k\r\n\r\n";
+            sendMsg += getSongList();
+            
+            c.announce(MaplePacketCreator.getNPCTalk(1052015, (byte) 0, sendMsg, "00 00", (byte) 0));
+            return;
+        }
+        
+        String song = player.getLastCommandMessage();
+        for (String s : GameConstants.GAME_SONGS) {
+            if (s.equalsIgnoreCase(song)) {    // thanks Masterrulax for finding an issue here
+                player.getMap().broadcastMessage(MaplePacketCreator.musicChange(s));
+                player.yellowMessage("Now playing song " + s + ".");
+                return;
+            }
+        }
+        
+        String sendMsg = "";
+        sendMsg += "Song not found, please enter a song below.\r\n\r\n";
+        sendMsg += getSongList();
+        
+        c.announce(MaplePacketCreator.getNPCTalk(1052015, (byte) 0, sendMsg, "00 00", (byte) 0));
+    }
+}