diff --git a/scripts/event/2xEvent.js b/scripts/event/2xEvent.js index c693514f47..641f3a5d4f 100644 --- a/scripts/event/2xEvent.js +++ b/scripts/event/2xEvent.js @@ -57,18 +57,18 @@ function cancelSchedule() { function start() { const Server = Java.type('net.server.Server'); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); var world = Server.getInstance().getWorld(em.getChannelServer().getWorld()); world.setExpRate(8); - world.broadcastPacket(MaplePacketCreator.serverNotice(6, "The Bunny Onslaught Survival Scanner (BOSS) has detected an Easter Bunny onslaught soon! The GM team has activated the Emergency XP Pool (EXP) that doubles experience gained for the next two hours!")); + world.broadcastPacket(PacketCreator.serverNotice(6, "The Bunny Onslaught Survival Scanner (BOSS) has detected an Easter Bunny onslaught soon! The GM team has activated the Emergency XP Pool (EXP) that doubles experience gained for the next two hours!")); } function stop() { const Server = Java.type('net.server.Server'); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); var world = Server.getInstance().getWorld(em.getChannelServer().getWorld()); world.setExpRate(4); - world.broadcastPacket(MaplePacketCreator.serverNotice(6, "Unfortunately the Emergency XP Pool (EXP) has run out of juice for now and needs to recharge causing the EXP rate to go back to normal.")); + world.broadcastPacket(PacketCreator.serverNotice(6, "Unfortunately the Emergency XP Pool (EXP) has run out of juice for now and needs to recharge causing the EXP rate to go back to normal.")); } // ---------- FILLER FUNCTIONS ---------- diff --git a/scripts/event/3rdJob_bowman.js b/scripts/event/3rdJob_bowman.js index 0f21752d2b..bf17764cd6 100644 --- a/scripts/event/3rdJob_bowman.js +++ b/scripts/event/3rdJob_bowman.js @@ -54,8 +54,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 0); em.setProperty("noEntry","true"); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getClient().announce(PacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/3rdJob_magician.js b/scripts/event/3rdJob_magician.js index efa3818094..9a9614084f 100644 --- a/scripts/event/3rdJob_magician.js +++ b/scripts/event/3rdJob_magician.js @@ -54,8 +54,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 0); em.setProperty("noEntry","true"); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getClient().announce(PacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/3rdJob_mount.js b/scripts/event/3rdJob_mount.js index 363f2e28f0..bd514983f1 100644 --- a/scripts/event/3rdJob_mount.js +++ b/scripts/event/3rdJob_mount.js @@ -84,8 +84,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 0); em.setProperty("noEntry","true"); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getClient().announce(PacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/3rdJob_pirate.js b/scripts/event/3rdJob_pirate.js index 27ff8d4586..fd95fe986b 100644 --- a/scripts/event/3rdJob_pirate.js +++ b/scripts/event/3rdJob_pirate.js @@ -46,8 +46,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 0); em.setProperty("noEntry","true"); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getClient().announce(PacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/3rdJob_thief.js b/scripts/event/3rdJob_thief.js index 37b5fefa60..4ef82f1a06 100644 --- a/scripts/event/3rdJob_thief.js +++ b/scripts/event/3rdJob_thief.js @@ -54,8 +54,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 0); em.setProperty("noEntry","true"); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getClient().announce(PacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/3rdJob_warrior.js b/scripts/event/3rdJob_warrior.js index 0ce3a86411..0f36734085 100644 --- a/scripts/event/3rdJob_warrior.js +++ b/scripts/event/3rdJob_warrior.js @@ -54,8 +54,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 0); em.setProperty("noEntry","true"); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getClient().announce(PacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/Aran_2ndmount.js b/scripts/event/Aran_2ndmount.js index 27da92ba44..1639ae8252 100644 --- a/scripts/event/Aran_2ndmount.js +++ b/scripts/event/Aran_2ndmount.js @@ -60,8 +60,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 2); em.setProperty("noEntry","true"); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getClient().announce(PacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/Aran_3rdmount.js b/scripts/event/Aran_3rdmount.js index 93c9ee83c8..cce7fb3f12 100644 --- a/scripts/event/Aran_3rdmount.js +++ b/scripts/event/Aran_3rdmount.js @@ -61,8 +61,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 1); em.setProperty("noEntry","true"); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getClient().announce(PacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/AreaBossBamboo.js b/scripts/event/AreaBossBamboo.js index 3a12c4ebf4..c4d3a49c09 100644 --- a/scripts/event/AreaBossBamboo.js +++ b/scripts/event/AreaBossBamboo.js @@ -50,9 +50,9 @@ function start() { } const Point = Java.type('java.awt.Point'); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); mapObj.spawnMonsterOnGroundBelow(mobObj, new Point(560, 50)); - mapObj.broadcastMessage(MaplePacketCreator.serverNotice(6, "From amongst the ruins shrouded by the mists, Bamboo Warrior appears.")); + mapObj.broadcastMessage(PacketCreator.serverNotice(6, "From amongst the ruins shrouded by the mists, Bamboo Warrior appears.")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossCentipede.js b/scripts/event/AreaBossCentipede.js index b7e4b5653b..4df057c579 100644 --- a/scripts/event/AreaBossCentipede.js +++ b/scripts/event/AreaBossCentipede.js @@ -49,11 +49,11 @@ function start() { const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); const Point = Java.type('java.awt.Point'); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); var gcent = MapleLifeFactory.getMonster(5220004); herbGarden.spawnMonsterOnGroundBelow(gcent, new Point(560, 50)); - herbGarden.broadcastMessage(MaplePacketCreator.serverNotice(6, "From the mists surrounding the herb garden, the gargantuous Giant Centipede appears.")); + herbGarden.broadcastMessage(PacketCreator.serverNotice(6, "From the mists surrounding the herb garden, the gargantuous Giant Centipede appears.")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossDeo.js b/scripts/event/AreaBossDeo.js index 64d13bb70e..1a83b1128c 100644 --- a/scripts/event/AreaBossDeo.js +++ b/scripts/event/AreaBossDeo.js @@ -49,11 +49,11 @@ function start() { const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); const Point = Java.type('java.awt.Point'); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); var deo = MapleLifeFactory.getMonster(3220001); royalCatthusDesert.spawnMonsterOnGroundBelow(deo, new Point(645, 275)); - royalCatthusDesert.broadcastMessage(MaplePacketCreator.serverNotice(6, "Deo slowly appeared out of the sand dust.")); + royalCatthusDesert.broadcastMessage(PacketCreator.serverNotice(6, "Deo slowly appeared out of the sand dust.")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossDoor1.js b/scripts/event/AreaBossDoor1.js index 68d447dbe4..dc4b01ddaf 100644 --- a/scripts/event/AreaBossDoor1.js +++ b/scripts/event/AreaBossDoor1.js @@ -49,13 +49,13 @@ function start() { } const Point = Java.type('java.awt.Point'); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); var boss = MapleLifeFactory.getMonster(bossMobid); var bossPos = new Point(467, 0); map.spawnMonsterOnGroundBelow(boss, bossPos); - map.broadcastMessage(MaplePacketCreator.serverNotice(6, bossMsg)); + map.broadcastMessage(PacketCreator.serverNotice(6, bossMsg)); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossDoor2.js b/scripts/event/AreaBossDoor2.js index 22380d50cf..c230949dd8 100644 --- a/scripts/event/AreaBossDoor2.js +++ b/scripts/event/AreaBossDoor2.js @@ -50,12 +50,12 @@ function start() { const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); const Point = Java.type('java.awt.Point'); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); var boss = MapleLifeFactory.getMonster(bossMobid); var bossPos = new Point(201, 80); map.spawnMonsterOnGroundBelow(boss, bossPos); - map.broadcastMessage(MaplePacketCreator.serverNotice(6, bossMsg)); + map.broadcastMessage(PacketCreator.serverNotice(6, bossMsg)); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossDoor3.js b/scripts/event/AreaBossDoor3.js index f9dfa38f08..a872cb42a1 100644 --- a/scripts/event/AreaBossDoor3.js +++ b/scripts/event/AreaBossDoor3.js @@ -50,12 +50,12 @@ function start() { const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); const Point = Java.type('java.awt.Point'); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); var boss = MapleLifeFactory.getMonster(bossMobid); var bossPos = new Point(251, -841); map.spawnMonsterOnGroundBelow(boss, bossPos); - map.broadcastMessage(MaplePacketCreator.serverNotice(6, bossMsg)); + map.broadcastMessage(PacketCreator.serverNotice(6, bossMsg)); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossDoor4.js b/scripts/event/AreaBossDoor4.js index d58b2e7e0c..7fa3b0b079 100644 --- a/scripts/event/AreaBossDoor4.js +++ b/scripts/event/AreaBossDoor4.js @@ -50,12 +50,12 @@ function start() { const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); const Point = Java.type('java.awt.Point'); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); var boss = MapleLifeFactory.getMonster(bossMobid); var bossPos = new Point(842, 0); map.spawnMonsterOnGroundBelow(boss, bossPos); - map.broadcastMessage(MaplePacketCreator.serverNotice(6, bossMsg)); + map.broadcastMessage(PacketCreator.serverNotice(6, bossMsg)); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossDoor5.js b/scripts/event/AreaBossDoor5.js index a8b1095794..e2844d77f5 100644 --- a/scripts/event/AreaBossDoor5.js +++ b/scripts/event/AreaBossDoor5.js @@ -50,12 +50,12 @@ function start() { const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); const Point = Java.type('java.awt.Point'); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); var boss = MapleLifeFactory.getMonster(bossMobid); var bossPos = new Point(461, 61); map.spawnMonsterOnGroundBelow(boss, bossPos); - map.broadcastMessage(MaplePacketCreator.serverNotice(6, bossMsg)); + map.broadcastMessage(PacketCreator.serverNotice(6, bossMsg)); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossDoor6.js b/scripts/event/AreaBossDoor6.js index 3fdec07a5a..61b406a0ec 100644 --- a/scripts/event/AreaBossDoor6.js +++ b/scripts/event/AreaBossDoor6.js @@ -50,12 +50,12 @@ function start() { const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); const Point = Java.type('java.awt.Point'); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); var boss = MapleLifeFactory.getMonster(bossMobid); var bossPos = new Point(171, 50); map.spawnMonsterOnGroundBelow(boss, bossPos); - map.broadcastMessage(MaplePacketCreator.serverNotice(6, bossMsg)); + map.broadcastMessage(PacketCreator.serverNotice(6, bossMsg)); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossDyle.js b/scripts/event/AreaBossDyle.js index 084180a3c0..bbb6e882e3 100644 --- a/scripts/event/AreaBossDyle.js +++ b/scripts/event/AreaBossDyle.js @@ -48,11 +48,11 @@ function start() { } const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); const Point = Java.type('java.awt.Point'); const spawnpoint = new Point(90, 119); dangeroudCroko1.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(6220000), spawnpoint); - dangeroudCroko1.broadcastMessage(MaplePacketCreator.serverNotice(6, "The huge crocodile Dyle has come out from the swamp.")); + dangeroudCroko1.broadcastMessage(PacketCreator.serverNotice(6, "The huge crocodile Dyle has come out from the swamp.")); setupTask = em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossEliza1.js b/scripts/event/AreaBossEliza1.js index ead84f636a..df74a9b2bb 100644 --- a/scripts/event/AreaBossEliza1.js +++ b/scripts/event/AreaBossEliza1.js @@ -52,11 +52,11 @@ function start() { return; } - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); const Point = Java.type('java.awt.Point'); const spawnpoint = new Point(208, 83); stairwayToTheSky2.spawnMonsterOnGroundBelow(eliza, spawnpoint); - stairwayToTheSky2.broadcastMessage(MaplePacketCreator.serverNotice(6, "Eliza has appeared with a black whirlwind.")); + stairwayToTheSky2.broadcastMessage(PacketCreator.serverNotice(6, "Eliza has appeared with a black whirlwind.")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossFaust1.js b/scripts/event/AreaBossFaust1.js index 7219b6e422..b30dc16c83 100644 --- a/scripts/event/AreaBossFaust1.js +++ b/scripts/event/AreaBossFaust1.js @@ -48,13 +48,13 @@ function start() { } const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); const Point = Java.type('java.awt.Point'); var faust1 = MapleLifeFactory.getMonster(5220002); const spawnpoint = new Point(456, 278); theForestOfEvil1.spawnMonsterOnGroundBelow(faust1, spawnpoint); - theForestOfEvil1.broadcastMessage(MaplePacketCreator.serverNotice(6, "Faust appeared amidst the blue fog.")); + theForestOfEvil1.broadcastMessage(PacketCreator.serverNotice(6, "Faust appeared amidst the blue fog.")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossFaust2.js b/scripts/event/AreaBossFaust2.js index 719da12138..311734bb90 100644 --- a/scripts/event/AreaBossFaust2.js +++ b/scripts/event/AreaBossFaust2.js @@ -54,8 +54,8 @@ function start() { const spawnpoint = new Point(474, 278); theForestOfEvil2.spawnMonsterOnGroundBelow(faust2, spawnpoint); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - theForestOfEvil2.broadcastMessage(MaplePacketCreator.serverNotice(6, "Faust appeared amidst the blue fog.")); + const PacketCreator = Java.type('tools.PacketCreator'); + theForestOfEvil2.broadcastMessage(PacketCreator.serverNotice(6, "Faust appeared amidst the blue fog.")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossKimera.js b/scripts/event/AreaBossKimera.js index c1e11a06a6..2a50671430 100644 --- a/scripts/event/AreaBossKimera.js +++ b/scripts/event/AreaBossKimera.js @@ -57,8 +57,8 @@ function start() { const spawnpoint = new Point(posX, posY); labSecretBasementPath.spawnMonsterOnGroundBelow(chimera, spawnpoint); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - labSecretBasementPath.broadcastMessage(MaplePacketCreator.serverNotice(6, "Kimera has appeared out of the darkness of the underground with a glitter in her eyes.")); + const PacketCreator = Java.type('tools.PacketCreator'); + labSecretBasementPath.broadcastMessage(PacketCreator.serverNotice(6, "Kimera has appeared out of the darkness of the underground with a glitter in her eyes.")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossKingClang.js b/scripts/event/AreaBossKingClang.js index daad7c3346..da7bceb2fe 100644 --- a/scripts/event/AreaBossKingClang.js +++ b/scripts/event/AreaBossKingClang.js @@ -58,8 +58,8 @@ function start() { const spawnpoint = new Point(posX, posY); hotSand.spawnMonsterOnGroundBelow(kingClang, spawnpoint); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - hotSand.broadcastMessage(MaplePacketCreator.serverNotice(6, "A strange turban shell has appeared on the beach.")); + const PacketCreator = Java.type('tools.PacketCreator'); + hotSand.broadcastMessage(PacketCreator.serverNotice(6, "A strange turban shell has appeared on the beach.")); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossKingSageCat.js b/scripts/event/AreaBossKingSageCat.js index 0e48183fb5..11b487772c 100644 --- a/scripts/event/AreaBossKingSageCat.js +++ b/scripts/event/AreaBossKingSageCat.js @@ -56,8 +56,8 @@ function start() { const spawnpoint = new Point(posX, posY); goblinForest2.spawnMonsterOnGroundBelow(kingSageCat, spawnpoint); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - goblinForest2.broadcastMessage(MaplePacketCreator.serverNotice(6, "The ghostly air around here has become stronger. The unpleasant sound of a cat crying can be heard.")); + const PacketCreator = Java.type('tools.PacketCreator'); + goblinForest2.broadcastMessage(PacketCreator.serverNotice(6, "The ghostly air around here has become stronger. The unpleasant sound of a cat crying can be heard.")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossLeviathan.js b/scripts/event/AreaBossLeviathan.js index 4b53177f76..4a2a6b64b6 100644 --- a/scripts/event/AreaBossLeviathan.js +++ b/scripts/event/AreaBossLeviathan.js @@ -56,8 +56,8 @@ function start() { const spawnpoint = new Point(posX, posY); leviathansCanyon.spawnMonsterOnGroundBelow(leviathan, spawnpoint); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - leviathansCanyon.broadcastMessage(MaplePacketCreator.serverNotice(6, "Leviathan emerges from the canyon and the cold icy wind blows.")); + const PacketCreator = Java.type('tools.PacketCreator'); + leviathansCanyon.broadcastMessage(PacketCreator.serverNotice(6, "Leviathan emerges from the canyon and the cold icy wind blows.")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossMano.js b/scripts/event/AreaBossMano.js index efd553f051..3e46eb9248 100644 --- a/scripts/event/AreaBossMano.js +++ b/scripts/event/AreaBossMano.js @@ -52,8 +52,8 @@ function start() { const spawnpoint = new Point(279, -496); thicketAroundTheBeach3.spawnMonsterOnGroundBelow(mano, spawnpoint); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - thicketAroundTheBeach3.broadcastMessage(MaplePacketCreator.serverNotice(6, "A cool breeze was felt when Mano appeared.")); + const PacketCreator = Java.type('tools.PacketCreator'); + thicketAroundTheBeach3.broadcastMessage(PacketCreator.serverNotice(6, "A cool breeze was felt when Mano appeared.")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossNineTailedFox.js b/scripts/event/AreaBossNineTailedFox.js index 9573170bde..cda001496a 100644 --- a/scripts/event/AreaBossNineTailedFox.js +++ b/scripts/event/AreaBossNineTailedFox.js @@ -55,8 +55,8 @@ function start() { const spawnpoint = new Point(posX, posY); moonRidge.spawnMonsterOnGroundBelow(nineTailedFox, spawnpoint); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - moonRidge.broadcastMessage(MaplePacketCreator.serverNotice(6, "As the moon light dims, a long fox cry can be heard and the presence of the old fox can be felt")); + const PacketCreator = Java.type('tools.PacketCreator'); + moonRidge.broadcastMessage(PacketCreator.serverNotice(6, "As the moon light dims, a long fox cry can be heard and the presence of the old fox can be felt")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossSeruf.js b/scripts/event/AreaBossSeruf.js index d55e2da280..e6eed006d6 100644 --- a/scripts/event/AreaBossSeruf.js +++ b/scripts/event/AreaBossSeruf.js @@ -58,8 +58,8 @@ function start() { const spawnpoint = new Point(posX, posY); theSeaweedTower.spawnMonsterOnGroundBelow(seruf, spawnpoint); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - theSeaweedTower.broadcastMessage(MaplePacketCreator.serverNotice(6, "A strange shell has appeared from a grove of seaweed")); + const PacketCreator = Java.type('tools.PacketCreator'); + theSeaweedTower.broadcastMessage(PacketCreator.serverNotice(6, "A strange shell has appeared from a grove of seaweed")); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossSnackBar.js b/scripts/event/AreaBossSnackBar.js index 97388176d6..316505b2b3 100644 --- a/scripts/event/AreaBossSnackBar.js +++ b/scripts/event/AreaBossSnackBar.js @@ -52,11 +52,11 @@ function start() { const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); const Point = Java.type('java.awt.Point'); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); var snackBar = MapleLifeFactory.getMonster(8220008); snackBarMap.spawnMonsterOnGroundBelow(snackBar, new Point(rndPos[0], rndPos[1])); - snackBarMap.broadcastMessage(MaplePacketCreator.serverNotice(6, "Slowly, a suspicious food stand opens up on a strangely remote place.")); + snackBarMap.broadcastMessage(PacketCreator.serverNotice(6, "Slowly, a suspicious food stand opens up on a strangely remote place.")); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossStumpy.js b/scripts/event/AreaBossStumpy.js index bb4cdf3b51..90f991354a 100644 --- a/scripts/event/AreaBossStumpy.js +++ b/scripts/event/AreaBossStumpy.js @@ -57,8 +57,8 @@ function start() { const spawnpoint = new Point(posX, posY); eastRockyMountain5.spawnMonsterOnGroundBelow(stumpy, spawnpoint); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - eastRockyMountain5.broadcastMessage(MaplePacketCreator.serverNotice(6, "Stumpy has appeared with a stumping sound that rings the Stone Mountain.")); + const PacketCreator = Java.type('tools.PacketCreator'); + eastRockyMountain5.broadcastMessage(PacketCreator.serverNotice(6, "Stumpy has appeared with a stumping sound that rings the Stone Mountain.")); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossTaeRoon.js b/scripts/event/AreaBossTaeRoon.js index 29532d19c2..5a0f881ca0 100644 --- a/scripts/event/AreaBossTaeRoon.js +++ b/scripts/event/AreaBossTaeRoon.js @@ -57,8 +57,8 @@ function start() { const spawnpoint = new Point(posX, posY); territoryOfWanderingBear.spawnMonsterOnGroundBelow(taeRoon, spawnpoint); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - territoryOfWanderingBear.broadcastMessage(MaplePacketCreator.serverNotice(6, "Tae Roon has appeared with a soft whistling sound.")); + const PacketCreator = Java.type('tools.PacketCreator'); + territoryOfWanderingBear.broadcastMessage(PacketCreator.serverNotice(6, "Tae Roon has appeared with a soft whistling sound.")); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossTimer1.js b/scripts/event/AreaBossTimer1.js index 2d76789b54..3ead99a478 100644 --- a/scripts/event/AreaBossTimer1.js +++ b/scripts/event/AreaBossTimer1.js @@ -56,8 +56,8 @@ function start() { const spawnpoint = new Point(posX, posY); whirlpoolOfTime.spawnMonsterOnGroundBelow(timer1, spawnpoint); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - whirlpoolOfTime.broadcastMessage(MaplePacketCreator.serverNotice(6, "Tick-Tock Tick-Tock! Timer makes it's presence known.")); + const PacketCreator = Java.type('tools.PacketCreator'); + whirlpoolOfTime.broadcastMessage(PacketCreator.serverNotice(6, "Tick-Tock Tick-Tock! Timer makes it's presence known.")); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossTimer2.js b/scripts/event/AreaBossTimer2.js index 51aa4efc23..aa762ce1d8 100644 --- a/scripts/event/AreaBossTimer2.js +++ b/scripts/event/AreaBossTimer2.js @@ -57,8 +57,8 @@ function start() { const spawnpoint = new Point(posX, posY); lostTime1.spawnMonsterOnGroundBelow(timer2, spawnpoint); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - lostTime1.broadcastMessage(MaplePacketCreator.serverNotice(6, "Tick-Tock Tick-Tock! Timer makes it's presence known.")); + const PacketCreator = Java.type('tools.PacketCreator'); + lostTime1.broadcastMessage(PacketCreator.serverNotice(6, "Tick-Tock Tick-Tock! Timer makes it's presence known.")); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossTimer3.js b/scripts/event/AreaBossTimer3.js index cd5d9a73fb..a0bbb09fc3 100644 --- a/scripts/event/AreaBossTimer3.js +++ b/scripts/event/AreaBossTimer3.js @@ -58,8 +58,8 @@ function start() { const spawnpoint = new Point(posX, posY); lostTime2.spawnMonsterOnGroundBelow(timer3, spawnpoint); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - lostTime2.broadcastMessage(MaplePacketCreator.serverNotice(6, "Tick-Tock Tick-Tock! Timer makes it's presence known.")); + const PacketCreator = Java.type('tools.PacketCreator'); + lostTime2.broadcastMessage(PacketCreator.serverNotice(6, "Tick-Tock Tick-Tock! Timer makes it's presence known.")); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossZeno.js b/scripts/event/AreaBossZeno.js index 348f03bce5..fe808f1104 100644 --- a/scripts/event/AreaBossZeno.js +++ b/scripts/event/AreaBossZeno.js @@ -49,11 +49,11 @@ function start() { const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); const Point = Java.type('java.awt.Point'); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); var zeno = MapleLifeFactory.getMonster(6220001); graysPrairie.spawnMonsterOnGroundBelow(zeno, new Point(-4224, 776)); - graysPrairie.broadcastMessage(MaplePacketCreator.serverNotice(6, "Zeno has appeared with a heavy sound of machinery.")); + graysPrairie.broadcastMessage(PacketCreator.serverNotice(6, "Zeno has appeared with a heavy sound of machinery.")); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/BalrogQuest.js b/scripts/event/BalrogQuest.js index 9a7be5607f..3332e5f847 100644 --- a/scripts/event/BalrogQuest.js +++ b/scripts/event/BalrogQuest.js @@ -63,8 +63,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 1); em.setProperty("noEntry","true"); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getClient().announce(PacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/Boats.js b/scripts/event/Boats.js index 69d75f7019..cbcab79119 100644 --- a/scripts/event/Boats.js +++ b/scripts/event/Boats.js @@ -86,9 +86,9 @@ function approach() { em.setProperty("haveBalrog","true"); Boat_to_Orbis.broadcastEnemyShip(true); Boat_to_Ellinia.broadcastEnemyShip(true); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - Boat_to_Orbis.broadcastMessage(MaplePacketCreator.musicChange("Bgm04/ArabPirate")); - Boat_to_Ellinia.broadcastMessage(MaplePacketCreator.musicChange("Bgm04/ArabPirate")); + const PacketCreator = Java.type('tools.PacketCreator'); + Boat_to_Orbis.broadcastMessage(PacketCreator.musicChange("Bgm04/ArabPirate")); + Boat_to_Ellinia.broadcastMessage(PacketCreator.musicChange("Bgm04/ArabPirate")); em.schedule("invasion", invasionDelay); } diff --git a/scripts/event/DollHouse.js b/scripts/event/DollHouse.js index df5d482425..f476024254 100644 --- a/scripts/event/DollHouse.js +++ b/scripts/event/DollHouse.js @@ -46,8 +46,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 0); em.setProperty("noEntry","true"); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getClient().announce(PacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/Hak.js b/scripts/event/Hak.js index 536124e21d..0e10f03181 100644 --- a/scripts/event/Hak.js +++ b/scripts/event/Hak.js @@ -32,8 +32,8 @@ function playerEntry(eim, player) { onRide = eim.getMapFactory().getMap(birdRide[myRide]); player.changeMap(onRide, onRide.getPortal(0)); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getClient().announce(MaplePacketCreator.getClock(rideTime / 1000)); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getClient().announce(PacketCreator.getClock(rideTime / 1000)); eim.schedule("timeOut", rideTime); } diff --git a/scripts/event/HenesysPQ.js b/scripts/event/HenesysPQ.js index 84a6432819..4a6ccc0098 100644 --- a/scripts/event/HenesysPQ.js +++ b/scripts/event/HenesysPQ.js @@ -250,8 +250,8 @@ function friendlyItemDrop(eim, mob) { var cakes = eim.getIntProperty("bunnyCake") + 1; eim.setIntProperty("bunnyCake", cakes); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - mob.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, "The Moon Bunny made rice cake number " + cakes + ".")); + const PacketCreator = Java.type('tools.PacketCreator'); + mob.getMap().broadcastMessage(PacketCreator.serverNotice(6, "The Moon Bunny made rice cake number " + cakes + ".")); } } @@ -259,8 +259,8 @@ function friendlyDamaged(eim, mob) { if (mob.getId() == 9300061) { var bunnyDamage = eim.getIntProperty("bunnyDamaged") + 1; if (bunnyDamage > 5) { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - broadcastMessage(MaplePacketCreator.serverNotice(6, "The Moon Bunny is feeling sick. Please protect it so it can make delicious rice cakes.")); + const PacketCreator = Java.type('tools.PacketCreator'); + broadcastMessage(PacketCreator.serverNotice(6, "The Moon Bunny is feeling sick. Please protect it so it can make delicious rice cakes.")); eim.setIntProperty("bunnyDamaged", 0); } } diff --git a/scripts/event/KerningTrain.js b/scripts/event/KerningTrain.js index 09f707ee27..d672f9f72c 100644 --- a/scripts/event/KerningTrain.js +++ b/scripts/event/KerningTrain.js @@ -33,9 +33,9 @@ function playerEntry(eim, player) { onRide = eim.getMapFactory().getMap(trainRide[myRide]); player.changeMap(onRide, onRide.getPortal(0)); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getClient().announce(MaplePacketCreator.getClock(rideTime / 1000)); - player.getClient().announce(MaplePacketCreator.earnTitleMessage("The next stop is at Kerning " + (myRide == 0 ? "Square" : "Subway") + " Station. The exit is to your left.")); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getClient().announce(PacketCreator.getClock(rideTime / 1000)); + player.getClient().announce(PacketCreator.earnTitleMessage("The next stop is at Kerning " + (myRide == 0 ? "Square" : "Subway") + " Station. The exit is to your left.")); eim.schedule("timeOut", rideTime); } diff --git a/scripts/event/RescueGaga.js b/scripts/event/RescueGaga.js index b1dbe077e6..9b3f739c91 100644 --- a/scripts/event/RescueGaga.js +++ b/scripts/event/RescueGaga.js @@ -101,8 +101,8 @@ function playerEntry(eim, player) { var map = eim.getMapInstance(entryMap); player.changeMap(map, map.getPortal(0)); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.announce(MaplePacketCreator.showEffect("event/space/start")); + const PacketCreator = Java.type('tools.PacketCreator'); + player.announce(PacketCreator.showEffect("event/space/start")); player.startMapEffect("Please rescue Gaga within the time limit.", 5120027); } diff --git a/scripts/event/Subway.js b/scripts/event/Subway.js index 9cd8d68ddd..148d82da6e 100644 --- a/scripts/event/Subway.js +++ b/scripts/event/Subway.js @@ -36,11 +36,11 @@ function stopEntry() { } function takeoff() { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); //sound src: https://www.soundjay.com/transportation/metro-door-close-01.mp3 - KC_docked.broadcastMessage(MaplePacketCreator.playSound("subway/whistle")); - NLC_docked.broadcastMessage(MaplePacketCreator.playSound("subway/whistle")); + KC_docked.broadcastMessage(PacketCreator.playSound("subway/whistle")); + NLC_docked.broadcastMessage(PacketCreator.playSound("subway/whistle")); em.setProperty("docked","false"); KC_Waiting.warpEveryone(Subway_to_NLC.getId()); @@ -53,9 +53,9 @@ function arrived() { Subway_to_NLC.warpEveryone(NLC_docked.getId(), 0); scheduleNew(); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - KC_docked.broadcastMessage(MaplePacketCreator.playSound("subway/whistle")); - NLC_docked.broadcastMessage(MaplePacketCreator.playSound("subway/whistle")); + const PacketCreator = Java.type('tools.PacketCreator'); + KC_docked.broadcastMessage(PacketCreator.playSound("subway/whistle")); + NLC_docked.broadcastMessage(PacketCreator.playSound("subway/whistle")); } function cancelSchedule() {} diff --git a/scripts/map/onUserEnter/200090000.js b/scripts/map/onUserEnter/200090000.js index 22fd6156a5..f59d69363f 100644 --- a/scripts/map/onUserEnter/200090000.js +++ b/scripts/map/onUserEnter/200090000.js @@ -5,9 +5,9 @@ function start(ms) { var map = ms.getClient().getChannelServer().getMapFactory().getMap(mapId); if(map.getDocked()) { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - ms.getClient().announce(MaplePacketCreator.musicChange("Bgm04/ArabPirate")); - ms.getClient().announce(MaplePacketCreator.crogBoatPacket(true)); + const PacketCreator = Java.type('tools.PacketCreator'); + ms.getClient().announce(PacketCreator.musicChange("Bgm04/ArabPirate")); + ms.getClient().announce(PacketCreator.crogBoatPacket(true)); } return true; diff --git a/scripts/map/onUserEnter/200090010.js b/scripts/map/onUserEnter/200090010.js index b72a54b86f..65063ad747 100644 --- a/scripts/map/onUserEnter/200090010.js +++ b/scripts/map/onUserEnter/200090010.js @@ -5,9 +5,9 @@ function start(ms) { var map = ms.getClient().getChannelServer().getMapFactory().getMap(mapId); if(map.getDocked()) { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - ms.getClient().announce(MaplePacketCreator.musicChange("Bgm04/ArabPirate")); - ms.getClient().announce(MaplePacketCreator.crogBoatPacket(true)); + const PacketCreator = Java.type('tools.PacketCreator'); + ms.getClient().announce(PacketCreator.musicChange("Bgm04/ArabPirate")); + ms.getClient().announce(PacketCreator.crogBoatPacket(true)); } return true; diff --git a/scripts/npc/1022101_old.js b/scripts/npc/1022101_old.js index 63a593d8c8..f0a0c226fc 100644 --- a/scripts/npc/1022101_old.js +++ b/scripts/npc/1022101_old.js @@ -136,8 +136,8 @@ function action(mode, type, selection) { cm.gainItem(itemToUse, -1); cm.getPlayer().getCashShop().gainCash(1, nxAmount); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - cm.getPlayer().announce(MaplePacketCreator.earnTitleMessage("You have earned " + nxAmount + " NX")); + const PacketCreator = Java.type('tools.PacketCreator'); + cm.getPlayer().announce(PacketCreator.earnTitleMessage("You have earned " + nxAmount + " NX")); cm.logLeaf(nxAmount + " NX"); cm.dispose(); } else if(choice == 2) { diff --git a/scripts/npc/1061014.js b/scripts/npc/1061014.js index 0ac0837bc1..cc4410d375 100644 --- a/scripts/npc/1061014.js +++ b/scripts/npc/1061014.js @@ -156,8 +156,8 @@ function action(mode, type, selection) { cm.sendOk("The expedition will begin and you will now be escorted to the #b" + expedMap + "#k."); status = 4; } else if (selection == 3) { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition.")); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getMap().broadcastMessage(PacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition.")); cm.endExpedition(expedition); cm.sendOk("The expedition has now ended. Sometimes the best strategy is to run away."); cm.dispose(); diff --git a/scripts/npc/2012027.js b/scripts/npc/2012027.js index 6d78795cd2..0eb18ddd36 100644 --- a/scripts/npc/2012027.js +++ b/scripts/npc/2012027.js @@ -45,8 +45,8 @@ function action(mode, type, selection) { status--; if(status == 0) { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - cm.getMap().broadcastMessage(MaplePacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027])); + const PacketCreator = Java.type('tools.PacketCreator'); + cm.getMap().broadcastMessage(PacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027])); if(cm.isQuestStarted(3114)) { var idx = -1 * cm.getQuestProgressInt(3114); // infoEx without infoNumber, must use one progress only, critical hit! @@ -57,8 +57,8 @@ function action(mode, type, selection) { if(harpNote != nextNote) { cm.setQuestProgress(3114, 0); - cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/wrong_kor")); - cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Failed")); + cm.getPlayer().announce(PacketCreator.showEffect("quest/party/wrong_kor")); + cm.getPlayer().announce(PacketCreator.playSound("Party1/Failed")); cm.message("You've missed the note... Start over again."); } else { @@ -71,8 +71,8 @@ function action(mode, type, selection) { cm.message("Twinkle, twinkle, little star, how I wonder what you are."); cm.setQuestProgress(3114, 42); - cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/clear")); - cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Clear")); + cm.getPlayer().announce(PacketCreator.showEffect("quest/party/clear")); + cm.getPlayer().announce(PacketCreator.playSound("Party1/Clear")); cm.dispose(); return; diff --git a/scripts/npc/2012028.js b/scripts/npc/2012028.js index 43627b8b8a..3986903679 100644 --- a/scripts/npc/2012028.js +++ b/scripts/npc/2012028.js @@ -45,8 +45,8 @@ function action(mode, type, selection) { status--; if(status == 0) { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - cm.getMap().broadcastMessage(MaplePacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027])); + const PacketCreator = Java.type('tools.PacketCreator'); + cm.getMap().broadcastMessage(PacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027])); if(cm.isQuestStarted(3114)) { var idx = -1 * cm.getQuestProgressInt(3114); @@ -57,8 +57,8 @@ function action(mode, type, selection) { if(harpNote != nextNote) { cm.setQuestProgress(3114, 0); - cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/wrong_kor")); - cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Failed")); + cm.getPlayer().announce(PacketCreator.showEffect("quest/party/wrong_kor")); + cm.getPlayer().announce(PacketCreator.playSound("Party1/Failed")); cm.message("You've missed the note... Start over again."); } else { @@ -71,8 +71,8 @@ function action(mode, type, selection) { cm.message("Twinkle, twinkle, little star, how I wonder what you are."); cm.setQuestProgress(3114, 42); - cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/clear")); - cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Clear")); + cm.getPlayer().announce(PacketCreator.showEffect("quest/party/clear")); + cm.getPlayer().announce(PacketCreator.playSound("Party1/Clear")); cm.dispose(); return; diff --git a/scripts/npc/2012029.js b/scripts/npc/2012029.js index 9b5a7ab270..8b986072ac 100644 --- a/scripts/npc/2012029.js +++ b/scripts/npc/2012029.js @@ -45,8 +45,8 @@ function action(mode, type, selection) { status--; if(status == 0) { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - cm.getMap().broadcastMessage(MaplePacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027])); + const PacketCreator = Java.type('tools.PacketCreator'); + cm.getMap().broadcastMessage(PacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027])); if(cm.isQuestStarted(3114)) { var idx = -1 * cm.getQuestProgressInt(3114); @@ -57,8 +57,8 @@ function action(mode, type, selection) { if(harpNote != nextNote) { cm.setQuestProgress(3114, 0); - cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/wrong_kor")); - cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Failed")); + cm.getPlayer().announce(PacketCreator.showEffect("quest/party/wrong_kor")); + cm.getPlayer().announce(PacketCreator.playSound("Party1/Failed")); cm.message("You've missed the note... Start over again."); } else { @@ -71,8 +71,8 @@ function action(mode, type, selection) { cm.message("Twinkle, twinkle, little star, how I wonder what you are."); cm.setQuestProgress(3114, 42); - cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/clear")); - cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Clear")); + cm.getPlayer().announce(PacketCreator.showEffect("quest/party/clear")); + cm.getPlayer().announce(PacketCreator.playSound("Party1/Clear")); cm.dispose(); return; diff --git a/scripts/npc/2012030.js b/scripts/npc/2012030.js index c7a6590218..2a50a6cf68 100644 --- a/scripts/npc/2012030.js +++ b/scripts/npc/2012030.js @@ -45,8 +45,8 @@ function action(mode, type, selection) { status--; if(status == 0) { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - cm.getMap().broadcastMessage(MaplePacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027])); + const PacketCreator = Java.type('tools.PacketCreator'); + cm.getMap().broadcastMessage(PacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027])); if(cm.isQuestStarted(3114)) { var idx = -1 * cm.getQuestProgressInt(3114); @@ -57,8 +57,8 @@ function action(mode, type, selection) { if(harpNote != nextNote) { cm.setQuestProgress(3114, 0); - cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/wrong_kor")); - cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Failed")); + cm.getPlayer().announce(PacketCreator.showEffect("quest/party/wrong_kor")); + cm.getPlayer().announce(PacketCreator.playSound("Party1/Failed")); cm.message("You've missed the note... Start over again."); } else { @@ -71,8 +71,8 @@ function action(mode, type, selection) { cm.message("Twinkle, twinkle, little star, how I wonder what you are."); cm.setQuestProgress(3114, 42); - cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/clear")); - cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Clear")); + cm.getPlayer().announce(PacketCreator.showEffect("quest/party/clear")); + cm.getPlayer().announce(PacketCreator.playSound("Party1/Clear")); cm.dispose(); return; diff --git a/scripts/npc/2012031.js b/scripts/npc/2012031.js index 3420643eaf..8202dad15f 100644 --- a/scripts/npc/2012031.js +++ b/scripts/npc/2012031.js @@ -45,8 +45,8 @@ function action(mode, type, selection) { status--; if(status == 0) { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - cm.getMap().broadcastMessage(MaplePacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027])); + const PacketCreator = Java.type('tools.PacketCreator'); + cm.getMap().broadcastMessage(PacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027])); if(cm.isQuestStarted(3114)) { var idx = -1 * cm.getQuestProgressInt(3114); @@ -57,8 +57,8 @@ function action(mode, type, selection) { if(harpNote != nextNote) { cm.setQuestProgress(3114, 0); - cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/wrong_kor")); - cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Failed")); + cm.getPlayer().announce(PacketCreator.showEffect("quest/party/wrong_kor")); + cm.getPlayer().announce(PacketCreator.playSound("Party1/Failed")); cm.message("You've missed the note... Start over again."); } else { @@ -71,8 +71,8 @@ function action(mode, type, selection) { cm.message("Twinkle, twinkle, little star, how I wonder what you are."); cm.setQuestProgress(3114, 42); - cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/clear")); - cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Clear")); + cm.getPlayer().announce(PacketCreator.showEffect("quest/party/clear")); + cm.getPlayer().announce(PacketCreator.playSound("Party1/Clear")); cm.dispose(); return; diff --git a/scripts/npc/2012032.js b/scripts/npc/2012032.js index 3c39a2493b..16281bbb9a 100644 --- a/scripts/npc/2012032.js +++ b/scripts/npc/2012032.js @@ -45,8 +45,8 @@ function action(mode, type, selection) { status--; if(status == 0) { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - cm.getMap().broadcastMessage(MaplePacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027])); + const PacketCreator = Java.type('tools.PacketCreator'); + cm.getMap().broadcastMessage(PacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027])); if(cm.isQuestStarted(3114)) { var idx = -1 * cm.getQuestProgressInt(3114); @@ -57,8 +57,8 @@ function action(mode, type, selection) { if(harpNote != nextNote) { cm.setQuestProgress(3114, 0); - cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/wrong_kor")); - cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Failed")); + cm.getPlayer().announce(PacketCreator.showEffect("quest/party/wrong_kor")); + cm.getPlayer().announce(PacketCreator.playSound("Party1/Failed")); cm.message("You've missed the note... Start over again."); } else { @@ -71,8 +71,8 @@ function action(mode, type, selection) { cm.message("Twinkle, twinkle, little star, how I wonder what you are."); cm.setQuestProgress(3114, 42); - cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/clear")); - cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Clear")); + cm.getPlayer().announce(PacketCreator.showEffect("quest/party/clear")); + cm.getPlayer().announce(PacketCreator.playSound("Party1/Clear")); cm.dispose(); return; diff --git a/scripts/npc/2012033.js b/scripts/npc/2012033.js index 35499c3a28..24379bd233 100644 --- a/scripts/npc/2012033.js +++ b/scripts/npc/2012033.js @@ -45,8 +45,8 @@ function action(mode, type, selection) { status--; if(status == 0) { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - cm.getMap().broadcastMessage(MaplePacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027])); + const PacketCreator = Java.type('tools.PacketCreator'); + cm.getMap().broadcastMessage(PacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027])); if(cm.isQuestStarted(3114)) { var idx = -1 * cm.getQuestProgressInt(3114); @@ -57,8 +57,8 @@ function action(mode, type, selection) { if(harpNote != nextNote) { cm.setQuestProgress(3114, 0); - cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/wrong_kor")); - cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Failed")); + cm.getPlayer().announce(PacketCreator.showEffect("quest/party/wrong_kor")); + cm.getPlayer().announce(PacketCreator.playSound("Party1/Failed")); cm.message("You've missed the note... Start over again."); } else { @@ -71,8 +71,8 @@ function action(mode, type, selection) { cm.message("Twinkle, twinkle, little star, how I wonder what you are."); cm.setQuestProgress(3114, 42); - cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/clear")); - cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Clear")); + cm.getPlayer().announce(PacketCreator.showEffect("quest/party/clear")); + cm.getPlayer().announce(PacketCreator.playSound("Party1/Clear")); cm.dispose(); return; diff --git a/scripts/npc/2030013.js b/scripts/npc/2030013.js index 0c204d4d02..b0ab2e5c5d 100644 --- a/scripts/npc/2030013.js +++ b/scripts/npc/2030013.js @@ -159,8 +159,8 @@ function action(mode, type, selection) { cm.sendOk("The expedition will begin and you will now be escorted to the #b" + expedMap + "#k."); status = 4; } else if (selection == 3) { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition.")); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getMap().broadcastMessage(PacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition.")); cm.endExpedition(expedition); cm.sendOk("The expedition has now ended. Sometimes the best strategy is to run away."); cm.dispose(); diff --git a/scripts/npc/2083004.js b/scripts/npc/2083004.js index 55691bec0e..3d95f72be4 100644 --- a/scripts/npc/2083004.js +++ b/scripts/npc/2083004.js @@ -151,8 +151,8 @@ function action(mode, type, selection) { cm.sendOk("Good luck! All of Leafre is counting on you."); status = 4; } else if (selection == 3) { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition.")); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getMap().broadcastMessage(PacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition.")); cm.endExpedition(expedition); cm.sendOk("The expedition has now ended. Sometimes the best strategy is to run away."); cm.dispose(); diff --git a/scripts/npc/2141001.js b/scripts/npc/2141001.js index 6d92c75daf..2e94159166 100644 --- a/scripts/npc/2141001.js +++ b/scripts/npc/2141001.js @@ -154,8 +154,8 @@ function action(mode, type, selection) { cm.sendOk("The expedition will begin and you will now be escorted to the #b" + expedMap + "#k."); status = 4; } else if (selection == 3) { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition.")); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getMap().broadcastMessage(PacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition.")); cm.endExpedition(expedition); cm.sendOk("The expedition has now ended. Sometimes the best strategy is to run away."); cm.dispose(); diff --git a/scripts/npc/9000019.js b/scripts/npc/9000019.js index 7dac2aa966..c928c5cbe7 100644 --- a/scripts/npc/9000019.js +++ b/scripts/npc/9000019.js @@ -26,8 +26,8 @@ function action(mode, type, selection) { return; } - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - cm.getClient().announce(MaplePacketCreator.openRPSNPC()); + const PacketCreator = Java.type('tools.PacketCreator'); + cm.getClient().announce(PacketCreator.openRPSNPC()); cm.dispose(); } } diff --git a/scripts/npc/9120201.js b/scripts/npc/9120201.js index 98a0d7984f..38b8e6d57f 100644 --- a/scripts/npc/9120201.js +++ b/scripts/npc/9120201.js @@ -158,8 +158,8 @@ function action(mode, type, selection) { cm.sendOk("The expedition will begin and you will now be escorted to the #b" + expedMap + "#k."); status = 4; } else if (selection == 3) { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition.")); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getMap().broadcastMessage(PacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition.")); cm.endExpedition(expedition); cm.sendOk("The expedition has now ended. Sometimes the best strategy is to run away."); cm.dispose(); diff --git a/scripts/npc/9201002.js b/scripts/npc/9201002.js index 5aac705356..ab3f04b48d 100644 --- a/scripts/npc/9201002.js +++ b/scripts/npc/9201002.js @@ -300,19 +300,19 @@ function action(mode, type, selection) { if (state == 0) { // give player blessings eim.gridInsert(cm.getPlayer(), 1); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); if (YamlConfig.config.server.WEDDING_BLESSER_SHOWFX) { var target = cm.getPlayer(); - target.announce(MaplePacketCreator.showSpecialEffect(9)); - target.getMap().broadcastMessage(target, MaplePacketCreator.showForeignEffect(target.getId(), 9), false); + target.announce(PacketCreator.showSpecialEffect(9)); + target.getMap().broadcastMessage(target, PacketCreator.showForeignEffect(target.getId(), 9), false); } else { var target = eim.getPlayerById(eim.getIntProperty("groomId")); - target.announce(MaplePacketCreator.showSpecialEffect(9)); - target.getMap().broadcastMessage(target, MaplePacketCreator.showForeignEffect(target.getId(), 9), false); + target.announce(PacketCreator.showSpecialEffect(9)); + target.getMap().broadcastMessage(target, PacketCreator.showForeignEffect(target.getId(), 9), false); target = eim.getPlayerById(eim.getIntProperty("brideId")); - target.announce(MaplePacketCreator.showSpecialEffect(9)); - target.getMap().broadcastMessage(target, MaplePacketCreator.showForeignEffect(target.getId(), 9), false); + target.announce(PacketCreator.showSpecialEffect(9)); + target.getMap().broadcastMessage(target, PacketCreator.showForeignEffect(target.getId(), 9), false); } cm.sendOk("Your blessings have been added to their love. What a noble act for a lovely couple!"); diff --git a/scripts/npc/9201011.js b/scripts/npc/9201011.js index e61b923927..a10562cef3 100644 --- a/scripts/npc/9201011.js +++ b/scripts/npc/9201011.js @@ -170,19 +170,19 @@ function action(mode, type, selection) { if(state == 0) { // give player blessings eim.gridInsert(cm.getPlayer(), 1); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); if(YamlConfig.config.server.WEDDING_BLESSER_SHOWFX) { var target = cm.getPlayer(); - target.announce(MaplePacketCreator.showSpecialEffect(9)); - target.getMap().broadcastMessage(target, MaplePacketCreator.showForeignEffect(target.getId(), 9), false); + target.announce(PacketCreator.showSpecialEffect(9)); + target.getMap().broadcastMessage(target, PacketCreator.showForeignEffect(target.getId(), 9), false); } else { var target = eim.getPlayerById(eim.getIntProperty("groomId")); - target.announce(MaplePacketCreator.showSpecialEffect(9)); - target.getMap().broadcastMessage(target, MaplePacketCreator.showForeignEffect(target.getId(), 9), false); + target.announce(PacketCreator.showSpecialEffect(9)); + target.getMap().broadcastMessage(target, PacketCreator.showForeignEffect(target.getId(), 9), false); target = eim.getPlayerById(eim.getIntProperty("brideId")); - target.announce(MaplePacketCreator.showSpecialEffect(9)); - target.getMap().broadcastMessage(target, MaplePacketCreator.showForeignEffect(target.getId(), 9), false); + target.announce(PacketCreator.showSpecialEffect(9)); + target.getMap().broadcastMessage(target, PacketCreator.showForeignEffect(target.getId(), 9), false); } cm.sendOk("Way to go, my friend! Your LOVE has been added to theirs, now in one bigger heart-shaped sentiment that will remain lively in our hearts forever! Who-hoo~!"); diff --git a/scripts/npc/9201113.js b/scripts/npc/9201113.js index 539fef544e..21f6bfaca5 100644 --- a/scripts/npc/9201113.js +++ b/scripts/npc/9201113.js @@ -141,8 +141,8 @@ function action(mode, type, selection) { cm.sendOk("The expedition will begin and you will now be escorted to the #bEntrance to CWKPQ Altar#k."); status = 4; } else if (selection == 3) { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition.")); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getMap().broadcastMessage(PacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition.")); cm.endExpedition(expedition); cm.sendOk("The expedition has now ended. Sometimes the best strategy is to run away."); cm.dispose(); diff --git a/scripts/npc/9270047.js b/scripts/npc/9270047.js index bafaa03ae3..c7cc73c902 100644 --- a/scripts/npc/9270047.js +++ b/scripts/npc/9270047.js @@ -158,8 +158,8 @@ function action(mode, type, selection) { cm.sendOk("The expedition will begin and you will now be escorted to the #b" + expedMap + "#k."); status = 4; } else if (selection == 3) { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - player.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition.")); + const PacketCreator = Java.type('tools.PacketCreator'); + player.getMap().broadcastMessage(PacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition.")); cm.endExpedition(expedition); cm.sendOk("The expedition has now ended. Sometimes the best strategy is to run away."); cm.dispose(); diff --git a/scripts/npc/9977777.js b/scripts/npc/9977777.js index 31605dc4ac..c9e9a5805b 100644 --- a/scripts/npc/9977777.js +++ b/scripts/npc/9977777.js @@ -308,21 +308,21 @@ function writeAllFeatures() { } function start() { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - cm.getPlayer().announce(MaplePacketCreator.musicChange(anthemSong)); + const PacketCreator = Java.type('tools.PacketCreator'); + cm.getPlayer().announce(PacketCreator.musicChange(anthemSong)); status = -1; writeAllFeatures(); action(1, 0, 0); } function action(mode, type, selection) { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); if (mode == -1) { - cm.getPlayer().announce(MaplePacketCreator.musicChange(ambientSong)); + cm.getPlayer().announce(PacketCreator.musicChange(ambientSong)); cm.dispose(); } else { if (mode == 0 && type > 0) { - cm.getPlayer().announce(MaplePacketCreator.musicChange(ambientSong)); + cm.getPlayer().announce(PacketCreator.musicChange(ambientSong)); cm.dispose(); return; } @@ -356,7 +356,7 @@ function action(mode, type, selection) { cm.sendPrev(sendStr); } else { - cm.getPlayer().announce(MaplePacketCreator.musicChange(ambientSong)); + cm.getPlayer().announce(PacketCreator.musicChange(ambientSong)); cm.dispose(); } } diff --git a/scripts/npc/MagatiaPassword.js b/scripts/npc/MagatiaPassword.js index 340e7b52cb..9d54d25693 100644 --- a/scripts/npc/MagatiaPassword.js +++ b/scripts/npc/MagatiaPassword.js @@ -21,8 +21,8 @@ function action(mode, type, selection){ else if(status == 1){ if(cm.getText() == cm.getQuestProgress(3360)){ cm.setQuestProgress(3360, 1); - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); - cm.getPlayer().announce(MaplePacketCreator.playPortalSound()); + const PacketCreator = Java.type('tools.PacketCreator'); + cm.getPlayer().announce(PacketCreator.playPortalSound()); cm.warp(261030000, "sp_" + ((cm.getMapId() == 261010000) ? "jenu" : "alca")); } else { diff --git a/scripts/portal/party3_jailin.js b/scripts/portal/party3_jailin.js index 2ccdeac4ed..8e87dee8a0 100644 --- a/scripts/portal/party3_jailin.js +++ b/scripts/portal/party3_jailin.js @@ -28,17 +28,17 @@ function enterLeverSequence(pi) { } } - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); if(countMiss > 0) { - map.broadcastMessage(MaplePacketCreator.showEffect("quest/party/wrong_kor")); - map.broadcastMessage(MaplePacketCreator.playSound("Party1/Failed")); + map.broadcastMessage(PacketCreator.showEffect("quest/party/wrong_kor")); + map.broadcastMessage(PacketCreator.playSound("Party1/Failed")); pi.playerMessage(5, "The right combination of levers is needed to pass. " + countMiss + " lever(s) are misplaced."); return false; } - map.broadcastMessage(MaplePacketCreator.showEffect("quest/party/clear")); - map.broadcastMessage(MaplePacketCreator.playSound("Party1/Clear")); + map.broadcastMessage(PacketCreator.showEffect("quest/party/clear")); + map.broadcastMessage(PacketCreator.playSound("Party1/Clear")); pi.getEventInstance().setProperty("jail" + jailn, "0"); } diff --git a/scripts/reactor/9101000.js b/scripts/reactor/9101000.js index 6467d5d633..e05ff1d916 100644 --- a/scripts/reactor/9101000.js +++ b/scripts/reactor/9101000.js @@ -29,11 +29,11 @@ */ function act() { - const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const PacketCreator = Java.type('tools.PacketCreator'); rm.spawnMonster(9300061, 1, 0, 0); // (0, 0) is temp position rm.getClient().getMap().startMapEffect("Protect the Moon Bunny that's pounding the mill, and gather up 10 Moon Bunny's Rice Cakes!", 5120016, 7000); - rm.getClient().getMap().broadcastMessage(MaplePacketCreator.bunnyPacket()); // Protect the Moon Bunny! - rm.getClient().getMap().broadcastMessage(MaplePacketCreator.showHPQMoon()); + rm.getClient().getMap().broadcastMessage(PacketCreator.bunnyPacket()); // Protect the Moon Bunny! + rm.getClient().getMap().broadcastMessage(PacketCreator.showHPQMoon()); rm.getClient().getMap().showAllMonsters(); } \ No newline at end of file diff --git a/src/main/java/client/BuddyList.java b/src/main/java/client/BuddyList.java index 2fac16afc2..83ed697282 100644 --- a/src/main/java/client/BuddyList.java +++ b/src/main/java/client/BuddyList.java @@ -23,7 +23,7 @@ package client; import net.server.PlayerStorage; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.sql.Connection; import java.sql.PreparedStatement; @@ -167,7 +167,7 @@ public class BuddyList { public void addBuddyRequest(MapleClient c, int cidFrom, String nameFrom, int channelFrom) { put(new BuddylistEntry(nameFrom, "Default Group", cidFrom, channelFrom, false)); if (pendingRequests.isEmpty()) { - c.announce(MaplePacketCreator.requestBuddylistAdd(cidFrom, c.getPlayer().getId(), nameFrom)); + c.announce(PacketCreator.requestBuddylistAdd(cidFrom, c.getPlayer().getId(), nameFrom)); } else { pendingRequests.push(new CharacterNameAndId(cidFrom, nameFrom)); } diff --git a/src/main/java/client/MapleCharacter.java b/src/main/java/client/MapleCharacter.java index b1a57fbc5c..6a5bd054d6 100644 --- a/src/main/java/client/MapleCharacter.java +++ b/src/main/java/client/MapleCharacter.java @@ -294,7 +294,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { statup.add(new Pair<>(s.getKey(), s.getValue())); } - announce(MaplePacketCreator.updatePlayerStats(statup, true, MapleCharacter.this)); + announce(PacketCreator.updatePlayerStats(statup, true, MapleCharacter.this)); } }); @@ -757,7 +757,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } combocounter = (short) Math.min(30000, count); if (count > 0) { - announce(MaplePacketCreator.showCombo(combocounter)); + announce(PacketCreator.showCombo(combocounter)); } } @@ -823,13 +823,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (isGM() && hide != this.hidden) { if (!hide) { this.hidden = false; - announce(MaplePacketCreator.getGMEffect(0x10, (byte) 0)); + announce(PacketCreator.getGMEffect(0x10, (byte) 0)); List dsstat = Collections.singletonList(MapleBuffStat.DARKSIGHT); - getMap().broadcastGMMessage(this, MaplePacketCreator.cancelForeignBuff(id, dsstat), false); + getMap().broadcastGMMessage(this, PacketCreator.cancelForeignBuff(id, dsstat), false); getMap().broadcastSpawnPlayerMapObjectMessage(this, this, false); for(MapleSummon ms: this.getSummonsValues()) { - getMap().broadcastNONGMMessage(this, MaplePacketCreator.spawnSummon(ms, false), false); + getMap().broadcastNONGMMessage(this, PacketCreator.spawnSummon(ms, false), false); } for (MapleMapObject mo : this.getMap().getMonsters()) { @@ -838,15 +838,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } else { this.hidden = true; - announce(MaplePacketCreator.getGMEffect(0x10, (byte) 1)); + announce(PacketCreator.getGMEffect(0x10, (byte) 1)); if (!login) { - getMap().broadcastNONGMMessage(this, MaplePacketCreator.removePlayerFromMap(getId()), false); + getMap().broadcastNONGMMessage(this, PacketCreator.removePlayerFromMap(getId()), false); } List> ldsstat = Collections.singletonList(new Pair(MapleBuffStat.DARKSIGHT, 0)); - getMap().broadcastGMMessage(this, MaplePacketCreator.giveForeignBuff(id, ldsstat), false); + getMap().broadcastGMMessage(this, PacketCreator.giveForeignBuff(id, ldsstat), false); this.releaseControlledMonsters(); } - announce(MaplePacketCreator.enableActions()); + announce(PacketCreator.enableActions()); } } @@ -871,9 +871,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private void cancelPlayerBuffs(List buffstats) { if (client.getChannelServer().getPlayerStorage().getCharacterById(getId()) != null) { updateLocalStats(); - client.announce(MaplePacketCreator.cancelBuff(buffstats)); + client.announce(PacketCreator.cancelBuff(buffstats)); if (buffstats.size() > 0) { - getMap().broadcastMessage(this, MaplePacketCreator.cancelForeignBuff(getId(), buffstats), false); + getMap().broadcastMessage(this, PacketCreator.cancelForeignBuff(getId(), buffstats), false); } } } @@ -1034,7 +1034,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { MapleMap map = thisChr.getMap(); if (map != null) { - map.broadcastMessage(thisChr, MaplePacketCreator.showForeignEffect(thisChr.getId(), 8), false); + map.broadcastMessage(thisChr, PacketCreator.showForeignEffect(thisChr.getId(), 8), false); } } }, 777); @@ -1137,7 +1137,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { statup.add(new Pair<>(MapleStat.AVAILABLEAP, remainingAp)); statup.add(new Pair<>(MapleStat.AVAILABLESP, remainingSp[GameConstants.getSkillBook(job.getId())])); statup.add(new Pair<>(MapleStat.JOB, job.getId())); - client.announce(MaplePacketCreator.updatePlayerStats(statup, true, this)); + client.announce(PacketCreator.updatePlayerStats(statup, true, this)); } finally { statWlock.unlock(); effLock.unlock(); @@ -1147,16 +1147,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject { silentPartyUpdate(); if (dragon != null) { - getMap().broadcastMessage(MaplePacketCreator.removeDragon(dragon.getObjectId())); + getMap().broadcastMessage(PacketCreator.removeDragon(dragon.getObjectId())); dragon = null; } if (this.guildid > 0) { - getGuild().broadcast(MaplePacketCreator.jobMessage(0, job.getId(), name), this.getId()); + getGuild().broadcast(PacketCreator.jobMessage(0, job.getId(), name), this.getId()); } MapleFamily family = getFamily(); if(family != null) { - family.broadcast(MaplePacketCreator.jobMessage(1, job.getId(), name), this.getId()); + family.broadcast(PacketCreator.jobMessage(1, job.getId(), name), this.getId()); } setMasteries(this.job.getId()); guildUpdate(); @@ -1178,7 +1178,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public void broadcastAcquaintances(int type, String message) { - broadcastAcquaintances(MaplePacketCreator.serverNotice(type, message)); + broadcastAcquaintances(PacketCreator.serverNotice(type, message)); } public void broadcastAcquaintances(byte[] packet) { @@ -1219,7 +1219,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public void broadcastStance() { - map.broadcastMessage(this, MaplePacketCreator.movePlayer(id, this.getIdleMovement(), getIdleMovementDataLength()), false); + map.broadcastMessage(this, PacketCreator.movePlayer(id, this.getIdleMovement(), getIdleMovementDataLength()), false); } public MapleMap getWarpMap(int map) { @@ -1366,7 +1366,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (pto == null) { pto = to.getPortal(0); } - changeMapInternal(to, pto.getPosition(), MaplePacketCreator.getWarpToMap(to, pto.getId(), this)); + changeMapInternal(to, pto.getPosition(), PacketCreator.getWarpToMap(to, pto.getId(), this)); canWarpMap = false; canWarpCounter--; @@ -1382,7 +1382,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { eventChangedMap(target.getId()); MapleMap to = getWarpMap(target.getId()); - changeMapInternal(to, pos, MaplePacketCreator.getWarpToMap(to, 0x80, pos, this)); + changeMapInternal(to, pos, PacketCreator.getWarpToMap(to, 0x80, pos, this)); canWarpMap = false; canWarpCounter--; @@ -1417,7 +1417,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (pto == null) { pto = to.getPortal(0); } - changeMapInternal(to, pto.getPosition(), MaplePacketCreator.getWarpToMap(to, pto.getId(), this)); + changeMapInternal(to, pto.getPosition(), PacketCreator.getWarpToMap(to, pto.getId(), this)); canWarpMap = false; canWarpCounter--; @@ -1701,7 +1701,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { try { if (party != null) { mpc.setMapId(to.getId()); - client.announce(MaplePacketCreator.updateParty(client.getChannel(), party, PartyOperation.SILENT_UPDATE, null)); + client.announce(PacketCreator.updateParty(client.getChannel(), party, PartyOperation.SILENT_UPDATE, null)); updatePartyMemberHPInternal(); } } finally { @@ -1738,7 +1738,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } // if this map has obstacle components moving, make it do so for this client - announce(MaplePacketCreator.environmentMoveList(map.getEnvironment().entrySet())); + announce(PacketCreator.environmentMoveList(map.getEnvironment().entrySet())); } } @@ -1758,11 +1758,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (newLevel > -1) { skills.put(skill, new SkillEntry(newLevel, newMasterlevel, expiration)); if (!GameConstants.isHiddenSkills(skill.getId())) { - this.client.announce(MaplePacketCreator.updateSkill(skill.getId(), newLevel, newMasterlevel, expiration)); + this.client.announce(PacketCreator.updateSkill(skill.getId(), newLevel, newMasterlevel, expiration)); } } else { skills.remove(skill); - this.client.announce(MaplePacketCreator.updateSkill(skill.getId(), newLevel, newMasterlevel, -1)); //Shouldn't use expiration anymore :) + this.client.announce(PacketCreator.updateSkill(skill.getId(), newLevel, newMasterlevel, -1)); //Shouldn't use expiration anymore :) try (Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM skills WHERE skillid = ? AND characterid = ?")) { ps.setInt(1, skill.getId()); @@ -1799,11 +1799,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return; } - client.announce(MaplePacketCreator.showOwnBerserk(skilllevel, berserk)); + client.announce(PacketCreator.showOwnBerserk(skilllevel, berserk)); if (!isHidden) { - getMap().broadcastMessage(MapleCharacter.this, MaplePacketCreator.showBerserk(getId(), skilllevel, berserk), false); + getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showBerserk(getId(), skilllevel, berserk), false); } else { - getMap().broadcastGMMessage(MapleCharacter.this, MaplePacketCreator.showBerserk(getId(), skilllevel, berserk), false); + getMap().broadcastGMMessage(MapleCharacter.this, PacketCreator.showBerserk(getId(), skilllevel, berserk), false); } } }, 5000, 3000); @@ -1923,7 +1923,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (ob instanceof MapleMapItem) { MapleMapItem mapitem = (MapleMapItem) ob; if (System.currentTimeMillis() - mapitem.getDropTime() < 400 || !mapitem.canBePickedBy(this)) { - client.announce(MaplePacketCreator.enableActions()); + client.announce(PacketCreator.enableActions()); return; } @@ -1936,13 +1936,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { mapitem.lockItem(); try { if (mapitem.isPickedUp()) { - client.announce(MaplePacketCreator.showItemUnavailable()); - client.announce(MaplePacketCreator.enableActions()); + client.announce(PacketCreator.showItemUnavailable()); + client.announce(PacketCreator.enableActions()); return; } boolean isPet = petIndex > -1; - final byte[] pickupPacket = MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), (isPet) ? 5 : 2, this.getId(), isPet, petIndex); + final byte[] pickupPacket = PacketCreator.removeItemFromMap(mapitem.getObjectId(), (isPet) ? 5 : 2, this.getId(), isPet, petIndex); Item mItem = mapitem.getItem(); boolean hasSpaceInventory = true; @@ -1975,21 +1975,21 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } else if (MapleInventoryManipulator.addFromDrop(client, mItem, true)) { this.getMap().pickItemDrop(pickupPacket, mapitem); } else { - client.announce(MaplePacketCreator.enableActions()); + client.announce(PacketCreator.enableActions()); return; } } else { - client.announce(MaplePacketCreator.showItemUnavailable()); - client.announce(MaplePacketCreator.enableActions()); + client.announce(PacketCreator.showItemUnavailable()); + client.announce(PacketCreator.enableActions()); return; } - client.announce(MaplePacketCreator.enableActions()); + client.announce(PacketCreator.enableActions()); return; } if (!this.needQuestItem(mapitem.getQuest(), mapitem.getItemId())) { - client.announce(MaplePacketCreator.showItemUnavailable()); - client.announce(MaplePacketCreator.enableActions()); + client.announce(PacketCreator.showItemUnavailable()); + client.announce(PacketCreator.enableActions()); return; } @@ -2010,7 +2010,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { itemScript = info; } else { if (!MapleInventoryManipulator.addFromDrop(client, mItem, true)) { - client.announce(MaplePacketCreator.enableActions()); + client.announce(PacketCreator.enableActions()); return; } } @@ -2026,14 +2026,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { updateAriantScore(); } } else { - client.announce(MaplePacketCreator.enableActions()); + client.announce(PacketCreator.enableActions()); return; } this.getMap().pickItemDrop(pickupPacket, mapitem); } else if(!hasSpaceInventory) { - client.announce(MaplePacketCreator.getInventoryFull()); - client.announce(MaplePacketCreator.getShowInventoryFull()); + client.announce(PacketCreator.getInventoryFull()); + client.announce(PacketCreator.getShowInventoryFull()); } } finally { mapitem.unlockItem(); @@ -2044,7 +2044,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ism.runItemScript(client, itemScript); } } - client.announce(MaplePacketCreator.enableActions()); + client.announce(PacketCreator.enableActions()); } public int countItem(int itemid) { @@ -2075,7 +2075,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public void announceBattleshipHp() { - announce(MaplePacketCreator.skillCooldown(5221999, battleshipHp)); + announce(PacketCreator.skillCooldown(5221999, battleshipHp)); } public void decreaseBattleshipHp(int decrease) { @@ -2083,7 +2083,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (battleshipHp <= 0) { Skill battleship = SkillFactory.getSkill(Corsair.BATTLE_SHIP); int cooldown = battleship.getEffect(getSkillLevel(battleship)).getCooldown(); - announce(MaplePacketCreator.skillCooldown(Corsair.BATTLE_SHIP, cooldown)); + announce(PacketCreator.skillCooldown(Corsair.BATTLE_SHIP, cooldown)); addCooldown(Corsair.BATTLE_SHIP, Server.getInstance().getCurrentTime(), (long)(cooldown * 1000)); removeCooldown(5221999); cancelEffectFromBuffStat(MapleBuffStat.MONSTER_RIDING); @@ -2115,7 +2115,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private void nextPendingRequest(MapleClient c) { CharacterNameAndId pendingBuddyRequest = c.getPlayer().getBuddylist().pollPendingRequest(); if (pendingBuddyRequest != null) { - c.announce(MaplePacketCreator.requestBuddylistAdd(pendingBuddyRequest.getId(), c.getPlayer().getId(), pendingBuddyRequest.getName())); + c.announce(PacketCreator.requestBuddylistAdd(pendingBuddyRequest.getId(), c.getPlayer().getId(), pendingBuddyRequest.getName())); } } @@ -2133,7 +2133,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { notifyRemoteChannel(client, getWorldServer().find(otherCid), otherCid, BuddyList.BuddyOperation.DELETED); } bl.remove(otherCid); - client.announce(MaplePacketCreator.updateBuddylist(getBuddylist().getBuddies())); + client.announce(PacketCreator.updateBuddylist(getBuddylist().getBuddies())); nextPendingRequest(client); } @@ -2458,8 +2458,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if(MapleCharacter.this.getHp() < localmaxhp) { byte recHP = (byte) (healHP / YamlConfig.config.server.CHAIR_EXTRA_HEAL_MULTIPLIER); - client.announce(MaplePacketCreator.showOwnRecovery(recHP)); - getMap().broadcastMessage(MapleCharacter.this, MaplePacketCreator.showRecovery(id, recHP), false); + client.announce(PacketCreator.showOwnRecovery(recHP)); + getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showRecovery(id, recHP), false); } else if (MapleCharacter.this.getMp() >= localmaxmp) { stopChairTask(); // optimizing schedule management when player is already with full pool. } @@ -2506,8 +2506,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if(MapleCharacter.this.getHp() < localmaxhp) { if(healHP > 0) { - client.announce(MaplePacketCreator.showOwnRecovery(healHP)); - getMap().broadcastMessage(MapleCharacter.this, MaplePacketCreator.showRecovery(id, healHP), false); + client.announce(PacketCreator.showOwnRecovery(healHP)); + getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showRecovery(id, healHP), false); } } @@ -2614,9 +2614,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { final List> debuff = Collections.singletonList(new Pair<>(disease, Integer.valueOf(skill.getX()))); if (disease != MapleDisease.SLOW) { - map.broadcastMessage(MaplePacketCreator.giveForeignDebuff(id, debuff, skill)); + map.broadcastMessage(PacketCreator.giveForeignDebuff(id, debuff, skill)); } else { - map.broadcastMessage(MaplePacketCreator.giveForeignSlowDebuff(id, debuff, skill)); + map.broadcastMessage(PacketCreator.giveForeignSlowDebuff(id, debuff, skill)); } } } @@ -2631,9 +2631,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { final List> debuff = Collections.singletonList(new Pair<>(disease, Integer.valueOf(skill.getX()))); if (disease != MapleDisease.SLOW) { - this.announce(MaplePacketCreator.giveForeignDebuff(cid, debuff, skill)); + this.announce(PacketCreator.giveForeignDebuff(cid, debuff, skill)); } else { - this.announce(MaplePacketCreator.giveForeignSlowDebuff(cid, debuff, skill)); + this.announce(PacketCreator.giveForeignSlowDebuff(cid, debuff, skill)); } } } @@ -2661,12 +2661,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } final List> debuff = Collections.singletonList(new Pair<>(disease, Integer.valueOf(skill.getX()))); - client.announce(MaplePacketCreator.giveDebuff(debuff, skill)); + client.announce(PacketCreator.giveDebuff(debuff, skill)); if (disease != MapleDisease.SLOW) { - map.broadcastMessage(this, MaplePacketCreator.giveForeignDebuff(id, debuff, skill), false); + map.broadcastMessage(this, PacketCreator.giveForeignDebuff(id, debuff, skill), false); } else { - map.broadcastMessage(this, MaplePacketCreator.giveForeignSlowDebuff(id, debuff, skill), false); + map.broadcastMessage(this, PacketCreator.giveForeignSlowDebuff(id, debuff, skill), false); } } } @@ -2674,12 +2674,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void dispelDebuff(MapleDisease debuff) { if (hasDisease(debuff)) { long mask = debuff.getValue(); - announce(MaplePacketCreator.cancelDebuff(mask)); + announce(PacketCreator.cancelDebuff(mask)); if (debuff != MapleDisease.SLOW) { - map.broadcastMessage(this, MaplePacketCreator.cancelForeignDebuff(id, mask), false); + map.broadcastMessage(this, PacketCreator.cancelForeignDebuff(id, mask), false); } else { - map.broadcastMessage(this, MaplePacketCreator.cancelForeignSlowDebuff(id), false); + map.broadcastMessage(this, PacketCreator.cancelForeignSlowDebuff(id), false); } chrLock.lock(); @@ -2789,7 +2789,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public void dropMessage(int type, String message) { - client.announce(MaplePacketCreator.serverNotice(type, message)); + client.announce(PacketCreator.serverNotice(type, message)); } public void enteredScript(String script, int mapid) { @@ -2909,7 +2909,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { MapleCoolDownValueHolder mcdvh = bel.getValue(); if(curTime >= mcdvh.startTime + mcdvh.length) { removeCooldown(mcdvh.skillId); - client.announce(MaplePacketCreator.skillCooldown(mcdvh.skillId, 0)); + client.announce(PacketCreator.skillCooldown(mcdvh.skillId, 0)); } } } @@ -2954,7 +2954,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { forceUpdateItem(item); //TEST :3 } else if (expiration != -1 && expiration < currenttime) { if (!ItemConstants.isPet(item.getItemId())) { - client.announce(MaplePacketCreator.itemExpired(item.getItemId())); + client.announce(PacketCreator.itemExpired(item.getItemId())); toberemove.add(item); if (ItemConstants.isRateCoupon(item.getItemId())) { deletedCoupon = true; @@ -2966,7 +2966,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } if (ItemConstants.isExpirablePet(item.getItemId())) { - client.announce(MaplePacketCreator.itemExpired(item.getItemId())); + client.announce(PacketCreator.itemExpired(item.getItemId())); toberemove.add(item); } else { item.setExpiration(-1); @@ -3017,7 +3017,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { final List mods = new LinkedList<>(); mods.add(new ModifyInventory(3, item)); mods.add(new ModifyInventory(0, item)); - client.announce(MaplePacketCreator.modifyInventory(true, mods)); + client.announce(PacketCreator.modifyInventory(true, mods)); } public void gainGachaExp() { @@ -3094,7 +3094,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { white = false; } - client.announce(MaplePacketCreator.getShowExpGain((int) gain, equip, party, inChat, white)); + client.announce(PacketCreator.getShowExpGain((int) gain, equip, party, inChat, white)); } private synchronized void gainExpInternal(long gain, int equip, int party, boolean show, boolean inChat, boolean white) { // need of method synchonization here detected thanks to MedicOP @@ -3158,10 +3158,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { updateSingleStat(MapleStat.FAME, thisFame); if (fromPlayer != null) { - fromPlayer.announce(MaplePacketCreator.giveFameResponse(mode, getName(), thisFame)); - announce(MaplePacketCreator.receiveFame(mode, fromPlayer.getName())); + fromPlayer.announce(PacketCreator.giveFameResponse(mode, getName(), thisFame)); + announce(PacketCreator.receiveFame(mode, fromPlayer.getName())); } else { - announce(MaplePacketCreator.getShowFameGain(delta)); + announce(PacketCreator.getShowFameGain(delta)); } return true; @@ -3201,15 +3201,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (gain != 0) { updateSingleStat(MapleStat.MESO, (int) nextMeso, enableActions); if (show) { - client.announce(MaplePacketCreator.getShowMesoGain(gain, inChat)); + client.announce(PacketCreator.getShowMesoGain(gain, inChat)); } } else { - client.announce(MaplePacketCreator.enableActions()); + client.announce(PacketCreator.enableActions()); } } public void genericGuildMessage(int code) { - this.client.announce(MaplePacketCreator.genericGuildMessage((byte) code)); + this.client.announce(PacketCreator.genericGuildMessage((byte) code)); } public int getAccountID() { @@ -3712,7 +3712,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { MapleSummon summon = summons.get(summonId); if (summon != null) { - getMap().broadcastMessage(MaplePacketCreator.removeSummon(summon, true), summon.getPosition()); + getMap().broadcastMessage(PacketCreator.removeSummon(summon, true), summon.getPosition()); getMap().removeMapObject(summon); removeVisibleMapObject(summon); @@ -4032,8 +4032,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } if (!inactiveStats.isEmpty()) { - client.announce(MaplePacketCreator.cancelBuff(inactiveStats)); - getMap().broadcastMessage(this, MaplePacketCreator.cancelForeignBuff(getId(), inactiveStats), false); + client.announce(PacketCreator.cancelBuff(inactiveStats)); + getMap().broadcastMessage(this, PacketCreator.cancelForeignBuff(getId(), inactiveStats), false); } } @@ -4308,7 +4308,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (this.isRidingBattleship()) { List> statups = new ArrayList<>(1); statups.add(new Pair<>(MapleBuffStat.MONSTER_RIDING, 0)); - this.announce(MaplePacketCreator.giveBuff(1932000, 5221006, statups)); + this.announce(PacketCreator.giveBuff(1932000, 5221006, statups)); this.announceBattleshipHp(); } } @@ -4402,9 +4402,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } addHP(healEffect.getHp()); - client.announce(MaplePacketCreator.showOwnBuffEffect(beholder, 2)); - getMap().broadcastMessage(MapleCharacter.this, MaplePacketCreator.summonSkill(getId(), beholder, 5), true); - getMap().broadcastMessage(MapleCharacter.this, MaplePacketCreator.showOwnBuffEffect(beholder, 2), false); + client.announce(PacketCreator.showOwnBuffEffect(beholder, 2)); + getMap().broadcastMessage(MapleCharacter.this, PacketCreator.summonSkill(getId(), beholder, 5), true); + getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showOwnBuffEffect(beholder, 2), false); } }, healInterval, healInterval); } @@ -4420,9 +4420,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } buffEffect.applyTo(MapleCharacter.this); - client.announce(MaplePacketCreator.showOwnBuffEffect(beholder, 2)); - getMap().broadcastMessage(MapleCharacter.this, MaplePacketCreator.summonSkill(getId(), beholder, (int) (Math.random() * 3) + 6), true); - getMap().broadcastMessage(MapleCharacter.this, MaplePacketCreator.showBuffeffect(getId(), beholder, 2), false); + client.announce(PacketCreator.showOwnBuffEffect(beholder, 2)); + getMap().broadcastMessage(MapleCharacter.this, PacketCreator.summonSkill(getId(), beholder, (int) (Math.random() * 3) + 6), true); + getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showBuffeffect(getId(), beholder, 2), false); } }, buffInterval, buffInterval); } @@ -4454,8 +4454,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } addHP(heal); - client.announce(MaplePacketCreator.showOwnRecovery(heal)); - getMap().broadcastMessage(MapleCharacter.this, MaplePacketCreator.showRecovery(id, heal), false); + client.announce(PacketCreator.showOwnRecovery(heal)); + getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showRecovery(id, heal), false); } }, healInterval, healInterval); } finally { @@ -4812,7 +4812,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { Set exclItems = pe.getValue(); if (!exclItems.isEmpty()) { - client.announce(MaplePacketCreator.loadExceptionList(this.getId(), pe.getKey(), petIndex, new ArrayList<>(exclItems))); + client.announce(PacketCreator.loadExceptionList(this.getId(), pe.getKey(), petIndex, new ArrayList<>(exclItems))); chrLock.lock(); try { @@ -4836,7 +4836,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { Set exclItems = pe.getValue(); if (!exclItems.isEmpty()) { - c.announce(MaplePacketCreator.loadExceptionList(this.getId(), pe.getKey(), petIndex, new ArrayList<>(exclItems))); + c.announce(PacketCreator.loadExceptionList(this.getId(), pe.getKey(), petIndex, new ArrayList<>(exclItems))); } } } @@ -5935,7 +5935,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { //Server.getInstance().getGuild(guildid, world, mgc).gainGP(40); int allianceId = getGuild().getAllianceId(); if (allianceId > 0) { - Server.getInstance().allianceMessage(allianceId, MaplePacketCreator.updateAllianceJobLevel(this), getId(), -1); + Server.getInstance().allianceMessage(allianceId, PacketCreator.updateAllianceJobLevel(this), getId(), -1); } } catch (Exception e) { e.printStackTrace(); @@ -5954,10 +5954,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.ENERGY_CHARGE, energybar)); setBuffedValue(MapleBuffStat.ENERGY_CHARGE, energybar); - client.announce(MaplePacketCreator.giveBuff(energybar, 0, stat)); - client.announce(MaplePacketCreator.showOwnBuffEffect(energycharge.getId(), 2)); - getMap().broadcastMessage(this, MaplePacketCreator.showBuffeffect(id, energycharge.getId(), 2)); - getMap().broadcastMessage(this, MaplePacketCreator.giveForeignBuff(energybar, stat)); + client.announce(PacketCreator.giveBuff(energybar, 0, stat)); + client.announce(PacketCreator.showOwnBuffEffect(energycharge.getId(), 2)); + getMap().broadcastMessage(this, PacketCreator.showBuffeffect(id, energycharge.getId(), 2)); + getMap().broadcastMessage(this, PacketCreator.giveForeignBuff(energybar, stat)); } if (energybar >= 10000 && energybar < 11000) { energybar = 15000; @@ -5968,8 +5968,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { energybar = 0; List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.ENERGY_CHARGE, energybar)); setBuffedValue(MapleBuffStat.ENERGY_CHARGE, energybar); - client.announce(MaplePacketCreator.giveBuff(energybar, 0, stat)); - getMap().broadcastMessage(chr, MaplePacketCreator.cancelForeignFirstDebuff(id, ((long) 1) << 50)); + client.announce(PacketCreator.giveBuff(energybar, 0, stat)); + getMap().broadcastMessage(chr, PacketCreator.cancelForeignFirstDebuff(id, ((long) 1) << 50)); } }, ceffect.getDuration()); } @@ -5980,8 +5980,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { Skill combo = SkillFactory.getSkill(skillid); List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.COMBO, 1)); setBuffedValue(MapleBuffStat.COMBO, 1); - client.announce(MaplePacketCreator.giveBuff(skillid, combo.getEffect(getSkillLevel(combo)).getDuration() + (int) ((getBuffedStarttime(MapleBuffStat.COMBO) - System.currentTimeMillis())), stat)); - getMap().broadcastMessage(this, MaplePacketCreator.giveForeignBuff(getId(), stat), false); + client.announce(PacketCreator.giveBuff(skillid, combo.getEffect(getSkillLevel(combo)).getDuration() + (int) ((getBuffedStarttime(MapleBuffStat.COMBO) - System.currentTimeMillis())), stat)); + getMap().broadcastMessage(this, PacketCreator.giveForeignBuff(getId(), stat), false); } public boolean hasEntered(String script) { @@ -6412,7 +6412,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } final String names = (getMedalText() + name); - getWorldServer().broadcastPacket(MaplePacketCreator.serverNotice(6, String.format(LEVEL_200, names, maxClassLevel, names))); + getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, String.format(LEVEL_200, names, maxClassLevel, names))); } } @@ -6439,18 +6439,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { statup.add(new Pair<>(MapleStat.STR, str)); statup.add(new Pair<>(MapleStat.DEX, dex)); - client.announce(MaplePacketCreator.updatePlayerStats(statup, true, this)); + client.announce(PacketCreator.updatePlayerStats(statup, true, this)); } finally { statWlock.unlock(); effLock.unlock(); } - getMap().broadcastMessage(this, MaplePacketCreator.showForeignEffect(getId(), 0), false); + getMap().broadcastMessage(this, PacketCreator.showForeignEffect(getId(), 0), false); setMPC(new MaplePartyCharacter(this)); silentPartyUpdate(); if (this.guildid > 0) { - getGuild().broadcast(MaplePacketCreator.levelUpMessage(2, level, name), this.getId()); + getGuild().broadcast(PacketCreator.levelUpMessage(2, level, name), this.getId()); } if (level % 20 == 0) { @@ -6497,7 +6497,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { MapleFamilyEntry senior = familyEntry.getSenior(); if(senior != null) { //only send the message to direct senior MapleCharacter seniorChr = senior.getChr(); - if(seniorChr != null) seniorChr.announce(MaplePacketCreator.levelUpMessage(1, level, getName())); + if(seniorChr != null) seniorChr.announce(PacketCreator.levelUpMessage(1, level, getName())); } } } @@ -7495,7 +7495,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public void yellowMessage(String m) { - announce(MaplePacketCreator.sendYellowTip(m)); + announce(PacketCreator.sendYellowTip(m)); } public void raiseQuestMobCount(int id) { @@ -7544,7 +7544,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (getCP() < losing) { losing = getCP(); } - getMap().broadcastMessage(MaplePacketCreator.playerDiedMessage(getName(), losing, getTeam())); + getMap().broadcastMessage(PacketCreator.playerDiedMessage(getName(), losing, getTeam())); gainCP(-losing); return; } @@ -7603,7 +7603,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } unsitChairInternal(); - client.announce(MaplePacketCreator.enableActions()); + client.announce(PacketCreator.enableActions()); } private void unsitChairInternal() { @@ -7615,13 +7615,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { setChair(-1); if (unregisterChairBuff()) { - getMap().broadcastMessage(this, MaplePacketCreator.cancelForeignChairSkillEffect(this.getId()), false); + getMap().broadcastMessage(this, PacketCreator.cancelForeignChairSkillEffect(this.getId()), false); } - getMap().broadcastMessage(this, MaplePacketCreator.showChair(this.getId(), 0), false); + getMap().broadcastMessage(this, PacketCreator.showChair(this.getId(), 0), false); } - announce(MaplePacketCreator.cancelChair(-1)); + announce(PacketCreator.cancelChair(-1)); } public void sitChair(int itemId) { @@ -7629,16 +7629,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (itemId >= 1000000) { // sit on item chair if (chair.get() < 0) { setChair(itemId); - getMap().broadcastMessage(this, MaplePacketCreator.showChair(this.getId(), itemId), false); + getMap().broadcastMessage(this, PacketCreator.showChair(this.getId(), itemId), false); } - announce(MaplePacketCreator.enableActions()); + announce(PacketCreator.enableActions()); } else if (itemId >= 0) { // sit on map chair if (chair.get() < 0) { setChair(itemId); if (registerChairBuff()) { - getMap().broadcastMessage(this, MaplePacketCreator.giveForeignChairSkillEffect(this.getId()), false); + getMap().broadcastMessage(this, PacketCreator.giveForeignChairSkillEffect(this.getId()), false); } - announce(MaplePacketCreator.cancelChair(itemId)); + announce(PacketCreator.cancelChair(itemId)); } } else { // stand up unsitChairInternal(); @@ -7683,8 +7683,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } addHP(-bloodEffect.getX()); - announce(MaplePacketCreator.showOwnBuffEffect(bloodEffect.getSourceId(), 5)); - getMap().broadcastMessage(MapleCharacter.this, MaplePacketCreator.showBuffeffect(getId(), bloodEffect.getSourceId(), 5), false); + announce(PacketCreator.showOwnBuffEffect(bloodEffect.getSourceId(), 5)); + getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showBuffeffect(getId(), bloodEffect.getSourceId(), 5), false); } }, 4000, 4000); } @@ -7908,7 +7908,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { enforceMaxHpMp(); if (!hpmpupdate.isEmpty()) { - client.announce(MaplePacketCreator.updatePlayerStats(hpmpupdate, true, this)); + client.announce(PacketCreator.updatePlayerStats(hpmpupdate, true, this)); } if (oldmaxhp != localmaxhp) { // thanks Wh1SK3Y (Suwaidy) for pointing out a deadlock occuring related to party members HP @@ -7926,7 +7926,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { try { if (party != null) { for (MapleCharacter partychar : this.getPartyMembersOnSameMap()) { - announce(MaplePacketCreator.updatePartyMemberHP(partychar.getId(), partychar.getHp(), partychar.getCurrentMaxHp())); + announce(PacketCreator.updatePartyMemberHP(partychar.getId(), partychar.getHp(), partychar.getCurrentMaxHp())); } } } finally { @@ -7943,7 +7943,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (mcvh.skillId != id) { coolDowns.remove(mcvh.skillId); if (packet) { - client.announce(MaplePacketCreator.skillCooldown(mcvh.skillId, 0)); + client.announce(PacketCreator.skillCooldown(mcvh.skillId, 0)); } } } @@ -8742,7 +8742,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public void sendPolice(int greason, String reason, int duration) { - announce(MaplePacketCreator.sendPolice(String.format("You have been blocked by the#b %s Police for %s.#k", "Cosmic", reason))); + announce(PacketCreator.sendPolice(String.format("You have been blocked by the#b %s Police for %s.#k", "Cosmic", reason))); this.isbanned = true; TimerManager.getInstance().schedule(new Runnable() { @Override @@ -8755,14 +8755,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void sendPolice(String text) { String message = getName() + " received this - " + text; if (Server.getInstance().isGmOnline(this.getWorld())) { //Alert and log if a GM is online - Server.getInstance().broadcastGMMessage(this.getWorld(), MaplePacketCreator.sendYellowTip(message)); + Server.getInstance().broadcastGMMessage(this.getWorld(), PacketCreator.sendYellowTip(message)); FilePrinter.print(FilePrinter.AUTOBAN_WARNING, message); } else { //Auto DC and log if no GM is online client.disconnect(false, false); FilePrinter.print(FilePrinter.AUTOBAN_DC, message); } - //Server.getInstance().broadcastGMMessage(0, MaplePacketCreator.serverNotice(1, getName() + " received this - " + text)); - //announce(MaplePacketCreator.sendPolice(text)); + //Server.getInstance().broadcastGMMessage(0, PacketCreator.serverNotice(1, getName() + " received this - " + text)); + //announce(PacketCreator.sendPolice(text)); //this.isbanned = true; //TimerManager.getInstance().schedule(new Runnable() { // @Override @@ -8773,7 +8773,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public void sendKeymap() { - client.announce(MaplePacketCreator.getKeymap(keymap)); + client.announce(PacketCreator.getKeymap(keymap)); } public void sendQuickmap() { @@ -8784,12 +8784,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { pQuickslotKeyMapped = new MapleQuickslotBinding(MapleQuickslotBinding.DEFAULT_QUICKSLOTS); } - this.announce(MaplePacketCreator.QuickslotMappedInit(pQuickslotKeyMapped)); + this.announce(PacketCreator.QuickslotMappedInit(pQuickslotKeyMapped)); } public void sendMacros() { // Always send the macro packet to fix a client side bug when switching characters. - client.announce(MaplePacketCreator.getMacros(skillMacros)); + client.announce(PacketCreator.getMacros(skillMacros)); } public SkillMacro[] getMacros() { @@ -8826,7 +8826,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setBuddyCapacity(int capacity) { buddylist.setCapacity(capacity); - client.announce(MaplePacketCreator.updateBuddyCapacity(capacity)); + client.announce(PacketCreator.updateBuddyCapacity(capacity)); } public void setBuffedValue(MapleBuffStat effect, int value) { @@ -9300,7 +9300,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (newLimit != -1) { this.saveCharToDB(); if (update) { - client.announce(MaplePacketCreator.updateInventorySlotLimit(type, newLimit)); + client.announce(PacketCreator.updateInventorySlotLimit(type, newLimit)); } return true; } else { @@ -9602,7 +9602,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void showDojoClock() { if (GameConstants.isDojoBossArea(map.getId())) { - client.announce(MaplePacketCreator.getClock((int) (getDojoTimeLeft() / 1000))); + client.announce(PacketCreator.getClock((int) (getDojoTimeLeft() / 1000))); } } @@ -9632,7 +9632,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { strLines.add(""); strLines.add(this.getClient().getChannelServer().getServerMessage().isEmpty() ? 0 : 1, "Get off my lawn!!"); - this.announce(MaplePacketCreator.getAvatarMega(mapOwner, medal, this.getClient().getChannel(), 5390006, strLines, true)); + this.announce(PacketCreator.getAvatarMega(mapOwner, medal, this.getClient().getChannel(), 5390006, strLines, true)); } } @@ -9652,7 +9652,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { rs.last(); int count = rs.getRow(); rs.first(); - client.announce(MaplePacketCreator.showNotes(rs, count)); + client.announce(PacketCreator.showNotes(rs, count)); } } catch (SQLException e) { e.printStackTrace(); @@ -9731,7 +9731,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if(maplemount != null) { int tiredness = maplemount.incrementAndGetTiredness(); - this.getMap().broadcastMessage(MaplePacketCreator.updateMount(this.getId(), maplemount, false)); + this.getMap().broadcastMessage(PacketCreator.updateMount(this.getId(), maplemount, false)); if (tiredness > 99) { maplemount.setTiredness(99); this.dispelSkill(this.getJobType() * 10000000 + 1004); @@ -9781,13 +9781,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } this.getClient().getWorldServer().unregisterPetHunger(this, petIdx); - getMap().broadcastMessage(this, MaplePacketCreator.showPet(this, pet, true, hunger), true); + getMap().broadcastMessage(this, PacketCreator.showPet(this, pet, true, hunger), true); removePet(pet, shift_left); commitExcludedItems(); - client.announce(MaplePacketCreator.petStatUpdate(this)); - client.announce(MaplePacketCreator.enableActions()); + client.announce(PacketCreator.petStatUpdate(this)); + client.announce(PacketCreator.enableActions()); } public void updateMacros(int position, SkillMacro updateMacro) { @@ -9808,7 +9808,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { int curmaxhp = getCurrentMaxHp(); int curhp = getHp(); for (MapleCharacter partychar : this.getPartyMembersOnSameMap()) { - partychar.announce(MaplePacketCreator.updatePartyMemberHP(getId(), curhp, curmaxhp)); + partychar.announce(PacketCreator.updatePartyMemberHP(getId(), curhp, curmaxhp)); } } } @@ -9858,20 +9858,20 @@ public class MapleCharacter extends AbstractMapleCharacterObject { switch (questUpdate.getLeft()) { case UPDATE: - announce(MaplePacketCreator.updateQuest(chr, (MapleQuestStatus) objs[0], (Boolean) objs[1])); + announce(PacketCreator.updateQuest(chr, (MapleQuestStatus) objs[0], (Boolean) objs[1])); break; case FORFEIT: - announce(MaplePacketCreator.forfeitQuest((Short) objs[0])); + announce(PacketCreator.forfeitQuest((Short) objs[0])); break; case COMPLETE: - announce(MaplePacketCreator.completeQuest((Short) objs[0], (Long) objs[1])); + announce(PacketCreator.completeQuest((Short) objs[0], (Long) objs[1])); break; case INFO: MapleQuestStatus qs = (MapleQuestStatus) objs[0]; - announce(MaplePacketCreator.updateQuestInfo(qs.getQuest().getId(), qs.getNpc())); + announce(PacketCreator.updateQuestInfo(qs.getQuest().getId(), qs.getNpc())); break; } } @@ -9932,7 +9932,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private void expireQuest(MapleQuest quest) { if (quest.forfeit(this)) { - announce(MaplePacketCreator.questExpire(quest.getId())); + announce(PacketCreator.questExpire(quest.getId())); } } @@ -10027,7 +10027,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void questTimeLimit(final MapleQuest quest, int seconds) { registerQuestExpire(quest, seconds * 1000); - announce(MaplePacketCreator.addQuestTimeLimit(quest.getId(), seconds * 1000)); + announce(PacketCreator.addQuestTimeLimit(quest.getId(), seconds * 1000)); } public void questTimeLimit2(final MapleQuest quest, long expires) { @@ -10045,7 +10045,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } private void updateSingleStat(MapleStat stat, int newval, boolean itemReaction) { - announce(MaplePacketCreator.updatePlayerStats(Collections.singletonList(new Pair<>(stat, Integer.valueOf(newval))), itemReaction, this)); + announce(PacketCreator.updatePlayerStats(Collections.singletonList(new Pair<>(stat, Integer.valueOf(newval))), itemReaction, this)); } public void announce(final byte[] packet) { @@ -10064,22 +10064,22 @@ public class MapleCharacter extends AbstractMapleCharacterObject { @Override public void sendDestroyData(MapleClient client) { - client.announce(MaplePacketCreator.removePlayerFromMap(this.getObjectId())); + client.announce(PacketCreator.removePlayerFromMap(this.getObjectId())); } @Override public void sendSpawnData(MapleClient client) { if (!this.isHidden() || client.getPlayer().gmLevel() > 1) { - client.announce(MaplePacketCreator.spawnPlayerMapObject(client, this, false)); + client.announce(PacketCreator.spawnPlayerMapObject(client, this, false)); if (buffEffects.containsKey(getJobMapChair(job))) { // mustn't effLock, chrLock sendSpawnData - client.announce(MaplePacketCreator.giveForeignChairSkillEffect(id)); + client.announce(PacketCreator.giveForeignChairSkillEffect(id)); } } if (this.isHidden()) { List> dsstat = Collections.singletonList(new Pair<>(MapleBuffStat.DARKSIGHT, 0)); - getMap().broadcastGMMessage(this, MaplePacketCreator.giveForeignBuff(getId(), dsstat), false); + getMap().broadcastGMMessage(this, PacketCreator.giveForeignBuff(getId(), dsstat), false); } } @@ -10148,7 +10148,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void blockPortal(String scriptName) { if (!blockedPortals.contains(scriptName) && scriptName != null) { blockedPortals.add(scriptName); - client.announce(MaplePacketCreator.enableActions()); + client.announce(PacketCreator.enableActions()); } } @@ -10172,7 +10172,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void updateAreaInfo(int area, String info) { area_info.put(Short.valueOf((short) area), info); - announce(MaplePacketCreator.updateAreaInfo(area, info)); + announce(PacketCreator.updateAreaInfo(area, info)); } public String getAreaInfo(int area) { @@ -10189,7 +10189,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } this.ban(reason); - announce(MaplePacketCreator.sendPolice(String.format("You have been blocked by the#b %s Police for HACK reason.#k", "Cosmic"))); + announce(PacketCreator.sendPolice(String.format("You have been blocked by the#b %s Police for HACK reason.#k", "Cosmic"))); TimerManager.getInstance().schedule(new Runnable() { @Override public void run() { @@ -10197,7 +10197,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } }, 5000); - Server.getInstance().broadcastGMMessage(this.getWorld(), MaplePacketCreator.serverNotice(6, MapleCharacter.makeMapleReadable(this.name) + " was autobanned for " + reason)); + Server.getInstance().broadcastGMMessage(this.getWorld(), PacketCreator.serverNotice(6, MapleCharacter.makeMapleReadable(this.name) + " was autobanned for " + reason)); } public void block(int reason, int days, String desc) { @@ -10417,12 +10417,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void broadcastMarriageMessage() { MapleGuild guild = this.getGuild(); if(guild != null) { - guild.broadcast(MaplePacketCreator.marriageMessage(0, name)); + guild.broadcast(PacketCreator.marriageMessage(0, name)); } MapleFamily family = this.getFamily(); if(family != null) { - family.broadcast(MaplePacketCreator.marriageMessage(1, name)); + family.broadcast(PacketCreator.marriageMessage(1, name)); } } @@ -11238,9 +11238,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (this.getCP() > this.getTotalCP()) { this.setTotalCP(this.getCP()); } - this.getClient().announce(MaplePacketCreator.CPUpdate(false, this.getCP(), this.getTotalCP(), getTeam())); + this.getClient().announce(PacketCreator.CPUpdate(false, this.getCP(), this.getTotalCP(), getTeam())); if (this.getParty() != null && getTeam() != -1) { - this.getMap().broadcastMessage(MaplePacketCreator.CPUpdate(true, this.getMonsterCarnival().getCP(team), this.getMonsterCarnival().getTotalCP(team), getTeam())); + this.getMap().broadcastMessage(PacketCreator.CPUpdate(true, this.getMonsterCarnival().getCP(team), this.getMonsterCarnival().getTotalCP(team), getTeam())); } else { } } diff --git a/src/main/java/client/MapleClient.java b/src/main/java/client/MapleClient.java index 4d72ec87ba..2b0bd14158 100644 --- a/src/main/java/client/MapleClient.java +++ b/src/main/java/client/MapleClient.java @@ -30,11 +30,11 @@ import io.netty.handler.timeout.IdleStateEvent; import net.MaplePacketHandler; import net.PacketProcessor; import net.netty.InvalidPacketHeaderException; -import net.packet.logging.LoggingUtil; -import net.packet.logging.MapleLogger; import net.packet.ByteBufOutPacket; import net.packet.InPacket; import net.packet.OutPacket; +import net.packet.logging.LoggingUtil; +import net.packet.logging.MapleLogger; import net.server.Server; import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.factory.MonitoredReentrantLockFactory; @@ -208,7 +208,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { handler.handlePacket(accessor, this); } catch (final Throwable t) { FilePrinter.printError(FilePrinter.PACKET_HANDLER + handler.getClass().getName() + ".txt", t, "Error for " + (getPlayer() == null ? "" : "player ; " + getPlayer() + " on map ; " + getPlayer().getMapId() + " - ") + "account ; " + getAccountName() + "\r\n" + accessor); - //client.announce(MaplePacketCreator.enableActions());//bugs sometimes + //client.announce(PacketCreator.enableActions());//bugs sometimes } } @@ -307,7 +307,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { } public void sendCharList(int server) { - this.announce(MaplePacketCreator.getCharList(this, server, 0)); + this.announce(PacketCreator.getCharList(this, server, 0)); } public List loadCharacters(int serverId) { @@ -999,7 +999,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { if (guild != null) { final Server server = Server.getInstance(); server.setGuildMemberOnline(player, false, player.getClient().getChannel()); - player.getClient().announce(MaplePacketCreator.showGuildInfo(player)); + player.getClient().announce(PacketCreator.showGuildInfo(player)); } if (bl != null) { wserv.loggedOff(player.getName(), player.getId(), channel, player.getBuddylist().getBuddyIds()); @@ -1144,7 +1144,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { public void checkIfIdle(final IdleStateEvent event) { final long pingedAt = System.currentTimeMillis(); - announce(MaplePacketCreator.getPing()); + announce(PacketCreator.getPing()); TimerManager.getInstance().schedule(() -> { try { if (lastPong < pingedAt) { @@ -1414,12 +1414,12 @@ public class MapleClient extends ChannelInboundHandlerAdapter { private void announceDisableServerMessage() { if (!this.getWorldServer().registerDisabledServerMessage(player.getId())) { - announce(MaplePacketCreator.serverMessage("")); + announce(PacketCreator.serverMessage("")); } } public void announceServerMessage() { - announce(MaplePacketCreator.serverMessage(this.getChannelServer().getServerMessage())); + announce(PacketCreator.serverMessage(this.getChannelServer().getServerMessage())); } public synchronized void announceBossHpBar(MapleMonster mm, final int mobHash, final byte[] packet) { @@ -1477,8 +1477,8 @@ public class MapleClient extends ChannelInboundHandlerAdapter { } public void announceHint(String msg, int length) { - announce(MaplePacketCreator.sendHint(msg, length, 10)); - announce(MaplePacketCreator.enableActions()); + announce(PacketCreator.sendHint(msg, length, 10)); + announce(PacketCreator.enableActions()); } public void changeChannel(int channel) { @@ -1488,18 +1488,18 @@ public class MapleClient extends ChannelInboundHandlerAdapter { return; } if (!player.isAlive() || FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) { - announce(MaplePacketCreator.enableActions()); + announce(PacketCreator.enableActions()); return; } else if (MapleMiniDungeonInfo.isDungeonMap(player.getMapId())) { - announce(MaplePacketCreator.serverNotice(5, "Changing channels or entering Cash Shop or MTS are disabled when inside a Mini-Dungeon.")); - announce(MaplePacketCreator.enableActions()); + announce(PacketCreator.serverNotice(5, "Changing channels or entering Cash Shop or MTS are disabled when inside a Mini-Dungeon.")); + announce(PacketCreator.enableActions()); return; } String[] socket = Server.getInstance().getInetSocket(this, getWorld(), channel); if (socket == null) { - announce(MaplePacketCreator.serverNotice(1, "Channel " + channel + " is currently disabled. Try another channel.")); - announce(MaplePacketCreator.enableActions()); + announce(PacketCreator.serverNotice(1, "Channel " + channel + " is currently disabled. Try another channel.")); + announce(PacketCreator.enableActions()); return; } @@ -1530,7 +1530,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { player.setSessionTransitionState(); try { - announce(MaplePacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]))); + announce(PacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]))); } catch (IOException e) { e.printStackTrace(); } @@ -1586,7 +1586,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { } public void enableCSActions() { - announce(MaplePacketCreator.enableCSUse(player)); + announce(PacketCreator.enableCSUse(player)); } public boolean canBypassPin() { diff --git a/src/main/java/client/MapleFamily.java b/src/main/java/client/MapleFamily.java index 60bf97b092..68d64ef3ea 100644 --- a/src/main/java/client/MapleFamily.java +++ b/src/main/java/client/MapleFamily.java @@ -25,7 +25,7 @@ import net.server.Server; import net.server.world.World; import tools.DatabaseConnection; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import java.sql.Connection; @@ -169,7 +169,7 @@ public class MapleFamily { for(MapleFamilyEntry entry : members.values()) { MapleCharacter chr = entry.getChr(); if(chr != null) { - chr.getClient().announce(MaplePacketCreator.getFamilyInfo(entry)); + chr.getClient().announce(PacketCreator.getFamilyInfo(entry)); } } } diff --git a/src/main/java/client/MapleFamilyEntry.java b/src/main/java/client/MapleFamilyEntry.java index e1ad0ecad0..4ab07299c5 100644 --- a/src/main/java/client/MapleFamilyEntry.java +++ b/src/main/java/client/MapleFamilyEntry.java @@ -19,6 +19,12 @@ */ package client; +import net.server.Server; +import tools.DatabaseConnection; +import tools.FilePrinter; +import tools.PacketCreator; +import tools.Pair; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; @@ -26,12 +32,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import net.server.Server; -import tools.DatabaseConnection; -import tools.FilePrinter; -import tools.MaplePacketCreator; -import tools.Pair; - /** * @author Ubaware */ @@ -264,7 +264,7 @@ public class MapleFamilyEntry { this.totalReputation += gain; } MapleCharacter chr = getChr(); - if(chr != null) chr.announce(MaplePacketCreator.sendGainRep(gain, from != null ? from.getName() : "")); + if(chr != null) chr.announce(PacketCreator.sendGainRep(gain, from != null ? from.getName() : "")); } public void giveReputationToSenior(int gain, boolean includeSuperSenior) { @@ -437,11 +437,11 @@ public class MapleFamilyEntry { MapleFamilyEntry senior = getSenior(); if(senior != null) { MapleCharacter seniorChr = senior.getChr(); - if(seniorChr != null) seniorChr.announce(MaplePacketCreator.getFamilyInfo(senior)); + if(seniorChr != null) seniorChr.announce(PacketCreator.getFamilyInfo(senior)); senior = senior.getSenior(); if(includeSuperSenior && senior != null) { seniorChr = senior.getChr(); - if(seniorChr != null) seniorChr.announce(MaplePacketCreator.getFamilyInfo(senior)); + if(seniorChr != null) seniorChr.announce(PacketCreator.getFamilyInfo(senior)); } } } diff --git a/src/main/java/client/MonsterBook.java b/src/main/java/client/MonsterBook.java index 1e614cf32d..26bca16d1e 100644 --- a/src/main/java/client/MonsterBook.java +++ b/src/main/java/client/MonsterBook.java @@ -24,7 +24,7 @@ package client; import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.sql.Connection; import java.sql.PreparedStatement; @@ -54,7 +54,7 @@ public final class MonsterBook { } public void addCard(final MapleClient c, final int cardid) { - c.getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.showForeignCardEffect(c.getPlayer().getId()), false); + c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.showForeignCardEffect(c.getPlayer().getId()), false); Integer qty; lock.lock(); @@ -84,10 +84,10 @@ public final class MonsterBook { calculateLevel(); } - c.announce(MaplePacketCreator.addCard(false, cardid, qty + 1)); - c.announce(MaplePacketCreator.showGainCard()); + c.announce(PacketCreator.addCard(false, cardid, qty + 1)); + c.announce(PacketCreator.showGainCard()); } else { - c.announce(MaplePacketCreator.addCard(true, cardid, 5)); + c.announce(PacketCreator.addCard(true, cardid, 5)); } } diff --git a/src/main/java/client/autoban/AutobanFactory.java b/src/main/java/client/autoban/AutobanFactory.java index 8f65f5463e..481a7a0ee4 100644 --- a/src/main/java/client/autoban/AutobanFactory.java +++ b/src/main/java/client/autoban/AutobanFactory.java @@ -24,10 +24,10 @@ package client.autoban; import client.MapleCharacter; import config.YamlConfig; +import net.packet.logging.MapleLogger; import net.server.Server; import tools.FilePrinter; -import net.packet.logging.MapleLogger; -import tools.MaplePacketCreator; +import tools.PacketCreator; /** * @@ -88,7 +88,7 @@ public enum AutobanFactory { if (chr != null && MapleLogger.ignored.contains(chr.getId())){ return; } - Server.getInstance().broadcastGMMessage((chr != null ? chr.getWorld() : 0), MaplePacketCreator.sendYellowTip((chr != null ? MapleCharacter.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason)); + Server.getInstance().broadcastGMMessage((chr != null ? chr.getWorld() : 0), PacketCreator.sendYellowTip((chr != null ? MapleCharacter.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason)); } if (YamlConfig.config.server.USE_AUTOBAN_LOG) { FilePrinter.print(FilePrinter.AUTOBAN_WARNING, (chr != null ? MapleCharacter.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason); diff --git a/src/main/java/client/command/commands/gm0/DisposeCommand.java b/src/main/java/client/command/commands/gm0/DisposeCommand.java index f31cd2dc77..aa5bdd6bcd 100644 --- a/src/main/java/client/command/commands/gm0/DisposeCommand.java +++ b/src/main/java/client/command/commands/gm0/DisposeCommand.java @@ -27,7 +27,7 @@ import client.MapleClient; import client.command.Command; import scripting.npc.NPCScriptManager; import scripting.quest.QuestScriptManager; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class DisposeCommand extends Command { { @@ -38,7 +38,7 @@ public class DisposeCommand extends Command { public void execute(MapleClient c, String[] params) { NPCScriptManager.getInstance().dispose(c); QuestScriptManager.getInstance().dispose(c); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); c.removeClickedNPC(); c.getPlayer().message("You've been disposed."); } diff --git a/src/main/java/client/command/commands/gm0/GmCommand.java b/src/main/java/client/command/commands/gm0/GmCommand.java index baad48c6a1..9c2a94105f 100644 --- a/src/main/java/client/command/commands/gm0/GmCommand.java +++ b/src/main/java/client/command/commands/gm0/GmCommand.java @@ -28,7 +28,7 @@ import client.MapleClient; import client.command.Command; import net.server.Server; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Randomizer; public class GmCommand extends Command { @@ -51,8 +51,8 @@ public class GmCommand extends Command { 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)); + Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[GM Message]:" + MapleCharacter.makeMapleReadable(player.getName()) + ": " + message)); + Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.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)]); diff --git a/src/main/java/client/command/commands/gm0/RanksCommand.java b/src/main/java/client/command/commands/gm0/RanksCommand.java index 1ce9cf81c5..7da0fdb0b4 100644 --- a/src/main/java/client/command/commands/gm0/RanksCommand.java +++ b/src/main/java/client/command/commands/gm0/RanksCommand.java @@ -27,7 +27,7 @@ import client.MapleCharacter; import client.MapleClient; import client.command.Command; import net.server.Server; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import java.util.List; @@ -42,6 +42,6 @@ public class RanksCommand extends Command { MapleCharacter player = c.getPlayer(); List> worldRanking = Server.getInstance().getWorldPlayerRanking(player.getWorld()); - player.announce(MaplePacketCreator.showPlayerRanks(9010000, worldRanking)); + player.announce(PacketCreator.showPlayerRanks(9010000, worldRanking)); } } diff --git a/src/main/java/client/command/commands/gm0/ReportBugCommand.java b/src/main/java/client/command/commands/gm0/ReportBugCommand.java index 6a74fa3c92..7085dc730d 100644 --- a/src/main/java/client/command/commands/gm0/ReportBugCommand.java +++ b/src/main/java/client/command/commands/gm0/ReportBugCommand.java @@ -28,7 +28,7 @@ import client.MapleClient; import client.command.Command; import net.server.Server; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class ReportBugCommand extends Command { { @@ -44,8 +44,8 @@ public class ReportBugCommand extends Command { 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)); + Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[Bug]:" + MapleCharacter.makeMapleReadable(player.getName()) + ": " + message)); + Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.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!"); diff --git a/src/main/java/client/command/commands/gm2/BombCommand.java b/src/main/java/client/command/commands/gm2/BombCommand.java index 37e698b097..46d3f36f5a 100644 --- a/src/main/java/client/command/commands/gm2/BombCommand.java +++ b/src/main/java/client/command/commands/gm2/BombCommand.java @@ -28,7 +28,7 @@ import client.MapleClient; import client.command.Command; import net.server.Server; import server.life.MapleLifeFactory; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class BombCommand extends Command { { @@ -42,7 +42,7 @@ public class BombCommand extends Command { 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())); + Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, player.getName() + " used !bomb on " + victim.getName())); } else { player.message("Player '" + params[0] + "' could not be found on this world."); } diff --git a/src/main/java/client/command/commands/gm2/UnBugCommand.java b/src/main/java/client/command/commands/gm2/UnBugCommand.java index 502ea2bed1..50ec7eaf45 100644 --- a/src/main/java/client/command/commands/gm2/UnBugCommand.java +++ b/src/main/java/client/command/commands/gm2/UnBugCommand.java @@ -25,7 +25,7 @@ package client.command.commands.gm2; import client.MapleClient; import client.command.Command; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class UnBugCommand extends Command { { @@ -34,6 +34,6 @@ public class UnBugCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - c.getPlayer().getMap().broadcastMessage(MaplePacketCreator.enableActions()); + c.getPlayer().getMap().broadcastMessage(PacketCreator.enableActions()); } } diff --git a/src/main/java/client/command/commands/gm3/BanCommand.java b/src/main/java/client/command/commands/gm3/BanCommand.java index 38a773852b..1e74cd8ba8 100644 --- a/src/main/java/client/command/commands/gm3/BanCommand.java +++ b/src/main/java/client/command/commands/gm3/BanCommand.java @@ -29,7 +29,7 @@ import client.command.Command; import net.server.Server; import server.TimerManager; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.sql.Connection; import java.sql.PreparedStatement; @@ -73,15 +73,15 @@ public class BanCommand extends Command { 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)); + c.announce(PacketCreator.getGMEffect(4, (byte) 0)); final MapleCharacter rip = target; TimerManager.getInstance().schedule(() -> rip.getClient().disconnect(false, false), 5000); //5 Seconds - Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.serverNotice(6, "[RIP]: " + ign + " has been banned.")); + Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.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.")); + c.announce(PacketCreator.getGMEffect(4, (byte) 0)); + Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[RIP]: " + ign + " has been banned.")); } else { - c.announce(MaplePacketCreator.getGMEffect(6, (byte) 1)); + c.announce(PacketCreator.getGMEffect(6, (byte) 1)); } } } diff --git a/src/main/java/client/command/commands/gm3/IgnoreCommand.java b/src/main/java/client/command/commands/gm3/IgnoreCommand.java index 226e63c323..d935639104 100644 --- a/src/main/java/client/command/commands/gm3/IgnoreCommand.java +++ b/src/main/java/client/command/commands/gm3/IgnoreCommand.java @@ -26,9 +26,9 @@ package client.command.commands.gm3; import client.MapleCharacter; import client.MapleClient; import client.command.Command; -import net.server.Server; import net.packet.logging.MapleLogger; -import tools.MaplePacketCreator; +import net.server.Server; +import tools.PacketCreator; public class IgnoreCommand extends Command { { @@ -55,7 +55,7 @@ public class IgnoreCommand extends Command { } 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_)); + Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, message_)); } } diff --git a/src/main/java/client/command/commands/gm3/KillCommand.java b/src/main/java/client/command/commands/gm3/KillCommand.java index e18387c3e4..135474b096 100644 --- a/src/main/java/client/command/commands/gm3/KillCommand.java +++ b/src/main/java/client/command/commands/gm3/KillCommand.java @@ -27,7 +27,7 @@ import client.MapleCharacter; import client.MapleClient; import client.command.Command; import net.server.Server; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class KillCommand extends Command { { @@ -45,7 +45,7 @@ public class KillCommand extends Command { 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())); + Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, player.getName() + " used !kill on " + victim.getName())); } else { player.message("Player '" + params[0] + "' could not be found."); } diff --git a/src/main/java/client/command/commands/gm3/MaxEnergyCommand.java b/src/main/java/client/command/commands/gm3/MaxEnergyCommand.java index 71cf8bba41..540f92f231 100644 --- a/src/main/java/client/command/commands/gm3/MaxEnergyCommand.java +++ b/src/main/java/client/command/commands/gm3/MaxEnergyCommand.java @@ -26,7 +26,7 @@ package client.command.commands.gm3; import client.MapleCharacter; import client.MapleClient; import client.command.Command; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class MaxEnergyCommand extends Command { { @@ -37,6 +37,6 @@ public class MaxEnergyCommand extends Command { public void execute(MapleClient c, String[] params) { MapleCharacter player = c.getPlayer(); c.getPlayer().setDojoEnergy(10000); - c.announce(MaplePacketCreator.getEnergy("energy", 10000)); + c.announce(PacketCreator.getEnergy("energy", 10000)); } } diff --git a/src/main/java/client/command/commands/gm3/MonitorCommand.java b/src/main/java/client/command/commands/gm3/MonitorCommand.java index 0a82ce454b..7f05db7521 100644 --- a/src/main/java/client/command/commands/gm3/MonitorCommand.java +++ b/src/main/java/client/command/commands/gm3/MonitorCommand.java @@ -26,9 +26,9 @@ package client.command.commands.gm3; import client.MapleCharacter; import client.MapleClient; import client.command.Command; -import net.server.Server; import net.packet.logging.MapleLogger; -import tools.MaplePacketCreator; +import net.server.Server; +import tools.PacketCreator; public class MonitorCommand extends Command { { @@ -55,7 +55,7 @@ public class MonitorCommand extends Command { } 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)); + Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, message)); } } diff --git a/src/main/java/client/command/commands/gm3/MusicCommand.java b/src/main/java/client/command/commands/gm3/MusicCommand.java index 407c0ff901..c3bca566f8 100644 --- a/src/main/java/client/command/commands/gm3/MusicCommand.java +++ b/src/main/java/client/command/commands/gm3/MusicCommand.java @@ -27,7 +27,7 @@ import client.MapleCharacter; import client.MapleClient; import client.command.Command; import constants.game.GameConstants; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class MusicCommand extends Command { { @@ -53,14 +53,14 @@ public class MusicCommand extends Command { sendMsg += "Syntax: #r!music #k\r\n\r\n"; sendMsg += getSongList(); - c.announce(MaplePacketCreator.getNPCTalk(1052015, (byte) 0, sendMsg, "00 00", (byte) 0)); + c.announce(PacketCreator.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.getMap().broadcastMessage(PacketCreator.musicChange(s)); player.yellowMessage("Now playing song " + s + "."); return; } @@ -70,6 +70,6 @@ public class MusicCommand extends Command { 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)); + c.announce(PacketCreator.getNPCTalk(1052015, (byte) 0, sendMsg, "00 00", (byte) 0)); } } diff --git a/src/main/java/client/command/commands/gm3/NoticeCommand.java b/src/main/java/client/command/commands/gm3/NoticeCommand.java index deee048b39..f321d170d0 100644 --- a/src/main/java/client/command/commands/gm3/NoticeCommand.java +++ b/src/main/java/client/command/commands/gm3/NoticeCommand.java @@ -27,7 +27,7 @@ import client.MapleCharacter; import client.MapleClient; import client.command.Command; import net.server.Server; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class NoticeCommand extends Command { { @@ -37,6 +37,6 @@ public class NoticeCommand extends Command { @Override public void execute(MapleClient c, String[] params) { MapleCharacter player = c.getPlayer(); - Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.serverNotice(6, "[Notice] " + player.getLastCommandMessage())); + Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[Notice] " + player.getLastCommandMessage())); } } diff --git a/src/main/java/client/command/commands/gm3/NpcCommand.java b/src/main/java/client/command/commands/gm3/NpcCommand.java index eb49eb438a..28c937a591 100644 --- a/src/main/java/client/command/commands/gm3/NpcCommand.java +++ b/src/main/java/client/command/commands/gm3/NpcCommand.java @@ -28,7 +28,7 @@ import client.MapleClient; import client.command.Command; import server.life.MapleLifeFactory; import server.life.MapleNPC; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class NpcCommand extends Command { { @@ -50,7 +50,7 @@ public class NpcCommand extends Command { npc.setRx1(player.getPosition().x - 50); npc.setFh(player.getMap().getFootholds().findBelow(c.getPlayer().getPosition()).getId()); player.getMap().addMapObject(npc); - player.getMap().broadcastMessage(MaplePacketCreator.spawnNPC(npc)); + player.getMap().broadcastMessage(PacketCreator.spawnNPC(npc)); } } } diff --git a/src/main/java/client/command/commands/gm3/RipCommand.java b/src/main/java/client/command/commands/gm3/RipCommand.java index db8d7919e4..06cbb73c9e 100644 --- a/src/main/java/client/command/commands/gm3/RipCommand.java +++ b/src/main/java/client/command/commands/gm3/RipCommand.java @@ -27,7 +27,7 @@ import client.MapleCharacter; import client.MapleClient; import client.command.Command; import net.server.Server; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class RipCommand extends Command { { @@ -37,6 +37,6 @@ public class RipCommand extends Command { @Override public void execute(MapleClient c, String[] params) { MapleCharacter player = c.getPlayer(); - Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.serverNotice(6, "[RIP]: " + joinStringFrom(params, 1))); + Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[RIP]: " + joinStringFrom(params, 1))); } } diff --git a/src/main/java/client/command/commands/gm3/StartEventCommand.java b/src/main/java/client/command/commands/gm3/StartEventCommand.java index 78d8139c20..855fa36843 100644 --- a/src/main/java/client/command/commands/gm3/StartEventCommand.java +++ b/src/main/java/client/command/commands/gm3/StartEventCommand.java @@ -28,7 +28,7 @@ import client.MapleClient; import client.command.Command; import net.server.Server; import server.events.gm.MapleEvent; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class StartEventCommand extends Command { { @@ -42,14 +42,14 @@ public class StartEventCommand extends Command { if (params.length > 1) players = Integer.parseInt(params[0]); c.getChannelServer().setEvent(new MapleEvent(player.getMapId(), players)); - Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.earnTitleMessage( + Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.earnTitleMessage( "[Event] An event has started on " + player.getMap().getMapName() + " and will allow " + players + " players to join. Type @joinevent to participate.")); Server.getInstance().broadcastMessage(c.getWorld(), - MaplePacketCreator.serverNotice(6, "[Event] An event has started on " + PacketCreator.serverNotice(6, "[Event] An event has started on " + player.getMap().getMapName() + " and will allow " + players diff --git a/src/main/java/client/command/commands/gm3/TimerAllCommand.java b/src/main/java/client/command/commands/gm3/TimerAllCommand.java index 40c1d47241..a74bb55ff6 100644 --- a/src/main/java/client/command/commands/gm3/TimerAllCommand.java +++ b/src/main/java/client/command/commands/gm3/TimerAllCommand.java @@ -26,7 +26,7 @@ package client.command.commands.gm3; import client.MapleCharacter; import client.MapleClient; import client.command.Command; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class TimerAllCommand extends Command { { @@ -43,13 +43,13 @@ public class TimerAllCommand extends Command { if (params[0].equalsIgnoreCase("remove")) { for (MapleCharacter victim : player.getWorldServer().getPlayerStorage().getAllCharacters()) { - victim.announce(MaplePacketCreator.removeClock()); + victim.announce(PacketCreator.removeClock()); } } else { try { int seconds = Integer.parseInt(params[0]); for (MapleCharacter victim : player.getWorldServer().getPlayerStorage().getAllCharacters()) { - victim.announce(MaplePacketCreator.getClock(seconds)); + victim.announce(PacketCreator.getClock(seconds)); } } catch (NumberFormatException e) { player.yellowMessage("Syntax: !timerall |remove"); diff --git a/src/main/java/client/command/commands/gm3/TimerCommand.java b/src/main/java/client/command/commands/gm3/TimerCommand.java index dfb12c6df5..78ceb32c12 100644 --- a/src/main/java/client/command/commands/gm3/TimerCommand.java +++ b/src/main/java/client/command/commands/gm3/TimerCommand.java @@ -26,7 +26,7 @@ package client.command.commands.gm3; import client.MapleCharacter; import client.MapleClient; import client.command.Command; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class TimerCommand extends Command { { @@ -44,10 +44,10 @@ public class TimerCommand extends Command { MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { if (params[1].equalsIgnoreCase("remove")) { - victim.announce(MaplePacketCreator.removeClock()); + victim.announce(PacketCreator.removeClock()); } else { try { - victim.announce(MaplePacketCreator.getClock(Integer.parseInt(params[1]))); + victim.announce(PacketCreator.getClock(Integer.parseInt(params[1]))); } catch (NumberFormatException e) { player.yellowMessage("Syntax: !timer |remove"); } diff --git a/src/main/java/client/command/commands/gm3/TimerMapCommand.java b/src/main/java/client/command/commands/gm3/TimerMapCommand.java index 2096e8f2c3..ce65f9a9d8 100644 --- a/src/main/java/client/command/commands/gm3/TimerMapCommand.java +++ b/src/main/java/client/command/commands/gm3/TimerMapCommand.java @@ -26,7 +26,7 @@ package client.command.commands.gm3; import client.MapleCharacter; import client.MapleClient; import client.command.Command; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class TimerMapCommand extends Command { { @@ -43,13 +43,13 @@ public class TimerMapCommand extends Command { if (params[0].equalsIgnoreCase("remove")) { for (MapleCharacter victim : player.getMap().getCharacters()) { - victim.announce(MaplePacketCreator.removeClock()); + victim.announce(PacketCreator.removeClock()); } } else { try { int seconds = Integer.parseInt(params[0]); for (MapleCharacter victim : player.getMap().getCharacters()) { - victim.announce(MaplePacketCreator.getClock(seconds)); + victim.announce(PacketCreator.getClock(seconds)); } } catch (NumberFormatException e) { player.yellowMessage("Syntax: !timermap |remove"); diff --git a/src/main/java/client/command/commands/gm4/BossDropRateCommand.java b/src/main/java/client/command/commands/gm4/BossDropRateCommand.java index 58901b9fb7..14cc40935a 100644 --- a/src/main/java/client/command/commands/gm4/BossDropRateCommand.java +++ b/src/main/java/client/command/commands/gm4/BossDropRateCommand.java @@ -22,7 +22,7 @@ package client.command.commands.gm4; import client.MapleCharacter; import client.MapleClient; import client.command.Command; -import tools.MaplePacketCreator; +import tools.PacketCreator; /** * @@ -43,6 +43,6 @@ public class BossDropRateCommand extends Command { int bossdroprate = Math.max(Integer.parseInt(params[0]), 1); c.getWorldServer().setBossDropRate(bossdroprate); - c.getWorldServer().broadcastPacket(MaplePacketCreator.serverNotice(6, "[Rate] Boss Drop Rate has been changed to " + bossdroprate + "x.")); + c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Boss Drop Rate has been changed to " + bossdroprate + "x.")); } } diff --git a/src/main/java/client/command/commands/gm4/DropRateCommand.java b/src/main/java/client/command/commands/gm4/DropRateCommand.java index d87b2b3fc7..1dda95d9a9 100644 --- a/src/main/java/client/command/commands/gm4/DropRateCommand.java +++ b/src/main/java/client/command/commands/gm4/DropRateCommand.java @@ -26,7 +26,7 @@ package client.command.commands.gm4; import client.MapleCharacter; import client.MapleClient; import client.command.Command; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class DropRateCommand extends Command { { @@ -43,7 +43,7 @@ public class DropRateCommand extends Command { int droprate = Math.max(Integer.parseInt(params[0]), 1); c.getWorldServer().setDropRate(droprate); - c.getWorldServer().broadcastPacket(MaplePacketCreator.serverNotice(6, "[Rate] Drop Rate has been changed to " + droprate + "x.")); + c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Drop Rate has been changed to " + droprate + "x.")); } } diff --git a/src/main/java/client/command/commands/gm4/ExpRateCommand.java b/src/main/java/client/command/commands/gm4/ExpRateCommand.java index 372a4f272d..a1fe479708 100644 --- a/src/main/java/client/command/commands/gm4/ExpRateCommand.java +++ b/src/main/java/client/command/commands/gm4/ExpRateCommand.java @@ -26,7 +26,7 @@ package client.command.commands.gm4; import client.MapleCharacter; import client.MapleClient; import client.command.Command; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class ExpRateCommand extends Command { { @@ -43,6 +43,6 @@ public class ExpRateCommand extends Command { int exprate = Math.max(Integer.parseInt(params[0]), 1); c.getWorldServer().setExpRate(exprate); - c.getWorldServer().broadcastPacket(MaplePacketCreator.serverNotice(6, "[Rate] Exp Rate has been changed to " + exprate + "x.")); + c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Exp Rate has been changed to " + exprate + "x.")); } } diff --git a/src/main/java/client/command/commands/gm4/FishingRateCommand.java b/src/main/java/client/command/commands/gm4/FishingRateCommand.java index 2ec8722674..768d896533 100644 --- a/src/main/java/client/command/commands/gm4/FishingRateCommand.java +++ b/src/main/java/client/command/commands/gm4/FishingRateCommand.java @@ -26,7 +26,7 @@ package client.command.commands.gm4; import client.MapleCharacter; import client.MapleClient; import client.command.Command; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class FishingRateCommand extends Command { { @@ -43,6 +43,6 @@ public class FishingRateCommand extends Command { int fishrate = Math.max(Integer.parseInt(params[0]), 1); c.getWorldServer().setFishingRate(fishrate); - c.getWorldServer().broadcastPacket(MaplePacketCreator.serverNotice(6, "[Rate] Fishing Rate has been changed to " + fishrate + "x.")); + c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Fishing Rate has been changed to " + fishrate + "x.")); } } diff --git a/src/main/java/client/command/commands/gm4/ForceVacCommand.java b/src/main/java/client/command/commands/gm4/ForceVacCommand.java index a4de383ad7..2369efc487 100644 --- a/src/main/java/client/command/commands/gm4/ForceVacCommand.java +++ b/src/main/java/client/command/commands/gm4/ForceVacCommand.java @@ -31,7 +31,7 @@ import client.inventory.manipulator.MapleInventoryManipulator; import server.maps.MapleMapItem; import server.maps.MapleMapObject; import server.maps.MapleMapObjectType; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.util.Arrays; import java.util.List; @@ -70,7 +70,7 @@ public class ForceVacCommand extends Command { } } - player.getMap().pickItemDrop(MaplePacketCreator.removeItemFromMap(mapItem.getObjectId(), 2, player.getId()), mapItem); + player.getMap().pickItemDrop(PacketCreator.removeItemFromMap(mapItem.getObjectId(), 2, player.getId()), mapItem); } finally { mapItem.unlockItem(); } diff --git a/src/main/java/client/command/commands/gm4/MesoRateCommand.java b/src/main/java/client/command/commands/gm4/MesoRateCommand.java index 0e4ee2f528..944a6bef9d 100644 --- a/src/main/java/client/command/commands/gm4/MesoRateCommand.java +++ b/src/main/java/client/command/commands/gm4/MesoRateCommand.java @@ -26,7 +26,7 @@ package client.command.commands.gm4; import client.MapleCharacter; import client.MapleClient; import client.command.Command; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class MesoRateCommand extends Command { { @@ -43,6 +43,6 @@ public class MesoRateCommand extends Command { int mesorate = Math.max(Integer.parseInt(params[0]), 1); c.getWorldServer().setMesoRate(mesorate); - c.getWorldServer().broadcastPacket(MaplePacketCreator.serverNotice(6, "[Rate] Meso Rate has been changed to " + mesorate + "x.")); + c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Meso Rate has been changed to " + mesorate + "x.")); } } diff --git a/src/main/java/client/command/commands/gm4/PnpcCommand.java b/src/main/java/client/command/commands/gm4/PnpcCommand.java index 7cd83c5da0..1b15f81832 100644 --- a/src/main/java/client/command/commands/gm4/PnpcCommand.java +++ b/src/main/java/client/command/commands/gm4/PnpcCommand.java @@ -31,7 +31,7 @@ import server.life.MapleLifeFactory; import server.life.MapleNPC; import server.maps.MapleMap; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.awt.*; import java.sql.Connection; @@ -94,7 +94,7 @@ public class PnpcCommand extends Command { MapleMap map = ch.getMapFactory().getMap(mapId); map.addMapObject(npc); - map.broadcastMessage(MaplePacketCreator.spawnNPC(npc)); + map.broadcastMessage(PacketCreator.spawnNPC(npc)); } player.yellowMessage("Pnpc created."); diff --git a/src/main/java/client/command/commands/gm4/QuestRateCommand.java b/src/main/java/client/command/commands/gm4/QuestRateCommand.java index ecf41e63e8..855fe1caa8 100644 --- a/src/main/java/client/command/commands/gm4/QuestRateCommand.java +++ b/src/main/java/client/command/commands/gm4/QuestRateCommand.java @@ -26,7 +26,7 @@ package client.command.commands.gm4; import client.MapleCharacter; import client.MapleClient; import client.command.Command; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class QuestRateCommand extends Command { { @@ -43,7 +43,7 @@ public class QuestRateCommand extends Command { int questrate = Math.max(Integer.parseInt(params[0]), 1); c.getWorldServer().setQuestRate(questrate); - c.getWorldServer().broadcastPacket(MaplePacketCreator.serverNotice(6, "[Rate] Quest Rate has been changed to " + questrate + "x.")); + c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Quest Rate has been changed to " + questrate + "x.")); } } diff --git a/src/main/java/client/command/commands/gm4/TravelRateCommand.java b/src/main/java/client/command/commands/gm4/TravelRateCommand.java index ce0b3058a9..14da01f08f 100644 --- a/src/main/java/client/command/commands/gm4/TravelRateCommand.java +++ b/src/main/java/client/command/commands/gm4/TravelRateCommand.java @@ -26,7 +26,7 @@ package client.command.commands.gm4; import client.MapleCharacter; import client.MapleClient; import client.command.Command; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class TravelRateCommand extends Command { { @@ -43,6 +43,6 @@ public class TravelRateCommand extends Command { int travelrate = Math.max(Integer.parseInt(params[0]), 1); c.getWorldServer().setTravelRate(travelrate); - c.getWorldServer().broadcastPacket(MaplePacketCreator.serverNotice(6, "[Rate] Travel Rate has been changed to " + travelrate + "x.")); + c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Travel Rate has been changed to " + travelrate + "x.")); } } diff --git a/src/main/java/client/command/commands/gm5/DebugCommand.java b/src/main/java/client/command/commands/gm5/DebugCommand.java index 3ed04fab77..019f703912 100644 --- a/src/main/java/client/command/commands/gm5/DebugCommand.java +++ b/src/main/java/client/command/commands/gm5/DebugCommand.java @@ -76,7 +76,7 @@ public class DebugCommand extends Command { break; case "packet": - //player.getMap().broadcastMessage(MaplePacketCreator.customPacket(joinStringFrom(params, 1))); + //player.getMap().broadcastMessage(PacketCreator.customPacket(joinStringFrom(params, 1))); break; case "portal": diff --git a/src/main/java/client/command/commands/gm6/SaveAllCommand.java b/src/main/java/client/command/commands/gm6/SaveAllCommand.java index d9d1770f5a..d6a117a24f 100644 --- a/src/main/java/client/command/commands/gm6/SaveAllCommand.java +++ b/src/main/java/client/command/commands/gm6/SaveAllCommand.java @@ -28,7 +28,7 @@ import client.MapleClient; import client.command.Command; import net.server.Server; import net.server.world.World; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class SaveAllCommand extends Command { { @@ -44,7 +44,7 @@ public class SaveAllCommand extends Command { } } String message = player.getName() + " used !saveall."; - Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(5, message)); + Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, message)); player.message("All players saved successfully."); } } diff --git a/src/main/java/client/command/commands/gm6/WarpWorldCommand.java b/src/main/java/client/command/commands/gm6/WarpWorldCommand.java index 0512f1f4fc..3c159eb419 100644 --- a/src/main/java/client/command/commands/gm6/WarpWorldCommand.java +++ b/src/main/java/client/command/commands/gm6/WarpWorldCommand.java @@ -27,7 +27,7 @@ import client.MapleCharacter; import client.MapleClient; import client.command.Command; import net.server.Server; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.net.InetAddress; import java.net.UnknownHostException; @@ -55,7 +55,7 @@ public class WarpWorldCommand extends Command { player.setSessionTransitionState(); player.setWorld(worldb); player.saveCharToDB();//To set the new world :O (true because else 2 player instances are created, one in both worlds) - c.announce(MaplePacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]))); + c.announce(PacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]))); } catch (UnknownHostException | NumberFormatException ex) { ex.printStackTrace(); player.message("Unexpected error when changing worlds, are you sure the world you are trying to warp to has the same amount of channels?"); diff --git a/src/main/java/client/creator/CharacterFactory.java b/src/main/java/client/creator/CharacterFactory.java index fe65ab98b5..34dffa08e2 100644 --- a/src/main/java/client/creator/CharacterFactory.java +++ b/src/main/java/client/creator/CharacterFactory.java @@ -19,8 +19,8 @@ */ package client.creator; -import client.MapleClient; import client.MapleCharacter; +import client.MapleClient; import client.MapleSkinColor; import client.inventory.Item; import client.inventory.MapleInventory; @@ -29,7 +29,7 @@ import config.YamlConfig; import net.server.Server; import server.MapleItemInformationProvider; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; /** * @@ -90,10 +90,10 @@ public abstract class CharacterFactory { if (!newchar.insertNewChar(recipe)) { return -2; } - c.announce(MaplePacketCreator.addNewCharEntry(newchar)); + c.announce(PacketCreator.addNewCharEntry(newchar)); Server.getInstance().createCharacterEntry(newchar); - Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.sendYellowTip("[New Char]: " + c.getAccountName() + " has created a new character with IGN " + name)); + Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[New Char]: " + c.getAccountName() + " has created a new character with IGN " + name)); FilePrinter.print(FilePrinter.CREATED_CHAR + c.getAccountName() + ".txt", c.getAccountName() + " created character with IGN " + name); return 0; diff --git a/src/main/java/client/inventory/Equip.java b/src/main/java/client/inventory/Equip.java index c2a821cddc..a2e234c6ad 100644 --- a/src/main/java/client/inventory/Equip.java +++ b/src/main/java/client/inventory/Equip.java @@ -26,7 +26,7 @@ import config.YamlConfig; import constants.game.ExpTable; import constants.inventory.ItemConstants; import server.MapleItemInformationProvider; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.Randomizer; @@ -532,8 +532,8 @@ public class Equip extends Item { showLevelupMessage(showStr, c); // thanks to Polaris dev team ! c.getPlayer().dropMessage(6, lvupStr); - c.announce(MaplePacketCreator.showEquipmentLevelUp()); - c.getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.showForeignEffect(c.getPlayer().getId(), 15)); + c.announce(PacketCreator.showEquipmentLevelUp()); + c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.showForeignEffect(c.getPlayer().getId(), 15)); c.getPlayer().forceUpdateItem(this); } diff --git a/src/main/java/client/inventory/MaplePet.java b/src/main/java/client/inventory/MaplePet.java index e2b3cb8594..3d0d6abbf1 100644 --- a/src/main/java/client/inventory/MaplePet.java +++ b/src/main/java/client/inventory/MaplePet.java @@ -29,7 +29,7 @@ import server.movement.AbsoluteLifeMovement; import server.movement.LifeMovement; import server.movement.LifeMovementFragment; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import java.awt.*; @@ -202,8 +202,8 @@ public class MaplePet extends Item { closeness = newCloseness; while(newCloseness >= ExpTable.getClosenessNeededForLevel(level)) { level += 1; - owner.getClient().announce(MaplePacketCreator.showOwnPetLevelUp(slot)); - owner.getMap().broadcastMessage(MaplePacketCreator.showPetLevelUp(owner, slot)); + owner.getClient().announce(PacketCreator.showOwnPetLevelUp(slot)); + owner.getMap().broadcastMessage(PacketCreator.showPetLevelUp(owner, slot)); } } @@ -220,7 +220,7 @@ public class MaplePet extends Item { enjoyed = false; } - owner.getMap().broadcastMessage(MaplePacketCreator.petFoodResponse(owner.getId(), slot, enjoyed, false)); + owner.getMap().broadcastMessage(PacketCreator.petFoodResponse(owner.getId(), slot, enjoyed, false)); saveToDb(); Item petz = owner.getInventory(MapleInventoryType.CASH).getItem(getPosition()); diff --git a/src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java b/src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java index 5c96e090ae..62fc2e4b16 100644 --- a/src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java +++ b/src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java @@ -31,7 +31,7 @@ import constants.inventory.ItemConstants; import server.MapleItemInformationProvider; import server.maps.MapleMap; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.awt.*; import java.util.ArrayList; @@ -92,7 +92,7 @@ public class MapleInventoryManipulator { quantity -= (newQ - oldQ); eItem.setQuantity(newQ); eItem.setExpiration(expiration); - c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(1, eItem)))); + c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(1, eItem)))); } } else { break; @@ -109,17 +109,17 @@ public class MapleInventoryManipulator { nItem.setExpiration(expiration); short newSlot = inv.addItem(nItem); if (newSlot == -1) { - c.announce(MaplePacketCreator.getInventoryFull()); - c.announce(MaplePacketCreator.getShowInventoryFull()); + c.announce(PacketCreator.getInventoryFull()); + c.announce(PacketCreator.getShowInventoryFull()); return false; } if (owner != null) { nItem.setOwner(owner); } - c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem)))); + c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem)))); if(sandboxItem) chr.setHasSandboxItem(); } else { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } } @@ -129,11 +129,11 @@ public class MapleInventoryManipulator { nItem.setExpiration(expiration); short newSlot = inv.addItem(nItem); if (newSlot == -1) { - c.announce(MaplePacketCreator.getInventoryFull()); - c.announce(MaplePacketCreator.getShowInventoryFull()); + c.announce(PacketCreator.getInventoryFull()); + c.announce(PacketCreator.getShowInventoryFull()); return false; } - c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem)))); + c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem)))); if(MapleInventoryManipulator.isSandboxItem(nItem)) chr.setHasSandboxItem(); } } else if (quantity == 1) { @@ -145,11 +145,11 @@ public class MapleInventoryManipulator { } short newSlot = inv.addItem(nEquip); if (newSlot == -1) { - c.announce(MaplePacketCreator.getInventoryFull()); - c.announce(MaplePacketCreator.getShowInventoryFull()); + c.announce(PacketCreator.getInventoryFull()); + c.announce(PacketCreator.getShowInventoryFull()); return false; } - c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nEquip)))); + c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nEquip)))); if(MapleInventoryManipulator.isSandboxItem(nEquip)) chr.setHasSandboxItem(); } else { throw new RuntimeException("Trying to create equip with non-one quantity"); @@ -182,8 +182,8 @@ public class MapleInventoryManipulator { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); int itemid = item.getItemId(); if (ii.isPickupRestricted(itemid) && chr.haveItemWithId(itemid, true)) { - c.announce(MaplePacketCreator.getInventoryFull()); - c.announce(MaplePacketCreator.showItemUnavailable()); + c.announce(PacketCreator.getInventoryFull()); + c.announce(PacketCreator.showItemUnavailable()); return false; } short quantity = item.getQuantity(); @@ -203,7 +203,7 @@ public class MapleInventoryManipulator { quantity -= (newQ - oldQ); eItem.setQuantity(newQ); item.setPosition(eItem.getPosition()); - c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(1, eItem)))); + c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(1, eItem)))); } } else { break; @@ -219,14 +219,14 @@ public class MapleInventoryManipulator { nItem.setFlag(item.getFlag()); short newSlot = inv.addItem(nItem); if (newSlot == -1) { - c.announce(MaplePacketCreator.getInventoryFull()); - c.announce(MaplePacketCreator.getShowInventoryFull()); + c.announce(PacketCreator.getInventoryFull()); + c.announce(PacketCreator.getShowInventoryFull()); item.setQuantity((short) (quantity + newQ)); return false; } nItem.setPosition(newSlot); item.setPosition(newSlot); - c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem)))); + c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem)))); if (MapleInventoryManipulator.isSandboxItem(nItem)) chr.setHasSandboxItem(); } } else { @@ -236,34 +236,34 @@ public class MapleInventoryManipulator { short newSlot = inv.addItem(nItem); if (newSlot == -1) { - c.announce(MaplePacketCreator.getInventoryFull()); - c.announce(MaplePacketCreator.getShowInventoryFull()); + c.announce(PacketCreator.getInventoryFull()); + c.announce(PacketCreator.getShowInventoryFull()); return false; } nItem.setPosition(newSlot); item.setPosition(newSlot); - c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem)))); + c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem)))); if (MapleInventoryManipulator.isSandboxItem(nItem)) chr.setHasSandboxItem(); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } else if (quantity == 1) { short newSlot = inv.addItem(item); if (newSlot == -1) { - c.announce(MaplePacketCreator.getInventoryFull()); - c.announce(MaplePacketCreator.getShowInventoryFull()); + c.announce(PacketCreator.getInventoryFull()); + c.announce(PacketCreator.getShowInventoryFull()); return false; } item.setPosition(newSlot); - c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, item)))); + c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, item)))); if (MapleInventoryManipulator.isSandboxItem(item)) chr.setHasSandboxItem(); } else { FilePrinter.printError(FilePrinter.ITEM, "Tried to pickup Equip id " + itemid + " containing more than 1 quantity --> " + quantity); - c.announce(MaplePacketCreator.getInventoryFull()); - c.announce(MaplePacketCreator.showItemUnavailable()); + c.announce(PacketCreator.getInventoryFull()); + c.announce(PacketCreator.showItemUnavailable()); return false; } if (show) { - c.announce(MaplePacketCreator.getShowItemGain(itemid, item.getQuantity())); + c.announce(PacketCreator.getShowItemGain(itemid, item.getQuantity())); } return true; } @@ -429,9 +429,9 @@ public class MapleInventoryManipulator { private static void announceModifyInventory(MapleClient c, Item item, boolean fromDrop, boolean allowZero) { if (item.getQuantity() == 0 && !allowZero) { - c.announce(MaplePacketCreator.modifyInventory(fromDrop, Collections.singletonList(new ModifyInventory(3, item)))); + c.announce(PacketCreator.modifyInventory(fromDrop, Collections.singletonList(new ModifyInventory(3, item)))); } else { - c.announce(MaplePacketCreator.modifyInventory(fromDrop, Collections.singletonList(new ModifyInventory(1, item)))); + c.announce(PacketCreator.modifyInventory(fromDrop, Collections.singletonList(new ModifyInventory(1, item)))); } } @@ -498,7 +498,7 @@ public class MapleInventoryManipulator { } else { mods.add(new ModifyInventory(2, source, src)); } - c.announce(MaplePacketCreator.modifyInventory(true, mods)); + c.announce(PacketCreator.modifyInventory(true, mods)); } public static void equip(MapleClient c, short src, short dst) { @@ -510,7 +510,7 @@ public class MapleInventoryManipulator { Equip source = (Equip) eqpInv.getItem(src); if (source == null || !ii.canWearEquipment(chr, source, dst)) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } else if ((((source.getItemId() >= 1902000 && source.getItemId() <= 1902002) || source.getItemId() == 1912000) && chr.isCygnus()) || ((source.getItemId() >= 1902005 && source.getItemId() <= 1902007) || source.getItemId() == 1912005) && !chr.isCygnus()) {// Adventurer taming equipment return; @@ -527,8 +527,8 @@ public class MapleInventoryManipulator { Item top = eqpdInv.getItem((short) -5); if (top != null && ItemConstants.isOverall(top.getItemId())) { if (eqpInv.isFull()) { - c.announce(MaplePacketCreator.getInventoryFull()); - c.announce(MaplePacketCreator.getShowInventoryFull()); + c.announce(PacketCreator.getInventoryFull()); + c.announce(PacketCreator.getShowInventoryFull()); return; } unequip(c, (byte) -5, eqpInv.getNextFreeSlot()); @@ -537,8 +537,8 @@ public class MapleInventoryManipulator { final Item bottom = eqpdInv.getItem((short) -6); if (bottom != null && ItemConstants.isOverall(source.getItemId())) { if (eqpInv.isFull()) { - c.announce(MaplePacketCreator.getInventoryFull()); - c.announce(MaplePacketCreator.getShowInventoryFull()); + c.announce(PacketCreator.getInventoryFull()); + c.announce(PacketCreator.getShowInventoryFull()); return; } unequip(c, (byte) -6, eqpInv.getNextFreeSlot()); @@ -547,8 +547,8 @@ public class MapleInventoryManipulator { Item weapon = eqpdInv.getItem((short) -11); if (weapon != null && ii.isTwoHanded(weapon.getItemId())) { if (eqpInv.isFull()) { - c.announce(MaplePacketCreator.getInventoryFull()); - c.announce(MaplePacketCreator.getShowInventoryFull()); + c.announce(PacketCreator.getInventoryFull()); + c.announce(PacketCreator.getShowInventoryFull()); return; } unequip(c, (byte) -11, eqpInv.getNextFreeSlot()); @@ -557,8 +557,8 @@ public class MapleInventoryManipulator { Item shield = eqpdInv.getItem((short) -10); if (shield != null && ii.isTwoHanded(source.getItemId())) { if (eqpInv.isFull()) { - c.announce(MaplePacketCreator.getInventoryFull()); - c.announce(MaplePacketCreator.getShowInventoryFull()); + c.announce(PacketCreator.getInventoryFull()); + c.announce(PacketCreator.getShowInventoryFull()); return; } unequip(c, (byte) -10, eqpInv.getNextFreeSlot()); @@ -614,7 +614,7 @@ public class MapleInventoryManipulator { } mods.add(new ModifyInventory(2, source, src)); - c.announce(MaplePacketCreator.modifyInventory(true, mods)); + c.announce(PacketCreator.modifyInventory(true, mods)); chr.equipChanged(); } @@ -632,7 +632,7 @@ public class MapleInventoryManipulator { return; } if (target != null && src <= 0) { - c.announce(MaplePacketCreator.getInventoryFull()); + c.announce(PacketCreator.getInventoryFull()); return; } @@ -656,7 +656,7 @@ public class MapleInventoryManipulator { target.setPosition(src); eqpdInv.addItemFromDB(target); } - c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(2, source, src)))); + c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(2, source, src)))); chr.equipChanged(); } @@ -712,7 +712,7 @@ public class MapleInventoryManipulator { Item target = source.copy(); target.setQuantity(quantity); source.setQuantity((short) (source.getQuantity() - quantity)); - c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(1, source)))); + c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(1, source)))); if (ItemConstants.isNewYearCardEtc(itemId)) { if(itemId == 4300000) { @@ -742,7 +742,7 @@ public class MapleInventoryManipulator { inv.removeSlot(src); } - c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(3, source)))); + c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(3, source)))); if (src < 0) { chr.equipChanged(); } else if (ItemConstants.isNewYearCardEtc(itemId)) { @@ -766,7 +766,7 @@ public class MapleInventoryManipulator { if (itemId == chr.getItemEffect()) { if (quantityNow <= 0) { chr.setItemEffect(0); - map.broadcastMessage(MaplePacketCreator.itemEffect(chr.getId(), 0)); + map.broadcastMessage(PacketCreator.itemEffect(chr.getId(), 0)); } } else if (itemId == 5370000 || itemId == 5370001) { if (source.getQuantity() <= 0) { diff --git a/src/main/java/client/newyear/NewYearCardRecord.java b/src/main/java/client/newyear/NewYearCardRecord.java index 88a7c0212d..38b51e23ba 100644 --- a/src/main/java/client/newyear/NewYearCardRecord.java +++ b/src/main/java/client/newyear/NewYearCardRecord.java @@ -23,7 +23,7 @@ import client.MapleCharacter; import net.server.Server; import server.TimerManager; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.sql.Connection; import java.sql.PreparedStatement; @@ -257,7 +257,7 @@ public class NewYearCardRecord { MapleCharacter target = server.getWorld(world).getPlayerStorage().getCharacterById(receiverId); if(target != null && target.isLoggedinWorld()) { - target.announce(MaplePacketCreator.onNewYearCardRes(target, NewYearCardRecord.this, 0xC, 0)); + target.announce(PacketCreator.onNewYearCardRes(target, NewYearCardRecord.this, 0xC, 0)); } }, 1000 * 60 * 60); //1 Hour } @@ -308,12 +308,12 @@ public class NewYearCardRecord { chr.removeNewYearRecord(nyc); deleteNewYearCard(nyc.id); - chr.getMap().broadcastMessage(MaplePacketCreator.onNewYearCardRes(chr, nyc, 0xE, 0)); + chr.getMap().broadcastMessage(PacketCreator.onNewYearCardRes(chr, nyc, 0xE, 0)); MapleCharacter other = chr.getClient().getWorldServer().getPlayerStorage().getCharacterById(nyc.getReceiverId()); if(other != null && other.isLoggedinWorld()) { other.removeNewYearRecord(nyc); - other.getMap().broadcastMessage(MaplePacketCreator.onNewYearCardRes(other, nyc, 0xE, 0)); + other.getMap().broadcastMessage(PacketCreator.onNewYearCardRes(other, nyc, 0xE, 0)); other.dropMessage(6, "[New Year] " + chr.getName() + " threw away the New Year card."); } @@ -326,12 +326,12 @@ public class NewYearCardRecord { chr.removeNewYearRecord(nyc); deleteNewYearCard(nyc.id); - chr.getMap().broadcastMessage(MaplePacketCreator.onNewYearCardRes(chr, nyc, 0xE, 0)); + chr.getMap().broadcastMessage(PacketCreator.onNewYearCardRes(chr, nyc, 0xE, 0)); MapleCharacter other = chr.getClient().getWorldServer().getPlayerStorage().getCharacterById(nyc.getSenderId()); if(other != null && other.isLoggedinWorld()) { other.removeNewYearRecord(nyc); - other.getMap().broadcastMessage(MaplePacketCreator.onNewYearCardRes(other, nyc, 0xE, 0)); + other.getMap().broadcastMessage(PacketCreator.onNewYearCardRes(other, nyc, 0xE, 0)); other.dropMessage(6, "[New Year] " + chr.getName() + " threw away the New Year card."); } diff --git a/src/main/java/client/processor/action/BuybackProcessor.java b/src/main/java/client/processor/action/BuybackProcessor.java index 4fd5a6e628..80439c143d 100644 --- a/src/main/java/client/processor/action/BuybackProcessor.java +++ b/src/main/java/client/processor/action/BuybackProcessor.java @@ -19,10 +19,10 @@ */ package client.processor.action; // thanks Alex for pointing out some package structures containing broad modules -import client.MapleClient; import client.MapleCharacter; +import client.MapleClient; import server.maps.MapleMap; -import tools.MaplePacketCreator; +import tools.PacketCreator; /** * @@ -74,11 +74,11 @@ public class BuybackProcessor { chr.broadcastStance(chr.isFacingLeft() ? 5 : 4); MapleMap map = chr.getMap(); - map.broadcastMessage(MaplePacketCreator.playSound("Buyback/" + jobString)); - map.broadcastMessage(MaplePacketCreator.earnTitleMessage(chr.getName() + " just bought back into the game!")); + map.broadcastMessage(PacketCreator.playSound("Buyback/" + jobString)); + map.broadcastMessage(PacketCreator.earnTitleMessage(chr.getName() + " just bought back into the game!")); - chr.announce(MaplePacketCreator.showBuybackEffect()); - map.broadcastMessage(chr, MaplePacketCreator.showForeignBuybackEffect(chr.getId()), false); + chr.announce(PacketCreator.showBuybackEffect()); + map.broadcastMessage(chr, PacketCreator.showForeignBuybackEffect(chr.getId()), false); } } } diff --git a/src/main/java/client/processor/action/MakerProcessor.java b/src/main/java/client/processor/action/MakerProcessor.java index e2634abce6..b8df84f107 100644 --- a/src/main/java/client/processor/action/MakerProcessor.java +++ b/src/main/java/client/processor/action/MakerProcessor.java @@ -19,27 +19,28 @@ */ package client.processor.action; -import client.MapleClient; import client.MapleCharacter; +import client.MapleClient; import client.inventory.Equip; import client.inventory.Item; import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import config.YamlConfig; -import constants.inventory.ItemConstants; import constants.game.GameConstants; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import constants.inventory.ItemConstants; import server.MakerItemFactory; import server.MakerItemFactory.MakerItemCreateEntry; import server.MapleItemInformationProvider; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.data.input.SeekableLittleEndianAccessor; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + /** * * @author Ronan @@ -64,8 +65,8 @@ public class MakerProcessor { int fromLeftover = toCreate; toCreate = ii.getMakerCrystalFromLeftover(toCreate); if(toCreate == -1) { - c.announce(MaplePacketCreator.serverNotice(1, ii.getName(fromLeftover) + " is unavailable for Monster Crystal conversion.")); - c.announce(MaplePacketCreator.makerEnableActions()); + c.announce(PacketCreator.serverNotice(1, ii.getName(fromLeftover) + " is unavailable for Monster Crystal conversion.")); + c.announce(PacketCreator.makerEnableActions()); return; } @@ -82,13 +83,13 @@ public class MakerProcessor { if(p != null) { recipe = MakerItemFactory.generateDisassemblyCrystalEntry(toDisassemble, p.getLeft(), p.getRight()); } else { - c.announce(MaplePacketCreator.serverNotice(1, ii.getName(toCreate) + " is unavailable for Monster Crystal disassembly.")); - c.announce(MaplePacketCreator.makerEnableActions()); + c.announce(PacketCreator.serverNotice(1, ii.getName(toCreate) + " is unavailable for Monster Crystal disassembly.")); + c.announce(PacketCreator.makerEnableActions()); return; } } else { - c.announce(MaplePacketCreator.serverNotice(1, "An unknown error occurred when trying to apply that item for disassembly.")); - c.announce(MaplePacketCreator.makerEnableActions()); + c.announce(PacketCreator.serverNotice(1, "An unknown error occurred when trying to apply that item for disassembly.")); + c.announce(PacketCreator.makerEnableActions()); return; } } else { @@ -135,8 +136,8 @@ public class MakerProcessor { if(!reagentids.isEmpty()) { if(!removeOddMakerReagents(toCreate, reagentids)) { - c.announce(MaplePacketCreator.serverNotice(1, "You can only use WATK and MATK Strengthening Gems on weapon items.")); - c.announce(MaplePacketCreator.makerEnableActions()); + c.announce(PacketCreator.serverNotice(1, "You can only use WATK and MATK Strengthening Gems on weapon items.")); + c.announce(PacketCreator.makerEnableActions()); return; } } @@ -150,33 +151,33 @@ public class MakerProcessor { switch(createStatus) { case -1:// non-available for Maker itemid has been tried to forge FilePrinter.printError(FilePrinter.EXPLOITS, "Player " + c.getPlayer().getName() + " tried to craft itemid " + toCreate + " using the Maker skill."); - c.announce(MaplePacketCreator.serverNotice(1, "The requested item could not be crafted on this operation.")); - c.announce(MaplePacketCreator.makerEnableActions()); + c.announce(PacketCreator.serverNotice(1, "The requested item could not be crafted on this operation.")); + c.announce(PacketCreator.makerEnableActions()); break; case 1: // no items - c.announce(MaplePacketCreator.serverNotice(1, "You don't have all required items in your inventory to make " + ii.getName(toCreate) + ".")); - c.announce(MaplePacketCreator.makerEnableActions()); + c.announce(PacketCreator.serverNotice(1, "You don't have all required items in your inventory to make " + ii.getName(toCreate) + ".")); + c.announce(PacketCreator.makerEnableActions()); break; case 2: // no meso - c.announce(MaplePacketCreator.serverNotice(1, "You don't have enough mesos (" + GameConstants.numberWithCommas(recipe.getCost()) + ") to complete this operation.")); - c.announce(MaplePacketCreator.makerEnableActions()); + c.announce(PacketCreator.serverNotice(1, "You don't have enough mesos (" + GameConstants.numberWithCommas(recipe.getCost()) + ") to complete this operation.")); + c.announce(PacketCreator.makerEnableActions()); break; case 3: // no req level - c.announce(MaplePacketCreator.serverNotice(1, "You don't have enough level to complete this operation.")); - c.announce(MaplePacketCreator.makerEnableActions()); + c.announce(PacketCreator.serverNotice(1, "You don't have enough level to complete this operation.")); + c.announce(PacketCreator.makerEnableActions()); break; case 4: // no req skill level - c.announce(MaplePacketCreator.serverNotice(1, "You don't have enough Maker level to complete this operation.")); - c.announce(MaplePacketCreator.makerEnableActions()); + c.announce(PacketCreator.serverNotice(1, "You don't have enough Maker level to complete this operation.")); + c.announce(PacketCreator.makerEnableActions()); break; case 5: // inventory full - c.announce(MaplePacketCreator.serverNotice(1, "Your inventory is full.")); - c.announce(MaplePacketCreator.makerEnableActions()); + c.announce(PacketCreator.serverNotice(1, "Your inventory is full.")); + c.announce(PacketCreator.makerEnableActions()); break; default: @@ -213,15 +214,15 @@ public class MakerProcessor { // thanks inhyuk for noticing missing MAKER_RESULT packets if (type == 3) { - c.announce(MaplePacketCreator.makerResultCrystal(recipe.getGainItems().get(0).getLeft(), recipe.getReqItems().get(0).getLeft())); + c.announce(PacketCreator.makerResultCrystal(recipe.getGainItems().get(0).getLeft(), recipe.getReqItems().get(0).getLeft())); } else if (type == 4) { - c.announce(MaplePacketCreator.makerResultDesynth(recipe.getReqItems().get(0).getLeft(), recipe.getCost(), recipe.getGainItems())); + c.announce(PacketCreator.makerResultDesynth(recipe.getReqItems().get(0).getLeft(), recipe.getCost(), recipe.getGainItems())); } else { - c.announce(MaplePacketCreator.makerResult(makerSucceeded, recipe.getGainItems().get(0).getLeft(), recipe.getGainItems().get(0).getRight(), recipe.getCost(), recipe.getReqItems(), stimulantid, new LinkedList<>(reagentids.keySet()))); + c.announce(PacketCreator.makerResult(makerSucceeded, recipe.getGainItems().get(0).getLeft(), recipe.getGainItems().get(0).getRight(), recipe.getCost(), recipe.getReqItems(), stimulantid, new LinkedList<>(reagentids.keySet()))); } - c.announce(MaplePacketCreator.showMakerEffect(makerSucceeded)); - c.getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.showForeignMakerEffect(c.getPlayer().getId(), makerSucceeded), false); + c.announce(PacketCreator.showMakerEffect(makerSucceeded)); + c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.showForeignMakerEffect(c.getPlayer().getId(), makerSucceeded), false); if(toCreate == 4260003 && type == 3 && c.getPlayer().getQuestStatus(6033) == 1) { c.getAbstractPlayerInteraction().setQuestProgress(6033, 1); diff --git a/src/main/java/client/processor/action/PetAutopotProcessor.java b/src/main/java/client/processor/action/PetAutopotProcessor.java index 0bb2c79c30..d7c69eb52a 100644 --- a/src/main/java/client/processor/action/PetAutopotProcessor.java +++ b/src/main/java/client/processor/action/PetAutopotProcessor.java @@ -28,10 +28,11 @@ import client.inventory.MapleInventory; import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import config.YamlConfig; -import java.util.List; import server.MapleItemInformationProvider; import server.MapleStatEffect; -import tools.MaplePacketCreator; +import tools.PacketCreator; + +import java.util.List; /** * @@ -82,7 +83,7 @@ public class PetAutopotProcessor { MapleClient c = this.c; MapleCharacter chr = c.getPlayer(); if (!chr.isAlive()) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -101,7 +102,7 @@ public class PetAutopotProcessor { toUse = useInv.getItem(slot); if (toUse != null) { if (toUse.getItemId() != itemId) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -110,7 +111,7 @@ public class PetAutopotProcessor { // from now on, toUse becomes the "cursor" for the current pot being used if (toUse.getQuantity() <= 0) { if (!cursorOnNextAvailablePot(chr)) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } } @@ -178,7 +179,7 @@ public class PetAutopotProcessor { } } - chr.announce(MaplePacketCreator.enableActions()); + chr.announce(PacketCreator.enableActions()); } } diff --git a/src/main/java/client/processor/action/SpawnPetProcessor.java b/src/main/java/client/processor/action/SpawnPetProcessor.java index 9929e24224..b82a21c3f9 100644 --- a/src/main/java/client/processor/action/SpawnPetProcessor.java +++ b/src/main/java/client/processor/action/SpawnPetProcessor.java @@ -29,7 +29,7 @@ import provider.MapleDataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.awt.*; @@ -52,7 +52,7 @@ public class SpawnPetProcessor { { if (chr.haveItem(petid + 1)) { chr.dropMessage(5, "You can't hatch your " + (petid == 5000028 ? "Dragon egg" : "Robo egg") + " if you already have a Baby " + (petid == 5000028 ? "Dragon." : "Robo.")); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } else { int evolveid = MapleDataTool.getInt("info/evol1", dataRoot.getData("Pet/" + petid + ".img")); @@ -64,7 +64,7 @@ public class SpawnPetProcessor { MapleInventoryManipulator.removeById(c, MapleInventoryType.CASH, petid, (short) 1, false, false); MapleInventoryManipulator.addById(c, evolveid, (short) 1, null, petId, expiration); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } } @@ -85,9 +85,9 @@ public class SpawnPetProcessor { pet.setSummoned(true); pet.saveToDb(); chr.addPet(pet); - chr.getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.showPet(c.getPlayer(), pet, false, false), true); - c.announce(MaplePacketCreator.petStatUpdate(c.getPlayer())); - c.announce(MaplePacketCreator.enableActions()); + chr.getMap().broadcastMessage(c.getPlayer(), PacketCreator.showPet(c.getPlayer(), pet, false, false), true); + c.announce(PacketCreator.petStatUpdate(c.getPlayer())); + c.announce(PacketCreator.enableActions()); chr.commitExcludedItems(); chr.getClient().getWorldServer().registerPetHunger(chr, chr.getPetIndex(pet)); diff --git a/src/main/java/client/processor/npc/DueyProcessor.java b/src/main/java/client/processor/npc/DueyProcessor.java index 3d984bae8a..c0289a9c9e 100644 --- a/src/main/java/client/processor/npc/DueyProcessor.java +++ b/src/main/java/client/processor/npc/DueyProcessor.java @@ -40,7 +40,7 @@ import server.MapleItemInformationProvider; import server.MapleTrade; import tools.DatabaseConnection; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import java.sql.*; @@ -117,7 +117,7 @@ public class DueyProcessor { ps2.setInt(1, player.getId()); ps2.executeUpdate(); - c.announce(MaplePacketCreator.sendDueyParcelReceived(rs.getString("SenderName"), rs.getInt("Type") == 1)); + c.announce(PacketCreator.sendDueyParcelReceived(rs.getString("SenderName"), rs.getInt("Type") == 1)); } } } @@ -305,21 +305,21 @@ public class DueyProcessor { int recipientAccId = accIdCid.getLeft(); if (recipientAccId != -1) { if (recipientAccId == c.getAccID()) { - c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_SAMEACC_ERROR.getCode())); + c.announce(PacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_SAMEACC_ERROR.getCode())); return; } } else { - c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_NAME_DOES_NOT_EXIST.getCode())); + c.announce(PacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_NAME_DOES_NOT_EXIST.getCode())); return; } } else { - c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_NOT_ENOUGH_MESOS.getCode())); + c.announce(PacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_NOT_ENOUGH_MESOS.getCode())); return; } int recipientCid = accIdCid.getRight(); if (recipientCid == -1) { - c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_NAME_DOES_NOT_EXIST.getCode())); + c.announce(PacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_NAME_DOES_NOT_EXIST.getCode())); return; } @@ -329,18 +329,18 @@ public class DueyProcessor { int packageId = createPackage(sendMesos, sendMessage, c.getPlayer().getName(), recipientCid, quick); if (packageId == -1) { - c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_ENABLE_ACTIONS.getCode())); + c.announce(PacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_ENABLE_ACTIONS.getCode())); return; } c.getPlayer().gainMeso((int) -finalcost, false); int res = addPackageItemFromInventory(packageId, c, invTypeId, itemPos, amount); if (res == 0) { - c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_SUCCESSFULLY_SENT.getCode())); + c.announce(PacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_SUCCESSFULLY_SENT.getCode())); } else if (res > 0) { - c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_ENABLE_ACTIONS.getCode())); + c.announce(PacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_ENABLE_ACTIONS.getCode())); } else { - c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_INCORRECT_REQUEST.getCode())); + c.announce(PacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_INCORRECT_REQUEST.getCode())); } MapleClient rClient = null; @@ -368,7 +368,7 @@ public class DueyProcessor { if (c.tryacquireClient()) { try { removePackageFromDB(packageid); - c.announce(MaplePacketCreator.removeItemFromDuey(playerRemove, packageid)); + c.announce(PacketCreator.removeItemFromDuey(playerRemove, packageid)); } finally { c.releaseClient(); } @@ -392,29 +392,29 @@ public class DueyProcessor { } if (dp == null) { - c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_UNKNOWN_ERROR.getCode())); + c.announce(PacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_UNKNOWN_ERROR.getCode())); FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " tried to receive package from duey with id " + packageId); return; } if (dp.isDeliveringTime()) { - c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_UNKNOWN_ERROR.getCode())); + c.announce(PacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_UNKNOWN_ERROR.getCode())); return; } Item dpItem = dp.getItem(); if (dpItem != null) { if (!c.getPlayer().canHoldMeso(dp.getMesos())) { - c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_UNKNOWN_ERROR.getCode())); + c.announce(PacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_UNKNOWN_ERROR.getCode())); return; } if (!MapleInventoryManipulator.checkSpace(c, dpItem.getItemId(), dpItem.getQuantity(), dpItem.getOwner())) { int itemid = dpItem.getItemId(); if (MapleItemInformationProvider.getInstance().isPickupRestricted(itemid) && c.getPlayer().getInventory(ItemConstants.getInventoryType(itemid)).findById(itemid) != null) { - c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_RECEIVER_WITH_UNIQUE.getCode())); + c.announce(PacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_RECEIVER_WITH_UNIQUE.getCode())); } else { - c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_NO_FREE_SLOTS.getCode())); + c.announce(PacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_NO_FREE_SLOTS.getCode())); } return; @@ -440,15 +440,15 @@ public class DueyProcessor { try { long timeNow = System.currentTimeMillis(); if (timeNow - c.getPlayer().getNpcCooldown() < YamlConfig.config.server.BLOCK_NPC_RACE_CONDT) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } c.getPlayer().setNpcCooldown(timeNow); if (quickDelivery) { - c.announce(MaplePacketCreator.sendDuey(0x1A, null)); + c.announce(PacketCreator.sendDuey(0x1A, null)); } else { - c.announce(MaplePacketCreator.sendDuey(0x8, loadPackages(c.getPlayer()))); + c.announce(PacketCreator.sendDuey(0x8, loadPackages(c.getPlayer()))); } } finally { c.releaseClient(); diff --git a/src/main/java/client/processor/npc/FredrickProcessor.java b/src/main/java/client/processor/npc/FredrickProcessor.java index 3b8f0dfa2c..43bd649a7b 100644 --- a/src/main/java/client/processor/npc/FredrickProcessor.java +++ b/src/main/java/client/processor/npc/FredrickProcessor.java @@ -36,7 +36,7 @@ import server.MapleItemInformationProvider; import server.maps.MapleHiredMerchant; import tools.DatabaseConnection; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import java.sql.*; @@ -275,7 +275,7 @@ public class FredrickProcessor { byte response = canRetrieveFromFredrick(chr, items); if (response != 0) { - chr.announce(MaplePacketCreator.fredrickMessage(response)); + chr.announce(PacketCreator.fredrickMessage(response)); return; } @@ -294,7 +294,7 @@ public class FredrickProcessor { FilePrinter.print(FilePrinter.FREDRICK + chr.getName() + ".txt", chr.getName() + " gained " + item.getQuantity() + " " + itemName + " (" + item.getItemId() + ")"); } - chr.announce(MaplePacketCreator.fredrickMessage((byte) 0x1E)); + chr.announce(PacketCreator.fredrickMessage((byte) 0x1E)); removeFredrickLog(chr.getId()); } else { chr.message("An unknown error has occured."); diff --git a/src/main/java/client/processor/npc/StorageProcessor.java b/src/main/java/client/processor/npc/StorageProcessor.java index 8251c9791c..55ea3433b2 100644 --- a/src/main/java/client/processor/npc/StorageProcessor.java +++ b/src/main/java/client/processor/npc/StorageProcessor.java @@ -21,20 +21,20 @@ */ package client.processor.npc; -import client.MapleClient; import client.MapleCharacter; +import client.MapleClient; import client.autoban.AutobanFactory; import client.inventory.Item; import client.inventory.MapleInventory; import client.inventory.MapleInventoryType; +import client.inventory.manipulator.MapleInventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; import config.YamlConfig; import constants.inventory.ItemConstants; -import client.inventory.manipulator.MapleInventoryManipulator; import server.MapleItemInformationProvider; import server.MapleStorage; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -52,7 +52,7 @@ public class StorageProcessor { if (chr.getLevel() < 15){ chr.dropMessage(1, "You may only use the storage once you have reached level 15."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -71,13 +71,13 @@ public class StorageProcessor { Item item = storage.getItem(slot); if (item != null) { if (ii.isPickupRestricted(item.getItemId()) && chr.haveItemWithId(item.getItemId(), true)) { - c.announce(MaplePacketCreator.getStorageError((byte) 0x0C)); + c.announce(PacketCreator.getStorageError((byte) 0x0C)); return; } int takeoutFee = storage.getTakeOutFee(); if (chr.getMeso() < takeoutFee) { - c.announce(MaplePacketCreator.getStorageError((byte) 0x0B)); + c.announce(PacketCreator.getStorageError((byte) 0x0B)); return; } else { chr.gainMeso(-takeoutFee, false); @@ -95,11 +95,11 @@ public class StorageProcessor { storage.sendTakenOut(c, item.getInventoryType()); } else { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } } else { - c.announce(MaplePacketCreator.getStorageError((byte) 0x0A)); + c.announce(PacketCreator.getStorageError((byte) 0x0A)); } } } else if (mode == 5) { // store @@ -115,17 +115,17 @@ public class StorageProcessor { return; } if (quantity < 1) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } if (storage.isFull()) { - c.announce(MaplePacketCreator.getStorageError((byte) 0x11)); + c.announce(PacketCreator.getStorageError((byte) 0x11)); return; } int storeFee = storage.getStoreFee(); if (chr.getMeso() < storeFee) { - c.announce(MaplePacketCreator.getStorageError((byte) 0x0B)); + c.announce(PacketCreator.getStorageError((byte) 0x0B)); } else { Item item; @@ -134,7 +134,7 @@ public class StorageProcessor { item = inv.getItem(slot); if (item != null && item.getItemId() == itemId && (item.getQuantity() >= quantity || ItemConstants.isRechargeable(itemId))) { if (ItemConstants.isWeddingRing(itemId) || ItemConstants.isWeddingToken(itemId)) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -144,7 +144,7 @@ public class StorageProcessor { MapleInventoryManipulator.removeFromSlot(c, invType, slot, quantity, false); } else { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -168,7 +168,7 @@ public class StorageProcessor { } } else if (mode == 6) { // arrange items if(YamlConfig.config.server.USE_STORAGE_ITEM_SORT) storage.arrangeItems(c); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } else if (mode == 7) { // meso int meso = slea.readInt(); int storageMesos = storage.getMeso(); @@ -177,13 +177,13 @@ public class StorageProcessor { if (meso < 0 && (storageMesos - meso) < 0) { meso = Integer.MIN_VALUE + storageMesos; if (meso < playerMesos) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } } else if (meso > 0 && (playerMesos + meso) < 0) { meso = Integer.MAX_VALUE - playerMesos; if (meso > storageMesos) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } } @@ -193,7 +193,7 @@ public class StorageProcessor { FilePrinter.print(FilePrinter.STORAGE + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + (meso > 0 ? " took out " : " stored ") + Math.abs(meso) + " mesos"); storage.sendMeso(c); } else { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } } else if (mode == 8) {// close... unless the player decides to enter cash shop! diff --git a/src/main/java/client/processor/stat/AssignAPProcessor.java b/src/main/java/client/processor/stat/AssignAPProcessor.java index 032143883e..dcc9a77057 100644 --- a/src/main/java/client/processor/stat/AssignAPProcessor.java +++ b/src/main/java/client/processor/stat/AssignAPProcessor.java @@ -30,7 +30,7 @@ import client.inventory.Item; import client.inventory.MapleInventoryType; import config.YamlConfig; import constants.skills.*; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Randomizer; import tools.data.input.SeekableLittleEndianAccessor; @@ -329,11 +329,11 @@ public class AssignAPProcessor { } chr.assignStrDexIntLuk(statGain[0], statGain[1], statGain[3], statGain[2]); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); //---------------------------------------------------------------------------------------- - c.announce(MaplePacketCreator.serverNotice(1, "Better AP applications detected:\r\nSTR: +" + statGain[0] + "\r\nDEX: +" + statGain[1] + "\r\nINT: +" + statGain[3] + "\r\nLUK: +" + statGain[2])); + c.announce(PacketCreator.serverNotice(1, "Better AP applications detected:\r\nSTR: +" + statGain[0] + "\r\nDEX: +" + statGain[1] + "\r\nINT: +" + statGain[3] + "\r\nLUK: +" + statGain[2])); } else { if(slea.available() < 16) { AutobanFactory.PACKET_EDIT.alert(chr, "Didn't send full packet for Auto Assign."); @@ -353,7 +353,7 @@ public class AssignAPProcessor { } chr.assignStrDexIntLuk(statGain[0], statGain[1], statGain[3], statGain[2]); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } finally { c.unlockClient(); @@ -426,48 +426,48 @@ public class AssignAPProcessor { case 64: // str if (player.getStr() < 5) { player.message("You don't have the minimum STR required to swap."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } if (!player.assignStr(-1)) { player.message("Couldn't execute AP reset operation."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } break; case 128: // dex if (player.getDex() < 5) { player.message("You don't have the minimum DEX required to swap."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } if (!player.assignDex(-1)) { player.message("Couldn't execute AP reset operation."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } break; case 256: // int if (player.getInt() < 5) { player.message("You don't have the minimum INT required to swap."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } if (!player.assignInt(-1)) { player.message("Couldn't execute AP reset operation."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } break; case 512: // luk if (player.getLuk() < 5) { player.message("You don't have the minimum LUK required to swap."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } if (!player.assignLuk(-1)) { player.message("Couldn't execute AP reset operation."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } break; @@ -475,14 +475,14 @@ public class AssignAPProcessor { if(YamlConfig.config.server.USE_ENFORCE_HPMP_SWAP) { if (APTo != 8192) { player.message("You can only swap HP ability points to MP."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } } if (player.getHpMpApUsed() < 1) { player.message("You don't have enough HPMP stat points to spend on AP Reset."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } @@ -490,7 +490,7 @@ public class AssignAPProcessor { int level_ = player.getLevel(); if (hp < level_ * 14 + 148) { player.message("You don't have the minimum HP pool required to swap."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } @@ -506,14 +506,14 @@ public class AssignAPProcessor { if(YamlConfig.config.server.USE_ENFORCE_HPMP_SWAP) { if (APTo != 2048) { player.message("You can only swap MP ability points to HP."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } } if (player.getHpMpApUsed() < 1) { player.message("You don't have enough HPMP stat points to spend on AP Reset."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } @@ -534,7 +534,7 @@ public class AssignAPProcessor { if (!canWash) { player.message("You don't have the minimum MP pool required to swap."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } @@ -546,7 +546,7 @@ public class AssignAPProcessor { } break; default: - c.announce(MaplePacketCreator.updatePlayerStats(MaplePacketCreator.EMPTY_STATUPDATE, true, player)); + c.announce(PacketCreator.updatePlayerStats(PacketCreator.EMPTY_STATUPDATE, true, player)); return false; } @@ -571,47 +571,47 @@ public class AssignAPProcessor { case 64: if (!chr.assignStr(1)) { chr.message("Couldn't execute AP assign operation."); - chr.announce(MaplePacketCreator.enableActions()); + chr.announce(PacketCreator.enableActions()); return false; } break; case 128: // Dex if (!chr.assignDex(1)) { chr.message("Couldn't execute AP assign operation."); - chr.announce(MaplePacketCreator.enableActions()); + chr.announce(PacketCreator.enableActions()); return false; } break; case 256: // Int if (!chr.assignInt(1)) { chr.message("Couldn't execute AP assign operation."); - chr.announce(MaplePacketCreator.enableActions()); + chr.announce(PacketCreator.enableActions()); return false; } break; case 512: // Luk if (!chr.assignLuk(1)) { chr.message("Couldn't execute AP assign operation."); - chr.announce(MaplePacketCreator.enableActions()); + chr.announce(PacketCreator.enableActions()); return false; } break; case 2048: if (!chr.assignHP(calcHpChange(chr, usedAPReset), 1)) { chr.message("Couldn't execute AP assign operation."); - chr.announce(MaplePacketCreator.enableActions()); + chr.announce(PacketCreator.enableActions()); return false; } break; case 8192: if (!chr.assignMP(calcMpChange(chr, usedAPReset), 1)) { chr.message("Couldn't execute AP assign operation."); - chr.announce(MaplePacketCreator.enableActions()); + chr.announce(PacketCreator.enableActions()); return false; } break; default: - chr.announce(MaplePacketCreator.updatePlayerStats(MaplePacketCreator.EMPTY_STATUPDATE, true, chr)); + chr.announce(PacketCreator.updatePlayerStats(PacketCreator.EMPTY_STATUPDATE, true, chr)); return false; } return true; diff --git a/src/main/java/client/processor/stat/AssignSPProcessor.java b/src/main/java/client/processor/stat/AssignSPProcessor.java index f6f18cfaa6..349b5ef244 100644 --- a/src/main/java/client/processor/stat/AssignSPProcessor.java +++ b/src/main/java/client/processor/stat/AssignSPProcessor.java @@ -31,7 +31,7 @@ import client.autoban.AutobanFactory; import constants.game.GameConstants; import constants.skills.Aran; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; /** * @@ -41,7 +41,7 @@ public class AssignSPProcessor { public static boolean canSPAssign(MapleClient c, int skillid) { if (skillid == Aran.HIDDEN_FULL_DOUBLE || skillid == Aran.HIDDEN_FULL_TRIPLE || skillid == Aran.HIDDEN_OVER_DOUBLE || skillid == Aran.HIDDEN_OVER_TRIPLE) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } @@ -82,7 +82,7 @@ public class AssignSPProcessor { if (!isBeginnerSkill) { player.gainSp(-1, GameConstants.getSkillBook(skillid/10000), false); } else { - player.announce(MaplePacketCreator.enableActions()); + player.announce(PacketCreator.enableActions()); } if (skill.getId() == Aran.FULL_SWING) { player.changeSkillLevel(skill, (byte) (curLevel + 1), player.getMasterLevel(skill), player.getSkillExpiration(skill)); diff --git a/src/main/java/net/netty/ServerChannelInitializer.java b/src/main/java/net/netty/ServerChannelInitializer.java index 9e520f593d..e18f78e754 100644 --- a/src/main/java/net/netty/ServerChannelInitializer.java +++ b/src/main/java/net/netty/ServerChannelInitializer.java @@ -18,7 +18,7 @@ import net.packet.logging.OutPacketLogger; import net.server.coordinator.session.IpAddresses; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.net.InetSocketAddress; import java.util.concurrent.atomic.AtomicLong; @@ -54,7 +54,7 @@ public abstract class ServerChannelInitializer extends ChannelInitializer 0) { // be sure to only use LIMITED ATTACKS with animation time here TimerManager.getInstance().schedule(() -> { - map.broadcastMessage(MaplePacketCreator.damageMonster(monster.getObjectId(), damage), monster.getPosition()); + map.broadcastMessage(PacketCreator.damageMonster(monster.getObjectId(), damage), monster.getPosition()); map.damageMonster(attacker, monster, damage); }, animationTime); } else { - map.broadcastMessage(MaplePacketCreator.damageMonster(monster.getObjectId(), damage), monster.getPosition()); + map.broadcastMessage(PacketCreator.damageMonster(monster.getObjectId(), damage), monster.getPosition()); map.damageMonster(attacker, monster, damage); } } diff --git a/src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java b/src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java index a0babdf6bd..625d509966 100644 --- a/src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java +++ b/src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java @@ -21,16 +21,11 @@ */ package net.server.channel.handlers; -import config.YamlConfig; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - import client.MapleCharacter; import client.MapleClient; import client.MapleFamily; import client.MapleFamilyEntry; +import config.YamlConfig; import net.AbstractMaplePacketHandler; import net.server.coordinator.world.MapleInviteCoordinator; import net.server.coordinator.world.MapleInviteCoordinator.InviteResult; @@ -38,9 +33,13 @@ import net.server.coordinator.world.MapleInviteCoordinator.InviteType; import net.server.coordinator.world.MapleInviteCoordinator.MapleInviteResult; import tools.DatabaseConnection; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; + /** * * @author Jay Estrella @@ -68,7 +67,7 @@ public final class AcceptFamilyHandler extends AbstractMaplePacketHandler { MapleFamilyEntry newEntry = new MapleFamilyEntry(inviter.getFamily(), chr.getId(), chr.getName(), chr.getLevel(), chr.getJob()); newEntry.setCharacter(chr); if(!newEntry.setSenior(inviter.getFamilyEntry(), true)) { - inviter.announce(MaplePacketCreator.sendFamilyMessage(1, 0)); + inviter.announce(PacketCreator.sendFamilyMessage(1, 0)); return; } else { // save @@ -82,15 +81,15 @@ public final class AcceptFamilyHandler extends AbstractMaplePacketHandler { if(inviter.getFamily().getTotalGenerations() + targetFamily.getTotalGenerations() <= YamlConfig.config.server.FAMILY_MAX_GENERATIONS) { targetEntry.join(inviter.getFamilyEntry()); } else { - inviter.announce(MaplePacketCreator.sendFamilyMessage(76, 0)); - chr.announce(MaplePacketCreator.sendFamilyMessage(76, 0)); + inviter.announce(PacketCreator.sendFamilyMessage(76, 0)); + chr.announce(PacketCreator.sendFamilyMessage(76, 0)); return; } } } else { // create new family if(chr.getFamily() != null && inviter.getFamily() != null && chr.getFamily().getTotalGenerations() + inviter.getFamily().getTotalGenerations() >= YamlConfig.config.server.FAMILY_MAX_GENERATIONS) { - inviter.announce(MaplePacketCreator.sendFamilyMessage(76, 0)); - chr.announce(MaplePacketCreator.sendFamilyMessage(76, 0)); + inviter.announce(PacketCreator.sendFamilyMessage(76, 0)); + chr.announce(PacketCreator.sendFamilyMessage(76, 0)); return; } MapleFamily newFamily = new MapleFamily(-1, c.getWorld()); @@ -113,15 +112,15 @@ public final class AcceptFamilyHandler extends AbstractMaplePacketHandler { chr.getFamilyEntry().join(inviterEntry); } } - c.getPlayer().getFamily().broadcast(MaplePacketCreator.sendFamilyJoinResponse(true, c.getPlayer().getName()), c.getPlayer().getId()); - c.announce(MaplePacketCreator.getSeniorMessage(inviter.getName())); - c.announce(MaplePacketCreator.getFamilyInfo(chr.getFamilyEntry())); + c.getPlayer().getFamily().broadcast(PacketCreator.sendFamilyJoinResponse(true, c.getPlayer().getName()), c.getPlayer().getId()); + c.announce(PacketCreator.getSeniorMessage(inviter.getName())); + c.announce(PacketCreator.getFamilyInfo(chr.getFamilyEntry())); chr.getFamilyEntry().updateSeniorFamilyInfo(true); } else { - inviter.announce(MaplePacketCreator.sendFamilyJoinResponse(false, c.getPlayer().getName())); + inviter.announce(PacketCreator.sendFamilyJoinResponse(false, c.getPlayer().getName())); } } - c.announce(MaplePacketCreator.sendFamilyMessage(0, 0)); + c.announce(PacketCreator.sendFamilyMessage(0, 0)); } private static void insertNewFamilyRecord(int characterID, int familyID, int seniorID, boolean updateChar) { diff --git a/src/main/java/net/server/channel/handlers/AdminChatHandler.java b/src/main/java/net/server/channel/handlers/AdminChatHandler.java index 40acfc9259..0ebfa825d6 100644 --- a/src/main/java/net/server/channel/handlers/AdminChatHandler.java +++ b/src/main/java/net/server/channel/handlers/AdminChatHandler.java @@ -4,7 +4,7 @@ import client.MapleClient; import config.YamlConfig; import net.AbstractMaplePacketHandler; import tools.LogHelper; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -21,7 +21,7 @@ public class AdminChatHandler extends AbstractMaplePacketHandler { byte mode = slea.readByte(); //not saving slides... String message = slea.readMapleAsciiString(); - byte[] packet = MaplePacketCreator.serverNotice(slea.readByte(), message);//maybe I should make a check for the slea.readByte()... but I just hope gm's don't fuck things up :) + byte[] packet = PacketCreator.serverNotice(slea.readByte(), message);//maybe I should make a check for the slea.readByte()... but I just hope gm's don't fuck things up :) switch (mode) { case 0:// /alertall, /noticeall, /slideall c.getWorldServer().broadcastPacket(packet); diff --git a/src/main/java/net/server/channel/handlers/AdminCommandHandler.java b/src/main/java/net/server/channel/handlers/AdminCommandHandler.java index 9c8b80a88a..625c2662b1 100644 --- a/src/main/java/net/server/channel/handlers/AdminCommandHandler.java +++ b/src/main/java/net/server/channel/handlers/AdminCommandHandler.java @@ -33,7 +33,7 @@ import server.life.MapleMonster; import server.maps.MapleMapObject; import server.maps.MapleMapObjectType; import server.quest.MapleQuest; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Randomizer; import tools.data.input.SeekableLittleEndianAccessor; @@ -58,7 +58,7 @@ public final class AdminCommandHandler extends AbstractMaplePacketHandler { c.getPlayer().getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(toSpawnChild[0]), c.getPlayer().getPosition()); } } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); break; case 0x01: { // /d (inv) byte type = slea.readByte(); @@ -94,11 +94,11 @@ public final class AdminCommandHandler extends AbstractMaplePacketHandler { target.block(type, duration, description); target.sendPolice(duration, reason, 6000); } - c.announce(MaplePacketCreator.getGMEffect(4, (byte) 0)); + c.announce(PacketCreator.getGMEffect(4, (byte) 0)); } else if (MapleCharacter.ban(victim, reason, false)) { - c.announce(MaplePacketCreator.getGMEffect(4, (byte) 0)); + c.announce(PacketCreator.getGMEffect(4, (byte) 0)); } else { - c.announce(MaplePacketCreator.getGMEffect(6, (byte) 1)); + c.announce(PacketCreator.getGMEffect(6, (byte) 1)); } break; case 0x10: // /h, information added by vana -- ... hide ofcourse @@ -160,10 +160,10 @@ public final class AdminCommandHandler extends AbstractMaplePacketHandler { String message = slea.readMapleAsciiString(); target = c.getChannelServer().getPlayerStorage().getCharacterByName(victim); if (target != null) { - target.getClient().announce(MaplePacketCreator.serverNotice(1, message)); - c.announce(MaplePacketCreator.getGMEffect(0x1E, (byte) 1)); + target.getClient().announce(PacketCreator.serverNotice(1, message)); + c.announce(PacketCreator.getGMEffect(0x1E, (byte) 1)); } else { - c.announce(MaplePacketCreator.getGMEffect(0x1E, (byte) 0)); + c.announce(PacketCreator.getGMEffect(0x1E, (byte) 0)); } break; case 0x24:// /Artifact Ranking diff --git a/src/main/java/net/server/channel/handlers/AllianceOperationHandler.java b/src/main/java/net/server/channel/handlers/AllianceOperationHandler.java index c450f5eae4..8bfac3ff80 100644 --- a/src/main/java/net/server/channel/handlers/AllianceOperationHandler.java +++ b/src/main/java/net/server/channel/handlers/AllianceOperationHandler.java @@ -29,7 +29,7 @@ import net.server.Server; import net.server.guild.MapleAlliance; import net.server.guild.MapleGuild; import net.server.guild.MapleGuildCharacter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import tools.data.output.MaplePacketLittleEndianWriter; @@ -45,7 +45,7 @@ public final class AllianceOperationHandler extends AbstractMaplePacketHandler { MapleCharacter chr = c.getPlayer(); if (chr.getGuild() == null) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -56,18 +56,18 @@ public final class AllianceOperationHandler extends AbstractMaplePacketHandler { byte b = slea.readByte(); if (alliance == null) { if (b != 4) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } } else { if (b == 4) { chr.dropMessage(5, "Your guild is already registered on a guild alliance."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } if (chr.getMGC().getAllianceRank() > 2 || !alliance.getGuilds().contains(chr.getGuildId())) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } } @@ -131,9 +131,9 @@ public final class AllianceOperationHandler extends AbstractMaplePacketHandler { chr.saveGuildStatus(); - Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.addGuildToAlliance(alliance, guildid, c), -1, -1); - Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.updateAllianceInfo(alliance, c.getWorld()), -1, -1); - Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.allianceNotice(alliance.getId(), alliance.getNotice()), -1, -1); + Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.addGuildToAlliance(alliance, guildid, c), -1, -1); + Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.updateAllianceInfo(alliance, c.getWorld()), -1, -1); + Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.allianceNotice(alliance.getId(), alliance.getNotice()), -1, -1); guild.dropMessage("Your guild has joined the [" + alliance.getName() + "] union."); break; @@ -145,12 +145,12 @@ public final class AllianceOperationHandler extends AbstractMaplePacketHandler { return; } - Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.removeGuildFromAlliance(alliance, guildid, c.getWorld()), -1, -1); + Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.removeGuildFromAlliance(alliance, guildid, c.getWorld()), -1, -1); Server.getInstance().removeGuildFromAlliance(alliance.getId(), guildid); - Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.getGuildAlliances(alliance, c.getWorld()), -1, -1); - Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.allianceNotice(alliance.getId(), alliance.getNotice()), -1, -1); - Server.getInstance().guildMessage(guildid, MaplePacketCreator.disbandAlliance(allianceid)); + Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.getGuildAlliances(alliance, c.getWorld()), -1, -1); + Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.allianceNotice(alliance.getId(), alliance.getNotice()), -1, -1); + Server.getInstance().guildMessage(guildid, PacketCreator.disbandAlliance(allianceid)); alliance.dropMessage("[" + Server.getInstance().getGuild(guildid).getName() + "] guild has been expelled from the union."); break; @@ -175,7 +175,7 @@ public final class AllianceOperationHandler extends AbstractMaplePacketHandler { ranks[i] = slea.readMapleAsciiString(); } Server.getInstance().setAllianceRanks(alliance.getId(), ranks); - Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.changeAllianceRankTitle(alliance.getId(), ranks), -1, -1); + Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.changeAllianceRankTitle(alliance.getId(), ranks), -1, -1); break; case 0x09: { int int1 = slea.readInt(); @@ -190,7 +190,7 @@ public final class AllianceOperationHandler extends AbstractMaplePacketHandler { case 0x0A: String notice = slea.readMapleAsciiString(); Server.getInstance().setAllianceNotice(alliance.getId(), notice); - Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.allianceNotice(alliance.getId(), notice), -1, -1); + Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.allianceNotice(alliance.getId(), notice), -1, -1); alliance.dropMessage(5, "* Alliance Notice : " + notice); break; @@ -210,7 +210,7 @@ public final class AllianceOperationHandler extends AbstractMaplePacketHandler { newLeader.getMGC().setAllianceRank(1); newLeader.saveGuildStatus(); - Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.getGuildAlliances(alliance, newLeader.getWorld()), -1, -1); + Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.getGuildAlliances(alliance, newLeader.getWorld()), -1, -1); alliance.dropMessage("'" + newLeader.getName() + "' has been appointed as the new head of this Alliance."); } @@ -221,7 +221,7 @@ public final class AllianceOperationHandler extends AbstractMaplePacketHandler { chr.getMGC().setAllianceRank(newRank); chr.saveGuildStatus(); - Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.getGuildAlliances(alliance, chr.getWorld()), -1, -1); + Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.getGuildAlliances(alliance, chr.getWorld()), -1, -1); alliance.dropMessage("'" + chr.getName() + "' has been reassigned to '" + alliance.getRankTitle(newRank) + "' in this Alliance."); } diff --git a/src/main/java/net/server/channel/handlers/BBSOperationHandler.java b/src/main/java/net/server/channel/handlers/BBSOperationHandler.java index 83682555b0..d6e857cd31 100644 --- a/src/main/java/net/server/channel/handlers/BBSOperationHandler.java +++ b/src/main/java/net/server/channel/handlers/BBSOperationHandler.java @@ -25,7 +25,7 @@ import client.MapleCharacter; import client.MapleClient; import net.AbstractMaplePacketHandler; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import java.sql.Connection; @@ -103,7 +103,7 @@ public final class BBSOperationHandler extends AbstractMaplePacketHandler { ps.setInt(1, c.getPlayer().getGuildId()); try (ResultSet rs = ps.executeQuery()) { - c.announce(MaplePacketCreator.BBSThreadList(rs, start)); + c.announce(PacketCreator.BBSThreadList(rs, start)); } } catch (SQLException se) { se.printStackTrace(); @@ -317,7 +317,7 @@ public final class BBSOperationHandler extends AbstractMaplePacketHandler { ps2.setInt(1, !bIsThreadIdLocal ? threadid : threadRS.getInt("threadid")); repliesRS = ps2.executeQuery(); } - client.announce(MaplePacketCreator.showThread(bIsThreadIdLocal ? threadid : threadRS.getInt("localthreadid"), threadRS, repliesRS)); + client.announce(PacketCreator.showThread(bIsThreadIdLocal ? threadid : threadRS.getInt("localthreadid"), threadRS, repliesRS)); repliesRS.close(); } if (ps2 != null) { diff --git a/src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java b/src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java index b0633904a8..37a1c5b33d 100644 --- a/src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java +++ b/src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java @@ -21,23 +21,21 @@ */ package net.server.channel.handlers; -import client.BuddyList; +import client.*; import client.BuddyList.BuddyAddResult; import client.BuddyList.BuddyOperation; -import static client.BuddyList.BuddyOperation.ADDED; -import client.BuddylistEntry; -import client.CharacterNameAndId; -import client.MapleCharacter; -import client.MapleClient; +import net.AbstractMaplePacketHandler; +import net.server.world.World; +import tools.DatabaseConnection; +import tools.PacketCreator; +import tools.data.input.SeekableLittleEndianAccessor; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import net.AbstractMaplePacketHandler; -import net.server.world.World; -import tools.DatabaseConnection; -import tools.MaplePacketCreator; -import tools.data.input.SeekableLittleEndianAccessor; + +import static client.BuddyList.BuddyOperation.ADDED; public class BuddylistModifyHandler extends AbstractMaplePacketHandler { private static class CharacterIdNameBuddyCapacity extends CharacterNameAndId { @@ -56,7 +54,7 @@ public class BuddylistModifyHandler extends AbstractMaplePacketHandler { private void nextPendingRequest(MapleClient c) { CharacterNameAndId pendingBuddyRequest = c.getPlayer().getBuddylist().pollPendingRequest(); if (pendingBuddyRequest != null) { - c.announce(MaplePacketCreator.requestBuddylistAdd(pendingBuddyRequest.getId(), c.getPlayer().getId(), pendingBuddyRequest.getName())); + c.announce(PacketCreator.requestBuddylistAdd(pendingBuddyRequest.getId(), c.getPlayer().getId(), pendingBuddyRequest.getName())); } } @@ -90,9 +88,9 @@ public class BuddylistModifyHandler extends AbstractMaplePacketHandler { } BuddylistEntry ble = buddylist.get(addName); if (ble != null && !ble.isVisible() && group.equals(ble.getGroup())) { - c.announce(MaplePacketCreator.serverNotice(1, "You already have \"" + ble.getName() + "\" on your Buddylist")); + c.announce(PacketCreator.serverNotice(1, "You already have \"" + ble.getName() + "\" on your Buddylist")); } else if (buddylist.isFull() && ble == null) { - c.announce(MaplePacketCreator.serverNotice(1, "Your buddylist is already full")); + c.announce(PacketCreator.serverNotice(1, "Your buddylist is already full")); } else if (ble == null) { try { World world = c.getWorldServer(); @@ -137,7 +135,7 @@ public class BuddylistModifyHandler extends AbstractMaplePacketHandler { } } if (buddyAddResult == BuddyAddResult.BUDDYLIST_FULL) { - c.announce(MaplePacketCreator.serverNotice(1, "\"" + addName + "\"'s Buddylist is full")); + c.announce(PacketCreator.serverNotice(1, "\"" + addName + "\"'s Buddylist is full")); } else { int displayChannel; displayChannel = -1; @@ -154,17 +152,17 @@ public class BuddylistModifyHandler extends AbstractMaplePacketHandler { } } buddylist.put(new BuddylistEntry(charWithId.getName(), group, otherCid, displayChannel, true)); - c.announce(MaplePacketCreator.updateBuddylist(buddylist.getBuddies())); + c.announce(PacketCreator.updateBuddylist(buddylist.getBuddies())); } } else { - c.announce(MaplePacketCreator.serverNotice(1, "A character called \"" + addName + "\" does not exist")); + c.announce(PacketCreator.serverNotice(1, "A character called \"" + addName + "\" does not exist")); } } catch (SQLException e) { e.printStackTrace(); } } else { ble.changeGroup(group); - c.announce(MaplePacketCreator.updateBuddylist(buddylist.getBuddies())); + c.announce(PacketCreator.updateBuddylist(buddylist.getBuddies())); } } else if (mode == 2) { // accept buddy int otherCid = slea.readInt(); @@ -189,7 +187,7 @@ public class BuddylistModifyHandler extends AbstractMaplePacketHandler { } if (otherName != null) { buddylist.put(new BuddylistEntry(otherName, "Default Group", otherCid, channel, true)); - c.announce(MaplePacketCreator.updateBuddylist(buddylist.getBuddies())); + c.announce(PacketCreator.updateBuddylist(buddylist.getBuddies())); notifyRemoteChannel(c, channel, otherCid, ADDED); } } catch (SQLException e) { diff --git a/src/main/java/net/server/channel/handlers/CancelBuffHandler.java b/src/main/java/net/server/channel/handlers/CancelBuffHandler.java index 69cda11d49..afd012632f 100644 --- a/src/main/java/net/server/channel/handlers/CancelBuffHandler.java +++ b/src/main/java/net/server/channel/handlers/CancelBuffHandler.java @@ -23,17 +23,10 @@ package net.server.channel.handlers; import client.MapleClient; import client.SkillFactory; -import constants.skills.Bishop; -import constants.skills.Bowmaster; -import constants.skills.Corsair; -import constants.skills.Evan; -import constants.skills.FPArchMage; -import constants.skills.ILArchMage; -import constants.skills.Marksman; -import constants.skills.WindArcher; +import constants.skills.*; import net.AbstractMaplePacketHandler; import net.MaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class CancelBuffHandler extends AbstractMaplePacketHandler implements MaplePacketHandler { @@ -52,7 +45,7 @@ public final class CancelBuffHandler extends AbstractMaplePacketHandler implemen case WindArcher.HURRICANE: case Evan.FIRE_BREATH: case Evan.ICE_BREATH: - c.getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.skillCancel(c.getPlayer(), sourceid), false); + c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.skillCancel(c.getPlayer(), sourceid), false); break; default: diff --git a/src/main/java/net/server/channel/handlers/CancelDebuffHandler.java b/src/main/java/net/server/channel/handlers/CancelDebuffHandler.java index 9611245c84..d7add270f3 100644 --- a/src/main/java/net/server/channel/handlers/CancelDebuffHandler.java +++ b/src/main/java/net/server/channel/handlers/CancelDebuffHandler.java @@ -35,8 +35,8 @@ public final class CancelDebuffHandler extends AbstractMaplePacketHandler {//TIP List disease_ = new ArrayList(); disease_.add(disease); diseases_.add(disease); - c.announce(MaplePacketCreator.cancelDebuff(disease_)); - c.getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.cancelForeignDebuff(c.getPlayer().getId(), disease_), false); + c.announce(PacketCreator.cancelDebuff(disease_)); + c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.cancelForeignDebuff(c.getPlayer().getId(), disease_), false); } for (MapleDisease disease : diseases_) { c.getPlayer().removeDisease(disease); diff --git a/src/main/java/net/server/channel/handlers/CashOperationHandler.java b/src/main/java/net/server/channel/handlers/CashOperationHandler.java index 39a56c61f0..50445dc656 100644 --- a/src/main/java/net/server/channel/handlers/CashOperationHandler.java +++ b/src/main/java/net/server/channel/handlers/CashOperationHandler.java @@ -28,24 +28,25 @@ import client.inventory.Equip; import client.inventory.Item; import client.inventory.MapleInventory; import client.inventory.MapleInventoryType; +import client.inventory.manipulator.MapleInventoryManipulator; import config.YamlConfig; import constants.inventory.ItemConstants; -import java.sql.SQLException; -import java.util.Calendar; -import java.util.List; -import java.util.Map; import net.AbstractMaplePacketHandler; import net.server.Server; import server.CashShop; import server.CashShop.CashItem; import server.CashShop.CashItemFactory; -import client.inventory.manipulator.MapleInventoryManipulator; import server.MapleItemInformationProvider; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.data.input.SeekableLittleEndianAccessor; +import java.sql.SQLException; +import java.util.Calendar; +import java.util.List; +import java.util.Map; + public final class CashOperationHandler extends AbstractMaplePacketHandler { @Override @@ -54,7 +55,7 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { CashShop cs = chr.getCashShop(); if (!cs.isOpened()) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -88,7 +89,7 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { Item item = cItem.toItem(); cs.gainCash(useNX, cItem, chr.getWorld()); // thanks Rohenn for noticing cash operations after item acquisition cs.addToInventory(item); - c.announce(MaplePacketCreator.showBoughtCashItem(item, c.getAccID())); + c.announce(PacketCreator.showBoughtCashItem(item, c.getAccID())); } else { // Package cs.gainCash(useNX, cItem, chr.getWorld()); @@ -96,9 +97,9 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { for (Item item : cashPackage) { cs.addToInventory(item); } - c.announce(MaplePacketCreator.showBoughtCashPackage(cashPackage, c.getAccID())); + c.announce(PacketCreator.showBoughtCashPackage(cashPackage, c.getAccID())); } - c.announce(MaplePacketCreator.showCash(chr)); + c.announce(PacketCreator.showCash(chr)); } else if (action == 0x04) {//TODO check for gender int birthday = slea.readInt(); CashItem cItem = CashItemFactory.getItem(slea.readInt()); @@ -109,19 +110,19 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { return; } if (!checkBirthday(c, birthday)) { - c.announce(MaplePacketCreator.showCashShopMessage((byte) 0xC4)); + c.announce(PacketCreator.showCashShopMessage((byte) 0xC4)); return; } else if (recipient == null) { - c.announce(MaplePacketCreator.showCashShopMessage((byte) 0xA9)); + c.announce(PacketCreator.showCashShopMessage((byte) 0xA9)); return; } else if (recipient.get("accountid").equals(String.valueOf(c.getAccID()))) { - c.announce(MaplePacketCreator.showCashShopMessage((byte) 0xA8)); + c.announce(PacketCreator.showCashShopMessage((byte) 0xA8)); return; } cs.gainCash(4, cItem, chr.getWorld()); cs.gift(Integer.parseInt(recipient.get("id")), chr.getName(), message, cItem.getSN()); - c.announce(MaplePacketCreator.showGiftSucceed(recipient.get("name"), cItem)); - c.announce(MaplePacketCreator.showCash(chr)); + c.announce(PacketCreator.showGiftSucceed(recipient.get("name"), cItem)); + c.announce(PacketCreator.showCash(chr)); try { chr.sendNote(recipient.get("name"), chr.getName() + " has sent you a gift! Go check out the Cash Shop.", (byte) 0); //fame or not } catch (SQLException ex) { @@ -138,7 +139,7 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { cs.addToWishList(sn); } } - c.announce(MaplePacketCreator.showWishList(chr, true)); + c.announce(PacketCreator.showWishList(chr, true)); } else if (action == 0x06) { // Increase Inventory Slots slea.skip(1); int cash = slea.readInt(); @@ -156,8 +157,8 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { } cs.gainCash(cash, -4000); if (chr.gainSlots(type, qty, false)) { - c.announce(MaplePacketCreator.showBoughtInventorySlots(type, chr.getSlots(type))); - c.announce(MaplePacketCreator.showCash(chr)); + c.announce(PacketCreator.showBoughtInventorySlots(type, chr.getSlots(type))); + c.announce(PacketCreator.showCash(chr)); } else { FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add " + qty + " slots of type " + type + " for player " + MapleCharacter.makeMapleReadable(chr.getName())); } @@ -175,8 +176,8 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { } cs.gainCash(cash, cItem, chr.getWorld()); if (chr.gainSlots(type, qty, false)) { - c.announce(MaplePacketCreator.showBoughtInventorySlots(type, chr.getSlots(type))); - c.announce(MaplePacketCreator.showCash(chr)); + c.announce(PacketCreator.showBoughtInventorySlots(type, chr.getSlots(type))); + c.announce(PacketCreator.showCash(chr)); } else { FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add " + qty + " slots of type " + type + " for player " + MapleCharacter.makeMapleReadable(chr.getName())); } @@ -200,8 +201,8 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { FilePrinter.print(FilePrinter.STORAGE + c.getAccountName() + ".txt", c.getPlayer().getName() + " bought " + qty + " slots to their account storage."); chr.setUsedStorage(); - c.announce(MaplePacketCreator.showBoughtStorageSlots(chr.getStorage().getSlots())); - c.announce(MaplePacketCreator.showCash(chr)); + c.announce(PacketCreator.showBoughtStorageSlots(chr.getStorage().getSlots())); + c.announce(PacketCreator.showCash(chr)); } else { FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add " + qty + " slots to " + MapleCharacter.makeMapleReadable(chr.getName()) + "'s account."); } @@ -222,8 +223,8 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { FilePrinter.print(FilePrinter.STORAGE + c.getAccountName() + ".txt", c.getPlayer().getName() + " bought " + qty + " slots to their account storage."); chr.setUsedStorage(); - c.announce(MaplePacketCreator.showBoughtStorageSlots(chr.getStorage().getSlots())); - c.announce(MaplePacketCreator.showCash(chr)); + c.announce(PacketCreator.showBoughtStorageSlots(chr.getStorage().getSlots())); + c.announce(PacketCreator.showCash(chr)); } else { FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add " + qty + " slots to " + MapleCharacter.makeMapleReadable(chr.getName()) + "'s account."); } @@ -244,8 +245,8 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { } cs.gainCash(cash, cItem, chr.getWorld()); if (c.gainCharacterSlot()) { - c.announce(MaplePacketCreator.showBoughtCharacterSlot(c.getCharacterSlots())); - c.announce(MaplePacketCreator.showCash(chr)); + c.announce(PacketCreator.showBoughtCharacterSlot(c.getCharacterSlots())); + c.announce(PacketCreator.showCash(chr)); } else { FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add a character slot to " + MapleCharacter.makeMapleReadable(chr.getName()) + "'s account."); c.enableCSActions(); @@ -259,7 +260,7 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { } if (chr.getInventory(item.getInventoryType()).addItem(item) != -1) { cs.removeFromInventory(item); - c.announce(MaplePacketCreator.takeFromCashInventory(item)); + c.announce(PacketCreator.takeFromCashInventory(item)); if(item instanceof Equip) { Equip equip = (Equip) item; @@ -285,17 +286,17 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { c.enableCSActions(); return; } else if (c.getPlayer().getPetIndex(item.getPetId()) > -1) { - chr.getClient().announce(MaplePacketCreator.serverNotice(1, "You cannot put the pet you currently equip into the Cash Shop inventory.")); + chr.getClient().announce(PacketCreator.serverNotice(1, "You cannot put the pet you currently equip into the Cash Shop inventory.")); c.enableCSActions(); return; } else if (ItemConstants.isWeddingRing(item.getItemId()) || ItemConstants.isWeddingToken(item.getItemId())) { - chr.getClient().announce(MaplePacketCreator.serverNotice(1, "You cannot put relationship items into the Cash Shop inventory.")); + chr.getClient().announce(PacketCreator.serverNotice(1, "You cannot put relationship items into the Cash Shop inventory.")); c.enableCSActions(); return; } cs.addToInventory(item); mi.removeSlot(item.getPosition()); - c.announce(MaplePacketCreator.putIntoCashInventory(item, c.getAccID())); + c.announce(PacketCreator.putIntoCashInventory(item, c.getAccID())); } else if (action == 0x1D) { //crush ring (action 28) int birthday = slea.readInt(); if (checkBirthday(c, birthday)) { @@ -306,7 +307,7 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { CashItem itemRing = CashItemFactory.getItem(SN); MapleCharacter partner = c.getChannelServer().getPlayerStorage().getCharacterByName(recipientName); if (partner == null) { - chr.getClient().announce(MaplePacketCreator.serverNotice(1, "The partner you specified cannot be found.\r\nPlease make sure your partner is online and in the same channel.")); + chr.getClient().announce(PacketCreator.serverNotice(1, "The partner you specified cannot be found.\r\nPlease make sure your partner is online and in the same channel.")); } else { /* if (partner.getGender() == chr.getGender()) { @@ -320,7 +321,7 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { Pair rings = MapleRing.createRing(itemRing.getItemId(), chr, partner); eqp.setRingId(rings.getLeft()); cs.addToInventory(eqp); - c.announce(MaplePacketCreator.showBoughtCashItem(eqp, c.getAccID())); + c.announce(PacketCreator.showBoughtCashItem(eqp, c.getAccID())); cs.gainCash(toCharge, itemRing, chr.getWorld()); cs.gift(partner.getId(), chr.getName(), text, eqp.getSN(), rings.getRight()); chr.addCrushRing(MapleRing.loadFromDb(rings.getLeft())); @@ -333,27 +334,27 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { } } } else { - c.announce(MaplePacketCreator.showCashShopMessage((byte) 0xC4)); + c.announce(PacketCreator.showCashShopMessage((byte) 0xC4)); } - c.announce(MaplePacketCreator.showCash(c.getPlayer())); + c.announce(PacketCreator.showCash(c.getPlayer())); } else if (action == 0x20) { int serialNumber = slea.readInt(); // thanks GabrielSin for detecting a potential exploit with 1 meso cash items. if (serialNumber / 10000000 != 8) { - c.announce(MaplePacketCreator.showCashShopMessage((byte) 0xC0)); + c.announce(PacketCreator.showCashShopMessage((byte) 0xC0)); return; } CashItem item = CashItemFactory.getItem(serialNumber); if (item == null || !item.isOnSale()) { - c.announce(MaplePacketCreator.showCashShopMessage((byte) 0xC0)); + c.announce(PacketCreator.showCashShopMessage((byte) 0xC0)); return; } int itemId = item.getItemId(); int itemPrice = item.getPrice(); if (itemPrice <= 0) { - c.announce(MaplePacketCreator.showCashShopMessage((byte) 0xC0)); + c.announce(PacketCreator.showCashShopMessage((byte) 0xC0)); return; } @@ -361,10 +362,10 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { if (chr.canHold(itemId)) { chr.gainMeso(-itemPrice, false); MapleInventoryManipulator.addById(c, itemId, (short) 1, "", -1); - c.announce(MaplePacketCreator.showBoughtQuestItem(itemId)); + c.announce(PacketCreator.showBoughtQuestItem(itemId)); } } - c.announce(MaplePacketCreator.showCash(c.getPlayer())); + c.announce(PacketCreator.showCash(c.getPlayer())); } else if (action == 0x23) { //Friendship :3 int birthday = slea.readInt(); if (checkBirthday(c, birthday)) { @@ -378,7 +379,7 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { slea.readByte(); MapleCharacter partner = c.getChannelServer().getPlayerStorage().getCharacterByName(sentTo); if (partner == null) { - c.announce(MaplePacketCreator.showCashShopMessage((byte)0xBE)); + c.announce(PacketCreator.showCashShopMessage((byte)0xBE)); } else { // Need to check to make sure its actually an equip and the right SN... if(itemRing.toItem() instanceof Equip) { @@ -386,7 +387,7 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { Pair rings = MapleRing.createRing(itemRing.getItemId(), chr, partner); eqp.setRingId(rings.getLeft()); cs.addToInventory(eqp); - c.announce(MaplePacketCreator.showBoughtCashRing(eqp, partner.getName(), c.getAccID())); + c.announce(PacketCreator.showBoughtCashRing(eqp, partner.getName(), c.getAccID())); cs.gainCash(payment, -itemRing.getPrice()); cs.gift(partner.getId(), chr.getName(), text, eqp.getSN(), rings.getRight()); chr.addFriendshipRing(MapleRing.loadFromDb(rings.getLeft())); @@ -399,14 +400,14 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { } } } else { - c.announce(MaplePacketCreator.showCashShopMessage((byte) 0xC4)); + c.announce(PacketCreator.showCashShopMessage((byte) 0xC4)); } - c.announce(MaplePacketCreator.showCash(c.getPlayer())); + c.announce(PacketCreator.showCash(c.getPlayer())); } else if (action == 0x2E) { //name change CashItem cItem = CashItemFactory.getItem(slea.readInt()); if (cItem == null || !canBuy(chr, cItem, cs.getCash(4))) { - c.announce(MaplePacketCreator.showCashShopMessage((byte)0)); + c.announce(PacketCreator.showCashShopMessage((byte)0)); c.enableCSActions(); return; } @@ -414,28 +415,28 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { slea.readMapleAsciiString(); //old name String newName = slea.readMapleAsciiString(); if(!MapleCharacter.canCreateChar(newName) || chr.getLevel() < 10) { //(longest ban duration isn't tracked currently) - c.announce(MaplePacketCreator.showCashShopMessage((byte)0)); + c.announce(PacketCreator.showCashShopMessage((byte)0)); c.enableCSActions(); return; } else if(c.getTempBanCalendar() != null && c.getTempBanCalendar().getTimeInMillis() + (30*24*60*60*1000) > Calendar.getInstance().getTimeInMillis()) { - c.announce(MaplePacketCreator.showCashShopMessage((byte)0)); + c.announce(PacketCreator.showCashShopMessage((byte)0)); c.enableCSActions(); return; } if(chr.registerNameChange(newName)) { //success Item item = cItem.toItem(); - c.announce(MaplePacketCreator.showNameChangeSuccess(item, c.getAccID())); + c.announce(PacketCreator.showNameChangeSuccess(item, c.getAccID())); cs.gainCash(4, cItem, chr.getWorld()); cs.addToInventory(item); } else { - c.announce(MaplePacketCreator.showCashShopMessage((byte)0)); + c.announce(PacketCreator.showCashShopMessage((byte)0)); } } c.enableCSActions(); } else if(action == 0x31) { //world transfer CashItem cItem = CashItemFactory.getItem(slea.readInt()); if (cItem == null || !canBuy(chr, cItem, cs.getCash(4))) { - c.announce(MaplePacketCreator.showCashShopMessage((byte)0)); + c.announce(PacketCreator.showCashShopMessage((byte)0)); c.enableCSActions(); return; } @@ -444,21 +445,21 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { int worldTransferError = chr.checkWorldTransferEligibility(); if(worldTransferError != 0 || newWorldSelection >= Server.getInstance().getWorldsSize() || Server.getInstance().getWorldsSize() <= 1) { - c.announce(MaplePacketCreator.showCashShopMessage((byte)0)); + c.announce(PacketCreator.showCashShopMessage((byte)0)); return; } else if(newWorldSelection == c.getWorld()) { - c.announce(MaplePacketCreator.showCashShopMessage((byte)0xDC)); + c.announce(PacketCreator.showCashShopMessage((byte)0xDC)); return; } else if(c.getAvailableCharacterWorldSlots(newWorldSelection) < 1 || Server.getInstance().getAccountWorldCharacterCount(c.getAccID(), newWorldSelection) >= 3) { - c.announce(MaplePacketCreator.showCashShopMessage((byte)0xDF)); + c.announce(PacketCreator.showCashShopMessage((byte)0xDF)); return; } else if(chr.registerWorldTransfer(newWorldSelection)) { Item item = cItem.toItem(); - c.announce(MaplePacketCreator.showWorldTransferSuccess(item, c.getAccID())); + c.announce(PacketCreator.showWorldTransferSuccess(item, c.getAccID())); cs.gainCash(4, cItem, chr.getWorld()); cs.addToInventory(item); } else { - c.announce(MaplePacketCreator.showCashShopMessage((byte)0)); + c.announce(PacketCreator.showCashShopMessage((byte)0)); } } c.enableCSActions(); @@ -469,7 +470,7 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler { c.releaseClient(); } } else { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } diff --git a/src/main/java/net/server/channel/handlers/CashShopSurpriseHandler.java b/src/main/java/net/server/channel/handlers/CashShopSurpriseHandler.java index f5df6a4699..f7374def7f 100644 --- a/src/main/java/net/server/channel/handlers/CashShopSurpriseHandler.java +++ b/src/main/java/net/server/channel/handlers/CashShopSurpriseHandler.java @@ -23,9 +23,9 @@ import client.MapleClient; import client.inventory.Item; import net.AbstractMaplePacketHandler; import server.CashShop; -import tools.data.input.SeekableLittleEndianAccessor; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; +import tools.data.input.SeekableLittleEndianAccessor; /** * @@ -41,9 +41,9 @@ public class CashShopSurpriseHandler extends AbstractMaplePacketHandler { if(cssResult != null) { Item cssItem = cssResult.getLeft(), cssBox = cssResult.getRight(); - c.announce(MaplePacketCreator.onCashGachaponOpenSuccess(c.getAccID(), cssBox.getSN(), cssBox.getQuantity(), cssItem, cssItem.getItemId(), cssItem.getQuantity(), true)); + c.announce(PacketCreator.onCashGachaponOpenSuccess(c.getAccID(), cssBox.getSN(), cssBox.getQuantity(), cssItem, cssItem.getItemId(), cssItem.getQuantity(), true)); } else { - c.announce(MaplePacketCreator.onCashItemGachaponOpenFailed()); + c.announce(PacketCreator.onCashItemGachaponOpenFailed()); } } } diff --git a/src/main/java/net/server/channel/handlers/ChangeMapHandler.java b/src/main/java/net/server/channel/handlers/ChangeMapHandler.java index 5ea0701d62..b10bd7b371 100644 --- a/src/main/java/net/server/channel/handlers/ChangeMapHandler.java +++ b/src/main/java/net/server/channel/handlers/ChangeMapHandler.java @@ -30,7 +30,7 @@ import server.MapleTrade; import server.maps.MapleMap; import server.maps.MaplePortal; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import java.awt.*; @@ -49,7 +49,7 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler { FilePrinter.printError(FilePrinter.PORTAL_STUCK + chr.getName() + ".txt", "Player " + chr.getName() + " got stuck when changing maps. Timestamp: " + Calendar.getInstance().getTime().toString() + " Last visited mapids: " + chr.getLastVisitedMapids()); } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } if (chr.getTrade() != null) { @@ -65,7 +65,7 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler { chr.setSessionTransitionState(); try { - c.announce(MaplePacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]))); + c.announce(PacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]))); } catch (UnknownHostException ex) { ex.printStackTrace(); } @@ -95,7 +95,7 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler { // thanks lucasziron (lziron) for showing revivePlayer() triggering by Wheel MapleInventoryManipulator.removeById(c, MapleInventoryType.CASH, 5510000, 1, true, false); - chr.announce(MaplePacketCreator.showWheelsLeft(chr.getItemQuantity(5510000, false))); + chr.announce(PacketCreator.showWheelsLeft(chr.getItemQuantity(5510000, false))); chr.updateHp(50); chr.changeMap(map, map.findClosestPlayerSpawnpoint(chr.getPosition())); @@ -121,8 +121,8 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler { } } else if (divi == 20100) { if (targetid == 104000000) { - c.announce(MaplePacketCreator.lockUI(false)); - c.announce(MaplePacketCreator.disableUI(false)); + c.announce(PacketCreator.lockUI(false)); + c.announce(PacketCreator.disableUI(false)); warp = true; } } else if (divi == 9130401) { // Only allow warp if player is already in Intro map, or else = hack @@ -151,8 +151,8 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler { } if (portal != null && !portal.getPortalStatus()) { - c.announce(MaplePacketCreator.blockedMessage(1)); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.blockedMessage(1)); + c.announce(PacketCreator.enableActions()); return; } @@ -164,13 +164,13 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler { if (portal != null) { if (portal.getPosition().distanceSq(chr.getPosition()) > 400000) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } portal.enterPortal(c); } else { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/net/server/channel/handlers/ChangeMapSpecialHandler.java b/src/main/java/net/server/channel/handlers/ChangeMapSpecialHandler.java index 1c1f6368df..796609abb9 100644 --- a/src/main/java/net/server/channel/handlers/ChangeMapSpecialHandler.java +++ b/src/main/java/net/server/channel/handlers/ChangeMapSpecialHandler.java @@ -23,10 +23,10 @@ package net.server.channel.handlers; import client.MapleClient; import net.AbstractMaplePacketHandler; -import server.maps.MaplePortal; import server.MapleTrade; import server.MapleTrade.TradeResult; -import tools.MaplePacketCreator; +import server.maps.MaplePortal; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class ChangeMapSpecialHandler extends AbstractMaplePacketHandler { @@ -37,11 +37,11 @@ public final class ChangeMapSpecialHandler extends AbstractMaplePacketHandler { slea.readShort(); MaplePortal portal = c.getPlayer().getMap().getPortal(startwp); if (portal == null || c.getPlayer().portalDelay() > currentServerTime() || c.getPlayer().getBlockedPortals().contains(portal.getScriptName())) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } if (c.getPlayer().isChangingMaps() || c.getPlayer().isBanned()) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } if (c.getPlayer().getTrade() != null) { diff --git a/src/main/java/net/server/channel/handlers/CharInfoRequestHandler.java b/src/main/java/net/server/channel/handlers/CharInfoRequestHandler.java index 6454a9e256..ad1bc1ad8a 100644 --- a/src/main/java/net/server/channel/handlers/CharInfoRequestHandler.java +++ b/src/main/java/net/server/channel/handlers/CharInfoRequestHandler.java @@ -25,7 +25,7 @@ import client.MapleCharacter; import client.MapleClient; import net.AbstractMaplePacketHandler; import server.maps.MapleMapObject; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class CharInfoRequestHandler extends AbstractMaplePacketHandler { @@ -42,7 +42,7 @@ public final class CharInfoRequestHandler extends AbstractMaplePacketHandler { if(c.getPlayer().getId() != player.getId()) { player.exportExcludedItems(c); } - c.announce(MaplePacketCreator.charInfo(player)); + c.announce(PacketCreator.charInfo(player)); } } } diff --git a/src/main/java/net/server/channel/handlers/CloseChalkboardHandler.java b/src/main/java/net/server/channel/handlers/CloseChalkboardHandler.java index 497660d247..797eba7a8d 100644 --- a/src/main/java/net/server/channel/handlers/CloseChalkboardHandler.java +++ b/src/main/java/net/server/channel/handlers/CloseChalkboardHandler.java @@ -23,7 +23,7 @@ package net.server.channel.handlers; import client.MapleClient; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -35,6 +35,6 @@ public final class CloseChalkboardHandler extends AbstractMaplePacketHandler { @Override public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { c.getPlayer().setChalkboard(null); - c.getPlayer().getMap().broadcastMessage(MaplePacketCreator.useChalkboard(c.getPlayer(), true)); + c.getPlayer().getMap().broadcastMessage(PacketCreator.useChalkboard(c.getPlayer(), true)); } } diff --git a/src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java b/src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java index 2d681567ce..da71d9b818 100644 --- a/src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java @@ -26,7 +26,7 @@ import config.YamlConfig; import constants.game.GameConstants; import constants.skills.*; import server.MapleStatEffect; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.data.input.SeekableLittleEndianAccessor; @@ -59,10 +59,10 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler { return; if (GameConstants.isDojo(chr.getMap().getId()) && attack.numAttacked > 0) { chr.setDojoEnergy(chr.getDojoEnergy() + YamlConfig.config.server.DOJO_ENERGY_ATK); - c.announce(MaplePacketCreator.getEnergy("energy", chr.getDojoEnergy())); + c.announce(PacketCreator.getEnergy("energy", chr.getDojoEnergy())); } - chr.getMap().broadcastMessage(chr, MaplePacketCreator.closeRangeAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, attack.allDamage, attack.speed, attack.direction, attack.display), false, true); + chr.getMap().broadcastMessage(chr, PacketCreator.closeRangeAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, attack.allDamage, attack.speed, attack.direction, attack.display), false, true); int numFinisherOrbs = 0; Integer comboBuff = chr.getBuffedValue(MapleBuffStat.COMBO); if (GameConstants.isFinisherSkill(attack.skill)) { @@ -104,8 +104,8 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler { List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.COMBO, neworbcount)); chr.setBuffedValue(MapleBuffStat.COMBO, neworbcount); duration -= (int) (currentServerTime() - chr.getBuffedStarttime(MapleBuffStat.COMBO)); - c.announce(MaplePacketCreator.giveBuff(oid, duration, stat)); - chr.getMap().broadcastMessage(chr, MaplePacketCreator.giveForeignBuff(chr.getId(), stat), false); + c.announce(PacketCreator.giveBuff(oid, duration, stat)); + chr.getMap().broadcastMessage(chr, PacketCreator.giveForeignBuff(chr.getId(), stat), false); } } } else if (chr.getSkillLevel(chr.isCygnus() ? SkillFactory.getSkill(15100004) : SkillFactory.getSkill(5110001)) > 0 && (chr.getJob().isA(MapleJob.MARAUDER) || chr.getJob().isA(MapleJob.THUNDERBREAKER2))) { @@ -146,8 +146,8 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler { } chr.setDojoEnergy(0); - c.announce(MaplePacketCreator.getEnergy("energy", chr.getDojoEnergy())); - c.announce(MaplePacketCreator.serverNotice(5, "As you used the secret skill, your energy bar has been reset.")); + c.announce(PacketCreator.getEnergy("energy", chr.getDojoEnergy())); + c.announce(PacketCreator.serverNotice(5, "As you used the secret skill, your energy bar has been reset.")); } else if (attack.skill > 0) { Skill skill = SkillFactory.getSkill(attack.skill); MapleStatEffect effect_ = skill.getEffect(chr.getSkillLevel(skill)); @@ -155,7 +155,7 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler { if (chr.skillIsCooling(attack.skill)) { return; } else { - c.announce(MaplePacketCreator.skillCooldown(attack.skill, effect_.getCooldown())); + c.announce(PacketCreator.skillCooldown(attack.skill, effect_.getCooldown())); chr.addCooldown(attack.skill, currentServerTime(), effect_.getCooldown() * 1000); } } diff --git a/src/main/java/net/server/channel/handlers/CoconutHandler.java b/src/main/java/net/server/channel/handlers/CoconutHandler.java index e25a2d167e..817286193a 100644 --- a/src/main/java/net/server/channel/handlers/CoconutHandler.java +++ b/src/main/java/net/server/channel/handlers/CoconutHandler.java @@ -27,7 +27,7 @@ import net.AbstractMaplePacketHandler; import server.events.gm.MapleCoconut; import server.events.gm.MapleCoconuts; import server.maps.MapleMap; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -57,29 +57,29 @@ public final class CoconutHandler extends AbstractMaplePacketHandler { if (Math.random() < 0.01 && event.getStopped() > 0) { nut.setHittable(false); event.stopCoconut(); - map.broadcastMessage(MaplePacketCreator.hitCoconut(false, id, 1)); + map.broadcastMessage(PacketCreator.hitCoconut(false, id, 1)); return; } nut.setHittable(false); // for sure :) nut.resetHits(); // For next event (without restarts) if (Math.random() < 0.05 && event.getBombings() > 0) { - map.broadcastMessage(MaplePacketCreator.hitCoconut(false, id, 2)); + map.broadcastMessage(PacketCreator.hitCoconut(false, id, 2)); event.bombCoconut(); } else if (event.getFalling() > 0) { - map.broadcastMessage(MaplePacketCreator.hitCoconut(false, id, 3)); + map.broadcastMessage(PacketCreator.hitCoconut(false, id, 3)); event.fallCoconut(); if (c.getPlayer().getTeam() == 0) { event.addMapleScore(); - map.broadcastMessage(MaplePacketCreator.serverNotice(5, c.getPlayer().getName() + " of Team Maple knocks down a coconut.")); + map.broadcastMessage(PacketCreator.serverNotice(5, c.getPlayer().getName() + " of Team Maple knocks down a coconut.")); } else { event.addStoryScore(); - map.broadcastMessage(MaplePacketCreator.serverNotice(5, c.getPlayer().getName() + " of Team Story knocks down a coconut.")); + map.broadcastMessage(PacketCreator.serverNotice(5, c.getPlayer().getName() + " of Team Story knocks down a coconut.")); } - map.broadcastMessage(MaplePacketCreator.coconutScore(event.getMapleScore(), event.getStoryScore())); + map.broadcastMessage(PacketCreator.coconutScore(event.getMapleScore(), event.getStoryScore())); } } else { nut.hit(); - map.broadcastMessage(MaplePacketCreator.hitCoconut(false, id, 1)); + map.broadcastMessage(PacketCreator.hitCoconut(false, id, 1)); } } } diff --git a/src/main/java/net/server/channel/handlers/CouponCodeHandler.java b/src/main/java/net/server/channel/handlers/CouponCodeHandler.java index 9dedbe2432..7fcae0f642 100644 --- a/src/main/java/net/server/channel/handlers/CouponCodeHandler.java +++ b/src/main/java/net/server/channel/handlers/CouponCodeHandler.java @@ -33,7 +33,7 @@ import server.CashShop; import server.MapleItemInformationProvider; import tools.DatabaseConnection; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.data.input.SeekableLittleEndianAccessor; @@ -188,7 +188,7 @@ public final class CouponCodeHandler extends AbstractMaplePacketHandler { Pair>>> codeRes = getNXCodeResult(c.getPlayer(), code.toUpperCase()); int type = codeRes.getLeft(); if (type < 0) { - c.announce(MaplePacketCreator.showCashShopMessage((byte) parseCouponResult(type))); + c.announce(PacketCreator.showCashShopMessage((byte) parseCouponResult(type))); } else { List cashItems = new LinkedList<>(); List> items = new LinkedList<>(); @@ -260,9 +260,9 @@ public final class CouponCodeHandler extends AbstractMaplePacketHandler { } } if (nxCredit != 0 || nxPrepaid != 0) { //coupon packet can only show maple points (afaik) - c.announce(MaplePacketCreator.showBoughtQuestItem(0)); + c.announce(PacketCreator.showBoughtQuestItem(0)); } else { - c.announce(MaplePacketCreator.showCouponRedeemedItems(c.getAccID(), maplePoints, mesos, cashItems, items)); + c.announce(PacketCreator.showCouponRedeemedItems(c.getAccID(), maplePoints, mesos, cashItems, items)); } c.enableCSActions(); } diff --git a/src/main/java/net/server/channel/handlers/DamageSummonHandler.java b/src/main/java/net/server/channel/handlers/DamageSummonHandler.java index ae54da5444..b32f36df46 100644 --- a/src/main/java/net/server/channel/handlers/DamageSummonHandler.java +++ b/src/main/java/net/server/channel/handlers/DamageSummonHandler.java @@ -25,9 +25,9 @@ import client.MapleBuffStat; import client.MapleCharacter; import client.MapleClient; import net.AbstractMaplePacketHandler; -import server.maps.MapleSummon; import server.maps.MapleMapObject; -import tools.MaplePacketCreator; +import server.maps.MapleSummon; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class DamageSummonHandler extends AbstractMaplePacketHandler { @@ -48,7 +48,7 @@ public final class DamageSummonHandler extends AbstractMaplePacketHandler { if (summon.getHP() <= 0) { player.cancelEffectFromBuffStat(MapleBuffStat.PUPPET); } - player.getMap().broadcastMessage(player, MaplePacketCreator.damageSummon(player.getId(), oid, damage, monsterIdFrom), summon.getPosition()); + player.getMap().broadcastMessage(player, PacketCreator.damageSummon(player.getId(), oid, damage, monsterIdFrom), summon.getPosition()); } } } diff --git a/src/main/java/net/server/channel/handlers/DenyPartyRequestHandler.java b/src/main/java/net/server/channel/handlers/DenyPartyRequestHandler.java index 748804377d..6648c0e5a7 100644 --- a/src/main/java/net/server/channel/handlers/DenyPartyRequestHandler.java +++ b/src/main/java/net/server/channel/handlers/DenyPartyRequestHandler.java @@ -27,7 +27,7 @@ import net.AbstractMaplePacketHandler; import net.server.coordinator.world.MapleInviteCoordinator; import net.server.coordinator.world.MapleInviteCoordinator.InviteResult; import net.server.coordinator.world.MapleInviteCoordinator.InviteType; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class DenyPartyRequestHandler extends AbstractMaplePacketHandler { @@ -43,7 +43,7 @@ public final class DenyPartyRequestHandler extends AbstractMaplePacketHandler { if (MapleInviteCoordinator.answerInvite(InviteType.PARTY, chr.getId(), cfrom.getPartyId(), false).result == InviteResult.DENIED) { chr.updatePartySearchAvailability(chr.getParty() == null); - cfrom.getClient().announce(MaplePacketCreator.partyStatusMessage(23, chr.getName())); + cfrom.getClient().announce(PacketCreator.partyStatusMessage(23, chr.getName())); } } } diff --git a/src/main/java/net/server/channel/handlers/DoorHandler.java b/src/main/java/net/server/channel/handlers/DoorHandler.java index b2a2ea2888..497629861c 100644 --- a/src/main/java/net/server/channel/handlers/DoorHandler.java +++ b/src/main/java/net/server/channel/handlers/DoorHandler.java @@ -26,7 +26,7 @@ import client.MapleClient; import net.AbstractMaplePacketHandler; import server.maps.MapleDoorObject; import server.maps.MapleMapObject; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -41,7 +41,7 @@ public final class DoorHandler extends AbstractMaplePacketHandler { MapleCharacter chr = c.getPlayer(); if (chr.isChangingMaps() || chr.isBanned()) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -55,7 +55,7 @@ public final class DoorHandler extends AbstractMaplePacketHandler { } } - c.announce(MaplePacketCreator.blockedMessage(6)); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.blockedMessage(6)); + c.announce(PacketCreator.enableActions()); } } diff --git a/src/main/java/net/server/channel/handlers/DueyHandler.java b/src/main/java/net/server/channel/handlers/DueyHandler.java index 0e67dc43e7..c6956c00c1 100644 --- a/src/main/java/net/server/channel/handlers/DueyHandler.java +++ b/src/main/java/net/server/channel/handlers/DueyHandler.java @@ -24,9 +24,8 @@ package net.server.channel.handlers; import client.MapleClient; import client.processor.npc.DueyProcessor; import config.YamlConfig; - import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class DueyHandler extends AbstractMaplePacketHandler { @@ -34,7 +33,7 @@ public final class DueyHandler extends AbstractMaplePacketHandler { @Override public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { if (!YamlConfig.config.server.USE_DUEY){ - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } diff --git a/src/main/java/net/server/channel/handlers/EnterCashShopHandler.java b/src/main/java/net/server/channel/handlers/EnterCashShopHandler.java index 915bf996d2..b9b61f8b50 100644 --- a/src/main/java/net/server/channel/handlers/EnterCashShopHandler.java +++ b/src/main/java/net/server/channel/handlers/EnterCashShopHandler.java @@ -26,7 +26,7 @@ import client.MapleClient; import net.AbstractMaplePacketHandler; import net.server.Server; import server.maps.MapleMiniDungeonInfo; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -40,19 +40,19 @@ public class EnterCashShopHandler extends AbstractMaplePacketHandler { MapleCharacter mc = c.getPlayer(); if (mc.cannotEnterCashShop()) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } if(mc.getEventInstance() != null) { - c.announce(MaplePacketCreator.serverNotice(5, "Entering Cash Shop or MTS are disabled when registered on an event.")); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.serverNotice(5, "Entering Cash Shop or MTS are disabled when registered on an event.")); + c.announce(PacketCreator.enableActions()); return; } if(MapleMiniDungeonInfo.isDungeonMap(mc.getMapId())) { - c.announce(MaplePacketCreator.serverNotice(5, "Changing channels or entering Cash Shop or MTS are disabled when inside a Mini-Dungeon.")); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.serverNotice(5, "Changing channels or entering Cash Shop or MTS are disabled when inside a Mini-Dungeon.")); + c.announce(PacketCreator.enableActions()); return; } @@ -79,11 +79,11 @@ public class EnterCashShopHandler extends AbstractMaplePacketHandler { mc.forfeitExpirableQuests(); mc.cancelQuestExpirationTask(); - c.announce(MaplePacketCreator.openCashShop(c, false)); - c.announce(MaplePacketCreator.showCashInventory(c)); - c.announce(MaplePacketCreator.showGifts(mc.getCashShop().loadGifts())); - c.announce(MaplePacketCreator.showWishList(mc, false)); - c.announce(MaplePacketCreator.showCash(mc)); + c.announce(PacketCreator.openCashShop(c, false)); + c.announce(PacketCreator.showCashInventory(c)); + c.announce(PacketCreator.showGifts(mc.getCashShop().loadGifts())); + c.announce(PacketCreator.showWishList(mc, false)); + c.announce(PacketCreator.showCash(mc)); c.getChannelServer().removePlayer(mc); mc.getMap().removePlayer(mc); diff --git a/src/main/java/net/server/channel/handlers/EnterMTSHandler.java b/src/main/java/net/server/channel/handlers/EnterMTSHandler.java index e6e42a79c5..2d5919fc70 100644 --- a/src/main/java/net/server/channel/handlers/EnterMTSHandler.java +++ b/src/main/java/net/server/channel/handlers/EnterMTSHandler.java @@ -33,7 +33,7 @@ import server.MTSItemInfo; import server.maps.FieldLimit; import server.maps.MapleMiniDungeonInfo; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import java.sql.Connection; @@ -51,38 +51,38 @@ public final class EnterMTSHandler extends AbstractMaplePacketHandler { if(!chr.isAlive() && YamlConfig.config.server.USE_BUYBACK_SYSTEM) { BuybackProcessor.processBuyback(c); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } else { if (!YamlConfig.config.server.USE_MTS) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } if(chr.getEventInstance() != null) { - c.announce(MaplePacketCreator.serverNotice(5, "Entering Cash Shop or MTS are disabled when registered on an event.")); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.serverNotice(5, "Entering Cash Shop or MTS are disabled when registered on an event.")); + c.announce(PacketCreator.enableActions()); return; } if(MapleMiniDungeonInfo.isDungeonMap(chr.getMapId())) { - c.announce(MaplePacketCreator.serverNotice(5, "Changing channels or entering Cash Shop or MTS are disabled when inside a Mini-Dungeon.")); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.serverNotice(5, "Changing channels or entering Cash Shop or MTS are disabled when inside a Mini-Dungeon.")); + c.announce(PacketCreator.enableActions()); return; } if (FieldLimit.CANNOTMIGRATE.check(chr.getMap().getFieldLimit())) { chr.dropMessage(1, "You can't do it here in this map."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } if (!chr.isAlive()) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } if (chr.getLevel() < 10) { - c.announce(MaplePacketCreator.blockedMessage2(5)); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.blockedMessage2(5)); + c.announce(PacketCreator.enableActions()); return; } @@ -110,14 +110,14 @@ public final class EnterMTSHandler extends AbstractMaplePacketHandler { c.getChannelServer().removePlayer(chr); chr.getMap().removePlayer(c.getPlayer()); try { - c.announce(MaplePacketCreator.openCashShop(c, true)); + c.announce(PacketCreator.openCashShop(c, true)); } catch (Exception ex) { ex.printStackTrace(); } chr.getCashShop().open(true);// xD c.enableCSActions(); - c.announce(MaplePacketCreator.MTSWantedListingOver(0, 0)); - c.announce(MaplePacketCreator.showMTSCash(c.getPlayer())); + c.announce(PacketCreator.MTSWantedListingOver(0, 0)); + c.announce(PacketCreator.showMTSCash(c.getPlayer())); List items = new ArrayList<>(); int pages = 0; try (Connection con = DatabaseConnection.getConnection()) { @@ -171,9 +171,9 @@ public final class EnterMTSHandler extends AbstractMaplePacketHandler { } catch (SQLException e) { e.printStackTrace(); } - c.announce(MaplePacketCreator.sendMTS(items, 1, 0, 0, pages)); - c.announce(MaplePacketCreator.transferInventory(getTransfer(chr.getId()))); - c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(chr.getId()))); + c.announce(PacketCreator.sendMTS(items, 1, 0, 0, pages)); + c.announce(PacketCreator.transferInventory(getTransfer(chr.getId()))); + c.announce(PacketCreator.notYetSoldInv(getNotYetSold(chr.getId()))); } } diff --git a/src/main/java/net/server/channel/handlers/FamilyAddHandler.java b/src/main/java/net/server/channel/handlers/FamilyAddHandler.java index 6c9e0d7fcd..1d9bd53fea 100644 --- a/src/main/java/net/server/channel/handlers/FamilyAddHandler.java +++ b/src/main/java/net/server/channel/handlers/FamilyAddHandler.java @@ -21,13 +21,13 @@ */ package net.server.channel.handlers; -import config.YamlConfig; import client.MapleCharacter; import client.MapleClient; +import config.YamlConfig; import net.AbstractMaplePacketHandler; import net.server.coordinator.world.MapleInviteCoordinator; import net.server.coordinator.world.MapleInviteCoordinator.InviteType; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -45,26 +45,26 @@ public final class FamilyAddHandler extends AbstractMaplePacketHandler { MapleCharacter addChr = c.getChannelServer().getPlayerStorage().getCharacterByName(toAdd); MapleCharacter chr = c.getPlayer(); if(addChr == null) { - c.announce(MaplePacketCreator.sendFamilyMessage(65, 0)); + c.announce(PacketCreator.sendFamilyMessage(65, 0)); } else if(addChr == chr) { //only possible through packet editing/client editing i think? - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } else if(addChr.getMap() != chr.getMap() || (addChr.isHidden()) && chr.gmLevel() < addChr.gmLevel()) { - c.announce(MaplePacketCreator.sendFamilyMessage(69, 0)); + c.announce(PacketCreator.sendFamilyMessage(69, 0)); } else if(addChr.getLevel() <= 10) { - c.announce(MaplePacketCreator.sendFamilyMessage(77, 0)); + c.announce(PacketCreator.sendFamilyMessage(77, 0)); } else if(Math.abs(addChr.getLevel() - chr.getLevel()) > 20) { - c.announce(MaplePacketCreator.sendFamilyMessage(72, 0)); + c.announce(PacketCreator.sendFamilyMessage(72, 0)); } else if(addChr.getFamily() != null && addChr.getFamily() == chr.getFamily()) { //same family - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } else if(MapleInviteCoordinator.hasInvite(InviteType.FAMILY, addChr.getId())) { - c.announce(MaplePacketCreator.sendFamilyMessage(73, 0)); + c.announce(PacketCreator.sendFamilyMessage(73, 0)); } else if(chr.getFamily() != null && addChr.getFamily() != null && addChr.getFamily().getTotalGenerations() + chr.getFamily().getTotalGenerations() > YamlConfig.config.server.FAMILY_MAX_GENERATIONS) { - c.announce(MaplePacketCreator.sendFamilyMessage(76, 0)); + c.announce(PacketCreator.sendFamilyMessage(76, 0)); } else { MapleInviteCoordinator.createInvite(InviteType.FAMILY, chr, addChr, addChr.getId()); - addChr.getClient().announce(MaplePacketCreator.sendFamilyInvite(chr.getId(), chr.getName())); + addChr.getClient().announce(PacketCreator.sendFamilyInvite(chr.getId(), chr.getName())); chr.dropMessage("The invite has been sent."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } } diff --git a/src/main/java/net/server/channel/handlers/FamilyPreceptsHandler.java b/src/main/java/net/server/channel/handlers/FamilyPreceptsHandler.java index 7da34c29f2..68f79b3af3 100644 --- a/src/main/java/net/server/channel/handlers/FamilyPreceptsHandler.java +++ b/src/main/java/net/server/channel/handlers/FamilyPreceptsHandler.java @@ -3,7 +3,7 @@ package net.server.channel.handlers; import client.MapleClient; import client.MapleFamily; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public class FamilyPreceptsHandler extends AbstractMaplePacketHandler { @@ -17,7 +17,7 @@ public class FamilyPreceptsHandler extends AbstractMaplePacketHandler { if(newPrecepts.length() > 200) return; family.setMessage(newPrecepts, true); //family.broadcastFamilyInfoUpdate(); //probably don't need to broadcast for this? - c.announce(MaplePacketCreator.getFamilyInfo(c.getPlayer().getFamilyEntry())); + c.announce(PacketCreator.getFamilyInfo(c.getPlayer().getFamilyEntry())); } } diff --git a/src/main/java/net/server/channel/handlers/FamilySeparateHandler.java b/src/main/java/net/server/channel/handlers/FamilySeparateHandler.java index d1a69822b0..bfb72af671 100644 --- a/src/main/java/net/server/channel/handlers/FamilySeparateHandler.java +++ b/src/main/java/net/server/channel/handlers/FamilySeparateHandler.java @@ -24,7 +24,7 @@ import client.MapleFamily; import client.MapleFamilyEntry; import config.YamlConfig; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public class FamilySeparateHandler extends AbstractMaplePacketHandler { @@ -52,18 +52,18 @@ public class FamilySeparateHandler extends AbstractMaplePacketHandler { int cost = 2500 * levelDiff; cost += levelDiff * levelDiff; if(c.getPlayer().getMeso() < cost) { - c.announce(MaplePacketCreator.sendFamilyMessage(isSenior ? 81 : 80, cost)); + c.announce(PacketCreator.sendFamilyMessage(isSenior ? 81 : 80, cost)); return; } c.getPlayer().gainMeso(-cost); int repCost = separateRepCost(forkOn); senior.gainReputation(-repCost, false); if(senior.getSenior() != null) senior.getSenior().gainReputation(-(repCost/2), false); - forkOn.announceToSenior(MaplePacketCreator.serverNotice(5, forkOn.getName() + " has left the family."), true); + forkOn.announceToSenior(PacketCreator.serverNotice(5, forkOn.getName() + " has left the family."), true); forkOn.fork(); - c.announce(MaplePacketCreator.getFamilyInfo(forkOn)); //pedigree info will be requested from the client if the window is open + c.announce(PacketCreator.getFamilyInfo(forkOn)); //pedigree info will be requested from the client if the window is open forkOn.updateSeniorFamilyInfo(true); - c.announce(MaplePacketCreator.sendFamilyMessage(1, 0)); + c.announce(PacketCreator.sendFamilyMessage(1, 0)); } diff --git a/src/main/java/net/server/channel/handlers/FamilySummonResponseHandler.java b/src/main/java/net/server/channel/handlers/FamilySummonResponseHandler.java index 9f39b745f8..e01f38a2b0 100644 --- a/src/main/java/net/server/channel/handlers/FamilySummonResponseHandler.java +++ b/src/main/java/net/server/channel/handlers/FamilySummonResponseHandler.java @@ -11,7 +11,7 @@ import net.server.coordinator.world.MapleInviteCoordinator.InviteResult; import net.server.coordinator.world.MapleInviteCoordinator.InviteType; import net.server.coordinator.world.MapleInviteCoordinator.MapleInviteResult; import server.maps.MapleMap; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public class FamilySummonResponseHandler extends AbstractMaplePacketHandler { @@ -32,7 +32,7 @@ public class FamilySummonResponseHandler extends AbstractMaplePacketHandler { } else { inviterEntry.refundEntitlement(MapleFamilyEntitlement.SUMMON_FAMILY); inviterEntry.gainReputation(MapleFamilyEntitlement.SUMMON_FAMILY.getRepCost(), false); //refund rep cost if declined - inviter.announce(MaplePacketCreator.getFamilyInfo(inviterEntry)); + inviter.announce(PacketCreator.getFamilyInfo(inviterEntry)); inviter.dropMessage(5, c.getPlayer().getName() + " has denied the summon request."); } } diff --git a/src/main/java/net/server/channel/handlers/FamilyUseHandler.java b/src/main/java/net/server/channel/handlers/FamilyUseHandler.java index 344f8b541d..52a343cb03 100644 --- a/src/main/java/net/server/channel/handlers/FamilyUseHandler.java +++ b/src/main/java/net/server/channel/handlers/FamilyUseHandler.java @@ -31,7 +31,7 @@ import net.server.coordinator.world.MapleInviteCoordinator; import net.server.coordinator.world.MapleInviteCoordinator.InviteType; import server.maps.FieldLimit; import server.maps.MapleMap; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -51,7 +51,7 @@ public final class FamilyUseHandler extends AbstractMaplePacketHandler { if(entry.getReputation() < cost || entry.isEntitlementUsed(type)) { return; // shouldn't even be able to request it } - c.announce(MaplePacketCreator.getFamilyInfo(entry)); + c.announce(PacketCreator.getFamilyInfo(entry)); MapleCharacter victim; if(type == MapleFamilyEntitlement.FAMILY_REUINION || type == MapleFamilyEntitlement.SUMMON_FAMILY) { victim = c.getChannelServer().getPlayerStorage().getCharacterByName(slea.readMapleAsciiString()); @@ -67,7 +67,7 @@ public final class FamilyUseHandler extends AbstractMaplePacketHandler { c.getPlayer().changeMap(victim.getMap(), victim.getMap().getPortal(0)); useEntitlement(entry, type); } else { - c.announce(MaplePacketCreator.sendFamilyMessage(75, 0)); // wrong message, but close enough. (client should check this first anyway) + c.announce(PacketCreator.sendFamilyMessage(75, 0)); // wrong message, but close enough. (client should check this first anyway) return; } } else { @@ -75,20 +75,20 @@ public final class FamilyUseHandler extends AbstractMaplePacketHandler { && (ownMap.getForcedReturnId() == 999999999 || ownMap.getId() < 100000000) && ownMap.getEventInstance() == null) { if(MapleInviteCoordinator.hasInvite(InviteType.FAMILY_SUMMON, victim.getId())) { - c.announce(MaplePacketCreator.sendFamilyMessage(74, 0)); + c.announce(PacketCreator.sendFamilyMessage(74, 0)); return; } MapleInviteCoordinator.createInvite(InviteType.FAMILY_SUMMON, c.getPlayer(), victim, victim.getId(), c.getPlayer().getMap()); - victim.announce(MaplePacketCreator.sendFamilySummonRequest(c.getPlayer().getFamily().getName(), c.getPlayer().getName())); + victim.announce(PacketCreator.sendFamilySummonRequest(c.getPlayer().getFamily().getName(), c.getPlayer().getName())); useEntitlement(entry, type); } else { - c.announce(MaplePacketCreator.sendFamilyMessage(75, 0)); + c.announce(PacketCreator.sendFamilyMessage(75, 0)); return; } } } } else { - c.announce(MaplePacketCreator.sendFamilyMessage(67, 0)); + c.announce(PacketCreator.sendFamilyMessage(67, 0)); } } } else if(type == MapleFamilyEntitlement.FAMILY_BONDING) { @@ -133,7 +133,7 @@ public final class FamilyUseHandler extends AbstractMaplePacketHandler { private boolean useEntitlement(MapleFamilyEntry entry, MapleFamilyEntitlement entitlement) { if(entry.useEntitlement(entitlement)) { entry.gainReputation(-entitlement.getRepCost(), false); - entry.getChr().announce(MaplePacketCreator.getFamilyInfo(entry)); + entry.getChr().announce(PacketCreator.getFamilyInfo(entry)); return true; } return false; diff --git a/src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java b/src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java index 6eb53f5086..69b2954302 100644 --- a/src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java +++ b/src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java @@ -27,7 +27,7 @@ import server.life.MapleMonster; import server.life.MapleMonsterInformationProvider; import server.maps.MapleMap; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public class FieldDamageMobHandler extends AbstractMaplePacketHandler { @@ -52,7 +52,7 @@ public class FieldDamageMobHandler extends AbstractMaplePacketHandler { return; } - map.broadcastMessage(chr, MaplePacketCreator.damageMonster(mobOid, dmg), true); + map.broadcastMessage(chr, PacketCreator.damageMonster(mobOid, dmg), true); map.damageMonster(chr, mob, dmg); } } diff --git a/src/main/java/net/server/channel/handlers/FredrickHandler.java b/src/main/java/net/server/channel/handlers/FredrickHandler.java index 1e035ded11..7347eae914 100644 --- a/src/main/java/net/server/channel/handlers/FredrickHandler.java +++ b/src/main/java/net/server/channel/handlers/FredrickHandler.java @@ -24,7 +24,6 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; import client.processor.npc.FredrickProcessor; - import net.AbstractMaplePacketHandler; import tools.data.input.SeekableLittleEndianAccessor; @@ -41,7 +40,7 @@ public class FredrickHandler extends AbstractMaplePacketHandler { switch (operation) { case 0x19: //Will never come... - //c.announce(MaplePacketCreator.getFredrick((byte) 0x24)); + //c.announce(PacketCreator.getFredrick((byte) 0x24)); break; case 0x1A: FredrickProcessor.fredrickRetrieveItems(c); diff --git a/src/main/java/net/server/channel/handlers/GeneralChatHandler.java b/src/main/java/net/server/channel/handlers/GeneralChatHandler.java index 6f56b1a16b..75c79e6c3a 100644 --- a/src/main/java/net/server/channel/handlers/GeneralChatHandler.java +++ b/src/main/java/net/server/channel/handlers/GeneralChatHandler.java @@ -29,7 +29,7 @@ import config.YamlConfig; import net.AbstractMaplePacketHandler; import tools.FilePrinter; import tools.LogHelper; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class GeneralChatHandler extends AbstractMaplePacketHandler { @@ -38,7 +38,7 @@ public final class GeneralChatHandler extends AbstractMaplePacketHandler { String s = slea.readMapleAsciiString(); MapleCharacter chr = c.getPlayer(); if(chr.getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } if (s.length() > Byte.MAX_VALUE && !chr.isGM()) { @@ -58,12 +58,12 @@ public final class GeneralChatHandler extends AbstractMaplePacketHandler { } if (!chr.isHidden()) { - chr.getMap().broadcastMessage(MaplePacketCreator.getChatText(chr.getId(), s, chr.getWhiteChat(), show)); + chr.getMap().broadcastMessage(PacketCreator.getChatText(chr.getId(), s, chr.getWhiteChat(), show)); if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) { LogHelper.logChat(c, "General", s); } } else { - chr.getMap().broadcastGMMessage(MaplePacketCreator.getChatText(chr.getId(), s, chr.getWhiteChat(), show)); + chr.getMap().broadcastGMMessage(PacketCreator.getChatText(chr.getId(), s, chr.getWhiteChat(), show)); if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) { LogHelper.logChat(c, "GM General", s); } diff --git a/src/main/java/net/server/channel/handlers/GiveFameHandler.java b/src/main/java/net/server/channel/handlers/GiveFameHandler.java index fadf9f8e6b..a171580708 100644 --- a/src/main/java/net/server/channel/handlers/GiveFameHandler.java +++ b/src/main/java/net/server/channel/handlers/GiveFameHandler.java @@ -23,12 +23,11 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleCharacter.FameStatus; -import client.autoban.AutobanFactory; import client.MapleClient; -import client.MapleStat; +import client.autoban.AutobanFactory; import net.AbstractMaplePacketHandler; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class GiveFameHandler extends AbstractMaplePacketHandler { @@ -58,7 +57,7 @@ public final class GiveFameHandler extends AbstractMaplePacketHandler { player.message("Could not process the request, since this character currently has the minimum/maximum level of fame."); } } else { - c.announce(MaplePacketCreator.giveFameErrorResponse(status == FameStatus.NOT_TODAY ? 3 : 4)); + c.announce(PacketCreator.giveFameErrorResponse(status == FameStatus.NOT_TODAY ? 3 : 4)); } } } \ No newline at end of file diff --git a/src/main/java/net/server/channel/handlers/GrenadeEffectHandler.java b/src/main/java/net/server/channel/handlers/GrenadeEffectHandler.java index 59bdb84259..aeba09763e 100644 --- a/src/main/java/net/server/channel/handlers/GrenadeEffectHandler.java +++ b/src/main/java/net/server/channel/handlers/GrenadeEffectHandler.java @@ -19,15 +19,16 @@ */ package net.server.channel.handlers; -import client.MapleClient; import client.MapleCharacter; +import client.MapleClient; import constants.skills.Gunslinger; import constants.skills.NightWalker; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; -import tools.data.input.SeekableLittleEndianAccessor; -import java.awt.Point; import tools.FilePrinter; +import tools.PacketCreator; +import tools.data.input.SeekableLittleEndianAccessor; + +import java.awt.*; /* * @author GabrielSin @@ -46,7 +47,7 @@ public class GrenadeEffectHandler extends AbstractMaplePacketHandler { case Gunslinger.GRENADE: int skillLevel = chr.getSkillLevel(skillId); if (skillLevel > 0) { - chr.getMap().broadcastMessage(chr, MaplePacketCreator.throwGrenade(chr.getId(), position, keyDown, skillId, skillLevel), position); + chr.getMap().broadcastMessage(chr, PacketCreator.throwGrenade(chr.getId(), position, keyDown, skillId, skillLevel), position); } break; default: diff --git a/src/main/java/net/server/channel/handlers/GuildOperationHandler.java b/src/main/java/net/server/channel/handlers/GuildOperationHandler.java index 15cffe4c93..0fb36f08aa 100644 --- a/src/main/java/net/server/channel/handlers/GuildOperationHandler.java +++ b/src/main/java/net/server/channel/handlers/GuildOperationHandler.java @@ -33,7 +33,7 @@ import net.server.guild.MapleGuild; import net.server.guild.MapleGuildResponse; import net.server.world.MapleParty; import net.server.world.World; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import java.util.HashSet; @@ -59,7 +59,7 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler { int allianceId = -1; switch (type) { case 0x00: - //c.announce(MaplePacketCreator.showGuildInfo(mc)); + //c.announce(PacketCreator.showGuildInfo(mc)); break; case 0x02: if (mc.getGuildId() > 0) { @@ -140,14 +140,14 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler { return; } - c.announce(MaplePacketCreator.showGuildInfo(mc)); + c.announce(PacketCreator.showGuildInfo(mc)); allianceId = mc.getGuild().getAllianceId(); if(allianceId > 0) Server.getInstance().getAlliance(allianceId).updateAlliancePackets(mc); mc.saveGuildStatus(); // update database - mc.getMap().broadcastMessage(mc, MaplePacketCreator.guildNameChanged(mc.getId(), mc.getGuild().getName())); // thanks Vcoc for pointing out an issue with updating guild tooltip to players in the map - mc.getMap().broadcastMessage(mc, MaplePacketCreator.guildMarkChanged(mc.getId(), mc.getGuild())); + mc.getMap().broadcastMessage(mc, PacketCreator.guildNameChanged(mc.getId(), mc.getGuild().getName())); // thanks Vcoc for pointing out an issue with updating guild tooltip to players in the map + mc.getMap().broadcastMessage(mc, PacketCreator.guildMarkChanged(mc.getId(), mc.getGuild())); break; case 0x07: cid = slea.readInt(); @@ -159,16 +159,16 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler { allianceId = mc.getGuild().getAllianceId(); - c.announce(MaplePacketCreator.updateGP(mc.getGuildId(), 0)); + c.announce(PacketCreator.updateGP(mc.getGuildId(), 0)); Server.getInstance().leaveGuild(mc.getMGC()); - c.announce(MaplePacketCreator.showGuildInfo(null)); + c.announce(PacketCreator.showGuildInfo(null)); if(allianceId > 0) Server.getInstance().getAlliance(allianceId).updateAlliancePackets(mc); mc.getMGC().setGuildId(0); mc.getMGC().setGuildRank(5); mc.saveGuildStatus(); - mc.getMap().broadcastMessage(mc, MaplePacketCreator.guildNameChanged(mc.getId(), "")); + mc.getMap().broadcastMessage(mc, PacketCreator.guildNameChanged(mc.getId(), "")); break; case 0x08: allianceId = mc.getGuild().getAllianceId(); @@ -213,7 +213,7 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler { return; } if (mc.getMeso() < YamlConfig.config.server.CHANGE_EMBLEM_COST) { - c.announce(MaplePacketCreator.serverNotice(1, "You do not have " + GameConstants.numberWithCommas(YamlConfig.config.server.CHANGE_EMBLEM_COST) + " mesos to change the Guild emblem.")); + c.announce(PacketCreator.serverNotice(1, "You do not have " + GameConstants.numberWithCommas(YamlConfig.config.server.CHANGE_EMBLEM_COST) + " mesos to change the Guild emblem.")); return; } short bg = slea.readShort(); @@ -224,7 +224,7 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler { if (mc.getGuild() != null && mc.getGuild().getAllianceId() > 0) { MapleAlliance alliance = mc.getAlliance(); - Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.getGuildAlliances(alliance, c.getWorld()), -1, -1); + Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.getGuildAlliances(alliance, c.getWorld()), -1, -1); } mc.gainMeso(-YamlConfig.config.server.CHANGE_EMBLEM_COST, true, false, true); diff --git a/src/main/java/net/server/channel/handlers/HealOvertimeHandler.java b/src/main/java/net/server/channel/handlers/HealOvertimeHandler.java index 35ab9233d0..ade95b5eda 100644 --- a/src/main/java/net/server/channel/handlers/HealOvertimeHandler.java +++ b/src/main/java/net/server/channel/handlers/HealOvertimeHandler.java @@ -28,8 +28,8 @@ import client.autoban.AutobanManager; import net.AbstractMaplePacketHandler; import net.server.Server; import server.maps.MapleMap; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; -import tools.MaplePacketCreator; public final class HealOvertimeHandler extends AbstractMaplePacketHandler { @Override @@ -54,7 +54,7 @@ public final class HealOvertimeHandler extends AbstractMaplePacketHandler { } chr.addHP(healHP); - chr.getMap().broadcastMessage(chr, MaplePacketCreator.showHpHealed(chr.getId(), healHP), false); + chr.getMap().broadcastMessage(chr, PacketCreator.showHpHealed(chr.getId(), healHP), false); abm.spam(0, timestamp); } short healMP = slea.readShort(); diff --git a/src/main/java/net/server/channel/handlers/HiredMerchantRequest.java b/src/main/java/net/server/channel/handlers/HiredMerchantRequest.java index 160cdfff0d..64fe53fd34 100644 --- a/src/main/java/net/server/channel/handlers/HiredMerchantRequest.java +++ b/src/main/java/net/server/channel/handlers/HiredMerchantRequest.java @@ -21,21 +21,22 @@ */ package net.server.channel.handlers; -import client.inventory.ItemFactory; import client.MapleCharacter; -import java.sql.SQLException; -import java.util.Arrays; import client.MapleClient; +import client.inventory.ItemFactory; import constants.game.GameConstants; -import java.awt.Point; import net.AbstractMaplePacketHandler; -import server.maps.MaplePortal; import server.maps.MapleMapObject; import server.maps.MapleMapObjectType; import server.maps.MaplePlayerShop; -import tools.MaplePacketCreator; +import server.maps.MaplePortal; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; +import java.awt.*; +import java.sql.SQLException; +import java.util.Arrays; + /** * * @author XoticStory @@ -52,11 +53,11 @@ public final class HiredMerchantRequest extends AbstractMaplePacketHandler { MaplePlayerShop shop = mc.getPlayerShop(); if (shop != null && shop.isOwner(mc)) { - chr.announce(MaplePacketCreator.getMiniRoomError(13)); + chr.announce(PacketCreator.getMiniRoomError(13)); return; } } else { - chr.announce(MaplePacketCreator.getMiniRoomError(13)); + chr.announce(PacketCreator.getMiniRoomError(13)); return; } } @@ -64,7 +65,7 @@ public final class HiredMerchantRequest extends AbstractMaplePacketHandler { Point cpos = chr.getPosition(); MaplePortal portal = chr.getMap().findClosestTeleportPortal(cpos); if (portal != null && portal.getPosition().distance(cpos) < 120.0) { - chr.announce(MaplePacketCreator.getMiniRoomError(10)); + chr.announce(PacketCreator.getMiniRoomError(10)); return; } } catch (Exception e) { @@ -75,9 +76,9 @@ public final class HiredMerchantRequest extends AbstractMaplePacketHandler { if (!chr.hasMerchant()) { try { if (ItemFactory.MERCHANT.loadItems(chr.getId(), false).isEmpty() && chr.getMerchantMeso() == 0) { - c.announce(MaplePacketCreator.hiredMerchantBox()); + c.announce(PacketCreator.hiredMerchantBox()); } else { - chr.announce(MaplePacketCreator.retrieveFirstMessage()); + chr.announce(PacketCreator.retrieveFirstMessage()); } } catch (SQLException ex) { ex.printStackTrace(); diff --git a/src/main/java/net/server/channel/handlers/InventoryMergeHandler.java b/src/main/java/net/server/channel/handlers/InventoryMergeHandler.java index ae8c2feb3b..307e62ea04 100644 --- a/src/main/java/net/server/channel/handlers/InventoryMergeHandler.java +++ b/src/main/java/net/server/channel/handlers/InventoryMergeHandler.java @@ -21,18 +21,18 @@ */ package net.server.channel.handlers; -import config.YamlConfig; -import net.AbstractMaplePacketHandler; -import client.inventory.manipulator.MapleInventoryManipulator; -import tools.MaplePacketCreator; -import tools.data.input.SeekableLittleEndianAccessor; import client.MapleCharacter; import client.MapleClient; import client.inventory.Item; import client.inventory.MapleInventory; import client.inventory.MapleInventoryType; +import client.inventory.manipulator.MapleInventoryManipulator; +import config.YamlConfig; +import net.AbstractMaplePacketHandler; import net.server.Server; import server.MapleItemInformationProvider; +import tools.PacketCreator; +import tools.data.input.SeekableLittleEndianAccessor; public final class InventoryMergeHandler extends AbstractMaplePacketHandler { @@ -43,7 +43,7 @@ public final class InventoryMergeHandler extends AbstractMaplePacketHandler { chr.getAutobanManager().setTimestamp(2, Server.getInstance().getCurrentTimestamp(), 4); if(!YamlConfig.config.server.USE_ITEM_SORT) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -106,7 +106,7 @@ public final class InventoryMergeHandler extends AbstractMaplePacketHandler { inventory.unlockInventory(); } - c.announce(MaplePacketCreator.finishedSort(inventoryType.getType())); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.finishedSort(inventoryType.getType())); + c.announce(PacketCreator.enableActions()); } } \ No newline at end of file diff --git a/src/main/java/net/server/channel/handlers/InventorySortHandler.java b/src/main/java/net/server/channel/handlers/InventorySortHandler.java index b993695db8..e3b63fe9a0 100644 --- a/src/main/java/net/server/channel/handlers/InventorySortHandler.java +++ b/src/main/java/net/server/channel/handlers/InventorySortHandler.java @@ -28,7 +28,7 @@ import config.YamlConfig; import net.AbstractMaplePacketHandler; import net.server.Server; import server.MapleItemInformationProvider; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import java.util.ArrayList; @@ -267,7 +267,7 @@ public final class InventorySortHandler extends AbstractMaplePacketHandler { chr.getAutobanManager().setTimestamp(3, Server.getInstance().getCurrentTimestamp(), 4); if(!YamlConfig.config.server.USE_ITEM_SORT) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -308,8 +308,8 @@ public final class InventorySortHandler extends AbstractMaplePacketHandler { inventory.unlockInventory(); } - c.announce(MaplePacketCreator.modifyInventory(true, mods)); - c.announce(MaplePacketCreator.finishedSort2(invType)); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.modifyInventory(true, mods)); + c.announce(PacketCreator.finishedSort2(invType)); + c.announce(PacketCreator.enableActions()); } } diff --git a/src/main/java/net/server/channel/handlers/ItemMoveHandler.java b/src/main/java/net/server/channel/handlers/ItemMoveHandler.java index 959232cd98..99c4594435 100644 --- a/src/main/java/net/server/channel/handlers/ItemMoveHandler.java +++ b/src/main/java/net/server/channel/handlers/ItemMoveHandler.java @@ -23,9 +23,9 @@ package net.server.channel.handlers; import client.MapleClient; import client.inventory.MapleInventoryType; -import net.AbstractMaplePacketHandler; import client.inventory.manipulator.MapleInventoryManipulator; -import tools.MaplePacketCreator; +import net.AbstractMaplePacketHandler; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -37,7 +37,7 @@ public final class ItemMoveHandler extends AbstractMaplePacketHandler { public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { slea.skip(4); if(c.getPlayer().getAutobanManager().getLastSpam(6) + 300 > currentServerTime()) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } diff --git a/src/main/java/net/server/channel/handlers/ItemRewardHandler.java b/src/main/java/net/server/channel/handlers/ItemRewardHandler.java index 6fc7586ecf..853f0f0c6d 100644 --- a/src/main/java/net/server/channel/handlers/ItemRewardHandler.java +++ b/src/main/java/net/server/channel/handlers/ItemRewardHandler.java @@ -24,18 +24,19 @@ package net.server.channel.handlers; import client.MapleClient; import client.inventory.Item; import client.inventory.MapleInventoryType; +import client.inventory.manipulator.MapleInventoryManipulator; import constants.inventory.ItemConstants; -import java.util.List; import net.AbstractMaplePacketHandler; import net.server.Server; -import client.inventory.manipulator.MapleInventoryManipulator; import server.MapleItemInformationProvider; import server.MapleItemInformationProvider.RewardItem; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.Randomizer; import tools.data.input.SeekableLittleEndianAccessor; +import java.util.List; + /** * @author Jay Estrella * @author kevintjuh93 @@ -53,7 +54,7 @@ public final class ItemRewardHandler extends AbstractMaplePacketHandler { Pair> rewards = ii.getItemReward(itemId); for (RewardItem reward : rewards.getRight()) { if (!MapleInventoryManipulator.checkSpace(c, reward.itemid, reward.quantity, "")) { - c.announce(MaplePacketCreator.getShowInventoryFull()); + c.announce(PacketCreator.getShowInventoryFull()); break; } if (Randomizer.nextInt(rewards.getLeft()) < reward.prob) {//Is it even possible to get an item with prob 1? @@ -71,11 +72,11 @@ public final class ItemRewardHandler extends AbstractMaplePacketHandler { String msg = reward.worldmsg; msg.replaceAll("/name", c.getPlayer().getName()); msg.replaceAll("/item", ii.getName(reward.itemid)); - Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.serverNotice(6, msg)); + Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, msg)); } break; } } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } diff --git a/src/main/java/net/server/channel/handlers/LeftKnockbackHandler.java b/src/main/java/net/server/channel/handlers/LeftKnockbackHandler.java index 7a71d85ce5..8a05b55cb0 100644 --- a/src/main/java/net/server/channel/handlers/LeftKnockbackHandler.java +++ b/src/main/java/net/server/channel/handlers/LeftKnockbackHandler.java @@ -24,7 +24,7 @@ package net.server.channel.handlers; import client.MapleClient; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -33,7 +33,7 @@ import tools.data.input.SeekableLittleEndianAccessor; */ public class LeftKnockbackHandler extends AbstractMaplePacketHandler { public void handlePacket(SeekableLittleEndianAccessor slea, final MapleClient c) { - c.announce(MaplePacketCreator.leftKnockBack()); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.leftKnockBack()); + c.announce(PacketCreator.enableActions()); } } diff --git a/src/main/java/net/server/channel/handlers/MTSHandler.java b/src/main/java/net/server/channel/handlers/MTSHandler.java index 97fce7ec6c..2b4b3aa46b 100644 --- a/src/main/java/net/server/channel/handlers/MTSHandler.java +++ b/src/main/java/net/server/channel/handlers/MTSHandler.java @@ -34,7 +34,7 @@ import net.server.channel.Channel; import server.MTSItemInfo; import server.MapleItemInformationProvider; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.data.input.SeekableLittleEndianAccessor; @@ -115,8 +115,8 @@ public final class MTSHandler extends AbstractMaplePacketHandler { if (rs.getInt(1) > 10) { //They have more than 10 items up for sale already! c.getPlayer().dropMessage(1, "You already have 10 items up for auction!"); c.announce(getMTS(1, 0, 0)); - c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); - c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); + c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); + c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); rs.close(); ps.close(); return; @@ -219,11 +219,11 @@ public final class MTSHandler extends AbstractMaplePacketHandler { e.printStackTrace(); } c.getPlayer().gainMeso(-5000, false); - c.announce(MaplePacketCreator.MTSConfirmSell()); + c.announce(PacketCreator.MTSConfirmSell()); c.announce(getMTS(1, 0, 0)); c.enableCSActions(); - c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); - c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); + c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); + c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); } } else if (op == 3) { //send offer for wanted item } else if (op == 4) { //list wanted item @@ -248,8 +248,8 @@ public final class MTSHandler extends AbstractMaplePacketHandler { c.getPlayer().changeTab(tab); c.getPlayer().changeType(type); c.enableCSActions(); - c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); - c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); + c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); + c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); } else if (op == 6) { //search int tab = slea.readInt(); int type = slea.readInt(); @@ -261,11 +261,11 @@ public final class MTSHandler extends AbstractMaplePacketHandler { c.getPlayer().changeType(type); c.getPlayer().changeCI(ci); c.enableCSActions(); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); c.announce(getMTSSearch(tab, type, ci, search, c.getPlayer().getCurrentPage())); - c.announce(MaplePacketCreator.showMTSCash(c.getPlayer())); - c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); - c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); + c.announce(PacketCreator.showMTSCash(c.getPlayer())); + c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); + c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); } else if (op == 7) { //cancel sale int id = slea.readInt(); //id of the item Connection con = null; @@ -286,8 +286,8 @@ public final class MTSHandler extends AbstractMaplePacketHandler { } c.enableCSActions(); c.announce(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage())); - c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); - c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); + c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); + c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); } else if (op == 8) { //transfer item from transfer inv. int id = slea.readInt(); //id of the item Connection con = null; @@ -346,8 +346,8 @@ public final class MTSHandler extends AbstractMaplePacketHandler { c.enableCSActions(); c.announce(getCart(c.getPlayer().getId())); c.announce(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage())); - c.announce(MaplePacketCreator.MTSConfirmTransfer(i.getQuantity(), i.getPosition())); - c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); + c.announce(PacketCreator.MTSConfirmTransfer(i.getQuantity(), i.getPosition())); + c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); } rs.close(); ps.close(); @@ -387,9 +387,9 @@ public final class MTSHandler extends AbstractMaplePacketHandler { } c.announce(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage())); c.enableCSActions(); - c.announce(MaplePacketCreator.enableActions()); - c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); - c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); + c.announce(PacketCreator.enableActions()); + c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); + c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); } else if (op == 10) { //delete from cart int id = slea.readInt(); //id of the item Connection con = null; @@ -406,8 +406,8 @@ public final class MTSHandler extends AbstractMaplePacketHandler { } c.announce(getCart(c.getPlayer().getId())); c.enableCSActions(); - c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); - c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); + c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); + c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); } else if (op == 12) { //put item up for auction } else if (op == 13) { //cancel wanted cart thing } else if (op == 14) { //buy auction item now @@ -459,13 +459,13 @@ public final class MTSHandler extends AbstractMaplePacketHandler { c.getPlayer().getCashShop().gainCash(4, -price); c.enableCSActions(); c.announce(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage())); - c.announce(MaplePacketCreator.MTSConfirmBuy()); - c.announce(MaplePacketCreator.showMTSCash(c.getPlayer())); - c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); - c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.MTSConfirmBuy()); + c.announce(PacketCreator.showMTSCash(c.getPlayer())); + c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); + c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); + c.announce(PacketCreator.enableActions()); } else { - c.announce(MaplePacketCreator.MTSFailBuy()); + c.announce(PacketCreator.MTSFailBuy()); } } rs.close(); @@ -473,7 +473,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler { con.close(); } catch (SQLException e) { e.printStackTrace(); - c.announce(MaplePacketCreator.MTSFailBuy()); + c.announce(PacketCreator.MTSFailBuy()); } } else if (op == 17) { //buy from cart int id = slea.readInt(); //id of the item @@ -520,12 +520,12 @@ public final class MTSHandler extends AbstractMaplePacketHandler { c.getPlayer().getCashShop().gainCash(4, -price); c.announce(getCart(c.getPlayer().getId())); c.enableCSActions(); - c.announce(MaplePacketCreator.MTSConfirmBuy()); - c.announce(MaplePacketCreator.showMTSCash(c.getPlayer())); - c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); - c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); + c.announce(PacketCreator.MTSConfirmBuy()); + c.announce(PacketCreator.showMTSCash(c.getPlayer())); + c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); + c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); } else { - c.announce(MaplePacketCreator.MTSFailBuy()); + c.announce(PacketCreator.MTSFailBuy()); } } rs.close(); @@ -533,13 +533,13 @@ public final class MTSHandler extends AbstractMaplePacketHandler { con.close(); } catch (SQLException e) { e.printStackTrace(); - c.announce(MaplePacketCreator.MTSFailBuy()); + c.announce(PacketCreator.MTSFailBuy()); } } else { System.out.println("Unhandled OP(MTS): " + op + " Packet: " + slea.toString()); } } else { - c.announce(MaplePacketCreator.showMTSCash(c.getPlayer())); + c.announce(PacketCreator.showMTSCash(c.getPlayer())); } } @@ -668,7 +668,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler { } catch (SQLException e) { e.printStackTrace(); } - return MaplePacketCreator.sendMTS(items, 4, 0, 0, pages); + return PacketCreator.sendMTS(items, 4, 0, 0, pages); } public List getTransfer(int cid) { @@ -803,7 +803,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler { } catch (SQLException e) { e.printStackTrace(); } - return MaplePacketCreator.sendMTS(items, tab, type, page, pages); // resniff + return PacketCreator.sendMTS(items, tab, type, page, pages); // resniff } public byte[] getMTSSearch(int tab, int type, int cOi, String search, int page) { @@ -904,6 +904,6 @@ public final class MTSHandler extends AbstractMaplePacketHandler { } catch (SQLException e) { e.printStackTrace(); } - return MaplePacketCreator.sendMTS(items, tab, type, page, pages); + return PacketCreator.sendMTS(items, tab, type, page, pages); } } diff --git a/src/main/java/net/server/channel/handlers/MagicDamageHandler.java b/src/main/java/net/server/channel/handlers/MagicDamageHandler.java index b1f9c56303..72f00f05f4 100644 --- a/src/main/java/net/server/channel/handlers/MagicDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/MagicDamageHandler.java @@ -21,11 +21,7 @@ */ package net.server.channel.handlers; -import client.MapleBuffStat; -import client.MapleCharacter; -import client.MapleClient; -import client.Skill; -import client.SkillFactory; +import client.*; import config.YamlConfig; import constants.game.GameConstants; import constants.skills.Bishop; @@ -33,7 +29,7 @@ import constants.skills.Evan; import constants.skills.FPArchMage; import constants.skills.ILArchMage; import server.MapleStatEffect; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class MagicDamageHandler extends AbstractDealDamageHandler { @@ -59,11 +55,11 @@ public final class MagicDamageHandler extends AbstractDealDamageHandler { if (GameConstants.isDojo(chr.getMap().getId()) && attack.numAttacked > 0) { chr.setDojoEnergy(chr.getDojoEnergy() + + YamlConfig.config.server.DOJO_ENERGY_ATK); - c.announce(MaplePacketCreator.getEnergy("energy", chr.getDojoEnergy())); + c.announce(PacketCreator.getEnergy("energy", chr.getDojoEnergy())); } int charge = (attack.skill == Evan.FIRE_BREATH || attack.skill == Evan.ICE_BREATH || attack.skill == FPArchMage.BIG_BANG || attack.skill == ILArchMage.BIG_BANG || attack.skill == Bishop.BIG_BANG) ? attack.charge : -1; - byte[] packet = MaplePacketCreator.magicAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, attack.allDamage, charge, attack.speed, attack.direction, attack.display); + byte[] packet = PacketCreator.magicAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, attack.allDamage, charge, attack.speed, attack.direction, attack.display); chr.getMap().broadcastMessage(chr, packet, false, true); MapleStatEffect effect = attack.getAttackEffect(chr, null); @@ -73,7 +69,7 @@ public final class MagicDamageHandler extends AbstractDealDamageHandler { if (chr.skillIsCooling(attack.skill)) { return; } else { - c.announce(MaplePacketCreator.skillCooldown(attack.skill, effect_.getCooldown())); + c.announce(PacketCreator.skillCooldown(attack.skill, effect_.getCooldown())); chr.addCooldown(attack.skill, currentServerTime(), effect_.getCooldown() * 1000); } } diff --git a/src/main/java/net/server/channel/handlers/MesoDropHandler.java b/src/main/java/net/server/channel/handlers/MesoDropHandler.java index e401d00582..cd37bc745f 100644 --- a/src/main/java/net/server/channel/handlers/MesoDropHandler.java +++ b/src/main/java/net/server/channel/handlers/MesoDropHandler.java @@ -21,11 +21,11 @@ */ package net.server.channel.handlers; -import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; -import tools.data.input.SeekableLittleEndianAccessor; import client.MapleCharacter; import client.MapleClient; +import net.AbstractMaplePacketHandler; +import tools.PacketCreator; +import tools.data.input.SeekableLittleEndianAccessor; /** * @@ -37,7 +37,7 @@ public final class MesoDropHandler extends AbstractMaplePacketHandler { public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { MapleCharacter player = c.getPlayer(); if (!player.isAlive()) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } slea.skip(4); @@ -48,14 +48,14 @@ public final class MesoDropHandler extends AbstractMaplePacketHandler { if (meso <= player.getMeso() && meso > 9 && meso < 50001) { player.gainMeso(-meso, false, true, false); } else { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } } finally { c.releaseClient(); } } else { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } diff --git a/src/main/java/net/server/channel/handlers/MessengerHandler.java b/src/main/java/net/server/channel/handlers/MessengerHandler.java index e30b9a8aca..62efac1f3b 100644 --- a/src/main/java/net/server/channel/handlers/MessengerHandler.java +++ b/src/main/java/net/server/channel/handlers/MessengerHandler.java @@ -31,7 +31,7 @@ import net.server.coordinator.world.MapleInviteCoordinator.MapleInviteResult; import net.server.world.MapleMessenger; import net.server.world.MapleMessengerCharacter; import net.server.world.World; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class MessengerHandler extends AbstractMaplePacketHandler { @@ -82,30 +82,30 @@ public final class MessengerHandler extends AbstractMaplePacketHandler { break; case 0x03: if (messenger == null) { - c.announce(MaplePacketCreator.messengerChat(player.getName() + " : This Maple Messenger is currently unavailable. Please quit this chat.")); + c.announce(PacketCreator.messengerChat(player.getName() + " : This Maple Messenger is currently unavailable. Please quit this chat.")); } else if (messenger.getMembers().size() < 3) { input = slea.readMapleAsciiString(); MapleCharacter target = c.getChannelServer().getPlayerStorage().getCharacterByName(input); if (target != null) { if (target.getMessenger() == null) { if (MapleInviteCoordinator.createInvite(InviteType.MESSENGER, c.getPlayer(), messenger.getId(), target.getId())) { - target.getClient().announce(MaplePacketCreator.messengerInvite(c.getPlayer().getName(), messenger.getId())); - c.announce(MaplePacketCreator.messengerNote(input, 4, 1)); + target.getClient().announce(PacketCreator.messengerInvite(c.getPlayer().getName(), messenger.getId())); + c.announce(PacketCreator.messengerNote(input, 4, 1)); } else { - c.announce(MaplePacketCreator.messengerChat(player.getName() + " : " + input + " is already managing a Maple Messenger invitation")); + c.announce(PacketCreator.messengerChat(player.getName() + " : " + input + " is already managing a Maple Messenger invitation")); } } else { - c.announce(MaplePacketCreator.messengerChat(player.getName() + " : " + input + " is already using Maple Messenger")); + c.announce(PacketCreator.messengerChat(player.getName() + " : " + input + " is already using Maple Messenger")); } } else { if (world.find(input) > -1) { world.messengerInvite(c.getPlayer().getName(), messenger.getId(), input, c.getChannel()); } else { - c.announce(MaplePacketCreator.messengerNote(input, 4, 0)); + c.announce(PacketCreator.messengerNote(input, 4, 0)); } } } else { - c.announce(MaplePacketCreator.messengerChat(player.getName() + " : You cannot have more than 3 people in the Maple Messenger")); + c.announce(PacketCreator.messengerChat(player.getName() + " : You cannot have more than 3 people in the Maple Messenger")); } break; case 0x05: diff --git a/src/main/java/net/server/channel/handlers/MobDamageMobFriendlyHandler.java b/src/main/java/net/server/channel/handlers/MobDamageMobFriendlyHandler.java index 39c318e64b..ec5a787e86 100644 --- a/src/main/java/net/server/channel/handlers/MobDamageMobFriendlyHandler.java +++ b/src/main/java/net/server/channel/handlers/MobDamageMobFriendlyHandler.java @@ -21,14 +21,14 @@ */ package net.server.channel.handlers; +import client.MapleClient; import net.AbstractMaplePacketHandler; import scripting.event.EventInstanceManager; import server.life.MapleMonster; import server.maps.MapleMap; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Randomizer; import tools.data.input.SeekableLittleEndianAccessor; -import client.MapleClient; /** * @@ -53,19 +53,19 @@ public final class MobDamageMobFriendlyHandler extends AbstractMaplePacketHandle if (monster.getHp() - damage < 1) { // friendly dies if(monster.getId() == 9300102) { - map.broadcastMessage(MaplePacketCreator.serverNotice(6, "The Watch Hog has been injured by the aliens. Better luck next time...")); + map.broadcastMessage(PacketCreator.serverNotice(6, "The Watch Hog has been injured by the aliens. Better luck next time...")); } else if (monster.getId() == 9300061) { //moon bunny - map.broadcastMessage(MaplePacketCreator.serverNotice(6, "The Moon Bunny went home because he was sick.")); + map.broadcastMessage(PacketCreator.serverNotice(6, "The Moon Bunny went home because he was sick.")); } else if(monster.getId() == 9300093) { //tylus - map.broadcastMessage(MaplePacketCreator.serverNotice(6, "Tylus has fallen by the overwhelming forces of the ambush.")); + map.broadcastMessage(PacketCreator.serverNotice(6, "Tylus has fallen by the overwhelming forces of the ambush.")); } else if(monster.getId() == 9300137) { //juliet - map.broadcastMessage(MaplePacketCreator.serverNotice(6, "Juliet has fainted in the middle of the combat.")); + map.broadcastMessage(PacketCreator.serverNotice(6, "Juliet has fainted in the middle of the combat.")); } else if(monster.getId() == 9300138) { //romeo - map.broadcastMessage(MaplePacketCreator.serverNotice(6, "Romeo has fainted in the middle of the combat.")); + map.broadcastMessage(PacketCreator.serverNotice(6, "Romeo has fainted in the middle of the combat.")); } else if(monster.getId() == 9400322 || monster.getId() == 9400327 || monster.getId() == 9400332) { //snowman - map.broadcastMessage(MaplePacketCreator.serverNotice(6, "The Snowman has melted on the heat of the battle.")); + map.broadcastMessage(PacketCreator.serverNotice(6, "The Snowman has melted on the heat of the battle.")); } else if(monster.getId() == 9300162) { //delli - map.broadcastMessage(MaplePacketCreator.serverNotice(6, "Delli vanished after the ambush, sheets still laying on the ground...")); + map.broadcastMessage(PacketCreator.serverNotice(6, "Delli vanished after the ambush, sheets still laying on the ground...")); } map.killFriendlies(monster); @@ -83,7 +83,7 @@ public final class MobDamageMobFriendlyHandler extends AbstractMaplePacketHandle map.removeMapObject(monster); } - map.broadcastMessage(MaplePacketCreator.MobDamageMobFriendly(monster, damage, remainingHp), monster.getPosition()); - c.announce(MaplePacketCreator.enableActions()); + map.broadcastMessage(PacketCreator.MobDamageMobFriendly(monster, damage, remainingHp), monster.getPosition()); + c.announce(PacketCreator.enableActions()); } } \ No newline at end of file diff --git a/src/main/java/net/server/channel/handlers/MobDamageMobHandler.java b/src/main/java/net/server/channel/handlers/MobDamageMobHandler.java index f6d8ac7b0d..989063f3f2 100644 --- a/src/main/java/net/server/channel/handlers/MobDamageMobHandler.java +++ b/src/main/java/net/server/channel/handlers/MobDamageMobHandler.java @@ -21,9 +21,8 @@ */ package net.server.channel.handlers; -import java.util.Map; -import client.MapleClient; import client.MapleCharacter; +import client.MapleClient; import client.autoban.AutobanFactory; import client.status.MonsterStatus; import client.status.MonsterStatusEffect; @@ -32,9 +31,11 @@ import server.life.MapleMonster; import server.life.MapleMonsterInformationProvider; import server.maps.MapleMap; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; +import java.util.Map; + /** * * @author Jay Estrella @@ -65,7 +66,7 @@ public final class MobDamageMobHandler extends AbstractMaplePacketHandler { } map.damageMonster(chr, damaged, dmg); - map.broadcastMessage(chr, MaplePacketCreator.damageMonster(to, dmg), false); + map.broadcastMessage(chr, PacketCreator.damageMonster(to, dmg), false); } } diff --git a/src/main/java/net/server/channel/handlers/MonsterBombHandler.java b/src/main/java/net/server/channel/handlers/MonsterBombHandler.java index 56568d1f9d..7b1d637214 100644 --- a/src/main/java/net/server/channel/handlers/MonsterBombHandler.java +++ b/src/main/java/net/server/channel/handlers/MonsterBombHandler.java @@ -24,7 +24,7 @@ package net.server.channel.handlers; import client.MapleClient; import net.AbstractMaplePacketHandler; import server.life.MapleMonster; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class MonsterBombHandler extends AbstractMaplePacketHandler { @@ -36,7 +36,7 @@ public final class MonsterBombHandler extends AbstractMaplePacketHandler { return; } if (monster.getId() == 8500003 || monster.getId() == 8500004) { - monster.getMap().broadcastMessage(MaplePacketCreator.killMonster(monster.getObjectId(), 4)); + monster.getMap().broadcastMessage(PacketCreator.killMonster(monster.getObjectId(), 4)); c.getPlayer().getMap().removeMapObject(oid); } } diff --git a/src/main/java/net/server/channel/handlers/MonsterBookCoverHandler.java b/src/main/java/net/server/channel/handlers/MonsterBookCoverHandler.java index ebe97ea7d7..abb60a2b92 100644 --- a/src/main/java/net/server/channel/handlers/MonsterBookCoverHandler.java +++ b/src/main/java/net/server/channel/handlers/MonsterBookCoverHandler.java @@ -23,15 +23,15 @@ package net.server.channel.handlers; import client.MapleClient; import net.AbstractMaplePacketHandler; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; -import tools.MaplePacketCreator; public final class MonsterBookCoverHandler extends AbstractMaplePacketHandler { public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { int id = slea.readInt(); if (id == 0 || id / 10000 == 238) { c.getPlayer().setMonsterBookCover(id); - c.announce(MaplePacketCreator.changeCover(id)); + c.announce(PacketCreator.changeCover(id)); } } } diff --git a/src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java b/src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java index 7878dd3254..912aac9463 100644 --- a/src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java +++ b/src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java @@ -24,8 +24,6 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; import client.MapleDisease; -import java.awt.Point; -import java.util.List; import net.AbstractMaplePacketHandler; import net.server.world.MapleParty; import net.server.world.MaplePartyCharacter; @@ -34,10 +32,13 @@ import server.life.MapleMonster; import server.partyquest.MapleCarnivalFactory; import server.partyquest.MapleCarnivalFactory.MCSkill; import server.partyquest.MonsterCarnival; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.data.input.SeekableLittleEndianAccessor; +import java.awt.*; +import java.util.List; + /** *@author Drago (Dragohe4rt) @@ -56,8 +57,8 @@ public final class MonsterCarnivalHandler extends AbstractMaplePacketHandler { if (tab == 0) { final List> mobs = c.getPlayer().getMap().getMobsToSpawn(); if (num >= mobs.size() || c.getPlayer().getCP() < mobs.get(num).right) { - c.announce(MaplePacketCreator.CPQMessage((byte) 1)); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.CPQMessage((byte) 1)); + c.announce(PacketCreator.enableActions()); return; } @@ -65,8 +66,8 @@ public final class MonsterCarnivalHandler extends AbstractMaplePacketHandler { MonsterCarnival mcpq = c.getPlayer().getMonsterCarnival(); if (mcpq != null) { if (!mcpq.canSummonR() && c.getPlayer().getTeam() == 0 || !mcpq.canSummonB() && c.getPlayer().getTeam() == 1) { - c.announce(MaplePacketCreator.CPQMessage((byte) 2)); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.CPQMessage((byte) 2)); + c.announce(PacketCreator.enableActions()); return; } @@ -81,7 +82,7 @@ public final class MonsterCarnivalHandler extends AbstractMaplePacketHandler { c.getPlayer().getMap().addMonsterSpawn(mob, 1, c.getPlayer().getTeam()); c.getPlayer().getMap().addAllMonsterSpawn(mob, 1, c.getPlayer().getTeam()); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } neededCP = mobs.get(num).right; @@ -89,13 +90,13 @@ public final class MonsterCarnivalHandler extends AbstractMaplePacketHandler { final List skillid = c.getPlayer().getMap().getSkillIds(); if (num >= skillid.size()) { c.getPlayer().dropMessage(5, "An unexpected error has occurred."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } final MCSkill skill = MapleCarnivalFactory.getInstance().getSkill(skillid.get(num)); //ugh wtf if (skill == null || c.getPlayer().getCP() < skill.cpLoss) { - c.announce(MaplePacketCreator.CPQMessage((byte) 1)); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.CPQMessage((byte) 1)); + c.announce(PacketCreator.enableActions()); return; } final MapleDisease dis = skill.getDisease(); @@ -130,20 +131,20 @@ public final class MonsterCarnivalHandler extends AbstractMaplePacketHandler { } } neededCP = skill.cpLoss; - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } else if (tab == 2) { //protectors final MCSkill skill = MapleCarnivalFactory.getInstance().getGuardian(num); if (skill == null || c.getPlayer().getCP() < skill.cpLoss) { - c.announce(MaplePacketCreator.CPQMessage((byte) 1)); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.CPQMessage((byte) 1)); + c.announce(PacketCreator.enableActions()); return; } MonsterCarnival mcpq = c.getPlayer().getMonsterCarnival(); if (mcpq != null) { if (!mcpq.canGuardianR() && c.getPlayer().getTeam() == 0 || !mcpq.canGuardianB() && c.getPlayer().getTeam() == 1) { - c.announce(MaplePacketCreator.CPQMessage((byte) 2)); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.CPQMessage((byte) 2)); + c.announce(PacketCreator.enableActions()); return; } @@ -151,17 +152,17 @@ public final class MonsterCarnivalHandler extends AbstractMaplePacketHandler { if (success != 1) { switch (success) { case -1: - c.announce(MaplePacketCreator.CPQMessage((byte) 3)); + c.announce(PacketCreator.CPQMessage((byte) 3)); break; case 0: - c.announce(MaplePacketCreator.CPQMessage((byte) 4)); + c.announce(PacketCreator.CPQMessage((byte) 4)); break; default: - c.announce(MaplePacketCreator.CPQMessage((byte) 3)); + c.announce(PacketCreator.CPQMessage((byte) 3)); } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } else { neededCP = skill.cpLoss; @@ -169,7 +170,7 @@ public final class MonsterCarnivalHandler extends AbstractMaplePacketHandler { } } c.getPlayer().gainCP(-neededCP); - c.getPlayer().getMap().broadcastMessage(MaplePacketCreator.playerSummoned(c.getPlayer().getName(), tab, num)); + c.getPlayer().getMap().broadcastMessage(PacketCreator.playerSummoned(c.getPlayer().getName(), tab, num)); }catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/net/server/channel/handlers/MoveDragonHandler.java b/src/main/java/net/server/channel/handlers/MoveDragonHandler.java index d66e0abac0..2195e42d76 100644 --- a/src/main/java/net/server/channel/handlers/MoveDragonHandler.java +++ b/src/main/java/net/server/channel/handlers/MoveDragonHandler.java @@ -21,15 +21,15 @@ along with this program. If not, see . */ package net.server.channel.handlers; -import java.awt.Point; - import client.MapleCharacter; import client.MapleClient; import server.maps.MapleDragon; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import tools.exceptions.EmptyMovementException; +import java.awt.*; + public class MoveDragonHandler extends AbstractMovementPacketHandler { @Override @@ -45,9 +45,9 @@ public class MoveDragonHandler extends AbstractMovementPacketHandler { slea.seek(movementDataStart); if (chr.isHidden()) { - chr.getMap().broadcastGMMessage(chr, MaplePacketCreator.moveDragon(dragon, startPos, slea, movementDataLength)); + chr.getMap().broadcastGMMessage(chr, PacketCreator.moveDragon(dragon, startPos, slea, movementDataLength)); } else { - chr.getMap().broadcastMessage(chr, MaplePacketCreator.moveDragon(dragon, startPos, slea, movementDataLength), dragon.getPosition()); + chr.getMap().broadcastMessage(chr, PacketCreator.moveDragon(dragon, startPos, slea, movementDataLength), dragon.getPosition()); } } catch (EmptyMovementException e) {} } diff --git a/src/main/java/net/server/channel/handlers/MoveLifeHandler.java b/src/main/java/net/server/channel/handlers/MoveLifeHandler.java index 370bc3011b..bd0d6ba87c 100644 --- a/src/main/java/net/server/channel/handlers/MoveLifeHandler.java +++ b/src/main/java/net/server/channel/handlers/MoveLifeHandler.java @@ -23,26 +23,24 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; -import java.awt.Point; -import java.util.LinkedList; -import java.util.List; - import config.YamlConfig; import server.life.MapleMonster; import server.life.MapleMonsterInformationProvider; -//import server.life.MobAttackInfo; -//import server.life.MobAttackInfoFactory; import server.life.MobSkill; import server.life.MobSkillFactory; import server.maps.MapleMap; import server.maps.MapleMapObject; import server.maps.MapleMapObjectType; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.Randomizer; import tools.data.input.SeekableLittleEndianAccessor; import tools.exceptions.EmptyMovementException; +import java.awt.*; +import java.util.LinkedList; +import java.util.List; + /** * @author Danny (Leifde) * @author ExtremeDevilz @@ -152,9 +150,9 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler { if (aggro == null) return; if (nextUse != null) { - c.announce(MaplePacketCreator.moveMonsterResponse(objectid, moveid, mobMp, aggro, nextSkillId, nextSkillLevel)); + c.announce(PacketCreator.moveMonsterResponse(objectid, moveid, mobMp, aggro, nextSkillId, nextSkillLevel)); } else { - c.announce(MaplePacketCreator.moveMonsterResponse(objectid, moveid, mobMp, aggro)); + c.announce(PacketCreator.moveMonsterResponse(objectid, moveid, mobMp, aggro)); } @@ -168,7 +166,7 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler { System.out.println((isSkill ? "SKILL " : (isAttack ? "ATTCK " : " ")) + "castPos: " + castPos + " rawAct: " + rawActivity + " opt: " + pOption + " skillID: " + useSkillId + " skillLV: " + useSkillLevel + " " + "allowSkill: " + nextMovementCouldBeSkill + " mobMp: " + mobMp); } - map.broadcastMessage(player, MaplePacketCreator.moveMonster(objectid, nextMovementCouldBeSkill, rawActivity, useSkillId, useSkillLevel, pOption, startPos, slea, movementDataLength), serverStartPos); + map.broadcastMessage(player, PacketCreator.moveMonster(objectid, nextMovementCouldBeSkill, rawActivity, useSkillId, useSkillLevel, pOption, startPos, slea, movementDataLength), serverStartPos); //updatePosition(res, monster, -2); //does this need to be done after the packet is broadcast? map.moveMonster(monster, monster.getPosition()); } catch (EmptyMovementException e) {} diff --git a/src/main/java/net/server/channel/handlers/MovePetHandler.java b/src/main/java/net/server/channel/handlers/MovePetHandler.java index fd8b120ab7..2cd3a154e8 100644 --- a/src/main/java/net/server/channel/handlers/MovePetHandler.java +++ b/src/main/java/net/server/channel/handlers/MovePetHandler.java @@ -21,14 +21,15 @@ */ package net.server.channel.handlers; -import java.util.List; import client.MapleCharacter; import client.MapleClient; import server.movement.LifeMovementFragment; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import tools.exceptions.EmptyMovementException; +import java.util.List; + public final class MovePetHandler extends AbstractMovementPacketHandler { @Override public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { @@ -48,6 +49,6 @@ public final class MovePetHandler extends AbstractMovementPacketHandler { return; } player.getPet(slot).updatePosition(res); - player.getMap().broadcastMessage(player, MaplePacketCreator.movePet(player.getId(), petId, slot, res), false); + player.getMap().broadcastMessage(player, PacketCreator.movePet(player.getId(), petId, slot, res), false); } } diff --git a/src/main/java/net/server/channel/handlers/MovePlayerHandler.java b/src/main/java/net/server/channel/handlers/MovePlayerHandler.java index 85fc546951..058ee194c5 100644 --- a/src/main/java/net/server/channel/handlers/MovePlayerHandler.java +++ b/src/main/java/net/server/channel/handlers/MovePlayerHandler.java @@ -22,7 +22,7 @@ package net.server.channel.handlers; import client.MapleClient; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import tools.exceptions.EmptyMovementException; @@ -38,9 +38,9 @@ public final class MovePlayerHandler extends AbstractMovementPacketHandler { c.getPlayer().getMap().movePlayer(c.getPlayer(), c.getPlayer().getPosition()); if (c.getPlayer().isHidden()) { - c.getPlayer().getMap().broadcastGMMessage(c.getPlayer(), MaplePacketCreator.movePlayer(c.getPlayer().getId(), slea, movementDataLength), false); + c.getPlayer().getMap().broadcastGMMessage(c.getPlayer(), PacketCreator.movePlayer(c.getPlayer().getId(), slea, movementDataLength), false); } else { - c.getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.movePlayer(c.getPlayer().getId(), slea, movementDataLength), false); + c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.movePlayer(c.getPlayer().getId(), slea, movementDataLength), false); } } catch (EmptyMovementException e) {} } diff --git a/src/main/java/net/server/channel/handlers/MoveSummonHandler.java b/src/main/java/net/server/channel/handlers/MoveSummonHandler.java index a6cf0a4420..2d74ea8ae6 100644 --- a/src/main/java/net/server/channel/handlers/MoveSummonHandler.java +++ b/src/main/java/net/server/channel/handlers/MoveSummonHandler.java @@ -21,16 +21,16 @@ */ package net.server.channel.handlers; -import java.awt.Point; -import java.util.Collection; - import client.MapleCharacter; import client.MapleClient; import server.maps.MapleSummon; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import tools.exceptions.EmptyMovementException; +import java.awt.*; +import java.util.Collection; + public final class MoveSummonHandler extends AbstractMovementPacketHandler { @Override public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { @@ -52,7 +52,7 @@ public final class MoveSummonHandler extends AbstractMovementPacketHandler { long movementDataLength = slea.getPosition() - movementDataStart; //how many bytes were read by updatePosition slea.seek(movementDataStart); - player.getMap().broadcastMessage(player, MaplePacketCreator.moveSummon(player.getId(), oid, startPos, slea, movementDataLength), summon.getPosition()); + player.getMap().broadcastMessage(player, PacketCreator.moveSummon(player.getId(), oid, startPos, slea, movementDataLength), summon.getPosition()); } catch (EmptyMovementException e) {} } } diff --git a/src/main/java/net/server/channel/handlers/MultiChatHandler.java b/src/main/java/net/server/channel/handlers/MultiChatHandler.java index df75fd41b5..c9d98c2aca 100644 --- a/src/main/java/net/server/channel/handlers/MultiChatHandler.java +++ b/src/main/java/net/server/channel/handlers/MultiChatHandler.java @@ -30,7 +30,7 @@ import net.server.Server; import net.server.world.World; import tools.FilePrinter; import tools.LogHelper; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class MultiChatHandler extends AbstractMaplePacketHandler { @@ -73,7 +73,7 @@ public final class MultiChatHandler extends AbstractMaplePacketHandler { } else if (type == 3 && player.getGuild() != null) { int allianceId = player.getGuild().getAllianceId(); if (allianceId > 0) { - Server.getInstance().allianceMessage(allianceId, MaplePacketCreator.multiChat(player.getName(), chattext, 3), player.getId(), -1); + Server.getInstance().allianceMessage(allianceId, PacketCreator.multiChat(player.getName(), chattext, 3), player.getId(), -1); if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) { LogHelper.logChat(c, "Ally", chattext); } diff --git a/src/main/java/net/server/channel/handlers/NPCTalkHandler.java b/src/main/java/net/server/channel/handlers/NPCTalkHandler.java index 73fec20467..a283e495b2 100644 --- a/src/main/java/net/server/channel/handlers/NPCTalkHandler.java +++ b/src/main/java/net/server/channel/handlers/NPCTalkHandler.java @@ -27,22 +27,22 @@ import config.YamlConfig; import net.AbstractMaplePacketHandler; import scripting.npc.NPCScriptManager; import server.life.MapleNPC; -import server.maps.MapleMapObject; import server.life.MaplePlayerNPC; +import server.maps.MapleMapObject; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class NPCTalkHandler extends AbstractMaplePacketHandler { @Override public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { if (!c.getPlayer().isAlive()) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } if(currentServerTime() - c.getPlayer().getNpcCooldown() < YamlConfig.config.server.BLOCK_NPC_RACE_CONDT) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -56,7 +56,7 @@ public final class NPCTalkHandler extends AbstractMaplePacketHandler { DueyProcessor.dueySendTalk(c, false); } else { if (c.getCM() != null || c.getQM() != null) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -74,7 +74,7 @@ public final class NPCTalkHandler extends AbstractMaplePacketHandler { FilePrinter.printError(FilePrinter.NPC_UNCODED, "NPC " + npc.getName() + "(" + npc.getId() + ") is not coded."); return; } else if (c.getPlayer().getShop() != null) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } diff --git a/src/main/java/net/server/channel/handlers/NewYearCardHandler.java b/src/main/java/net/server/channel/handlers/NewYearCardHandler.java index af7d3102bb..0c351feed2 100644 --- a/src/main/java/net/server/channel/handlers/NewYearCardHandler.java +++ b/src/main/java/net/server/channel/handlers/NewYearCardHandler.java @@ -19,21 +19,21 @@ */ package net.server.channel.handlers; -import constants.inventory.ItemConstants; - import client.MapleCharacter; import client.MapleClient; import client.inventory.Item; import client.newyear.NewYearCardRecord; +import constants.inventory.ItemConstants; +import net.AbstractMaplePacketHandler; +import net.server.Server; +import tools.DatabaseConnection; +import tools.PacketCreator; +import tools.data.input.SeekableLittleEndianAccessor; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import net.AbstractMaplePacketHandler; -import net.server.Server; -import tools.DatabaseConnection; -import tools.MaplePacketCreator; -import tools.data.input.SeekableLittleEndianAccessor; /** * @@ -72,21 +72,21 @@ public final class NewYearCardHandler extends AbstractMaplePacketHandler { Server.getInstance().setNewYearCard(newyear); newyear.startNewYearCardTask(); - player.announce(MaplePacketCreator.onNewYearCardRes(player, newyear, 4, 0)); // successfully sent + player.announce(PacketCreator.onNewYearCardRes(player, newyear, 4, 0)); // successfully sent } else { - player.announce(MaplePacketCreator.onNewYearCardRes(player, -1, 5, 0xF)); // cannot send to yourself + player.announce(PacketCreator.onNewYearCardRes(player, -1, 5, 0xF)); // cannot send to yourself } } else { - player.announce(MaplePacketCreator.onNewYearCardRes(player, -1, 5, 0x13)); // cannot find such character + player.announce(PacketCreator.onNewYearCardRes(player, -1, 5, 0x13)); // cannot find such character } } else { - player.announce(MaplePacketCreator.onNewYearCardRes(player, -1, 5, 0x10)); // inventory full + player.announce(PacketCreator.onNewYearCardRes(player, -1, 5, 0x10)); // inventory full } } else { - player.announce(MaplePacketCreator.onNewYearCardRes(player, -1, 5, status)); // item and inventory errors + player.announce(PacketCreator.onNewYearCardRes(player, -1, 5, status)); // item and inventory errors } } else { - player.announce(MaplePacketCreator.onNewYearCardRes(player, -1, 5, 0x11)); // have no card to send + player.announce(PacketCreator.onNewYearCardRes(player, -1, 5, 0x11)); // have no card to send } } else { //receiver accepted the card int cardid = slea.readInt(); @@ -103,17 +103,17 @@ public final class NewYearCardHandler extends AbstractMaplePacketHandler { if(!newyear.getMessage().isEmpty()) player.dropMessage(6, "[New Year] " + newyear.getSenderName() + ": " + newyear.getMessage()); player.addNewYearRecord(newyear); - player.announce(MaplePacketCreator.onNewYearCardRes(player, newyear, 6, 0)); // successfully rcvd + player.announce(PacketCreator.onNewYearCardRes(player, newyear, 6, 0)); // successfully rcvd - player.getMap().broadcastMessage(MaplePacketCreator.onNewYearCardRes(player, newyear, 0xD, 0)); + player.getMap().broadcastMessage(PacketCreator.onNewYearCardRes(player, newyear, 0xD, 0)); MapleCharacter sender = c.getWorldServer().getPlayerStorage().getCharacterById(newyear.getSenderId()); if(sender != null && sender.isLoggedinWorld()) { - sender.getMap().broadcastMessage(MaplePacketCreator.onNewYearCardRes(sender, newyear, 0xD, 0)); + sender.getMap().broadcastMessage(PacketCreator.onNewYearCardRes(sender, newyear, 0xD, 0)); sender.dropMessage(6, "[New Year] Your addressee successfully received the New Year card."); } } else { - player.announce(MaplePacketCreator.onNewYearCardRes(player, -1, 5, 0x10)); // inventory full + player.announce(PacketCreator.onNewYearCardRes(player, -1, 5, 0x10)); // inventory full } } else { player.dropMessage(6, "[New Year] The sender of the New Year card already dropped it. Nothing to receive."); diff --git a/src/main/java/net/server/channel/handlers/NoteActionHandler.java b/src/main/java/net/server/channel/handlers/NoteActionHandler.java index 9c7689bc38..00d5cb5d90 100644 --- a/src/main/java/net/server/channel/handlers/NoteActionHandler.java +++ b/src/main/java/net/server/channel/handlers/NoteActionHandler.java @@ -24,7 +24,7 @@ package net.server.channel.handlers; import client.MapleClient; import net.AbstractMaplePacketHandler; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import java.sql.Connection; @@ -41,7 +41,7 @@ public final class NoteActionHandler extends AbstractMaplePacketHandler { String message = slea.readMapleAsciiString(); try { if (c.getPlayer().getCashShop().isOpened()) { - c.announce(MaplePacketCreator.showCashInventory(c)); + c.announce(PacketCreator.showCashInventory(c)); } c.getPlayer().sendNote(charname, message, (byte) 1); diff --git a/src/main/java/net/server/channel/handlers/OpenFamilyHandler.java b/src/main/java/net/server/channel/handlers/OpenFamilyHandler.java index 0811842ed8..f4be5f63d7 100644 --- a/src/main/java/net/server/channel/handlers/OpenFamilyHandler.java +++ b/src/main/java/net/server/channel/handlers/OpenFamilyHandler.java @@ -19,11 +19,11 @@ */ package net.server.channel.handlers; -import config.YamlConfig; import client.MapleCharacter; import client.MapleClient; +import config.YamlConfig; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -35,7 +35,7 @@ public final class OpenFamilyHandler extends AbstractMaplePacketHandler { public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) return; MapleCharacter chr = c.getPlayer(); - c.announce(MaplePacketCreator.getFamilyInfo(chr.getFamilyEntry())); + c.announce(PacketCreator.getFamilyInfo(chr.getFamilyEntry())); } } diff --git a/src/main/java/net/server/channel/handlers/OpenFamilyPedigreeHandler.java b/src/main/java/net/server/channel/handlers/OpenFamilyPedigreeHandler.java index 444cc9161a..30926e0289 100644 --- a/src/main/java/net/server/channel/handlers/OpenFamilyPedigreeHandler.java +++ b/src/main/java/net/server/channel/handlers/OpenFamilyPedigreeHandler.java @@ -19,11 +19,11 @@ */ package net.server.channel.handlers; -import config.YamlConfig; import client.MapleCharacter; import client.MapleClient; +import config.YamlConfig; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -36,7 +36,7 @@ public final class OpenFamilyPedigreeHandler extends AbstractMaplePacketHandler if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) return; MapleCharacter target = c.getChannelServer().getPlayerStorage().getCharacterByName(slea.readMapleAsciiString()); if(target != null && target.getFamily() != null) { - c.announce(MaplePacketCreator.showPedigree(target.getFamilyEntry())); + c.announce(PacketCreator.showPedigree(target.getFamilyEntry())); } } } diff --git a/src/main/java/net/server/channel/handlers/OwlWarpHandler.java b/src/main/java/net/server/channel/handlers/OwlWarpHandler.java index 5eab87fa5b..fed429d03e 100644 --- a/src/main/java/net/server/channel/handlers/OwlWarpHandler.java +++ b/src/main/java/net/server/channel/handlers/OwlWarpHandler.java @@ -19,12 +19,12 @@ */ package net.server.channel.handlers; -import constants.game.GameConstants; import client.MapleClient; +import constants.game.GameConstants; import net.AbstractMaplePacketHandler; -import server.maps.MaplePlayerShop; import server.maps.MapleHiredMerchant; -import tools.MaplePacketCreator; +import server.maps.MaplePlayerShop; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /* @@ -38,7 +38,7 @@ public final class OwlWarpHandler extends AbstractMaplePacketHandler { int mapid = slea.readInt(); if(ownerid == c.getPlayer().getId()) { - c.announce(MaplePacketCreator.serverNotice(1, "You cannot visit your own shop.")); + c.announce(PacketCreator.serverNotice(1, "You cannot visit your own shop.")); return; } @@ -47,8 +47,8 @@ public final class OwlWarpHandler extends AbstractMaplePacketHandler { if(hm == null || hm.getMapId() != mapid || !hm.hasItem(c.getPlayer().getOwlSearch())) { ps = c.getWorldServer().getPlayerShop(ownerid); if(ps == null || ps.getMapId() != mapid || !ps.hasItem(c.getPlayer().getOwlSearch())) { - if(hm == null && ps == null) c.announce(MaplePacketCreator.getOwlMessage(1)); - else c.announce(MaplePacketCreator.getOwlMessage(3)); + if(hm == null && ps == null) c.announce(PacketCreator.getOwlMessage(1)); + else c.announce(PacketCreator.getOwlMessage(3)); return; } @@ -59,22 +59,22 @@ public final class OwlWarpHandler extends AbstractMaplePacketHandler { if(ps.isOpen()) { //change map has a delay, must double check if(!ps.visitShop(c.getPlayer())) { - if(!ps.isBanned(c.getPlayer().getName())) c.announce(MaplePacketCreator.getOwlMessage(2)); - else c.announce(MaplePacketCreator.getOwlMessage(17)); + if(!ps.isBanned(c.getPlayer().getName())) c.announce(PacketCreator.getOwlMessage(2)); + else c.announce(PacketCreator.getOwlMessage(17)); } } else { - //c.announce(MaplePacketCreator.serverNotice(1, "That merchant has either been closed or is under maintenance.")); - c.announce(MaplePacketCreator.getOwlMessage(18)); + //c.announce(PacketCreator.serverNotice(1, "That merchant has either been closed or is under maintenance.")); + c.announce(PacketCreator.getOwlMessage(18)); } } else { - c.announce(MaplePacketCreator.serverNotice(1, "That shop is currently located in another channel. Current location: Channel " + hm.getChannel() + ", '" + hm.getMap().getMapName() + "'.")); + c.announce(PacketCreator.serverNotice(1, "That shop is currently located in another channel. Current location: Channel " + hm.getChannel() + ", '" + hm.getMap().getMapName() + "'.")); } } else { - c.announce(MaplePacketCreator.serverNotice(1, "That shop is currently located outside of the FM area. Current location: Channel " + hm.getChannel() + ", '" + hm.getMap().getMapName() + "'.")); + c.announce(PacketCreator.serverNotice(1, "That shop is currently located outside of the FM area. Current location: Channel " + hm.getChannel() + ", '" + hm.getMap().getMapName() + "'.")); } } else { - //c.announce(MaplePacketCreator.serverNotice(1, "That merchant has either been closed or is under maintenance.")); - c.announce(MaplePacketCreator.getOwlMessage(18)); + //c.announce(PacketCreator.serverNotice(1, "That merchant has either been closed or is under maintenance.")); + c.announce(PacketCreator.getOwlMessage(18)); } } else { if(hm.isOpen()) { @@ -84,25 +84,25 @@ public final class OwlWarpHandler extends AbstractMaplePacketHandler { if(hm.isOpen()) { //change map has a delay, must double check if(hm.addVisitor(c.getPlayer())) { - c.announce(MaplePacketCreator.getHiredMerchant(c.getPlayer(), hm, false)); + c.announce(PacketCreator.getHiredMerchant(c.getPlayer(), hm, false)); c.getPlayer().setHiredMerchant(hm); } else { - //c.announce(MaplePacketCreator.serverNotice(1, hm.getOwner() + "'s merchant is full. Wait awhile before trying again.")); - c.announce(MaplePacketCreator.getOwlMessage(2)); + //c.announce(PacketCreator.serverNotice(1, hm.getOwner() + "'s merchant is full. Wait awhile before trying again.")); + c.announce(PacketCreator.getOwlMessage(2)); } } else { - //c.announce(MaplePacketCreator.serverNotice(1, "That merchant has either been closed or is under maintenance.")); - c.announce(MaplePacketCreator.getOwlMessage(18)); + //c.announce(PacketCreator.serverNotice(1, "That merchant has either been closed or is under maintenance.")); + c.announce(PacketCreator.getOwlMessage(18)); } } else { - c.announce(MaplePacketCreator.serverNotice(1, "That merchant is currently located in another channel. Current location: Channel " + hm.getChannel() + ", '" + hm.getMap().getMapName() + "'.")); + c.announce(PacketCreator.serverNotice(1, "That merchant is currently located in another channel. Current location: Channel " + hm.getChannel() + ", '" + hm.getMap().getMapName() + "'.")); } } else { - c.announce(MaplePacketCreator.serverNotice(1, "That merchant is currently located outside of the FM area. Current location: Channel " + hm.getChannel() + ", '" + hm.getMap().getMapName() + "'.")); + c.announce(PacketCreator.serverNotice(1, "That merchant is currently located outside of the FM area. Current location: Channel " + hm.getChannel() + ", '" + hm.getMap().getMapName() + "'.")); } } else { - //c.announce(MaplePacketCreator.serverNotice(1, "That merchant has either been closed or is under maintenance.")); - c.announce(MaplePacketCreator.getOwlMessage(18)); + //c.announce(PacketCreator.serverNotice(1, "That merchant has either been closed or is under maintenance.")); + c.announce(PacketCreator.getOwlMessage(18)); } } } diff --git a/src/main/java/net/server/channel/handlers/PartyOperationHandler.java b/src/main/java/net/server/channel/handlers/PartyOperationHandler.java index 4977ce0137..2bd2f3e0eb 100644 --- a/src/main/java/net/server/channel/handlers/PartyOperationHandler.java +++ b/src/main/java/net/server/channel/handlers/PartyOperationHandler.java @@ -21,20 +21,20 @@ */ package net.server.channel.handlers; -import config.YamlConfig; -import net.AbstractMaplePacketHandler; -import net.server.world.MapleParty; -import net.server.world.MaplePartyCharacter; -import net.server.world.PartyOperation; -import net.server.world.World; -import tools.MaplePacketCreator; -import tools.data.input.SeekableLittleEndianAccessor; import client.MapleCharacter; import client.MapleClient; +import config.YamlConfig; +import net.AbstractMaplePacketHandler; import net.server.coordinator.world.MapleInviteCoordinator; import net.server.coordinator.world.MapleInviteCoordinator.InviteResult; import net.server.coordinator.world.MapleInviteCoordinator.InviteType; import net.server.coordinator.world.MapleInviteCoordinator.MapleInviteResult; +import net.server.world.MapleParty; +import net.server.world.MaplePartyCharacter; +import net.server.world.PartyOperation; +import net.server.world.World; +import tools.PacketCreator; +import tools.data.input.SeekableLittleEndianAccessor; import java.util.List; @@ -69,7 +69,7 @@ public final class PartyOperationHandler extends AbstractMaplePacketHandler { if (res == InviteResult.ACCEPTED) { MapleParty.joinParty(player, partyid, false); } else { - c.announce(MaplePacketCreator.serverNotice(5, "You couldn't join the party due to an expired invitation request.")); + c.announce(PacketCreator.serverNotice(5, "You couldn't join the party due to an expired invitation request.")); } break; } @@ -78,11 +78,11 @@ public final class PartyOperationHandler extends AbstractMaplePacketHandler { MapleCharacter invited = world.getPlayerStorage().getCharacterByName(name); if (invited != null) { if(invited.getLevel() < 10 && (!YamlConfig.config.server.USE_PARTY_FOR_STARTERS || player.getLevel() >= 10)) { //min requirement is level 10 - c.announce(MaplePacketCreator.serverNotice(5, "The player you have invited does not meet the requirements.")); + c.announce(PacketCreator.serverNotice(5, "The player you have invited does not meet the requirements.")); return; } if(YamlConfig.config.server.USE_PARTY_FOR_STARTERS && invited.getLevel() >= 10 && player.getLevel() < 10) { //trying to invite high level - c.announce(MaplePacketCreator.serverNotice(5, "The player you have invited does not meet the requirements.")); + c.announce(PacketCreator.serverNotice(5, "The player you have invited does not meet the requirements.")); return; } @@ -96,18 +96,18 @@ public final class PartyOperationHandler extends AbstractMaplePacketHandler { } if (party.getMembers().size() < 6) { if (MapleInviteCoordinator.createInvite(InviteType.PARTY, player, party.getId(), invited.getId())) { - invited.getClient().announce(MaplePacketCreator.partyInvite(player)); + invited.getClient().announce(PacketCreator.partyInvite(player)); } else { - c.announce(MaplePacketCreator.partyStatusMessage(22, invited.getName())); + c.announce(PacketCreator.partyStatusMessage(22, invited.getName())); } } else { - c.announce(MaplePacketCreator.partyStatusMessage(17)); + c.announce(PacketCreator.partyStatusMessage(17)); } } else { - c.announce(MaplePacketCreator.partyStatusMessage(16)); + c.announce(PacketCreator.partyStatusMessage(16)); } } else { - c.announce(MaplePacketCreator.partyStatusMessage(19)); + c.announce(PacketCreator.partyStatusMessage(19)); } break; } diff --git a/src/main/java/net/server/channel/handlers/PartySearchStartHandler.java b/src/main/java/net/server/channel/handlers/PartySearchStartHandler.java index ca7f1c53f1..f4d21c7c90 100644 --- a/src/main/java/net/server/channel/handlers/PartySearchStartHandler.java +++ b/src/main/java/net/server/channel/handlers/PartySearchStartHandler.java @@ -21,13 +21,13 @@ */ package net.server.channel.handlers; -import net.AbstractMaplePacketHandler; -import net.server.world.MapleParty; -import tools.data.input.SeekableLittleEndianAccessor; -import tools.MaplePacketCreator; import client.MapleCharacter; import client.MapleClient; +import net.AbstractMaplePacketHandler; +import net.server.world.MapleParty; import net.server.world.World; +import tools.PacketCreator; +import tools.data.input.SeekableLittleEndianAccessor; /** * @@ -44,19 +44,19 @@ public class PartySearchStartHandler extends AbstractMaplePacketHandler { MapleCharacter chr = c.getPlayer(); if (min > max) { chr.dropMessage(1, "The min. value is higher than the max!"); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } if (max - min > 30) { chr.dropMessage(1, "You can only search for party members within a range of 30 levels."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } if (chr.getLevel() < min || chr.getLevel() > max) { chr.dropMessage(1, "The range of level for search has to include your own level."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } diff --git a/src/main/java/net/server/channel/handlers/PetChatHandler.java b/src/main/java/net/server/channel/handlers/PetChatHandler.java index b18db64dbb..b2e13d74e5 100644 --- a/src/main/java/net/server/channel/handlers/PetChatHandler.java +++ b/src/main/java/net/server/channel/handlers/PetChatHandler.java @@ -27,7 +27,7 @@ import config.YamlConfig; import net.AbstractMaplePacketHandler; import tools.FilePrinter; import tools.LogHelper; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class PetChatHandler extends AbstractMaplePacketHandler { @@ -49,7 +49,7 @@ public final class PetChatHandler extends AbstractMaplePacketHandler { c.disconnect(true, false); return; } - c.getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.petChat(c.getPlayer().getId(), pet, act, text), true); + c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.petChat(c.getPlayer().getId(), pet, act, text), true); if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) { LogHelper.logChat(c, "Pet", text); } diff --git a/src/main/java/net/server/channel/handlers/PetCommandHandler.java b/src/main/java/net/server/channel/handlers/PetCommandHandler.java index f25768b5a8..d71ef7e748 100644 --- a/src/main/java/net/server/channel/handlers/PetCommandHandler.java +++ b/src/main/java/net/server/channel/handlers/PetCommandHandler.java @@ -27,7 +27,7 @@ import client.inventory.MaplePet; import client.inventory.PetCommand; import client.inventory.PetDataFactory; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Randomizer; import tools.data.input.SeekableLittleEndianAccessor; @@ -54,9 +54,9 @@ public final class PetCommandHandler extends AbstractMaplePacketHandler { if (Randomizer.nextInt(100) < petCommand.getProbability()) { pet.gainClosenessFullness(chr, petCommand.getIncrease(), 0, command); - chr.getMap().broadcastMessage(MaplePacketCreator.commandResponse(chr.getId(), petIndex, false, command, false)); + chr.getMap().broadcastMessage(PacketCreator.commandResponse(chr.getId(), petIndex, false, command, false)); } else { - chr.getMap().broadcastMessage(MaplePacketCreator.commandResponse(chr.getId(), petIndex, true, command, false)); + chr.getMap().broadcastMessage(PacketCreator.commandResponse(chr.getId(), petIndex, true, command, false)); } } } diff --git a/src/main/java/net/server/channel/handlers/PetFoodHandler.java b/src/main/java/net/server/channel/handlers/PetFoodHandler.java index 23e9b7f4b0..6d56611372 100644 --- a/src/main/java/net/server/channel/handlers/PetFoodHandler.java +++ b/src/main/java/net/server/channel/handlers/PetFoodHandler.java @@ -21,17 +21,17 @@ */ package net.server.channel.handlers; -import net.AbstractMaplePacketHandler; import client.MapleCharacter; import client.MapleClient; +import client.autoban.AutobanManager; +import client.inventory.Item; import client.inventory.MapleInventory; import client.inventory.MapleInventoryType; import client.inventory.MaplePet; -import client.autoban.AutobanManager; -import client.inventory.Item; import client.inventory.manipulator.MapleInventoryManipulator; +import net.AbstractMaplePacketHandler; import net.server.Server; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class PetFoodHandler extends AbstractMaplePacketHandler { @@ -41,14 +41,14 @@ public final class PetFoodHandler extends AbstractMaplePacketHandler { MapleCharacter chr = c.getPlayer(); AutobanManager abm = chr.getAutobanManager(); if (abm.getLastSpam(2) + 500 > currentServerTime()) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } abm.spam(2); slea.readInt(); // timestamp issue detected thanks to Masterrulax abm.setTimestamp(1, Server.getInstance().getCurrentTimestamp(), 3); if (chr.getNoPets() == 0) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } int previousFullness = 100; diff --git a/src/main/java/net/server/channel/handlers/PetLootHandler.java b/src/main/java/net/server/channel/handlers/PetLootHandler.java index 8b794344f2..68494ba459 100644 --- a/src/main/java/net/server/channel/handlers/PetLootHandler.java +++ b/src/main/java/net/server/channel/handlers/PetLootHandler.java @@ -21,17 +21,17 @@ */ package net.server.channel.handlers; -import java.util.Set; - import client.MapleCharacter; import client.MapleClient; import client.inventory.MaplePet; import net.AbstractMaplePacketHandler; import server.maps.MapleMapItem; import server.maps.MapleMapObject; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; +import java.util.Set; + /** * @author TheRamon * @author Ronan @@ -44,7 +44,7 @@ public final class PetLootHandler extends AbstractMaplePacketHandler { int petIndex = chr.getPetIndex(slea.readInt()); MaplePet pet = chr.getPet(petIndex); if (pet == null || !pet.isSummoned()) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -55,27 +55,27 @@ public final class PetLootHandler extends AbstractMaplePacketHandler { MapleMapItem mapitem = (MapleMapItem) ob; if (mapitem.getMeso() > 0) { if (!chr.isEquippedMesoMagnet()) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } if (chr.isEquippedPetItemIgnore()) { final Set petIgnore = chr.getExcludedItems(); if(!petIgnore.isEmpty() && petIgnore.contains(Integer.MAX_VALUE)) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } } } else { if (!chr.isEquippedItemPouch()) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } if (chr.isEquippedPetItemIgnore()) { final Set petIgnore = chr.getExcludedItems(); if(!petIgnore.isEmpty() && petIgnore.contains(mapitem.getItem().getItemId())) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } } @@ -83,7 +83,7 @@ public final class PetLootHandler extends AbstractMaplePacketHandler { chr.pickupItem(ob, petIndex); } catch (NullPointerException | ClassCastException e) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } } diff --git a/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java b/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java index a066a7fbb2..52fa49abb0 100644 --- a/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java +++ b/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java @@ -30,26 +30,18 @@ import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; import config.YamlConfig; +import constants.game.GameConstants; import constants.inventory.ItemConstants; - import net.AbstractMaplePacketHandler; import server.MapleItemInformationProvider; -import server.maps.MaplePortal; import server.MapleTrade; -import constants.game.GameConstants; -import server.maps.FieldLimit; -import server.maps.MapleHiredMerchant; -import server.maps.MapleMapObject; -import server.maps.MapleMapObjectType; -import server.maps.MapleMiniGame; +import server.maps.*; import server.maps.MapleMiniGame.MiniGameType; -import server.maps.MaplePlayerShop; -import server.maps.MaplePlayerShopItem; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; -import java.awt.Point; +import java.awt.*; import java.sql.SQLException; import java.util.Arrays; @@ -136,7 +128,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { @Override public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { if (!c.tryacquireClient()) { // thanks GabrielSin for pointing dupes within player interactions - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -146,7 +138,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { if (mode == Action.CREATE.getCode()) { if(!chr.isAlive()) { // thanks GabrielSin for pointing this - chr.getClient().announce(MaplePacketCreator.getMiniRoomError(4)); + chr.getClient().announce(PacketCreator.getMiniRoomError(4)); return; } @@ -156,7 +148,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { } else if (createType == 1) { // omok mini game int status = establishMiniroomStatus(chr, true); if (status > 0) { - chr.getClient().announce(MaplePacketCreator.getMiniRoomError(status)); + chr.getClient().announce(PacketCreator.getMiniRoomError(status)); return; } @@ -176,7 +168,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { type = 0; } if (!chr.haveItem(4080000 + type)) { - chr.getClient().announce(MaplePacketCreator.getMiniRoomError(6)); + chr.getClient().announce(PacketCreator.getMiniRoomError(6)); return; } @@ -185,12 +177,12 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { game.setPieceType(type); game.setGameType(MiniGameType.OMOK); chr.getMap().addMapObject(game); - chr.getMap().broadcastMessage(MaplePacketCreator.addOmokBox(chr, 1, 0)); + chr.getMap().broadcastMessage(PacketCreator.addOmokBox(chr, 1, 0)); game.sendOmok(c, type); } else if (createType == 2) { // matchcard int status = establishMiniroomStatus(chr, true); if (status > 0) { - chr.getClient().announce(MaplePacketCreator.getMiniRoomError(status)); + chr.getClient().announce(PacketCreator.getMiniRoomError(status)); return; } @@ -210,7 +202,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { type = 0; } if (!chr.haveItem(4080100)) { - chr.getClient().announce(MaplePacketCreator.getMiniRoomError(6)); + chr.getClient().announce(PacketCreator.getMiniRoomError(6)); return; } @@ -226,17 +218,17 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { game.setGameType(MiniGameType.MATCH_CARD); chr.setMiniGame(game); chr.getMap().addMapObject(game); - chr.getMap().broadcastMessage(MaplePacketCreator.addMatchCardBox(chr, 1, 0)); + chr.getMap().broadcastMessage(PacketCreator.addMatchCardBox(chr, 1, 0)); game.sendMatchCard(c, type); } else if (createType == 4 || createType == 5) { // shop if(!GameConstants.isFreeMarketRoom(chr.getMapId())) { - chr.getClient().announce(MaplePacketCreator.getMiniRoomError(15)); + chr.getClient().announce(PacketCreator.getMiniRoomError(15)); return; } int status = establishMiniroomStatus(chr, false); if (status > 0) { - chr.getClient().announce(MaplePacketCreator.getMiniRoomError(status)); + chr.getClient().announce(PacketCreator.getMiniRoomError(status)); return; } @@ -248,7 +240,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { slea.skip(3); int itemId = slea.readInt(); if (chr.getInventory(MapleInventoryType.CASH).countById(itemId) < 1) { - chr.getClient().announce(MaplePacketCreator.getMiniRoomError(6)); + chr.getClient().announce(PacketCreator.getMiniRoomError(6)); return; } @@ -258,13 +250,13 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { chr.getMap().addMapObject(shop); shop.sendShop(c); c.getWorldServer().registerPlayerShop(shop); - //c.announce(MaplePacketCreator.getPlayerShopRemoveVisitor(1)); + //c.announce(PacketCreator.getPlayerShopRemoveVisitor(1)); } else if (ItemConstants.isHiredMerchant(itemId)) { MapleHiredMerchant merchant = new MapleHiredMerchant(chr, desc, itemId); chr.setHiredMerchant(merchant); c.getWorldServer().registerHiredMerchant(merchant); chr.getClient().getChannelServer().addHiredMerchant(chr.getId(), merchant); - chr.announce(MaplePacketCreator.getHiredMerchant(chr, merchant, true)); + chr.announce(PacketCreator.getHiredMerchant(chr, merchant, true)); } } } else if (mode == Action.INVITE.getCode()) { @@ -282,7 +274,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { if (!chr.getTrade().isFullTrade() && !chr.getTrade().getPartner().isFullTrade()) { MapleTrade.visitTrade(chr, chr.getTrade().getPartner().getChr()); } else { - chr.getClient().announce(MaplePacketCreator.getMiniRoomError(2)); + chr.getClient().announce(PacketCreator.getMiniRoomError(2)); return; } } else { @@ -311,10 +303,10 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { break; } } else { - chr.getClient().announce(MaplePacketCreator.getMiniRoomError(2)); + chr.getClient().announce(PacketCreator.getMiniRoomError(2)); } } else { - chr.getClient().announce(MaplePacketCreator.getMiniRoomError(22)); + chr.getClient().announce(PacketCreator.getMiniRoomError(22)); } } else if (ob instanceof MapleHiredMerchant && chr.getHiredMerchant() == null) { MapleHiredMerchant merchant = (MapleHiredMerchant) ob; @@ -355,11 +347,11 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { slea.readShort(); int birthday = slea.readInt(); if (!CashOperationHandler.checkBirthday(c, birthday)) { // birthday check here found thanks to lucasziron - c.announce(MaplePacketCreator.serverNotice(1, "Please check again the birthday date.")); + c.announce(PacketCreator.serverNotice(1, "Please check again the birthday date.")); return; } - c.announce(MaplePacketCreator.hiredMerchantOwnerMaintenanceLeave()); + c.announce(PacketCreator.hiredMerchantOwnerMaintenanceLeave()); } if (!canPlaceStore(chr)) { // thanks Ari for noticing player shops overlapping on opening time @@ -375,32 +367,32 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { } catch(RuntimeException re) {} // fella does not have a player shop permit... } - chr.getMap().broadcastMessage(MaplePacketCreator.updatePlayerShopBox(shop)); + chr.getMap().broadcastMessage(PacketCreator.updatePlayerShopBox(shop)); shop.setOpen(true); } else if (merchant != null && merchant.isOwner(chr)) { chr.setHasMerchant(true); merchant.setOpen(true); chr.getMap().addMapObject(merchant); chr.setHiredMerchant(null); - chr.getMap().broadcastMessage(MaplePacketCreator.spawnHiredMerchantBox(merchant)); + chr.getMap().broadcastMessage(PacketCreator.spawnHiredMerchantBox(merchant)); } } else if (mode == Action.READY.getCode()) { MapleMiniGame game = chr.getMiniGame(); - game.broadcast(MaplePacketCreator.getMiniGameReady(game)); + game.broadcast(PacketCreator.getMiniGameReady(game)); } else if (mode == Action.UN_READY.getCode()) { MapleMiniGame game = chr.getMiniGame(); - game.broadcast(MaplePacketCreator.getMiniGameUnReady(game)); + game.broadcast(PacketCreator.getMiniGameUnReady(game)); } else if (mode == Action.START.getCode()) { MapleMiniGame game = chr.getMiniGame(); if (game.getGameType().equals(MiniGameType.OMOK)) { game.minigameMatchStarted(); - game.broadcast(MaplePacketCreator.getMiniGameStart(game, game.getLoser())); - chr.getMap().broadcastMessage(MaplePacketCreator.addOmokBox(game.getOwner(), 2, 1)); + game.broadcast(PacketCreator.getMiniGameStart(game, game.getLoser())); + chr.getMap().broadcastMessage(PacketCreator.addOmokBox(game.getOwner(), 2, 1)); } else if (game.getGameType().equals(MiniGameType.MATCH_CARD)) { game.minigameMatchStarted(); game.shuffleList(); - game.broadcast(MaplePacketCreator.getMatchCardStart(game, game.getLoser())); - chr.getMap().broadcastMessage(MaplePacketCreator.addMatchCardBox(game.getOwner(), 2, 1)); + game.broadcast(PacketCreator.getMatchCardStart(game, game.getLoser())); + chr.getMap().broadcastMessage(PacketCreator.addMatchCardBox(game.getOwner(), 2, 1)); } } else if (mode == Action.GIVE_UP.getCode()) { MapleMiniGame game = chr.getMiniGame(); @@ -421,9 +413,9 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { MapleMiniGame game = chr.getMiniGame(); if (!game.isTieDenied(chr)) { if (game.isOwner(chr)) { - game.broadcastToVisitor(MaplePacketCreator.getMiniGameRequestTie(game)); + game.broadcastToVisitor(PacketCreator.getMiniGameRequestTie(game)); } else { - game.broadcastToOwner(MaplePacketCreator.getMiniGameRequestTie(game)); + game.broadcastToOwner(PacketCreator.getMiniGameRequestTie(game)); } } } else if (mode == Action.ANSWER_TIE.getCode()) { @@ -434,17 +426,17 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { game.denyTie(chr); if (game.isOwner(chr)) { - game.broadcastToVisitor(MaplePacketCreator.getMiniGameDenyTie(game)); + game.broadcastToVisitor(PacketCreator.getMiniGameDenyTie(game)); } else { - game.broadcastToOwner(MaplePacketCreator.getMiniGameDenyTie(game)); + game.broadcastToOwner(PacketCreator.getMiniGameDenyTie(game)); } } } else if (mode == Action.SKIP.getCode()) { MapleMiniGame game = chr.getMiniGame(); if (game.isOwner(chr)) { - game.broadcast(MaplePacketCreator.getMiniGameSkipOwner(game)); + game.broadcast(PacketCreator.getMiniGameSkipOwner(game)); } else { - game.broadcast(MaplePacketCreator.getMiniGameSkipVisitor(game)); + game.broadcast(PacketCreator.getMiniGameSkipVisitor(game)); } } else if (mode == Action.MOVE_OMOK.getCode()) { int x = slea.readInt(); // x point @@ -459,22 +451,22 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { if (turn == 1) { game.setFirstSlot(slot); if (game.isOwner(chr)) { - game.broadcastToVisitor(MaplePacketCreator.getMatchCardSelect(game, turn, slot, firstslot, turn)); + game.broadcastToVisitor(PacketCreator.getMatchCardSelect(game, turn, slot, firstslot, turn)); } else { - game.getOwner().getClient().announce(MaplePacketCreator.getMatchCardSelect(game, turn, slot, firstslot, turn)); + game.getOwner().getClient().announce(PacketCreator.getMatchCardSelect(game, turn, slot, firstslot, turn)); } } else if ((game.getCardId(firstslot)) == (game.getCardId(slot))) { if (game.isOwner(chr)) { - game.broadcast(MaplePacketCreator.getMatchCardSelect(game, turn, slot, firstslot, 2)); + game.broadcast(PacketCreator.getMatchCardSelect(game, turn, slot, firstslot, 2)); game.setOwnerPoints(); } else { - game.broadcast(MaplePacketCreator.getMatchCardSelect(game, turn, slot, firstslot, 3)); + game.broadcast(PacketCreator.getMatchCardSelect(game, turn, slot, firstslot, 3)); game.setVisitorPoints(); } } else if (game.isOwner(chr)) { - game.broadcast(MaplePacketCreator.getMatchCardSelect(game, turn, slot, firstslot, 0)); + game.broadcast(PacketCreator.getMatchCardSelect(game, turn, slot, firstslot, 0)); } else { - game.broadcast(MaplePacketCreator.getMatchCardSelect(game, turn, slot, firstslot, 1)); + game.broadcast(PacketCreator.getMatchCardSelect(game, turn, slot, firstslot, 1)); } } else if (mode == Action.SET_MESO.getCode()) { chr.getTrade().setMeso(slea.readInt()); @@ -488,30 +480,30 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { if (targetSlot < 1 || targetSlot > 9) { System.out.println("[Hack] " + chr.getName() + " Trying to dupe on trade slot."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } if (item == null) { - c.announce(MaplePacketCreator.serverNotice(1, "Invalid item description.")); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.serverNotice(1, "Invalid item description.")); + c.announce(PacketCreator.enableActions()); return; } if (ii.isUnmerchable(item.getItemId())) { if (ItemConstants.isPet(item.getItemId())) { - c.announce(MaplePacketCreator.serverNotice(1, "Pets are not allowed to be traded.")); + c.announce(PacketCreator.serverNotice(1, "Pets are not allowed to be traded.")); } else { - c.announce(MaplePacketCreator.serverNotice(1, "Cash items are not allowed to be traded.")); + c.announce(PacketCreator.serverNotice(1, "Cash items are not allowed to be traded.")); } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } if (quantity < 1 || quantity > item.getQuantity()) { - c.announce(MaplePacketCreator.serverNotice(1, "You don't have enough quantity of the item.")); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.serverNotice(1, "You don't have enough quantity of the item.")); + c.announce(PacketCreator.enableActions()); return; } @@ -520,8 +512,8 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { if ((quantity <= item.getQuantity() && quantity >= 0) || ItemConstants.isRechargeable(item.getItemId())) { if (ii.isDropRestricted(item.getItemId())) { // ensure that undroppable items do not make it to the trade window if (!MapleKarmaManipulator.hasKarmaFlag(item)) { - c.announce(MaplePacketCreator.serverNotice(1, "That item is untradeable.")); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.serverNotice(1, "That item is untradeable.")); + c.announce(PacketCreator.enableActions()); return; } } @@ -531,8 +523,8 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { try { Item checkItem = chr.getInventory(ivType).getItem(pos); if (checkItem != item || checkItem.getPosition() != item.getPosition()) { - c.announce(MaplePacketCreator.serverNotice(1, "Invalid item description.")); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.serverNotice(1, "Invalid item description.")); + c.announce(PacketCreator.enableActions()); return; } @@ -547,9 +539,9 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { if (trade.addItem(tradeItem)) { MapleInventoryManipulator.removeFromSlot(c, ivType, item.getPosition(), quantity, true); - trade.getChr().announce(MaplePacketCreator.getTradeItemAdd((byte) 0, tradeItem)); + trade.getChr().announce(PacketCreator.getTradeItemAdd((byte) 0, tradeItem)); if (trade.getPartner() != null) { - trade.getPartner().getChr().announce(MaplePacketCreator.getTradeItemAdd((byte) 1, tradeItem)); + trade.getPartner().getChr().announce(PacketCreator.getTradeItemAdd((byte) 1, tradeItem)); } } } catch (Exception e) { @@ -570,17 +562,17 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { Item ivItem = chr.getInventory(ivType).getItem(slot); if (ivItem == null || ivItem.isUntradeable()) { - c.announce(MaplePacketCreator.serverNotice(1, "Could not perform shop operation with that item.")); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.serverNotice(1, "Could not perform shop operation with that item.")); + c.announce(PacketCreator.enableActions()); return; } else if (MapleItemInformationProvider.getInstance().isUnmerchable(ivItem.getItemId())) { if (ItemConstants.isPet(ivItem.getItemId())) { - c.announce(MaplePacketCreator.serverNotice(1, "Pets are not allowed to be sold on the Player Store.")); + c.announce(PacketCreator.serverNotice(1, "Pets are not allowed to be sold on the Player Store.")); } else { - c.announce(MaplePacketCreator.serverNotice(1, "Cash items are not allowed to be sold on the Player Store.")); + c.announce(PacketCreator.serverNotice(1, "Cash items are not allowed to be sold on the Player Store.")); } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -590,8 +582,8 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { perBundle = 1; bundles = 1; } else if (ivItem.getQuantity() < (bundles * perBundle)) { // thanks GabrielSin for finding a dupe here - c.announce(MaplePacketCreator.serverNotice(1, "Could not perform shop operation with that item.")); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.serverNotice(1, "Could not perform shop operation with that item.")); + c.announce(PacketCreator.enableActions()); return; } @@ -612,7 +604,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { MapleHiredMerchant merchant = chr.getHiredMerchant(); if (shop != null && shop.isOwner(chr)) { if (shop.isOpen() || !shop.addItem(shopItem)) { // thanks Vcoc for pointing an exploit with unlimited shop slots - c.announce(MaplePacketCreator.serverNotice(1, "You can't sell it anymore.")); + c.announce(PacketCreator.serverNotice(1, "You can't sell it anymore.")); return; } @@ -622,15 +614,15 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { MapleInventoryManipulator.removeFromSlot(c, ivType, slot, (short) (bundles * perBundle), true); } - c.announce(MaplePacketCreator.getPlayerShopItemUpdate(shop)); + c.announce(PacketCreator.getPlayerShopItemUpdate(shop)); } else if (merchant != null && merchant.isOwner(chr)) { if (ivType.equals(MapleInventoryType.CASH) && merchant.isPublished()) { - c.announce(MaplePacketCreator.serverNotice(1, "Cash items are only allowed to be sold when first opening the store.")); + c.announce(PacketCreator.serverNotice(1, "Cash items are only allowed to be sold when first opening the store.")); return; } if (merchant.isOpen() || !merchant.addItem(shopItem)) { // thanks Vcoc for pointing an exploit with unlimited shop slots - c.announce(MaplePacketCreator.serverNotice(1, "You can't sell it anymore.")); + c.announce(PacketCreator.serverNotice(1, "You can't sell it anymore.")); return; } @@ -640,7 +632,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { MapleInventoryManipulator.removeFromSlot(c, ivType, slot, (short) (bundles * perBundle), true); } - c.announce(MaplePacketCreator.updateHiredMerchant(merchant, chr)); + c.announce(PacketCreator.updateHiredMerchant(merchant, chr)); if (YamlConfig.config.server.USE_ENFORCE_MERCHANT_SAVE) { chr.saveCharToDB(false); @@ -652,7 +644,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { ex.printStackTrace(); } } else { - c.announce(MaplePacketCreator.serverNotice(1, "You can't sell without owning a shop.")); + c.announce(PacketCreator.serverNotice(1, "You can't sell without owning a shop.")); } } else if (mode == Action.REMOVE_ITEM.getCode()) { if (isTradeOpen(chr)) return; @@ -660,7 +652,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { MaplePlayerShop shop = chr.getPlayerShop(); if (shop != null && shop.isOwner(chr)) { if (shop.isOpen()) { - c.announce(MaplePacketCreator.serverNotice(1, "You can't take it with the store open.")); + c.announce(PacketCreator.serverNotice(1, "You can't take it with the store open.")); return; } @@ -690,7 +682,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { merchant.closeOwnerMerchant(chr); return; } - c.announce(MaplePacketCreator.updateHiredMerchant(merchant, chr)); + c.announce(PacketCreator.updateHiredMerchant(merchant, chr)); } else if (mode == Action.BUY.getCode() || mode == Action.MERCHANT_BUY.getCode()) { if (isTradeOpen(chr)) return; @@ -707,11 +699,11 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { MapleHiredMerchant merchant = chr.getHiredMerchant(); if (shop != null && shop.isVisitor(chr)) { if (shop.buy(c, itemid, quantity)) { - shop.broadcast(MaplePacketCreator.getPlayerShopItemUpdate(shop)); + shop.broadcast(PacketCreator.getPlayerShopItemUpdate(shop)); } } else if (merchant != null && !merchant.isOwner(chr)) { merchant.buy(c, itemid, quantity); - merchant.broadcastToVisitorsThreadsafe(MaplePacketCreator.updateHiredMerchant(merchant, chr)); + merchant.broadcastToVisitorsThreadsafe(PacketCreator.updateHiredMerchant(merchant, chr)); } } else if (mode == Action.TAKE_ITEM_BACK.getCode()) { if (isTradeOpen(chr)) return; @@ -719,7 +711,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { MapleHiredMerchant merchant = chr.getHiredMerchant(); if (merchant != null && merchant.isOwner(chr)) { if (merchant.isOpen()) { - c.announce(MaplePacketCreator.serverNotice(1, "You can't take it with the store open.")); + c.announce(PacketCreator.serverNotice(1, "You can't take it with the store open.")); return; } @@ -751,13 +743,13 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { } else { merchant.clearMessages(); merchant.setOpen(true); - merchant.getMap().broadcastMessage(MaplePacketCreator.updateHiredMerchantBox(merchant)); + merchant.getMap().broadcastMessage(PacketCreator.updateHiredMerchantBox(merchant)); } } } chr.setHiredMerchant(null); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } else if (mode == Action.BAN_PLAYER.getCode()) { slea.skip(1); @@ -772,7 +764,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { if(visitor != null) { visitor.closeMiniGame(false); - visitor.announce(MaplePacketCreator.getMiniGameClose(true, 5)); + visitor.announce(PacketCreator.getMiniGameClose(true, 5)); } } } else if (mode == Action.EXIT_AFTER_GAME.getCode()) { @@ -794,7 +786,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { private static boolean isTradeOpen(MapleCharacter chr) { if (chr.getTrade() != null) { // thanks to Rien dev team //Apparently there is a dupe exploit that causes racing conditions when saving/retrieving from the db with stuff like trade open. - chr.announce(MaplePacketCreator.enableActions()); + chr.announce(PacketCreator.enableActions()); return true; } @@ -812,11 +804,11 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { MaplePlayerShop shop = mc.getPlayerShop(); if (shop != null && shop.isOwner(mc)) { - chr.announce(MaplePacketCreator.getMiniRoomError(13)); + chr.announce(PacketCreator.getMiniRoomError(13)); return false; } } else { - chr.announce(MaplePacketCreator.getMiniRoomError(13)); + chr.announce(PacketCreator.getMiniRoomError(13)); return false; } } @@ -824,7 +816,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { Point cpos = chr.getPosition(); MaplePortal portal = chr.getMap().findClosestTeleportPortal(cpos); if (portal != null && portal.getPosition().distance(cpos) < 120.0) { - chr.announce(MaplePacketCreator.getMiniRoomError(10)); + chr.announce(PacketCreator.getMiniRoomError(10)); return false; } } catch (Exception e) { diff --git a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java index dfa22824e4..e39875584a 100644 --- a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java +++ b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java @@ -43,7 +43,7 @@ import scripting.event.EventInstanceManager; import server.life.MobSkill; import tools.DatabaseConnection; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.data.input.SeekableLittleEndianAccessor; import tools.packets.Wedding; @@ -84,12 +84,12 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler { @Override public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { - final int cid = slea.readInt(); // TODO: investigate if this is the "client id" supplied in MaplePacketCreator#getServerIP() + final int cid = slea.readInt(); // TODO: investigate if this is the "client id" supplied in PacketCreator#getServerIP() final Server server = Server.getInstance(); if (!c.tryacquireClient()) { // thanks MedicOP for assisting on concurrency protection here - c.announce(MaplePacketCreator.getAfterLoginError(10)); + c.announce(PacketCreator.getAfterLoginError(10)); } try { @@ -176,7 +176,7 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler { if (state == MapleClient.LOGIN_LOGGEDIN) { c.disconnect(true, false); } else { - c.announce(MaplePacketCreator.getAfterLoginError(7)); + c.announce(PacketCreator.getAfterLoginError(7)); } return; @@ -188,7 +188,7 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler { } else { c.setPlayer(null); c.setAccID(0); - c.announce(MaplePacketCreator.getAfterLoginError(10)); + c.announce(PacketCreator.getAfterLoginError(10)); return; } @@ -213,7 +213,7 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler { player.silentApplyDiseases(diseases); } - c.announce(MaplePacketCreator.getCharInfo(player)); + c.announce(PacketCreator.getCharInfo(player)); if (!player.isHidden()) { if (player.isGM() && YamlConfig.config.server.USE_AUTOHIDE_GM) { player.toggleHide(true); @@ -225,10 +225,10 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler { // pot bindings being passed through other characters on the account detected thanks to Croosade dev team MapleKeyBinding autohpPot = player.getKeymap().get(91); - player.announce(MaplePacketCreator.sendAutoHpPot(autohpPot != null ? autohpPot.getAction() : 0)); + player.announce(PacketCreator.sendAutoHpPot(autohpPot != null ? autohpPot.getAction() : 0)); MapleKeyBinding autompPot = player.getKeymap().get(92); - player.announce(MaplePacketCreator.sendAutoMpPot(autompPot != null ? autompPot.getAction() : 0)); + player.announce(PacketCreator.sendAutoMpPot(autompPot != null ? autompPot.getAction() : 0)); player.getMap().addPlayer(player); player.visitMap(player.getMap()); @@ -241,9 +241,9 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler { ble.setChannel(onlineBuddy.getChannel()); bl.put(ble); } - c.announce(MaplePacketCreator.updateBuddylist(bl.getBuddies())); + c.announce(PacketCreator.updateBuddylist(bl.getBuddies())); - c.announce(MaplePacketCreator.loadFamily(player)); + c.announce(PacketCreator.loadFamily(player)); if (player.getFamilyId() > 0) { MapleFamily f = wserv.getFamily(player.getFamilyId()); if (f != null) { @@ -252,17 +252,17 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler { familyEntry.setCharacter(player); player.setFamilyEntry(familyEntry); - c.announce(MaplePacketCreator.getFamilyInfo(familyEntry)); - familyEntry.announceToSenior(MaplePacketCreator.sendFamilyLoginNotice(player.getName(), true), true); + c.announce(PacketCreator.getFamilyInfo(familyEntry)); + familyEntry.announceToSenior(PacketCreator.sendFamilyLoginNotice(player.getName(), true), true); } else { FilePrinter.printError(FilePrinter.FAMILY_ERROR, "Player " + player.getName() + "'s family doesn't have an entry for them. (" + f.getID() + ")"); } } else { FilePrinter.printError(FilePrinter.FAMILY_ERROR, "Player " + player.getName() + " has an invalid family ID. (" + player.getFamilyId() + ")"); - c.announce(MaplePacketCreator.getFamilyInfo(null)); + c.announce(PacketCreator.getFamilyInfo(null)); } } else { - c.announce(MaplePacketCreator.getFamilyInfo(null)); + c.announce(PacketCreator.getFamilyInfo(null)); } if (player.getGuildId() > 0) { @@ -275,7 +275,7 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler { playerGuild.getMGC(player.getId()).setCharacter(player); player.setMGC(playerGuild.getMGC(player.getId())); server.setGuildMemberOnline(player, true, c.getChannel()); - c.announce(MaplePacketCreator.showGuildInfo(player)); + c.announce(PacketCreator.showGuildInfo(player)); int allianceId = player.getGuild().getAllianceId(); if (allianceId > 0) { MapleAlliance newAlliance = server.getAlliance(allianceId); @@ -288,11 +288,11 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler { } } if (newAlliance != null) { - c.announce(MaplePacketCreator.updateAllianceInfo(newAlliance, c.getWorld())); - c.announce(MaplePacketCreator.allianceNotice(newAlliance.getId(), newAlliance.getNotice())); + c.announce(PacketCreator.updateAllianceInfo(newAlliance, c.getWorld())); + c.announce(PacketCreator.allianceNotice(newAlliance.getId(), newAlliance.getNotice())); if (newcomer) { - server.allianceMessage(allianceId, MaplePacketCreator.allianceMemberOnline(player, true), player.getId(), -1); + server.allianceMessage(allianceId, PacketCreator.allianceMemberOnline(player, true), player.getId(), -1); } } } @@ -304,7 +304,7 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler { MaplePartyCharacter pchar = player.getMPC(); //Use this in case of enabling party HPbar HUD when logging in, however "you created a party" will appear on chat. - //c.announce(MaplePacketCreator.partyCreated(pchar)); + //c.announce(PacketCreator.partyCreated(pchar)); pchar.setChannel(c.getChannel()); pchar.setMapId(player.getMapId()); @@ -323,16 +323,16 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler { eqpInv.unlockInventory(); } - c.announce(MaplePacketCreator.updateBuddylist(player.getBuddylist().getBuddies())); + c.announce(PacketCreator.updateBuddylist(player.getBuddylist().getBuddies())); CharacterNameAndId pendingBuddyRequest = c.getPlayer().getBuddylist().pollPendingRequest(); if (pendingBuddyRequest != null) { - c.announce(MaplePacketCreator.requestBuddylistAdd(pendingBuddyRequest.getId(), c.getPlayer().getId(), pendingBuddyRequest.getName())); + c.announce(PacketCreator.requestBuddylistAdd(pendingBuddyRequest.getId(), c.getPlayer().getId(), pendingBuddyRequest.getName())); } - c.announce(MaplePacketCreator.updateGender(player)); + c.announce(PacketCreator.updateGender(player)); player.checkMessenger(); - c.announce(MaplePacketCreator.enableReport()); + c.announce(PacketCreator.enableReport()); player.changeSkillLevel(SkillFactory.getSkill(10000000 * player.getJobType() + 12), (byte) (player.getLinkedLevel() / 10), 20, -1); player.checkBerserk(player.isHidden()); @@ -345,24 +345,24 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler { MapleMount mount = player.getMount(); // thanks Ari for noticing a scenario where Silver Mane quest couldn't be started if (mount.getItemId() != 0) { - player.announce(MaplePacketCreator.updateMount(player.getId(), mount, false)); + player.announce(PacketCreator.updateMount(player.getId(), mount, false)); } player.reloadQuestExpirations(); /* if (!c.hasVotedAlready()){ - player.announce(MaplePacketCreator.earnTitleMessage("You can vote now! Vote and earn a vote point!")); + player.announce(PacketCreator.earnTitleMessage("You can vote now! Vote and earn a vote point!")); } */ if (player.isGM()) { - Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.earnTitleMessage((player.gmLevel() < 6 ? "GM " : "Admin ") + player.getName() + " has logged in")); + Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.earnTitleMessage((player.gmLevel() < 6 ? "GM " : "Admin ") + player.getName() + " has logged in")); } if (diseases != null) { for (Entry> e : diseases.entrySet()) { final List> debuff = Collections.singletonList(new Pair<>(e.getKey(), e.getValue().getRight().getX())); - c.announce(MaplePacketCreator.giveDebuff(debuff, e.getValue().getRight())); + c.announce(PacketCreator.giveDebuff(debuff, e.getValue().getRight())); } } } else { @@ -427,7 +427,7 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler { npcsIds.put(YamlConfig.config.server.REBIRTH_NPC_ID, "Rebirth"); } - c.announce(MaplePacketCreator.setNPCScriptable(npcsIds)); + c.announce(PacketCreator.setNPCScriptable(npcsIds)); } if (newcomer) player.setLoginTime(System.currentTimeMillis()); @@ -449,7 +449,7 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler { ps2.setInt(1, player.getId()); ps2.executeUpdate(); - c.announce(MaplePacketCreator.sendDueyParcelNotification(rs.getInt("Type") == 1)); + c.announce(PacketCreator.sendDueyParcelNotification(rs.getInt("Type") == 1)); } } } diff --git a/src/main/java/net/server/channel/handlers/PlayerMapTransitionHandler.java b/src/main/java/net/server/channel/handlers/PlayerMapTransitionHandler.java index 760cd41bc9..4eb702b576 100644 --- a/src/main/java/net/server/channel/handlers/PlayerMapTransitionHandler.java +++ b/src/main/java/net/server/channel/handlers/PlayerMapTransitionHandler.java @@ -23,15 +23,16 @@ package net.server.channel.handlers; import client.MapleBuffStat; import client.MapleCharacter; import client.MapleClient; -import java.util.Collections; -import java.util.List; import net.AbstractMaplePacketHandler; import server.life.MapleMonster; import server.maps.MapleMapObject; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.data.input.SeekableLittleEndianAccessor; +import java.util.Collections; +import java.util.List; + /** * * @author Ronan @@ -48,7 +49,7 @@ public final class PlayerMapTransitionHandler extends AbstractMaplePacketHandler chr.cancelBuffStats(MapleBuffStat.HOMING_BEACON); final List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.HOMING_BEACON, 0)); - chr.announce(MaplePacketCreator.giveBuff(1, beaconid, stat)); + chr.announce(PacketCreator.giveBuff(1, beaconid, stat)); } if (!chr.isHidden()) { // thanks Lame (Conrad) for noticing hidden characters controlling mobs @@ -56,7 +57,7 @@ public final class PlayerMapTransitionHandler extends AbstractMaplePacketHandler MapleMonster m = (MapleMonster) mo; if (m.getSpawnEffect() == 0 || m.getHp() < m.getMaxHp()) { // avoid effect-spawning mobs if (m.getController() == chr) { - c.announce(MaplePacketCreator.stopControllingMonster(m.getObjectId())); + c.announce(PacketCreator.stopControllingMonster(m.getObjectId())); m.sendDestroyData(c); m.aggroRemoveController(); } else { diff --git a/src/main/java/net/server/channel/handlers/RPSActionHandler.java b/src/main/java/net/server/channel/handlers/RPSActionHandler.java index f3eea78053..b185d7ca1f 100644 --- a/src/main/java/net/server/channel/handlers/RPSActionHandler.java +++ b/src/main/java/net/server/channel/handlers/RPSActionHandler.java @@ -2,9 +2,9 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; -import server.minigame.MapleRockPaperScissor; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import server.minigame.MapleRockPaperScissor; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -37,29 +37,29 @@ public final class RPSActionHandler extends AbstractMaplePacketHandler{ if(chr.getMeso() >= 1000){ chr.setRPS(new MapleRockPaperScissor(c, mode)); }else{ - c.announce(MaplePacketCreator.rpsMesoError(-1)); + c.announce(PacketCreator.rpsMesoError(-1)); } break; case 1: // answer if(rps == null || !rps.answer(c, slea.readByte())){ - c.announce(MaplePacketCreator.rpsMode((byte) 0x0D));// 13 + c.announce(PacketCreator.rpsMode((byte) 0x0D));// 13 } break; case 2: // time over if(rps == null || !rps.timeOut(c)){ - c.announce(MaplePacketCreator.rpsMode((byte) 0x0D)); + c.announce(PacketCreator.rpsMode((byte) 0x0D)); } break; case 3: // continue if(rps == null || !rps.nextRound(c)){ - c.announce(MaplePacketCreator.rpsMode((byte) 0x0D)); + c.announce(PacketCreator.rpsMode((byte) 0x0D)); } break; case 4: // leave if(rps != null){ rps.dispose(c); }else{ - c.announce(MaplePacketCreator.rpsMode((byte) 0x0D)); + c.announce(PacketCreator.rpsMode((byte) 0x0D)); } break; } diff --git a/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java b/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java index b0ad63342a..21336fb4b1 100644 --- a/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java +++ b/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java @@ -10,7 +10,7 @@ import net.AbstractMaplePacketHandler; import server.MapleItemInformationProvider; import server.MapleItemInformationProvider.QuestConsItem; import server.quest.MapleQuest; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import java.util.Map; @@ -42,7 +42,7 @@ public class RaiseIncExpHandler extends AbstractMaplePacketHandler { MapleCharacter chr = c.getPlayer(); MapleQuest quest = MapleQuest.getInstanceFromInfoNumber(infoNumber); if (!chr.getQuest(quest).getStatus().equals(MapleQuestStatus.Status.STARTED)) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -64,7 +64,7 @@ public class RaiseIncExpHandler extends AbstractMaplePacketHandler { int nextValue = Math.min(consumables.get(consId) + c.getAbstractPlayerInteraction().getQuestProgressInt(questid, infoNumber), consItem.exp * consItem.grade); c.getAbstractPlayerInteraction().setQuestProgress(questid, infoNumber, nextValue); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } finally { c.releaseClient(); } diff --git a/src/main/java/net/server/channel/handlers/RangedAttackHandler.java b/src/main/java/net/server/channel/handlers/RangedAttackHandler.java index 5b7f7e19cb..7b758a0dd4 100644 --- a/src/main/java/net/server/channel/handlers/RangedAttackHandler.java +++ b/src/main/java/net/server/channel/handlers/RangedAttackHandler.java @@ -21,11 +21,7 @@ along with this program. If not, see . */ package net.server.channel.handlers; -import client.MapleBuffStat; -import client.MapleCharacter; -import client.MapleClient; -import client.Skill; -import client.SkillFactory; +import client.*; import client.inventory.Item; import client.inventory.MapleInventory; import client.inventory.MapleInventoryType; @@ -34,16 +30,10 @@ import client.inventory.manipulator.MapleInventoryManipulator; import config.YamlConfig; import constants.game.GameConstants; import constants.inventory.ItemConstants; -import constants.skills.Aran; -import constants.skills.Buccaneer; -import constants.skills.NightLord; -import constants.skills.NightWalker; -import constants.skills.Shadower; -import constants.skills.ThunderBreaker; -import constants.skills.WindArcher; +import constants.skills.*; import server.MapleItemInformationProvider; import server.MapleStatEffect; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Randomizer; import tools.data.input.SeekableLittleEndianAccessor; @@ -72,21 +62,21 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler { if (GameConstants.isDojo(chr.getMap().getId()) && attack.numAttacked > 0) { chr.setDojoEnergy(chr.getDojoEnergy() + YamlConfig.config.server.DOJO_ENERGY_ATK); - c.announce(MaplePacketCreator.getEnergy("energy", chr.getDojoEnergy())); + c.announce(PacketCreator.getEnergy("energy", chr.getDojoEnergy())); } if (attack.skill == Buccaneer.ENERGY_ORB || attack.skill == ThunderBreaker.SPARK || attack.skill == Shadower.TAUNT || attack.skill == NightLord.TAUNT) { - chr.getMap().broadcastMessage(chr, MaplePacketCreator.rangedAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, 0, attack.allDamage, attack.speed, attack.direction, attack.display), false); + chr.getMap().broadcastMessage(chr, PacketCreator.rangedAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, 0, attack.allDamage, attack.speed, attack.direction, attack.display), false); applyAttack(attack, chr, 1); } else if (attack.skill == ThunderBreaker.SHARK_WAVE && chr.getSkillLevel(ThunderBreaker.SHARK_WAVE) > 0) { - chr.getMap().broadcastMessage(chr, MaplePacketCreator.rangedAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, 0, attack.allDamage, attack.speed, attack.direction, attack.display), false); + chr.getMap().broadcastMessage(chr, PacketCreator.rangedAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, 0, attack.allDamage, attack.speed, attack.direction, attack.display), false); applyAttack(attack, chr, 1); for (int i = 0; i < attack.numAttacked; i++) { chr.handleEnergyChargeGain(); } } else if (attack.skill == Aran.COMBO_SMASH || attack.skill == Aran.COMBO_FENRIR || attack.skill == Aran.COMBO_TEMPEST) { - chr.getMap().broadcastMessage(chr, MaplePacketCreator.rangedAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, 0, attack.allDamage, attack.speed, attack.direction, attack.display), false); + chr.getMap().broadcastMessage(chr, PacketCreator.rangedAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, 0, attack.allDamage, attack.speed, attack.direction, attack.display), false); if (attack.skill == Aran.COMBO_SMASH && chr.getCombo() >= 30) { chr.setCombo((short) 0); applyAttack(attack, chr, 1); @@ -111,7 +101,7 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler { effect = attack.getAttackEffect(chr, null); bulletCount = effect.getBulletCount(); if (effect.getCooldown() > 0) { - c.announce(MaplePacketCreator.skillCooldown(attack.skill, effect.getCooldown())); + c.announce(PacketCreator.skillCooldown(attack.skill, effect.getCooldown())); } if(attack.skill == 4111004) { // shadow meso @@ -203,10 +193,10 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler { case 3221001: // Pierce case 5221004: // Rapid Fire case 13111002: // KoC Hurricane - packet = MaplePacketCreator.rangedAttack(chr, attack.skill, attack.skilllevel, attack.rangedirection, attack.numAttackedAndDamage, visProjectile, attack.allDamage, attack.speed, attack.direction, attack.display); + packet = PacketCreator.rangedAttack(chr, attack.skill, attack.skilllevel, attack.rangedirection, attack.numAttackedAndDamage, visProjectile, attack.allDamage, attack.speed, attack.direction, attack.display); break; default: - packet = MaplePacketCreator.rangedAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, visProjectile, attack.allDamage, attack.speed, attack.direction, attack.display); + packet = PacketCreator.rangedAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, visProjectile, attack.allDamage, attack.speed, attack.direction, attack.display); break; } chr.getMap().broadcastMessage(chr, packet, false, true); @@ -218,7 +208,7 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler { if (chr.skillIsCooling(attack.skill)) { return; } else { - c.announce(MaplePacketCreator.skillCooldown(attack.skill, effect_.getCooldown())); + c.announce(PacketCreator.skillCooldown(attack.skill, effect_.getCooldown())); chr.addCooldown(attack.skill, currentServerTime(), effect_.getCooldown() * 1000); } } diff --git a/src/main/java/net/server/channel/handlers/RemoteStoreHandler.java b/src/main/java/net/server/channel/handlers/RemoteStoreHandler.java index 0a24fe84d7..0447680ffa 100644 --- a/src/main/java/net/server/channel/handlers/RemoteStoreHandler.java +++ b/src/main/java/net/server/channel/handlers/RemoteStoreHandler.java @@ -26,7 +26,7 @@ import client.MapleCharacter; import client.MapleClient; import net.AbstractMaplePacketHandler; import server.maps.MapleHiredMerchant; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -42,13 +42,13 @@ public class RemoteStoreHandler extends AbstractMaplePacketHandler { if (hm.getChannel() == chr.getClient().getChannel()) { hm.visitShop(chr); } else { - c.announce(MaplePacketCreator.remoteChannelChange((byte) (hm.getChannel() - 1))); + c.announce(PacketCreator.remoteChannelChange((byte) (hm.getChannel() - 1))); } return; } else { chr.dropMessage(1, "You don't have a Merchant open."); } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } private static MapleHiredMerchant getMerchant(MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/ReportHandler.java b/src/main/java/net/server/channel/handlers/ReportHandler.java index 2cc21962f1..219ee9e9d8 100644 --- a/src/main/java/net/server/channel/handlers/ReportHandler.java +++ b/src/main/java/net/server/channel/handlers/ReportHandler.java @@ -26,7 +26,7 @@ import client.MapleClient; import net.AbstractMaplePacketHandler; import net.server.Server; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import java.sql.Connection; @@ -51,14 +51,14 @@ public final class ReportHandler extends AbstractMaplePacketHandler { c.getPlayer().decreaseReports(); c.getPlayer().gainMeso(-300, true); } else { - c.announce(MaplePacketCreator.reportResponse((byte) 4)); + c.announce(PacketCreator.reportResponse((byte) 4)); return; } } else { - c.announce(MaplePacketCreator.reportResponse((byte) 2)); + c.announce(PacketCreator.reportResponse((byte) 2)); return; } - Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(6, victim + " was reported for: " + description)); + Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(6, victim + " was reported for: " + description)); addReport(c.getPlayer().getId(), MapleCharacter.getIdByName(victim), 0, description, null); } else if (type == 1) { String chatlog = slea.readMapleAsciiString(); @@ -70,14 +70,14 @@ public final class ReportHandler extends AbstractMaplePacketHandler { c.getPlayer().decreaseReports(); c.getPlayer().gainMeso(-300, true); } else { - c.announce(MaplePacketCreator.reportResponse((byte) 4)); + c.announce(PacketCreator.reportResponse((byte) 4)); return; } } - Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(6, victim + " was reported for: " + description)); + Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(6, victim + " was reported for: " + description)); addReport(c.getPlayer().getId(), MapleCharacter.getIdByName(victim), reason, description, chatlog); } else { - Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(6, c.getPlayer().getName() + " is probably packet editing. Got unknown report type, which is impossible.")); + Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(6, c.getPlayer().getName() + " is probably packet editing. Got unknown report type, which is impossible.")); } } diff --git a/src/main/java/net/server/channel/handlers/RingActionHandler.java b/src/main/java/net/server/channel/handlers/RingActionHandler.java index 08a063ea9b..0d5bcbeaa8 100644 --- a/src/main/java/net/server/channel/handlers/RingActionHandler.java +++ b/src/main/java/net/server/channel/handlers/RingActionHandler.java @@ -35,7 +35,7 @@ import net.server.world.World; import scripting.event.EventInstanceManager; import server.MapleItemInformationProvider; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.data.input.SeekableLittleEndianAccessor; import tools.packets.Wedding; @@ -315,20 +315,20 @@ public final class RingActionHandler extends AbstractMaplePacketHandler { final MapleCharacter target = c.getPlayer(); if (source == null) { - target.announce(MaplePacketCreator.enableActions()); + target.announce(PacketCreator.enableActions()); return; } final int itemid = source.getMarriageItemId(); if (target.getPartnerId() > 0 || source.getId() != id || itemid <= 0 || !source.haveItem(itemid) || source.getPartnerId() > 0 || !source.isAlive() || !target.isAlive()) { - target.announce(MaplePacketCreator.enableActions()); + target.announce(PacketCreator.enableActions()); return; } if (accepted) { final int newItemId = getBoxId(itemid); if (!MapleInventoryManipulator.checkSpace(c, newItemId, 1, "") || !MapleInventoryManipulator.checkSpace(source.getClient(), newItemId, 1, "")) { - target.announce(MaplePacketCreator.enableActions()); + target.announce(PacketCreator.enableActions()); return; } @@ -374,12 +374,12 @@ public final class RingActionHandler extends AbstractMaplePacketHandler { try { itemId = c.getPlayer().getInventory(MapleInventoryType.ETC).getItem(slot).getItemId(); } catch(NullPointerException npe) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } if((itemId != 4031377 && itemId != 4031395) || !c.getPlayer().haveItem(itemId)) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -444,7 +444,7 @@ public final class RingActionHandler extends AbstractMaplePacketHandler { if(invitationid == 4031406 || invitationid == 4031407) { Item item = c.getPlayer().getInventory(MapleInventoryType.ETC).getItem(slot); if(item == null || item.getItemId() != invitationid) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -502,6 +502,6 @@ public final class RingActionHandler extends AbstractMaplePacketHandler { break; } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } diff --git a/src/main/java/net/server/channel/handlers/ScrollHandler.java b/src/main/java/net/server/channel/handlers/ScrollHandler.java index d8b9911855..a22d413c5e 100644 --- a/src/main/java/net/server/channel/handlers/ScrollHandler.java +++ b/src/main/java/net/server/channel/handlers/ScrollHandler.java @@ -31,7 +31,7 @@ import client.inventory.manipulator.MapleInventoryManipulator; import constants.inventory.ItemConstants; import net.AbstractMaplePacketHandler; import server.MapleItemInformationProvider; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import java.util.ArrayList; @@ -171,8 +171,8 @@ public final class ScrollHandler extends AbstractMaplePacketHandler { mods.add(new ModifyInventory(3, scrolled)); mods.add(new ModifyInventory(0, scrolled)); } - c.announce(MaplePacketCreator.modifyInventory(true, mods)); - chr.getMap().broadcastMessage(MaplePacketCreator.getScrollEffect(chr.getId(), scrollSuccess, legendarySpirit, whiteScroll)); + c.announce(PacketCreator.modifyInventory(true, mods)); + chr.getMap().broadcastMessage(PacketCreator.getScrollEffect(chr.getId(), scrollSuccess, legendarySpirit, whiteScroll)); if (dst < 0 && (scrollSuccess == Equip.ScrollResult.SUCCESS || scrollSuccess == Equip.ScrollResult.CURSE)) { chr.equipChanged(); } @@ -184,9 +184,9 @@ public final class ScrollHandler extends AbstractMaplePacketHandler { private static void announceCannotScroll(MapleClient c, boolean legendarySpirit) { if (legendarySpirit) { - c.announce(MaplePacketCreator.getScrollEffect(c.getPlayer().getId(), Equip.ScrollResult.FAIL, false, false)); + c.announce(PacketCreator.getScrollEffect(c.getPlayer().getId(), Equip.ScrollResult.FAIL, false, false)); } else { - c.announce(MaplePacketCreator.getInventoryFull()); + c.announce(PacketCreator.getInventoryFull()); } } diff --git a/src/main/java/net/server/channel/handlers/SkillBookHandler.java b/src/main/java/net/server/channel/handlers/SkillBookHandler.java index 9ff146ecb6..5a4774cc9d 100644 --- a/src/main/java/net/server/channel/handlers/SkillBookHandler.java +++ b/src/main/java/net/server/channel/handlers/SkillBookHandler.java @@ -31,7 +31,7 @@ import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import net.AbstractMaplePacketHandler; import server.MapleItemInformationProvider; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import java.util.Map; @@ -40,7 +40,7 @@ public final class SkillBookHandler extends AbstractMaplePacketHandler { @Override public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { if (!c.getPlayer().isAlive()) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -97,7 +97,7 @@ public final class SkillBookHandler extends AbstractMaplePacketHandler { } // thanks Vcoc for noting skill book result not showing for all in area - player.getMap().broadcastMessage(MaplePacketCreator.skillBookResult(player, skill, maxlevel, canuse, success)); + player.getMap().broadcastMessage(PacketCreator.skillBookResult(player, skill, maxlevel, canuse, success)); } } } diff --git a/src/main/java/net/server/channel/handlers/SkillEffectHandler.java b/src/main/java/net/server/channel/handlers/SkillEffectHandler.java index d0d3679485..01d7e6bc03 100644 --- a/src/main/java/net/server/channel/handlers/SkillEffectHandler.java +++ b/src/main/java/net/server/channel/handlers/SkillEffectHandler.java @@ -22,25 +22,9 @@ package net.server.channel.handlers; import client.MapleClient; -import constants.skills.Bishop; -import constants.skills.Bowmaster; -import constants.skills.Brawler; -import constants.skills.ChiefBandit; -import constants.skills.Corsair; -import constants.skills.DarkKnight; -import constants.skills.Evan; -import constants.skills.FPArchMage; -import constants.skills.FPMage; -import constants.skills.Gunslinger; -import constants.skills.Hero; -import constants.skills.ILArchMage; -import constants.skills.Marksman; -import constants.skills.NightWalker; -import constants.skills.Paladin; -import constants.skills.ThunderBreaker; -import constants.skills.WindArcher; +import constants.skills.*; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class SkillEffectHandler extends AbstractMaplePacketHandler { @@ -70,7 +54,7 @@ public final class SkillEffectHandler extends AbstractMaplePacketHandler { case Hero.MONSTER_MAGNET: case Evan.FIRE_BREATH: case Evan.ICE_BREATH: - c.getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.skillEffect(c.getPlayer(), skillId, level, flags, speed, aids), false); + c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.skillEffect(c.getPlayer(), skillId, level, flags, speed, aids), false); return; default: System.out.println(c.getPlayer() + " entered SkillEffectHandler without being handled using " + skillId + "."); diff --git a/src/main/java/net/server/channel/handlers/SpecialMoveHandler.java b/src/main/java/net/server/channel/handlers/SpecialMoveHandler.java index cf988013d8..2b96e283ed 100644 --- a/src/main/java/net/server/channel/handlers/SpecialMoveHandler.java +++ b/src/main/java/net/server/channel/handlers/SpecialMoveHandler.java @@ -21,26 +21,20 @@ */ package net.server.channel.handlers; -import java.awt.Point; - -import config.YamlConfig; -import net.AbstractMaplePacketHandler; -import server.MapleStatEffect; -import server.life.MapleMonster; -import tools.MaplePacketCreator; -import tools.data.input.SeekableLittleEndianAccessor; import client.MapleCharacter; import client.MapleClient; import client.Skill; import client.SkillFactory; -import constants.skills.Brawler; -import constants.skills.Corsair; -import constants.skills.DarkKnight; -import constants.skills.Hero; -import constants.skills.Paladin; -import constants.skills.Priest; -import constants.skills.SuperGM; +import config.YamlConfig; +import constants.skills.*; +import net.AbstractMaplePacketHandler; import net.server.Server; +import server.MapleStatEffect; +import server.life.MapleMonster; +import tools.PacketCreator; +import tools.data.input.SeekableLittleEndianAccessor; + +import java.awt.*; public final class SpecialMoveHandler extends AbstractMaplePacketHandler { @@ -70,8 +64,8 @@ public final class SpecialMoveHandler extends AbstractMaplePacketHandler { } skillLevel = 1; chr.setDojoEnergy(0); - c.announce(MaplePacketCreator.getEnergy("energy", chr.getDojoEnergy())); - c.announce(MaplePacketCreator.serverNotice(5, "As you used the secret skill, your energy bar has been reset.")); + c.announce(PacketCreator.getEnergy("energy", chr.getDojoEnergy())); + c.announce(PacketCreator.serverNotice(5, "As you used the secret skill, your energy bar has been reset.")); } if (skillLevel == 0 || skillLevel != __skillLevel) return; @@ -85,7 +79,7 @@ public final class SpecialMoveHandler extends AbstractMaplePacketHandler { cooldownTime /= 60; } - c.announce(MaplePacketCreator.skillCooldown(skillid, cooldownTime)); + c.announce(PacketCreator.skillCooldown(skillid, cooldownTime)); chr.addCooldown(skillid, currentServerTime(), cooldownTime * 1000); } } @@ -94,7 +88,7 @@ public final class SpecialMoveHandler extends AbstractMaplePacketHandler { for (int i = 0; i < num; i++) { int mobOid = slea.readInt(); byte success = slea.readByte(); - chr.getMap().broadcastMessage(chr, MaplePacketCreator.catchMonster(mobOid, success), false); + chr.getMap().broadcastMessage(chr, PacketCreator.catchMonster(mobOid, success), false); MapleMonster monster = chr.getMap().getMonsterByOid(mobOid); if (monster != null) { if (!monster.isBoss()) { @@ -108,8 +102,8 @@ public final class SpecialMoveHandler extends AbstractMaplePacketHandler { } } byte direction = slea.readByte(); // thanks MedicOP for pointing some 3rd-party related issues with Magnet - chr.getMap().broadcastMessage(chr, MaplePacketCreator.showBuffeffect(chr.getId(), skillid, chr.getSkillLevel(skillid), 1, direction), false); - c.announce(MaplePacketCreator.enableActions()); + chr.getMap().broadcastMessage(chr, PacketCreator.showBuffeffect(chr.getId(), skillid, chr.getSkillLevel(skillid), 1, direction), false); + c.announce(PacketCreator.enableActions()); return; } else if (skillid == Brawler.MP_RECOVERY) {// MP Recovery Skill s = SkillFactory.getSkill(skillid); @@ -120,7 +114,7 @@ public final class SpecialMoveHandler extends AbstractMaplePacketHandler { chr.addMP(gain); } else if (skillid == SuperGM.HEAL_PLUS_DISPEL) { slea.skip(11); - chr.getMap().broadcastMessage(chr, MaplePacketCreator.showBuffeffect(chr.getId(), skillid, chr.getSkillLevel(skillid)), false); + chr.getMap().broadcastMessage(chr, PacketCreator.showBuffeffect(chr.getId(), skillid, chr.getSkillLevel(skillid)), false); } else if (skillid % 10000000 == 1004) { slea.readShort(); } @@ -149,10 +143,10 @@ public final class SpecialMoveHandler extends AbstractMaplePacketHandler { } } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } else { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } } \ No newline at end of file diff --git a/src/main/java/net/server/channel/handlers/SpouseChatHandler.java b/src/main/java/net/server/channel/handlers/SpouseChatHandler.java index 46d4bff57f..6da509343d 100644 --- a/src/main/java/net/server/channel/handlers/SpouseChatHandler.java +++ b/src/main/java/net/server/channel/handlers/SpouseChatHandler.java @@ -26,7 +26,7 @@ import client.MapleClient; import config.YamlConfig; import net.AbstractMaplePacketHandler; import tools.LogHelper; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class SpouseChatHandler extends AbstractMaplePacketHandler { @@ -39,8 +39,8 @@ public final class SpouseChatHandler extends AbstractMaplePacketHandler { if (partnerId > 0) { // yay marriage MapleCharacter spouse = c.getWorldServer().getPlayerStorage().getCharacterById(partnerId); if (spouse != null) { - spouse.announce(MaplePacketCreator.OnCoupleMessage(c.getPlayer().getName(), msg, true)); - c.announce(MaplePacketCreator.OnCoupleMessage(c.getPlayer().getName(), msg, true)); + spouse.announce(PacketCreator.OnCoupleMessage(c.getPlayer().getName(), msg, true)); + c.announce(PacketCreator.OnCoupleMessage(c.getPlayer().getName(), msg, true)); if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) { LogHelper.logChat(c, "Spouse", msg); } diff --git a/src/main/java/net/server/channel/handlers/SummonDamageHandler.java b/src/main/java/net/server/channel/handlers/SummonDamageHandler.java index 18722edf21..379a288d20 100644 --- a/src/main/java/net/server/channel/handlers/SummonDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/SummonDamageHandler.java @@ -31,17 +31,18 @@ import client.inventory.MapleInventoryType; import client.inventory.MapleWeaponType; import client.status.MonsterStatusEffect; import constants.skills.Outlaw; -import java.util.ArrayList; -import java.util.List; import server.MapleItemInformationProvider; import server.MapleStatEffect; import server.life.MapleMonster; import server.life.MapleMonsterInformationProvider; import server.maps.MapleSummon; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; +import java.util.ArrayList; +import java.util.List; + public final class SummonDamageHandler extends AbstractDealDamageHandler { public final class SummonAttackEntry { @@ -93,7 +94,7 @@ public final class SummonDamageHandler extends AbstractDealDamageHandler { int damage = slea.readInt(); allDamage.add(new SummonAttackEntry(monsterOid, damage)); } - player.getMap().broadcastMessage(player, MaplePacketCreator.summonAttack(player.getId(), summon.getObjectId(), direction, allDamage), summon.getPosition()); + player.getMap().broadcastMessage(player, PacketCreator.summonAttack(player.getId(), summon.getObjectId(), direction, allDamage), summon.getPosition()); if (player.getMap().isOwnershipRestricted(player)) { return; diff --git a/src/main/java/net/server/channel/handlers/TakeDamageHandler.java b/src/main/java/net/server/channel/handlers/TakeDamageHandler.java index c04a258e18..8e59aace0e 100644 --- a/src/main/java/net/server/channel/handlers/TakeDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/TakeDamageHandler.java @@ -39,7 +39,7 @@ import server.life.*; import server.maps.MapleMap; import server.maps.MapleMapObject; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Randomizer; import tools.data.input.SeekableLittleEndianAccessor; @@ -168,9 +168,9 @@ public final class TakeDamageHandler extends AbstractMaplePacketHandler { bouncedamage = attacker.getMaxHp() / 5; } map.damageMonster(chr, attacker, bouncedamage); - map.broadcastMessage(chr, MaplePacketCreator.damageMonster(oid, bouncedamage), true); - chr.getClient().announce(MaplePacketCreator.showOwnBuffEffect(id, 5)); - map.broadcastMessage(chr, MaplePacketCreator.showBuffeffect(chr.getId(), id, 5), false); + map.broadcastMessage(chr, PacketCreator.damageMonster(oid, bouncedamage), true); + chr.getClient().announce(PacketCreator.showOwnBuffEffect(id, 5)); + map.broadcastMessage(chr, PacketCreator.showBuffeffect(chr.getId(), id, 5), false); } } } @@ -201,7 +201,7 @@ public final class TakeDamageHandler extends AbstractMaplePacketHandler { bouncedamage = Math.min(bouncedamage, attacker.getMaxHp() / 10); damage -= bouncedamage; map.damageMonster(chr, attacker, bouncedamage); - map.broadcastMessage(chr, MaplePacketCreator.damageMonster(oid, bouncedamage), false, true); + map.broadcastMessage(chr, PacketCreator.damageMonster(oid, bouncedamage), false, true); attacker.aggroMonsterDamage(chr, bouncedamage); } MapleStatEffect bPressure = chr.getBuffEffect(MapleBuffStat.BODY_PRESSURE); // thanks Atoot for noticing an issue on Body Pressure neutralise @@ -268,13 +268,13 @@ public final class TakeDamageHandler extends AbstractMaplePacketHandler { } } if (!chr.isHidden()) { - map.broadcastMessage(chr, MaplePacketCreator.damagePlayer(damagefrom, monsteridfrom, chr.getId(), damage, fake, direction, is_pgmr, pgmr, is_pg, oid, pos_x, pos_y), false); + map.broadcastMessage(chr, PacketCreator.damagePlayer(damagefrom, monsteridfrom, chr.getId(), damage, fake, direction, is_pgmr, pgmr, is_pg, oid, pos_x, pos_y), false); } else { - map.broadcastGMMessage(chr, MaplePacketCreator.damagePlayer(damagefrom, monsteridfrom, chr.getId(), damage, fake, direction, is_pgmr, pgmr, is_pg, oid, pos_x, pos_y), false); + map.broadcastGMMessage(chr, PacketCreator.damagePlayer(damagefrom, monsteridfrom, chr.getId(), damage, fake, direction, is_pgmr, pgmr, is_pg, oid, pos_x, pos_y), false); } if (GameConstants.isDojo(map.getId())) { chr.setDojoEnergy(chr.getDojoEnergy() + YamlConfig.config.server.DOJO_ENERGY_DMG); - c.announce(MaplePacketCreator.getEnergy("energy", chr.getDojoEnergy())); + c.announce(PacketCreator.getEnergy("energy", chr.getDojoEnergy())); } for (MapleCharacter player : banishPlayers) { // chill, if this list ever gets non-empty an attacker does exist, trust me :) diff --git a/src/main/java/net/server/channel/handlers/TouchingCashShopHandler.java b/src/main/java/net/server/channel/handlers/TouchingCashShopHandler.java index be241138b5..c6613ceeb7 100644 --- a/src/main/java/net/server/channel/handlers/TouchingCashShopHandler.java +++ b/src/main/java/net/server/channel/handlers/TouchingCashShopHandler.java @@ -23,7 +23,7 @@ package net.server.channel.handlers; import client.MapleClient; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -33,6 +33,6 @@ import tools.data.input.SeekableLittleEndianAccessor; public final class TouchingCashShopHandler extends AbstractMaplePacketHandler { @Override public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { - c.announce(MaplePacketCreator.showCash(c.getPlayer())); + c.announce(PacketCreator.showCash(c.getPlayer())); } } diff --git a/src/main/java/net/server/channel/handlers/TransferNameHandler.java b/src/main/java/net/server/channel/handlers/TransferNameHandler.java index d434fae6be..89f38629c5 100644 --- a/src/main/java/net/server/channel/handlers/TransferNameHandler.java +++ b/src/main/java/net/server/channel/handlers/TransferNameHandler.java @@ -25,7 +25,7 @@ import client.MapleClient; import config.YamlConfig; import net.AbstractMaplePacketHandler; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import java.sql.*; @@ -43,20 +43,20 @@ public final class TransferNameHandler extends AbstractMaplePacketHandler { slea.readInt(); //cid int birthday = slea.readInt(); if (!CashOperationHandler.checkBirthday(c, birthday)) { - c.announce(MaplePacketCreator.showCashShopMessage((byte) 0xC4)); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.showCashShopMessage((byte) 0xC4)); + c.announce(PacketCreator.enableActions()); return; } if(!YamlConfig.config.server.ALLOW_CASHSHOP_NAME_CHANGE) { - c.announce(MaplePacketCreator.sendNameTransferRules(4)); + c.announce(PacketCreator.sendNameTransferRules(4)); return; } MapleCharacter chr = c.getPlayer(); if(chr.getLevel() < 10) { - c.announce(MaplePacketCreator.sendNameTransferRules(4)); + c.announce(PacketCreator.sendNameTransferRules(4)); return; } else if(c.getTempBanCalendar() != null && c.getTempBanCalendar().getTimeInMillis() + (30*24*60*60*1000) < Calendar.getInstance().getTimeInMillis()) { - c.announce(MaplePacketCreator.sendNameTransferRules(2)); + c.announce(PacketCreator.sendNameTransferRules(2)); return; } //sql queries @@ -67,10 +67,10 @@ public final class TransferNameHandler extends AbstractMaplePacketHandler { while(rs.next()) { Timestamp completedTimestamp = rs.getTimestamp("completionTime"); if(completedTimestamp == null) { //has pending name request - c.announce(MaplePacketCreator.sendNameTransferRules(1)); + c.announce(PacketCreator.sendNameTransferRules(1)); return; } else if(completedTimestamp.getTime() + YamlConfig.config.server.NAME_CHANGE_COOLDOWN > System.currentTimeMillis()) { - c.announce(MaplePacketCreator.sendNameTransferRules(3)); + c.announce(PacketCreator.sendNameTransferRules(3)); return; } } @@ -78,6 +78,6 @@ public final class TransferNameHandler extends AbstractMaplePacketHandler { e.printStackTrace(); return; } - c.announce(MaplePacketCreator.sendNameTransferRules(0)); + c.announce(PacketCreator.sendNameTransferRules(0)); } } \ No newline at end of file diff --git a/src/main/java/net/server/channel/handlers/TransferNameResultHandler.java b/src/main/java/net/server/channel/handlers/TransferNameResultHandler.java index aca218c523..647a043541 100644 --- a/src/main/java/net/server/channel/handlers/TransferNameResultHandler.java +++ b/src/main/java/net/server/channel/handlers/TransferNameResultHandler.java @@ -23,7 +23,7 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -35,6 +35,6 @@ public final class TransferNameResultHandler extends AbstractMaplePacketHandler @Override public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { String name = slea.readMapleAsciiString(); - c.announce(MaplePacketCreator.sendNameTransferCheck(name, MapleCharacter.canCreateChar(name))); + c.announce(PacketCreator.sendNameTransferCheck(name, MapleCharacter.canCreateChar(name))); } } \ No newline at end of file diff --git a/src/main/java/net/server/channel/handlers/TransferWorldHandler.java b/src/main/java/net/server/channel/handlers/TransferWorldHandler.java index b34078c1b4..b2fbc14c7a 100644 --- a/src/main/java/net/server/channel/handlers/TransferWorldHandler.java +++ b/src/main/java/net/server/channel/handlers/TransferWorldHandler.java @@ -26,7 +26,7 @@ import config.YamlConfig; import net.AbstractMaplePacketHandler; import net.server.Server; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import java.sql.*; @@ -43,18 +43,18 @@ public final class TransferWorldHandler extends AbstractMaplePacketHandler { slea.readInt(); //cid int birthday = slea.readInt(); if (!CashOperationHandler.checkBirthday(c, birthday)) { - c.announce(MaplePacketCreator.showCashShopMessage((byte) 0xC4)); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.showCashShopMessage((byte) 0xC4)); + c.announce(PacketCreator.enableActions()); return; } MapleCharacter chr = c.getPlayer(); if(!YamlConfig.config.server.ALLOW_CASHSHOP_WORLD_TRANSFER || Server.getInstance().getWorldsSize() <= 1) { - c.announce(MaplePacketCreator.sendWorldTransferRules(9, c)); + c.announce(PacketCreator.sendWorldTransferRules(9, c)); return; } int worldTransferError = chr.checkWorldTransferEligibility(); if(worldTransferError != 0) { - c.announce(MaplePacketCreator.sendWorldTransferRules(worldTransferError, c)); + c.announce(PacketCreator.sendWorldTransferRules(worldTransferError, c)); return; } try (Connection con = DatabaseConnection.getConnection(); @@ -64,10 +64,10 @@ public final class TransferWorldHandler extends AbstractMaplePacketHandler { while(rs.next()) { Timestamp completedTimestamp = rs.getTimestamp("completionTime"); if(completedTimestamp == null) { //has pending world transfer - c.announce(MaplePacketCreator.sendWorldTransferRules(6, c)); + c.announce(PacketCreator.sendWorldTransferRules(6, c)); return; } else if(completedTimestamp.getTime() + YamlConfig.config.server.WORLD_TRANSFER_COOLDOWN > System.currentTimeMillis()) { - c.announce(MaplePacketCreator.sendWorldTransferRules(7, c)); + c.announce(PacketCreator.sendWorldTransferRules(7, c)); return; } } @@ -75,6 +75,6 @@ public final class TransferWorldHandler extends AbstractMaplePacketHandler { e.printStackTrace(); return; } - c.announce(MaplePacketCreator.sendWorldTransferRules(0, c)); + c.announce(PacketCreator.sendWorldTransferRules(0, c)); } } \ No newline at end of file diff --git a/src/main/java/net/server/channel/handlers/TrockAddMapHandler.java b/src/main/java/net/server/channel/handlers/TrockAddMapHandler.java index 0f0c34364b..0011af7535 100644 --- a/src/main/java/net/server/channel/handlers/TrockAddMapHandler.java +++ b/src/main/java/net/server/channel/handlers/TrockAddMapHandler.java @@ -25,7 +25,7 @@ import client.MapleCharacter; import client.MapleClient; import net.AbstractMaplePacketHandler; import server.maps.FieldLimit; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -45,7 +45,7 @@ public final class TrockAddMapHandler extends AbstractMaplePacketHandler { chr.deleteFromVipTrocks(mapId); else chr.deleteFromTrocks(mapId); - c.announce(MaplePacketCreator.trockRefreshMapList(chr, true, vip)); + c.announce(PacketCreator.trockRefreshMapList(chr, true, vip)); } else if (type == 0x01) { if (!FieldLimit.CANNOTVIPROCK.check(chr.getMap().getFieldLimit())) { if (vip) @@ -53,7 +53,7 @@ public final class TrockAddMapHandler extends AbstractMaplePacketHandler { else chr.addTrockMap(); - c.announce(MaplePacketCreator.trockRefreshMapList(chr, false, vip)); + c.announce(PacketCreator.trockRefreshMapList(chr, false, vip)); } else { chr.message("You may not save this map."); } diff --git a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java index 3cf50014fd..3bc6beff29 100644 --- a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java @@ -40,7 +40,7 @@ import server.MapleShop; import server.MapleShopFactory; import server.TimerManager; import server.maps.*; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.data.input.SeekableLittleEndianAccessor; @@ -58,7 +58,7 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { long timeNow = currentServerTime(); if (timeNow - player.getLastUsedCashItem() < 3000) { player.dropMessage(1, "You have used a cash item recently. Wait a moment, then try again."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } player.setLastUsedCashItem(timeNow); @@ -74,7 +74,7 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { toUse = cashInv.findById(itemId); if (toUse == null) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -82,7 +82,7 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { } if (toUse.getQuantity() < 1) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -133,11 +133,11 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { if (!success) { MapleInventoryManipulator.addById(c, itemId, (short) 1); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } else if (itemType == 505) { // AP/SP reset if(!player.isAlive()) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -254,14 +254,14 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { switch ((itemId / 1000) % 10) { case 1: // Megaphone if (player.getLevel() > 9) { - player.getClient().getChannelServer().broadcastPacket(MaplePacketCreator.serverNotice(2, medal + player.getName() + " : " + slea.readMapleAsciiString())); + player.getClient().getChannelServer().broadcastPacket(PacketCreator.serverNotice(2, medal + player.getName() + " : " + slea.readMapleAsciiString())); } else { player.dropMessage(1, "You may not use this until you're level 10."); return; } break; case 2: // Super megaphone - Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.serverNotice(3, c.getChannel(), medal + player.getName() + " : " + slea.readMapleAsciiString(), (slea.readByte() != 0))); + Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(3, c.getChannel(), medal + player.getName() + " : " + slea.readMapleAsciiString(), (slea.readByte() != 0))); break; case 5: // Maple TV int tvType = itemId % 10; @@ -299,7 +299,7 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { } if (megassenger) { - Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.serverNotice(3, c.getChannel(), medal + player.getName() + " : " + builder.toString(), ear)); + Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(3, c.getChannel(), medal + player.getName() + " : " + builder.toString(), ear)); } break; @@ -316,7 +316,7 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { // thanks Conrad for noticing that untradeable items should be allowed in megas } - Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.itemMegaphone(msg, whisper, c.getChannel(), item)); + Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.itemMegaphone(msg, whisper, c.getChannel(), item)); break; case 7: //triple megaphone int lines = slea.readByte(); @@ -329,7 +329,7 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { msg2[i] = medal + player.getName() + " : " + slea.readMapleAsciiString(); } whisper = slea.readByte() == 1; - Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.getMultiMegaphone(msg2, c.getChannel(), whisper)); + Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.getMultiMegaphone(msg2, c.getChannel(), whisper)); break; } remove(c, position, itemId); @@ -340,7 +340,7 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { player.getMap().spawnKite(kite); remove(c, position, itemId); } else { - c.announce(MaplePacketCreator.sendCannotSpawnKite()); + c.announce(PacketCreator.sendCannotSpawnKite()); } } else if (itemType == 509) { String sendTo = slea.readMapleAsciiString(); @@ -352,7 +352,7 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { } remove(c, position, itemId); } else if (itemType == 510) { - player.getMap().broadcastMessage(MaplePacketCreator.musicChange("Jukebox/Congratulation")); + player.getMap().broadcastMessage(PacketCreator.musicChange("Jukebox/Congratulation")); remove(c, position, itemId); } else if (itemType == 512) { if (ii.getStateChangeItem(itemId) != 0) { @@ -365,7 +365,7 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { } else if (itemType == 517) { MaplePet pet = player.getPet(0); if (pet == null) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } String newName = slea.readMapleAsciiString(); @@ -376,13 +376,13 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { if (item != null) player.forceUpdateItem(item); - player.getMap().broadcastMessage(player, MaplePacketCreator.changePetName(player, newName, 1), true); - c.announce(MaplePacketCreator.enableActions()); + player.getMap().broadcastMessage(player, PacketCreator.changePetName(player, newName, 1), true); + c.announce(PacketCreator.enableActions()); remove(c, position, itemId); } else if (itemType == 520) { player.gainMeso(ii.getMeso(itemId), true, false, true); remove(c, position, itemId); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } else if (itemType == 523) { int itemid = slea.readInt(); @@ -391,8 +391,8 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { List> hmsAvailable = c.getWorldServer().getAvailableItemBundles(itemid); if(!hmsAvailable.isEmpty()) remove(c, position, itemId); - c.announce(MaplePacketCreator.owlOfMinerva(c, itemid, hmsAvailable)); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.owlOfMinerva(c, itemid, hmsAvailable)); + c.announce(PacketCreator.enableActions()); } else if (itemType == 524) { for (byte i = 0; i < 3; i++) { @@ -409,7 +409,7 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { break; } } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } else if (itemType == 530) { ii.getItemEffect(itemId).applyTo(player); remove(c, position, itemId); @@ -418,13 +418,13 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { } else if (itemType == 537) { if (GameConstants.isFreeMarketRoom(player.getMapId())) { player.dropMessage(5, "You cannot use the chalkboard here."); - player.getClient().announce(MaplePacketCreator.enableActions()); + player.getClient().announce(PacketCreator.enableActions()); return; } player.setChalkboard(slea.readMapleAsciiString()); - player.getMap().broadcastMessage(MaplePacketCreator.useChalkboard(player, false)); - player.getClient().announce(MaplePacketCreator.enableActions()); + player.getMap().broadcastMessage(PacketCreator.useChalkboard(player, false)); + player.getClient().announce(PacketCreator.enableActions()); //remove(c, position, itemId); thanks Conrad for noticing chalkboards shouldn't be depleted upon use } else if (itemType == 539) { List strLines = new LinkedList<>(); @@ -433,23 +433,23 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { } final int world = c.getWorld(); - Server.getInstance().broadcastMessage(world, MaplePacketCreator.getAvatarMega(player, medal, c.getChannel(), itemId, strLines, (slea.readByte() != 0))); - TimerManager.getInstance().schedule(() -> Server.getInstance().broadcastMessage(world, MaplePacketCreator.byeAvatarMega()), 1000 * 10); + Server.getInstance().broadcastMessage(world, PacketCreator.getAvatarMega(player, medal, c.getChannel(), itemId, strLines, (slea.readByte() != 0))); + TimerManager.getInstance().schedule(() -> Server.getInstance().broadcastMessage(world, PacketCreator.byeAvatarMega()), 1000 * 10); remove(c, position, itemId); } else if (itemType == 540) { slea.readByte(); slea.readInt(); if(itemId == 5400000) { //name change - c.announce(MaplePacketCreator.showNameChangeCancel(player.cancelPendingNameChange())); + c.announce(PacketCreator.showNameChangeCancel(player.cancelPendingNameChange())); } else if(itemId == 5401000) { //world transfer - c.announce(MaplePacketCreator.showWorldTransferCancel(player.cancelPendingWorldTranfer())); + c.announce(PacketCreator.showWorldTransferCancel(player.cancelPendingWorldTranfer())); } remove(c, position, itemId); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } else if (itemType == 543) { if(itemId == 5432000 && !c.gainCharacterSlot()) { player.dropMessage(1, "You have already used up all 12 extra character slots."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -485,15 +485,15 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { } if(createStatus == 0) { - c.announce(MaplePacketCreator.sendMapleLifeError(0)); // success! + c.announce(PacketCreator.sendMapleLifeError(0)); // success! player.showHint("#bSuccess#k on creation of the new character through the Maple Life card."); remove(c, position, itemId); } else { if(createStatus == -1) { // check name - c.announce(MaplePacketCreator.sendMapleLifeNameError()); + c.announce(PacketCreator.sendMapleLifeNameError()); } else { - c.announce(MaplePacketCreator.sendMapleLifeError(-1 * createStatus)); + c.announce(PacketCreator.sendMapleLifeError(-1 * createStatus)); } } } else if (itemType == 545) { // MiuMiu's travel store @@ -504,25 +504,25 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { remove(c, position, itemId); } } else { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } else if (itemType == 550) { //Extend item expiration - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } else if (itemType == 552) { MapleInventoryType type = MapleInventoryType.getByType((byte) slea.readInt()); short slot = (short) slea.readInt(); Item item = player.getInventory(type).getItem(slot); if (item == null || item.getQuantity() <= 0 || MapleKarmaManipulator.hasKarmaFlag(item) || !ii.isKarmaAble(item.getItemId())) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } MapleKarmaManipulator.setKarmaFlag(item); player.forceUpdateItem(item); remove(c, position, itemId); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } else if (itemType == 552) { //DS EGG THING - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } else if (itemType == 557) { slea.readInt(); int itemSlot = slea.readInt(); @@ -534,8 +534,8 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { equip.setVicious(equip.getVicious() + 1); equip.setUpgradeSlots(equip.getUpgradeSlots() + 1); remove(c, position, itemId); - c.announce(MaplePacketCreator.enableActions()); - c.announce(MaplePacketCreator.sendHammerData(equip.getVicious())); + c.announce(PacketCreator.enableActions()); + c.announce(PacketCreator.sendHammerData(equip.getVicious())); player.forceUpdateItem(equip); } else if (itemType == 561) { //VEGA'S SPELL if (slea.readInt() != 1) { @@ -557,7 +557,7 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { Equip toScroll = (Equip) eitem; if (toScroll.getUpgradeSlots() < 1) { - c.announce(MaplePacketCreator.getInventoryFull()); + c.announce(PacketCreator.getInventoryFull()); return; } @@ -567,10 +567,10 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { player.toggleBlockCashShop(); final int curlevel = toScroll.getLevel(); - c.announce(MaplePacketCreator.sendVegaScroll(0x40)); + c.announce(PacketCreator.sendVegaScroll(0x40)); final Equip scrolled = (Equip) ii.scrollEquipWithId(toScroll, uitem.getItemId(), false, itemId, player.isGM()); - c.announce(MaplePacketCreator.sendVegaScroll(scrolled.getLevel() > curlevel ? 0x41 : 0x43)); + c.announce(PacketCreator.sendVegaScroll(scrolled.getLevel() > curlevel ? 0x41 : 0x43)); //opcodes 0x42, 0x44: "this item cannot be used"; 0x39, 0x45: crashes MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, uSlot, (short) 1, false); @@ -585,19 +585,19 @@ player.toggleBlockCashShop(); final List mods = new ArrayList<>(); mods.add(new ModifyInventory(3, scrolled)); mods.add(new ModifyInventory(0, scrolled)); -client.announce(MaplePacketCreator.modifyInventory(true, mods)); +client.announce(PacketCreator.modifyInventory(true, mods)); ScrollResult scrollResult = scrolled.getLevel() > curlevel ? ScrollResult.SUCCESS : ScrollResult.FAIL; -player.getMap().broadcastMessage(MaplePacketCreator.getScrollEffect(player.getId(), scrollResult, false, false)); +player.getMap().broadcastMessage(PacketCreator.getScrollEffect(player.getId(), scrollResult, false, false)); if (eSlot < 0 && (scrollResult == ScrollResult.SUCCESS)) { player.equipChanged(); } -client.announce(MaplePacketCreator.enableActions()); +client.announce(PacketCreator.enableActions()); }, 1000 * 3); } else { System.out.println("NEW CASH ITEM: " + itemType + "\n" + slea.toString()); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } diff --git a/src/main/java/net/server/channel/handlers/UseCatchItemHandler.java b/src/main/java/net/server/channel/handlers/UseCatchItemHandler.java index ef3ee4b444..906d86772c 100644 --- a/src/main/java/net/server/channel/handlers/UseCatchItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseCatchItemHandler.java @@ -23,15 +23,15 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; -import client.inventory.MapleInventoryType; import client.autoban.AutobanManager; +import client.inventory.MapleInventoryType; +import client.inventory.manipulator.MapleInventoryManipulator; import constants.inventory.ItemConstants; import net.AbstractMaplePacketHandler; import net.server.Server; -import client.inventory.manipulator.MapleInventoryManipulator; import server.MapleItemInformationProvider; import server.life.MapleMonster; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -59,27 +59,27 @@ public final class UseCatchItemHandler extends AbstractMaplePacketHandler { switch (itemId) { case 2270000: if (mob.getId() == 9300101) { - chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1)); + chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, 1902000, (short) 1, "", -1); } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); break; case 2270001: if (mob.getId() == 9500197) { if ((abm.getLastSpam(10) + 1000) < currentServerTime()) { if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) { - chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1)); + chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, 4031830, (short) 1, "", -1); } else { abm.spam(10); - c.announce(MaplePacketCreator.catchMessage(0)); + c.announce(PacketCreator.catchMessage(0)); } } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } break; case 2270002: @@ -88,12 +88,12 @@ public final class UseCatchItemHandler extends AbstractMaplePacketHandler { if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) { if (chr.canHold(4031868, 1)) { if (Math.random() < 0.5) { // 50% chance - chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1)); + chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, 4031868, (short) 1, "", -1); } else { - chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 0)); + chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 0)); } } else { chr.dropMessage(5, "Make a ETC slot available before using this item."); @@ -101,89 +101,89 @@ public final class UseCatchItemHandler extends AbstractMaplePacketHandler { abm.spam(10); } else { - c.announce(MaplePacketCreator.catchMessage(0)); + c.announce(PacketCreator.catchMessage(0)); } } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } break; case 2270003: if (mob.getId() == 9500320) { if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) { - chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1)); + chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, 4031887, (short) 1, "", -1); } else { - c.announce(MaplePacketCreator.catchMessage(0)); + c.announce(PacketCreator.catchMessage(0)); } } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); break; case 2270005: if (mob.getId() == 9300187) { if (mob.getHp() < ((mob.getMaxHp() / 10) * 3)) { - chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1)); + chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, 2109001, (short) 1, "", -1); } else { - c.announce(MaplePacketCreator.catchMessage(0)); + c.announce(PacketCreator.catchMessage(0)); } } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); break; case 2270006: if (mob.getId() == 9300189) { if (mob.getHp() < ((mob.getMaxHp() / 10) * 3)) { - chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1)); + chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, 2109002, (short) 1, "", -1); } else { - c.announce(MaplePacketCreator.catchMessage(0)); + c.announce(PacketCreator.catchMessage(0)); } } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); break; case 2270007: if (mob.getId() == 9300191) { if (mob.getHp() < ((mob.getMaxHp() / 10) * 3)) { - chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1)); + chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, 2109003, (short) 1, "", -1); } else { - c.announce(MaplePacketCreator.catchMessage(0)); + c.announce(PacketCreator.catchMessage(0)); } } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); break; case 2270004: if (mob.getId() == 9300175) { if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) { - chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1)); + chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, 4001169, (short) 1, "", -1); } else { - c.announce(MaplePacketCreator.catchMessage(0)); + c.announce(PacketCreator.catchMessage(0)); } } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); break; case 2270008: if (mob.getId() == 9500336) { if ((abm.getLastSpam(10) + 3000) < currentServerTime()) { abm.spam(10); - chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1)); + chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, 2022323, (short) 1, "", -1); } else { chr.message("You cannot use the Fishing Net yet."); } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } break; default: @@ -199,21 +199,21 @@ public final class UseCatchItemHandler extends AbstractMaplePacketHandler { if (timeCatch != 0 && (abm.getLastSpam(10) + timeCatch) < currentServerTime()) { if (mobHp != 0 && mob.getHp() < ((mob.getMaxHp() / 100) * mobHp)) { - chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1)); + chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, itemGanho, (short) 1, "", -1); } else if (mob.getId() != 9500336) { if (mobHp != 0) { abm.spam(10); - c.announce(MaplePacketCreator.catchMessage(0)); + c.announce(PacketCreator.catchMessage(0)); } } else { chr.message("You cannot use the Fishing Net yet."); } } } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); // System.out.println("UseCatchItemHandler: \r\n" + slea.toString()); } diff --git a/src/main/java/net/server/channel/handlers/UseDeathItemHandler.java b/src/main/java/net/server/channel/handlers/UseDeathItemHandler.java index d750301b40..5714263866 100644 --- a/src/main/java/net/server/channel/handlers/UseDeathItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseDeathItemHandler.java @@ -23,7 +23,7 @@ package net.server.channel.handlers; import client.MapleClient; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class UseDeathItemHandler extends AbstractMaplePacketHandler { @@ -31,6 +31,6 @@ public final class UseDeathItemHandler extends AbstractMaplePacketHandler { public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { int itemId = slea.readInt(); c.getPlayer().setItemEffect(itemId); - c.announce(MaplePacketCreator.itemEffect(c.getPlayer().getId(), itemId)); + c.announce(PacketCreator.itemEffect(c.getPlayer().getId(), itemId)); } } diff --git a/src/main/java/net/server/channel/handlers/UseGachaExpHandler.java b/src/main/java/net/server/channel/handlers/UseGachaExpHandler.java index 61b8c27bf5..7aa95462c8 100644 --- a/src/main/java/net/server/channel/handlers/UseGachaExpHandler.java +++ b/src/main/java/net/server/channel/handlers/UseGachaExpHandler.java @@ -25,7 +25,7 @@ package net.server.channel.handlers; import client.MapleClient; import client.autoban.AutobanFactory; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -50,6 +50,6 @@ public class UseGachaExpHandler extends AbstractMaplePacketHandler { } } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } diff --git a/src/main/java/net/server/channel/handlers/UseHammerHandler.java b/src/main/java/net/server/channel/handlers/UseHammerHandler.java index dc80c8960e..68c4640575 100644 --- a/src/main/java/net/server/channel/handlers/UseHammerHandler.java +++ b/src/main/java/net/server/channel/handlers/UseHammerHandler.java @@ -23,7 +23,7 @@ package net.server.channel.handlers; import client.MapleClient; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -32,6 +32,6 @@ import tools.data.input.SeekableLittleEndianAccessor; */ public final class UseHammerHandler extends AbstractMaplePacketHandler { public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { - c.announce(MaplePacketCreator.sendHammerMessage()); + c.announce(PacketCreator.sendHammerMessage()); } } diff --git a/src/main/java/net/server/channel/handlers/UseItemEffectHandler.java b/src/main/java/net/server/channel/handlers/UseItemEffectHandler.java index 45efffae3a..eabb6c36ed 100644 --- a/src/main/java/net/server/channel/handlers/UseItemEffectHandler.java +++ b/src/main/java/net/server/channel/handlers/UseItemEffectHandler.java @@ -25,7 +25,7 @@ import client.MapleClient; import client.inventory.Item; import client.inventory.MapleInventoryType; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class UseItemEffectHandler extends AbstractMaplePacketHandler { @@ -42,6 +42,6 @@ public final class UseItemEffectHandler extends AbstractMaplePacketHandler { if (itemId != 0) return; } c.getPlayer().setItemEffect(itemId); - c.getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.itemEffect(c.getPlayer().getId(), itemId), false); + c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.itemEffect(c.getPlayer().getId(), itemId), false); } } diff --git a/src/main/java/net/server/channel/handlers/UseItemHandler.java b/src/main/java/net/server/channel/handlers/UseItemHandler.java index 61f04cfec5..32e150d0df 100644 --- a/src/main/java/net/server/channel/handlers/UseItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseItemHandler.java @@ -26,13 +26,13 @@ import client.MapleClient; import client.MapleDisease; import client.inventory.Item; import client.inventory.MapleInventoryType; +import client.inventory.manipulator.MapleInventoryManipulator; import config.YamlConfig; import constants.inventory.ItemConstants; import net.AbstractMaplePacketHandler; -import client.inventory.manipulator.MapleInventoryManipulator; import server.MapleItemInformationProvider; import server.MapleStatEffect; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -44,7 +44,7 @@ public final class UseItemHandler extends AbstractMaplePacketHandler { MapleCharacter chr = c.getPlayer(); if (!chr.isAlive()) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); @@ -108,6 +108,6 @@ public final class UseItemHandler extends AbstractMaplePacketHandler { private void remove(MapleClient c, short slot) { MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, slot, (short) 1, false); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } diff --git a/src/main/java/net/server/channel/handlers/UseMapleLifeHandler.java b/src/main/java/net/server/channel/handlers/UseMapleLifeHandler.java index 4c45d4e593..43ca8b9b25 100644 --- a/src/main/java/net/server/channel/handlers/UseMapleLifeHandler.java +++ b/src/main/java/net/server/channel/handlers/UseMapleLifeHandler.java @@ -22,7 +22,7 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -37,18 +37,18 @@ public class UseMapleLifeHandler extends AbstractMaplePacketHandler { if(timeNow - player.getLastUsedCashItem() < 3000) { player.dropMessage(5, "Please wait a moment before trying again."); - c.announce(MaplePacketCreator.sendMapleLifeError(3)); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.sendMapleLifeError(3)); + c.announce(PacketCreator.enableActions()); return; } player.setLastUsedCashItem(timeNow); String name = slea.readMapleAsciiString(); if(MapleCharacter.canCreateChar(name)) { - c.announce(MaplePacketCreator.sendMapleLifeCharacterInfo()); + c.announce(PacketCreator.sendMapleLifeCharacterInfo()); } else { - c.announce(MaplePacketCreator.sendMapleLifeNameError()); + c.announce(PacketCreator.sendMapleLifeNameError()); } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } diff --git a/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java b/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java index 3325baa280..8a44e3c5d0 100644 --- a/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java +++ b/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java @@ -21,16 +21,16 @@ */ package net.server.channel.handlers; -import client.MapleClient; import client.MapleCharacter; +import client.MapleClient; import client.MapleMount; import client.inventory.Item; import client.inventory.MapleInventory; import client.inventory.MapleInventoryType; +import client.inventory.manipulator.MapleInventoryManipulator; import constants.game.ExpTable; import net.AbstractMaplePacketHandler; -import client.inventory.manipulator.MapleInventoryManipulator; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -80,7 +80,7 @@ public final class UseMountFoodHandler extends AbstractMaplePacketHandler { } if (mountLevelup != null) { - chr.getMap().broadcastMessage(MaplePacketCreator.updateMount(chr.getId(), mount, mountLevelup)); + chr.getMap().broadcastMessage(PacketCreator.updateMount(chr.getId(), mount, mountLevelup)); } } finally { c.releaseClient(); diff --git a/src/main/java/net/server/channel/handlers/UseOwlOfMinervaHandler.java b/src/main/java/net/server/channel/handlers/UseOwlOfMinervaHandler.java index 5f0729a19a..1ca579a505 100644 --- a/src/main/java/net/server/channel/handlers/UseOwlOfMinervaHandler.java +++ b/src/main/java/net/server/channel/handlers/UseOwlOfMinervaHandler.java @@ -22,7 +22,7 @@ package net.server.channel.handlers; import client.MapleClient; import constants.game.GameConstants; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.data.input.SeekableLittleEndianAccessor; @@ -59,6 +59,6 @@ public final class UseOwlOfMinervaHandler extends AbstractMaplePacketHandler { } } - c.announce(MaplePacketCreator.getOwlOpen(owlLeaderboards)); + c.announce(PacketCreator.getOwlOpen(owlLeaderboards)); } } \ No newline at end of file diff --git a/src/main/java/net/server/channel/handlers/UseSolomonHandler.java b/src/main/java/net/server/channel/handlers/UseSolomonHandler.java index 972e7dc69a..7d6aa7df59 100644 --- a/src/main/java/net/server/channel/handlers/UseSolomonHandler.java +++ b/src/main/java/net/server/channel/handlers/UseSolomonHandler.java @@ -23,13 +23,13 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; -import client.inventory.MapleInventory; import client.inventory.Item; +import client.inventory.MapleInventory; import client.inventory.MapleInventoryType; -import net.AbstractMaplePacketHandler; import client.inventory.manipulator.MapleInventoryManipulator; +import net.AbstractMaplePacketHandler; import server.MapleItemInformationProvider; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -75,6 +75,6 @@ public final class UseSolomonHandler extends AbstractMaplePacketHandler { } } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } diff --git a/src/main/java/net/server/channel/handlers/UseSummonBagHandler.java b/src/main/java/net/server/channel/handlers/UseSummonBagHandler.java index da8d730d68..0eedeebe3f 100644 --- a/src/main/java/net/server/channel/handlers/UseSummonBagHandler.java +++ b/src/main/java/net/server/channel/handlers/UseSummonBagHandler.java @@ -28,7 +28,7 @@ import client.inventory.manipulator.MapleInventoryManipulator; import net.AbstractMaplePacketHandler; import server.MapleItemInformationProvider; import server.life.MapleLifeFactory; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Randomizer; import tools.data.input.SeekableLittleEndianAccessor; @@ -42,7 +42,7 @@ public final class UseSummonBagHandler extends AbstractMaplePacketHandler { public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { //[4A 00][6C 4C F2 02][02 00][63 0B 20 00] if (!c.getPlayer().isAlive()) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } slea.readInt(); @@ -58,6 +58,6 @@ public final class UseSummonBagHandler extends AbstractMaplePacketHandler { } } } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } diff --git a/src/main/java/net/server/channel/handlers/WeddingHandler.java b/src/main/java/net/server/channel/handlers/WeddingHandler.java index 677f119786..3bfc0bc374 100644 --- a/src/main/java/net/server/channel/handlers/WeddingHandler.java +++ b/src/main/java/net/server/channel/handlers/WeddingHandler.java @@ -18,9 +18,10 @@ import config.YamlConfig; import constants.inventory.ItemConstants; import net.AbstractMaplePacketHandler; import server.MapleMarriage; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import tools.packets.Wedding; + import java.util.Collections; import java.util.List; @@ -98,7 +99,7 @@ public final class WeddingHandler extends AbstractMaplePacketHandler { } } catch (NumberFormatException nfe) {} } else { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } else if (mode == 7) { // take items slea.readByte(); // invType @@ -146,7 +147,7 @@ public final class WeddingHandler extends AbstractMaplePacketHandler { } } } else if (mode == 8) { // out of Wedding Registry - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } else { System.out.println(mode); } diff --git a/src/main/java/net/server/channel/handlers/WeddingTalkHandler.java b/src/main/java/net/server/channel/handlers/WeddingTalkHandler.java index 607cc7d194..9f93e371c7 100644 --- a/src/main/java/net/server/channel/handlers/WeddingTalkHandler.java +++ b/src/main/java/net/server/channel/handlers/WeddingTalkHandler.java @@ -23,7 +23,7 @@ package net.server.channel.handlers; import client.MapleClient; import net.AbstractMaplePacketHandler; import scripting.event.EventInstanceManager; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import tools.packets.Wedding; @@ -48,6 +48,6 @@ public final class WeddingTalkHandler extends AbstractMaplePacketHandler { c.announce(Wedding.OnWeddingProgress(true, 0, 0, (byte) 3)); } - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } \ No newline at end of file diff --git a/src/main/java/net/server/channel/handlers/WeddingTalkMoreHandler.java b/src/main/java/net/server/channel/handlers/WeddingTalkMoreHandler.java index d557b15912..00f1d054ec 100644 --- a/src/main/java/net/server/channel/handlers/WeddingTalkMoreHandler.java +++ b/src/main/java/net/server/channel/handlers/WeddingTalkMoreHandler.java @@ -23,7 +23,7 @@ package net.server.channel.handlers; import client.MapleClient; import net.AbstractMaplePacketHandler; import scripting.event.EventInstanceManager; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import tools.packets.Wedding; @@ -42,6 +42,6 @@ public final class WeddingTalkMoreHandler extends AbstractMaplePacketHandler { } c.announce(Wedding.OnWeddingProgress(true, 0, 0, (byte) 3)); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } \ No newline at end of file diff --git a/src/main/java/net/server/channel/handlers/WhisperHandler.java b/src/main/java/net/server/channel/handlers/WhisperHandler.java index 1d622d16ff..6bb6ab73a1 100644 --- a/src/main/java/net/server/channel/handlers/WhisperHandler.java +++ b/src/main/java/net/server/channel/handlers/WhisperHandler.java @@ -28,8 +28,8 @@ import config.YamlConfig; import net.AbstractMaplePacketHandler; import tools.FilePrinter; import tools.LogHelper; -import tools.MaplePacketCreator; -import tools.MaplePacketCreator.WhisperFlag; +import tools.PacketCreator; +import tools.PacketCreator.WhisperFlag; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -50,7 +50,7 @@ public final class WhisperHandler extends AbstractMaplePacketHandler { MapleCharacter target = c.getWorldServer().getPlayerStorage().getCharacterByName(name); if (target == null) { - c.announce(MaplePacketCreator.getWhisperResult(name, false)); + c.announce(PacketCreator.getWhisperResult(name, false)); return; } @@ -74,15 +74,15 @@ public final class WhisperHandler extends AbstractMaplePacketHandler { private void handleFind(MapleCharacter user, MapleCharacter target, byte flag) { if (user.gmLevel() >= target.gmLevel()) { if (target.getCashShop().isOpened()) { - user.announce(MaplePacketCreator.getFindResult(target, RT_CASH_SHOP, -1, flag)); + user.announce(PacketCreator.getFindResult(target, RT_CASH_SHOP, -1, flag)); } else if (target.getClient().getChannel() == user.getClient().getChannel()) { - user.announce(MaplePacketCreator.getFindResult(target, RT_SAME_CHANNEL, target.getMapId(), flag)); + user.announce(PacketCreator.getFindResult(target, RT_SAME_CHANNEL, target.getMapId(), flag)); } else { - user.announce(MaplePacketCreator.getFindResult(target, RT_DIFFERENT_CHANNEL, target.getClient().getChannel() - 1, flag)); + user.announce(PacketCreator.getFindResult(target, RT_DIFFERENT_CHANNEL, target.getClient().getChannel() - 1, flag)); } } else { // not found for whisper is the same message - user.announce(MaplePacketCreator.getWhisperResult(target.getName(), false)); + user.announce(PacketCreator.getWhisperResult(target.getName(), false)); } } @@ -103,9 +103,9 @@ public final class WhisperHandler extends AbstractMaplePacketHandler { LogHelper.logChat(user.getClient(), "Whisper To " + target.getName(), message); } - target.announce(MaplePacketCreator.getWhisperReceive(user.getName(), user.getClient().getChannel() - 1, user.isGM(), message)); + target.announce(PacketCreator.getWhisperReceive(user.getName(), user.getClient().getChannel() - 1, user.isGM(), message)); boolean hidden = target.isHidden() && target.gmLevel() > user.gmLevel(); - user.announce(MaplePacketCreator.getWhisperResult(target.getName(), !hidden)); + user.announce(PacketCreator.getWhisperResult(target.getName(), !hidden)); } } diff --git a/src/main/java/net/server/coordinator/matchchecker/listener/MatchCheckerGuildCreation.java b/src/main/java/net/server/coordinator/matchchecker/listener/MatchCheckerGuildCreation.java index 6c42b38dbb..d6694a841f 100644 --- a/src/main/java/net/server/coordinator/matchchecker/listener/MatchCheckerGuildCreation.java +++ b/src/main/java/net/server/coordinator/matchchecker/listener/MatchCheckerGuildCreation.java @@ -22,14 +22,15 @@ package net.server.coordinator.matchchecker.listener; import client.MapleCharacter; import config.YamlConfig; import constants.game.GameConstants; +import net.server.Server; import net.server.coordinator.matchchecker.AbstractMatchCheckerListener; import net.server.coordinator.matchchecker.MatchCheckerListenerRecipe; import net.server.guild.MapleGuild; import net.server.guild.MapleGuildCharacter; -import java.util.Set; -import net.server.Server; import net.server.world.MapleParty; -import tools.MaplePacketCreator; +import tools.PacketCreator; + +import java.util.Set; /** * @@ -40,7 +41,7 @@ public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe { private static void broadcastGuildCreationDismiss(Set nonLeaderMatchPlayers) { for (MapleCharacter chr : nonLeaderMatchPlayers) { if (chr.isLoggedinWorld()) { - chr.announce(MaplePacketCreator.genericGuildMessage((byte) 0x26)); + chr.announce(PacketCreator.genericGuildMessage((byte) 0x26)); } } } @@ -55,7 +56,7 @@ public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe { @Override public void onMatchCreated(MapleCharacter leader, Set nonLeaderMatchPlayers, String message) { - byte[] createGuildPacket = MaplePacketCreator.createGuildMessage(leader.getName(), message); + byte[] createGuildPacket = PacketCreator.createGuildMessage(leader.getName(), message); for (MapleCharacter chr : nonLeaderMatchPlayers) { if (chr.isLoggedinWorld()) { @@ -111,7 +112,7 @@ public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe { int gid = Server.getInstance().createGuild(leader.getId(), message); if (gid == 0) { - leader.announce(MaplePacketCreator.genericGuildMessage((byte) 0x23)); + leader.announce(PacketCreator.genericGuildMessage((byte) 0x23)); broadcastGuildCreationDismiss(matchPlayers); return; } @@ -121,7 +122,7 @@ public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe { MapleGuild guild = Server.getInstance().getGuild(leader.getGuildId(), leader.getWorld(), leader); // initialize guild structure Server.getInstance().changeRank(gid, leader.getId(), 1); - leader.announce(MaplePacketCreator.showGuildInfo(leader)); + leader.announce(PacketCreator.showGuildInfo(leader)); leader.dropMessage(1, "You have successfully created a Guild."); for (MapleCharacter chr : matchPlayers) { @@ -135,7 +136,7 @@ public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe { Server.getInstance().addGuildMember(mgc, chr); if (chr.isLoggedinWorld()) { - chr.announce(MaplePacketCreator.showGuildInfo(chr)); + chr.announce(PacketCreator.showGuildInfo(chr)); if (cofounder) { chr.dropMessage(1, "You have successfully cofounded a Guild."); @@ -159,7 +160,7 @@ public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe { } if (chr.isLoggedinWorld()) { - chr.announce(MaplePacketCreator.genericGuildMessage((byte)0x26)); + chr.announce(PacketCreator.genericGuildMessage((byte)0x26)); } } } @@ -189,7 +190,7 @@ public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe { if (chr.isLoggedinWorld()) { chr.message(msg); - chr.announce(MaplePacketCreator.genericGuildMessage((byte)0x26)); + chr.announce(PacketCreator.genericGuildMessage((byte)0x26)); } } } diff --git a/src/main/java/net/server/coordinator/partysearch/MaplePartySearchCoordinator.java b/src/main/java/net/server/coordinator/partysearch/MaplePartySearchCoordinator.java index 4dcbb2f54a..9b3f2c6c36 100644 --- a/src/main/java/net/server/coordinator/partysearch/MaplePartySearchCoordinator.java +++ b/src/main/java/net/server/coordinator/partysearch/MaplePartySearchCoordinator.java @@ -35,7 +35,7 @@ import provider.MapleData; import provider.MapleDataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import java.util.*; @@ -292,7 +292,7 @@ public class MaplePartySearchCoordinator { if (MapleInviteCoordinator.createInvite(InviteType.PARTY, leader, partyid, chr.getId())) { chr.disablePartySearchInvite(leader.getId()); - chr.announce(MaplePacketCreator.partySearchInvite(leader)); + chr.announce(PacketCreator.partySearchInvite(leader)); return true; } else { return false; diff --git a/src/main/java/net/server/guild/MapleAlliance.java b/src/main/java/net/server/guild/MapleAlliance.java index 3aa405f2e7..70007d2128 100644 --- a/src/main/java/net/server/guild/MapleAlliance.java +++ b/src/main/java/net/server/guild/MapleAlliance.java @@ -30,7 +30,7 @@ import net.server.coordinator.world.MapleInviteCoordinator.MapleInviteResult; import net.server.world.MapleParty; import net.server.world.MaplePartyCharacter; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.sql.Connection; import java.sql.PreparedStatement; @@ -141,8 +141,8 @@ public class MapleAlliance { Server.getInstance().addAlliance(id, alliance); int worldid = guildMasters.get(0).getWorld(); - Server.getInstance().allianceMessage(id, MaplePacketCreator.updateAllianceInfo(alliance, worldid), -1, -1); - Server.getInstance().allianceMessage(id, MaplePacketCreator.getGuildAlliances(alliance, worldid), -1, -1); // thanks Vcoc for noticing guilds from other alliances being visually stacked here due to this not being updated + Server.getInstance().allianceMessage(id, PacketCreator.updateAllianceInfo(alliance, worldid), -1, -1); + Server.getInstance().allianceMessage(id, PacketCreator.getGuildAlliances(alliance, worldid), -1, -1); // thanks Vcoc for noticing guilds from other alliances being visually stacked here due to this not being updated } catch (Exception e) { e.printStackTrace(); return null; @@ -273,7 +273,7 @@ public class MapleAlliance { ps.executeUpdate(); } - Server.getInstance().allianceMessage(allianceId, MaplePacketCreator.disbandAlliance(allianceId), -1, -1); + Server.getInstance().allianceMessage(allianceId, PacketCreator.disbandAlliance(allianceId), -1, -1); Server.getInstance().disbandAlliance(allianceId); } catch (SQLException sqle) { sqle.printStackTrace(); @@ -298,13 +298,13 @@ public class MapleAlliance { return false; } - srv.allianceMessage(alliance.getId(), MaplePacketCreator.removeGuildFromAlliance(alliance, guildId, worldId), -1, -1); + srv.allianceMessage(alliance.getId(), PacketCreator.removeGuildFromAlliance(alliance, guildId, worldId), -1, -1); srv.removeGuildFromAlliance(alliance.getId(), guildId); removeGuildFromAllianceOnDb(guildId); - srv.allianceMessage(alliance.getId(), MaplePacketCreator.getGuildAlliances(alliance, worldId), -1, -1); - srv.allianceMessage(alliance.getId(), MaplePacketCreator.allianceNotice(alliance.getId(), alliance.getNotice()), -1, -1); - srv.guildMessage(guildId, MaplePacketCreator.disbandAlliance(alliance.getId())); + srv.allianceMessage(alliance.getId(), PacketCreator.getGuildAlliances(alliance, worldId), -1, -1); + srv.allianceMessage(alliance.getId(), PacketCreator.allianceNotice(alliance.getId(), alliance.getNotice()), -1, -1); + srv.guildMessage(guildId, PacketCreator.disbandAlliance(alliance.getId())); alliance.dropMessage("[" + srv.getGuild(guildId, worldId).getName() + "] guild has left the union."); return true; @@ -312,8 +312,8 @@ public class MapleAlliance { public void updateAlliancePackets(MapleCharacter chr) { if (allianceId > 0) { - this.broadcastMessage(MaplePacketCreator.updateAllianceInfo(this, chr.getWorld())); - this.broadcastMessage(MaplePacketCreator.allianceNotice(this.getId(), this.getNotice())); + this.broadcastMessage(PacketCreator.updateAllianceInfo(this, chr.getWorld())); + this.broadcastMessage(PacketCreator.allianceNotice(this.getId(), this.getNotice())); } } @@ -448,7 +448,7 @@ public class MapleAlliance { c.getPlayer().dropMessage(5, "The master of the guild that you offered an invitation is currently not online."); } else { if (MapleInviteCoordinator.createInvite(InviteType.ALLIANCE, c.getPlayer(), allianceId, victim.getId())) { - victim.getClient().announce(MaplePacketCreator.allianceInvite(allianceId, c.getPlayer())); + victim.getClient().announce(PacketCreator.allianceInvite(allianceId, c.getPlayer())); } else { c.getPlayer().dropMessage(5, "The master of the guild that you offered an invitation is currently managing another invite."); } diff --git a/src/main/java/net/server/guild/MapleGuild.java b/src/main/java/net/server/guild/MapleGuild.java index 2c7f82e5da..5d825ccb64 100644 --- a/src/main/java/net/server/guild/MapleGuild.java +++ b/src/main/java/net/server/guild/MapleGuild.java @@ -34,7 +34,7 @@ import net.server.coordinator.world.MapleInviteCoordinator; import net.server.coordinator.world.MapleInviteCoordinator.InviteType; import net.server.coordinator.world.MapleInviteCoordinator.MapleInviteResult; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.sql.Connection; import java.sql.PreparedStatement; @@ -184,7 +184,7 @@ public class MapleGuild { membersLock.lock(); try { - this.broadcast(MaplePacketCreator.guildDisband(this.id)); + this.broadcast(PacketCreator.guildDisband(this.id)); } finally { membersLock.unlock(); } @@ -279,7 +279,7 @@ public class MapleGuild { continue; } - byte[] packet = MaplePacketCreator.guildNameChanged(chr.getId(), this.getName()); + byte[] packet = PacketCreator.guildNameChanged(chr.getId(), this.getName()); chr.getMap().broadcastMessage(chr, packet); } } @@ -293,7 +293,7 @@ public class MapleGuild { continue; } - byte[] packet = MaplePacketCreator.guildMarkChanged(chr.getId(), this); + byte[] packet = PacketCreator.guildMarkChanged(chr.getId(), this); chr.getMap().broadcastMessage(chr, packet); } } @@ -307,7 +307,7 @@ public class MapleGuild { continue; } - byte[] packet = MaplePacketCreator.showGuildInfo(chr); + byte[] packet = PacketCreator.showGuildInfo(chr); chr.announce(packet); } } @@ -401,7 +401,7 @@ public class MapleGuild { } } if (bBroadcast) { - this.broadcast(MaplePacketCreator.guildMemberOnline(id, cid, online), cid); + this.broadcast(PacketCreator.guildMemberOnline(id, cid, online), cid); } bDirty = true; } finally { @@ -412,7 +412,7 @@ public class MapleGuild { public void guildChat(String name, int cid, String message) { membersLock.lock(); try { - this.broadcast(MaplePacketCreator.multiChat(name, message, 2), cid); + this.broadcast(PacketCreator.multiChat(name, message, 2), cid); } finally { membersLock.unlock(); } @@ -479,7 +479,7 @@ public class MapleGuild { } } - this.broadcast(MaplePacketCreator.newGuildMember(mgc)); + this.broadcast(PacketCreator.newGuildMember(mgc)); return 1; } finally { membersLock.unlock(); @@ -489,7 +489,7 @@ public class MapleGuild { public void leaveGuild(MapleGuildCharacter mgc) { membersLock.lock(); try { - this.broadcast(MaplePacketCreator.memberLeft(mgc, false)); + this.broadcast(PacketCreator.memberLeft(mgc, false)); members.remove(mgc); bDirty = true; } finally { @@ -505,7 +505,7 @@ public class MapleGuild { while (itr.hasNext()) { mgc = itr.next(); if (mgc.getId() == cid && initiator.getGuildRank() < mgc.getGuildRank()) { - this.broadcast(MaplePacketCreator.memberLeft(mgc, true)); + this.broadcast(PacketCreator.memberLeft(mgc, true)); itr.remove(); bDirty = true; try { @@ -568,7 +568,7 @@ public class MapleGuild { membersLock.lock(); try { - this.broadcast(MaplePacketCreator.changeRank(mgc)); + this.broadcast(PacketCreator.changeRank(mgc)); } finally { membersLock.unlock(); } @@ -580,7 +580,7 @@ public class MapleGuild { membersLock.lock(); try { - this.broadcast(MaplePacketCreator.guildNotice(this.id, notice)); + this.broadcast(PacketCreator.guildNotice(this.id, notice)); } finally { membersLock.unlock(); } @@ -593,7 +593,7 @@ public class MapleGuild { if (mgc.equals(member)) { member.setJobId(mgc.getJobId()); member.setLevel(mgc.getLevel()); - this.broadcast(MaplePacketCreator.guildMemberLevelJobUpdate(mgc)); + this.broadcast(PacketCreator.guildMemberLevelJobUpdate(mgc)); break; } } @@ -624,7 +624,7 @@ public class MapleGuild { membersLock.lock(); try { - this.broadcast(MaplePacketCreator.rankTitleChange(this.id, ranks)); + this.broadcast(PacketCreator.rankTitleChange(this.id, ranks)); } finally { membersLock.unlock(); } @@ -686,7 +686,7 @@ public class MapleGuild { membersLock.lock(); try { - this.broadcast(MaplePacketCreator.guildCapacityChange(this.id, this.capacity)); + this.broadcast(PacketCreator.guildCapacityChange(this.id, this.capacity)); } finally { membersLock.unlock(); } @@ -697,14 +697,14 @@ public class MapleGuild { public void gainGP(int amount) { this.gp += amount; this.writeToDB(false); - this.guildMessage(MaplePacketCreator.updateGP(this.id, this.gp)); - this.guildMessage(MaplePacketCreator.getGPMessage(amount)); + this.guildMessage(PacketCreator.updateGP(this.id, this.gp)); + this.guildMessage(PacketCreator.getGPMessage(amount)); } public void removeGP(int amount) { this.gp -= amount; this.writeToDB(false); - this.guildMessage(MaplePacketCreator.updateGP(this.id, this.gp)); + this.guildMessage(PacketCreator.updateGP(this.id, this.gp)); } public static MapleGuildResponse sendInvitation(MapleClient c, String targetName) { @@ -718,7 +718,7 @@ public class MapleGuild { MapleCharacter sender = c.getPlayer(); if (MapleInviteCoordinator.createInvite(InviteType.GUILD, sender, sender.getGuildId(), mc.getId())) { - mc.getClient().announce(MaplePacketCreator.guildInvite(sender.getGuildId(), sender.getName())); + mc.getClient().announce(PacketCreator.guildInvite(sender.getGuildId(), sender.getName())); return null; } else { return MapleGuildResponse.MANAGING_INVITE; @@ -766,7 +766,7 @@ public class MapleGuild { try (Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT `name`, `GP`, `logoBG`, `logoBGColor`, `logo`, `logoColor` FROM guilds ORDER BY `GP` DESC LIMIT 50", ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); ResultSet rs = ps.executeQuery()) { - c.announce(MaplePacketCreator.showGuildRanks(npcid, rs)); + c.announce(PacketCreator.showGuildRanks(npcid, rs)); } catch (SQLException e) { e.printStackTrace(); System.out.println("failed to display guild ranks. " + e); diff --git a/src/main/java/net/server/guild/MapleGuildResponse.java b/src/main/java/net/server/guild/MapleGuildResponse.java index b8c04e1832..ec59fdba51 100644 --- a/src/main/java/net/server/guild/MapleGuildResponse.java +++ b/src/main/java/net/server/guild/MapleGuildResponse.java @@ -21,7 +21,7 @@ */ package net.server.guild; -import tools.MaplePacketCreator; +import tools.PacketCreator; public enum MapleGuildResponse { NOT_IN_CHANNEL(0x2a), @@ -39,9 +39,9 @@ public enum MapleGuildResponse { public final byte[] getPacket(String targetName) { if (value >= MANAGING_INVITE.value) { - return MaplePacketCreator.responseGuildMessage((byte) value, targetName); + return PacketCreator.responseGuildMessage((byte) value, targetName); } else { - return MaplePacketCreator.genericGuildMessage((byte) value); + return PacketCreator.genericGuildMessage((byte) value); } } } diff --git a/src/main/java/net/server/handlers/CustomPacketHandler.java b/src/main/java/net/server/handlers/CustomPacketHandler.java index 6da4ae94d8..8d00553530 100644 --- a/src/main/java/net/server/handlers/CustomPacketHandler.java +++ b/src/main/java/net/server/handlers/CustomPacketHandler.java @@ -23,14 +23,14 @@ package net.server.handlers; import client.MapleClient; import net.MaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public class CustomPacketHandler implements MaplePacketHandler { @Override public void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { if (slea.available() > 0 && c.getGMLevel() == 4) {//w/e - c.announce(MaplePacketCreator.customPacket(slea.read((int) slea.available()))); + c.announce(PacketCreator.customPacket(slea.read((int) slea.available()))); } } diff --git a/src/main/java/net/server/handlers/login/AcceptToSHandler.java b/src/main/java/net/server/handlers/login/AcceptToSHandler.java index 52268c15a1..fe3675ab5f 100644 --- a/src/main/java/net/server/handlers/login/AcceptToSHandler.java +++ b/src/main/java/net/server/handlers/login/AcceptToSHandler.java @@ -2,7 +2,7 @@ package net.server.handlers.login; import client.MapleClient; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -23,9 +23,9 @@ public final class AcceptToSHandler extends AbstractMaplePacketHandler { return; } if (c.finishLogin() == 0) { - c.announce(MaplePacketCreator.getAuthSuccess(c)); + c.announce(PacketCreator.getAuthSuccess(c)); } else { - c.announce(MaplePacketCreator.getLoginFailed(9));//shouldn't happen XD + c.announce(PacketCreator.getLoginFailed(9));//shouldn't happen XD } } } diff --git a/src/main/java/net/server/handlers/login/AfterLoginHandler.java b/src/main/java/net/server/handlers/login/AfterLoginHandler.java index 2a4b306665..0d7741bf8d 100644 --- a/src/main/java/net/server/handlers/login/AfterLoginHandler.java +++ b/src/main/java/net/server/handlers/login/AfterLoginHandler.java @@ -24,7 +24,7 @@ package net.server.handlers.login; import client.MapleClient; import net.AbstractMaplePacketHandler; import net.server.coordinator.session.SessionCoordinator; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class AfterLoginHandler extends AbstractMaplePacketHandler { @@ -38,23 +38,23 @@ public final class AfterLoginHandler extends AbstractMaplePacketHandler { } if (c2 == 1 && c3 == 1) { if (c.getPin() == null || c.getPin().equals("")) { - c.announce(MaplePacketCreator.registerPin()); + c.announce(PacketCreator.registerPin()); } else { - c.announce(MaplePacketCreator.requestPin()); + c.announce(PacketCreator.requestPin()); } } else if (c2 == 1 && c3 == 0) { String pin = slea.readMapleAsciiString(); if (c.checkPin(pin)) { - c.announce(MaplePacketCreator.pinAccepted()); + c.announce(PacketCreator.pinAccepted()); } else { - c.announce(MaplePacketCreator.requestPinAfterFailure()); + c.announce(PacketCreator.requestPinAfterFailure()); } } else if (c2 == 2 && c3 == 0) { String pin = slea.readMapleAsciiString(); if (c.checkPin(pin)) { - c.announce(MaplePacketCreator.registerPin()); + c.announce(PacketCreator.registerPin()); } else { - c.announce(MaplePacketCreator.requestPinAfterFailure()); + c.announce(PacketCreator.requestPinAfterFailure()); } } else if (c2 == 0 && c3 == 5) { SessionCoordinator.getInstance().closeSession(c, null); diff --git a/src/main/java/net/server/handlers/login/CharSelectedHandler.java b/src/main/java/net/server/handlers/login/CharSelectedHandler.java index b879b30c21..eba95d5001 100644 --- a/src/main/java/net/server/handlers/login/CharSelectedHandler.java +++ b/src/main/java/net/server/handlers/login/CharSelectedHandler.java @@ -30,7 +30,7 @@ import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult; import net.server.world.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import java.net.InetAddress; @@ -61,7 +61,7 @@ public final class CharSelectedHandler extends AbstractMaplePacketHandler { hwid = Hwid.fromHostString(hostString); } catch (IllegalArgumentException e) { log.warn("Invalid host string: {}", hostString, e); - c.announce(MaplePacketCreator.getAfterLoginError(17)); + c.announce(PacketCreator.getAfterLoginError(17)); return; } @@ -70,7 +70,7 @@ public final class CharSelectedHandler extends AbstractMaplePacketHandler { AntiMulticlientResult res = SessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid); if (res != AntiMulticlientResult.SUCCESS) { - c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); + c.announce(PacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); return; } @@ -88,13 +88,13 @@ public final class CharSelectedHandler extends AbstractMaplePacketHandler { c.setWorld(server.getCharacterWorld(charId)); World wserv = c.getWorldServer(); if(wserv == null || wserv.isWorldCapacityFull()) { - c.announce(MaplePacketCreator.getAfterLoginError(10)); + c.announce(PacketCreator.getAfterLoginError(10)); return; } String[] socket = server.getInetSocket(c, c.getWorld(), c.getChannel()); if(socket == null) { - c.announce(MaplePacketCreator.getAfterLoginError(10)); + c.announce(PacketCreator.getAfterLoginError(10)); return; } @@ -102,7 +102,7 @@ public final class CharSelectedHandler extends AbstractMaplePacketHandler { c.setCharacterOnSessionTransitionState(charId); try { - c.announce(MaplePacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId)); + c.announce(PacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId)); } catch (UnknownHostException | NumberFormatException e) { e.printStackTrace(); } diff --git a/src/main/java/net/server/handlers/login/CharSelectedWithPicHandler.java b/src/main/java/net/server/handlers/login/CharSelectedWithPicHandler.java index 7311b931df..66c8842a86 100644 --- a/src/main/java/net/server/handlers/login/CharSelectedWithPicHandler.java +++ b/src/main/java/net/server/handlers/login/CharSelectedWithPicHandler.java @@ -9,7 +9,7 @@ import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult; import net.server.world.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import java.net.InetAddress; @@ -41,7 +41,7 @@ public class CharSelectedWithPicHandler extends AbstractMaplePacketHandler { hwid = Hwid.fromHostString(hostString); } catch (IllegalArgumentException e) { log.warn("Invalid host string: {}", hostString, e); - c.announce(MaplePacketCreator.getAfterLoginError(17)); + c.announce(PacketCreator.getAfterLoginError(17)); return; } @@ -63,19 +63,19 @@ public class CharSelectedWithPicHandler extends AbstractMaplePacketHandler { c.setWorld(server.getCharacterWorld(charId)); World wserv = c.getWorldServer(); if(wserv == null || wserv.isWorldCapacityFull()) { - c.announce(MaplePacketCreator.getAfterLoginError(10)); + c.announce(PacketCreator.getAfterLoginError(10)); return; } String[] socket = server.getInetSocket(c, c.getWorld(), c.getChannel()); if(socket == null) { - c.announce(MaplePacketCreator.getAfterLoginError(10)); + c.announce(PacketCreator.getAfterLoginError(10)); return; } AntiMulticlientResult res = SessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid); if (res != AntiMulticlientResult.SUCCESS) { - c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); + c.announce(PacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); return; } @@ -83,12 +83,12 @@ public class CharSelectedWithPicHandler extends AbstractMaplePacketHandler { c.setCharacterOnSessionTransitionState(charId); try { - c.announce(MaplePacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId)); + c.announce(PacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId)); } catch (UnknownHostException | NumberFormatException e) { e.printStackTrace(); } } else { - c.announce(MaplePacketCreator.wrongPic()); + c.announce(PacketCreator.wrongPic()); } } } diff --git a/src/main/java/net/server/handlers/login/CharlistRequestHandler.java b/src/main/java/net/server/handlers/login/CharlistRequestHandler.java index 66c290d3b7..99a19caada 100644 --- a/src/main/java/net/server/handlers/login/CharlistRequestHandler.java +++ b/src/main/java/net/server/handlers/login/CharlistRequestHandler.java @@ -26,7 +26,7 @@ import net.AbstractMaplePacketHandler; import net.server.Server; import net.server.channel.Channel; import net.server.world.World; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class CharlistRequestHandler extends AbstractMaplePacketHandler { @@ -38,14 +38,14 @@ public final class CharlistRequestHandler extends AbstractMaplePacketHandler { World wserv = Server.getInstance().getWorld(world); if(wserv == null || wserv.isWorldCapacityFull()) { - c.announce(MaplePacketCreator.getServerStatus(2)); + c.announce(PacketCreator.getServerStatus(2)); return; } int channel = slea.readByte() + 1; Channel ch = wserv.getChannel(channel); if(ch == null) { - c.announce(MaplePacketCreator.getServerStatus(2)); + c.announce(PacketCreator.getServerStatus(2)); return; } diff --git a/src/main/java/net/server/handlers/login/CheckCharNameHandler.java b/src/main/java/net/server/handlers/login/CheckCharNameHandler.java index dc27beedb7..b1ff02223a 100644 --- a/src/main/java/net/server/handlers/login/CheckCharNameHandler.java +++ b/src/main/java/net/server/handlers/login/CheckCharNameHandler.java @@ -24,7 +24,7 @@ package net.server.handlers.login; import client.MapleCharacter; import client.MapleClient; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class CheckCharNameHandler extends AbstractMaplePacketHandler { @@ -32,6 +32,6 @@ public final class CheckCharNameHandler extends AbstractMaplePacketHandler { @Override public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { String name = slea.readMapleAsciiString(); - c.announce(MaplePacketCreator.charNameResponse(name, !MapleCharacter.canCreateChar(name))); + c.announce(PacketCreator.charNameResponse(name, !MapleCharacter.canCreateChar(name))); } } diff --git a/src/main/java/net/server/handlers/login/CreateCharHandler.java b/src/main/java/net/server/handlers/login/CreateCharHandler.java index ae709f4e02..cce3a4c801 100644 --- a/src/main/java/net/server/handlers/login/CreateCharHandler.java +++ b/src/main/java/net/server/handlers/login/CreateCharHandler.java @@ -27,7 +27,7 @@ import client.creator.novice.LegendCreator; import client.creator.novice.NoblesseCreator; import net.AbstractMaplePacketHandler; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import java.util.Arrays; @@ -84,12 +84,12 @@ public final class CreateCharHandler extends AbstractMaplePacketHandler { } else if (job == 2) { // Aran status = LegendCreator.createCharacter(c, name, face, hair + haircolor, skincolor, top, bottom, shoes, weapon, gender); } else { - c.announce(MaplePacketCreator.deleteCharResponse(0, 9)); + c.announce(PacketCreator.deleteCharResponse(0, 9)); return; } if (status == -2) { - c.announce(MaplePacketCreator.deleteCharResponse(0, 9)); + c.announce(PacketCreator.deleteCharResponse(0, 9)); } } } \ No newline at end of file diff --git a/src/main/java/net/server/handlers/login/DeleteCharHandler.java b/src/main/java/net/server/handlers/login/DeleteCharHandler.java index a57c1db128..3ad6485439 100644 --- a/src/main/java/net/server/handlers/login/DeleteCharHandler.java +++ b/src/main/java/net/server/handlers/login/DeleteCharHandler.java @@ -27,7 +27,7 @@ import net.AbstractMaplePacketHandler; import net.server.Server; import tools.DatabaseConnection; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import java.sql.Connection; @@ -57,12 +57,12 @@ public final class DeleteCharHandler extends AbstractMaplePacketHandler { int guildRank = rs.getInt("guildrank"); int familyId = rs.getInt("familyId"); if (guildId != 0 && guildRank <= 1) { - c.announce(MaplePacketCreator.deleteCharResponse(cid, 0x16)); + c.announce(PacketCreator.deleteCharResponse(cid, 0x16)); return; } else if (familyId != -1) { MapleFamily family = Server.getInstance().getWorld(world).getFamily(familyId); if (family != null && family.getTotalMembers() > 1) { - c.announce(MaplePacketCreator.deleteCharResponse(cid, 0x1D)); + c.announce(PacketCreator.deleteCharResponse(cid, 0x1D)); return; } } @@ -72,23 +72,23 @@ public final class DeleteCharHandler extends AbstractMaplePacketHandler { try (ResultSet rs = ps2.executeQuery()) { rs.next(); if (rs.getInt("rowcount") > 0) { - c.announce(MaplePacketCreator.deleteCharResponse(cid, 0x1A)); + c.announce(PacketCreator.deleteCharResponse(cid, 0x1A)); return; } } } catch (SQLException e) { e.printStackTrace(); - c.announce(MaplePacketCreator.deleteCharResponse(cid, 0x09)); + c.announce(PacketCreator.deleteCharResponse(cid, 0x09)); return; } if (c.deleteCharacter(cid, c.getAccID())) { FilePrinter.print(FilePrinter.DELETED_CHAR + c.getAccountName() + ".txt", c.getAccountName() + " deleted CID: " + cid); - c.announce(MaplePacketCreator.deleteCharResponse(cid, 0)); + c.announce(PacketCreator.deleteCharResponse(cid, 0)); } else { - c.announce(MaplePacketCreator.deleteCharResponse(cid, 0x09)); + c.announce(PacketCreator.deleteCharResponse(cid, 0x09)); } } else { - c.announce(MaplePacketCreator.deleteCharResponse(cid, 0x14)); + c.announce(PacketCreator.deleteCharResponse(cid, 0x14)); } } } diff --git a/src/main/java/net/server/handlers/login/GuestLoginHandler.java b/src/main/java/net/server/handlers/login/GuestLoginHandler.java index 8ad0f707d7..9aede70d00 100644 --- a/src/main/java/net/server/handlers/login/GuestLoginHandler.java +++ b/src/main/java/net/server/handlers/login/GuestLoginHandler.java @@ -23,7 +23,7 @@ package net.server.handlers.login; import client.MapleClient; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /* @@ -33,7 +33,7 @@ public final class GuestLoginHandler extends AbstractMaplePacketHandler { @Override public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { - c.announce(MaplePacketCreator.sendGuestTOS()); + c.announce(PacketCreator.sendGuestTOS()); //System.out.println(slea.toString()); new LoginPasswordHandler().handlePacket(slea, c); } diff --git a/src/main/java/net/server/handlers/login/LoginPasswordHandler.java b/src/main/java/net/server/handlers/login/LoginPasswordHandler.java index 3928d9506c..af94075058 100644 --- a/src/main/java/net/server/handlers/login/LoginPasswordHandler.java +++ b/src/main/java/net/server/handlers/login/LoginPasswordHandler.java @@ -30,7 +30,7 @@ import net.server.coordinator.session.Hwid; import tools.BCrypt; import tools.DatabaseConnection; import tools.HexTool; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import java.io.UnsupportedEncodingException; @@ -57,7 +57,7 @@ public final class LoginPasswordHandler implements MaplePacketHandler { public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { String remoteHost = c.getRemoteAddress(); if (remoteHost.contentEquals("null")) { - c.announce(MaplePacketCreator.getLoginFailed(14)); // thanks Alchemist for noting remoteHost could be null + c.announce(PacketCreator.getLoginFailed(14)); // thanks Alchemist for noting remoteHost could be null return; } @@ -106,33 +106,33 @@ public final class LoginPasswordHandler implements MaplePacketHandler { } if (c.hasBannedIP() || c.hasBannedMac()) { - c.announce(MaplePacketCreator.getLoginFailed(3)); + c.announce(PacketCreator.getLoginFailed(3)); return; } Calendar tempban = c.getTempBanCalendarFromDB(); if (tempban != null) { if (tempban.getTimeInMillis() > Calendar.getInstance().getTimeInMillis()) { - c.announce(MaplePacketCreator.getTempBan(tempban.getTimeInMillis(), c.getGReason())); + c.announce(PacketCreator.getTempBan(tempban.getTimeInMillis(), c.getGReason())); return; } } if (loginok == 3) { - c.announce(MaplePacketCreator.getPermBan(c.getGReason()));//crashes but idc :D + c.announce(PacketCreator.getPermBan(c.getGReason()));//crashes but idc :D return; } else if (loginok != 0) { - c.announce(MaplePacketCreator.getLoginFailed(loginok)); + c.announce(PacketCreator.getLoginFailed(loginok)); return; } if (c.finishLogin() == 0) { c.checkChar(c.getAccID()); login(c); } else { - c.announce(MaplePacketCreator.getLoginFailed(7)); + c.announce(PacketCreator.getLoginFailed(7)); } } private static void login(MapleClient c) { - c.announce(MaplePacketCreator.getAuthSuccess(c));//why the fk did I do c.getAccountName()? + c.announce(PacketCreator.getAuthSuccess(c));//why the fk did I do c.getAccountName()? Server.getInstance().registerLoginState(c); } } diff --git a/src/main/java/net/server/handlers/login/RegisterPicHandler.java b/src/main/java/net/server/handlers/login/RegisterPicHandler.java index 8d3f4a7ad8..1442cb50e6 100644 --- a/src/main/java/net/server/handlers/login/RegisterPicHandler.java +++ b/src/main/java/net/server/handlers/login/RegisterPicHandler.java @@ -9,7 +9,7 @@ import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult; import net.server.world.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; import java.net.InetAddress; @@ -41,7 +41,7 @@ public final class RegisterPicHandler extends AbstractMaplePacketHandler { hwid = Hwid.fromHostString(hostString); } catch (IllegalArgumentException e) { log.warn("Invalid host string: {}", hostString, e); - c.announce(MaplePacketCreator.getAfterLoginError(17)); + c.announce(PacketCreator.getAfterLoginError(17)); return; } @@ -50,7 +50,7 @@ public final class RegisterPicHandler extends AbstractMaplePacketHandler { AntiMulticlientResult res = SessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid); if (res != AntiMulticlientResult.SUCCESS) { - c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); + c.announce(PacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); return; } @@ -72,13 +72,13 @@ public final class RegisterPicHandler extends AbstractMaplePacketHandler { c.setWorld(server.getCharacterWorld(charId)); World wserv = c.getWorldServer(); if(wserv == null || wserv.isWorldCapacityFull()) { - c.announce(MaplePacketCreator.getAfterLoginError(10)); + c.announce(PacketCreator.getAfterLoginError(10)); return; } String[] socket = server.getInetSocket(c, c.getWorld(), c.getChannel()); if(socket == null) { - c.announce(MaplePacketCreator.getAfterLoginError(10)); + c.announce(PacketCreator.getAfterLoginError(10)); return; } @@ -86,7 +86,7 @@ public final class RegisterPicHandler extends AbstractMaplePacketHandler { c.setCharacterOnSessionTransitionState(charId); try { - c.announce(MaplePacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId)); + c.announce(PacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId)); } catch (UnknownHostException e) { e.printStackTrace(); } diff --git a/src/main/java/net/server/handlers/login/RegisterPinHandler.java b/src/main/java/net/server/handlers/login/RegisterPinHandler.java index d35d6717e7..4c56774765 100644 --- a/src/main/java/net/server/handlers/login/RegisterPinHandler.java +++ b/src/main/java/net/server/handlers/login/RegisterPinHandler.java @@ -24,7 +24,7 @@ package net.server.handlers.login; import client.MapleClient; import net.AbstractMaplePacketHandler; import net.server.coordinator.session.SessionCoordinator; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /* @@ -41,7 +41,7 @@ public final class RegisterPinHandler extends AbstractMaplePacketHandler { String pin = slea.readMapleAsciiString(); if (pin != null) { c.setPin(pin); - c.announce(MaplePacketCreator.pinRegistered()); + c.announce(PacketCreator.pinRegistered()); SessionCoordinator.getInstance().closeSession(c, null); c.updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN); diff --git a/src/main/java/net/server/handlers/login/RelogRequestHandler.java b/src/main/java/net/server/handlers/login/RelogRequestHandler.java index 0e16342a07..1f50df5dea 100644 --- a/src/main/java/net/server/handlers/login/RelogRequestHandler.java +++ b/src/main/java/net/server/handlers/login/RelogRequestHandler.java @@ -23,7 +23,7 @@ package net.server.handlers.login; import client.MapleClient; import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class RelogRequestHandler extends AbstractMaplePacketHandler { @@ -34,6 +34,6 @@ public final class RelogRequestHandler extends AbstractMaplePacketHandler { @Override public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { - c.announce(MaplePacketCreator.getRelogResponse()); + c.announce(PacketCreator.getRelogResponse()); } } diff --git a/src/main/java/net/server/handlers/login/ServerStatusRequestHandler.java b/src/main/java/net/server/handlers/login/ServerStatusRequestHandler.java index b2c37b302a..ad72f23dbe 100644 --- a/src/main/java/net/server/handlers/login/ServerStatusRequestHandler.java +++ b/src/main/java/net/server/handlers/login/ServerStatusRequestHandler.java @@ -23,9 +23,9 @@ package net.server.handlers.login; import client.MapleClient; import net.AbstractMaplePacketHandler; -import net.server.world.World; import net.server.Server; -import tools.MaplePacketCreator; +import net.server.world.World; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; public final class ServerStatusRequestHandler extends AbstractMaplePacketHandler { @@ -36,9 +36,9 @@ public final class ServerStatusRequestHandler extends AbstractMaplePacketHandler World wserv = Server.getInstance().getWorld(world); if(wserv != null) { int status = wserv.getWorldCapacityStatus(); - c.announce(MaplePacketCreator.getServerStatus(status)); + c.announce(PacketCreator.getServerStatus(status)); } else { - c.announce(MaplePacketCreator.getServerStatus(2)); + c.announce(PacketCreator.getServerStatus(2)); } } } diff --git a/src/main/java/net/server/handlers/login/ServerlistRequestHandler.java b/src/main/java/net/server/handlers/login/ServerlistRequestHandler.java index 9391bafac4..bf1b7501b6 100644 --- a/src/main/java/net/server/handlers/login/ServerlistRequestHandler.java +++ b/src/main/java/net/server/handlers/login/ServerlistRequestHandler.java @@ -23,13 +23,14 @@ package net.server.handlers.login; import client.MapleClient; import constants.game.GameConstants; -import java.util.List; import net.AbstractMaplePacketHandler; import net.server.Server; import net.server.world.World; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; +import java.util.List; + public final class ServerlistRequestHandler extends AbstractMaplePacketHandler { @Override @@ -39,10 +40,10 @@ public final class ServerlistRequestHandler extends AbstractMaplePacketHandler { c.requestedServerlist(worlds.size()); for (World world : worlds) { - c.announce(MaplePacketCreator.getServerList(world.getId(), GameConstants.WORLD_NAMES[world.getId()], world.getFlag(), world.getEventMessage(), world.getChannels())); + c.announce(PacketCreator.getServerList(world.getId(), GameConstants.WORLD_NAMES[world.getId()], world.getFlag(), world.getEventMessage(), world.getChannels())); } - c.announce(MaplePacketCreator.getEndOfServerList()); - c.announce(MaplePacketCreator.selectWorld(0));//too lazy to make a check lol - c.announce(MaplePacketCreator.sendRecommended(server.worldRecommendedList())); + c.announce(PacketCreator.getEndOfServerList()); + c.announce(PacketCreator.selectWorld(0));//too lazy to make a check lol + c.announce(PacketCreator.sendRecommended(server.worldRecommendedList())); } } \ No newline at end of file diff --git a/src/main/java/net/server/handlers/login/SetGenderHandler.java b/src/main/java/net/server/handlers/login/SetGenderHandler.java index 50c9292643..4465f3c3e8 100644 --- a/src/main/java/net/server/handlers/login/SetGenderHandler.java +++ b/src/main/java/net/server/handlers/login/SetGenderHandler.java @@ -26,7 +26,7 @@ import client.MapleClient; import net.AbstractMaplePacketHandler; import net.server.Server; import net.server.coordinator.session.SessionCoordinator; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.data.input.SeekableLittleEndianAccessor; /** @@ -40,7 +40,7 @@ public class SetGenderHandler extends AbstractMaplePacketHandler { byte confirmed = slea.readByte(); if (confirmed == 0x01) { c.setGender(slea.readByte()); - c.announce(MaplePacketCreator.getAuthSuccess(c)); + c.announce(PacketCreator.getAuthSuccess(c)); Server.getInstance().registerLoginState(c); } else { diff --git a/src/main/java/net/server/handlers/login/ViewAllCharHandler.java b/src/main/java/net/server/handlers/login/ViewAllCharHandler.java index edf3a5f7dc..b8f0bcd39e 100644 --- a/src/main/java/net/server/handlers/login/ViewAllCharHandler.java +++ b/src/main/java/net/server/handlers/login/ViewAllCharHandler.java @@ -24,19 +24,20 @@ package net.server.handlers.login; import client.MapleCharacter; import client.MapleClient; import config.YamlConfig; -import java.util.List; import net.AbstractMaplePacketHandler; import net.server.Server; -import tools.MaplePacketCreator; -import tools.data.input.SeekableLittleEndianAccessor; +import tools.PacketCreator; import tools.Pair; +import tools.data.input.SeekableLittleEndianAccessor; + +import java.util.List; public final class ViewAllCharHandler extends AbstractMaplePacketHandler { @Override public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { try { if(!c.canRequestCharlist()) { // client breaks if the charlist request pops too soon - c.announce(MaplePacketCreator.showAllCharacter(0, 0)); + c.announce(PacketCreator.showAllCharacter(0, 0)); return; } @@ -61,10 +62,10 @@ public final class ViewAllCharHandler extends AbstractMaplePacketHandler { int charsSize = chrTotal; int unk = charsSize + (3 - charsSize % 3); //rowSize? - c.announce(MaplePacketCreator.showAllCharacter(charsSize, unk)); + c.announce(PacketCreator.showAllCharacter(charsSize, unk)); for (Pair> wchars : worldChars) { - c.announce(MaplePacketCreator.showAllCharacterInfo(wchars.getLeft(), wchars.getRight(), YamlConfig.config.server.ENABLE_PIC && !c.canBypassPic())); + c.announce(PacketCreator.showAllCharacterInfo(wchars.getLeft(), wchars.getRight(), YamlConfig.config.server.ENABLE_PIC && !c.canBypassPic())); } } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/net/server/handlers/login/ViewAllCharRegisterPicHandler.java b/src/main/java/net/server/handlers/login/ViewAllCharRegisterPicHandler.java index a2fc4842b5..a7bde1be57 100644 --- a/src/main/java/net/server/handlers/login/ViewAllCharRegisterPicHandler.java +++ b/src/main/java/net/server/handlers/login/ViewAllCharRegisterPicHandler.java @@ -9,7 +9,7 @@ import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult; import net.server.world.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Randomizer; import tools.data.input.SeekableLittleEndianAccessor; @@ -43,7 +43,7 @@ public final class ViewAllCharRegisterPicHandler extends AbstractMaplePacketHand hwid = Hwid.fromHostString(hostString); } catch (IllegalArgumentException e) { log.warn("Invalid host string: {}", hostString, e); - c.announce(MaplePacketCreator.getAfterLoginError(17)); + c.announce(PacketCreator.getAfterLoginError(17)); return; } @@ -57,7 +57,7 @@ public final class ViewAllCharRegisterPicHandler extends AbstractMaplePacketHand AntiMulticlientResult res = SessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid); if (res != AntiMulticlientResult.SUCCESS) { - c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); + c.announce(PacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); return; } @@ -70,7 +70,7 @@ public final class ViewAllCharRegisterPicHandler extends AbstractMaplePacketHand c.setWorld(server.getCharacterWorld(charId)); World wserv = c.getWorldServer(); if(wserv == null || wserv.isWorldCapacityFull()) { - c.announce(MaplePacketCreator.getAfterLoginError(10)); + c.announce(PacketCreator.getAfterLoginError(10)); return; } @@ -82,7 +82,7 @@ public final class ViewAllCharRegisterPicHandler extends AbstractMaplePacketHand String[] socket = server.getInetSocket(c, c.getWorld(), channel); if (socket == null) { - c.announce(MaplePacketCreator.getAfterLoginError(10)); + c.announce(PacketCreator.getAfterLoginError(10)); return; } @@ -90,7 +90,7 @@ public final class ViewAllCharRegisterPicHandler extends AbstractMaplePacketHand c.setCharacterOnSessionTransitionState(charId); try { - c.announce(MaplePacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId)); + c.announce(PacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId)); } catch (UnknownHostException e) { e.printStackTrace(); } diff --git a/src/main/java/net/server/handlers/login/ViewAllCharSelectedHandler.java b/src/main/java/net/server/handlers/login/ViewAllCharSelectedHandler.java index 82157f8c89..24476b5562 100644 --- a/src/main/java/net/server/handlers/login/ViewAllCharSelectedHandler.java +++ b/src/main/java/net/server/handlers/login/ViewAllCharSelectedHandler.java @@ -30,7 +30,7 @@ import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult; import net.server.world.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Randomizer; import tools.data.input.SeekableLittleEndianAccessor; @@ -63,7 +63,7 @@ public final class ViewAllCharSelectedHandler extends AbstractMaplePacketHandler hwid = Hwid.fromHostString(hostString); } catch (IllegalArgumentException e) { log.warn("Invalid host string: {}", hostString, e); - c.announce(MaplePacketCreator.getAfterLoginError(17)); + c.announce(PacketCreator.getAfterLoginError(17)); return; } @@ -77,7 +77,7 @@ public final class ViewAllCharSelectedHandler extends AbstractMaplePacketHandler AntiMulticlientResult res = SessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid); if (res != AntiMulticlientResult.SUCCESS) { - c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); + c.announce(PacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); return; } @@ -91,7 +91,7 @@ public final class ViewAllCharSelectedHandler extends AbstractMaplePacketHandler World wserv = c.getWorldServer(); if(wserv == null || wserv.isWorldCapacityFull()) { - c.announce(MaplePacketCreator.getAfterLoginError(10)); + c.announce(PacketCreator.getAfterLoginError(10)); return; } @@ -105,7 +105,7 @@ public final class ViewAllCharSelectedHandler extends AbstractMaplePacketHandler String[] socket = server.getInetSocket(c, c.getWorld(), c.getChannel()); if(socket == null) { - c.announce(MaplePacketCreator.getAfterLoginError(10)); + c.announce(PacketCreator.getAfterLoginError(10)); return; } @@ -113,7 +113,7 @@ public final class ViewAllCharSelectedHandler extends AbstractMaplePacketHandler c.setCharacterOnSessionTransitionState(charId); try { - c.announce(MaplePacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId)); + c.announce(PacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId)); } catch (UnknownHostException e) { e.printStackTrace(); } diff --git a/src/main/java/net/server/handlers/login/ViewAllCharSelectedWithPicHandler.java b/src/main/java/net/server/handlers/login/ViewAllCharSelectedWithPicHandler.java index 2b3a33e14c..599bf9f90e 100644 --- a/src/main/java/net/server/handlers/login/ViewAllCharSelectedWithPicHandler.java +++ b/src/main/java/net/server/handlers/login/ViewAllCharSelectedWithPicHandler.java @@ -9,7 +9,7 @@ import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult; import net.server.world.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Randomizer; import tools.data.input.SeekableLittleEndianAccessor; @@ -44,7 +44,7 @@ public class ViewAllCharSelectedWithPicHandler extends AbstractMaplePacketHandle hwid = Hwid.fromHostString(hostString); } catch (IllegalArgumentException e) { log.warn("Invalid host string: {}", hostString, e); - c.announce(MaplePacketCreator.getAfterLoginError(17)); + c.announce(PacketCreator.getAfterLoginError(17)); return; } @@ -65,7 +65,7 @@ public class ViewAllCharSelectedWithPicHandler extends AbstractMaplePacketHandle c.setWorld(server.getCharacterWorld(charId)); World wserv = c.getWorldServer(); if(wserv == null || wserv.isWorldCapacityFull()) { - c.announce(MaplePacketCreator.getAfterLoginError(10)); + c.announce(PacketCreator.getAfterLoginError(10)); return; } @@ -75,13 +75,13 @@ public class ViewAllCharSelectedWithPicHandler extends AbstractMaplePacketHandle if (c.checkPic(pic)) { String[] socket = server.getInetSocket(c, c.getWorld(), c.getChannel()); if(socket == null) { - c.announce(MaplePacketCreator.getAfterLoginError(10)); + c.announce(PacketCreator.getAfterLoginError(10)); return; } AntiMulticlientResult res = SessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid); if (res != AntiMulticlientResult.SUCCESS) { - c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); + c.announce(PacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); return; } @@ -89,13 +89,13 @@ public class ViewAllCharSelectedWithPicHandler extends AbstractMaplePacketHandle c.setCharacterOnSessionTransitionState(charId); try { - c.announce(MaplePacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId)); + c.announce(PacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId)); } catch (UnknownHostException e) { e.printStackTrace(); } } else { - c.announce(MaplePacketCreator.wrongPic()); + c.announce(PacketCreator.wrongPic()); } } } diff --git a/src/main/java/net/server/services/task/channel/FaceExpressionService.java b/src/main/java/net/server/services/task/channel/FaceExpressionService.java index 1f788d4651..35aa7eff11 100644 --- a/src/main/java/net/server/services/task/channel/FaceExpressionService.java +++ b/src/main/java/net/server/services/task/channel/FaceExpressionService.java @@ -28,7 +28,7 @@ import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import net.server.services.BaseScheduler; import net.server.services.BaseService; import server.maps.MapleMap; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.util.Collections; @@ -75,7 +75,7 @@ public class FaceExpressionService extends BaseService { Runnable cancelAction = () -> { if(chr.isLoggedinWorld()) { - map.broadcastMessage(chr, MaplePacketCreator.facialExpression(chr, 0), false); + map.broadcastMessage(chr, PacketCreator.facialExpression(chr, 0), false); } }; @@ -90,7 +90,7 @@ public class FaceExpressionService extends BaseService { faceLock[lockid].unlock(); } - map.broadcastMessage(chr, MaplePacketCreator.facialExpression(chr, emote), false); + map.broadcastMessage(chr, PacketCreator.facialExpression(chr, emote), false); } public void unregisterFaceExpression(int mapid, MapleCharacter chr) { diff --git a/src/main/java/net/server/world/MapleParty.java b/src/main/java/net/server/world/MapleParty.java index c9fe9faab0..20091c40b4 100644 --- a/src/main/java/net/server/world/MapleParty.java +++ b/src/main/java/net/server/world/MapleParty.java @@ -34,7 +34,7 @@ import scripting.event.EventInstanceManager; import server.maps.MapleDoor; import server.maps.MapleMap; import server.partyquest.MonsterCarnival; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.util.*; import java.util.Map.Entry; @@ -330,7 +330,7 @@ public class MapleParty { MapleParty party = player.getParty(); if (party == null) { if (player.getLevel() < 10 && !YamlConfig.config.server.USE_PARTY_FOR_STARTERS) { - player.announce(MaplePacketCreator.partyStatusMessage(10)); + player.announce(PacketCreator.partyStatusMessage(10)); return false; } else if (player.getAriantColiseum() != null) { player.dropMessage(5, "You cannot request a party creation while participating the Ariant Battle Arena."); @@ -347,12 +347,12 @@ public class MapleParty { player.updatePartySearchAvailability(false); player.partyOperationUpdate(party, null); - player.announce(MaplePacketCreator.partyCreated(party, partyplayer.getId())); + player.announce(PacketCreator.partyCreated(party, partyplayer.getId())); return true; } else { if (!silentCheck) { - player.announce(MaplePacketCreator.partyStatusMessage(16)); + player.announce(PacketCreator.partyStatusMessage(16)); } return false; @@ -380,15 +380,15 @@ public class MapleParty { return true; } else { if (!silentCheck) { - player.announce(MaplePacketCreator.partyStatusMessage(17)); + player.announce(PacketCreator.partyStatusMessage(17)); } } } else { - player.announce(MaplePacketCreator.serverNotice(5, "You couldn't join the party since it had already been disbanded.")); + player.announce(PacketCreator.serverNotice(5, "You couldn't join the party since it had already been disbanded.")); } } else { if (!silentCheck) { - player.announce(MaplePacketCreator.serverNotice(5, "You can't join the party as you are already in one.")); + player.announce(PacketCreator.serverNotice(5, "You can't join the party as you are already in one.")); } } diff --git a/src/main/java/net/server/world/World.java b/src/main/java/net/server/world/World.java index c4fb749fa6..d7e086c212 100644 --- a/src/main/java/net/server/world/World.java +++ b/src/main/java/net/server/world/World.java @@ -55,7 +55,7 @@ import server.MapleStorage; import server.TimerManager; import server.maps.*; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.packets.Fishing; @@ -675,10 +675,10 @@ public class World { if (mc.isLoggedinWorld()) { MapleGuild guild = Server.getInstance().getGuild(guildid); if (guild != null) { - mc.getMap().broadcastMessage(mc, MaplePacketCreator.guildNameChanged(cid, guild.getName())); - mc.getMap().broadcastMessage(mc, MaplePacketCreator.guildMarkChanged(cid, guild)); + mc.getMap().broadcastMessage(mc, PacketCreator.guildNameChanged(cid, guild.getName())); + mc.getMap().broadcastMessage(mc, PacketCreator.guildMarkChanged(cid, guild)); } else { - mc.getMap().broadcastMessage(mc, MaplePacketCreator.guildNameChanged(cid, "")); + mc.getMap().broadcastMessage(mc, PacketCreator.guildNameChanged(cid, "")); } } } @@ -686,7 +686,7 @@ public class World { public void changeEmblem(int gid, List affectedPlayers, MapleGuildSummary mgs) { updateGuildSummary(gid, mgs); - sendPacket(affectedPlayers, MaplePacketCreator.guildEmblemChange(gid, mgs.getLogoBG(), mgs.getLogoBGColor(), mgs.getLogo(), mgs.getLogoColor()), -1); + sendPacket(affectedPlayers, PacketCreator.guildEmblemChange(gid, mgs.getLogoBG(), mgs.getLogoBGColor(), mgs.getLogo(), mgs.getLogoColor()), -1); setGuildAndRank(affectedPlayers, -1, -1, -1); //respawn player } @@ -911,7 +911,7 @@ public class World { chr.setParty(party); chr.setMPC(partychar); } - chr.announce(MaplePacketCreator.updateParty(chr.getClient().getChannel(), party, operation, target)); + chr.announce(PacketCreator.updateParty(chr.getClient().getChannel(), party, operation, target)); } } switch (operation) { @@ -919,7 +919,7 @@ public class World { case EXPEL: MapleCharacter chr = getPlayerStorage().getCharacterById(target.getId()); if (chr != null) { - chr.announce(MaplePacketCreator.updateParty(chr.getClient().getChannel(), party, operation, target)); + chr.announce(PacketCreator.updateParty(chr.getClient().getChannel(), party, operation, target)); chr.setParty(null); chr.setMPC(null); } @@ -1014,7 +1014,7 @@ public class World { if (!(partychar.getName().equals(namefrom))) { MapleCharacter chr = getPlayerStorage().getCharacterByName(partychar.getName()); if (chr != null) { - chr.getClient().announce(MaplePacketCreator.multiChat(namefrom, chattext, 1)); + chr.getClient().announce(PacketCreator.multiChat(namefrom, chattext, 1)); } } } @@ -1026,7 +1026,7 @@ public class World { MapleCharacter chr = playerStorage.getCharacterById(characterId); if (chr != null) { if (chr.getBuddylist().containsVisible(cidFrom)) { - chr.getClient().announce(MaplePacketCreator.multiChat(nameFrom, chattext, 0)); + chr.getClient().announce(PacketCreator.multiChat(nameFrom, chattext, 0)); } } } @@ -1065,15 +1065,15 @@ public class World { MapleCharacter from = getChannel(fromchannel).getPlayerStorage().getCharacterByName(sender); if (from != null) { if (MapleInviteCoordinator.createInvite(InviteType.MESSENGER, from, messengerid, targetChr.getId())) { - targetChr.getClient().announce(MaplePacketCreator.messengerInvite(sender, messengerid)); - from.getClient().announce(MaplePacketCreator.messengerNote(target, 4, 1)); + targetChr.getClient().announce(PacketCreator.messengerInvite(sender, messengerid)); + from.getClient().announce(PacketCreator.messengerNote(target, 4, 1)); } else { - from.announce(MaplePacketCreator.messengerChat(sender + " : " + target + " is already managing a Maple Messenger invitation")); + from.announce(PacketCreator.messengerChat(sender + " : " + target + " is already managing a Maple Messenger invitation")); } } } else { MapleCharacter from = getChannel(fromchannel).getPlayerStorage().getCharacterByName(sender); - from.getClient().announce(MaplePacketCreator.messengerChat(sender + " : " + target + " is already using Maple Messenger")); + from.getClient().announce(PacketCreator.messengerChat(sender + " : " + target + " is already using Maple Messenger")); } } } @@ -1087,10 +1087,10 @@ public class World { } if (!messengerchar.getName().equals(namefrom)) { MapleCharacter from = getChannel(fromchannel).getPlayerStorage().getCharacterByName(namefrom); - chr.getClient().announce(MaplePacketCreator.addMessengerPlayer(namefrom, from, position, (byte) (fromchannel - 1))); - from.getClient().announce(MaplePacketCreator.addMessengerPlayer(chr.getName(), chr, messengerchar.getPosition(), (byte) (messengerchar.getChannel() - 1))); + chr.getClient().announce(PacketCreator.addMessengerPlayer(namefrom, from, position, (byte) (fromchannel - 1))); + from.getClient().announce(PacketCreator.addMessengerPlayer(chr.getName(), chr, messengerchar.getPosition(), (byte) (messengerchar.getChannel() - 1))); } else { - chr.getClient().announce(MaplePacketCreator.joinMessenger(messengerchar.getPosition())); + chr.getClient().announce(PacketCreator.joinMessenger(messengerchar.getPosition())); } } } @@ -1099,7 +1099,7 @@ public class World { for (MapleMessengerCharacter messengerchar : messenger.getMembers()) { MapleCharacter chr = getPlayerStorage().getCharacterByName(messengerchar.getName()); if (chr != null) { - chr.getClient().announce(MaplePacketCreator.removeMessengerPlayer(position)); + chr.getClient().announce(PacketCreator.removeMessengerPlayer(position)); } } } @@ -1112,7 +1112,7 @@ public class World { if (!(messengerchar.getName().equals(namefrom))) { MapleCharacter chr = getPlayerStorage().getCharacterByName(messengerchar.getName()); if (chr != null) { - chr.getClient().announce(MaplePacketCreator.messengerChat(chattext)); + chr.getClient().announce(PacketCreator.messengerChat(chattext)); if (to1.equals("")){ to1 = messengerchar.getName(); } else if (to2.equals("")){ @@ -1130,7 +1130,7 @@ public class World { MapleCharacter senderChr = getPlayerStorage().getCharacterByName(sender); if (senderChr != null && senderChr.getMessenger() != null) { if (MapleInviteCoordinator.answerInvite(InviteType.MESSENGER, player.getId(), senderChr.getMessenger().getId(), false).result == InviteResult.DENIED) { - senderChr.getClient().announce(MaplePacketCreator.messengerNote(player.getName(), 5, 0)); + senderChr.getClient().announce(PacketCreator.messengerNote(player.getName(), 5, 0)); } } } @@ -1148,7 +1148,7 @@ public class World { if (!(messengerchar.getName().equals(namefrom))) { MapleCharacter chr = ch.getPlayerStorage().getCharacterByName(messengerchar.getName()); if (chr != null) { - chr.getClient().announce(MaplePacketCreator.updateMessengerPlayer(namefrom, getChannel(fromchannel).getPlayerStorage().getCharacterByName(namefrom), position, (byte) (fromchannel - 1))); + chr.getClient().announce(PacketCreator.updateMessengerPlayer(namefrom, getChannel(fromchannel).getPlayerStorage().getCharacterByName(namefrom), position, (byte) (fromchannel - 1))); } } } @@ -1214,13 +1214,13 @@ public class World { case ADDED: if (buddylist.contains(cidFrom)) { buddylist.put(new BuddylistEntry(name, "Default Group", cidFrom, channel, true)); - addChar.getClient().announce(MaplePacketCreator.updateBuddyChannel(cidFrom, (byte) (channel - 1))); + addChar.getClient().announce(PacketCreator.updateBuddyChannel(cidFrom, (byte) (channel - 1))); } break; case DELETED: if (buddylist.contains(cidFrom)) { buddylist.put(new BuddylistEntry(name, "Default Group", cidFrom, (byte) -1, buddylist.get(cidFrom).isVisible())); - addChar.getClient().announce(MaplePacketCreator.updateBuddyChannel(cidFrom, (byte) -1)); + addChar.getClient().announce(PacketCreator.updateBuddyChannel(cidFrom, (byte) -1)); } break; } @@ -1251,7 +1251,7 @@ public class World { mcChannel = (byte) (channel - 1); } chr.getBuddylist().put(ble); - chr.getClient().announce(MaplePacketCreator.updateBuddyChannel(ble.getCharacterId(), mcChannel)); + chr.getClient().announce(PacketCreator.updateBuddyChannel(ble.getCharacterId(), mcChannel)); } } } @@ -1721,7 +1721,7 @@ public class World { MapleCharacter chr = players.getCharacterById(chrid); if(chr != null && chr.isLoggedinWorld()) { - chr.announce(MaplePacketCreator.serverMessage(chr.getClient().getChannelServer().getServerMessage())); + chr.announce(PacketCreator.serverMessage(chr.getClient().getChannelServer().getServerMessage())); } } } diff --git a/src/main/java/scripting/AbstractPlayerInteraction.java b/src/main/java/scripting/AbstractPlayerInteraction.java index 35de7419da..dd4a972bec 100644 --- a/src/main/java/scripting/AbstractPlayerInteraction.java +++ b/src/main/java/scripting/AbstractPlayerInteraction.java @@ -47,7 +47,7 @@ import server.maps.MapleMapObjectType; import server.partyquest.PartyQuest; import server.partyquest.Pyramid; import server.quest.MapleQuest; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import java.awt.*; @@ -526,9 +526,9 @@ public class AbstractPlayerInteraction { getPlayer().addPet(evolved); - getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.showPet(c.getPlayer(), evolved, false, false), true); - c.announce(MaplePacketCreator.petStatUpdate(c.getPlayer())); - c.announce(MaplePacketCreator.enableActions()); + getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.showPet(c.getPlayer(), evolved, false, false), true); + c.announce(PacketCreator.petStatUpdate(c.getPlayer())); + c.announce(PacketCreator.enableActions()); chr.getClient().getWorldServer().registerPetHunger(chr, chr.getPetIndex(evolved)); */ @@ -635,7 +635,7 @@ public class AbstractPlayerInteraction { MapleInventoryManipulator.removeById(c, ItemConstants.getInventoryType(id), id, -quantity, true, false); } if (showMessage) { - c.announce(MaplePacketCreator.getShowItemGain(id, quantity, true)); + c.announce(PacketCreator.getShowItemGain(id, quantity, true)); } return item; @@ -646,11 +646,11 @@ public class AbstractPlayerInteraction { } public void changeMusic(String songName) { - getPlayer().getMap().broadcastMessage(MaplePacketCreator.musicChange(songName)); + getPlayer().getMap().broadcastMessage(PacketCreator.musicChange(songName)); } public void playerMessage(int type, String message) { - c.announce(MaplePacketCreator.serverNotice(type, message)); + c.announce(PacketCreator.serverNotice(type, message)); } public void message(String message) { @@ -662,15 +662,15 @@ public class AbstractPlayerInteraction { } public void mapMessage(int type, String message) { - getPlayer().getMap().broadcastMessage(MaplePacketCreator.serverNotice(type, message)); + getPlayer().getMap().broadcastMessage(PacketCreator.serverNotice(type, message)); } public void mapEffect(String path) { - c.announce(MaplePacketCreator.mapEffect(path)); + c.announce(PacketCreator.mapEffect(path)); } public void mapSound(String path) { - c.announce(MaplePacketCreator.mapSound(path)); + c.announce(PacketCreator.mapSound(path)); } public void displayAranIntro() { @@ -699,17 +699,17 @@ public class AbstractPlayerInteraction { } public void showIntro(String path) { - c.announce(MaplePacketCreator.showIntro(path)); + c.announce(PacketCreator.showIntro(path)); } public void showInfo(String path) { - c.announce(MaplePacketCreator.showInfo(path)); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.showInfo(path)); + c.announce(PacketCreator.enableActions()); } public void guildMessage(int type, String message) { if (getGuild() != null) { - getGuild().guildMessage(MaplePacketCreator.serverNotice(type, message)); + getGuild().guildMessage(PacketCreator.serverNotice(type, message)); } } @@ -754,7 +754,7 @@ public class AbstractPlayerInteraction { } else { MapleInventoryManipulator.removeById(cl, ItemConstants.getInventoryType(id), id, -quantity, true, false); } - cl.announce(MaplePacketCreator.getShowItemGain(id, quantity, true)); + cl.announce(PacketCreator.getShowItemGain(id, quantity, true)); } } @@ -847,7 +847,7 @@ public class AbstractPlayerInteraction { int possesed = iv.countById(id); if (possesed > 0) { MapleInventoryManipulator.removeById(c, ItemConstants.getInventoryType(id), id, possesed, true, false); - chr.announce(MaplePacketCreator.getShowItemGain(id, (short) -possesed, true)); + chr.announce(PacketCreator.getShowItemGain(id, (short) -possesed, true)); } } } @@ -861,13 +861,13 @@ public class AbstractPlayerInteraction { int possessed = cl.getPlayer().getInventory(invType).countById(id); if (possessed > 0) { MapleInventoryManipulator.removeById(cl, ItemConstants.getInventoryType(id), id, possessed, true, false); - cl.announce(MaplePacketCreator.getShowItemGain(id, (short) -possessed, true)); + cl.announce(PacketCreator.getShowItemGain(id, (short) -possessed, true)); } if(invType == MapleInventoryType.EQUIP) { if(cl.getPlayer().getInventory(MapleInventoryType.EQUIPPED).countById(id) > 0) { MapleInventoryManipulator.removeById(cl, MapleInventoryType.EQUIPPED, id, 1, true, false); - cl.announce(MaplePacketCreator.getShowItemGain(id, (short) -1, true)); + cl.announce(PacketCreator.getShowItemGain(id, (short) -1, true)); } } } @@ -881,12 +881,12 @@ public class AbstractPlayerInteraction { } public void showInstruction(String msg, int width, int height) { - c.announce(MaplePacketCreator.sendHint(msg, width, height)); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.sendHint(msg, width, height)); + c.announce(PacketCreator.enableActions()); } public void disableMinimap() { - c.announce(MaplePacketCreator.disableMinimap()); + c.announce(PacketCreator.disableMinimap()); } public boolean isAllReactorState(final int reactorId, final int state) { @@ -898,13 +898,13 @@ public class AbstractPlayerInteraction { getMap(mapid).killAllMonsters(); for (MapleMapObject i : getMap(mapid).getMapObjectsInRange(c.getPlayer().getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM))) { getMap(mapid).removeMapObject(i); - getMap(mapid).broadcastMessage(MaplePacketCreator.removeItemFromMap(i.getObjectId(), 0, c.getPlayer().getId())); + getMap(mapid).broadcastMessage(PacketCreator.removeItemFromMap(i.getObjectId(), 0, c.getPlayer().getId())); } } public void useItem(int id) { MapleItemInformationProvider.getInstance().getItemEffect(id).applyTo(c.getPlayer()); - c.announce(MaplePacketCreator.getItemMessage(id));//Useful shet :3 + c.announce(PacketCreator.getItemMessage(id));//Useful shet :3 } public void cancelItem(final int id) { @@ -924,7 +924,7 @@ public class AbstractPlayerInteraction { return; } } else if (GameConstants.isAranSkills(skillid)) { - c.announce(MaplePacketCreator.showInfo("Effect/BasicEff.img/AranGetSkill")); + c.announce(PacketCreator.showInfo("Effect/BasicEff.img/AranGetSkill")); } getPlayer().changeSkillLevel(skill, level, masterLevel, expiration); @@ -943,7 +943,7 @@ public class AbstractPlayerInteraction { final Item newItem = MapleItemInformationProvider.getInstance().getEquipById(itemid); newItem.setPosition(slot); c.getPlayer().getInventory(MapleInventoryType.EQUIPPED).addItemFromDB(newItem); - c.announce(MaplePacketCreator.modifyInventory(false, Collections.singletonList(new ModifyInventory(0, newItem)))); + c.announce(PacketCreator.modifyInventory(false, Collections.singletonList(new ModifyInventory(0, newItem)))); } public void spawnNpc(int npcId, Point pos, MapleMap map) { @@ -955,7 +955,7 @@ public class AbstractPlayerInteraction { npc.setRx1(pos.x - 50); npc.setFh(map.getFootholds().findBelow(pos).getId()); map.addMapObject(npc); - map.broadcastMessage(MaplePacketCreator.spawnNPC(npc)); + map.broadcastMessage(PacketCreator.spawnNPC(npc)); } } @@ -974,19 +974,19 @@ public class AbstractPlayerInteraction { } public void spawnGuide() { - c.announce(MaplePacketCreator.spawnGuide(true)); + c.announce(PacketCreator.spawnGuide(true)); } public void removeGuide() { - c.announce(MaplePacketCreator.spawnGuide(false)); + c.announce(PacketCreator.spawnGuide(false)); } public void displayGuide(int num) { - c.announce(MaplePacketCreator.showInfo("UI/tutorial.img/" + num)); + c.announce(PacketCreator.showInfo("UI/tutorial.img/" + num)); } public void goDojoUp() { - c.announce(MaplePacketCreator.dojoWarpUp()); + c.announce(PacketCreator.dojoWarpUp()); } public void resetDojoEnergy() { @@ -1000,28 +1000,28 @@ public class AbstractPlayerInteraction { } public void enableActions() { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } public void showEffect(String effect){ - c.announce(MaplePacketCreator.showEffect(effect)); + c.announce(PacketCreator.showEffect(effect)); } public void dojoEnergy() { - c.announce(MaplePacketCreator.getEnergy("energy", getPlayer().getDojoEnergy())); + c.announce(PacketCreator.getEnergy("energy", getPlayer().getDojoEnergy())); } public void talkGuide(String message) { - c.announce(MaplePacketCreator.talkGuide(message)); + c.announce(PacketCreator.talkGuide(message)); } public void guideHint(int hint) { - c.announce(MaplePacketCreator.guideHint(hint)); + c.announce(PacketCreator.guideHint(hint)); } public void updateAreaInfo(Short area, String info) { c.getPlayer().updateAreaInfo(area, info); - c.announce(MaplePacketCreator.enableActions());//idk, nexon does the same :P + c.announce(PacketCreator.enableActions());//idk, nexon does the same :P } public boolean containsAreaInfo(short area, String info) { @@ -1029,33 +1029,33 @@ public class AbstractPlayerInteraction { } public void earnTitle(String msg) { - c.announce(MaplePacketCreator.earnTitleMessage(msg)); + c.announce(PacketCreator.earnTitleMessage(msg)); } public void showInfoText(String msg) { - c.announce(MaplePacketCreator.showInfoText(msg)); + c.announce(PacketCreator.showInfoText(msg)); } public void openUI(byte ui) { - c.announce(MaplePacketCreator.openUI(ui)); + c.announce(PacketCreator.openUI(ui)); } public void lockUI() { - c.announce(MaplePacketCreator.disableUI(true)); - c.announce(MaplePacketCreator.lockUI(true)); + c.announce(PacketCreator.disableUI(true)); + c.announce(PacketCreator.lockUI(true)); } public void unlockUI() { - c.announce(MaplePacketCreator.disableUI(false)); - c.announce(MaplePacketCreator.lockUI(false)); + c.announce(PacketCreator.disableUI(false)); + c.announce(PacketCreator.lockUI(false)); } public void playSound(String sound) { - getPlayer().getMap().broadcastMessage(MaplePacketCreator.environmentChange(sound, 4)); + getPlayer().getMap().broadcastMessage(PacketCreator.environmentChange(sound, 4)); } public void environmentChange(String env, int mode) { - getPlayer().getMap().broadcastMessage(MaplePacketCreator.environmentChange(env, mode)); + getPlayer().getMap().broadcastMessage(PacketCreator.environmentChange(env, mode)); } public String numberWithCommas(int number) { @@ -1183,7 +1183,7 @@ public class AbstractPlayerInteraction { } public void npcTalk(int npcid, String message) { - c.announce(MaplePacketCreator.getNPCTalk(npcid, (byte) 0, message, "00 00", (byte) 0)); + c.announce(PacketCreator.getNPCTalk(npcid, (byte) 0, message, "00 00", (byte) 0)); } public long getCurrentTime() { diff --git a/src/main/java/scripting/event/EventInstanceManager.java b/src/main/java/scripting/event/EventInstanceManager.java index ee4dbc6104..3a4e6defa8 100644 --- a/src/main/java/scripting/event/EventInstanceManager.java +++ b/src/main/java/scripting/event/EventInstanceManager.java @@ -48,7 +48,7 @@ import server.maps.MapleMap; import server.maps.MapleMapManager; import server.maps.MaplePortal; import server.maps.MapleReactor; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import javax.script.ScriptException; @@ -282,7 +282,7 @@ public class EventInstanceManager { eventTime = time; for(MapleCharacter chr: getPlayers()) { - chr.announce(MaplePacketCreator.getClock((int) (time / 1000))); + chr.announce(PacketCreator.getClock((int) (time / 1000))); } event_schedule = TimerManager.getInstance().schedule(() -> { @@ -319,7 +319,7 @@ public class EventInstanceManager { private void dismissEventTimer() { for(MapleCharacter chr: getPlayers()) { - chr.getClient().announce(MaplePacketCreator.removeClock()); + chr.getClient().announce(PacketCreator.removeClock()); } event_schedule = null; @@ -857,7 +857,7 @@ public class EventInstanceManager { npc.setRx1(pos.x - 50); npc.setFh(map.getFootholds().findBelow(pos).getId()); map.addMapObject(npc); - map.broadcastMessage(MaplePacketCreator.spawnNPC(npc)); + map.broadcastMessage(PacketCreator.spawnNPC(npc)); } } @@ -1209,8 +1209,8 @@ public class EventInstanceManager { public final void showWrongEffect(int mapId) { MapleMap map = getMapInstance(mapId); - map.broadcastMessage(MaplePacketCreator.showEffect("quest/party/wrong_kor")); - map.broadcastMessage(MaplePacketCreator.playSound("Party1/Failed")); + map.broadcastMessage(PacketCreator.showEffect("quest/party/wrong_kor")); + map.broadcastMessage(PacketCreator.playSound("Party1/Failed")); } public final void showClearEffect() { @@ -1236,10 +1236,10 @@ public class EventInstanceManager { public final void showClearEffect(boolean hasGate, int mapId, String mapObj, int newState) { MapleMap map = getMapInstance(mapId); - map.broadcastMessage(MaplePacketCreator.showEffect("quest/party/clear")); - map.broadcastMessage(MaplePacketCreator.playSound("Party1/Clear")); + map.broadcastMessage(PacketCreator.showEffect("quest/party/clear")); + map.broadcastMessage(PacketCreator.playSound("Party1/Clear")); if(hasGate) { - map.broadcastMessage(MaplePacketCreator.environmentChange(mapObj, newState)); + map.broadcastMessage(PacketCreator.environmentChange(mapObj, newState)); wL.lock(); try { openedGates.put(map.getId(), new Pair<>(mapObj, newState)); @@ -1262,7 +1262,7 @@ public class EventInstanceManager { } if(gateData != null) { - chr.announce(MaplePacketCreator.environmentChange(gateData.getLeft(), gateData.getRight())); + chr.announce(PacketCreator.environmentChange(gateData.getLeft(), gateData.getRight())); } } diff --git a/src/main/java/scripting/map/MapScriptMethods.java b/src/main/java/scripting/map/MapScriptMethods.java index cc94de2edd..6435e9dc88 100644 --- a/src/main/java/scripting/map/MapScriptMethods.java +++ b/src/main/java/scripting/map/MapScriptMethods.java @@ -26,7 +26,7 @@ import client.MapleClient; import client.MapleQuestStatus; import scripting.AbstractPlayerInteraction; import server.quest.MapleQuest; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class MapScriptMethods extends AbstractPlayerInteraction { @@ -40,26 +40,26 @@ public class MapScriptMethods extends AbstractPlayerInteraction { switch (c.getPlayer().getMapId()) { case 913040100: lockUI(); - c.announce(MaplePacketCreator.showIntro("Effect/Direction.img/cygnusJobTutorial/Scene0")); + c.announce(PacketCreator.showIntro("Effect/Direction.img/cygnusJobTutorial/Scene0")); break; case 913040101: - c.announce(MaplePacketCreator.showIntro("Effect/Direction.img/cygnusJobTutorial/Scene1")); + c.announce(PacketCreator.showIntro("Effect/Direction.img/cygnusJobTutorial/Scene1")); break; case 913040102: - c.announce(MaplePacketCreator.showIntro("Effect/Direction.img/cygnusJobTutorial/Scene2")); + c.announce(PacketCreator.showIntro("Effect/Direction.img/cygnusJobTutorial/Scene2")); break; case 913040103: - c.announce(MaplePacketCreator.showIntro("Effect/Direction.img/cygnusJobTutorial/Scene3")); + c.announce(PacketCreator.showIntro("Effect/Direction.img/cygnusJobTutorial/Scene3")); break; case 913040104: - c.announce(MaplePacketCreator.showIntro("Effect/Direction.img/cygnusJobTutorial/Scene4")); + c.announce(PacketCreator.showIntro("Effect/Direction.img/cygnusJobTutorial/Scene4")); break; case 913040105: - c.announce(MaplePacketCreator.showIntro("Effect/Direction.img/cygnusJobTutorial/Scene5")); + c.announce(PacketCreator.showIntro("Effect/Direction.img/cygnusJobTutorial/Scene5")); break; case 913040106: lockUI(); - c.announce(MaplePacketCreator.showIntro("Effect/Direction.img/cygnusJobTutorial/Scene6")); + c.announce(PacketCreator.showIntro("Effect/Direction.img/cygnusJobTutorial/Scene6")); break; } } @@ -68,20 +68,20 @@ public class MapScriptMethods extends AbstractPlayerInteraction { switch (c.getPlayer().getMapId()) { case 914090010: lockUI(); - c.announce(MaplePacketCreator.showIntro("Effect/Direction1.img/aranTutorial/Scene0")); + c.announce(PacketCreator.showIntro("Effect/Direction1.img/aranTutorial/Scene0")); break; case 914090011: - c.announce(MaplePacketCreator.showIntro("Effect/Direction1.img/aranTutorial/Scene1" + c.getPlayer().getGender())); + c.announce(PacketCreator.showIntro("Effect/Direction1.img/aranTutorial/Scene1" + c.getPlayer().getGender())); break; case 914090012: - c.announce(MaplePacketCreator.showIntro("Effect/Direction1.img/aranTutorial/Scene2" + c.getPlayer().getGender())); + c.announce(PacketCreator.showIntro("Effect/Direction1.img/aranTutorial/Scene2" + c.getPlayer().getGender())); break; case 914090013: - c.announce(MaplePacketCreator.showIntro("Effect/Direction1.img/aranTutorial/Scene3")); + c.announce(PacketCreator.showIntro("Effect/Direction1.img/aranTutorial/Scene3")); break; case 914090100: lockUI(); - c.announce(MaplePacketCreator.showIntro("Effect/Direction1.img/aranTutorial/HandedPoleArm" + c.getPlayer().getGender())); + c.announce(PacketCreator.showIntro("Effect/Direction1.img/aranTutorial/HandedPoleArm" + c.getPlayer().getGender())); break; } } @@ -89,30 +89,30 @@ public class MapScriptMethods extends AbstractPlayerInteraction { public void startExplorerExperience() { if (c.getPlayer().getMapId() == 1020100) //Swordman { - c.announce(MaplePacketCreator.showIntro("Effect/Direction3.img/swordman/Scene" + c.getPlayer().getGender())); + c.announce(PacketCreator.showIntro("Effect/Direction3.img/swordman/Scene" + c.getPlayer().getGender())); } else if (c.getPlayer().getMapId() == 1020200) //Magician { - c.announce(MaplePacketCreator.showIntro("Effect/Direction3.img/magician/Scene" + c.getPlayer().getGender())); + c.announce(PacketCreator.showIntro("Effect/Direction3.img/magician/Scene" + c.getPlayer().getGender())); } else if (c.getPlayer().getMapId() == 1020300) //Archer { - c.announce(MaplePacketCreator.showIntro("Effect/Direction3.img/archer/Scene" + c.getPlayer().getGender())); + c.announce(PacketCreator.showIntro("Effect/Direction3.img/archer/Scene" + c.getPlayer().getGender())); } else if (c.getPlayer().getMapId() == 1020400) //Rogue { - c.announce(MaplePacketCreator.showIntro("Effect/Direction3.img/rogue/Scene" + c.getPlayer().getGender())); + c.announce(PacketCreator.showIntro("Effect/Direction3.img/rogue/Scene" + c.getPlayer().getGender())); } else if (c.getPlayer().getMapId() == 1020500) //Pirate { - c.announce(MaplePacketCreator.showIntro("Effect/Direction3.img/pirate/Scene" + c.getPlayer().getGender())); + c.announce(PacketCreator.showIntro("Effect/Direction3.img/pirate/Scene" + c.getPlayer().getGender())); } } public void goAdventure() { lockUI(); - c.announce(MaplePacketCreator.showIntro("Effect/Direction3.img/goAdventure/Scene" + c.getPlayer().getGender())); + c.announce(PacketCreator.showIntro("Effect/Direction3.img/goAdventure/Scene" + c.getPlayer().getGender())); } public void goLith() { lockUI(); - c.announce(MaplePacketCreator.showIntro("Effect/Direction3.img/goLith/Scene" + c.getPlayer().getGender())); + c.announce(PacketCreator.showIntro("Effect/Direction3.img/goLith/Scene" + c.getPlayer().getGender())); } public void explorerQuest(short questid, String questName) { @@ -134,13 +134,13 @@ public class MapScriptMethods extends AbstractPlayerInteraction { if (status.equals(infoex)) { etm.append("Earned the ").append(questName).append(" title!"); smp.append("You have earned the <").append(questName).append(">").append(rewardstring); - getPlayer().announce(MaplePacketCreator.getShowQuestCompletion(quest.getId())); + getPlayer().announce(PacketCreator.getShowQuestCompletion(quest.getId())); } else { - getPlayer().announce(MaplePacketCreator.earnTitleMessage(status + "/" + infoex + " regions explored.")); + getPlayer().announce(PacketCreator.earnTitleMessage(status + "/" + infoex + " regions explored.")); etm.append("Trying for the ").append(questName).append(" title."); smp.append("You made progress on the ").append(questName).append(" title. ").append(status).append("/").append(infoex); } - getPlayer().announce(MaplePacketCreator.earnTitleMessage(etm.toString())); + getPlayer().announce(PacketCreator.earnTitleMessage(etm.toString())); showInfoText(smp.toString()); } @@ -157,11 +157,11 @@ public class MapScriptMethods extends AbstractPlayerInteraction { } String status = Integer.toString(qs.getMedalProgress()); getPlayer().announceUpdateQuest(DelayedQuestUpdate.UPDATE, qs, true); - getPlayer().announce(MaplePacketCreator.earnTitleMessage(status + "/5 Completed")); - getPlayer().announce(MaplePacketCreator.earnTitleMessage("The One Who's Touched the Sky title in progress.")); + getPlayer().announce(PacketCreator.earnTitleMessage(status + "/5 Completed")); + getPlayer().announce(PacketCreator.earnTitleMessage("The One Who's Touched the Sky title in progress.")); if (Integer.toString(qs.getMedalProgress()).equals(qs.getInfoEx(0))) { showInfoText("The One Who's Touched the Sky" + rewardstring); - getPlayer().announce(MaplePacketCreator.getShowQuestCompletion(quest.getId())); + getPlayer().announce(PacketCreator.getShowQuestCompletion(quest.getId())); } else { showInfoText("The One Who's Touched the Sky title in progress. " + status + "/5 Completed"); } diff --git a/src/main/java/scripting/npc/NPCConversationManager.java b/src/main/java/scripting/npc/NPCConversationManager.java index c634ca6c3a..07886a81fb 100644 --- a/src/main/java/scripting/npc/NPCConversationManager.java +++ b/src/main/java/scripting/npc/NPCConversationManager.java @@ -59,7 +59,7 @@ import server.partyquest.Pyramid; import server.partyquest.Pyramid.PyramidMode; import tools.FilePrinter; import tools.LogHelper; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.packets.Wedding; import java.awt.*; @@ -133,23 +133,23 @@ public class NPCConversationManager extends AbstractPlayerInteraction { public void dispose() { NPCScriptManager.getInstance().dispose(this); - getClient().announce(MaplePacketCreator.enableActions()); + getClient().announce(PacketCreator.enableActions()); } public void sendNext(String text) { - getClient().announce(MaplePacketCreator.getNPCTalk(npc, (byte) 0, text, "00 01", (byte) 0)); + getClient().announce(PacketCreator.getNPCTalk(npc, (byte) 0, text, "00 01", (byte) 0)); } public void sendPrev(String text) { - getClient().announce(MaplePacketCreator.getNPCTalk(npc, (byte) 0, text, "01 00", (byte) 0)); + getClient().announce(PacketCreator.getNPCTalk(npc, (byte) 0, text, "01 00", (byte) 0)); } public void sendNextPrev(String text) { - getClient().announce(MaplePacketCreator.getNPCTalk(npc, (byte) 0, text, "01 01", (byte) 0)); + getClient().announce(PacketCreator.getNPCTalk(npc, (byte) 0, text, "01 01", (byte) 0)); } public void sendOk(String text) { - getClient().announce(MaplePacketCreator.getNPCTalk(npc, (byte) 0, text, "00 00", (byte) 0)); + getClient().announce(PacketCreator.getNPCTalk(npc, (byte) 0, text, "00 00", (byte) 0)); } public void sendDefault() { @@ -157,48 +157,48 @@ public class NPCConversationManager extends AbstractPlayerInteraction { } public void sendYesNo(String text) { - getClient().announce(MaplePacketCreator.getNPCTalk(npc, (byte) 1, text, "", (byte) 0)); + getClient().announce(PacketCreator.getNPCTalk(npc, (byte) 1, text, "", (byte) 0)); } public void sendAcceptDecline(String text) { - getClient().announce(MaplePacketCreator.getNPCTalk(npc, (byte) 0x0C, text, "", (byte) 0)); + getClient().announce(PacketCreator.getNPCTalk(npc, (byte) 0x0C, text, "", (byte) 0)); } public void sendSimple(String text) { - getClient().announce(MaplePacketCreator.getNPCTalk(npc, (byte) 4, text, "", (byte) 0)); + getClient().announce(PacketCreator.getNPCTalk(npc, (byte) 4, text, "", (byte) 0)); } public void sendNext(String text, byte speaker) { - getClient().announce(MaplePacketCreator.getNPCTalk(npc, (byte) 0, text, "00 01", speaker)); + getClient().announce(PacketCreator.getNPCTalk(npc, (byte) 0, text, "00 01", speaker)); } public void sendPrev(String text, byte speaker) { - getClient().announce(MaplePacketCreator.getNPCTalk(npc, (byte) 0, text, "01 00", speaker)); + getClient().announce(PacketCreator.getNPCTalk(npc, (byte) 0, text, "01 00", speaker)); } public void sendNextPrev(String text, byte speaker) { - getClient().announce(MaplePacketCreator.getNPCTalk(npc, (byte) 0, text, "01 01", speaker)); + getClient().announce(PacketCreator.getNPCTalk(npc, (byte) 0, text, "01 01", speaker)); } public void sendOk(String text, byte speaker) { - getClient().announce(MaplePacketCreator.getNPCTalk(npc, (byte) 0, text, "00 00", speaker)); + getClient().announce(PacketCreator.getNPCTalk(npc, (byte) 0, text, "00 00", speaker)); } public void sendYesNo(String text, byte speaker) { - getClient().announce(MaplePacketCreator.getNPCTalk(npc, (byte) 1, text, "", speaker)); + getClient().announce(PacketCreator.getNPCTalk(npc, (byte) 1, text, "", speaker)); } public void sendAcceptDecline(String text, byte speaker) { - getClient().announce(MaplePacketCreator.getNPCTalk(npc, (byte) 0x0C, text, "", speaker)); + getClient().announce(PacketCreator.getNPCTalk(npc, (byte) 0x0C, text, "", speaker)); } public void sendSimple(String text, byte speaker) { - getClient().announce(MaplePacketCreator.getNPCTalk(npc, (byte) 4, text, "", speaker)); + getClient().announce(PacketCreator.getNPCTalk(npc, (byte) 4, text, "", speaker)); } public void sendStyle(String text, int[] styles) { if (styles.length > 0) { - getClient().announce(MaplePacketCreator.getNPCTalkStyle(npc, text, styles)); + getClient().announce(PacketCreator.getNPCTalkStyle(npc, text, styles)); } else { // thanks Conrad for noticing empty styles crashing players sendOk("Sorry, there are no options of cosmetics available for you here at the moment."); dispose(); @@ -206,11 +206,11 @@ public class NPCConversationManager extends AbstractPlayerInteraction { } public void sendGetNumber(String text, int def, int min, int max) { - getClient().announce(MaplePacketCreator.getNPCTalkNum(npc, text, def, min, max)); + getClient().announce(PacketCreator.getNPCTalkNum(npc, text, def, min, max)); } public void sendGetText(String text) { - getClient().announce(MaplePacketCreator.getNPCTalkText(npc, text, "")); + getClient().announce(PacketCreator.getNPCTalkText(npc, text, "")); } /* @@ -223,7 +223,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { * 6 = Kerning Subway */ public void sendDimensionalMirror(String text) { - getClient().announce(MaplePacketCreator.getDimensionalMirror(text)); + getClient().announce(PacketCreator.getDimensionalMirror(text)); } public void setGetText(String text) { @@ -278,7 +278,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { @Override public void showEffect(String effect) { - getPlayer().getMap().broadcastMessage(MaplePacketCreator.environmentChange(effect, 3)); + getPlayer().getMap().broadcastMessage(PacketCreator.environmentChange(effect, 3)); } public void setHair(int hair) { @@ -410,7 +410,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { LogHelper.logGacha(getPlayer(), item.getId(), map); if (item.getTier() > 0){ //Uncommon and Rare - Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.gachaponMessage(itemGained, map, getPlayer())); + Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.gachaponMessage(itemGained, map, getPlayer())); } } @@ -418,10 +418,10 @@ public class NPCConversationManager extends AbstractPlayerInteraction { MapleAlliance alliance = Server.getInstance().getAlliance(c.getPlayer().getGuild().getAllianceId()); alliance.increaseCapacity(1); - Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.getGuildAlliances(alliance, c.getWorld()), -1, -1); - Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.allianceNotice(alliance.getId(), alliance.getNotice()), -1, -1); + Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.getGuildAlliances(alliance, c.getWorld()), -1, -1); + Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.allianceNotice(alliance.getId(), alliance.getNotice()), -1, -1); - c.announce(MaplePacketCreator.updateAllianceInfo(alliance, c.getWorld())); // thanks Vcoc for finding an alliance update to leader issue + c.announce(PacketCreator.updateAllianceInfo(alliance, c.getWorld())); // thanks Vcoc for finding an alliance update to leader issue } public void disbandAlliance(MapleClient c, int allianceId) { @@ -461,7 +461,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { } public void showFredrick() { - c.announce(MaplePacketCreator.getFredrick(getPlayer())); + c.announce(PacketCreator.getFredrick(getPlayer())); } public int partyMembersInMap() { @@ -677,7 +677,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { if (mc != null) { mc.setChallenged(false); mc.changeMap(map, map.getPortal(0)); - mc.announce(MaplePacketCreator.serverNotice(6, LanguageConstants.getMessage(mc, LanguageConstants.CPQEntryLobby))); + mc.announce(PacketCreator.serverNotice(6, LanguageConstants.getMessage(mc, LanguageConstants.CPQEntryLobby))); TimerManager tMan = TimerManager.getInstance(); tMan.schedule(() -> mapClock(3 * 60), 1500); @@ -926,7 +926,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { if (mc != null) { mc.setChallenged(false); mc.changeMap(map, map.getPortal(0)); - mc.announce(MaplePacketCreator.serverNotice(6, LanguageConstants.getMessage(mc, LanguageConstants.CPQEntryLobby))); + mc.announce(PacketCreator.serverNotice(6, LanguageConstants.getMessage(mc, LanguageConstants.CPQEntryLobby))); TimerManager tMan = TimerManager.getInstance(); tMan.schedule(() -> mapClock(3 * 60), 1500); @@ -939,7 +939,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { } public void mapClock(int time) { - getPlayer().getMap().broadcastMessage(MaplePacketCreator.getClock(time)); + getPlayer().getMap().broadcastMessage(PacketCreator.getClock(time)); } private boolean sendCPQChallenge(String cpqType, int leaderid) { diff --git a/src/main/java/scripting/npc/NPCScriptManager.java b/src/main/java/scripting/npc/NPCScriptManager.java index 39b74f2bc1..6e7408ebb1 100644 --- a/src/main/java/scripting/npc/NPCScriptManager.java +++ b/src/main/java/scripting/npc/NPCScriptManager.java @@ -27,7 +27,7 @@ import net.server.world.MaplePartyCharacter; import scripting.AbstractScriptManager; import server.MapleItemInformationProvider.ScriptedItem; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import javax.script.Invocable; import javax.script.ScriptEngine; @@ -151,7 +151,7 @@ public class NPCScriptManager extends AbstractScriptManager { } } } else { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } return true; } catch (final Exception ute) { diff --git a/src/main/java/scripting/portal/PortalPlayerInteraction.java b/src/main/java/scripting/portal/PortalPlayerInteraction.java index d12ea79a1d..06e20baf5b 100644 --- a/src/main/java/scripting/portal/PortalPlayerInteraction.java +++ b/src/main/java/scripting/portal/PortalPlayerInteraction.java @@ -26,7 +26,7 @@ import scripting.AbstractPlayerInteraction; import scripting.map.MapScriptManager; import server.maps.MaplePortal; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.sql.Connection; import java.sql.PreparedStatement; @@ -78,6 +78,6 @@ public class PortalPlayerInteraction extends AbstractPlayerInteraction { } public void playPortalSound() { - c.announce(MaplePacketCreator.playPortalSound()); + c.announce(PacketCreator.playPortalSound()); } } \ No newline at end of file diff --git a/src/main/java/scripting/reactor/ReactorActionManager.java b/src/main/java/scripting/reactor/ReactorActionManager.java index b5246a69af..4140a79155 100644 --- a/src/main/java/scripting/reactor/ReactorActionManager.java +++ b/src/main/java/scripting/reactor/ReactorActionManager.java @@ -39,7 +39,7 @@ import server.maps.MapleReactor; import server.maps.ReactorDropEntry; import server.partyquest.MapleCarnivalFactory; import server.partyquest.MapleCarnivalFactory.MCSkill; -import tools.MaplePacketCreator; +import tools.PacketCreator; import javax.script.Invocable; import java.awt.*; @@ -294,7 +294,7 @@ public class ReactorActionManager extends AbstractPlayerInteraction { if(chr != null) { map.damageMonster(chr, mm, damage); - map.broadcastMessage(MaplePacketCreator.damageMonster(mm.getObjectId(), damage)); + map.broadcastMessage(PacketCreator.damageMonster(mm.getObjectId(), damage)); } } } diff --git a/src/main/java/server/MapleItemInformationProvider.java b/src/main/java/server/MapleItemInformationProvider.java index 64b3253fed..c74b8b1bba 100644 --- a/src/main/java/server/MapleItemInformationProvider.java +++ b/src/main/java/server/MapleItemInformationProvider.java @@ -1668,7 +1668,7 @@ public class MapleItemInformationProvider { if (!EquipSlot.getFromTextSlot(islot).isAllowed(dst, isCash(id))) { equip.wear(false); String itemName = MapleItemInformationProvider.getInstance().getName(equip.getItemId()); - Server.getInstance().broadcastGMMessage(chr.getWorld(), MaplePacketCreator.sendYellowTip("[Warning]: " + chr.getName() + " tried to equip " + itemName + " into slot " + dst + ".")); + Server.getInstance().broadcastGMMessage(chr.getWorld(), PacketCreator.sendYellowTip("[Warning]: " + chr.getName() + " tried to equip " + itemName + " into slot " + dst + ".")); AutobanFactory.PACKET_EDIT.alert(chr, chr.getName() + " tried to forcibly equip an item."); FilePrinter.printError(FilePrinter.EXPLOITS + chr.getName() + ".txt", chr.getName() + " tried to equip " + itemName + " into " + dst + " slot."); return false; diff --git a/src/main/java/server/MapleShop.java b/src/main/java/server/MapleShop.java index 241900da8f..71854b32bb 100644 --- a/src/main/java/server/MapleShop.java +++ b/src/main/java/server/MapleShop.java @@ -28,7 +28,7 @@ import client.inventory.MaplePet; import client.inventory.manipulator.MapleInventoryManipulator; import constants.inventory.ItemConstants; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.sql.Connection; import java.sql.PreparedStatement; @@ -76,7 +76,7 @@ public class MapleShop { public void sendShop(MapleClient c) { c.getPlayer().setShop(this); - c.announce(MaplePacketCreator.getNPCShop(c, getNpcId(), items)); + c.announce(PacketCreator.getNPCShop(c, getNpcId(), items)); } public void buy(MapleClient c, short slot, int itemId, short quantity) { @@ -103,12 +103,12 @@ public class MapleShop { MapleInventoryManipulator.addById(c, itemId, quantity, "", -1); c.getPlayer().gainMeso(-item.getPrice(), false); } - c.announce(MaplePacketCreator.shopTransaction((byte) 0)); + c.announce(PacketCreator.shopTransaction((byte) 0)); } else - c.announce(MaplePacketCreator.shopTransaction((byte) 3)); + c.announce(PacketCreator.shopTransaction((byte) 3)); } else - c.announce(MaplePacketCreator.shopTransaction((byte) 2)); + c.announce(PacketCreator.shopTransaction((byte) 2)); } else if (item.getPitch() > 0) { int amount = (int)Math.min((float) item.getPitch() * quantity, Integer.MAX_VALUE); @@ -124,9 +124,9 @@ public class MapleShop { MapleInventoryManipulator.addById(c, itemId, quantity, "", -1); MapleInventoryManipulator.removeById(c, MapleInventoryType.ETC, 4310000, amount, false, false); } - c.announce(MaplePacketCreator.shopTransaction((byte) 0)); + c.announce(PacketCreator.shopTransaction((byte) 0)); } else - c.announce(MaplePacketCreator.shopTransaction((byte) 3)); + c.announce(PacketCreator.shopTransaction((byte) 3)); } } else if (c.getPlayer().getInventory(MapleInventoryType.CASH).countById(token) != 0) { @@ -145,11 +145,11 @@ public class MapleShop { } c.getPlayer().gainMeso(diff, false); } else { - c.announce(MaplePacketCreator.shopTransaction((byte) 3)); + c.announce(PacketCreator.shopTransaction((byte) 3)); } - c.announce(MaplePacketCreator.shopTransaction((byte) 0)); + c.announce(PacketCreator.shopTransaction((byte) 0)); } else { - c.announce(MaplePacketCreator.shopTransaction((byte) 2)); + c.announce(PacketCreator.shopTransaction((byte) 2)); } } } @@ -203,9 +203,9 @@ public class MapleShop { if (recvMesos > 0) { c.getPlayer().gainMeso(recvMesos, false); } - c.announce(MaplePacketCreator.shopTransaction((byte) 0x8)); + c.announce(PacketCreator.shopTransaction((byte) 0x8)); } else { - c.announce(MaplePacketCreator.shopTransaction((byte) 0x5)); + c.announce(PacketCreator.shopTransaction((byte) 0x5)); } } @@ -225,9 +225,9 @@ public class MapleShop { item.setQuantity(slotMax); c.getPlayer().forceUpdateItem(item); c.getPlayer().gainMeso(-price, false, true, false); - c.announce(MaplePacketCreator.shopTransaction((byte) 0x8)); + c.announce(PacketCreator.shopTransaction((byte) 0x8)); } else { - c.announce(MaplePacketCreator.shopTransaction((byte) 0x2)); + c.announce(PacketCreator.shopTransaction((byte) 0x2)); } } } diff --git a/src/main/java/server/MapleStatEffect.java b/src/main/java/server/MapleStatEffect.java index d7aa812cd9..673a598999 100644 --- a/src/main/java/server/MapleStatEffect.java +++ b/src/main/java/server/MapleStatEffect.java @@ -43,7 +43,7 @@ import server.maps.*; import server.partyquest.MapleCarnivalFactory; import server.partyquest.MapleCarnivalFactory.MCSkill; import tools.ArrayMap; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import java.awt.*; @@ -826,8 +826,8 @@ public class MapleStatEffect { if (absorbMp > 0) { mob.setMp(mob.getMp() - absorbMp); applyto.addMP(absorbMp); - applyto.announce(MaplePacketCreator.showOwnBuffEffect(sourceid, 1)); - applyto.getMap().broadcastMessage(applyto, MaplePacketCreator.showBuffeffect(applyto.getId(), sourceid, 1), false); + applyto.announce(PacketCreator.showOwnBuffEffect(sourceid, 1)); + applyto.getMap().broadcastMessage(applyto, PacketCreator.showBuffeffect(applyto.getId(), sourceid, 1), false); } } break; @@ -875,7 +875,7 @@ public class MapleStatEffect { if (primary) { if (itemConNo != 0) { if (!applyto.getAbstractPlayerInteraction().hasItem(itemCon, itemConNo)) { - applyto.announce(MaplePacketCreator.enableActions()); + applyto.announce(PacketCreator.enableActions()); return false; } MapleInventoryManipulator.removeById(applyto.getClient(), ItemConstants.getInventoryType(itemCon), itemCon, itemConNo, false, true); @@ -899,7 +899,7 @@ public class MapleStatEffect { } */ if (!applyto.applyHpMpChange(hpCon, hpchange, mpchange)) { - applyto.announce(MaplePacketCreator.enableActions()); + applyto.announce(PacketCreator.enableActions()); return false; } @@ -970,7 +970,7 @@ public class MapleStatEffect { applyto.cancelBuffStats(MapleBuffStat.SUMMON); } - applyto.announce(MaplePacketCreator.enableActions()); + applyto.announce(PacketCreator.enableActions()); } applyBuffEffect(applyfrom, applyto, primary); @@ -1108,8 +1108,8 @@ public class MapleStatEffect { affectedc += affectedp.size(); // used for heal for (MapleCharacter affected : affectedp) { applyTo(applyfrom, affected, false, null, useMaxRange, affectedc); - affected.announce(MaplePacketCreator.showOwnBuffEffect(sourceid, 2)); - affected.getMap().broadcastMessage(affected, MaplePacketCreator.showBuffeffect(affected.getId(), sourceid, 2), false); + affected.announce(PacketCreator.showOwnBuffEffect(sourceid, 2)); + affected.getMap().broadcastMessage(affected, PacketCreator.showBuffeffect(affected.getId(), sourceid, 2), false); } } @@ -1182,7 +1182,7 @@ public class MapleStatEffect { public final void applyComboBuff(final MapleCharacter applyto, int combo) { final List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.ARAN_COMBO, combo)); - applyto.announce(MaplePacketCreator.giveBuff(sourceid, 99999, stat)); + applyto.announce(PacketCreator.giveBuff(sourceid, 99999, stat)); final long starttime = Server.getInstance().getCurrentTime(); // final CancelEffectAction cancelAction = new CancelEffectAction(applyto, this, starttime); @@ -1192,7 +1192,7 @@ public class MapleStatEffect { public final void applyBeaconBuff(final MapleCharacter applyto, int objectid) { // thanks Thora & Hyun for reporting an issue with homing beacon autoflagging mobs when changing maps final List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.HOMING_BEACON, objectid)); - applyto.announce(MaplePacketCreator.giveBuff(1, sourceid, stat)); + applyto.announce(PacketCreator.giveBuff(1, sourceid, stat)); final long starttime = Server.getInstance().getCurrentTime(); applyto.registerEffect(this, starttime, Long.MAX_VALUE, false); @@ -1205,9 +1205,9 @@ public class MapleStatEffect { long leftDuration = (starttime + localDuration) - Server.getInstance().getCurrentTime(); if (leftDuration > 0) { if (isDash() || isInfusion()) { - target.announce(MaplePacketCreator.givePirateBuff(activeStats, (skill ? sourceid : -sourceid), (int) leftDuration)); + target.announce(PacketCreator.givePirateBuff(activeStats, (skill ? sourceid : -sourceid), (int) leftDuration)); } else { - target.announce(MaplePacketCreator.giveBuff((skill ? sourceid : -sourceid), (int) leftDuration, activeStats)); + target.announce(PacketCreator.giveBuff((skill ? sourceid : -sourceid), (int) leftDuration, activeStats)); } } } @@ -1260,35 +1260,35 @@ public class MapleStatEffect { } if (primary) { localDuration = alchemistModifyVal(applyfrom, localDuration, false); - applyto.getMap().broadcastMessage(applyto, MaplePacketCreator.showBuffeffect(applyto.getId(), sourceid, 1, (byte) 3), false); + applyto.getMap().broadcastMessage(applyto, PacketCreator.showBuffeffect(applyto.getId(), sourceid, 1, (byte) 3), false); } if (localstatups.size() > 0) { byte[] buff = null; byte[] mbuff = null; if (this.isActive(applyto)) { - buff = MaplePacketCreator.giveBuff((skill ? sourceid : -sourceid), localDuration, localstatups); + buff = PacketCreator.giveBuff((skill ? sourceid : -sourceid), localDuration, localstatups); } if (isDash()) { - buff = MaplePacketCreator.givePirateBuff(statups, sourceid, seconds); - mbuff = MaplePacketCreator.giveForeignPirateBuff(applyto.getId(), sourceid, seconds, localstatups); + buff = PacketCreator.givePirateBuff(statups, sourceid, seconds); + mbuff = PacketCreator.giveForeignPirateBuff(applyto.getId(), sourceid, seconds, localstatups); } else if (isWkCharge()) { - mbuff = MaplePacketCreator.giveForeignWKChargeEffect(applyto.getId(), sourceid, localstatups); + mbuff = PacketCreator.giveForeignWKChargeEffect(applyto.getId(), sourceid, localstatups); } else if (isInfusion()) { - buff = MaplePacketCreator.givePirateBuff(localstatups, sourceid, seconds); - mbuff = MaplePacketCreator.giveForeignPirateBuff(applyto.getId(), sourceid, seconds, localstatups); + buff = PacketCreator.givePirateBuff(localstatups, sourceid, seconds); + mbuff = PacketCreator.giveForeignPirateBuff(applyto.getId(), sourceid, seconds, localstatups); } else if (isDs()) { List> dsstat = Collections.singletonList(new Pair<>(MapleBuffStat.DARKSIGHT, 0)); - mbuff = MaplePacketCreator.giveForeignBuff(applyto.getId(), dsstat); + mbuff = PacketCreator.giveForeignBuff(applyto.getId(), dsstat); } else if (isWw()) { List> dsstat = Collections.singletonList(new Pair<>(MapleBuffStat.WIND_WALK, 0)); - mbuff = MaplePacketCreator.giveForeignBuff(applyto.getId(), dsstat); + mbuff = PacketCreator.giveForeignBuff(applyto.getId(), dsstat); } else if (isCombo()) { Integer comboCount = applyto.getBuffedValue(MapleBuffStat.COMBO); if (comboCount == null) comboCount = 0; List> cbstat = Collections.singletonList(new Pair<>(MapleBuffStat.COMBO, comboCount)); - buff = MaplePacketCreator.giveBuff((skill ? sourceid : -sourceid), localDuration, cbstat); - mbuff = MaplePacketCreator.giveForeignBuff(applyto.getId(), cbstat); + buff = PacketCreator.giveBuff((skill ? sourceid : -sourceid), localDuration, cbstat); + mbuff = PacketCreator.giveForeignBuff(applyto.getId(), cbstat); } else if (isMonsterRiding()) { if (sourceid == Corsair.BATTLE_SHIP) {//hp if (applyto.getBattleshipHp() <= 0) { @@ -1297,23 +1297,23 @@ public class MapleStatEffect { localstatups = statups; } - buff = MaplePacketCreator.giveBuff(localsourceid, localDuration, localstatups); - mbuff = MaplePacketCreator.showMonsterRiding(applyto.getId(), givemount); + buff = PacketCreator.giveBuff(localsourceid, localDuration, localstatups); + mbuff = PacketCreator.showMonsterRiding(applyto.getId(), givemount); localDuration = duration; } else if (isShadowPartner()) { List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.SHADOWPARTNER, 0)); - mbuff = MaplePacketCreator.giveForeignBuff(applyto.getId(), stat); + mbuff = PacketCreator.giveForeignBuff(applyto.getId(), stat); } else if (isSoulArrow()) { List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.SOULARROW, 0)); - mbuff = MaplePacketCreator.giveForeignBuff(applyto.getId(), stat); + mbuff = PacketCreator.giveForeignBuff(applyto.getId(), stat); } else if (isEnrage()) { applyto.handleOrbconsume(); } else if (isMorph()) { List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.MORPH, getMorph(applyto))); - mbuff = MaplePacketCreator.giveForeignBuff(applyto.getId(), stat); + mbuff = PacketCreator.giveForeignBuff(applyto.getId(), stat); } else if (isAriantShield()) { List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.AURA, 1)); - mbuff = MaplePacketCreator.giveForeignBuff(applyto.getId(), stat); + mbuff = PacketCreator.giveForeignBuff(applyto.getId(), stat); } if (buff != null) { diff --git a/src/main/java/server/MapleStorage.java b/src/main/java/server/MapleStorage.java index ffb5aca046..02b940d2f6 100644 --- a/src/main/java/server/MapleStorage.java +++ b/src/main/java/server/MapleStorage.java @@ -32,7 +32,7 @@ import provider.MapleDataTool; import provider.wz.WZFiles; import tools.DatabaseConnection; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import java.sql.Connection; @@ -227,7 +227,7 @@ public class MapleStorage { public void sendStorage(MapleClient c, int npcId) { if (c.getPlayer().getLevel() < 15){ c.getPlayer().dropMessage(1, "You may only use the storage once you have reached level 15."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -248,7 +248,7 @@ public class MapleStorage { } currentNpcid = npcId; - c.announce(MaplePacketCreator.getStorage(npcId, slots, storageItems, meso)); + c.announce(PacketCreator.getStorage(npcId, slots, storageItems, meso)); } finally { lock.unlock(); } @@ -257,7 +257,7 @@ public class MapleStorage { public void sendStored(MapleClient c, MapleInventoryType type) { lock.lock(); try { - c.announce(MaplePacketCreator.storeStorage(slots, type, typeItems.get(type))); + c.announce(PacketCreator.storeStorage(slots, type, typeItems.get(type))); } finally { lock.unlock(); } @@ -266,7 +266,7 @@ public class MapleStorage { public void sendTakenOut(MapleClient c, MapleInventoryType type) { lock.lock(); try { - c.announce(MaplePacketCreator.takeOutStorage(slots, type, typeItems.get(type))); + c.announce(PacketCreator.takeOutStorage(slots, type, typeItems.get(type))); } finally { lock.unlock(); } @@ -283,7 +283,7 @@ public class MapleStorage { typeItems.put(type, new ArrayList<>(items)); } - c.announce(MaplePacketCreator.arrangeStorage(slots, items)); + c.announce(PacketCreator.arrangeStorage(slots, items)); } finally { lock.unlock(); } @@ -301,7 +301,7 @@ public class MapleStorage { } public void sendMeso(MapleClient c) { - c.announce(MaplePacketCreator.mesoStorage(slots, meso)); + c.announce(PacketCreator.mesoStorage(slots, meso)); } public int getStoreFee() { // thanks to GabrielSin diff --git a/src/main/java/server/MapleTrade.java b/src/main/java/server/MapleTrade.java index 7ad528c397..71ef61b8b4 100644 --- a/src/main/java/server/MapleTrade.java +++ b/src/main/java/server/MapleTrade.java @@ -21,27 +21,27 @@ */ package server; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.atomic.AtomicBoolean; - -import config.YamlConfig; -import tools.LogHelper; -import tools.MaplePacketCreator; import client.MapleCharacter; import client.inventory.Item; import client.inventory.MapleInventory; import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; +import config.YamlConfig; import constants.game.GameConstants; import net.server.coordinator.world.MapleInviteCoordinator; import net.server.coordinator.world.MapleInviteCoordinator.InviteResult; import net.server.coordinator.world.MapleInviteCoordinator.InviteType; import net.server.coordinator.world.MapleInviteCoordinator.MapleInviteResult; +import tools.LogHelper; +import tools.PacketCreator; import tools.Pair; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; + /** * * @author Matze @@ -104,7 +104,7 @@ public class MapleTrade { private void lockTrade() { locked.set(true); - partner.getChr().getClient().announce(MaplePacketCreator.getTradeConfirmation()); + partner.getChr().getClient().announce(PacketCreator.getTradeConfirmation()); } private void fetchExchangedItems() { @@ -143,7 +143,7 @@ public class MapleTrade { exchangeItems.clear(); } - chr.getClient().announce(MaplePacketCreator.getTradeResult(number, result)); + chr.getClient().announce(PacketCreator.getTradeResult(number, result)); } private void cancel(byte result) { @@ -164,7 +164,7 @@ public class MapleTrade { exchangeItems.clear(); } - chr.getClient().announce(MaplePacketCreator.getTradeResult(number, result)); + chr.getClient().announce(PacketCreator.getTradeResult(number, result)); } private boolean isLocked() { @@ -186,9 +186,9 @@ public class MapleTrade { if (chr.getMeso() >= meso) { chr.gainMeso(-meso, false, true, false); this.meso += meso; - chr.getClient().announce(MaplePacketCreator.getTradeMesoSet((byte) 0, this.meso)); + chr.getClient().announce(PacketCreator.getTradeMesoSet((byte) 0, this.meso)); if (partner != null) { - partner.getChr().getClient().announce(MaplePacketCreator.getTradeMesoSet((byte) 1, this.meso)); + partner.getChr().getClient().announce(PacketCreator.getTradeMesoSet((byte) 1, this.meso)); } } else { } @@ -212,9 +212,9 @@ public class MapleTrade { } public void chat(String message) { - chr.getClient().announce(MaplePacketCreator.getTradeChat(chr, message, true)); + chr.getClient().announce(PacketCreator.getTradeChat(chr, message, true)); if (partner != null) { - partner.getChr().getClient().announce(MaplePacketCreator.getTradeChat(chr, message, false)); + partner.getChr().getClient().announce(PacketCreator.getTradeChat(chr, message, false)); } } @@ -334,7 +334,7 @@ public class MapleTrade { if (local.getChr().getLevel() < 15) { if (local.getChr().getMesosTraded() + local.exchangeMeso > 1000000) { cancelTrade(local.getChr(), TradeResult.NO_RESPONSE); - local.getChr().getClient().announce(MaplePacketCreator.serverNotice(1, "Characters under level 15 may not trade more than 1 million mesos per day.")); + local.getChr().getClient().announce(PacketCreator.serverNotice(1, "Characters under level 15 may not trade more than 1 million mesos per day.")); return; } else { local.getChr().addMesosTraded(local.exchangeMeso); @@ -342,7 +342,7 @@ public class MapleTrade { } else if (partner.getChr().getLevel() < 15) { if (partner.getChr().getMesosTraded() + partner.exchangeMeso > 1000000) { cancelTrade(partner.getChr(), TradeResult.NO_RESPONSE); - partner.getChr().getClient().announce(MaplePacketCreator.serverNotice(1, "Characters under level 15 may not trade more than 1 million mesos per day.")); + partner.getChr().getClient().announce(PacketCreator.serverNotice(1, "Characters under level 15 may not trade more than 1 million mesos per day.")); return; } else { partner.getChr().addMesosTraded(partner.exchangeMeso); @@ -463,8 +463,8 @@ public class MapleTrade { c2.getTrade().setPartner(c1.getTrade()); c1.getTrade().setPartner(c2.getTrade()); - c1.getClient().announce(MaplePacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 0)); - c2.getClient().announce(MaplePacketCreator.tradeInvite(c1)); + c1.getClient().announce(PacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 0)); + c2.getClient().announce(PacketCreator.tradeInvite(c1)); } else { c1.message("The other player is already trading with someone else."); cancelTrade(c1, TradeResult.NO_RESPONSE); @@ -482,8 +482,8 @@ public class MapleTrade { InviteResult res = inviteRes.result; if (res == InviteResult.ACCEPTED) { if (c1.getTrade() != null && c1.getTrade().getPartner() == c2.getTrade() && c2.getTrade() != null && c2.getTrade().getPartner() == c1.getTrade()) { - c2.getClient().announce(MaplePacketCreator.getTradePartnerAdd(c1)); - c1.getClient().announce(MaplePacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 1)); + c2.getClient().announce(PacketCreator.getTradePartnerAdd(c1)); + c1.getClient().announce(PacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 1)); c1.getTrade().setFullTrade(true); c2.getTrade().setFullTrade(true); } else { diff --git a/src/main/java/server/events/gm/MapleCoconut.java b/src/main/java/server/events/gm/MapleCoconut.java index c9ca7332bd..36cabad1d1 100644 --- a/src/main/java/server/events/gm/MapleCoconut.java +++ b/src/main/java/server/events/gm/MapleCoconut.java @@ -25,7 +25,7 @@ package server.events.gm; import client.MapleCharacter; import server.TimerManager; import server.maps.MapleMap; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.util.ArrayList; import java.util.LinkedList; @@ -55,9 +55,9 @@ public class MapleCoconut extends MapleEvent { for (int i = 0; i < 506; i++) { coconuts.add(new MapleCoconuts(i)); } - map.broadcastMessage(MaplePacketCreator.hitCoconut(true, 0, 0)); + map.broadcastMessage(PacketCreator.hitCoconut(true, 0, 0)); setCoconutsHittable(true); - map.broadcastMessage(MaplePacketCreator.getClock(300)); + map.broadcastMessage(PacketCreator.getClock(300)); TimerManager.getInstance().schedule(() -> { if (map.getId() == 109080000) { @@ -66,22 +66,22 @@ public class MapleCoconut extends MapleEvent { } else if (getMapleScore() > getStoryScore()) { for (MapleCharacter chr : map.getCharacters()) { if (chr.getTeam() == 0) { - chr.getClient().announce(MaplePacketCreator.showEffect("event/coconut/victory")); - chr.getClient().announce(MaplePacketCreator.playSound("Coconut/Victory")); + chr.getClient().announce(PacketCreator.showEffect("event/coconut/victory")); + chr.getClient().announce(PacketCreator.playSound("Coconut/Victory")); } else { - chr.getClient().announce(MaplePacketCreator.showEffect("event/coconut/lose")); - chr.getClient().announce(MaplePacketCreator.playSound("Coconut/Failed")); + chr.getClient().announce(PacketCreator.showEffect("event/coconut/lose")); + chr.getClient().announce(PacketCreator.playSound("Coconut/Failed")); } } warpOut(); } else { for (MapleCharacter chr : map.getCharacters()) { if (chr.getTeam() == 1) { - chr.getClient().announce(MaplePacketCreator.showEffect("event/coconut/victory")); - chr.getClient().announce(MaplePacketCreator.playSound("Coconut/Victory")); + chr.getClient().announce(PacketCreator.showEffect("event/coconut/victory")); + chr.getClient().announce(PacketCreator.playSound("Coconut/Victory")); } else { - chr.getClient().announce(MaplePacketCreator.showEffect("event/coconut/lose")); - chr.getClient().announce(MaplePacketCreator.playSound("Coconut/Failed")); + chr.getClient().announce(PacketCreator.showEffect("event/coconut/lose")); + chr.getClient().announce(PacketCreator.playSound("Coconut/Failed")); } } warpOut(); @@ -91,33 +91,33 @@ public class MapleCoconut extends MapleEvent { } public void bonusTime() { - map.broadcastMessage(MaplePacketCreator.getClock(120)); + map.broadcastMessage(PacketCreator.getClock(120)); TimerManager.getInstance().schedule(() -> { if (getMapleScore() == getStoryScore()) { for (MapleCharacter chr : map.getCharacters()) { - chr.getClient().announce(MaplePacketCreator.showEffect("event/coconut/lose")); - chr.getClient().announce(MaplePacketCreator.playSound("Coconut/Failed")); + chr.getClient().announce(PacketCreator.showEffect("event/coconut/lose")); + chr.getClient().announce(PacketCreator.playSound("Coconut/Failed")); } warpOut(); } else if (getMapleScore() > getStoryScore()) { for (MapleCharacter chr : map.getCharacters()) { if (chr.getTeam() == 0) { - chr.getClient().announce(MaplePacketCreator.showEffect("event/coconut/victory")); - chr.getClient().announce(MaplePacketCreator.playSound("Coconut/Victory")); + chr.getClient().announce(PacketCreator.showEffect("event/coconut/victory")); + chr.getClient().announce(PacketCreator.playSound("Coconut/Victory")); } else { - chr.getClient().announce(MaplePacketCreator.showEffect("event/coconut/lose")); - chr.getClient().announce(MaplePacketCreator.playSound("Coconut/Failed")); + chr.getClient().announce(PacketCreator.showEffect("event/coconut/lose")); + chr.getClient().announce(PacketCreator.playSound("Coconut/Failed")); } } warpOut(); } else { for (MapleCharacter chr : map.getCharacters()) { if (chr.getTeam() == 1) { - chr.getClient().announce(MaplePacketCreator.showEffect("event/coconut/victory")); - chr.getClient().announce(MaplePacketCreator.playSound("Coconut/Victory")); + chr.getClient().announce(PacketCreator.showEffect("event/coconut/victory")); + chr.getClient().announce(PacketCreator.playSound("Coconut/Victory")); } else { - chr.getClient().announce(MaplePacketCreator.showEffect("event/coconut/lose")); - chr.getClient().announce(MaplePacketCreator.playSound("Coconut/Failed")); + chr.getClient().announce(PacketCreator.showEffect("event/coconut/lose")); + chr.getClient().announce(PacketCreator.playSound("Coconut/Failed")); } } warpOut(); diff --git a/src/main/java/server/events/gm/MapleFitness.java b/src/main/java/server/events/gm/MapleFitness.java index 4006a30eba..54eaa554a1 100644 --- a/src/main/java/server/events/gm/MapleFitness.java +++ b/src/main/java/server/events/gm/MapleFitness.java @@ -24,7 +24,7 @@ package server.events.gm; import client.MapleCharacter; import server.TimerManager; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.util.concurrent.ScheduledFuture; @@ -49,13 +49,13 @@ public class MapleFitness { public void startFitness() { chr.getMap().startEvent(); - chr.getClient().announce(MaplePacketCreator.getClock(900)); + chr.getClient().announce(PacketCreator.getClock(900)); this.timeStarted = System.currentTimeMillis(); this.time = 900000; checkAndMessage(); chr.getMap().getPortal("join00").setPortalStatus(true); - chr.getClient().announce(MaplePacketCreator.serverNotice(0, "The portal has now opened. Press the up arrow key at the portal to enter.")); + chr.getClient().announce(PacketCreator.serverNotice(0, "The portal has now opened. Press the up arrow key at the portal to enter.")); } public boolean isTimerStarted() { @@ -84,29 +84,29 @@ public class MapleFitness { } if (chr.getMap().getId() >= 109040000 && chr.getMap().getId() <= 109040004) { if (getTimeLeft() > 9000 && getTimeLeft() < 11000) { - chr.getClient().announce(MaplePacketCreator.serverNotice(0, "You have 10 sec left. Those of you unable to beat the game, we hope you beat it next time! Great job everyone!! See you later~")); + chr.getClient().announce(PacketCreator.serverNotice(0, "You have 10 sec left. Those of you unable to beat the game, we hope you beat it next time! Great job everyone!! See you later~")); } else if (getTimeLeft() > 99000 && getTimeLeft() < 101000) { - chr.getClient().announce(MaplePacketCreator.serverNotice(0, "Alright, you don't have much time remaining. Please hurry up a little!")); + chr.getClient().announce(PacketCreator.serverNotice(0, "Alright, you don't have much time remaining. Please hurry up a little!")); } else if (getTimeLeft() > 239000 && getTimeLeft() < 241000) { - chr.getClient().announce(MaplePacketCreator.serverNotice(0, "The 4th stage is the last one for [The Maple Physical Fitness Test]. Please don't give up at the last minute and try your best. The reward is waiting for you at the very top!")); + chr.getClient().announce(PacketCreator.serverNotice(0, "The 4th stage is the last one for [The Maple Physical Fitness Test]. Please don't give up at the last minute and try your best. The reward is waiting for you at the very top!")); } else if (getTimeLeft() > 299000 && getTimeLeft() < 301000) { - chr.getClient().announce(MaplePacketCreator.serverNotice(0, "The 3rd stage offers traps where you may see them, but you won't be able to step on them. Please be careful of them as you make your way up.")); + chr.getClient().announce(PacketCreator.serverNotice(0, "The 3rd stage offers traps where you may see them, but you won't be able to step on them. Please be careful of them as you make your way up.")); } else if (getTimeLeft() > 359000 && getTimeLeft() < 361000) { - chr.getClient().announce(MaplePacketCreator.serverNotice(0, "For those who have heavy lags, please make sure to move slowly to avoid falling all the way down because of lags.")); + chr.getClient().announce(PacketCreator.serverNotice(0, "For those who have heavy lags, please make sure to move slowly to avoid falling all the way down because of lags.")); } else if (getTimeLeft() > 499000 && getTimeLeft() < 501000) { - chr.getClient().announce(MaplePacketCreator.serverNotice(0, "Please remember that if you die during the event, you'll be eliminated from the game. If you're running out of HP, either take a potion or recover HP first before moving on.")); + chr.getClient().announce(PacketCreator.serverNotice(0, "Please remember that if you die during the event, you'll be eliminated from the game. If you're running out of HP, either take a potion or recover HP first before moving on.")); } else if (getTimeLeft() > 599000 && getTimeLeft() < 601000) { - chr.getClient().announce(MaplePacketCreator.serverNotice(0, "The most important thing you'll need to know to avoid the bananas thrown by the monkeys is *Timing* Timing is everything in this!")); + chr.getClient().announce(PacketCreator.serverNotice(0, "The most important thing you'll need to know to avoid the bananas thrown by the monkeys is *Timing* Timing is everything in this!")); } else if (getTimeLeft() > 659000 && getTimeLeft() < 661000) { - chr.getClient().announce(MaplePacketCreator.serverNotice(0, "The 2nd stage offers monkeys throwing bananas. Please make sure to avoid them by moving along at just the right timing.")); + chr.getClient().announce(PacketCreator.serverNotice(0, "The 2nd stage offers monkeys throwing bananas. Please make sure to avoid them by moving along at just the right timing.")); } else if (getTimeLeft() > 699000 && getTimeLeft() < 701000) { - chr.getClient().announce(MaplePacketCreator.serverNotice(0, "Please remember that if you die during the event, you'll be eliminated from the game. You still have plenty of time left, so either take a potion or recover HP first before moving on.")); + chr.getClient().announce(PacketCreator.serverNotice(0, "Please remember that if you die during the event, you'll be eliminated from the game. You still have plenty of time left, so either take a potion or recover HP first before moving on.")); } else if (getTimeLeft() > 779000 && getTimeLeft() < 781000) { - chr.getClient().announce(MaplePacketCreator.serverNotice(0, "Everyone that clears [The Maple Physical Fitness Test] on time will be given an item, regardless of the order of finish, so just relax, take your time, and clear the 4 stages.")); + chr.getClient().announce(PacketCreator.serverNotice(0, "Everyone that clears [The Maple Physical Fitness Test] on time will be given an item, regardless of the order of finish, so just relax, take your time, and clear the 4 stages.")); } else if (getTimeLeft() > 839000 && getTimeLeft() < 841000) { - chr.getClient().announce(MaplePacketCreator.serverNotice(0, "There may be a heavy lag due to many users at stage 1 all at once. It won't be difficult, so please make sure not to fall down because of heavy lag.")); + chr.getClient().announce(PacketCreator.serverNotice(0, "There may be a heavy lag due to many users at stage 1 all at once. It won't be difficult, so please make sure not to fall down because of heavy lag.")); } else if (getTimeLeft() > 869000 && getTimeLeft() < 871000) { - chr.getClient().announce(MaplePacketCreator.serverNotice(0, "[MapleStory Physical Fitness Test] consists of 4 stages, and if you happen to die during the game, you'll be eliminated from the game, so please be careful of that.")); + chr.getClient().announce(PacketCreator.serverNotice(0, "[MapleStory Physical Fitness Test] consists of 4 stages, and if you happen to die during the game, you'll be eliminated from the game, so please be careful of that.")); } } else { resetTimes(); diff --git a/src/main/java/server/events/gm/MapleOla.java b/src/main/java/server/events/gm/MapleOla.java index 820c618ad6..fa51f0e629 100644 --- a/src/main/java/server/events/gm/MapleOla.java +++ b/src/main/java/server/events/gm/MapleOla.java @@ -23,7 +23,7 @@ package server.events.gm; import client.MapleCharacter; import server.TimerManager; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.util.concurrent.ScheduledFuture; @@ -48,12 +48,12 @@ public class MapleOla { public void startOla() { // TODO: Messages chr.getMap().startEvent(); - chr.getClient().announce(MaplePacketCreator.getClock(360)); + chr.getClient().announce(PacketCreator.getClock(360)); this.timeStarted = System.currentTimeMillis(); this.time = 360000; chr.getMap().getPortal("join00").setPortalStatus(true); - chr.getClient().announce(MaplePacketCreator.serverNotice(0, "The portal has now opened. Press the up arrow key at the portal to enter.")); + chr.getClient().announce(PacketCreator.serverNotice(0, "The portal has now opened. Press the up arrow key at the portal to enter.")); } public boolean isTimerStarted() { diff --git a/src/main/java/server/events/gm/MapleOxQuiz.java b/src/main/java/server/events/gm/MapleOxQuiz.java index 4849d01eff..03aa6143b7 100644 --- a/src/main/java/server/events/gm/MapleOxQuiz.java +++ b/src/main/java/server/events/gm/MapleOxQuiz.java @@ -28,7 +28,7 @@ import provider.MapleDataTool; import provider.wz.WZFiles; import server.TimerManager; import server.maps.MapleMap; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Randomizer; import java.util.ArrayList; @@ -69,9 +69,9 @@ public final class MapleOxQuiz { } } final int number = gm; - map.broadcastMessage(MaplePacketCreator.showOXQuiz(round, question, true)); + map.broadcastMessage(PacketCreator.showOXQuiz(round, question, true)); TimerManager.getInstance().schedule(() -> { - map.broadcastMessage(MaplePacketCreator.showOXQuiz(round, question, true)); + map.broadcastMessage(PacketCreator.showOXQuiz(round, question, true)); List chars = new ArrayList<>(map.getCharacters()); for (MapleCharacter chr : chars) { @@ -92,7 +92,7 @@ public final class MapleOxQuiz { } //send question if (map.getCharacters().size() - number <= 2) { - map.broadcastMessage(MaplePacketCreator.serverNotice(6, "The event has ended")); + map.broadcastMessage(PacketCreator.serverNotice(6, "The event has ended")); map.getPortal("join00").setPortalStatus(true); map.setOx(null); map.setOxQuiz(false); diff --git a/src/main/java/server/events/gm/MapleSnowball.java b/src/main/java/server/events/gm/MapleSnowball.java index ab69320f70..528e876775 100644 --- a/src/main/java/server/events/gm/MapleSnowball.java +++ b/src/main/java/server/events/gm/MapleSnowball.java @@ -24,7 +24,7 @@ package server.events.gm; import client.MapleCharacter; import server.TimerManager; import server.maps.MapleMap; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.util.LinkedList; import java.util.List; @@ -58,8 +58,8 @@ public class MapleSnowball { for (MapleCharacter chr : characters) { if (chr != null) { - chr.announce(MaplePacketCreator.rollSnowBall(false, 1, map.getSnowball(0), map.getSnowball(1))); - chr.announce(MaplePacketCreator.getClock(600)); + chr.announce(PacketCreator.rollSnowBall(false, 1, map.getSnowball(0), map.getSnowball(1))); + chr.announce(PacketCreator.getClock(600)); } } hittable = true; @@ -67,13 +67,13 @@ public class MapleSnowball { if (map.getSnowball(team).getPosition() > map.getSnowball(team == 0 ? 1 : 0).getPosition()) { for (MapleCharacter chr : characters) { if (chr != null) - chr.announce(MaplePacketCreator.rollSnowBall(false, 3, map.getSnowball(0), map.getSnowball(0))); + chr.announce(PacketCreator.rollSnowBall(false, 3, map.getSnowball(0), map.getSnowball(0))); } winner = true; } else if (map.getSnowball(team == 0 ? 1 : 0).getPosition() > map.getSnowball(team).getPosition()) { for (MapleCharacter chr : characters) { if (chr != null) - chr.announce(MaplePacketCreator.rollSnowBall(false, 4, map.getSnowball(0), map.getSnowball(0))); + chr.announce(PacketCreator.rollSnowBall(false, 4, map.getSnowball(0), map.getSnowball(0))); } winner = true; } //Else @@ -116,7 +116,7 @@ public class MapleSnowball { }, 10000); } else this.snowmanhp -= damage; - map.broadcastMessage(MaplePacketCreator.rollSnowBall(false, 1, map.getSnowball(0), map.getSnowball(1))); + map.broadcastMessage(PacketCreator.rollSnowBall(false, 1, map.getSnowball(0), map.getSnowball(1))); } if (this.hits == 0) { @@ -129,16 +129,16 @@ public class MapleSnowball { map.getSnowball(team == 0 ? 1 : 0).message(3); this.hits = 3; - map.broadcastMessage(MaplePacketCreator.rollSnowBall(false, 0, map.getSnowball(0), map.getSnowball(1))); - map.broadcastMessage(MaplePacketCreator.rollSnowBall(false, 1, map.getSnowball(0), map.getSnowball(1))); + map.broadcastMessage(PacketCreator.rollSnowBall(false, 0, map.getSnowball(0), map.getSnowball(1))); + map.broadcastMessage(PacketCreator.rollSnowBall(false, 1, map.getSnowball(0), map.getSnowball(1))); } - map.broadcastMessage(MaplePacketCreator.hitSnowBall(what, damage)); + map.broadcastMessage(PacketCreator.hitSnowBall(what, damage)); } public void message(int message) { for (MapleCharacter chr : characters) { if (chr != null) - chr.announce(MaplePacketCreator.snowballMessage(team, message)); + chr.announce(PacketCreator.snowballMessage(team, message)); } } diff --git a/src/main/java/server/expeditions/MapleExpedition.java b/src/main/java/server/expeditions/MapleExpedition.java index 32262909e6..1cb82ec854 100644 --- a/src/main/java/server/expeditions/MapleExpedition.java +++ b/src/main/java/server/expeditions/MapleExpedition.java @@ -33,7 +33,7 @@ import server.TimerManager; import server.life.MapleMonster; import server.maps.MapleMap; import tools.LogHelper; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.text.SimpleDateFormat; import java.util.*; @@ -115,10 +115,10 @@ public class MapleExpedition { public void beginRegistration() { registering = true; - leader.announce(MaplePacketCreator.getClock(type.getRegistrationTime() * 60)); + leader.announce(PacketCreator.getClock(type.getRegistrationTime() * 60)); if (!silent) { - startMap.broadcastMessage(leader, MaplePacketCreator.serverNotice(6, "[Expedition] " + leader.getName() + " has been declared the expedition captain. Please register for the expedition."), false); - leader.announce(MaplePacketCreator.serverNotice(6, "[Expedition] You have become the expedition captain. Gather enough people for your team then talk to the NPC to start.")); + startMap.broadcastMessage(leader, PacketCreator.serverNotice(6, "[Expedition] " + leader.getName() + " has been declared the expedition captain. Please register for the expedition."), false); + leader.announce(PacketCreator.serverNotice(6, "[Expedition] You have become the expedition captain. Gather enough people for your team then talk to the NPC to start.")); } scheduleRegistrationEnd(); } @@ -130,7 +130,7 @@ public class MapleExpedition { schedule = TimerManager.getInstance().schedule(() -> { if (registering){ exped.removeChannelExpedition(startMap.getChannelServer()); - if (!silent) startMap.broadcastMessage(MaplePacketCreator.serverNotice(6, "[Expedition] The time limit has been reached. Expedition has been disbanded.")); + if (!silent) startMap.broadcastMessage(PacketCreator.serverNotice(6, "[Expedition] The time limit has been reached. Expedition has been disbanded.")); dispose(false); } @@ -138,7 +138,7 @@ dispose(false); } public void dispose(boolean log){ - broadcastExped(MaplePacketCreator.removeClock()); + broadcastExped(PacketCreator.removeClock()); if (schedule != null){ schedule.cancel(false); @@ -155,10 +155,10 @@ dispose(false); public void start(){ finishRegistration(); registerExpeditionAttempt(); - broadcastExped(MaplePacketCreator.removeClock()); - if (!silent) broadcastExped(MaplePacketCreator.serverNotice(6, "[Expedition] The expedition has started! Good luck, brave heroes!")); + broadcastExped(PacketCreator.removeClock()); + if (!silent) broadcastExped(PacketCreator.serverNotice(6, "[Expedition] The expedition has started! Good luck, brave heroes!")); startTime = System.currentTimeMillis(); - Server.getInstance().broadcastGMMessage(startMap.getWorld(), MaplePacketCreator.serverNotice(6, "[Expedition] " + type.toString() + " Expedition started with leader: " + leader.getName())); + Server.getInstance().broadcastGMMessage(startMap.getWorld(), PacketCreator.serverNotice(6, "[Expedition] " + type.toString() + " Expedition started with leader: " + leader.getName())); } public String addMember(MapleCharacter player) { @@ -178,8 +178,8 @@ dispose(false); } members.put(player.getId(), player.getName()); - player.announce(MaplePacketCreator.getClock((int)(startTime - System.currentTimeMillis()) / 1000)); - if (!silent) broadcastExped(MaplePacketCreator.serverNotice(6, "[Expedition] " + player.getName() + " has joined the expedition!")); + player.announce(PacketCreator.getClock((int)(startTime - System.currentTimeMillis()) / 1000)); + if (!silent) broadcastExped(PacketCreator.serverNotice(6, "[Expedition] " + player.getName() + " has joined the expedition!")); return "You have registered for the expedition successfully!"; } @@ -195,8 +195,8 @@ dispose(false); } members.put(player.getId(), player.getName()); - player.announce(MaplePacketCreator.getClock((int) (startTime - System.currentTimeMillis()) / 1000)); - if (!silent) broadcastExped(MaplePacketCreator.serverNotice(6, "[Expedition] " + player.getName() + " has joined the expedition!")); + player.announce(PacketCreator.getClock((int) (startTime - System.currentTimeMillis()) / 1000)); + if (!silent) broadcastExped(PacketCreator.serverNotice(6, "[Expedition] " + player.getName() + " has joined the expedition!")); return 0; //"You have registered for the expedition successfully!"; } @@ -216,9 +216,9 @@ dispose(false); public boolean removeMember(MapleCharacter chr) { if(members.remove(chr.getId()) != null) { - chr.announce(MaplePacketCreator.removeClock()); + chr.announce(PacketCreator.removeClock()); if (!silent) { - broadcastExped(MaplePacketCreator.serverNotice(6, "[Expedition] " + chr.getName() + " has left the expedition.")); + broadcastExped(PacketCreator.serverNotice(6, "[Expedition] " + chr.getName() + " has left the expedition.")); chr.dropMessage(6, "[Expedition] You have left this expedition."); } return true; @@ -233,11 +233,11 @@ dispose(false); banned.add(cid); members.remove(cid); - if (!silent) broadcastExped(MaplePacketCreator.serverNotice(6, "[Expedition] " + chr.getValue() + " has been banned from the expedition.")); + if (!silent) broadcastExped(PacketCreator.serverNotice(6, "[Expedition] " + chr.getValue() + " has been banned from the expedition.")); MapleCharacter player = startMap.getWorldServer().getPlayerStorage().getCharacterById(cid); if (player != null && player.isLoggedinWorld()) { - player.announce(MaplePacketCreator.removeClock()); + player.announce(PacketCreator.removeClock()); if (!silent) player.dropMessage(6, "[Expedition] You have been banned from this expedition."); if (MapleExpeditionType.ARIANT.equals(type) || MapleExpeditionType.ARIANT1.equals(type) || MapleExpeditionType.ARIANT2.equals(type)) { player.changeMap(980010000); diff --git a/src/main/java/server/life/MapleMonster.java b/src/main/java/server/life/MapleMonster.java index 05b695e60a..728ee1cf76 100644 --- a/src/main/java/server/life/MapleMonster.java +++ b/src/main/java/server/life/MapleMonster.java @@ -48,7 +48,7 @@ import server.maps.MapleMap; import server.maps.MapleMapObjectType; import server.maps.MapleSummon; import tools.IntervalBuilder; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.Randomizer; @@ -365,7 +365,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { from.getMap().broadcastBossHpMessage(this, this.hashCode(), makeBossHPBarPacket(), getPosition()); } else if (!isBoss()) { int remainingHP = (int) Math.max(1, hp.get() * 100f / getMaxHp()); - byte[] packet = MaplePacketCreator.showMonsterHP(getObjectId(), remainingHP); + byte[] packet = PacketCreator.showMonsterHP(getObjectId(), remainingHP); if (from.getParty() != null) { for (MaplePartyCharacter mpc : from.getParty().getMembers()) { MapleCharacter member = from.getMap().getCharacterById(mpc.getId()); // god bless @@ -471,7 +471,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { setMp(mp2Heal); if (hp > 0) { - getMap().broadcastMessage(MaplePacketCreator.healMonster(getObjectId(), hp, getHp(), getMaxHp())); + getMap().broadcastMessage(PacketCreator.healMonster(getObjectId(), hp, getHp(), getMaxHp())); } maxHpPlusHeal.addAndGet(hpHealed); @@ -758,13 +758,13 @@ public class MapleMonster extends AbstractLoadedMapleLife { if (toSpawn != null) { final MapleMap reviveMap = map; if (toSpawn.contains(9300216) && reviveMap.getId() > 925000000 && reviveMap.getId() < 926000000) { - reviveMap.broadcastMessage(MaplePacketCreator.playSound("Dojang/clear")); - reviveMap.broadcastMessage(MaplePacketCreator.showEffect("dojang/end/clear")); + reviveMap.broadcastMessage(PacketCreator.playSound("Dojang/clear")); + reviveMap.broadcastMessage(PacketCreator.showEffect("dojang/end/clear")); } Pair timeMob = reviveMap.getTimeMob(); if (timeMob != null) { if (toSpawn.contains(timeMob.getLeft())) { - reviveMap.broadcastMessage(MaplePacketCreator.serverNotice(6, timeMob.getRight())); + reviveMap.broadcastMessage(PacketCreator.serverNotice(6, timeMob.getRight())); } } @@ -1006,7 +1006,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { } public byte[] makeBossHPBarPacket() { - return MaplePacketCreator.showBossHP(getId(), getHp(), getMaxHp(), getTagColor(), getTagBgColor()); + return PacketCreator.showBossHP(getId(), getHp(), getMaxHp(), getTagColor(), getTagBgColor()); } public boolean hasBossHPBar() { @@ -1019,9 +1019,9 @@ public class MapleMonster extends AbstractLoadedMapleLife { return; } if (fake) { - client.announce(MaplePacketCreator.spawnFakeMonster(this, 0)); + client.announce(PacketCreator.spawnFakeMonster(this, 0)); } else { - client.announce(MaplePacketCreator.spawnMonster(this, false)); + client.announce(PacketCreator.spawnMonster(this, false)); } if (hasBossHPBar()) { @@ -1031,8 +1031,8 @@ public class MapleMonster extends AbstractLoadedMapleLife { @Override public void sendDestroyData(MapleClient client) { - client.announce(MaplePacketCreator.killMonster(getObjectId(), false)); - client.announce(MaplePacketCreator.killMonster(getObjectId(), true)); + client.announce(PacketCreator.killMonster(getObjectId(), false)); + client.announce(PacketCreator.killMonster(getObjectId(), true)); } @Override @@ -1097,7 +1097,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { private int broadcastStatusEffect(final MonsterStatusEffect status) { int animationTime = status.getSkill().getAnimationTime(); - byte[] packet = MaplePacketCreator.applyMonsterStatus(getObjectId(), status, null); + byte[] packet = PacketCreator.applyMonsterStatus(getObjectId(), status, null); broadcastMonsterStatusMessage(packet); return animationTime; @@ -1172,7 +1172,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { final Runnable cancelTask = () -> { if (isAlive()) { - byte[] packet = MaplePacketCreator.cancelMonsterStatus(getObjectId(), status.getStati()); + byte[] packet = PacketCreator.cancelMonsterStatus(getObjectId(), status.getStati()); broadcastMonsterStatusMessage(packet); } @@ -1284,7 +1284,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { public void applyMonsterBuff(final Map stats, final int x, int skillId, long duration, MobSkill skill, final List reflection) { final Runnable cancelTask = () -> { if (isAlive()) { - byte[] packet = MaplePacketCreator.cancelMonsterStatus(getObjectId(), stats); + byte[] packet = PacketCreator.cancelMonsterStatus(getObjectId(), stats); broadcastMonsterStatusMessage(packet); statiLock.lock(); @@ -1298,7 +1298,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { } }; final MonsterStatusEffect effect = new MonsterStatusEffect(stats, null, skill, true); - byte[] packet = MaplePacketCreator.applyMonsterStatus(getObjectId(), effect, reflection); + byte[] packet = PacketCreator.applyMonsterStatus(getObjectId(), effect, reflection); broadcastMonsterStatusMessage(packet); statiLock.lock(); @@ -1323,7 +1323,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { aggroRemoveController(); setPosition(newPoint); - map.broadcastMessage(MaplePacketCreator.moveMonster(this.getObjectId(), false, -1, 0, 0, 0, this.getPosition(), this.getIdleMovement(), getIdleMovementDataLength())); + map.broadcastMessage(PacketCreator.moveMonster(this.getObjectId(), false, -1, 0, 0, 0, this.getPosition(), this.getIdleMovement(), getIdleMovementDataLength())); map.moveMonster(this, this.getPosition()); aggroUpdateController(); @@ -1339,7 +1339,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { } if (oldEffect != null) { - byte[] packet = MaplePacketCreator.cancelMonsterStatus(getObjectId(), oldEffect.getStati()); + byte[] packet = PacketCreator.cancelMonsterStatus(getObjectId(), oldEffect.getStati()); broadcastMonsterStatusMessage(packet); } } @@ -1639,10 +1639,10 @@ public class MapleMonster extends AbstractLoadedMapleLife { } if (type == 1) { - map.broadcastMessage(MaplePacketCreator.damageMonster(getObjectId(), damage), getPosition()); + map.broadcastMessage(PacketCreator.damageMonster(getObjectId(), damage), getPosition()); } else if (type == 2) { if(damage < dealDamage) { // ninja ambush (type 2) is already displaying DOT to the caster - map.broadcastMessage(MaplePacketCreator.damageMonster(getObjectId(), damage), getPosition()); + map.broadcastMessage(PacketCreator.damageMonster(getObjectId(), damage), getPosition()); } } } @@ -1884,7 +1884,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { } if (chrController != null) { // this can/should only happen when a hidden gm attacks the monster - if (!this.isFake()) chrController.announce(MaplePacketCreator.stopControllingMonster(this.getObjectId())); + if (!this.isFake()) chrController.announce(PacketCreator.stopControllingMonster(this.getObjectId())); chrController.stopControllingMonster(this); } @@ -2088,7 +2088,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { Maybe Nexon intended to interchange controllers at every attack... else if (chrController != null) { - chrController.announce(MaplePacketCreator.stopControllingMonster(this.getObjectId())); + chrController.announce(PacketCreator.stopControllingMonster(this.getObjectId())); aggroMonsterControl(chrController.getClient(), this, true); } */ @@ -2099,7 +2099,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { } private static void aggroMonsterControl(MapleClient c, MapleMonster mob, boolean immediateAggro) { - c.announce(MaplePacketCreator.controlMonster(mob, false, immediateAggro)); + c.announce(PacketCreator.controlMonster(mob, false, immediateAggro)); } private void aggroRefreshPuppetVisibility(MapleCharacter chrController, MapleSummon puppet) { @@ -2113,15 +2113,15 @@ public class MapleMonster extends AbstractLoadedMapleLife { } for (MapleMonster mob : puppetControlled) { - chrController.announce(MaplePacketCreator.stopControllingMonster(mob.getObjectId())); + chrController.announce(PacketCreator.stopControllingMonster(mob.getObjectId())); } - chrController.announce(MaplePacketCreator.removeSummon(puppet, false)); + chrController.announce(PacketCreator.removeSummon(puppet, false)); MapleClient c = chrController.getClient(); for (MapleMonster mob : puppetControlled) { // thanks BHB for noticing puppets disrupting mobstatuses for bowmans aggroMonsterControl(c, mob, mob.isControllerKnowsAboutAggro()); } - chrController.announce(MaplePacketCreator.spawnSummon(puppet, false)); + chrController.announce(PacketCreator.spawnSummon(puppet, false)); } public void aggroUpdatePuppetVisibility() { @@ -2151,7 +2151,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { if (controllerHasPuppet) { controllerHasPuppet = false; - chrController.announce(MaplePacketCreator.stopControllingMonster(MapleMonster.this.getObjectId())); + chrController.announce(PacketCreator.stopControllingMonster(MapleMonster.this.getObjectId())); aggroMonsterControl(chrController.getClient(), MapleMonster.this, MapleMonster.this.isControllerHasAggro()); } } finally { diff --git a/src/main/java/server/life/MapleNPC.java b/src/main/java/server/life/MapleNPC.java index a86fad4459..ef343786b4 100644 --- a/src/main/java/server/life/MapleNPC.java +++ b/src/main/java/server/life/MapleNPC.java @@ -24,7 +24,7 @@ package server.life; import client.MapleClient; import server.MapleShopFactory; import server.maps.MapleMapObjectType; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class MapleNPC extends AbstractLoadedMapleLife { private MapleNPCStats stats; @@ -44,14 +44,14 @@ public class MapleNPC extends AbstractLoadedMapleLife { @Override public void sendSpawnData(MapleClient client) { - client.announce(MaplePacketCreator.spawnNPC(this)); - client.announce(MaplePacketCreator.spawnNPCRequestController(this, true)); + client.announce(PacketCreator.spawnNPC(this)); + client.announce(PacketCreator.spawnNPCRequestController(this, true)); } @Override public void sendDestroyData(MapleClient client) { - client.announce(MaplePacketCreator.removeNPCController(getObjectId())); - client.announce(MaplePacketCreator.removeNPC(getObjectId())); + client.announce(PacketCreator.removeNPCController(getObjectId())); + client.announce(PacketCreator.removeNPC(getObjectId())); } @Override diff --git a/src/main/java/server/life/MaplePlayerNPC.java b/src/main/java/server/life/MaplePlayerNPC.java index 8c5c8d27b5..ddd3b852db 100644 --- a/src/main/java/server/life/MaplePlayerNPC.java +++ b/src/main/java/server/life/MaplePlayerNPC.java @@ -37,7 +37,7 @@ import server.maps.MapleMap; import server.maps.MapleMapObject; import server.maps.MapleMapObjectType; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import java.awt.*; @@ -200,14 +200,14 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { @Override public void sendSpawnData(MapleClient client) { - client.announce(MaplePacketCreator.spawnPlayerNPC(this)); - client.announce(MaplePacketCreator.getPlayerNPC(this)); + client.announce(PacketCreator.spawnPlayerNPC(this)); + client.announce(PacketCreator.getPlayerNPC(this)); } @Override public void sendDestroyData(MapleClient client) { - client.announce(MaplePacketCreator.removeNPCController(this.getObjectId())); - client.announce(MaplePacketCreator.removePlayerNPC(this.getObjectId())); + client.announce(PacketCreator.removeNPCController(this.getObjectId())); + client.announce(PacketCreator.removePlayerNPC(this.getObjectId())); } private static void getRunningMetadata() { @@ -540,8 +540,8 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { MapleMap m = channel.getMapFactory().getMap(mapid); m.addPlayerNPCMapObject(pn); - m.broadcastMessage(MaplePacketCreator.spawnPlayerNPC(pn)); - m.broadcastMessage(MaplePacketCreator.getPlayerNPC(pn)); + m.broadcastMessage(PacketCreator.spawnPlayerNPC(pn)); + m.broadcastMessage(PacketCreator.getPlayerNPC(pn)); } return true; @@ -577,8 +577,8 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { MapleMap m = channel.getMapFactory().getMap(mapid); m.removeMapObject(pn); - m.broadcastMessage(MaplePacketCreator.removeNPCController(pn.getObjectId())); - m.broadcastMessage(MaplePacketCreator.removePlayerNPC(pn.getObjectId())); + m.broadcastMessage(PacketCreator.removeNPCController(pn.getObjectId())); + m.broadcastMessage(PacketCreator.removePlayerNPC(pn.getObjectId())); } } } @@ -615,8 +615,8 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { for (MapleMapObject pnpcObj : m.getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.PLAYER_NPC))) { MaplePlayerNPC pn = (MaplePlayerNPC) pnpcObj; m.removeMapObject(pnpcObj); - m.broadcastMessage(MaplePacketCreator.removeNPCController(pn.getObjectId())); - m.broadcastMessage(MaplePacketCreator.removePlayerNPC(pn.getObjectId())); + m.broadcastMessage(PacketCreator.removeNPCController(pn.getObjectId())); + m.broadcastMessage(PacketCreator.removePlayerNPC(pn.getObjectId())); } } } diff --git a/src/main/java/server/life/positioner/MaplePlayerNPCPodium.java b/src/main/java/server/life/positioner/MaplePlayerNPCPodium.java index 3ac2eae064..7aa3e9c2ac 100644 --- a/src/main/java/server/life/positioner/MaplePlayerNPCPodium.java +++ b/src/main/java/server/life/positioner/MaplePlayerNPCPodium.java @@ -26,7 +26,7 @@ import server.life.MaplePlayerNPC; import server.maps.MapleMap; import server.maps.MapleMapObject; import server.maps.MapleMapObjectType; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.awt.*; import java.util.ArrayList; @@ -100,8 +100,8 @@ public class MaplePlayerNPCPodium { for(MaplePlayerNPC pn : playerNpcs) { m.removeMapObject(pn); - m.broadcastMessage(MaplePacketCreator.removeNPCController(pn.getObjectId())); - m.broadcastMessage(MaplePacketCreator.removePlayerNPC(pn.getObjectId())); + m.broadcastMessage(PacketCreator.removeNPCController(pn.getObjectId())); + m.broadcastMessage(PacketCreator.removePlayerNPC(pn.getObjectId())); } } @@ -112,8 +112,8 @@ public class MaplePlayerNPCPodium { for(MaplePlayerNPC pn : playerNpcs) { m.addPlayerNPCMapObject(pn); - m.broadcastMessage(MaplePacketCreator.spawnPlayerNPC(pn)); - m.broadcastMessage(MaplePacketCreator.getPlayerNPC(pn)); + m.broadcastMessage(PacketCreator.spawnPlayerNPC(pn)); + m.broadcastMessage(PacketCreator.getPlayerNPC(pn)); } } diff --git a/src/main/java/server/life/positioner/MaplePlayerNPCPositioner.java b/src/main/java/server/life/positioner/MaplePlayerNPCPositioner.java index 15b70471d0..5b153f671e 100644 --- a/src/main/java/server/life/positioner/MaplePlayerNPCPositioner.java +++ b/src/main/java/server/life/positioner/MaplePlayerNPCPositioner.java @@ -26,7 +26,7 @@ import server.life.MaplePlayerNPC; import server.maps.MapleMap; import server.maps.MapleMapObject; import server.maps.MapleMapObjectType; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.awt.*; import java.util.ArrayList; @@ -152,8 +152,8 @@ public class MaplePlayerNPCPositioner { for(MaplePlayerNPC pn : playerNpcs) { m.removeMapObject(pn); - m.broadcastMessage(MaplePacketCreator.removeNPCController(pn.getObjectId())); - m.broadcastMessage(MaplePacketCreator.removePlayerNPC(pn.getObjectId())); + m.broadcastMessage(PacketCreator.removeNPCController(pn.getObjectId())); + m.broadcastMessage(PacketCreator.removePlayerNPC(pn.getObjectId())); } } @@ -164,8 +164,8 @@ public class MaplePlayerNPCPositioner { for(MaplePlayerNPC pn : playerNpcs) { m.addPlayerNPCMapObject(pn); - m.broadcastMessage(MaplePacketCreator.spawnPlayerNPC(pn)); - m.broadcastMessage(MaplePacketCreator.getPlayerNPC(pn)); + m.broadcastMessage(PacketCreator.spawnPlayerNPC(pn)); + m.broadcastMessage(PacketCreator.getPlayerNPC(pn)); } } diff --git a/src/main/java/server/maps/MapleDoorObject.java b/src/main/java/server/maps/MapleDoorObject.java index 834bebd4d0..880094dd48 100644 --- a/src/main/java/server/maps/MapleDoorObject.java +++ b/src/main/java/server/maps/MapleDoorObject.java @@ -19,7 +19,6 @@ */ package server.maps; -import java.awt.Point; import client.MapleCharacter; import client.MapleClient; import net.server.audit.locks.MonitoredLockType; @@ -29,7 +28,9 @@ import net.server.audit.locks.MonitoredWriteLock; import net.server.audit.locks.factory.MonitoredReadLockFactory; import net.server.audit.locks.factory.MonitoredWriteLockFactory; import net.server.world.MapleParty; -import tools.MaplePacketCreator; +import tools.PacketCreator; + +import java.awt.*; /** * @@ -90,7 +91,7 @@ public class MapleDoorObject extends AbstractMapleMapObject { public void warp(final MapleCharacter chr) { MapleParty party = chr.getParty(); if (chr.getId() == ownerId || (party != null && party.getMemberById(ownerId) != null)) { - chr.announce(MaplePacketCreator.playPortalSound()); + chr.announce(PacketCreator.playPortalSound()); if(!inTown() && party == null) { chr.changeMap(to, getLinkedPortalId()); @@ -98,8 +99,8 @@ public class MapleDoorObject extends AbstractMapleMapObject { chr.changeMap(to, getLinkedPortalPosition()); } } else { - chr.getClient().announce(MaplePacketCreator.blockedMessage(6)); - chr.getClient().announce(MaplePacketCreator.enableActions()); + chr.getClient().announce(PacketCreator.blockedMessage(6)); + chr.getClient().announce(PacketCreator.enableActions()); } } @@ -112,12 +113,12 @@ public class MapleDoorObject extends AbstractMapleMapObject { MapleCharacter chr = client.getPlayer(); if (this.getFrom().getId() == chr.getMapId()) { if (chr.getParty() != null && (this.getOwnerId() == chr.getId() || chr.getParty().getMemberById(this.getOwnerId()) != null)) { - chr.announce(MaplePacketCreator.partyPortal(this.getFrom().getId(), this.getTo().getId(), this.toPosition())); + chr.announce(PacketCreator.partyPortal(this.getFrom().getId(), this.getTo().getId(), this.toPosition())); } - chr.announce(MaplePacketCreator.spawnPortal(this.getFrom().getId(), this.getTo().getId(), this.toPosition())); + chr.announce(PacketCreator.spawnPortal(this.getFrom().getId(), this.getTo().getId(), this.toPosition())); if (!this.inTown()) { - chr.announce(MaplePacketCreator.spawnDoor(this.getOwnerId(), this.getPosition(), launched)); + chr.announce(PacketCreator.spawnDoor(this.getOwnerId(), this.getPosition(), launched)); } } } @@ -128,16 +129,16 @@ public class MapleDoorObject extends AbstractMapleMapObject { if (from.getId() == chr.getMapId()) { MapleParty party = chr.getParty(); if (party != null && (ownerId == chr.getId() || party.getMemberById(ownerId) != null)) { - client.announce(MaplePacketCreator.partyPortal(999999999, 999999999, new Point(-1, -1))); + client.announce(PacketCreator.partyPortal(999999999, 999999999, new Point(-1, -1))); } - client.announce(MaplePacketCreator.removeDoor(ownerId, inTown())); + client.announce(PacketCreator.removeDoor(ownerId, inTown())); } } public void sendDestroyData(MapleClient client, boolean partyUpdate) { if (client != null && from.getId() == client.getPlayer().getMapId()) { - client.announce(MaplePacketCreator.partyPortal(999999999, 999999999, new Point(-1, -1))); - client.announce(MaplePacketCreator.removeDoor(ownerId, inTown())); + client.announce(PacketCreator.partyPortal(999999999, 999999999, new Point(-1, -1))); + client.announce(PacketCreator.removeDoor(ownerId, inTown())); } } diff --git a/src/main/java/server/maps/MapleDragon.java b/src/main/java/server/maps/MapleDragon.java index 6632b91940..6c669daa17 100644 --- a/src/main/java/server/maps/MapleDragon.java +++ b/src/main/java/server/maps/MapleDragon.java @@ -21,9 +21,9 @@ along with this program. If not, see . */ package server.maps; -import tools.MaplePacketCreator; import client.MapleCharacter; import client.MapleClient; +import tools.PacketCreator; @@ -46,7 +46,7 @@ public class MapleDragon extends AbstractAnimatedMapleMapObject { @Override public void sendSpawnData(MapleClient client) { - client.announce(MaplePacketCreator.spawnDragon(this)); + client.announce(PacketCreator.spawnDragon(this)); } @Override @@ -56,7 +56,7 @@ public class MapleDragon extends AbstractAnimatedMapleMapObject { @Override public void sendDestroyData(MapleClient c) { - c.announce(MaplePacketCreator.removeDragon(owner.getId())); + c.announce(PacketCreator.removeDragon(owner.getId())); } public MapleCharacter getOwner() { diff --git a/src/main/java/server/maps/MapleGenericPortal.java b/src/main/java/server/maps/MapleGenericPortal.java index 38d4301808..75d21b5a5d 100644 --- a/src/main/java/server/maps/MapleGenericPortal.java +++ b/src/main/java/server/maps/MapleGenericPortal.java @@ -21,15 +21,16 @@ along with this program. If not, see . */ package server.maps; -import client.MapleClient; import client.MapleCharacter; +import client.MapleClient; import constants.game.GameConstants; -import java.awt.Point; -import scripting.portal.PortalScriptManager; -import tools.MaplePacketCreator; import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.MonitoredReentrantLock; import net.server.audit.locks.factory.MonitoredReentrantLockFactory; +import scripting.portal.PortalScriptManager; +import tools.PacketCreator; + +import java.awt.*; public class MapleGenericPortal implements MaplePortal { @@ -155,7 +156,7 @@ public class MapleGenericPortal implements MaplePortal { } } if (!changed) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); } } diff --git a/src/main/java/server/maps/MapleHiredMerchant.java b/src/main/java/server/maps/MapleHiredMerchant.java index 845e593fd3..0bce8bc3ce 100644 --- a/src/main/java/server/maps/MapleHiredMerchant.java +++ b/src/main/java/server/maps/MapleHiredMerchant.java @@ -37,7 +37,7 @@ import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import server.MapleItemInformationProvider; import server.MapleTrade; import tools.DatabaseConnection; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import java.sql.Connection; @@ -126,8 +126,8 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { int i = this.getFreeSlot(); if (i > -1) { visitors[i] = visitor; - broadcastToVisitors(MaplePacketCreator.hiredMerchantVisitorAdd(visitor, i + 1)); - this.getMap().broadcastMessage(MaplePacketCreator.updateHiredMerchantBox(this)); + broadcastToVisitors(PacketCreator.hiredMerchantVisitorAdd(visitor, i + 1)); + this.getMap().broadcastMessage(PacketCreator.updateHiredMerchantBox(this)); return true; } @@ -147,8 +147,8 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { } if (visitors[slot] != null && visitors[slot].getId() == visitor.getId()) { visitors[slot] = null; - broadcastToVisitors(MaplePacketCreator.hiredMerchantVisitorLeave(slot + 1)); - this.getMap().broadcastMessage(MaplePacketCreator.updateHiredMerchantBox(this)); + broadcastToVisitors(PacketCreator.hiredMerchantVisitorLeave(slot + 1)); + this.getMap().broadcastMessage(PacketCreator.updateHiredMerchantBox(this)); } } finally { visitorLock.unlock(); @@ -182,14 +182,14 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { if (visitor != null) { visitor.setHiredMerchant(null); - visitor.getClient().announce(MaplePacketCreator.leaveHiredMerchant(i + 1, 0x11)); - visitor.getClient().announce(MaplePacketCreator.hiredMerchantMaintenanceMessage()); + visitor.getClient().announce(PacketCreator.leaveHiredMerchant(i + 1, 0x11)); + visitor.getClient().announce(PacketCreator.hiredMerchantMaintenanceMessage()); visitors[i] = null; } } - this.getMap().broadcastMessage(MaplePacketCreator.updateHiredMerchantBox(this)); + this.getMap().broadcastMessage(PacketCreator.updateHiredMerchantBox(this)); } finally { visitorLock.unlock(); } @@ -197,8 +197,8 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { private void removeOwner(MapleCharacter owner) { if (owner.getHiredMerchant() == this) { - owner.announce(MaplePacketCreator.hiredMerchantOwnerLeave()); - owner.announce(MaplePacketCreator.leaveHiredMerchant(0x00, 0x03)); + owner.announce(PacketCreator.hiredMerchantOwnerLeave()); + owner.announce(PacketCreator.leaveHiredMerchant(0x00, 0x03)); owner.setHiredMerchant(null); } } @@ -220,8 +220,8 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { iitem.setQuantity((short) (shopItem.getItem().getQuantity() * shopItem.getBundles())); if (!MapleInventory.checkSpot(chr, iitem)) { - chr.announce(MaplePacketCreator.serverNotice(1, "Have a slot available on your inventory to claim back the item.")); - chr.announce(MaplePacketCreator.enableActions()); + chr.announce(PacketCreator.serverNotice(1, "Have a slot available on your inventory to claim back the item.")); + chr.announce(PacketCreator.enableActions()); return; } @@ -229,7 +229,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { } removeFromSlot(slot); - chr.announce(MaplePacketCreator.updateHiredMerchant(this, chr)); + chr.announce(PacketCreator.updateHiredMerchant(this, chr)); } if (YamlConfig.config.server.USE_ENFORCE_MERCHANT_SAVE) { @@ -263,10 +263,10 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { newItem.setQuantity((short) ((pItem.getItem().getQuantity() * quantity))); if (quantity < 1 || !pItem.isExist() || pItem.getBundles() < quantity) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } else if (newItem.getInventoryType().equals(MapleInventoryType.EQUIP) && newItem.getQuantity() > 1) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } @@ -318,12 +318,12 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { } } else { c.getPlayer().dropMessage(1, "Your inventory is full. Please clear a slot before buying this item."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } } else { c.getPlayer().dropMessage(1, "You don't have enough mesos to purchase this item."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return; } try { @@ -345,7 +345,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { public void forceClose() { //Server.getInstance().getChannel(world, channel).removeHiredMerchant(ownerId); - map.broadcastMessage(MaplePacketCreator.removeHiredMerchantBox(getOwnerId())); + map.broadcastMessage(PacketCreator.removeHiredMerchantBox(getOwnerId())); map.removeMapObject(this); MapleCharacter owner = Server.getInstance().getWorld(world).getPlayerStorage().getCharacterById(ownerId); @@ -398,7 +398,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { private void closeShop(MapleClient c, boolean timeout) { map.removeMapObject(this); - map.broadcastMessage(MaplePacketCreator.removeHiredMerchantBox(ownerId)); + map.broadcastMessage(PacketCreator.removeHiredMerchantBox(ownerId)); c.getChannelServer().removeHiredMerchant(ownerId); this.removeAllVisitors(); @@ -461,15 +461,15 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { this.setOpen(false); this.removeAllVisitors(); - chr.announce(MaplePacketCreator.getHiredMerchant(chr, this, false)); + chr.announce(PacketCreator.getHiredMerchant(chr, this, false)); } else if (!this.isOpen()) { - chr.announce(MaplePacketCreator.getMiniRoomError(18)); + chr.announce(PacketCreator.getMiniRoomError(18)); return; } else if (!this.addVisitor(chr)) { - chr.announce(MaplePacketCreator.getMiniRoomError(2)); + chr.announce(PacketCreator.getMiniRoomError(2)); return; } else { - chr.announce(MaplePacketCreator.getHiredMerchant(chr, this, false)); + chr.announce(PacketCreator.getHiredMerchant(chr, this, false)); } chr.setHiredMerchant(this); } finally { @@ -599,7 +599,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { synchronized (messages) { messages.add(new Pair<>(message, slot)); } - broadcastToVisitorsThreadsafe(MaplePacketCreator.hiredMerchantChat(message, slot)); + broadcastToVisitorsThreadsafe(PacketCreator.hiredMerchantChat(message, slot)); } public List sendAvailableBundles(int itemid) { @@ -713,7 +713,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { @Override public void sendSpawnData(MapleClient client) { - client.announce(MaplePacketCreator.spawnHiredMerchantBox(this)); + client.announce(PacketCreator.spawnHiredMerchantBox(this)); } public class SoldItem { diff --git a/src/main/java/server/maps/MapleKite.java b/src/main/java/server/maps/MapleKite.java index d0cea46a48..f1fdbc54ed 100644 --- a/src/main/java/server/maps/MapleKite.java +++ b/src/main/java/server/maps/MapleKite.java @@ -1,9 +1,10 @@ package server.maps; -import java.awt.Point; import client.MapleCharacter; import client.MapleClient; -import tools.MaplePacketCreator; +import tools.PacketCreator; + +import java.awt.*; public class MapleKite extends AbstractMapleMapObject { @@ -51,10 +52,10 @@ public class MapleKite extends AbstractMapleMapObject { } public final byte[] makeSpawnData() { - return MaplePacketCreator.spawnKite(getObjectId(), itemid, owner.getName(), text, pos, ft); + return PacketCreator.spawnKite(getObjectId(), itemid, owner.getName(), text, pos, ft); } public final byte[] makeDestroyData() { - return MaplePacketCreator.removeKite(getObjectId(), 0); + return PacketCreator.removeKite(getObjectId(), 0); } } \ No newline at end of file diff --git a/src/main/java/server/maps/MapleMap.java b/src/main/java/server/maps/MapleMap.java index 135f5753d2..851b866553 100644 --- a/src/main/java/server/maps/MapleMap.java +++ b/src/main/java/server/maps/MapleMap.java @@ -62,7 +62,7 @@ import server.partyquest.GuardianSpawnPoint; import server.partyquest.MapleCarnivalFactory; import server.partyquest.MapleCarnivalFactory.MCSkill; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.Randomizer; @@ -307,7 +307,7 @@ public class MapleMap { mr.lockReactor(); try { mr.resetReactorActions(1); - broadcastMessage(MaplePacketCreator.triggerReactor((MapleReactor) o, 1)); + broadcastMessage(PacketCreator.triggerReactor((MapleReactor) o, 1)); } finally { mr.unlockReactor(); } @@ -1040,8 +1040,8 @@ public class MapleMap { mdrop.setPartyOwnerId(partyid); - byte[] removePacket = MaplePacketCreator.silentRemoveItemFromMap(mdrop.getObjectId()); - byte[] updatePacket = MaplePacketCreator.updateMapItemObject(mdrop, partyLeaver == null); + byte[] removePacket = PacketCreator.silentRemoveItemFromMap(mdrop.getObjectId()); + byte[] updatePacket = PacketCreator.updateMapItemObject(mdrop, partyLeaver == null); for (MapleCharacter mc : partyMembers) { if (this.equals(mc.getMap())) { @@ -1058,7 +1058,7 @@ public class MapleMap { partyLeaver.announce(removePacket); if (partyLeaver.needQuestItem(mdrop.getQuest(), mdrop.getItemId())) { - partyLeaver.announce(MaplePacketCreator.updateMapItemObject(mdrop, true)); + partyLeaver.announce(PacketCreator.updateMapItemObject(mdrop, true)); } } } @@ -1081,8 +1081,8 @@ public class MapleMap { continue; } - byte[] removePacket = MaplePacketCreator.silentRemoveItemFromMap(mdrop.getObjectId()); - byte[] updatePacket = MaplePacketCreator.updateMapItemObject(mdrop, true); + byte[] removePacket = PacketCreator.silentRemoveItemFromMap(mdrop.getObjectId()); + byte[] updatePacket = PacketCreator.updateMapItemObject(mdrop, true); if (newcomer != null) { if (this.equals(newcomer.getMap())) { @@ -1108,7 +1108,7 @@ public class MapleMap { if (chr1.needQuestItem(questid, idrop.getItemId())) { mdrop.lockItem(); try { - c.announce(MaplePacketCreator.dropItemFromMapObject(chr1, mdrop, dropper.getPosition(), dropPos, (byte) 1)); + c.announce(PacketCreator.dropItemFromMapObject(chr1, mdrop, dropper.getPosition(), dropPos, (byte) 1)); } finally { mdrop.unlockItem(); } @@ -1127,7 +1127,7 @@ public class MapleMap { spawnAndAddRangedMapObject(mdrop, c -> { mdrop.lockItem(); try { - c.announce(MaplePacketCreator.dropItemFromMapObject(c.getPlayer(), mdrop, dropper.getPosition(), droppos, (byte) 1)); + c.announce(PacketCreator.dropItemFromMapObject(c.getPlayer(), mdrop, dropper.getPosition(), droppos, (byte) 1)); } finally { mdrop.unlockItem(); } @@ -1379,7 +1379,7 @@ public class MapleMap { if (chr == null) { if (removeKilledMonsterObject(monster)) { monster.dispatchMonsterKilled(false); - broadcastMessage(MaplePacketCreator.killMonster(monster.getObjectId(), animation), monster.getPosition()); + broadcastMessage(PacketCreator.killMonster(monster.getObjectId(), animation), monster.getPosition()); monster.aggroSwitchController(null, false); } } else { @@ -1407,8 +1407,8 @@ public class MapleMap { MapleCharacter character = (MapleCharacter) mmo; if (character.isAlive()) { MapleStatEffect statEffect = mii.getItemEffect(buff); - character.getClient().announce(MaplePacketCreator.showOwnBuffEffect(buff, 1)); - broadcastMessage(character, MaplePacketCreator.showBuffeffect(character.getId(), buff, 1), false); + character.getClient().announce(PacketCreator.showOwnBuffEffect(buff, 1)); + broadcastMessage(character, PacketCreator.showBuffeffect(character.getId(), buff, 1), false); statEffect.applyTo(character); } } @@ -1460,7 +1460,7 @@ public class MapleMap { e.printStackTrace(); } finally { // thanks resinate for pointing out a memory leak possibly from an exception thrown monster.dispatchMonsterKilled(true); - broadcastMessage(MaplePacketCreator.killMonster(monster.getObjectId(), animation), monster.getPosition()); + broadcastMessage(PacketCreator.killMonster(monster.getObjectId(), animation), monster.getPosition()); } } } @@ -1593,7 +1593,7 @@ public class MapleMap { try { r.resetReactorActions(0); r.setAlive(true); - broadcastMessage(MaplePacketCreator.triggerReactor(r, 0)); + broadcastMessage(PacketCreator.triggerReactor(r, 0)); } finally { r.unlockReactor(); } @@ -1727,8 +1727,8 @@ public class MapleMap { try { for (MapleMapObject obj : npcs) { if (((MapleNPC) obj).getId() == npcid) { - broadcastMessage(MaplePacketCreator.removeNPCController(obj.getObjectId())); - broadcastMessage(MaplePacketCreator.removeNPC(obj.getObjectId())); + broadcastMessage(PacketCreator.removeNPCController(obj.getObjectId())); + broadcastMessage(PacketCreator.removeNPC(obj.getObjectId())); this.mapobjects.remove(obj.getObjectId()); } @@ -1867,7 +1867,7 @@ public class MapleMap { getEventInstance().registerMonster(monster); } - spawnAndAddRangedMapObject(monster, c -> c.announce(MaplePacketCreator.spawnMonster(monster, false))); + spawnAndAddRangedMapObject(monster, c -> c.announce(PacketCreator.spawnMonster(monster, false))); monster.aggroUpdateController(); updateBossSpawn(monster); @@ -1954,7 +1954,7 @@ public class MapleMap { getEventInstance().registerMonster(monster); } - spawnAndAddRangedMapObject(monster, c -> c.announce(MaplePacketCreator.spawnMonster(monster, true)), null); + spawnAndAddRangedMapObject(monster, c -> c.announce(PacketCreator.spawnMonster(monster, true)), null); monster.aggroUpdateController(); updateBossSpawn(monster); @@ -2015,7 +2015,7 @@ public class MapleMap { monster.setPosition(spos); monster.setSpawnEffect(effect); - spawnAndAddRangedMapObject(monster, c -> c.announce(MaplePacketCreator.spawnMonster(monster, true, effect))); + spawnAndAddRangedMapObject(monster, c -> c.announce(PacketCreator.spawnMonster(monster, true, effect))); monster.aggroUpdateController(); updateBossSpawn(monster); @@ -2028,7 +2028,7 @@ public class MapleMap { public void spawnFakeMonster(final MapleMonster monster) { monster.setMap(this); monster.setFake(true); - spawnAndAddRangedMapObject(monster, c -> c.announce(MaplePacketCreator.spawnFakeMonster(monster, 0))); + spawnAndAddRangedMapObject(monster, c -> c.announce(PacketCreator.spawnFakeMonster(monster, 0))); spawnedMonstersOnMap.incrementAndGet(); addSelfDestructive(monster); @@ -2036,7 +2036,7 @@ public class MapleMap { public void makeMonsterReal(final MapleMonster monster) { monster.setFake(false); - broadcastMessage(MaplePacketCreator.makeMonsterReal(monster)); + broadcastMessage(PacketCreator.makeMonsterReal(monster)); monster.aggroUpdateController(); updateBossSpawn(monster); } @@ -2069,7 +2069,7 @@ public class MapleMap { public void spawnSummon(final MapleSummon summon) { spawnAndAddRangedMapObject(summon, c -> { if (summon != null) { - c.announce(MaplePacketCreator.spawnSummon(summon, true)); + c.announce(PacketCreator.spawnSummon(summon, true)); } }, null); } @@ -2148,7 +2148,7 @@ public class MapleMap { spawnAndAddRangedMapObject(mdrop, c -> { mdrop.lockItem(); try { - c.announce(MaplePacketCreator.dropItemFromMapObject(c.getPlayer(), mdrop, dropper.getPosition(), droppos, (byte) 1)); + c.announce(PacketCreator.dropItemFromMapObject(c.getPlayer(), mdrop, dropper.getPosition(), droppos, (byte) 1)); } finally { mdrop.unlockItem(); } @@ -2268,7 +2268,7 @@ public class MapleMap { } public void changeEnvironment(String mapObj, int newState) { - broadcastMessage(MaplePacketCreator.environmentChange(mapObj, newState)); + broadcastMessage(PacketCreator.environmentChange(mapObj, newState)); } public void startMapEffect(String msg, int itemId) { @@ -2402,7 +2402,7 @@ public class MapleMap { if (mapid == 200090060) { // To Rien int travelTime = getWorldServer().getTransportationTime(1 * 60 * 1000); - chr.announce(MaplePacketCreator.getClock(travelTime / 1000)); + chr.announce(PacketCreator.getClock(travelTime / 1000)); TimerManager.getInstance().schedule(() -> { if (chr.getMapId() == 200090060) { chr.changeMap(140020300, 0); @@ -2410,7 +2410,7 @@ public class MapleMap { }, travelTime); } else if (mapid == 200090070) { // To Lith Harbor int travelTime = getWorldServer().getTransportationTime(1 * 60 * 1000); - chr.announce(MaplePacketCreator.getClock(travelTime / 1000)); + chr.announce(PacketCreator.getClock(travelTime / 1000)); TimerManager.getInstance().schedule(() -> { if (chr.getMapId() == 200090070) { chr.changeMap(104000000, 3); @@ -2418,7 +2418,7 @@ public class MapleMap { }, travelTime); } else if (mapid == 200090030) { // To Ereve (SkyFerry) int travelTime = getWorldServer().getTransportationTime(2 * 60 * 1000); - chr.announce(MaplePacketCreator.getClock(travelTime / 1000)); + chr.announce(PacketCreator.getClock(travelTime / 1000)); TimerManager.getInstance().schedule(() -> { if (chr.getMapId() == 200090030) { chr.changeMap(130000210, 0); @@ -2426,7 +2426,7 @@ public class MapleMap { }, travelTime); } else if (mapid == 200090031) { // To Victoria Island (SkyFerry) int travelTime = getWorldServer().getTransportationTime(2 * 60 * 1000); - chr.announce(MaplePacketCreator.getClock(travelTime / 1000)); + chr.announce(PacketCreator.getClock(travelTime / 1000)); TimerManager.getInstance().schedule(() -> { if (chr.getMapId() == 200090031) { chr.changeMap(101000400, 0); @@ -2434,7 +2434,7 @@ public class MapleMap { }, travelTime); } else if (mapid == 200090021) { // To Orbis (SkyFerry) int travelTime = getWorldServer().getTransportationTime(8 * 60 * 1000); - chr.announce(MaplePacketCreator.getClock(travelTime / 1000)); + chr.announce(PacketCreator.getClock(travelTime / 1000)); TimerManager.getInstance().schedule(() -> { if (chr.getMapId() == 200090021) { chr.changeMap(200000161, 0); @@ -2442,7 +2442,7 @@ public class MapleMap { }, travelTime); } else if (mapid == 200090020) { // To Ereve From Orbis (SkyFerry) int travelTime = getWorldServer().getTransportationTime(8 * 60 * 1000); - chr.announce(MaplePacketCreator.getClock(travelTime / 1000)); + chr.announce(PacketCreator.getClock(travelTime / 1000)); TimerManager.getInstance().schedule(() -> { if (chr.getMapId() == 200090020) { chr.changeMap(130000210, 0); @@ -2455,14 +2455,14 @@ public class MapleMap { } } else if (GameConstants.isAriantColiseumArena(mapid)) { int pqTimer = (10 * 60 * 1000); - chr.announce(MaplePacketCreator.getClock(pqTimer / 1000)); + chr.announce(PacketCreator.getClock(pqTimer / 1000)); } MaplePet[] pets = chr.getPets(); for (MaplePet pet : pets) { if (pet != null) { pet.setPos(getGroundBelow(chr.getPosition())); - chr.announce(MaplePacketCreator.showPet(chr, pet, false, false)); + chr.announce(PacketCreator.showPet(chr, pet, false, false)); } else { break; } @@ -2470,7 +2470,7 @@ public class MapleMap { chr.commitExcludedItems(); // thanks OishiiKawaiiDesu for noticing pet item ignore registry erasing upon changing maps if (chr.getMonsterCarnival() != null) { - chr.getClient().announce(MaplePacketCreator.getClock(chr.getMonsterCarnival().getTimeLeftSeconds())); + chr.getClient().announce(PacketCreator.getClock(chr.getMonsterCarnival().getTimeLeftSeconds())); if (isCPQMap()) { int team = -1; int oposition = -1; @@ -2482,7 +2482,7 @@ public class MapleMap { team = 1; oposition = 0; } - chr.getClient().announce(MaplePacketCreator.startMonsterCarnival(chr, team, oposition)); + chr.getClient().announce(PacketCreator.startMonsterCarnival(chr, team, oposition)); } } @@ -2490,7 +2490,7 @@ public class MapleMap { if (chr.getChalkboard() != null) { if (!GameConstants.isFreeMarketRoom(mapid)) { - chr.announce(MaplePacketCreator.useChalkboard(chr, false)); // update player's chalkboard when changing maps found thanks to Vcoc + chr.announce(PacketCreator.useChalkboard(chr, false)); // update player's chalkboard when changing maps found thanks to Vcoc } else { chr.setChalkboard(null); } @@ -2498,10 +2498,10 @@ public class MapleMap { if (chr.isHidden()) { broadcastGMSpawnPlayerMapObjectMessage(chr, chr, true); - chr.announce(MaplePacketCreator.getGMEffect(0x10, (byte) 1)); + chr.announce(PacketCreator.getGMEffect(0x10, (byte) 1)); List> dsstat = Collections.singletonList(new Pair<>(MapleBuffStat.DARKSIGHT, 0)); - broadcastGMMessage(chr, MaplePacketCreator.giveForeignBuff(chr.getId(), dsstat), false); + broadcastGMMessage(chr, PacketCreator.giveForeignBuff(chr.getId(), dsstat), false); } else { broadcastSpawnPlayerMapObjectMessage(chr, chr, true); } @@ -2512,11 +2512,11 @@ public class MapleMap { chr.getMap().getPortal("join00").setPortalStatus(false); } if (hasForcedEquip()) { - chr.getClient().announce(MaplePacketCreator.showForcedEquip(-1)); + chr.getClient().announce(PacketCreator.showForcedEquip(-1)); } if (specialEquip()) { - chr.getClient().announce(MaplePacketCreator.coconutScore(0, 0)); - chr.getClient().announce(MaplePacketCreator.showForcedEquip(chr.getTeam())); + chr.getClient().announce(PacketCreator.coconutScore(0, 0)); + chr.getClient().announce(PacketCreator.showForcedEquip(chr.getTeam())); } objectWLock.lock(); try { @@ -2534,9 +2534,9 @@ public class MapleMap { dragon.setPosition(chr.getPosition()); this.addMapObject(dragon); if (chr.isHidden()) { - this.broadcastGMMessage(chr, MaplePacketCreator.spawnDragon(dragon)); + this.broadcastGMMessage(chr, PacketCreator.spawnDragon(dragon)); } else { - this.broadcastMessage(chr, MaplePacketCreator.spawnDragon(dragon)); + this.broadcastMessage(chr, PacketCreator.spawnDragon(dragon)); } } @@ -2550,34 +2550,34 @@ public class MapleMap { if (mapEffect != null) { mapEffect.sendStartData(chr.getClient()); } - chr.getClient().announce(MaplePacketCreator.resetForcedStats()); + chr.getClient().announce(PacketCreator.resetForcedStats()); if (mapid == 914000200 || mapid == 914000210 || mapid == 914000220) { - chr.getClient().announce(MaplePacketCreator.aranGodlyStats()); + chr.getClient().announce(PacketCreator.aranGodlyStats()); } if (chr.getEventInstance() != null && chr.getEventInstance().isTimerStarted()) { - chr.getClient().announce(MaplePacketCreator.getClock((int) (chr.getEventInstance().getTimeLeft() / 1000))); + chr.getClient().announce(PacketCreator.getClock((int) (chr.getEventInstance().getTimeLeft() / 1000))); } if (chr.getFitness() != null && chr.getFitness().isTimerStarted()) { - chr.getClient().announce(MaplePacketCreator.getClock((int) (chr.getFitness().getTimeLeft() / 1000))); + chr.getClient().announce(PacketCreator.getClock((int) (chr.getFitness().getTimeLeft() / 1000))); } if (chr.getOla() != null && chr.getOla().isTimerStarted()) { - chr.getClient().announce(MaplePacketCreator.getClock((int) (chr.getOla().getTimeLeft() / 1000))); + chr.getClient().announce(PacketCreator.getClock((int) (chr.getOla().getTimeLeft() / 1000))); } if (mapid == 109060000) { - chr.announce(MaplePacketCreator.rollSnowBall(true, 0, null, null)); + chr.announce(PacketCreator.rollSnowBall(true, 0, null, null)); } if (hasClock()) { Calendar cal = Calendar.getInstance(); - chr.getClient().announce((MaplePacketCreator.getClockTime(cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND)))); + chr.getClient().announce((PacketCreator.getClockTime(cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND)))); } if (hasBoat() > 0) { if (hasBoat() == 1) { - chr.getClient().announce((MaplePacketCreator.boatPacket(true))); + chr.getClient().announce((PacketCreator.boatPacket(true))); } else { - chr.getClient().announce(MaplePacketCreator.boatPacket(false)); + chr.getClient().announce(PacketCreator.boatPacket(false)); } } @@ -2697,9 +2697,9 @@ public class MapleMap { removeMapObject(chr.getObjectId()); if (!chr.isHidden()) { - broadcastMessage(MaplePacketCreator.removePlayerFromMap(chr.getId())); + broadcastMessage(PacketCreator.removePlayerFromMap(chr.getId())); } else { - broadcastGMMessage(MaplePacketCreator.removePlayerFromMap(chr.getId())); + broadcastGMMessage(PacketCreator.removePlayerFromMap(chr.getId())); } chr.leaveMap(); @@ -2715,9 +2715,9 @@ public class MapleMap { if (chr.getDragon() != null) { removeMapObject(chr.getDragon()); if (chr.isHidden()) { - this.broadcastGMMessage(chr, MaplePacketCreator.removeDragon(chr.getId())); + this.broadcastGMMessage(chr, PacketCreator.removeDragon(chr.getId())); } else { - this.broadcastMessage(chr, MaplePacketCreator.removeDragon(chr.getId())); + this.broadcastMessage(chr, PacketCreator.removeDragon(chr.getId())); } } } @@ -2847,7 +2847,7 @@ public class MapleMap { chrRLock.lock(); try { for (MapleCharacter chr : characters) { - final byte[] packet = MaplePacketCreator.dropItemFromMapObject(chr, mdrop, dropperPos, dropPos, mod); + final byte[] packet = PacketCreator.dropItemFromMapObject(chr, mdrop, dropperPos, dropPos, mod); if (rangeSq < Double.POSITIVE_INFINITY) { if (rangedFrom.distanceSq(chr.getPosition()) <= rangeSq) { @@ -2877,14 +2877,14 @@ public class MapleMap { for (MapleCharacter chr : characters) { if (chr.isGM()) { if (chr != source) { - chr.announce(MaplePacketCreator.spawnPlayerMapObject(chr.getClient(), player, enteringField)); + chr.announce(PacketCreator.spawnPlayerMapObject(chr.getClient(), player, enteringField)); } } } } else { for (MapleCharacter chr : characters) { if (chr != source) { - chr.announce(MaplePacketCreator.spawnPlayerMapObject(chr.getClient(), player, enteringField)); + chr.announce(PacketCreator.spawnPlayerMapObject(chr.getClient(), player, enteringField)); } } } @@ -2898,7 +2898,7 @@ public class MapleMap { try { for (MapleCharacter chr : characters) { if (chr != source) { - chr.announce(MaplePacketCreator.updateCharLook(chr.getClient(), player)); + chr.announce(PacketCreator.updateCharLook(chr.getClient(), player)); } } } finally { @@ -2911,7 +2911,7 @@ public class MapleMap { } public void broadcastStringMessage(int type, String message) { - broadcastMessage(MaplePacketCreator.serverNotice(type, message)); + broadcastMessage(PacketCreator.serverNotice(type, message)); } private static boolean isNonRangedType(MapleMapObjectType type) { @@ -3234,7 +3234,7 @@ public class MapleMap { } public final void moveEnvironment(final String ms, final int type) { - broadcastMessage(MaplePacketCreator.environmentMove(ms, type)); + broadcastMessage(PacketCreator.environmentMove(ms, type)); objectWLock.lock(); try { @@ -3317,7 +3317,7 @@ public class MapleMap { public void sendNightEffect(MapleCharacter mc) { for (Entry types : backgroundTypes.entrySet()) { if (types.getValue() >= 3) { // 3 is a special number - mc.announce(MaplePacketCreator.changeBackgroundEffect(true, types.getKey(), 0)); + mc.announce(PacketCreator.changeBackgroundEffect(true, types.getKey(), 0)); } } } @@ -3363,7 +3363,7 @@ public class MapleMap { return true; } - MapleMap.this.pickItemDrop(MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), 0, 0), mapitem); + MapleMap.this.pickItemDrop(PacketCreator.removeItemFromMap(mapitem.getObjectId(), 0, 0), mapitem); return true; } finally { mapitem.unlockItem(); @@ -3442,7 +3442,7 @@ public class MapleMap { unregisterItemDrop(mapitem); reactor.setShouldCollect(false); - MapleMap.this.broadcastMessage(MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), 0, 0), mapitem.getPosition()); + MapleMap.this.broadcastMessage(PacketCreator.removeItemFromMap(mapitem.getObjectId(), 0, 0), mapitem.getPosition()); droppedItemCount.decrementAndGet(); MapleMap.this.removeMapObject(mapitem); @@ -3458,7 +3458,7 @@ public class MapleMap { try { reactor.resetReactorActions(0); reactor.setAlive(true); - broadcastMessage(MaplePacketCreator.triggerReactor(reactor, 0)); + broadcastMessage(PacketCreator.triggerReactor(reactor, 0)); } finally { reactor.unlockReactor(); } @@ -3803,7 +3803,7 @@ public class MapleMap { for (MapleMapObject i : getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM))) { droppedItemCount.decrementAndGet(); removeMapObject(i); - this.broadcastMessage(MaplePacketCreator.removeItemFromMap(i.getObjectId(), 0, player.getId())); + this.broadcastMessage(PacketCreator.removeItemFromMap(i.getObjectId(), 0, player.getId())); } } @@ -3811,7 +3811,7 @@ public class MapleMap { for (MapleMapObject i : getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM))) { droppedItemCount.decrementAndGet(); removeMapObject(i); - this.broadcastMessage(MaplePacketCreator.removeItemFromMap(i.getObjectId(), 0, 0)); + this.broadcastMessage(PacketCreator.removeItemFromMap(i.getObjectId(), 0, 0)); } } @@ -3976,7 +3976,7 @@ public class MapleMap { npc.setHide(!npc.isHidden()); if (!npc.isHidden()) //Should only be hidden upon changing maps { - broadcastMessage(MaplePacketCreator.spawnNPC(npc)); + broadcastMessage(PacketCreator.spawnNPC(npc)); } } } @@ -4025,12 +4025,12 @@ public class MapleMap { } public void broadcastShip(final boolean state) { - broadcastMessage(MaplePacketCreator.boatPacket(state)); + broadcastMessage(PacketCreator.boatPacket(state)); this.setDocked(state); } public void broadcastEnemyShip(final boolean state) { - broadcastMessage(MaplePacketCreator.crogBoatPacket(state)); + broadcastMessage(PacketCreator.crogBoatPacket(state)); this.setDocked(state); } diff --git a/src/main/java/server/maps/MapleMapEffect.java b/src/main/java/server/maps/MapleMapEffect.java index a1f49891b1..0b304f806b 100644 --- a/src/main/java/server/maps/MapleMapEffect.java +++ b/src/main/java/server/maps/MapleMapEffect.java @@ -22,7 +22,7 @@ package server.maps; import client.MapleClient; -import tools.MaplePacketCreator; +import tools.PacketCreator; public class MapleMapEffect { private String msg; @@ -35,11 +35,11 @@ public class MapleMapEffect { } public final byte[] makeDestroyData() { - return MaplePacketCreator.removeMapEffect(); + return PacketCreator.removeMapEffect(); } public final byte[] makeStartData() { - return MaplePacketCreator.startMapEffect(msg, itemId, active); + return PacketCreator.startMapEffect(msg, itemId, active); } public void sendStartData(MapleClient client) { diff --git a/src/main/java/server/maps/MapleMapItem.java b/src/main/java/server/maps/MapleMapItem.java index 529cef07d9..16f4c231d2 100644 --- a/src/main/java/server/maps/MapleMapItem.java +++ b/src/main/java/server/maps/MapleMapItem.java @@ -23,11 +23,12 @@ package server.maps; import client.MapleCharacter; import client.MapleClient; import client.inventory.Item; -import java.awt.Point; -import java.util.concurrent.locks.Lock; -import tools.MaplePacketCreator; import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.factory.MonitoredReentrantLockFactory; +import tools.PacketCreator; + +import java.awt.*; +import java.util.concurrent.locks.Lock; public class MapleMapItem extends AbstractMapleMapObject { protected MapleClient ownerClient; @@ -202,7 +203,7 @@ public class MapleMapItem extends AbstractMapleMapObject { if (chr.needQuestItem(questid, getItemId())) { this.lockItem(); try { - client.announce(MaplePacketCreator.dropItemFromMapObject(chr, this, null, getPosition(), (byte) 2)); + client.announce(PacketCreator.dropItemFromMapObject(chr, this, null, getPosition(), (byte) 2)); } finally { this.unlockItem(); } @@ -211,6 +212,6 @@ public class MapleMapItem extends AbstractMapleMapObject { @Override public void sendDestroyData(final MapleClient client) { - client.announce(MaplePacketCreator.removeItemFromMap(getObjectId(), 1, 0)); + client.announce(PacketCreator.removeItemFromMap(getObjectId(), 1, 0)); } } \ No newline at end of file diff --git a/src/main/java/server/maps/MapleMiniDungeon.java b/src/main/java/server/maps/MapleMiniDungeon.java index d001108b34..2fb9ffa62c 100644 --- a/src/main/java/server/maps/MapleMiniDungeon.java +++ b/src/main/java/server/maps/MapleMiniDungeon.java @@ -23,7 +23,7 @@ import client.MapleCharacter; import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import server.TimerManager; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.util.ArrayList; import java.util.List; @@ -53,7 +53,7 @@ public class MapleMiniDungeon { public boolean registerPlayer(MapleCharacter chr) { int time = (int)((expireTime - System.currentTimeMillis()) / 1000); - if(time > 0) chr.getClient().announce(MaplePacketCreator.getClock(time)); + if(time > 0) chr.getClient().announce(PacketCreator.getClock(time)); lock.lock(); try { @@ -68,7 +68,7 @@ public class MapleMiniDungeon { } public boolean unregisterPlayer(MapleCharacter chr) { - chr.getClient().announce(MaplePacketCreator.removeClock()); + chr.getClient().announce(PacketCreator.removeClock()); lock.lock(); try { diff --git a/src/main/java/server/maps/MapleMiniGame.java b/src/main/java/server/maps/MapleMiniGame.java index 4f383da923..6427bea47c 100644 --- a/src/main/java/server/maps/MapleMiniGame.java +++ b/src/main/java/server/maps/MapleMiniGame.java @@ -24,7 +24,7 @@ package server.maps; import client.MapleCharacter; import client.MapleClient; import net.server.Server; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.util.ArrayList; import java.util.Collections; @@ -107,21 +107,21 @@ public class MapleMiniGame extends AbstractMapleMapObject { MapleCharacter owner = this.getOwner(); if (GameType == MiniGameType.OMOK) { - owner.announce(MaplePacketCreator.getMiniGameNewVisitor(this, challenger, 1)); - owner.getMap().broadcastMessage(MaplePacketCreator.addOmokBox(owner, 2, 0)); + owner.announce(PacketCreator.getMiniGameNewVisitor(this, challenger, 1)); + owner.getMap().broadcastMessage(PacketCreator.addOmokBox(owner, 2, 0)); } else if (GameType == MiniGameType.MATCH_CARD) { - owner.announce(MaplePacketCreator.getMatchCardNewVisitor(this, challenger, 1)); - owner.getMap().broadcastMessage(MaplePacketCreator.addMatchCardBox(owner, 2, 0)); + owner.announce(PacketCreator.getMatchCardNewVisitor(this, challenger, 1)); + owner.getMap().broadcastMessage(PacketCreator.addMatchCardBox(owner, 2, 0)); } } public void closeRoom(boolean forceClose) { - owner.getMap().broadcastMessage(MaplePacketCreator.removeMinigameBox(owner)); + owner.getMap().broadcastMessage(PacketCreator.removeMinigameBox(owner)); if (forceClose) { - this.broadcastToOwner(MaplePacketCreator.getMiniGameClose(false, 4)); + this.broadcastToOwner(PacketCreator.getMiniGameClose(false, 4)); } - this.broadcastToVisitor(MaplePacketCreator.getMiniGameClose(true, 3)); + this.broadcastToVisitor(PacketCreator.getMiniGameClose(true, 3)); if (visitor != null) { visitor.setMiniGame(null); @@ -135,17 +135,17 @@ public class MapleMiniGame extends AbstractMapleMapObject { public void removeVisitor(boolean forceClose, MapleCharacter challenger) { if (visitor == challenger) { if (forceClose) { - visitor.announce(MaplePacketCreator.getMiniGameClose(true, 4)); + visitor.announce(PacketCreator.getMiniGameClose(true, 4)); } challenger.setMiniGame(null); visitor = null; - this.getOwner().getClient().announce(MaplePacketCreator.getMiniGameRemoveVisitor()); + this.getOwner().getClient().announce(PacketCreator.getMiniGameRemoveVisitor()); if (GameType == MiniGameType.OMOK) { - this.getOwner().getMap().broadcastMessage(MaplePacketCreator.addOmokBox(owner, 1, 0)); + this.getOwner().getMap().broadcastMessage(PacketCreator.addOmokBox(owner, 1, 0)); } else if (GameType == MiniGameType.MATCH_CARD) { - this.getOwner().getMap().broadcastMessage(MaplePacketCreator.addMatchCardBox(owner, 1, 0)); + this.getOwner().getMap().broadcastMessage(PacketCreator.addMatchCardBox(owner, 1, 0)); } } } @@ -176,7 +176,7 @@ public class MapleMiniGame extends AbstractMapleMapObject { } private void updateMiniGameBox() { - this.getOwner().getMap().broadcastMessage(MaplePacketCreator.addOmokBox(owner, visitor != null ? 2 : 1, inprogress)); + this.getOwner().getMap().broadcastMessage(PacketCreator.addOmokBox(owner, visitor != null ? 2 : 1, inprogress)); } private synchronized boolean minigameMatchFinish() { @@ -241,7 +241,7 @@ public class MapleMiniGame extends AbstractMapleMapObject { visitorscore += (15 * (forfeit ? -1 : 1)); if (forfeit) visitorforfeits++; - this.broadcast(MaplePacketCreator.getMiniGameOwnerWin(this, forfeit)); + this.broadcast(PacketCreator.getMiniGameOwnerWin(this, forfeit)); minigameMatchFinished(); } @@ -255,7 +255,7 @@ public class MapleMiniGame extends AbstractMapleMapObject { ownerscore += (15 * (forfeit ? -1 : 1)); if (forfeit) ownerforfeits++; - this.broadcast(MaplePacketCreator.getMiniGameVisitorWin(this, forfeit)); + this.broadcast(PacketCreator.getMiniGameVisitorWin(this, forfeit)); minigameMatchFinished(); } @@ -273,7 +273,7 @@ public class MapleMiniGame extends AbstractMapleMapObject { nextavailabletie = timeNow + 5 * 60 * 1000; } - this.broadcast(MaplePacketCreator.getMiniGameTie(this)); + this.broadcast(PacketCreator.getMiniGameTie(this)); minigameMatchFinished(); } @@ -390,15 +390,15 @@ public class MapleMiniGame extends AbstractMapleMapObject { } public void chat(MapleClient c, String chat) { - broadcast(MaplePacketCreator.getPlayerShopChat(c.getPlayer(), chat, isOwner(c.getPlayer()))); + broadcast(PacketCreator.getPlayerShopChat(c.getPlayer(), chat, isOwner(c.getPlayer()))); } public void sendOmok(MapleClient c, int type) { - c.announce(MaplePacketCreator.getMiniGame(c, this, isOwner(c.getPlayer()), type)); + c.announce(PacketCreator.getMiniGame(c, this, isOwner(c.getPlayer()), type)); } public void sendMatchCard(MapleClient c, int type) { - c.announce(MaplePacketCreator.getMatchCard(c, this, isOwner(c.getPlayer()), type)); + c.announce(PacketCreator.getMatchCard(c, this, isOwner(c.getPlayer()), type)); } public MapleCharacter getOwner() { @@ -413,7 +413,7 @@ public class MapleMiniGame extends AbstractMapleMapObject { int slot = move2 * 15 + move1 + 1; if (piece[slot] == 0) { piece[slot] = type; - this.broadcast(MaplePacketCreator.getMiniGameMoveOmok(this, move1, move2, type)); + this.broadcast(PacketCreator.getMiniGameMoveOmok(this, move1, move2, type)); for (int y = 0; y < 15; y++) { for (int x = 0; x < 11; x++) { if (searchCombo(x, y, type)) { diff --git a/src/main/java/server/maps/MapleMist.java b/src/main/java/server/maps/MapleMist.java index 51704ccaee..941175e16e 100644 --- a/src/main/java/server/maps/MapleMist.java +++ b/src/main/java/server/maps/MapleMist.java @@ -25,19 +25,13 @@ import client.MapleCharacter; import client.MapleClient; import client.Skill; import client.SkillFactory; - -import java.awt.Point; -import java.awt.Rectangle; - -import constants.skills.BlazeWizard; -import constants.skills.Evan; -import constants.skills.FPMage; -import constants.skills.NightWalker; -import constants.skills.Shadower; +import constants.skills.*; import server.MapleStatEffect; import server.life.MapleMonster; import server.life.MobSkill; -import tools.MaplePacketCreator; +import tools.PacketCreator; + +import java.awt.*; /** * @@ -135,21 +129,21 @@ public class MapleMist extends AbstractMapleMapObject { } public final byte[] makeDestroyData() { - return MaplePacketCreator.removeMist(getObjectId()); + return PacketCreator.removeMist(getObjectId()); } public final byte[] makeSpawnData() { if (owner != null) { - return MaplePacketCreator.spawnMist(getObjectId(), owner.getId(), getSourceSkill().getId(), owner.getSkillLevel(SkillFactory.getSkill(source.getSourceId())), this); + return PacketCreator.spawnMist(getObjectId(), owner.getId(), getSourceSkill().getId(), owner.getSkillLevel(SkillFactory.getSkill(source.getSourceId())), this); } - return MaplePacketCreator.spawnMist(getObjectId(), mob.getId(), skill.getSkillId(), skill.getSkillLevel(), this); + return PacketCreator.spawnMist(getObjectId(), mob.getId(), skill.getSkillId(), skill.getSkillLevel(), this); } public final byte[] makeFakeSpawnData(int level) { if (owner != null) { - return MaplePacketCreator.spawnMist(getObjectId(), owner.getId(), getSourceSkill().getId(), level, this); + return PacketCreator.spawnMist(getObjectId(), owner.getId(), getSourceSkill().getId(), level, this); } - return MaplePacketCreator.spawnMist(getObjectId(), mob.getId(), skill.getSkillId(), skill.getSkillLevel(), this); + return PacketCreator.spawnMist(getObjectId(), mob.getId(), skill.getSkillId(), skill.getSkillLevel(), this); } @Override diff --git a/src/main/java/server/maps/MaplePlayerShop.java b/src/main/java/server/maps/MaplePlayerShop.java index b2648d9854..81d912857e 100644 --- a/src/main/java/server/maps/MaplePlayerShop.java +++ b/src/main/java/server/maps/MaplePlayerShop.java @@ -32,7 +32,7 @@ import net.opcodes.SendOpcode; import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import server.MapleTrade; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.data.output.MaplePacketLittleEndianWriter; @@ -126,8 +126,8 @@ public class MaplePlayerShop extends AbstractMapleMapObject { visitors[i] = visitor; visitor.setSlot(i); - this.broadcast(MaplePacketCreator.getPlayerShopNewVisitor(visitor, i + 1)); - owner.getMap().broadcastMessage(MaplePacketCreator.updatePlayerShopBox(this)); + this.broadcast(PacketCreator.getPlayerShopNewVisitor(visitor, i + 1)); + owner.getMap().broadcastMessage(PacketCreator.updatePlayerShopBox(this)); break; } } @@ -147,8 +147,8 @@ public class MaplePlayerShop extends AbstractMapleMapObject { visitors[i] = null; visitor.setSlot(-1); - this.broadcast(MaplePacketCreator.getPlayerShopRemoveVisitor(i + 1)); - owner.getMap().broadcastMessage(MaplePacketCreator.updatePlayerShopBox(this)); + this.broadcast(PacketCreator.getPlayerShopRemoveVisitor(i + 1)); + owner.getMap().broadcastMessage(PacketCreator.updatePlayerShopBox(this)); return; } } @@ -169,17 +169,17 @@ public class MaplePlayerShop extends AbstractMapleMapObject { visitor.setSlot(-1); //absolutely cant remove player slot for late players without dc'ing them... heh for(int j = i; j < 2; j++) { - if(visitors[j] != null) owner.announce(MaplePacketCreator.getPlayerShopRemoveVisitor(j + 1)); + if(visitors[j] != null) owner.announce(PacketCreator.getPlayerShopRemoveVisitor(j + 1)); visitors[j] = visitors[j + 1]; if(visitors[j] != null) visitors[j].setSlot(j); } visitors[2] = null; for(int j = i; j < 2; j++) { - if(visitors[j] != null) owner.announce(MaplePacketCreator.getPlayerShopNewVisitor(visitors[j], j + 1)); + if(visitors[j] != null) owner.announce(PacketCreator.getPlayerShopNewVisitor(visitors[j], j + 1)); } this.broadcastRestoreToVisitors(); - owner.getMap().broadcastMessage(MaplePacketCreator.updatePlayerShopBox(this)); + owner.getMap().broadcastMessage(PacketCreator.updatePlayerShopBox(this)); return; } } @@ -187,7 +187,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject { visitorLock.unlock(); } - owner.getMap().broadcastMessage(MaplePacketCreator.updatePlayerShopBox(this)); + owner.getMap().broadcastMessage(PacketCreator.updatePlayerShopBox(this)); } } @@ -226,8 +226,8 @@ public class MaplePlayerShop extends AbstractMapleMapObject { iitem.setQuantity((short) (shopItem.getItem().getQuantity() * shopItem.getBundles())); if (!MapleInventory.checkSpot(chr, iitem)) { - chr.announce(MaplePacketCreator.serverNotice(1, "Have a slot available on your inventory to claim back the item.")); - chr.announce(MaplePacketCreator.enableActions()); + chr.announce(PacketCreator.serverNotice(1, "Have a slot available on your inventory to claim back the item.")); + chr.announce(PacketCreator.enableActions()); return; } @@ -235,7 +235,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject { } removeFromSlot(slot); - chr.announce(MaplePacketCreator.getPlayerShopItemUpdate(this)); + chr.announce(PacketCreator.getPlayerShopItemUpdate(this)); } } } @@ -254,10 +254,10 @@ public class MaplePlayerShop extends AbstractMapleMapObject { newItem.setQuantity((short) ((pItem.getItem().getQuantity() * quantity))); if (quantity < 1 || !pItem.isExist() || pItem.getBundles() < quantity) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } else if (newItem.getInventoryType().equals(MapleInventoryType.EQUIP) && newItem.getQuantity() > 1) { - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } @@ -270,7 +270,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject { if (c.getPlayer().getMeso() >= price) { if (!owner.canHoldMeso(price)) { // thanks Rohenn for noticing owner hold check misplaced c.getPlayer().dropMessage(1, "Transaction failed since the shop owner can't hold any more mesos."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } @@ -280,7 +280,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject { owner.gainMeso(price, true); SoldItem soldItem = new SoldItem(c.getPlayer().getName(), pItem.getItem().getItemId(), quantity, price); - owner.announce(MaplePacketCreator.getPlayerShopOwnerUpdate(soldItem, item)); + owner.announce(PacketCreator.getPlayerShopOwnerUpdate(soldItem, item)); synchronized (sold) { sold.add(soldItem); @@ -298,12 +298,12 @@ public class MaplePlayerShop extends AbstractMapleMapObject { } } else { c.getPlayer().dropMessage(1, "Your inventory is full. Please clear a slot before buying this item."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } } else { c.getPlayer().dropMessage(1, "You don't have enough mesos to purchase this item."); - c.announce(MaplePacketCreator.enableActions()); + c.announce(PacketCreator.enableActions()); return false; } @@ -335,13 +335,13 @@ public class MaplePlayerShop extends AbstractMapleMapObject { try { for (int i = 0; i < 3; i++) { if (visitors[i] != null) { - visitors[i].getClient().announce(MaplePacketCreator.getPlayerShopRemoveVisitor(i + 1)); + visitors[i].getClient().announce(PacketCreator.getPlayerShopRemoveVisitor(i + 1)); } } for (int i = 0; i < 3; i++) { if (visitors[i] != null) { - visitors[i].getClient().announce(MaplePacketCreator.getPlayerShop(this, false)); + visitors[i].getClient().announce(PacketCreator.getPlayerShop(this, false)); } } @@ -359,7 +359,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject { try { for (int i = 0; i < 3; i++) { if (visitors[i] != null) { - visitors[i].getClient().announce(MaplePacketCreator.shopErrorMessage(10, 1)); + visitors[i].getClient().announce(PacketCreator.shopErrorMessage(10, 1)); visitorList.add(visitors[i]); } } @@ -418,7 +418,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject { chatSlot.put(c.getPlayer().getId(), s); } - broadcast(MaplePacketCreator.getPlayerShopChat(c.getPlayer(), chat, s)); + broadcast(PacketCreator.getPlayerShopChat(c.getPlayer(), chat, s)); } private void recoverChatLog() { @@ -427,7 +427,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject { MapleCharacter chr = it.getLeft(); Byte pos = chatSlot.get(chr.getId()); - broadcastToVisitors(MaplePacketCreator.getPlayerShopChat(chr, it.getRight(), pos)); + broadcastToVisitors(PacketCreator.getPlayerShopChat(chr, it.getRight(), pos)); } } } @@ -441,13 +441,13 @@ public class MaplePlayerShop extends AbstractMapleMapObject { public void closeShop() { clearChatLog(); removeVisitors(); - owner.getMap().broadcastMessage(MaplePacketCreator.removePlayerShopBox(this)); + owner.getMap().broadcastMessage(PacketCreator.removePlayerShopBox(this)); } public void sendShop(MapleClient c) { visitorLock.lock(); try { - c.announce(MaplePacketCreator.getPlayerShop(this, isOwner(c.getPlayer()))); + c.announce(PacketCreator.getPlayerShop(this, isOwner(c.getPlayer()))); } finally { visitorLock.unlock(); } @@ -512,7 +512,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject { } if(target != null) { - target.getClient().announce(MaplePacketCreator.shopErrorMessage(5, 1)); + target.getClient().announce(PacketCreator.shopErrorMessage(5, 1)); removeVisitor(target); } } @@ -572,12 +572,12 @@ public class MaplePlayerShop extends AbstractMapleMapObject { @Override public void sendDestroyData(MapleClient client) { - client.announce(MaplePacketCreator.removePlayerShopBox(this)); + client.announce(PacketCreator.removePlayerShopBox(this)); } @Override public void sendSpawnData(MapleClient client) { - client.announce(MaplePacketCreator.updatePlayerShopBox(this)); + client.announce(PacketCreator.updatePlayerShopBox(this)); } @Override diff --git a/src/main/java/server/maps/MapleReactor.java b/src/main/java/server/maps/MapleReactor.java index a8e127e8c1..d821ded0f8 100644 --- a/src/main/java/server/maps/MapleReactor.java +++ b/src/main/java/server/maps/MapleReactor.java @@ -30,7 +30,7 @@ import net.server.services.type.ChannelServices; import scripting.reactor.ReactorScriptManager; import server.TimerManager; import server.partyquest.GuardianSpawnPoint; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import java.awt.*; @@ -170,7 +170,7 @@ public class MapleReactor extends AbstractMapleMapObject { } public final byte[] makeDestroyData() { - return MaplePacketCreator.destroyReactor(this); + return PacketCreator.destroyReactor(this); } @Override @@ -181,7 +181,7 @@ public class MapleReactor extends AbstractMapleMapObject { } public final byte[] makeSpawnData() { - return MaplePacketCreator.spawnReactor(this); + return PacketCreator.spawnReactor(this); } public void resetReactorActions(int newState) { @@ -199,7 +199,7 @@ public class MapleReactor extends AbstractMapleMapObject { this.lockReactor(); try { this.resetReactorActions(newState); - map.broadcastMessage(MaplePacketCreator.triggerReactor(this, (short) 0)); + map.broadcastMessage(PacketCreator.triggerReactor(this, (short) 0)); } finally { this.unlockReactor(); } @@ -212,7 +212,7 @@ public class MapleReactor extends AbstractMapleMapObject { try { this.resetReactorActions(newState); - map.broadcastMessage(MaplePacketCreator.triggerReactor(this, (short) 0)); + map.broadcastMessage(PacketCreator.triggerReactor(this, (short) 0)); } finally { reactorLock.unlock(); } @@ -278,15 +278,15 @@ public class MapleReactor extends AbstractMapleMapObject { if (delay > 0) { map.destroyReactor(getObjectId()); } else {//trigger as normal - map.broadcastMessage(MaplePacketCreator.triggerReactor(this, stance)); + map.broadcastMessage(PacketCreator.triggerReactor(this, stance)); } } else {//item-triggered on final step - map.broadcastMessage(MaplePacketCreator.triggerReactor(this, stance)); + map.broadcastMessage(PacketCreator.triggerReactor(this, stance)); } ReactorScriptManager.getInstance().act(c, this); } else { //reactor not broken yet - map.broadcastMessage(MaplePacketCreator.triggerReactor(this, stance)); + map.broadcastMessage(PacketCreator.triggerReactor(this, stance)); if (state == stats.getNextState(state, b)) {//current state = next state, looping reactor ReactorScriptManager.getInstance().act(c, this); } @@ -302,7 +302,7 @@ public class MapleReactor extends AbstractMapleMapObject { } } else { state++; - map.broadcastMessage(MaplePacketCreator.triggerReactor(this, stance)); + map.broadcastMessage(PacketCreator.triggerReactor(this, stance)); if (this.getId() != 9980000 && this.getId() != 9980001) { ReactorScriptManager.getInstance().act(c, this); } @@ -344,7 +344,7 @@ public class MapleReactor extends AbstractMapleMapObject { } } - map.broadcastMessage(MaplePacketCreator.destroyReactor(this)); + map.broadcastMessage(PacketCreator.destroyReactor(this)); return false; } diff --git a/src/main/java/server/maps/MapleSummon.java b/src/main/java/server/maps/MapleSummon.java index 5a1a677c25..714235f838 100644 --- a/src/main/java/server/maps/MapleSummon.java +++ b/src/main/java/server/maps/MapleSummon.java @@ -21,11 +21,12 @@ */ package server.maps; -import java.awt.Point; import client.MapleCharacter; import client.MapleClient; import client.SkillFactory; -import tools.MaplePacketCreator; +import tools.PacketCreator; + +import java.awt.*; /** * @@ -49,12 +50,12 @@ public class MapleSummon extends AbstractAnimatedMapleMapObject { @Override public void sendSpawnData(MapleClient client) { - client.announce(MaplePacketCreator.spawnSummon(this, false)); + client.announce(PacketCreator.spawnSummon(this, false)); } @Override public void sendDestroyData(MapleClient client) { - client.announce(MaplePacketCreator.removeSummon(this, true)); + client.announce(PacketCreator.removeSummon(this, true)); } public MapleCharacter getOwner() { diff --git a/src/main/java/server/maps/MapleTVEffect.java b/src/main/java/server/maps/MapleTVEffect.java index 00f250b85c..4576cb6ef2 100644 --- a/src/main/java/server/maps/MapleTVEffect.java +++ b/src/main/java/server/maps/MapleTVEffect.java @@ -24,7 +24,7 @@ package server.maps; import client.MapleCharacter; import net.server.Server; import server.TimerManager; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.util.List; @@ -51,8 +51,8 @@ public class MapleTVEffect { Server server = Server.getInstance(); ACTIVE[userWorld] = activity; if (activity) { - server.broadcastMessage(userWorld, MaplePacketCreator.enableTV()); - server.broadcastMessage(userWorld, MaplePacketCreator.sendTV(user, message, type <= 2 ? type : type - 3, partner)); + server.broadcastMessage(userWorld, PacketCreator.enableTV()); + server.broadcastMessage(userWorld, PacketCreator.sendTV(user, message, type <= 2 ? type : type - 3, partner)); int delay = 15000; if (type == 4) { delay = 30000; @@ -61,7 +61,7 @@ public class MapleTVEffect { } TimerManager.getInstance().schedule(() -> broadcastTV(false, userWorld, null, null, -1, null), delay); } else { - server.broadcastMessage(userWorld, MaplePacketCreator.removeTV()); + server.broadcastMessage(userWorld, PacketCreator.removeTV()); } } } diff --git a/src/main/java/server/minigame/MapleRockPaperScissor.java b/src/main/java/server/minigame/MapleRockPaperScissor.java index 16832abcc0..86b5b183b4 100644 --- a/src/main/java/server/minigame/MapleRockPaperScissor.java +++ b/src/main/java/server/minigame/MapleRockPaperScissor.java @@ -3,7 +3,7 @@ package server.minigame; import client.MapleClient; import client.inventory.Item; import client.inventory.manipulator.MapleInventoryManipulator; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Randomizer; /** @@ -18,7 +18,7 @@ public class MapleRockPaperScissor{ private boolean win = false; public MapleRockPaperScissor(final MapleClient c, final byte mode){ - c.announce(MaplePacketCreator.rpsMode((byte) (9 + mode))); + c.announce(PacketCreator.rpsMode((byte) (9 + mode))); if(mode == 0){ c.getPlayer().gainMeso(-1000, true, true, true); } @@ -28,14 +28,14 @@ public class MapleRockPaperScissor{ if(ableAnswer && !win && answer >= 0 && answer <= 2){ final int response = Randomizer.nextInt(3); if(response == answer){ - c.announce(MaplePacketCreator.rpsSelection((byte) response, (byte) round)); + c.announce(PacketCreator.rpsSelection((byte) response, (byte) round)); // dont do anything. they can still answer once a draw }else if((answer == 0 && response == 2) || (answer == 1 && response == 0) || (answer == 2 && response == 1)){ // they win - c.announce(MaplePacketCreator.rpsSelection((byte) response, (byte) (round + 1))); + c.announce(PacketCreator.rpsSelection((byte) response, (byte) (round + 1))); ableAnswer = false; win = true; }else{ // they lose - c.announce(MaplePacketCreator.rpsSelection((byte) response, (byte) -1)); + c.announce(PacketCreator.rpsSelection((byte) response, (byte) -1)); ableAnswer = false; } return true; @@ -47,7 +47,7 @@ public class MapleRockPaperScissor{ public final boolean timeOut(final MapleClient c){ if(ableAnswer && !win){ ableAnswer = false; - c.announce(MaplePacketCreator.rpsMode((byte) 0x0A)); + c.announce(PacketCreator.rpsMode((byte) 0x0A)); return true; } reward(c); @@ -60,7 +60,7 @@ public class MapleRockPaperScissor{ if(round < 10){ win = false; ableAnswer = true; - c.announce(MaplePacketCreator.rpsMode((byte) 0x0C)); + c.announce(PacketCreator.rpsMode((byte) 0x0C)); return true; } else { round = 10; @@ -79,6 +79,6 @@ public class MapleRockPaperScissor{ public final void dispose(final MapleClient c){ reward(c); - c.announce(MaplePacketCreator.rpsMode((byte) 0x0D)); + c.announce(PacketCreator.rpsMode((byte) 0x0D)); } } diff --git a/src/main/java/server/partyquest/AriantColiseum.java b/src/main/java/server/partyquest/AriantColiseum.java index 0b08f79b3d..735a2d2ad1 100644 --- a/src/main/java/server/partyquest/AriantColiseum.java +++ b/src/main/java/server/partyquest/AriantColiseum.java @@ -25,7 +25,7 @@ import server.TimerManager; import server.expeditions.MapleExpedition; import server.expeditions.MapleExpeditionType; import server.maps.MapleMap; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.util.ArrayList; import java.util.HashMap; @@ -76,7 +76,7 @@ public class AriantColiseum { } for (MapleCharacter mc : players) { - mc.announce(MaplePacketCreator.updateAriantPQRanking(score)); + mc.announce(PacketCreator.updateAriantPQRanking(score)); } setAriantScoreBoard(TimerManager.getInstance().schedule(() -> showArenaResults(), pqTimerBoard)); @@ -144,7 +144,7 @@ public class AriantColiseum { private void broadcastAriantScoreUpdate() { if (scoreDirty) { for (MapleCharacter chr : score.keySet()) { - chr.announce(MaplePacketCreator.updateAriantPQRanking(score)); + chr.announce(PacketCreator.updateAriantPQRanking(score)); } scoreDirty = false; } @@ -193,7 +193,7 @@ public class AriantColiseum { eventClear = true; if (map != null) { - map.broadcastMessage(MaplePacketCreator.showAriantScoreBoard()); + map.broadcastMessage(PacketCreator.showAriantScoreBoard()); map.killAllMonsters(); distributeAriantPoints(); diff --git a/src/main/java/server/partyquest/MonsterCarnival.java b/src/main/java/server/partyquest/MonsterCarnival.java index ea1064eac6..3151a47d9a 100644 --- a/src/main/java/server/partyquest/MonsterCarnival.java +++ b/src/main/java/server/partyquest/MonsterCarnival.java @@ -10,7 +10,7 @@ import net.server.world.MaplePartyCharacter; import server.TimerManager; import server.maps.MapleMap; import server.maps.MapleReactor; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.util.concurrent.ScheduledFuture; @@ -346,7 +346,7 @@ public class MonsterCarnival { } startTime = System.currentTimeMillis() + 3 * 60 * 1000; - map.broadcastMessage(MaplePacketCreator.getClock(3 * 60)); + map.broadcastMessage(PacketCreator.getClock(3 * 60)); timer = TimerManager.getInstance().schedule(() -> timeUp(), map.getTimeExpand() * 1000); effectTimer = TimerManager.getInstance().schedule(() -> complete(), map.getTimeExpand() * 1000 - 10 * 1000); // thanks Vcoc for noticing a time set issue here @@ -374,12 +374,12 @@ public class MonsterCarnival { MapleCharacter mc = mpc.getPlayer(); if (mc != null) { if (redWin) { - mc.getClient().announce(MaplePacketCreator.showEffect("quest/carnival/win")); - mc.getClient().announce(MaplePacketCreator.playSound("MobCarnival/Win")); + mc.getClient().announce(PacketCreator.showEffect("quest/carnival/win")); + mc.getClient().announce(PacketCreator.playSound("MobCarnival/Win")); mc.dispelDebuffs(); } else { - mc.getClient().announce(MaplePacketCreator.showEffect("quest/carnival/lose")); - mc.getClient().announce(MaplePacketCreator.playSound("MobCarnival/Lose")); + mc.getClient().announce(PacketCreator.showEffect("quest/carnival/lose")); + mc.getClient().announce(PacketCreator.playSound("MobCarnival/Lose")); mc.dispelDebuffs(); } } @@ -388,12 +388,12 @@ public class MonsterCarnival { MapleCharacter mc = mpc.getPlayer(); if (mc != null) { if (!redWin) { - mc.getClient().announce(MaplePacketCreator.showEffect("quest/carnival/win")); - mc.getClient().announce(MaplePacketCreator.playSound("MobCarnival/Win")); + mc.getClient().announce(PacketCreator.showEffect("quest/carnival/win")); + mc.getClient().announce(PacketCreator.playSound("MobCarnival/Win")); mc.dispelDebuffs(); } else { - mc.getClient().announce(MaplePacketCreator.showEffect("quest/carnival/lose")); - mc.getClient().announce(MaplePacketCreator.playSound("MobCarnival/Lose")); + mc.getClient().announce(PacketCreator.showEffect("quest/carnival/lose")); + mc.getClient().announce(PacketCreator.playSound("MobCarnival/Lose")); mc.dispelDebuffs(); } } diff --git a/src/main/java/server/partyquest/MonsterCarnivalParty.java b/src/main/java/server/partyquest/MonsterCarnivalParty.java index ab57498e25..7058163bc2 100644 --- a/src/main/java/server/partyquest/MonsterCarnivalParty.java +++ b/src/main/java/server/partyquest/MonsterCarnivalParty.java @@ -1,10 +1,11 @@ package server.partyquest; import client.MapleCharacter; +import server.maps.MapleMap; +import tools.PacketCreator; + import java.util.LinkedList; import java.util.List; -import server.maps.MapleMap; -import tools.MaplePacketCreator; /** * @author Rob @@ -111,7 +112,7 @@ public class MonsterCarnivalParty { final String effect = winner ? "quest/carnival/win" : "quest/carnival/lose"; for (final MapleCharacter chr : members) { - chr.announce(MaplePacketCreator.showEffect(effect)); + chr.announce(PacketCreator.showEffect(effect)); } } diff --git a/src/main/java/server/partyquest/Pyramid.java b/src/main/java/server/partyquest/Pyramid.java index 7c9560afc1..ff737cb9d4 100644 --- a/src/main/java/server/partyquest/Pyramid.java +++ b/src/main/java/server/partyquest/Pyramid.java @@ -26,7 +26,7 @@ import client.MapleCharacter; import net.server.world.MapleParty; import server.MapleItemInformationProvider; import server.TimerManager; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.util.concurrent.ScheduledFuture; @@ -151,8 +151,8 @@ public class Pyramid extends PartyQuest { public void broadcastInfo(String info, int amount) { for (MapleCharacter chr : getParticipants()) { - chr.announce(MaplePacketCreator.getEnergy("massacre_" + info, amount)); - chr.announce(MaplePacketCreator.pyramidGauge(count)); + chr.announce(PacketCreator.getEnergy("massacre_" + info, amount)); + chr.announce(PacketCreator.pyramidGauge(count)); } } @@ -177,7 +177,7 @@ public class Pyramid extends PartyQuest { skill++; MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); for (MapleCharacter chr : getParticipants()) { - chr.announce(MaplePacketCreator.getEnergy("massacre_skill", skill)); + chr.announce(PacketCreator.getEnergy("massacre_skill", skill)); ii.getItemEffect(2022586).applyTo(chr); } } else if (buffcount == 2 && total >= 1000) { @@ -185,7 +185,7 @@ public class Pyramid extends PartyQuest { skill++; MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); for (MapleCharacter chr : getParticipants()) { - chr.announce(MaplePacketCreator.getEnergy("massacre_skill", skill)); + chr.announce(PacketCreator.getEnergy("massacre_skill", skill)); ii.getItemEffect(2022587).applyTo(chr); } } else if (buffcount == 3 && total >= 1500) { @@ -196,7 +196,7 @@ public class Pyramid extends PartyQuest { skill++; MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); for (MapleCharacter chr : getParticipants()) { - chr.announce(MaplePacketCreator.getEnergy("massacre_skill", skill)); + chr.announce(PacketCreator.getEnergy("massacre_skill", skill)); ii.getItemEffect(2022588).applyTo(chr); } } else if (buffcount == 5 && total >= 2500) { @@ -229,7 +229,7 @@ public class Pyramid extends PartyQuest { exp += ((kill * 2) + (cool * 10)); } - chr.announce(MaplePacketCreator.pyramidScore(rank, exp)); + chr.announce(PacketCreator.pyramidScore(rank, exp)); chr.gainExp(exp, true, true); } } diff --git a/src/main/java/server/quest/MapleQuest.java b/src/main/java/server/quest/MapleQuest.java index 5495a51726..6dbacf6e2c 100644 --- a/src/main/java/server/quest/MapleQuest.java +++ b/src/main/java/server/quest/MapleQuest.java @@ -32,7 +32,7 @@ import provider.MapleDataTool; import provider.wz.WZFiles; import server.quest.actions.*; import server.quest.requirements.*; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.StringUtil; import java.util.*; @@ -315,7 +315,7 @@ public class MapleQuest { return false; } if (timeLimit > 0) { - chr.announce(MaplePacketCreator.removeQuestTimeLimit(id)); + chr.announce(PacketCreator.removeQuestTimeLimit(id)); } MapleQuestStatus newStatus = new MapleQuestStatus(this, MapleQuestStatus.Status.NOT_STARTED); newStatus.setForfeited(chr.getQuest(this).getForfeited() + 1); @@ -361,7 +361,7 @@ public class MapleQuest { public boolean forceComplete(MapleCharacter chr, int npc) { if (timeLimit > 0) { - chr.announce(MaplePacketCreator.removeQuestTimeLimit(id)); + chr.announce(PacketCreator.removeQuestTimeLimit(id)); } MapleQuestStatus newStatus = new MapleQuestStatus(this, MapleQuestStatus.Status.COMPLETED, npc); @@ -370,8 +370,8 @@ public class MapleQuest { newStatus.setCompletionTime(System.currentTimeMillis()); chr.updateQuestStatus(newStatus); - chr.announce(MaplePacketCreator.showSpecialEffect(9)); // Quest completion - chr.getMap().broadcastMessage(chr, MaplePacketCreator.showForeignEffect(chr.getId(), 9), false); //use 9 instead of 12 for both + chr.announce(PacketCreator.showSpecialEffect(9)); // Quest completion + chr.getMap().broadcastMessage(chr, PacketCreator.showForeignEffect(chr.getId(), 9), false); //use 9 instead of 12 for both return true; } diff --git a/src/main/java/server/quest/actions/ItemAction.java b/src/main/java/server/quest/actions/ItemAction.java index 25271baa56..3cb5f02afc 100644 --- a/src/main/java/server/quest/actions/ItemAction.java +++ b/src/main/java/server/quest/actions/ItemAction.java @@ -33,7 +33,7 @@ import server.MapleItemInformationProvider; import server.quest.MapleQuest; import server.quest.MapleQuestActionType; import tools.FilePrinter; -import tools.MaplePacketCreator; +import tools.PacketCreator; import tools.Pair; import tools.Randomizer; @@ -143,14 +143,14 @@ public class ItemAction extends MapleQuestAction { } MapleInventoryManipulator.removeById(chr.getClient(), type, itemid, quantity, true, false); - chr.announce(MaplePacketCreator.getShowItemGain(itemid, (short) count, true)); + chr.announce(PacketCreator.getShowItemGain(itemid, (short) count, true)); } for(ItemData iEntry: giveItem) { int itemid = iEntry.getId(), count = iEntry.getCount(), period = iEntry.getPeriod(); // thanks Vcoc for noticing quest milestone item not getting removed from inventory after a while MapleInventoryManipulator.addById(chr.getClient(), itemid, (short) count, "", -1, period > 0 ? (System.currentTimeMillis() + period * 60 * 1000) : -1); - chr.announce(MaplePacketCreator.getShowItemGain(itemid, (short) count, true)); + chr.announce(PacketCreator.getShowItemGain(itemid, (short) count, true)); } } diff --git a/src/main/java/server/quest/actions/NextQuestAction.java b/src/main/java/server/quest/actions/NextQuestAction.java index 234bfc95fd..b4598e9c4c 100644 --- a/src/main/java/server/quest/actions/NextQuestAction.java +++ b/src/main/java/server/quest/actions/NextQuestAction.java @@ -27,7 +27,7 @@ import provider.MapleData; import provider.MapleDataTool; import server.quest.MapleQuest; import server.quest.MapleQuestActionType; -import tools.MaplePacketCreator; +import tools.PacketCreator; /** * @@ -50,6 +50,6 @@ public class NextQuestAction extends MapleQuestAction { @Override public void run(MapleCharacter chr, Integer extSelection) { MapleQuestStatus status = chr.getQuest(MapleQuest.getInstance(questID)); - chr.announce(MaplePacketCreator.updateQuestFinish((short) questID, status.getNpc(), (short) nextQuest)); + chr.announce(PacketCreator.updateQuestFinish((short) questID, status.getNpc(), (short) nextQuest)); } } diff --git a/src/main/java/tools/LogHelper.java b/src/main/java/tools/LogHelper.java index 3a7e83ccf6..ceedac0648 100644 --- a/src/main/java/tools/LogHelper.java +++ b/src/main/java/tools/LogHelper.java @@ -35,7 +35,7 @@ public class LogHelper { } public static void logExpedition(MapleExpedition expedition) { - Server.getInstance().broadcastGMMessage(expedition.getLeader().getWorld(), MaplePacketCreator.serverNotice(6, expedition.getType().toString() + " Expedition with leader " + expedition.getLeader().getName() + " finished after " + getTimeString(expedition.getStartTime()))); + Server.getInstance().broadcastGMMessage(expedition.getLeader().getWorld(), PacketCreator.serverNotice(6, expedition.getType().toString() + " Expedition with leader " + expedition.getLeader().getName() + " finished after " + getTimeString(expedition.getStartTime()))); String log = expedition.getType().toString() + " EXPEDITION\r\n"; log += getTimeString(expedition.getStartTime()) + "\r\n"; diff --git a/src/main/java/tools/MaplePacketCreator.java b/src/main/java/tools/PacketCreator.java similarity index 99% rename from src/main/java/tools/MaplePacketCreator.java rename to src/main/java/tools/PacketCreator.java index 1c321610d5..d23bed5ae4 100644 --- a/src/main/java/tools/MaplePacketCreator.java +++ b/src/main/java/tools/PacketCreator.java @@ -81,7 +81,7 @@ import java.util.stream.Collectors; * * @author Frz */ -public class MaplePacketCreator { +public class PacketCreator { public static final List> EMPTY_STATUPDATE = Collections.emptyList(); private final static long FT_UT_OFFSET = 116444736010800000L + (10000L * TimeZone.getDefault().getOffset(System.currentTimeMillis())); // normalize with timezone offset suggested by Ari diff --git a/src/main/java/tools/packets/Fishing.java b/src/main/java/tools/packets/Fishing.java index d2daa766a6..b3a883b3c8 100644 --- a/src/main/java/tools/packets/Fishing.java +++ b/src/main/java/tools/packets/Fishing.java @@ -24,7 +24,7 @@ import config.YamlConfig; import constants.game.GameConstants; import constants.inventory.ItemConstants; import server.MapleItemInformationProvider; -import tools.MaplePacketCreator; +import tools.PacketCreator; import java.util.Calendar; @@ -119,8 +119,8 @@ public class Fishing { chr.getMap().dropMessage(6, chr.getName() + " found " + rewardStr); } - chr.announce(MaplePacketCreator.showInfo(fishingEffect)); - chr.getMap().broadcastMessage(chr, MaplePacketCreator.showForeignInfo(chr.getId(), fishingEffect), false); + chr.announce(PacketCreator.showInfo(fishingEffect)); + chr.getMap().broadcastMessage(chr, PacketCreator.showForeignInfo(chr.getId(), fishingEffect), false); } public static int getRandomItem(){ diff --git a/src/main/java/tools/packets/Wedding.java b/src/main/java/tools/packets/Wedding.java index fdf8231a3b..ab688c0e1c 100644 --- a/src/main/java/tools/packets/Wedding.java +++ b/src/main/java/tools/packets/Wedding.java @@ -6,14 +6,15 @@ package tools.packets; -import client.inventory.Item; import client.MapleCharacter; -import java.util.ArrayList; -import java.util.List; -import tools.MaplePacketCreator; +import client.inventory.Item; +import tools.PacketCreator; import tools.StringUtil; import tools.data.output.MaplePacketLittleEndianWriter; +import java.util.ArrayList; +import java.util.List; + /** * CField_Wedding, CField_WeddingPhoto, CWeddingMan, OnMarriageResult, and all Wedding/Marriage enum/structs. * @@ -21,7 +22,7 @@ import tools.data.output.MaplePacketLittleEndianWriter; * * Wishlists edited by Drago (Dragohe4rt) */ -public class Wedding extends MaplePacketCreator { +public class Wedding extends PacketCreator { private static final short MARRIAGE_REQUEST = 0x48; private static final short MARRIAGE_RESULT = 0x49; private static final short WEDDING_GIFT_RESULT = 0x4A;