forked from Grasscutters/Grasscutter
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request Grasscutters#318 from Yazawazi/development
Implementing the `Player Show Avatars`
- Loading branch information
Showing
5 changed files
with
132 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
syntax = "proto3"; | ||
|
||
option java_package = "emu.grasscutter.net.proto"; | ||
|
||
message UpdatePlayerShowAvatarListReq { | ||
enum CmdId { | ||
option allow_alias = true; | ||
ENET_CHANNEL_ID = 0; | ||
NONE = 0; | ||
ENET_IS_RELIABLE = 1; | ||
IS_ALLOW_CLIENT = 1; | ||
CMD_ID = 4093; | ||
} | ||
|
||
repeated uint32 show_avatar_id_list = 1; | ||
bool is_show_avatar = 2; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
syntax = "proto3"; | ||
|
||
option java_package = "emu.grasscutter.net.proto"; | ||
|
||
message UpdatePlayerShowAvatarListRsp { | ||
enum CmdId { | ||
option allow_alias = true; | ||
NONE = 0; | ||
ENET_CHANNEL_ID = 0; | ||
ENET_IS_RELIABLE = 1; | ||
CMD_ID = 4053; | ||
} | ||
|
||
int32 retcode = 1; | ||
repeated uint32 show_avatar_id_list = 2; | ||
bool is_show_avatar = 3; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdatePlayerShowAvatarListReq.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
package emu.grasscutter.server.packet.recv; | ||
|
||
import emu.grasscutter.Grasscutter; | ||
import emu.grasscutter.net.packet.Opcodes; | ||
import emu.grasscutter.net.packet.PacketHandler; | ||
import emu.grasscutter.net.packet.PacketOpcodes; | ||
import emu.grasscutter.net.proto.UpdatePlayerShowAvatarListReqOuterClass; | ||
import emu.grasscutter.server.game.GameSession; | ||
import emu.grasscutter.server.packet.send.PacketUpdatePlayerShowAvatarListRsp; | ||
|
||
@Opcodes(PacketOpcodes.UpdatePlayerShowAvatarListReq) | ||
public class HandlerUpdatePlayerShowAvatarListReq extends PacketHandler { | ||
@Override | ||
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { | ||
UpdatePlayerShowAvatarListReqOuterClass.UpdatePlayerShowAvatarListReq req = UpdatePlayerShowAvatarListReqOuterClass.UpdatePlayerShowAvatarListReq.parseFrom(payload); | ||
|
||
session.getPlayer().setShowAvatars(req.getIsShowAvatar()); | ||
session.getPlayer().setShowAvatarList(req.getShowAvatarIdListList()); | ||
|
||
session.send(new PacketUpdatePlayerShowAvatarListRsp(req.getIsShowAvatar(), req.getShowAvatarIdListList())); | ||
} | ||
} |
22 changes: 22 additions & 0 deletions
22
src/main/java/emu/grasscutter/server/packet/send/PacketUpdatePlayerShowAvatarListRsp.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
package emu.grasscutter.server.packet.send; | ||
|
||
import emu.grasscutter.net.packet.BasePacket; | ||
import emu.grasscutter.net.packet.PacketOpcodes; | ||
import emu.grasscutter.net.proto.UpdatePlayerShowAvatarListRspOuterClass.UpdatePlayerShowAvatarListRsp; | ||
|
||
import java.util.List; | ||
|
||
public class PacketUpdatePlayerShowAvatarListRsp extends BasePacket { | ||
|
||
public PacketUpdatePlayerShowAvatarListRsp(boolean isShowAvatar, List<Integer> avatarIds) { | ||
super(PacketOpcodes.UpdatePlayerShowAvatarListRsp); | ||
|
||
UpdatePlayerShowAvatarListRsp proto = UpdatePlayerShowAvatarListRsp.newBuilder() | ||
.setIsShowAvatar(isShowAvatar) | ||
.addAllShowAvatarIdList(avatarIds) | ||
.setRetcode(0) | ||
.build(); | ||
|
||
this.setData(proto); | ||
} | ||
} |