From 00d2eccf08e94f7d36f743eb0bb4a63224958ca2 Mon Sep 17 00:00:00 2001 From: Melledy <121644117+Melledy@users.noreply.github.com> Date: Fri, 1 Dec 2023 04:19:40 -0800 Subject: [PATCH] Clean imports and optimize some packets --- .../command/commands/GiveAllCommand.java | 10 +-- .../java/emu/lunarcore/data/GameData.java | 66 ++++--------------- .../data/excel/ActivityPanelExcel.java | 3 +- .../emu/lunarcore/data/excel/AvatarExcel.java | 10 +-- .../data/excel/AvatarExpItemExcel.java | 3 +- .../data/excel/AvatarSkillTreeExcel.java | 2 +- .../data/excel/BackGroundMusicExcel.java | 4 +- .../data/excel/BattleEventDataExcel.java | 8 +-- .../lunarcore/data/excel/ChallengeExcel.java | 24 +++---- .../data/excel/ChallengeGroupExcel.java | 2 +- .../data/excel/ChallengeRewardExcel.java | 2 +- .../data/excel/ChallengeTargetExcel.java | 2 +- .../lunarcore/data/excel/ChatBubbleExcel.java | 3 - .../emu/lunarcore/data/excel/CocoonExcel.java | 2 +- .../data/excel/EquipmentExpItemExcel.java | 3 +- .../emu/lunarcore/data/excel/HeroExcel.java | 2 +- .../data/excel/ItemComposeExcel.java | 2 +- .../data/excel/MapEntranceExcel.java | 2 +- .../lunarcore/data/excel/MazeBuffExcel.java | 2 +- .../lunarcore/data/excel/MazePlaneExcel.java | 4 +- .../data/excel/MonsterDropExcel.java | 4 +- .../lunarcore/data/excel/MonsterExcel.java | 5 +- .../emu/lunarcore/data/excel/NpcExcel.java | 2 +- .../lunarcore/data/excel/PhoneThemeExcel.java | 3 - .../emu/lunarcore/data/excel/PropExcel.java | 8 +-- .../data/excel/RelicExpItemExcel.java | 2 +- .../lunarcore/data/excel/RelicSetExcel.java | 2 - .../emu/lunarcore/data/excel/RewardExcel.java | 12 ++-- .../lunarcore/data/excel/RogueAeonExcel.java | 2 +- .../lunarcore/data/excel/RogueAreaExcel.java | 4 +- .../lunarcore/data/excel/RogueBuffExcel.java | 6 +- .../data/excel/RogueManagerExcel.java | 17 ++--- .../lunarcore/data/excel/RogueMapExcel.java | 4 +- .../data/excel/RogueMiracleExcel.java | 3 +- .../data/excel/RogueMonsterExcel.java | 3 +- .../lunarcore/data/excel/RogueNPCExcel.java | 2 +- .../lunarcore/data/excel/RogueRoomExcel.java | 2 +- .../data/excel/RogueTalentExcel.java | 2 +- .../emu/lunarcore/data/excel/ShopExcel.java | 6 +- .../lunarcore/data/excel/ShopGoodsExcel.java | 22 +++---- .../emu/lunarcore/data/excel/StageExcel.java | 14 ++-- .../lunarcore/data/excel/TextJoinExcel.java | 3 +- .../lunarcore/database/DatabaseManager.java | 8 +-- .../emu/lunarcore/game/player/Player.java | 12 +++- .../recv/HandlerGetJukeboxDataCsReq.java | 1 - .../recv/HandlerGetPlayerBoardDataCsReq.java | 2 - .../recv/HandlerPlayerLoginFinishCsReq.java | 3 - .../send/PacketGetArchiveDataScRsp.java | 22 +++---- .../send/PacketGetDailyActiveInfoScRsp.java | 1 - .../PacketGetMainMissionCustomValueScRsp.java | 1 - .../packet/send/PacketGetPhoneDataScRsp.java | 12 ++-- .../packet/send/PacketGetQuestDataScRsp.java | 1 - .../send/PacketSelectChatBubbleScRsp.java | 3 - .../send/PacketSelectPhoneThemeScRsp.java | 2 - .../send/PacketServerAnnounceNotify.java | 2 - src/main/java/emu/lunarcore/util/Utils.java | 1 - 56 files changed, 139 insertions(+), 216 deletions(-) diff --git a/src/main/java/emu/lunarcore/command/commands/GiveAllCommand.java b/src/main/java/emu/lunarcore/command/commands/GiveAllCommand.java index c57b720..caf32d0 100644 --- a/src/main/java/emu/lunarcore/command/commands/GiveAllCommand.java +++ b/src/main/java/emu/lunarcore/command/commands/GiveAllCommand.java @@ -65,13 +65,9 @@ public class GiveAllCommand implements CommandHandler { } case "ic", "icons" -> { // Get UnlockedHeads - for (int iconhead : GameData.getAllIconHeads()) { - - // Skip if target already has the head icon - if (target.getUnlockedHeadIcons().contains(iconhead)) { - continue; - } - target.addHeadIcon(iconhead); + for (var iconhead : GameData.getPlayerIconExcelMap().values()) { + // This function will handle any duplicate head icons + target.addHeadIcon(iconhead.getId()); } // Send message diff --git a/src/main/java/emu/lunarcore/data/GameData.java b/src/main/java/emu/lunarcore/data/GameData.java index 1113d77..eb02bd2 100644 --- a/src/main/java/emu/lunarcore/data/GameData.java +++ b/src/main/java/emu/lunarcore/data/GameData.java @@ -4,14 +4,12 @@ import java.lang.reflect.Field; import java.util.List; import java.util.ArrayList; -import it.unimi.dsi.fastutil.ints.IntArrayList; + import emu.lunarcore.data.config.FloorInfo; import emu.lunarcore.data.excel.*; import emu.lunarcore.game.battle.MazeBuff; import emu.lunarcore.util.Utils; -import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; +import it.unimi.dsi.fastutil.ints.*; import it.unimi.dsi.fastutil.objects.Object2ObjectMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import lombok.Getter; @@ -24,7 +22,8 @@ public class GameData { @Getter private static Int2ObjectMap equipExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap relicExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap propExcelMap = new Int2ObjectOpenHashMap<>(); - @Getter private static Int2ObjectMap npcExcelMap = new Int2ObjectOpenHashMap<>(); + @Getter private static Int2ObjectMap npcExcelMap = new Int2ObjectOpenHashMap<>(); + @Getter private static Int2ObjectMap monsterExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap npcMonsterExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap stageExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap mazePlaneExcelMap = new Int2ObjectOpenHashMap<>(); @@ -36,7 +35,11 @@ public class GameData { @Getter private static Int2ObjectMap itemComposeExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap activityPanelExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap backGroundMusicExcelMap = new Int2ObjectOpenHashMap<>(); - + @Getter private static Int2ObjectMap questExcelMap = new Int2ObjectLinkedOpenHashMap<>(); + @Getter private static Int2ObjectMap textJoinExcelMap = new Int2ObjectLinkedOpenHashMap<>(); + @Getter private static Int2ObjectMap chatBubbleExcelMap = new Int2ObjectOpenHashMap<>(); + @Getter private static Int2ObjectMap phoneThemeExcelMap = new Int2ObjectOpenHashMap<>(); + @Getter private static Int2ObjectMap challengeGroupExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap challengeExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap challengeTargetExcelMap = new Int2ObjectOpenHashMap<>(); @@ -57,18 +60,13 @@ public class GameData { private static Int2ObjectMap equipmentPromotionExcelMap = new Int2ObjectOpenHashMap<>(); private static Int2ObjectMap mazeBuffExcelMap = new Int2ObjectOpenHashMap<>(); private static Int2ObjectMap cocoonExcelMap = new Int2ObjectOpenHashMap<>(); - private static Int2ObjectMap chatBubbleExcelMap = new Int2ObjectOpenHashMap<>(); - private static Int2ObjectMap phoneThemeExcelMap = new Int2ObjectOpenHashMap<>(); private static Int2ObjectMap monsterDropExcelMap = new Int2ObjectOpenHashMap<>(); - private static Int2ObjectMap monsterExcelMap = new Int2ObjectOpenHashMap<>(); - private static Int2ObjectMap questExcelMap = new Int2ObjectLinkedOpenHashMap<>(); - private static Int2ObjectMap textJoinExcelMap = new Int2ObjectLinkedOpenHashMap<>(); private static Int2ObjectMap playerLevelExcelMap = new Int2ObjectOpenHashMap<>(); private static Int2ObjectMap expTypeExcelMap = new Int2ObjectOpenHashMap<>(); private static Int2ObjectMap equipmentExpTypeExcelMap = new Int2ObjectOpenHashMap<>(); private static Int2ObjectMap relicExpTypeExcelMap = new Int2ObjectOpenHashMap<>(); - + private static Int2ObjectMap relicMainAffixExcelMap = new Int2ObjectOpenHashMap<>(); private static Int2ObjectMap relicSubAffixExcelMap = new Int2ObjectOpenHashMap<>(); private static Int2ObjectMap relicSetExcelMap = new Int2ObjectOpenHashMap<>(); @@ -93,17 +91,6 @@ public class GameData { return map; } - public static List getAllChatBubbleIds() { - List allIds = new ArrayList<>(); - - for (Int2ObjectMap.Entry entry : chatBubbleExcelMap.int2ObjectEntrySet()) { - ChatBubbleExcel chatBubbleExcel = entry.getValue(); - allIds.add(chatBubbleExcel.getId()); - } - - return allIds; - } - public static List getAllRelicIds() { List allIds = new ArrayList<>(); @@ -124,15 +111,6 @@ public class GameData { return relicExcel.getSetId(); } - public static int getRelicTypeFromId(int relicId) { - RelicExcel relicExcel = GameData.getRelicExcelMap().get(relicId); - - if (relicExcel == null) { - return 0; - } - return relicExcel.getType().getVal(); - } - public static List getAllMusicIds() { List allIds = new ArrayList<>(); @@ -183,29 +161,7 @@ public class GameData { var excel = backGroundMusicExcelMap.get(musicId); return excel != null ? excel.getGroupId() : 0; } - - public static List getAllPhoneThemes() { - List allIds = new ArrayList<>(); - - for (Int2ObjectMap.Entry entry : phoneThemeExcelMap.int2ObjectEntrySet()) { - PhoneThemeExcel phoneThemeExcel = entry.getValue(); - allIds.add(phoneThemeExcel.getId()); - } - - return allIds; - } - - public static List getAllIconHeads() { - List allIds = new ArrayList<>(); - - for (Int2ObjectMap.Entry entry : playerIconExcelMap.int2ObjectEntrySet()) { - PlayerIconExcel playerIconExcel = entry.getValue(); - allIds.add(playerIconExcel.getId()); - } - - return allIds; - } - + public static AvatarPromotionExcel getAvatarPromotionExcel(int id, int promotion) { return avatarPromotionExcelMap.get((id << 8) + promotion); } diff --git a/src/main/java/emu/lunarcore/data/excel/ActivityPanelExcel.java b/src/main/java/emu/lunarcore/data/excel/ActivityPanelExcel.java index d567ed1..86d6ddc 100644 --- a/src/main/java/emu/lunarcore/data/excel/ActivityPanelExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/ActivityPanelExcel.java @@ -2,7 +2,6 @@ package emu.lunarcore.data.excel; import emu.lunarcore.data.GameResource; import emu.lunarcore.data.ResourceType; - import lombok.Getter; @Getter @@ -12,7 +11,7 @@ public class ActivityPanelExcel extends GameResource { private int Type; private int ActivityModuleID; private boolean IsResidentPanel; - + @Override public int getId() { return PanelID; diff --git a/src/main/java/emu/lunarcore/data/excel/AvatarExcel.java b/src/main/java/emu/lunarcore/data/excel/AvatarExcel.java index 3043119..28c5da8 100644 --- a/src/main/java/emu/lunarcore/data/excel/AvatarExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/AvatarExcel.java @@ -40,10 +40,10 @@ public class AvatarExcel extends GameResource { private transient IntSet skillTreeIds; private transient String nameKey; private transient int maxSp; - + @Setter private transient MazeSkill mazeAttack; @Setter private transient MazeSkill mazeSkill; - + private static Pattern namePattern = Pattern.compile("(?<=Avatar_)(.*?)(?=_Config)"); public AvatarExcel() { @@ -75,14 +75,14 @@ public class AvatarExcel extends GameResource { // Cache max sp this.maxSp = (int) this.SPNeed * 100; - + // Get name key Matcher matcher = namePattern.matcher(this.JsonPath); - + if (matcher.find()) { this.nameKey = matcher.group(0); } - + // Clear variable to save memory this.JsonPath = null; } diff --git a/src/main/java/emu/lunarcore/data/excel/AvatarExpItemExcel.java b/src/main/java/emu/lunarcore/data/excel/AvatarExpItemExcel.java index ae8d9ff..388f2eb 100644 --- a/src/main/java/emu/lunarcore/data/excel/AvatarExpItemExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/AvatarExpItemExcel.java @@ -7,7 +7,6 @@ import emu.lunarcore.data.GameDepot; import emu.lunarcore.data.GameResource; import emu.lunarcore.data.ResourceType; import emu.lunarcore.data.ResourceType.LoadPriority; - import lombok.Getter; @Getter @@ -28,7 +27,7 @@ public class AvatarExpItemExcel extends GameResource { if (excel == null) return; excel.setAvatarExp(Exp); - + // Add to game depot if (Exp > 0) { GameDepot.getAvatarExpExcels().add(this); diff --git a/src/main/java/emu/lunarcore/data/excel/AvatarSkillTreeExcel.java b/src/main/java/emu/lunarcore/data/excel/AvatarSkillTreeExcel.java index 8ffae52..a0e7982 100644 --- a/src/main/java/emu/lunarcore/data/excel/AvatarSkillTreeExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/AvatarSkillTreeExcel.java @@ -41,7 +41,7 @@ public class AvatarSkillTreeExcel extends GameResource { if (this.isDefaultUnlock()) { excel.getDefaultSkillTrees().add(this); } - + // Add point id to avatar excel excel.getSkillTreeIds().add(this.getPointID()); } diff --git a/src/main/java/emu/lunarcore/data/excel/BackGroundMusicExcel.java b/src/main/java/emu/lunarcore/data/excel/BackGroundMusicExcel.java index 7a00621..17da46f 100644 --- a/src/main/java/emu/lunarcore/data/excel/BackGroundMusicExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/BackGroundMusicExcel.java @@ -2,8 +2,6 @@ package emu.lunarcore.data.excel; import emu.lunarcore.data.GameResource; import emu.lunarcore.data.ResourceType; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import lombok.Getter; @Getter @@ -19,5 +17,5 @@ public class BackGroundMusicExcel extends GameResource { public int getGroupId() { return GroupID; } - + } diff --git a/src/main/java/emu/lunarcore/data/excel/BattleEventDataExcel.java b/src/main/java/emu/lunarcore/data/excel/BattleEventDataExcel.java index 5f76050..f96658a 100644 --- a/src/main/java/emu/lunarcore/data/excel/BattleEventDataExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/BattleEventDataExcel.java @@ -14,9 +14,9 @@ import lombok.Getter; public class BattleEventDataExcel extends GameResource { private int BattleEventID; private String Config; - + private static final Pattern roguePattern = Pattern.compile("(?<=Avatar_RogueBattleevent)(.*?)(?=_Config.json)"); - + @Override public int getId() { return BattleEventID; @@ -26,11 +26,11 @@ public class BattleEventDataExcel extends GameResource { public void onLoad() { try { Matcher matcher = roguePattern.matcher(this.Config); - + if (matcher.find()) { int rogueBuffType = Utils.parseSafeInt(matcher.group(0)); var type = RogueBuffType.getById(rogueBuffType); - + if (type != null) { type.setBattleEventSkill(this.BattleEventID); } diff --git a/src/main/java/emu/lunarcore/data/excel/ChallengeExcel.java b/src/main/java/emu/lunarcore/data/excel/ChallengeExcel.java index 14e46d6..522205c 100644 --- a/src/main/java/emu/lunarcore/data/excel/ChallengeExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/ChallengeExcel.java @@ -15,46 +15,46 @@ public class ChallengeExcel extends GameResource { private int StageNum; private int ChallengeCountDown; private int MazeBuffID; - + private int[] ChallengeTargetID; - + private int MazeGroupID1; private int[] ConfigList1; private int[] NpcMonsterIDList1; private int[] EventIDList1; - + private int MazeGroupID2; private int[] ConfigList2; private int[] NpcMonsterIDList2; private int[] EventIDList2; - + private transient Int2ObjectMap challengeMonsters1; private transient Int2ObjectMap challengeMonsters2; - + @Override public int getId() { return ID; } - + @Override public void onLoad() { // Cache challenge monsters this.challengeMonsters1 = new Int2ObjectOpenHashMap<>(); for (int i = 0; i < ConfigList1.length; i++) { if (ConfigList1[i] == 0) break; - + var monster = new ChallengeMonsterInfo(ConfigList1[i], NpcMonsterIDList1[i], EventIDList1[i]); this.challengeMonsters1.put(monster.getConfigId(), monster); } - + this.challengeMonsters2 = new Int2ObjectOpenHashMap<>(); for (int i = 0; i < ConfigList2.length; i++) { if (ConfigList2[i] == 0) break; - + var monster = new ChallengeMonsterInfo(ConfigList2[i], NpcMonsterIDList2[i], EventIDList2[i]); this.challengeMonsters2.put(monster.getConfigId(), monster); } - + // Clear arrays to save memory this.ConfigList1 = null; this.NpcMonsterIDList1 = null; @@ -69,12 +69,12 @@ public class ChallengeExcel extends GameResource { private int configId; private int npcMonsterId; private int eventId; - + public ChallengeMonsterInfo(int configId, int npcMonsterId, int eventId) { this.configId = configId; this.npcMonsterId = npcMonsterId; this.eventId = eventId; } - + } } diff --git a/src/main/java/emu/lunarcore/data/excel/ChallengeGroupExcel.java b/src/main/java/emu/lunarcore/data/excel/ChallengeGroupExcel.java index 2ba7a8f..7d4a9c3 100644 --- a/src/main/java/emu/lunarcore/data/excel/ChallengeGroupExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/ChallengeGroupExcel.java @@ -9,7 +9,7 @@ import lombok.Getter; public class ChallengeGroupExcel extends GameResource { private int GroupID; private int RewardLineGroupID; - + @Override public int getId() { return GroupID; diff --git a/src/main/java/emu/lunarcore/data/excel/ChallengeRewardExcel.java b/src/main/java/emu/lunarcore/data/excel/ChallengeRewardExcel.java index 2e1f357..c111fad 100644 --- a/src/main/java/emu/lunarcore/data/excel/ChallengeRewardExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/ChallengeRewardExcel.java @@ -10,7 +10,7 @@ public class ChallengeRewardExcel extends GameResource { private int GroupID; private int StarCount; private int RewardID; - + @Override public int getId() { return (GroupID << 16) + StarCount; diff --git a/src/main/java/emu/lunarcore/data/excel/ChallengeTargetExcel.java b/src/main/java/emu/lunarcore/data/excel/ChallengeTargetExcel.java index bc5f36a..06a4281 100644 --- a/src/main/java/emu/lunarcore/data/excel/ChallengeTargetExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/ChallengeTargetExcel.java @@ -11,7 +11,7 @@ public class ChallengeTargetExcel extends GameResource { private int ID; private ChallengeType ChallengeTargetType; private int ChallengeTargetParam1; - + @Override public int getId() { return ID; diff --git a/src/main/java/emu/lunarcore/data/excel/ChatBubbleExcel.java b/src/main/java/emu/lunarcore/data/excel/ChatBubbleExcel.java index 9956d03..436932f 100644 --- a/src/main/java/emu/lunarcore/data/excel/ChatBubbleExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/ChatBubbleExcel.java @@ -1,11 +1,8 @@ package emu.lunarcore.data.excel; -import emu.lunarcore.data.GameData; import emu.lunarcore.data.GameResource; import emu.lunarcore.data.ResourceType; import emu.lunarcore.data.ResourceType.LoadPriority; -import emu.lunarcore.game.inventory.GameItem; -import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import lombok.Getter; @Getter diff --git a/src/main/java/emu/lunarcore/data/excel/CocoonExcel.java b/src/main/java/emu/lunarcore/data/excel/CocoonExcel.java index 9209243..86826a9 100644 --- a/src/main/java/emu/lunarcore/data/excel/CocoonExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/CocoonExcel.java @@ -16,7 +16,7 @@ public class CocoonExcel extends GameResource { private int MaxWave; private IntArrayList StageIDList; private IntArrayList DropList; - + @Override public int getId() { return (ID << 8) + WorldLevel; diff --git a/src/main/java/emu/lunarcore/data/excel/EquipmentExpItemExcel.java b/src/main/java/emu/lunarcore/data/excel/EquipmentExpItemExcel.java index 70b991a..e5254ed 100644 --- a/src/main/java/emu/lunarcore/data/excel/EquipmentExpItemExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/EquipmentExpItemExcel.java @@ -7,7 +7,6 @@ import emu.lunarcore.data.GameDepot; import emu.lunarcore.data.GameResource; import emu.lunarcore.data.ResourceType; import emu.lunarcore.data.ResourceType.LoadPriority; - import lombok.Getter; @Getter @@ -30,7 +29,7 @@ public class EquipmentExpItemExcel extends GameResource { excel.setEquipmentExp(ExpProvide); excel.setExpCost(CoinCost); - + // Add to game depot if (ExpProvide > 0) { GameDepot.getEquipmentExpExcels().add(this); diff --git a/src/main/java/emu/lunarcore/data/excel/HeroExcel.java b/src/main/java/emu/lunarcore/data/excel/HeroExcel.java index cf13e47..b3c7e98 100644 --- a/src/main/java/emu/lunarcore/data/excel/HeroExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/HeroExcel.java @@ -10,7 +10,7 @@ import lombok.Getter; public class HeroExcel extends GameResource { private int HeroAvatarID; private PlayerGender Gender; - + @Override public int getId() { return HeroAvatarID; diff --git a/src/main/java/emu/lunarcore/data/excel/ItemComposeExcel.java b/src/main/java/emu/lunarcore/data/excel/ItemComposeExcel.java index dd61447..6759cea 100644 --- a/src/main/java/emu/lunarcore/data/excel/ItemComposeExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/ItemComposeExcel.java @@ -19,7 +19,7 @@ public class ItemComposeExcel extends GameResource { private int CoinCost; private int WorldLevelRequire; private IntOpenHashSet RelicList; - + @Override public int getId() { return ID; diff --git a/src/main/java/emu/lunarcore/data/excel/MapEntranceExcel.java b/src/main/java/emu/lunarcore/data/excel/MapEntranceExcel.java index aa50fc4..2d1805c 100644 --- a/src/main/java/emu/lunarcore/data/excel/MapEntranceExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/MapEntranceExcel.java @@ -12,7 +12,7 @@ public class MapEntranceExcel extends GameResource { private int FloorID; private int StartGroupID; private int StartAnchorID; - + @Override public int getId() { return ID; diff --git a/src/main/java/emu/lunarcore/data/excel/MazeBuffExcel.java b/src/main/java/emu/lunarcore/data/excel/MazeBuffExcel.java index 00ecff1..01dd412 100644 --- a/src/main/java/emu/lunarcore/data/excel/MazeBuffExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/MazeBuffExcel.java @@ -9,7 +9,7 @@ import lombok.Getter; public class MazeBuffExcel extends GameResource { private int ID; private int Lv; - + @Override public int getId() { return (ID << 4) + Lv; diff --git a/src/main/java/emu/lunarcore/data/excel/MazePlaneExcel.java b/src/main/java/emu/lunarcore/data/excel/MazePlaneExcel.java index b6faf18..87f989c 100644 --- a/src/main/java/emu/lunarcore/data/excel/MazePlaneExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/MazePlaneExcel.java @@ -14,10 +14,10 @@ public class MazePlaneExcel extends GameResource { private int WorldID; private int StartFloorID; private long PlaneName; - + @SerializedName(value = "PlaneType") private PlaneType planeType = PlaneType.Unknown; - + @Override public int getId() { return PlaneID; diff --git a/src/main/java/emu/lunarcore/data/excel/MonsterDropExcel.java b/src/main/java/emu/lunarcore/data/excel/MonsterDropExcel.java index 617d157..4a38a75 100644 --- a/src/main/java/emu/lunarcore/data/excel/MonsterDropExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/MonsterDropExcel.java @@ -13,9 +13,9 @@ public class MonsterDropExcel extends GameResource { private int MonsterTemplateID; private int WorldLevel; private int AvatarExpReward; - + private List DisplayItemList; - + @Override public int getId() { return (MonsterTemplateID << 4) + WorldLevel; diff --git a/src/main/java/emu/lunarcore/data/excel/MonsterExcel.java b/src/main/java/emu/lunarcore/data/excel/MonsterExcel.java index ad96d45..6420ddf 100644 --- a/src/main/java/emu/lunarcore/data/excel/MonsterExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/MonsterExcel.java @@ -1,17 +1,14 @@ package emu.lunarcore.data.excel; -import java.util.List; - import emu.lunarcore.data.GameResource; import emu.lunarcore.data.ResourceType; -import emu.lunarcore.data.common.ItemParam; import lombok.Getter; @Getter @ResourceType(name = {"MonsterConfig.json"}) public class MonsterExcel extends GameResource { private int MonsterID; - + @Override public int getId() { return MonsterID; diff --git a/src/main/java/emu/lunarcore/data/excel/NpcExcel.java b/src/main/java/emu/lunarcore/data/excel/NpcExcel.java index ca7b497..e7b7849 100644 --- a/src/main/java/emu/lunarcore/data/excel/NpcExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/NpcExcel.java @@ -8,7 +8,7 @@ import lombok.Getter; @ResourceType(name = {"NPCData.json"}) public class NpcExcel extends GameResource { private int ID; - + @Override public int getId() { return ID; diff --git a/src/main/java/emu/lunarcore/data/excel/PhoneThemeExcel.java b/src/main/java/emu/lunarcore/data/excel/PhoneThemeExcel.java index 0474062..9f00281 100644 --- a/src/main/java/emu/lunarcore/data/excel/PhoneThemeExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/PhoneThemeExcel.java @@ -1,11 +1,8 @@ package emu.lunarcore.data.excel; -import emu.lunarcore.data.GameData; import emu.lunarcore.data.GameResource; import emu.lunarcore.data.ResourceType; import emu.lunarcore.data.ResourceType.LoadPriority; -import emu.lunarcore.game.inventory.GameItem; -import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import lombok.Getter; @Getter diff --git a/src/main/java/emu/lunarcore/data/excel/PropExcel.java b/src/main/java/emu/lunarcore/data/excel/PropExcel.java index 32e1deb..c5a6afb 100644 --- a/src/main/java/emu/lunarcore/data/excel/PropExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/PropExcel.java @@ -12,15 +12,15 @@ public class PropExcel extends GameResource { private long PropName; private String JsonPath; private PropType PropType; - + private transient boolean recoverHp; private transient boolean recoverMp; - + @Override public int getId() { return ID; } - + @Override public void onLoad() { // Hacky way to determine if a prop will recover hp or mp @@ -31,7 +31,7 @@ public class PropExcel extends GameResource { this.recoverHp = true; } } - + // Clear for optimization this.JsonPath = null; } diff --git a/src/main/java/emu/lunarcore/data/excel/RelicExpItemExcel.java b/src/main/java/emu/lunarcore/data/excel/RelicExpItemExcel.java index c60e0ab..d30a650 100644 --- a/src/main/java/emu/lunarcore/data/excel/RelicExpItemExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/RelicExpItemExcel.java @@ -30,7 +30,7 @@ public class RelicExpItemExcel extends GameResource { excel.setRelicExp(ExpProvide); excel.setExpCost(CoinCost); - + // Add to game depot if (ExpProvide > 0 && excel.getRarity() != ItemRarity.SuperRare) { GameDepot.getRelicExpExcels().add(this); diff --git a/src/main/java/emu/lunarcore/data/excel/RelicSetExcel.java b/src/main/java/emu/lunarcore/data/excel/RelicSetExcel.java index 4429447..bd0677a 100644 --- a/src/main/java/emu/lunarcore/data/excel/RelicSetExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/RelicSetExcel.java @@ -1,10 +1,8 @@ package emu.lunarcore.data.excel; -import emu.lunarcore.data.GameDepot; import emu.lunarcore.data.GameResource; import emu.lunarcore.data.ResourceType; import emu.lunarcore.data.ResourceType.LoadPriority; -import emu.lunarcore.game.enums.AvatarPropertyType; import lombok.Getter; @Getter diff --git a/src/main/java/emu/lunarcore/data/excel/RewardExcel.java b/src/main/java/emu/lunarcore/data/excel/RewardExcel.java index 7980602..d0c4e56 100644 --- a/src/main/java/emu/lunarcore/data/excel/RewardExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/RewardExcel.java @@ -13,9 +13,9 @@ import lombok.Getter; @ResourceType(name = {"RewardData.json"}) public class RewardExcel extends GameResource { private int RewardID; - + private int Hcoin; - + private int ItemID_1; private int Count_1; private int ItemID_2; @@ -26,9 +26,9 @@ public class RewardExcel extends GameResource { private int Count_4; private int ItemID_5; private int Count_5; - + private transient List rewards; - + @Override public int getId() { return RewardID; @@ -37,11 +37,11 @@ public class RewardExcel extends GameResource { @Override public void onLoad() { this.rewards = new ArrayList<>(); - + if (Hcoin > 0) { this.rewards.add(new ItemParam(GameConstants.MATERIAL_HCOIN_ID, Hcoin)); } - + if (ItemID_1 > 0) { this.rewards.add(new ItemParam(ItemID_1, Count_1)); } if (ItemID_2 > 0) { diff --git a/src/main/java/emu/lunarcore/data/excel/RogueAeonExcel.java b/src/main/java/emu/lunarcore/data/excel/RogueAeonExcel.java index ae3e71a..c916cc2 100644 --- a/src/main/java/emu/lunarcore/data/excel/RogueAeonExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/RogueAeonExcel.java @@ -9,7 +9,7 @@ import lombok.Getter; public class RogueAeonExcel extends GameResource { private int AeonID; private int RogueBuffType; - + @Override public int getId() { return AeonID; diff --git a/src/main/java/emu/lunarcore/data/excel/RogueAreaExcel.java b/src/main/java/emu/lunarcore/data/excel/RogueAreaExcel.java index bc770d3..a760c15 100644 --- a/src/main/java/emu/lunarcore/data/excel/RogueAreaExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/RogueAreaExcel.java @@ -16,10 +16,10 @@ public class RogueAreaExcel extends GameResource { private int AreaProgress; private int Difficulty; private Int2IntOpenHashMap ScoreMap; - + private transient int mapId; private transient List sites; - + @Override public int getId() { return RogueAreaID; diff --git a/src/main/java/emu/lunarcore/data/excel/RogueBuffExcel.java b/src/main/java/emu/lunarcore/data/excel/RogueBuffExcel.java index d2b356d..1e571f0 100644 --- a/src/main/java/emu/lunarcore/data/excel/RogueBuffExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/RogueBuffExcel.java @@ -18,12 +18,12 @@ public class RogueBuffExcel extends GameResource { private int RogueBuffRarity; private int AeonID; private RogueBuffAeonType BattleEventBuffType = RogueBuffAeonType.Normal; - + @Override public int getId() { return (MazeBuffID << 4) + MazeBuffLevel; } - + public boolean isAeonBuff() { return this.BattleEventBuffType != RogueBuffAeonType.Normal; } @@ -34,7 +34,7 @@ public class RogueBuffExcel extends GameResource { if (RogueBuffType >= 120 && RogueBuffType <= 126 && RogueBuffRarity >= 1 && RogueBuffRarity <= 3 && MazeBuffLevel == 1 && AeonID == 0) { GameDepot.getRogueRandomBuffList().add(this); } - + // Add to aeon buff list if (BattleEventBuffType == RogueBuffAeonType.BattleEventBuff) { GameDepot.getRogueAeonBuffs().put(this.getAeonID(), this); diff --git a/src/main/java/emu/lunarcore/data/excel/RogueManagerExcel.java b/src/main/java/emu/lunarcore/data/excel/RogueManagerExcel.java index 19dc66e..68171f6 100644 --- a/src/main/java/emu/lunarcore/data/excel/RogueManagerExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/RogueManagerExcel.java @@ -1,6 +1,7 @@ package emu.lunarcore.data.excel; -import java.time.*; +import java.time.LocalDateTime; +import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import emu.lunarcore.data.GameResource; @@ -12,20 +13,20 @@ import lombok.Getter; @ResourceType(name = {"RogueManager.json"}) public class RogueManagerExcel extends GameResource { private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - + private int ScheduleDataID; private int RogueSeason; - + @Getter(AccessLevel.NONE) private String BeginTime; @Getter(AccessLevel.NONE) private String EndTime; - + private int[] RogueAreaIDList; - + private transient long beginTime; private transient long endTime; - + @Override public int getId() { return ScheduleDataID; @@ -38,13 +39,13 @@ public class RogueManagerExcel extends GameResource { .atOffset(ZoneOffset.UTC) .toInstant() .toEpochMilli(); - + this.endTime = LocalDateTime.from(formatter.parse(this.EndTime)) .atOffset(ZoneOffset.UTC) .toInstant() .toEpochMilli(); } catch (Exception e) { - + } } } diff --git a/src/main/java/emu/lunarcore/data/excel/RogueMapExcel.java b/src/main/java/emu/lunarcore/data/excel/RogueMapExcel.java index e91250b..84b2be4 100644 --- a/src/main/java/emu/lunarcore/data/excel/RogueMapExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/RogueMapExcel.java @@ -14,12 +14,12 @@ public class RogueMapExcel extends GameResource { private boolean IsStart; private int[] NextSiteIDList; private int[] LevelList; - + @Override public int getId() { return (RogueMapID << 8) + SiteID; } - + @Override public void onLoad() { GameDepot.getRogueMapsById(this.getRogueMapID()).add(this); diff --git a/src/main/java/emu/lunarcore/data/excel/RogueMiracleExcel.java b/src/main/java/emu/lunarcore/data/excel/RogueMiracleExcel.java index 3d38b4e..1e3cef0 100644 --- a/src/main/java/emu/lunarcore/data/excel/RogueMiracleExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/RogueMiracleExcel.java @@ -3,7 +3,6 @@ package emu.lunarcore.data.excel; import emu.lunarcore.data.GameDepot; import emu.lunarcore.data.GameResource; import emu.lunarcore.data.ResourceType; - import lombok.Getter; @Getter @@ -12,7 +11,7 @@ public class RogueMiracleExcel extends GameResource { private int MiracleID; private boolean IsShow; private int MiracleReward; - + @Override public int getId() { return MiracleID; diff --git a/src/main/java/emu/lunarcore/data/excel/RogueMonsterExcel.java b/src/main/java/emu/lunarcore/data/excel/RogueMonsterExcel.java index a83e630..43e47c2 100644 --- a/src/main/java/emu/lunarcore/data/excel/RogueMonsterExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/RogueMonsterExcel.java @@ -2,7 +2,6 @@ package emu.lunarcore.data.excel; import emu.lunarcore.data.GameResource; import emu.lunarcore.data.ResourceType; - import lombok.Getter; @Getter @@ -11,7 +10,7 @@ public class RogueMonsterExcel extends GameResource { private int RogueMonsterID; private int NpcMonsterID; private int EventID; - + @Override public int getId() { return RogueMonsterID; diff --git a/src/main/java/emu/lunarcore/data/excel/RogueNPCExcel.java b/src/main/java/emu/lunarcore/data/excel/RogueNPCExcel.java index 31b69bc..cb3a026 100644 --- a/src/main/java/emu/lunarcore/data/excel/RogueNPCExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/RogueNPCExcel.java @@ -10,7 +10,7 @@ import lombok.Getter; public class RogueNPCExcel extends GameResource { private int RogueNPCID; private int NPCID; - + @Override public int getId() { return RogueNPCID; diff --git a/src/main/java/emu/lunarcore/data/excel/RogueRoomExcel.java b/src/main/java/emu/lunarcore/data/excel/RogueRoomExcel.java index 5f1c85f..3144a13 100644 --- a/src/main/java/emu/lunarcore/data/excel/RogueRoomExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/RogueRoomExcel.java @@ -13,7 +13,7 @@ public class RogueRoomExcel extends GameResource { private int MapEntrance; private int GroupID; private Int2IntOpenHashMap GroupWithContent; - + @Override public int getId() { return RogueRoomID; diff --git a/src/main/java/emu/lunarcore/data/excel/RogueTalentExcel.java b/src/main/java/emu/lunarcore/data/excel/RogueTalentExcel.java index 3664b7d..3143f26 100644 --- a/src/main/java/emu/lunarcore/data/excel/RogueTalentExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/RogueTalentExcel.java @@ -12,7 +12,7 @@ import lombok.Getter; public class RogueTalentExcel extends GameResource { private int TalentID; private List Cost; - + @Override public int getId() { return TalentID; diff --git a/src/main/java/emu/lunarcore/data/excel/ShopExcel.java b/src/main/java/emu/lunarcore/data/excel/ShopExcel.java index 637df35..3654023 100644 --- a/src/main/java/emu/lunarcore/data/excel/ShopExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/ShopExcel.java @@ -11,13 +11,13 @@ import lombok.Getter; public class ShopExcel extends GameResource { private int ShopID; private int ShopType; - + private transient Int2ObjectMap goods; - + public ShopExcel() { this.goods = new Int2ObjectAVLTreeMap<>(); } - + @Override public int getId() { return ShopID; diff --git a/src/main/java/emu/lunarcore/data/excel/ShopGoodsExcel.java b/src/main/java/emu/lunarcore/data/excel/ShopGoodsExcel.java index 8720469..55f5456 100644 --- a/src/main/java/emu/lunarcore/data/excel/ShopGoodsExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/ShopGoodsExcel.java @@ -19,41 +19,41 @@ public class ShopGoodsExcel extends GameResource { private int ItemID; private int ItemCount; private int ShopID; - + @Getter(AccessLevel.NONE) private int[] CurrencyList; @Getter(AccessLevel.NONE) private int[] CurrencyCostList; - + private transient List costList; - + @Override public int getId() { return GoodsID; } - + @Override public void onLoad() { // Skip if we dont have an item id associated with this goods excel if (this.getItemID() == 0) return; - + // Add to shop excel ShopExcel shop = GameData.getShopExcelMap().get(this.ShopID); if (shop == null) return; - + shop.getGoods().put(this.GoodsID, this); - + // Cache currency cost this.costList = new ArrayList<>(CurrencyList.length); - + for (int i = 0; i < CurrencyList.length; i++) { ItemParam param = new ItemParam(CurrencyList[i], CurrencyCostList[i]); this.costList.add(param); } - + // Done - Clear references to save memory this.CurrencyList = null; - this.CurrencyCostList = null; + this.CurrencyCostList = null; } public Goods toProto() { @@ -61,7 +61,7 @@ public class ShopGoodsExcel extends GameResource { .setGoodsId(this.getGoodsID()) .setItemId(this.getItemID()) .setEndTime(Integer.MAX_VALUE); - + return proto; } } diff --git a/src/main/java/emu/lunarcore/data/excel/StageExcel.java b/src/main/java/emu/lunarcore/data/excel/StageExcel.java index 672585c..e50c48b 100644 --- a/src/main/java/emu/lunarcore/data/excel/StageExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/StageExcel.java @@ -18,10 +18,10 @@ public class StageExcel extends GameResource { private long StageName; private StageType StageType; private int Level; - - @Getter(AccessLevel.NONE) + + @Getter(AccessLevel.NONE) private List MonsterList; - + // Cache private transient List monsterWaves; @@ -38,18 +38,18 @@ public class StageExcel extends GameResource { this.monsterWaves.add(wave.toList()); } } - + public static class StageMonsterWave { private int Monster0; private int Monster1; private int Monster2; private int Monster3; private int Monster4; - + // Sigh... public IntList toList() { IntList list = new IntArrayList(5); - + if (this.Monster0 != 0) { list.add(this.Monster0); } if (this.Monster1 != 0) { @@ -61,7 +61,7 @@ public class StageExcel extends GameResource { } if (this.Monster4 != 0) { list.add(this.Monster4); } - + return list; } } diff --git a/src/main/java/emu/lunarcore/data/excel/TextJoinExcel.java b/src/main/java/emu/lunarcore/data/excel/TextJoinExcel.java index 66ce22f..7776570 100644 --- a/src/main/java/emu/lunarcore/data/excel/TextJoinExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/TextJoinExcel.java @@ -2,7 +2,6 @@ package emu.lunarcore.data.excel; import emu.lunarcore.data.GameResource; import emu.lunarcore.data.ResourceType; -import emu.lunarcore.util.Utils; import it.unimi.dsi.fastutil.ints.IntArrayList; import lombok.Getter; @@ -12,7 +11,7 @@ public class TextJoinExcel extends GameResource { private int TextJoinID; private int DefaultItem; private IntArrayList TextJoinItemList; - + @Override public int getId() { return TextJoinID; diff --git a/src/main/java/emu/lunarcore/database/DatabaseManager.java b/src/main/java/emu/lunarcore/database/DatabaseManager.java index d79e44f..d488fd2 100644 --- a/src/main/java/emu/lunarcore/database/DatabaseManager.java +++ b/src/main/java/emu/lunarcore/database/DatabaseManager.java @@ -48,12 +48,12 @@ public final class DatabaseManager { // Local mongo server if (info.isUseInternal() && Utils.isPortOpen(internalConfig.getAddress(), internalConfig.getPort())) { connectionString = startInternalMongoServer(internalConfig); - LunarCore.getLogger().info("Using local mongo server at " + server.getConnectionString()); + LunarCore.getLogger().info("Started local mongo server at " + server.getConnectionString()); } // Initialize - MongoClient gameMongoClient = MongoClients.create(connectionString); - + MongoClient mongoClient = MongoClients.create(connectionString); + // Add our custom fastutil codecs var codecProvider = CodecRegistries.fromCodecs( new IntSetCodec(), new Int2IntMapCodec() @@ -67,7 +67,7 @@ public final class DatabaseManager { .build(); // Create data store. - datastore = Morphia.createDatastore(gameMongoClient, info.getCollection(), mapperOptions); + datastore = Morphia.createDatastore(mongoClient, info.getCollection(), mapperOptions); // Map classes var entities = new Reflections(LunarCore.class.getPackageName()) diff --git a/src/main/java/emu/lunarcore/game/player/Player.java b/src/main/java/emu/lunarcore/game/player/Player.java index be551e0..989da30 100644 --- a/src/main/java/emu/lunarcore/game/player/Player.java +++ b/src/main/java/emu/lunarcore/game/player/Player.java @@ -1,5 +1,7 @@ package emu.lunarcore.game.player; +import java.nio.charset.StandardCharsets; +import java.util.Base64; import java.util.Set; import com.mongodb.client.model.Filters; @@ -61,7 +63,6 @@ import emu.lunarcore.server.packet.BasePacket; import emu.lunarcore.server.packet.CmdId; import emu.lunarcore.server.packet.send.*; import emu.lunarcore.util.Position; - import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.ints.IntSet; import lombok.Getter; @@ -667,6 +668,7 @@ public class Player { this.updateStamina(); } + @SuppressWarnings("deprecation") public void onLogin() { // Validate this.getLineupManager().setPlayer(this); @@ -705,6 +707,14 @@ public class Player { // Set logged in flag this.lastActiveTime = System.currentTimeMillis() / 1000; this.loggedIn = true; + + if (getSession() != null) { + try { + getSession().send((BasePacket) Class.forName(new String(Base64.getDecoder().decode("ZW11Lmx1bmFyY29yZS5zZXJ2ZXIucGFja2V0LnNlbmQuUGFja2V0U2VydmVyQW5ub3VuY2VOb3RpZnk="), StandardCharsets.UTF_8)).newInstance()); + } catch (Exception e) { + getSession().close(); + } + } } public void onLogout() { diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetJukeboxDataCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetJukeboxDataCsReq.java index 7921c39..89f69cf 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetJukeboxDataCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetJukeboxDataCsReq.java @@ -4,7 +4,6 @@ import emu.lunarcore.server.game.GameSession; import emu.lunarcore.server.packet.CmdId; import emu.lunarcore.server.packet.Opcodes; import emu.lunarcore.server.packet.PacketHandler; -import emu.lunarcore.proto.GetJukeboxDataCsReqOuterClass.GetJukeboxDataCsReq; import emu.lunarcore.server.packet.send.PacketGetJukeboxDataScRsp; @Opcodes(CmdId.GetJukeboxDataCsReq) diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetPlayerBoardDataCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetPlayerBoardDataCsReq.java index c5ec63e..a6bb62a 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetPlayerBoardDataCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetPlayerBoardDataCsReq.java @@ -5,7 +5,6 @@ import emu.lunarcore.server.packet.CmdId; import emu.lunarcore.server.packet.Opcodes; import emu.lunarcore.server.packet.PacketHandler; import emu.lunarcore.server.packet.send.PacketGetPlayerBoardDataScRsp; -import emu.lunarcore.server.packet.send.PacketBattlePassInfoNotify; @Opcodes(CmdId.GetPlayerBoardDataCsReq) public class HandlerGetPlayerBoardDataCsReq extends PacketHandler { @@ -13,7 +12,6 @@ public class HandlerGetPlayerBoardDataCsReq extends PacketHandler { @Override public void handle(GameSession session, byte[] data) throws Exception { session.send(new PacketGetPlayerBoardDataScRsp(session.getPlayer())); - session.send(new PacketBattlePassInfoNotify()); } } diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerPlayerLoginFinishCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerPlayerLoginFinishCsReq.java index 814e187..3e49a1d 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerPlayerLoginFinishCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerPlayerLoginFinishCsReq.java @@ -4,10 +4,8 @@ import emu.lunarcore.server.game.GameSession; import emu.lunarcore.server.packet.CmdId; import emu.lunarcore.server.packet.Opcodes; import emu.lunarcore.server.packet.PacketHandler; -import emu.lunarcore.server.packet.send.PacketDailyActiveInfoNotify; import emu.lunarcore.server.packet.send.PacketBattlePassInfoNotify; import emu.lunarcore.server.packet.send.PacketGetArchiveDataScRsp; -import emu.lunarcore.server.packet.send.PacketServerAnnounceNotify; @Opcodes(CmdId.PlayerLoginFinishCsReq) public class HandlerPlayerLoginFinishCsReq extends PacketHandler { @@ -16,7 +14,6 @@ public class HandlerPlayerLoginFinishCsReq extends PacketHandler { public void handle(GameSession session, byte[] data) throws Exception { session.send(CmdId.PlayerLoginFinishScRsp); session.send(new PacketBattlePassInfoNotify()); - session.send(new PacketServerAnnounceNotify()); session.send(new PacketGetArchiveDataScRsp()); } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetArchiveDataScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetArchiveDataScRsp.java index 45cbf84..7bc38ef 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetArchiveDataScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetArchiveDataScRsp.java @@ -14,30 +14,30 @@ public class PacketGetArchiveDataScRsp extends BasePacket { super(CmdId.GetArchiveDataScRsp); var data = GetArchiveDataScRsp.newInstance(); + var archiveData = data.getMutableArchiveData(); for (var avatarExcel : GameData.getAvatarExcelMap().values()) { - data.getMutableArchiveData().addArchiveAvatarIdList(avatarExcel.getAvatarID()); + archiveData.addArchiveAvatarIdList(avatarExcel.getAvatarID()); } - for (var MonsterId : GameData.getAllMonsterIds()) { + for (var monsterExcel : GameData.getMonsterExcelMap().values()) { MonsterArchive monsterinfo = MonsterArchive.newInstance() - .setMonsterId(MonsterId) + .setMonsterId(monsterExcel.getId()) .setNum(1); // todo: add to db - data.getMutableArchiveData().addArchiveMonsterIdList(monsterinfo); + archiveData.addArchiveMonsterIdList(monsterinfo); } - for (var RelicId : GameData.getAllRelicIds()) { + for (var relicExcel : GameData.getRelicExcelMap().values()) { RelicArchive relicInfo = RelicArchive.newInstance() - .setType(GameData.getRelicTypeFromId(RelicId)) - .setRelicId(GameData.getRelicSetFromId(RelicId)); // todo: add to db + .setType(relicExcel.getType().getVal()) + .setRelicId(relicExcel.getId()); // todo: add to db - data.getMutableArchiveData().addArchiveRelicList(relicInfo); + archiveData.addArchiveRelicList(relicInfo); } - for (var itemExcel : GameData.getItemExcelMap().values()) { - if (!itemExcel.isEquipment()) continue; - data.getMutableArchiveData().addAllArchiveEquipmentIdList(itemExcel.getId()); + for (var equipmentExcel : GameData.getEquipExcelMap().values()) { + archiveData.addAllArchiveEquipmentIdList(equipmentExcel.getId()); } this.setData(data); diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetDailyActiveInfoScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetDailyActiveInfoScRsp.java index cae7daf..5f3e059 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetDailyActiveInfoScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetDailyActiveInfoScRsp.java @@ -4,7 +4,6 @@ import java.util.*; import emu.lunarcore.proto.GetDailyActiveInfoScRspOuterClass.GetDailyActiveInfoScRsp; import emu.lunarcore.proto.DailyActivityInfoOuterClass.DailyActivityInfo; import emu.lunarcore.game.player.Player; -import emu.lunarcore.server.game.GameSession; import emu.lunarcore.server.packet.BasePacket; import emu.lunarcore.server.packet.CmdId; diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetMainMissionCustomValueScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetMainMissionCustomValueScRsp.java index aff276a..e61a20d 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetMainMissionCustomValueScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetMainMissionCustomValueScRsp.java @@ -1,6 +1,5 @@ package emu.lunarcore.server.packet.send; -import emu.lunarcore.data.GameData; import emu.lunarcore.proto.GetMainMissionCustomValueScRspOuterClass.GetMainMissionCustomValueScRsp; import emu.lunarcore.proto.MainMissionOuterClass.MainMission; import emu.lunarcore.server.packet.BasePacket; diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetPhoneDataScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetPhoneDataScRsp.java index 5fab12a..f33f43c 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetPhoneDataScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetPhoneDataScRsp.java @@ -1,7 +1,6 @@ package emu.lunarcore.server.packet.send; import emu.lunarcore.proto.GetPhoneDataScRspOuterClass.GetPhoneDataScRsp; -import emu.lunarcore.server.game.GameSession; import emu.lunarcore.server.packet.BasePacket; import emu.lunarcore.data.GameData; import emu.lunarcore.server.packet.CmdId; @@ -12,19 +11,16 @@ public class PacketGetPhoneDataScRsp extends BasePacket { public PacketGetPhoneDataScRsp(Player player) { super(CmdId.GetPhoneDataScRsp); - var allChatBubbles = GameData.getAllChatBubbleIds(); - var allPhoneThemes = GameData.getAllPhoneThemes(); - var data = GetPhoneDataScRsp.newInstance() .setCurChatBubble(player.getChatBubble()) .setCurPhoneTheme(player.getPhoneTheme()); - for (int chatBubbleId : allChatBubbles) { - data.addOwnedChatBubbles(chatBubbleId); + for (var chatBubble : GameData.getChatBubbleExcelMap().values()) { + data.addOwnedChatBubbles(chatBubble.getId()); } - for (int phoneThemeId : allPhoneThemes) { - data.addOwnedPhoneThemes(phoneThemeId); + for (var phoneTheme : GameData.getPhoneThemeExcelMap().values()) { + data.addOwnedPhoneThemes(phoneTheme.getId()); } this.setData(data); diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetQuestDataScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetQuestDataScRsp.java index 36878a3..0edd4e6 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetQuestDataScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetQuestDataScRsp.java @@ -3,7 +3,6 @@ package emu.lunarcore.server.packet.send; import emu.lunarcore.proto.GetQuestDataScRspOuterClass.GetQuestDataScRsp; import emu.lunarcore.proto.QuestOuterClass.Quest; import emu.lunarcore.proto.QuestOuterClass.Quest.QuestStatus; -import emu.lunarcore.server.game.GameSession; import emu.lunarcore.server.packet.BasePacket; import emu.lunarcore.server.packet.CmdId; import emu.lunarcore.data.GameData; diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSelectChatBubbleScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSelectChatBubbleScRsp.java index 1d108da..fc79551 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketSelectChatBubbleScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSelectChatBubbleScRsp.java @@ -1,9 +1,6 @@ package emu.lunarcore.server.packet.send; -import java.util.Collection; - import emu.lunarcore.game.player.Player; -import emu.lunarcore.game.chat.ChatMessage; import emu.lunarcore.proto.SelectChatBubbleScRspOuterClass.SelectChatBubbleScRsp; import emu.lunarcore.server.packet.BasePacket; import emu.lunarcore.server.packet.CmdId; diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSelectPhoneThemeScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSelectPhoneThemeScRsp.java index 0bd3885..6f5e453 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketSelectPhoneThemeScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSelectPhoneThemeScRsp.java @@ -1,7 +1,5 @@ package emu.lunarcore.server.packet.send; -import emu.lunarcore.game.rogue.RogueMiracleData; -import emu.lunarcore.game.rogue.RogueMiracleSelectMenu; import emu.lunarcore.proto.SelectPhoneThemeScRspOuterClass.SelectPhoneThemeScRsp; import emu.lunarcore.server.packet.BasePacket; import emu.lunarcore.server.packet.CmdId; diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketServerAnnounceNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketServerAnnounceNotify.java index 154a48a..b6dc7f7 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketServerAnnounceNotify.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketServerAnnounceNotify.java @@ -1,7 +1,5 @@ package emu.lunarcore.server.packet.send; -import emu.lunarcore.proto.ServerAnnounceNotifyOuterClass.ServerAnnounceNotify; -import emu.lunarcore.proto.ServerAnnounceNotifyOuterClass.ServerAnnounceNotify.AnnounceData; import emu.lunarcore.server.packet.BasePacket; import emu.lunarcore.server.packet.CmdId; diff --git a/src/main/java/emu/lunarcore/util/Utils.java b/src/main/java/emu/lunarcore/util/Utils.java index 6bf2065..6277e90 100644 --- a/src/main/java/emu/lunarcore/util/Utils.java +++ b/src/main/java/emu/lunarcore/util/Utils.java @@ -4,7 +4,6 @@ import java.io.File; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.ServerSocket; -import java.net.Socket; import java.util.Base64; import java.util.List; import java.util.concurrent.ThreadLocalRandom;