mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

21w13a entity stuff (#2231) 

* entity

* Apply suggestions from code review

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

* nbt_key -> key

* Update mappings/net/minecraft/entity/EntityType.mapping

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

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
This commit is contained in:
Shnupbups 2021-04-02 22:59:05 +11:00 committed by GitHub
parent 86891d90dc
commit 1014a0a840
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mappings/net/minecraft/entity/Bucketable.mapping
View File

@ -1,6 +1,20 @@
CLASS net/minecraft/class_5761 net/minecraft/entity/Bucketable
METHOD method_6452 getFishBucketItem ()Lnet/minecraft/class_1799;
METHOD method_35167 copyDataToStack (Lnet/minecraft/class_1308;Lnet/minecraft/class_1799;)V
ARG 0 entity
ARG 1 stack
METHOD method_35168 copyDataFromNbt (Lnet/minecraft/class_1308;Lnet/minecraft/class_2487;)V
ARG 0 entity
ARG 1 nbt
METHOD method_35169 tryBucket (Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1309;)Ljava/util/Optional;
ARG 0 player
ARG 1 hand
ARG 2 entity
METHOD method_35170 copyDataFromNbt (Lnet/minecraft/class_2487;)V
ARG 1 nbt
METHOD method_35171 getBucketedSound ()Lnet/minecraft/class_3414;
METHOD method_6452 getBucketItem ()Lnet/minecraft/class_1799;
METHOD method_6453 isFromBucket ()Z
METHOD method_6454 setFromBucket (Z)V
ARG 1 fromBucket
METHOD method_6455 copyDataToStack (Lnet/minecraft/class_1799;)V
ARG 1 stack

1
mappings/net/minecraft/entity/EntityType.mapping
View File

@ -6,6 +6,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
FIELD field_24085 maxTrackDistance I
FIELD field_24086 trackTickInterval I
FIELD field_25355 canSpawnInside Lcom/google/common/collect/ImmutableSet;
FIELD field_30053 ENTITY_TAG_KEY Ljava/lang/String;
FIELD field_6056 saveable Z
FIELD field_6072 summonable Z
FIELD field_6088 LOGGER Lorg/apache/logging/log4j/Logger;

2
mappings/net/minecraft/entity/EquipmentSlot.mapping
View File

@ -11,6 +11,8 @@ CLASS net/minecraft/class_1304 net/minecraft/entity/EquipmentSlot
METHOD method_20234 fromTypeIndex (Lnet/minecraft/class_1304$class_1305;I)Lnet/minecraft/class_1304;
ARG 0 type
ARG 1 index
METHOD method_32320 getOffsetEntitySlotId (I)I
ARG 1 offset
METHOD method_5923 getName ()Ljava/lang/String;
METHOD method_5924 byName (Ljava/lang/String;)Lnet/minecraft/class_1304;
ARG 0 name

1
mappings/net/minecraft/entity/LightningEntity.mapping
View File

@ -20,6 +20,7 @@ CLASS net/minecraft/class_1538 net/minecraft/entity/LightningEntity
METHOD method_34710 cleanOxidizationAround (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Ljava/util/Optional;
ARG 0 world
ARG 1 pos
METHOD method_35052 getChanneler ()Lnet/minecraft/class_3222;
METHOD method_6960 spawnFire (I)V
ARG 1 spreadAttempts
METHOD method_6961 setChanneler (Lnet/minecraft/class_3222;)V

1
mappings/net/minecraft/entity/TntEntity.mapping
View File

@ -1,4 +1,5 @@
CLASS net/minecraft/class_1541 net/minecraft/entity/TntEntity
FIELD field_30459 DEFAULT_FUSE I
FIELD field_7197 FUSE Lnet/minecraft/class_2940;
FIELD field_7198 causingEntity Lnet/minecraft/class_1309;
METHOD <init> (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1309;)V

4
mappings/net/minecraft/entity/damage/DamageRecord.mapping
View File

@ -12,6 +12,10 @@ CLASS net/minecraft/class_1281 net/minecraft/entity/damage/DamageRecord
ARG 4 damage
ARG 5 fallDeathSuffix
ARG 6 fallDistance
METHOD method_35035 getEntityAge ()I
METHOD method_35036 getEntityHealth ()F
METHOD method_35037 getNewEntityHealth ()F
METHOD method_35038 getAttacker ()Lnet/minecraft/class_1297;
METHOD method_5498 getAttackerName ()Lnet/minecraft/class_2561;
METHOD method_5499 getDamageSource ()Lnet/minecraft/class_1282;
METHOD method_5500 getFallDeathSuffix ()Ljava/lang/String;

2
mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping
View File

@ -69,6 +69,8 @@ CLASS net/minecraft/class_1531 net/minecraft/entity/decoration/ArmorStandEntity
ARG 1 slot
METHOD method_6916 slotFromPosition (Lnet/minecraft/class_243;)Lnet/minecraft/class_1304;
METHOD method_6917 getLeftLegRotation ()Lnet/minecraft/class_2379;
METHOD method_6918 (Lnet/minecraft/class_1297;)Z
ARG 0 entity
METHOD method_6919 setHeadRotation (Lnet/minecraft/class_2379;)V
ARG 1 angle
METHOD method_6920 playBreakSound ()V

1
mappings/net/minecraft/entity/mob/AbstractPiglinEntity.mapping
View File

@ -1,6 +1,7 @@
CLASS net/minecraft/class_5418 net/minecraft/entity/mob/AbstractPiglinEntity
FIELD field_25758 IMMUNE_TO_ZOMBIFICATION Lnet/minecraft/class_2940;
FIELD field_25759 timeInOverworld I
FIELD field_30547 TIME_TO_ZOMBIFY I
METHOD method_24694 zombify (Lnet/minecraft/class_3218;)V
ARG 1 world
METHOD method_24705 getActivity ()Lnet/minecraft/class_4837;

1
mappings/net/minecraft/entity/mob/AbstractSkeletonEntity.mapping
View File

@ -2,6 +2,7 @@ CLASS net/minecraft/class_1547 net/minecraft/entity/mob/AbstractSkeletonEntity
FIELD field_7220 bowAttackGoal Lnet/minecraft/class_1380;
FIELD field_7221 meleeAttackGoal Lnet/minecraft/class_1366;
METHOD method_26905 createAbstractSkeletonAttributes ()Lnet/minecraft/class_5132$class_5133;
METHOD method_35191 isShaking ()Z
METHOD method_6996 createArrowProjectile (Lnet/minecraft/class_1799;F)Lnet/minecraft/class_1665;
ARG 1 arrow
ARG 2 damageModifier

2
mappings/net/minecraft/entity/mob/Angerable.mapping
View File

@ -1,4 +1,6 @@
CLASS net/minecraft/class_5354 net/minecraft/entity/mob/Angerable
FIELD field_30093 ANGER_TIME_KEY Ljava/lang/String;
FIELD field_30094 ANGRY_AT_KEY Ljava/lang/String;
METHOD method_29505 setAttacking (Lnet/minecraft/class_1657;)V
ARG 1 attacking
METHOD method_29507 getAngerTime ()I

1
mappings/net/minecraft/entity/mob/EndermiteEntity.mapping
View File

@ -1,4 +1,5 @@
CLASS net/minecraft/class_1559 net/minecraft/entity/mob/EndermiteEntity
FIELD field_30463 DESPAWN_TIME I
FIELD field_7250 lifeTime I
METHOD method_20674 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type

1
mappings/net/minecraft/entity/mob/MobEntity.mapping
View File

@ -2,6 +2,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
FIELD field_18074 positionTarget Lnet/minecraft/class_2338;
FIELD field_18075 positionTargetRange F
FIELD field_18279 holdingEntityId I
FIELD field_30086 LEASH_KEY Ljava/lang/String;
FIELD field_6184 lootTableSeed J
FIELD field_6185 targetSelector Lnet/minecraft/class_1355;
FIELD field_6186 armorDropChances [F

2
mappings/net/minecraft/entity/mob/PillagerEntity.mapping
View File

@ -3,3 +3,5 @@ CLASS net/minecraft/class_1604 net/minecraft/entity/mob/PillagerEntity
FIELD field_7335 inventory Lnet/minecraft/class_1277;
METHOD method_26919 createPillagerAttributes ()Lnet/minecraft/class_5132$class_5133;
METHOD method_7108 isCharging ()Z
METHOD method_7111 isRaidCaptain (Lnet/minecraft/class_1799;)Z
ARG 1 stack

2
mappings/net/minecraft/entity/mob/ShulkerEntity.mapping
View File

@ -16,6 +16,8 @@ CLASS net/minecraft/class_1606 net/minecraft/entity/mob/ShulkerEntity
METHOD method_31546 setColor (Lnet/minecraft/class_1767;)V
ARG 1 color
METHOD method_31547 spawnNewShulker ()V
METHOD method_35192 setAttachedFace (Lnet/minecraft/class_2350;)V
ARG 1 face
METHOD method_7115 getPeekAmount ()I
METHOD method_7116 getOpenProgress (F)F
ARG 1 delta

3
mappings/net/minecraft/entity/mob/SkeletonEntity.mapping
View File

@ -1,9 +1,12 @@
CLASS net/minecraft/class_1613 net/minecraft/entity/mob/SkeletonEntity
FIELD field_28642 CONVERTING Lnet/minecraft/class_2940;
FIELD field_28644 conversionTime I
FIELD field_30495 STRAY_CONVERSION_TIME_KEY Ljava/lang/String;
METHOD method_33589 setConversionTime (I)V
ARG 1 time
METHOD method_33590 isConverting ()Z
COMMENT Returns whether this skeleton is currently converting to a stray.
METHOD method_33591 convertToStray ()V
COMMENT Converts this skeleton to a stray and plays a sound if it is not silent.
METHOD method_35193 setConverting (Z)V
ARG 1 converting

3
mappings/net/minecraft/entity/mob/VindicatorEntity.mapping
View File

@ -1,6 +1,9 @@
CLASS net/minecraft/class_1632 net/minecraft/entity/mob/VindicatorEntity
FIELD field_19014 DIFFICULTY_ALLOWS_DOOR_BREAKING_PREDICATE Ljava/util/function/Predicate;
FIELD field_30504 JOHNNY_KEY Ljava/lang/String;
FIELD field_7406 johnny Z
METHOD method_20007 (Lnet/minecraft/class_1267;)Z
ARG 0 difficulty
METHOD method_26926 createVindicatorAttributes ()Lnet/minecraft/class_5132$class_5133;
CLASS class_1633 FollowEntityGoal
METHOD <init> (Lnet/minecraft/class_1632;)V

6
mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping
View File

@ -1,3 +1,9 @@
CLASS net/minecraft/class_1480 net/minecraft/entity/mob/WaterCreatureEntity
METHOD method_35174 canSpawnUnderground (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;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_6673 tickWaterBreathingAir (I)V
ARG 1 air

1
mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping
View File

@ -12,6 +12,7 @@ CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity
ARG 1 xp
METHOD method_21649 setGossipData (Lnet/minecraft/class_2520;)V
ARG 1 gossipTag
METHOD method_35194 getXp ()I
METHOD method_7194 getConversionRate ()I
METHOD method_7197 finishConversion (Lnet/minecraft/class_3218;)V
ARG 1 world

1
mappings/net/minecraft/entity/passive/PandaEntity.mapping
View File

@ -23,6 +23,7 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity
METHOD method_18057 stop ()V
METHOD method_18442 isIdle ()Z
METHOD method_26888 createPandaAttributes ()Lnet/minecraft/class_5132$class_5133;
METHOD method_35173 isBrown ()Z
METHOD method_6503 updateLieOnBackAnimation ()V
METHOD method_6505 setLyingOnBack (Z)V
ARG 1 lyingOnBack

4
mappings/net/minecraft/entity/player/HungerManager.mapping
View File

@ -4,6 +4,10 @@ CLASS net/minecraft/class_1702 net/minecraft/entity/player/HungerManager
FIELD field_7754 prevFoodLevel I
FIELD field_7755 foodStarvationTimer I
FIELD field_7756 foodLevel I
METHOD method_35217 getPrevFoodLevel ()I
METHOD method_35218 setExhaustion (F)V
ARG 1 exhaustion
METHOD method_35219 getExhaustion ()F
METHOD method_7579 eat (Lnet/minecraft/class_1792;Lnet/minecraft/class_1799;)V
ARG 1 item
ARG 2 stack

2
mappings/net/minecraft/entity/player/PlayerInventory.mapping
View File

@ -1,4 +1,6 @@
CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory
FIELD field_30638 MAIN_SIZE I
FIELD field_30641 HOTBAR_SIZE I
FIELD field_7542 changeCount I
FIELD field_7543 combinedInventory Ljava/util/List;
FIELD field_7544 offHand Lnet/minecraft/class_2371;

3
mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping
View File

@ -25,6 +25,9 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/PersistentProject
METHOD method_20011 getSound ()Lnet/minecraft/class_3414;
METHOD method_26351 shouldFall ()Z
METHOD method_26352 fall ()V
METHOD method_34713 tryPickup (Lnet/minecraft/class_1657;)Z
ARG 1 player
METHOD method_35207 getPunch ()I
METHOD method_7433 setNoClip (Z)V
ARG 1 noClip
METHOD method_7434 getEntityCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Lnet/minecraft/class_3966;

2
mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping
View File

@ -19,6 +19,8 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity
ARG 1 newRot
METHOD method_26961 shouldLeaveOwner ()Z
METHOD method_26962 updateRotation ()V
METHOD method_34714 isOwner (Lnet/minecraft/class_1297;)Z
ARG 1 entity
METHOD method_7432 setOwner (Lnet/minecraft/class_1297;)V
ARG 1 entity
METHOD method_7454 onEntityHit (Lnet/minecraft/class_3966;)V

1
mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping
View File

@ -11,5 +11,6 @@ CLASS net/minecraft/class_1678 net/minecraft/entity/projectile/ShulkerBulletEnti
ARG 2 owner
ARG 3 target
ARG 4 axis
METHOD method_35208 getDirection ()Lnet/minecraft/class_2350;
METHOD method_7487 setDirection (Lnet/minecraft/class_2350;)V
ARG 1 direction

4
mappings/net/minecraft/entity/vehicle/SpawnerMinecartEntity.mapping
View File

@ -1,7 +1,11 @@
CLASS net/minecraft/class_1699 net/minecraft/entity/vehicle/SpawnerMinecartEntity
FIELD field_27012 ticker Ljava/lang/Runnable;
FIELD field_7746 logic Lnet/minecraft/class_1917;
METHOD <init> (Lnet/minecraft/class_1937;DDD)V
ARG 1 world
ARG 2 x
ARG 4 y
ARG 6 z
METHOD method_31553 getTicker (Lnet/minecraft/class_1937;)Ljava/lang/Runnable;
ARG 1 world
METHOD method_35216 getLogic ()Lnet/minecraft/class_1917;