Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-22 07:37:43 +00:00
Code Issues Projects Releases Wiki Activity

Move PlayerManagers and GameServerSystems around

Browse Source
This commit is contained in:
Melledy 2022-07-20 03:17:59 -07:00
parent 8b4212ffb9
commit b9b0f00232
8 changed files with 13 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/emu/grasscutter/game/managers/collection/CollectionData.java
View File

@ -1,30 +0,0 @@
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;
}
}

9
src/main/java/emu/grasscutter/game/player/Player.java
View File

@ -31,7 +31,6 @@ import emu.grasscutter.game.mail.MailHandler;
import emu.grasscutter.game.managers.CookingManager;
import emu.grasscutter.game.managers.FurnitureManager;
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.energy.EnergyManager;
import emu.grasscutter.game.managers.forging.ActiveForgeData;
@ -158,7 +157,7 @@ public class Player {
private TowerData towerData;
private PlayerGachaInfo gachaInfo;
private PlayerOpenStateManager openStateManager;
private CollectionRecordStore collectionRecordStore;
private PlayerCollectionRecords collectionRecordStore;
private ArrayList<ShopLimit> shopLimit;
@Getter private transient GameHome home;
@ -213,7 +212,7 @@ public class Player {
this.flyCloakList = new HashSet<>();
this.costumeList = new HashSet<>();
this.towerData = new TowerData();
this.collectionRecordStore = new CollectionRecordStore();
this.collectionRecordStore = new PlayerCollectionRecords();
this.unlockedForgingBlueprints = new HashSet<>();
this.unlockedCombines = new HashSet<>();
this.unlockedFurniture = new HashSet<>();
@ -1148,9 +1147,9 @@ public class Player {
this.battlePassManager.getMissions().values().removeIf(mission -> mission.getData() == null);
}
public CollectionRecordStore getCollectionRecordStore() {
public PlayerCollectionRecords getCollectionRecordStore() {
if(this.collectionRecordStore==null){
this.collectionRecordStore = new CollectionRecordStore();
this.collectionRecordStore = new PlayerCollectionRecords();
}
return collectionRecordStore;
}

4
src/main/java/emu/grasscutter/game/managers/collection/CollectionRecordStore.java → src/main/java/emu/grasscutter/game/player/PlayerCollectionRecords.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.game.managers.collection;
package emu.grasscutter.game.player;
import java.util.HashMap;
import java.util.Map;
@ -6,7 +6,7 @@ import java.util.Map;
import dev.morphia.annotations.Entity;
@Entity
public class CollectionRecordStore {
public class PlayerCollectionRecords {
private Map<Integer, CollectionRecord> records;
private Map<Integer, CollectionRecord> getRecords() {

2
src/main/java/emu/grasscutter/game/managers/AnnouncementSystem.java → src/main/java/emu/grasscutter/game/systems/AnnouncementSystem.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.game.managers;
package emu.grasscutter.game.systems;
import com.google.gson.reflect.TypeToken;
import emu.grasscutter.Grasscutter;

2
src/main/java/emu/grasscutter/game/managers/InventorySystem.java → src/main/java/emu/grasscutter/game/systems/InventorySystem.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.game.managers;
package emu.grasscutter.game.systems;
import java.util.ArrayList;
import java.util.Arrays;

2
src/main/java/emu/grasscutter/game/managers/MultiplayerSystem.java → src/main/java/emu/grasscutter/game/systems/MultiplayerSystem.java
View File

@ -1,4 +1,4 @@
package emu.grasscutter.game.managers;
package emu.grasscutter.game.systems;
import emu.grasscutter.game.CoopRequest;
import emu.grasscutter.game.props.EnterReason;

6
src/main/java/emu/grasscutter/server/game/GameServer.java
View File

@ -12,10 +12,7 @@ import emu.grasscutter.game.dungeons.DungeonSystem;
import emu.grasscutter.game.dungeons.challenge.DungeonChallenge;
import emu.grasscutter.game.expedition.ExpeditionSystem;
import emu.grasscutter.game.gacha.GachaSystem;
import emu.grasscutter.game.managers.AnnouncementSystem;
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.ChatManagerHandler;
import emu.grasscutter.game.managers.energy.EnergyManager;
@ -23,6 +20,9 @@ import emu.grasscutter.game.managers.stamina.StaminaManager;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.quest.QuestSystem;
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.world.World;
import emu.grasscutter.game.world.WorldDataSystem;

2
src/main/java/emu/grasscutter/task/tasks/AnnouncementTask.java
View File

@ -1,7 +1,7 @@
package emu.grasscutter.task.tasks;
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.TaskHandler;
import org.quartz.JobExecutionContext;