Merge branch '24w13a' into 24w13a-stuff

This commit is contained in:
Shnupbups 2024-03-28 23:55:35 +11:00
commit 1d3bcfd74f
7 changed files with 48 additions and 1 deletions

View File

@ -0,0 +1,3 @@
CLASS net/minecraft/class_9467 net/minecraft/enchantment/BreachEnchantment
METHOD method_58672 getFactor (FF)F
ARG 0 level

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 <init> (F)V
ARG 1 knockbackModifier

View File

@ -3,7 +3,7 @@ CLASS net/minecraft/class_1280 net/minecraft/entity/DamageUtil
ARG 0 damage
ARG 1 source
ARG 2 armor
ARG 3 armorToughness
ARG 3 armorToughnesss
METHOD method_5497 getInflictedDamage (FF)F
ARG 0 damageDealt
ARG 1 protection

View File

@ -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