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.

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

1.21.4-pre1 more stuff #4054

Merged
merged 1 commit into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CLASS net/minecraft/class_380 net/minecraft/client/font/GlyphAtlasTexture
FIELD field_32227 SLOT_LENGTH I
FIELD field_44759 textRenderLayers Lnet/minecraft/class_8538;
METHOD <init> (Lnet/minecraft/class_8538;Z)V
ARG 1 textRenderLayers
ARG 2 hasColor
METHOD method_2022 bake (Lnet/minecraft/class_383;)Lnet/minecraft/class_382;
ARG 1 glyph
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_10521 net/minecraft/client/model/ItemAssetsLoader
CLASS net/minecraft/class_10521 net/minecraft/client/item/ItemAssetsLoader
FIELD field_55460 LOGGER Lorg/slf4j/Logger;
FIELD field_55571 FINDER Lnet/minecraft/class_7654;
METHOD method_65927 (Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;Lcom/mojang/serialization/DataResult$Error;)V
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/client/render/RenderPhase.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,10 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase
METHOD method_23564 getId ()Ljava/util/Optional;
CLASS class_5940 Textures
FIELD field_29453 id Ljava/util/Optional;
METHOD <init> (Ljava/util/List;)V
ARG 1 textures
METHOD method_34560 create ()Lnet/minecraft/class_4668$class_5940$class_5941;
CLASS class_10542 TextureEntry
CLASS class_5941 Builder
FIELD field_29454 textures Lcom/google/common/collect/ImmutableList$Builder;
METHOD method_34562 build ()Lnet/minecraft/class_4668$class_5940;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ CLASS net/minecraft/class_1092 net/minecraft/client/render/model/BakedModelManag
ARG 0 id
METHOD method_65756 getBlockEntityModelsSupplier ()Ljava/util/function/Supplier;
METHOD method_65757 getEntityModelsSupplier ()Ljava/util/function/Supplier;
METHOD method_65933 (Lnet/minecraft/class_10097;Lnet/minecraft/class_10434;)V
ARG 1 asset
METHOD method_65934 getItemProperties (Lnet/minecraft/class_2960;)Lnet/minecraft/class_10434$class_10543;
ARG 1 id
CLASS class_7779 BakingResult
9 changes: 9 additions & 0 deletions mappings/net/minecraft/client/texture/AbstractTexture.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,18 @@ CLASS net/minecraft/class_1044 net/minecraft/client/texture/AbstractTexture
FIELD field_32948 DEFAULT_ID I
FIELD field_5204 glId I
FIELD field_5205 bilinear Z
FIELD field_55567 wrapS I
FIELD field_55568 wrapT I
FIELD field_55569 minFilter I
FIELD field_55570 magFilter I
METHOD method_23207 bindTexture ()V
METHOD method_4527 setFilter (ZZ)V
ARG 1 bilinear
ARG 2 mipmap
METHOD method_4528 clearGlId ()V
METHOD method_4624 getGlId ()I
METHOD method_65923 setFilter (Lnet/minecraft/class_9851;Z)V
ARG 1 bilinear
ARG 2 mipmap
METHOD method_65924 setClamp (Z)V
ARG 1 clamp
3 changes: 3 additions & 0 deletions mappings/net/minecraft/client/texture/TextureManager.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,7 @@ CLASS net/minecraft/class_1060 net/minecraft/client/texture/TextureManager
METHOD method_65879 (Ljava/util/List;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)V
ARG 3 id
ARG 4 texture
METHOD method_65925 loadTexture (Lnet/minecraft/class_2960;Lnet/minecraft/class_10537;)Lnet/minecraft/class_10539;
ARG 1 id
ARG 2 texture
CLASS class_10540 ReloadedTexture
4 changes: 4 additions & 0 deletions mappings/net/minecraft/entity/mob/MobEntity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -304,5 +304,9 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
ARG 1 newStack
ARG 2 currentStack
ARG 3 slot
METHOD method_65898 (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;
ARG 0 stack
METHOD method_65899 (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;
ARG 0 stack
METHOD method_7217 setBaby (Z)V
ARG 1 baby
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/mob/ShulkerEntity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ CLASS net/minecraft/class_1606 net/minecraft/entity/mob/ShulkerEntity
ARG 0 scale
ARG 1 facing
ARG 2 extraLength
ARG 3 pos
METHOD method_33347 calculateBoundingBox (FLnet/minecraft/class_2350;FFLnet/minecraft/class_243;)Lnet/minecraft/class_238;
ARG 0 scale
ARG 1 facing
ARG 2 prevExtraLength
ARG 3 extraLength
ARG 4 pos
METHOD method_33348 tryAttachOrTeleport ()V
METHOD method_33349 tickOpenProgress ()Z
METHOD method_33350 moveEntities ()V
Expand Down
15 changes: 15 additions & 0 deletions mappings/net/minecraft/network/OpaqueByteBufHolder.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
CLASS net/minecraft/class_10550 net/minecraft/network/OpaqueByteBufHolder
COMMENT A holder of {@link ByteBuf}. This is used in local connection to skip
COMMENT unnecessary operations that check {@code instanceof ByteBuf}.
METHOD <init> (Lio/netty/buffer/ByteBuf;)V
ARG 1 buf
METHOD method_65937 pack (Ljava/lang/Object;)Ljava/lang/Object;
ARG 0 buf
METHOD method_65939 unpack (Ljava/lang/Object;)Ljava/lang/Object;
ARG 0 holder
METHOD release (I)Z
ARG 1 count
METHOD retain (I)Lio/netty/util/ReferenceCounted;
ARG 1 count
METHOD touch (Ljava/lang/Object;)Lio/netty/util/ReferenceCounted;
ARG 1 object
5 changes: 5 additions & 0 deletions mappings/net/minecraft/network/handler/LocalBufPacker.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
CLASS net/minecraft/class_10552 net/minecraft/network/handler/LocalBufPacker
METHOD write (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/channel/ChannelPromise;)V
ARG 1 context
ARG 2 buf
ARG 3 channelPromise
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CLASS net/minecraft/class_10551 net/minecraft/network/handler/LocalBufUnpacker
METHOD channelRead (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;)V
ARG 1 context
ARG 2 buf