diff --git a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping index 71f8655ff5..854c6aff13 100644 --- a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping +++ b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping @@ -38,6 +38,11 @@ CLASS none/boh net/minecraft/client/player/EntityPlayerClient METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage + METHOD a (Lnone/sg;)V + ARG 0 entity + METHOD a startRiding (Lnone/sg;Z)Z + ARG 0 entity + ARG 1 ignoreRequirements METHOD a openHorseInventory (Lnone/xd;Lnone/qv;)V METHOD a spawnEntityItem (Lnone/za;)Lnone/aes; ARG 0 entityItem @@ -51,5 +56,5 @@ CLASS none/boh net/minecraft/client/player/EntityPlayerClient METHOD d move (DDD)V METHOD g sendChatMessage (Ljava/lang/String;)V ARG 0 message - METHOD p dismountVehicle ()V + METHOD p stopRiding ()V METHOD y_ update ()V diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index ebabd1a5ed..22417d9f5a 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -32,13 +32,14 @@ CLASS none/sg net/minecraft/entity/Entity FIELD as uuidString Ljava/lang/String; FIELD at glowing Z FIELD au passengerList Ljava/util/List; - FIELD av vehicle Lnone/sg; + FIELD av ridingEntity Lnone/sg; FIELD aw boundingBox Lnone/bcs; FIELD az fireTimer I FIELD b EMPTY_STACK_LIST Ljava/util/List; FIELD c NULL_BOX Lnone/bcs; FIELD g maxEntityId I FIELD h entityId I + FIELD j startRidingCooldown I FIELD l world Lnone/aiw; FIELD m prevX D FIELD n prevY D @@ -60,6 +61,7 @@ CLASS none/sg net/minecraft/entity/Entity METHOD O getEntityId ()I METHOD R getDataTracker ()Lnone/km; METHOD T invalidate ()V + METHOD U ()V METHOD X extinguish ()V METHOD a setPositionAnglesAndUpdate (DDDFF)V ARG 0 x @@ -67,6 +69,12 @@ CLASS none/sg net/minecraft/entity/Entity ARG 2 z ARG 3 yaw ARG 4 pitch + METHOD a (DDDFFIZ)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 yaw + ARG 4 pitch METHOD a hasPermission (ILjava/lang/String;)Z ARG 0 permissionLevel ARG 1 commandName @@ -127,6 +135,10 @@ CLASS none/sg net/minecraft/entity/Entity METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage + METHOD a (Lnone/sg;)V + METHOD a startRiding (Lnone/sg;Z)Z + ARG 0 entity + ARG 1 ignoreRequirements METHOD a setEquippedStack (Lnone/sl;Lnone/aes;)V ARG 0 slot ARG 1 stack @@ -153,6 +165,7 @@ CLASS none/sg net/minecraft/entity/Entity METHOD ad isSilent ()Z METHOD ae isUnaffectedByGravity ()Z METHOD au isValid ()Z + METHOD az removeAllPassengers ()V METHOD b setPosition (DDD)V ARG 0 x ARG 1 y @@ -176,7 +189,7 @@ CLASS none/sg net/minecraft/entity/Entity ARG 0 tag METHOD b isInvulnerableTo (Lnone/rr;)Z ARG 0 source - METHOD bB getVehicle ()Lnone/sg; + METHOD bB getRidingEntity ()Lnone/sg; METHOD bC getSoundCategory ()Lnone/nm; METHOD be getUuid ()Ljava/util/UUID; METHOD bf getUuidAsString ()Ljava/lang/String; @@ -261,12 +274,18 @@ CLASS none/sg net/minecraft/entity/Entity ARG 0 index METHOD l setBreath (I)V ARG 0 value + METHOD m startRiding (Lnone/sg;)Z + ARG 0 entity + METHOD n canStartRiding (Lnone/sg;)Z + ARG 0 entity METHOD n_ hasCustomName ()Z - METHOD o startRiding (Lnone/sg;)V + METHOD o addPassenger (Lnone/sg;)V ARG 0 entity METHOD o_ getPistonBehavior ()Lnone/ayu; - METHOD p dismountVehicle ()V - METHOD p stopRiding (Lnone/sg;)V + METHOD p stopRiding ()V + METHOD p removePassenger (Lnone/sg;)V + ARG 0 entity + METHOD q canFitPassenger (Lnone/sg;)Z ARG 0 entity METHOD u setPositionAndAngles (Lnone/sg;)V ARG 0 other diff --git a/mappings/net/minecraft/entity/EntityLiving.mapping b/mappings/net/minecraft/entity/EntityLiving.mapping index 86249ac500..9ff61a079f 100644 --- a/mappings/net/minecraft/entity/EntityLiving.mapping +++ b/mappings/net/minecraft/entity/EntityLiving.mapping @@ -13,6 +13,13 @@ CLASS none/sp net/minecraft/entity/EntityLiving METHOD D canSee (Lnone/sg;)Z ARG 0 other METHOD F updatePotionVisibility ()V + METHOD U ()V + METHOD a (DDDFFIZ)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 yaw + ARG 4 pitch METHOD a containsOnlyAmbientEffects (Ljava/util/Collection;)Z ARG 0 effects METHOD a deserializeCustomData (Lnone/dt;)V @@ -87,5 +94,5 @@ CLASS none/sp net/minecraft/entity/EntityLiving METHOD i initDataTracker ()V METHOD l_ isChild ()Z METHOD m_ canClimb ()Z - METHOD p dismountVehicle ()V + METHOD p stopRiding ()V METHOD y_ update ()V diff --git a/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping b/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping index df07ccca9c..4f9b9ee67a 100644 --- a/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping +++ b/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping @@ -27,3 +27,5 @@ CLASS none/xr net/minecraft/entity/boss/EntityEnderDragon METHOD c addPotionEffect (Lnone/sa;)V ARG 0 effect METHOD i initDataTracker ()V + METHOD n canStartRiding (Lnone/sg;)Z + ARG 0 entity diff --git a/mappings/net/minecraft/entity/boss/EntityWither.mapping b/mappings/net/minecraft/entity/boss/EntityWither.mapping index 875d5a6552..ea335daee2 100644 --- a/mappings/net/minecraft/entity/boss/EntityWither.mapping +++ b/mappings/net/minecraft/entity/boss/EntityWither.mapping @@ -36,3 +36,5 @@ CLASS none/yl net/minecraft/entity/boss/EntityWither METHOD i initDataTracker ()V METHOD m getTrackedEntityId (I)I ARG 0 headIndex + METHOD n canStartRiding (Lnone/sg;)Z + ARG 0 entity diff --git a/mappings/net/minecraft/entity/decoration/EntityDecorationBase.mapping b/mappings/net/minecraft/entity/decoration/EntityDecorationBase.mapping index c83ef429b9..75672aa048 100644 --- a/mappings/net/minecraft/entity/decoration/EntityDecorationBase.mapping +++ b/mappings/net/minecraft/entity/decoration/EntityDecorationBase.mapping @@ -19,6 +19,8 @@ CLASS none/yo net/minecraft/entity/decoration/EntityDecorationBase METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage + METHOD a (Lnone/sg;)V + ARG 0 entity METHOD a onStruckByLightning (Lnone/yx;)V ARG 0 lightning METHOD b setPosition (DDD)V diff --git a/mappings/net/minecraft/entity/decoration/EntityItemFrame.mapping b/mappings/net/minecraft/entity/decoration/EntityItemFrame.mapping index 760f9f39a8..e18f3e3474 100644 --- a/mappings/net/minecraft/entity/decoration/EntityItemFrame.mapping +++ b/mappings/net/minecraft/entity/decoration/EntityItemFrame.mapping @@ -23,6 +23,8 @@ CLASS none/yp net/minecraft/entity/decoration/EntityItemFrame METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage + METHOD a (Lnone/sg;)V + ARG 0 entity METHOD b interact (Lnone/aam;Lnone/rb;)Z ARG 0 player ARG 1 hand diff --git a/mappings/net/minecraft/entity/decoration/EntityLeashKnot.mapping b/mappings/net/minecraft/entity/decoration/EntityLeashKnot.mapping index 340d07dd14..86c25df344 100644 --- a/mappings/net/minecraft/entity/decoration/EntityLeashKnot.mapping +++ b/mappings/net/minecraft/entity/decoration/EntityLeashKnot.mapping @@ -3,6 +3,8 @@ CLASS none/yq net/minecraft/entity/decoration/EntityLeashKnot ARG 0 facing METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a (Lnone/sg;)V + ARG 0 entity METHOD b setPosition (DDD)V ARG 0 x ARG 1 y diff --git a/mappings/net/minecraft/entity/decoration/EntityPainting.mapping b/mappings/net/minecraft/entity/decoration/EntityPainting.mapping index 32fbe728c5..6fa564e499 100644 --- a/mappings/net/minecraft/entity/decoration/EntityPainting.mapping +++ b/mappings/net/minecraft/entity/decoration/EntityPainting.mapping @@ -29,8 +29,16 @@ CLASS none/yr net/minecraft/entity/decoration/EntityPainting FIELD y SKELETON Lnone/yr$a; FIELD z DONKEY_KONG Lnone/yr$a; FIELD c type Lnone/yr$a; + METHOD a (DDDFFIZ)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 yaw + ARG 4 pitch METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a (Lnone/sg;)V + ARG 0 entity METHOD b setPositionAndAngles (DDDFF)V ARG 0 x ARG 1 y diff --git a/mappings/net/minecraft/entity/mob/EntityAquatic.mapping b/mappings/net/minecraft/entity/mob/EntityAquatic.mapping index 215c11a5fa..3cc4895a2a 100644 --- a/mappings/net/minecraft/entity/mob/EntityAquatic.mapping +++ b/mappings/net/minecraft/entity/mob/EntityAquatic.mapping @@ -1 +1,2 @@ CLASS none/xa net/minecraft/entity/mob/EntityAquatic + METHOD U ()V diff --git a/mappings/net/minecraft/entity/mob/EntityMob.mapping b/mappings/net/minecraft/entity/mob/EntityMob.mapping index c4b22f1592..836ac9efd3 100644 --- a/mappings/net/minecraft/entity/mob/EntityMob.mapping +++ b/mappings/net/minecraft/entity/mob/EntityMob.mapping @@ -13,6 +13,7 @@ CLASS none/sq net/minecraft/entity/mob/EntityMob FIELD bz pickUpLoot Z METHOD G getSoundAmbient ()Lnone/nk; METHOD J ()Lnone/kp; + METHOD U ()V METHOD a canBeLeashedBy (Lnone/aam;)Z ARG 0 player METHOD a interactMob (Lnone/aam;Lnone/rb;)Z @@ -23,6 +24,9 @@ CLASS none/sq net/minecraft/entity/mob/EntityMob METHOD a registerTagUpgraders (Lnone/pf;Ljava/lang/Class;)V ARG 0 handler ARG 1 entityClass + METHOD a startRiding (Lnone/sg;Z)Z + ARG 0 entity + ARG 1 ignoreRequirements METHOD a setEquippedStack (Lnone/sl;Lnone/aes;)V ARG 0 slot ARG 1 stack diff --git a/mappings/net/minecraft/entity/mob/EntityPigZombie.mapping b/mappings/net/minecraft/entity/mob/EntityPigZombie.mapping index f0736f412e..ff42b14743 100644 --- a/mappings/net/minecraft/entity/mob/EntityPigZombie.mapping +++ b/mappings/net/minecraft/entity/mob/EntityPigZombie.mapping @@ -11,6 +11,8 @@ CLASS none/zr net/minecraft/entity/mob/EntityPigZombie METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage + METHOD a (Lnone/sg;)V + ARG 0 entity METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD b registerTagUpgraders (Lnone/pf;)V diff --git a/mappings/net/minecraft/entity/mob/EntityShulker.mapping b/mappings/net/minecraft/entity/mob/EntityShulker.mapping index 34c13c470e..51817ef508 100644 --- a/mappings/net/minecraft/entity/mob/EntityShulker.mapping +++ b/mappings/net/minecraft/entity/mob/EntityShulker.mapping @@ -19,6 +19,12 @@ CLASS none/zu net/minecraft/entity/mob/EntityShulker FIELD c PEEK_AMOUNT Lnone/kj; METHOD G getSoundAmbient ()Lnone/nk; METHOD J ()Lnone/kp; + METHOD a (DDDFFIZ)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 yaw + ARG 4 pitch METHOD a setPeekAmount (I)V ARG 0 value METHOD a deserializeCustomData (Lnone/dt;)V diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping index 5bfca3a6eb..666d57f89c 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping @@ -86,6 +86,8 @@ CLASS none/aam net/minecraft/entity/player/EntityPlayer METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage + METHOD a (Lnone/sg;)V + ARG 0 entity METHOD a interactWith (Lnone/sg;Lnone/rb;)Lnone/rd; ARG 0 entity ARG 1 hand @@ -140,7 +142,7 @@ CLASS none/aam net/minecraft/entity/player/EntityPlayer ARG 0 amount METHOD n setReducedDebugInfo (Z)V ARG 0 value - METHOD p dismountVehicle ()V + METHOD p stopRiding ()V METHOD y isSpectator ()Z METHOD y_ update ()V METHOD z isCreative ()Z diff --git a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping index 857370729a..f3587ccc8b 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping @@ -52,6 +52,11 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage + METHOD a (Lnone/sg;)V + ARG 0 entity + METHOD a startRiding (Lnone/sg;Z)Z + ARG 0 entity + ARG 1 ignoreRequirements METHOD a openHorseInventory (Lnone/xd;Lnone/qv;)V METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag @@ -64,7 +69,7 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer ARG 0 entity METHOD f attack (Lnone/sg;)V ARG 0 entity - METHOD p dismountVehicle ()V + METHOD p stopRiding ()V METHOD s closeGui ()V METHOD x getWorldServer ()Lnone/lu; METHOD y isSpectator ()Z diff --git a/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping b/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping index b3dabbcec0..e0de66b3a8 100644 --- a/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping @@ -9,6 +9,12 @@ CLASS none/aap net/minecraft/entity/projectile/EntityArrowBase METHOD (Lnone/aiw;Lnone/sp;)V ARG 0 world ARG 1 owner + METHOD a (DDDFFIZ)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 yaw + ARG 4 pitch METHOD a onCollision (Lnone/bct;)V ARG 0 hit METHOD a deserializeCustomData (Lnone/dt;)V diff --git a/mappings/net/minecraft/entity/projectile/EntityFishHook.mapping b/mappings/net/minecraft/entity/projectile/EntityFishHook.mapping index 69b89c2d34..4a93aedfe4 100644 --- a/mappings/net/minecraft/entity/projectile/EntityFishHook.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityFishHook.mapping @@ -1,6 +1,12 @@ CLASS none/yt net/minecraft/entity/projectile/EntityFishHook FIELD c HOOK_ENTITY_ID Lnone/kj; METHOD T invalidate ()V + METHOD a (DDDFFIZ)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 yaw + ARG 4 pitch METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a onTrackedDataSet (Lnone/kj;)V diff --git a/mappings/net/minecraft/entity/vehicle/EntityBoat.mapping b/mappings/net/minecraft/entity/vehicle/EntityBoat.mapping index 288b3dc187..5b22224dd3 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityBoat.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityBoat.mapping @@ -17,22 +17,34 @@ CLASS none/abj net/minecraft/entity/vehicle/EntityBoat METHOD a getType (Ljava/lang/String;)Lnone/abj$b; ARG 0 name METHOD b getId ()I + METHOD values values ()[Lnone/abj$b; FIELD d BOAT_TYPE Lnone/kj; METHOD (Lnone/aiw;DDD)V ARG 0 world ARG 1 x ARG 2 y ARG 3 z + METHOD a (DDDFFIZ)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 yaw + ARG 4 pitch METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage + METHOD a (Lnone/sg;)V + ARG 0 entity METHOD b interact (Lnone/aam;Lnone/rb;)Z ARG 0 player ARG 1 hand METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD i initDataTracker ()V + METHOD j getBoatItem ()Lnone/aeq; + METHOD q canFitPassenger (Lnone/sg;)Z + ARG 0 entity METHOD r getBoatType ()Lnone/abj$b; METHOD y_ update ()V diff --git a/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping b/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping index 9e03431082..c0b34c474c 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping @@ -28,6 +28,12 @@ CLASS none/abk net/minecraft/entity/vehicle/EntityMinecartBase ARG 3 z METHOD A hasCustomBlock ()Z METHOD T invalidate ()V + METHOD a (DDDFFIZ)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 yaw + ARG 4 pitch METHOD a onActivatorRail (IIIZ)V ARG 0 x ARG 1 y diff --git a/mappings/none/boi.mapping b/mappings/none/boi.mapping index 77b545b24e..31005f420b 100644 --- a/mappings/none/boi.mapping +++ b/mappings/none/boi.mapping @@ -1,4 +1,10 @@ CLASS none/boi + METHOD a (DDDFFIZ)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 yaw + ARG 4 pitch METHOD a hasPermission (ILjava/lang/String;)Z ARG 0 permissionLevel ARG 1 commandName