Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
ziqian zhang
Grasscutter
Commits
b9b0f002
Commit
b9b0f002
authored
Jul 20, 2022
by
Melledy
Browse files
Move PlayerManagers and GameServerSystems around
parent
8b4212ff
Changes
8
Hide whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/game/managers/collection/CollectionData.java
deleted
100644 → 0
View file @
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
;
}
}
src/main/java/emu/grasscutter/game/player/Player.java
View file @
b9b0f002
...
...
@@ -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
CollectionRecord
Store
collectionRecordStore
;
private
Player
CollectionRecord
s
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
CollectionRecord
Store
();
this
.
collectionRecordStore
=
new
Player
CollectionRecord
s
();
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
CollectionRecord
Store
getCollectionRecordStore
()
{
public
Player
CollectionRecord
s
getCollectionRecordStore
()
{
if
(
this
.
collectionRecordStore
==
null
){
this
.
collectionRecordStore
=
new
CollectionRecord
Store
();
this
.
collectionRecordStore
=
new
Player
CollectionRecord
s
();
}
return
collectionRecordStore
;
}
...
...
src/main/java/emu/grasscutter/game/
managers/collection/
CollectionRecord
Store
.java
→
src/main/java/emu/grasscutter/game/
player/Player
CollectionRecord
s
.java
View file @
b9b0f002
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
CollectionRecord
Store
{
public
class
Player
CollectionRecord
s
{
private
Map
<
Integer
,
CollectionRecord
>
records
;
private
Map
<
Integer
,
CollectionRecord
>
getRecords
()
{
...
...
src/main/java/emu/grasscutter/game/
manager
s/AnnouncementSystem.java
→
src/main/java/emu/grasscutter/game/
system
s/AnnouncementSystem.java
View file @
b9b0f002
package
emu.grasscutter.game.
manager
s
;
package
emu.grasscutter.game.
system
s
;
import
com.google.gson.reflect.TypeToken
;
import
emu.grasscutter.Grasscutter
;
...
...
src/main/java/emu/grasscutter/game/
manager
s/InventorySystem.java
→
src/main/java/emu/grasscutter/game/
system
s/InventorySystem.java
View file @
b9b0f002
package
emu.grasscutter.game.
manager
s
;
package
emu.grasscutter.game.
system
s
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
...
...
src/main/java/emu/grasscutter/game/
manager
s/MultiplayerSystem.java
→
src/main/java/emu/grasscutter/game/
system
s/MultiplayerSystem.java
View file @
b9b0f002
package
emu.grasscutter.game.
manager
s
;
package
emu.grasscutter.game.
system
s
;
import
emu.grasscutter.game.CoopRequest
;
import
emu.grasscutter.game.props.EnterReason
;
...
...
src/main/java/emu/grasscutter/server/game/GameServer.java
View file @
b9b0f002
...
...
@@ -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
;
...
...
src/main/java/emu/grasscutter/task/tasks/AnnouncementTask.java
View file @
b9b0f002
package
emu.grasscutter.task.tasks
;
import
emu.grasscutter.Grasscutter
;
import
emu.grasscutter.game.
manager
s.AnnouncementSystem
;
import
emu.grasscutter.game.
system
s.AnnouncementSystem
;
import
emu.grasscutter.task.Task
;
import
emu.grasscutter.task.TaskHandler
;
import
org.quartz.JobExecutionContext
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment