helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2026-08-29 13:04:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix legacy achievements and add test harness

Browse source
This commit is contained in:
milutinke 2026-03-30 17:25:08 +02:00
parent 962c8b1ab2
commit 0881cbaa1c
7 changed files with 785 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

49
MinecraftClient/Protocol/Handlers/Protocol18.cs
View file

@ -91,6 +91,7 @@ namespace MinecraftClient.Protocol.Handlers
private int currentDimension;
private bool isOnlineMode = false;
private readonly BlockingCollection<Tuple<int, Queue<byte>>> packetQueue = new();
private readonly Dictionary<string, bool> legacyAchievementProgress = new(StringComparer.Ordinal);
private float LastYaw, LastPitch;
private double lastSentX, lastSentY, lastSentZ;
private float lastSentYaw, lastSentPitch;
@ -120,6 +121,7 @@ namespace MinecraftClient.Protocol.Handlers
Tuple<Thread, CancellationTokenSource>? netReader = null; // reader thread
readonly ILogger log;
readonly RandomNumberGenerator randomGen;
private bool legacyAchievementsInitialized;
public Protocol18Handler(TcpClient Client, int protocolVersion, IMinecraftComHandler handler,
ForgeInfo? forgeInfo, int rawProtocolVersion = 0)
@ -3132,6 +3134,11 @@ namespace MinecraftClient.Protocol.Handlers
case PacketTypesIn.RecipeBookSettings:
break;
case PacketTypesIn.Statistics:
if (protocolVersion < MC_1_12_Version)
HandleLegacyStatistics(packetData);
break;
case PacketTypesIn.Advancements:
HandleAdvancements(packetData);
break;
@ -3147,9 +3154,39 @@ namespace MinecraftClient.Protocol.Handlers
return true; //Packet processed
}
/// <summary>
/// Handle the Statistics packet for pre-1.12 legacy achievements.
/// </summary>
private void HandleLegacyStatistics(Queue<byte> packetData)
{
int statCount = dataTypes.ReadNextVarInt(packetData);
for (int i = 0; i < statCount; i++)
{
string statId = dataTypes.ReadNextString(packetData);
int value = dataTypes.ReadNextVarInt(packetData);
if (statId.StartsWith("achievement.", StringComparison.Ordinal))
legacyAchievementProgress[statId] = value > 0;
}
List<Achievement> added = new(LegacyAchievementCatalog.Ids.Count + legacyAchievementProgress.Count);
foreach (string achievementId in LegacyAchievementCatalog.Ids)
added.Add(CreateLegacyAchievement(achievementId, legacyAchievementProgress.TryGetValue(achievementId, out bool completed) && completed));
foreach (var (achievementId, completed) in legacyAchievementProgress)
{
if (!LegacyAchievementCatalog.Contains(achievementId))
added.Add(CreateLegacyAchievement(achievementId, completed));
}
handler.OnAchievementsUpdate(added, [], reset: !legacyAchievementsInitialized);
legacyAchievementsInitialized = true;
}
/// <summary>
/// Handle the Advancements packet (1.12+).
/// Also handles the Statistics packet for pre-1.12 legacy achievements.
/// </summary>
private void HandleAdvancements(Queue<byte> packetData)
{
@ -3282,6 +3319,16 @@ namespace MinecraftClient.Protocol.Handlers
handler.OnAchievementsUpdate(added, removedIds, reset);
}
private static Achievement CreateLegacyAchievement(string id, bool isCompleted)
{
Dictionary<string, bool> criteria = new(StringComparer.Ordinal)
{
[id] = isCompleted
};
IReadOnlyList<string>[] requirements = [[id]];
return new Achievement(id, null, null, AchievementType.Legacy, false, isCompleted, requirements, criteria);
}
/// <summary>
/// Compute whether an advancement is completed based on AND-of-ORs requirements.
/// </summary>