Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

24w36a minor things #3979

Merged
merged 2 commits into from
Sep 6, 2024
Merged

24w36a minor things #3979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
526c777
Rename remaining references of Fall Flying to Gliding
Shnupbups Sep 6, 2024
65a76dc
a couple of dropped params
Shnupbups Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ CLASS net/minecraft/class_1007 net/minecraft/client/render/entity/PlayerEntityRe
METHOD method_62605 getShoulderParrotVariant (Lnet/minecraft/class_742;Z)Lnet/minecraft/class_1453$class_7989;
ARG 0 player
ARG 1 left
METHOD method_62607 updateFallFlying (Lnet/minecraft/class_742;Lnet/minecraft/class_10055;F)V
METHOD method_62607 updateGliding (Lnet/minecraft/class_742;Lnet/minecraft/class_10055;F)V
ARG 0 player
ARG 1 state
ARG 2 tickDelta
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/render/entity/state/BipedEntityRenderState.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CLASS net/minecraft/class_10034 net/minecraft/client/render/entity/state/BipedEn
FIELD field_53408 preferredArm Lnet/minecraft/class_1306;
FIELD field_53409 activeHand Lnet/minecraft/class_1268;
FIELD field_53410 isInSneakingPose Z
FIELD field_53411 isFallFlying Z
FIELD field_53411 isGliding Z
FIELD field_53412 isSwimming Z
FIELD field_53413 hasVehicle Z
FIELD field_53414 isUsingItem Z
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/render/entity/state/PlayerEntityRenderState.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CLASS net/minecraft/class_10055 net/minecraft/client/render/entity/state/PlayerE
FIELD field_53530 leftSleeveVisible Z
FIELD field_53531 rightSleeveVisible Z
FIELD field_53532 capeVisible Z
FIELD field_53534 fallFlyingTicks F
FIELD field_53534 glidingTicks F
FIELD field_53535 applyFlyingRotation Z
FIELD field_53539 stuckArrowCount I
FIELD field_53540 stingerCount I
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/render/model/BasicBakedModel.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ CLASS net/minecraft/class_1093 net/minecraft/client/render/model/BasicBakedModel
FIELD field_5424 particleTexture Lnet/minecraft/class_1058;
METHOD <init> (Lnet/minecraft/class_793;Z)V
ARG 1 unbakedModel
ARG 2 hasDepth
METHOD <init> (ZZZLnet/minecraft/class_809;)V
ARG 1 usesAo
ARG 2 isSideLit
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/render/model/BuiltinBakedModel.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ CLASS net/minecraft/class_1090 net/minecraft/client/render/model/BuiltinBakedMod
FIELD field_5404 transformation Lnet/minecraft/class_809;
METHOD <init> (Lnet/minecraft/class_809;Lnet/minecraft/class_1058;Z)V
ARG 1 transformation
ARG 2 sprite
ARG 3 sideLit
6 changes: 3 additions & 3 deletions mappings/net/minecraft/entity/LivingEntity.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
METHOD method_6132 applyArmorToDamage (Lnet/minecraft/class_1282;F)F
ARG 1 source
ARG 2 amount
METHOD method_61417 travelFallFlying ()V
METHOD method_61417 travelGliding ()V
METHOD method_61419 forEachShearedItem (Lnet/minecraft/class_5321;Ljava/util/function/Consumer;)V
ARG 1 lootTable
ARG 2 action
Expand All @@ -676,15 +676,15 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
ARG 1 removedEquipment
ARG 2 slot
ARG 3 container
METHOD method_61424 checkFallFlyingCollision (DD)V
METHOD method_61424 checkGlidingCollision (DD)V
ARG 1 oldSpeed
ARG 3 newSpeed
METHOD method_61426 getEffectiveGravity ()D
METHOD method_61428 travelMidAir (Lnet/minecraft/class_243;)V
ARG 1 movementInput
METHOD method_61429 travelInFluid (Lnet/minecraft/class_243;)V
ARG 1 movementInput
METHOD method_61430 calcFallFlyingVelocity (Lnet/minecraft/class_243;)Lnet/minecraft/class_243;
METHOD method_61430 calcGlidingVelocity (Lnet/minecraft/class_243;)Lnet/minecraft/class_243;
ARG 1 oldVelocity
METHOD method_62821 getBlockingItem ()Lnet/minecraft/class_1799;
COMMENT {@return the item stack currently being used for blocking, such as shields}
Expand Down
2 changes: 1 addition & 1 deletion unpick-definitions/entity_flags.unpick
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ constant entity_flag_index net/minecraft/entity/Entity SPRINTING_FLAG_INDEX
constant entity_flag_index net/minecraft/entity/Entity SWIMMING_FLAG_INDEX
constant entity_flag_index net/minecraft/entity/Entity INVISIBLE_FLAG_INDEX
constant entity_flag_index net/minecraft/entity/Entity GLOWING_FLAG_INDEX
constant entity_flag_index net/minecraft/entity/Entity FALL_FLYING_FLAG_INDEX
constant entity_flag_index net/minecraft/entity/Entity GLIDING_FLAG_INDEX

target_method net/minecraft/entity/Entity getFlag (I)Z
param 0 entity_flag_index
Expand Down