From 90b4a7e40de22f36803d490049b4f18fff7aad17 Mon Sep 17 00:00:00 2001 From: Melledy <121644117+Melledy@users.noreply.github.com> Date: Wed, 8 Nov 2023 16:02:05 -0800 Subject: [PATCH] Clean up some todo comments --- src/main/java/emu/lunarcore/data/config/TaskInfo.java | 2 +- .../emu/lunarcore/game/battle/skills/MazeSkillModifyHP.java | 1 - .../emu/lunarcore/game/battle/skills/MazeSkillModifySP.java | 1 - .../emu/lunarcore/game/battle/skills/MazeSkillSummonUnit.java | 2 -- src/main/java/emu/lunarcore/game/gacha/GachaService.java | 3 +-- src/main/java/emu/lunarcore/game/player/Player.java | 2 +- src/main/java/emu/lunarcore/game/rogue/RogueEntityLoader.java | 2 +- src/main/java/emu/lunarcore/game/scene/Scene.java | 3 +-- .../java/emu/lunarcore/game/scene/entity/EntityMonster.java | 2 +- .../java/emu/lunarcore/server/game/GameServerKcpListener.java | 2 +- .../emu/lunarcore/server/game/GameServerPacketHandler.java | 2 +- .../server/http/handlers/ComboTokenGranterHandler.java | 2 +- src/main/java/emu/lunarcore/util/Position.java | 2 +- 13 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/main/java/emu/lunarcore/data/config/TaskInfo.java b/src/main/java/emu/lunarcore/data/config/TaskInfo.java index 1a10981..f69be17 100644 --- a/src/main/java/emu/lunarcore/data/config/TaskInfo.java +++ b/src/main/java/emu/lunarcore/data/config/TaskInfo.java @@ -29,7 +29,7 @@ public class TaskInfo { public int getLifeTime() { if (this.LifeTime == null) { - return 15; // TODO change + return 20; // TODO change } return (int) this.LifeTime.getValue(); diff --git a/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillModifyHP.java b/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillModifyHP.java index 0eee84f..a3a32bb 100644 --- a/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillModifyHP.java +++ b/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillModifyHP.java @@ -14,7 +14,6 @@ public class MazeSkillModifyHP extends MazeSkillAction { @Override public void onCast(GameAvatar caster, MotionInfo castPosition) { caster.getOwner().getCurrentLineup().heal(this.amount, false); - // TODO Perhaps we should send a sync lineup packet here } @Override diff --git a/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillModifySP.java b/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillModifySP.java index bc1f223..a12ca81 100644 --- a/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillModifySP.java +++ b/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillModifySP.java @@ -17,7 +17,6 @@ public class MazeSkillModifySP extends MazeSkillAction { caster.getOwner().getCurrentLineup(), amount + caster.getCurrentSp(caster.getOwner().getCurrentLineup()) ); - // TODO Perhaps we should send a sync lineup packet here } @Override diff --git a/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillSummonUnit.java b/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillSummonUnit.java index 3339c6d..3c43acc 100644 --- a/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillSummonUnit.java +++ b/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillSummonUnit.java @@ -9,13 +9,11 @@ public class MazeSkillSummonUnit extends MazeSkillAction { @Override public void onCast(GameAvatar caster, MotionInfo castPosition) { // TODO Auto-generated method stub - } @Override public void onAttack(GameAvatar caster, Battle battle) { // TODO Auto-generated method stub - } } diff --git a/src/main/java/emu/lunarcore/game/gacha/GachaService.java b/src/main/java/emu/lunarcore/game/gacha/GachaService.java index b8e12aa..ad6f216 100644 --- a/src/main/java/emu/lunarcore/game/gacha/GachaService.java +++ b/src/main/java/emu/lunarcore/game/gacha/GachaService.java @@ -64,7 +64,6 @@ public class GachaService extends BaseGameService { getGachaBanners().put(banner.getId(), banner); } } catch (Exception e) { - // TODO Auto-generated catch block LunarCore.getLogger().warn("No gacha banners loaded!"); } } @@ -188,7 +187,7 @@ public class GachaService extends BaseGameService { GameAvatar avatar = player.getAvatars().getAvatarById(avatarId); if (avatar != null) { int dupeLevel = avatar.getRank(); - int dupeItemId = avatarId + 10000; // Hacky. TODO optimize by using AvatarRankExcel + int dupeItemId = avatarId + 10000; // Hacky fix so we dont have to fetch data from an excel GameItem dupeItem = player.getInventory().getInventoryTab(ItemMainType.Material).getItemById(dupeItemId); if (dupeItem != null) { dupeLevel += dupeItem.getCount(); diff --git a/src/main/java/emu/lunarcore/game/player/Player.java b/src/main/java/emu/lunarcore/game/player/Player.java index 7695cc5..bea06cf 100644 --- a/src/main/java/emu/lunarcore/game/player/Player.java +++ b/src/main/java/emu/lunarcore/game/player/Player.java @@ -393,7 +393,7 @@ public class Player { // Finish puzzle prop.setState(PropState.Locked); // Trigger event - this.getScene().fireTrigger(PropTriggerType.PUZZLE_FINISH, prop.getGroupId(), prop.getInstId()); + this.getScene().invokeTrigger(PropTriggerType.PUZZLE_FINISH, prop.getGroupId(), prop.getInstId()); // return prop; } diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueEntityLoader.java b/src/main/java/emu/lunarcore/game/rogue/RogueEntityLoader.java index fffafaa..dacebed 100644 --- a/src/main/java/emu/lunarcore/game/rogue/RogueEntityLoader.java +++ b/src/main/java/emu/lunarcore/game/rogue/RogueEntityLoader.java @@ -95,7 +95,7 @@ public class RogueEntityLoader extends SceneEntityLoader { } // Force rogue door to be open - propId = 1021; // TODO get proper portal ids + propId = 1021; state = PropState.Open; } diff --git a/src/main/java/emu/lunarcore/game/scene/Scene.java b/src/main/java/emu/lunarcore/game/scene/Scene.java index b64f0f8..8d36719 100644 --- a/src/main/java/emu/lunarcore/game/scene/Scene.java +++ b/src/main/java/emu/lunarcore/game/scene/Scene.java @@ -238,8 +238,7 @@ public class Scene { return spring; } - // TODO - public void fireTrigger(PropTriggerType type, int param1, int param2) { + public void invokeTrigger(PropTriggerType type, int param1, int param2) { for (PropTrigger trigger : this.getTriggers()) { if (trigger.shouldRun(param1, param2)) { trigger.run(this); diff --git a/src/main/java/emu/lunarcore/game/scene/entity/EntityMonster.java b/src/main/java/emu/lunarcore/game/scene/entity/EntityMonster.java index 8611534..e688a0b 100644 --- a/src/main/java/emu/lunarcore/game/scene/entity/EntityMonster.java +++ b/src/main/java/emu/lunarcore/game/scene/entity/EntityMonster.java @@ -46,7 +46,7 @@ public class EntityMonster implements GameEntity { @Override public void onRemove() { // Try to fire any triggers - getScene().fireTrigger(PropTriggerType.MONSTER_DIE, this.getGroupId(), this.getInstId()); + getScene().invokeTrigger(PropTriggerType.MONSTER_DIE, this.getGroupId(), this.getInstId()); } @Override diff --git a/src/main/java/emu/lunarcore/server/game/GameServerKcpListener.java b/src/main/java/emu/lunarcore/server/game/GameServerKcpListener.java index 8863d47..e5b7117 100644 --- a/src/main/java/emu/lunarcore/server/game/GameServerKcpListener.java +++ b/src/main/java/emu/lunarcore/server/game/GameServerKcpListener.java @@ -47,6 +47,6 @@ public class GameServerKcpListener implements KcpListener { @Override public void handleException(Throwable err, Ukcp ukcp) { - // TODO + } } diff --git a/src/main/java/emu/lunarcore/server/game/GameServerPacketHandler.java b/src/main/java/emu/lunarcore/server/game/GameServerPacketHandler.java index 5b9eba1..da0f08d 100644 --- a/src/main/java/emu/lunarcore/server/game/GameServerPacketHandler.java +++ b/src/main/java/emu/lunarcore/server/game/GameServerPacketHandler.java @@ -77,9 +77,9 @@ public class GameServerPacketHandler { // Handle packet handler.handle(session, header, data); } catch (Exception ex) { - // TODO Remove this when no more needed ex.printStackTrace(); } + return; // Packet successfully handled } diff --git a/src/main/java/emu/lunarcore/server/http/handlers/ComboTokenGranterHandler.java b/src/main/java/emu/lunarcore/server/http/handlers/ComboTokenGranterHandler.java index 67bdc26..35ffcca 100644 --- a/src/main/java/emu/lunarcore/server/http/handlers/ComboTokenGranterHandler.java +++ b/src/main/java/emu/lunarcore/server/http/handlers/ComboTokenGranterHandler.java @@ -16,7 +16,7 @@ import io.javalin.http.Handler; public class ComboTokenGranterHandler implements Handler { public ComboTokenGranterHandler() { - // TODO Auto-generated constructor stub + } @Override diff --git a/src/main/java/emu/lunarcore/util/Position.java b/src/main/java/emu/lunarcore/util/Position.java index da251e1..dc31cc2 100644 --- a/src/main/java/emu/lunarcore/util/Position.java +++ b/src/main/java/emu/lunarcore/util/Position.java @@ -68,7 +68,7 @@ public class Position { return this; } - // Operations TODO + // Operations public double get2dDist(Position pos) { int x = this.getX() - pos.getX();