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

refactor: simplify fallback enchantment reverse maps

Browse source 
Co-authored-by: milutinke <441903+milutinke@users.noreply.github.com>
Agent-Logs-Url: https://github.com/MCCTeam/Minecraft-Console-Client/sessions/16e21ef0-6f09-4280-b539-8d704ddc3b67
This commit is contained in:
copilot-swe-agent[bot] 2026-03-25 18:02:12 +00:00
parent d4faea9ecc
commit 71c01c739a
1 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
MinecraftClient/Inventory/EnchantmentMapping.cs
View file

@ -250,7 +250,11 @@ namespace MinecraftClient.Inventory
}
private static Dictionary<Enchantments, short>? reverseDynamicEnchantmentMappings;
private static readonly Dictionary<int, Dictionary<Enchantments, short>> reverseFallbackEnchantmentMappings = new();
private static readonly Dictionary<Enchantments, short> reverseEnchantmentMappings114 = CreateReverseMap(enchantmentMappings114);
private static readonly Dictionary<Enchantments, short> reverseEnchantmentMappings116 = CreateReverseMap(enchantmentMappings116);
private static readonly Dictionary<Enchantments, short> reverseEnchantmentMappings119 = CreateReverseMap(enchantmentMappings119);
private static readonly Dictionary<Enchantments, short> reverseEnchantmentMappings1206 = CreateReverseMap(enchantmentMappings1206);
private static readonly Dictionary<Enchantments, short> reverseEnchantmentMappings12111 = CreateReverseMap(enchantmentMappings12111);
private static Dictionary<int, Enchantments>? dynamicEnchantmentIdMap;
private static readonly Dictionary<string, Enchantments> nameToEnchantment = new()
@ -339,7 +343,7 @@ namespace MinecraftClient.Inventory
return reverseDynamicEnchantmentMappings.TryGetValue(enchantment, out var dynamicId) ? dynamicId : -1;
}
var reverseMap = GetReverseFallbackMapForProtocolVersion(protocolVersion);
var reverseMap = GetReverseMapForProtocolVersion(protocolVersion);
return reverseMap.TryGetValue(enchantment, out var id) ? id : -1;
}
@ -390,16 +394,24 @@ namespace MinecraftClient.Inventory
};
}
private static Dictionary<Enchantments, short> GetReverseFallbackMapForProtocolVersion(int protocolVersion)
private static Dictionary<Enchantments, short> GetReverseMapForProtocolVersion(int protocolVersion)
{
if (reverseFallbackEnchantmentMappings.TryGetValue(protocolVersion, out var reverseMap))
return reverseMap;
return protocolVersion switch
{
>= Protocol18Handler.MC_1_14_Version and < Protocol18Handler.MC_1_16_Version => reverseEnchantmentMappings114,
>= Protocol18Handler.MC_1_16_Version and < Protocol18Handler.MC_1_19_Version => reverseEnchantmentMappings116,
>= Protocol18Handler.MC_1_19_Version and < Protocol18Handler.MC_1_20_6_Version => reverseEnchantmentMappings119,
>= Protocol18Handler.MC_1_21_11_Version => reverseEnchantmentMappings12111,
_ => reverseEnchantmentMappings1206
};
}
reverseMap = new();
foreach (var kvp in GetMapForProtocolVersion(protocolVersion))
private static Dictionary<Enchantments, short> CreateReverseMap(Dictionary<short, Enchantments> map)
{
Dictionary<Enchantments, short> reverseMap = new();
foreach (var kvp in map)
reverseMap[kvp.Value] = kvp.Key;
reverseFallbackEnchantmentMappings[protocolVersion] = reverseMap;
return reverseMap;
}
}