From 7c8783defd3ff479ee4ebe5c39dd623639aa350b Mon Sep 17 00:00:00 2001 From: copygirl Date: Fri, 9 Sep 2016 01:27:28 +0200 Subject: [PATCH] Map projectile onCollision & onHit --- .../net/minecraft/entity/projectile/EntityArrowBase.mapping | 4 ++++ .../entity/projectile/EntityExplosiveProjectile.mapping | 2 ++ .../net/minecraft/entity/projectile/impl/EntityArrow.mapping | 2 ++ .../entity/projectile/impl/EntityDragonFireball.mapping | 2 ++ .../entity/projectile/impl/EntityExplodingWitherSkull.mapping | 2 ++ .../minecraft/entity/projectile/impl/EntityFireball.mapping | 2 ++ .../entity/projectile/impl/EntitySmallFireball.mapping | 2 ++ .../entity/projectile/impl/EntitySpectralArrow.mapping | 2 ++ mappings/net/minecraft/entity/thrown/EntityThrown.mapping | 2 ++ .../net/minecraft/entity/thrown/impl/EntitySnowball.mapping | 2 ++ .../net/minecraft/entity/thrown/impl/EntityThrownEgg.mapping | 2 ++ .../entity/thrown/impl/EntityThrownEnderpearl.mapping | 2 ++ .../entity/thrown/impl/EntityThrownExperienceBottle.mapping | 2 ++ .../minecraft/entity/thrown/impl/EntityThrownPotion.mapping | 2 ++ 14 files changed, 30 insertions(+) diff --git a/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping b/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping index 3548c38540..c17dd90cac 100644 --- a/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping @@ -1,4 +1,8 @@ CLASS none/aan net/minecraft/entity/projectile/EntityArrowBase + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a onHit (Lnone/sn;)V + ARG 0 entity METHOD b serializeEntityTag (Lnone/dt;)V METHOD m update ()V diff --git a/mappings/net/minecraft/entity/projectile/EntityExplosiveProjectile.mapping b/mappings/net/minecraft/entity/projectile/EntityExplosiveProjectile.mapping index b7622fd210..262423ecec 100644 --- a/mappings/net/minecraft/entity/projectile/EntityExplosiveProjectile.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityExplosiveProjectile.mapping @@ -1,4 +1,6 @@ CLASS none/aaq net/minecraft/entity/projectile/EntityExplosiveProjectile + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a damage (Lnone/rp;F)Z ARG 0 source diff --git a/mappings/net/minecraft/entity/projectile/impl/EntityArrow.mapping b/mappings/net/minecraft/entity/projectile/impl/EntityArrow.mapping index 419c0fee71..1db6387c72 100644 --- a/mappings/net/minecraft/entity/projectile/impl/EntityArrow.mapping +++ b/mappings/net/minecraft/entity/projectile/impl/EntityArrow.mapping @@ -1,4 +1,6 @@ CLASS none/abe net/minecraft/entity/projectile/impl/EntityArrow METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a onHit (Lnone/sn;)V + ARG 0 entity METHOD b serializeEntityTag (Lnone/dt;)V METHOD m update ()V diff --git a/mappings/net/minecraft/entity/projectile/impl/EntityDragonFireball.mapping b/mappings/net/minecraft/entity/projectile/impl/EntityDragonFireball.mapping index ff9865c3d1..3d04fdbaee 100644 --- a/mappings/net/minecraft/entity/projectile/impl/EntityDragonFireball.mapping +++ b/mappings/net/minecraft/entity/projectile/impl/EntityDragonFireball.mapping @@ -1,4 +1,6 @@ CLASS none/aao net/minecraft/entity/projectile/impl/EntityDragonFireball + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage diff --git a/mappings/net/minecraft/entity/projectile/impl/EntityExplodingWitherSkull.mapping b/mappings/net/minecraft/entity/projectile/impl/EntityExplodingWitherSkull.mapping index 74d6dc684f..15e3b3b117 100644 --- a/mappings/net/minecraft/entity/projectile/impl/EntityExplodingWitherSkull.mapping +++ b/mappings/net/minecraft/entity/projectile/impl/EntityExplodingWitherSkull.mapping @@ -4,6 +4,8 @@ CLASS none/abf net/minecraft/entity/projectile/impl/EntityExplodingWitherSkull ARG 1 world ARG 2 pos ARG 3 state + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage diff --git a/mappings/net/minecraft/entity/projectile/impl/EntityFireball.mapping b/mappings/net/minecraft/entity/projectile/impl/EntityFireball.mapping index 13557bcbe3..290f63e513 100644 --- a/mappings/net/minecraft/entity/projectile/impl/EntityFireball.mapping +++ b/mappings/net/minecraft/entity/projectile/impl/EntityFireball.mapping @@ -1,3 +1,5 @@ CLASS none/aas net/minecraft/entity/projectile/impl/EntityFireball + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V diff --git a/mappings/net/minecraft/entity/projectile/impl/EntitySmallFireball.mapping b/mappings/net/minecraft/entity/projectile/impl/EntitySmallFireball.mapping index 9b413ae56e..26fb2717dd 100644 --- a/mappings/net/minecraft/entity/projectile/impl/EntitySmallFireball.mapping +++ b/mappings/net/minecraft/entity/projectile/impl/EntitySmallFireball.mapping @@ -1,4 +1,6 @@ CLASS none/aaw net/minecraft/entity/projectile/impl/EntitySmallFireball + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage diff --git a/mappings/net/minecraft/entity/projectile/impl/EntitySpectralArrow.mapping b/mappings/net/minecraft/entity/projectile/impl/EntitySpectralArrow.mapping index cb74779690..1ec7e5b3ba 100644 --- a/mappings/net/minecraft/entity/projectile/impl/EntitySpectralArrow.mapping +++ b/mappings/net/minecraft/entity/projectile/impl/EntitySpectralArrow.mapping @@ -1,4 +1,6 @@ CLASS none/aay net/minecraft/entity/projectile/impl/EntitySpectralArrow METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a onHit (Lnone/sn;)V + ARG 0 entity METHOD b serializeEntityTag (Lnone/dt;)V METHOD m update ()V diff --git a/mappings/net/minecraft/entity/thrown/EntityThrown.mapping b/mappings/net/minecraft/entity/thrown/EntityThrown.mapping index ce3b12f5a2..6e7caff396 100644 --- a/mappings/net/minecraft/entity/thrown/EntityThrown.mapping +++ b/mappings/net/minecraft/entity/thrown/EntityThrown.mapping @@ -1,4 +1,6 @@ CLASS none/aaz net/minecraft/entity/thrown/EntityThrown + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V METHOD m update ()V diff --git a/mappings/net/minecraft/entity/thrown/impl/EntitySnowball.mapping b/mappings/net/minecraft/entity/thrown/impl/EntitySnowball.mapping index c3ac18d75b..7689f0d890 100644 --- a/mappings/net/minecraft/entity/thrown/impl/EntitySnowball.mapping +++ b/mappings/net/minecraft/entity/thrown/impl/EntitySnowball.mapping @@ -1 +1,3 @@ CLASS none/aax net/minecraft/entity/thrown/impl/EntitySnowball + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit diff --git a/mappings/net/minecraft/entity/thrown/impl/EntityThrownEgg.mapping b/mappings/net/minecraft/entity/thrown/impl/EntityThrownEgg.mapping index 7a11306016..1ab15dc4f8 100644 --- a/mappings/net/minecraft/entity/thrown/impl/EntityThrownEgg.mapping +++ b/mappings/net/minecraft/entity/thrown/impl/EntityThrownEgg.mapping @@ -1 +1,3 @@ CLASS none/aba net/minecraft/entity/thrown/impl/EntityThrownEgg + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit diff --git a/mappings/net/minecraft/entity/thrown/impl/EntityThrownEnderpearl.mapping b/mappings/net/minecraft/entity/thrown/impl/EntityThrownEnderpearl.mapping index 5c5669ff5b..02aed5417f 100644 --- a/mappings/net/minecraft/entity/thrown/impl/EntityThrownEnderpearl.mapping +++ b/mappings/net/minecraft/entity/thrown/impl/EntityThrownEnderpearl.mapping @@ -1,2 +1,4 @@ CLASS none/abb net/minecraft/entity/thrown/impl/EntityThrownEnderpearl + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit METHOD m update ()V diff --git a/mappings/net/minecraft/entity/thrown/impl/EntityThrownExperienceBottle.mapping b/mappings/net/minecraft/entity/thrown/impl/EntityThrownExperienceBottle.mapping index 45fcc75cbe..2d7a7fde58 100644 --- a/mappings/net/minecraft/entity/thrown/impl/EntityThrownExperienceBottle.mapping +++ b/mappings/net/minecraft/entity/thrown/impl/EntityThrownExperienceBottle.mapping @@ -1 +1,3 @@ CLASS none/abc net/minecraft/entity/thrown/impl/EntityThrownExperienceBottle + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit diff --git a/mappings/net/minecraft/entity/thrown/impl/EntityThrownPotion.mapping b/mappings/net/minecraft/entity/thrown/impl/EntityThrownPotion.mapping index 54f0e16fa5..3b6da4ddf2 100644 --- a/mappings/net/minecraft/entity/thrown/impl/EntityThrownPotion.mapping +++ b/mappings/net/minecraft/entity/thrown/impl/EntityThrownPotion.mapping @@ -1,4 +1,6 @@ CLASS none/abd net/minecraft/entity/thrown/impl/EntityThrownPotion FIELD e LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V