Map entity methods and params (#2455)

* Map entity methods and params

* Apply suggestions from code review

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Rename prevAge, change javadoc

* 1.17-pre3 methods

* Add javadocs

* Update mappings/net/minecraft/entity/damage/DamageSource.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
This commit is contained in:
apple502j 2021-06-06 23:21:56 +09:00 committed by GitHub
parent d3b85ba3b8
commit 7d8e711671
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 58 additions and 4 deletions

View File

@ -9,7 +9,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
FIELD field_23807 inanimate Z
FIELD field_25599 submergedFluidTag Lnet/minecraft/class_3494;
FIELD field_25750 trackedPosition Lnet/minecraft/class_243;
FIELD field_26994 prevAge I
FIELD field_26994 lastChimeAge I
FIELD field_26995 removalReason Lnet/minecraft/class_1297$class_5529;
FIELD field_26996 entityChangeListener Lnet/minecraft/class_5569;
FIELD field_27857 inPowderSnow Z
@ -345,6 +345,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
COMMENT
COMMENT @implNote The vanilla implementation always returns {@code null}.
METHOD method_33189 occludeVibrationSignals ()Z
METHOD method_33331 (Lnet/minecraft/class_4048;Lnet/minecraft/class_243;)V
ARG 2 pos
METHOD method_33332 calculateBoundingBox ()Lnet/minecraft/class_238;
METHOD method_33567 requestTeleportAndDismount (DDD)V
ARG 1 destX
@ -398,6 +400,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
ARG 2 pos
METHOD method_36974 tryCheckBlockCollision ()V
METHOD method_36975 playExtinguishSound ()V
METHOD method_37215 playAmethystChimeSound (Lnet/minecraft/class_2680;)V
ARG 1 state
METHOD method_5621 getMountedHeightOffset ()D
METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V
ARG 1 state
@ -558,6 +562,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
ARG 1 status
METHOD method_5712 playStepSound (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
ARG 1 pos
ARG 2 state
METHOD method_5713 checkWaterState ()V
METHOD method_5715 isSneaking ()Z
METHOD method_5716 updateKilledAdvancementCriterion (Lnet/minecraft/class_1297;ILnet/minecraft/class_1282;)V

View File

@ -38,6 +38,8 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
ARG 0 nbt
ARG 1 world
ARG 2 entityProcessor
METHOD method_17843 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1937;Ljava/util/function/Function;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297;
ARG 3 entity
METHOD method_17848 loadEntityFromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_1937;)Ljava/util/Optional;
ARG 0 nbt
ARG 1 world

View File

@ -1,6 +1,7 @@
CLASS net/minecraft/class_1303 net/minecraft/entity/ExperienceOrbEntity
FIELD field_27009 pickingCount I
FIELD field_30055 DESPAWN_AGE I
FIELD field_30056 EXPENSIVE_UPDATE_INTERVAL I
FIELD field_6159 amount I
FIELD field_6161 health I
FIELD field_6162 target Lnet/minecraft/class_1657;
@ -11,6 +12,8 @@ CLASS net/minecraft/class_1303 net/minecraft/entity/ExperienceOrbEntity
ARG 4 y
ARG 6 z
ARG 8 amount
METHOD method_31492 (IILnet/minecraft/class_1303;)Z
ARG 2 orb
METHOD method_31493 spawn (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;I)V
ARG 0 world
ARG 1 pos
@ -27,10 +30,11 @@ CLASS net/minecraft/class_1303 net/minecraft/entity/ExperienceOrbEntity
ARG 2 amount
METHOD method_31497 merge (Lnet/minecraft/class_1303;)V
ARG 1 other
METHOD method_31498 onEverySecond ()V
COMMENT Called every second (every 20 ticks).
METHOD method_31498 expensiveUpdate ()V
COMMENT Performs an expensive update.
COMMENT
COMMENT @implSpec This method first checks if the orb still has a nearby {@link #target},
COMMENT @implSpec Called every second (every {@link #EXPENSIVE_UPDATE_INTERVAL} ticks).
COMMENT This method first checks if the orb still has a nearby {@link #target},
COMMENT and assigns a new target if there is none. It then tries to merge nearby experience orbs.
METHOD method_35051 repairPlayerGears (Lnet/minecraft/class_1657;I)I
COMMENT Repairs a player's gears using the experience recursively, until the experience is

View File

@ -17,6 +17,8 @@ CLASS net/minecraft/class_1540 net/minecraft/entity/FallingBlockEntity
METHOD method_32752 onDestroyedOnLanding (Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;)V
ARG 1 block
ARG 2 pos
METHOD method_32879 (Lnet/minecraft/class_1282;FLnet/minecraft/class_1297;)V
ARG 2 entity
METHOD method_6962 getBlockState ()Lnet/minecraft/class_2680;
METHOD method_6963 setFallingBlockPos (Lnet/minecraft/class_2338;)V
ARG 1 pos

View File

@ -1,5 +1,7 @@
CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity
FIELD field_30456 DESPAWN_AGE I
FIELD field_30457 CANNOT_PICK_UP_DELAY I
FIELD field_30458 NEVER_DESPAWN_AGE I
FIELD field_7199 STACK Lnet/minecraft/class_2940;
FIELD field_7200 thrower Ljava/util/UUID;
FIELD field_7201 health I

View File

@ -104,6 +104,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
ARG 2 predicate
METHOD method_18392 setPositionInBed (Lnet/minecraft/class_2338;)V
ARG 1 pos
METHOD method_18393 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2338;)V
ARG 1 pos
METHOD method_18394 getActiveEyeHeight (Lnet/minecraft/class_4050;Lnet/minecraft/class_4048;)F
ARG 1 pose
ARG 2 dimensions
@ -223,6 +225,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
METHOD method_27071 shouldDropLoot ()Z
METHOD method_27302 shouldDisplaySoulSpeedEffects ()Z
METHOD method_27303 isOnSoulSpeedBlock ()Z
METHOD method_28305 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V
ARG 1 brain
METHOD method_28306 createBrainProfile ()Lnet/minecraft/class_4095$class_5303;
METHOD method_29242 updateLimbs (Lnet/minecraft/class_1309;Z)V
ARG 1 entity
@ -284,6 +288,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
METHOD method_36977 damageHelmet (Lnet/minecraft/class_1282;F)V
ARG 1 source
ARG 2 amount
METHOD method_37119 tickItemStackUsage (Lnet/minecraft/class_1799;)V
ARG 1 stack
METHOD method_37222 addStatusEffect (Lnet/minecraft/class_1293;Lnet/minecraft/class_1297;)Z
COMMENT Adds a status effect to this entity.
COMMENT

View File

@ -2,6 +2,10 @@ CLASS net/minecraft/class_1510 net/minecraft/entity/boss/dragon/EnderDragonEntit
FIELD field_18120 CLOSE_PLAYER_PREDICATE Lnet/minecraft/class_4051;
FIELD field_20865 yawAcceleration F
FIELD field_30428 MAX_HEALTH I
FIELD field_30430 TAKEOFF_THRESHOLD F
COMMENT The damage the dragon can take before it takes off, represented as a ratio to the full health.
FIELD field_33910 DRAGON_DEATH_TIME_KEY Ljava/lang/String;
FIELD field_33911 DRAGON_PHASE_KEY Ljava/lang/String;
FIELD field_7008 pathHeap Lnet/minecraft/class_5;
FIELD field_7009 tail2 Lnet/minecraft/class_1508;
FIELD field_7010 latestSegment I

View File

@ -17,6 +17,8 @@ CLASS net/minecraft/class_2881 net/minecraft/entity/boss/dragon/EnderDragonFight
FIELD field_13120 dragonSpawnState Lnet/minecraft/class_2876;
FIELD field_13121 gateways Ljava/util/List;
FIELD field_13122 playerUpdateTimer I
FIELD field_31443 CHECK_DRAGON_SEEN_INTERVAL I
FIELD field_31444 CRYSTAL_COUNTING_INTERVAL I
METHOD <init> (Lnet/minecraft/class_3218;JLnet/minecraft/class_2487;)V
ARG 1 world
ARG 2 gatewaysSeed

View File

@ -5,6 +5,12 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource
FIELD field_28100 fallingBlock Z
FIELD field_28399 fromFalling Z
FIELD field_28400 STALAGMITE Lnet/minecraft/class_1282;
FIELD field_34004 neutral Z
COMMENT Whether the attacked entity should be neutral to the attacker.
COMMENT
COMMENT @apiNote This is used by goats to prevent rammed mobs from retaliating.
COMMENT Damages that are neutral do not cause {@link LivingEntity#setAttacker(LivingEntity)}
COMMENT to be called.
FIELD field_5839 unblockable Z
FIELD field_5840 bypassesArmor Z
FIELD field_5841 name Ljava/lang/String;
@ -49,6 +55,8 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource
METHOD method_32873 setFallingBlock ()Lnet/minecraft/class_1282;
METHOD method_33329 isFromFalling ()Z
METHOD method_33330 setFromFalling ()Lnet/minecraft/class_1282;
METHOD method_37353 setNeutral ()Lnet/minecraft/class_1282;
METHOD method_37354 isNeutral ()Z
METHOD method_5504 isUnblockable ()Z
METHOD method_5505 setOutOfWorld ()Lnet/minecraft/class_1282;
METHOD method_5506 getDeathMessage (Lnet/minecraft/class_1309;)Lnet/minecraft/class_2561;

View File

@ -101,6 +101,8 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
METHOD method_33191 squaredAttackRange (Lnet/minecraft/class_1309;)D
ARG 1 target
METHOD method_35056 clearGoalsAndTasks ()V
METHOD method_37341 (Lnet/minecraft/class_1799;)V
ARG 0 stack
METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F
ARG 1 slot
METHOD method_5930 setForwardSpeed (F)V

View File

@ -1,8 +1,19 @@
CLASS net/minecraft/class_1480 net/minecraft/entity/mob/WaterCreatureEntity
METHOD method_35174 canSpawnUnderground (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 entityType
ARG 1 world
ARG 2 spawnReason
ARG 3 pos
ARG 4 random
METHOD method_37359 hasNoLight (Lnet/minecraft/class_5425;Lnet/minecraft/class_2338;)Z
ARG 0 world
ARG 1 pos
METHOD method_37360 hasStoneFloor (Lnet/minecraft/class_2338;Lnet/minecraft/class_5425;)Z
COMMENT Returns if the position has a stone floor.
COMMENT
COMMENT @implNote This method checks if a block in the {@link net.minecraft.tag.BlockTags#BASE_STONE_OVERWORLD}
COMMENT tag exists within 5 blocks, and all blocks in between are water.
ARG 0 pos
ARG 1 world
METHOD method_6673 tickWaterBreathingAir (I)V
ARG 1 air

View File

@ -6,3 +6,4 @@ CLASS net/minecraft/class_1674 net/minecraft/entity/projectile/FireballEntity
ARG 3 velocityX
ARG 5 velocityY
ARG 7 velocityZ
ARG 9 explosionPower

View File

@ -39,6 +39,7 @@ CLASS net/minecraft/class_1536 net/minecraft/entity/projectile/FishingBobberEnti
METHOD method_6949 tickFishingLogic (Lnet/minecraft/class_2338;)V
ARG 1 pos
METHOD method_6951 updateHookedEntityId (Lnet/minecraft/class_1297;)V
ARG 1 entity
METHOD method_6954 pullHookedEntity (Lnet/minecraft/class_1297;)V
ARG 1 entity
METHOD method_6957 use (Lnet/minecraft/class_1799;)I

View File

@ -2,5 +2,7 @@ CLASS net/minecraft/class_3857 net/minecraft/entity/projectile/thrown/ThrownItem
FIELD field_17082 ITEM Lnet/minecraft/class_2940;
METHOD method_16940 setItem (Lnet/minecraft/class_1799;)V
ARG 1 item
METHOD method_16941 (Lnet/minecraft/class_1799;)V
ARG 0 stack
METHOD method_16942 getDefaultItem ()Lnet/minecraft/class_1792;
METHOD method_16943 getItem ()Lnet/minecraft/class_1799;

View File

@ -14,6 +14,8 @@ CLASS net/minecraft/class_3763 net/minecraft/entity/raid/RaiderEntity
ARG 1 ableToJoinRaid
METHOD method_16481 canJoinRaid ()Z
METHOD method_16482 hasActiveRaid ()Z
METHOD method_16483 (Lnet/minecraft/class_1542;)Z
ARG 0 itemEntity
METHOD method_16484 addBonusForWave (IZ)V
ARG 1 wave
ARG 2 unused