diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index b7f4875aa9..41e103c1a6 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -23,10 +23,13 @@ CLASS ahl net/minecraft/entity/Entity FIELD aC NAME_VISIBLE Lpx; FIELD aD SILENT Lpx; FIELD aE NO_GRAVITY Lpx; + FIELD aF STATUS Lpx; FIELD aG invulnerable Z FIELD aH scoreboardTags Ljava/util/Set; FIELD aJ pistonMovementDelta [D FIELD aK pistonMovementTick J + FIELD aL size Lahm; + FIELD aM standingEyeHeight F FIELD aa ENTITY_FLAGS Lpx; FIELD ac chunkX I FIELD ad chunkY I @@ -79,6 +82,7 @@ CLASS ahl net/minecraft/entity/Entity METHOD V kill ()V METHOD W getDataTracker ()Lqa; METHOD Y invalidate ()V + METHOD Z getStatus ()Laie; METHOD a shouldRenderAtDistance (D)Z ARG 1 distance METHOD a setPositionAnglesAndUpdate (DDDFF)V @@ -116,6 +120,8 @@ CLASS ahl net/minecraft/entity/Entity ARG 2 x ARG 4 y ARG 6 z + METHOD a getSizeForStatus (Laie;)Lahm; + METHOD a getEyeHeight (Laie;Lahm;)F METHOD a onStruckByLightning (Lapo;)V METHOD a interactAt (Lary;Lcnk;Lagg;)Lagh; ARG 1 player @@ -223,6 +229,7 @@ CLASS ahl net/minecraft/entity/Entity METHOD b setEntityFlag (IZ)V ARG 1 index METHOD b isInvulnerableTo (Lagv;)Z + METHOD b setStatus (Laie;)V METHOD b onPlayerCollision (Lary;)V METHOD b interact (Lary;Lagg;)Z ARG 1 player @@ -238,7 +245,7 @@ CLASS ahl net/minecraft/entity/Entity METHOD bE getMovementDirection ()Lex; METHOD bF getComponentHoverEvent ()Ljl; METHOD bG getBoundingBox ()Lcnf; - METHOD bI getEyeHeight ()F + METHOD bI getStandingEyeHeight ()F METHOD bJ getPos ()Les; METHOD bK getPosVector ()Lcnk; METHOD bL getEntityWorld ()Lbde; @@ -278,6 +285,7 @@ CLASS ahl net/minecraft/entity/Entity ARG 5 z METHOD c getVectorFromRotation (FF)Lcnk; ARG 1 pitch + METHOD c getEyeHeight (Laie;)F METHOD c canSeePlayer (Lary;)Z METHOD c squaredDistanceTo (Les;)D METHOD c saveSelfToTag (Lhx;)Z diff --git a/mappings/net/minecraft/entity/EntitySize.mapping b/mappings/net/minecraft/entity/EntitySize.mapping new file mode 100644 index 0000000000..43fffc58ca --- /dev/null +++ b/mappings/net/minecraft/entity/EntitySize.mapping @@ -0,0 +1,12 @@ +CLASS ahm net/minecraft/entity/EntitySize + FIELD a width F + FIELD b height F + FIELD c constant Z + METHOD a grow (F)Lahm; + ARG 1 ratio + METHOD a resizeable (FF)Lahm; + ARG 0 x + ARG 1 z + METHOD b constant (FF)Lahm; + ARG 0 x + ARG 1 z diff --git a/mappings/net/minecraft/entity/EntityStatus.mapping b/mappings/net/minecraft/entity/EntityStatus.mapping new file mode 100644 index 0000000000..d2e9a7a785 --- /dev/null +++ b/mappings/net/minecraft/entity/EntityStatus.mapping @@ -0,0 +1 @@ +CLASS aie net/minecraft/entity/EntityStatus diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 3d0e2efd08..9d05893d2b 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -96,6 +96,7 @@ CLASS ahp net/minecraft/entity/EntityType FIELD be textComponent Lji; FIELD bf lootTableId Lqi; FIELD bg dataFixerType Lcom/mojang/datafixers/types/Type; + FIELD bh size Lahm; FIELD c ARROW Lahp; FIELD d BAT Lahp; FIELD e BLAZE Lahp; @@ -155,3 +156,4 @@ CLASS ahp net/minecraft/entity/EntityType METHOD f getLootTableId ()Lqi; METHOD g getWidth ()F METHOD h getHeight ()F + METHOD i getDefaultSize ()Lahm; diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index c4f8c760cd..4376e832f7 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -7,6 +7,7 @@ CLASS ahu net/minecraft/entity/LivingEntity FIELD aW dead Z FIELD aX despawnCounter I FIELD au LIVING_FLAGS Lpx; + FIELD av SLEEPING_SIZE Lahm; FIELD ax preferredHand Lagg; FIELD az stuckArrowTimer I FIELD bA activePotionEffects Ljava/util/Map; @@ -24,6 +25,7 @@ CLASS ahu net/minecraft/entity/LivingEntity FIELD bi movementInputForward F FIELD bs activeItemStack Laxw; FIELD bw STUCK_ARROWS Lpx; + FIELD bx SLEEPING_POSITION Lpx; FIELD by attributeContainer Lain; FIELD bz damageTracker Lagu; FIELD c ATTR_SPRINTING_SPEED_BOOST_ID Ljava/util/UUID; @@ -57,6 +59,7 @@ CLASS ahu net/minecraft/entity/LivingEntity METHOD b getStackInHand (Lagg;)Laxw; METHOD b getPotionEffect (Lahe;)Lahf; METHOD b getEquippedStack (Lahq;)Laxw; + METHOD b getActiveEyeHeight (Laie;Lahm;)F METHOD b onEquipStack (Laxw;)V METHOD c setHealth (F)V METHOD c setCurrentHand (Lagg;)V @@ -103,14 +106,20 @@ CLASS ahu net/minecraft/entity/LivingEntity METHOD d removeStatusEffect (Lahe;)Z METHOD d isPotionEffective (Lahf;)Z METHOD d getCurrentExperience (Lary;)I + METHOD d canPickUp (Laxw;)Z METHOD da getMainHand ()Laht; METHOD db isUsingItem ()Z METHOD dc getActiveHand ()Lagg; METHOD de getActiveItem ()Laxw; METHOD dk isFallFlying ()Z + METHOD do getSleepingPosition ()Ljava/util/Optional; + METHOD dp clearSleepingPosition ()V METHOD dq isSleeping ()Z + METHOD dr wakeUp ()V METHOD e getHurtSound (Lagv;)Lxy; METHOD f attackLivingEntity (Lahu;)V + METHOD f setSleepingPosition (Les;)V + METHOD g sleep (Les;)V METHOD k updateMovement ()V METHOD m damageShield (F)V METHOD m setDespawnCounter (I)V @@ -119,6 +128,7 @@ CLASS ahu net/minecraft/entity/LivingEntity ARG 1 movementSpeed METHOD n getFallSound (I)Lxy; METHOD o setStuckArrows (I)V + METHOD p isSleepingInBed ()Z METHOD p setAbsorptionAmount (F)V METHOD v_ isChild ()Z METHOD w_ canClimb ()Z diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index 736adc172a..32fc0ee5d5 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -51,7 +51,7 @@ CLASS anb net/minecraft/entity/passive/FoxEntity FIELD bD TYPE Lpx; FIELD bE FLAGS Lpx; FIELD bF OWNER Lpx; - FIELD bH FRIEND Lpx; + FIELD bH OTHER_TRUSTED Lpx; FIELD bI PICKABLE_DROP_FILTER Ljava/util/function/Predicate; FIELD bJ JUST_ATTACKED_SOMETHING_FILTER Ljava/util/function/Predicate; FIELD bK CHICKEN_AND_RABBIT_FILTER Ljava/util/function/Predicate; @@ -66,7 +66,8 @@ CLASS anb net/minecraft/entity/passive/FoxEntity FIELD bT eatingTime I METHOD a setType (Lanb$u;)V METHOD a canJumpChase (Lanb;Lahu;)Z - METHOD b setOwner (Ljava/util/UUID;)V + METHOD b addTrustedUuid (Ljava/util/UUID;)V + METHOD c canTrust (Ljava/util/UUID;)Z METHOD d setFlag (IZ)V METHOD dK getType ()Lanb$u; METHOD dL isSitting ()Z @@ -76,7 +77,7 @@ CLASS anb net/minecraft/entity/passive/FoxEntity METHOD dU isCrouching ()Z METHOD dV isRollingHead ()Z METHOD dY addTypeSpecificGoals ()V - METHOD dZ getFriends ()Ljava/util/List; + METHOD dZ getTrustedUuids ()Ljava/util/List; METHOD ea isAggressive ()Z METHOD eb wakeUp ()V METHOD ec stopActions ()V diff --git a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping index d1210b055a..80b85a40d8 100644 --- a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping +++ b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping @@ -1 +1,14 @@ CLASS and net/minecraft/entity/passive/MooshroomEntity + CLASS and$a Type + FIELD c name Ljava/lang/String; + FIELD d mushroomState Lbrd; + METHOD a getMushroomState ()Lbrd; + METHOD b fromName (Ljava/lang/String;)Land$a; + FIELD bD TYPE Lpx; + FIELD bE stewEffect Lahe; + FIELD bF stewEffectDuration I + FIELD bH lightningId Ljava/util/UUID; + METHOD a setType (Land$a;)V + METHOD a chooseBabyType (Land;)Land$a; + METHOD dK getType ()Land$a; + METHOD h getStewEffectFrom (Laxw;)Lorg/apache/commons/lang3/tuple/Pair; diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index 7939c82c01..937970de0f 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -19,12 +19,17 @@ CLASS anf net/minecraft/entity/passive/PandaEntity METHOD c isRecessive ()Z CLASS anf$c PandaFleeGoal CLASS anf$d PandaMateGoal + CLASS anf$e SpawnData CLASS anf$i PandaMoveControl FIELD i panda Lanf; + CLASS anf$j ExtinguishFireGoal FIELD bI MAIN_GENE Lpx; FIELD bJ HIDDEN_GENE Lpx; + FIELD bK FLAGS Lpx; METHOD a setMainGene (Lanf$a;)V + METHOD a initGenes (Lanf;Lanf;)V METHOD b setHiddenGene (Lanf$a;)V + METHOD d setFlag (IZ)V METHOD dU getMainGene ()Lanf$a; METHOD dV getHiddenGene ()Lanf$a; METHOD dX getProductGene ()Lanf$a; @@ -33,3 +38,7 @@ CLASS anf net/minecraft/entity/passive/PandaEntity METHOD ea isPlayful ()Z METHOD ec isWeak ()Z METHOD ed isAggressive ()Z + METHOD ef initAttributes ()V + METHOD ep sneeze ()V + METHOD eq getRandomGene ()Lanf$a; + METHOD t hasFlag (I)Z diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 6bd2d0f990..b534572747 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -12,6 +12,7 @@ CLASS ary net/minecraft/entity/player/PlayerEntity FIELD bD containerPlayer Lauq; FIELD bE container Latt; FIELD bF hungerManager Latr; + FIELD b STATUS_TO_SIZE Ljava/util/Map; FIELD bQ isInWater Z FIELD bR abilities Larv; FIELD bS experience I @@ -20,6 +21,7 @@ CLASS ary net/minecraft/entity/player/PlayerEntity FIELD bV enchantmentTableSeed I FIELD bX fishHook Lapm; FIELD bY spawnForced Z + FIELD bw STANDING_SIZE Lahm; FIELD bx PLAYER_MODEL_BIT_MASK Lpx; FIELD by MAIN_HAND Lpx; FIELD bz LEFT_SHOULDER_ENTITY Lpx; @@ -101,6 +103,7 @@ CLASS ary net/minecraft/entity/player/PlayerEntity METHOD dQ getShoulderEntityRight ()Lhx; METHOD dT getItemCooldownManager ()Laxs; METHOD dU getLuck ()F + METHOD dV isCreativeLevelTwoOp ()Z METHOD dt updateInWater ()Z METHOD du updateSize ()V METHOD dv getScore ()I