From 803911c10f5cf36f8e5741e0a24b9dae054aaee8 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 21:35:06 +0200 Subject: [PATCH] Rename and clean up MapleGuildCharacter --- src/main/java/client/Character.java | 12 ++--- src/main/java/client/Client.java | 4 +- src/main/java/net/server/Server.java | 14 +++--- .../handlers/AllianceOperationHandler.java | 4 +- .../listener/MatchCheckerGuildCreation.java | 4 +- src/main/java/net/server/guild/Alliance.java | 4 +- src/main/java/net/server/guild/Guild.java | 48 +++++++++---------- ...uildCharacter.java => GuildCharacter.java} | 26 +++++----- .../java/net/server/guild/GuildPackets.java | 20 ++++---- src/main/java/net/server/world/World.java | 4 +- 10 files changed, 70 insertions(+), 70 deletions(-) rename src/main/java/net/server/guild/{MapleGuildCharacter.java => GuildCharacter.java} (89%) diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java index bcfcd45bd3..ae963fe906 100644 --- a/src/main/java/client/Character.java +++ b/src/main/java/client/Character.java @@ -47,8 +47,8 @@ import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import net.server.coordinator.world.InviteCoordinator; import net.server.guild.Alliance; import net.server.guild.Guild; +import net.server.guild.GuildCharacter; import net.server.guild.GuildPackets; -import net.server.guild.MapleGuildCharacter; import net.server.services.task.channel.FaceExpressionService; import net.server.services.task.world.CharacterSaveService; import net.server.services.type.ChannelServices; @@ -153,7 +153,7 @@ public class Character extends AbstractCharacterObject { private EventInstanceManager eventInstance = null; private MapleHiredMerchant hiredMerchant = null; private Client client; - private MapleGuildCharacter mgc = null; + private GuildCharacter mgc = null; private MaplePartyCharacter mpc = null; private Inventory[] inventory; private Job job = Job.BEGINNER; @@ -2198,7 +2198,7 @@ public class Character extends AbstractCharacterObject { try (ResultSet rs = ps.executeQuery()) { if (rs.next() && rs.getInt("guildid") > 0) { - Server.getInstance().deleteGuildCharacter(new MapleGuildCharacter(player, cid, 0, rs.getString("name"), (byte) -1, (byte) -1, 0, rs.getInt("guildrank"), rs.getInt("guildid"), false, rs.getInt("allianceRank"))); + Server.getInstance().deleteGuildCharacter(new GuildCharacter(player, cid, 0, rs.getString("name"), (byte) -1, (byte) -1, 0, rs.getInt("guildrank"), rs.getInt("guildid"), false, rs.getInt("allianceRank"))); } } } @@ -5289,11 +5289,11 @@ public class Character extends AbstractCharacterObject { return messengerposition; } - public MapleGuildCharacter getMGC() { + public GuildCharacter getMGC() { return mgc; } - public void setMGC(MapleGuildCharacter mgc) { + public void setMGC(GuildCharacter mgc) { this.mgc = mgc; } @@ -7029,7 +7029,7 @@ public class Character extends AbstractCharacterObject { ret.dojoPoints = rs.getInt("dojoPoints"); ret.dojoStage = rs.getInt("lastDojoStage"); ret.dataString = rs.getString("dataString"); - ret.mgc = new MapleGuildCharacter(ret); + ret.mgc = new GuildCharacter(ret); int buddyCapacity = rs.getInt("buddyCapacity"); ret.buddylist = new BuddyList(buddyCapacity); ret.lastExpGainTime = rs.getTimestamp("lastExpGainTime").getTime(); diff --git a/src/main/java/client/Client.java b/src/main/java/client/Client.java index 6786cc5c78..ac490c766b 100644 --- a/src/main/java/client/Client.java +++ b/src/main/java/client/Client.java @@ -44,8 +44,8 @@ import net.server.coordinator.session.IpAddresses; import net.server.coordinator.session.SessionCoordinator; import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult; import net.server.guild.Guild; +import net.server.guild.GuildCharacter; import net.server.guild.GuildPackets; -import net.server.guild.MapleGuildCharacter; import net.server.world.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -966,7 +966,7 @@ public class Client extends ChannelInboundHandlerAdapter { //final int fid = player.getFamilyId(); final BuddyList bl = player.getBuddylist(); final MapleMessengerCharacter chrm = new MapleMessengerCharacter(player, 0); - final MapleGuildCharacter chrg = player.getMGC(); + final GuildCharacter chrg = player.getMGC(); final Guild guild = player.getGuild(); player.cancelMagicDoor(); diff --git a/src/main/java/net/server/Server.java b/src/main/java/net/server/Server.java index 8f25657b8a..5e15971dec 100644 --- a/src/main/java/net/server/Server.java +++ b/src/main/java/net/server/Server.java @@ -50,7 +50,7 @@ import net.server.coordinator.session.IpAddresses; import net.server.coordinator.session.SessionCoordinator; import net.server.guild.Alliance; import net.server.guild.Guild; -import net.server.guild.MapleGuildCharacter; +import net.server.guild.GuildCharacter; import net.server.task.*; import net.server.world.World; import org.slf4j.Logger; @@ -1097,7 +1097,7 @@ public class Server { } if (mc != null) { - MapleGuildCharacter mgc = g.getMGC(mc.getId()); + GuildCharacter mgc = g.getMGC(mc.getId()); if (mgc != null) { mc.setMGC(mgc); mgc.setCharacter(mc); @@ -1118,7 +1118,7 @@ public class Server { g.setOnline(mc.getId(), bOnline, channel); } - public int addGuildMember(MapleGuildCharacter mgc, Character chr) { + public int addGuildMember(GuildCharacter mgc, Character chr) { Guild g = guilds.get(mgc.getGuildId()); if (g != null) { return g.addGuildMember(mgc, chr); @@ -1139,7 +1139,7 @@ public class Server { guilds.get(gId).resetAllianceGuildPlayersRank(); } - public void leaveGuild(MapleGuildCharacter mgc) { + public void leaveGuild(GuildCharacter mgc) { Guild g = guilds.get(mgc.getGuildId()); if (g != null) { g.leaveGuild(mgc); @@ -1160,7 +1160,7 @@ public class Server { } } - public void expelMember(MapleGuildCharacter initiator, String name, int cid) { + public void expelMember(GuildCharacter initiator, String name, int cid) { Guild g = guilds.get(initiator.getGuildId()); if (g != null) { g.expelMember(initiator, name, cid); @@ -1174,7 +1174,7 @@ public class Server { } } - public void memberLevelJobUpdate(MapleGuildCharacter mgc) { + public void memberLevelJobUpdate(GuildCharacter mgc) { Guild g = guilds.get(mgc.getGuildId()); if (g != null) { g.memberLevelJobUpdate(mgc); @@ -1242,7 +1242,7 @@ public class Server { } } - public void deleteGuildCharacter(MapleGuildCharacter mgc) { + public void deleteGuildCharacter(GuildCharacter mgc) { if (mgc.getCharacter() != null) { setGuildMemberOnline(mgc.getCharacter(), false, (byte) -1); } diff --git a/src/main/java/net/server/channel/handlers/AllianceOperationHandler.java b/src/main/java/net/server/channel/handlers/AllianceOperationHandler.java index 83f19ec027..a0f1ae16d8 100644 --- a/src/main/java/net/server/channel/handlers/AllianceOperationHandler.java +++ b/src/main/java/net/server/channel/handlers/AllianceOperationHandler.java @@ -28,8 +28,8 @@ import net.packet.InPacket; import net.server.Server; import net.server.guild.Alliance; import net.server.guild.Guild; +import net.server.guild.GuildCharacter; import net.server.guild.GuildPackets; -import net.server.guild.MapleGuildCharacter; import tools.PacketCreator; /** @@ -201,7 +201,7 @@ public final class AllianceOperationHandler extends AbstractPacketHandler { } private void changeLeaderAllianceRank(Alliance alliance, Character newLeader) { - MapleGuildCharacter lmgc = alliance.getLeader(); + GuildCharacter lmgc = alliance.getLeader(); Character leader = newLeader.getWorldServer().getPlayerStorage().getCharacterById(lmgc.getId()); leader.getMGC().setAllianceRank(2); leader.saveGuildStatus(); 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 2d82b48d22..a3745f2484 100644 --- a/src/main/java/net/server/coordinator/matchchecker/listener/MatchCheckerGuildCreation.java +++ b/src/main/java/net/server/coordinator/matchchecker/listener/MatchCheckerGuildCreation.java @@ -27,8 +27,8 @@ import net.server.Server; import net.server.coordinator.matchchecker.AbstractMatchCheckerListener; import net.server.coordinator.matchchecker.MatchCheckerListenerRecipe; import net.server.guild.Guild; +import net.server.guild.GuildCharacter; import net.server.guild.GuildPackets; -import net.server.guild.MapleGuildCharacter; import net.server.world.MapleParty; import java.util.Set; @@ -129,7 +129,7 @@ public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe { for (Character chr : matchPlayers) { boolean cofounder = chr.getPartyId() == partyid; - MapleGuildCharacter mgc = chr.getMGC(); + GuildCharacter mgc = chr.getMGC(); mgc.setGuildId(gid); mgc.setGuildRank(cofounder ? 2 : 5); mgc.setAllianceRank(5); diff --git a/src/main/java/net/server/guild/Alliance.java b/src/main/java/net/server/guild/Alliance.java index 0d94ce8ee0..c24e3f6a6f 100644 --- a/src/main/java/net/server/guild/Alliance.java +++ b/src/main/java/net/server/guild/Alliance.java @@ -403,11 +403,11 @@ public class Alliance { return name; } - public MapleGuildCharacter getLeader() { + public GuildCharacter getLeader() { synchronized (guilds) { for (Integer gId : guilds) { Guild guild = Server.getInstance().getGuild(gId); - MapleGuildCharacter mgc = guild.getMGC(guild.getLeaderId()); + GuildCharacter mgc = guild.getMGC(guild.getLeaderId()); if (mgc.getAllianceRank() == 1) { return mgc; diff --git a/src/main/java/net/server/guild/Guild.java b/src/main/java/net/server/guild/Guild.java index 1d1665778a..2658b75130 100644 --- a/src/main/java/net/server/guild/Guild.java +++ b/src/main/java/net/server/guild/Guild.java @@ -50,7 +50,7 @@ public class Guild { NONE, DISBAND, EMBLEMCHANGE } - private final List members; + private final List members; private final Lock membersLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.GUILD, true); private String[] rankTitles = new String[5]; // 1 = master, 2 = jr, 5 = lowest member @@ -97,7 +97,7 @@ public class Guild { } do { - members.add(new MapleGuildCharacter(null, rs.getInt("id"), rs.getInt("level"), rs.getString("name"), (byte) -1, world, rs.getInt("job"), rs.getInt("guildrank"), guildid, false, rs.getInt("allianceRank"))); + members.add(new GuildCharacter(null, rs.getInt("id"), rs.getInt("level"), rs.getString("name"), (byte) -1, world, rs.getInt("job"), rs.getInt("guildrank"), guildid, false, rs.getInt("allianceRank"))); } while (rs.next()); } } @@ -127,7 +127,7 @@ public class Guild { membersLock.lock(); try { - for (MapleGuildCharacter mgc : members) { + for (GuildCharacter mgc : members) { if (!mgc.isOnline()) { continue; } @@ -254,7 +254,7 @@ public class Guild { return name; } - public List getMembers() { + public List getMembers() { membersLock.lock(); try { return new ArrayList<>(members); @@ -274,7 +274,7 @@ public class Guild { public void broadcastNameChanged() { PlayerStorage ps = Server.getInstance().getWorld(world).getPlayerStorage(); - for (MapleGuildCharacter mgc : getMembers()) { + for (GuildCharacter mgc : getMembers()) { Character chr = ps.getCharacterById(mgc.getId()); if (chr == null || !chr.isLoggedinWorld()) { continue; @@ -288,7 +288,7 @@ public class Guild { public void broadcastEmblemChanged() { PlayerStorage ps = Server.getInstance().getWorld(world).getPlayerStorage(); - for (MapleGuildCharacter mgc : getMembers()) { + for (GuildCharacter mgc : getMembers()) { Character chr = ps.getCharacterById(mgc.getId()); if (chr == null || !chr.isLoggedinWorld()) { continue; @@ -302,7 +302,7 @@ public class Guild { public void broadcastInfoChanged() { PlayerStorage ps = Server.getInstance().getWorld(world).getPlayerStorage(); - for (MapleGuildCharacter mgc : getMembers()) { + for (GuildCharacter mgc : getMembers()) { Character chr = ps.getCharacterById(mgc.getId()); if (chr == null || !chr.isLoggedinWorld()) { continue; @@ -352,7 +352,7 @@ public class Guild { public void guildMessage(Packet serverNotice) { membersLock.lock(); try { - for (MapleGuildCharacter mgc : members) { + for (GuildCharacter mgc : members) { for (Channel cs : Server.getInstance().getChannelsFromWorld(world)) { if (cs.getPlayerStorage().getCharacterById(mgc.getId()) != null) { cs.getPlayerStorage().getCharacterById(mgc.getId()).sendPacket(serverNotice); @@ -372,7 +372,7 @@ public class Guild { public void dropMessage(int type, String message) { membersLock.lock(); try { - for (MapleGuildCharacter mgc : members) { + for (GuildCharacter mgc : members) { if (mgc.getCharacter() != null) { mgc.getCharacter().dropMessage(type, message); } @@ -390,7 +390,7 @@ public class Guild { membersLock.lock(); try { boolean bBroadcast = true; - for (MapleGuildCharacter mgc : members) { + for (GuildCharacter mgc : members) { if (mgc.getId() == cid) { if (mgc.isOnline() && online) { bBroadcast = false; @@ -464,7 +464,7 @@ public class Guild { } } - public int addGuildMember(MapleGuildCharacter mgc, Character chr) { + public int addGuildMember(GuildCharacter mgc, Character chr) { membersLock.lock(); try { if (members.size() >= capacity) { @@ -486,7 +486,7 @@ public class Guild { } } - public void leaveGuild(MapleGuildCharacter mgc) { + public void leaveGuild(GuildCharacter mgc) { membersLock.lock(); try { this.broadcast(GuildPackets.memberLeft(mgc, false)); @@ -497,11 +497,11 @@ public class Guild { } } - public void expelMember(MapleGuildCharacter initiator, String name, int cid) { + public void expelMember(GuildCharacter initiator, String name, int cid) { membersLock.lock(); try { - java.util.Iterator itr = members.iterator(); - MapleGuildCharacter mgc; + java.util.Iterator itr = members.iterator(); + GuildCharacter mgc; while (itr.hasNext()) { mgc = itr.next(); if (mgc.getId() == cid && initiator.getGuildRank() < mgc.getGuildRank()) { @@ -541,7 +541,7 @@ public class Guild { public void changeRank(int cid, int newRank) { membersLock.lock(); try { - for (MapleGuildCharacter mgc : members) { + for (GuildCharacter mgc : members) { if (cid == mgc.getId()) { changeRank(mgc, newRank); return; @@ -552,7 +552,7 @@ public class Guild { } } - public void changeRank(MapleGuildCharacter mgc, int newRank) { + public void changeRank(GuildCharacter mgc, int newRank) { try { if (mgc.isOnline()) { Server.getInstance().getWorld(mgc.getWorld()).setGuildAndRank(mgc.getId(), this.id, newRank); @@ -586,10 +586,10 @@ public class Guild { } } - public void memberLevelJobUpdate(MapleGuildCharacter mgc) { + public void memberLevelJobUpdate(GuildCharacter mgc) { membersLock.lock(); try { - for (MapleGuildCharacter member : members) { + for (GuildCharacter member : members) { if (mgc.equals(member)) { member.setJobId(mgc.getJobId()); member.setLevel(mgc.getLevel()); @@ -604,10 +604,10 @@ public class Guild { @Override public boolean equals(Object other) { - if (!(other instanceof MapleGuildCharacter)) { + if (!(other instanceof GuildCharacter)) { return false; } - MapleGuildCharacter o = (MapleGuildCharacter) other; + GuildCharacter o = (GuildCharacter) other; return (o.getId() == id && o.getName().equals(name)); } @@ -663,10 +663,10 @@ public class Guild { } } - public MapleGuildCharacter getMGC(int cid) { + public GuildCharacter getMGC(int cid) { membersLock.lock(); try { - for (MapleGuildCharacter mgc : members) { + for (GuildCharacter mgc : members) { if (mgc.getId() == cid) { return mgc; } @@ -793,7 +793,7 @@ public class Guild { try { membersLock.lock(); try { - for (MapleGuildCharacter mgc : members) { + for (GuildCharacter mgc : members) { if (mgc.isOnline()) { mgc.setAllianceRank(5); } diff --git a/src/main/java/net/server/guild/MapleGuildCharacter.java b/src/main/java/net/server/guild/GuildCharacter.java similarity index 89% rename from src/main/java/net/server/guild/MapleGuildCharacter.java rename to src/main/java/net/server/guild/GuildCharacter.java index f748064a64..dff14a3558 100644 --- a/src/main/java/net/server/guild/MapleGuildCharacter.java +++ b/src/main/java/net/server/guild/GuildCharacter.java @@ -23,19 +23,19 @@ package net.server.guild; import client.Character; -public class MapleGuildCharacter { +public class GuildCharacter { private Character character; private int level; - private int id; + private final int id; private int world, channel; private int jobid; private int guildrank; private int guildid; private int allianceRank; private boolean online; - private String name; + private final String name; - public MapleGuildCharacter(Character chr) { + public GuildCharacter(Character chr) { this.character = chr; this.name = chr.getName(); this.level = chr.getLevel(); @@ -49,7 +49,7 @@ public class MapleGuildCharacter { this.allianceRank = chr.getAllianceRank(); } - public MapleGuildCharacter(Character chr, int _id, int _lv, String _name, int _channel, int _world, int _job, int _rank, int _gid, boolean _on, int _allianceRank) { + public GuildCharacter(Character chr, int _id, int _lv, String _name, int _channel, int _world, int _job, int _rank, int _gid, boolean _on, int _allianceRank) { this.character = chr; this.level = _lv; this.id = _id; @@ -64,11 +64,11 @@ public class MapleGuildCharacter { this.guildid = _gid; this.allianceRank = _allianceRank; } - + public void setCharacter(Character ch) { this.character = ch; } - + public Character getCharacter() { return character; } @@ -113,7 +113,7 @@ public class MapleGuildCharacter { guildid = gid; character.setGuildId(gid); } - + public int getGuildRank() { return guildrank; } @@ -121,16 +121,16 @@ public class MapleGuildCharacter { public void setOfflineGuildRank(int rank) { guildrank = rank; } - + public void setGuildRank(int rank) { guildrank = rank; character.setGuildRank(rank); } - + public int getAllianceRank() { return allianceRank; } - + public void setAllianceRank(int rank) { allianceRank = rank; character.setAllianceRank(rank); @@ -150,10 +150,10 @@ public class MapleGuildCharacter { @Override public boolean equals(Object other) { - if (!(other instanceof MapleGuildCharacter)) { + if (!(other instanceof GuildCharacter)) { return false; } - MapleGuildCharacter o = (MapleGuildCharacter) other; + GuildCharacter o = (GuildCharacter) other; return (o.getId() == id && o.getName().equals(name)); } diff --git a/src/main/java/net/server/guild/GuildPackets.java b/src/main/java/net/server/guild/GuildPackets.java index 9bc131cec0..f3420ffdf0 100644 --- a/src/main/java/net/server/guild/GuildPackets.java +++ b/src/main/java/net/server/guild/GuildPackets.java @@ -34,12 +34,12 @@ public class GuildPackets { for (int i = 1; i <= 5; i++) { p.writeString(g.getRankTitle(i)); } - Collection members = g.getMembers(); + Collection members = g.getMembers(); p.writeByte(members.size()); //then it is the size of all the members - for (MapleGuildCharacter mgc : members) {//and each of their character ids o_O + for (GuildCharacter mgc : members) {//and each of their character ids o_O p.writeInt(mgc.getId()); } - for (MapleGuildCharacter mgc : members) { + for (GuildCharacter mgc : members) { p.writeFixedString(StringUtil.getRightPaddedStr(mgc.getName(), '\0', 13)); p.writeInt(mgc.getJobId()); p.writeInt(mgc.getLevel()); @@ -121,7 +121,7 @@ public class GuildPackets { return p; } - public static Packet newGuildMember(MapleGuildCharacter mgc) { + public static Packet newGuildMember(GuildCharacter mgc) { OutPacket p = OutPacket.create(SendOpcode.GUILD_OPERATION); p.writeByte(0x27); p.writeInt(mgc.getGuildId()); @@ -137,7 +137,7 @@ public class GuildPackets { } //someone leaving, mode == 0x2c for leaving, 0x2f for expelled - public static Packet memberLeft(MapleGuildCharacter mgc, boolean bExpelled) { + public static Packet memberLeft(GuildCharacter mgc, boolean bExpelled) { OutPacket p = OutPacket.create(SendOpcode.GUILD_OPERATION); p.writeByte(bExpelled ? 0x2f : 0x2c); p.writeInt(mgc.getGuildId()); @@ -147,7 +147,7 @@ public class GuildPackets { } //rank change - public static Packet changeRank(MapleGuildCharacter mgc) { + public static Packet changeRank(GuildCharacter mgc) { OutPacket p = OutPacket.create(SendOpcode.GUILD_OPERATION); p.writeByte(0x40); p.writeInt(mgc.getGuildId()); @@ -164,7 +164,7 @@ public class GuildPackets { return p; } - public static Packet guildMemberLevelJobUpdate(MapleGuildCharacter mgc) { + public static Packet guildMemberLevelJobUpdate(GuildCharacter mgc) { OutPacket p = OutPacket.create(SendOpcode.GUILD_OPERATION); p.writeByte(0x3C); p.writeInt(mgc.getGuildId()); @@ -341,12 +341,12 @@ public class GuildPackets { for (int i = 1; i <= 5; i++) { p.writeString(guild.getRankTitle(i)); } - Collection members = guild.getMembers(); + Collection members = guild.getMembers(); p.writeByte(members.size()); - for (MapleGuildCharacter mgc : members) { + for (GuildCharacter mgc : members) { p.writeInt(mgc.getId()); } - for (MapleGuildCharacter mgc : members) { + for (GuildCharacter mgc : members) { p.writeFixedString(StringUtil.getRightPaddedStr(mgc.getName(), '\0', 13)); p.writeInt(mgc.getJobId()); p.writeInt(mgc.getLevel()); diff --git a/src/main/java/net/server/world/World.java b/src/main/java/net/server/world/World.java index 7526bcd49b..dd42ad0f91 100644 --- a/src/main/java/net/server/world/World.java +++ b/src/main/java/net/server/world/World.java @@ -45,8 +45,8 @@ import net.server.coordinator.world.InviteCoordinator; import net.server.coordinator.world.InviteCoordinator.InviteResult; import net.server.coordinator.world.InviteCoordinator.InviteType; import net.server.guild.Guild; +import net.server.guild.GuildCharacter; import net.server.guild.GuildPackets; -import net.server.guild.MapleGuildCharacter; import net.server.guild.MapleGuildSummary; import net.server.services.BaseService; import net.server.services.ServicesManager; @@ -576,7 +576,7 @@ public class World { } } - public Guild getGuild(MapleGuildCharacter mgc) { + public Guild getGuild(GuildCharacter mgc) { if(mgc == null) return null; int gid = mgc.getGuildId();