Commit 2e19e70f authored by Melledy's avatar Melledy
Browse files

Refactor game server managers to systems

parent d20e9d1f
...@@ -16,7 +16,7 @@ public class HandlerGachaWishReq extends PacketHandler { ...@@ -16,7 +16,7 @@ public class HandlerGachaWishReq extends PacketHandler {
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
GachaWishReq req = GachaWishReq.parseFrom(payload); GachaWishReq req = GachaWishReq.parseFrom(payload);
GachaBanner banner = session.getServer().getGachaManager().getGachaBanners().get(req.getGachaScheduleId()); GachaBanner banner = session.getServer().getGachaSystem().getGachaBanners().get(req.getGachaScheduleId());
PlayerGachaBannerInfo gachaInfo = session.getPlayer().getGachaInfo().getBannerInfo(banner); PlayerGachaBannerInfo gachaInfo = session.getPlayer().getGachaInfo().getBannerInfo(banner);
gachaInfo.setFailedChosenItemPulls(0); gachaInfo.setFailedChosenItemPulls(0);
......
...@@ -14,7 +14,7 @@ public class HandlerGetGachaInfoReq extends PacketHandler { ...@@ -14,7 +14,7 @@ public class HandlerGetGachaInfoReq extends PacketHandler {
@Override @Override
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
session.send(new PacketGetGachaInfoRsp(session.getServer().getGachaManager(), session.getPlayer())); session.send(new PacketGetGachaInfoRsp(session.getServer().getGachaSystem(), session.getPlayer()));
} }
} }
...@@ -16,7 +16,7 @@ public class HandlerGetInvestigationMonsterReq extends PacketHandler { ...@@ -16,7 +16,7 @@ public class HandlerGetInvestigationMonsterReq extends PacketHandler {
session.send(new PacketGetInvestigationMonsterRsp( session.send(new PacketGetInvestigationMonsterRsp(
session.getPlayer(), session.getPlayer(),
session.getServer().getWorldDataManager(), session.getServer().getWorldDataSystem(),
req.getCityIdListList())); req.getCityIdListList()));
} }
......
...@@ -14,7 +14,7 @@ public class HandlerPlayerApplyEnterMpReq extends PacketHandler { ...@@ -14,7 +14,7 @@ public class HandlerPlayerApplyEnterMpReq extends PacketHandler {
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
PlayerApplyEnterMpReq req = PlayerApplyEnterMpReq.parseFrom(payload); PlayerApplyEnterMpReq req = PlayerApplyEnterMpReq.parseFrom(payload);
session.getServer().getMultiplayerManager().applyEnterMp(session.getPlayer(), req.getTargetUid()); session.getServer().getMultiplayerSystem().applyEnterMp(session.getPlayer(), req.getTargetUid());
session.send(new PacketPlayerApplyEnterMpRsp(req.getTargetUid())); session.send(new PacketPlayerApplyEnterMpRsp(req.getTargetUid()));
} }
......
...@@ -14,7 +14,7 @@ public class HandlerPlayerApplyEnterMpResultReq extends PacketHandler { ...@@ -14,7 +14,7 @@ public class HandlerPlayerApplyEnterMpResultReq extends PacketHandler {
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
PlayerApplyEnterMpResultReq req = PlayerApplyEnterMpResultReq.parseFrom(payload); PlayerApplyEnterMpResultReq req = PlayerApplyEnterMpResultReq.parseFrom(payload);
session.getServer().getMultiplayerManager().applyEnterMpReply(session.getPlayer(), req.getApplyUid(), req.getIsAgreed()); session.getServer().getMultiplayerSystem().applyEnterMpReply(session.getPlayer(), req.getApplyUid(), req.getIsAgreed());
session.send(new PacketPlayerApplyEnterMpResultRsp(req.getApplyUid(), req.getIsAgreed())); session.send(new PacketPlayerApplyEnterMpResultRsp(req.getApplyUid(), req.getIsAgreed()));
} }
......
...@@ -14,7 +14,7 @@ public class HandlerPlayerEnterDungeonReq extends PacketHandler { ...@@ -14,7 +14,7 @@ public class HandlerPlayerEnterDungeonReq extends PacketHandler {
// Auto template // Auto template
PlayerEnterDungeonReq req = PlayerEnterDungeonReq.parseFrom(payload); PlayerEnterDungeonReq req = PlayerEnterDungeonReq.parseFrom(payload);
session.getServer().getDungeonManager().enterDungeon(session.getPlayer(), req.getPointId(), req.getDungeonId()); session.getServer().getDungeonSystem().enterDungeon(session.getPlayer(), req.getPointId(), req.getDungeonId());
} }
} }
...@@ -13,7 +13,7 @@ public class HandlerPlayerGetForceQuitBanInfoReq extends PacketHandler { ...@@ -13,7 +13,7 @@ public class HandlerPlayerGetForceQuitBanInfoReq extends PacketHandler {
@Override @Override
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
if (session.getServer().getMultiplayerManager().leaveCoop(session.getPlayer())) { if (session.getServer().getMultiplayerSystem().leaveCoop(session.getPlayer())) {
// Success // Success
session.send(new PacketPlayerGetForceQuitBanInfoRsp(RetcodeOuterClass.Retcode.RET_SUCC_VALUE)); session.send(new PacketPlayerGetForceQuitBanInfoRsp(RetcodeOuterClass.Retcode.RET_SUCC_VALUE));
} else { } else {
......
...@@ -10,7 +10,7 @@ public class HandlerPlayerQuitDungeonReq extends PacketHandler { ...@@ -10,7 +10,7 @@ public class HandlerPlayerQuitDungeonReq extends PacketHandler {
@Override @Override
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
session.getPlayer().getServer().getDungeonManager().exitDungeon(session.getPlayer()); session.getPlayer().getServer().getDungeonSystem().exitDungeon(session.getPlayer());
} }
} }
...@@ -11,6 +11,6 @@ public class HandlerReliquaryDecomposeReq extends PacketHandler { ...@@ -11,6 +11,6 @@ public class HandlerReliquaryDecomposeReq extends PacketHandler {
@Override @Override
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
ReliquaryDecomposeReq req = ReliquaryDecomposeReq.parseFrom(payload); ReliquaryDecomposeReq req = ReliquaryDecomposeReq.parseFrom(payload);
session.getServer().getCombineManger().decomposeReliquaries(session.getPlayer(), req.getConfigId(), req.getTargetCount(), req.getGuidListList()); session.getServer().getCombineSystem().decomposeReliquaries(session.getPlayer(), req.getConfigId(), req.getTargetCount(), req.getGuidListList());
} }
} }
...@@ -13,7 +13,7 @@ public class HandlerReliquaryUpgradeReq extends PacketHandler { ...@@ -13,7 +13,7 @@ public class HandlerReliquaryUpgradeReq extends PacketHandler {
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
ReliquaryUpgradeReq req = ReliquaryUpgradeReq.parseFrom(payload); ReliquaryUpgradeReq req = ReliquaryUpgradeReq.parseFrom(payload);
session.getServer().getInventoryManager().upgradeRelic(session.getPlayer(), req.getTargetReliquaryGuid(), req.getFoodReliquaryGuidListList(), req.getItemParamListList()); session.getServer().getInventorySystem().upgradeRelic(session.getPlayer(), req.getTargetReliquaryGuid(), req.getFoodReliquaryGuidListList(), req.getItemParamListList());
} }
} }
...@@ -14,7 +14,7 @@ public class HandlerSceneKickPlayerReq extends PacketHandler { ...@@ -14,7 +14,7 @@ public class HandlerSceneKickPlayerReq extends PacketHandler {
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
SceneKickPlayerReq req = SceneKickPlayerReq.parseFrom(payload); SceneKickPlayerReq req = SceneKickPlayerReq.parseFrom(payload);
if (session.getServer().getMultiplayerManager().kickPlayer(session.getPlayer(), req.getTargetUid())) { if (session.getServer().getMultiplayerSystem().kickPlayer(session.getPlayer(), req.getTargetUid())) {
// Success // Success
session.send(new PacketSceneKickPlayerRsp(req.getTargetUid())); session.send(new PacketSceneKickPlayerRsp(req.getTargetUid()));
} else { } else {
......
...@@ -13,7 +13,7 @@ public class HandlerSetEquipLockStateReq extends PacketHandler { ...@@ -13,7 +13,7 @@ public class HandlerSetEquipLockStateReq extends PacketHandler {
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
SetEquipLockStateReq req = SetEquipLockStateReq.parseFrom(payload); SetEquipLockStateReq req = SetEquipLockStateReq.parseFrom(payload);
session.getServer().getInventoryManager().lockEquip(session.getPlayer(), req.getTargetEquipGuid(), req.getIsLocked()); session.getServer().getInventorySystem().lockEquip(session.getPlayer(), req.getTargetEquipGuid(), req.getIsLocked());
} }
} }
...@@ -12,7 +12,7 @@ public class HandlerTowerAllDataReq extends PacketHandler { ...@@ -12,7 +12,7 @@ public class HandlerTowerAllDataReq extends PacketHandler {
@Override @Override
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
session.send(new PacketTowerAllDataRsp( session.send(new PacketTowerAllDataRsp(
session.getServer().getTowerScheduleManager(), session.getServer().getTowerSystem(),
session.getPlayer().getTowerManager() session.getPlayer().getTowerManager()
)); ));
} }
......
...@@ -14,7 +14,7 @@ public class HandlerUnlockAvatarTalentReq extends PacketHandler { ...@@ -14,7 +14,7 @@ public class HandlerUnlockAvatarTalentReq extends PacketHandler {
UnlockAvatarTalentReq req = UnlockAvatarTalentReq.parseFrom(payload); UnlockAvatarTalentReq req = UnlockAvatarTalentReq.parseFrom(payload);
// Unlock avatar const // Unlock avatar const
session.getServer().getInventoryManager().unlockAvatarConstellation(session.getPlayer(), req.getAvatarGuid()); session.getServer().getInventorySystem().unlockAvatarConstellation(session.getPlayer(), req.getAvatarGuid());
} }
} }
...@@ -15,7 +15,7 @@ public class HandlerUseItemReq extends PacketHandler { ...@@ -15,7 +15,7 @@ public class HandlerUseItemReq extends PacketHandler {
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
UseItemReq req = UseItemReq.parseFrom(payload); UseItemReq req = UseItemReq.parseFrom(payload);
GameItem useItem = session.getServer().getInventoryManager().useItem(session.getPlayer(), req.getTargetGuid(), req.getGuid(), req.getCount(), req.getOptionIdx()); GameItem useItem = session.getServer().getInventorySystem().useItem(session.getPlayer(), req.getTargetGuid(), req.getGuid(), req.getCount(), req.getOptionIdx());
if (useItem != null) { if (useItem != null) {
session.send(new PacketUseItemRsp(req.getTargetGuid(), useItem)); session.send(new PacketUseItemRsp(req.getTargetGuid(), useItem));
} else { } else {
......
...@@ -14,7 +14,7 @@ public class HandlerWeaponAwakenReq extends PacketHandler { ...@@ -14,7 +14,7 @@ public class HandlerWeaponAwakenReq extends PacketHandler {
WeaponAwakenReq req = WeaponAwakenReq.parseFrom(payload); WeaponAwakenReq req = WeaponAwakenReq.parseFrom(payload);
// Weapon refinement // Weapon refinement
session.getServer().getInventoryManager().refineWeapon(session.getPlayer(), req.getTargetWeaponGuid(), req.getItemGuid()); session.getServer().getInventorySystem().refineWeapon(session.getPlayer(), req.getTargetWeaponGuid(), req.getItemGuid());
} }
} }
...@@ -14,7 +14,7 @@ public class HandlerWeaponPromoteReq extends PacketHandler { ...@@ -14,7 +14,7 @@ public class HandlerWeaponPromoteReq extends PacketHandler {
WeaponPromoteReq req = WeaponPromoteReq.parseFrom(payload); WeaponPromoteReq req = WeaponPromoteReq.parseFrom(payload);
// Ascend weapon // Ascend weapon
session.getServer().getInventoryManager().promoteWeapon(session.getPlayer(), req.getTargetWeaponGuid()); session.getServer().getInventorySystem().promoteWeapon(session.getPlayer(), req.getTargetWeaponGuid());
} }
} }
...@@ -14,7 +14,7 @@ public class HandlerWeaponUpgradeReq extends PacketHandler { ...@@ -14,7 +14,7 @@ public class HandlerWeaponUpgradeReq extends PacketHandler {
WeaponUpgradeReq req = WeaponUpgradeReq.parseFrom(payload); WeaponUpgradeReq req = WeaponUpgradeReq.parseFrom(payload);
// Level up weapon // Level up weapon
session.getServer().getInventoryManager().upgradeWeapon( session.getServer().getInventorySystem().upgradeWeapon(
session.getPlayer(), session.getPlayer(),
req.getTargetWeaponGuid(), req.getTargetWeaponGuid(),
req.getFoodWeaponGuidListList(), req.getFoodWeaponGuidListList(),
......
package emu.grasscutter.server.packet.send; package emu.grasscutter.server.packet.send;
import emu.grasscutter.game.gacha.GachaManager; import emu.grasscutter.game.gacha.GachaSystem;
import emu.grasscutter.game.player.Player; import emu.grasscutter.game.player.Player;
import emu.grasscutter.net.packet.BasePacket; import emu.grasscutter.net.packet.BasePacket;
import emu.grasscutter.net.packet.PacketOpcodes; import emu.grasscutter.net.packet.PacketOpcodes;
public class PacketGetGachaInfoRsp extends BasePacket { public class PacketGetGachaInfoRsp extends BasePacket {
public PacketGetGachaInfoRsp(GachaManager manager, Player player) { public PacketGetGachaInfoRsp(GachaSystem manager, Player player) {
super(PacketOpcodes.GetGachaInfoRsp); super(PacketOpcodes.GetGachaInfoRsp);
this.setData(manager.toProto(player)); this.setData(manager.toProto(player));
......
package emu.grasscutter.server.packet.send; package emu.grasscutter.server.packet.send;
import emu.grasscutter.game.player.Player; import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.world.WorldDataManager; import emu.grasscutter.game.world.WorldDataSystem;
import emu.grasscutter.net.packet.BasePacket; import emu.grasscutter.net.packet.BasePacket;
import emu.grasscutter.net.packet.PacketOpcodes; import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.GetActivityInfoRspOuterClass; import emu.grasscutter.net.proto.GetActivityInfoRspOuterClass;
...@@ -11,7 +11,7 @@ import java.util.List; ...@@ -11,7 +11,7 @@ import java.util.List;
public class PacketGetInvestigationMonsterRsp extends BasePacket { public class PacketGetInvestigationMonsterRsp extends BasePacket {
public PacketGetInvestigationMonsterRsp(Player player, WorldDataManager worldDataManager, List<Integer> cityIdListList) { public PacketGetInvestigationMonsterRsp(Player player, WorldDataSystem worldDataManager, List<Integer> cityIdListList) {
super(PacketOpcodes.GetInvestigationMonsterRsp); super(PacketOpcodes.GetInvestigationMonsterRsp);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment