mirror of
https://github.com/MCCTeam/Minecraft-Console-Client
synced 2026-08-15 13:04:36 +00:00
Fix enchantment name display for 1.20.6 structured components
EnchantmentsComponent (used by both regular and stored enchantments) was directly casting the registry VarInt ID to the Enchantments enum via (Enchantments)id. However, the Enchantments enum is ordered alphabetically (AquaAffinity=0, BaneOfArthropods=1, ..., Sharpness=32) while the 1.20.6 registry uses a completely different order (protection=0, fire_protection=1, ..., sharpness=13). This caused all enchantment names to display incorrectly (e.g. Sharpness V shown as "Unknown Enchantment with ID: 32"). Changes: - Parse now uses EnchantmentMapping.GetEnchantmentByRegistryId1206() to properly map registry IDs to enum values via the existing 1.20.6+ mapping table - Serialize now uses EnchantmentMapping.GetRegistryId1206ByEnchantment() to convert enum values back to registry IDs (reverse lookup) - Fixed translation key prefix: "Enchantments.minecraft." (wrong) -> "enchantment.minecraft." (matches en_us.json resource keys) - Fixed 3 long-standing typos in the Enchantments enum that prevented translation lookup from matching resource keys: - DepthStrieder -> DepthStrider (depth_strieder vs depth_strider) - Efficency -> Efficiency (efficency vs efficiency) - Loyality -> Loyalty (loyality vs loyalty) Verified on vanilla 1.20.6 server: items with sharpness, efficiency, unbreaking, fortune, mending, and bane_of_arthropods all display correct localized names (锋利, 效率, 耐久, 时运, 经验修补, 节肢杀手). Made-with: Cursor
This commit is contained in:
BruceChen
parent
1e2b853b14
commit
79a0dff8cd
3 changed files with 44 additions and 20 deletions
|
|
@ -1,4 +1,4 @@
|
|||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using MinecraftClient.Protocol.Handlers;
|
||||
|
|
@ -21,7 +21,7 @@ namespace MinecraftClient.Inventory
|
|||
{ 5, Enchantments.Respiration },
|
||||
{ 6, Enchantments.AquaAffinity },
|
||||
{ 7, Enchantments.Thorns },
|
||||
{ 8, Enchantments.DepthStrieder },
|
||||
{ 8, Enchantments.DepthStrider },
|
||||
{ 9, Enchantments.FrostWalker },
|
||||
{ 10, Enchantments.BindingCurse },
|
||||
{ 11, Enchantments.Sharpness },
|
||||
|
|
@ -31,7 +31,7 @@ namespace MinecraftClient.Inventory
|
|||
{ 15, Enchantments.FireAspect },
|
||||
{ 16, Enchantments.Looting },
|
||||
{ 17, Enchantments.Sweeping },
|
||||
{ 18, Enchantments.Efficency },
|
||||
{ 18, Enchantments.Efficiency },
|
||||
{ 19, Enchantments.SilkTouch },
|
||||
{ 20, Enchantments.Unbreaking },
|
||||
{ 21, Enchantments.Fortune },
|
||||
|
|
@ -41,7 +41,7 @@ namespace MinecraftClient.Inventory
|
|||
{ 25, Enchantments.Infinity },
|
||||
{ 26, Enchantments.LuckOfTheSea },
|
||||
{ 27, Enchantments.Lure },
|
||||
{ 28, Enchantments.Loyality },
|
||||
{ 28, Enchantments.Loyalty },
|
||||
{ 29, Enchantments.Impaling },
|
||||
{ 30, Enchantments.Riptide },
|
||||
{ 31, Enchantments.Channeling },
|
||||
|
|
@ -61,7 +61,7 @@ namespace MinecraftClient.Inventory
|
|||
{ 5, Enchantments.Respiration },
|
||||
{ 6, Enchantments.AquaAffinity },
|
||||
{ 7, Enchantments.Thorns },
|
||||
{ 8, Enchantments.DepthStrieder },
|
||||
{ 8, Enchantments.DepthStrider },
|
||||
{ 9, Enchantments.FrostWalker },
|
||||
{ 10, Enchantments.BindingCurse },
|
||||
{ 11, Enchantments.SoulSpeed },
|
||||
|
|
@ -72,7 +72,7 @@ namespace MinecraftClient.Inventory
|
|||
{ 16, Enchantments.FireAspect },
|
||||
{ 17, Enchantments.Looting },
|
||||
{ 18, Enchantments.Sweeping },
|
||||
{ 19, Enchantments.Efficency },
|
||||
{ 19, Enchantments.Efficiency },
|
||||
{ 20, Enchantments.SilkTouch },
|
||||
{ 21, Enchantments.Unbreaking },
|
||||
{ 22, Enchantments.Fortune },
|
||||
|
|
@ -82,7 +82,7 @@ namespace MinecraftClient.Inventory
|
|||
{ 26, Enchantments.Infinity },
|
||||
{ 27, Enchantments.LuckOfTheSea },
|
||||
{ 28, Enchantments.Lure },
|
||||
{ 29, Enchantments.Loyality },
|
||||
{ 29, Enchantments.Loyalty },
|
||||
{ 30, Enchantments.Impaling },
|
||||
{ 31, Enchantments.Riptide },
|
||||
{ 32, Enchantments.Channeling },
|
||||
|
|
@ -105,7 +105,7 @@ namespace MinecraftClient.Inventory
|
|||
{ 5, Enchantments.Respiration },
|
||||
{ 6, Enchantments.AquaAffinity },
|
||||
{ 7, Enchantments.Thorns },
|
||||
{ 8, Enchantments.DepthStrieder },
|
||||
{ 8, Enchantments.DepthStrider },
|
||||
{ 9, Enchantments.FrostWalker },
|
||||
{ 10, Enchantments.BindingCurse },
|
||||
{ 11, Enchantments.SoulSpeed },
|
||||
|
|
@ -117,7 +117,7 @@ namespace MinecraftClient.Inventory
|
|||
{ 17, Enchantments.FireAspect },
|
||||
{ 18, Enchantments.Looting },
|
||||
{ 19, Enchantments.Sweeping },
|
||||
{ 20, Enchantments.Efficency },
|
||||
{ 20, Enchantments.Efficiency },
|
||||
{ 21, Enchantments.SilkTouch },
|
||||
{ 22, Enchantments.Unbreaking },
|
||||
{ 23, Enchantments.Fortune },
|
||||
|
|
@ -127,7 +127,7 @@ namespace MinecraftClient.Inventory
|
|||
{ 27, Enchantments.Infinity },
|
||||
{ 28, Enchantments.LuckOfTheSea },
|
||||
{ 29, Enchantments.Lure },
|
||||
{ 30, Enchantments.Loyality },
|
||||
{ 30, Enchantments.Loyalty },
|
||||
{ 31, Enchantments.Impaling },
|
||||
{ 32, Enchantments.Riptide },
|
||||
{ 33, Enchantments.Channeling },
|
||||
|
|
@ -150,7 +150,7 @@ namespace MinecraftClient.Inventory
|
|||
{ 5, Enchantments.Respiration },
|
||||
{ 6, Enchantments.AquaAffinity },
|
||||
{ 7, Enchantments.Thorns },
|
||||
{ 8, Enchantments.DepthStrieder },
|
||||
{ 8, Enchantments.DepthStrider },
|
||||
{ 9, Enchantments.FrostWalker },
|
||||
{ 10, Enchantments.BindingCurse },
|
||||
{ 11, Enchantments.SoulSpeed },
|
||||
|
|
@ -162,7 +162,7 @@ namespace MinecraftClient.Inventory
|
|||
{ 17, Enchantments.FireAspect },
|
||||
{ 18, Enchantments.Looting },
|
||||
{ 19, Enchantments.Sweeping },
|
||||
{ 20, Enchantments.Efficency },
|
||||
{ 20, Enchantments.Efficiency },
|
||||
{ 21, Enchantments.SilkTouch },
|
||||
{ 22, Enchantments.Unbreaking },
|
||||
{ 23, Enchantments.Fortune },
|
||||
|
|
@ -172,7 +172,7 @@ namespace MinecraftClient.Inventory
|
|||
{ 27, Enchantments.Infinity },
|
||||
{ 28, Enchantments.LuckOfTheSea },
|
||||
{ 29, Enchantments.Lure },
|
||||
{ 30, Enchantments.Loyality },
|
||||
{ 30, Enchantments.Loyalty },
|
||||
{ 31, Enchantments.Impaling },
|
||||
{ 32, Enchantments.Riptide },
|
||||
{ 33, Enchantments.Channeling },
|
||||
|
|
@ -206,9 +206,29 @@ namespace MinecraftClient.Inventory
|
|||
return value;
|
||||
}
|
||||
|
||||
private static Dictionary<Enchantments, short>? reverseEnchantmentMappings;
|
||||
|
||||
public static Enchantments GetEnchantmentByRegistryId1206(int id)
|
||||
{
|
||||
if (enchantmentMappings.TryGetValue((short)id, out var value))
|
||||
return value;
|
||||
return (Enchantments)(-1);
|
||||
}
|
||||
|
||||
public static int GetRegistryId1206ByEnchantment(Enchantments enchantment)
|
||||
{
|
||||
if (reverseEnchantmentMappings == null)
|
||||
{
|
||||
reverseEnchantmentMappings = new Dictionary<Enchantments, short>();
|
||||
foreach (var kvp in enchantmentMappings)
|
||||
reverseEnchantmentMappings[kvp.Value] = kvp.Key;
|
||||
}
|
||||
return reverseEnchantmentMappings.TryGetValue(enchantment, out var id) ? id : -1;
|
||||
}
|
||||
|
||||
public static string GetEnchantmentName(Enchantments enchantment)
|
||||
{
|
||||
var translation = ChatParser.TranslateString("Enchantments.minecraft." + enchantment.ToString().ToUnderscoreCase());
|
||||
var translation = ChatParser.TranslateString("enchantment.minecraft." + enchantment.ToString().ToUnderscoreCase());
|
||||
return string.IsNullOrEmpty(translation) ? $"Unknown Enchantment with ID: {(short)enchantment} (Probably not named in the code yet)" : translation;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
namespace MinecraftClient.Inventory
|
||||
namespace MinecraftClient.Inventory
|
||||
{
|
||||
// Not implemented for 1.14
|
||||
public enum Enchantments : short
|
||||
|
|
@ -9,9 +9,9 @@
|
|||
BlastProtection,
|
||||
Breach,
|
||||
Channeling,
|
||||
DepthStrieder,
|
||||
DepthStrider,
|
||||
Density,
|
||||
Efficency,
|
||||
Efficiency,
|
||||
FeatherFalling,
|
||||
FireAspect,
|
||||
FireProtection,
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
Knockback,
|
||||
Looting,
|
||||
LuckOfTheSea,
|
||||
Loyality,
|
||||
Loyalty,
|
||||
Lure,
|
||||
Mending,
|
||||
Multishot,
|
||||
|
|
|
|||
|
|
@ -17,7 +17,11 @@ public class EnchantmentsComponent(DataTypes dataTypes, ItemPalette itemPalette,
|
|||
NumberOfEnchantments = dataTypes.ReadNextVarInt(data);
|
||||
|
||||
for (var i = 0; i < NumberOfEnchantments; i++)
|
||||
Enchantments.Add(new Enchantment((Enchantments)dataTypes.ReadNextVarInt(data), dataTypes.ReadNextVarInt(data)));
|
||||
{
|
||||
var registryId = dataTypes.ReadNextVarInt(data);
|
||||
var level = dataTypes.ReadNextVarInt(data);
|
||||
Enchantments.Add(new Enchantment(EnchantmentMapping.GetEnchantmentByRegistryId1206(registryId), level));
|
||||
}
|
||||
|
||||
ShowTooltip = dataTypes.ReadNextBool(data);
|
||||
}
|
||||
|
|
@ -28,7 +32,7 @@ public class EnchantmentsComponent(DataTypes dataTypes, ItemPalette itemPalette,
|
|||
data.AddRange(DataTypes.GetVarInt(Enchantments.Count));
|
||||
foreach (var enchantment in Enchantments)
|
||||
{
|
||||
data.AddRange(DataTypes.GetVarInt((int)enchantment.Type));
|
||||
data.AddRange(DataTypes.GetVarInt(EnchantmentMapping.GetRegistryId1206ByEnchantment(enchantment.Type)));
|
||||
data.AddRange(DataTypes.GetVarInt(enchantment.Level));
|
||||
}
|
||||
data.AddRange(DataTypes.GetBool(ShowTooltip));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue