Skip to content

Commit fe100ae

Browse files
Entity model renames (#4139)
* Entity model renames * Fix parameter javadocs
1 parent eb181a9 commit fe100ae

File tree

5 files changed

+41
-25
lines changed

5 files changed

+41
-25
lines changed

mappings/net/minecraft/client/model/Model.mapping

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ CLASS net/minecraft/class_3879 net/minecraft/client/model/Model
3535
ARG 1 animation
3636
METHOD method_62102 animateWalking (Lnet/minecraft/class_7184;FFFF)V
3737
ARG 1 animation
38-
ARG 2 limbFrequency
39-
ARG 3 limbAmplitudeModifier
38+
ARG 2 limbSwingAnimationProgress
39+
ARG 3 limbSwingAmplitude
4040
METHOD method_62103 (Lnet/minecraft/class_7184;FFLnet/minecraft/class_7094;)V
4141
ARG 4 state
4242
METHOD method_62104 getPart (Ljava/lang/String;)Ljava/util/Optional;

mappings/net/minecraft/client/model/ModelPart.mapping

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart
22
FIELD field_3654 pitch F
3-
FIELD field_3655 pivotZ F
4-
FIELD field_3656 pivotY F
5-
FIELD field_3657 pivotX F
3+
FIELD field_3655 originZ F
4+
FIELD field_3656 originY F
5+
FIELD field_3657 originX F
66
FIELD field_3661 children Ljava/util/Map;
77
FIELD field_3663 cuboids Ljava/util/List;
88
FIELD field_3665 visible Z
@@ -37,15 +37,15 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart
3737
ARG 3 light
3838
ARG 4 overlay
3939
ARG 5 color
40-
METHOD method_22703 rotate (Lnet/minecraft/class_4587;)V
40+
METHOD method_22703 applyTransform (Lnet/minecraft/class_4587;)V
4141
ARG 1 matrices
42-
METHOD method_2851 setPivot (FFF)V
42+
METHOD method_2851 setOrigin (FFF)V
4343
ARG 1 x
4444
ARG 2 y
4545
ARG 3 z
4646
METHOD method_32084 getTransform ()Lnet/minecraft/class_5603;
4747
METHOD method_32085 setTransform (Lnet/minecraft/class_5603;)V
48-
ARG 1 rotationData
48+
ARG 1 transform
4949
METHOD method_32086 getChild (Ljava/lang/String;)Lnet/minecraft/class_630;
5050
ARG 1 name
5151
METHOD method_32087 isEmpty ()Z
@@ -68,7 +68,7 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart
6868
ARG 1 transform
6969
METHOD method_41919 hasChild (Ljava/lang/String;)Z
7070
ARG 1 child
71-
METHOD method_41920 translate (Lorg/joml/Vector3f;)V
71+
METHOD method_41920 moveOrigin (Lorg/joml/Vector3f;)V
7272
ARG 1 vec3f
7373
METHOD method_41921 getDefaultTransform ()Lnet/minecraft/class_5603;
7474
METHOD method_41922 rotate (Lorg/joml/Vector3f;)V

mappings/net/minecraft/client/model/ModelTransform.mapping

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ CLASS net/minecraft/class_5603 net/minecraft/client/model/ModelTransform
1111
METHOD comp_3000 pitch ()F
1212
METHOD comp_3001 yaw ()F
1313
METHOD comp_3002 roll ()F
14-
METHOD method_32090 anchor (FFF)Lnet/minecraft/class_5603;
14+
METHOD method_32090 origin (FFF)Lnet/minecraft/class_5603;
1515
ARG 0 x
1616
ARG 1 y
1717
ARG 2 z
1818
METHOD method_32091 of (FFFFFF)Lnet/minecraft/class_5603;
19-
ARG 0 pivotX
20-
ARG 1 pivotY
21-
ARG 2 pivotZ
19+
ARG 0 originX
20+
ARG 1 originY
21+
ARG 2 originZ
2222
ARG 3 pitch
2323
ARG 4 yaw
2424
ARG 5 roll
@@ -30,7 +30,7 @@ CLASS net/minecraft/class_5603 net/minecraft/client/model/ModelTransform
3030
ARG 1 scale
3131
METHOD method_62134 scaled (F)Lnet/minecraft/class_5603;
3232
ARG 1 scale
33-
METHOD method_62135 offset (FFF)Lnet/minecraft/class_5603;
33+
METHOD method_62135 moveOrigin (FFF)Lnet/minecraft/class_5603;
3434
ARG 1 x
3535
ARG 2 y
3636
ARG 3 z

mappings/net/minecraft/client/render/entity/state/LivingEntityRenderState.mapping

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
CLASS net/minecraft/class_10042 net/minecraft/client/render/entity/state/LivingEntityRenderState
22
FIELD field_53446 bodyYaw F
3-
FIELD field_53447 yawDegrees F
3+
FIELD field_53447 relativeHeadYaw F
4+
COMMENT The entity's head yaw relative to its body yaw. For example, if the entity is facing straight ahead, this value is 0.
45
FIELD field_53448 pitch F
56
FIELD field_53449 deathTime F
6-
FIELD field_53450 limbFrequency F
7-
FIELD field_53451 limbAmplitudeMultiplier F
7+
FIELD field_53450 limbSwingAnimationProgress F
8+
FIELD field_53451 limbSwingAmplitude F
89
FIELD field_53452 headItemAnimationProgress F
910
FIELD field_53453 baseScale F
1011
FIELD field_53454 ageScale F
Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,34 @@
11
CLASS net/minecraft/class_8080 net/minecraft/entity/LimbAnimator
22
FIELD field_42109 lastSpeed F
33
FIELD field_42110 speed F
4-
FIELD field_42111 pos F
5-
FIELD field_52449 scale F
4+
COMMENT The speed of the limb movement, also affects the amplitude of their swing.
5+
FIELD field_42111 animationProgress F
6+
COMMENT How far the limbs have progressed in swinging over time.
7+
COMMENT
8+
COMMENT <p>This value is uncapped. It's in arbitrary units and is scaled differently by different entity models
9+
COMMENT (shorter legs need to swing faster to make the entity appear to be running at the same speed).
10+
FIELD field_52449 timeScale F
11+
COMMENT Like {@link #speed}, affects the speed of the limb movement, but without affecting the amplitude of the limb swings.
12+
COMMENT Used by baby zombies etc.
613
METHOD method_48566 getSpeed ()F
714
METHOD method_48567 setSpeed (F)V
815
ARG 1 speed
916
METHOD method_48568 updateLimbs (FFF)V
10-
ARG 1 speed
11-
ARG 2 multiplier
12-
ARG 3 scale
13-
METHOD method_48569 getPos ()F
14-
METHOD method_48570 getSpeed (F)F
17+
COMMENT Called every tick to update limbs.
18+
ARG 1 targetSpeed
19+
COMMENT the target limb speed, that may be reached over multiple ticks.
20+
COMMENT Limb speed affects the amplitude of the limb swings as well as how fast they move
21+
ARG 2 speedChangeRate
22+
COMMENT the rate that the current speed will be updated to the target speed, from 0 to 1.
23+
COMMENT A value of 1 means the target speed will be reached immediately.
24+
COMMENT A value of 0.5 means that the speed will be updated half way towards the target speed each time this method is called.
25+
COMMENT Used to smooth out changes in amplitude
26+
ARG 3 timeScale
27+
COMMENT affects the speed of the limb movement, but without affecting the amplitude of the limb swings
28+
METHOD method_48569 getAnimationProgress ()F
29+
METHOD method_48570 getAmplitude (F)F
1530
ARG 1 tickProgress
1631
METHOD method_48571 isLimbMoving ()Z
17-
METHOD method_48572 getPos (F)F
32+
METHOD method_48572 getAnimationProgress (F)F
1833
ARG 1 tickProgress
1934
METHOD method_61433 reset ()V

0 commit comments

Comments
 (0)