mirror of
https://github.com/MCCTeam/Minecraft-Console-Client
synced 2026-08-15 13:04:36 +00:00
79a0dff8cd
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
264 lines
11 KiB
C#
264 lines
11 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using MinecraftClient.Protocol.Handlers;
|
|
using MinecraftClient.Protocol.Message;
|
|
|
|
namespace MinecraftClient.Inventory
|
|
{
|
|
public class EnchantmentMapping
|
|
{
|
|
#pragma warning disable format // @formatter:off
|
|
// 1.14 - 1.15.2
|
|
private static Dictionary<short, Enchantments> enchantmentMappings114 = new()
|
|
{
|
|
//id type
|
|
{ 0, Enchantments.Protection },
|
|
{ 1, Enchantments.FireProtection },
|
|
{ 2, Enchantments.FeatherFalling },
|
|
{ 3, Enchantments.BlastProtection },
|
|
{ 4, Enchantments.ProjectileProtection },
|
|
{ 5, Enchantments.Respiration },
|
|
{ 6, Enchantments.AquaAffinity },
|
|
{ 7, Enchantments.Thorns },
|
|
{ 8, Enchantments.DepthStrider },
|
|
{ 9, Enchantments.FrostWalker },
|
|
{ 10, Enchantments.BindingCurse },
|
|
{ 11, Enchantments.Sharpness },
|
|
{ 12, Enchantments.Smite },
|
|
{ 13, Enchantments.BaneOfArthropods },
|
|
{ 14, Enchantments.Knockback },
|
|
{ 15, Enchantments.FireAspect },
|
|
{ 16, Enchantments.Looting },
|
|
{ 17, Enchantments.Sweeping },
|
|
{ 18, Enchantments.Efficiency },
|
|
{ 19, Enchantments.SilkTouch },
|
|
{ 20, Enchantments.Unbreaking },
|
|
{ 21, Enchantments.Fortune },
|
|
{ 22, Enchantments.Power },
|
|
{ 23, Enchantments.Punch },
|
|
{ 24, Enchantments.Flame },
|
|
{ 25, Enchantments.Infinity },
|
|
{ 26, Enchantments.LuckOfTheSea },
|
|
{ 27, Enchantments.Lure },
|
|
{ 28, Enchantments.Loyalty },
|
|
{ 29, Enchantments.Impaling },
|
|
{ 30, Enchantments.Riptide },
|
|
{ 31, Enchantments.Channeling },
|
|
{ 32, Enchantments.Mending },
|
|
{ 33, Enchantments.VanishingCurse }
|
|
};
|
|
|
|
// 1.16 - 1.18
|
|
private static Dictionary<short, Enchantments> enchantmentMappings116 = new()
|
|
{
|
|
//id type
|
|
{ 0, Enchantments.Protection },
|
|
{ 1, Enchantments.FireProtection },
|
|
{ 2, Enchantments.FeatherFalling },
|
|
{ 3, Enchantments.BlastProtection },
|
|
{ 4, Enchantments.ProjectileProtection },
|
|
{ 5, Enchantments.Respiration },
|
|
{ 6, Enchantments.AquaAffinity },
|
|
{ 7, Enchantments.Thorns },
|
|
{ 8, Enchantments.DepthStrider },
|
|
{ 9, Enchantments.FrostWalker },
|
|
{ 10, Enchantments.BindingCurse },
|
|
{ 11, Enchantments.SoulSpeed },
|
|
{ 12, Enchantments.Sharpness },
|
|
{ 13, Enchantments.Smite },
|
|
{ 14, Enchantments.BaneOfArthropods },
|
|
{ 15, Enchantments.Knockback },
|
|
{ 16, Enchantments.FireAspect },
|
|
{ 17, Enchantments.Looting },
|
|
{ 18, Enchantments.Sweeping },
|
|
{ 19, Enchantments.Efficiency },
|
|
{ 20, Enchantments.SilkTouch },
|
|
{ 21, Enchantments.Unbreaking },
|
|
{ 22, Enchantments.Fortune },
|
|
{ 23, Enchantments.Power },
|
|
{ 24, Enchantments.Punch },
|
|
{ 25, Enchantments.Flame },
|
|
{ 26, Enchantments.Infinity },
|
|
{ 27, Enchantments.LuckOfTheSea },
|
|
{ 28, Enchantments.Lure },
|
|
{ 29, Enchantments.Loyalty },
|
|
{ 30, Enchantments.Impaling },
|
|
{ 31, Enchantments.Riptide },
|
|
{ 32, Enchantments.Channeling },
|
|
{ 33, Enchantments.Multishot },
|
|
{ 34, Enchantments.QuickCharge },
|
|
{ 35, Enchantments.Piercing },
|
|
{ 36, Enchantments.Mending },
|
|
{ 37, Enchantments.VanishingCurse }
|
|
};
|
|
|
|
// 1.19 - 1.20.4
|
|
private static Dictionary<short, Enchantments> enchantmentMappings119 = new()
|
|
{
|
|
//id type
|
|
{ 0, Enchantments.Protection },
|
|
{ 1, Enchantments.FireProtection },
|
|
{ 2, Enchantments.FeatherFalling },
|
|
{ 3, Enchantments.BlastProtection },
|
|
{ 4, Enchantments.ProjectileProtection },
|
|
{ 5, Enchantments.Respiration },
|
|
{ 6, Enchantments.AquaAffinity },
|
|
{ 7, Enchantments.Thorns },
|
|
{ 8, Enchantments.DepthStrider },
|
|
{ 9, Enchantments.FrostWalker },
|
|
{ 10, Enchantments.BindingCurse },
|
|
{ 11, Enchantments.SoulSpeed },
|
|
{ 12, Enchantments.SwiftSneak },
|
|
{ 13, Enchantments.Sharpness },
|
|
{ 14, Enchantments.Smite },
|
|
{ 15, Enchantments.BaneOfArthropods },
|
|
{ 16, Enchantments.Knockback },
|
|
{ 17, Enchantments.FireAspect },
|
|
{ 18, Enchantments.Looting },
|
|
{ 19, Enchantments.Sweeping },
|
|
{ 20, Enchantments.Efficiency },
|
|
{ 21, Enchantments.SilkTouch },
|
|
{ 22, Enchantments.Unbreaking },
|
|
{ 23, Enchantments.Fortune },
|
|
{ 24, Enchantments.Power },
|
|
{ 25, Enchantments.Punch },
|
|
{ 26, Enchantments.Flame },
|
|
{ 27, Enchantments.Infinity },
|
|
{ 28, Enchantments.LuckOfTheSea },
|
|
{ 29, Enchantments.Lure },
|
|
{ 30, Enchantments.Loyalty },
|
|
{ 31, Enchantments.Impaling },
|
|
{ 32, Enchantments.Riptide },
|
|
{ 33, Enchantments.Channeling },
|
|
{ 34, Enchantments.Multishot },
|
|
{ 35, Enchantments.QuickCharge },
|
|
{ 36, Enchantments.Piercing },
|
|
{ 37, Enchantments.Mending },
|
|
{ 38, Enchantments.VanishingCurse }
|
|
};
|
|
|
|
// 1.20.6+
|
|
private static Dictionary<short, Enchantments> enchantmentMappings = new()
|
|
{
|
|
//id type
|
|
{ 0, Enchantments.Protection },
|
|
{ 1, Enchantments.FireProtection },
|
|
{ 2, Enchantments.FeatherFalling },
|
|
{ 3, Enchantments.BlastProtection },
|
|
{ 4, Enchantments.ProjectileProtection },
|
|
{ 5, Enchantments.Respiration },
|
|
{ 6, Enchantments.AquaAffinity },
|
|
{ 7, Enchantments.Thorns },
|
|
{ 8, Enchantments.DepthStrider },
|
|
{ 9, Enchantments.FrostWalker },
|
|
{ 10, Enchantments.BindingCurse },
|
|
{ 11, Enchantments.SoulSpeed },
|
|
{ 12, Enchantments.SwiftSneak },
|
|
{ 13, Enchantments.Sharpness },
|
|
{ 14, Enchantments.Smite },
|
|
{ 15, Enchantments.BaneOfArthropods },
|
|
{ 16, Enchantments.Knockback },
|
|
{ 17, Enchantments.FireAspect },
|
|
{ 18, Enchantments.Looting },
|
|
{ 19, Enchantments.Sweeping },
|
|
{ 20, Enchantments.Efficiency },
|
|
{ 21, Enchantments.SilkTouch },
|
|
{ 22, Enchantments.Unbreaking },
|
|
{ 23, Enchantments.Fortune },
|
|
{ 24, Enchantments.Power },
|
|
{ 25, Enchantments.Punch },
|
|
{ 26, Enchantments.Flame },
|
|
{ 27, Enchantments.Infinity },
|
|
{ 28, Enchantments.LuckOfTheSea },
|
|
{ 29, Enchantments.Lure },
|
|
{ 30, Enchantments.Loyalty },
|
|
{ 31, Enchantments.Impaling },
|
|
{ 32, Enchantments.Riptide },
|
|
{ 33, Enchantments.Channeling },
|
|
{ 34, Enchantments.Multishot },
|
|
{ 35, Enchantments.QuickCharge },
|
|
{ 36, Enchantments.Piercing },
|
|
{ 37, Enchantments.Density },
|
|
{ 38, Enchantments.Breach },
|
|
{ 39, Enchantments.WindBurst },
|
|
{ 40, Enchantments.Mending },
|
|
{ 41, Enchantments.VanishingCurse }
|
|
};
|
|
#pragma warning restore format // @formatter:on
|
|
|
|
public static Enchantments GetEnchantmentById(int protocolVersion, short id)
|
|
{
|
|
if (protocolVersion < Protocol18Handler.MC_1_14_Version)
|
|
throw new Exception("Enchantments mappings are not implemented bellow 1.14");
|
|
|
|
var map = protocolVersion switch
|
|
{
|
|
>= Protocol18Handler.MC_1_14_Version and < Protocol18Handler.MC_1_16_Version => enchantmentMappings114,
|
|
>= Protocol18Handler.MC_1_16_Version and < Protocol18Handler.MC_1_19_Version => enchantmentMappings116,
|
|
>= Protocol18Handler.MC_1_19_Version and < Protocol18Handler.MC_1_21_Version => enchantmentMappings119,
|
|
_ => enchantmentMappings
|
|
};
|
|
|
|
if (!map.TryGetValue(id, out var value))
|
|
throw new Exception($"Got an Unknown Enchantment ID {id}, please update the Mappings!");
|
|
|
|
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("enchantment.minecraft." + enchantment.ToString().ToUnderscoreCase());
|
|
return string.IsNullOrEmpty(translation) ? $"Unknown Enchantment with ID: {(short)enchantment} (Probably not named in the code yet)" : translation;
|
|
}
|
|
|
|
public static string ConvertLevelToRomanNumbers(int num)
|
|
{
|
|
var result = string.Empty;
|
|
var romanNumbers = new Dictionary<string, int>
|
|
{
|
|
{"M", 1000},
|
|
{"CM", 900},
|
|
{"D", 500},
|
|
{"CD", 400},
|
|
{"C", 100},
|
|
{"XC", 90},
|
|
{"L", 50},
|
|
{"XL", 40},
|
|
{"X", 10},
|
|
{"IX", 9},
|
|
{"V", 5},
|
|
{"IV", 4},
|
|
{"I", 1}
|
|
};
|
|
|
|
foreach (var pair in romanNumbers)
|
|
{
|
|
result += string.Join(string.Empty, Enumerable.Repeat(pair.Key, num / pair.Value));
|
|
num %= pair.Value;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
}
|
|
}
|