Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleCharacter

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:09:45 +02:00
parent 46bd0570d7
commit 7dc3a2159a
379 changed files with 3418 additions and 3373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

197
src/main/java/tools/PacketCreator.java
View File

@@ -20,8 +20,9 @@
*/
package tools;
import client.Character;
import client.*;
import client.MapleCharacter.SkillEntry;
import client.Character.SkillEntry;
import client.inventory.*;
import client.inventory.Equip.ScrollResult;
import client.keybind.KeyBinding;
@@ -110,7 +111,7 @@ public class PacketCreator {
return p;
}
private static void addRemainingSkillInfo(final OutPacket p, MapleCharacter chr) {
private static void addRemainingSkillInfo(final OutPacket p, Character chr) {
int[] remainingSp = chr.getRemainingSps();
int effectiveLength = 0;
for (int j : remainingSp) {
@@ -128,7 +129,7 @@ public class PacketCreator {
}
}
private static void addCharStats(OutPacket p, MapleCharacter chr) {
private static void addCharStats(OutPacket p, Character chr) {
p.writeInt(chr.getId()); // character id
p.writeFixedString(StringUtil.getRightPaddedStr(chr.getName(), '\0', 13));
p.writeByte(chr.getGender()); // gender (0 = male, 1 = female)
@@ -170,7 +171,7 @@ public class PacketCreator {
p.writeInt(0);
}
protected static void addCharLook(final OutPacket p, MapleCharacter chr, boolean mega) {
protected static void addCharLook(final OutPacket p, Character chr, boolean mega) {
p.writeByte(chr.getGender());
p.writeByte(chr.getSkinColor().getId()); // skin color
p.writeInt(chr.getFace()); // face
@@ -179,7 +180,7 @@ public class PacketCreator {
addCharEquips(p, chr);
}
private static void addCharacterInfo(OutPacket p, MapleCharacter chr) {
private static void addCharacterInfo(OutPacket p, Character chr) {
p.writeLong(-1);
p.writeByte(0);
addCharStats(p, chr);
@@ -205,7 +206,7 @@ public class PacketCreator {
p.writeShort(0);
}
private static void addNewYearInfo(OutPacket p, MapleCharacter chr) {
private static void addNewYearInfo(OutPacket p, Character chr) {
Set<NewYearCardRecord> received = chr.getReceivedNewYearRecords();
p.writeShort(received.size());
@@ -214,7 +215,7 @@ public class PacketCreator {
}
}
private static void addTeleportInfo(OutPacket p, MapleCharacter chr) {
private static void addTeleportInfo(OutPacket p, Character chr) {
final List<Integer> tele = chr.getTrockMaps();
final List<Integer> viptele = chr.getVipTrockMaps();
for (int i = 0; i < 5; i++) {
@@ -225,7 +226,7 @@ public class PacketCreator {
}
}
private static void addMiniGameInfo(OutPacket p, MapleCharacter chr) {
private static void addMiniGameInfo(OutPacket p, Character chr) {
p.writeShort(0);
/*for (int m = size; m > 0; m--) {//nexon does this :P
p.writeInt(0);
@@ -236,7 +237,7 @@ public class PacketCreator {
}*/
}
private static void addAreaInfo(OutPacket p, MapleCharacter chr) {
private static void addAreaInfo(OutPacket p, Character chr) {
Map<Short, String> areaInfos = chr.getAreaInfos();
p.writeShort(areaInfos.size());
for (Short area : areaInfos.keySet()) {
@@ -245,7 +246,7 @@ public class PacketCreator {
}
}
private static void addCharEquips(final OutPacket p, MapleCharacter chr) {
private static void addCharEquips(final OutPacket p, Character chr) {
Inventory equip = chr.getInventory(InventoryType.EQUIPPED);
Collection<Item> ii = MapleItemInformationProvider.getInstance().canWearEquipment(chr, equip.list());
Map<Short, Integer> myEquip = new LinkedHashMap<>();
@@ -291,7 +292,7 @@ public class PacketCreator {
return p;
}
private static void addCharEntry(OutPacket p, MapleCharacter chr, boolean viewall) {
private static void addCharEntry(OutPacket p, Character chr, boolean viewall) {
addCharStats(p, chr);
addCharLook(p, chr, false);
if (!viewall) {
@@ -308,7 +309,7 @@ public class PacketCreator {
p.writeInt(chr.getJobRankMove()); // move (negative is downwards)
}
private static void addQuestInfo(OutPacket p, MapleCharacter chr) {
private static void addQuestInfo(OutPacket p, Character chr) {
List<MapleQuestStatus> started = chr.getStartedQuests();
int startedSize = 0;
for (MapleQuestStatus qs : started) {
@@ -439,7 +440,7 @@ public class PacketCreator {
}
private static void addInventoryInfo(OutPacket p, MapleCharacter chr) {
private static void addInventoryInfo(OutPacket p, Character chr) {
for (byte i = 1; i <= 5; i++) {
p.writeByte(chr.getInventory(InventoryType.getByType(i)).getSlotLimit());
}
@@ -484,9 +485,9 @@ public class PacketCreator {
}
}
private static void addSkillInfo(OutPacket p, MapleCharacter chr) {
private static void addSkillInfo(OutPacket p, Character chr) {
p.writeByte(0); // start of skills
Map<Skill, MapleCharacter.SkillEntry> skills = chr.getSkills();
Map<Skill, Character.SkillEntry> skills = chr.getSkills();
int skillsSize = skills.size();
// We don't want to include any hidden skill in this, so subtract them from the size list and ignore them.
for (Entry<Skill, SkillEntry> skill : skills.entrySet()) {
@@ -514,7 +515,7 @@ public class PacketCreator {
}
}
private static void addMonsterBookInfo(OutPacket p, MapleCharacter chr) {
private static void addMonsterBookInfo(OutPacket p, Character chr) {
p.writeInt(chr.getMonsterBookCover()); // cover
p.writeByte(0);
Map<Integer, Integer> cards = chr.getMonsterBook().getCards();
@@ -852,9 +853,9 @@ public class PacketCreator {
public static Packet getCharList(MapleClient c, int serverId, int status) {
final OutPacket p = OutPacket.create(SendOpcode.CHARLIST);
p.writeByte(status);
List<MapleCharacter> chars = c.loadCharacters(serverId);
List<Character> chars = c.loadCharacters(serverId);
p.writeByte((byte) chars.size());
for (MapleCharacter chr : chars) {
for (Character chr : chars) {
addCharEntry(p, chr, false);
}
@@ -888,7 +889,7 @@ public class PacketCreator {
* @param partner The partner shown with chr
* @return the SEND_TV packet
*/
public static Packet sendTV(MapleCharacter chr, List<String> messages, int type, MapleCharacter partner) {
public static Packet sendTV(Character chr, List<String> messages, int type, Character partner) {
final OutPacket p = OutPacket.create(SendOpcode.SEND_TV);
p.writeByte(partner != null ? 3 : 1);
p.writeByte(type); //Heart = 2 Star = 1 Normal = 0
@@ -919,7 +920,7 @@ public class PacketCreator {
* @param chr The character to get info about.
* @return The character info packet.
*/
public static Packet getCharInfo(MapleCharacter chr) {
public static Packet getCharInfo(Character chr) {
final OutPacket p = OutPacket.create(SendOpcode.SET_FIELD);
p.writeInt(chr.getClient().getChannel() - 1);
p.writeByte(1);
@@ -950,7 +951,7 @@ public class PacketCreator {
* @param chr The update target.
* @return The stat update packet.
*/
public static Packet updatePlayerStats(List<Pair<MapleStat, Integer>> stats, boolean enableActions, MapleCharacter chr) {
public static Packet updatePlayerStats(List<Pair<MapleStat, Integer>> stats, boolean enableActions, Character chr) {
OutPacket p = OutPacket.create(SendOpcode.STAT_CHANGED);
p.writeBool(enableActions);
int updateMask = 0;
@@ -1000,7 +1001,7 @@ public class PacketCreator {
* @param chr The character warping to <code>to</code>
* @return The map change packet.
*/
public static Packet getWarpToMap(MapleMap to, int spawnPoint, MapleCharacter chr) {
public static Packet getWarpToMap(MapleMap to, int spawnPoint, Character chr) {
final OutPacket p = OutPacket.create(SendOpcode.SET_FIELD);
p.writeInt(chr.getClient().getChannel() - 1);
p.writeInt(0);//updated
@@ -1018,7 +1019,7 @@ public class PacketCreator {
return p;
}
public static Packet getWarpToMap(MapleMap to, int spawnPoint, Point spawnPosition, MapleCharacter chr) {
public static Packet getWarpToMap(MapleMap to, int spawnPoint, Point spawnPosition, Character chr) {
final OutPacket p = OutPacket.create(SendOpcode.SET_FIELD);
p.writeInt(chr.getClient().getChannel() - 1);
p.writeInt(0);//updated
@@ -1249,7 +1250,7 @@ public class PacketCreator {
* @param ear Whether or not the ear is shown for whisper.
* @return
*/
public static Packet getAvatarMega(MapleCharacter chr, String medal, int channel, int itemId, List<String> message, boolean ear) {
public static Packet getAvatarMega(Character chr, String medal, int channel, int itemId, List<String> message, boolean ear) {
final OutPacket p = OutPacket.create(SendOpcode.SET_AVATAR_MEGAPHONE);
p.writeInt(itemId);
p.writeString(medal + chr.getName());
@@ -1280,7 +1281,7 @@ public class PacketCreator {
* @param player
* @return
*/
public static Packet gachaponMessage(Item item, String town, MapleCharacter player) {
public static Packet gachaponMessage(Item item, String town, Character player) {
final OutPacket p = OutPacket.create(SendOpcode.SERVERMESSAGE);
p.writeByte(0x0B);
p.writeString(player.getName() + " : got a(n)");
@@ -1765,7 +1766,7 @@ public class PacketCreator {
return p;
}
public static Packet dropItemFromMapObject(MapleCharacter player, MapleMapItem drop, Point dropfrom, Point dropto, byte mod) {
public static Packet dropItemFromMapObject(Character player, MapleMapItem drop, Point dropfrom, Point dropto, byte mod) {
int dropType = drop.getDropType();
if (drop.hasClientsideOwnership(player) && dropType < 3) {
dropType = 2;
@@ -1792,7 +1793,7 @@ public class PacketCreator {
return p;
}
private static void writeForeignBuffs(OutPacket p, MapleCharacter chr) {
private static void writeForeignBuffs(OutPacket p, Character chr) {
p.writeInt(0);
p.writeShort(0); //v83
p.writeByte(0xFC);
@@ -1887,7 +1888,7 @@ public class PacketCreator {
* @param enteringField Whether the character to spawn is not yet present in the map or already is.
* @return The spawn player packet.
*/
public static Packet spawnPlayerMapObject(MapleClient target, MapleCharacter chr, boolean enteringField) {
public static Packet spawnPlayerMapObject(MapleClient target, Character chr, boolean enteringField) {
OutPacket p = OutPacket.create(SendOpcode.SPAWN_PLAYER);
p.writeInt(chr.getId());
p.writeByte(chr.getLevel()); //v83
@@ -1989,7 +1990,7 @@ public class PacketCreator {
return p;
}
private static void encodeNewYearCardInfo(OutPacket p, MapleCharacter chr) {
private static void encodeNewYearCardInfo(OutPacket p, Character chr) {
Set<NewYearCardRecord> newyears = chr.getReceivedNewYearRecords();
if (!newyears.isEmpty()) {
p.writeByte(1);
@@ -2003,12 +2004,12 @@ public class PacketCreator {
}
}
public static Packet onNewYearCardRes(MapleCharacter user, int cardId, int mode, int msg) {
public static Packet onNewYearCardRes(Character user, int cardId, int mode, int msg) {
NewYearCardRecord newyear = user.getNewYearRecord(cardId);
return onNewYearCardRes(user, newyear, mode, msg);
}
public static Packet onNewYearCardRes(MapleCharacter user, NewYearCardRecord newyear, int mode, int msg) {
public static Packet onNewYearCardRes(Character user, NewYearCardRecord newyear, int mode, int msg) {
OutPacket p = OutPacket.create(SendOpcode.NEW_YEAR_CARD_RES);
p.writeByte(mode);
switch (mode) {
@@ -2079,7 +2080,7 @@ public class PacketCreator {
p.writeString(newyear.getMessage());
}
private static void addRingLook(final OutPacket p, MapleCharacter chr, boolean crush) {
private static void addRingLook(final OutPacket p, Character chr, boolean crush) {
List<MapleRing> rings;
if (crush) {
rings = chr.getCrushRings();
@@ -2105,7 +2106,7 @@ public class PacketCreator {
}
}
private static void addMarriageRingLook(MapleClient target, final OutPacket p, MapleCharacter chr) {
private static void addMarriageRingLook(MapleClient target, final OutPacket p, Character chr) {
MapleRing ring = chr.getMarriageRing();
if (ring == null || !ring.equipped()) {
@@ -2113,7 +2114,7 @@ public class PacketCreator {
} else {
p.writeByte(1);
MapleCharacter targetChr = target.getPlayer();
Character targetChr = target.getPlayer();
if (targetChr != null && targetChr.getPartnerId() == chr.getId()) {
p.writeInt(0);
p.writeInt(0);
@@ -2199,7 +2200,7 @@ public class PacketCreator {
return p;
}
public static Packet facialExpression(MapleCharacter from, int expression) {
public static Packet facialExpression(Character from, int expression) {
OutPacket p = OutPacket.create(SendOpcode.FACIAL_EXPRESSION);
p.writeInt(from.getId());
p.writeInt(expression);
@@ -2289,20 +2290,20 @@ public class PacketCreator {
}
*/
public static Packet closeRangeAttack(MapleCharacter chr, int skill, int skilllevel, int stance, int numAttackedAndDamage, Map<Integer, List<Integer>> damage, int speed, int direction, int display) {
public static Packet closeRangeAttack(Character chr, int skill, int skilllevel, int stance, int numAttackedAndDamage, Map<Integer, List<Integer>> damage, int speed, int direction, int display) {
final OutPacket p = OutPacket.create(SendOpcode.CLOSE_RANGE_ATTACK);
addAttackBody(p, chr, skill, skilllevel, stance, numAttackedAndDamage, 0, damage, speed, direction, display);
return p;
}
public static Packet rangedAttack(MapleCharacter chr, int skill, int skilllevel, int stance, int numAttackedAndDamage, int projectile, Map<Integer, List<Integer>> damage, int speed, int direction, int display) {
public static Packet rangedAttack(Character chr, int skill, int skilllevel, int stance, int numAttackedAndDamage, int projectile, Map<Integer, List<Integer>> damage, int speed, int direction, int display) {
final OutPacket p = OutPacket.create(SendOpcode.RANGED_ATTACK);
addAttackBody(p, chr, skill, skilllevel, stance, numAttackedAndDamage, projectile, damage, speed, direction, display);
p.writeInt(0);
return p;
}
public static Packet magicAttack(MapleCharacter chr, int skill, int skilllevel, int stance, int numAttackedAndDamage, Map<Integer, List<Integer>> damage, int charge, int speed, int direction, int display) {
public static Packet magicAttack(Character chr, int skill, int skilllevel, int stance, int numAttackedAndDamage, Map<Integer, List<Integer>> damage, int charge, int speed, int direction, int display) {
final OutPacket p = OutPacket.create(SendOpcode.MAGIC_ATTACK);
addAttackBody(p, chr, skill, skilllevel, stance, numAttackedAndDamage, 0, damage, speed, direction, display);
if (charge != -1) {
@@ -2311,7 +2312,7 @@ public class PacketCreator {
return p;
}
private static void addAttackBody(OutPacket p, MapleCharacter chr, int skill, int skilllevel, int stance, int numAttackedAndDamage, int projectile, Map<Integer, List<Integer>> damage, int speed, int direction, int display) {
private static void addAttackBody(OutPacket p, Character chr, int skill, int skilllevel, int stance, int numAttackedAndDamage, int projectile, Map<Integer, List<Integer>> damage, int speed, int direction, int display) {
p.writeInt(chr.getId());
p.writeByte(numAttackedAndDamage);
p.writeByte(0x5B);//?
@@ -2481,16 +2482,16 @@ public class PacketCreator {
return OutPacket.create(SendOpcode.ARIANT_ARENA_SHOW_RESULT);
}
public static Packet updateAriantPQRanking(final MapleCharacter chr, final int score) {
return updateAriantPQRanking(new LinkedHashMap<MapleCharacter, Integer>() {{
public static Packet updateAriantPQRanking(final Character chr, final int score) {
return updateAriantPQRanking(new LinkedHashMap<Character, Integer>() {{
put(chr, score);
}});
}
public static Packet updateAriantPQRanking(Map<MapleCharacter, Integer> playerScore) {
public static Packet updateAriantPQRanking(Map<Character, Integer> playerScore) {
OutPacket p = OutPacket.create(SendOpcode.ARIANT_ARENA_USER_SCORE);
p.writeByte(playerScore.size());
for (Entry<MapleCharacter, Integer> e : playerScore.entrySet()) {
for (Entry<Character, Integer> e : playerScore.entrySet()) {
p.writeString(e.getKey().getName());
p.writeInt(e.getValue());
}
@@ -2545,7 +2546,7 @@ public class PacketCreator {
return p;
}
public static Packet updateCharLook(MapleClient target, MapleCharacter chr) {
public static Packet updateCharLook(MapleClient target, Character chr) {
OutPacket p = OutPacket.create(SendOpcode.UPDATE_CHAR_LOOK);
p.writeInt(chr.getId());
p.writeByte(1);
@@ -2618,7 +2619,7 @@ public class PacketCreator {
return p;
}
public static Packet addNewCharEntry(MapleCharacter chr) {
public static Packet addNewCharEntry(Character chr) {
final OutPacket p = OutPacket.create(SendOpcode.ADD_NEW_CHAR_ENTRY);
p.writeByte(0);
addCharEntry(p, chr, false);
@@ -2670,7 +2671,7 @@ public class PacketCreator {
* @param isSelf
* @return
*/
public static Packet charInfo(MapleCharacter chr) {
public static Packet charInfo(Character chr) {
//3D 00 0A 43 01 00 02 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
final OutPacket p = OutPacket.create(SendOpcode.CHAR_INFO);
p.writeInt(chr.getId());
@@ -2877,7 +2878,7 @@ public class PacketCreator {
return p;
}
public static Packet updateQuest(MapleCharacter chr, MapleQuestStatus qs, boolean infoUpdate) {
public static Packet updateQuest(Character chr, MapleQuestStatus qs, boolean infoUpdate) {
final OutPacket p = OutPacket.create(SendOpcode.SHOW_STATUS_INFO);
p.writeByte(1);
if (infoUpdate) {
@@ -3105,7 +3106,7 @@ public class PacketCreator {
return p;
}
public static Packet getPlayerShopChat(MapleCharacter chr, String chat, boolean owner) {
public static Packet getPlayerShopChat(Character chr, String chat, boolean owner) {
OutPacket p = OutPacket.create(SendOpcode.PLAYER_INTERACTION);
p.writeByte(PlayerInteractionHandler.Action.CHAT.getCode());
p.writeByte(PlayerInteractionHandler.Action.CHAT_THING.getCode());
@@ -3114,7 +3115,7 @@ public class PacketCreator {
return p;
}
public static Packet getPlayerShopNewVisitor(MapleCharacter chr, int slot) {
public static Packet getPlayerShopNewVisitor(Character chr, int slot) {
final OutPacket p = OutPacket.create(SendOpcode.PLAYER_INTERACTION);
p.writeByte(PlayerInteractionHandler.Action.VISIT.getCode());
p.writeByte(slot);
@@ -3132,7 +3133,7 @@ public class PacketCreator {
return p;
}
public static Packet getTradePartnerAdd(MapleCharacter chr) {
public static Packet getTradePartnerAdd(Character chr) {
final OutPacket p = OutPacket.create(SendOpcode.PLAYER_INTERACTION);
p.writeByte(PlayerInteractionHandler.Action.VISIT.getCode());
p.writeByte(1);
@@ -3141,7 +3142,7 @@ public class PacketCreator {
return p;
}
public static Packet tradeInvite(MapleCharacter chr) {
public static Packet tradeInvite(Character chr) {
final OutPacket p = OutPacket.create(SendOpcode.PLAYER_INTERACTION);
p.writeByte(PlayerInteractionHandler.Action.INVITE.getCode());
p.writeByte(3);
@@ -3219,7 +3220,7 @@ public class PacketCreator {
addCharLook(p, shop.getOwner(), false);
p.writeString(shop.getOwner().getName());
MapleCharacter[] visitors = shop.getVisitors();
Character[] visitors = shop.getVisitors();
for (int i = 0; i < 3; i++) {
if (visitors[i] != null) {
p.writeByte(i + 1);
@@ -3711,7 +3712,7 @@ public class PacketCreator {
return p;
}
public static Packet partyInvite(MapleCharacter from) {
public static Packet partyInvite(Character from) {
final OutPacket p = OutPacket.create(SendOpcode.PARTY_OPERATION);
p.writeByte(4);
p.writeInt(from.getParty().getId());
@@ -3720,7 +3721,7 @@ public class PacketCreator {
return p;
}
public static Packet partySearchInvite(MapleCharacter from) {
public static Packet partySearchInvite(Character from) {
final OutPacket p = OutPacket.create(SendOpcode.PARTY_OPERATION);
p.writeByte(4);
p.writeInt(from.getParty().getId());
@@ -4220,7 +4221,7 @@ public class PacketCreator {
return p;
}
public static Packet skillEffect(MapleCharacter from, int skillId, int level, byte flags, int speed, byte direction) {
public static Packet skillEffect(Character from, int skillId, int level, byte flags, int speed, byte direction) {
final OutPacket p = OutPacket.create(SendOpcode.SKILL_EFFECT);
p.writeInt(from.getId());
p.writeInt(skillId);
@@ -4231,7 +4232,7 @@ public class PacketCreator {
return p;
}
public static Packet skillCancel(MapleCharacter from, int skillId) {
public static Packet skillCancel(Character from, int skillId) {
final OutPacket p = OutPacket.create(SendOpcode.CANCEL_SKILL_EFFECT);
p.writeInt(from.getId());
p.writeInt(skillId);
@@ -4290,7 +4291,7 @@ public class PacketCreator {
}
/*
public static Packet sendSpouseChat(MapleCharacter partner, String msg) {
public static Packet sendSpouseChat(Character partner, String msg) {
OutPacket p = OutPacket.create(SendOpcode);
SPOUSE_CHAT);
p.writeString(partner.getName());
@@ -4310,7 +4311,7 @@ public class PacketCreator {
return p;
}
public static Packet addMessengerPlayer(String from, MapleCharacter chr, int position, int channel) {
public static Packet addMessengerPlayer(String from, Character chr, int position, int channel) {
final OutPacket p = OutPacket.create(SendOpcode.MESSENGER);
p.writeByte(0x00);
p.writeByte(position);
@@ -4328,7 +4329,7 @@ public class PacketCreator {
return p;
}
public static Packet updateMessengerPlayer(String from, MapleCharacter chr, int position, int channel) {
public static Packet updateMessengerPlayer(String from, Character chr, int position, int channel) {
final OutPacket p = OutPacket.create(SendOpcode.MESSENGER);
p.writeByte(0x07);
p.writeByte(position);
@@ -4375,7 +4376,7 @@ public class PacketCreator {
p.writeInt(pet.getFh());
}
public static Packet showPet(MapleCharacter chr, Pet pet, boolean remove, boolean hunger) {
public static Packet showPet(Character chr, Pet pet, boolean remove, boolean hunger) {
OutPacket p = OutPacket.create(SendOpcode.SPAWN_PET);
p.writeInt(chr.getId());
p.writeByte(chr.getPetIndex(pet));
@@ -4437,7 +4438,7 @@ public class PacketCreator {
return p;
}
public static Packet showPetLevelUp(MapleCharacter chr, byte index) {
public static Packet showPetLevelUp(Character chr, byte index) {
final OutPacket p = OutPacket.create(SendOpcode.SHOW_FOREIGN_EFFECT);
p.writeInt(chr.getId());
p.writeByte(4);
@@ -4446,7 +4447,7 @@ public class PacketCreator {
return p;
}
public static Packet changePetName(MapleCharacter chr, String newname, int slot) {
public static Packet changePetName(Character chr, String newname, int slot) {
OutPacket p = OutPacket.create(SendOpcode.PET_NAMECHANGE);
p.writeInt(chr.getId());
p.writeByte(0);
@@ -4467,7 +4468,7 @@ public class PacketCreator {
return p;
}
public static Packet petStatUpdate(MapleCharacter chr) {
public static Packet petStatUpdate(Character chr) {
// this actually does nothing... packet structure and stats needs to be uncovered
final OutPacket p = OutPacket.create(SendOpcode.STAT_CHANGED);
@@ -4510,7 +4511,7 @@ public class PacketCreator {
return p;
}
public static Packet skillBookResult(MapleCharacter chr, int skillid, int maxlevel, boolean canuse, boolean success) {
public static Packet skillBookResult(Character chr, int skillid, int maxlevel, boolean canuse, boolean success) {
final OutPacket p = OutPacket.create(SendOpcode.SKILL_LEARN_ITEM_RESULT);
p.writeInt(chr.getId());
p.writeByte(1);
@@ -4543,12 +4544,12 @@ public class PacketCreator {
return p;
}
public static Packet showAllCharacterInfo(int worldid, List<MapleCharacter> chars, boolean usePic) {
public static Packet showAllCharacterInfo(int worldid, List<Character> chars, boolean usePic) {
final OutPacket p = OutPacket.create(SendOpcode.VIEW_ALL_CHAR);
p.writeByte(0);
p.writeByte(worldid);
p.writeByte(chars.size());
for (MapleCharacter chr : chars) {
for (Character chr : chars) {
addCharEntry(p, chr, true);
}
p.writeByte(usePic ? 1 : 2);
@@ -4589,7 +4590,7 @@ public class PacketCreator {
addCharLook(p, minigame.getOwner(), false);
p.writeString(minigame.getOwner().getName());
if (minigame.getVisitor() != null) {
MapleCharacter visitor = minigame.getVisitor();
Character visitor = minigame.getVisitor();
p.writeByte(1);
addCharLook(p, visitor, false);
p.writeString(visitor.getName());
@@ -4602,7 +4603,7 @@ public class PacketCreator {
p.writeInt(minigame.getOwner().getMiniGamePoints(MiniGameResult.LOSS, true));
p.writeInt(minigame.getOwnerScore());
if (minigame.getVisitor() != null) {
MapleCharacter visitor = minigame.getVisitor();
Character visitor = minigame.getVisitor();
p.writeByte(1);
p.writeInt(1);
p.writeInt(visitor.getMiniGamePoints(MiniGameResult.WIN, true));
@@ -4690,7 +4691,7 @@ public class PacketCreator {
return p;
}
public static Packet getMiniGameNewVisitor(MapleMiniGame minigame, MapleCharacter chr, int slot) {
public static Packet getMiniGameNewVisitor(MapleMiniGame minigame, Character chr, int slot) {
OutPacket p = OutPacket.create(SendOpcode.PLAYER_INTERACTION);
p.writeByte(PlayerInteractionHandler.Action.VISIT.getCode());
p.writeByte(slot);
@@ -4788,7 +4789,7 @@ public class PacketCreator {
addCharLook(p, minigame.getOwner(), false);
p.writeString(minigame.getOwner().getName());
if (minigame.getVisitor() != null) {
MapleCharacter visitor = minigame.getVisitor();
Character visitor = minigame.getVisitor();
p.writeByte(1);
addCharLook(p, visitor, false);
p.writeString(visitor.getName());
@@ -4803,7 +4804,7 @@ public class PacketCreator {
//set vs
p.writeInt(minigame.getOwnerScore());
if (minigame.getVisitor() != null) {
MapleCharacter visitor = minigame.getVisitor();
Character visitor = minigame.getVisitor();
p.writeByte(1);
p.writeInt(2);
p.writeInt(visitor.getMiniGamePoints(MiniGameResult.WIN, false));
@@ -4839,7 +4840,7 @@ public class PacketCreator {
return p;
}
public static Packet getMatchCardNewVisitor(MapleMiniGame minigame, MapleCharacter chr, int slot) {
public static Packet getMatchCardNewVisitor(MapleMiniGame minigame, Character chr, int slot) {
OutPacket p = OutPacket.create(SendOpcode.PLAYER_INTERACTION);
p.writeByte(PlayerInteractionHandler.Action.VISIT.getCode());
p.writeByte(slot);
@@ -4920,7 +4921,7 @@ public class PacketCreator {
return p;
}
public static Packet getFredrick(MapleCharacter chr) {
public static Packet getFredrick(Character chr) {
final OutPacket p = OutPacket.create(SendOpcode.FREDRICK);
p.writeByte(0x23);
p.writeInt(9030000); // Fredrick
@@ -4942,28 +4943,28 @@ public class PacketCreator {
return p;
}
public static Packet addOmokBox(MapleCharacter chr, int amount, int type) {
public static Packet addOmokBox(Character chr, int amount, int type) {
OutPacket p = OutPacket.create(SendOpcode.UPDATE_CHAR_BOX);
p.writeInt(chr.getId());
addAnnounceBox(p, chr.getMiniGame(), amount, type);
return p;
}
public static Packet addMatchCardBox(MapleCharacter chr, int amount, int type) {
public static Packet addMatchCardBox(Character chr, int amount, int type) {
OutPacket p = OutPacket.create(SendOpcode.UPDATE_CHAR_BOX);
p.writeInt(chr.getId());
addAnnounceBox(p, chr.getMiniGame(), amount, type);
return p;
}
public static Packet removeMinigameBox(MapleCharacter chr) {
public static Packet removeMinigameBox(Character chr) {
OutPacket p = OutPacket.create(SendOpcode.UPDATE_CHAR_BOX);
p.writeInt(chr.getId());
p.writeByte(0);
return p;
}
public static Packet getPlayerShopChat(MapleCharacter chr, String chat, byte slot) {
public static Packet getPlayerShopChat(Character chr, String chat, byte slot) {
final OutPacket p = OutPacket.create(SendOpcode.PLAYER_INTERACTION);
p.writeByte(PlayerInteractionHandler.Action.CHAT.getCode());
p.writeByte(PlayerInteractionHandler.Action.CHAT_THING.getCode());
@@ -4972,7 +4973,7 @@ public class PacketCreator {
return p;
}
public static Packet getTradeChat(MapleCharacter chr, String chat, boolean owner) {
public static Packet getTradeChat(Character chr, String chat, boolean owner) {
final OutPacket p = OutPacket.create(SendOpcode.PLAYER_INTERACTION);
p.writeByte(PlayerInteractionHandler.Action.CHAT.getCode());
p.writeByte(PlayerInteractionHandler.Action.CHAT_THING.getCode());
@@ -5016,7 +5017,7 @@ public class PacketCreator {
AbstractMapleMapObject mo = hme.getRight();
if (mo instanceof MaplePlayerShop ps) {
MapleCharacter owner = ps.getOwner();
Character owner = ps.getOwner();
p.writeString(owner.getName());
p.writeInt(owner.getMapId());
@@ -5079,7 +5080,7 @@ public class PacketCreator {
* 0x12 = FKING POPUP LOL
*/
public static Packet getHiredMerchant(MapleCharacter chr, MapleHiredMerchant hm, boolean firstTime) {//Thanks Dustin
public static Packet getHiredMerchant(Character chr, MapleHiredMerchant hm, boolean firstTime) {//Thanks Dustin
final OutPacket p = OutPacket.create(SendOpcode.PLAYER_INTERACTION);
p.writeByte(PlayerInteractionHandler.Action.ROOM.getCode());
p.writeByte(0x05);
@@ -5088,7 +5089,7 @@ public class PacketCreator {
p.writeInt(hm.getItemId());
p.writeString("Hired Merchant");
MapleCharacter[] visitors = hm.getVisitors();
Character[] visitors = hm.getVisitors();
for (int i = 0; i < 3; i++) {
if (visitors[i] != null) {
p.writeByte(i + 1);
@@ -5140,7 +5141,7 @@ public class PacketCreator {
return p;
}
public static Packet updateHiredMerchant(MapleHiredMerchant hm, MapleCharacter chr) {
public static Packet updateHiredMerchant(MapleHiredMerchant hm, Character chr) {
final OutPacket p = OutPacket.create(SendOpcode.PLAYER_INTERACTION);
p.writeByte(PlayerInteractionHandler.Action.UPDATE_MERCHANT.getCode());
p.writeInt(hm.isOwner(chr) ? chr.getMerchantMeso() : chr.getMeso());
@@ -5202,7 +5203,7 @@ public class PacketCreator {
return p;
}
public static Packet hiredMerchantVisitorAdd(MapleCharacter chr, int slot) {
public static Packet hiredMerchantVisitorAdd(Character chr, int slot) {
final OutPacket p = OutPacket.create(SendOpcode.PLAYER_INTERACTION);
p.writeByte(PlayerInteractionHandler.Action.VISIT.getCode());
p.writeByte(slot);
@@ -5404,7 +5405,7 @@ public class PacketCreator {
return p;
}
public static Packet useChalkboard(MapleCharacter chr, boolean close) {
public static Packet useChalkboard(Character chr, boolean close) {
OutPacket p = OutPacket.create(SendOpcode.CHALKBOARD);
p.writeInt(chr.getId());
if (close) {
@@ -5416,7 +5417,7 @@ public class PacketCreator {
return p;
}
public static Packet trockRefreshMapList(MapleCharacter chr, boolean delete, boolean vip) {
public static Packet trockRefreshMapList(Character chr, boolean delete, boolean vip) {
final OutPacket p = OutPacket.create(SendOpcode.MAP_TRANSFER_RESULT);
p.writeByte(delete ? 2 : 3);
if (vip) {
@@ -5523,7 +5524,7 @@ public class PacketCreator {
return p;
}
public static Packet showMTSCash(MapleCharacter chr) {
public static Packet showMTSCash(Character chr) {
final OutPacket p = OutPacket.create(SendOpcode.MTS_OPERATION2);
p.writeInt(chr.getCashShop().getCash(4));
p.writeInt(chr.getCashShop().getCash(2));
@@ -5632,7 +5633,7 @@ public class PacketCreator {
return p;
}
public static Packet showCash(MapleCharacter mc) {
public static Packet showCash(Character mc) {
final OutPacket p = OutPacket.create(SendOpcode.QUERY_CASH_RESULT);
p.writeInt(mc.getCashShop().getCash(1));
p.writeInt(mc.getCashShop().getCash(2));
@@ -5640,7 +5641,7 @@ public class PacketCreator {
return p;
}
public static Packet enableCSUse(MapleCharacter mc) {
public static Packet enableCSUse(Character mc) {
return showCash(mc);
}
@@ -5664,7 +5665,7 @@ public class PacketCreator {
* @param flag LOCATION or LOCATION_FRIEND
* @return packet structure
*/
public static Packet getFindResult(MapleCharacter target, byte type, int fieldOrChannel, byte flag) {
public static Packet getFindResult(Character target, byte type, int fieldOrChannel, byte flag) {
OutPacket p = OutPacket.create(SendOpcode.WHISPER);
p.writeByte(flag | WhisperFlag.RESULT);
@@ -5718,7 +5719,7 @@ public class PacketCreator {
return p;
}
public static Packet updateGender(MapleCharacter chr) {
public static Packet updateGender(Character chr) {
OutPacket p = OutPacket.create(SendOpcode.SET_GENDER);
p.writeByte(chr.getGender());
return p;
@@ -5744,7 +5745,7 @@ public class PacketCreator {
return p;
}
public static Packet loadFamily(MapleCharacter player) {
public static Packet loadFamily(Character player) {
final OutPacket p = OutPacket.create(SendOpcode.FAMILY_PRIVILEGE_LIST);
p.writeInt(MapleFamilyEntitlement.values().length);
for (int i = 0; i < MapleFamilyEntitlement.values().length; i++) {
@@ -5917,7 +5918,7 @@ public class PacketCreator {
}
private static void addPedigreeEntry(OutPacket p, MapleFamilyEntry entry) {
MapleCharacter chr = entry.getChr();
Character chr = entry.getChr();
boolean isOnline = chr != null;
p.writeInt(entry.getChrId()); //ID
p.writeInt(entry.getSenior() != null ? entry.getSenior().getChrId() : 0); //parent ID
@@ -6587,7 +6588,7 @@ public class PacketCreator {
return p;
}
public static Packet updateDojoStats(MapleCharacter chr, int belt) {
public static Packet updateDojoStats(Character chr, int belt) {
final OutPacket p = OutPacket.create(SendOpcode.SHOW_STATUS_INFO);
p.writeByte(10);
p.writeBytes(new byte[]{(byte) 0xB7, 4}); //?
@@ -6709,7 +6710,7 @@ public class PacketCreator {
return p;
}
private static void addRingInfo(OutPacket p, MapleCharacter chr) {
private static void addRingInfo(OutPacket p, Character chr) {
p.writeShort(chr.getCrushRings().size());
for (MapleRing ring : chr.getCrushRings()) {
p.writeInt(ring.getPartnerChrId());
@@ -6745,8 +6746,8 @@ public class PacketCreator {
p.writeInt(1112803); // Engagement Ring's Outcome (doesn't matter for engagement)
p.writeInt(1112803); // Engagement Ring's Outcome (doesn't matter for engagement)
}
p.writeFixedString(StringUtil.getRightPaddedStr(chr.getGender() == 0 ? chr.getName() : MapleCharacter.getNameById(chr.getPartnerId()), '\0', 13));
p.writeFixedString(StringUtil.getRightPaddedStr(chr.getGender() == 0 ? MapleCharacter.getNameById(chr.getPartnerId()) : chr.getName(), '\0', 13));
p.writeFixedString(StringUtil.getRightPaddedStr(chr.getGender() == 0 ? chr.getName() : Character.getNameById(chr.getPartnerId()), '\0', 13));
p.writeFixedString(StringUtil.getRightPaddedStr(chr.getGender() == 0 ? Character.getNameById(chr.getPartnerId()) : chr.getName(), '\0', 13));
} else {
p.writeShort(0);
}
@@ -6918,7 +6919,7 @@ public class PacketCreator {
p.writeLong(0);
}
public static Packet showWishList(MapleCharacter mc, boolean update) {
public static Packet showWishList(Character mc, boolean update) {
final OutPacket p = OutPacket.create(SendOpcode.CASHSHOP_OPERATION);
if (update) {
@@ -7226,7 +7227,7 @@ public class PacketCreator {
return p;
}
public static Packet startMonsterCarnival(MapleCharacter chr, int team, int opposition) {
public static Packet startMonsterCarnival(Character chr, int team, int opposition) {
OutPacket p = OutPacket.create(SendOpcode.MONSTER_CARNIVAL_START);
p.writeByte(team); // team
p.writeShort(chr.getCP()); // Obtained CP - Used CP