helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from master

Browse source
This commit is contained in:
BruceChen 2022-09-04 10:44:25 +08:00
commit afdf2f9e2c
28 changed files with 1453 additions and 1114 deletions
Download patch file Download diff file Expand all files Collapse all files

36
MinecraftClient/McClient.cs
View file

@ -15,6 +15,7 @@ using MinecraftClient.Inventory;
using MinecraftClient.Logger;
using MinecraftClient.Protocol.Keys;
using MinecraftClient.Protocol.Session;
using MinecraftClient.Protocol.Message;
namespace MinecraftClient
{
@ -69,7 +70,8 @@ namespace MinecraftClient
private int port;
private int protocolversion;
private string username;
private string uuid;
private Guid uuid;
private string uuidStr;
private string sessionid;
private PlayerKeyPair? playerKeyPair;
private DateTime lastKeepAlive;
@ -105,7 +107,8 @@ namespace MinecraftClient
public int GetServerPort() { return port; }
public string GetServerHost() { return host; }
public string GetUsername() { return username; }
public string GetUserUUID() { return uuid; }
public Guid GetUserUuid() { return uuid; }
public string GetUserUuidStr() { return uuidStr; }
public string GetSessionID() { return sessionid; }
public Location GetCurrentLocation() { return location; }
public float GetYaw() { return playerYaw; }
@ -151,7 +154,9 @@ namespace MinecraftClient
bool retry = false;
this.sessionid = session.ID;
this.uuid = session.PlayerID;
if (!Guid.TryParse(session.PlayerID, out this.uuid))
this.uuid = Guid.Empty;
this.uuidStr = session.PlayerID;
this.username = session.PlayerName;
this.host = server_ip;
this.port = port;
@ -2092,20 +2097,18 @@ namespace MinecraftClient
List<string> links = new();
string messageText;
if (message.isJson)
if (message.isSignedChat)
{
if (message.isSignedChat)
{
if (!Settings.ShowIllegalSignedChat && !message.isSystemChat && !(bool)message.isSignatureLegal!)
return;
messageText = ChatParser.ParseSignedChat(message, links);
}
else
messageText = ChatParser.ParseText(message.content, links);
if (!Settings.ShowIllegalSignedChat && !message.isSystemChat && !(bool)message.isSignatureLegal!)
return;
messageText = ChatParser.ParseSignedChat(message, links);
}
else
{
messageText = message.content;
if (message.isJson)
messageText = ChatParser.ParseText(message.content, links);
else
messageText = message.content;
}
Log.Chat(messageText);
@ -2242,15 +2245,16 @@ namespace MinecraftClient
if (player.Name == username)
{
// 1.19+ offline server is possible to return different uuid
this.uuid = player.UUID.ToString().Replace("-", string.Empty);
this.uuid = player.Uuid;
this.uuidStr = player.Uuid.ToString().Replace("-", string.Empty);
}
lock (onlinePlayers)
{
onlinePlayers[player.UUID] = player;
onlinePlayers[player.Uuid] = player;
}
DispatchBotEvent(bot => bot.OnPlayerJoin(player.UUID, player.Name));
DispatchBotEvent(bot => bot.OnPlayerJoin(player.Uuid, player.Name));
}
/// <summary>