From 8fb75cc949abfe83875c103cc3bcb59900fc693b Mon Sep 17 00:00:00 2001 From: Runemoro Date: Thu, 4 Apr 2019 16:04:27 -0400 Subject: [PATCH 1/2] Entity mappings --- .../block/entity/BeaconBlockEntity.mapping | 3 +- .../client/audio/AmbientSoundManager.mapping | 3 - .../client/audio/AmbientSoundPlayer.mapping | 4 + .../audio/BubbleColumnSoundPlayer.mapping | 4 + .../client/block/ColoredBlock.mapping | 2 + .../client/network/ClientPlayerEntity.mapping | 13 +++ .../network/packet/GameJoinS2CPacket.mapping | 9 +++ .../entity/EntityRenderDispatcher.mapping | 12 +++ .../render/entity/EntityRenderer.mapping | 21 ++++- .../entity/ItemFrameEntityRenderer.mapping | 2 +- .../FrostWalkerEnchantment.mapping | 5 ++ .../net/minecraft/entity/DamageUtil.mapping | 4 + mappings/net/minecraft/entity/Entity.mapping | 21 +++-- .../minecraft/entity/FireworkEntity.mapping | 22 +++++- .../net/minecraft/entity/LivingEntity.mapping | 79 ++++++++++++++++--- .../minecraft/entity/ProjectileUtil.mapping | 18 +++++ .../entity/ai/control/LookControl.mapping | 14 ++++ .../entity/ai/control/MoveControl.mapping | 4 + .../entity/damage/DamageSource.mapping | 2 +- .../entity/effect/StatusEffect.mapping | 2 + .../entity/mob/ElderGuardianEntity.mapping | 1 + .../entity/mob/EndermanEntity.mapping | 2 + .../entity/mob/EvokerFangsEntity.mapping | 6 ++ .../entity/mob/HostileEntity.mapping | 2 + .../entity/mob/IllagerEntity.mapping | 1 + .../minecraft/entity/mob/MobEntity.mapping | 16 +++- .../entity/mob/MobEntityWithAi.mapping | 3 + .../minecraft/entity/mob/SlimeEntity.mapping | 30 ++++++- .../minecraft/entity/mob/VexEntity.mapping | 4 +- .../minecraft/entity/mob/ZombieEntity.mapping | 2 + .../entity/passive/FoxEntity.mapping | 8 +- .../entity/passive/PandaEntity.mapping | 8 +- .../entity/player/PlayerEntity.mapping | 23 +++++- .../entity/player/PlayerInventory.mapping | 2 + .../ExplosiveProjectileEntity.mapping | 1 + .../projectile/ProjectileEntity.mapping | 8 +- mappings/net/minecraft/item/ItemStack.mapping | 3 + .../village/PointOfInterestStorage.mapping | 6 ++ .../net/minecraft/world/EntityView.mapping | 19 +++-- .../net/minecraft/world/ViewableWorld.mapping | 2 +- mappings/net/minecraft/world/World.mapping | 4 +- .../minecraft/world/chunk/ChunkPos.mapping | 2 + .../minecraft/world/gen/CatSpawner.mapping | 14 ++++ .../gen/chunk/FlatChunkGenerator.mapping | 1 + 44 files changed, 360 insertions(+), 52 deletions(-) delete mode 100644 mappings/net/minecraft/client/audio/AmbientSoundManager.mapping create mode 100644 mappings/net/minecraft/client/audio/AmbientSoundPlayer.mapping create mode 100644 mappings/net/minecraft/client/audio/BubbleColumnSoundPlayer.mapping create mode 100644 mappings/net/minecraft/client/block/ColoredBlock.mapping create mode 100644 mappings/net/minecraft/world/gen/CatSpawner.mapping diff --git a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping index d490c7b872..371b6284b1 100644 --- a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping @@ -9,7 +9,8 @@ CLASS bsx net/minecraft/block/entity/BeaconBlockEntity METHOD c getHeight ()I FIELD a EFFECTS_BY_LEVEL [[Lahr; FIELD b EFFECTS Ljava/util/Set; - FIELD h levels I + FIELD c beamSegments Ljava/util/List; + FIELD h level I FIELD j primary Lahr; FIELD k secondary Lahr; FIELD l customName Ljm; diff --git a/mappings/net/minecraft/client/audio/AmbientSoundManager.mapping b/mappings/net/minecraft/client/audio/AmbientSoundManager.mapping deleted file mode 100644 index 313a6bcc79..0000000000 --- a/mappings/net/minecraft/client/audio/AmbientSoundManager.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS dwg net/minecraft/client/audio/AmbientSoundManager - FIELD a player Ldjf; - FIELD b soundManager Ldxe; diff --git a/mappings/net/minecraft/client/audio/AmbientSoundPlayer.mapping b/mappings/net/minecraft/client/audio/AmbientSoundPlayer.mapping new file mode 100644 index 0000000000..21527a147a --- /dev/null +++ b/mappings/net/minecraft/client/audio/AmbientSoundPlayer.mapping @@ -0,0 +1,4 @@ +CLASS dwg net/minecraft/client/audio/AmbientSoundPlayer + FIELD a player Ldjf; + FIELD b soundManager Ldxe; + FIELD c ticksUntilPlay I diff --git a/mappings/net/minecraft/client/audio/BubbleColumnSoundPlayer.mapping b/mappings/net/minecraft/client/audio/BubbleColumnSoundPlayer.mapping new file mode 100644 index 0000000000..0b8201c36e --- /dev/null +++ b/mappings/net/minecraft/client/audio/BubbleColumnSoundPlayer.mapping @@ -0,0 +1,4 @@ +CLASS dvu net/minecraft/client/audio/BubbleColumnSoundPlayer + FIELD a player Ldjf; + FIELD b hasPlayedForCurrentColumn Z + FIELD c firstTick Z diff --git a/mappings/net/minecraft/client/block/ColoredBlock.mapping b/mappings/net/minecraft/client/block/ColoredBlock.mapping new file mode 100644 index 0000000000..2b0ba6edbd --- /dev/null +++ b/mappings/net/minecraft/client/block/ColoredBlock.mapping @@ -0,0 +1,2 @@ +CLASS blt net/minecraft/client/block/ColoredBlock + METHOD a getColor ()Lban; diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index 9dd23c9494..84983a6474 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -9,9 +9,18 @@ CLASS djf net/minecraft/client/network/ClientPlayerEntity FIELD cd recipeBook Lcul; FIELD ce tickables Ljava/util/List; FIELD cf clientPermissionLevel I + FIELD cg lastX D + FIELD ch lastBaseY D + FIELD ci lastZ D + FIELD cj lastYaw F + FIELD ck lastPitch F + FIELD cl lastOnGround Z + FIELD cm lastIsHoldingSneakKey Z + FIELD cn lastSprinting Z FIELD cq serverBrand Ljava/lang/String; FIELD cu activeHand Lagt; FIELD cv riding Z + FIELD cw lastAutoJump Z FIELD e networkHandler Ldgs; FIELD f input Ldjd; FIELD g client Lcuu; @@ -21,12 +30,16 @@ CLASS djf net/minecraft/client/network/ClientPlayerEntity METHOD B getStats ()Lys; METHOD D getRecipeBook ()Lcul; METHOD F hasJumpingMount ()Z + METHOD H isHoldingSneakKey ()Z METHOD I isCamera ()Z METHOD J isRiding ()Z + METHOD M sendMovementPackets ()V METHOD a setClientPermissionLevel (I)V METHOD a onRecipeDisplayed (Lbdy;)V METHOD eb updateNausea ()V METHOD f sendChatMessage (Ljava/lang/String;)V + METHOD g cannotFitAt (Lev;)Z + ARG 1 pos METHOD g setServerBrand (Ljava/lang/String;)V ARG 1 serverBrand METHOD t updateHealth (F)V diff --git a/mappings/net/minecraft/client/network/packet/GameJoinS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/GameJoinS2CPacket.mapping index dbdeed2882..67afdb434e 100644 --- a/mappings/net/minecraft/client/network/packet/GameJoinS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/GameJoinS2CPacket.mapping @@ -2,15 +2,24 @@ CLASS lp net/minecraft/client/network/packet/GameJoinS2CPacket FIELD a playerEntityId I FIELD b hardcore Z FIELD c gameMode Lbgt; + FIELD d dimension Lbxs; FIELD e maxPlayers I FIELD f generatorType Lbhd; + FIELD g chunkLoadDistance I FIELD h reducedDebugInfo Z METHOD (ILbgt;ZLbxs;ILbhd;IZ)V ARG 1 playerEntityId ARG 2 gameMode ARG 3 hardcore + ARG 4 dimension + ARG 5 maxPlayers + ARG 6 generatorType + ARG 7 chunkLoadDistance + ARG 8 reducedDebugInfo METHOD b getEntityId ()I METHOD c isHardcore ()Z METHOD d getGameMode ()Lbgt; METHOD e getDimension ()Lbxs; + METHOD g getGeneratorType ()Lbhd; + METHOD h getChunkLoadDistance ()I METHOD i hasReducedDebugInfo ()Z diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping index d3e5914995..2cede29a3c 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping @@ -14,6 +14,7 @@ CLASS dop net/minecraft/client/render/entity/EntityRenderDispatcher FIELD m renderPosY D FIELD n renderPosZ D FIELD o renderOutlines Z + FIELD q showHitboxes Z METHOD (Ldtr;Ldpk;Lxa;)V ARG 1 textureManager METHOD a setRenderPosition (DDD)V @@ -21,8 +22,15 @@ CLASS dop net/minecraft/client/render/entity/EntityRenderDispatcher METHOD a getRenderer (Lahz;)Ldoq; METHOD a renderHitbox (Lahz;DDDFF)V METHOD a render (Lahz;DDDFFZ)V + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 yaw + ARG 9 tickDelta + ARG 10 forceHideHitbox METHOD a renderSecondPass (Lahz;F)V METHOD a render (Lahz;FZ)V + ARG 2 tickDelta METHOD a configure (Lbgw;Lcvm;Lcuk;Lahz;Lcuy;)V ARG 1 world ARG 2 textRenderer @@ -30,6 +38,10 @@ CLASS dop net/minecraft/client/render/entity/EntityRenderDispatcher ARG 4 targetedEntity ARG 5 gameOptions METHOD a getRenderer (Ljava/lang/Class;)Ldoq; + METHOD b showsHitboxes ()Z METHOD b hasSecondPass (Lahz;)Z + METHOD b setShowHitboxes (Z)V + ARG 1 showHitboxes METHOD c getTextRenderer ()Lcvm; METHOD c setRenderOutlines (Z)V + ARG 1 renderOutlines diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping index 5dbe8a3f20..c19abb77b5 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping @@ -4,12 +4,28 @@ CLASS doq net/minecraft/client/render/entity/EntityRenderer FIELD e renderOutlines Z METHOD a hasSecondPass ()Z METHOD a getTexture (Lahz;)Lqr; + METHOD a renderLabelIfPresent (Lahz;DDD)V + ARG 1 entity + ARG 2 x + ARG 4 y + ARG 6 z METHOD a renderEntityOnFire (Lahz;DDDF)V ARG 2 x ARG 4 y METHOD a render (Lahz;DDDFF)V + ARG 1 entity + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 yaw + ARG 9 tickDelta + METHOD a renderLabel (Lahz;DDDLjava/lang/String;D)V + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 text METHOD a isVisible (Lahz;Ldmu;DDD)Z - METHOD a renderEntityLabel (Lahz;Ljava/lang/String;DDDI)V + METHOD a renderLabel (Lahz;Ljava/lang/String;DDDI)V ARG 1 entity ARG 2 text ARG 3 x @@ -21,7 +37,8 @@ CLASS doq net/minecraft/client/render/entity/EntityRenderer METHOD a bindTexture (Lqr;)V METHOD a setRenderOutlines (Z)V METHOD b getFontRenderer ()Lcvm; - METHOD b renderRightArmOverlay (Lahz;)Z + METHOD b hasLabel (Lahz;)Z + ARG 1 entity METHOD b renderSecondPass (Lahz;DDDFF)V METHOD c getRenderManager ()Ldop; METHOD c getOutlineColor (Lahz;)I diff --git a/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping index 1cf5a5c340..b5a7ee6896 100644 --- a/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping @@ -4,4 +4,4 @@ CLASS dpj net/minecraft/client/render/entity/ItemFrameEntityRenderer FIELD i itemRenderer Ldpk; METHOD (Ldop;Ldpk;)V ARG 1 renderManager - METHOD b renderRightArmOverlay (Lasu;)V + METHOD b hasLabel (Lasu;)V diff --git a/mappings/net/minecraft/enchantment/FrostWalkerEnchantment.mapping b/mappings/net/minecraft/enchantment/FrostWalkerEnchantment.mapping index 009caf814a..6d7c7494c5 100644 --- a/mappings/net/minecraft/enchantment/FrostWalkerEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/FrostWalkerEnchantment.mapping @@ -2,3 +2,8 @@ CLASS bff net/minecraft/enchantment/FrostWalkerEnchantment METHOD (Lbey$a;[Laie;)V ARG 1 weight ARG 2 slotTypes + METHOD a freezeWater (Laii;Lbgw;Lev;I)V + ARG 0 entity + ARG 1 world + ARG 2 blockPos + ARG 3 level diff --git a/mappings/net/minecraft/entity/DamageUtil.mapping b/mappings/net/minecraft/entity/DamageUtil.mapping index 97e6f898ff..948fa10bbe 100644 --- a/mappings/net/minecraft/entity/DamageUtil.mapping +++ b/mappings/net/minecraft/entity/DamageUtil.mapping @@ -1 +1,5 @@ CLASS ahg net/minecraft/entity/DamageUtil + METHOD a getDamageLeft (FFF)F + ARG 0 damage + ARG 1 armor + ARG 2 armorToughness diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 5e42934fd7..0e2738615c 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -13,7 +13,7 @@ CLASS ahz net/minecraft/entity/Entity FIELD O age I FIELD P insideWater Z FIELD U dataTracker Lqj; - FIELD V ENTITY_FLAGS Lqg; + FIELD V FLAGS Lqg; FIELD X chunkX I FIELD Y chunkY I FIELD Z chunkZ I @@ -81,7 +81,8 @@ CLASS ahz net/minecraft/entity/Entity METHOD W getDataTracker ()Lqj; METHOD Y remove ()V METHOD Z getPose ()Lais; - METHOD a setStatus (B)V + METHOD a handleStatus (B)V + ARG 1 status METHOD a shouldRenderAtDistance (D)Z ARG 1 distance METHOD a requestTeleport (DDD)V @@ -202,8 +203,11 @@ CLASS ahz net/minecraft/entity/Entity METHOD aT getRotationVecClient ()Lcri; METHOD aV getDefaultPortalCooldown ()I METHOD aX getItemsHand ()Ljava/lang/Iterable; - METHOD aY getItemsArmor ()Ljava/lang/Iterable; + METHOD aY getArmorItems ()Ljava/lang/Iterable; METHOD aZ getItemsEquipped ()Ljava/lang/Iterable; + METHOD a_ equip (ILbbq;)Z + ARG 1 slot + ARG 2 item METHOD aa baseTick ()V METHOD ab getMaxPortalTime ()I METHOD ac setOnFireFromLava ()V @@ -236,7 +240,7 @@ CLASS ahz net/minecraft/entity/Entity METHOD b handleFallDamage (FF)V ARG 1 fallDistance ARG 2 damageMultiplier - METHOD b setEntityFlag (IZ)V + METHOD b setFlag (IZ)V ARG 1 index METHOD b isInvulnerableTo (Lahi;)Z METHOD b setPose (Lais;)V @@ -261,6 +265,7 @@ CLASS ahz net/minecraft/entity/Entity METHOD bG getMovementDirection ()Lfa; METHOD bH getComponentHoverEvent ()Ljp; METHOD bI getBoundingBox ()Lcrd; + METHOD bJ getVisibilityBoundingBox ()Lcrd; METHOD bK getStandingEyeHeight ()F METHOD bL getBlockPos ()Lev; METHOD bM getPosVector ()Lcri; @@ -276,6 +281,7 @@ CLASS ahz net/minecraft/entity/Entity METHOD ba isOnFire ()Z METHOD bb hasVehicle ()Z METHOD bc hasPassengers ()Z + METHOD bd canBeRiddenInWater ()Z METHOD be isSneaking ()Z METHOD bg isSprinting ()Z METHOD bh isSwimming ()Z @@ -314,6 +320,7 @@ CLASS ahz net/minecraft/entity/Entity ARG 3 offsetY ARG 5 offsetZ METHOD d getEyeHeight (Lais;)F + ARG 1 pose METHOD d setVelocity (Lcri;)V METHOD d saveToTag (Lib;)Z METHOD d setUnaffectedByGravity (Z)V @@ -347,9 +354,13 @@ CLASS ahz net/minecraft/entity/Entity ARG 3 y ARG 5 z METHOD h getYaw (F)F - METHOD h getEntityFlag (I)Z + METHOD h getFlag (I)Z METHOD h squaredDistanceTo (Lahz;)D METHOD h setGlowing (Z)V + METHOD i pushOutOfBlocks (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z METHOD i setBreath (I)V METHOD i pushAwayFrom (Lahz;)V METHOD i setInvisible (Z)V diff --git a/mappings/net/minecraft/entity/FireworkEntity.mapping b/mappings/net/minecraft/entity/FireworkEntity.mapping index d72e7cc56c..64d2906b23 100644 --- a/mappings/net/minecraft/entity/FireworkEntity.mapping +++ b/mappings/net/minecraft/entity/FireworkEntity.mapping @@ -1,2 +1,22 @@ CLASS avy net/minecraft/entity/FireworkEntity - FIELD b ITEM_STACK Lqg; + FIELD b ITEM Lqg; + FIELD c SHOOTER_ENTITY_ID Lqg; + FIELD d SHOT_AT_ANGLE Lqg; + FIELD e life I + FIELD f lifeTime I + FIELD g shooter Laii; + METHOD (Lbgw;DDDLbbq;)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 item + METHOD (Lbgw;Lbbq;Laii;)V + ARG 1 world + ARG 2 item + ARG 3 shooter + METHOD a handleCollision (Lcrg;)V + METHOD i wasShotAtAngle ()Z + METHOD k explodeAndRemove ()V + METHOD l explode ()V + METHOD m wasShotByEntity ()Z diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index b0ecd3990c..bb5cd3a8d7 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -1,4 +1,5 @@ CLASS aii net/minecraft/entity/LivingEntity + FIELD aA handSwingProgress F FIELD aM headYaw F FIELD aN prevHeadYaw F FIELD aP attackingPlayer Lavn; @@ -7,26 +8,30 @@ CLASS aii net/minecraft/entity/LivingEntity FIELD aS despawnCounter I FIELD ap LIVING_FLAGS Lqg; FIELD aq SLEEPING_SIZE Laia; + FIELD ar isHandSwinging Z FIELD as preferredHand Lagt; + FIELD at handSwingTicks I FIELD au stuckArrowTimer I FIELD av hurtTime I FIELD ay deathCounter I + FIELD az lastHandSwingProgress F FIELD bA lastAttackedTime I FIELD bB attacking Laii; FIELD bC lastAttackTime I FIELD bD movementSpeed F FIELD bF absorptionAmount F + FIELD bG lastBlockPos Lev; FIELD b ATTR_SPRINTING_SPEED_BOOST_ID Ljava/util/UUID; FIELD ba jumping Z - FIELD bb movementInputSideways F - FIELD bc movementInputUp F - FIELD bd movementInputForward F + FIELD bb sidewaysSpeed F + FIELD bc upwardSpeed F + FIELD bd forwardSpeed F FIELD bn activeItemStack Lbbq; FIELD br brain Laix; FIELD bs SLEEPING_POSITION Lqg; FIELD bt attributeContainer Lajc; FIELD bu damageTracker Lahh; - FIELD bv activePotionEffects Ljava/util/Map; + FIELD bv activeStatusEffects Ljava/util/Map; FIELD bw equippedHand Lfj; FIELD bx equippedArmor Lfj; FIELD bz attacker Laii; @@ -57,16 +62,30 @@ CLASS aii net/minecraft/entity/LivingEntity METHOD a dropLoot (Lahi;Z)V ARG 1 source ARG 2 killedByPlayer - METHOD a hasPotionEffect (Lahr;)Z - METHOD a pickUpEntity (Lahz;I)V + METHOD a hasStatusEffect (Lahr;)Z + METHOD a takeKnockback (Lahz;FDD)V + ARG 1 source + ARG 2 scale + ARG 3 x + ARG 5 z + METHOD a sendPickup (Lahz;I)V + ARG 1 item ARG 2 count METHOD a canTarget (Laid;)Z METHOD a isEquippedStackValid (Laie;)Z METHOD a setAttacker (Laii;)V + METHOD a isTarget (Laii;Lapp;)Z + ARG 1 target + ARG 2 targetPredicate METHOD a getAttributeInstance (Laiy;)Laiz; + METHOD a spawnItemParticles (Lbbq;I)V + ARG 1 item + ARG 2 count METHOD a applyFoodEffects (Lbbq;Lbgw;Laii;)V METHOD a eatFood (Lbgw;Lbbq;)Lbbq; - METHOD a createBrain (Lcom/mojang/datafixers/Dynamic;)Laix; + METHOD a deserializeBrain (Lcom/mojang/datafixers/Dynamic;)Laix; + METHOD a setPositionInBed (Lev;)V + ARG 1 pos METHOD a setNearbySongPlaying (Lev;Z)V ARG 1 songSource ARG 2 playing @@ -76,28 +95,49 @@ CLASS aii net/minecraft/entity/LivingEntity METHOD b heal (F)V ARG 1 amount METHOD b getStackInHand (Lagt;)Lbbq; - METHOD b getPotionEffect (Lahr;)Laht; + METHOD b applyArmorToDamage (Lahi;F)F + ARG 1 source + ARG 2 damage + METHOD b getStatusEffect (Lahr;)Laht; METHOD b getEquippedStack (Laie;)Lbbq; METHOD b getActiveEyeHeight (Lais;Laia;)F METHOD b onEquipStack (Lbbq;)V ARG 1 stack + METHOD b spawnEatingParticlesAndPlayEatingSoundOrPlayDrinkingSound (Lbbq;I)V + ARG 1 item + ARG 2 particleCount + METHOD b applyFrostWalker (Lev;)V + ARG 1 pos METHOD c setHealth (F)V + METHOD c setLivingFlag (IZ)V + ARG 1 mask + ARG 2 value METHOD c setCurrentHand (Lagt;)V METHOD c playHurtSound (Lahi;)V + METHOD c applyEnchantmentsToDamage (Lahi;F)F + ARG 1 source + ARG 2 amount METHOD c removePotionEffect (Lahr;)Laht; METHOD c addPotionEffect (Laht;)Z + METHOD c sendEquipmentBreakStatus (Laie;)V + ARG 1 slot METHOD c canTarget (Laii;)Z + ARG 1 target METHOD c getDrinkSound (Lbbq;)Lyh; METHOD c containsOnlyAmbientEffects (Ljava/util/Collection;)Z ARG 0 effects + METHOD c swimUpward (Lyz;)V + ARG 1 fluid METHOD cA getHealth ()F METHOD cB getRecentDamageSource ()Lahi; METHOD cC dropInventory ()V METHOD cD getLootTable ()Lqr; METHOD cE getDeathSound ()Lyh; + METHOD cG getArmor ()I METHOD cH getDamageTracker ()Lahh; METHOD cJ getHealthMaximum ()F METHOD cK getStuckArrows ()I + METHOD cL tickHandSwing ()V METHOD cM getAttributeContainer ()Lajc; METHOD cN getGroup ()Laim; METHOD cO getMainHandStack ()Lbbq; @@ -112,6 +152,7 @@ CLASS aii net/minecraft/entity/LivingEntity METHOD ch getBrain ()Laix; METHOD ci initAttributes ()V METHOD cj canBreatheInWater ()Z + METHOD ck getScaleFactor ()F METHOD cl updatePostDeath ()V METHOD cm canDropLootAndXp ()Z METHOD cn shouldAlwaysDropXp ()Z @@ -121,15 +162,22 @@ CLASS aii net/minecraft/entity/LivingEntity METHOD cr getAttacking ()Laii; METHOD cs getLastAttackTime ()I METHOD ct getDespawnCounter ()I + METHOD cu spawnPotionParticles ()V METHOD cv clearPotionSwirls ()V METHOD cw clearPotionEffects ()Z - METHOD cx getPotionEffects ()Ljava/util/Collection; + METHOD cx getStatusEffects ()Ljava/util/Collection; + METHOD cy getActiveStatusEffects ()Ljava/util/Map; METHOD cz isUndead ()Z + METHOD d sendToolBreakStatus (Lagt;)V METHOD d drop (Lahi;)V METHOD d applyDamage (Lahi;F)V - ARG 1 damageSource + ARG 1 source + ARG 2 damage METHOD d removeStatusEffect (Lahr;)Z METHOD d isPotionEffective (Laht;)Z + METHOD d getEquipmentBreakStatus (Laie;)B + METHOD d takeShieldHit (Laii;)V + ARG 1 source METHOD d getCurrentExperience (Lavn;)I METHOD d getEatSound (Lbbq;)Lyh; METHOD d setSleepingPosition (Lev;)V @@ -149,18 +197,29 @@ CLASS aii net/minecraft/entity/LivingEntity ARG 1 yaw METHOD e getHurtSound (Lahi;)Lyh; ARG 1 source + METHOD e knockback (Laii;)V + ARG 1 target METHOD e canPickUp (Lbbq;)Z METHOD e travel (Lcri;)V ARG 1 movementInput METHOD e sleep (Lev;)V METHOD f attackLivingEntity (Laii;)V METHOD f getArrowType (Lbbq;)Lbbq; + METHOD g playEquipmentBreakEffects (Lbbq;)V + ARG 1 item METHOD k updateMovement ()V + METHOD k getNextBreathInWater (I)I + ARG 1 breath METHOD l getHandSwingDuration ()I + METHOD l getNextBreathInAir (I)I + ARG 1 breath + METHOD m damageArmor (F)V + ARG 1 amount METHOD m setDespawnCounter (I)V ARG 1 despawnCounter METHOD n initAi ()V METHOD n damageShield (F)V + ARG 1 amount METHOD n getFallSound (I)Lyh; METHOD o setMovementSpeed (F)V ARG 1 movementSpeed diff --git a/mappings/net/minecraft/entity/ProjectileUtil.mapping b/mappings/net/minecraft/entity/ProjectileUtil.mapping index 77ab40a29f..ff65ba0cec 100644 --- a/mappings/net/minecraft/entity/ProjectileUtil.mapping +++ b/mappings/net/minecraft/entity/ProjectileUtil.mapping @@ -1,5 +1,23 @@ CLASS awd net/minecraft/entity/ProjectileUtil + METHOD a getEntityAndRidingEntity (Lahz;)Ljava/util/Set; + ARG 0 entity + METHOD a getCollision (Lahz;Lcrd;Ljava/util/function/Predicate;Lbgk$a;Z)Lcrg; + ARG 0 entity + ARG 1 box + ARG 2 entityCollisionPredicate + ARG 3 shapeType + METHOD a rayTrace (Lahz;Lcri;Lcri;Lcrd;Ljava/util/function/Predicate;D)Lcrf; + METHOD a getCollision (Lahz;ZZLahz;Lbgk$a;)Lcrg; + ARG 0 entity + ARG 4 shapeType + METHOD a getCollision (Lahz;ZZLahz;Lbgk$a;ZLjava/util/function/Predicate;Lcrd;)Lcrg; + ARG 0 entity + ARG 4 shapeType + ARG 6 entityCollisionPredicate + ARG 7 boz METHOD a getHandPossiblyHolding (Laii;Lbbl;)Lagt; ARG 0 entity ARG 1 item METHOD a createArrowProjectile (Laii;Lbbq;F)Lavr; + METHOD a getEntityCollision (Lbgw;Lahz;Lcri;Lcri;Lcrd;Ljava/util/function/Predicate;)Lcrf; + METHOD a getEntityCollision (Lbgw;Lahz;Lcri;Lcri;Lcrd;Ljava/util/function/Predicate;D)Lcrf; diff --git a/mappings/net/minecraft/entity/ai/control/LookControl.mapping b/mappings/net/minecraft/entity/ai/control/LookControl.mapping index d27a141111..d66bb7ff9b 100644 --- a/mappings/net/minecraft/entity/ai/control/LookControl.mapping +++ b/mappings/net/minecraft/entity/ai/control/LookControl.mapping @@ -1,5 +1,7 @@ CLASS alq net/minecraft/entity/ai/control/LookControl FIELD a entity Laij; + FIELD b yawSpeed F + FIELD c pitchSpeed F FIELD d active Z FIELD e lookX D FIELD f lookY D @@ -8,8 +10,20 @@ CLASS alq net/minecraft/entity/ai/control/LookControl METHOD a lookAt (DDDFF)V ARG 1 x ARG 3 y + ARG 5 z + ARG 7 yawSpeed + ARG 8 pitchSpeed + METHOD a changeAngle (FFF)F + ARG 1 from + ARG 2 to + ARG 3 max METHOD a lookAt (Lahz;FF)V + ARG 1 entity + ARG 2 yawSpeed + ARG 3 pitchSpeed METHOD b isActive ()Z METHOD c getLookX ()D METHOD d getLookY ()D METHOD e getLookZ ()D + METHOD f getTargetPitch ()F + METHOD g getTargetYaw ()F diff --git a/mappings/net/minecraft/entity/ai/control/MoveControl.mapping b/mappings/net/minecraft/entity/ai/control/MoveControl.mapping index 6a8a9a9ca6..2eb2784f7a 100644 --- a/mappings/net/minecraft/entity/ai/control/MoveControl.mapping +++ b/mappings/net/minecraft/entity/ai/control/MoveControl.mapping @@ -14,6 +14,10 @@ CLASS alr net/minecraft/entity/ai/control/MoveControl ARG 3 y ARG 5 z ARG 7 speed + METHOD a changeAngle (FFF)F + ARG 1 from + ARG 2 to + ARG 3 max METHOD b isMoving ()Z METHOD c getSpeed ()D METHOD d getTargetX ()D diff --git a/mappings/net/minecraft/entity/damage/DamageSource.mapping b/mappings/net/minecraft/entity/damage/DamageSource.mapping index f82d3574e2..38d74eafb2 100644 --- a/mappings/net/minecraft/entity/damage/DamageSource.mapping +++ b/mappings/net/minecraft/entity/damage/DamageSource.mapping @@ -65,7 +65,7 @@ CLASS ahi net/minecraft/entity/damage/DamageSource METHOD c getDeathMessage (Laii;)Ljm; METHOD d isExplosive ()Z METHOD e setExplosive ()Lahi; - METHOD f doesBypassArmor ()Z + METHOD f bypassesArmor ()Z METHOD g getExhaustion ()F METHOD h doesDamageToCreative ()Z METHOD i isUnblockable ()Z diff --git a/mappings/net/minecraft/entity/effect/StatusEffect.mapping b/mappings/net/minecraft/entity/effect/StatusEffect.mapping index a9146b6124..b3f74f5a47 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffect.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffect.mapping @@ -1,5 +1,6 @@ CLASS ahr net/minecraft/entity/effect/StatusEffect FIELD a attributes Ljava/util/Map; + FIELD b type Lahs; FIELD c color I FIELD d translationKey Ljava/lang/String; METHOD a isInstant ()Z @@ -17,4 +18,5 @@ CLASS ahr net/minecraft/entity/effect/StatusEffect METHOD a applyUpdateEffect (Laii;I)V ARG 1 entity METHOD c getTranslationKey ()Ljava/lang/String; + METHOD e getType ()Lahs; METHOD f getColor ()I diff --git a/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping b/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping index 498b722ce6..48fde00973 100644 --- a/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping @@ -1 +1,2 @@ CLASS ato net/minecraft/entity/mob/ElderGuardianEntity + METHOD dT straightenTail ()V diff --git a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping index 68def0e1d0..4a0513c371 100644 --- a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping @@ -19,6 +19,7 @@ CLASS atp net/minecraft/entity/mob/EndermanEntity CLASS atp$d PickUpBlockGoal FIELD a owner Latp; FIELD bA PLAYER_ENDERMITE_PREDICATE Ljava/util/function/Predicate; + FIELD bB lastAngrySoundAge I FIELD bC ageWhenTargetSet I FIELD bz ANGRY Lqg; FIELD d CARRIED_BLOCK Lqg; @@ -33,3 +34,4 @@ CLASS atp net/minecraft/entity/mob/EndermanEntity ARG 1 x ARG 3 y ARG 5 z + METHOD l playAngrySound ()V diff --git a/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping b/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping index 4c04343520..79533a428f 100644 --- a/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping @@ -1,5 +1,7 @@ CLASS avv net/minecraft/entity/mob/EvokerFangsEntity FIELD b warmup I + FIELD d ticksLeft I + FIELD e hasAttacked Z FIELD f owner Laii; FIELD g ownerUuid Ljava/util/UUID; METHOD (Lbgw;DDDFILaii;)V @@ -7,5 +9,9 @@ CLASS avv net/minecraft/entity/mob/EvokerFangsEntity ARG 2 x ARG 4 y ARG 6 z + METHOD a getAnimationProgress (F)F + ARG 1 tickDelta METHOD a setOwner (Laii;)V + METHOD c damage (Laii;)V + ARG 1 target METHOD f getOwner ()Laii; diff --git a/mappings/net/minecraft/entity/mob/HostileEntity.mapping b/mappings/net/minecraft/entity/mob/HostileEntity.mapping index f226f42db9..64cacaf739 100644 --- a/mappings/net/minecraft/entity/mob/HostileEntity.mapping +++ b/mappings/net/minecraft/entity/mob/HostileEntity.mapping @@ -3,3 +3,5 @@ CLASS atz net/minecraft/entity/mob/HostileEntity ARG 1 type METHOD I_ checkLightLevelForSpawn ()Z METHOD dZ updateDespawnCounter ()V + METHOD e isAngryAt (Lavn;)Z + ARG 1 player diff --git a/mappings/net/minecraft/entity/mob/IllagerEntity.mapping b/mappings/net/minecraft/entity/mob/IllagerEntity.mapping index 8cd1448a8f..fd33df581a 100644 --- a/mappings/net/minecraft/entity/mob/IllagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/IllagerEntity.mapping @@ -1,5 +1,6 @@ CLASS ath net/minecraft/entity/mob/IllagerEntity CLASS ath$a State + CLASS net/minecraft/entity/mob/IllagerEntity$b DoorInteractGoal METHOD (Laid;Lbgw;)V ARG 1 type METHOD l getState ()Lath$a; diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 2c46ef7091..969ebb8fe9 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -28,12 +28,15 @@ CLASS aij net/minecraft/entity/mob/MobEntity ARG 1 type METHOD A getMinAmbientSoundDelay ()I METHOD B playAmbientSound ()V + METHOD D playSpawnEffects ()V METHOD F getAmbientSound ()Lyh; METHOD G getLootTableId ()Lqr; METHOD H cannotDespawn ()Z METHOD I checkDespawn ()V METHOD J sendAiDebugData ()V METHOD K mobTick ()V + METHOD L getLookPitchSpeed ()I + METHOD M getLookYawSpeed ()I METHOD a changeAngle (FFF)F ARG 1 oldAngle ARG 2 newAngle @@ -48,7 +51,7 @@ CLASS aij net/minecraft/entity/mob/MobEntity METHOD a getEquipmentForSlot (Laie;I)Lbbl; ARG 0 equipmentSlot ARG 1 equipmentLevel - METHOD a pickUp (Late;)V + METHOD a loot (Late;)V ARG 1 item METHOD a canBeLeashedBy (Lavn;)Z METHOD a interactMob (Lavn;Lagt;)Z @@ -61,6 +64,8 @@ CLASS aij net/minecraft/entity/mob/MobEntity METHOD a prepareEntityData (Lbgx;Lags;Lail;Laiu;Lib;)Laiu; ARG 3 difficulty METHOD a canSpawn (Lbgx;Lail;)Z + METHOD a canSpawn (Lbgz;)Z + ARG 1 world METHOD a getPathNodeTypeWeight (Lcmp;)F METHOD a setPathNodeTypeWeight (Lcmp;F)V ARG 1 type @@ -72,6 +77,9 @@ CLASS aij net/minecraft/entity/mob/MobEntity ARG 1 difficulty METHOD b attachLeash (Lahz;Z)V ARG 1 entity + METHOD b canEquipmentSlotContain (Laie;Lbbq;)Z + ARG 0 slot + ARG 1 item METHOD b createNavigation (Lbgw;)Laox; METHOD c canImmediatelyDespawn (D)Z ARG 1 distanceSquared @@ -111,7 +119,13 @@ CLASS aij net/minecraft/entity/mob/MobEntity METHOD q setAttacking (Z)V ARG 1 attacking METHOD r getMoveControl ()Lalr; + METHOD r setForwardSpeed (F)V + ARG 1 forwardSpeed METHOD s getJumpControl ()Lalp; + METHOD s setUpwardSpeed (F)V + ARG 1 upwardSpeed + METHOD t setSidewaysSpeed (F)V + ARG 1 sidewaysMovement METHOD u getNavigation ()Laox; METHOD v getVisibilityCache ()Lapj; METHOD w getTarget ()Laii; diff --git a/mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping b/mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping index 4b0e335d03..e8a001eeea 100644 --- a/mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping @@ -3,4 +3,7 @@ CLASS aip net/minecraft/entity/mob/MobEntityWithAi ARG 1 type METHOD a getPathfindingFavor (Lev;Lbgz;)F METHOD dQ isNavigating ()Z + METHOD dR getRunFromLeashSpeed ()D METHOD f getPathfindingFavor (Lev;)F + METHOD u updateForLeashLength (F)V + ARG 1 leashLength diff --git a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping index c174fe81cd..ace99c2e66 100644 --- a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping @@ -1,13 +1,37 @@ CLASS auk net/minecraft/entity/mob/SlimeEntity CLASS auk$d SlimeMoveControl + FIELD i targetYaw F + FIELD j ticksUntilJump I FIELD k slime Lauk; + FIELD l jumpOften Z + METHOD a move (D)V + ARG 1 speed + METHOD a look (FZ)V + ARG 1 targetYaw + ARG 2 jumpOften + CLASS net/minecraft/entity/mob/SlimeEntity$a LookGoal + FIELD a owner Lauk; + CLASS net/minecraft/entity/mob/SlimeEntity$b SwimGoal + FIELD a owner Lauk; + CLASS net/minecraft/entity/mob/SlimeEntity$c MoveGoal + FIELD a owner Lauk; FIELD bA onGroundLastTick Z - FIELD b sizeX F + FIELD b targetStretch F FIELD bz SLIME_SIZE Lqg; - FIELD c sizeY F - FIELD d sizeZ F + FIELD c stretch F + FIELD d lastStretch F + METHOD a setSize (IZ)V + ARG 1 size + ARG 2 heal + METHOD dQ getTicksUntilNextJump ()I + METHOD dR updateStretch ()V + METHOD dS isBig ()Z + METHOD dT getDamageAmount ()I METHOD dU getSquishSound ()Lyh; METHOD dV getJumpSound ()Lyh; METHOD dW getSize ()I METHOD dX isSmall ()Z + METHOD dY makesJumpSound ()Z + METHOD h damage (Laii;)V + ARG 1 target METHOD l getParticles ()Lgd; diff --git a/mappings/net/minecraft/entity/mob/VexEntity.mapping b/mappings/net/minecraft/entity/mob/VexEntity.mapping index 73146f00ba..f80c9a7792 100644 --- a/mappings/net/minecraft/entity/mob/VexEntity.mapping +++ b/mappings/net/minecraft/entity/mob/VexEntity.mapping @@ -5,13 +5,13 @@ CLASS auo net/minecraft/entity/mob/VexEntity CLASS auo$c VexMoveControl CLASS auo$d LookAtTargetGoal FIELD bA lifeTicks I - FIELD b FLAGS Lqg; + FIELD b VEX_FLAGS Lqg; FIELD bz alive Z FIELD c owner Laij; FIELD d bounds Lev; METHOD a setLifeTicks (I)V ARG 1 lifeTicks - METHOD a setFlags (IZ)V + METHOD a setVexFlag (IZ)V ARG 1 mask ARG 2 value METHOD a setOwner (Laij;)V diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index b805a422cf..0efb46db8e 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -1,5 +1,7 @@ CLASS aus net/minecraft/entity/mob/ZombieEntity CLASS aus$a DestroyEggGoal + CLASS net/minecraft/entity/mob/ZombieEntity$b ZombieEntityData + FIELD a isChild Z FIELD bB CONVERTING_IN_WATER Lqg; FIELD bD breakDoorsGoal Lalw; FIELD bE canBreakDoors Z diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index 4463d83a83..cf3d28b122 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -48,7 +48,7 @@ CLASS aqo net/minecraft/entity/passive/FoxEntity METHOD a byName (Ljava/lang/String;)Laqo$u; METHOD b getBiomes ()Ljava/util/List; METHOD c getId ()I - FIELD bA FLAGS Lqg; + FIELD bA FOX_FLAGS Lqg; FIELD bB OWNER Lqg; FIELD bD OTHER_TRUSTED Lqg; FIELD bE PICKABLE_DROP_FILTER Ljava/util/function/Predicate; @@ -68,7 +68,9 @@ CLASS aqo net/minecraft/entity/passive/FoxEntity METHOD a canJumpChase (Laqo;Laii;)Z METHOD b addTrustedUuid (Ljava/util/UUID;)V METHOD c canTrust (Ljava/util/UUID;)Z - METHOD d setFlag (IZ)V + METHOD d setFoxFlag (IZ)V + ARG 1 mask + ARG 2 value METHOD dS getFoxType ()Laqo$u; METHOD dT isSitting ()Z METHOD dU isWalking ()Z @@ -84,7 +86,7 @@ CLASS aqo net/minecraft/entity/passive/FoxEntity METHOD el wantsToPickupItem ()Z METHOD k spit (Lbbq;)V METHOD l dropItem (Lbbq;)V - METHOD r getFlag (I)Z + METHOD r getFoxFlag (I)Z METHOD r setSitting (Z)V METHOD s setChasing (Z)V METHOD t setCrouching (Z)V diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index 8414aaf705..8844f1e648 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -31,11 +31,13 @@ CLASS aqs net/minecraft/entity/passive/PandaEntity CLASS aqs$j ExtinguishFireGoal FIELD bE MAIN_GENE Lqg; FIELD bF HIDDEN_GENE Lqg; - FIELD bG FLAGS Lqg; + FIELD bG PANDA_FLAGS Lqg; METHOD a setMainGene (Laqs$a;)V METHOD a initGenes (Laqs;Laqs;)V METHOD b setHiddenGene (Laqs$a;)V - METHOD d setFlag (IZ)V + METHOD d setPandaFlag (IZ)V + ARG 1 mask + ARG 2 value METHOD ec getMainGene ()Laqs$a; METHOD ed getHiddenGene ()Laqs$a; METHOD ef getProductGene ()Laqs$a; @@ -46,4 +48,4 @@ CLASS aqs net/minecraft/entity/passive/PandaEntity METHOD em resetAttributes ()V METHOD ew sneeze ()V METHOD ex getRandomGene ()Laqs$a; - METHOD u hasFlag (I)Z + METHOD u hasPandaFlag (I)Z diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 161a7a1b15..3b7ee6b8fb 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -1,10 +1,12 @@ CLASS avn net/minecraft/entity/player/PlayerEntity - CLASS avn$a SleepResult + CLASS avn$a SleepFailureReason FIELD a INVALID_WORLD Lavn$a; FIELD b WRONG_TIME Lavn$a; FIELD c TOO_FAR_AWAY Lavn$a; FIELD e INVALID_ATTEMPT Lavn$a; FIELD f NOT_SAFE Lavn$a; + FIELD g text Ljm; + METHOD a getText ()Ljm; FIELD bA container Laxr; FIELD bB hungerManager Laxn; FIELD b SIZES Ljava/util/Map; @@ -65,21 +67,31 @@ CLASS avn net/minecraft/entity/player/PlayerEntity ARG 1 recipes METHOD a addChatMessage (Ljm;Z)V ARG 1 message - METHOD a increaseStat (Lqr;)V + METHOD a incrementStat (Lqr;)V + ARG 1 stat + METHOD a increaseStat (Lqr;I)V + ARG 1 stat + ARG 2 amount METHOD a playSound (Lyh;Lyj;FF)V METHOD a resetStat (Lyo;)V - METHOD a incrementStat (Lyo;I)V ARG 1 stat + METHOD a increaseStat (Lyo;I)V + ARG 1 stat + ARG 2 amount METHOD a wakeUp (ZZZ)V METHOD a unlockRecipes ([Lqr;)V ARG 1 ids METHOD b addEnchantedHitParticles (Lahz;)V METHOD b getBlockBreakingSpeed (Lbuy;)F + METHOD b isBedObstructed (Lev;Lfa;)Z + ARG 1 pos + ARG 2 direction METHOD b setPlayerSpawn (Lev;Z)V ARG 1 pos METHOD b lockRecipes (Ljava/util/Collection;)I ARG 1 recipes METHOD b incrementStat (Lyo;)V + ARG 1 stat METHOD c collideWithEntity (Lahz;)V METHOD c isUsingEffectiveTool (Lbuy;)Z METHOD c getOfflinePlayerUuid (Ljava/lang/String;)Ljava/util/UUID; @@ -109,6 +121,8 @@ CLASS avn net/minecraft/entity/player/PlayerEntity METHOD dz updateSize ()V METHOD ea isCreativeLevelTwoOp ()Z METHOD f attack (Lahz;)V + METHOD f doesNotSuffocate (Lev;)Z + ARG 1 pos METHOD g createCooldownManager ()Lbbm; METHOD g giveItemStack (Lbbq;)Z ARG 1 stack @@ -117,9 +131,12 @@ CLASS avn net/minecraft/entity/player/PlayerEntity METHOD j updateShoulderEntity (Lib;)V METHOD l updateTurtleHelmet ()V METHOD n dropSelectedItem (Z)Late; + METHOD o disableShield (Z)V + ARG 1 sprinting METHOD p canConsume (Z)Z METHOD q setScore (I)V METHOD q setReducedDebugInfo (Z)V + METHOD r sendAbilitiesUpdate ()V METHOD r addExhaustion (F)V METHOD r addScore (I)V METHOD t_ closeGui ()V diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index b71f83b1ec..4fc40d4d3b 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -7,6 +7,8 @@ CLASS avm net/minecraft/entity/player/PlayerInventory FIELD f combinedInventory Ljava/util/List; FIELD g cursorStack Lbbq; FIELD h changeCount I + METHOD a damageArmor (F)V + ARG 1 armor METHOD a clone (Lavm;)V METHOD a populateRecipeFinder (Lavp;)V METHOD a addPickBlock (Lbbq;)V diff --git a/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping index 941012446d..f2d5040c96 100644 --- a/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping @@ -4,6 +4,7 @@ CLASS avs net/minecraft/entity/projectile/ExplosiveProjectileEntity FIELD d posY D FIELD e posZ D FIELD f life I + FIELD g ticks I METHOD (Laid;DDDDDDLbgw;)V ARG 1 world METHOD (Laid;Laii;DDDLbgw;)V diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index 6b006eedc3..b36daa3355 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -4,7 +4,7 @@ CLASS avr net/minecraft/entity/projectile/ProjectileEntity FIELD b PICKUP Lavr$a; FIELD c CREATIVE_PICKUP Lavr$a; METHOD a fromOrdinal (I)Lavr$a; - FIELD ap FLAGS Lqg; + FIELD ap PROJECTILE_FLAGS Lqg; FIELD aq PIERCE_LEVEL Lqg; FIELD ar inBlockState Lbuy; FIELD as life I @@ -19,16 +19,16 @@ CLASS avr net/minecraft/entity/projectile/ProjectileEntity FIELD g ownerUuid Ljava/util/UUID; METHOD (Laid;Lbgw;)V ARG 1 type - METHOD a setFlag (IZ)V + METHOD a setProjectileFlag (IZ)V ARG 1 index METHOD a setOwner (Lahz;)V METHOD a onHit (Laii;)V METHOD a onEntityHit (Lcrf;)V METHOD a onHit (Lcrg;)V - METHOD a tryHitEntity (Lcri;Lcri;)Lcrf; + METHOD a getEntityCollision (Lcri;Lcri;)Lcrf; METHOD a setSound (Lyh;)V METHOD a setCritical (Z)V - METHOD b setFlagByte (B)V + METHOD b setPierceLevel (B)V METHOD c setDamage (D)V METHOD i age ()V METHOD k getSound ()Lyh; diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 1002923cdd..c05566a489 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -70,6 +70,7 @@ CLASS bbq net/minecraft/item/ItemStack METHOD a fromTag (Lib;)Lbbq; ARG 0 tag METHOD a getOrCreateSubCompoundTag (Ljava/lang/String;)Lib; + ARG 1 key METHOD a addAttributeModifier (Ljava/lang/String;Laja;Laie;)V ARG 1 attributeName ARG 2 modifier @@ -86,6 +87,7 @@ CLASS bbq net/minecraft/item/ItemStack METHOD b isEffectiveOn (Lbuy;)Z METHOD b toTag (Lib;)Lib; METHOD b getSubCompoundTag (Ljava/lang/String;)Lib; + ARG 1 key METHOD b getCustomCanPlace (Lzb;Lbvc;)Z METHOD c getMaxAmount ()I METHOD c setRepairCost (I)V @@ -95,6 +97,7 @@ CLASS bbq net/minecraft/item/ItemStack ARG 1 b METHOD c setTag (Lib;)V METHOD c removeSubTag (Ljava/lang/String;)V + ARG 1 key METHOD d canStack ()Z METHOD d setUpdateCooldown (I)V METHOD d areEqualIgnoreDurability (Lbbq;Lbbq;)Z diff --git a/mappings/net/minecraft/village/PointOfInterestStorage.mapping b/mappings/net/minecraft/village/PointOfInterestStorage.mapping index 1a49ed671b..d35fe5eef1 100644 --- a/mappings/net/minecraft/village/PointOfInterestStorage.mapping +++ b/mappings/net/minecraft/village/PointOfInterestStorage.mapping @@ -27,6 +27,11 @@ CLASS apw net/minecraft/village/PointOfInterestStorage ARG 1 typePredicate ARG 2 pos ARG 3 occupationStatus + METHOD a count (Ljava/util/function/Predicate;Lev;ILapw$b;)J + ARG 1 typePredicate + ARG 2 pos + ARG 3 radius + ARG 4 occupationStatus METHOD a getPosition (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lapw$b;Lev;ILjava/util/Random;)Ljava/util/Optional; ARG 1 typePredicate ARG 2 positionPredicate @@ -50,6 +55,7 @@ CLASS apw net/minecraft/village/PointOfInterestStorage METHOD b get (Ljava/util/function/Predicate;Lev;ILapw$b;)Ljava/util/stream/Stream; ARG 1 typePredicate ARG 2 pos + ARG 3 radius ARG 4 occupationStatus METHOD b getNearestPosition (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lev;I)Ljava/util/Optional; ARG 1 typePredicate diff --git a/mappings/net/minecraft/world/EntityView.mapping b/mappings/net/minecraft/world/EntityView.mapping index 5e204a29c5..58cd7dabe9 100644 --- a/mappings/net/minecraft/world/EntityView.mapping +++ b/mappings/net/minecraft/world/EntityView.mapping @@ -29,7 +29,8 @@ CLASS bgo net/minecraft/world/EntityView ARG 2 box METHOD a getEntities (Lahz;Lcrd;Ljava/util/function/Predicate;)Ljava/util/List; ARG 1 except - ARG 2 boundingBox + ARG 2 box + ARG 3 predicate METHOD a intersectsEntities (Lahz;Lcsc;)Z ARG 1 except ARG 2 shape @@ -52,14 +53,18 @@ CLASS bgo net/minecraft/world/EntityView ARG 4 x ARG 6 y ARG 8 z - METHOD a getEntitiesInBox (Ljava/lang/Class;Lapp;Laii;Lcrd;)Ljava/util/List; + METHOD a getTargets (Ljava/lang/Class;Lapp;Laii;Lcrd;)Ljava/util/List; ARG 1 entityClass - METHOD a getEntitiesInBox (Ljava/lang/Class;Lcrd;)Ljava/util/List; + ARG 2 targetPredicate + ARG 3 targettingEntity + ARG 4 box + METHOD a getEntities (Ljava/lang/Class;Lcrd;)Ljava/util/List; ARG 1 entityClass - ARG 2 boundingBox - METHOD a getEntitiesInBox (Ljava/lang/Class;Lcrd;Ljava/util/function/Predicate;)Ljava/util/List; - ARG 1 except - ARG 2 boundingBox + ARG 2 box + METHOD a getEntities (Ljava/lang/Class;Lcrd;Ljava/util/function/Predicate;)Ljava/util/List; + ARG 1 entityClass + ARG 2 box + ARG 3 predicate METHOD a getClosestEntity (Ljava/util/List;Lapp;Laii;DDD)Laii; ARG 1 entityList ARG 4 x diff --git a/mappings/net/minecraft/world/ViewableWorld.mapping b/mappings/net/minecraft/world/ViewableWorld.mapping index 5b8fe645b1..d4879f6445 100644 --- a/mappings/net/minecraft/world/ViewableWorld.mapping +++ b/mappings/net/minecraft/world/ViewableWorld.mapping @@ -20,7 +20,7 @@ CLASS bgz net/minecraft/world/ViewableWorld METHOD a doesNotCollide (Lahz;Lcrd;Ljava/util/Set;)Z ARG 1 entity ARG 2 entityBoundingBox - ARG 3 other + ARG 3 otherEntities METHOD a intersectsEntities (Lahz;Lcsc;)Z ARG 1 except ARG 2 shape diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 07bee92875..18b5520426 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -69,7 +69,9 @@ CLASS bgw net/minecraft/world/World ARG 3 z METHOD a setBlockBreakingProgress (ILev;I)V METHOD a setTime (J)V - METHOD a setEntityStatus (Lahz;B)V + METHOD a sendEntityStatus (Lahz;B)V + ARG 1 entity + ARG 2 status METHOD a createExplosion (Lahz;DDDFLbgp$a;)Lbgp; ARG 1 entity ARG 2 x diff --git a/mappings/net/minecraft/world/chunk/ChunkPos.mapping b/mappings/net/minecraft/world/chunk/ChunkPos.mapping index 6902096312..2a13c8a7ea 100644 --- a/mappings/net/minecraft/world/chunk/ChunkPos.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkPos.mapping @@ -23,6 +23,8 @@ CLASS bgj net/minecraft/world/chunk/ChunkPos METHOD a getPackedX (J)I ARG 0 pos METHOD a streamPositions (Lbgj;I)Ljava/util/stream/Stream; + ARG 0 pos + ARG 1 radius METHOD a streamPositions (Lbgj;Lbgj;)Ljava/util/stream/Stream; METHOD b getPackedZ (J)I ARG 0 pos diff --git a/mappings/net/minecraft/world/gen/CatSpawner.mapping b/mappings/net/minecraft/world/gen/CatSpawner.mapping new file mode 100644 index 0000000000..2135368161 --- /dev/null +++ b/mappings/net/minecraft/world/gen/CatSpawner.mapping @@ -0,0 +1,14 @@ +CLASS auw net/minecraft/world/gen/CatSpawner + FIELD a ticksUntilNextSpawn I + METHOD a spawnInSwampHut (Lbgw;Lev;)I + ARG 1 world + ARG 2 pos + METHOD a spawn (Lbgw;ZZ)I + ARG 2 spawnMonsters + ARG 3 spawnAnimals + METHOD a spawn (Lev;Lbgw;)I + ARG 1 pos + ARG 2 world + METHOD a spawnInHouse (Lve;Lev;)I + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping index 441788e00d..dcf626e872 100644 --- a/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping @@ -2,6 +2,7 @@ CLASS byd net/minecraft/world/gen/chunk/FlatChunkGenerator CLASS byd$a FlatChunkGeneratorBiome FIELD e biome Lbht; FIELD f phantomSpawner Lbym; + FIELD g catSpawner Lauw; METHOD (Lbgx;Lbhv;Lcez;)V ARG 1 world ARG 3 config From fca78f74f4cfce5765071498546bf2b0f6d69c27 Mon Sep 17 00:00:00 2001 From: Runemoro Date: Thu, 4 Apr 2019 18:04:19 -0400 Subject: [PATCH 2/2] More mappings --- .../entity/LivingEntityRenderer.mapping | 35 ++++++++++++++----- .../entity/feature/FeatureRenderer.mapping | 1 + .../render/entity/model/EntityModel.mapping | 27 ++++++++------ .../entity/model/WolfEntityModel.mapping | 1 + mappings/net/minecraft/entity/Entity.mapping | 1 + .../net/minecraft/entity/LivingEntity.mapping | 9 +++-- .../entity/effect/StatusEffect.mapping | 8 ++++- .../passive/AbstractDonkeyEntity.mapping | 1 + .../passive/AbstractTraderEntity.mapping | 6 +++- .../entity/passive/AnimalEntity.mapping | 3 ++ .../entity/passive/DolphinEntity.mapping | 2 ++ .../entity/passive/HorseBaseEntity.mapping | 21 +++++++++++ .../entity/passive/LlamaEntity.mapping | 9 +++++ .../entity/passive/OcelotEntity.mapping | 2 ++ .../entity/passive/ParrotBaseEntity.mapping | 2 ++ .../entity/passive/ParrotEntity.mapping | 5 +++ .../entity/passive/PassiveEntity.mapping | 4 +++ .../entity/passive/PufferfishEntity.mapping | 8 +++++ .../entity/passive/RabbitEntity.mapping | 1 + .../entity/passive/VillagerEntity.mapping | 1 + .../entity/passive/WolfEntity.mapping | 9 +++++ .../entity/player/PlayerEntity.mapping | 1 + .../projectile/AbstractFireballEntity.mapping | 3 +- .../ExplosiveProjectileEntity.mapping | 1 + .../entity/projectile/LlamaSpitEntity.mapping | 2 ++ .../entity/thrown/SnowballEntity.mapping | 1 + .../entity/thrown/ThrownEntity.mapping | 8 +++-- .../entity/thrown/ThrownItemEntity.mapping | 10 ++++++ .../entity/thrown/ThrownPotionEntity.mapping | 2 ++ mappings/net/minecraft/village/Trader.mapping | 2 +- 30 files changed, 159 insertions(+), 27 deletions(-) diff --git a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping index d99d8c5c36..ec0806a3ee 100644 --- a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping @@ -5,6 +5,9 @@ CLASS dpo net/minecraft/client/render/entity/LivingEntityRenderer FIELD h features Ljava/util/List; FIELD i disableOutlineRender Z FIELD j colorOverlayTexture Ldtg; + METHOD a scale (Laii;F)V + ARG 1 entity + ARG 2 tickDelta METHOD a getOverlayColor (Laii;FF)I METHOD a setupTransforms (Laii;FFF)V ARG 1 entity @@ -13,22 +16,38 @@ CLASS dpo net/minecraft/client/render/entity/LivingEntityRenderer ARG 4 delta METHOD a render (Laii;FFFFFF)V ARG 1 entity - ARG 2 limbMoveAngle - ARG 3 limbMoveAmount + ARG 2 limbAngle + ARG 3 limbDistance + ARG 4 age ARG 5 headYaw ARG 6 headPitch + ARG 7 scale METHOD a renderFeatures (Laii;FFFFFFF)V ARG 1 entity - ARG 4 delta - METHOD a tryApplyOverlayColor (Laii;FZ)Z + ARG 2 limbAngle + ARG 3 limbDistance + ARG 4 tickDelta + ARG 5 age + ARG 6 headYaw + ARG 7 headPitch + ARG 8 scale + METHOD a applyOverlayColor (Laii;FZ)Z ARG 1 entity - ARG 2 delta + ARG 2 tickDelta + ARG 3 hasHurtOverlay METHOD a addFeature (Ldsn;)Z METHOD b getLyingAngle (Laii;)F - METHOD c renderLeftArmOverlay (Laii;)Z - METHOD c (Laii;F)F + METHOD b getAge (Laii;F)F ARG 1 entity + ARG 2 tickDelta + METHOD c renderLeftArmOverlay (Laii;)Z + METHOD c scaleAndTranslate (Laii;F)F + ARG 1 entity + ARG 2 tickDelta METHOD d beforeOutlineRender (Laii;)Z - METHOD d tryApplyOverlayColor (Laii;F)Z + METHOD d applyOverlayColor (Laii;F)Z METHOD e afterOutlineRender ()V + METHOD e getHandSwingProgress (Laii;F)F + ARG 1 entity + ARG 2 tickDelta METHOD f disableOverlayColor ()V diff --git a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping index 196fe3a5d2..cea7feb606 100644 --- a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping @@ -2,6 +2,7 @@ CLASS dsn net/minecraft/client/render/entity/feature/FeatureRenderer FIELD a context Ldqg; METHOD (Ldqg;)V ARG 1 context + METHOD a hasHurtOverlay ()Z METHOD a applyLightmapCoordinates (Lahz;)V METHOD a render (Lahz;FFFFFFF)V ARG 1 entity diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping index 49c6acad8f..2fccaa7f9c 100644 --- a/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping @@ -1,21 +1,26 @@ CLASS ddx net/minecraft/client/render/entity/model/EntityModel - FIELD c swingProgress F + FIELD c handSwingProgress F FIELD d isRiding Z FIELD e isChild Z METHOD a animateModel (Lahz;FFF)V - ARG 2 swingAmount - ARG 3 swingDelta + ARG 1 entity + ARG 2 limbAngle + ARG 3 limbDistance ARG 4 tickDelta METHOD a setAngles (Lahz;FFFFFF)V - ARG 2 limbMoveAngle - ARG 3 limbMoveAmount - ARG 4 age - ARG 5 headYaw - ARG 6 headPitch - METHOD b render (Lahz;FFFFFF)V ARG 1 entity - ARG 2 limbMoveAngle - ARG 3 limbMoveAmount + ARG 2 limbAngle + ARG 3 limbDistance + ARG 4 age + ARG 5 headYaw + ARG 6 headPitch + ARG 7 scale + METHOD a copyStateTo (Lddx;)V + ARG 1 copy + METHOD b render (Lahz;FFFFFF)V + ARG 1 entity + ARG 2 limbAngle + ARG 3 limbDistance ARG 4 age ARG 5 headYaw ARG 6 headPitch diff --git a/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping index af17c4ccf8..a3d8101d35 100644 --- a/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping @@ -1 +1,2 @@ CLASS dgc net/minecraft/client/render/entity/model/WolfEntityModel + FIELD a head Ldgl; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 0e2738615c..e533d7cd71 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -220,6 +220,7 @@ CLASS ahz net/minecraft/entity/Entity METHOD ak checkBlockCollision ()V METHOD am isSilent ()Z METHOD an isUnaffectedByGravity ()Z + METHOD ao canClimb ()Z METHOD aq isFireImmune ()Z METHOD ar isInsideWater ()Z METHOD as isInsideWaterOrRain ()Z diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index bb5cd3a8d7..272d8d7385 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -1,5 +1,8 @@ CLASS aii net/minecraft/entity/LivingEntity FIELD aA handSwingProgress F + FIELD aC lastLimbDistance F + FIELD aD limbDistance F + FIELD aE limbAngle F FIELD aM headYaw F FIELD aN prevHeadYaw F FIELD aP attackingPlayer Lavn; @@ -13,7 +16,7 @@ CLASS aii net/minecraft/entity/LivingEntity FIELD at handSwingTicks I FIELD au stuckArrowTimer I FIELD av hurtTime I - FIELD ay deathCounter I + FIELD ay deathTime I FIELD az lastHandSwingProgress F FIELD bA lastAttackedTime I FIELD bB attacking Laii; @@ -225,7 +228,9 @@ CLASS aii net/minecraft/entity/LivingEntity ARG 1 movementSpeed METHOD o setStuckArrows (I)V METHOD p isSleepingInBed ()Z + METHOD p getHandSwingProgress (F)F + ARG 1 tickDelta METHOD q setAbsorptionAmount (F)V METHOD v_ isChild ()Z - METHOD w_ canClimb ()Z + METHOD w_ isClimbing ()Z METHOD z onAttacking (Lahz;)V diff --git a/mappings/net/minecraft/entity/effect/StatusEffect.mapping b/mappings/net/minecraft/entity/effect/StatusEffect.mapping index b3f74f5a47..884f611bc7 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffect.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffect.mapping @@ -1,5 +1,5 @@ CLASS ahr net/minecraft/entity/effect/StatusEffect - FIELD a attributes Ljava/util/Map; + FIELD a attributeModifiers Ljava/util/Map; FIELD b type Lahs; FIELD c color I FIELD d translationKey Ljava/lang/String; @@ -17,6 +17,12 @@ CLASS ahr net/minecraft/entity/effect/StatusEffect ARG 4 amplifier METHOD a applyUpdateEffect (Laii;I)V ARG 1 entity + METHOD a addAttributeModifier (Laiy;Ljava/lang/String;DLaja$a;)Lahr; + ARG 1 attribute + ARG 2 uuid + ARG 3 amount + ARG 5 operation METHOD c getTranslationKey ()Ljava/lang/String; METHOD e getType ()Lahs; METHOD f getColor ()I + METHOD g getAttributeModifiers ()Ljava/util/Map; diff --git a/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping index 8150b7042e..11ed6280bd 100644 --- a/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping @@ -3,4 +3,5 @@ CLASS arh net/minecraft/entity/passive/AbstractDonkeyEntity METHOD (Laid;Lbgw;)V ARG 1 type METHOD dS hasChest ()Z + METHOD dV playAddChestSound ()V METHOD r setHasChest (Z)V diff --git a/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping index 006d5e4f68..f4235ba435 100644 --- a/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping @@ -1,7 +1,8 @@ CLASS auv net/minecraft/entity/passive/AbstractTraderEntity FIELD bA customer Lavn; FIELD bB inventory Lagz; - FIELD bz recipes Lbgb; + FIELD bC shakeHeadTicksLeft I + FIELD bz offers Lbgb; METHOD a fillRecipesFromPool (Lbgb;[Lave$f;I)V ARG 1 recipeList ARG 2 pool @@ -10,7 +11,10 @@ CLASS auv net/minecraft/entity/passive/AbstractTraderEntity METHOD dU hasCustomer ()Z METHOD dX getYesSound ()Lyh; METHOD dY playCelebrateSound ()V + METHOD dZ shakeHeadTicksLeft ()I METHOD ea getInventory ()Lagz; METHOD ec fillRecipes ()V + METHOD r setShakeHeadTicksLeft (I)V + ARG 1 shakeHeadTicksLeft METHOD r getTradingSound (Z)Lyh; ARG 1 sold diff --git a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping index 6e9fd0029c..48bb52da43 100644 --- a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping @@ -9,9 +9,12 @@ CLASS aqh net/minecraft/entity/passive/AnimalEntity METHOD a eat (Lavn;Lbbq;)V ARG 1 player ARG 2 stack + METHOD dX canEat ()Z METHOD dY getLovingPlayer ()Lvf; METHOD dZ isInLove ()Z METHOD ea resetLoveTicks ()V + METHOD f lovePlayer (Lavn;)V + ARG 1 player METHOD i isBreedingItem (Lbbq;)Z METHOD q setLoveTicks (I)V ARG 1 loveTicks diff --git a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping index 8188f7d9df..dcd3b9f59c 100644 --- a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping +++ b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping @@ -3,4 +3,6 @@ CLASS aqm net/minecraft/entity/passive/DolphinEntity FIELD i dolphin Laqm; CLASS aqm$c FIELD a dolphinEntity Laqm; + CLASS net/minecraft/entity/passive/DolphinEntity$b + FIELD a owner Laqm; FIELD bA CLOSE_PLAYER_PREDICATE Lapp; diff --git a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping index ea103398dd..b59434144c 100644 --- a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping @@ -1,30 +1,51 @@ CLASS ari net/minecraft/entity/passive/HorseBaseEntity + FIELD bD inAir Z FIELD bE items Lagz; FIELD bF temper I + FIELD bG jumpStrength F FIELD bJ IS_BRED_HORSE Ljava/util/function/Predicate; FIELD bK PARENT_HORSE_PREDICATE Lapp; FIELD bL HORSE_FLAGS Lqg; FIELD bM OWNER_UUID Lqg; + FIELD bP angryTicks I + FIELD bQ jumping Z FIELD bz JUMP_STRENGTH Laiy; METHOD (Laid;Lbgw;)V ARG 1 type + METHOD a setChildAttributes (Lahx;Lari;)V + ARG 1 mate + ARG 2 child METHOD b setOwnerUuid (Ljava/util/UUID;)V METHOD d setHorseFlag (IZ)V ARG 1 index METHOD dT getInventorySize ()I + METHOD dU getAngrySound ()Lyh; METHOD eb initCustomGoals ()V METHOD ec isTame ()Z METHOD ed getOwnerUuid ()Ljava/util/UUID; + METHOD ee isInAir ()Z METHOD ef isEating ()Z + METHOD eg isAngry ()Z METHOD eh isBred ()Z METHOD ei getTemper ()I + METHOD ek initializeSaddle ()V METHOD en isSaddled ()Z METHOD ep walkToParent ()V + METHOD er playAngrySound ()V METHOD es playJumpSound ()V + METHOD et canBreed ()Z + METHOD eu getChildHealthBonus ()F + METHOD ev getChildJumpStrengthBonus ()D + METHOD ew getChildMovementSpeedBonus ()D + METHOD ey updateAnger ()V METHOD g putPlayerOnBack (Lavn;)V METHOD r getHorseFlag (I)Z METHOD s setTemper (I)V METHOD s setTame (Z)V + METHOD t setInAir (Z)V + ARG 1 inAir METHOD u setBred (Z)V METHOD v setSaddled (Z)V METHOD w setEating (Z)V + METHOD x setAngry (Z)V + ARG 1 angry diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index 9b3afdf299..f9da7e5655 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -1,11 +1,20 @@ CLASS arl net/minecraft/entity/passive/LlamaEntity + CLASS net/minecraft/entity/passive/LlamaEntity$b LlamaEntityData + FIELD a variant I FIELD bJ ATTR_STRENGTH Lqg; + FIELD bK CARPET_COLOR Lqg; FIELD bL ATTR_VARIANT Lqg; + METHOD a setCarpetColor (Lban;)V + ARG 1 color METHOD eA getVariant ()I + METHOD eB getCarpetColor ()Lban; METHOD eC createChild ()Larl; METHOD eF isFollowing ()Z METHOD eG getFollowing ()Larl; + METHOD eH initializeStrength ()V METHOD ey isTrader ()Z METHOD ez getStrength ()I + METHOD k getColorFromCarpet (Lbbq;)Lban; + ARG 0 color METHOD u setVariant (I)V METHOD v setStrength (I)V diff --git a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping index cda1b643f3..eb873150e0 100644 --- a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping @@ -7,6 +7,8 @@ CLASS aqr net/minecraft/entity/passive/OcelotEntity FIELD bB fleeGoal Laqr$a; FIELD bD temptGoal Laqr$b; FIELD bz TAMING_INGREDIENT Lbdv; + METHOD dS updateFleeing ()V + METHOD dT spawnKittens ()V METHOD dU isTrusting ()Z METHOD r setTrusting (Z)V ARG 1 trusting diff --git a/mappings/net/minecraft/entity/passive/ParrotBaseEntity.mapping b/mappings/net/minecraft/entity/passive/ParrotBaseEntity.mapping index 47de7a1be7..7e71b1dbda 100644 --- a/mappings/net/minecraft/entity/passive/ParrotBaseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ParrotBaseEntity.mapping @@ -1,4 +1,6 @@ CLASS ara net/minecraft/entity/passive/ParrotBaseEntity + FIELD bD ticks I METHOD (Laid;Lbgw;)V ARG 1 type METHOD d mountOnto (Lvf;)Z + METHOD ee isReadyToSitOnPlayer ()Z diff --git a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping index fbff10c247..5131f62847 100644 --- a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping @@ -1,7 +1,12 @@ CLASS aqt net/minecraft/entity/passive/ParrotEntity FIELD bI ATTR_VARIANT Lqg; FIELD bL TAMING_INGREDIENTS Ljava/util/Set; + FIELD bM MOB_SOUNDS Ljava/util/Map; FIELD bN songPlaying Z FIELD bO songSource Lev; + METHOD a getRandomSound (Ljava/util/Random;)Lyh; + ARG 0 random + METHOD b getSound (Laid;)Lyh; + ARG 0 imitate METHOD ec getVariant ()I METHOD r setVariant (I)V diff --git a/mappings/net/minecraft/entity/passive/PassiveEntity.mapping b/mappings/net/minecraft/entity/passive/PassiveEntity.mapping index 6c0c6cf972..446d985563 100644 --- a/mappings/net/minecraft/entity/passive/PassiveEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PassiveEntity.mapping @@ -5,5 +5,9 @@ CLASS ahx net/minecraft/entity/passive/PassiveEntity METHOD (Laid;Lbgw;)V ARG 1 type METHOD a createChild (Lahx;)Lahx; + ARG 1 mate + METHOD a onPlayerSpawnedChild (Lavn;Lahx;)V + ARG 1 player + ARG 2 child METHOD b_ setBreedingAge (I)V METHOD i getBreedingAge ()I diff --git a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping index 6d8a639405..cefaa50b3d 100644 --- a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping @@ -1 +1,9 @@ CLASS aqw net/minecraft/entity/passive/PufferfishEntity + FIELD b PUFF_STATE Lqg; + METHOD a sting (Laij;)V + ARG 1 mob + METHOD b setPuffState (I)V + ARG 1 puffState + METHOD dU getPuffState ()I + METHOD q getScaleForPuffState (I)F + ARG 0 puffState diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping index 61c3de5a5e..6058c69884 100644 --- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping +++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping @@ -8,6 +8,7 @@ CLASS aqx net/minecraft/entity/passive/RabbitEntity CLASS aqx$f FIELD f owner Laqx; FIELD bA KILLER_BUNNY Lqr; + FIELD bG moreCarrotTicks I FIELD bz RABBIT_TYPE Lqg; METHOD b isBreedingItem (Lbbl;)Z METHOD d setSpeed (D)V diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index e157216cb9..e032f121b6 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -41,6 +41,7 @@ CLASS ava net/minecraft/entity/passive/VillagerEntity METHOD em canBreed ()Z METHOD en hasSeedToPlant ()Z METHOD eo getLastRestock ()J + METHOD ep sayNo ()V METHOD eq clearCurrentBonus ()V METHOD er canLevelUp ()Z METHOD es levelUp ()V diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index 595eaee8f6..3e60b01ef6 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -1,6 +1,15 @@ CLASS arg net/minecraft/entity/passive/WolfEntity CLASS arg$a WolfFleeGoal + FIELD bD FOLLOW_TAMED_PREDICATE Ljava/util/function/Predicate; FIELD bE WOLF_HEALTH Lqg; + FIELD bF BEGGING Lqg; FIELD bG COLLAR_COLOR Lqg; + FIELD bH begHeadRoll F + FIELD bI lastBegHeadRoll F METHOD ed isAngry ()Z + METHOD ef isBegging ()Z METHOD u setAngry (Z)V + METHOD v setBegging (Z)V + ARG 1 begging + METHOD w getBegHeadRoll (F)F + ARG 1 tickDelta diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 3b7ee6b8fb..42165ceafa 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -100,6 +100,7 @@ CLASS avn net/minecraft/entity/player/PlayerEntity METHOD dA getScore ()I METHOD dB vanishCursedItems ()V METHOD dD requestRespawn ()V + METHOD dE isMainPlayer ()Z METHOD dF getGameProfile ()Lcom/mojang/authlib/GameProfile; METHOD dG isSleepingLongEnough ()Z METHOD dH getSleepTimer ()I diff --git a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping index 324cbff89b..6284e45e5b 100644 --- a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping @@ -1,2 +1,3 @@ CLASS avx net/minecraft/entity/projectile/AbstractFireballEntity - FIELD f STACK Lqg; + FIELD f ITEM Lqg; + METHOD l getItem ()Lbbq; diff --git a/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping index f2d5040c96..a3c84d7509 100644 --- a/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping @@ -12,6 +12,7 @@ CLASS avs net/minecraft/entity/projectile/ExplosiveProjectileEntity ARG 2 owner METHOD (Laid;Lbgw;)V ARG 1 type + METHOD L_ isBurning ()Z METHOD a onCollision (Lcrg;)V METHOD i getParticleType ()Lgd; METHOD k getDrag ()F diff --git a/mappings/net/minecraft/entity/projectile/LlamaSpitEntity.mapping b/mappings/net/minecraft/entity/projectile/LlamaSpitEntity.mapping index 40c2f72e14..fe06cc7953 100644 --- a/mappings/net/minecraft/entity/projectile/LlamaSpitEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/LlamaSpitEntity.mapping @@ -1,2 +1,4 @@ CLASS awb net/minecraft/entity/projectile/LlamaSpitEntity FIELD b owner Larl; + FIELD c tag Lib; + METHOD f readTag ()V diff --git a/mappings/net/minecraft/entity/thrown/SnowballEntity.mapping b/mappings/net/minecraft/entity/thrown/SnowballEntity.mapping index bb39c0edea..8eff461690 100644 --- a/mappings/net/minecraft/entity/thrown/SnowballEntity.mapping +++ b/mappings/net/minecraft/entity/thrown/SnowballEntity.mapping @@ -1 +1,2 @@ CLASS awg net/minecraft/entity/thrown/SnowballEntity + METHOD n getParticleParameters ()Lgd; diff --git a/mappings/net/minecraft/entity/thrown/ThrownEntity.mapping b/mappings/net/minecraft/entity/thrown/ThrownEntity.mapping index ae12b5fc1e..cc0fffbc62 100644 --- a/mappings/net/minecraft/entity/thrown/ThrownEntity.mapping +++ b/mappings/net/minecraft/entity/thrown/ThrownEntity.mapping @@ -1,4 +1,5 @@ CLASS awj net/minecraft/entity/thrown/ThrownEntity + FIELD ap ownerUuid Ljava/util/UUID; FIELD b inGround Z FIELD c shake I FIELD d owner Laii; @@ -6,12 +7,15 @@ CLASS awj net/minecraft/entity/thrown/ThrownEntity FIELD f blockY I FIELD g blockZ I METHOD (Laid;DDDLbgw;)V - ARG 1 world + ARG 1 type ARG 2 x ARG 4 y ARG 6 z + ARG 8 world METHOD (Laid;Laii;Lbgw;)V - ARG 1 world + ARG 1 type + ARG 2 owner + ARG 3 world METHOD (Laid;Lbgw;)V ARG 1 type METHOD a onCollision (Lcrg;)V diff --git a/mappings/net/minecraft/entity/thrown/ThrownItemEntity.mapping b/mappings/net/minecraft/entity/thrown/ThrownItemEntity.mapping index 381ec35670..0b11fe119a 100644 --- a/mappings/net/minecraft/entity/thrown/ThrownItemEntity.mapping +++ b/mappings/net/minecraft/entity/thrown/ThrownItemEntity.mapping @@ -1,3 +1,13 @@ CLASS awi net/minecraft/entity/thrown/ThrownItemEntity + FIELD e ITEM Lqg; + METHOD (Laid;DDDLbgw;)V + ARG 1 type + METHOD (Laid;Laii;Lbgw;)V + ARG 1 type + ARG 2 owner + ARG 3 world + METHOD (Laid;Lbgw;)V + ARG 1 type + METHOD b setItem (Lbbq;)V METHOD i getDefaultItem ()Lbbl; METHOD k getItem ()Lbbq; diff --git a/mappings/net/minecraft/entity/thrown/ThrownPotionEntity.mapping b/mappings/net/minecraft/entity/thrown/ThrownPotionEntity.mapping index 42a7576e05..cc59cc15da 100644 --- a/mappings/net/minecraft/entity/thrown/ThrownPotionEntity.mapping +++ b/mappings/net/minecraft/entity/thrown/ThrownPotionEntity.mapping @@ -1,4 +1,5 @@ CLASS awn net/minecraft/entity/thrown/ThrownPotionEntity + FIELD e WATER_HURTS Ljava/util/function/Predicate; FIELD f ITEM_STACK Lqg; FIELD g LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lbgw;DDD)V @@ -11,4 +12,5 @@ CLASS awn net/minecraft/entity/thrown/ThrownPotionEntity ARG 0 entityHit METHOD a extinguishFire (Lev;Lfa;)V METHOD b setItemStack (Lbbq;)V + METHOD i damageEntitiesHurtByWater ()V METHOD k isLingering ()Z diff --git a/mappings/net/minecraft/village/Trader.mapping b/mappings/net/minecraft/village/Trader.mapping index 9ae7a823d3..4854cc29a9 100644 --- a/mappings/net/minecraft/village/Trader.mapping +++ b/mappings/net/minecraft/village/Trader.mapping @@ -4,7 +4,7 @@ CLASS bfz net/minecraft/village/Trader METHOD a setRecipesFromServer (Lbgb;)V METHOD dS getExperience ()I METHOD dT getCurrentCustomer ()Lavn; - METHOD dV getRecipes ()Lbgb; + METHOD dV getOffers ()Lbgb; METHOD dW isLevelledTrader ()Z METHOD e setCurrentCustomer (Lavn;)V ARG 1 customer