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

Fixed Enchantment mappings for 1.19.

Browse source 
Added Swift Sneak.
This commit is contained in:
Milutinke 2022-10-14 16:29:08 +02:00
parent c47add39a4
commit 6365e12735
4 changed files with 53 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

53
MinecraftClient/Inventory/EnchantmentMapping.cs
View file

@ -49,7 +49,8 @@ namespace MinecraftClient.Inventory
{ 33, Enchantment.VanishingCurse } { 33, Enchantment.VanishingCurse }
}; };
private static Dictionary<short, Enchantment> enchantmentMappings116Plus = new Dictionary<short, Enchantment>() // 1.16 - 1.18
private static Dictionary<short, Enchantment> enchantmentMappings116 = new Dictionary<short, Enchantment>()
{ {
//id type //id type
{ 0, Enchantment.Protection }, { 0, Enchantment.Protection },
@ -92,6 +93,51 @@ namespace MinecraftClient.Inventory
{ 37, Enchantment.VanishingCurse } { 37, Enchantment.VanishingCurse }
}; };
// 1.19+
private static Dictionary<short, Enchantment> enchantmentMappings = new Dictionary<short, Enchantment>()
{
//id type
{ 0, Enchantment.Protection },
{ 1, Enchantment.FireProtection },
{ 2, Enchantment.FeatherFalling },
{ 3, Enchantment.BlastProtection },
{ 4, Enchantment.ProjectileProtection },
{ 5, Enchantment.Respiration },
{ 6, Enchantment.AquaAffinity },
{ 7, Enchantment.Thorns },
{ 8, Enchantment.DepthStrieder },
{ 9, Enchantment.FrostWalker },
{ 10, Enchantment.BindingCurse },
{ 11, Enchantment.SoulSpeed },
{ 12, Enchantment.SwiftSneak },
{ 13, Enchantment.Sharpness },
{ 14, Enchantment.Smite },
{ 15, Enchantment.BaneOfArthropods },
{ 16, Enchantment.Knockback },
{ 17, Enchantment.FireAspect },
{ 18, Enchantment.Looting },
{ 19, Enchantment.Sweeping },
{ 20, Enchantment.Efficency },
{ 21, Enchantment.SilkTouch },
{ 22, Enchantment.Unbreaking },
{ 23, Enchantment.Fortune },
{ 24, Enchantment.Power },
{ 25, Enchantment.Punch },
{ 26, Enchantment.Flame },
{ 27, Enchantment.Infinity },
{ 28, Enchantment.LuckOfTheSea },
{ 29, Enchantment.Lure },
{ 30, Enchantment.Loyality },
{ 31, Enchantment.Impaling },
{ 32, Enchantment.Riptide },
{ 33, Enchantment.Channeling },
{ 34, Enchantment.Multishot },
{ 35, Enchantment.QuickCharge },
{ 36, Enchantment.Piercing },
{ 37, Enchantment.Mending },
{ 38, Enchantment.VanishingCurse }
};
private static Dictionary<Enchantment, string> enchantmentNames = new Dictionary<Enchantment, string>() private static Dictionary<Enchantment, string> enchantmentNames = new Dictionary<Enchantment, string>()
{ {
//type //type
@ -107,6 +153,7 @@ namespace MinecraftClient.Inventory
{ Enchantment.FrostWalker, "Enchantment.FrostWalker" }, { Enchantment.FrostWalker, "Enchantment.FrostWalker" },
{ Enchantment.BindingCurse, "Enchantment.BindingCurse" }, { Enchantment.BindingCurse, "Enchantment.BindingCurse" },
{ Enchantment.SoulSpeed, "Enchantment.SoulSpeed" }, { Enchantment.SoulSpeed, "Enchantment.SoulSpeed" },
{ Enchantment.SwiftSneak, "Enchantment.SwiftSneak" },
{ Enchantment.Sharpness, "Enchantment.Sharpness" }, { Enchantment.Sharpness, "Enchantment.Sharpness" },
{ Enchantment.Smite, "Enchantment.Smite" }, { Enchantment.Smite, "Enchantment.Smite" },
{ Enchantment.BaneOfArthropods, "Enchantment.BaneOfArthropods" }, { Enchantment.BaneOfArthropods, "Enchantment.BaneOfArthropods" },
@ -141,10 +188,12 @@ namespace MinecraftClient.Inventory
if (protocolVersion < Protocol18Handler.MC_1_14_Version) if (protocolVersion < Protocol18Handler.MC_1_14_Version)
throw new Exception("Enchantments mappings are not implemented bellow 1.14"); throw new Exception("Enchantments mappings are not implemented bellow 1.14");
Dictionary<short, Enchantment> map = enchantmentMappings116Plus; Dictionary<short, Enchantment> map = enchantmentMappings;
if (protocolVersion >= Protocol18Handler.MC_1_14_Version && protocolVersion < Protocol18Handler.MC_1_16_Version) if (protocolVersion >= Protocol18Handler.MC_1_14_Version && protocolVersion < Protocol18Handler.MC_1_16_Version)
map = enchantmentMappings114; map = enchantmentMappings114;
else if (protocolVersion >= Protocol18Handler.MC_1_16_Version && protocolVersion < Protocol18Handler.MC_1_19_Version)
map = enchantmentMappings116;
if (!map.ContainsKey(id)) if (!map.ContainsKey(id))
throw new Exception("Got an Unknown Enchantment ID '" + id + "', please update the Mappings!"); throw new Exception("Got an Unknown Enchantment ID '" + id + "', please update the Mappings!");

1
MinecraftClient/Inventory/Enchantments.cs
View file

@ -15,6 +15,7 @@
FrostWalker, FrostWalker,
BindingCurse, BindingCurse,
SoulSpeed, SoulSpeed,
SwiftSneak,
Sharpness, Sharpness,
Smite, Smite,
BaneOfArthropods, BaneOfArthropods,

2
MinecraftClient/McClient.cs
View file

@ -2671,8 +2671,6 @@ namespace MinecraftClient
inventory.Properties.Add(propertyId, propertyValue); inventory.Properties.Add(propertyId, propertyValue);
Log.Info("Got a property " + propertyId + " with value: " + propertyValue);
DispatchBotEvent(bot => bot.OnInventoryProperties(inventoryID, propertyId, propertyValue)); DispatchBotEvent(bot => bot.OnInventoryProperties(inventoryID, propertyId, propertyValue));
if (inventory.Type == ContainerType.Enchantment) if (inventory.Type == ContainerType.Enchantment)

1
MinecraftClient/Resources/lang/en.ini
View file

@ -171,6 +171,7 @@ Enchantment.DepthStrieder=Depth Strieder
Enchantment.FrostWalker=Frost Walker Enchantment.FrostWalker=Frost Walker
Enchantment.BindingCurse=Curse of Binding Enchantment.BindingCurse=Curse of Binding
Enchantment.SoulSpeed=Soul Speed Enchantment.SoulSpeed=Soul Speed
Enchantment.SwiftSneak=Swift Sneak
Enchantment.Sharpness=Sharpness Enchantment.Sharpness=Sharpness
Enchantment.Smite=Smite Enchantment.Smite=Smite
Enchantment.BaneOfArthropods=Bane of Arthropods Enchantment.BaneOfArthropods=Bane of Arthropods