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
2e19e70f
Commit
2e19e70f
authored
Jul 18, 2022
by
Melledy
Browse files
Refactor game server managers to systems
parent
d20e9d1f
Changes
63
Hide whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/server/packet/send/PacketGetShopRsp.java
View file @
2e19e70f
...
...
@@ -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.Shop
Manager
;
import
emu.grasscutter.game.shop.Shop
System
;
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
Shop
Manager
manager
=
Grasscutter
.
getGameServer
().
getShop
Manager
();
Shop
System
manager
=
Grasscutter
.
getGameServer
().
getShop
System
();
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
=
Shop
Manager
.
getShopNextRefreshTime
(
info
);
int
nextRefreshTime
=
Shop
System
.
getShopNextRefreshTime
(
info
);
if
(
currentShopLimit
!=
null
)
{
if
(
currentShopLimit
.
getNextRefreshTime
()
<
currentTs
)
{
// second game day
currentShopLimit
.
setHasBoughtInPeriod
(
0
);
...
...
src/main/java/emu/grasscutter/server/packet/send/PacketTowerAllDataRsp.java
View file @
2e19e70f
package
emu.grasscutter.server.packet.send
;
import
emu.grasscutter.game.tower.TowerManager
;
import
emu.grasscutter.game.tower.TowerS
cheduleManager
;
import
emu.grasscutter.game.tower.TowerS
ystem
;
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
(
TowerS
cheduleManager
towerScheduleManager
,
TowerManager
towerManager
)
{
public
PacketTowerAllDataRsp
(
TowerS
ystem
towerScheduleManager
,
TowerManager
towerManager
)
{
super
(
PacketOpcodes
.
TowerAllDataRsp
);
var
recordList
=
towerManager
.
getRecordMap
().
values
().
stream
()
...
...
src/main/java/emu/grasscutter/task/tasks/AnnouncementTask.java
View file @
2e19e70f
package
emu.grasscutter.task.tasks
;
import
emu.grasscutter.Grasscutter
;
import
emu.grasscutter.game.managers.Announcement
Manager
;
import
emu.grasscutter.game.managers.Announcement
System
;
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
().
getAnnouncement
Manager
().
getAnnounceConfigItemMap
().
values
().
stream
()
.
filter
(
Announcement
Manager
.
AnnounceConfigItem
::
isTick
)
var
announceConfigItems
=
Grasscutter
.
getGameServer
().
getAnnouncement
System
().
getAnnounceConfigItemMap
().
values
().
stream
()
.
filter
(
Announcement
System
.
AnnounceConfigItem
::
isTick
)
.
filter
(
i
->
current
.
after
(
i
.
getBeginTime
()))
.
filter
(
i
->
current
.
before
(
i
.
getEndTime
()))
.
collect
(
Collectors
.
toMap
(
Announcement
Manager
.
AnnounceConfigItem
::
getTemplateId
,
y
->
y
));
.
collect
(
Collectors
.
toMap
(
Announcement
System
.
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
().
getAnnouncement
Manager
().
broadcast
(
toSend
);
Grasscutter
.
getGameServer
().
getAnnouncement
System
().
broadcast
(
toSend
);
Grasscutter
.
getLogger
().
debug
(
"Broadcast {} announcement(s) to all online players"
,
toSend
.
size
());
// clear the interval count
...
...
Prev
1
2
3
4
Next
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