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

Refactor game server managers to systems

parent d20e9d1f
......@@ -4,7 +4,7 @@ import emu.grasscutter.Grasscutter;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.shop.ShopInfo;
import emu.grasscutter.game.shop.ShopLimit;
import emu.grasscutter.game.shop.ShopManager;
import emu.grasscutter.game.shop.ShopSystem;
import emu.grasscutter.net.packet.BasePacket;
import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.GetShopRspOuterClass;
......@@ -27,7 +27,7 @@ public class PacketGetShopRsp extends BasePacket {
.setCityId(1) //mock
.setCityReputationLevel(10); //mock
ShopManager manager = Grasscutter.getGameServer().getShopManager();
ShopSystem manager = Grasscutter.getGameServer().getShopSystem();
if (manager.getShopData().get(shopType) != null) {
List<ShopInfo> list = manager.getShopData().get(shopType);
List<ShopGoods> goodsList = new ArrayList<>();
......@@ -54,7 +54,7 @@ public class PacketGetShopRsp extends BasePacket {
int currentTs = Utils.getCurrentSeconds();
ShopLimit currentShopLimit = inv.getGoodsLimit(info.getGoodsId());
int nextRefreshTime = ShopManager.getShopNextRefreshTime(info);
int nextRefreshTime = ShopSystem.getShopNextRefreshTime(info);
if (currentShopLimit != null) {
if (currentShopLimit.getNextRefreshTime() < currentTs) { // second game day
currentShopLimit.setHasBoughtInPeriod(0);
......
package emu.grasscutter.server.packet.send;
import emu.grasscutter.game.tower.TowerManager;
import emu.grasscutter.game.tower.TowerScheduleManager;
import emu.grasscutter.game.tower.TowerSystem;
import emu.grasscutter.net.packet.BasePacket;
import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.TowerAllDataRspOuterClass.TowerAllDataRsp;
......@@ -17,7 +17,7 @@ import java.util.stream.IntStream;
public class PacketTowerAllDataRsp extends BasePacket {
public PacketTowerAllDataRsp(TowerScheduleManager towerScheduleManager, TowerManager towerManager) {
public PacketTowerAllDataRsp(TowerSystem towerScheduleManager, TowerManager towerManager) {
super(PacketOpcodes.TowerAllDataRsp);
var recordList = towerManager.getRecordMap().values().stream()
......
package emu.grasscutter.task.tasks;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.game.managers.AnnouncementManager;
import emu.grasscutter.game.managers.AnnouncementSystem;
import emu.grasscutter.task.Task;
import emu.grasscutter.task.TaskHandler;
import org.quartz.JobExecutionContext;
......@@ -29,11 +29,11 @@ public final class AnnouncementTask extends TaskHandler {
@Override
public synchronized void execute(JobExecutionContext context) throws JobExecutionException {
var current = new Date();
var announceConfigItems = Grasscutter.getGameServer().getAnnouncementManager().getAnnounceConfigItemMap().values().stream()
.filter(AnnouncementManager.AnnounceConfigItem::isTick)
var announceConfigItems = Grasscutter.getGameServer().getAnnouncementSystem().getAnnounceConfigItemMap().values().stream()
.filter(AnnouncementSystem.AnnounceConfigItem::isTick)
.filter(i -> current.after(i.getBeginTime()))
.filter(i -> current.before(i.getEndTime()))
.collect(Collectors.toMap(AnnouncementManager.AnnounceConfigItem::getTemplateId, y -> y));
.collect(Collectors.toMap(AnnouncementSystem.AnnounceConfigItem::getTemplateId, y -> y));
announceConfigItems.values().forEach(i -> intervalMap.compute(i.getTemplateId(), (k,v) -> v == null ? 1 : v + 1));
......@@ -43,7 +43,7 @@ public final class AnnouncementTask extends TaskHandler {
.map(i -> announceConfigItems.get(i.getKey()))
.toList();
Grasscutter.getGameServer().getAnnouncementManager().broadcast(toSend);
Grasscutter.getGameServer().getAnnouncementSystem().broadcast(toSend);
Grasscutter.getLogger().debug("Broadcast {} announcement(s) to all online players", toSend.size());
// clear the interval count
......
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