Mirror/LunarCore
1
0
Fork 0
mirror of https://github.com/Melledy/LunarCore.git synced 2025-12-13 13:54:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support for adding multiple display avatars for the server console friend

Browse Source
This commit is contained in:
Melledy
2024-06-19 21:32:02 -07:00
parent 9e90c52df1
commit 82fad62eaa
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/emu/lunarcore/Config.java
View File

@@ -160,8 +160,18 @@ public class Config {
public int level = 1; public int level = 1;
public int headIcon = 201001; public int headIcon = 201001;
public int chatBubbleId = 0; public int chatBubbleId = 0;
public int displayAvatarId = 1001; public List<ServerDisplayAvatar> displayAvatars = List.of(new ServerDisplayAvatar(1001, 1));
public int displayAvatarLevel = 1;
@Getter
public static class ServerDisplayAvatar {
public int avatarId;
public int level;
public ServerDisplayAvatar(int avatarId, int level) {
this.avatarId = avatarId;
this.level = level;
}
}
} }
@Getter @Getter

17
src/main/java/emu/lunarcore/server/packet/send/PacketGetFriendListInfoScRsp.java
View File

@@ -30,12 +30,27 @@ public class PacketGetFriendListInfoScRsp extends BasePacket {
.setChatBubbleId(serverFriendInfo.getChatBubbleId()) .setChatBubbleId(serverFriendInfo.getChatBubbleId())
.setOnlineStatus(FriendOnlineStatus.FRIEND_ONLINE_STATUS_ONLINE) .setOnlineStatus(FriendOnlineStatus.FRIEND_ONLINE_STATUS_ONLINE)
.setPlatformType(PlatformType.PC) .setPlatformType(PlatformType.PC)
.addAssistSimpleInfo(AssistSimpleInfo.newInstance().setAvatarId(serverFriendInfo.getDisplayAvatarId()).setLevel(serverFriendInfo.getDisplayAvatarLevel()))
.setHeadIcon(serverFriendInfo.getHeadIcon()); .setHeadIcon(serverFriendInfo.getHeadIcon());
// Add server display avatars
if (serverFriendInfo.getDisplayAvatars() != null) {
for (int pos = 0; pos < serverFriendInfo.getDisplayAvatars().size(); pos++) {
var displayAvatar = serverFriendInfo.getDisplayAvatars().get(pos);
var info = AssistSimpleInfo.newInstance()
.setAvatarId(displayAvatar.getAvatarId())
.setLevel(displayAvatar.getLevel())
.setPos(pos);
consoleFriend.addAssistSimpleInfo(info);
}
}
// Create proto and add the server console info to it
var data = GetFriendListInfoScRsp.newInstance() var data = GetFriendListInfoScRsp.newInstance()
.addFriendList(FriendListInfo.newInstance().setSimpleInfo(consoleFriend)); .addFriendList(FriendListInfo.newInstance().setSimpleInfo(consoleFriend));
// Add friend infos
for (var friendship : friendList.getFriends().values()) { for (var friendship : friendList.getFriends().values()) {
var friend = friendList.getServer().getPlayerByUid(friendship.getFriendUid(), true); var friend = friendList.getServer().getPlayerByUid(friendship.getFriendUid(), true);
if (friend == null) continue; if (friend == null) continue;