From 007d1f97a7faf201f13f06a82d9b7526ffe49d04 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 21 May 2021 23:28:57 +0900 Subject: [PATCH] 21w20a entity (#2413) * 21w20a entity * Apply suggestions from code review Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- mappings/net/minecraft/entity/Entity.mapping | 6 ++++++ mappings/net/minecraft/entity/ItemEntity.mapping | 9 +++++++++ mappings/net/minecraft/entity/LightningEntity.mapping | 1 + mappings/net/minecraft/entity/LivingEntity.mapping | 3 +++ .../net/minecraft/entity/passive/LlamaEntity.mapping | 2 ++ .../minecraft/entity/passive/PufferfishEntity.mapping | 3 +++ .../net/minecraft/entity/player/PlayerEntity.mapping | 1 + .../net/minecraft/entity/player/PlayerInventory.mapping | 5 +++++ .../entity/projectile/AbstractFireballEntity.mapping | 2 ++ 9 files changed, 32 insertions(+) diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 7d169595f5..14b509d640 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -392,6 +392,11 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 yaw METHOD method_36457 setPitch (F)V ARG 1 pitch + METHOD method_36971 canModifyAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos + METHOD method_36974 tryCheckBlockCollision ()V + METHOD method_36975 playExtinguishSound ()V METHOD method_5621 getMountedHeightOffset ()D METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V ARG 1 state @@ -537,6 +542,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 anchorPoint ARG 2 target METHOD method_5703 hasPassengerType (Ljava/util/function/Predicate;)Z + ARG 1 predicate METHOD method_5705 getYaw (F)F ARG 1 tickDelta METHOD method_5706 dropItem (Lnet/minecraft/class_1935;)Lnet/minecraft/class_1542; diff --git a/mappings/net/minecraft/entity/ItemEntity.mapping b/mappings/net/minecraft/entity/ItemEntity.mapping index 0dd37947b9..4267f2a126 100644 --- a/mappings/net/minecraft/entity/ItemEntity.mapping +++ b/mappings/net/minecraft/entity/ItemEntity.mapping @@ -19,6 +19,15 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity ARG 4 y ARG 6 z ARG 8 stack + METHOD (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1799;DDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 stack + ARG 9 velocityX + ARG 11 velocityY + ARG 13 velocityZ METHOD method_18006 merge (Lnet/minecraft/class_1542;Lnet/minecraft/class_1799;Lnet/minecraft/class_1542;Lnet/minecraft/class_1799;)V ARG 0 targetEntity ARG 1 targetStack diff --git a/mappings/net/minecraft/entity/LightningEntity.mapping b/mappings/net/minecraft/entity/LightningEntity.mapping index 5de8d76dd1..02a2536218 100644 --- a/mappings/net/minecraft/entity/LightningEntity.mapping +++ b/mappings/net/minecraft/entity/LightningEntity.mapping @@ -21,6 +21,7 @@ CLASS net/minecraft/class_1538 net/minecraft/entity/LightningEntity ARG 0 world ARG 1 pos METHOD method_35052 getChanneler ()Lnet/minecraft/class_3222; + METHOD method_36607 getAffectedBlockPos ()Lnet/minecraft/class_2338; METHOD method_6960 spawnFire (I)V ARG 1 spreadAttempts METHOD method_6961 setChanneler (Lnet/minecraft/class_3222;)V diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index f648e40a36..db7a27c670 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -266,6 +266,9 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 noDrag METHOD method_36362 updateGlowing ()V METHOD method_36608 isPartOfGame ()Z + METHOD method_36977 damageHelmet (Lnet/minecraft/class_1282;F)V + ARG 1 source + ARG 2 amount METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index e15dc833fa..4a0f0d6ea6 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -38,6 +38,8 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity ARG 0 wolf CLASS class_1503 LlamaData FIELD field_7001 variant I + METHOD (I)V + ARG 1 variant CLASS class_1504 SpitRevengeGoal METHOD (Lnet/minecraft/class_1501;)V ARG 1 llama diff --git a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping index 62e29f5363..01750187d6 100644 --- a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping @@ -2,10 +2,13 @@ CLASS net/minecraft/class_1454 net/minecraft/entity/passive/PufferfishEntity FIELD field_30353 NOT_PUFFED I FIELD field_30354 SEMI_PUFFED I FIELD field_30355 FULLY_PUFFED I + FIELD field_33692 BLOW_UP_TARGET_PREDICATE Lnet/minecraft/class_4051; FIELD field_6832 deflateTicks I FIELD field_6833 inflateTicks I FIELD field_6834 BLOW_UP_FILTER Ljava/util/function/Predicate; FIELD field_6835 PUFF_STATE Lnet/minecraft/class_2940; + METHOD method_36550 (Lnet/minecraft/class_1308;)Z + ARG 1 entity METHOD method_6591 (Lnet/minecraft/class_1309;)Z ARG 0 entity METHOD method_6592 getScaleForPuffState (I)F diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 899591c5fc..87b6358d1c 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_18134 POSE_DIMENSIONS Ljava/util/Map; FIELD field_18135 STANDING_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_19428 shoulderEntityAddedTime J + FIELD field_30642 OFFLINE_PLAYER_UUID_PREFIX Ljava/lang/String; FIELD field_7483 strideDistance F FIELD field_7484 itemCooldownManager Lnet/minecraft/class_1796; FIELD field_7486 enderChestInventory Lnet/minecraft/class_1730; diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index 2c848730de..d7ec7979f6 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -15,6 +15,8 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory COMMENT The number of columns ({@value}) in the inventory. COMMENT COMMENT

The same value dictates the size of the player's hotbar, excluding the offhand slot.

+ FIELD field_33767 ARMOR_SLOTS [I + FIELD field_33768 HELMET_SLOTS [I FIELD field_7542 changeCount I FIELD field_7543 combinedInventory Ljava/util/List; FIELD field_7544 offHand Lnet/minecraft/class_2371; @@ -24,6 +26,8 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory FIELD field_7548 armor Lnet/minecraft/class_2371; METHOD (Lnet/minecraft/class_1657;)V ARG 1 player + METHOD method_20265 (ILnet/minecraft/class_1657;)V + ARG 1 player METHOD method_29280 remove (Ljava/util/function/Predicate;ILnet/minecraft/class_1263;)I ARG 1 shouldRemove ARG 2 maxCount @@ -57,6 +61,7 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory METHOD method_7375 damageArmor (Lnet/minecraft/class_1282;F[I)V ARG 1 damageSource ARG 2 amount + ARG 3 slots METHOD method_7376 getEmptySlot ()I METHOD method_7377 clone (Lnet/minecraft/class_1661;)V ARG 1 other diff --git a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping index 3ff3173a9a..6305ccee8f 100644 --- a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping @@ -2,4 +2,6 @@ CLASS net/minecraft/class_3855 net/minecraft/entity/projectile/AbstractFireballE FIELD field_17081 ITEM Lnet/minecraft/class_2940; METHOD method_16936 setItem (Lnet/minecraft/class_1799;)V ARG 1 stack + METHOD method_16937 (Lnet/minecraft/class_1799;)V + ARG 0 stack METHOD method_16938 getItem ()Lnet/minecraft/class_1799;