From d216c61a5a76d72d9d332a187881e8c77cf613b9 Mon Sep 17 00:00:00 2001 From: Melledy <121644117+Melledy@users.noreply.github.com> Date: Sat, 11 Nov 2023 23:47:45 -0800 Subject: [PATCH] Various refactors --- src/main/java/emu/lunarcore/LunarCore.java | 2 +- .../emu/lunarcore/command/commands/ClearCommand.java | 2 +- .../lunarcore/command/commands/GiveAllCommand.java | 4 ++-- .../emu/lunarcore/command/commands/GiveCommand.java | 2 +- src/main/java/emu/lunarcore/data/GameDepot.java | 12 +++++++----- .../java/emu/lunarcore/data/excel/ItemExcel.java | 12 ++++++------ .../java/emu/lunarcore/data/excel/RelicExcel.java | 2 +- .../emu/lunarcore/data/excel/RelicExpItemExcel.java | 2 +- .../java/emu/lunarcore/game/avatar/GameAvatar.java | 2 +- src/main/java/emu/lunarcore/game/battle/Battle.java | 2 -- .../lunarcore/game/challenge/ChallengeManager.java | 11 +++++++---- .../game/{inventory => enums}/ItemMainType.java | 2 +- .../game/{inventory => enums}/ItemRarity.java | 2 +- .../game/{inventory => enums}/ItemSubType.java | 2 +- .../game/{inventory => enums}/RelicType.java | 2 +- .../java/emu/lunarcore/game/gacha/GachaService.java | 4 ++-- .../java/emu/lunarcore/game/inventory/GameItem.java | 1 + .../java/emu/lunarcore/game/inventory/Inventory.java | 2 ++ .../server/packet/send/PacketGetBagScRsp.java | 2 +- 19 files changed, 38 insertions(+), 32 deletions(-) rename src/main/java/emu/lunarcore/game/{inventory => enums}/ItemMainType.java (89%) rename src/main/java/emu/lunarcore/game/{inventory => enums}/ItemRarity.java (86%) rename src/main/java/emu/lunarcore/game/{inventory => enums}/ItemSubType.java (94%) rename src/main/java/emu/lunarcore/game/{inventory => enums}/RelicType.java (86%) diff --git a/src/main/java/emu/lunarcore/LunarCore.java b/src/main/java/emu/lunarcore/LunarCore.java index 0889ab9..83a5aa3 100644 --- a/src/main/java/emu/lunarcore/LunarCore.java +++ b/src/main/java/emu/lunarcore/LunarCore.java @@ -59,7 +59,7 @@ public class LunarCore { public static void main(String[] args) { // Start Server LunarCore.getLogger().info("Starting Lunar Core..."); - LunarCore.getLogger().info("Made for game version " + GameConstants.VERSION); + LunarCore.getLogger().info("Game version: " + GameConstants.VERSION); boolean generateHandbook = true; // Load commands diff --git a/src/main/java/emu/lunarcore/command/commands/ClearCommand.java b/src/main/java/emu/lunarcore/command/commands/ClearCommand.java index 73fd829..3cf418d 100644 --- a/src/main/java/emu/lunarcore/command/commands/ClearCommand.java +++ b/src/main/java/emu/lunarcore/command/commands/ClearCommand.java @@ -6,8 +6,8 @@ import java.util.List; import emu.lunarcore.command.Command; import emu.lunarcore.command.CommandArgs; import emu.lunarcore.command.CommandHandler; +import emu.lunarcore.game.enums.ItemMainType; import emu.lunarcore.game.inventory.GameItem; -import emu.lunarcore.game.inventory.ItemMainType; import emu.lunarcore.game.player.Player; @Command(label = "clear", permission = "player.clear", desc = "/clear {relics | lightcones | materials | items}. Removes filtered items from the player inventory.") diff --git a/src/main/java/emu/lunarcore/command/commands/GiveAllCommand.java b/src/main/java/emu/lunarcore/command/commands/GiveAllCommand.java index 968d6c9..7c70fc8 100644 --- a/src/main/java/emu/lunarcore/command/commands/GiveAllCommand.java +++ b/src/main/java/emu/lunarcore/command/commands/GiveAllCommand.java @@ -8,9 +8,9 @@ import emu.lunarcore.command.CommandArgs; import emu.lunarcore.command.CommandHandler; import emu.lunarcore.data.GameData; import emu.lunarcore.data.excel.ItemExcel; +import emu.lunarcore.game.enums.ItemMainType; +import emu.lunarcore.game.enums.ItemSubType; import emu.lunarcore.game.inventory.GameItem; -import emu.lunarcore.game.inventory.ItemMainType; -import emu.lunarcore.game.inventory.ItemSubType; import emu.lunarcore.game.player.Player; @Command(label = "giveall", aliases = {"ga"}, permission = "player.give", desc = "/giveall {materials | avatars}. Gives the targeted player items.") diff --git a/src/main/java/emu/lunarcore/command/commands/GiveCommand.java b/src/main/java/emu/lunarcore/command/commands/GiveCommand.java index a4cc343..2fb65e8 100644 --- a/src/main/java/emu/lunarcore/command/commands/GiveCommand.java +++ b/src/main/java/emu/lunarcore/command/commands/GiveCommand.java @@ -9,8 +9,8 @@ import emu.lunarcore.command.CommandHandler; import emu.lunarcore.data.GameData; import emu.lunarcore.data.excel.ItemExcel; import emu.lunarcore.game.avatar.GameAvatar; +import emu.lunarcore.game.enums.ItemMainType; import emu.lunarcore.game.inventory.GameItem; -import emu.lunarcore.game.inventory.ItemMainType; import emu.lunarcore.game.player.Player; import emu.lunarcore.util.Utils; diff --git a/src/main/java/emu/lunarcore/data/GameDepot.java b/src/main/java/emu/lunarcore/data/GameDepot.java index 50c3c38..fe167f2 100644 --- a/src/main/java/emu/lunarcore/data/GameDepot.java +++ b/src/main/java/emu/lunarcore/data/GameDepot.java @@ -29,13 +29,15 @@ public class GameDepot { private static Int2ObjectMap> rogueMapDepot = new Int2ObjectOpenHashMap<>(); public static void addRelicMainAffix(RelicMainAffixExcel affix) { - List list = relicMainAffixDepot.computeIfAbsent(affix.getGroupID(), k -> new ArrayList<>()); - list.add(affix); + relicMainAffixDepot + .computeIfAbsent(affix.getGroupID(), k -> new ArrayList<>()) + .add(affix); } public static void addRelicSubAffix(RelicSubAffixExcel affix) { - List list = relicSubAffixDepot.computeIfAbsent(affix.getGroupID(), k -> new ArrayList<>()); - list.add(affix); + relicSubAffixDepot + .computeIfAbsent(affix.getGroupID(), k -> new ArrayList<>()) + .add(affix); } public static RelicMainAffixExcel getRandomRelicMainAffix(int groupId) { @@ -49,7 +51,7 @@ public class GameDepot { return relicSubAffixDepot.get(groupId); } - // TODO cache this so we dont have to run this function everytime we get the schedule + // TODO cache this so we don't have to run this function every time we get the schedule public static RogueManagerExcel getCurrentRogueSchedule() { long time = System.currentTimeMillis() - (GameConstants.CURRENT_ZONEOFFSET.getTotalSeconds() * 1000); diff --git a/src/main/java/emu/lunarcore/data/excel/ItemExcel.java b/src/main/java/emu/lunarcore/data/excel/ItemExcel.java index cb5c507..c368552 100644 --- a/src/main/java/emu/lunarcore/data/excel/ItemExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/ItemExcel.java @@ -5,9 +5,9 @@ import java.util.List; import emu.lunarcore.data.GameResource; import emu.lunarcore.data.ResourceType; import emu.lunarcore.data.common.ItemParam; -import emu.lunarcore.game.inventory.ItemMainType; -import emu.lunarcore.game.inventory.ItemRarity; -import emu.lunarcore.game.inventory.ItemSubType; +import emu.lunarcore.game.enums.ItemMainType; +import emu.lunarcore.game.enums.ItemRarity; +import emu.lunarcore.game.enums.ItemSubType; import lombok.Getter; import lombok.Setter; @@ -41,15 +41,15 @@ public class ItemExcel extends GameResource { } public boolean isEquipment() { - return ItemMainType == emu.lunarcore.game.inventory.ItemMainType.Equipment && this.getEquipmentExcel() != null; + return ItemMainType == emu.lunarcore.game.enums.ItemMainType.Equipment && this.getEquipmentExcel() != null; } public boolean isRelic() { - return ItemMainType == emu.lunarcore.game.inventory.ItemMainType.Relic && this.getRelicExcel() != null; + return ItemMainType == emu.lunarcore.game.enums.ItemMainType.Relic && this.getRelicExcel() != null; } public boolean isEquippable() { - return ItemMainType == emu.lunarcore.game.inventory.ItemMainType.Relic || ItemMainType == emu.lunarcore.game.inventory.ItemMainType.Equipment; + return ItemMainType == emu.lunarcore.game.enums.ItemMainType.Relic || ItemMainType == emu.lunarcore.game.enums.ItemMainType.Equipment; } public int getRelicExp() { diff --git a/src/main/java/emu/lunarcore/data/excel/RelicExcel.java b/src/main/java/emu/lunarcore/data/excel/RelicExcel.java index cbf17ba..d535e30 100644 --- a/src/main/java/emu/lunarcore/data/excel/RelicExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/RelicExcel.java @@ -4,7 +4,7 @@ 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.RelicType; +import emu.lunarcore.game.enums.RelicType; import lombok.Getter; @Getter diff --git a/src/main/java/emu/lunarcore/data/excel/RelicExpItemExcel.java b/src/main/java/emu/lunarcore/data/excel/RelicExpItemExcel.java index 21498dc..c60e0ab 100644 --- a/src/main/java/emu/lunarcore/data/excel/RelicExpItemExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/RelicExpItemExcel.java @@ -7,7 +7,7 @@ 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.inventory.ItemRarity; +import emu.lunarcore.game.enums.ItemRarity; import lombok.Getter; @Getter diff --git a/src/main/java/emu/lunarcore/game/avatar/GameAvatar.java b/src/main/java/emu/lunarcore/game/avatar/GameAvatar.java index 39497c9..1bb2fe4 100644 --- a/src/main/java/emu/lunarcore/game/avatar/GameAvatar.java +++ b/src/main/java/emu/lunarcore/game/avatar/GameAvatar.java @@ -12,8 +12,8 @@ import emu.lunarcore.GameConstants; import emu.lunarcore.LunarCore; import emu.lunarcore.data.GameData; import emu.lunarcore.data.excel.AvatarExcel; +import emu.lunarcore.game.enums.ItemMainType; import emu.lunarcore.game.inventory.GameItem; -import emu.lunarcore.game.inventory.ItemMainType; import emu.lunarcore.game.player.Player; import emu.lunarcore.game.player.lineup.PlayerLineup; import emu.lunarcore.game.scene.Scene; diff --git a/src/main/java/emu/lunarcore/game/battle/Battle.java b/src/main/java/emu/lunarcore/game/battle/Battle.java index 96b81ff..edb318a 100644 --- a/src/main/java/emu/lunarcore/game/battle/Battle.java +++ b/src/main/java/emu/lunarcore/game/battle/Battle.java @@ -5,7 +5,6 @@ import java.util.Collection; import java.util.List; import emu.lunarcore.data.GameData; -import emu.lunarcore.data.common.ItemParam; import emu.lunarcore.data.excel.MazeBuffExcel; import emu.lunarcore.data.excel.StageExcel; import emu.lunarcore.game.avatar.GameAvatar; @@ -19,7 +18,6 @@ import emu.lunarcore.proto.SceneMonsterOuterClass.SceneMonster; import emu.lunarcore.proto.SceneMonsterWaveOuterClass.SceneMonsterWave; import emu.lunarcore.util.Utils; -import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; import it.unimi.dsi.fastutil.ints.IntList; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/emu/lunarcore/game/challenge/ChallengeManager.java b/src/main/java/emu/lunarcore/game/challenge/ChallengeManager.java index 7991183..1e6af92 100644 --- a/src/main/java/emu/lunarcore/game/challenge/ChallengeManager.java +++ b/src/main/java/emu/lunarcore/game/challenge/ChallengeManager.java @@ -3,6 +3,7 @@ package emu.lunarcore.game.challenge; import java.util.List; import java.util.stream.Stream; +import emu.lunarcore.GameConstants; import emu.lunarcore.LunarCore; import emu.lunarcore.data.GameData; import emu.lunarcore.data.excel.ChallengeExcel; @@ -46,10 +47,12 @@ public class ChallengeManager extends BasePlayerManager { avatar.setCurrentHp(lineup, 10000); avatar.setCurrentSp(lineup, avatar.getMaxSp() / 2); }); - // Set technique points - lineup.setMp(5); + // Set technique points to full + lineup.setMp(GameConstants.MAX_MP); } + if (excel.getStageNum() >= 2) { + // Get lineup PlayerLineup lineup = getPlayer().getLineupManager().getExtraLineupByType(ExtraLineupType.LINEUP_CHALLENGE_2_VALUE); // Make sure this lineup has avatars set if (lineup.getAvatars().size() == 0) return; @@ -58,8 +61,8 @@ public class ChallengeManager extends BasePlayerManager { avatar.setCurrentHp(lineup, 10000); avatar.setCurrentSp(lineup, avatar.getMaxSp() / 2); }); - // Set technique points - lineup.setMp(5); + // Set technique points to full + lineup.setMp(GameConstants.MAX_MP); } // Set challenge data for player diff --git a/src/main/java/emu/lunarcore/game/inventory/ItemMainType.java b/src/main/java/emu/lunarcore/game/enums/ItemMainType.java similarity index 89% rename from src/main/java/emu/lunarcore/game/inventory/ItemMainType.java rename to src/main/java/emu/lunarcore/game/enums/ItemMainType.java index 4ece63c..194be2a 100644 --- a/src/main/java/emu/lunarcore/game/inventory/ItemMainType.java +++ b/src/main/java/emu/lunarcore/game/enums/ItemMainType.java @@ -1,4 +1,4 @@ -package emu.lunarcore.game.inventory; +package emu.lunarcore.game.enums; import lombok.Getter; diff --git a/src/main/java/emu/lunarcore/game/inventory/ItemRarity.java b/src/main/java/emu/lunarcore/game/enums/ItemRarity.java similarity index 86% rename from src/main/java/emu/lunarcore/game/inventory/ItemRarity.java rename to src/main/java/emu/lunarcore/game/enums/ItemRarity.java index 0b94169..0293b1c 100644 --- a/src/main/java/emu/lunarcore/game/inventory/ItemRarity.java +++ b/src/main/java/emu/lunarcore/game/enums/ItemRarity.java @@ -1,4 +1,4 @@ -package emu.lunarcore.game.inventory; +package emu.lunarcore.game.enums; import lombok.Getter; diff --git a/src/main/java/emu/lunarcore/game/inventory/ItemSubType.java b/src/main/java/emu/lunarcore/game/enums/ItemSubType.java similarity index 94% rename from src/main/java/emu/lunarcore/game/inventory/ItemSubType.java rename to src/main/java/emu/lunarcore/game/enums/ItemSubType.java index b0c5e21..eb064e0 100644 --- a/src/main/java/emu/lunarcore/game/inventory/ItemSubType.java +++ b/src/main/java/emu/lunarcore/game/enums/ItemSubType.java @@ -1,4 +1,4 @@ -package emu.lunarcore.game.inventory; +package emu.lunarcore.game.enums; import lombok.Getter; diff --git a/src/main/java/emu/lunarcore/game/inventory/RelicType.java b/src/main/java/emu/lunarcore/game/enums/RelicType.java similarity index 86% rename from src/main/java/emu/lunarcore/game/inventory/RelicType.java rename to src/main/java/emu/lunarcore/game/enums/RelicType.java index 7bc2c76..b3c2a82 100644 --- a/src/main/java/emu/lunarcore/game/inventory/RelicType.java +++ b/src/main/java/emu/lunarcore/game/enums/RelicType.java @@ -1,4 +1,4 @@ -package emu.lunarcore.game.inventory; +package emu.lunarcore.game.enums; import lombok.Getter; diff --git a/src/main/java/emu/lunarcore/game/gacha/GachaService.java b/src/main/java/emu/lunarcore/game/gacha/GachaService.java index ad6f216..ee34ea3 100644 --- a/src/main/java/emu/lunarcore/game/gacha/GachaService.java +++ b/src/main/java/emu/lunarcore/game/gacha/GachaService.java @@ -9,9 +9,9 @@ import emu.lunarcore.LunarCore; import emu.lunarcore.data.GameData; import emu.lunarcore.data.excel.ItemExcel; import emu.lunarcore.game.avatar.GameAvatar; +import emu.lunarcore.game.enums.ItemMainType; +import emu.lunarcore.game.enums.ItemRarity; import emu.lunarcore.game.inventory.GameItem; -import emu.lunarcore.game.inventory.ItemMainType; -import emu.lunarcore.game.inventory.ItemRarity; import emu.lunarcore.game.player.Player; import emu.lunarcore.proto.GachaItemOuterClass.GachaItem; import emu.lunarcore.proto.GetGachaInfoScRspOuterClass.GetGachaInfoScRsp; diff --git a/src/main/java/emu/lunarcore/game/inventory/GameItem.java b/src/main/java/emu/lunarcore/game/inventory/GameItem.java index 84efc9a..a2595eb 100644 --- a/src/main/java/emu/lunarcore/game/inventory/GameItem.java +++ b/src/main/java/emu/lunarcore/game/inventory/GameItem.java @@ -15,6 +15,7 @@ import emu.lunarcore.data.excel.ItemExcel; import emu.lunarcore.data.excel.RelicMainAffixExcel; import emu.lunarcore.data.excel.RelicSubAffixExcel; import emu.lunarcore.game.enums.AvatarPropertyType; +import emu.lunarcore.game.enums.ItemMainType; import emu.lunarcore.game.player.Player; import emu.lunarcore.proto.EquipmentOuterClass.Equipment; import emu.lunarcore.proto.ItemOuterClass.Item; diff --git a/src/main/java/emu/lunarcore/game/inventory/Inventory.java b/src/main/java/emu/lunarcore/game/inventory/Inventory.java index 56c606b..f793cff 100644 --- a/src/main/java/emu/lunarcore/game/inventory/Inventory.java +++ b/src/main/java/emu/lunarcore/game/inventory/Inventory.java @@ -14,6 +14,8 @@ import emu.lunarcore.data.excel.AvatarExcel; import emu.lunarcore.data.excel.ItemExcel; import emu.lunarcore.game.avatar.AvatarStorage; import emu.lunarcore.game.avatar.GameAvatar; +import emu.lunarcore.game.enums.ItemMainType; +import emu.lunarcore.game.enums.ItemSubType; import emu.lunarcore.game.player.BasePlayerManager; import emu.lunarcore.game.player.Player; import emu.lunarcore.server.packet.send.PacketPlayerSyncScNotify; diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetBagScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetBagScRsp.java index b7c1c9f..9cd0778 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetBagScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetBagScRsp.java @@ -1,8 +1,8 @@ package emu.lunarcore.server.packet.send; +import emu.lunarcore.game.enums.ItemMainType; import emu.lunarcore.game.inventory.GameItem; import emu.lunarcore.game.inventory.InventoryTab; -import emu.lunarcore.game.inventory.ItemMainType; import emu.lunarcore.proto.GetBagScRspOuterClass.GetBagScRsp; import emu.lunarcore.server.game.GameSession; import emu.lunarcore.server.packet.BasePacket;