From e375b9927027de6e864c15971b1715f4127b0862 Mon Sep 17 00:00:00 2001 From: NeunEinser Date: Tue, 7 May 2019 13:19:00 +0200 Subject: [PATCH] Entity mappings (#657) * Entity mapping modifications * Entity mapping renames * improvements * xp -> experience, Snowgolem -> SnowGolem, spitout -> spitOut, lastLeveledUp -> lastPlayedLevelUpSoundTime, missed an instance of targetting * Rename SnowgolemEntity.mapping to SnowGolemEntity.mapping Stupid file system doesn't make a difference between cases. * touchingLava -> inLava, touchLava() - setInLava() * putOnTopmostSolidBlock -> afterSpawn * owner -> actor, other improvements * Actors are evil. Or something. * Missed some actors, reverted stuff that's now part of #663 * isInfestableBlock -> isInfestable * getRegularBlock(BlockState) ->fromRegularBlock Another method with inverse logic in that class. * use method name from main branch for surface collision --- .../net/minecraft/block/InfestedBlock.mapping | 10 +- .../ClientPlayerInteractionManager.mapping | 9 ++ .../packet/SetTradeOffersPacket.mapping | 6 +- .../entity/AreaEffectCloudEntity.mapping | 15 ++- .../net/minecraft/entity/CrossbowUser.mapping | 2 + .../net/minecraft/entity/DamageUtil.mapping | 3 + .../minecraft/entity/EnderEyeEntity.mapping | 17 +++ mappings/net/minecraft/entity/Entity.mapping | 109 ++++++++++++++++-- .../minecraft/entity/EntityCategory.mapping | 5 + .../net/minecraft/entity/EntitySize.mapping | 4 + .../net/minecraft/entity/EntityType.mapping | 52 ++++++++- .../minecraft/entity/EquipmentSlot.mapping | 3 + .../entity/ExperienceOrbEntity.mapping | 4 + .../entity/FallingBlockEntity.mapping | 4 + .../minecraft/entity/FireworkEntity.mapping | 8 ++ .../entity/InteractionObserver.mapping | 1 + .../net/minecraft/entity/ItemEntity.mapping | 10 ++ .../net/minecraft/entity/JumpingMount.mapping | 2 + .../net/minecraft/entity/LivingEntity.mapping | 21 ++++ .../minecraft/entity/PrimedTntEntity.mapping | 3 + .../minecraft/entity/SpawnRestriction.mapping | 8 ++ .../entity/ai/GoToOwnerAndPurrGoal.mapping | 2 - .../entity/ai/RangedAttackMob.mapping | 3 + .../entity/ai/RangedAttacker.mapping | 3 - .../entity/ai/goal/AnimalMateGoal.mapping | 5 +- .../entity/ai/goal/AttackGoal.mapping | 2 + .../ai/goal/AttackWithOwnerGoal.mapping | 4 +- .../entity/ai/goal/AvoidSunlightGoal.mapping | 4 +- .../entity/ai/goal/BowAttackGoal.mapping | 11 ++ .../entity/ai/goal/BreakDoorGoal.mapping | 9 ++ .../entity/ai/goal/BreatheAirGoal.mapping | 6 +- .../entity/ai/goal/CatSitOnBlockGoal.mapping | 3 + .../entity/ai/goal/ChaseBoatGoal.mapping | 4 +- .../entity/ai/goal/CreeperIgniteGoal.mapping | 4 +- .../entity/ai/goal/CrossbowAttackGoal.mapping | 8 +- .../goal/DisableableFollowTargetGoal.mapping | 8 ++ .../entity/ai/goal/DolphinJumpGoal.mapping | 1 + .../entity/ai/goal/DoorInteractGoal.mapping | 6 +- .../entity/ai/goal/EatGrassGoal.mapping | 4 +- .../entity/ai/goal/EscapeDangerGoal.mapping | 6 +- .../entity/ai/goal/EscapeSunlightGoal.mapping | 4 +- .../entity/ai/goal/FleeEntityGoal.mapping | 26 ++--- .../entity/ai/goal/FlyToOwnerGoal.mapping | 1 - .../ai/goal/FollowGroupLeaderGoal.mapping | 5 +- .../entity/ai/goal/FollowMobGoal.mapping | 12 ++ .../ai/goal/FollowOwnerFlyingGoal.mapping | 1 + .../entity/ai/goal/FollowOwnerGoal.mapping | 11 +- .../entity/ai/goal/FollowParentGoal.mapping | 7 +- .../entity/ai/goal/FollowTargetGoal.mapping | 9 +- .../ai/goal/FollowTargetIfTamedGoal.mapping | 6 + .../entity/ai/goal/FormCaravanGoal.mapping | 5 +- .../ai/goal/GoToEntityTargetGoal.mapping | 10 +- .../ai/goal/GoToOwnerAndPurrGoal.mapping | 6 + .../entity/ai/goal/GoToVillageGoal.mapping | 5 +- .../entity/ai/goal/GoToWalkTargetGoal.mapping | 3 + .../entity/ai/goal/HoldInHandsGoal.mapping | 6 + .../ai/goal/HorseBondWithPlayerGoal.mapping | 4 +- .../entity/ai/goal/IronGolemLookGoal.mapping | 4 +- .../ai/goal/LongDoorInteractGoal.mapping | 2 +- .../entity/ai/goal/LookAroundGoal.mapping | 4 +- .../entity/ai/goal/LookAtCustomerGoal.mapping | 2 +- .../entity/ai/goal/LookAtEntityGoal.mapping | 6 +- .../entity/ai/goal/MeleeAttackGoal.mapping | 9 +- .../entity/ai/goal/MoveIntoWaterGoal.mapping | 4 +- .../ai/goal/MoveThroughVillageGoal.mapping | 9 ++ .../ai/goal/MoveToRaidCenterGoal.mapping | 5 +- .../ai/goal/MoveToTargetPosGoal.mapping | 6 +- .../ai/goal/ParrotClimbOntoPlayerGoal.mapping | 6 - .../entity/ai/goal/PounceAtTargetGoal.mapping | 6 +- .../ai/goal/ProjectileAttackGoal.mapping | 15 ++- .../minecraft/entity/ai/goal/RaidGoal.mapping | 5 + .../entity/ai/goal/RevengeGoal.mapping | 5 + .../minecraft/entity/ai/goal/SitGoal.mapping | 5 +- .../entity/ai/goal/SitOnOwnerShoulder.mapping | 6 + .../entity/ai/goal/SkeletonHorseGoal.mapping | 2 - .../goal/SkeletonHorseTrapTriggerGoal.mapping | 9 ++ .../ai/goal/StepAndDestroyBlockGoal.mapping | 4 +- .../ai/goal/StopFollowingCustomerGoal.mapping | 3 + .../minecraft/entity/ai/goal/SwimGoal.mapping | 4 +- .../entity/ai/goal/TemptGoal.mapping | 12 +- .../entity/ai/goal/TrackAttackerGoal.mapping | 1 - .../ai/goal/TrackIronGolemTargetGoal.mapping | 4 +- .../ai/goal/TrackOwnerAttackerGoal.mapping | 6 + .../entity/ai/goal/TrackTargetGoal.mapping | 9 +- .../ai/goal/WanderAroundFarGoal.mapping | 6 +- .../entity/ai/goal/WanderAroundGoal.mapping | 6 +- .../entity/ai/goal/WeightedGoal.mapping | 3 + .../entity/ai/goal/WolfBegGoal.mapping | 5 +- .../entity/ai/goal/ZombieAttackGoal.mapping | 5 + .../ai/goal/ZombieRaiseArmsGoal.mapping | 2 - .../ai/pathing/EntityNavigation.mapping | 3 + .../AbstractEntityAttributeContainer.mapping | 4 + .../attribute/EntityAttributeInstance.mapping | 1 + .../EntityAttributeInstanceImpl.mapping | 1 + .../attribute/EntityAttributeModifier.mapping | 3 + .../entity/attribute/EntityAttributes.mapping | 2 + .../net/minecraft/entity/boss/BossBar.mapping | 2 +- .../entity/boss/BossBarManager.mapping | 13 ++- .../entity/boss/CommandBossBar.mapping | 13 +++ .../entity/boss/ServerBossBar.mapping | 7 +- .../entity/boss/WitherEntity.mapping | 27 +++++ .../boss/dragon/EnderDragonEntity.mapping | 2 +- .../boss/dragon/EnderDragonPart.mapping | 3 + .../boss/dragon/EnderDragonSpawnState.mapping | 3 + .../minecraft/entity/mob/BlazeEntity.mapping | 4 + .../entity/mob/DrownedEntity.mapping | 40 ++++++- .../entity/mob/EndermanEntity.mapping | 19 ++- .../minecraft/entity/mob/EvokerEntity.mapping | 9 +- .../entity/mob/EvokerFangsEntity.mapping | 3 + .../minecraft/entity/mob/GhastEntity.mapping | 12 +- .../entity/mob/GuardianEntity.mapping | 8 +- .../entity/mob/IllagerEntity.mapping | 1 + .../minecraft/entity/mob/MobEntity.mapping | 15 ++- .../entity/mob/MobEntityWithAi.mapping | 1 + .../entity/mob/MobVisibilityCache.mapping | 3 + .../minecraft/entity/mob/PatrolEntity.mapping | 8 +- .../entity/mob/PhantomEntity.mapping | 9 +- .../entity/mob/RavagerEntity.mapping | 1 + .../entity/mob/ShulkerEntity.mapping | 4 + .../entity/mob/SilverfishEntity.mapping | 12 ++ .../entity/mob/SkeletonHorseEntity.mapping | 5 + .../minecraft/entity/mob/SlimeEntity.mapping | 18 +++ .../mob/SpellcastingIllagerEntity.mapping | 11 ++ .../minecraft/entity/mob/SpiderEntity.mapping | 11 ++ .../minecraft/entity/mob/VexEntity.mapping | 6 + .../entity/mob/VindicatorEntity.mapping | 9 +- .../minecraft/entity/mob/ZombieEntity.mapping | 3 + .../entity/mob/ZombiePigmanEntity.mapping | 7 ++ .../entity/mob/ZombieVillagerEntity.mapping | 5 + .../passive/AbstractDonkeyEntity.mapping | 1 + .../passive/AbstractTraderEntity.mapping | 3 + .../entity/passive/BatEntity.mapping | 2 + .../entity/passive/CatEntity.mapping | 20 +++- .../entity/passive/DolphinEntity.mapping | 7 ++ .../entity/passive/FishEntity.mapping | 6 + .../entity/passive/FoxEntity.mapping | 54 ++++++++- .../entity/passive/HorseBaseEntity.mapping | 7 +- .../entity/passive/HorseEntity.mapping | 5 + .../entity/passive/LlamaEntity.mapping | 3 + .../entity/passive/MooshroomEntity.mapping | 9 +- .../entity/passive/OcelotEntity.mapping | 13 ++- .../entity/passive/PandaEntity.mapping | 30 ++++- .../entity/passive/PufferfishEntity.mapping | 4 + .../entity/passive/RabbitEntity.mapping | 26 ++++- .../passive/SchoolingFishEntity.mapping | 4 + .../entity/passive/SnowGolemEntity.mapping | 5 + .../entity/passive/SnowmanEntity.mapping | 4 - .../entity/passive/SquidEntity.mapping | 6 +- .../entity/passive/TameableEntity.mapping | 5 + .../passive/TameableShoulderEntity.mapping | 1 + .../entity/passive/TraderLlamaEntity.mapping | 4 + .../entity/passive/TropicalFishEntity.mapping | 7 ++ .../entity/passive/TurtleEntity.mapping | 20 ++-- .../entity/passive/VillagerEntity.mapping | 10 +- .../passive/WanderingTraderEntity.mapping | 8 ++ .../entity/passive/WolfEntity.mapping | 7 ++ .../entity/player/PlayerEntity.mapping | 58 +++++++++- .../entity/player/PlayerInventory.mapping | 25 ++++ .../projectile/AbstractFireballEntity.mapping | 2 + .../entity/projectile/ArrowEntity.mapping | 8 ++ .../projectile/DragonFireballEntity.mapping | 14 +++ .../ExplodingWitherSkullEntity.mapping | 15 +++ .../ExplosiveProjectileEntity.mapping | 15 ++- .../entity/projectile/FireballEntity.mapping | 14 +++ .../entity/projectile/FishHookEntity.mapping | 19 +++ .../entity/projectile/LlamaSpitEntity.mapping | 11 ++ .../entity/projectile/Projectile.mapping | 1 + .../projectile/ProjectileEntity.mapping | 12 ++ .../projectile/ShulkerBulletEntity.mapping | 12 ++ .../projectile/SmallFireballEntity.mapping | 14 +++ .../projectile/SpectralArrowEntity.mapping | 8 ++ .../entity/projectile/TridentEntity.mapping | 9 ++ .../net/minecraft/entity/raid/Raid.mapping | 23 +++- .../minecraft/entity/raid/RaidManager.mapping | 12 ++ .../entity/raid/RaiderEntity.mapping | 18 ++- .../entity/thrown/SnowballEntity.mapping | 8 ++ .../entity/thrown/ThrownEggEntity.mapping | 8 ++ .../thrown/ThrownEnderpearlEntity.mapping | 8 ++ .../ThrownExperienceBottleEntity.mapping | 8 ++ .../entity/thrown/ThrownItemEntity.mapping | 1 + .../vehicle/AbstractMinecartEntity.mapping | 6 +- .../vehicle/ChestMinecartEntity.mapping | 5 + .../CommandBlockMinecartEntity.mapping | 5 + .../vehicle/FurnaceMinecartEntity.mapping | 7 ++ .../vehicle/HopperMinecartEntity.mapping | 7 ++ .../entity/vehicle/MinecartEntity.mapping | 5 + .../vehicle/MobSpawnerMinecartEntity.mapping | 5 + .../vehicle/StorageMinecartEntity.mapping | 9 ++ .../net/minecraft/inventory/Inventory.mapping | 2 +- .../minecraft/world/MobSpawnerLogic.mapping | 2 + .../minecraft/world/PersistentState.mapping | 2 + 191 files changed, 1463 insertions(+), 184 deletions(-) delete mode 100644 mappings/net/minecraft/entity/ai/GoToOwnerAndPurrGoal.mapping create mode 100644 mappings/net/minecraft/entity/ai/RangedAttackMob.mapping delete mode 100644 mappings/net/minecraft/entity/ai/RangedAttacker.mapping delete mode 100644 mappings/net/minecraft/entity/ai/goal/FlyToOwnerGoal.mapping create mode 100644 mappings/net/minecraft/entity/ai/goal/FollowOwnerFlyingGoal.mapping create mode 100644 mappings/net/minecraft/entity/ai/goal/GoToOwnerAndPurrGoal.mapping delete mode 100644 mappings/net/minecraft/entity/ai/goal/ParrotClimbOntoPlayerGoal.mapping create mode 100644 mappings/net/minecraft/entity/ai/goal/SitOnOwnerShoulder.mapping delete mode 100644 mappings/net/minecraft/entity/ai/goal/SkeletonHorseGoal.mapping create mode 100644 mappings/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.mapping delete mode 100644 mappings/net/minecraft/entity/ai/goal/TrackAttackerGoal.mapping create mode 100644 mappings/net/minecraft/entity/ai/goal/TrackOwnerAttackerGoal.mapping create mode 100644 mappings/net/minecraft/entity/ai/goal/ZombieAttackGoal.mapping delete mode 100644 mappings/net/minecraft/entity/ai/goal/ZombieRaiseArmsGoal.mapping create mode 100644 mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping delete mode 100644 mappings/net/minecraft/entity/passive/SnowmanEntity.mapping diff --git a/mappings/net/minecraft/block/InfestedBlock.mapping b/mappings/net/minecraft/block/InfestedBlock.mapping index 6796e36a2d..a18cbf0001 100644 --- a/mappings/net/minecraft/block/InfestedBlock.mapping +++ b/mappings/net/minecraft/block/InfestedBlock.mapping @@ -1,11 +1,11 @@ CLASS bpe net/minecraft/block/InfestedBlock FIELD a regularBlock Lbml; - FIELD b INFESTED_TO_REGULAR Ljava/util/Map; + FIELD b REGULAR_TO_INFESTED Ljava/util/Map; METHOD (Lbml;Lbml$c;)V ARG 1 regularBlock ARG 2 settings METHOD d getRegularBlock ()Lbml; - METHOD e getRegularBlock (Lbml;)Lbvj; - ARG 0 infestedBlockState - METHOD j hasRegularBlock (Lbvj;)Z - ARG 0 infestedBlockState + METHOD e fromRegularBlock (Lbml;)Lbvj; + ARG 0 regularBlock + METHOD j isInfestable (Lbvj;)Z + ARG 0 block diff --git a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping index 7195338e53..5869d6358c 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping @@ -20,6 +20,8 @@ CLASS dhk net/minecraft/client/network/ClientPlayerInteractionManager ARG 2 recipe METHOD a copyAbilities (Lavx;)V METHOD a attackEntity (Lavx;Laif;)V + ARG 1 player + ARG 2 target METHOD a interactEntity (Lavx;Laif;Lagz;)Laha; ARG 1 player ARG 2 entity @@ -28,20 +30,27 @@ CLASS dhk net/minecraft/client/network/ClientPlayerInteractionManager METHOD a interactItem (Lavx;Lbhh;Lagz;)Laha; ARG 1 player ARG 2 world + ARG 3 hand METHOD a dropCreativeStack (Lbca;)V METHOD a clickCreativeStack (Lbca;I)V ARG 1 stack METHOD a setGameMode (Lbhe;)V METHOD a createPlayer (Ldhl;Lyu;Lcuy;)Ldjv; + ARG 1 world + ARG 2 stateHandler + ARG 3 recipeBook METHOD a interactBlock (Ldjv;Ldhl;Lagz;Lcrr;)Laha; ARG 1 player ARG 2 world + ARG 3 hand + ARG 4 hitResult METHOD a breakBlock (Lev;)Z METHOD a attackBlock (Lev;Lfa;)Z ARG 1 pos METHOD b cancelBlockBreaking ()V METHOD b stopUsingItem (Lavx;)V METHOD b isCurrentlyBreaking (Lev;)Z + ARG 1 pos METHOD c getReachDistance ()F METHOD d tick ()V METHOD e hasExperienceBar ()Z diff --git a/mappings/net/minecraft/client/network/packet/SetTradeOffersPacket.mapping b/mappings/net/minecraft/client/network/packet/SetTradeOffersPacket.mapping index 53a4db7c59..0177c95f68 100644 --- a/mappings/net/minecraft/client/network/packet/SetTradeOffersPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/SetTradeOffersPacket.mapping @@ -3,15 +3,15 @@ CLASS lr net/minecraft/client/network/packet/SetTradeOffersPacket FIELD b recipes Lbgl; FIELD c levelProgress I FIELD d experience I - FIELD e levelled Z + FIELD e leveled Z METHOD (ILbgl;IIZ)V ARG 1 syncId ARG 2 recipes ARG 3 levelProgress ARG 4 experience - ARG 5 levelled + ARG 5 leveled METHOD b getSyncId ()I METHOD c getOffers ()Lbgl; METHOD d getLevelProgress ()I METHOD e getExperience ()I - METHOD f isLevelled ()Z + METHOD f isLeveled ()Z diff --git a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping index 9c542e0276..5be4a1fe8d 100644 --- a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping +++ b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping @@ -19,17 +19,30 @@ CLASS aie net/minecraft/entity/AreaEffectCloudEntity METHOD (Lbhh;DDD)V ARG 1 world ARG 2 x + ARG 4 y + ARG 6 z METHOD a setRadius (F)V + ARG 1 radius METHOD a setColor (I)V + ARG 1 rgb METHOD a addEffect (Lahz;)V + ARG 1 effect METHOD a setOwner (Laio;)V + ARG 1 owner METHOD a setPotion (Lbdp;)V + ARG 1 potion METHOD a setParticleType (Lgd;)V + ARG 1 particle METHOD a setWaiting (Z)V - METHOD b setRadiusStart (F)V + ARG 1 waiting + METHOD b setRadiusOnUse (F)V + ARG 1 radius METHOD b setDuration (I)V + ARG 1 duration METHOD c setRadiusGrowth (F)V + ARG 1 growth METHOD d setWaitTime (I)V + ARG 1 ticks METHOD f getRadius ()F METHOD i getColor ()I METHOD k getParticleType ()Lgd; diff --git a/mappings/net/minecraft/entity/CrossbowUser.mapping b/mappings/net/minecraft/entity/CrossbowUser.mapping index 4e1ad14ce0..654dd09cf1 100644 --- a/mappings/net/minecraft/entity/CrossbowUser.mapping +++ b/mappings/net/minecraft/entity/CrossbowUser.mapping @@ -1,7 +1,9 @@ CLASS atw net/minecraft/entity/CrossbowUser METHOD a shoot (Laio;Lbca;Lawm;F)V ARG 1 target + ARG 2 crossbow ARG 3 projectile + ARG 4 multiShotSpray METHOD a setCharging (Z)V ARG 1 charging METHOD w getTarget ()Laio; diff --git a/mappings/net/minecraft/entity/DamageUtil.mapping b/mappings/net/minecraft/entity/DamageUtil.mapping index a0bd215eb4..391ee323bc 100644 --- a/mappings/net/minecraft/entity/DamageUtil.mapping +++ b/mappings/net/minecraft/entity/DamageUtil.mapping @@ -1,4 +1,7 @@ CLASS ahm net/minecraft/entity/DamageUtil + METHOD a getInflictedDamage (FF)F + ARG 0 damageDealt + ARG 1 protection METHOD a getDamageLeft (FFF)F ARG 0 damage ARG 1 armor diff --git a/mappings/net/minecraft/entity/EnderEyeEntity.mapping b/mappings/net/minecraft/entity/EnderEyeEntity.mapping index 12dbc0f1fb..c47eca1d4b 100644 --- a/mappings/net/minecraft/entity/EnderEyeEntity.mapping +++ b/mappings/net/minecraft/entity/EnderEyeEntity.mapping @@ -1,2 +1,19 @@ CLASS awg net/minecraft/entity/EnderEyeEntity + FIELD b ITEM Lqh; + FIELD c velocityX D + FIELD d velocityY D + FIELD e velocityZ D FIELD f useCount I + FIELD g dropsItem Z + METHOD (Lbhh;DDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + METHOD a moveTowards (Lev;)V + ARG 1 pos + METHOD b setItem (Lbca;)V + ARG 1 stack + METHOD c (Lbca;)V + ARG 0 stack + METHOD i getTrackedItem ()Lbca; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 7430d9ff25..0edcb5f5f7 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -13,7 +13,7 @@ CLASS aif net/minecraft/entity/Entity FIELD O age I FIELD P insideWater Z FIELD Q waterHeight D - FIELD S isTouchingLava Z + FIELD S inLava Z FIELD V dataTracker Lqk; FIELD W FLAGS Lqh; FIELD X POSE Lqh; @@ -81,6 +81,7 @@ CLASS aif net/minecraft/entity/Entity METHOD U getScoreboardTags ()Ljava/util/Set; METHOD V kill ()V METHOD W getDataTracker ()Lqk; + METHOD X afterSpawn ()V METHOD Y remove ()V METHOD Z getPose ()Laiy; METHOD a handleStatus (B)V @@ -91,6 +92,9 @@ CLASS aif net/minecraft/entity/Entity ARG 1 cursorDeltaX ARG 3 cursorDeltaY METHOD a requestTeleport (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z METHOD a setPositionAnglesAndUpdate (DDDFF)V ARG 1 x ARG 3 y @@ -101,9 +105,12 @@ CLASS aif net/minecraft/entity/Entity ARG 1 x ARG 3 y ARG 5 z + ARG 7 yaw + ARG 8 pitch METHOD a rayTrace (DFZ)Lcrt; ARG 1 maxDistance ARG 3 tickDelta + ARG 4 includeFluids METHOD a fall (DZLbvj;Lev;)V ARG 1 heightDifference ARG 3 onGround @@ -111,16 +118,22 @@ CLASS aif net/minecraft/entity/Entity ARG 5 blockPos METHOD a setRotation (FF)V ARG 1 yaw + ARG 2 pitch METHOD a updateVelocity (FLcrv;)V ARG 1 speed ARG 2 movementInput METHOD a damage (Laho;F)Z ARG 1 source ARG 2 amount + METHOD a updateKilledAdvancementCriterion (Laif;ILaho;)V + ARG 1 killer + ARG 2 score + ARG 3 damageSource METHOD a startRiding (Laif;Z)Z ARG 1 entity METHOD a setEquippedStack (Laik;Lbca;)V ARG 1 slot + ARG 2 stack METHOD a dealDamage (Laio;Laif;)V ARG 1 attacker ARG 2 target @@ -128,31 +141,47 @@ CLASS aif net/minecraft/entity/Entity ARG 1 type ARG 2 offset METHOD a getSize (Laiy;)Laig; + ARG 1 pose METHOD a getEyeHeight (Laiy;Laig;)F + ARG 1 pose + ARG 2 size METHOD a onStruckByLightning (Latl;)V ARG 1 lightning METHOD a interactAt (Lavx;Lcrv;Lagz;)Laha; ARG 1 player ARG 2 hitPos + ARG 3 hand METHOD a dropStack (Lbca;)Lato; + ARG 1 stack METHOD a dropStack (Lbca;F)Lato; ARG 1 stack + ARG 2 yOffset METHOD a canExplosionDestroyBlock (Lbha;Lbgr;Lev;Lbvj;F)Z ARG 1 explosion ARG 2 world ARG 3 pos ARG 4 state + ARG 5 explosionPower METHOD a getEffectiveExplosionResistance (Lbha;Lbgr;Lev;Lbvj;Lckz;F)F ARG 1 explosion ARG 2 world ARG 3 pos - ARG 5 state + ARG 4 blockState + ARG 5 fluidState + ARG 6 max METHOD a dropItem (Lbhg;)Lato; + ARG 1 item METHOD a dropItem (Lbhg;I)Lato; + ARG 1 item + ARG 2 yOffset METHOD a setWorld (Lbhh;)V + ARG 1 world METHOD a applyMirror (Lbpw;)F + ARG 1 mirror METHOD a applyRotation (Lbqw;)F + ARG 1 rotation METHOD a onBlockCollision (Lbvj;)V + ARG 1 state METHOD a slowMovement (Lbvj;Lcrv;)V ARG 1 state ARG 2 multipliers @@ -162,6 +191,7 @@ CLASS aif net/minecraft/entity/Entity ARG 1 anchor ARG 2 target METHOD a setBoundingBox (Lcrq;)V + ARG 1 boundingBox METHOD a movementInputToVelocity (Lcrv;FF)Lcrv; ARG 0 movementInput ARG 1 speed @@ -170,7 +200,9 @@ CLASS aif net/minecraft/entity/Entity ARG 1 offset ARG 2 type METHOD a isTeamPlayer (Lcsx;)Z + ARG 1 team METHOD a populateCrashReport (Le;)V + ARG 1 section METHOD a setPositionAndAngles (Lev;FF)V ARG 1 pos ARG 2 yaw @@ -180,21 +212,32 @@ CLASS aif net/minecraft/entity/Entity ARG 2 state METHOD a readCustomDataFromTag (Lib;)V ARG 1 tag + METHOD a hasPassengerType (Ljava/lang/Class;)Z + ARG 1 clazz METHOD a addScoreboardTag (Ljava/lang/String;)Z + ARG 1 tag METHOD a setUuid (Ljava/util/UUID;)V + ARG 1 uuid METHOD a onTrackedDataSet (Lqh;)V ARG 1 data + METHOD a canBeSpectated (Lvh;)Z + ARG 1 spectator METHOD a playSound (Lyj;FF)V ARG 1 sound ARG 2 volume + ARG 3 pitch METHOD a isInFluid (Lzb;)Z + ARG 1 fluidTag METHOD a isInFluid (Lzb;Z)Z + ARG 1 fluidTag ARG 2 requireLoadedChunk METHOD a toListTag ([D)Lii; + ARG 1 values METHOD a toListTag ([F)Lii; + ARG 1 values METHOD aA spawnSprintingParticles ()V - METHOD aB onLavaCollision ()V - METHOD aC isTouchingLava ()Z + METHOD aB setInLava ()V + METHOD aC isInLava ()Z METHOD aD getLightmapCoordinates ()I METHOD aE getBrightnessAtEyes ()F METHOD aF scheduleVelocityUpdate ()V @@ -231,8 +274,9 @@ CLASS aif net/minecraft/entity/Entity METHOD aj getHighSpeedSplashSound ()Lyj; METHOD ak checkBlockCollision ()V METHOD am isSilent ()Z - METHOD an isUnaffectedByGravity ()Z + METHOD an hasNoGravity ()Z METHOD ao canClimb ()Z + METHOD ap getCollisionBox ()Lcrq; METHOD aq isFireImmune ()Z METHOD ar isInsideWater ()Z METHOD as isInsideWaterOrRain ()Z @@ -257,18 +301,28 @@ CLASS aif net/minecraft/entity/Entity ARG 1 index ARG 2 value METHOD b isInvulnerableTo (Laho;)Z + ARG 1 damageSource + METHOD b onKilledOther (Laio;)V + ARG 1 other METHOD b setPose (Laiy;)V + ARG 1 pose METHOD b onPlayerCollision (Lavx;)V + ARG 1 player METHOD b interact (Lavx;Lagz;)Z ARG 1 player + ARG 2 hand METHOD b doesNotCollide (Lcrq;)Z ARG 1 box METHOD b squaredHorizontalLength (Lcrv;)D + ARG 0 vector METHOD b writeCustomDataToTag (Lib;)V ARG 1 tag METHOD b removeScoreboardTag (Ljava/lang/String;)Z + ARG 1 tag METHOD b setCustomName (Ljm;)V + ARG 1 name METHOD b onStartedTrackingBy (Lvh;)V + ARG 1 player METHOD b updateMovementInFluid (Lzb;)Z ARG 1 tag METHOD bA getUuid ()Ljava/util/UUID; @@ -289,6 +343,7 @@ CLASS aif net/minecraft/entity/Entity METHOD bP getEntityWorld ()Lbhh; METHOD bQ getServer ()Lnet/minecraft/server/MinecraftServer; METHOD bR isImmuneToExplosion ()Z + METHOD bS entityDataRequiresOperator ()Z METHOD bU getPrimaryPassenger ()Laif; METHOD bV getPassengerList ()Ljava/util/List; METHOD bW getPassengersDeep ()Ljava/util/Collection; @@ -304,6 +359,7 @@ CLASS aif net/minecraft/entity/Entity METHOD bh isSprinting ()Z METHOD bi isSwimming ()Z METHOD bj isInSwimmingPose ()Z + METHOD bk shouldLeaveSwimmingPose ()Z METHOD bl isGlowing ()Z METHOD bm isInvisible ()Z METHOD bn getScoreboardTeam ()Lcsx; @@ -324,14 +380,21 @@ CLASS aif net/minecraft/entity/Entity ARG 1 pitch ARG 2 yaw METHOD c wouldPoseNotCollide (Laiy;)Z + ARG 1 pose METHOD c canSeePlayer (Lavx;)Z ARG 1 player METHOD c squaredDistanceTo (Lcrv;)D + ARG 1 vector METHOD c setInPortal (Lev;)V ARG 1 pos METHOD c saveSelfToTag (Lib;)Z + ARG 1 tag + METHOD c removeClickEvents (Ljm;)V + ARG 0 textComponent METHOD c onStoppedTrackingBy (Lvh;)V + ARG 1 player METHOD c setSilent (Z)V + ARG 1 silent METHOD ca getVehicle ()Laif; METHOD cb getSoundCategory ()Lyl; METHOD cd getCommandSource ()Lcd; @@ -350,14 +413,21 @@ CLASS aif net/minecraft/entity/Entity ARG 1 pitch ARG 2 yaw METHOD d setVelocity (Lcrv;)V + ARG 1 velocity METHOD d saveToTag (Lib;)Z - METHOD d setUnaffectedByGravity (Z)V + ARG 1 tag + METHOD d setNoGravity (Z)V + ARG 1 noGravity METHOD e squaredDistanceTo (DDD)D ARG 1 x + ARG 3 y + ARG 5 z METHOD e setEntityId (I)V + ARG 1 id METHOD e getEyeHeight (Laiy;)F ARG 1 pose METHOD e toTag (Lib;)Lib; + ARG 1 tag METHOD e setSneaking (Z)V ARG 1 sneaking METHOD equals (Ljava/lang/Object;)Z @@ -371,6 +441,7 @@ CLASS aif net/minecraft/entity/Entity METHOD f setOnFireFor (I)V ARG 1 seconds METHOD f fromTag (Lib;)V + ARG 1 tag METHOD f setSprinting (Z)V ARG 1 sprinting METHOD g shouldRenderFrom (DDD)Z @@ -380,7 +451,9 @@ CLASS aif net/minecraft/entity/Entity METHOD g getPitch (F)F ARG 1 tickDelta METHOD g burn (I)V + ARG 1 time METHOD g distanceTo (Laif;)F + ARG 1 entity METHOD g setSwimming (Z)V ARG 1 swimming METHOD h tick ()V @@ -393,6 +466,7 @@ CLASS aif net/minecraft/entity/Entity METHOD h getFlag (I)Z ARG 1 index METHOD h squaredDistanceTo (Laif;)D + ARG 1 entity METHOD h setGlowing (Z)V ARG 1 glowing METHOD i pushOutOfBlocks (DDD)V @@ -404,6 +478,7 @@ CLASS aif net/minecraft/entity/Entity METHOD i setBreath (I)V ARG 1 breath METHOD i pushAwayFrom (Laif;)V + ARG 1 entity METHOD i setInvisible (Z)V ARG 1 invisible METHOD j stopRiding ()V @@ -414,35 +489,49 @@ CLASS aif net/minecraft/entity/Entity METHOD j getCameraPosVec (F)Lcrv; ARG 1 tickDelta METHOD j allowsPermissionLevel (I)Z - METHOD j onBubbleColumnSufaceCollision (Z)V - ARG 1 downwards + METHOD j onBubbleColumnSurfaceCollision (Z)V + ARG 1 drag METHOD k isBeingRainedOn ()Z METHOD k setHeadYaw (F)V ARG 1 headYaw METHOD k updatePassengerPosition (Laif;)V ARG 1 passenger METHOD k onBubbleColumnCollision (Z)V - ARG 1 downwards + ARG 1 drag METHOD l isInsideBubbleColumn ()Z METHOD l setYaw (F)V + ARG 1 yaw METHOD l onPassengerLookAround (Laif;)V ARG 1 passenger METHOD l setInvulnerable (Z)V + ARG 1 invulnerable METHOD m startRiding (Laif;)Z + ARG 1 entity METHOD m setCustomNameVisible (Z)V + ARG 1 visible METHOD n canStartRiding (Laif;)Z + ARG 1 entity METHOD o addPassenger (Laif;)V + ARG 1 passenger METHOD p removePassenger (Laif;)V + ARG 1 passenger METHOD q canAddPassenger (Laif;)Z + ARG 1 passenger METHOD r isTeammate (Laif;)Z + ARG 1 other METHOD s isPartOf (Laif;)Z + ARG 1 entity METHOD t isSpectator ()Z METHOD t handlePlayerAttack (Laif;)Z - METHOD u setPositionAndAngles (Laif;)V + METHOD u copyPositionAndRotation (Laif;)V + ARG 1 entity METHOD u_ initDataTracker ()V METHOD w hasPassenger (Laif;)Z + ARG 1 passenger METHOD x isConnectedThroughVehicle (Laif;)Z ARG 1 entity METHOD x_ refreshSize ()V METHOD y getPermissionLevel ()I + METHOD y hasPassengerDeep (Laif;)Z + ARG 1 passenger METHOD y_ getPistonBehavior ()Lclf; diff --git a/mappings/net/minecraft/entity/EntityCategory.mapping b/mappings/net/minecraft/entity/EntityCategory.mapping index b6089211d5..f73900fcc6 100644 --- a/mappings/net/minecraft/entity/EntityCategory.mapping +++ b/mappings/net/minecraft/entity/EntityCategory.mapping @@ -4,6 +4,11 @@ CLASS aiq net/minecraft/entity/EntityCategory FIELD h peaceful Z FIELD i animal Z FIELD j name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;IZZ)V + ARG 3 name + ARG 4 spawnCap + ARG 5 peaceful + ARG 6 animal METHOD a getName ()Ljava/lang/String; METHOD b getSpawnCap ()I METHOD c isPeaceful ()Z diff --git a/mappings/net/minecraft/entity/EntitySize.mapping b/mappings/net/minecraft/entity/EntitySize.mapping index 9e19929ca3..8abb97a2e7 100644 --- a/mappings/net/minecraft/entity/EntitySize.mapping +++ b/mappings/net/minecraft/entity/EntitySize.mapping @@ -2,6 +2,10 @@ CLASS aig net/minecraft/entity/EntitySize FIELD a width F FIELD b height F FIELD c constant Z + METHOD (FFZ)V + ARG 1 width + ARG 2 height + ARG 3 constant METHOD a scaled (F)Laig; ARG 1 ratio METHOD a scaled (FF)Laig; diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index a7d532fc9d..d8c8a5e1eb 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -1,19 +1,31 @@ CLASS aij net/minecraft/entity/EntityType CLASS aij$a Builder - FIELD a function Laij$b; - FIELD b entityClass Laiq; + FIELD a factory Laij$b; + FIELD b category Laiq; FIELD c saveable Z FIELD d summonable Z + FIELD e fireImmune Z FIELD f size Laig; + METHOD (Laij$b;Laiq;)V + ARG 1 factory + ARG 2 category METHOD a disableSummon ()Laij$a; METHOD a setSize (FF)Laij$a; ARG 1 width ARG 2 height METHOD a create (Laij$b;Laiq;)Laij$a; + ARG 0 factory + ARG 1 category METHOD a create (Laiq;)Laij$a; + ARG 0 category METHOD a build (Ljava/lang/String;)Laij; + ARG 1 id METHOD b disableSaving ()Laij$a; + METHOD c makeFireImmune ()Laij$a; CLASS aij$b EntityFactory + METHOD create (Laij;Lbhh;)Laif; + ARG 1 type + ARG 2 world FIELD aY LOGGER Lorg/apache/logging/log4j/Logger; FIELD aZ factory Laij$b; FIELD ba category Laiq; @@ -35,28 +47,64 @@ CLASS aij net/minecraft/entity/EntityType ARG 7 size METHOD a isSaveable ()Z METHOD a createSimpleBoundingBox (DDD)Lcrq; + ARG 1 feetX + ARG 3 feetY + ARG 5 feetZ METHOD a createInstanceFromId (ILbhh;)Laif; + ARG 0 type + ARG 1 world METHOD a getId (Laij;)Lqs; + ARG 0 type METHOD a create (Lbhh;)Laif; + ARG 1 world METHOD a newInstance (Lbhh;Laij;)Laif; ARG 0 world ARG 1 type METHOD a loadFromEntityTag (Lbhh;Lavx;Laif;Lib;)V + ARG 0 world + ARG 1 player + ARG 3 itemTag METHOD a spawnFromItemStack (Lbhh;Lbca;Lavx;Lev;Lair;ZZ)Laif; + ARG 1 world + ARG 2 stack + ARG 3 player + ARG 4 pos + ARG 5 spawnType METHOD a spawn (Lbhh;Lib;Ljm;Lavx;Lev;Lair;ZZ)Laif; + ARG 1 world + ARG 2 itemTag + ARG 3 name + ARG 4 player + ARG 5 pos + ARG 6 spawnType METHOD a getOriginY (Lbhk;Lev;ZLcrq;)D + ARG 0 world + ARG 1 pos + ARG 3 boundingBox METHOD a fromTag (Lib;)Ljava/util/Optional; ARG 0 compoundTag METHOD a getEntityFromTag (Lib;Lbhh;)Ljava/util/Optional; + ARG 0 tag + ARG 1 world METHOD a loadEntityWithPassengers (Lib;Lbhh;Ljava/util/function/Function;)Laif; ARG 0 compoundTag ARG 1 world ARG 2 entityProcessor METHOD a get (Ljava/lang/String;)Ljava/util/Optional; + ARG 0 id METHOD a register (Ljava/lang/String;Laij$a;)Laij; + ARG 0 id + ARG 1 type METHOD a isTaggedWith (Lzb;)Z + ARG 1 tag METHOD b isSummonable ()Z METHOD b create (Lbhh;Lib;Ljm;Lavx;Lev;Lair;ZZ)Laif; + ARG 1 world + ARG 2 itemTag + ARG 3 name + ARG 4 player + ARG 5 pos + ARG 6 spawnType METHOD b loadEntityFromTag (Lib;Lbhh;)Ljava/util/Optional; ARG 0 compoundTag ARG 1 world diff --git a/mappings/net/minecraft/entity/EquipmentSlot.mapping b/mappings/net/minecraft/entity/EquipmentSlot.mapping index ad3dc40a16..c025ac8841 100644 --- a/mappings/net/minecraft/entity/EquipmentSlot.mapping +++ b/mappings/net/minecraft/entity/EquipmentSlot.mapping @@ -10,6 +10,9 @@ CLASS aik net/minecraft/entity/EquipmentSlot ARG 5 armorStandId ARG 6 name METHOD a getType ()Laik$a; + METHOD a fromTypeIndex (Laik$a;I)Laik; + ARG 0 type + ARG 1 index METHOD a byName (Ljava/lang/String;)Laik; ARG 0 name METHOD b getEntitySlotId ()I diff --git a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping index 7e15630ca8..2d1449eee0 100644 --- a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping +++ b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping @@ -13,6 +13,10 @@ CLASS ail net/minecraft/entity/ExperienceOrbEntity ARG 8 amount METHOD a roundToOrbSize (I)I ARG 0 value + METHOD b getMendingRepairCost (I)I + ARG 1 repairAmount + METHOD c getMendingRepairAmount (I)I + ARG 1 experienceAmount METHOD f getExperienceAmount ()I METHOD i getOrbSize ()I METHOD k applyWaterMovement ()V diff --git a/mappings/net/minecraft/entity/FallingBlockEntity.mapping b/mappings/net/minecraft/entity/FallingBlockEntity.mapping index da0ad6e7b8..c541e43782 100644 --- a/mappings/net/minecraft/entity/FallingBlockEntity.mapping +++ b/mappings/net/minecraft/entity/FallingBlockEntity.mapping @@ -12,8 +12,12 @@ CLASS atn net/minecraft/entity/FallingBlockEntity ARG 1 world ARG 2 x ARG 4 y + ARG 6 z + ARG 8 block METHOD a setFallingBlockPos (Lev;)V + ARG 1 pos METHOD a setHurtEntities (Z)V + ARG 1 hurtEntities METHOD f getFallingBlockPos ()Lev; METHOD i getWorldClient ()Lbhh; METHOD k getBlockState ()Lbvj; diff --git a/mappings/net/minecraft/entity/FireworkEntity.mapping b/mappings/net/minecraft/entity/FireworkEntity.mapping index cd3e2e4275..49ca9a635a 100644 --- a/mappings/net/minecraft/entity/FireworkEntity.mapping +++ b/mappings/net/minecraft/entity/FireworkEntity.mapping @@ -11,6 +11,13 @@ CLASS awi net/minecraft/entity/FireworkEntity ARG 4 y ARG 6 z ARG 8 item + METHOD (Lbhh;Lbca;DDDZ)V + ARG 1 world + ARG 2 item + ARG 3 x + ARG 5 y + ARG 7 z + ARG 9 shotAtAngle METHOD (Lbhh;Lbca;Laio;)V ARG 1 world ARG 2 item @@ -18,5 +25,6 @@ CLASS awi net/minecraft/entity/FireworkEntity METHOD a handleCollision (Lcrt;)V METHOD i wasShotAtAngle ()Z METHOD k explodeAndRemove ()V + METHOD l hasExplosionEffects ()Z METHOD m explode ()V METHOD n wasShotByEntity ()Z diff --git a/mappings/net/minecraft/entity/InteractionObserver.mapping b/mappings/net/minecraft/entity/InteractionObserver.mapping index 61060e5eae..f31e57d09b 100644 --- a/mappings/net/minecraft/entity/InteractionObserver.mapping +++ b/mappings/net/minecraft/entity/InteractionObserver.mapping @@ -1,3 +1,4 @@ CLASS aiz net/minecraft/entity/InteractionObserver METHOD a onInteractionWith (Laqd;Laif;)V ARG 1 interaction + ARG 2 entity diff --git a/mappings/net/minecraft/entity/ItemEntity.mapping b/mappings/net/minecraft/entity/ItemEntity.mapping index eddd1430b8..09daac0058 100644 --- a/mappings/net/minecraft/entity/ItemEntity.mapping +++ b/mappings/net/minecraft/entity/ItemEntity.mapping @@ -18,10 +18,20 @@ CLASS ato net/minecraft/entity/ItemEntity ARG 6 z ARG 8 stack METHOD a setPickupDelay (I)V + ARG 1 pickupDelay METHOD a tryMerge (Lato;)V + ARG 1 other + METHOD a merge (Lato;Lbca;Lato;Lbca;)V + ARG 0 targetEntity + ARG 1 targetStack + ARG 2 sourceEntity + ARG 3 sourceStack METHOD b setStack (Lbca;)V + ARG 1 stack METHOD b setOwner (Ljava/util/UUID;)V + ARG 1 uuid METHOD c setThrower (Ljava/util/UUID;)V + ARG 1 uuid METHOD i getStack ()Lbca; METHOD k getOwner ()Ljava/util/UUID; METHOD l getThrower ()Ljava/util/UUID; diff --git a/mappings/net/minecraft/entity/JumpingMount.mapping b/mappings/net/minecraft/entity/JumpingMount.mapping index 368ea0f461..0095993bef 100644 --- a/mappings/net/minecraft/entity/JumpingMount.mapping +++ b/mappings/net/minecraft/entity/JumpingMount.mapping @@ -1,5 +1,7 @@ CLASS aix net/minecraft/entity/JumpingMount METHOD F_ canJump ()Z METHOD a_ setJumpStrength (I)V + ARG 1 strength METHOD b startJumping (I)V + ARG 1 height METHOD c stopJumping ()V diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index ed34421e55..3ac4d4a815 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -2,6 +2,7 @@ CLASS aio net/minecraft/entity/LivingEntity FIELD aA deathTime I FIELD aB lastHandSwingProgress F FIELD aC handSwingProgress F + FIELD aD lastAttackedTicks I FIELD aE lastLimbDistance F FIELD aF limbDistance F FIELD aG limbAngle F @@ -49,8 +50,10 @@ CLASS aio net/minecraft/entity/LivingEntity METHOD A getAttackDistanceScalingFactor (Laif;)D METHOD C updatePotionVisibility ()V METHOD C tryAttack (Laif;)Z + ARG 1 target METHOD D pushAway (Laif;)V METHOD E canSee (Laif;)Z + ARG 1 entity METHOD a teleport (DDDZ)Z ARG 1 x ARG 3 y @@ -60,7 +63,9 @@ CLASS aio net/minecraft/entity/LivingEntity METHOD a setStackInHand (Lagz;Lbca;)V ARG 1 hand METHOD a onDeath (Laho;)V + ARG 1 damageSource METHOD a dropEquipment (Laho;IZ)V + ARG 1 damageSource ARG 2 addedDropChance ARG 3 dropAllowed METHOD a dropLoot (Laho;Z)V @@ -76,8 +81,10 @@ CLASS aio net/minecraft/entity/LivingEntity ARG 1 item ARG 2 count METHOD a canTarget (Laij;)Z + ARG 1 type METHOD a isEquippedStackValid (Laik;)Z METHOD a setAttacker (Laio;)V + ARG 1 attacker METHOD a isTarget (Laio;Lapz;)Z ARG 1 target ARG 2 targetPredicate @@ -105,7 +112,10 @@ CLASS aio net/minecraft/entity/LivingEntity ARG 2 damage METHOD b getStatusEffect (Lahx;)Lahz; METHOD b getEquippedStack (Laik;)Lbca; + ARG 1 slot METHOD b getActiveEyeHeight (Laiy;Laig;)F + ARG 1 pose + ARG 2 size METHOD b onEquipStack (Lbca;)V ARG 1 stack METHOD b spawnConsumptionEffects (Lbca;I)V @@ -119,16 +129,19 @@ CLASS aio net/minecraft/entity/LivingEntity ARG 2 value METHOD c setCurrentHand (Lagz;)V METHOD c playHurtSound (Laho;)V + ARG 1 damageSource METHOD c applyEnchantmentsToDamage (Laho;F)F ARG 1 source ARG 2 amount METHOD c removePotionEffect (Lahx;)Lahz; METHOD c addPotionEffect (Lahz;)Z + ARG 1 effect METHOD c sendEquipmentBreakStatus (Laik;)V ARG 1 slot METHOD c canTarget (Laio;)Z ARG 1 target METHOD c getDrinkSound (Lbca;)Lyj; + ARG 1 stack METHOD c containsOnlyAmbientEffects (Ljava/util/Collection;)Z ARG 0 effects METHOD c swimUpward (Lzb;)V @@ -179,11 +192,14 @@ CLASS aio net/minecraft/entity/LivingEntity ARG 2 damage METHOD d removeStatusEffect (Lahx;)Z METHOD d isPotionEffective (Lahz;)Z + ARG 1 effect METHOD d getEquipmentBreakStatus (Laik;)B METHOD d takeShieldHit (Laio;)V ARG 1 source METHOD d getCurrentExperience (Lavx;)I + ARG 1 player METHOD d getEatSound (Lbca;)Lyj; + ARG 1 stack METHOD d setSleepingPosition (Lev;)V METHOD da getMovementSpeed ()F METHOD db tickNewAi ()V @@ -212,10 +228,13 @@ CLASS aio net/minecraft/entity/LivingEntity METHOD e knockback (Laio;)V ARG 1 target METHOD e canPickUp (Lbca;)Z + ARG 1 stack METHOD e travel (Lcrv;)V ARG 1 movementInput METHOD e sleep (Lev;)V + ARG 1 pos METHOD f attackLivingEntity (Laio;)V + ARG 1 target METHOD f getArrowType (Lbca;)Lbca; METHOD g playEquipmentBreakEffects (Lbca;)V ARG 1 item @@ -233,6 +252,7 @@ CLASS aio net/minecraft/entity/LivingEntity METHOD n damageShield (F)V ARG 1 amount METHOD n getFallSound (I)Lyj; + ARG 1 fallDistance METHOD o setMovementSpeed (F)V ARG 1 movementSpeed METHOD o setStuckArrows (I)V @@ -240,6 +260,7 @@ CLASS aio net/minecraft/entity/LivingEntity METHOD p getHandSwingProgress (F)F ARG 1 tickDelta METHOD q setAbsorptionAmount (F)V + ARG 1 amount METHOD v_ isChild ()Z METHOD w_ isClimbing ()Z METHOD z onAttacking (Laif;)V diff --git a/mappings/net/minecraft/entity/PrimedTntEntity.mapping b/mappings/net/minecraft/entity/PrimedTntEntity.mapping index 3cf4e0bd83..ba790f8ff0 100644 --- a/mappings/net/minecraft/entity/PrimedTntEntity.mapping +++ b/mappings/net/minecraft/entity/PrimedTntEntity.mapping @@ -6,7 +6,10 @@ CLASS atp net/minecraft/entity/PrimedTntEntity ARG 1 world ARG 2 x ARG 4 y + ARG 6 z + ARG 8 igniter METHOD a setFuse (I)V + ARG 1 fuse METHOD f getCausingEntity ()Laio; METHOD i getFuse ()I METHOD k getFuseTimer ()I diff --git a/mappings/net/minecraft/entity/SpawnRestriction.mapping b/mappings/net/minecraft/entity/SpawnRestriction.mapping index f77a857806..83d33b14ae 100644 --- a/mappings/net/minecraft/entity/SpawnRestriction.mapping +++ b/mappings/net/minecraft/entity/SpawnRestriction.mapping @@ -2,8 +2,16 @@ CLASS ajb net/minecraft/entity/SpawnRestriction CLASS ajb$a Entry FIELD a heightMapType Lbyq$a; FIELD b location Lajb$b; + METHOD (Lbyq$a;Lajb$b;)V + ARG 1 heightMapType + ARG 2 location CLASS ajb$b Location FIELD a mapping Ljava/util/Map; METHOD a getLocation (Laij;)Lajb$b; + ARG 0 type METHOD a register (Laij;Lajb$b;Lbyq$a;)V + ARG 0 type + ARG 1 location + ARG 2 heightMapType METHOD b getHeightMapType (Laij;)Lbyq$a; + ARG 0 type diff --git a/mappings/net/minecraft/entity/ai/GoToOwnerAndPurrGoal.mapping b/mappings/net/minecraft/entity/ai/GoToOwnerAndPurrGoal.mapping deleted file mode 100644 index f5a8ef6f8a..0000000000 --- a/mappings/net/minecraft/entity/ai/GoToOwnerAndPurrGoal.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS ami net/minecraft/entity/ai/GoToOwnerAndPurrGoal - FIELD g cat Laqs; diff --git a/mappings/net/minecraft/entity/ai/RangedAttackMob.mapping b/mappings/net/minecraft/entity/ai/RangedAttackMob.mapping new file mode 100644 index 0000000000..054b06d98b --- /dev/null +++ b/mappings/net/minecraft/entity/ai/RangedAttackMob.mapping @@ -0,0 +1,3 @@ +CLASS auo net/minecraft/entity/ai/RangedAttackMob + METHOD a attack (Laio;F)V + ARG 1 target diff --git a/mappings/net/minecraft/entity/ai/RangedAttacker.mapping b/mappings/net/minecraft/entity/ai/RangedAttacker.mapping deleted file mode 100644 index 05c0d69cc1..0000000000 --- a/mappings/net/minecraft/entity/ai/RangedAttacker.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS auo net/minecraft/entity/ai/RangedAttacker - METHOD a attack (Laio;F)V - ARG 1 target diff --git a/mappings/net/minecraft/entity/ai/goal/AnimalMateGoal.mapping b/mappings/net/minecraft/entity/ai/goal/AnimalMateGoal.mapping index 89b846c8c1..f687f4d994 100644 --- a/mappings/net/minecraft/entity/ai/goal/AnimalMateGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/AnimalMateGoal.mapping @@ -1,5 +1,5 @@ CLASS amh net/minecraft/entity/ai/goal/AnimalMateGoal - FIELD a owner Laqr; + FIELD a animal Laqr; FIELD b world Lbhh; FIELD c mate Laqr; FIELD d VALID_MATE_PREDICATE Lapz; @@ -7,9 +7,10 @@ CLASS amh net/minecraft/entity/ai/goal/AnimalMateGoal FIELD f timer I FIELD g chance D METHOD (Laqr;D)V - ARG 1 owner + ARG 1 animal ARG 2 chance METHOD (Laqr;DLjava/lang/Class;)V + ARG 1 animal ARG 2 chance ARG 4 entityClass METHOD g breed ()V diff --git a/mappings/net/minecraft/entity/ai/goal/AttackGoal.mapping b/mappings/net/minecraft/entity/ai/goal/AttackGoal.mapping index e6611148cb..27cf1f8943 100644 --- a/mappings/net/minecraft/entity/ai/goal/AttackGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/AttackGoal.mapping @@ -3,3 +3,5 @@ CLASS anm net/minecraft/entity/ai/goal/AttackGoal FIELD b mob Laip; FIELD c target Laio; FIELD d cooldown I + METHOD (Laip;)V + ARG 1 mob diff --git a/mappings/net/minecraft/entity/ai/goal/AttackWithOwnerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/AttackWithOwnerGoal.mapping index ee18a42cf5..d825b200df 100644 --- a/mappings/net/minecraft/entity/ai/goal/AttackWithOwnerGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/AttackWithOwnerGoal.mapping @@ -1,4 +1,6 @@ CLASS aov net/minecraft/entity/ai/goal/AttackWithOwnerGoal - FIELD a owner Lajc; + FIELD a tameable Lajc; FIELD b attacking Laio; FIELD c lastAttackTime I + METHOD (Lajc;)V + ARG 1 tameable diff --git a/mappings/net/minecraft/entity/ai/goal/AvoidSunlightGoal.mapping b/mappings/net/minecraft/entity/ai/goal/AvoidSunlightGoal.mapping index 086cdce418..8d65da9361 100644 --- a/mappings/net/minecraft/entity/ai/goal/AvoidSunlightGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/AvoidSunlightGoal.mapping @@ -1,4 +1,4 @@ CLASS anz net/minecraft/entity/ai/goal/AvoidSunlightGoal - FIELD a owner Laiv; + FIELD a mob Laiv; METHOD (Laiv;)V - ARG 1 owner + ARG 1 mob diff --git a/mappings/net/minecraft/entity/ai/goal/BowAttackGoal.mapping b/mappings/net/minecraft/entity/ai/goal/BowAttackGoal.mapping index f17d6bc347..8b0738699b 100644 --- a/mappings/net/minecraft/entity/ai/goal/BowAttackGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/BowAttackGoal.mapping @@ -1,3 +1,14 @@ CLASS anw net/minecraft/entity/ai/goal/BowAttackGoal + FIELD a actor Lauj; + FIELD b speed D + FIELD c attackInterval I + FIELD d squaredRange F + FIELD e cooldown I + METHOD (Lauj;DIF)V + ARG 1 actor + ARG 2 speed + ARG 4 attackInterval + ARG 5 range METHOD a setAttackInterval (I)V + ARG 1 attackInterval METHOD g isHoldingBow ()Z diff --git a/mappings/net/minecraft/entity/ai/goal/BreakDoorGoal.mapping b/mappings/net/minecraft/entity/ai/goal/BreakDoorGoal.mapping index 888eaaf188..e675f071d1 100644 --- a/mappings/net/minecraft/entity/ai/goal/BreakDoorGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/BreakDoorGoal.mapping @@ -1,3 +1,12 @@ CLASS amf net/minecraft/entity/ai/goal/BreakDoorGoal FIELD a breakProgress I FIELD b prevBreakProgress I + FIELD g difficultySufficientPredicate Ljava/util/function/Predicate; + METHOD (Laip;ILjava/util/function/Predicate;)V + ARG 1 mob + ARG 3 difficultySufficientPredicate + METHOD (Laip;Ljava/util/function/Predicate;)V + ARG 1 mob + ARG 2 difficultySufficientPredicate + METHOD a isDifficultySufficient (Lagx;)Z + ARG 1 difficulty diff --git a/mappings/net/minecraft/entity/ai/goal/BreatheAirGoal.mapping b/mappings/net/minecraft/entity/ai/goal/BreatheAirGoal.mapping index 236152176e..2270e7d211 100644 --- a/mappings/net/minecraft/entity/ai/goal/BreatheAirGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/BreatheAirGoal.mapping @@ -1,4 +1,8 @@ CLASS amg net/minecraft/entity/ai/goal/BreatheAirGoal - FIELD a owner Laiv; + FIELD a mob Laiv; + METHOD (Laiv;)V + ARG 1 mob METHOD a isAirPos (Lbhk;Lev;)Z + ARG 1 world + ARG 2 pos METHOD g moveToAir ()V diff --git a/mappings/net/minecraft/entity/ai/goal/CatSitOnBlockGoal.mapping b/mappings/net/minecraft/entity/ai/goal/CatSitOnBlockGoal.mapping index 6bdd8954f7..4d22afe031 100644 --- a/mappings/net/minecraft/entity/ai/goal/CatSitOnBlockGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/CatSitOnBlockGoal.mapping @@ -1,2 +1,5 @@ CLASS amj net/minecraft/entity/ai/goal/CatSitOnBlockGoal FIELD g cat Laqs; + METHOD (Laqs;D)V + ARG 1 cat + ARG 2 speed diff --git a/mappings/net/minecraft/entity/ai/goal/ChaseBoatGoal.mapping b/mappings/net/minecraft/entity/ai/goal/ChaseBoatGoal.mapping index 7cecad9616..c986c96ae9 100644 --- a/mappings/net/minecraft/entity/ai/goal/ChaseBoatGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/ChaseBoatGoal.mapping @@ -1,6 +1,6 @@ CLASS amp net/minecraft/entity/ai/goal/ChaseBoatGoal - FIELD b owner Laiv; + FIELD b mob Laiv; FIELD c passenger Laio; FIELD d state Lame; METHOD (Laiv;)V - ARG 1 owner + ARG 1 mob diff --git a/mappings/net/minecraft/entity/ai/goal/CreeperIgniteGoal.mapping b/mappings/net/minecraft/entity/ai/goal/CreeperIgniteGoal.mapping index 3760dad1f1..e1bda870b4 100644 --- a/mappings/net/minecraft/entity/ai/goal/CreeperIgniteGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/CreeperIgniteGoal.mapping @@ -1,5 +1,5 @@ CLASS aod net/minecraft/entity/ai/goal/CreeperIgniteGoal - FIELD a owner Latv; + FIELD a creeper Latv; FIELD b target Laio; METHOD (Latv;)V - ARG 1 owner + ARG 1 creeper diff --git a/mappings/net/minecraft/entity/ai/goal/CrossbowAttackGoal.mapping b/mappings/net/minecraft/entity/ai/goal/CrossbowAttackGoal.mapping index c45949b84f..5c9e909b9d 100644 --- a/mappings/net/minecraft/entity/ai/goal/CrossbowAttackGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/CrossbowAttackGoal.mapping @@ -1,8 +1,12 @@ CLASS anx net/minecraft/entity/ai/goal/CrossbowAttackGoal CLASS anx$a Stage - FIELD a entity Lauj; + FIELD a actor Lauj; FIELD b stage Lanx$a; + FIELD c speed D + FIELD d squaredRange F METHOD (Lauj;DF)V - ARG 1 entity + ARG 1 actor + ARG 2 speed + ARG 4 range METHOD g isEntityHoldingCrossbow ()Z METHOD j isUncharged ()Z diff --git a/mappings/net/minecraft/entity/ai/goal/DisableableFollowTargetGoal.mapping b/mappings/net/minecraft/entity/ai/goal/DisableableFollowTargetGoal.mapping index 75b7f2aa67..44a0cd755a 100644 --- a/mappings/net/minecraft/entity/ai/goal/DisableableFollowTargetGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/DisableableFollowTargetGoal.mapping @@ -1,3 +1,11 @@ CLASS aor net/minecraft/entity/ai/goal/DisableableFollowTargetGoal FIELD i enabled Z + METHOD (Laxc;Ljava/lang/Class;IZZLjava/util/function/Predicate;)V + ARG 1 actor + ARG 2 targetEntityClass + ARG 3 reciprocalChance + ARG 4 checkVisibility + ARG 5 checkCanNavigate + ARG 6 targetPredicate METHOD a setEnabled (Z)V + ARG 1 enabled diff --git a/mappings/net/minecraft/entity/ai/goal/DolphinJumpGoal.mapping b/mappings/net/minecraft/entity/ai/goal/DolphinJumpGoal.mapping index 2bb88ef6fd..e67e7bb33c 100644 --- a/mappings/net/minecraft/entity/ai/goal/DolphinJumpGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/DolphinJumpGoal.mapping @@ -2,6 +2,7 @@ CLASS amk net/minecraft/entity/ai/goal/DolphinJumpGoal FIELD b dolphin Laqw; FIELD c chance I METHOD (Laqw;I)V + ARG 1 dolphin ARG 2 chance METHOD a isWater (Lev;III)Z ARG 1 pos diff --git a/mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping b/mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping index 3f950b2861..c9f786c1ef 100644 --- a/mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping @@ -1,7 +1,11 @@ CLASS aml net/minecraft/entity/ai/goal/DoorInteractGoal FIELD a shouldStop Z - FIELD d owner Laip; + FIELD d mob Laip; FIELD e doorPos Lev; + METHOD (Laip;)V + ARG 1 mob METHOD a getDoor (Lbhh;Lev;)Z + ARG 0 world + ARG 1 pos METHOD a setDoorOpen (Z)V ARG 1 open diff --git a/mappings/net/minecraft/entity/ai/goal/EatGrassGoal.mapping b/mappings/net/minecraft/entity/ai/goal/EatGrassGoal.mapping index d68e1ac799..fecee33f88 100644 --- a/mappings/net/minecraft/entity/ai/goal/EatGrassGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/EatGrassGoal.mapping @@ -1,8 +1,8 @@ CLASS amm net/minecraft/entity/ai/goal/EatGrassGoal FIELD a GRASS_PREDICATE Ljava/util/function/Predicate; - FIELD b owner Laip; + FIELD b mob Laip; FIELD c world Lbhh; FIELD d timer I METHOD (Laip;)V - ARG 1 entity + ARG 1 mob METHOD g getTimer ()I diff --git a/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping index b4d3bde65a..d2808cfe3f 100644 --- a/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping @@ -1,13 +1,15 @@ CLASS anp net/minecraft/entity/ai/goal/EscapeDangerGoal - FIELD a owner Laiv; + FIELD a mob Laiv; FIELD b speed D FIELD c targetX D FIELD d targetY D FIELD e targetZ D METHOD (Laiv;D)V - ARG 1 owner + ARG 1 mob ARG 2 speed METHOD a locateClosestWater (Lbgr;Laif;II)Lev; + ARG 1 blockView + ARG 2 entity ARG 3 rangeX ARG 4 rangeY METHOD g findTarget ()Z diff --git a/mappings/net/minecraft/entity/ai/goal/EscapeSunlightGoal.mapping b/mappings/net/minecraft/entity/ai/goal/EscapeSunlightGoal.mapping index 15a7415499..fe94ab8c7f 100644 --- a/mappings/net/minecraft/entity/ai/goal/EscapeSunlightGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/EscapeSunlightGoal.mapping @@ -1,11 +1,11 @@ CLASS amn net/minecraft/entity/ai/goal/EscapeSunlightGoal - FIELD a owner Laiv; + FIELD a mob Laiv; FIELD b targetX D FIELD c targetY D FIELD d targetZ D FIELD e speed D FIELD f world Lbhh; METHOD (Laiv;D)V - ARG 1 owner + ARG 1 mob ARG 2 speed METHOD h locateShadedPos ()Lcrv; diff --git a/mappings/net/minecraft/entity/ai/goal/FleeEntityGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FleeEntityGoal.mapping index 905d7c3f4e..d16383b91b 100644 --- a/mappings/net/minecraft/entity/ai/goal/FleeEntityGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FleeEntityGoal.mapping @@ -1,19 +1,19 @@ CLASS amc net/minecraft/entity/ai/goal/FleeEntityGoal - FIELD a fleeingEntity Laiv; + FIELD a mob Laiv; FIELD b targetEntity Laio; FIELD c fleeDistance F FIELD d fleePath Lcng; FIELD e fleeingEntityNavigation Laph; FIELD f classToFleeFrom Ljava/lang/Class; - FIELD i fleeSlowSpeed D - FIELD j fleeFastSpeed D + FIELD i slowSpeed D + FIELD j fastSpeed D FIELD k withinRangePredicate Lapz; METHOD (Laiv;Ljava/lang/Class;FDD)V - ARG 1 fleeingEntity - ARG 2 classToFleeFrom - ARG 3 fleeDistance - ARG 4 fleeSlowSpeed - ARG 6 fleeFastSpeed + ARG 1 mob + ARG 2 fleeFromType + ARG 3 distance + ARG 4 slowSpeed + ARG 6 fastSpeed METHOD (Laiv;Ljava/lang/Class;FDDLjava/util/function/Predicate;)V ARG 1 fleeingEntity ARG 2 classToFleeFrom @@ -21,8 +21,8 @@ CLASS amc net/minecraft/entity/ai/goal/FleeEntityGoal ARG 4 fleeSlowSpeed ARG 6 fleeFastSpeed METHOD (Laiv;Ljava/lang/Class;Ljava/util/function/Predicate;FDDLjava/util/function/Predicate;)V - ARG 1 fleeingEntity - ARG 2 classToFleeFrom - ARG 4 fleeDistance - ARG 5 fleeSlowSpeed - ARG 7 fleeFastSpeed + ARG 1 mob + ARG 2 fleeFromType + ARG 4 distance + ARG 5 slowSpeed + ARG 7 fastSpeed diff --git a/mappings/net/minecraft/entity/ai/goal/FlyToOwnerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FlyToOwnerGoal.mapping deleted file mode 100644 index 91aa8ca849..0000000000 --- a/mappings/net/minecraft/entity/ai/goal/FlyToOwnerGoal.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS ams net/minecraft/entity/ai/goal/FlyToOwnerGoal diff --git a/mappings/net/minecraft/entity/ai/goal/FollowGroupLeaderGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FollowGroupLeaderGoal.mapping index d2019e687e..26f3b1414e 100644 --- a/mappings/net/minecraft/entity/ai/goal/FollowGroupLeaderGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FollowGroupLeaderGoal.mapping @@ -1,5 +1,8 @@ CLASS amq net/minecraft/entity/ai/goal/FollowGroupLeaderGoal - FIELD a owner Laqq; + FIELD a fish Laqq; FIELD b moveDelay I FIELD c checkSurroundingDelay I + METHOD (Laqq;)V + ARG 1 fish METHOD a getSurroundingSearchDelay (Laqq;)I + ARG 1 fish diff --git a/mappings/net/minecraft/entity/ai/goal/FollowMobGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FollowMobGoal.mapping index 17b383ef1a..68c5466dd8 100644 --- a/mappings/net/minecraft/entity/ai/goal/FollowMobGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FollowMobGoal.mapping @@ -1 +1,13 @@ CLASS amr net/minecraft/entity/ai/goal/FollowMobGoal + FIELD a mob Laip; + FIELD b targetPredicate Ljava/util/function/Predicate; + FIELD c target Laip; + FIELD d speed D + FIELD e navigation Laph; + FIELD g minDistance F + FIELD i maxDistance F + METHOD (Laip;DFF)V + ARG 1 mob + ARG 2 speed + ARG 4 minDistance + ARG 5 maxDistance diff --git a/mappings/net/minecraft/entity/ai/goal/FollowOwnerFlyingGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FollowOwnerFlyingGoal.mapping new file mode 100644 index 0000000000..1749a0a80c --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/FollowOwnerFlyingGoal.mapping @@ -0,0 +1 @@ +CLASS ams net/minecraft/entity/ai/goal/FollowOwnerFlyingGoal diff --git a/mappings/net/minecraft/entity/ai/goal/FollowOwnerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FollowOwnerGoal.mapping index 62433b57a2..e227ea5c25 100644 --- a/mappings/net/minecraft/entity/ai/goal/FollowOwnerGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FollowOwnerGoal.mapping @@ -1,7 +1,14 @@ CLASS amt net/minecraft/entity/ai/goal/FollowOwnerGoal - FIELD a caller Lajc; + FIELD a tameable Lajc; FIELD b world Lbhk; FIELD c owner Laio; + FIELD e navigation Laph; + FIELD g maxDistance F FIELD h minDistance F METHOD (Lajc;DFF)V - ARG 1 caller + ARG 1 tameable + ARG 2 speed + ARG 4 minDistance + ARG 5 maxDistance + METHOD a (Lev;)Z + ARG 1 pos diff --git a/mappings/net/minecraft/entity/ai/goal/FollowParentGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FollowParentGoal.mapping index b15c1b71f4..5d6f2a1300 100644 --- a/mappings/net/minecraft/entity/ai/goal/FollowParentGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FollowParentGoal.mapping @@ -1,3 +1,8 @@ CLASS amu net/minecraft/entity/ai/goal/FollowParentGoal - FIELD a owner Laqr; + FIELD a animal Laqr; FIELD b parent Laqr; + FIELD c speed D + FIELD d delay I + METHOD (Laqr;D)V + ARG 1 animal + ARG 2 speed diff --git a/mappings/net/minecraft/entity/ai/goal/FollowTargetGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FollowTargetGoal.mapping index 9d3d859e6e..cec9dfeea4 100644 --- a/mappings/net/minecraft/entity/ai/goal/FollowTargetGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FollowTargetGoal.mapping @@ -4,16 +4,19 @@ CLASS aoq net/minecraft/entity/ai/goal/FollowTargetGoal FIELD c targetEntity Laio; FIELD d targetPredicate Lapz; METHOD (Laip;Ljava/lang/Class;IZZLjava/util/function/Predicate;)V - ARG 2 targetEntityClass + ARG 1 mob + ARG 2 targetClass ARG 3 reciprocalChance ARG 4 checkVisibility ARG 5 checkCanNavigate ARG 6 targetPredicate METHOD (Laip;Ljava/lang/Class;Z)V - ARG 2 targetEntityClass + ARG 1 mob + ARG 2 targetClass ARG 3 checkVisibility METHOD (Laip;Ljava/lang/Class;ZZ)V - ARG 2 targetEntityClass + ARG 1 mob + ARG 2 targetClass ARG 3 checkVisibility ARG 4 checkCanNavigate METHOD a getSearchBox (D)Lcrq; diff --git a/mappings/net/minecraft/entity/ai/goal/FollowTargetIfTamedGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FollowTargetIfTamedGoal.mapping index 5526409761..ef29916981 100644 --- a/mappings/net/minecraft/entity/ai/goal/FollowTargetIfTamedGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FollowTargetIfTamedGoal.mapping @@ -1 +1,7 @@ CLASS aot net/minecraft/entity/ai/goal/FollowTargetIfTamedGoal + FIELD i tameable Lajc; + METHOD (Lajc;Ljava/lang/Class;ZLjava/util/function/Predicate;)V + ARG 1 tameable + ARG 2 targetClass + ARG 3 checkVisibility + ARG 4 targetPredicate diff --git a/mappings/net/minecraft/entity/ai/goal/FormCaravanGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FormCaravanGoal.mapping index c7ade52db1..52c22672b7 100644 --- a/mappings/net/minecraft/entity/ai/goal/FormCaravanGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FormCaravanGoal.mapping @@ -1,6 +1,9 @@ CLASS anc net/minecraft/entity/ai/goal/FormCaravanGoal - FIELD a owner Larv; + FIELD a llama Larv; FIELD b speed D FIELD c counter I + METHOD (Larv;D)V + ARG 1 llama + ARG 2 speed METHOD a canFollow (Larv;I)Z ARG 2 length diff --git a/mappings/net/minecraft/entity/ai/goal/GoToEntityTargetGoal.mapping b/mappings/net/minecraft/entity/ai/goal/GoToEntityTargetGoal.mapping index cfcefba139..c9f681021c 100644 --- a/mappings/net/minecraft/entity/ai/goal/GoToEntityTargetGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/GoToEntityTargetGoal.mapping @@ -1,4 +1,12 @@ CLASS anl net/minecraft/entity/ai/goal/GoToEntityTargetGoal - FIELD a owner Laiv; + FIELD a mob Laiv; FIELD b target Laio; + FIELD c x D + FIELD d y D + FIELD e z D + FIELD f speed D FIELD g maxDistance F + METHOD (Laiv;DF)V + ARG 1 mob + ARG 2 speed + ARG 4 maxDistance diff --git a/mappings/net/minecraft/entity/ai/goal/GoToOwnerAndPurrGoal.mapping b/mappings/net/minecraft/entity/ai/goal/GoToOwnerAndPurrGoal.mapping new file mode 100644 index 0000000000..004f2bb914 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/GoToOwnerAndPurrGoal.mapping @@ -0,0 +1,6 @@ +CLASS ami net/minecraft/entity/ai/goal/GoToOwnerAndPurrGoal + FIELD g cat Laqs; + METHOD (Laqs;DI)V + ARG 1 cat + ARG 2 speed + ARG 4 range diff --git a/mappings/net/minecraft/entity/ai/goal/GoToVillageGoal.mapping b/mappings/net/minecraft/entity/ai/goal/GoToVillageGoal.mapping index 10f95267c0..35f897273e 100644 --- a/mappings/net/minecraft/entity/ai/goal/GoToVillageGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/GoToVillageGoal.mapping @@ -1,5 +1,8 @@ CLASS aoc net/minecraft/entity/ai/goal/GoToVillageGoal - FIELD a owner Laiv; + FIELD a mob Laiv; FIELD b searchRange I FIELD c targetPosition Lev; + METHOD (Laiv;I)V + ARG 1 mob + ARG 2 searchRange METHOD g findOtherWaypoint ()V diff --git a/mappings/net/minecraft/entity/ai/goal/GoToWalkTargetGoal.mapping b/mappings/net/minecraft/entity/ai/goal/GoToWalkTargetGoal.mapping index a4239c6fe9..2f1cdb68a0 100644 --- a/mappings/net/minecraft/entity/ai/goal/GoToWalkTargetGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/GoToWalkTargetGoal.mapping @@ -4,3 +4,6 @@ CLASS ank net/minecraft/entity/ai/goal/GoToWalkTargetGoal FIELD c y D FIELD d z D FIELD e speed D + METHOD (Laiv;D)V + ARG 1 mob + ARG 2 speed diff --git a/mappings/net/minecraft/entity/ai/goal/HoldInHandsGoal.mapping b/mappings/net/minecraft/entity/ai/goal/HoldInHandsGoal.mapping index e2625c1c9e..e7786ce8d1 100644 --- a/mappings/net/minecraft/entity/ai/goal/HoldInHandsGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/HoldInHandsGoal.mapping @@ -1,4 +1,10 @@ CLASS aoi net/minecraft/entity/ai/goal/HoldInHandsGoal + FIELD a actor Laip; FIELD b item Lbca; FIELD c condition Ljava/util/function/Predicate; FIELD d sound Lyj; + METHOD (Laip;Lbca;Lyj;Ljava/util/function/Predicate;)V + ARG 1 actor + ARG 2 item + ARG 3 sound + ARG 4 condition diff --git a/mappings/net/minecraft/entity/ai/goal/HorseBondWithPlayerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/HorseBondWithPlayerGoal.mapping index 2b245915fb..9d17620761 100644 --- a/mappings/net/minecraft/entity/ai/goal/HorseBondWithPlayerGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/HorseBondWithPlayerGoal.mapping @@ -1,9 +1,9 @@ CLASS aoa net/minecraft/entity/ai/goal/HorseBondWithPlayerGoal - FIELD a owner Lars; + FIELD a horse Lars; FIELD b speed D FIELD c targetX D FIELD d targetY D FIELD e targetZ D METHOD (Lars;D)V - ARG 1 owner + ARG 1 horse ARG 2 speed diff --git a/mappings/net/minecraft/entity/ai/goal/IronGolemLookGoal.mapping b/mappings/net/minecraft/entity/ai/goal/IronGolemLookGoal.mapping index 36aef5020b..73675489a2 100644 --- a/mappings/net/minecraft/entity/ai/goal/IronGolemLookGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/IronGolemLookGoal.mapping @@ -1,5 +1,7 @@ CLASS ann net/minecraft/entity/ai/goal/IronGolemLookGoal FIELD a CLOSE_VILLAGER_PREDICATE Lapz; - FIELD b ironGolemEntity Laqz; + FIELD b golem Laqz; FIELD c targetVillager Lavk; FIELD d lookCountdown I + METHOD (Laqz;)V + ARG 1 golem diff --git a/mappings/net/minecraft/entity/ai/goal/LongDoorInteractGoal.mapping b/mappings/net/minecraft/entity/ai/goal/LongDoorInteractGoal.mapping index 941ec9ef75..b5df406ac4 100644 --- a/mappings/net/minecraft/entity/ai/goal/LongDoorInteractGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/LongDoorInteractGoal.mapping @@ -1,4 +1,4 @@ CLASS ano net/minecraft/entity/ai/goal/LongDoorInteractGoal FIELD b ticksLeft I METHOD (Laip;Z)V - ARG 1 owner + ARG 1 mob diff --git a/mappings/net/minecraft/entity/ai/goal/LookAroundGoal.mapping b/mappings/net/minecraft/entity/ai/goal/LookAroundGoal.mapping index 8d8704f486..ba23fa7998 100644 --- a/mappings/net/minecraft/entity/ai/goal/LookAroundGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/LookAroundGoal.mapping @@ -1,7 +1,7 @@ CLASS ans net/minecraft/entity/ai/goal/LookAroundGoal - FIELD a owner Laip; + FIELD a mob Laip; FIELD b deltaX D FIELD c deltaZ D FIELD d lookTime I METHOD (Laip;)V - ARG 1 owner + ARG 1 mob diff --git a/mappings/net/minecraft/entity/ai/goal/LookAtCustomerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/LookAtCustomerGoal.mapping index 43f8d81796..ad5b67e970 100644 --- a/mappings/net/minecraft/entity/ai/goal/LookAtCustomerGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/LookAtCustomerGoal.mapping @@ -1,4 +1,4 @@ CLASS ane net/minecraft/entity/ai/goal/LookAtCustomerGoal FIELD f trader Lavg; METHOD (Lavg;)V - ARG 1 owner + ARG 1 trader diff --git a/mappings/net/minecraft/entity/ai/goal/LookAtEntityGoal.mapping b/mappings/net/minecraft/entity/ai/goal/LookAtEntityGoal.mapping index 7f4d9fb3f1..84a58dc708 100644 --- a/mappings/net/minecraft/entity/ai/goal/LookAtEntityGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/LookAtEntityGoal.mapping @@ -1,5 +1,5 @@ CLASS and net/minecraft/entity/ai/goal/LookAtEntityGoal - FIELD a owner Laip; + FIELD a mob Laip; FIELD b target Laif; FIELD c range F FIELD d targetType Ljava/lang/Class; @@ -7,11 +7,11 @@ CLASS and net/minecraft/entity/ai/goal/LookAtEntityGoal FIELD f lookTime I FIELD g chance F METHOD (Laip;Ljava/lang/Class;F)V - ARG 1 owner + ARG 1 mob ARG 2 targetType ARG 3 range METHOD (Laip;Ljava/lang/Class;FF)V - ARG 1 owner + ARG 1 mob ARG 2 targetType ARG 3 range ARG 4 chance diff --git a/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping index 9047dd998e..bcd8d1cc91 100644 --- a/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping @@ -1,8 +1,13 @@ CLASS anf net/minecraft/entity/ai/goal/MeleeAttackGoal - FIELD a entity Laiv; + FIELD a mob Laiv; FIELD b ticksUntilAttack I + FIELD d speed D + FIELD h targetX D + FIELD i targetY D + FIELD j targetZ D METHOD (Laiv;DZ)V - ARG 1 entity + ARG 1 mob + ARG 2 speed METHOD a getSquaredMaxAttackDistance (Laio;)D ARG 1 entity METHOD a attack (Laio;D)V diff --git a/mappings/net/minecraft/entity/ai/goal/MoveIntoWaterGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MoveIntoWaterGoal.mapping index 3633f40261..ae70b20049 100644 --- a/mappings/net/minecraft/entity/ai/goal/MoveIntoWaterGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/MoveIntoWaterGoal.mapping @@ -1,2 +1,4 @@ CLASS aoh net/minecraft/entity/ai/goal/MoveIntoWaterGoal - FIELD a owner Laiv; + FIELD a mob Laiv; + METHOD (Laiv;)V + ARG 1 mob diff --git a/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping index 01f78b36ce..364c4646b3 100644 --- a/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping @@ -1 +1,10 @@ CLASS ani net/minecraft/entity/ai/goal/MoveThroughVillageGoal + FIELD a mob Laiv; + FIELD b speed D + FIELD c targetPath Lcng; + FIELD d target Lev; + FIELD e requiresNighttime Z + METHOD (Laiv;DZILjava/util/function/BooleanSupplier;)V + ARG 1 mob + ARG 2 speed + ARG 4 requiresNighttime diff --git a/mappings/net/minecraft/entity/ai/goal/MoveToRaidCenterGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MoveToRaidCenterGoal.mapping index dc1d97f04d..c3124b7946 100644 --- a/mappings/net/minecraft/entity/ai/goal/MoveToRaidCenterGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/MoveToRaidCenterGoal.mapping @@ -1,4 +1,7 @@ CLASS anq net/minecraft/entity/ai/goal/MoveToRaidCenterGoal - FIELD a owner Laxc; + FIELD a actor Laxc; + METHOD (Laxc;)V + ARG 1 actor METHOD a includeFreeRaiders (Laxb;)V + ARG 1 raid METHOD g moveToAlternativePosition ()V diff --git a/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping index c1ebbbbb50..55b9c93380 100644 --- a/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping @@ -1,5 +1,5 @@ CLASS anj net/minecraft/entity/ai/goal/MoveToTargetPosGoal - FIELD a owner Laiv; + FIELD a mob Laiv; FIELD b speed D FIELD c cooldown I FIELD d tryingTime I @@ -10,11 +10,11 @@ CLASS anj net/minecraft/entity/ai/goal/MoveToTargetPosGoal FIELD i range I FIELD j maxYDifference I METHOD (Laiv;DI)V - ARG 1 owner + ARG 1 mob ARG 2 speed ARG 4 range METHOD (Laiv;DII)V - ARG 1 owner + ARG 1 mob ARG 2 speed ARG 4 range ARG 5 maxYDifference diff --git a/mappings/net/minecraft/entity/ai/goal/ParrotClimbOntoPlayerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/ParrotClimbOntoPlayerGoal.mapping deleted file mode 100644 index 9a5eab551b..0000000000 --- a/mappings/net/minecraft/entity/ai/goal/ParrotClimbOntoPlayerGoal.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS ana net/minecraft/entity/ai/goal/ParrotClimbOntoPlayerGoal - FIELD a parrot Lark; - FIELD b parrotOwner Lvh; - FIELD c mounted Z - METHOD (Lark;)V - ARG 1 parrot diff --git a/mappings/net/minecraft/entity/ai/goal/PounceAtTargetGoal.mapping b/mappings/net/minecraft/entity/ai/goal/PounceAtTargetGoal.mapping index 3f3205ed6f..f51cb94c1e 100644 --- a/mappings/net/minecraft/entity/ai/goal/PounceAtTargetGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/PounceAtTargetGoal.mapping @@ -1,5 +1,7 @@ CLASS anb net/minecraft/entity/ai/goal/PounceAtTargetGoal - FIELD a owner Laip; + FIELD a mob Laip; FIELD b target Laio; + FIELD c velocity F METHOD (Laip;F)V - ARG 1 owner + ARG 1 rmob + ARG 2 velocity diff --git a/mappings/net/minecraft/entity/ai/goal/ProjectileAttackGoal.mapping b/mappings/net/minecraft/entity/ai/goal/ProjectileAttackGoal.mapping index 164f214911..6a270329ab 100644 --- a/mappings/net/minecraft/entity/ai/goal/ProjectileAttackGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/ProjectileAttackGoal.mapping @@ -1,6 +1,15 @@ CLASS anv net/minecraft/entity/ai/goal/ProjectileAttackGoal - FIELD a mobEntity Laip; - FIELD b rangedAttacker Lauo; + FIELD a mob Laip; + FIELD b owner Lauo; FIELD c target Laio; + FIELD e mobSpeed D + FIELD i maxShootRange F + FIELD j squaredMaxShootRange F + METHOD (Lauo;DIF)V + ARG 1 mob + ARG 2 mobSpeed + ARG 5 maxShootRange METHOD (Lauo;DIIF)V - ARG 1 entity + ARG 1 mob + ARG 2 mobSpeed + ARG 6 maxShootRange diff --git a/mappings/net/minecraft/entity/ai/goal/RaidGoal.mapping b/mappings/net/minecraft/entity/ai/goal/RaidGoal.mapping index 639f934ea5..c65513a752 100644 --- a/mappings/net/minecraft/entity/ai/goal/RaidGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/RaidGoal.mapping @@ -1,4 +1,9 @@ CLASS aos net/minecraft/entity/ai/goal/RaidGoal FIELD i cooldown I + METHOD (Laxc;Ljava/lang/Class;ZLjava/util/function/Predicate;)V + ARG 1 raider + ARG 2 targetEntityClass + ARG 3 checkVisibility + ARG 4 tragetPredicate METHOD h getCooldown ()I METHOD j decreaseCooldown ()V diff --git a/mappings/net/minecraft/entity/ai/goal/RevengeGoal.mapping b/mappings/net/minecraft/entity/ai/goal/RevengeGoal.mapping index 1e9fddddca..e7f1c6951a 100644 --- a/mappings/net/minecraft/entity/ai/goal/RevengeGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/RevengeGoal.mapping @@ -4,7 +4,12 @@ CLASS aop net/minecraft/entity/ai/goal/RevengeGoal FIELD c lastAttackedTime I FIELD d noRevengeTypes [Ljava/lang/Class; FIELD i noHelpTypes [Ljava/lang/Class; + METHOD (Laiv;[Ljava/lang/Class;)V + ARG 1 mob + ARG 2 noRevengeTypes METHOD a setMobEntityTarget (Laip;Laio;)V + ARG 1 mob + ARG 2 target METHOD a setGroupRevenge ([Ljava/lang/Class;)Laop; ARG 1 noHelpTypes METHOD g callSameTypeForRevenge ()V diff --git a/mappings/net/minecraft/entity/ai/goal/SitGoal.mapping b/mappings/net/minecraft/entity/ai/goal/SitGoal.mapping index 5573ce5fd8..602187d2ee 100644 --- a/mappings/net/minecraft/entity/ai/goal/SitGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/SitGoal.mapping @@ -1,4 +1,7 @@ CLASS aob net/minecraft/entity/ai/goal/SitGoal - FIELD a entity Lajc; + FIELD a tameable Lajc; FIELD b enabledWithOwner Z + METHOD (Lajc;)V + ARG 1 tameable METHOD a setEnabledWithOwner (Z)V + ARG 1 enabledWithOwner diff --git a/mappings/net/minecraft/entity/ai/goal/SitOnOwnerShoulder.mapping b/mappings/net/minecraft/entity/ai/goal/SitOnOwnerShoulder.mapping new file mode 100644 index 0000000000..5a17b8ef84 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/SitOnOwnerShoulder.mapping @@ -0,0 +1,6 @@ +CLASS ana net/minecraft/entity/ai/goal/SitOnOwnerShoulder + FIELD a tameable Lark; + FIELD b owner Lvh; + FIELD c mounted Z + METHOD (Lark;)V + ARG 1 tameable diff --git a/mappings/net/minecraft/entity/ai/goal/SkeletonHorseGoal.mapping b/mappings/net/minecraft/entity/ai/goal/SkeletonHorseGoal.mapping deleted file mode 100644 index 9b92224f55..0000000000 --- a/mappings/net/minecraft/entity/ai/goal/SkeletonHorseGoal.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS ary net/minecraft/entity/ai/goal/SkeletonHorseGoal - FIELD a owner Larx; diff --git a/mappings/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.mapping new file mode 100644 index 0000000000..b7ab9ad3d4 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.mapping @@ -0,0 +1,9 @@ +CLASS ary net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal + FIELD a skeletonHorse Larx; + METHOD (Larx;)V + ARG 1 skeletonHorse + METHOD a getHorse (Lagy;)Lars; + ARG 1 localDifficulty + METHOD a getSkeleton (Lagy;Lars;)Laut; + ARG 1 localDifficulty + ARG 2 vehicle diff --git a/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping b/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping index 44527e5eb7..bb9066dc69 100644 --- a/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping @@ -1,10 +1,10 @@ CLASS any net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal FIELD g targetBlock Lbml; - FIELD h owner Laip; + FIELD h stepAndDestroyMob Laip; FIELD i counter I METHOD (Lbml;Laiv;DI)V ARG 1 targetBlock - ARG 2 owner + ARG 2 mob ARG 3 speed ARG 5 maxYDifference METHOD a onDestroyBlock (Lbhh;Lev;)V diff --git a/mappings/net/minecraft/entity/ai/goal/StopFollowingCustomerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/StopFollowingCustomerGoal.mapping index 5f7dc7cd8a..d7cb3b07f1 100644 --- a/mappings/net/minecraft/entity/ai/goal/StopFollowingCustomerGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/StopFollowingCustomerGoal.mapping @@ -1 +1,4 @@ CLASS aog net/minecraft/entity/ai/goal/StopFollowingCustomerGoal + FIELD a trader Lavg; + METHOD (Lavg;)V + ARG 1 trader diff --git a/mappings/net/minecraft/entity/ai/goal/SwimGoal.mapping b/mappings/net/minecraft/entity/ai/goal/SwimGoal.mapping index 61b0f9bc88..0e87d64785 100644 --- a/mappings/net/minecraft/entity/ai/goal/SwimGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/SwimGoal.mapping @@ -1,2 +1,4 @@ CLASS amo net/minecraft/entity/ai/goal/SwimGoal - FIELD a entityMob Laip; + FIELD a mob Laip; + METHOD (Laip;)V + ARG 1 mob diff --git a/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping b/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping index 1fb589faef..281bb3157f 100644 --- a/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping @@ -1,5 +1,5 @@ CLASS aof net/minecraft/entity/ai/goal/TemptGoal - FIELD a owner Laiv; + FIELD a mob Laiv; FIELD b closestPlayer Lavx; FIELD c TEMPTING_ENTITY_PREDICATE Lapz; FIELD d speed D @@ -10,18 +10,18 @@ CLASS aof net/minecraft/entity/ai/goal/TemptGoal FIELD i lastPlayerYaw D FIELD j cooldown I FIELD k active Z - FIELD l temptItem Lbef; + FIELD l food Lbef; FIELD m canBeScared Z METHOD (Laiv;DLbef;Z)V - ARG 1 owner + ARG 1 mob ARG 2 speed - ARG 4 temptItem + ARG 4 food ARG 5 canBeScared METHOD (Laiv;DZLbef;)V - ARG 1 owner + ARG 1 mob ARG 2 speed ARG 4 canBeScared - ARG 5 temptItem + ARG 5 food METHOD a isTempedBy (Lbca;)Z ARG 1 stack METHOD g canBeScared ()Z diff --git a/mappings/net/minecraft/entity/ai/goal/TrackAttackerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/TrackAttackerGoal.mapping deleted file mode 100644 index 94c40e582b..0000000000 --- a/mappings/net/minecraft/entity/ai/goal/TrackAttackerGoal.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS aou net/minecraft/entity/ai/goal/TrackAttackerGoal diff --git a/mappings/net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal.mapping b/mappings/net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal.mapping index 538f4c533e..bd1dde0d28 100644 --- a/mappings/net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal.mapping @@ -1,3 +1,5 @@ CLASS aoo net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal - FIELD a ironGolem Laqz; + FIELD a golem Laqz; FIELD b target Laio; + METHOD (Laqz;)V + ARG 1 golem diff --git a/mappings/net/minecraft/entity/ai/goal/TrackOwnerAttackerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/TrackOwnerAttackerGoal.mapping new file mode 100644 index 0000000000..92606074a0 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/TrackOwnerAttackerGoal.mapping @@ -0,0 +1,6 @@ +CLASS aou net/minecraft/entity/ai/goal/TrackOwnerAttackerGoal + FIELD a tameable Lajc; + FIELD b attacker Laio; + FIELD c lastAttackedTime I + METHOD (Lajc;)V + ARG 1 tameable diff --git a/mappings/net/minecraft/entity/ai/goal/TrackTargetGoal.mapping b/mappings/net/minecraft/entity/ai/goal/TrackTargetGoal.mapping index d4254ba695..2d462f3120 100644 --- a/mappings/net/minecraft/entity/ai/goal/TrackTargetGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/TrackTargetGoal.mapping @@ -3,15 +3,22 @@ CLASS aow net/minecraft/entity/ai/goal/TrackTargetGoal FIELD b canNavigateFlag I FIELD c checkCanNavigateCooldown I FIELD d timeWithoutVisibility I - FIELD e entity Laip; + FIELD e mob Laip; FIELD f checkVisibility Z FIELD g target Laio; FIELD h maxTimeWithoutVisibility I + METHOD (Laip;Z)V + ARG 1 mob + ARG 2 checkVisibility METHOD (Laip;ZZ)V + ARG 1 mob ARG 2 checkVisibility ARG 3 checkNavigable METHOD a setMaxTimeWithoutVisibility (I)Laow; + ARG 1 time METHOD a canNavigateToEntity (Laio;)Z + ARG 1 entity METHOD a canTrack (Laio;Lapz;)Z ARG 1 target + ARG 2 targetPredicate METHOD k getFollowRange ()D diff --git a/mappings/net/minecraft/entity/ai/goal/WanderAroundFarGoal.mapping b/mappings/net/minecraft/entity/ai/goal/WanderAroundFarGoal.mapping index 1a5b2a4ee3..e114fe6d17 100644 --- a/mappings/net/minecraft/entity/ai/goal/WanderAroundFarGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/WanderAroundFarGoal.mapping @@ -1,2 +1,6 @@ CLASS aok net/minecraft/entity/ai/goal/WanderAroundFarGoal - FIELD h farWanderProbability F + FIELD h probability F + METHOD (Laiv;DF)V + ARG 1 mob + ARG 2 speed + ARG 4 probabiliity diff --git a/mappings/net/minecraft/entity/ai/goal/WanderAroundGoal.mapping b/mappings/net/minecraft/entity/ai/goal/WanderAroundGoal.mapping index 3908edf06e..f0425842c3 100644 --- a/mappings/net/minecraft/entity/ai/goal/WanderAroundGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/WanderAroundGoal.mapping @@ -1,5 +1,5 @@ CLASS ant net/minecraft/entity/ai/goal/WanderAroundGoal - FIELD a owner Laiv; + FIELD a mob Laiv; FIELD b targetX D FIELD c targetY D FIELD d targetZ D @@ -7,10 +7,10 @@ CLASS ant net/minecraft/entity/ai/goal/WanderAroundGoal FIELD f chance I FIELD g ignoringChance Z METHOD (Laiv;D)V - ARG 1 owner + ARG 1 mob ARG 2 speed METHOD (Laiv;DI)V - ARG 1 owner + ARG 1 mob ARG 2 speed ARG 4 chance METHOD a setChance (I)V diff --git a/mappings/net/minecraft/entity/ai/goal/WeightedGoal.mapping b/mappings/net/minecraft/entity/ai/goal/WeightedGoal.mapping index c99e5c0f9c..784cdcac2c 100644 --- a/mappings/net/minecraft/entity/ai/goal/WeightedGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/WeightedGoal.mapping @@ -2,6 +2,9 @@ CLASS aol net/minecraft/entity/ai/goal/WeightedGoal FIELD a goal Lamv; FIELD b weight I FIELD c running Z + METHOD (ILamv;)V + ARG 1 weight + ARG 2 goal METHOD a canBeReplacedBy (Laol;)Z ARG 1 goal METHOD g isRunning ()Z diff --git a/mappings/net/minecraft/entity/ai/goal/WolfBegGoal.mapping b/mappings/net/minecraft/entity/ai/goal/WolfBegGoal.mapping index bb64a0e085..79bb482e3a 100644 --- a/mappings/net/minecraft/entity/ai/goal/WolfBegGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/WolfBegGoal.mapping @@ -1,11 +1,12 @@ CLASS amd net/minecraft/entity/ai/goal/WolfBegGoal - FIELD a owner Larq; + FIELD a wolf Larq; FIELD b begFrom Lavx; FIELD c world Lbhh; FIELD d begDistance F FIELD e timer I FIELD f validPlayerPredicate Lapz; METHOD (Larq;F)V - ARG 1 owner + ARG 1 wolf ARG 2 begDistance METHOD a isAttractive (Lavx;)Z + ARG 1 player diff --git a/mappings/net/minecraft/entity/ai/goal/ZombieAttackGoal.mapping b/mappings/net/minecraft/entity/ai/goal/ZombieAttackGoal.mapping new file mode 100644 index 0000000000..7ac81bcf5e --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/ZombieAttackGoal.mapping @@ -0,0 +1,5 @@ +CLASS aom net/minecraft/entity/ai/goal/ZombieAttackGoal + FIELD d zombie Lavd; + METHOD (Lavd;DZ)V + ARG 1 zombie + ARG 2 speed diff --git a/mappings/net/minecraft/entity/ai/goal/ZombieRaiseArmsGoal.mapping b/mappings/net/minecraft/entity/ai/goal/ZombieRaiseArmsGoal.mapping deleted file mode 100644 index f33091d5d0..0000000000 --- a/mappings/net/minecraft/entity/ai/goal/ZombieRaiseArmsGoal.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS aom net/minecraft/entity/ai/goal/ZombieRaiseArmsGoal - FIELD d zombie Lavd; diff --git a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping index 2d2888f02d..2dd1335938 100644 --- a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping @@ -18,6 +18,9 @@ CLASS aph net/minecraft/entity/ai/pathing/EntityNavigation ARG 3 y ARG 5 z METHOD a startMovingTo (DDDD)Z + ARG 1 x + ARG 3 y + ARG 5 z ARG 7 speed METHOD a createPathNodeNavigator (I)Lcni; METHOD a findPathTo (Laif;)Lcng; diff --git a/mappings/net/minecraft/entity/attribute/AbstractEntityAttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/AbstractEntityAttributeContainer.mapping index 82aad5ed45..9ea4d5ced1 100644 --- a/mappings/net/minecraft/entity/attribute/AbstractEntityAttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/AbstractEntityAttributeContainer.mapping @@ -7,9 +7,13 @@ CLASS aji net/minecraft/entity/attribute/AbstractEntityAttributeContainer ARG 1 attribute METHOD a add (Lajf;)V ARG 1 instance + METHOD a removeAll (Lcom/google/common/collect/Multimap;)V + ARG 1 modifiers METHOD a get (Ljava/lang/String;)Lajf; ARG 1 name METHOD b register (Laje;)Lajf; ARG 1 attribute + METHOD b replaceAll (Lcom/google/common/collect/Multimap;)V + ARG 1 modifiers METHOD c createInstance (Laje;)Lajf; ARG 1 attribute diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping index 35838e3370..ff7cd3e3bb 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping @@ -3,6 +3,7 @@ CLASS ajf net/minecraft/entity/attribute/EntityAttributeInstance METHOD a setBaseValue (D)V ARG 1 baseValue METHOD a getModifiers (Lajg$a;)Ljava/util/Collection; + ARG 1 operation METHOD a hasModifier (Lajg;)Z ARG 1 modifier METHOD a getModifier (Ljava/util/UUID;)Lajg; diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeInstanceImpl.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstanceImpl.mapping index 9c7e1eb1ac..554133e804 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeInstanceImpl.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeInstanceImpl.mapping @@ -11,5 +11,6 @@ CLASS ajj net/minecraft/entity/attribute/EntityAttributeInstanceImpl ARG 1 container ARG 2 attribute METHOD b getAllModifiers (Lajg$a;)Ljava/util/Collection; + ARG 1 operation METHOD f invalidateCache ()V METHOD g computeValue ()D diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping index 73762df450..c982fc3c28 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping @@ -15,14 +15,17 @@ CLASS ajg net/minecraft/entity/attribute/EntityAttributeModifier METHOD (Ljava/lang/String;DLajg$a;)V ARG 1 name ARG 2 amount + ARG 4 operation METHOD (Ljava/util/UUID;Ljava/lang/String;DLajg$a;)V ARG 1 uuid ARG 2 name ARG 3 amount + ARG 5 operation METHOD (Ljava/util/UUID;Ljava/util/function/Supplier;DLajg$a;)V ARG 1 uuid ARG 2 nameGetter ARG 3 amount + ARG 5 operation METHOD a getId ()Ljava/util/UUID; METHOD a setSerialize (Z)Lajg; ARG 1 serialize diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping index 9ad0f4f1eb..832d61cc5d 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping @@ -15,11 +15,13 @@ CLASS auq net/minecraft/entity/attribute/EntityAttributes ARG 0 instance METHOD a fromTag (Lajf;Lib;)V ARG 0 instance + ARG 1 tag METHOD a toTag (Lajg;)Lib; ARG 0 modifier METHOD a toTag (Laji;)Lii; ARG 0 container METHOD a fromTag (Laji;Lii;)V ARG 0 container + ARG 1 tag METHOD a createFromTag (Lib;)Lajg; ARG 0 tag diff --git a/mappings/net/minecraft/entity/boss/BossBar.mapping b/mappings/net/minecraft/entity/boss/BossBar.mapping index 7bd84e3b26..7422da8848 100644 --- a/mappings/net/minecraft/entity/boss/BossBar.mapping +++ b/mappings/net/minecraft/entity/boss/BossBar.mapping @@ -3,8 +3,8 @@ CLASS agq net/minecraft/entity/boss/BossBar FIELD h name Ljava/lang/String; FIELD i format Lc; METHOD (Ljava/lang/String;ILjava/lang/String;Lc;)V - ARG 1 format ARG 3 name + ARG 4 format METHOD a getTextFormat ()Lc; METHOD a byName (Ljava/lang/String;)Lagq$a; ARG 0 name diff --git a/mappings/net/minecraft/entity/boss/BossBarManager.mapping b/mappings/net/minecraft/entity/boss/BossBarManager.mapping index be546da3b3..0399c5e5e8 100644 --- a/mappings/net/minecraft/entity/boss/BossBarManager.mapping +++ b/mappings/net/minecraft/entity/boss/BossBarManager.mapping @@ -1,10 +1,21 @@ CLASS rj net/minecraft/entity/boss/BossBarManager FIELD a server Lnet/minecraft/server/MinecraftServer; - FIELD b bossBars Ljava/util/Map; + FIELD b commandBossBars Ljava/util/Map; + METHOD (Lnet/minecraft/server/MinecraftServer;)V + ARG 1 server METHOD a getIds ()Ljava/util/Collection; METHOD a fromTag (Lib;)V + ARG 1 tag METHOD a get (Lqs;)Lri; + ARG 1 id METHOD a add (Lqs;Ljm;)Lri; + ARG 1 id + ARG 2 displayName METHOD a remove (Lri;)V + ARG 1 bossBar + METHOD a onPlayerConnect (Lvh;)V + ARG 1 player METHOD b getAll ()Ljava/util/Collection; + METHOD b onPlayerDisconnenct (Lvh;)V + ARG 1 player METHOD c toTag ()Lib; diff --git a/mappings/net/minecraft/entity/boss/CommandBossBar.mapping b/mappings/net/minecraft/entity/boss/CommandBossBar.mapping index f181f4c270..2020b97baa 100644 --- a/mappings/net/minecraft/entity/boss/CommandBossBar.mapping +++ b/mappings/net/minecraft/entity/boss/CommandBossBar.mapping @@ -3,13 +3,26 @@ CLASS ri net/minecraft/entity/boss/CommandBossBar FIELD i playerUuids Ljava/util/Set; FIELD j value I FIELD k maxValue I + METHOD (Lqs;Ljm;)V + ARG 1 id + ARG 2 displayName METHOD a getId ()Lqs; METHOD a setValue (I)V + ARG 1 value METHOD a fromTag (Lib;Lqs;)Lri; + ARG 0 tag + ARG 1 id METHOD a addPlayers (Ljava/util/Collection;)Z + ARG 1 players METHOD a addPlayer (Ljava/util/UUID;)V + ARG 1 uuid METHOD b setMaxValue (I)V + ARG 1 maxValue METHOD c getValue ()I + METHOD c onPlayerConnect (Lvh;)V + ARG 1 player METHOD d getMaxValue ()I + METHOD d onPlayerDisconnect (Lvh;)V + ARG 1 player METHOD e getTextComponent ()Ljm; METHOD f toTag ()Lib; diff --git a/mappings/net/minecraft/entity/boss/ServerBossBar.mapping b/mappings/net/minecraft/entity/boss/ServerBossBar.mapping index e8b2748f3d..7f61b13836 100644 --- a/mappings/net/minecraft/entity/boss/ServerBossBar.mapping +++ b/mappings/net/minecraft/entity/boss/ServerBossBar.mapping @@ -1,13 +1,18 @@ CLASS vd net/minecraft/entity/boss/ServerBossBar FIELD h players Ljava/util/Set; + FIELD i unmodifiablePlayers Ljava/util/Set; FIELD j visible Z METHOD (Ljm;Lagq$a;Lagq$b;)V - ARG 1 name + ARG 1 displayName ARG 2 color + ARG 3 style METHOD a sendPacket (Lkq$a;)V + ARG 1 type METHOD a addPlayer (Lvh;)V + ARG 1 player METHOD b clearPlayers ()V METHOD b removePlayer (Lvh;)V + ARG 1 player METHOD d setVisible (Z)V ARG 1 visible METHOD g isVisible ()Z diff --git a/mappings/net/minecraft/entity/boss/WitherEntity.mapping b/mappings/net/minecraft/entity/boss/WitherEntity.mapping index d05fd5bcbe..273b095330 100644 --- a/mappings/net/minecraft/entity/boss/WitherEntity.mapping +++ b/mappings/net/minecraft/entity/boss/WitherEntity.mapping @@ -1,13 +1,40 @@ CLASS ata net/minecraft/entity/boss/WitherEntity FIELD bA INVUL_TIMER Lqh; FIELD bB HEAD_TARGET_PREDICATE Lapz; + FIELD bC sideHeadPitches [F + FIELD bD sideHeadYaws [F + FIELD bE prevSideHeadPitches [F + FIELD bF prevSideHeadYaws [F + FIELD bJ bossBar Lvd; + FIELD bK CAN_ATTACK_PREDICATE Ljava/util/function/Predicate; FIELD b TRACKED_ENTITY_ID_1 Lqh; + FIELD bz TRACKED_ENTITY_IDS Ljava/util/List; FIELD c TRACKED_ENTITY_ID_2 Lqh; FIELD d TRACKED_ENTITY_ID_3 Lqh; + METHOD a getNextAngle (FFF)F + ARG 1 prevAngle + ARG 2 desiredAngle + ARG 3 maxDifference + METHOD a getHeadYaw (I)F + ARG 1 headIndex + METHOD a (IDDDZ)V + ARG 1 headIndex METHOD a setTrackedEntityId (II)V ARG 1 headIndex + ARG 2 id + METHOD b getHeadPitch (I)F + ARG 1 headIndex METHOD b canDestroy (Lbvj;)Z + ARG 0 block METHOD dV getInvulTimer ()I METHOD dW isAtHalfHealth ()Z METHOD q setInvulTimer (I)V + ARG 1 ticks METHOD r getTrackedEntityId (I)I + ARG 1 headIndex + METHOD s getHeadX (I)D + ARG 1 headIndex + METHOD t getHeadY (I)D + ARG 1 headIndex + METHOD u getHeadZ (I)D + ARG 1 headIndex diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping index c263f99800..f439d2a88a 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping @@ -8,7 +8,7 @@ CLASS asg net/minecraft/entity/boss/dragon/EnderDragonEntity FIELD bG partWingRight Lase; FIELD bH partWingLeft Lase; FIELD b PHASE_TYPE Lqh; - FIELD bM enderCrystal Lasf; + FIELD bM connectedCrystal Lasf; FIELD bN LOGGER Lorg/apache/logging/log4j/Logger; FIELD bO CLOSE_PLAYER_PREDICATE Lapz; FIELD bP fight Lbyh; diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonPart.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonPart.mapping index 25f9012059..cfced2c17f 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonPart.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonPart.mapping @@ -1,6 +1,9 @@ CLASS ase net/minecraft/entity/boss/dragon/EnderDragonPart FIELD b owner Lasg; FIELD c name Ljava/lang/String; + FIELD d partSize Laig; METHOD (Lasg;Ljava/lang/String;FF)V + ARG 1 owner ARG 2 name ARG 3 width + ARG 4 height diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping index 0908686cc3..50b49e2dc4 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping @@ -5,3 +5,6 @@ CLASS byg net/minecraft/entity/boss/dragon/EnderDragonSpawnState FIELD d SUMMONING_DRAGOM Lbyg; FIELD e END Lbyg; METHOD a run (Lvg;Lbyh;Ljava/util/List;ILev;)V + ARG 1 world + ARG 2 fight + ARG 3 crystals diff --git a/mappings/net/minecraft/entity/mob/BlazeEntity.mapping b/mappings/net/minecraft/entity/mob/BlazeEntity.mapping index c8071019aa..384604b717 100644 --- a/mappings/net/minecraft/entity/mob/BlazeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/BlazeEntity.mapping @@ -1,5 +1,9 @@ CLASS att net/minecraft/entity/mob/BlazeEntity CLASS att$a ShootFireballGoal + FIELD a blaze Latt; + METHOD (Latt;)V + ARG 1 blaze FIELD d BLAZE_FLAGS Lqh; METHOD l isFireActive ()Z METHOD r setFireActive (Z)V + ARG 1 active diff --git a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping index 6242b28f77..f48fe854df 100644 --- a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping +++ b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping @@ -1,8 +1,42 @@ CLASS atx net/minecraft/entity/mob/DrownedEntity + CLASS atx$a DrownedAttackGoal + FIELD d drowned Latx; + METHOD (Latx;DZ)V + ARG 1 drowned + ARG 2 speed + CLASS atx$b LeaveWaterGoal + FIELD g drowned Latx; + METHOD (Latx;D)V + ARG 1 drowned + ARG 2 speed + CLASS atx$c WanderAroundOnSurfaceGoal + FIELD a mob Laiv; + FIELD b x D + FIELD c y D + FIELD d z D + FIELD e speed D + FIELD f world Lbhh; + METHOD (Laiv;D)V + ARG 1 mob + ARG 2 speed + METHOD g getWanderTarget ()Lcrv; CLASS atx$d DrownedMoveControl FIELD i drowned Latx; + METHOD (Latx;)V + ARG 1 drowned + CLASS atx$e + FIELD a drowned Latx; + FIELD b speed D + FIELD c minY I + METHOD (Latx;DI)V + ARG 1 drowned + ARG 2 speed + ARG 4 minY + CLASS atx$f TridentAttackGoal + FIELD a drowned Latx; FIELD b waterNavigation Lapj; - FIELD bz targettingUnderwater Z + FIELD bz targetingUnderwater Z FIELD c landNavigation Lapg; - METHOD eg isTargettingUnderwater ()Z - METHOD r setTargettingUnderwater (Z)V + METHOD eg isTargetingUnderwater ()Z + METHOD r setTargetingUnderwater (Z)V + ARG 1 targetingUnderwater diff --git a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping index c8e384bd23..61a0ea895a 100644 --- a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping @@ -1,27 +1,33 @@ CLASS atz net/minecraft/entity/mob/EndermanEntity CLASS atz$a ChasePlayerGoal - FIELD a endermanEntity Latz; + FIELD a enderman Latz; METHOD (Latz;)V - ARG 1 endermanEntity + ARG 1 enderman CLASS atz$b PlaceBlockGoal - FIELD a owner Latz; + FIELD a enderman Latz; + METHOD (Latz;)V + ARG 1 enderman CLASS atz$c TeleportTowardsPlayerGoal - FIELD i endermanEntity Latz; + FIELD i enderman Latz; FIELD j targetPlayer Lavx; FIELD k lookAtPlayerWarmup I FIELD l ticksSinceUnseenTeleport I FIELD m staringPlayerPredicate Lapz; FIELD n validTargetPredicate Lapz; METHOD (Latz;)V - ARG 1 endermanEntity + ARG 1 enderman METHOD a (Latz;Laio;)Z ARG 1 playerEntity CLASS atz$d PickUpBlockGoal - FIELD a owner Latz; + FIELD a enderman Latz; + METHOD (Latz;)V + ARG 1 enderman FIELD bA PLAYER_ENDERMITE_PREDICATE Ljava/util/function/Predicate; FIELD bB lastAngrySoundAge I FIELD bC ageWhenTargetSet I + FIELD b ATTACKING_SPEED_BOOST_UUID Ljava/util/UUID; FIELD bz ANGRY Lqh; + FIELD c ATTACKING_SPEED_BOOST Lajg; FIELD d CARRIED_BLOCK Lqh; METHOD a teleportTo (Laif;)Z ARG 1 targetEntity @@ -30,6 +36,7 @@ CLASS atz net/minecraft/entity/mob/EndermanEntity METHOD dX getCarriedBlock ()Lbvj; METHOD dY isAngry ()Z METHOD f isPlayerStaring (Lavx;)Z + ARG 1 player METHOD k teleport (DDD)Z ARG 1 x ARG 3 y diff --git a/mappings/net/minecraft/entity/mob/EvokerEntity.mapping b/mappings/net/minecraft/entity/mob/EvokerEntity.mapping index 1d00ed9951..38daa8b84b 100644 --- a/mappings/net/minecraft/entity/mob/EvokerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EvokerEntity.mapping @@ -1,9 +1,11 @@ CLASS auc net/minecraft/entity/mob/EvokerEntity CLASS auc$a ConjureFangsGoal METHOD a conjureFangs (DDDDFI)V - ARG 1 z - ARG 3 maxY - ARG 5 warmup + ARG 1 x + ARG 3 z + ARG 5 maxY + ARG 7 y + ARG 10 warmup CLASS auc$b LookAtTargetOrWololoTarget CLASS auc$c SummonVexGoal FIELD e closeVexPredicate Lapz; @@ -11,4 +13,5 @@ CLASS auc net/minecraft/entity/mob/EvokerEntity FIELD e purpleSheepPredicate Lapz; FIELD bz wololoTarget Larj; METHOD a setWololoTarget (Larj;)V + ARG 1 sheep METHOD eq getWololoTarget ()Larj; diff --git a/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping b/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping index 191cd0c2b5..a45ad4e8b8 100644 --- a/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping @@ -9,9 +9,12 @@ CLASS awf net/minecraft/entity/mob/EvokerFangsEntity ARG 2 x ARG 4 y ARG 6 z + ARG 9 warmup + ARG 10 owner METHOD a getAnimationProgress (F)F ARG 1 tickDelta METHOD a setOwner (Laio;)V + ARG 1 owner METHOD c damage (Laio;)V ARG 1 target METHOD f getOwner ()Laio; diff --git a/mappings/net/minecraft/entity/mob/GhastEntity.mapping b/mappings/net/minecraft/entity/mob/GhastEntity.mapping index 5f8e0b3e5b..0ef917f731 100644 --- a/mappings/net/minecraft/entity/mob/GhastEntity.mapping +++ b/mappings/net/minecraft/entity/mob/GhastEntity.mapping @@ -1,12 +1,22 @@ CLASS aud net/minecraft/entity/mob/GhastEntity + CLASS aud$a LookAtTargetGoal + FIELD a ghast Laud; + METHOD (Laud;)V + ARG 1 ghast CLASS aud$b GhastMoveControl FIELD i ghast Laud; CLASS aud$c ShootFireballGoal FIELD a cooldown I - FIELD b owner Laud; + FIELD b ghast Laud; + METHOD (Laud;)V + ARG 1 ghast CLASS aud$d FlyRandomlyGoal + FIELD a ghast Laud; + METHOD (Laud;)V + ARG 1 ghast FIELD b SHOOTING Lqh; FIELD c fireballStrength I METHOD dT getFireballStrength ()I METHOD l isShooting ()Z METHOD r setShooting (Z)V + ARG 1 shooting diff --git a/mappings/net/minecraft/entity/mob/GuardianEntity.mapping b/mappings/net/minecraft/entity/mob/GuardianEntity.mapping index 58daca85bb..cb4a3dcc21 100644 --- a/mappings/net/minecraft/entity/mob/GuardianEntity.mapping +++ b/mappings/net/minecraft/entity/mob/GuardianEntity.mapping @@ -1,10 +1,10 @@ CLASS auf net/minecraft/entity/mob/GuardianEntity CLASS auf$a FireBeamGoal - FIELD a owner Lauf; + FIELD a guardian Lauf; FIELD b beamTicks I - FIELD c elderOwner Z + FIELD c elder Z METHOD (Lauf;)V - ARG 1 owner + ARG 1 guardian CLASS auf$b GuardianTargetPredicate FIELD a owner Lauf; METHOD (Lauf;)V @@ -13,6 +13,8 @@ CLASS auf net/minecraft/entity/mob/GuardianEntity ARG 1 context CLASS auf$c GuardianMoveControl FIELD i guardian Lauf; + METHOD (Lauf;)V + ARG 1 guardian FIELD bA tailAngle F FIELD bB prevTailAngle F FIELD bC wanderGoal Lant; diff --git a/mappings/net/minecraft/entity/mob/IllagerEntity.mapping b/mappings/net/minecraft/entity/mob/IllagerEntity.mapping index f2574edd25..7953fecb16 100644 --- a/mappings/net/minecraft/entity/mob/IllagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/IllagerEntity.mapping @@ -1,5 +1,6 @@ CLASS atr net/minecraft/entity/mob/IllagerEntity CLASS atr$a State + CLASS atr$b LongDoorInteractGoal METHOD (Laij;Lbhh;)V ARG 1 type METHOD l getState ()Latr$a; diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index b7a1472183..21fbfcd82d 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -42,6 +42,7 @@ CLASS aip net/minecraft/entity/mob/MobEntity ARG 2 newAngle ARG 3 maxChangeInAngle METHOD a initEquipment (Lagy;)V + ARG 1 difficulty METHOD a lookAtEntity (Laif;FF)V ARG 1 targetEntity ARG 2 maxYawChange @@ -64,13 +65,25 @@ CLASS aip net/minecraft/entity/mob/MobEntity ARG 2 previous ARG 3 slot METHOD a initialize (Lbhi;Lagy;Lair;Laja;Lib;)Laja; - ARG 3 difficulty + ARG 1 world + ARG 2 difficulty + ARG 3 spawnType + ARG 4 entityData + ARG 5 entityTag METHOD a canSpawn (Lbhi;Lair;)Z + ARG 1 world + ARG 2 spawnType + METHOD a canSpawnAt (Lbhi;Lair;Lev;)Z + ARG 1 world + ARG 2 spawnType + ARG 3 pos METHOD a canSpawn (Lbhk;)Z ARG 1 world METHOD a getPathNodeTypeWeight (Lcnc;)F + ARG 1 type METHOD a setPathNodeTypeWeight (Lcnc;F)V ARG 1 type + ARG 2 weight METHOD a isInWalkTargetRange (Lev;)Z METHOD a setWalkTarget (Lev;I)V METHOD a detachLeash (ZZ)V diff --git a/mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping b/mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping index c7dee98169..eb619abd9c 100644 --- a/mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping @@ -7,5 +7,6 @@ CLASS aiv net/minecraft/entity/mob/MobEntityWithAi METHOD dT isNavigating ()Z METHOD dU getRunFromLeashSpeed ()D METHOD f getPathfindingFavor (Lev;)F + ARG 1 pos METHOD u updateForLeashLength (F)V ARG 1 leashLength diff --git a/mappings/net/minecraft/entity/mob/MobVisibilityCache.mapping b/mappings/net/minecraft/entity/mob/MobVisibilityCache.mapping index db13fd36fb..503bd88807 100644 --- a/mappings/net/minecraft/entity/mob/MobVisibilityCache.mapping +++ b/mappings/net/minecraft/entity/mob/MobVisibilityCache.mapping @@ -2,5 +2,8 @@ CLASS apt net/minecraft/entity/mob/MobVisibilityCache FIELD a owner Laip; FIELD b visibleEntities Ljava/util/List; FIELD c invisibleEntities Ljava/util/List; + METHOD (Laip;)V + ARG 1 owner METHOD a clear ()V METHOD a canSee (Laif;)Z + ARG 1 entity diff --git a/mappings/net/minecraft/entity/mob/PatrolEntity.mapping b/mappings/net/minecraft/entity/mob/PatrolEntity.mapping index ac9515687b..38743bb3b5 100644 --- a/mappings/net/minecraft/entity/mob/PatrolEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PatrolEntity.mapping @@ -1,8 +1,12 @@ CLASS auk net/minecraft/entity/mob/PatrolEntity CLASS auk$a PatrolGoal - FIELD a owner Lauk; + FIELD a actor Lauk; FIELD b leaderSpeed D FIELD c fellowSpeed D + METHOD (Lauk;DD)V + ARG 1 actor + ARG 2 leaderSpeed + ARG 4 fellowSpeed METHOD g wander ()V FIELD b patrolTarget Lev; FIELD c patrolLeader Z @@ -17,4 +21,6 @@ CLASS auk net/minecraft/entity/mob/PatrolEntity METHOD ee setRandomPatrolTarget ()V METHOD ef isRaidCenterSet ()Z METHOD g setPatrolTarget (Lev;)V + ARG 1 targetPos METHOD r setPatrolLeader (Z)V + ARG 1 patrolLeader diff --git a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping index 4e3ef14caa..a7957d1fa1 100644 --- a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping @@ -1,10 +1,17 @@ CLASS aul net/minecraft/entity/mob/PhantomEntity CLASS aul$a PhantomMovementType - CLASS aul$b + CLASS aul$b FindTargetGoal FIELD b PLAYERS_IN_RANGE_PREDICATE Lapz; + FIELD c delay I + CLASS aul$c StartAttackGoal CLASS aul$d PhantomBodyControl + CLASS aul$e CircleMovementGoal CLASS aul$f PhantomLookControl CLASS aul$g PhantomMoveControl + METHOD (Laul;Laip;)V + ARG 2 owner + CLASS aul$h MovementGoal + CLASS aul$i SwoopMovementGoal FIELD b SIZE Lqh; FIELD bz movementType Laul$a; METHOD a setPhantomSize (I)V diff --git a/mappings/net/minecraft/entity/mob/RavagerEntity.mapping b/mappings/net/minecraft/entity/mob/RavagerEntity.mapping index 2abd3e8993..e05c357499 100644 --- a/mappings/net/minecraft/entity/mob/RavagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/RavagerEntity.mapping @@ -1,4 +1,5 @@ CLASS aup net/minecraft/entity/mob/RavagerEntity + CLASS aup$a AttackGoal CLASS aup$b METHOD (Laip;Lbhh;)V ARG 1 world diff --git a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping index 914f06576c..f28ea276a0 100644 --- a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping @@ -3,9 +3,13 @@ CLASS aur net/minecraft/entity/mob/ShulkerEntity FIELD b counter I CLASS aur$b ShulkerBodyControl CLASS aur$c SearchForTargetGoal + METHOD (Laur;)V + ARG 1 shulker METHOD a (Laio;)Z ARG 0 entity CLASS aur$d SearchForPlayerGoal + METHOD (Laur;Laur;)V + ARG 2 shulker CLASS aur$e PeekGoal FIELD b counter I FIELD bA ATTR_COVERED_ARMOR_BONUS_UUID Ljava/util/UUID; diff --git a/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping b/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping index d7cc1bca54..ded35b3a5d 100644 --- a/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping @@ -1,2 +1,14 @@ CLASS aus net/minecraft/entity/mob/SilverfishEntity + CLASS aus$a WanderAndInfestGoal + FIELD h direction Lfa; + FIELD i canInfest Z + METHOD (Laus;)V + ARG 1 silverfish + CLASS aus$b CallForHelpGoal + FIELD a silverfish Laus; + FIELD b delay I + METHOD (Laus;)V + ARG 1 silverfish + METHOD g onHurt ()V FIELD b CLOSE_PLAYER_PREDICATE Lapz; + FIELD c callForHelpGoal Laus$b; diff --git a/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping b/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping index 64e6edb079..b0d4dc9b93 100644 --- a/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping @@ -1 +1,6 @@ CLASS arx net/minecraft/entity/mob/SkeletonHorseEntity + FIELD bK trapped Z + FIELD bL trapTime I + METHOD dV isTrapped ()Z + METHOD r setTrapped (Z)V + ARG 1 trapped diff --git a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping index d7fcc70daa..147d53c3d9 100644 --- a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping @@ -1,14 +1,32 @@ CLASS auu net/minecraft/entity/mob/SlimeEntity + CLASS auu$a + FIELD a slime Lauu; + METHOD (Lauu;)V + ARG 1 slime + CLASS auu$b + FIELD a slime Lauu; + METHOD (Lauu;)V + ARG 1 slime + CLASS auu$c + FIELD a slime Lauu; + METHOD (Lauu;)V + ARG 1 slime CLASS auu$d SlimeMoveControl FIELD i targetYaw F FIELD j ticksUntilJump I FIELD k slime Lauu; FIELD l jumpOften Z + METHOD (Lauu;)V + ARG 1 slime METHOD a move (D)V ARG 1 speed METHOD a look (FZ)V ARG 1 targetYaw ARG 2 jumpOften + CLASS auu$e + FIELD a slime Lauu; + METHOD (Lauu;)V + ARG 1 slime FIELD bA onGroundLastTick Z FIELD b targetStretch F FIELD bz SLIME_SIZE Lqh; diff --git a/mappings/net/minecraft/entity/mob/SpellcastingIllagerEntity.mapping b/mappings/net/minecraft/entity/mob/SpellcastingIllagerEntity.mapping index 27f28ad8f3..bd84f4058b 100644 --- a/mappings/net/minecraft/entity/mob/SpellcastingIllagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SpellcastingIllagerEntity.mapping @@ -1,4 +1,14 @@ CLASS auv net/minecraft/entity/mob/SpellcastingIllagerEntity + CLASS auv$a Spell + FIELD g id I + FIELD h particleVelocity [D + METHOD (Ljava/lang/String;IIDDD)V + ARG 3 id + ARG 4 particleVelocityX + ARG 6 particleVelocityY + ARG 8 particleVelocityZ + METHOD a byId (I)Lauv$a; + ARG 0 id CLASS auv$b LookAtTargetGoal CLASS auv$c CastSpellGoal FIELD b spellCooldown I @@ -7,6 +17,7 @@ CLASS auv net/minecraft/entity/mob/SpellcastingIllagerEntity METHOD h startTimeDelay ()I METHOD j castSpell ()V METHOD k getSoundPrepare ()Lyj; + METHOD l getSpell ()Lauv$a; METHOD m getInitialCooldown ()I FIELD bA spell Lauv$a; FIELD b spellTicks I diff --git a/mappings/net/minecraft/entity/mob/SpiderEntity.mapping b/mappings/net/minecraft/entity/mob/SpiderEntity.mapping index 9b37b3af2f..fd9def387e 100644 --- a/mappings/net/minecraft/entity/mob/SpiderEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SpiderEntity.mapping @@ -1,4 +1,15 @@ CLASS auw net/minecraft/entity/mob/SpiderEntity + CLASS auw$a AttackGoal + METHOD (Lauw;)V + ARG 1 spider + CLASS auw$b SpawnEffectData + FIELD a effect Lahx; + METHOD a setEffect (Ljava/util/Random;)V + ARG 1 random + CLASS auw$c FollowTargetGoal + METHOD (Lauw;Ljava/lang/Class;)V + ARG 1 spider + ARG 2 targetEntityClass FIELD b SPIDER_FLAGS Lqh; METHOD l getCanClimb ()Z METHOD r setCanClimb (Z)V diff --git a/mappings/net/minecraft/entity/mob/VexEntity.mapping b/mappings/net/minecraft/entity/mob/VexEntity.mapping index d0598b9318..e0fa105e93 100644 --- a/mappings/net/minecraft/entity/mob/VexEntity.mapping +++ b/mappings/net/minecraft/entity/mob/VexEntity.mapping @@ -2,7 +2,11 @@ CLASS auz net/minecraft/entity/mob/VexEntity CLASS auz$a ChargeTargetGoal CLASS auz$b TrackOwnerTargetGoal FIELD b TRACK_OWNER_PREDICATE Lapz; + METHOD (Lauz;Laiv;)V + ARG 2 mob CLASS auz$c VexMoveControl + METHOD (Lauz;Lauz;)V + ARG 2 owner CLASS auz$d LookAtTargetGoal FIELD bA lifeTicks I FIELD b VEX_FLAGS Lqh; @@ -15,11 +19,13 @@ CLASS auz net/minecraft/entity/mob/VexEntity ARG 1 mask ARG 2 value METHOD a setOwner (Laip;)V + ARG 1 owner METHOD b areFlagsSet (I)Z ARG 1 mask METHOD dW getBounds ()Lev; METHOD dX isCharging ()Z METHOD g setBounds (Lev;)V + ARG 1 pos METHOD l getOwner ()Laip; METHOD r setCharging (Z)V ARG 1 charging diff --git a/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping b/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping index 0773f75bea..7cab758d26 100644 --- a/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping +++ b/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping @@ -1,3 +1,10 @@ CLASS ava net/minecraft/entity/mob/VindicatorEntity - CLASS ava$a VindicatorBreakDoorGoal + CLASS ava$a BreakDoorGoal + CLASS ava$b FollowEntityGoal + METHOD (Lava;)V + ARG 1 vindicator + CLASS ava$c AttackGoal + METHOD (Lava;Lava;)V + ARG 2 vindicator + FIELD b DIFFICULTY_ALLOWS_DOOR_BREAKING_PREDICATE Ljava/util/function/Predicate; FIELD bz isJohnny Z diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index 228e0bd413..ea4393f901 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -1,5 +1,8 @@ CLASS avd net/minecraft/entity/mob/ZombieEntity CLASS avd$a DestroyEggGoal + METHOD (Lavd;Laiv;DI)V + ARG 2 mob + ARG 3 speed FIELD bB CONVERTING_IN_WATER Lqh; FIELD bD breakDoorsGoal Lamf; FIELD bE canBreakDoors Z diff --git a/mappings/net/minecraft/entity/mob/ZombiePigmanEntity.mapping b/mappings/net/minecraft/entity/mob/ZombiePigmanEntity.mapping index 8e575f7650..ad9ad9681e 100644 --- a/mappings/net/minecraft/entity/mob/ZombiePigmanEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombiePigmanEntity.mapping @@ -1,7 +1,14 @@ CLASS aum net/minecraft/entity/mob/ZombiePigmanEntity CLASS aum$a FollowPlayerIfAngryGoal + METHOD (Laum;)V + ARG 1 pigman CLASS aum$b AvoidZombiesGoal + METHOD (Laum;)V + ARG 1 pigman + FIELD bA angrySoundDelay I FIELD bB angerTarget Ljava/util/UUID; + FIELD b ATTACKING_SPEED_BOOST_UUID Ljava/util/UUID; FIELD bz anger I + FIELD c ATTACKING_SPEED_BOOST Lajg; METHOD a copyEntityData (Laif;)V METHOD ed isAngry ()Z diff --git a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping index 6b6c8de427..6c731b1f70 100644 --- a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping @@ -8,8 +8,13 @@ CLASS ave net/minecraft/entity/mob/ZombieVillagerEntity METHOD a setXp (I)V ARG 1 xp METHOD a setVillagerData (Lavl;)V + ARG 1 data METHOD a setConverting (Ljava/util/UUID;I)V + ARG 1 uuid + ARG 2 delay METHOD a finishConversion (Lvg;)V + ARG 1 world METHOD ed isConverting ()Z METHOD eg getConversionRate ()I METHOD g setOfferData (Lib;)V + ARG 1 offerTag diff --git a/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping index 6e1de2fef2..27d2ed6146 100644 --- a/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping @@ -5,3 +5,4 @@ CLASS arr net/minecraft/entity/passive/AbstractDonkeyEntity METHOD dV hasChest ()Z METHOD dY playAddChestSound ()V METHOD r setHasChest (Z)V + ARG 1 hasChest diff --git a/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping index 3a2e506ca5..ffbfd08d15 100644 --- a/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping @@ -8,7 +8,9 @@ CLASS avg net/minecraft/entity/passive/AbstractTraderEntity ARG 2 pool ARG 3 count METHOD a produceParticles (Lgd;)V + ARG 1 parameters METHOD b afterUsing (Lbgk;)V + ARG 1 offer METHOD dX hasCustomer ()Z METHOD ea getYesSound ()Lyj; METHOD eb playCelebrateSound ()V @@ -16,5 +18,6 @@ CLASS avg net/minecraft/entity/passive/AbstractTraderEntity METHOD ed getInventory ()Lahf; METHOD ef fillRecipes ()V METHOD r setHeadRollingTimeLeft (I)V + ARG 1 time METHOD r getTradingSound (Z)Lyj; ARG 1 sold diff --git a/mappings/net/minecraft/entity/passive/BatEntity.mapping b/mappings/net/minecraft/entity/passive/BatEntity.mapping index 25882c96af..58ff2986c4 100644 --- a/mappings/net/minecraft/entity/passive/BatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BatEntity.mapping @@ -1,5 +1,7 @@ CLASS aqm net/minecraft/entity/passive/BatEntity FIELD b BAT_FLAGS Lqh; FIELD c CLOSE_PLAYER_PREDICATE Lapz; + FIELD d hangingPosition Lev; + METHOD dT isTodayAroundHalloween ()Z METHOD l isRoosting ()Z METHOD r setRoosting (Z)V diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping index 41e9bf1d65..6a6fbf9f45 100644 --- a/mappings/net/minecraft/entity/passive/CatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping @@ -1,14 +1,28 @@ CLASS aqs net/minecraft/entity/passive/CatEntity CLASS aqs$a CatFleeGoal - FIELD i entity Laqs; + FIELD i cat Laqs; + METHOD (Laqs;Ljava/lang/Class;FDD)V + ARG 1 cat + ARG 2 fleeFromType + ARG 3 distance + ARG 4 slowSpeed + ARG 6 fastSpeed CLASS aqs$b SleepWithOwnerGoal - FIELD a entity Laqs; + FIELD a cat Laqs; FIELD b owner Lavx; FIELD c bedPos Lev; FIELD d ticksOnBed I + METHOD (Laqs;)V + ARG 1 cat METHOD h dropMorningGifts ()V - CLASS aqs$c CatTemptGoal + CLASS aqs$c TemptGoal + FIELD c player Lavx; FIELD d cat Laqs; + METHOD (Laqs;DLbef;Z)V + ARG 1 cat + ARG 2 speed + ARG 4 food + ARG 5 canBeScared FIELD bD TEXTURES Ljava/util/Map; FIELD bE TAMING_INGREDIENT Lbef; FIELD bF CAT_TYPE Lqh; diff --git a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping index 96b3992903..369ac07837 100644 --- a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping +++ b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping @@ -1,6 +1,10 @@ CLASS aqw net/minecraft/entity/passive/DolphinEntity CLASS aqw$a DolphinMoveControl FIELD i dolphin Laqw; + CLASS aqw$b LeadToNearbyTreasureGoal + FIELD a dolphin Laqw; + METHOD (Laqw;)V + ARG 1 dolphin CLASS aqw$c SwimWithPlayerGoal FIELD a dolphin Laqw; FIELD b speed D @@ -8,6 +12,9 @@ CLASS aqw net/minecraft/entity/passive/DolphinEntity METHOD (Laqw;D)V ARG 1 dolphin ARG 2 speed + CLASS aqw$d PlayWithItemsGoal + METHOD a spitOutItem (Lbca;)V + ARG 1 stack FIELD bA CLOSE_PLAYER_PREDICATE Lapz; FIELD b CAN_TAKE Ljava/util/function/Predicate; FIELD bz MOISTNESS Lqh; diff --git a/mappings/net/minecraft/entity/passive/FishEntity.mapping b/mappings/net/minecraft/entity/passive/FishEntity.mapping index 70235e1b3b..fe166f2623 100644 --- a/mappings/net/minecraft/entity/passive/FishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FishEntity.mapping @@ -1,7 +1,12 @@ CLASS aqo net/minecraft/entity/passive/FishEntity CLASS aqo$a FishMoveControl FIELD i fish Laqo; + METHOD (Laqo;)V + ARG 1 owner CLASS aqo$b SwimToRandomPlaceGoal + FIELD h fish Laqo; + METHOD (Laqo;)V + ARG 1 fish FIELD b FROM_BUCKET Lqh; METHOD (Laij;Lbhh;)V ARG 1 type @@ -9,5 +14,6 @@ CLASS aqo net/minecraft/entity/passive/FishEntity METHOD dW getFlopSound ()Lyj; METHOD dX isFromBucket ()Z METHOD i copyDataToStack (Lbca;)V + ARG 1 stack METHOD l getFishBucketItem ()Lbca; METHOD r setFromBucket (Z)V diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index ed5da1e01b..4539e1484d 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -3,28 +3,60 @@ CLASS aqy net/minecraft/entity/passive/FoxEntity FIELD j offender Laio; FIELD k friend Laio; FIELD l lastAttackedTime I + METHOD (Laqy;Ljava/lang/Class;ZZLjava/util/function/Predicate;)V + ARG 2 targetEntityClass + ARG 3 checkVisibility + ARG 4 checkCanNavigate + ARG 5 targetPredicate CLASS aqy$b StopWanderingGoal FIELD a timer I CLASS aqy$c WorriableEntityFilter + METHOD test (Ljava/lang/Object;)Z + ARG 1 entity CLASS aqy$d CalmDownGoal FIELD b WORRIABLE_ENTITY_PREDICATE Lapz; METHOD g isAtFavoredLocation ()Z METHOD h canCalmDown ()Z CLASS aqy$e MateGoal + METHOD (Laqy;D)V + ARG 2 chance CLASS aqy$f EatSweetBerriesGoal FIELD g timer I + METHOD (Laqy;DII)V + ARG 2 speed + ARG 4 rannge + ARG 5 maxYDifference METHOD m eatSweetBerry ()V CLASS aqy$g FoxSwimGoal + CLASS aqy$h FollowParentGoal + FIELD b fox Laqy; + METHOD (Laqy;Laqy;D)V + ARG 2 fox + ARG 3 speed CLASS aqy$i FoxData FIELD a type Laqy$v; FIELD b uses I + METHOD (Laqy$v;)V + ARG 1 type + CLASS aqy$j LookAtEntityGoal + METHOD (Laqy;Laip;Ljava/lang/Class;F)V + ARG 2 fox + ARG 3 targetType + ARG 4 range CLASS aqy$k FoxLookControl CLASS aqy$l AttackGoal + METHOD (Laqy;DZ)V + ARG 2 speed CLASS aqy$m FoxMoveControl CLASS aqy$n EscapeWhenNotAggresiveGoal + METHOD (Laqy;D)V + ARG 2 speed CLASS aqy$o JumpChasingGoal CLASS aqy$p PickupItemGoal CLASS aqy$q GoToVillageGoal + METHOD (Laqy;II)V + ARG 2 unused + ARG 3 searchRange METHOD g canGoToVillage ()Z CLASS aqy$r SitDownAndLookAroundGoal FIELD c lookX D @@ -34,18 +66,29 @@ CLASS aqy net/minecraft/entity/passive/FoxEntity METHOD j chooseNewAngle ()V CLASS aqy$s AvoidDaylightGoal FIELD c timer I + METHOD (Laqy;D)V + ARG 2 speed CLASS aqy$t DelayedCalmDownGoal FIELD c timer I + METHOD j canNotCalmDown ()Z CLASS aqy$u MoveToHuntGoal CLASS aqy$v Type - FIELD d byName Ljava/util/Map; + FIELD c TYPES [Laqy$v; + FIELD d NAME_TYPE_MAP Ljava/util/Map; FIELD e id I FIELD f key Ljava/lang/String; FIELD g biomes Ljava/util/List; + METHOD (Ljava/lang/String;IILjava/lang/String;[Lbie;)V + ARG 3 id + ARG 4 key + ARG 5 biomes METHOD a getKey ()Ljava/lang/String; METHOD a fromId (I)Laqy$v; + ARG 0 id METHOD a fromBiome (Lbie;)Laqy$v; + ARG 0 biome METHOD a byName (Ljava/lang/String;)Laqy$v; + ARG 0 name METHOD b getBiomes ()Ljava/util/List; METHOD c getId ()I FIELD bA FOX_FLAGS Lqh; @@ -65,8 +108,10 @@ CLASS aqy net/minecraft/entity/passive/FoxEntity FIELD bP eatingTime I FIELD bz TYPE Lqh; METHOD a setType (Laqy$v;)V + ARG 1 type METHOD a canJumpChase (Laqy;Laio;)Z METHOD b addTrustedUuid (Ljava/util/UUID;)V + ARG 1 uuid METHOD c canTrust (Ljava/util/UUID;)Z METHOD d setFoxFlag (IZ)V ARG 1 mask @@ -84,15 +129,22 @@ CLASS aqy net/minecraft/entity/passive/FoxEntity METHOD em wakeUp ()V METHOD en stopActions ()V METHOD eo wantsToPickupItem ()Z + METHOD j canEat (Lbca;)Z + ARG 1 stack METHOD k spit (Lbca;)V METHOD l dropItem (Lbca;)V METHOD r getFoxFlag (I)Z + ARG 1 bitmask METHOD r setSitting (Z)V + ARG 1 sitting METHOD s setChasing (Z)V METHOD t setCrouching (Z)V METHOD u setRollingHead (Z)V METHOD v getHeadRoll (F)F METHOD v setWalking (Z)V + ARG 1 walking METHOD w getBodyRotationHeightOffset (F)F METHOD w setAggressive (Z)V + ARG 1 aggressive METHOD x setSleeping (Z)V + ARG 1 sleeping diff --git a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping index 39ca7d42ab..ccb1ae845e 100644 --- a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping @@ -30,8 +30,10 @@ CLASS ars net/minecraft/entity/passive/HorseBaseEntity ARG 1 player ARG 2 item METHOD b setOwnerUuid (Ljava/util/UUID;)V + ARG 1 uuid METHOD d setHorseFlag (IZ)V - ARG 1 index + ARG 1 bitmask + ARG 2 flag METHOD dV playEatingAnimation ()V METHOD dW getInventorySize ()I METHOD dX getAngrySound ()Lyj; @@ -62,14 +64,17 @@ CLASS ars net/minecraft/entity/passive/HorseBaseEntity METHOD ey getChildJumpStrengthBonus ()D METHOD ez getChildMovementSpeedBonus ()D METHOD g putPlayerOnBack (Lavx;)V + ARG 1 player METHOD h bondWithPlayer (Lavx;)Z ARG 1 player METHOD j canEquip (Lbca;)Z ARG 1 item METHOD r getHorseFlag (I)Z + ARG 1 bitmask METHOD s setTemper (I)V ARG 1 temper METHOD s setTame (Z)V + ARG 1 tame METHOD t addTemper (I)I ARG 1 difference METHOD t setInAir (Z)V diff --git a/mappings/net/minecraft/entity/passive/HorseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseEntity.mapping index dc6936a263..a24af51170 100644 --- a/mappings/net/minecraft/entity/passive/HorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseEntity.mapping @@ -1,4 +1,5 @@ CLASS aru net/minecraft/entity/passive/HorseEntity + FIELD bJ HORSE_ARMOR_BONUS_UUID Ljava/util/UUID; FIELD bK VARIANT Lqh; FIELD bL HORSE_TEX [Ljava/lang/String; FIELD bM HORSE_TEX_ID [Ljava/lang/String; @@ -12,5 +13,9 @@ CLASS aru net/minecraft/entity/passive/HorseEntity METHOD eB getTextureLayers ()[Ljava/lang/String; METHOD eC clearTextureInfo ()V METHOD eD initTextureInfo ()V + METHOD k equipArmor (Lbca;)V + ARG 1 stack METHOD l setArmorTypeFromStack (Lbca;)V + ARG 1 stack METHOD u setVariant (I)V + ARG 1 variant diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index dfb5a2cae2..6034e2b448 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -1,4 +1,7 @@ CLASS arv net/minecraft/entity/passive/LlamaEntity + CLASS arv$a ChaseWolvesGoal + METHOD (Larv;)V + ARG 1 llama FIELD bJ ATTR_STRENGTH Lqh; FIELD bK CARPET_COLOR Lqh; FIELD bL ATTR_VARIANT Lqh; diff --git a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping index 0df09ad2db..a8d3a1b64f 100644 --- a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping +++ b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping @@ -1,14 +1,21 @@ CLASS ara net/minecraft/entity/passive/MooshroomEntity CLASS ara$a Type FIELD c name Ljava/lang/String; - FIELD d mushroomState Lbvj; + FIELD d mushroom Lbvj; + METHOD (Ljava/lang/String;ILjava/lang/String;Lbvj;)V + ARG 3 name + ARG 4 mushroom METHOD a getMushroomState ()Lbvj; METHOD b fromName (Ljava/lang/String;)Lara$a; + ARG 0 name FIELD bA stewEffect Lahx; FIELD bB stewEffectDuration I FIELD bD lightningId Ljava/util/UUID; FIELD bz TYPE Lqh; METHOD a setType (Lara$a;)V + ARG 1 type METHOD a chooseBabyType (Lara;)Lara$a; + ARG 1 mooshroom METHOD dV getMooshroomType ()Lara$a; METHOD j getStewEffectFrom (Lbca;)Lorg/apache/commons/lang3/tuple/Pair; + ARG 1 flower diff --git a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping index 6ed20ef9d0..590a4cfd56 100644 --- a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping @@ -1,8 +1,19 @@ CLASS arb net/minecraft/entity/passive/OcelotEntity - CLASS arb$a OcelotFleeGoal + CLASS arb$a FleeGoal FIELD i ocelot Larb; + METHOD (Larb;Ljava/lang/Class;FDD)V + ARG 1 ocelot + ARG 2 fleeFromType + ARG 3 distance + ARG 4 slowSpeed + ARG 6 fastSpeed CLASS arb$b OcelotTemptGoal FIELD c ocelot Larb; + METHOD (Larb;DLbef;Z)V + ARG 1 ocelot + ARG 2 speed + ARG 4 food + ARG 5 canBeScared FIELD bA TRUSTING Lqh; FIELD bB fleeGoal Larb$a; FIELD bD temptGoal Larb$b; diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index 8b2dd807dd..16d29b9838 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -10,8 +10,10 @@ CLASS arc net/minecraft/entity/passive/PandaEntity ARG 5 recessive METHOD a getId ()I METHOD a byId (I)Larc$a; + ARG 0 id METHOD a byName (Ljava/lang/String;)Larc$a; METHOD a createRandom (Ljava/util/Random;)Larc$a; + ARG 0 random METHOD b getName ()Ljava/lang/String; METHOD b getProductGene (Larc$a;Larc$a;)Larc$a; ARG 0 mainGene @@ -19,8 +21,17 @@ CLASS arc net/minecraft/entity/passive/PandaEntity METHOD c isRecessive ()Z CLASS arc$b AttackGoal FIELD d panda Larc; + METHOD (Larc;DZ)V + ARG 1 panda + ARG 2 speed CLASS arc$c PandaFleeGoal - FIELD i owner Larc; + FIELD i panda Larc; + METHOD (Larc;Ljava/lang/Class;FDD)V + ARG 1 panda + ARG 2 fleeFromType + ARG 3 distance + ARG 4 slowSpeed + ARG 6 fastSpeed CLASS arc$d PandaMateGoal FIELD d CLOSE_PLAYER_PREDICATE Lapz; FIELD e panda Larc; @@ -34,17 +45,25 @@ CLASS arc net/minecraft/entity/passive/PandaEntity FIELD a panda Larc; METHOD (Larc;[Ljava/lang/Class;)V ARG 1 panda + ARG 2 noRevengeTypes CLASS arc$g LieOnBackGoal FIELD a panda Larc; FIELD b nextLieOnBackAge I - CLASS arc$h PandaLookAtEntityGoal + METHOD (Larc;)V + ARG 1 panda + CLASS arc$h LookAtEntityGoal FIELD f panda Larc; METHOD (Larc;Ljava/lang/Class;F)V ARG 1 panda + ARG 2 targetType + ARG 3 range CLASS arc$i PandaMoveControl FIELD i panda Larc; CLASS arc$j ExtinguishFireGoal FIELD f panda Larc; + METHOD (Larc;D)V + ARG 1 panda + ARG 2 speed CLASS arc$k PlayGoal FIELD a panda Larc; METHOD (Larc;)V @@ -73,8 +92,12 @@ CLASS arc net/minecraft/entity/passive/PandaEntity FIELD bQ IS_FOOD Ljava/util/function/Predicate; FIELD bz playingTicks I METHOD a setMainGene (Larc$a;)V + ARG 1 gene METHOD a initGenes (Larc;Larc;)V + ARG 1 mother + ARG 2 father METHOD b setHiddenGene (Larc$a;)V + ARG 1 gene METHOD d setPandaFlag (IZ)V ARG 1 mask ARG 2 value @@ -104,6 +127,7 @@ CLASS arc net/minecraft/entity/passive/PandaEntity METHOD ey updatePlaying ()V METHOD ez sneeze ()V METHOD j canEat (Lbca;)Z + ARG 1 stack METHOD r setAskForBambooTicks (I)V ARG 1 askForBambooTicks METHOD r setScared (Z)V @@ -111,11 +135,13 @@ CLASS arc net/minecraft/entity/passive/PandaEntity METHOD s setSneezeProgress (I)V ARG 1 sneezeProgress METHOD s setLyingOnBack (Z)V + ARG 1 lyingOnBack METHOD t setEatingTicks (I)V ARG 1 eatingTicks METHOD t setEating (Z)V ARG 1 eating METHOD u hasPandaFlag (I)Z + ARG 1 bitmask METHOD u setSneezing (Z)V ARG 1 sneezing METHOD v getScaredAnimationProgress (F)F diff --git a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping index 0c2deb7aa3..4bf81c151d 100644 --- a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping @@ -1,4 +1,8 @@ CLASS arg net/minecraft/entity/passive/PufferfishEntity + CLASS arg$a + FIELD a pufferfish Larg; + METHOD (Larg;)V + ARG 1 pufferfish FIELD b PUFF_STATE Lqh; METHOD a sting (Laip;)V ARG 1 mob diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping index b016c1942b..20ef21503d 100644 --- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping +++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping @@ -1,20 +1,38 @@ CLASS arh net/minecraft/entity/passive/RabbitEntity CLASS arh$a RabbitAttackGoal - CLASS arh$b RabbitFleeGoal + METHOD (Larh;)V + ARG 1 rabbit + CLASS arh$b FleeGoal FIELD i rabbit Larh; + METHOD (Larh;Ljava/lang/Class;FDD)V + ARG 1 rabbit + ARG 2 fleeFromType + ARG 3 distance + ARG 4 slowSpeed + ARG 6 fastSpeed CLASS arh$c RabbitEntityData FIELD a type I METHOD (I)V ARG 1 type CLASS arh$d RabbitJumpControl FIELD c rabbit Larh; + METHOD (Larh;Larh;)V + ARG 2 owner METHOD c isActive ()Z CLASS arh$e RabbitMoveControl FIELD i rabbit Larh; - CLASS arh$f RabbitEscapeDangerGoal - FIELD f owner Larh; - CLASS arh$g + METHOD (Larh;)V + ARG 1 owner + CLASS arh$f EscapeDangerGoal + FIELD f rabbit Larh; + METHOD (Larh;D)V + ARG 1 rabbit + ARG 2 speed + CLASS arh$g EatCarrotCropGoal FIELD g rabbit Larh; + FIELD h wantsCarrots Z + METHOD (Larh;)V + ARG 1 rabbit FIELD bA KILLER_BUNNY Lqs; FIELD bB jumpTicks I FIELD bD jumpDuration I diff --git a/mappings/net/minecraft/entity/passive/SchoolingFishEntity.mapping b/mappings/net/minecraft/entity/passive/SchoolingFishEntity.mapping index 33ccc160e0..35f165880b 100644 --- a/mappings/net/minecraft/entity/passive/SchoolingFishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SchoolingFishEntity.mapping @@ -1,12 +1,16 @@ CLASS aqq net/minecraft/entity/passive/SchoolingFishEntity CLASS aqq$a Data FIELD a leader Laqq; + METHOD (Laqq;)V + ARG 1 leader FIELD b leader Laqq; FIELD c groupSize I METHOD (Laij;Lbhh;)V ARG 1 type METHOD a joinGroupOf (Laqq;)Laqq; + ARG 1 groupLeader METHOD a pullInOtherFish (Ljava/util/stream/Stream;)V + ARG 1 fish METHOD dX getMaxGroupSize ()I METHOD dY hasLeader ()Z METHOD dZ leaveGroup ()V diff --git a/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping new file mode 100644 index 0000000000..3f26e2d835 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping @@ -0,0 +1,5 @@ +CLASS arl net/minecraft/entity/passive/SnowGolemEntity + FIELD b SNOW_GOLEM_FLAGS Lqh; + METHOD l hasPumpkin ()Z + METHOD r setHasPumpkin (Z)V + ARG 1 hasPumpkin diff --git a/mappings/net/minecraft/entity/passive/SnowmanEntity.mapping b/mappings/net/minecraft/entity/passive/SnowmanEntity.mapping deleted file mode 100644 index 4bac5874ec..0000000000 --- a/mappings/net/minecraft/entity/passive/SnowmanEntity.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS arl net/minecraft/entity/passive/SnowmanEntity - FIELD b SNOWMAN_FLAGS Lqh; - METHOD l hasPumpkin ()Z - METHOD r setHasPumpkin (Z)V diff --git a/mappings/net/minecraft/entity/passive/SquidEntity.mapping b/mappings/net/minecraft/entity/passive/SquidEntity.mapping index f1ce3d1c7b..b2592fca94 100644 --- a/mappings/net/minecraft/entity/passive/SquidEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SquidEntity.mapping @@ -1,8 +1,10 @@ CLASS arm net/minecraft/entity/passive/SquidEntity CLASS arm$a EscapeAttackerGoal FIELD b timer I - CLASS arm$b SwimInOneDirectionGoal - FIELD b owner Larm; + CLASS arm$b SwimGoal + FIELD b squid Larm; + METHOD (Larm;Larm;)V + ARG 2 squid FIELD bE constantVelocityRate F FIELD bH constantVelocityX F FIELD bI constantVelocityY F diff --git a/mappings/net/minecraft/entity/passive/TameableEntity.mapping b/mappings/net/minecraft/entity/passive/TameableEntity.mapping index 4e1a9b2cab..a408138808 100644 --- a/mappings/net/minecraft/entity/passive/TameableEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TameableEntity.mapping @@ -9,14 +9,19 @@ CLASS ajc net/minecraft/entity/passive/TameableEntity ARG 1 target ARG 2 owner METHOD b setOwnerUuid (Ljava/util/UUID;)V + ARG 1 uuid METHOD dV isTamed ()Z METHOD dW onTamedChanged ()V METHOD dX isSitting ()Z METHOD dY getOwner ()Laio; METHOD dZ getSitGoal ()Laob; METHOD e setOwner (Lavx;)V + ARG 1 player METHOD h isOwner (Laio;)Z + ARG 1 entity METHOD r showEmoteParticle (Z)V ARG 1 positive METHOD s setTamed (Z)V + ARG 1 tamed METHOD t setSitting (Z)V + ARG 1 sitting diff --git a/mappings/net/minecraft/entity/passive/TameableShoulderEntity.mapping b/mappings/net/minecraft/entity/passive/TameableShoulderEntity.mapping index d4b3a719dd..1d4bddbbe3 100644 --- a/mappings/net/minecraft/entity/passive/TameableShoulderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TameableShoulderEntity.mapping @@ -3,4 +3,5 @@ CLASS ark net/minecraft/entity/passive/TameableShoulderEntity METHOD (Laij;Lbhh;)V ARG 1 type METHOD d mountOnto (Lvh;)Z + ARG 1 player METHOD eh isReadyToSitOnPlayer ()Z diff --git a/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping b/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping index 63e63d66cb..de37775049 100644 --- a/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping @@ -1,6 +1,10 @@ CLASS arz net/minecraft/entity/passive/TraderLlamaEntity CLASS arz$a DefendTraderGoal + FIELD b llama Larv; FIELD c offender Laio; FIELD d traderLastAttackedTime I + METHOD (Larz;Larv;)V + ARG 2 llama FIELD bJ despawnDelay I METHOD v setDespawnDelay (I)V + ARG 1 delay diff --git a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping index e301f9e6ef..c3b320c38e 100644 --- a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping @@ -17,6 +17,12 @@ CLASS arn net/minecraft/entity/passive/TropicalFishEntity FIELD c pattern I FIELD d baseColor I FIELD e patternColor I + METHOD (Larn;IIII)V + ARG 1 leader + ARG 2 shape + ARG 3 pattern + ARG 4 baseColor + ARG 5 patternColor FIELD bA LARGE_FISH_VARIETY_IDS [Lqs; FIELD bB commonSpawn Z FIELD b COMMON_VARIANTS [I @@ -42,6 +48,7 @@ CLASS arn net/minecraft/entity/passive/TropicalFishEntity METHOD s getTranslationKey (I)Ljava/lang/String; ARG 0 variant METHOD t setVariant (I)V + ARG 1 variant METHOD u getShape (I)I ARG 0 variant METHOD v getBaseDyeColorIndex (I)I diff --git a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping index 56422cd707..b4b16edf64 100644 --- a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping @@ -2,15 +2,15 @@ CLASS aro net/minecraft/entity/passive/TurtleEntity CLASS aro$a MateGoal FIELD d turtle Laro; METHOD (Laro;D)V - ARG 1 owner + ARG 1 turtle ARG 2 speed CLASS aro$b GoHomeGoal - FIELD a owner Laro; + FIELD a turtle Laro; FIELD b speed D FIELD c noPath Z FIELD d homeReachingTryTicks I METHOD (Laro;D)V - ARG 1 owner + ARG 1 turtle ARG 2 speed CLASS aro$c WanderInWaterGoal FIELD g turtle Laro; @@ -25,11 +25,11 @@ CLASS aro net/minecraft/entity/passive/TurtleEntity CLASS aro$e TurtleMoveControl FIELD i turtle Laro; METHOD (Laro;)V - ARG 1 owner + ARG 1 turtle METHOD g updateVelocity ()V CLASS aro$f TurtleEscapeDangerGoal METHOD (Laro;D)V - ARG 1 owner + ARG 1 turtle ARG 2 speed CLASS aro$g TurtleSwimNavigation METHOD (Laro;Lbhh;)V @@ -37,21 +37,25 @@ CLASS aro net/minecraft/entity/passive/TurtleEntity ARG 2 world CLASS aro$h WanderOnLandGoal FIELD h turtle Laro; + METHOD (Laro;DI)V + ARG 1 turtle + ARG 2 speed + ARG 4 chance CLASS aro$i ApproachFoodHoldingPlayerGoal FIELD a CLOSE_ENTITY_PREDICATE Lapz; - FIELD b owner Laro; + FIELD b turtle Laro; FIELD c speed D FIELD d targetPlayer Lavx; FIELD e cooldown I FIELD f attractiveItems Ljava/util/Set; METHOD (Laro;DLbbv;)V - ARG 1 owner + ARG 1 turtle ARG 2 speed ARG 4 attractiveItem METHOD a isAttractive (Lbca;)Z ARG 1 stack CLASS aro$j TravelGoal - FIELD a owner Laro; + FIELD a turtle Laro; FIELD b speed D FIELD c noPath Z METHOD (Laro;D)V diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index ceefab02a0..d3aaa82b61 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -24,10 +24,15 @@ CLASS avk net/minecraft/entity/passive/VillagerEntity FIELD bP lastRestock J FIELD bQ MEMORY_MODULES Lcom/google/common/collect/ImmutableList; FIELD bR SENSORS Lcom/google/common/collect/ImmutableList; + METHOD (Laij;Lbhh;Lavp;)V + ARG 1 entityType + ARG 2 world + ARG 3 type METHOD a isLackingBuddyGolem (J)Z ARG 1 time METHOD a wantsGolem (Laif;)Z METHOD a initBrain (Lajd;)V + ARG 1 brain METHOD a releaseTicketFor (Lapb;)V METHOD a talkWithVillager (Lavk;J)V ARG 1 villager @@ -35,7 +40,9 @@ CLASS avk net/minecraft/entity/passive/VillagerEntity METHOD a setVillagerData (Lavl;)V ARG 1 villagerData METHOD a reinitializeBrain (Lvg;)V - METHOD b setRecipes (Lbgl;)V + ARG 1 world + METHOD b setOffers (Lbgl;)V + ARG 1 offers METHOD eg resetCustomer ()V METHOD ei restock ()V METHOD ej playWorkSound ()V @@ -59,3 +66,4 @@ CLASS avk net/minecraft/entity/passive/VillagerEntity METHOD s depleteFood (I)V ARG 1 amount METHOD t setExperience (I)V + ARG 1 amount diff --git a/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping b/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping index 66cb485096..a8165eada3 100644 --- a/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping @@ -1,12 +1,20 @@ CLASS avq net/minecraft/entity/passive/WanderingTraderEntity CLASS avq$a WanderToTargetGoal + FIELD a trader Lavq; FIELD b proximityDistance D FIELD c speed D + METHOD (Lavq;Lavq;DD)V + ARG 2 trader + ARG 3 proximityDistance + ARG 5 speed METHOD a isTooFarFrom (Lev;D)Z + ARG 1 pos ARG 2 proximityDistance FIELD bA wanderTarget Lev; FIELD bB despawnDelay I METHOD eg getDespawnDelay ()I METHOD eh getWanderTarget ()Lev; METHOD g setWanderTarget (Lev;)V + ARG 1 pos METHOD s setDespawnDelay (I)V + ARG 1 delay diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index 741fec9978..eb32085840 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -1,6 +1,12 @@ CLASS arq net/minecraft/entity/passive/WolfEntity CLASS arq$a AvoidLlamaGoal FIELD j wolf Larq; + METHOD (Larq;Larq;Ljava/lang/Class;FDD)V + ARG 2 wolf + ARG 3 fleeFromType + ARG 4 distance + ARG 5 slowSpeed + ARG 7 fastSpeed METHOD a isScaredOf (Larv;)Z ARG 1 llama FIELD bD FOLLOW_TAMED_PREDICATE Ljava/util/function/Predicate; @@ -22,6 +28,7 @@ CLASS arq net/minecraft/entity/passive/WolfEntity METHOD f getShakeAnimationProgress (FF)F ARG 1 tickDelta METHOD u setAngry (Z)V + ARG 1 angry METHOD v getWetBrightnessMultiplier (F)F ARG 1 tickDelta METHOD v setBegging (Z)V diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index a228f6a92b..dca88270ed 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -4,17 +4,19 @@ CLASS avx net/minecraft/entity/player/PlayerEntity METHOD a getText ()Ljm; FIELD bA container Layb; FIELD bB hungerManager Laxx; - FIELD bF experienceOrbPickupDelay I + FIELD bF experiencePickUpDelay I FIELD b SIZES Ljava/util/Map; FIELD bM isInWater Z FIELD bN abilities Lavu; - FIELD bO experience I - FIELD bP experienceLevel I - FIELD bQ experienceLevelProgress F + FIELD bO experienceLevel I + FIELD bP totalExperience I + FIELD bQ experienceProgress F FIELD bR enchantmentTableSeed I FIELD bT fishHook Latj; + FIELD bU lastPlayedLevelUpSoundTime I FIELD bV gameProfile Lcom/mojang/authlib/GameProfile; FIELD bW reducedDebugInfo Z + FIELD bX selectedItem Lbca; FIELD bY itemCooldownManager Lbbw; FIELD bs STANDING_SIZE Laig; FIELD bt PLAYER_MODEL_BIT_MASK Lqh; @@ -29,23 +31,41 @@ CLASS avx net/minecraft/entity/player/PlayerEntity FIELD e sleepTimer I FIELD f spawnPosition Lev; FIELD g spawnForced Z + METHOD (Lbhh;Lcom/mojang/authlib/GameProfile;)V + ARG 1 world + ARG 2 profile METHOD a sendTradeOffers (ILbgl;IIZ)V ARG 1 syncId + ARG 2 offers + ARG 3 levelProgress + ARG 4 experience + ARG 5 leveled METHOD a openContainer (Lahd;)Ljava/util/OptionalInt; METHOD a addCritParticles (Laif;)V + ARG 1 target METHOD a interact (Laif;Lagz;)Laha; ARG 1 entity + ARG 2 hand METHOD a setMainHand (Lain;)V + ARG 1 absoluteHand METHOD a openHorseInventory (Lars;Lagt;)V METHOD a shouldDamagePlayer (Lavx;)Z + ARG 1 player METHOD a isSkinOverlayVisible (Lavy;)Z + ARG 1 modelPart + METHOD a applyEnchantmentCosts (Lbca;I)V + ARG 1 enchantedItem + ARG 2 experienceLevels METHOD a openEditBookScreen (Lbca;Lagz;)V + ARG 1 book + ARG 2 hand METHOD a dropItem (Lbca;Z)Lato; ARG 1 stack METHOD a dropItem (Lbca;ZZ)Lato; ARG 1 stack METHOD a openCommandBlockMinecartScreen (Lbgn;)V METHOD a setGameMode (Lbhe;)V + ARG 1 gameMode METHOD a openCommandBlockScreen (Lbtr;)V METHOD a openJigsawScreen (Lbuc;)V METHOD a openEditSignScreen (Lbui;)V @@ -53,12 +73,16 @@ CLASS avx net/minecraft/entity/player/PlayerEntity METHOD a getUuidFromProfile (Lcom/mojang/authlib/GameProfile;)Ljava/util/UUID; ARG 0 profile METHOD a trySleep (Lev;)Lcom/mojang/datafixers/util/Either; + ARG 1 pos METHOD a isWithinSleepingRange (Lev;Lfa;)Z ARG 1 sleepPos + ARG 2 direction METHOD a canPlaceOn (Lev;Lfa;Lbca;)Z ARG 1 pos ARG 2 facing + ARG 3 stack METHOD a spawnParticles (Lgd;)V + ARG 1 parameters METHOD a unlockRecipes (Ljava/util/Collection;)I ARG 1 recipes METHOD a addChatMessage (Ljm;Z)V @@ -69,16 +93,23 @@ CLASS avx net/minecraft/entity/player/PlayerEntity ARG 1 stat ARG 2 amount METHOD a playSound (Lyj;Lyl;FF)V + ARG 1 event + ARG 2 category + ARG 3 volume + ARG 4 pitch METHOD a resetStat (Lyq;)V ARG 1 stat METHOD a increaseStat (Lyq;I)V ARG 1 stat ARG 2 amount METHOD a wakeUp (ZZZ)V + ARG 3 setSpawn METHOD a unlockRecipes ([Lqs;)V ARG 1 ids METHOD b addEnchantedHitParticles (Laif;)V + ARG 1 target METHOD b getBlockBreakingSpeed (Lbvj;)F + ARG 1 block METHOD b isBedObstructed (Lev;Lfa;)Z ARG 1 pos ARG 2 direction @@ -88,13 +119,18 @@ CLASS avx net/minecraft/entity/player/PlayerEntity ARG 1 recipes METHOD b incrementStat (Lyq;)V ARG 1 stat + METHOD c addExperienceLevels (I)V + ARG 1 levels METHOD c collideWithEntity (Laif;)V + ARG 1 entity METHOD c isUsingEffectiveTool (Lbvj;)Z + ARG 1 block METHOD c getOfflinePlayerUuid (Ljava/lang/String;)Ljava/util/UUID; ARG 0 nickname METHOD c addTellClickEvent (Ljm;)Ljm; ARG 1 component METHOD d addExperience (I)V + ARG 1 experience METHOD dA updateInWater ()Z METHOD dB updateSize ()V METHOD dC getScore ()I @@ -118,10 +154,13 @@ CLASS avx net/minecraft/entity/player/PlayerEntity METHOD dV getReducedDebugInfo ()Z METHOD dW getShoulderEntityLeft ()Lib; METHOD dX getShoulderEntityRight ()Lib; + METHOD dY getAttackCooldownProgressPerTick ()F + METHOD dZ resetLastAttackedTicks ()V METHOD ea getItemCooldownManager ()Lbbw; METHOD eb getLuck ()F METHOD ec isCreativeLevelTwoOp ()Z METHOD f attack (Laif;)V + ARG 1 target METHOD f doesNotSuffocate (Lev;)Z ARG 1 pos METHOD g createCooldownManager ()Lbbw; @@ -130,17 +169,28 @@ CLASS avx net/minecraft/entity/player/PlayerEntity METHOD g addShoulderEntity (Lib;)Z ARG 1 tag METHOD h setShoulderEntityLeft (Lib;)V + ARG 1 entityTag METHOD i setShoulderEntityRight (Lib;)V + ARG 1 entityTag METHOD j updateShoulderEntity (Lib;)V + ARG 1 entityTag METHOD l updateTurtleHelmet ()V METHOD n dropSelectedItem (Z)Lato; + ARG 1 dropEntireStack METHOD o disableShield (Z)V ARG 1 sprinting METHOD p canConsume (Z)Z + ARG 1 ignoreHunger METHOD q setScore (I)V + ARG 1 score METHOD q setReducedDebugInfo (Z)V + ARG 1 reducedDebugInfo METHOD r sendAbilitiesUpdate ()V METHOD r addExhaustion (F)V + ARG 1 exhaustion METHOD r addScore (I)V + ARG 1 score + METHOD s getAttackCooldownProgress (F)F + ARG 1 baseTime METHOD t_ closeContainer ()V METHOD u isCreative ()Z diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index 052aaf20d3..3ca84edf5e 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -7,40 +7,65 @@ CLASS avw net/minecraft/entity/player/PlayerInventory FIELD f combinedInventory Ljava/util/List; FIELD g cursorStack Lbca; FIELD h changeCount I + METHOD (Lavx;)V + ARG 1 player + METHOD a scrollInHotbar (D)V + ARG 1 scrollAmount METHOD a damageArmor (F)V ARG 1 armor METHOD a clone (Lavw;)V + ARG 1 other METHOD a populateRecipeFinder (Lavz;)V + ARG 1 finder METHOD a addPickBlock (Lbca;)V METHOD a canStackAddMore (Lbca;Lbca;)Z ARG 1 existingStack + ARG 2 stack METHOD a offerOrDrop (Lbhh;Lbca;)V + ARG 1 world + ARG 2 stack METHOD a getBlockBreakingSpeed (Lbvj;)F + ARG 1 block METHOD a serialize (Lii;)Lii; + ARG 1 tag METHOD a contains (Lzb;)Z ARG 1 tag METHOD b getSlotWithStack (Lbca;)I + ARG 1 stack METHOD b areItemsEqual (Lbca;Lbca;)Z ARG 1 stack1 + ARG 2 stack2 METHOD b isUsingEffectiveTool (Lbvj;)Z METHOD b deserialize (Lii;)V + ARG 1 tag METHOD c swapSlotWithHotbar (I)V + ARG 1 hotbarSlot METHOD c insertStack (ILbca;)Z ARG 1 slot + ARG 2 stack METHOD d isValidHotbarIndex (I)Z ARG 0 slot + METHOD d addStack (ILbca;)I + ARG 1 slot + ARG 2 stack METHOD d getOccupiedSlotWithRoomForStack (Lbca;)I + ARG 1 stack METHOD e getArmorStack (I)Lbca; + ARG 1 slot METHOD e insertStack (Lbca;)Z + ARG 1 stack METHOD f getMainHandStack ()Lbca; METHOD f removeOne (Lbca;)V + ARG 1 stack METHOD g getHotbarSize ()I METHOD g setCursorStack (Lbca;)V + ARG 1 stack METHOD h getEmptySlot ()I METHOD h contains (Lbca;)Z ARG 1 stack METHOD i getSwappableHotbarSlot ()I METHOD i addStack (Lbca;)I + ARG 1 stack METHOD j updateItems ()V METHOD k dropAll ()V METHOD l getChangeCount ()I diff --git a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping index 64c4aa4b23..bcf02266cc 100644 --- a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping @@ -1,3 +1,5 @@ CLASS awh net/minecraft/entity/projectile/AbstractFireballEntity FIELD f ITEM Lqh; + METHOD b setItem (Lbca;)V + ARG 1 stack METHOD l getItem ()Lbca; diff --git a/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping b/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping index 1bd5924f9f..2206204536 100644 --- a/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping @@ -6,11 +6,19 @@ CLASS awd net/minecraft/entity/projectile/ArrowEntity METHOD (Lbhh;DDD)V ARG 1 world ARG 2 x + ARG 4 y + ARG 6 z METHOD (Lbhh;Laio;)V ARG 1 world + ARG 2 owner METHOD a addEffect (Lahz;)V + ARG 1 effect METHOD b spawnParticles (I)V METHOD b initFromStack (Lbca;)V + ARG 1 stack METHOD c setColor (I)V + ARG 1 color + METHOD c getCustomPotionColor (Lbca;)I + ARG 0 stack METHOD w getColor ()I METHOD z initColor ()V diff --git a/mappings/net/minecraft/entity/projectile/DragonFireballEntity.mapping b/mappings/net/minecraft/entity/projectile/DragonFireballEntity.mapping index 2bd405eef2..5df6811ebc 100644 --- a/mappings/net/minecraft/entity/projectile/DragonFireballEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/DragonFireballEntity.mapping @@ -1 +1,15 @@ CLASS awe net/minecraft/entity/projectile/DragonFireballEntity + METHOD (Lbhh;DDDDDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 directionX + ARG 10 directionY + ARG 12 directionZ + METHOD (Lbhh;Laio;DDD)V + ARG 1 world + ARG 2 owner + ARG 3 directionX + ARG 5 directionY + ARG 7 directionZ diff --git a/mappings/net/minecraft/entity/projectile/ExplodingWitherSkullEntity.mapping b/mappings/net/minecraft/entity/projectile/ExplodingWitherSkullEntity.mapping index a0c9656765..526b496cc2 100644 --- a/mappings/net/minecraft/entity/projectile/ExplodingWitherSkullEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ExplodingWitherSkullEntity.mapping @@ -1,4 +1,19 @@ CLASS awz net/minecraft/entity/projectile/ExplodingWitherSkullEntity FIELD f CHARGED Lqh; + METHOD (Lbhh;DDDDDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 directionX + ARG 10 directionY + ARG 12 directionZ + METHOD (Lbhh;Laio;DDD)V + ARG 1 world + ARG 2 owner + ARG 3 directionX + ARG 5 directionY + ARG 7 directionZ METHOD a setCharged (Z)V + ARG 1 charged METHOD l isCharged ()Z diff --git a/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping index 43801ed67f..e51b35794b 100644 --- a/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping @@ -6,10 +6,21 @@ CLASS awc net/minecraft/entity/projectile/ExplosiveProjectileEntity FIELD f life I FIELD g ticks I METHOD (Laij;DDDDDDLbhh;)V - ARG 1 world + ARG 1 type + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 directionX + ARG 10 directionY + ARG 12 directionZ + ARG 14 world METHOD (Laij;Laio;DDDLbhh;)V - ARG 1 world + ARG 1 type ARG 2 owner + ARG 3 directionX + ARG 5 directionY + ARG 7 directionZ + ARG 9 world METHOD (Laij;Lbhh;)V ARG 1 type METHOD L_ isBurning ()Z diff --git a/mappings/net/minecraft/entity/projectile/FireballEntity.mapping b/mappings/net/minecraft/entity/projectile/FireballEntity.mapping index 9460843820..7285da1e40 100644 --- a/mappings/net/minecraft/entity/projectile/FireballEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/FireballEntity.mapping @@ -1,2 +1,16 @@ CLASS awk net/minecraft/entity/projectile/FireballEntity FIELD f explosionPower I + METHOD (Lbhh;DDDDDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD (Lbhh;Laio;DDD)V + ARG 1 world + ARG 2 owner + ARG 3 velocityX + ARG 5 velocityY + ARG 7 velocityZ diff --git a/mappings/net/minecraft/entity/projectile/FishHookEntity.mapping b/mappings/net/minecraft/entity/projectile/FishHookEntity.mapping index ac551a9d5d..e54da9782d 100644 --- a/mappings/net/minecraft/entity/projectile/FishHookEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/FishHookEntity.mapping @@ -1,7 +1,26 @@ CLASS atj net/minecraft/entity/projectile/FishHookEntity CLASS atj$a State FIELD av state Latj$a; + FIELD aw lureLevel I + FIELD ax luckOfTheSeaLevel I FIELD b hookedEntity Laif; FIELD c HOOK_ENTITY_ID Lqh; FIELD f owner Lavx; + METHOD (Lavx;Lbhh;II)V + ARG 1 thrower + ARG 2 world + ARG 3 lureLevel + ARG 4 luckOfTheSeaLevel + METHOD (Lbhh;Lavx;DDD)V + ARG 1 world + ARG 2 thrower + ARG 3 x + ARG 5 y + ARG 7 z + METHOD (Lbhh;Lavx;II)V + ARG 1 world + ARG 2 owner + ARG 3 lureLevel + ARG 4 luckOfTheSeaLevel METHOD i getOwner ()Lavx; + METHOD n updateHookedEntityId ()V diff --git a/mappings/net/minecraft/entity/projectile/LlamaSpitEntity.mapping b/mappings/net/minecraft/entity/projectile/LlamaSpitEntity.mapping index 44e76dd438..69b35f7926 100644 --- a/mappings/net/minecraft/entity/projectile/LlamaSpitEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/LlamaSpitEntity.mapping @@ -1,4 +1,15 @@ CLASS awl net/minecraft/entity/projectile/LlamaSpitEntity FIELD b owner Larv; FIELD c tag Lib; + METHOD (Lbhh;DDDDDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD (Lbhh;Larv;)V + ARG 1 world + ARG 2 owner METHOD f readTag ()V diff --git a/mappings/net/minecraft/entity/projectile/Projectile.mapping b/mappings/net/minecraft/entity/projectile/Projectile.mapping index e9302f79af..9c2292fd1a 100644 --- a/mappings/net/minecraft/entity/projectile/Projectile.mapping +++ b/mappings/net/minecraft/entity/projectile/Projectile.mapping @@ -2,3 +2,4 @@ CLASS awm net/minecraft/entity/projectile/Projectile METHOD c setVelocity (DDDFF)V ARG 1 dirX ARG 3 dirY + ARG 5 dirZ diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index 244fe8ba0b..08d2593460 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -14,16 +14,28 @@ CLASS awb net/minecraft/entity/projectile/ProjectileEntity FIELD e pickupType Lawb$a; FIELD f shake I FIELD g ownerUuid Ljava/util/UUID; + METHOD (Laij;DDDLbhh;)V + ARG 1 type + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 world + METHOD (Laij;Laio;Lbhh;)V + ARG 1 type + ARG 2 owner + ARG 3 world METHOD (Laij;Lbhh;)V ARG 1 type METHOD a setProjectileFlag (IZ)V ARG 1 index METHOD a setOwner (Laif;)V METHOD a onHit (Laio;)V + ARG 1 target METHOD a onEntityHit (Lcrs;)V METHOD a onHit (Lcrt;)V METHOD a getEntityCollision (Lcrv;Lcrv;)Lcrs; METHOD a setSound (Lyj;)V + ARG 1 sound METHOD a setCritical (Z)V METHOD b setPierceLevel (B)V METHOD c setDamage (D)V diff --git a/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping b/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping index 49407556bc..468622340f 100644 --- a/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping @@ -6,5 +6,17 @@ CLASS awo net/minecraft/entity/projectile/ShulkerBulletEntity FIELD b owner Laio; FIELD c target Laif; FIELD d direction Lfa; + METHOD (Lbhh;DDDDDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD (Lbhh;Laio;Laif;Lfa$a;)V + ARG 1 world + ARG 2 owner + ARG 3 target METHOD a onHit (Lcrt;)V METHOD a setDirection (Lfa;)V diff --git a/mappings/net/minecraft/entity/projectile/SmallFireballEntity.mapping b/mappings/net/minecraft/entity/projectile/SmallFireballEntity.mapping index afb2d34f45..38a44a7e05 100644 --- a/mappings/net/minecraft/entity/projectile/SmallFireballEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/SmallFireballEntity.mapping @@ -1 +1,15 @@ CLASS awp net/minecraft/entity/projectile/SmallFireballEntity + METHOD (Lbhh;DDDDDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD (Lbhh;Laio;DDD)V + ARG 1 world + ARG 2 owner + ARG 3 velocityX + ARG 5 velocityY + ARG 7 velocityZ diff --git a/mappings/net/minecraft/entity/projectile/SpectralArrowEntity.mapping b/mappings/net/minecraft/entity/projectile/SpectralArrowEntity.mapping index 1661818537..daa4253c93 100644 --- a/mappings/net/minecraft/entity/projectile/SpectralArrowEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/SpectralArrowEntity.mapping @@ -1,2 +1,10 @@ CLASS awr net/minecraft/entity/projectile/SpectralArrowEntity FIELD ar duration I + METHOD (Lbhh;DDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + METHOD (Lbhh;Laio;)V + ARG 1 world + ARG 2 owner diff --git a/mappings/net/minecraft/entity/projectile/TridentEntity.mapping b/mappings/net/minecraft/entity/projectile/TridentEntity.mapping index 695ce296df..9ff44b5f2e 100644 --- a/mappings/net/minecraft/entity/projectile/TridentEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/TridentEntity.mapping @@ -2,4 +2,13 @@ CLASS awy net/minecraft/entity/projectile/TridentEntity FIELD as LOYALTY Lqh; FIELD at tridentStack Lbca; FIELD au dealtDamage Z + METHOD (Lbhh;DDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + METHOD (Lbhh;Laio;Lbca;)V + ARG 1 world + ARG 2 owner + ARG 3 item METHOD w isOwnerAlive ()Z diff --git a/mappings/net/minecraft/entity/raid/Raid.mapping b/mappings/net/minecraft/entity/raid/Raid.mapping index 8de10c9bb5..4c63f8d4a4 100644 --- a/mappings/net/minecraft/entity/raid/Raid.mapping +++ b/mappings/net/minecraft/entity/raid/Raid.mapping @@ -6,7 +6,10 @@ CLASS axb net/minecraft/entity/raid/Raid CLASS axb$b Member FIELD f VALUES [Laxb$b; FIELD g type Laij; - FIELD h waveToCount [I + FIELD h countInWave [I + METHOD (Ljava/lang/String;ILaij;[I)V + ARG 3 type + ARG 4 countInWave FIELD a OMINOUS_BANNER Lbca; FIELD b EVENT_TEXT Ljw; FIELD c VICTORY_SUFFIX_TEXT Ljw; @@ -35,6 +38,11 @@ CLASS axb net/minecraft/entity/raid/Raid FIELD z preCalculatedRavagerSpawnLocation Ljava/util/Optional; METHOD (ILvg;Lev;)V ARG 1 id + ARG 2 world + ARG 3 pos + METHOD (Lvg;Lib;)V + ARG 1 world + ARG 2 tag METHOD A hasSpawnedFinalWave ()Z METHOD B hasExtraWave ()Z METHOD C hasSpawnedExtraWave ()Z @@ -49,6 +57,7 @@ CLASS axb net/minecraft/entity/raid/Raid ARG 2 tries METHOD a setWaveCaptain (ILaxc;)V ARG 1 wave + ARG 2 entity METHOD a addRaider (ILaxc;Lev;Z)V ARG 1 wave ARG 2 raider @@ -56,27 +65,39 @@ CLASS axb net/minecraft/entity/raid/Raid ARG 4 existing METHOD a addToWave (ILaxc;Z)Z ARG 1 wave + ARG 2 entity ARG 3 countHealth METHOD a getMaxWaves (Lagx;)I + ARG 1 difficulty METHOD a addHero (Laif;)V + ARG 1 entity METHOD a start (Lavx;)V ARG 1 player METHOD a getCount (Laxb$b;IZ)I + ARG 1 member ARG 2 wave ARG 3 extra METHOD a getBonusCount (Laxb$b;Ljava/util/Random;ILagy;Z)I + ARG 1 member + ARG 2 random ARG 3 wave + ARG 4 localDifficulty ARG 5 extra METHOD a removeFromWave (Laxc;Z)V + ARG 1 entity ARG 2 countHealth METHOD a playRaidHorn (Lev;)V + ARG 1 pos METHOD a toTag (Lib;)Lib; + ARG 1 tag METHOD b isPreRaid ()Z METHOD b getCaptain (I)Laxc; ARG 1 wave METHOD b addToWave (ILaxc;)Z ARG 1 wave + ARG 2 entity METHOD b spawnNextWave (Lev;)V + ARG 1 pos METHOD c hasSpawned ()Z METHOD c removeLeader (I)V ARG 1 wave diff --git a/mappings/net/minecraft/entity/raid/RaidManager.mapping b/mappings/net/minecraft/entity/raid/RaidManager.mapping index 1dc6ac7e33..2c114eab6b 100644 --- a/mappings/net/minecraft/entity/raid/RaidManager.mapping +++ b/mappings/net/minecraft/entity/raid/RaidManager.mapping @@ -3,13 +3,25 @@ CLASS axd net/minecraft/entity/raid/RaidManager FIELD b world Lvg; FIELD c nextAvailableId I FIELD d currentTime I + METHOD (Lvg;)V + ARG 1 world METHOD a tick ()V METHOD a getRaid (I)Laxb; ARG 1 id METHOD a isLivingAroundVillage (Laio;Lev;I)Z + ARG 0 entity + ARG 1 pos + ARG 2 range METHOD a isValidRaiderFor (Laxc;Laxb;)Z + ARG 0 raider + ARG 1 raid METHOD a nameFor (Lbyc;)Ljava/lang/String; + ARG 0 dimension METHOD a getRaidAt (Lev;)Laxb; + ARG 1 pos METHOD a getOrCreateRaid (Lvg;Lev;)Laxb; + ARG 1 world + ARG 2 pos METHOD a startRaid (Lvh;)Laxb; + ARG 1 player METHOD e nextId ()I diff --git a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping index 83a8d40382..dcd6bbb324 100644 --- a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping +++ b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping @@ -1,24 +1,32 @@ CLASS axc net/minecraft/entity/raid/RaiderEntity CLASS axc$a PatrolApproachGoal FIELD a closeRaiderPredicate Lapz; - FIELD c raiderEntity Laxc; + FIELD c raider Laxc; FIELD d squaredDistance F METHOD (Laxc;Latr;F)V - ARG 2 raiderEntity + ARG 2 illager ARG 3 distance CLASS axc$b PickupBannerAsLeaderGoal + FIELD b actor Laxc; + METHOD (Laxc;Laxc;)V + ARG 2 actor CLASS axc$c CelebrateGoal + FIELD b raider Laxc; + METHOD (Laxc;Laxc;)V + ARG 2 raider CLASS axc$d AttackHomeGoal - FIELD a owner Laxc; + FIELD a raider Laxc; FIELD b speed D FIELD c home Lev; FIELD d lastHomes Ljava/util/List; FIELD e distance I FIELD f finished Z METHOD (Laxc;DI)V + ARG 1 raider ARG 2 speed ARG 4 distance METHOD a canLootHome (Lev;)Z + ARG 1 pos METHOD g isRaiding ()Z METHOD h tryFindHome ()Z METHOD j purgeMemory ()V @@ -31,10 +39,13 @@ CLASS axc net/minecraft/entity/raid/RaiderEntity METHOD (Laij;Lbhh;)V ARG 1 type METHOD a setWave (I)V + ARG 1 wave METHOD a addBonusForWave (IZ)V ARG 1 wave + ARG 2 unused METHOD a setRaid (Laxb;)V METHOD b setOutOfRaidCounter (I)V + ARG 1 counter METHOD dW getCelebratingSound ()Lyj; METHOD ej canJoinRaid ()Z METHOD ek getRaid ()Laxb; @@ -45,3 +56,4 @@ CLASS axc net/minecraft/entity/raid/RaiderEntity METHOD t setAbleToJoinRaid (Z)V ARG 1 ableToJoinRaid METHOD u setCelebrating (Z)V + ARG 1 celebrating diff --git a/mappings/net/minecraft/entity/thrown/SnowballEntity.mapping b/mappings/net/minecraft/entity/thrown/SnowballEntity.mapping index 1a8e0eadda..6168ccc59d 100644 --- a/mappings/net/minecraft/entity/thrown/SnowballEntity.mapping +++ b/mappings/net/minecraft/entity/thrown/SnowballEntity.mapping @@ -1,2 +1,10 @@ CLASS awq net/minecraft/entity/thrown/SnowballEntity + METHOD (Lbhh;DDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + METHOD (Lbhh;Laio;)V + ARG 1 world + ARG 2 owner METHOD n getParticleParameters ()Lgd; diff --git a/mappings/net/minecraft/entity/thrown/ThrownEggEntity.mapping b/mappings/net/minecraft/entity/thrown/ThrownEggEntity.mapping index 887331cd25..63d0ec9204 100644 --- a/mappings/net/minecraft/entity/thrown/ThrownEggEntity.mapping +++ b/mappings/net/minecraft/entity/thrown/ThrownEggEntity.mapping @@ -1 +1,9 @@ CLASS awu net/minecraft/entity/thrown/ThrownEggEntity + METHOD (Lbhh;DDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + METHOD (Lbhh;Laio;)V + ARG 1 world + ARG 2 thrower diff --git a/mappings/net/minecraft/entity/thrown/ThrownEnderpearlEntity.mapping b/mappings/net/minecraft/entity/thrown/ThrownEnderpearlEntity.mapping index 48bfab37fb..78e2498105 100644 --- a/mappings/net/minecraft/entity/thrown/ThrownEnderpearlEntity.mapping +++ b/mappings/net/minecraft/entity/thrown/ThrownEnderpearlEntity.mapping @@ -1,2 +1,10 @@ CLASS awv net/minecraft/entity/thrown/ThrownEnderpearlEntity FIELD e owner Laio; + METHOD (Lbhh;DDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + METHOD (Lbhh;Laio;)V + ARG 1 world + ARG 2 owner diff --git a/mappings/net/minecraft/entity/thrown/ThrownExperienceBottleEntity.mapping b/mappings/net/minecraft/entity/thrown/ThrownExperienceBottleEntity.mapping index a74e1ff023..708d2164b4 100644 --- a/mappings/net/minecraft/entity/thrown/ThrownExperienceBottleEntity.mapping +++ b/mappings/net/minecraft/entity/thrown/ThrownExperienceBottleEntity.mapping @@ -1 +1,9 @@ CLASS aww net/minecraft/entity/thrown/ThrownExperienceBottleEntity + METHOD (Lbhh;DDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + METHOD (Lbhh;Laio;)V + ARG 1 world + ARG 2 owner diff --git a/mappings/net/minecraft/entity/thrown/ThrownItemEntity.mapping b/mappings/net/minecraft/entity/thrown/ThrownItemEntity.mapping index cc444316d0..ed8d8cac57 100644 --- a/mappings/net/minecraft/entity/thrown/ThrownItemEntity.mapping +++ b/mappings/net/minecraft/entity/thrown/ThrownItemEntity.mapping @@ -9,5 +9,6 @@ CLASS aws net/minecraft/entity/thrown/ThrownItemEntity METHOD (Laij;Lbhh;)V ARG 1 type METHOD b setItem (Lbca;)V + ARG 1 item METHOD i getDefaultItem ()Lbbv; METHOD k getItem ()Lbca; diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping index fa0263fcb5..56eb14fcad 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping @@ -6,13 +6,17 @@ CLASS axl net/minecraft/entity/vehicle/AbstractMinecartEntity METHOD (Laij;Lbhh;)V ARG 1 type METHOD (Laij;Lbhh;DDD)V - ARG 1 world + ARG 1 type + ARG 2 world ARG 3 x + ARG 5 y + ARG 7 z METHOD a onActivatorRail (IIIZ)V ARG 1 x ARG 2 y ARG 3 z METHOD a dropItems (Laho;)V + ARG 1 damageSource METHOD a create (Lbhh;DDDLaxl$a;)Laxl; ARG 0 world ARG 1 x diff --git a/mappings/net/minecraft/entity/vehicle/ChestMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/ChestMinecartEntity.mapping index 8ab37c546f..8e422063ae 100644 --- a/mappings/net/minecraft/entity/vehicle/ChestMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/ChestMinecartEntity.mapping @@ -1 +1,6 @@ CLASS axp net/minecraft/entity/vehicle/ChestMinecartEntity + METHOD (Lbhh;DDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z diff --git a/mappings/net/minecraft/entity/vehicle/CommandBlockMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/CommandBlockMinecartEntity.mapping index d2034d4a98..dbf71a20c2 100644 --- a/mappings/net/minecraft/entity/vehicle/CommandBlockMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/CommandBlockMinecartEntity.mapping @@ -5,4 +5,9 @@ CLASS axq net/minecraft/entity/vehicle/CommandBlockMinecartEntity FIELD c LAST_OUTPUT Lqh; FIELD d commandExecutor Lbgn; FIELD e lastExecuted I + METHOD (Lbhh;DDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z METHOD v getCommandExecutor ()Lbgn; diff --git a/mappings/net/minecraft/entity/vehicle/FurnaceMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/FurnaceMinecartEntity.mapping index a082f57626..29394d2f70 100644 --- a/mappings/net/minecraft/entity/vehicle/FurnaceMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/FurnaceMinecartEntity.mapping @@ -3,5 +3,12 @@ CLASS axr net/minecraft/entity/vehicle/FurnaceMinecartEntity FIELD c pushZ D FIELD d LIT Lqh; FIELD e fuel I + FIELD f ACCEPTABLE_FUEL Lbef; + METHOD (Lbhh;DDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z METHOD n setLit (Z)V + ARG 1 lit METHOD v isLit ()Z diff --git a/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping index 83e3a40f3b..376b109f1c 100644 --- a/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping @@ -2,8 +2,15 @@ CLASS axs net/minecraft/entity/vehicle/HopperMinecartEntity FIELD d enabled Z FIELD e transferCooldown I FIELD f currentBlockPos Lev; + METHOD (Lbhh;DDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z METHOD C canOperate ()Z METHOD D isCoolingDown ()Z METHOD l setTransferCooldown (I)V + ARG 1 cooldown METHOD n setEnabled (Z)V + ARG 1 enabled METHOD v isEnabled ()Z diff --git a/mappings/net/minecraft/entity/vehicle/MinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/MinecartEntity.mapping index 27d54e5288..09ce659ef7 100644 --- a/mappings/net/minecraft/entity/vehicle/MinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/MinecartEntity.mapping @@ -1 +1,6 @@ CLASS axo net/minecraft/entity/vehicle/MinecartEntity + METHOD (Lbhh;DDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z diff --git a/mappings/net/minecraft/entity/vehicle/MobSpawnerMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/MobSpawnerMinecartEntity.mapping index 87d68dab54..331c26a288 100644 --- a/mappings/net/minecraft/entity/vehicle/MobSpawnerMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/MobSpawnerMinecartEntity.mapping @@ -1,2 +1,7 @@ CLASS axt net/minecraft/entity/vehicle/MobSpawnerMinecartEntity FIELD b logic Lbgo; + METHOD (Lbhh;DDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z diff --git a/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping index 64ecc3d788..34eae7082a 100644 --- a/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping @@ -2,8 +2,17 @@ CLASS axm net/minecraft/entity/vehicle/StorageMinecartEntity FIELD b inventory Lfj; FIELD d lootTableId Lqs; FIELD e lootSeed J + METHOD (Laij;DDDLbhh;)V + ARG 1 type + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 world METHOD (Laij;Lbhh;)V ARG 1 type + METHOD a getContainer (ILavw;)Layb; + ARG 1 syncId + ARG 2 playerInventory METHOD a setLootTable (Lqs;J)V ARG 1 id METHOD createMenu (ILavw;Lavx;)Layb; diff --git a/mappings/net/minecraft/inventory/Inventory.mapping b/mappings/net/minecraft/inventory/Inventory.mapping index 4c1e38ea13..a49cec405d 100644 --- a/mappings/net/minecraft/inventory/Inventory.mapping +++ b/mappings/net/minecraft/inventory/Inventory.mapping @@ -8,7 +8,7 @@ CLASS agt net/minecraft/inventory/Inventory ARG 2 amount METHOD a setInvStack (ILbca;)V ARG 1 slot - ARG 2 itemStack + ARG 2 stack METHOD a canPlayerUseInv (Lavx;)Z ARG 1 player METHOD a getInvAmountOf (Lbbv;)I diff --git a/mappings/net/minecraft/world/MobSpawnerLogic.mapping b/mappings/net/minecraft/world/MobSpawnerLogic.mapping index bcf55552fe..b31a5bde98 100644 --- a/mappings/net/minecraft/world/MobSpawnerLogic.mapping +++ b/mappings/net/minecraft/world/MobSpawnerLogic.mapping @@ -11,6 +11,8 @@ CLASS bgo net/minecraft/world/MobSpawnerLogic FIELD l requiredPlayerRange I FIELD m spawnRange I METHOD a getWorld ()Lbhh; + METHOD a sendStatus (I)V + ARG 1 status METHOD a spawnEntity (Laif;)V METHOD a setEntityId (Laij;)V METHOD a setSpawnEntry (Lbhv;)V diff --git a/mappings/net/minecraft/world/PersistentState.mapping b/mappings/net/minecraft/world/PersistentState.mapping index dea0e00532..660833580c 100644 --- a/mappings/net/minecraft/world/PersistentState.mapping +++ b/mappings/net/minecraft/world/PersistentState.mapping @@ -5,8 +5,10 @@ CLASS cnq net/minecraft/world/PersistentState METHOD (Ljava/lang/String;)V ARG 1 key METHOD a fromTag (Lib;)V + ARG 1 tag METHOD a setDirty (Z)V METHOD b markDirty ()V METHOD b toTag (Lib;)Lib; + ARG 1 tag METHOD c isDirty ()Z METHOD d getId ()Ljava/lang/String;