From 3804cad078d7dbd22babb618979f85789c9dcf19 Mon Sep 17 00:00:00 2001 From: Matias Koivikko Date: Thu, 28 Mar 2024 14:54:57 +0200 Subject: [PATCH] Map enchanments and mace methods (#3825) * Map 24w13a enchantments * Map new mace methods * Update mappings/net/minecraft/item/MaceItem.mapping Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com> --------- Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com> Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com> --- .../enchantment/BreachEnchantment.mapping | 3 +++ .../enchantment/DensityEnchantment.mapping | 4 ++++ .../net/minecraft/enchantment/Enchantment.mapping | 13 +++++++++++++ .../enchantment/EnchantmentHelper.mapping | 6 ++++++ .../enchantment/WindBurstEnchantment.mapping | 6 ++++++ mappings/net/minecraft/entity/DamageUtil.mapping | 1 + mappings/net/minecraft/item/MaceItem.mapping | 15 +++++++++++++++ 7 files changed, 48 insertions(+) create mode 100644 mappings/net/minecraft/enchantment/BreachEnchantment.mapping create mode 100644 mappings/net/minecraft/enchantment/DensityEnchantment.mapping create mode 100644 mappings/net/minecraft/enchantment/WindBurstEnchantment.mapping diff --git a/mappings/net/minecraft/enchantment/BreachEnchantment.mapping b/mappings/net/minecraft/enchantment/BreachEnchantment.mapping new file mode 100644 index 0000000000..b860926db0 --- /dev/null +++ b/mappings/net/minecraft/enchantment/BreachEnchantment.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9467 net/minecraft/enchantment/BreachEnchantment + METHOD method_58672 getFactor (FF)F + ARG 0 level diff --git a/mappings/net/minecraft/enchantment/DensityEnchantment.mapping b/mappings/net/minecraft/enchantment/DensityEnchantment.mapping new file mode 100644 index 0000000000..2794ee46c5 --- /dev/null +++ b/mappings/net/minecraft/enchantment/DensityEnchantment.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_9468 net/minecraft/enchantment/DensityEnchantment + METHOD method_58673 getDamage (IF)F + ARG 0 level + ARG 1 fallDistance diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index f09b46dc47..af25a4ed6c 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -40,6 +40,19 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment ARG 1 stack METHOD method_58445 getWeight ()I METHOD method_58446 getAnvilCost ()I + METHOD method_58674 properties (Lnet/minecraft/class_6862;IILnet/minecraft/class_1887$class_9426;Lnet/minecraft/class_1887$class_9426;ILnet/minecraft/class_7699;[Lnet/minecraft/class_1304;)Lnet/minecraft/class_1887$class_9427; + ARG 0 supportedItems + ARG 1 weight + ARG 2 maxLevel + ARG 3 minCost + ARG 4 maxCost + ARG 5 anvilCost + ARG 6 features + ARG 7 slots + METHOD method_58675 onAttack (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;I)V + ARG 1 attacket + ARG 2 target + ARG 3 level METHOD method_8178 onUserDamaged (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;I)V ARG 1 user ARG 2 attacker diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index 7590e81995..7c18c5a31e 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -36,6 +36,12 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper ARG 0 stack METHOD method_58448 getSweepingMultiplier (I)F ARG 0 level + METHOD method_58676 getBreachFactor (Lnet/minecraft/class_1297;F)F + ARG 0 entity + METHOD method_58677 onAttack (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;Lnet/minecraft/class_9304;)V + ARG 0 attacker + ARG 1 target + ARG 2 enchantments METHOD method_8198 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;Lnet/minecraft/class_1887;I)V ARG 2 enchantment ARG 3 level diff --git a/mappings/net/minecraft/enchantment/WindBurstEnchantment.mapping b/mappings/net/minecraft/enchantment/WindBurstEnchantment.mapping new file mode 100644 index 0000000000..c863464344 --- /dev/null +++ b/mappings/net/minecraft/enchantment/WindBurstEnchantment.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_9469 net/minecraft/enchantment/WindBurstEnchantment + FIELD field_50160 EXPLOSION_BEHAVIOURS [Lnet/minecraft/class_9469$class_9470; + CLASS class_9470 ExplosionBehaviour + FIELD field_50161 knockbackModifier F + METHOD (F)V + ARG 1 knockbackModifier diff --git a/mappings/net/minecraft/entity/DamageUtil.mapping b/mappings/net/minecraft/entity/DamageUtil.mapping index 24969f3d39..1a21d76ac6 100644 --- a/mappings/net/minecraft/entity/DamageUtil.mapping +++ b/mappings/net/minecraft/entity/DamageUtil.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1280 net/minecraft/entity/DamageUtil METHOD method_5496 getDamageLeft (FLnet/minecraft/class_1282;FF)F ARG 0 damage + ARG 1 source METHOD method_5497 getInflictedDamage (FF)F ARG 0 damageDealt ARG 1 protection diff --git a/mappings/net/minecraft/item/MaceItem.mapping b/mappings/net/minecraft/item/MaceItem.mapping index 07099d2d03..db2f6523d1 100644 --- a/mappings/net/minecraft/item/MaceItem.mapping +++ b/mappings/net/minecraft/item/MaceItem.mapping @@ -5,7 +5,22 @@ CLASS net/minecraft/class_9362 net/minecraft/item/MaceItem FIELD field_49826 ATTRIBUTE_MODIFIERS Lcom/google/common/collect/ImmutableMultimap; FIELD field_49999 KNOCKBACK_RANGE F FIELD field_50000 KNOCKBACK_POWER F + FIELD field_50142 FALL_DISTANCE_MULTIPLIER F METHOD method_58409 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1657;Lnet/minecraft/class_1309;)V ARG 2 entity METHOD method_58411 knockbackNearbyEntities (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;)V + ARG 0 world + ARG 1 player + ARG 2 attacked METHOD method_58412 createToolComponent ()Lnet/minecraft/class_9424; + METHOD method_58659 shouldDealAdditionalDamage (Lnet/minecraft/class_1657;)Z + ARG 0 attacker + METHOD method_58660 getKnockbackPredicate (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;)Ljava/util/function/Predicate; + ARG 0 player + ARG 1 attacked + METHOD method_58661 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;)Z + ARG 2 entity + METHOD method_58662 getKnockback (Lnet/minecraft/class_1657;Lnet/minecraft/class_1309;Lnet/minecraft/class_243;)D + ARG 0 player + ARG 1 attacked + ARG 2 distance