diff --git a/mappings/net/minecraft/client/texture/MissingSprite.mapping b/mappings/net/minecraft/client/texture/MissingSprite.mapping index 9598c4f224..0d1810f44d 100644 --- a/mappings/net/minecraft/client/texture/MissingSprite.mapping +++ b/mappings/net/minecraft/client/texture/MissingSprite.mapping @@ -3,7 +3,18 @@ CLASS net/minecraft/class_1047 net/minecraft/client/texture/MissingSprite FIELD field_5219 MISSINGNO Lnet/minecraft/class_2960; FIELD field_5220 texture Lnet/minecraft/class_1043; FIELD field_5221 IMAGE Lnet/minecraft/class_3528; + METHOD (Lnet/minecraft/class_1059;IIIII)V + ARG 2 maxLevel + ARG 3 atlasWidth + ARG 4 atlasHeight + ARG 5 x + ARG 6 y METHOD method_24104 getMissingInfo ()Lnet/minecraft/class_1058$class_4727; METHOD method_4539 getMissingSpriteId ()Lnet/minecraft/class_2960; METHOD method_4540 getMissingSpriteTexture ()Lnet/minecraft/class_1043; METHOD method_4541 getMissingSprite (Lnet/minecraft/class_1059;IIIII)Lnet/minecraft/class_1047; + ARG 1 maxLevel + ARG 2 atlasWidth + ARG 3 atlasHeight + ARG 4 x + ARG 5 y diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping index 26322ca26d..2882214d69 100644 --- a/mappings/net/minecraft/client/texture/NativeImage.mapping +++ b/mappings/net/minecraft/client/texture/NativeImage.mapping @@ -44,6 +44,7 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage ARG 1 blue ARG 2 green ARG 3 red + METHOD method_24032 write (Ljava/nio/channels/WritableByteChannel;)Z METHOD method_24033 getRed (I)I ARG 0 color METHOD method_24034 getGreen (I)I @@ -61,7 +62,7 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage ARG 1 level ARG 2 offsetX ARG 3 offsetY - ARG 4 mipmap + ARG 4 close METHOD method_4302 untrack ()V METHOD method_4303 read (Lnet/minecraft/class_1011$class_1012;Ljava/nio/ByteBuffer;)Lnet/minecraft/class_1011; METHOD method_4304 copyRect (IIIIIIZZ)V diff --git a/mappings/net/minecraft/client/texture/ResourceTexture.mapping b/mappings/net/minecraft/client/texture/ResourceTexture.mapping index b94aca1b9e..1ac540907b 100644 --- a/mappings/net/minecraft/client/texture/ResourceTexture.mapping +++ b/mappings/net/minecraft/client/texture/ResourceTexture.mapping @@ -5,6 +5,9 @@ CLASS net/minecraft/class_1049 net/minecraft/client/texture/ResourceTexture ARG 1 location METHOD method_18153 loadTextureData (Lnet/minecraft/class_3300;)Lnet/minecraft/class_1049$class_4006; ARG 1 resourceManager + METHOD method_22810 upload (Lnet/minecraft/class_1011;ZZ)V + ARG 2 blur + ARG 3 clamp CLASS class_4006 TextureData FIELD field_17895 metadata Lnet/minecraft/class_1084; FIELD field_17896 image Lnet/minecraft/class_1011; diff --git a/mappings/net/minecraft/client/texture/Sprite.mapping b/mappings/net/minecraft/client/texture/Sprite.mapping index 54261f74fc..24aa399196 100644 --- a/mappings/net/minecraft/client/texture/Sprite.mapping +++ b/mappings/net/minecraft/client/texture/Sprite.mapping @@ -13,7 +13,15 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite FIELD field_5270 uMin F FIELD field_5271 animationMetadata Lnet/minecraft/class_1079; FIELD field_5272 frameTicks I + COMMENT The tick position within the current frame. + COMMENT Resets to 0 on every frame advance. FIELD field_5273 frameIndex I + METHOD (Lnet/minecraft/class_1059;Lnet/minecraft/class_1058$class_4727;IIIIILnet/minecraft/class_1011;)V + ARG 3 maxLevel + ARG 4 atlasWidth + ARG 5 atlasHeight + ARG 6 x + ARG 7 y METHOD method_23841 getFrameDeltaFactor ()F METHOD method_23842 getAnimationFrameDelta ()F METHOD method_24108 getTextureSpecificVertexConsumer (Lnet/minecraft/class_4588;)Lnet/minecraft/class_4588; @@ -60,3 +68,19 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite FIELD field_21758 images [Lnet/minecraft/class_1011; METHOD (Lnet/minecraft/class_1058;Lnet/minecraft/class_1058$class_4727;I)V ARG 3 mipmap + METHOD method_24128 apply ()V + COMMENT Linearly interpolate between the current and next frame on all miplevels + COMMENT based on the tick position within the current frame, + COMMENT and upload the results to the currently bound texture to the frame slot at position (0,0). + METHOD method_24129 lerp (DII)I + COMMENT Purely mathematical single-value linear interpolation. + COMMENT {@code lerp(0, a, b) == b}, {@code lerp(1, a, b) == a}. + ARG 1 delta + ARG 3 to + ARG 4 from + METHOD method_24130 getPixelColor (IIII)I + COMMENT Returns the pixel color at frame {@code frameIndex} within mipmap {@code layer} at sprite relative coordinates. + ARG 1 frameIndex + ARG 2 layer + ARG 3 x + ARG 4 y diff --git a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping index 5c2891931b..3843ace6e8 100644 --- a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping +++ b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_1059 net/minecraft/client/texture/SpriteAtlasTexture FIELD field_5278 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_5280 sprites Ljava/util/Map; METHOD method_18159 upload (Lnet/minecraft/class_1059$class_4007;)V + METHOD method_18161 loadSprites (Lnet/minecraft/class_3300;Lnet/minecraft/class_1055;I)Ljava/util/List; + ARG 3 maxLevel METHOD method_18163 stitch (Lnet/minecraft/class_3300;Ljava/util/stream/Stream;Lnet/minecraft/class_3695;I)Lnet/minecraft/class_1059$class_4007; ARG 1 resourceManager ARG 2 idStream @@ -16,11 +18,22 @@ CLASS net/minecraft/class_1059 net/minecraft/client/texture/SpriteAtlasTexture METHOD method_18164 loadSprites (Lnet/minecraft/class_3300;Ljava/util/Set;)Ljava/util/Collection; ARG 1 resourceManager ARG 2 ids + METHOD method_24105 (ILjava/util/concurrent/ConcurrentLinkedQueue;Ljava/util/List;Lnet/minecraft/class_3300;Lnet/minecraft/class_1058$class_4727;IIII)V + ARG 6 atlasWidth + ARG 7 atlasHeight + ARG 8 x + ARG 9 y METHOD method_24106 getId ()Lnet/minecraft/class_2960; + METHOD method_24198 applyTextureFilter (Lnet/minecraft/class_1059$class_4007;)V METHOD method_4601 clear ()V METHOD method_4603 getTexturePath (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; METHOD method_4604 loadSprite (Lnet/minecraft/class_3300;Lnet/minecraft/class_1058$class_4727;IIIII)Lnet/minecraft/class_1058; ARG 1 container + ARG 3 atlasWidth + ARG 4 atlasHeight + ARG 5 maxLevel + ARG 6 x + ARG 7 y METHOD method_4608 getSprite (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1058; ARG 1 id METHOD method_4612 tickAnimatedSprites ()V @@ -29,7 +42,10 @@ CLASS net/minecraft/class_1059 net/minecraft/client/texture/SpriteAtlasTexture FIELD field_17901 width I FIELD field_17902 height I FIELD field_17903 sprites Ljava/util/List; + FIELD field_21795 maxLevel I METHOD (Ljava/util/Set;IIILjava/util/List;)V ARG 1 spriteIds ARG 2 width ARG 3 height + ARG 4 maxLevel + ARG 5 sprites diff --git a/mappings/net/minecraft/client/texture/TextureStitcher.mapping b/mappings/net/minecraft/client/texture/TextureStitcher.mapping index 4831c83d35..be7a2fcaad 100644 --- a/mappings/net/minecraft/client/texture/TextureStitcher.mapping +++ b/mappings/net/minecraft/client/texture/TextureStitcher.mapping @@ -47,3 +47,8 @@ CLASS net/minecraft/class_1055 net/minecraft/client/texture/TextureStitcher METHOD method_4568 addAllFilledSlots (Ljava/util/function/Consumer;)V METHOD method_4569 getX ()I CLASS class_4726 SpriteConsumer + METHOD load (Lnet/minecraft/class_1058$class_4727;IIII)V + ARG 2 width + ARG 3 height + ARG 4 x + ARG 5 y diff --git a/mappings/net/minecraft/client/texture/TextureUtil.mapping b/mappings/net/minecraft/client/texture/TextureUtil.mapping index 43ae2eb2ec..1ab3393eae 100644 --- a/mappings/net/minecraft/client/texture/TextureUtil.mapping +++ b/mappings/net/minecraft/client/texture/TextureUtil.mapping @@ -25,7 +25,7 @@ CLASS net/minecraft/class_4536 net/minecraft/client/texture/TextureUtil ARG 2 maxLevel ARG 3 width ARG 4 height - METHOD method_24962 (Ljava/io/InputStream;)Ljava/nio/ByteBuffer; + METHOD method_24962 readAllToByteBuffer (Ljava/io/InputStream;)Ljava/nio/ByteBuffer; ARG 0 inputStream METHOD method_24963 uploadImage (Ljava/nio/IntBuffer;II)V COMMENT Uploads {@code imageData} to the bound texture. @@ -35,5 +35,5 @@ CLASS net/minecraft/class_4536 net/minecraft/client/texture/TextureUtil ARG 2 height METHOD method_24964 bind (I)V ARG 0 id - METHOD method_24965 (Ljava/io/InputStream;)Ljava/lang/String; + METHOD method_24965 readAllToString (Ljava/io/InputStream;)Ljava/lang/String; ARG 0 inputStream