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
b5f356ce
Unverified
Commit
b5f356ce
authored
Oct 17, 2022
by
dragon
Committed by
GitHub
Oct 17, 2022
Browse files
send CompoundDataNotify on Login;fix spelling mistakes. (#1869)
parent
84d02370
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/game/managers/cooking/CookingCompoundManager.java
View file @
b5f356ce
...
...
@@ -14,6 +14,7 @@ import emu.grasscutter.net.proto.PlayerCompoundMaterialReqOuterClass.PlayerCompo
import
emu.grasscutter.net.proto.RetcodeOuterClass.Retcode
;
import
emu.grasscutter.net.proto.TakeCompoundOutputReqOuterClass.TakeCompoundOutputReq
;
import
emu.grasscutter.server.packet.send.PackageTakeCompoundOutputRsp
;
import
emu.grasscutter.server.packet.send.PacketCompoundDataNotify
;
import
emu.grasscutter.server.packet.send.PacketGetCompoundDataRsp
;
import
emu.grasscutter.server.packet.send.PacketPlayerCompoundMaterialRsp
;
import
emu.grasscutter.utils.Utils
;
...
...
@@ -129,4 +130,8 @@ public class CookingCompoundManager extends BasePlayerManager {
player
.
sendPacket
(
new
PackageTakeCompoundOutputRsp
(
null
,
Retcode
.
RET_COMPOUND_NOT_FINISH_VALUE
));
}
}
public
void
onPlayerLogin
()
{
player
.
sendPacket
(
new
PacketCompoundDataNotify
(
unlocked
,
getCompoundQueueData
()));
}
}
src/main/java/emu/grasscutter/game/managers/cooking/CookingManager.java
View file @
b5f356ce
...
...
@@ -12,7 +12,6 @@ import emu.grasscutter.game.inventory.GameItem;
import
emu.grasscutter.game.player.BasePlayerManager
;
import
emu.grasscutter.game.player.Player
;
import
emu.grasscutter.game.props.ActionReason
;
import
emu.grasscutter.game.props.ItemUseOp
;
import
emu.grasscutter.net.proto.CookRecipeDataOuterClass
;
import
emu.grasscutter.net.proto.PlayerCookArgsReqOuterClass.PlayerCookArgsReq
;
import
emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq
;
...
...
@@ -164,16 +163,16 @@ public class CookingManager extends BasePlayerManager {
}
}
public
void
sendCookDataNo
fit
y
()
{
// Default unlocked recip
i
es to player if they don't have them yet.
public
void
sendCookDataNo
tif
y
()
{
// Default unlocked recipes to player if they don't have them yet.
this
.
addDefaultUnlocked
();
// Get unlocked recip
i
es.
var
unlockedRecip
i
es
=
this
.
player
.
getUnlockedRecipies
();
// Get unlocked recipes.
var
unlockedRecipes
=
this
.
player
.
getUnlockedRecipies
();
// Construct CookRecipeData protos.
List
<
CookRecipeDataOuterClass
.
CookRecipeData
>
data
=
new
ArrayList
<>();
for
(
var
recipe
:
unlockedRecip
i
es
.
entrySet
())
{
for
(
var
recipe
:
unlockedRecipes
.
entrySet
())
{
int
recipeId
=
recipe
.
getKey
();
int
proficiency
=
recipe
.
getValue
();
...
...
src/main/java/emu/grasscutter/game/player/Player.java
View file @
b5f356ce
...
...
@@ -1199,7 +1199,8 @@ public class Player {
session
.
send
(
new
PacketGetChatEmojiCollectionRsp
(
this
.
getChatEmojiIdList
()));
this
.
forgingManager
.
sendForgeDataNotify
();
this
.
resinManager
.
onPlayerLogin
();
this
.
cookingManager
.
sendCookDataNofity
();
this
.
cookingManager
.
sendCookDataNotify
();
this
.
cookingCompoundManager
.
onPlayerLogin
();
this
.
teamManager
.
onPlayerLogin
();
getTodayMoonCard
();
// The timer works at 0:0, some users log in after that, use this method to check if they have received a reward today or not. If not, send the reward.
...
...
src/main/java/emu/grasscutter/server/packet/send/PacketCompoundDataNotify.java
0 → 100644
View file @
b5f356ce
package
emu.grasscutter.server.packet.send
;
import
emu.grasscutter.net.packet.BasePacket
;
import
emu.grasscutter.net.packet.PacketOpcodes
;
import
emu.grasscutter.net.proto.CompoundDataNotifyOuterClass.CompoundDataNotify
;
import
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData
;
import
java.util.List
;
import
java.util.Set
;
public
class
PacketCompoundDataNotify
extends
BasePacket
{
public
PacketCompoundDataNotify
(
Set
<
Integer
>
unlockedCompounds
,
List
<
CompoundQueueData
>
compoundQueueData
)
{
super
(
PacketOpcodes
.
CompoundDataNotify
);
var
proto
=
CompoundDataNotify
.
newBuilder
()
.
addAllUnlockCompoundList
(
unlockedCompounds
)
.
addAllCompoundQueDataList
(
compoundQueueData
)
.
build
();
this
.
setData
(
proto
);
}
}
src/main/java/emu/grasscutter/server/packet/send/PacketCookDataNotify.java
View file @
b5f356ce
...
...
@@ -8,14 +8,14 @@ import emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify;
import
emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData
;
public
class
PacketCookDataNotify
extends
BasePacket
{
public
PacketCookDataNotify
(
List
<
CookRecipeData
>
recip
i
es
)
{
public
PacketCookDataNotify
(
List
<
CookRecipeData
>
recipes
)
{
super
(
PacketOpcodes
.
CookDataNotify
);
CookDataNotify
proto
=
CookDataNotify
.
newBuilder
()
.
addAllRecipeDataList
(
recip
i
es
)
.
addAllRecipeDataList
(
recipes
)
.
build
();
this
.
setData
(
proto
);
}
}
src/main/java/emu/grasscutter/server/packet/send/PacketGetCompoundDataRsp.java
View file @
b5f356ce
...
...
@@ -10,11 +10,11 @@ import java.util.List;
import
java.util.Set
;
public
class
PacketGetCompoundDataRsp
extends
BasePacket
{
public
PacketGetCompoundDataRsp
(
Set
<
Integer
>
unlockedCompounds
,
List
<
CompoundQueueData
>
compundQueueData
)
{
public
PacketGetCompoundDataRsp
(
Set
<
Integer
>
unlockedCompounds
,
List
<
CompoundQueueData
>
comp
o
undQueueData
)
{
super
(
PacketOpcodes
.
GetCompoundDataRsp
);
var
proto
=
GetCompoundDataRsp
.
newBuilder
()
.
addAllUnlockCompoundList
(
unlockedCompounds
)
.
addAllCompoundQueDataList
(
compundQueueData
)
.
addAllCompoundQueDataList
(
comp
o
undQueueData
)
.
setRetcode
(
Retcode
.
RET_SUCC_VALUE
)
.
build
();
setData
(
proto
);
...
...
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