Mirror/LunarCore
1
0
Fork 0
mirror of https://github.com/Melledy/LunarCore.git synced 2025-12-14 06:14:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Various refactors

Browse Source
This commit is contained in:
Melledy
2023-11-11 23:47:45 -08:00
parent 012219de6a
commit d216c61a5a
19 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/lunarcore/LunarCore.java
View File

@@ -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

2
src/main/java/emu/lunarcore/command/commands/ClearCommand.java
View File

@@ -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.")

4
src/main/java/emu/lunarcore/command/commands/GiveAllCommand.java
View File

@@ -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.")

2
src/main/java/emu/lunarcore/command/commands/GiveCommand.java
View File

@@ -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;

12
src/main/java/emu/lunarcore/data/GameDepot.java
View File

@@ -29,13 +29,15 @@ public class GameDepot {
private static Int2ObjectMap<List<RogueMapExcel>> rogueMapDepot = new Int2ObjectOpenHashMap<>();
public static void addRelicMainAffix(RelicMainAffixExcel affix) {
List<RelicMainAffixExcel> 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<RelicSubAffixExcel> 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);

12
src/main/java/emu/lunarcore/data/excel/ItemExcel.java
View File

@@ -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() {

2
src/main/java/emu/lunarcore/data/excel/RelicExcel.java
View File

@@ -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

2
src/main/java/emu/lunarcore/data/excel/RelicExpItemExcel.java
View File

@@ -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

2
src/main/java/emu/lunarcore/game/avatar/GameAvatar.java
View File

@@ -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;

2
src/main/java/emu/lunarcore/game/battle/Battle.java
View File

@@ -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;

11
src/main/java/emu/lunarcore/game/challenge/ChallengeManager.java
View File

@@ -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

2
src/main/java/emu/lunarcore/game/inventory/ItemMainType.java → src/main/java/emu/lunarcore/game/enums/ItemMainType.java
View File

@@ -1,4 +1,4 @@
package emu.lunarcore.game.inventory;
package emu.lunarcore.game.enums;
import lombok.Getter;

2
src/main/java/emu/lunarcore/game/inventory/ItemRarity.java → src/main/java/emu/lunarcore/game/enums/ItemRarity.java
View File

@@ -1,4 +1,4 @@
package emu.lunarcore.game.inventory;
package emu.lunarcore.game.enums;
import lombok.Getter;

2
src/main/java/emu/lunarcore/game/inventory/ItemSubType.java → src/main/java/emu/lunarcore/game/enums/ItemSubType.java
View File

@@ -1,4 +1,4 @@
package emu.lunarcore.game.inventory;
package emu.lunarcore.game.enums;
import lombok.Getter;

2
src/main/java/emu/lunarcore/game/inventory/RelicType.java → src/main/java/emu/lunarcore/game/enums/RelicType.java
View File

@@ -1,4 +1,4 @@
package emu.lunarcore.game.inventory;
package emu.lunarcore.game.enums;
import lombok.Getter;

4
src/main/java/emu/lunarcore/game/gacha/GachaService.java
View File

@@ -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;

1
src/main/java/emu/lunarcore/game/inventory/GameItem.java
View File

@@ -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;

2
src/main/java/emu/lunarcore/game/inventory/Inventory.java
View File

@@ -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;

2
src/main/java/emu/lunarcore/server/packet/send/PacketGetBagScRsp.java
View File

@@ -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;