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

More 1.21.2-pre2 stuff #4021

Merged
merged 2 commits into from
Oct 10, 2024
Merged

More 1.21.2-pre2 stuff #4021

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
299444c
More 1.21.2-pre2 stuff
apple502j Oct 10, 2024
ce74d7d
consistency
apple502j Oct 10, 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
16 changes: 16 additions & 0 deletions mappings/com/mojang/blaze3d/systems/ProjectionType.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
CLASS net/minecraft/class_10366 com/mojang/blaze3d/systems/ProjectionType
FIELD field_54955 vertexSorter Lnet/minecraft/class_8251;
FIELD field_54956 applier Lnet/minecraft/class_10366$class_10367;
METHOD <init> (Ljava/lang/String;ILnet/minecraft/class_8251;Lnet/minecraft/class_10366$class_10367;)V
ARG 3 vertexSorter
ARG 4 applier
METHOD method_65045 getVertexSorter ()Lnet/minecraft/class_8251;
METHOD method_65046 apply (Lorg/joml/Matrix4f;F)V
ARG 1 matrix
METHOD method_65048 (Lorg/joml/Matrix4f;F)V
ARG 0 matrix
METHOD method_65049 (Lorg/joml/Matrix4f;F)V
ARG 0 matrix
CLASS class_10367 Applier
METHOD apply (Lorg/joml/Matrix4f;F)V
ARG 1 matrix
1 change: 1 addition & 0 deletions mappings/com/mojang/blaze3d/systems/RenderSystem.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
ARG 0 callback
METHOD setProjectionMatrix (Lorg/joml/Matrix4f;Lnet/minecraft/class_10366;)V
ARG 0 projectionMatrix
ARG 1 projectionType
METHOD setShader (Lnet/minecraft/class_5944;)V
COMMENT Sets the {@code RenderSystem}'s global shader program.
COMMENT
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/font/FontStorage.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage
FIELD field_49121 availableFonts Ljava/util/List;
FIELD field_54819 glyphFinder Ljava/util/function/IntFunction;
FIELD field_54820 glyphBaker Ljava/util/function/IntFunction;
FIELD field_54959 LOGGER Lorg/slf4j/Logger;
METHOD <init> (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;)V
ARG 1 textureManager
ARG 2 id
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/font/TextRenderer.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,4 +226,5 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
ARG 1 x
METHOD method_27532 addRectangle (Lnet/minecraft/class_382$class_328;)V
ARG 1 rectangle
METHOD method_65050 drawGlyphs ()V
CLASS class_6415 TextLayerType
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/render/entity/animation/BreezeAnimations.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ CLASS net/minecraft/class_8972 net/minecraft/client/render/entity/animation/Bree
FIELD field_47430 SLIDING Lnet/minecraft/class_7184;
FIELD field_47846 SLIDING_BACK Lnet/minecraft/class_7184;
FIELD field_52766 INHALING Lnet/minecraft/class_7184;
FIELD field_54958 IDLE Lnet/minecraft/class_7184;
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/render/entity/state/BreezeEntityRenderState.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ CLASS net/minecraft/class_10006 net/minecraft/client/render/entity/state/BreezeE
FIELD field_53286 slidingBackAnimationState Lnet/minecraft/class_7094;
FIELD field_53287 inhalingAnimationState Lnet/minecraft/class_7094;
FIELD field_53288 longJumpingAnimationState Lnet/minecraft/class_7094;
FIELD field_54963 idleAnimationState Lnet/minecraft/class_7094;
6 changes: 5 additions & 1 deletion mappings/net/minecraft/data/server/loottable/BlockLootTableGenerator.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,12 @@ CLASS net/minecraft/class_7788 net/minecraft/data/server/loottable/BlockLootTabl
ARG 1 flowerbed
METHOD method_60390 createSilkTouchCondition ()Lnet/minecraft/class_5341$class_210;
METHOD method_60391 createWithoutSilkTouchCondition ()Lnet/minecraft/class_5341$class_210;
METHOD method_60392 createWithShearsOrSilkTouchCondition ()Lnet/minecraft/class_5341$class_210;
METHOD method_60392 createWithSilkTouchOrShearsCondition ()Lnet/minecraft/class_5341$class_210;
METHOD method_60393 createWithoutShearsOrSilkTouchCondition ()Lnet/minecraft/class_5341$class_210;
METHOD method_62727 createWithShearsCondition ()Lnet/minecraft/class_5341$class_210;
METHOD method_63538 (Ljava/util/Set;Lnet/minecraft/class_2248;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5321;)V
ARG 4 lootTableKey
METHOD method_64930 paleMossCarpetDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
ARG 1 block
METHOD method_65053 dropsWithSilkTouchOrShears (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53;
ARG 1 item
2 changes: 2 additions & 0 deletions .../net/minecraft/data/server/loottable/winterdrop/WinterDropBlockLootTableGenerator.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ CLASS net/minecraft/class_10342 net/minecraft/data/server/loottable/winterdrop/W
ARG 1 block
METHOD method_64938 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
ARG 1 block
METHOD method_65054 (Lnet/minecraft/class_10342;Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53;
ARG 1 block
8 changes: 7 additions & 1 deletion mappings/net/minecraft/entity/Entity.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
FIELD field_51994 portalManager Lnet/minecraft/class_9787;
FIELD field_52442 collidedBlocks Ljava/util/Set;
FIELD field_54946 onFire Z
FIELD field_54947 queuedCollisionChecks Ljava/util/List;
FIELD field_54948 collidedBlockPositions Lit/unimi/dsi/fastutil/longs/LongSet;
FIELD field_5951 ridingCooldown I
FIELD field_5952 onGround Z
FIELD field_5953 firstUpdate Z
Expand Down Expand Up @@ -2252,7 +2254,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
METHOD method_64166 tickBlockCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V
ARG 1 lastRenderPos
ARG 2 pos
METHOD method_64168 checkBlockCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V
METHOD method_64168 queueBlockCollisionCheck (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V
ARG 1 oldPos
ARG 2 newPos
METHOD method_64270 shouldPlayBurnSoundInLava ()Z
Expand Down Expand Up @@ -2304,6 +2306,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
METHOD method_64615 onRemove (Lnet/minecraft/class_1297$class_5529;)V
COMMENT Called when the entity is about to be removed.
ARG 1 reason
METHOD method_65037 checkBlockCollision (Ljava/util/List;Ljava/util/Set;)V
ARG 1 queuedCollisionChecks
ARG 2 collidedBlocks
METHOD method_65038 isControlledByPlayer ()Z
METHOD method_65039 (Lnet/minecraft/class_2680;)Z
ARG 0 state
Expand All @@ -2312,6 +2317,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
COMMENT
COMMENT <p>This returns {@code false} unless the entity is a player in spectator game mode.
METHOD method_7490 getGravity ()D
CLASS class_10365 QueuedCollisionCheck
CLASS class_4738 PositionUpdater
METHOD accept (Lnet/minecraft/class_1297;DDD)V
ARG 1 entity
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/entity/mob/BreezeEntity.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CLASS net/minecraft/class_8949 net/minecraft/entity/mob/BreezeEntity
FIELD field_47269 idleAnimationState Lnet/minecraft/class_7094;
FIELD field_47270 inhalingAnimationState Lnet/minecraft/class_7094;
FIELD field_47277 slidingAnimationState Lnet/minecraft/class_7094;
FIELD field_47279 longJumpingParticleAddCount I
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ CLASS net/minecraft/class_1682 net/minecraft/entity/projectile/thrown/ThrownEnti
ARG 6 z
ARG 8 world
METHOD method_63673 applyDrag ()V
METHOD method_65041 tickInitialBubbleColumnCollision ()V