From 7bd162989d072ed070096116fe78ad77f666b165 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Wed, 11 Mar 2020 10:09:33 -0500 Subject: [PATCH] Pick up rendering stuff and dragon stuff (#1163) * Pick up #1026 and adjustments ArmorFeatureRenderer, BipedEntityModel and some player stuff Parrot entity rendering fixes At the moment, I don't know the difference between method_17110 and method_17111. method_17110 -> animateModel Still a provisional name. Finish the other feature renderers (except CapeFeatureRenderer) Name methods involving armor stands Work on Ender Dragon-related things overlay{Message, Tinted} -> {message, tinted} Add docs for ClientPlayerEntity#wateriness (now wetness) ClientPlayerEntity#getVisibilityReductionFromWater -> getScaledWetness Actually add javadocs newHealth -> health DragonFireballEntityRenderer#FIREBALL -> LAYER * Update mappings/net/minecraft/client/render/RenderLayer.mapping Co-authored-by: Kyarei --- .../client/gui/hud/InGameHud.mapping | 4 ++ .../client/network/ClientPlayerEntity.mapping | 25 +++++++- .../client/render/RenderLayer.mapping | 7 +++ .../entity/DonkeyEntityRenderer.mapping | 3 + .../DragonFireballEntityRenderer.mapping | 10 ++++ .../entity/EnderCrystalEntityRenderer.mapping | 7 +++ .../entity/EnderDragonEntityRenderer.mapping | 36 ++++++++++++ .../render/entity/EntityRenderer.mapping | 3 + .../entity/HorseBaseEntityRenderer.mapping | 4 ++ .../entity/LivingEntityRenderer.mapping | 6 +- .../entity/TropicalFishEntityRenderer.mapping | 2 + .../feature/ArmorFeatureRenderer.mapping | 39 ++++++++++++- .../entity/feature/FeatureRenderer.mapping | 1 + .../feature/HeldItemFeatureRenderer.mapping | 7 +++ .../ShoulderParrotFeatureRenderer.mapping | 9 +++ .../StuckArrowsFeatureRenderer.mapping | 2 + .../StuckObjectsFeatureRenderer.mapping | 7 ++- .../StuckStingersFeatureRenderer.mapping | 10 ++++ .../TridentRiptideFeatureRenderer.mapping | 1 + .../TropicalFishColorFeatureRenderer.mapping | 3 + ...opicalFishSomethingFeatureRenderer.mapping | 3 - .../VillagerClothingFeatureRenderer.mapping | 4 ++ .../feature/VillagerResourceMetadata.mapping | 3 + .../entity/model/BipedEntityModel.mapping | 3 + ...g => LargeTropicalFishEntityModel.mapping} | 2 +- .../render/entity/model/ModelWithArms.mapping | 1 + .../entity/model/ParrotEntityModel.mapping | 17 +++++- ...g => SmallTropicalFishEntityModel.mapping} | 2 +- .../entity/model/SnowmanEntityModel.mapping | 1 + mappings/net/minecraft/entity/Entity.mapping | 2 +- .../net/minecraft/entity/LivingEntity.mapping | 1 + .../boss/dragon/EnderDragonEntity.mapping | 58 +++++++++++++++++++ .../entity/boss/dragon/phase/Phase.mapping | 2 + .../entity/damage/EntityDamageSource.mapping | 3 + .../decoration/ArmorStandEntity.mapping | 19 ++++++ .../decoration/EnderCrystalEntity.mapping | 7 +++ .../entity/mob/ElderGuardianEntity.mapping | 1 + .../entity/passive/PandaEntity.mapping | 1 + .../entity/player/PlayerEntity.mapping | 1 + .../minecraft/util/math/MathHelper.mapping | 1 + .../world/dimension/TheEndDimension.mapping | 1 + 41 files changed, 304 insertions(+), 15 deletions(-) create mode 100644 mappings/net/minecraft/client/render/entity/feature/TropicalFishColorFeatureRenderer.mapping delete mode 100644 mappings/net/minecraft/client/render/entity/feature/TropicalFishSomethingFeatureRenderer.mapping rename mappings/net/minecraft/client/render/entity/model/{TropicalFishEntityModelB.mapping => LargeTropicalFishEntityModel.mapping} (64%) rename mappings/net/minecraft/client/render/entity/model/{TropicalFishEntityModelA.mapping => SmallTropicalFishEntityModel.mapping} (64%) diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 51ceaa8486..9d02cfd4ad 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -65,12 +65,16 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_1756 getFontRenderer ()Lnet/minecraft/class_327; METHOD method_1757 renderScoreboardSidebar (Lnet/minecraft/class_266;)V METHOD method_1758 setOverlayMessage (Lnet/minecraft/class_2561;Z)V + ARG 1 message + ARG 2 tinted METHOD method_1759 renderHotbar (F)V METHOD method_1760 renderStatusBars ()V METHOD method_1761 renderPumpkinOverlay ()V METHOD method_1762 renderHotbarItem (IIFLnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V METHOD method_1763 setTitles (Ljava/lang/String;Ljava/lang/String;III)V METHOD method_1764 setOverlayMessage (Ljava/lang/String;Z)V + ARG 1 message + ARG 2 tinted METHOD method_1765 renderStatusEffectOverlay ()V METHOD method_1766 renderDemoTimer ()V METHOD method_19346 drawTextBackground (Lnet/minecraft/class_327;II)V diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index a38aa2d8d0..c132dd1403 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -6,18 +6,24 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity FIELD field_3914 lastRenderPitch F FIELD field_3915 usingItem Z FIELD field_3916 renderPitch F + FIELD field_3917 underwaterVisibilityTicks I + FIELD field_3918 healthInitialized Z FIELD field_3919 lastSprinting Z FIELD field_3920 lastOnGround Z + FIELD field_3921 ticksSinceSprintingChanged I + FIELD field_3923 ticksSinceLastPositionPacketSent I FIELD field_3924 lastZ D FIELD field_3925 lastPitch F FIELD field_3926 lastX D - FIELD field_3927 lastAutoJump Z + FIELD field_3927 autoJumpEnabled Z FIELD field_3928 statHandler Lnet/minecraft/class_3469; FIELD field_3929 nextNauseaStrength F FIELD field_3930 recipeBook Lnet/minecraft/class_299; FIELD field_3931 lastRenderYaw F FIELD field_3932 renderYaw F FIELD field_3933 tickables Ljava/util/List; + FIELD field_3934 ticksToNextAutojump I + FIELD field_3935 ticksLeftToDoubleTapSprint I FIELD field_3936 lastIsHoldingSneakKey Z FIELD field_3937 client Lnet/minecraft/class_310; FIELD field_3940 lastBaseY D @@ -28,8 +34,13 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity FIELD field_3945 activeHand Lnet/minecraft/class_1268; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_638;Lnet/minecraft/class_634;Lnet/minecraft/class_3469;Lnet/minecraft/class_299;)V ARG 1 client + ARG 3 networkHandler + ARG 4 stats + ARG 5 recipeBook METHOD method_18654 updateNausea ()V METHOD method_20303 isHoldingSneakKey ()Z + METHOD method_20623 isWalking ()Z + METHOD method_22119 shouldAutoJump ()Z METHOD method_22120 hasMovementInput ()Z COMMENT Returns whether the player has movement input. COMMENT @@ -46,8 +57,14 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity METHOD method_3136 sendMovementPackets ()V METHOD method_3137 closeScreen ()V METHOD method_3138 updateHealth (F)V + ARG 1 health + METHOD method_3140 getUnderwaterVisibility ()F + COMMENT Returns the color multiplier of vision in water, so that visibility in + COMMENT water is reduced when the player just entered water. METHOD method_3141 onRecipeDisplayed (Lnet/minecraft/class_1860;)V + ARG 1 recipe METHOD method_3142 sendChatMessage (Ljava/lang/String;)V + ARG 1 message METHOD method_3143 getStatHandler ()Lnet/minecraft/class_3469; METHOD method_3144 isRiding ()Z METHOD method_3145 setExperience (FII)V @@ -57,6 +74,10 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity METHOD method_3146 setServerBrand (Ljava/lang/String;)V ARG 1 serverBrand METHOD method_3147 setClientPermissionLevel (I)V - METHOD method_3149 getLastAutoJump ()Z + ARG 1 clientPermissionLevel + METHOD method_3148 autoJump (FF)V + ARG 1 dx + ARG 2 dz + METHOD method_3149 isAutoJumpEnabled ()Z METHOD method_3150 cannotFitAt (Lnet/minecraft/class_2338;)Z ARG 1 pos diff --git a/mappings/net/minecraft/client/render/RenderLayer.mapping b/mappings/net/minecraft/client/render/RenderLayer.mapping index 14e970ecef..4ae917f1b9 100644 --- a/mappings/net/minecraft/client/render/RenderLayer.mapping +++ b/mappings/net/minecraft/client/render/RenderLayer.mapping @@ -97,6 +97,13 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer ARG 1 affectsOutline METHOD method_24295 isOutline ()Z METHOD method_24296 asOptional ()Ljava/util/Optional; + METHOD method_24468 getOutline (Lnet/minecraft/class_2960;Lnet/minecraft/class_4668$class_4671;)Lnet/minecraft/class_1921; + ARG 0 texture + ARG 1 cull + METHOD method_24469 getEntityShadow (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; + ARG 0 texture + METHOD method_25448 getArmorCutoutNoCull (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; + ARG 0 texture CLASS class_4687 MultiPhase FIELD field_21403 phases Lnet/minecraft/class_1921$class_4688; FIELD field_21404 hash I diff --git a/mappings/net/minecraft/client/render/entity/DonkeyEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/DonkeyEntityRenderer.mapping index 290f96b510..cc82efd7fa 100644 --- a/mappings/net/minecraft/client/render/entity/DonkeyEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/DonkeyEntityRenderer.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_883 net/minecraft/client/render/entity/DonkeyEntityRenderer FIELD field_4650 TEXTURES Ljava/util/Map; + METHOD (Lnet/minecraft/class_898;F)V + ARG 1 dispatcher + ARG 2 scale diff --git a/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping index 2ed0ce7b7a..c9b456eab6 100644 --- a/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping @@ -1,2 +1,12 @@ CLASS net/minecraft/class_891 net/minecraft/client/render/entity/DragonFireballEntityRenderer + FIELD field_21735 LAYER Lnet/minecraft/class_1921; FIELD field_4661 SKIN Lnet/minecraft/class_2960; + METHOD method_23837 produceVertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;IFIII)V + ARG 0 vertexConsumer + ARG 1 modelMatrix + ARG 2 normalMatrix + ARG 3 light + ARG 4 x + ARG 5 y + ARG 6 textureU + ARG 7 textureV diff --git a/mappings/net/minecraft/client/render/entity/EnderCrystalEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EnderCrystalEntityRenderer.mapping index 0ef459d6fc..eab16d844f 100644 --- a/mappings/net/minecraft/client/render/entity/EnderCrystalEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EnderCrystalEntityRenderer.mapping @@ -1,3 +1,10 @@ CLASS net/minecraft/class_892 net/minecraft/client/render/entity/EnderCrystalEntityRenderer + FIELD field_21002 SINE_FOURTY_FIVE_DEGREES F + FIELD field_21003 core Lnet/minecraft/class_630; + FIELD field_21004 frame Lnet/minecraft/class_630; FIELD field_21005 bottom Lnet/minecraft/class_630; + FIELD field_21736 ENDER_CRYSTAL Lnet/minecraft/class_1921; FIELD field_4663 SKIN Lnet/minecraft/class_2960; + METHOD method_23155 getYOffset (Lnet/minecraft/class_1511;F)F + ARG 0 crystal + ARG 1 tickDelta diff --git a/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping index 4da4c737c8..5097668d71 100644 --- a/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping @@ -1,11 +1,41 @@ CLASS net/minecraft/class_895 net/minecraft/client/render/entity/EnderDragonEntityRenderer FIELD field_21006 EYES_TEX Lnet/minecraft/class_2960; + FIELD field_21007 SINE_SIXTY_DEGREES F + FIELD field_21008 model Lnet/minecraft/class_895$class_625; + FIELD field_21737 DRAGON_CUTOUT Lnet/minecraft/class_1921; + FIELD field_21738 DRAGON_DECAL Lnet/minecraft/class_1921; + FIELD field_21739 DRAGON_EYES Lnet/minecraft/class_1921; + FIELD field_21740 CRYSTAL_BEAM_LAYER Lnet/minecraft/class_1921; FIELD field_4668 CRYSTAL_BEAM_TEX Lnet/minecraft/class_2960; FIELD field_4669 EXPLOSION_TEX Lnet/minecraft/class_2960; FIELD field_4670 SKIN Lnet/minecraft/class_2960; + METHOD method_23156 (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;FF)V + ARG 0 vertexConsumer + ARG 1 vertexTransform + METHOD method_23157 (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;I)V + ARG 0 vertexConsumer + ARG 1 vertexTransform + ARG 2 alpha + METHOD method_23158 (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;FF)V + ARG 0 vertexConsumer + ARG 1 vertexTransform + METHOD method_23159 (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;FF)V + ARG 0 vertexConsumer + ARG 1 vertexTransform + ARG 2 y + ARG 3 z METHOD method_3917 renderCrystalBeam (FFFFILnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V + ARG 0 dx + ARG 1 dy + ARG 2 dz + ARG 3 tickDelta + ARG 4 age + ARG 5 matrices + ARG 6 vertexConsumers + ARG 7 light CLASS class_625 DragonEntityModel FIELD field_21441 dragon Lnet/minecraft/class_1510; + FIELD field_21442 tickDelta F FIELD field_3625 frontFoot Lnet/minecraft/class_630; FIELD field_3626 rearLegTip Lnet/minecraft/class_630; FIELD field_3627 body Lnet/minecraft/class_630; @@ -18,3 +48,9 @@ CLASS net/minecraft/class_895 net/minecraft/client/render/entity/EnderDragonEnti FIELD field_3634 frontLegTip Lnet/minecraft/class_630; FIELD field_3635 wingTip Lnet/minecraft/class_630; FIELD field_3637 neck Lnet/minecraft/class_630; + METHOD method_23838 (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;IIFLnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_630;)V + ARG 1 matrices + ARG 2 vertexConsumer + ARG 3 light + ARG 4 overlay + ARG 5 offset diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping index 5f79f37a2e..39679ff202 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping @@ -20,7 +20,10 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer ARG 1 entity METHOD method_3926 renderLabelIfPresent (Lnet/minecraft/class_1297;Ljava/lang/String;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V ARG 1 entity + ARG 2 label ARG 3 matrices + ARG 4 vertexConsumers + ARG 5 light METHOD method_3931 getTexture (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2960; ARG 1 entity METHOD method_3932 getFontRenderer ()Lnet/minecraft/class_327; diff --git a/mappings/net/minecraft/client/render/entity/HorseBaseEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/HorseBaseEntityRenderer.mapping index e0d24bc464..ecf9fcc567 100644 --- a/mappings/net/minecraft/client/render/entity/HorseBaseEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/HorseBaseEntityRenderer.mapping @@ -1,2 +1,6 @@ CLASS net/minecraft/class_875 net/minecraft/client/render/entity/HorseBaseEntityRenderer FIELD field_4641 scale F + METHOD (Lnet/minecraft/class_898;Lnet/minecraft/class_549;F)V + ARG 1 dispatcher + ARG 2 model + ARG 3 scale diff --git a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping index 3ac6d9f40d..09927dfaaf 100644 --- a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping @@ -20,12 +20,16 @@ CLASS net/minecraft/class_922 net/minecraft/client/render/entity/LivingEntityRen ARG 1 entity ARG 2 showBody ARG 3 translucent + METHOD method_25450 isShaking (Lnet/minecraft/class_1309;)Z + COMMENT Returns if this entity is shaking, as if a zombie villager, zombie, + COMMENT husk, or piglin undergoing conversion. + ARG 1 entity METHOD method_4039 getLyingAngle (Lnet/minecraft/class_1309;)F ARG 1 entity METHOD method_4042 scale (Lnet/minecraft/class_1309;Lnet/minecraft/class_4587;F)V ARG 1 entity ARG 2 matrices - ARG 3 tickDelta + ARG 3 amount METHOD method_4044 getHandSwingProgress (Lnet/minecraft/class_1309;F)F ARG 1 entity ARG 2 tickDelta diff --git a/mappings/net/minecraft/client/render/entity/TropicalFishEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/TropicalFishEntityRenderer.mapping index d66f272993..2e09d8d639 100644 --- a/mappings/net/minecraft/client/render/entity/TropicalFishEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/TropicalFishEntityRenderer.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_959 net/minecraft/client/render/entity/TropicalFishEntityRenderer + FIELD field_4799 largeModel Lnet/minecraft/class_615; + FIELD field_4800 smallModel Lnet/minecraft/class_612; diff --git a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping index c5f152faef..01c13507fe 100644 --- a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping @@ -1,15 +1,48 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFeatureRenderer FIELD field_4829 ARMOR_TEXTURE_CACHE Ljava/util/Map; - FIELD field_4830 modelLeggings Lnet/minecraft/class_572; - FIELD field_4831 modelBody Lnet/minecraft/class_572; + FIELD field_4830 leggingsModel Lnet/minecraft/class_572; + FIELD field_4831 bodyModel Lnet/minecraft/class_572; + METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_572;Lnet/minecraft/class_572;)V + ARG 1 context + ARG 2 leggingsModel + ARG 3 bodyModel METHOD method_23192 renderArmorParts (Lnet/minecraft/class_1304;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1738;ZLnet/minecraft/class_572;ZFFFLjava/lang/String;)V + ARG 1 slot + ARG 2 matrices + ARG 3 vertexConsumers + ARG 4 light + ARG 5 item + ARG 6 glint + ARG 7 armorModel + ARG 8 secondLayer + ARG 9 red + ARG 10 green + ARG 11 blue + ARG 12 suffix METHOD method_4169 renderArmor (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1309;FFFFFFLnet/minecraft/class_1304;ILnet/minecraft/class_572;)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 entity + ARG 4 limbAngle + ARG 5 limbDistance + ARG 6 tickDelta + ARG 7 customAngle + ARG 8 headYaw + ARG 9 headPitch + ARG 10 slot + ARG 11 light + ARG 12 armorModel METHOD method_4170 setVisible (Lnet/minecraft/class_572;Lnet/minecraft/class_1304;)V ARG 1 bipedModel + ARG 2 slot METHOD method_4172 getArmor (Lnet/minecraft/class_1304;)Lnet/minecraft/class_572; ARG 1 slot - METHOD method_4173 isLegs (Lnet/minecraft/class_1304;)Z + METHOD method_4173 usesSecondLayer (Lnet/minecraft/class_1304;)Z + ARG 1 slot METHOD method_4174 getArmorTexture (Lnet/minecraft/class_1304;Lnet/minecraft/class_1738;ZLjava/lang/String;)Lnet/minecraft/class_2960; ARG 1 slot ARG 2 item + ARG 3 secondLayer + ARG 4 suffix METHOD method_4190 setInvisible (Lnet/minecraft/class_572;)V + ARG 1 bipedModel diff --git a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping index 18f8d16293..5ebc8c986e 100644 --- a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_3887 net/minecraft/client/render/entity/feature/Featur ARG 9 age ARG 10 headYaw ARG 11 headPitch + ARG 12 tickDelta ARG 13 red ARG 14 green ARG 15 blue diff --git a/mappings/net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer.mapping index a8515de02a..d74aed522f 100644 --- a/mappings/net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer.mapping @@ -1,2 +1,9 @@ CLASS net/minecraft/class_989 net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer METHOD method_4192 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;Lnet/minecraft/class_1306;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V + ARG 1 entity + ARG 2 stack + ARG 3 transformationMode + ARG 4 arm + ARG 5 matrices + ARG 6 vertexConsumers + ARG 7 light diff --git a/mappings/net/minecraft/client/render/entity/feature/ShoulderParrotFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ShoulderParrotFeatureRenderer.mapping index 0648a2d31d..b1f06dad03 100644 --- a/mappings/net/minecraft/client/render/entity/feature/ShoulderParrotFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/ShoulderParrotFeatureRenderer.mapping @@ -1,3 +1,12 @@ CLASS net/minecraft/class_983 net/minecraft/client/render/entity/feature/ShoulderParrotFeatureRenderer FIELD field_17154 model Lnet/minecraft/class_584; METHOD method_4186 renderShoulderParrot (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1657;FFFFZ)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 light + ARG 4 player + ARG 5 limbAngle + ARG 6 limbDistance + ARG 7 headYaw + ARG 8 headPitch + ARG 9 leftShoulder diff --git a/mappings/net/minecraft/client/render/entity/feature/StuckArrowsFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/StuckArrowsFeatureRenderer.mapping index f463aa91cb..33161c3845 100644 --- a/mappings/net/minecraft/client/render/entity/feature/StuckArrowsFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/StuckArrowsFeatureRenderer.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_973 net/minecraft/client/render/entity/feature/StuckArrowsFeatureRenderer + FIELD field_17153 dispatcher Lnet/minecraft/class_898; + FIELD field_20528 arrow Lnet/minecraft/class_1667; diff --git a/mappings/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.mapping index e97ce5d4ba..e8951d5d95 100644 --- a/mappings/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.mapping @@ -4,6 +4,11 @@ CLASS net/minecraft/class_4507 net/minecraft/client/render/entity/feature/StuckO METHOD method_22130 renderObject (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1297;FFFF)V ARG 1 matrix ARG 2 vertexConsumers - ARG 5 tickDelta + ARG 3 light + ARG 4 entity + ARG 5 dirX + ARG 6 dirY + ARG 7 dirZ + ARG 8 tickDelta METHOD method_22134 getObjectCount (Lnet/minecraft/class_1309;)I ARG 1 entity diff --git a/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping index 51550284fa..81e6a8a188 100644 --- a/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping @@ -1 +1,11 @@ CLASS net/minecraft/class_4506 net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer + FIELD field_20529 TEXTURE Lnet/minecraft/class_2960; + METHOD method_23295 produceVertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;FIFFI)V + ARG 0 vertexConsumer + ARG 1 vertexTransform + ARG 2 normalTransform + ARG 3 x + ARG 4 y + ARG 5 u + ARG 6 v + ARG 7 light diff --git a/mappings/net/minecraft/client/render/entity/feature/TridentRiptideFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/TridentRiptideFeatureRenderer.mapping index 5b88b9e781..a6d3959280 100644 --- a/mappings/net/minecraft/client/render/entity/feature/TridentRiptideFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/TridentRiptideFeatureRenderer.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_998 net/minecraft/client/render/entity/feature/TridentRiptideFeatureRenderer + FIELD field_21012 aura Lnet/minecraft/class_630; FIELD field_4898 TEXTURE Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/entity/feature/TropicalFishColorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/TropicalFishColorFeatureRenderer.mapping new file mode 100644 index 0000000000..4931f5b20a --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/feature/TropicalFishColorFeatureRenderer.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_1001 net/minecraft/client/render/entity/feature/TropicalFishColorFeatureRenderer + FIELD field_17157 smallModel Lnet/minecraft/class_612; + FIELD field_4903 largeModel Lnet/minecraft/class_615; diff --git a/mappings/net/minecraft/client/render/entity/feature/TropicalFishSomethingFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/TropicalFishSomethingFeatureRenderer.mapping deleted file mode 100644 index aab90c69ab..0000000000 --- a/mappings/net/minecraft/client/render/entity/feature/TropicalFishSomethingFeatureRenderer.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_1001 net/minecraft/client/render/entity/feature/TropicalFishSomethingFeatureRenderer - FIELD field_17157 modelA Lnet/minecraft/class_612; - FIELD field_4903 modelB Lnet/minecraft/class_615; diff --git a/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping index d39a3f53ef..6734fac119 100644 --- a/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping @@ -4,6 +4,10 @@ CLASS net/minecraft/class_3885 net/minecraft/client/render/entity/feature/Villag FIELD field_17150 professionToHat Lit/unimi/dsi/fastutil/objects/Object2ObjectMap; FIELD field_17151 resourceManager Lnet/minecraft/class_3296; FIELD field_17152 entityType Ljava/lang/String; + METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_3296;Ljava/lang/String;)V + ARG 1 context + ARG 2 resourceManager + ARG 3 entityType METHOD method_17153 getHatType (Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Ljava/lang/String;Lnet/minecraft/class_2348;Ljava/lang/Object;)Lnet/minecraft/class_3888$class_3889; ARG 1 hatLookUp ARG 2 keyType diff --git a/mappings/net/minecraft/client/render/entity/feature/VillagerResourceMetadata.mapping b/mappings/net/minecraft/client/render/entity/feature/VillagerResourceMetadata.mapping index cabb7afc95..32c8f1df1a 100644 --- a/mappings/net/minecraft/client/render/entity/feature/VillagerResourceMetadata.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/VillagerResourceMetadata.mapping @@ -5,5 +5,8 @@ CLASS net/minecraft/class_3888 net/minecraft/client/render/entity/feature/Villag CLASS class_3889 HatType FIELD field_17163 byName Ljava/util/Map; FIELD field_17164 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name METHOD method_17168 getName ()Ljava/lang/String; METHOD method_17170 from (Ljava/lang/String;)Lnet/minecraft/class_3888$class_3889; + ARG 0 name diff --git a/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping index 114fbb1e78..b6b680892f 100644 --- a/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_572 net/minecraft/client/render/entity/model/BipedEnti FIELD field_3392 rightLeg Lnet/minecraft/class_630; FIELD field_3394 helmet Lnet/minecraft/class_630; FIELD field_3395 rightArmPose Lnet/minecraft/class_572$class_573; + FIELD field_3396 leaningPitch F FIELD field_3397 leftLeg Lnet/minecraft/class_630; FIELD field_3398 head Lnet/minecraft/class_630; FIELD field_3399 leftArmPose Lnet/minecraft/class_572$class_573; @@ -13,11 +14,13 @@ CLASS net/minecraft/class_572 net/minecraft/client/render/entity/model/BipedEnti ARG 1 scale METHOD (FFII)V ARG 1 scale + ARG 2 pivotY ARG 3 textureWidth ARG 4 textureHeight METHOD (Ljava/util/function/Function;FFII)V ARG 1 texturedLayerFactory ARG 2 scale + ARG 3 pivotY ARG 4 textureWidth ARG 5 textureHeight METHOD method_2804 lerpAngle (FFF)F diff --git a/mappings/net/minecraft/client/render/entity/model/TropicalFishEntityModelB.mapping b/mappings/net/minecraft/client/render/entity/model/LargeTropicalFishEntityModel.mapping similarity index 64% rename from mappings/net/minecraft/client/render/entity/model/TropicalFishEntityModelB.mapping rename to mappings/net/minecraft/client/render/entity/model/LargeTropicalFishEntityModel.mapping index ebd44189dd..efe13bcf37 100644 --- a/mappings/net/minecraft/client/render/entity/model/TropicalFishEntityModelB.mapping +++ b/mappings/net/minecraft/client/render/entity/model/LargeTropicalFishEntityModel.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_615 net/minecraft/client/render/entity/model/TropicalFishEntityModelB +CLASS net/minecraft/class_615 net/minecraft/client/render/entity/model/LargeTropicalFishEntityModel diff --git a/mappings/net/minecraft/client/render/entity/model/ModelWithArms.mapping b/mappings/net/minecraft/client/render/entity/model/ModelWithArms.mapping index 4fbb950c9d..fae80142c1 100644 --- a/mappings/net/minecraft/client/render/entity/model/ModelWithArms.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ModelWithArms.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_3881 net/minecraft/client/render/entity/model/ModelWithArms METHOD method_2803 setArmAngle (Lnet/minecraft/class_1306;Lnet/minecraft/class_4587;)V ARG 1 arm + ARG 2 matrices diff --git a/mappings/net/minecraft/client/render/entity/model/ParrotEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ParrotEntityModel.mapping index 6e90139990..11c616d6e9 100644 --- a/mappings/net/minecraft/client/render/entity/model/ParrotEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ParrotEntityModel.mapping @@ -10,10 +10,23 @@ CLASS net/minecraft/class_584 net/minecraft/client/render/entity/model/ParrotEnt FIELD field_3459 leftWing Lnet/minecraft/class_630; FIELD field_3460 tail Lnet/minecraft/class_630; FIELD field_3461 forehead Lnet/minecraft/class_630; + METHOD method_17106 poseOnShoulder (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;IIFFFFI)V + ARG 1 matrices + ARG 2 vertexConsumer + ARG 3 light + ARG 4 overlay + ARG 5 limbAngle + ARG 6 limbDistance + ARG 7 headYaw + ARG 8 headPitch + ARG 9 danceAngle METHOD method_17107 getPose (Lnet/minecraft/class_1453;)Lnet/minecraft/class_584$class_585; - METHOD method_17111 (Lnet/minecraft/class_584$class_585;IFFFFF)V + ARG 0 parrot + METHOD method_17110 animateModel (Lnet/minecraft/class_584$class_585;)V ARG 1 pose - ARG 2 age + METHOD method_17111 setAngles (Lnet/minecraft/class_584$class_585;IFFFFF)V + ARG 1 pose + ARG 2 danceAngle ARG 3 limbAngle ARG 4 limbDistance ARG 5 age diff --git a/mappings/net/minecraft/client/render/entity/model/TropicalFishEntityModelA.mapping b/mappings/net/minecraft/client/render/entity/model/SmallTropicalFishEntityModel.mapping similarity index 64% rename from mappings/net/minecraft/client/render/entity/model/TropicalFishEntityModelA.mapping rename to mappings/net/minecraft/client/render/entity/model/SmallTropicalFishEntityModel.mapping index c6d8bf7bba..7882618165 100644 --- a/mappings/net/minecraft/client/render/entity/model/TropicalFishEntityModelA.mapping +++ b/mappings/net/minecraft/client/render/entity/model/SmallTropicalFishEntityModel.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_612 net/minecraft/client/render/entity/model/TropicalFishEntityModelA +CLASS net/minecraft/class_612 net/minecraft/client/render/entity/model/SmallTropicalFishEntityModel diff --git a/mappings/net/minecraft/client/render/entity/model/SnowmanEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/SnowmanEntityModel.mapping index a7d319fecb..2f0d8c6c73 100644 --- a/mappings/net/minecraft/client/render/entity/model/SnowmanEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/SnowmanEntityModel.mapping @@ -4,3 +4,4 @@ CLASS net/minecraft/class_608 net/minecraft/client/render/entity/model/SnowmanEn FIELD field_3567 middleSnowball Lnet/minecraft/class_630; FIELD field_3568 topSnowball Lnet/minecraft/class_630; FIELD field_3569 bottomSnowball Lnet/minecraft/class_630; + METHOD method_2834 getTopSnowball ()Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 81b1c01126..b9b3bb4d05 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -501,7 +501,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5775 dropStack (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1542; ARG 1 stack METHOD method_5776 hasWings ()Z - METHOD method_5777 isInFluid (Lnet/minecraft/class_3494;)Z + METHOD method_5777 isSubmergedIn (Lnet/minecraft/class_3494;)Z ARG 1 fluidTag METHOD method_5778 isBeingRainedOn ()Z METHOD method_5779 isPartOf (Lnet/minecraft/class_1297;)Z diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 6f4c116da1..54818afc2c 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -335,6 +335,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6100 setJumping (Z)V ARG 1 jumping METHOD method_6101 isClimbing ()Z + METHOD method_6102 isMobOrPlayer ()Z METHOD method_6103 sendPickup (Lnet/minecraft/class_1297;I)V ARG 1 item ARG 2 count diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping index 3597a923a3..e9880b9346 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping @@ -1,24 +1,82 @@ CLASS net/minecraft/class_1510 net/minecraft/entity/boss/dragon/EnderDragonEntity FIELD field_18120 CLOSE_PLAYER_PREDICATE Lnet/minecraft/class_4051; + FIELD field_7008 pathHeap Lnet/minecraft/class_5; FIELD field_7009 partTail2 Lnet/minecraft/class_1508; + FIELD field_7010 latestSegment I FIELD field_7011 partNeck Lnet/minecraft/class_1508; + FIELD field_7012 pathNodes [Lnet/minecraft/class_9; + COMMENT The first 12 path nodes are used for end crystals; the others are not tied to them. FIELD field_7013 PHASE_TYPE Lnet/minecraft/class_2940; FIELD field_7014 partWingLeft Lnet/minecraft/class_1508; FIELD field_7015 partWingRight Lnet/minecraft/class_1508; FIELD field_7016 fight Lnet/minecraft/class_2881; FIELD field_7017 partHead Lnet/minecraft/class_1508; + FIELD field_7018 ticksUntilNextGrowl I + FIELD field_7019 prevWingPosition F FIELD field_7020 partTail1 Lnet/minecraft/class_1508; FIELD field_7021 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_7022 partTail3 Lnet/minecraft/class_1508; FIELD field_7023 partBody Lnet/minecraft/class_1508; FIELD field_7024 connectedCrystal Lnet/minecraft/class_1511; + FIELD field_7025 pathNodeConnections [I + COMMENT An array of 24 bitflags, where node #i leads to #j iff (pathNodeConnections[i] & (1 << j)) != 0. + FIELD field_7026 segmentCircularBuffer [[D + COMMENT (yaw, y, ?) + FIELD field_7027 slowedDownByBlock Z FIELD field_7028 phaseManager Lnet/minecraft/class_1526; + FIELD field_7030 wingPosition F + FIELD field_7031 ticksSinceDeath I FIELD field_7032 parts [Lnet/minecraft/class_1508; + METHOD method_22863 movePart (Lnet/minecraft/class_1508;DDD)V + ARG 2 dx + ARG 4 dy + ARG 6 dz METHOD method_5690 getBodyParts ()[Lnet/minecraft/class_1508; METHOD method_6816 damagePart (Lnet/minecraft/class_1508;Lnet/minecraft/class_1282;F)Z + ARG 1 part + ARG 2 source + ARG 3 amount + METHOD method_6817 getSegmentProperties (IF)[D + ARG 1 segmentNumber + ARG 2 tickDelta + METHOD method_6818 getNearestPathNodeIndex ()I + METHOD method_6819 parentDamage (Lnet/minecraft/class_1282;F)Z + ARG 1 source + ARG 2 amount + METHOD method_6821 destroyBlocks (Lnet/minecraft/class_238;)Z + METHOD method_6822 getNearestPathNodeIndex (DDD)I + ARG 1 x + ARG 3 y + ARG 5 z + METHOD method_6823 (I[D[D)F + ARG 1 segmentOffset + ARG 2 segment1 + ARG 3 segment2 + METHOD method_6824 awardExperience (I)V + ARG 1 amount + METHOD method_6825 launchLivingEntities (Ljava/util/List;)V + ARG 1 entities + METHOD method_6826 getPathOfAllPredecessors (Lnet/minecraft/class_9;Lnet/minecraft/class_9;)Lnet/minecraft/class_11; + ARG 1 unused + ARG 2 node + METHOD method_6827 damageLivingEntities (Ljava/util/List;)V + ARG 1 entities METHOD method_6828 crystalDestroyed (Lnet/minecraft/class_1511;Lnet/minecraft/class_2338;Lnet/minecraft/class_1282;)V ARG 1 crystal ARG 2 pos ARG 3 source METHOD method_6829 getFight ()Lnet/minecraft/class_2881; + METHOD method_6830 tickWithEndCrystals ()V + COMMENT Things to do every tick related to end crystals. The Ender Dragon: + COMMENT + COMMENT * Disconnects from its crystal if it is removed + COMMENT * If it is connected to a crystal, then heals every 10 ticks + COMMENT * With a 1 in 10 chance each tick, searches for the nearest crystal and connects to it if present METHOD method_6831 getPhaseManager ()Lnet/minecraft/class_1526; + METHOD method_6832 wrapYawChange (D)F + ARG 1 yawDegrees + METHOD method_6833 findPath (IILnet/minecraft/class_9;)Lnet/minecraft/class_11; + ARG 1 from + ARG 2 to + METHOD method_6834 (F)Lnet/minecraft/class_243; + ARG 1 tickDelta diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping index 98525925b5..ca30460bfe 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_1521 net/minecraft/entity/boss/dragon/phase/Phase + METHOD method_6846 getMaxYAcceleration ()F + METHOD method_6848 isSittingOrHovering ()Z METHOD method_6849 getType ()Lnet/minecraft/class_1527; METHOD method_6850 crystalDestroyed (Lnet/minecraft/class_1511;Lnet/minecraft/class_2338;Lnet/minecraft/class_1282;Lnet/minecraft/class_1657;)V ARG 1 crystal diff --git a/mappings/net/minecraft/entity/damage/EntityDamageSource.mapping b/mappings/net/minecraft/entity/damage/EntityDamageSource.mapping index 0ca6343517..35dd2a8d0d 100644 --- a/mappings/net/minecraft/entity/damage/EntityDamageSource.mapping +++ b/mappings/net/minecraft/entity/damage/EntityDamageSource.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_1285 net/minecraft/entity/damage/EntityDamageSource FIELD field_5879 source Lnet/minecraft/class_1297; + FIELD field_5880 thorns Z METHOD (Ljava/lang/String;Lnet/minecraft/class_1297;)V ARG 1 name + METHOD method_5549 isThorns ()Z + METHOD method_5550 setThorns ()Lnet/minecraft/class_1285; diff --git a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping index 64e40967b0..d1dca4b36d 100644 --- a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_1531 net/minecraft/entity/decoration/ArmorStandEntity FIELD field_7107 ARMOR_STAND_FLAGS Lnet/minecraft/class_2940; FIELD field_7108 armorItems Lnet/minecraft/class_2371; FIELD field_7110 leftLegRotation Lnet/minecraft/class_2379; + FIELD field_7111 invisible Z + FIELD field_7112 lastHitTime J FIELD field_7113 DEFAULT_HEAD_ROTATION Lnet/minecraft/class_2379; FIELD field_7114 heldItems Lnet/minecraft/class_2371; FIELD field_7115 DEFAULT_RIGHT_ARM_ROTATION Lnet/minecraft/class_2379; @@ -22,27 +24,44 @@ CLASS net/minecraft/class_1531 net/minecraft/entity/decoration/ArmorStandEntity FIELD field_7125 TRACKER_RIGHT_LEG_ROTATION Lnet/minecraft/class_2940; FIELD field_7126 leftArmRotation Lnet/minecraft/class_2379; FIELD field_7127 TRACKER_LEFT_LEG_ROTATION Lnet/minecraft/class_2940; + METHOD (Lnet/minecraft/class_1937;DDD)V + ARG 2 x + ARG 4 y + ARG 6 z METHOD method_18059 canClip ()Z + METHOD method_6898 spawnBreakParticles ()V METHOD method_6900 getRightLegRotation ()Lnet/minecraft/class_2379; METHOD method_6901 shouldHideBasePlate ()Z METHOD method_6902 setMarker (Z)V + ARG 1 marker METHOD method_6903 getRightArmRotation ()Lnet/minecraft/class_2379; + METHOD method_6904 equip (Lnet/minecraft/class_1657;Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;)Z + METHOD method_6905 updateHealth (Lnet/minecraft/class_1282;F)V + ARG 2 amount METHOD method_6906 setBitField (BIZ)B ARG 1 value ARG 2 bitField ARG 3 set METHOD method_6907 setHideBasePlate (Z)V + ARG 1 hideBasePlate + METHOD method_6908 onBreak (Lnet/minecraft/class_1282;)V METHOD method_6909 setLeftLegRotation (Lnet/minecraft/class_2379;)V METHOD method_6910 setLeftArmRotation (Lnet/minecraft/class_2379;)V METHOD method_6911 serializePose ()Lnet/minecraft/class_2487; METHOD method_6912 isMarker ()Z METHOD method_6913 setShowArms (Z)V + ARG 1 showArms METHOD method_6914 isSmall ()Z + METHOD method_6915 isSlotDisabled (Lnet/minecraft/class_1304;)Z + METHOD method_6916 slotFromPosition (Lnet/minecraft/class_243;)Lnet/minecraft/class_1304; METHOD method_6917 getLeftLegRotation ()Lnet/minecraft/class_2379; METHOD method_6919 setHeadRotation (Lnet/minecraft/class_2379;)V + METHOD method_6920 playBreakSound ()V METHOD method_6921 getHeadRotation ()Lnet/minecraft/class_2379; METHOD method_6922 setSmall (Z)V + ARG 1 small METHOD method_6923 getBodyRotation ()Lnet/minecraft/class_2379; + METHOD method_6924 breakAndDropItem (Lnet/minecraft/class_1282;)V METHOD method_6925 setRightArmRotation (Lnet/minecraft/class_2379;)V METHOD method_6926 setRightLegRotation (Lnet/minecraft/class_2379;)V METHOD method_6927 setBodyRotation (Lnet/minecraft/class_2379;)V diff --git a/mappings/net/minecraft/entity/decoration/EnderCrystalEntity.mapping b/mappings/net/minecraft/entity/decoration/EnderCrystalEntity.mapping index 72425289ef..90a40761fa 100644 --- a/mappings/net/minecraft/entity/decoration/EnderCrystalEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/EnderCrystalEntity.mapping @@ -1,9 +1,16 @@ CLASS net/minecraft/class_1511 net/minecraft/entity/decoration/EnderCrystalEntity FIELD field_7033 BEAM_TARGET Lnet/minecraft/class_2940; + FIELD field_7034 enderCrystalAge I FIELD field_7035 SHOW_BOTTOM Lnet/minecraft/class_2940; + METHOD (Lnet/minecraft/class_1937;DDD)V + ARG 2 x + ARG 4 y + ARG 6 z METHOD method_6835 crystalDestroyed (Lnet/minecraft/class_1282;)V ARG 1 source METHOD method_6836 getShowBottom ()Z METHOD method_6837 setBeamTarget (Lnet/minecraft/class_2338;)V + ARG 1 beamTarget METHOD method_6838 getBeamTarget ()Lnet/minecraft/class_2338; METHOD method_6839 setShowBottom (Z)V + ARG 1 showBottom diff --git a/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping b/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping index c90b5f5904..f287f8b42a 100644 --- a/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_1550 net/minecraft/entity/mob/ElderGuardianEntity + FIELD field_17492 SCALE F diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index 5c067a9386..ec27476c29 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -37,6 +37,7 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity METHOD method_6521 getAskForBambooTicks ()I METHOD method_6522 isPlayful ()Z METHOD method_6523 updateRollOverAnimation ()V + METHOD method_6524 isScaredByThunderstorm ()Z METHOD method_6525 getMainGene ()Lnet/minecraft/class_1440$class_1443; METHOD method_6526 isPlaying ()Z METHOD method_6527 isEating ()Z diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 0e6a556ad1..e9dd81da6c 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -232,6 +232,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7356 getShoulderEntityLeft ()Lnet/minecraft/class_2487; METHOD method_7357 getItemCooldownManager ()Lnet/minecraft/class_1796; METHOD method_7358 wakeUp (ZZ)V + ARG 2 shouldUpdate CLASS class_1658 SleepFailureReason FIELD field_18593 text Lnet/minecraft/class_2561; METHOD (Ljava/lang/String;ILnet/minecraft/class_2561;)V diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 5e58faae48..449fc59b5e 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -189,6 +189,7 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 1 end ARG 2 delta METHOD method_22860 fwrapDegrees (D)F + ARG 0 degrees METHOD method_23278 fastInverseCbrt (F)F ARG 0 x METHOD method_24156 clamp (JJJ)J diff --git a/mappings/net/minecraft/world/dimension/TheEndDimension.mapping b/mappings/net/minecraft/world/dimension/TheEndDimension.mapping index 513c9cbb96..5f208a8f31 100644 --- a/mappings/net/minecraft/world/dimension/TheEndDimension.mapping +++ b/mappings/net/minecraft/world/dimension/TheEndDimension.mapping @@ -4,3 +4,4 @@ CLASS net/minecraft/class_2880 net/minecraft/world/dimension/TheEndDimension METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2874;)V ARG 1 world ARG 2 type + METHOD method_12513 getEnderDragonFight ()Lnet/minecraft/class_2881;