Commit b9b0f002 authored by Melledy's avatar Melledy
Browse files

Move PlayerManagers and GameServerSystems around

parent 8b4212ff
package emu.grasscutter.game.managers.collection;
import emu.grasscutter.game.props.FightProperty;
import emu.grasscutter.utils.Position;
public class CollectionData {
Gadget gadget;
MotionInfo motionInfo;
Prop[] fightPropList;
static class GatherGadget{
int itemId;
}
static class Gadget{
int gadgetId;
int authorityPeerId;
int configId;
int groupId;
boolean isEnableInteract;
GatherGadget gatherGadget;
}
static class MotionInfo{
Position pos;
Position rot;
}
static class Prop{
int propType;
float propValue;
}
}
...@@ -31,7 +31,6 @@ import emu.grasscutter.game.mail.MailHandler; ...@@ -31,7 +31,6 @@ import emu.grasscutter.game.mail.MailHandler;
import emu.grasscutter.game.managers.CookingManager; import emu.grasscutter.game.managers.CookingManager;
import emu.grasscutter.game.managers.FurnitureManager; import emu.grasscutter.game.managers.FurnitureManager;
import emu.grasscutter.game.managers.ResinManager; import emu.grasscutter.game.managers.ResinManager;
import emu.grasscutter.game.managers.collection.CollectionRecordStore;
import emu.grasscutter.game.managers.deforestation.DeforestationManager; import emu.grasscutter.game.managers.deforestation.DeforestationManager;
import emu.grasscutter.game.managers.energy.EnergyManager; import emu.grasscutter.game.managers.energy.EnergyManager;
import emu.grasscutter.game.managers.forging.ActiveForgeData; import emu.grasscutter.game.managers.forging.ActiveForgeData;
...@@ -158,7 +157,7 @@ public class Player { ...@@ -158,7 +157,7 @@ public class Player {
private TowerData towerData; private TowerData towerData;
private PlayerGachaInfo gachaInfo; private PlayerGachaInfo gachaInfo;
private PlayerOpenStateManager openStateManager; private PlayerOpenStateManager openStateManager;
private CollectionRecordStore collectionRecordStore; private PlayerCollectionRecords collectionRecordStore;
private ArrayList<ShopLimit> shopLimit; private ArrayList<ShopLimit> shopLimit;
@Getter private transient GameHome home; @Getter private transient GameHome home;
...@@ -213,7 +212,7 @@ public class Player { ...@@ -213,7 +212,7 @@ public class Player {
this.flyCloakList = new HashSet<>(); this.flyCloakList = new HashSet<>();
this.costumeList = new HashSet<>(); this.costumeList = new HashSet<>();
this.towerData = new TowerData(); this.towerData = new TowerData();
this.collectionRecordStore = new CollectionRecordStore(); this.collectionRecordStore = new PlayerCollectionRecords();
this.unlockedForgingBlueprints = new HashSet<>(); this.unlockedForgingBlueprints = new HashSet<>();
this.unlockedCombines = new HashSet<>(); this.unlockedCombines = new HashSet<>();
this.unlockedFurniture = new HashSet<>(); this.unlockedFurniture = new HashSet<>();
...@@ -1148,9 +1147,9 @@ public class Player { ...@@ -1148,9 +1147,9 @@ public class Player {
this.battlePassManager.getMissions().values().removeIf(mission -> mission.getData() == null); this.battlePassManager.getMissions().values().removeIf(mission -> mission.getData() == null);
} }
public CollectionRecordStore getCollectionRecordStore() { public PlayerCollectionRecords getCollectionRecordStore() {
if(this.collectionRecordStore==null){ if(this.collectionRecordStore==null){
this.collectionRecordStore = new CollectionRecordStore(); this.collectionRecordStore = new PlayerCollectionRecords();
} }
return collectionRecordStore; return collectionRecordStore;
} }
......
package emu.grasscutter.game.managers.collection; package emu.grasscutter.game.player;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
...@@ -6,7 +6,7 @@ import java.util.Map; ...@@ -6,7 +6,7 @@ import java.util.Map;
import dev.morphia.annotations.Entity; import dev.morphia.annotations.Entity;
@Entity @Entity
public class CollectionRecordStore { public class PlayerCollectionRecords {
private Map<Integer, CollectionRecord> records; private Map<Integer, CollectionRecord> records;
private Map<Integer, CollectionRecord> getRecords() { private Map<Integer, CollectionRecord> getRecords() {
......
package emu.grasscutter.game.managers; package emu.grasscutter.game.systems;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import emu.grasscutter.Grasscutter; import emu.grasscutter.Grasscutter;
......
package emu.grasscutter.game.managers; package emu.grasscutter.game.systems;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
......
package emu.grasscutter.game.managers; package emu.grasscutter.game.systems;
import emu.grasscutter.game.CoopRequest; import emu.grasscutter.game.CoopRequest;
import emu.grasscutter.game.props.EnterReason; import emu.grasscutter.game.props.EnterReason;
......
...@@ -12,10 +12,7 @@ import emu.grasscutter.game.dungeons.DungeonSystem; ...@@ -12,10 +12,7 @@ import emu.grasscutter.game.dungeons.DungeonSystem;
import emu.grasscutter.game.dungeons.challenge.DungeonChallenge; import emu.grasscutter.game.dungeons.challenge.DungeonChallenge;
import emu.grasscutter.game.expedition.ExpeditionSystem; import emu.grasscutter.game.expedition.ExpeditionSystem;
import emu.grasscutter.game.gacha.GachaSystem; import emu.grasscutter.game.gacha.GachaSystem;
import emu.grasscutter.game.managers.AnnouncementSystem;
import emu.grasscutter.game.managers.CookingManager; import emu.grasscutter.game.managers.CookingManager;
import emu.grasscutter.game.managers.InventorySystem;
import emu.grasscutter.game.managers.MultiplayerSystem;
import emu.grasscutter.game.managers.chat.ChatManager; import emu.grasscutter.game.managers.chat.ChatManager;
import emu.grasscutter.game.managers.chat.ChatManagerHandler; import emu.grasscutter.game.managers.chat.ChatManagerHandler;
import emu.grasscutter.game.managers.energy.EnergyManager; import emu.grasscutter.game.managers.energy.EnergyManager;
...@@ -23,6 +20,9 @@ import emu.grasscutter.game.managers.stamina.StaminaManager; ...@@ -23,6 +20,9 @@ import emu.grasscutter.game.managers.stamina.StaminaManager;
import emu.grasscutter.game.player.Player; import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.quest.QuestSystem; import emu.grasscutter.game.quest.QuestSystem;
import emu.grasscutter.game.shop.ShopSystem; import emu.grasscutter.game.shop.ShopSystem;
import emu.grasscutter.game.systems.AnnouncementSystem;
import emu.grasscutter.game.systems.InventorySystem;
import emu.grasscutter.game.systems.MultiplayerSystem;
import emu.grasscutter.game.tower.TowerSystem; import emu.grasscutter.game.tower.TowerSystem;
import emu.grasscutter.game.world.World; import emu.grasscutter.game.world.World;
import emu.grasscutter.game.world.WorldDataSystem; import emu.grasscutter.game.world.WorldDataSystem;
......
package emu.grasscutter.task.tasks; package emu.grasscutter.task.tasks;
import emu.grasscutter.Grasscutter; import emu.grasscutter.Grasscutter;
import emu.grasscutter.game.managers.AnnouncementSystem; import emu.grasscutter.game.systems.AnnouncementSystem;
import emu.grasscutter.task.Task; import emu.grasscutter.task.Task;
import emu.grasscutter.task.TaskHandler; import emu.grasscutter.task.TaskHandler;
import org.quartz.JobExecutionContext; import org.quartz.JobExecutionContext;
......
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