Unverified Commit b5f356ce authored by dragon's avatar dragon Committed by GitHub
Browse files

send CompoundDataNotify on Login;fix spelling mistakes. (#1869)

parent 84d02370
...@@ -14,6 +14,7 @@ import emu.grasscutter.net.proto.PlayerCompoundMaterialReqOuterClass.PlayerCompo ...@@ -14,6 +14,7 @@ import emu.grasscutter.net.proto.PlayerCompoundMaterialReqOuterClass.PlayerCompo
import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode; import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
import emu.grasscutter.net.proto.TakeCompoundOutputReqOuterClass.TakeCompoundOutputReq; import emu.grasscutter.net.proto.TakeCompoundOutputReqOuterClass.TakeCompoundOutputReq;
import emu.grasscutter.server.packet.send.PackageTakeCompoundOutputRsp; 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.PacketGetCompoundDataRsp;
import emu.grasscutter.server.packet.send.PacketPlayerCompoundMaterialRsp; import emu.grasscutter.server.packet.send.PacketPlayerCompoundMaterialRsp;
import emu.grasscutter.utils.Utils; import emu.grasscutter.utils.Utils;
...@@ -129,4 +130,8 @@ public class CookingCompoundManager extends BasePlayerManager { ...@@ -129,4 +130,8 @@ public class CookingCompoundManager extends BasePlayerManager {
player.sendPacket(new PackageTakeCompoundOutputRsp(null, Retcode.RET_COMPOUND_NOT_FINISH_VALUE)); player.sendPacket(new PackageTakeCompoundOutputRsp(null, Retcode.RET_COMPOUND_NOT_FINISH_VALUE));
} }
} }
public void onPlayerLogin() {
player.sendPacket(new PacketCompoundDataNotify(unlocked,getCompoundQueueData()));
}
} }
...@@ -12,7 +12,6 @@ import emu.grasscutter.game.inventory.GameItem; ...@@ -12,7 +12,6 @@ import emu.grasscutter.game.inventory.GameItem;
import emu.grasscutter.game.player.BasePlayerManager; import emu.grasscutter.game.player.BasePlayerManager;
import emu.grasscutter.game.player.Player; import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.ActionReason; import emu.grasscutter.game.props.ActionReason;
import emu.grasscutter.game.props.ItemUseOp;
import emu.grasscutter.net.proto.CookRecipeDataOuterClass; import emu.grasscutter.net.proto.CookRecipeDataOuterClass;
import emu.grasscutter.net.proto.PlayerCookArgsReqOuterClass.PlayerCookArgsReq; import emu.grasscutter.net.proto.PlayerCookArgsReqOuterClass.PlayerCookArgsReq;
import emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq; import emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq;
...@@ -164,16 +163,16 @@ public class CookingManager extends BasePlayerManager { ...@@ -164,16 +163,16 @@ public class CookingManager extends BasePlayerManager {
} }
} }
public void sendCookDataNofity() { public void sendCookDataNotify() {
// Default unlocked recipies to player if they don't have them yet. // Default unlocked recipes to player if they don't have them yet.
this.addDefaultUnlocked(); this.addDefaultUnlocked();
// Get unlocked recipies. // Get unlocked recipes.
var unlockedRecipies = this.player.getUnlockedRecipies(); var unlockedRecipes = this.player.getUnlockedRecipies();
// Construct CookRecipeData protos. // Construct CookRecipeData protos.
List<CookRecipeDataOuterClass.CookRecipeData> data = new ArrayList<>(); List<CookRecipeDataOuterClass.CookRecipeData> data = new ArrayList<>();
for (var recipe : unlockedRecipies.entrySet()) { for (var recipe : unlockedRecipes.entrySet()) {
int recipeId = recipe.getKey(); int recipeId = recipe.getKey();
int proficiency = recipe.getValue(); int proficiency = recipe.getValue();
......
...@@ -1199,7 +1199,8 @@ public class Player { ...@@ -1199,7 +1199,8 @@ public class Player {
session.send(new PacketGetChatEmojiCollectionRsp(this.getChatEmojiIdList())); session.send(new PacketGetChatEmojiCollectionRsp(this.getChatEmojiIdList()));
this.forgingManager.sendForgeDataNotify(); this.forgingManager.sendForgeDataNotify();
this.resinManager.onPlayerLogin(); this.resinManager.onPlayerLogin();
this.cookingManager.sendCookDataNofity(); this.cookingManager.sendCookDataNotify();
this.cookingCompoundManager.onPlayerLogin();
this.teamManager.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. 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.
......
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);
}
}
...@@ -8,14 +8,14 @@ import emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify; ...@@ -8,14 +8,14 @@ import emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify;
import emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData; import emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData;
public class PacketCookDataNotify extends BasePacket { public class PacketCookDataNotify extends BasePacket {
public PacketCookDataNotify(List<CookRecipeData> recipies) { public PacketCookDataNotify(List<CookRecipeData> recipes) {
super(PacketOpcodes.CookDataNotify); super(PacketOpcodes.CookDataNotify);
CookDataNotify proto = CookDataNotify.newBuilder() CookDataNotify proto = CookDataNotify.newBuilder()
.addAllRecipeDataList(recipies) .addAllRecipeDataList(recipes)
.build(); .build();
this.setData(proto); this.setData(proto);
} }
} }
...@@ -10,11 +10,11 @@ import java.util.List; ...@@ -10,11 +10,11 @@ import java.util.List;
import java.util.Set; import java.util.Set;
public class PacketGetCompoundDataRsp extends BasePacket { public class PacketGetCompoundDataRsp extends BasePacket {
public PacketGetCompoundDataRsp(Set<Integer> unlockedCompounds, List<CompoundQueueData> compundQueueData) { public PacketGetCompoundDataRsp(Set<Integer> unlockedCompounds, List<CompoundQueueData> compoundQueueData) {
super(PacketOpcodes.GetCompoundDataRsp); super(PacketOpcodes.GetCompoundDataRsp);
var proto = GetCompoundDataRsp.newBuilder() var proto = GetCompoundDataRsp.newBuilder()
.addAllUnlockCompoundList(unlockedCompounds) .addAllUnlockCompoundList(unlockedCompounds)
.addAllCompoundQueDataList(compundQueueData) .addAllCompoundQueDataList(compoundQueueData)
.setRetcode(Retcode.RET_SUCC_VALUE) .setRetcode(Retcode.RET_SUCC_VALUE)
.build(); .build();
setData(proto); setData(proto);
......
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