From 49b5730e5f2d5028032c87265b1b7853e937ee41 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 21:37:12 +0200 Subject: [PATCH] Rename and clean up MapleMessenger --- src/main/java/client/Character.java | 10 +++---- .../channel/handlers/MessengerHandler.java | 4 +-- .../{MapleMessenger.java => Messenger.java} | 28 +++++++++---------- src/main/java/net/server/world/World.java | 28 +++++++++---------- 4 files changed, 35 insertions(+), 35 deletions(-) rename src/main/java/net/server/world/{MapleMessenger.java => Messenger.java} (84%) diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java index ae963fe906..1ff0e5f1c8 100644 --- a/src/main/java/client/Character.java +++ b/src/main/java/client/Character.java @@ -157,7 +157,7 @@ public class Character extends AbstractCharacterObject { private MaplePartyCharacter mpc = null; private Inventory[] inventory; private Job job = Job.BEGINNER; - private MapleMessenger messenger = null; + private Messenger messenger = null; private MapleMiniGame miniGame; private MapleRockPaperScissor rps; private Mount maplemount; @@ -5376,7 +5376,7 @@ public class Character extends AbstractCharacterObject { return maplemount; } - public MapleMessenger getMessenger() { + public Messenger getMessenger() { return messenger; } @@ -5603,7 +5603,7 @@ public class Character extends AbstractCharacterObject { } public void closePlayerMessenger() { - MapleMessenger m = this.getMessenger(); + Messenger m = this.getMessenger(); if (m == null) { return; } @@ -7138,7 +7138,7 @@ public class Character extends AbstractCharacterObject { int messengerid = rs.getInt("messengerid"); int position = rs.getInt("messengerposition"); if (messengerid > 0 && position < 4 && position > -1) { - MapleMessenger messenger = wserv.getMessenger(messengerid); + Messenger messenger = wserv.getMessenger(messengerid); if (messenger != null) { ret.messenger = messenger; ret.messengerposition = position; @@ -9172,7 +9172,7 @@ public class Character extends AbstractCharacterObject { this.mapid = PmapId; } - public void setMessenger(MapleMessenger messenger) { + public void setMessenger(Messenger messenger) { this.messenger = messenger; } diff --git a/src/main/java/net/server/channel/handlers/MessengerHandler.java b/src/main/java/net/server/channel/handlers/MessengerHandler.java index 64e7fd84df..fa44c5b5a9 100644 --- a/src/main/java/net/server/channel/handlers/MessengerHandler.java +++ b/src/main/java/net/server/channel/handlers/MessengerHandler.java @@ -29,8 +29,8 @@ import net.server.coordinator.world.InviteCoordinator; import net.server.coordinator.world.InviteCoordinator.InviteResult; import net.server.coordinator.world.InviteCoordinator.InviteType; import net.server.coordinator.world.InviteCoordinator.MapleInviteResult; -import net.server.world.MapleMessenger; import net.server.world.MapleMessengerCharacter; +import net.server.world.Messenger; import net.server.world.World; import tools.PacketCreator; @@ -43,7 +43,7 @@ public final class MessengerHandler extends AbstractPacketHandler { byte mode = p.readByte(); Character player = c.getPlayer(); World world = c.getWorldServer(); - MapleMessenger messenger = player.getMessenger(); + Messenger messenger = player.getMessenger(); switch (mode) { case 0x00: int messengerid = p.readInt(); diff --git a/src/main/java/net/server/world/MapleMessenger.java b/src/main/java/net/server/world/Messenger.java similarity index 84% rename from src/main/java/net/server/world/MapleMessenger.java rename to src/main/java/net/server/world/Messenger.java index 0f596f71b8..1af236df68 100644 --- a/src/main/java/net/server/world/MapleMessenger.java +++ b/src/main/java/net/server/world/Messenger.java @@ -26,28 +26,28 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -public final class MapleMessenger { - - private int id; - private List members = new ArrayList<>(3); - private boolean[] pos = new boolean[3]; +public final class Messenger { - public MapleMessenger(int id, MapleMessengerCharacter chrfor) { - this.id = id; - for (int i = 0; i < 3; i++){ - pos[i] = false; - } + private final int id; + private final List members = new ArrayList<>(3); + private final boolean[] pos = new boolean[3]; + + public Messenger(int id, MapleMessengerCharacter chrfor) { + this.id = id; + for (int i = 0; i < 3; i++) { + pos[i] = false; + } addMember(chrfor, chrfor.getPosition()); } - + public int getId() { return id; } - + public Collection getMembers() { return Collections.unmodifiableList(members); } - + public void addMember(MapleMessengerCharacter member, int position) { members.add(member); member.setPosition(position); @@ -55,7 +55,7 @@ public final class MapleMessenger { } public void removeMember(MapleMessengerCharacter member) { - int position = member.getPosition(); + int position = member.getPosition(); pos[position] = false; members.remove(member); } diff --git a/src/main/java/net/server/world/World.java b/src/main/java/net/server/world/World.java index f89d1e7ef0..c8a091727c 100644 --- a/src/main/java/net/server/world/World.java +++ b/src/main/java/net/server/world/World.java @@ -80,7 +80,7 @@ public class World { private List channels = new ArrayList<>(); private Map pnpcStep = new HashMap<>(); private Map pnpcPodium = new HashMap<>(); - private Map messengers = new HashMap<>(); + private Map messengers = new HashMap<>(); private AtomicInteger runningMessengerId = new AtomicInteger(); private Map families = new LinkedHashMap<>(); private Map relationships = new HashMap<>(); @@ -1044,12 +1044,12 @@ public class World { return foundsChars.toArray(new CharacterIdChannelPair[foundsChars.size()]); } - public MapleMessenger getMessenger(int messengerid) { + public Messenger getMessenger(int messengerid) { return messengers.get(messengerid); } public void leaveMessenger(int messengerid, MapleMessengerCharacter target) { - MapleMessenger messenger = getMessenger(messengerid); + Messenger messenger = getMessenger(messengerid); if (messenger == null) { throw new IllegalArgumentException("No messenger with the specified messengerid exists"); } @@ -1062,7 +1062,7 @@ public class World { if (isConnected(target)) { Character targetChr = getPlayerStorage().getCharacterByName(target); if (targetChr != null) { - MapleMessenger messenger = targetChr.getMessenger(); + Messenger messenger = targetChr.getMessenger(); if (messenger == null) { Character from = getChannel(fromchannel).getPlayerStorage().getCharacterByName(sender); if (from != null) { @@ -1081,7 +1081,7 @@ public class World { } } - public void addMessengerPlayer(MapleMessenger messenger, String namefrom, int fromchannel, int position) { + public void addMessengerPlayer(Messenger messenger, String namefrom, int fromchannel, int position) { for (MapleMessengerCharacter messengerchar : messenger.getMembers()) { Character chr = getPlayerStorage().getCharacterByName(messengerchar.getName()); if(chr == null){ @@ -1097,7 +1097,7 @@ public class World { } } - public void removeMessengerPlayer(MapleMessenger messenger, int position) { + public void removeMessengerPlayer(Messenger messenger, int position) { for (MapleMessengerCharacter messengerchar : messenger.getMembers()) { Character chr = getPlayerStorage().getCharacterByName(messengerchar.getName()); if (chr != null) { @@ -1106,7 +1106,7 @@ public class World { } } - public void messengerChat(MapleMessenger messenger, String chattext, String namefrom) { + public void messengerChat(Messenger messenger, String chattext, String namefrom) { String from = ""; String to1 = ""; String to2 = ""; @@ -1139,12 +1139,12 @@ public class World { } public void updateMessenger(int messengerid, String namefrom, int fromchannel) { - MapleMessenger messenger = getMessenger(messengerid); + Messenger messenger = getMessenger(messengerid); int position = messenger.getPositionByName(namefrom); updateMessenger(messenger, namefrom, position, fromchannel); } - public void updateMessenger(MapleMessenger messenger, String namefrom, int position, int fromchannel) { + public void updateMessenger(Messenger messenger, String namefrom, int position, int fromchannel) { for (MapleMessengerCharacter messengerchar : messenger.getMembers()) { Channel ch = getChannel(fromchannel); if (!(messengerchar.getName().equals(namefrom))) { @@ -1157,7 +1157,7 @@ public class World { } public void silentLeaveMessenger(int messengerid, MapleMessengerCharacter target) { - MapleMessenger messenger = getMessenger(messengerid); + Messenger messenger = getMessenger(messengerid); if (messenger == null) { throw new IllegalArgumentException("No messenger with the specified messengerid exists"); } @@ -1165,7 +1165,7 @@ public class World { } public void joinMessenger(int messengerid, MapleMessengerCharacter target, String from, int fromchannel) { - MapleMessenger messenger = getMessenger(messengerid); + Messenger messenger = getMessenger(messengerid); if (messenger == null) { throw new IllegalArgumentException("No messenger with the specified messengerid exists"); } @@ -1174,16 +1174,16 @@ public class World { } public void silentJoinMessenger(int messengerid, MapleMessengerCharacter target, int position) { - MapleMessenger messenger = getMessenger(messengerid); + Messenger messenger = getMessenger(messengerid); if (messenger == null) { throw new IllegalArgumentException("No messenger with the specified messengerid exists"); } messenger.addMember(target, position); } - public MapleMessenger createMessenger(MapleMessengerCharacter chrfor) { + public Messenger createMessenger(MapleMessengerCharacter chrfor) { int messengerid = runningMessengerId.getAndIncrement(); - MapleMessenger messenger = new MapleMessenger(messengerid, chrfor); + Messenger messenger = new Messenger(messengerid, chrfor); messengers.put(messenger.getId(), messenger); return messenger; }