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

Sorted out the projectile mess (#1199) 

* sorted out the projectile mess

* Update ShulkerBulletEntity.mapping
This commit is contained in:
Yanis48 2020-03-19 15:41:57 +01:00 committed by GitHub
parent 69b0299c91
commit 1cf89957f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 113 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mappings/net/minecraft/entity/EnderEyeEntity.mapping → mappings/net/minecraft/entity/EyeOfEnderEntity.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_1672 net/minecraft/entity/EnderEyeEntity
CLASS net/minecraft/class_1672 net/minecraft/entity/EyeOfEnderEntity
FIELD field_17080 ITEM Lnet/minecraft/class_2940;
FIELD field_7617 velocityZ D
FIELD field_7618 velocityY D

2
mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping → mappings/net/minecraft/entity/FishingBobberEntity.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_1536 net/minecraft/entity/projectile/FishingBobberEntity
CLASS net/minecraft/class_1536 net/minecraft/entity/FishingBobberEntity
FIELD field_7165 hookedEntity Lnet/minecraft/class_1297;
FIELD field_7166 selfHitTimer I
FIELD field_7167 removalTimer I

6
mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping → mappings/net/minecraft/entity/ShulkerBulletEntity.mapping
View File

@ -1,9 +1,13 @@
CLASS net/minecraft/class_1678 net/minecraft/entity/projectile/ShulkerBulletEntity
CLASS net/minecraft/class_1678 net/minecraft/entity/ShulkerBulletEntity
FIELD field_7625 targetZ D
FIELD field_7626 target Lnet/minecraft/class_1297;
FIELD field_7627 stepCount I
FIELD field_7628 direction Lnet/minecraft/class_2350;
FIELD field_7629 ownerUuid Ljava/util/UUID;
FIELD field_7630 owner Lnet/minecraft/class_1297;
FIELD field_7632 targetUuid Ljava/util/UUID;
FIELD field_7633 targetY D
FIELD field_7635 targetX D
METHOD <init> (Lnet/minecraft/class_1937;DDDDDD)V
ARG 1 world
ARG 2 x

15
mappings/net/minecraft/entity/FireworkEntity.mapping → mappings/net/minecraft/entity/projectile/FireworkRocketEntity.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_1671 net/minecraft/entity/FireworkEntity
CLASS net/minecraft/class_1671 net/minecraft/entity/projectile/FireworkRocketEntity
FIELD field_7611 SHOOTER_ENTITY_ID Lnet/minecraft/class_2940;
FIELD field_7612 lifeTime I
FIELD field_7613 life I
@ -10,17 +10,24 @@ CLASS net/minecraft/class_1671 net/minecraft/entity/FireworkEntity
ARG 2 x
ARG 4 y
ARG 6 z
ARG 8 item
ARG 8 stack
METHOD <init> (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;DDDLnet/minecraft/class_1799;)V
ARG 1 world
ARG 2 entity
ARG 3 x
ARG 5 y
ARG 7 z
ARG 9 stack
METHOD <init> (Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;DDDZ)V
ARG 1 world
ARG 2 item
ARG 2 stack
ARG 3 x
ARG 5 y
ARG 7 z
ARG 9 shotAtAngle
METHOD <init> (Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_1309;)V
ARG 1 world
ARG 2 item
ARG 2 stack
ARG 3 shooter
METHOD method_16830 explodeAndRemove ()V
METHOD method_20308 hasExplosionEffects ()Z

64
mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping Normal file
View File

@ -0,0 +1,64 @@
CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/PersistentProjectileEntity
FIELD field_7571 damage D
FIELD field_7572 pickupType Lnet/minecraft/class_1665$class_1666;
FIELD field_7573 PROJECTILE_FLAGS Lnet/minecraft/class_2940;
FIELD field_7574 shake I
FIELD field_7575 punch I
FIELD field_7576 inGroundTime I
FIELD field_7577 flyingTick I
FIELD field_7578 life I
FIELD field_7579 piercingKilledEntities Ljava/util/List;
FIELD field_7584 sound Lnet/minecraft/class_3414;
FIELD field_7586 inBlockState Lnet/minecraft/class_2680;
FIELD field_7588 inGround Z
FIELD field_7589 PIERCE_LEVEL Lnet/minecraft/class_2940;
FIELD field_7590 piercedEntities Lit/unimi/dsi/fastutil/ints/IntOpenHashSet;
METHOD <init> (Lnet/minecraft/class_1299;DDDLnet/minecraft/class_1937;)V
ARG 1 type
ARG 2 x
ARG 4 y
ARG 6 z
ARG 8 world
METHOD <init> (Lnet/minecraft/class_1299;Lnet/minecraft/class_1309;Lnet/minecraft/class_1937;)V
ARG 1 type
ARG 2 owner
ARG 3 world
METHOD method_20011 getSound ()Lnet/minecraft/class_3414;
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;
ARG 1 currentPosition
ARG 2 nextPosition
METHOD method_7435 applyEnchantmentEffects (Lnet/minecraft/class_1309;F)V
ARG 1 entity
ARG 2 damageModifier
METHOD method_7436 getDragInWater ()F
METHOD method_7438 setDamage (D)V
ARG 1 damage
METHOD method_7439 setCritical (Z)V
ARG 1 critical
METHOD method_7440 getHitSound ()Lnet/minecraft/class_3414;
METHOD method_7441 isNoClip ()Z
METHOD method_7442 setShotFromCrossbow (Z)V
ARG 1 shotFromCrossbow
METHOD method_7443 isCritical ()Z
METHOD method_7444 setSound (Lnet/minecraft/class_3414;)V
ARG 1 sound
METHOD method_7445 asItemStack ()Lnet/minecraft/class_1799;
METHOD method_7446 age ()V
METHOD method_7447 getPierceLevel ()B
METHOD method_7448 getDamage ()D
METHOD method_7449 setPunch (I)V
ARG 1 punch
METHOD method_7450 onHit (Lnet/minecraft/class_1309;)V
ARG 1 target
METHOD method_7451 setPierceLevel (B)V
ARG 1 level
METHOD method_7453 clearPiercingStatus ()V
METHOD method_7455 setProjectileFlag (IZ)V
ARG 1 index
ARG 2 flag
METHOD method_7456 isShotFromCrossbow ()Z
CLASS class_1666 PickupPermission
METHOD method_7458 fromOrdinal (I)Lnet/minecraft/class_1665$class_1666;
ARG 0 ordinal

19
mappings/net/minecraft/entity/projectile/Projectile.mapping
View File

@ -1,19 +0,0 @@
CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/Projectile
FIELD field_22478 ownerUuid Ljava/util/UUID;
METHOD method_24919 setProperties (Lnet/minecraft/class_1297;FFFFF)V
ARG 1 user
ARG 2 pitch
ARG 3 yaw
ARG 4 roll
ARG 5 modifierZ
ARG 6 modifierXYZ
METHOD method_24921 getOwner ()Lnet/minecraft/class_1297;
METHOD method_7432 setOwner (Lnet/minecraft/class_1297;)V
METHOD method_7454 onEntityHit (Lnet/minecraft/class_3966;)V
METHOD method_7485 setVelocity (DDDFF)V
ARG 1 x
ARG 3 y
ARG 5 z
ARG 7 speed
ARG 8 divergence
METHOD method_7492 onCollision (Lnet/minecraft/class_239;)V

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

@ -1,64 +1,20 @@
CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/ProjectileEntity
FIELD field_7571 damage D
FIELD field_7572 pickupType Lnet/minecraft/class_1665$class_1666;
FIELD field_7573 PROJECTILE_FLAGS Lnet/minecraft/class_2940;
FIELD field_7574 shake I
FIELD field_7575 punch I
FIELD field_7576 inGroundTime I
FIELD field_7577 flyingTick I
FIELD field_7578 life I
FIELD field_7579 piercingKilledEntities Ljava/util/List;
FIELD field_7584 sound Lnet/minecraft/class_3414;
FIELD field_7586 inBlockState Lnet/minecraft/class_2680;
FIELD field_7588 inGround Z
FIELD field_7589 PIERCE_LEVEL Lnet/minecraft/class_2940;
FIELD field_7590 piercedEntities Lit/unimi/dsi/fastutil/ints/IntOpenHashSet;
METHOD <init> (Lnet/minecraft/class_1299;DDDLnet/minecraft/class_1937;)V
ARG 1 type
ARG 2 x
ARG 4 y
ARG 6 z
ARG 8 world
METHOD <init> (Lnet/minecraft/class_1299;Lnet/minecraft/class_1309;Lnet/minecraft/class_1937;)V
ARG 1 type
ARG 2 owner
ARG 3 world
METHOD method_20011 getSound ()Lnet/minecraft/class_3414;
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;
ARG 1 currentPosition
ARG 2 nextPosition
METHOD method_7435 applyEnchantmentEffects (Lnet/minecraft/class_1309;F)V
CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity
FIELD field_22478 ownerUuid Ljava/util/UUID;
METHOD method_24919 setProperties (Lnet/minecraft/class_1297;FFFFF)V
ARG 1 user
ARG 2 pitch
ARG 3 yaw
ARG 4 roll
ARG 5 modifierZ
ARG 6 modifierXYZ
METHOD method_24921 getOwner ()Lnet/minecraft/class_1297;
METHOD method_7432 setOwner (Lnet/minecraft/class_1297;)V
ARG 1 entity
ARG 2 damageModifier
METHOD method_7436 getDragInWater ()F
METHOD method_7438 setDamage (D)V
ARG 1 damage
METHOD method_7439 setCritical (Z)V
ARG 1 critical
METHOD method_7440 getHitSound ()Lnet/minecraft/class_3414;
METHOD method_7441 isNoClip ()Z
METHOD method_7442 setShotFromCrossbow (Z)V
ARG 1 shotFromCrossbow
METHOD method_7443 isCritical ()Z
METHOD method_7444 setSound (Lnet/minecraft/class_3414;)V
ARG 1 sound
METHOD method_7445 asItemStack ()Lnet/minecraft/class_1799;
METHOD method_7446 age ()V
METHOD method_7447 getPierceLevel ()B
METHOD method_7448 getDamage ()D
METHOD method_7449 setPunch (I)V
ARG 1 punch
METHOD method_7450 onHit (Lnet/minecraft/class_1309;)V
ARG 1 target
METHOD method_7451 setPierceLevel (B)V
ARG 1 level
METHOD method_7453 clearPiercingStatus ()V
METHOD method_7455 setProjectileFlag (IZ)V
ARG 1 index
ARG 2 flag
METHOD method_7456 isShotFromCrossbow ()Z
CLASS class_1666 PickupPermission
METHOD method_7458 fromOrdinal (I)Lnet/minecraft/class_1665$class_1666;
ARG 0 ordinal
METHOD method_7454 onEntityHit (Lnet/minecraft/class_3966;)V
METHOD method_7485 setVelocity (DDDFF)V
ARG 1 x
ARG 3 y
ARG 5 z
ARG 7 speed
ARG 8 divergence
METHOD method_7492 onCollision (Lnet/minecraft/class_239;)V

2
mappings/net/minecraft/entity/ProjectileUtil.mapping → mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_1675 net/minecraft/entity/ProjectileUtil
CLASS net/minecraft/class_1675 net/minecraft/entity/projectile/ProjectileUtil
METHOD method_18074 getCollision (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;Lnet/minecraft/class_3959$class_3960;Z)Lnet/minecraft/class_239;
ARG 0 entity
ARG 1 box

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

@ -11,5 +11,5 @@ CLASS net/minecraft/class_1685 net/minecraft/entity/projectile/TridentEntity
METHOD <init> (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)V
ARG 1 world
ARG 2 owner
ARG 3 item
ARG 3 stack
METHOD method_7493 isOwnerAlive ()Z

2
mappings/net/minecraft/entity/thrown/ThrownExperienceBottleEntity.mapping → mappings/net/minecraft/entity/projectile/thrown/EggEntity.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_1683 net/minecraft/entity/thrown/ThrownExperienceBottleEntity
CLASS net/minecraft/class_1681 net/minecraft/entity/projectile/thrown/EggEntity
METHOD <init> (Lnet/minecraft/class_1937;DDD)V
ARG 1 world
ARG 2 x

2
mappings/net/minecraft/entity/thrown/ThrownEnderpearlEntity.mapping → mappings/net/minecraft/entity/projectile/thrown/EnderPearlEntity.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_1684 net/minecraft/entity/thrown/ThrownEnderpearlEntity
CLASS net/minecraft/class_1684 net/minecraft/entity/projectile/thrown/EnderPearlEntity
FIELD field_7646 owner Lnet/minecraft/class_1309;
METHOD <init> (Lnet/minecraft/class_1937;DDD)V
ARG 1 world

4
mappings/net/minecraft/entity/thrown/ThrownEggEntity.mapping → mappings/net/minecraft/entity/projectile/thrown/ExperienceBottleEntity.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_1681 net/minecraft/entity/thrown/ThrownEggEntity
CLASS net/minecraft/class_1683 net/minecraft/entity/projectile/thrown/ExperienceBottleEntity
METHOD <init> (Lnet/minecraft/class_1937;DDD)V
ARG 1 world
ARG 2 x
@ -6,4 +6,4 @@ CLASS net/minecraft/class_1681 net/minecraft/entity/thrown/ThrownEggEntity
ARG 6 z
METHOD <init> (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)V
ARG 1 world
ARG 2 thrower
ARG 2 owner

4
mappings/net/minecraft/entity/thrown/ThrownPotionEntity.mapping → mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping
View File

@ -1,11 +1,13 @@
CLASS net/minecraft/class_1686 net/minecraft/entity/thrown/ThrownPotionEntity
CLASS net/minecraft/class_1686 net/minecraft/entity/projectile/thrown/PotionEntity
FIELD field_7653 WATER_HURTS Ljava/util/function/Predicate;
METHOD <init> (Lnet/minecraft/class_1937;DDD)V
ARG 1 world
ARG 2 x
ARG 4 y
ARG 6 z
METHOD <init> (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)V
ARG 1 world
ARG 2 owner
METHOD method_7496 doesWaterHurt (Lnet/minecraft/class_1309;)Z
ARG 0 entityHit
METHOD method_7497 applyLingeringPotion (Lnet/minecraft/class_1799;Lnet/minecraft/class_1842;)V

2
mappings/net/minecraft/entity/thrown/SnowballEntity.mapping → mappings/net/minecraft/entity/projectile/thrown/SnowballEntity.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_1680 net/minecraft/entity/thrown/SnowballEntity
CLASS net/minecraft/class_1680 net/minecraft/entity/projectile/thrown/SnowballEntity
METHOD <init> (Lnet/minecraft/class_1937;DDD)V
ARG 1 world
ARG 2 x

2
mappings/net/minecraft/entity/thrown/ThrownEntity.mapping → mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_1682 net/minecraft/entity/thrown/ThrownEntity
CLASS net/minecraft/class_1682 net/minecraft/entity/projectile/thrown/ThrownEntity
FIELD field_7639 blockY I
FIELD field_7640 blockX I
FIELD field_7641 blockZ I

2
mappings/net/minecraft/entity/thrown/ThrownItemEntity.mapping → mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_3857 net/minecraft/entity/thrown/ThrownItemEntity
CLASS net/minecraft/class_3857 net/minecraft/entity/projectile/thrown/ThrownItemEntity
FIELD field_17082 ITEM Lnet/minecraft/class_2940;
METHOD method_16940 setItem (Lnet/minecraft/class_1799;)V
ARG 1 item