Refactoring (#1660)
* Refactor a couple of iterators
* Use side-effect instead of second iterator
* Make World::onTick return shouldDelete instead of success
* Replace Shop iterator with side effects
* Scene
* Clean up Expeditions
* Refactor Expeditions
* Clean up Expeditions, Player
* Limit Expeditions by AR
* Lombokify props
Co-authored-by:
AnimeGitB <AnimeGitB@bigblueball.in>
Showing
- src/main/java/emu/grasscutter/data/excels/PlayerLevelData.java 5 additions, 17 deletions...ain/java/emu/grasscutter/data/excels/PlayerLevelData.java
- src/main/java/emu/grasscutter/game/expedition/ExpeditionInfo.java 13 additions, 33 deletions.../java/emu/grasscutter/game/expedition/ExpeditionInfo.java
- src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardData.java 9 additions, 12 deletions...emu/grasscutter/game/expedition/ExpeditionRewardData.java
- src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardDataList.java 13 additions, 8 deletions...grasscutter/game/expedition/ExpeditionRewardDataList.java
- src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardInfo.java 4 additions, 10 deletions...emu/grasscutter/game/expedition/ExpeditionRewardInfo.java
- src/main/java/emu/grasscutter/game/player/Player.java 83 additions, 292 deletionssrc/main/java/emu/grasscutter/game/player/Player.java
- src/main/java/emu/grasscutter/game/props/PlayerProperty.java 3 additions, 18 deletionssrc/main/java/emu/grasscutter/game/props/PlayerProperty.java
- src/main/java/emu/grasscutter/game/shop/ShopInfo.java 28 additions, 145 deletionssrc/main/java/emu/grasscutter/game/shop/ShopInfo.java
- src/main/java/emu/grasscutter/game/shop/ShopSystem.java 1 addition, 18 deletionssrc/main/java/emu/grasscutter/game/shop/ShopSystem.java
- src/main/java/emu/grasscutter/game/world/Scene.java 34 additions, 34 deletionssrc/main/java/emu/grasscutter/game/world/Scene.java
- src/main/java/emu/grasscutter/game/world/World.java 5 additions, 4 deletionssrc/main/java/emu/grasscutter/game/world/World.java
- src/main/java/emu/grasscutter/server/game/GameServer.java 2 additions, 13 deletionssrc/main/java/emu/grasscutter/server/game/GameServer.java
- src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionAllDataReq.java 2 additions, 1 deletion...server/packet/recv/HandlerAvatarExpeditionAllDataReq.java
- src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionCallBackReq.java 4 additions, 5 deletions...erver/packet/recv/HandlerAvatarExpeditionCallBackReq.java
- src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionGetRewardReq.java 15 additions, 32 deletions...rver/packet/recv/HandlerAvatarExpeditionGetRewardReq.java
- src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarExpeditionStartReq.java 4 additions, 4 deletions...r/server/packet/recv/HandlerAvatarExpeditionStartReq.java
- src/main/java/emu/grasscutter/server/packet/send/PacketAllWidgetDataNotify.java 1 addition, 1 deletion...scutter/server/packet/send/PacketAllWidgetDataNotify.java
- src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionAllDataRsp.java 11 additions, 17 deletions.../server/packet/send/PacketAvatarExpeditionAllDataRsp.java
- src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionCallBackRsp.java 4 additions, 8 deletions...server/packet/send/PacketAvatarExpeditionCallBackRsp.java
- src/main/java/emu/grasscutter/server/packet/send/PacketAvatarExpeditionDataNotify.java 10 additions, 15 deletions.../server/packet/send/PacketAvatarExpeditionDataNotify.java
Please register or sign in to comment