From 66b56c406c39c1a7882377a42b2f24fd4d757f4b Mon Sep 17 00:00:00 2001 From: Sychic <47618543+Sychic@users.noreply.github.com> Date: Thu, 26 Sep 2024 17:58:22 -0400 Subject: [PATCH] Entity related mappings (#278) --- .../net/minecraft/block/AnvilBlock.mapping | 2 + mappings/net/minecraft/block/Block.mapping | 3 + .../block/CraftingTableBlock.mapping | 2 + .../block/entity/BlockEntity.mapping | 1 + .../entity/EnchantingTableBlockEntity.mapping | 1 + .../LockableContainerBlockEntity.mapping | 1 + .../entity/StructureBlockBlockEntity.mapping | 1 + .../enchantment/EnchantmentHelper.mapping | 3 + .../enchantment/ProtectionEnchantment.mapping | 1 + mappings/net/minecraft/entity/Entity.mapping | 68 ++++++++++++++++++- .../net/minecraft/entity/EntityType.mapping | 1 + .../net/minecraft/entity/LivingEntity.mapping | 19 ++++++ .../minecraft/entity/boss/BossEntity.mapping | 4 ++ .../minecraft/entity/data/DataTracker.mapping | 5 ++ .../entity/effect/StatusEffect.mapping | 3 + .../effect/StatusEffectInstance.mapping | 1 + .../entity/player/PlayerEntity.mapping | 1 + .../entity/player/PlayerInventory.mapping | 1 + .../inventory/CraftingInventory.mapping | 1 + .../inventory/CraftingResultInventory.mapping | 1 + .../inventory/DoubleInventory.mapping | 1 + .../inventory/SimpleInventory.mapping | 1 + mappings/net/minecraft/item/ItemStack.mapping | 1 + mappings/net/minecraft/nbt/NbtElement.mapping | 2 + mappings/net/minecraft/nbt/NbtList.mapping | 1 + .../SimpleNamedScreenHandlerFactory.mapping | 1 + .../server/command/CommandOutput.mapping | 5 ++ .../server/world/ServerWorld.mapping | 2 + mappings/net/minecraft/util/Nameable.mapping | 4 +- .../net/minecraft/village/Merchant.mapping | 1 + .../village/MerchantInventory.mapping | 1 + mappings/net/minecraft/world/World.mapping | 8 +++ 32 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 mappings/net/minecraft/entity/boss/BossEntity.mapping diff --git a/mappings/net/minecraft/block/AnvilBlock.mapping b/mappings/net/minecraft/block/AnvilBlock.mapping index 760530bdc6..e0afd5209f 100644 --- a/mappings/net/minecraft/block/AnvilBlock.mapping +++ b/mappings/net/minecraft/block/AnvilBlock.mapping @@ -19,3 +19,5 @@ CLASS net/minecraft/class_2199 net/minecraft/block/AnvilBlock ARG 4 player METHOD method_9346 getLandingState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; ARG 0 fallingState + CLASS class_2200 AnvilScreenHandlerFactory + METHOD method_5797 getDisplayName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 9c3d54e886..a057cc6b96 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -315,6 +315,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 1 state ARG 2 view ARG 3 pos + METHOD method_9548 onEntityCollision (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_0_378;Lnet/minecraft/class_1297;)V METHOD method_9551 getRenderLayer ()Lnet/minecraft/class_1921; METHOD method_9552 shouldPostProcess (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 state @@ -565,12 +566,14 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block METHOD method_9597 getMaterial ()Lnet/minecraft/class_3614; METHOD method_9597 getMaterial (Lnet/minecraft/class_2680;)Lnet/minecraft/class_3614; ARG 1 state + METHOD method_9600 shouldSuffocate ()Z METHOD method_9601 isOpaque (Lnet/minecraft/class_2680;)Z ARG 1 state METHOD method_9602 getMapColor (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3620; ARG 1 state ARG 2 view ARG 3 pos + METHOD method_9604 getRenderType ()I METHOD method_9605 getPlacementState (Lnet/minecraft/class_1750;)Lnet/minecraft/class_2680; ARG 1 ctx METHOD method_9607 shouldDrawSide (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z diff --git a/mappings/net/minecraft/block/CraftingTableBlock.mapping b/mappings/net/minecraft/block/CraftingTableBlock.mapping index d9b2061a4e..0ad656fdd4 100644 --- a/mappings/net/minecraft/block/CraftingTableBlock.mapping +++ b/mappings/net/minecraft/block/CraftingTableBlock.mapping @@ -4,3 +4,5 @@ CLASS net/minecraft/class_2304 net/minecraft/block/CraftingTableBlock ARG 2 syncId ARG 3 inventory ARG 4 player + CLASS class_2305 CraftingTableScreenFactory + METHOD method_5797 getDisplayName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index 4a09f94e53..407479a166 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -250,3 +250,4 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity COMMENT COMMENT
This must be called when something changed in a way that COMMENT affects the saved NBT; otherwise, the game might not save the block entity. + METHOD method_5797 getDisplayName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/block/entity/EnchantingTableBlockEntity.mapping b/mappings/net/minecraft/block/entity/EnchantingTableBlockEntity.mapping index 135d4d972a..32e2233063 100644 --- a/mappings/net/minecraft/block/entity/EnchantingTableBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/EnchantingTableBlockEntity.mapping @@ -22,3 +22,4 @@ CLASS net/minecraft/class_2605 net/minecraft/block/entity/EnchantingTableBlockEn ARG 1 pos ARG 2 state ARG 3 blockEntity + METHOD method_5797 getDisplayName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping b/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping index 489fdb345e..d81e2a2034 100644 --- a/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping @@ -13,3 +13,4 @@ CLASS net/minecraft/class_2624 net/minecraft/block/entity/LockableContainerBlock METHOD method_5465 createScreenHandler (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1703; ARG 1 syncId ARG 2 playerInventory + METHOD method_5797 getDisplayName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping index 17c43a845b..545245b8b9 100644 --- a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping @@ -120,4 +120,5 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt METHOD method_35293 setStructureVoid (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V ARG 0 world ARG 1 pos + METHOD method_5797 getDisplayName ()Lnet/minecraft/class_2561; CLASS class_2634 Action diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index 48924aa3c5..80a9672ef4 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -90,6 +90,7 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper METHOD method_8210 onUserDamaged (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;)V ARG 0 user ARG 1 attacker + METHOD method_8211 getRespiration (Lnet/minecraft/class_1297;)I METHOD method_8211 getRespiration (Lnet/minecraft/class_1309;)I ARG 0 entity METHOD method_8212 (Lorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/class_1282;Lnet/minecraft/class_1887;I)V @@ -120,6 +121,7 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper METHOD method_8219 getProtectionAmount (Ljava/lang/Iterable;Lnet/minecraft/class_1282;)I ARG 0 equipment ARG 1 source + METHOD method_8219 getProtectionAmount ([Lnet/minecraft/class_1799;Lnet/minecraft/class_1282;)I METHOD method_8220 forEachEnchantment (Lnet/minecraft/class_1890$class_1891;Lnet/minecraft/class_1799;)V ARG 0 consumer ARG 1 stack @@ -193,6 +195,7 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper COMMENT the possible entries ARG 1 pickedEntry COMMENT the picked entry + METHOD method_8232 getDepthStrider (Lnet/minecraft/class_1297;)I METHOD method_8232 getDepthStrider (Lnet/minecraft/class_1309;)I ARG 0 entity METHOD method_8233 enchant (Ljava/util/Random;Lnet/minecraft/class_1799;IZ)Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping b/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping index 038c119bd3..ec8a97e704 100644 --- a/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_1900 net/minecraft/enchantment/ProtectionEnchantment METHOD method_8237 transformExplosionKnockback (Lnet/minecraft/class_1309;D)D ARG 0 entity ARG 1 velocity + METHOD method_8238 transformFireDuration (Lnet/minecraft/class_1297;I)I METHOD method_8238 transformFireDuration (Lnet/minecraft/class_1309;I)I ARG 0 entity ARG 1 duration diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 9ca1f6e613..5c9a61c25d 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -82,6 +82,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT
An entity is swimming if it is touching water, not riding any entities, and is + COMMENT sprinting. Note that to start swimming, the entity must first be submerged in + COMMENT water. + COMMENT + COMMENT @see #setSwimming + METHOD method_0_7016 setSwimming (Z)V + COMMENT Sets whether the entity is swimming. + COMMENT + COMMENT @see #isSwimming + ARG 1 swimming METHOD method_17681 getWidth ()F COMMENT {@return the width of the entity's current dimension} METHOD method_17682 getHeight ()F @@ -614,6 +640,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 x ARG 3 y ARG 5 z + METHOD method_3070 tick ()V METHOD method_30948 isCollidable ()Z COMMENT {@return whether other entities cannot occupy the same space with this entity} COMMENT @@ -1055,12 +1082,18 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT COMMENT @see #getRootVehicle COMMENT @see #getVehicle + METHOD method_5478 hasCustomName ()Z METHOD method_5621 getMountedHeightOffset ()D METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V COMMENT Called when this entity's collision box intersects {@code state}. COMMENT COMMENT @see net.minecraft.block.AbstractBlock#onEntityCollision ARG 1 state + METHOD method_5623 fall (DZLnet/minecraft/class_2248;Lnet/minecraft/class_2338;)V + ARG 1 heightDifference + ARG 3 onGround + ARG 4 block + ARG 5 landedPosition METHOD method_5623 fall (DZLnet/minecraft/class_2680;Lnet/minecraft/class_2338;)V COMMENT Called when the entity falls. Flying mobs should override this to do nothing. COMMENT @@ -1078,6 +1111,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT
Swimming is also considered as sprinting. COMMENT COMMENT #setSprinting + METHOD method_5625 getSplashSound ()Ljava/lang/String; METHOD method_5625 getSplashSound ()Lnet/minecraft/class_3414; METHOD method_5626 hasPassenger (Lnet/minecraft/class_1297;)Z COMMENT {@return whether {@code passenger} is a passenger of this entity} @@ -1208,6 +1242,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT and splash water bottles in vanilla. METHOD method_5647 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 nbt + METHOD method_5647 writeNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_5648 setInvisible (Z)V COMMENT Sets whether the entity is invisible to everyone. COMMENT @@ -1299,11 +1335,14 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 2 hitPos COMMENT the interaction's position offset from the entity's position ARG 3 hand + METHOD method_5665 setCustomName (Ljava/lang/String;)V + ARG 1 name METHOD method_5665 setCustomName (Lnet/minecraft/class_2561;)V COMMENT Sets the custom name of the entity to {@code name} (or {@code null} to COMMENT remove the custom name). ARG 1 name METHOD method_5666 attemptSprintingParticles ()V + METHOD method_5667 getUuid ()Ljava/util/UUID; METHOD method_5668 getRootVehicle ()Lnet/minecraft/class_1297; COMMENT {@return the lowest entity this entity is riding} COMMENT @@ -1410,6 +1449,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT COMMENT @see #getPermissionLevel ARG 1 permissionLevel + METHOD method_5688 interact (Lnet/minecraft/class_1657;)Z + COMMENT Called when a player interacts with this entity. + ARG 1 player METHOD method_5688 interact (Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; COMMENT Called when a player interacts with this entity. ARG 1 player @@ -1541,7 +1583,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 pos ARG 2 state METHOD method_5713 checkWaterState ()V - METHOD method_5713 checkWaterState ()Z METHOD method_5714 burn (I)V ARG 1 time METHOD method_5715 isSneaking ()Z @@ -1552,6 +1593,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT COMMENT @see #setSneaking COMMENT @see #isInSneakingPose + METHOD method_5716 updateKilledAdvancementCriterion (Lnet/minecraft/class_1297;I)V METHOD method_5716 updateKilledAdvancementCriterion (Lnet/minecraft/class_1297;ILnet/minecraft/class_1282;)V ARG 1 entityKilled ARG 2 score @@ -1633,6 +1675,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT Sets the entity on fire from lava, applies lava damage, and plays the burning sound. COMMENT COMMENT @implNote Fire from lava lasts 15 seconds by default. + METHOD method_5731 moveToWorld (I)V METHOD method_5731 changeDimension (Lnet/minecraft/class_2874;)Lnet/minecraft/class_1297; ARG 1 newDimension METHOD method_5731 moveToWorld (Lnet/minecraft/class_3218;)Lnet/minecraft/class_1297; @@ -1673,6 +1716,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @see #streamSelfAndPassengers COMMENT @see #streamPassengersAndSelf METHOD method_5736 getPassengersDeep ()Ljava/util/Collection; + METHOD method_5737 getSwimSound ()Ljava/lang/String; METHOD method_5737 getSwimSound ()Lnet/minecraft/class_3414; METHOD method_5738 removeScoreboardTag (Ljava/lang/String;)Z COMMENT Removes a command tag from this entity. @@ -1878,6 +1922,11 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 4 blockState ARG 5 fluidState ARG 6 max + METHOD method_5774 (Lnet/minecraft/class_1927;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_0_378;)F + ARG 1 explosion + ARG 2 world + ARG 3 pos + ARG 4 blockState METHOD method_5775 dropStack (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1542; COMMENT Drops {@code stack} at the entity's position. COMMENT @@ -1895,6 +1944,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT {@link #addAirTravelEffects}. METHOD method_5777 isSubmergedIn (Lnet/minecraft/class_3494;)Z ARG 1 fluidTag + METHOD method_5777 isSubmergedIn (Lnet/minecraft/class_3614;)Z METHOD method_5777 isSubmergedIn (Lnet/minecraft/class_6862;)Z COMMENT {@return whether the entity is submerged in a fluid in {@code fluidTag}} ARG 1 fluidTag @@ -1927,12 +1977,20 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @see #startRiding(Entity, boolean) COMMENT @see #stopRiding COMMENT @see #hasVehicle + METHOD method_5783 playSound (Ljava/lang/String;FF)V + ARG 1 sound + ARG 2 volume + ARG 3 pitch METHOD method_5783 playSound (Lnet/minecraft/class_3414;FF)V COMMENT Plays {@code sound} at this entity's position with the entity's {@linkplain COMMENT #getSoundCategory sound category} if the entity is {@linkplain #isSilent not silent}. ARG 1 sound ARG 2 volume ARG 3 pitch + METHOD method_5784 move (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z METHOD method_5784 move (Lnet/minecraft/class_1313;Lnet/minecraft/class_243;)V ARG 1 movementType ARG 2 movement @@ -2170,6 +2228,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5827 getCollisionBox ()Lnet/minecraft/class_238; METHOD method_5828 getRotationVec (F)Lnet/minecraft/class_243; ARG 1 tickDelta + METHOD method_5829 getBoundingBox ()Lnet/minecraft/class_238; METHOD method_5830 getVisibilityBoundingBox ()Lnet/minecraft/class_238; METHOD method_5832 applyRotation (Lnet/minecraft/class_2470;)F COMMENT Applies {@code rotation} to the entity's yaw. @@ -2270,6 +2329,12 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 3 pos ARG 4 state ARG 5 explosionPower + METHOD method_5853 canExplosionDestroyBlock (Lnet/minecraft/class_1927;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_0_378;F)Z + ARG 1 explosion + ARG 2 world + ARG 3 pos + ARG 4 blockState + ARG 5 explosionPower METHOD method_5854 getVehicle ()Lnet/minecraft/class_1297; COMMENT {@return the entity this entity rides, or {@code null} if there is none} COMMENT @@ -2357,6 +2422,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 2 output METHOD method_5869 isSubmergedInWater ()Z COMMENT {@return whether this entity's hitbox is fully submerged in water} + METHOD method_5870 dropItem (Lnet/minecraft/class_1792;IF)Lnet/minecraft/class_1542; METHOD method_5870 dropItem (Lnet/minecraft/class_1935;I)Lnet/minecraft/class_1542; COMMENT Drops one {@code item} at the entity's position with the given Y offset. COMMENT diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index bf3574db73..7ebd92a45c 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -155,6 +155,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType METHOD method_5889 createInstanceFromId (ILnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 0 type ARG 1 world + METHOD method_5890 getId (Lnet/minecraft/class_1297;)Ljava/lang/String; METHOD method_5890 getId (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2960; ARG 0 type METHOD method_5891 getSpawnGroup ()Lnet/minecraft/class_1311; diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 17ad71fdb0..bb6ae9dd90 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -98,6 +98,11 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_6284 serverYaw D FIELD field_6285 effectsChanged Z FIELD field_6287 movementSpeed F + METHOD method_0_7093 swimUpwardWater ()V + METHOD method_0_7094 swimUpwardLava ()V + METHOD method_0_7145 hasStatusEffect (I)Z + ARG 1 id + METHOD method_0_7155 getEquippedStack (I)Lnet/minecraft/class_1799; METHOD method_16077 dropLoot (Lnet/minecraft/class_1282;Z)V ARG 1 source ARG 2 causedByPlayer @@ -391,6 +396,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 hand METHOD method_5999 isUndead ()Z METHOD method_6000 enterCombat ()V + METHOD method_6002 getDeathSound ()Ljava/lang/String; METHOD method_6002 getDeathSound ()Lnet/minecraft/class_3414; METHOD method_6003 getRoll ()I METHOD method_6005 takeKnockback (DDD)V @@ -419,14 +425,17 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 fluid METHOD method_6010 swimUpward (Lnet/minecraft/class_6862;)V ARG 1 fluid + METHOD method_6011 getHurtSound ()Ljava/lang/String; METHOD method_6011 getHurtSound (Lnet/minecraft/class_1282;)Lnet/minecraft/class_3414; ARG 1 source + METHOD method_6012 clearStatusEffects ()V METHOD method_6012 clearStatusEffects ()Z METHOD method_6013 playHurtSound (Lnet/minecraft/class_1282;)V ARG 1 source METHOD method_6014 getItemUseTimeLeft ()I METHOD method_6015 setAttacker (Lnet/minecraft/class_1309;)V ARG 1 attacker + METHOD method_6016 removeStatusEffect (I)V METHOD method_6016 removeStatusEffect (Lnet/minecraft/class_1291;)Z COMMENT Removes a status effect from this entity. COMMENT @@ -469,6 +478,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6032 getHealth ()F METHOD method_6033 setHealth (F)V ARG 1 health + METHOD method_6034 canMoveVoluntarily ()Z METHOD method_6035 tickRiptide (Lnet/minecraft/class_238;Lnet/minecraft/class_238;)V ARG 1 a ARG 2 b @@ -490,6 +500,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 vehicle METHOD method_6039 isBlocking ()Z METHOD method_6040 consumeItem ()V + METHOD method_6041 getFallSound (I)Ljava/lang/String; + ARG 1 distance METHOD method_6041 getFallSound (I)Lnet/minecraft/class_3414; ARG 1 distance METHOD method_6043 jump ()V @@ -588,6 +600,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT flying entities}. ARG 1 movementInput COMMENT represents the sidewaysSpeed, upwardSpeed, and forwardSpeed of the entity in that order + METHOD method_6092 addStatusEffect (Lnet/minecraft/class_1293;)V METHOD method_6092 addStatusEffect (Lnet/minecraft/class_1293;)Z COMMENT Adds a status effect to this entity without specifying a source entity. COMMENT @@ -619,6 +632,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6103 sendPickup (Lnet/minecraft/class_1297;I)V ARG 1 item ARG 2 count + METHOD method_6104 swingHand ()V METHOD method_6104 swingHand (Lnet/minecraft/class_1268;)V ARG 1 hand METHOD method_6105 damageArmor (F)V @@ -649,6 +663,11 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT @see #shouldDropXp() ARG 1 player COMMENT the attacking player + METHOD method_6111 removeStatusEffectInternal (I)V + COMMENT Removes a status effect from this entity without calling any listener. + COMMENT + COMMENT
This method does not perform any cleanup or synchronization operation.
+ COMMENT Under most circumstances, calling {@link #removeStatusEffect(int)} is highly preferable.
METHOD method_6111 removeStatusEffectInternal (Lnet/minecraft/class_1291;)Lnet/minecraft/class_1293;
COMMENT Removes a status effect from this entity without calling any listener.
COMMENT
diff --git a/mappings/net/minecraft/entity/boss/BossEntity.mapping b/mappings/net/minecraft/entity/boss/BossEntity.mapping
new file mode 100644
index 0000000000..9bc9eb35ed
--- /dev/null
+++ b/mappings/net/minecraft/entity/boss/BossEntity.mapping
@@ -0,0 +1,4 @@
+CLASS net/minecraft/class_0_1876 net/minecraft/entity/boss/BossEntity
+ METHOD method_5797 getDisplayName ()Lnet/minecraft/class_2561;
+ METHOD method_6032 getHealth ()F
+ METHOD method_6063 getMaxHealth ()F
diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping
index ab66909f2d..ff41ed3c61 100644
--- a/mappings/net/minecraft/entity/data/DataTracker.mapping
+++ b/mappings/net/minecraft/entity/data/DataTracker.mapping
@@ -13,6 +13,11 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker
FIELD field_33378 MAX_DATA_VALUE_ID I
METHOD By default, this returns the result of {@link #getName}. The return value can
COMMENT have styling applied.
+ METHOD method_5477 getName ()Ljava/lang/String;
METHOD method_5477 getName ()Lnet/minecraft/class_2561;
COMMENT {@return the name of this object}
COMMENT
COMMENT This should return {@linkplain #getCustomName the custom name} if it exists,
COMMENT otherwise the default name. This should not have styling applied.
- METHOD method_5797 method_5797 ()Lnet/minecraft/class_2561;
+ METHOD method_5478 hasCustomName ()Z
+ METHOD method_5797 getDisplayName ()Lnet/minecraft/class_2561;
COMMENT {@return the custom name of this object, or {@code null} if there is none}
diff --git a/mappings/net/minecraft/village/Merchant.mapping b/mappings/net/minecraft/village/Merchant.mapping
index 4a97aa83ae..f5efc34358 100644
--- a/mappings/net/minecraft/village/Merchant.mapping
+++ b/mappings/net/minecraft/village/Merchant.mapping
@@ -14,6 +14,7 @@ CLASS net/minecraft/class_1915 net/minecraft/village/Merchant
ARG 1 experience
METHOD method_20708 canRefreshTrades ()Z
METHOD method_38069 isClient ()Z
+ METHOD method_5797 getDisplayName ()Lnet/minecraft/class_2561;
METHOD method_8257 getCustomer ()Lnet/minecraft/class_1657;
METHOD method_8258 onSellingItem (Lnet/minecraft/class_1799;)V
ARG 1 stack
diff --git a/mappings/net/minecraft/village/MerchantInventory.mapping b/mappings/net/minecraft/village/MerchantInventory.mapping
index 95cac2e784..b88aab0817 100644
--- a/mappings/net/minecraft/village/MerchantInventory.mapping
+++ b/mappings/net/minecraft/village/MerchantInventory.mapping
@@ -7,6 +7,7 @@ CLASS net/minecraft/class_1725 net/minecraft/village/MerchantInventory
METHOD