From 6fe506e276c66f3f788292615c663285498fad36 Mon Sep 17 00:00:00 2001 From: Sakura Ryoko <116967773+sakura-ryoko@users.noreply.github.com> Date: Wed, 19 Feb 2025 21:34:36 -0500 Subject: [PATCH] Shnupbups summons for texture / screenshot stuff (#4129) --- .../minecraft/client/font/RenderableGlyph.mapping | 1 + .../minecraft/client/render/CloudRenderer.mapping | 1 + .../minecraft/client/render/WorldRenderer.mapping | 4 ++++ .../minecraft/client/texture/AbstractTexture.mapping | 1 + .../net/minecraft/client/texture/Animator.mapping | 1 + .../minecraft/client/texture/DrawableTexture.mapping | 12 +++++++----- .../client/texture/NativeImageBackedTexture.mapping | 9 +++++++++ .../client/texture/ReloadableTexture.mapping | 1 + mappings/net/minecraft/client/texture/Sprite.mapping | 2 ++ .../minecraft/client/texture/SpriteContents.mapping | 6 ++++++ .../net/minecraft/client/texture/TextureType.mapping | 3 +++ 11 files changed, 36 insertions(+), 5 deletions(-) diff --git a/mappings/net/minecraft/client/font/RenderableGlyph.mapping b/mappings/net/minecraft/client/font/RenderableGlyph.mapping index 51c463a863..4bc8429a48 100644 --- a/mappings/net/minecraft/client/font/RenderableGlyph.mapping +++ b/mappings/net/minecraft/client/font/RenderableGlyph.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_383 net/minecraft/client/font/RenderableGlyph METHOD method_2030 upload (IILnet/minecraft/class_10792;)V ARG 1 x ARG 2 y + ARG 3 texture METHOD method_2031 getWidth ()I METHOD method_2032 getHeight ()I METHOD method_2033 hasColor ()Z diff --git a/mappings/net/minecraft/client/render/CloudRenderer.mapping b/mappings/net/minecraft/client/render/CloudRenderer.mapping index f4041a6e7d..b0787c1da4 100644 --- a/mappings/net/minecraft/client/render/CloudRenderer.mapping +++ b/mappings/net/minecraft/client/render/CloudRenderer.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_9955 net/minecraft/client/render/CloudRenderer ARG 1 color ARG 2 cloudRenderMode ARG 3 cloudHeight + ARG 4 cameraPos METHOD method_62169 packCloudCell (IZZZZ)J ARG 0 color ARG 1 borderNorth diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 51a3554bed..20d26c3a55 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -226,6 +226,10 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 4 fog METHOD method_62204 renderClouds (Lnet/minecraft/class_9909;Lnet/minecraft/class_4063;Lnet/minecraft/class_243;FIF)V ARG 1 frameGraphBuilder + ARG 2 mode + ARG 3 cameraPos + ARG 5 color + ARG 6 cloudHeight METHOD method_62206 renderBlockDamage (Lnet/minecraft/class_4587;Lnet/minecraft/class_4184;Lnet/minecraft/class_4597$class_4598;)V ARG 1 matrices ARG 2 camera diff --git a/mappings/net/minecraft/client/texture/AbstractTexture.mapping b/mappings/net/minecraft/client/texture/AbstractTexture.mapping index efbdeb6f8c..40b6faf067 100644 --- a/mappings/net/minecraft/client/texture/AbstractTexture.mapping +++ b/mappings/net/minecraft/client/texture/AbstractTexture.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1044 net/minecraft/client/texture/AbstractTexture FIELD field_5205 bilinear Z + FIELD field_56974 texture Lnet/minecraft/class_10792; METHOD method_23207 bindTexture ()V METHOD method_4527 setFilter (ZZ)V ARG 1 bilinear diff --git a/mappings/net/minecraft/client/texture/Animator.mapping b/mappings/net/minecraft/client/texture/Animator.mapping index cffa22f817..afd7384a12 100644 --- a/mappings/net/minecraft/client/texture/Animator.mapping +++ b/mappings/net/minecraft/client/texture/Animator.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_7768 net/minecraft/client/texture/Animator METHOD method_45824 tick (IILnet/minecraft/class_10792;)V ARG 1 x ARG 2 y + ARG 3 texture diff --git a/mappings/net/minecraft/client/texture/DrawableTexture.mapping b/mappings/net/minecraft/client/texture/DrawableTexture.mapping index 4224db90f9..3d637cb45c 100644 --- a/mappings/net/minecraft/client/texture/DrawableTexture.mapping +++ b/mappings/net/minecraft/client/texture/DrawableTexture.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_10792 net/minecraft/client/texture/DrawableTexture FIELD field_56761 width I FIELD field_56762 height I FIELD field_56763 mipLevels I - FIELD field_56764 debugName Ljava/lang/String; + FIELD field_56764 name Ljava/lang/String; FIELD field_56765 closed Z FIELD field_56766 clampedU Lnet/minecraft/class_10790; FIELD field_56767 clampedV Lnet/minecraft/class_10790; @@ -13,7 +13,7 @@ CLASS net/minecraft/class_10792 net/minecraft/client/texture/DrawableTexture FIELD field_56770 hasMipmap Z FIELD field_56771 dirty Z METHOD (Ljava/lang/String;Lnet/minecraft/class_10793;III)V - ARG 1 debugName + ARG 1 name ARG 2 type ARG 3 width ARG 4 height @@ -27,9 +27,9 @@ CLASS net/minecraft/class_10792 net/minecraft/client/texture/DrawableTexture METHOD method_67777 getMipLevels ()I METHOD method_67778 getMippedWidth (I)I ARG 1 mipLevel - METHOD method_67779 replaceImage (Lnet/minecraft/class_1011;)V + METHOD method_67779 save (Lnet/minecraft/class_1011;)V ARG 1 newImage - METHOD method_67780 copyTo (Lnet/minecraft/class_1011;IIIIIII)V + METHOD method_67780 save (Lnet/minecraft/class_1011;IIIIIII)V ARG 1 image ARG 2 mipLevel ARG 3 destX @@ -50,7 +50,7 @@ CLASS net/minecraft/class_10792 net/minecraft/client/texture/DrawableTexture METHOD method_67784 setFilter (Lnet/minecraft/class_10791;Z)V ARG 1 all ARG 2 hasMipMap - METHOD method_67785 upload (Ljava/nio/IntBuffer;Lnet/minecraft/class_1011$class_1012;IIIII)V + METHOD method_67785 save (Ljava/nio/IntBuffer;Lnet/minecraft/class_1011$class_1012;IIIII)V ARG 1 buffer ARG 2 format ARG 3 mipLevel @@ -64,3 +64,5 @@ CLASS net/minecraft/class_10792 net/minecraft/client/texture/DrawableTexture METHOD method_67788 bindTexture ()V METHOD method_67789 getGlId ()I METHOD method_67790 getDebugName ()Ljava/lang/String; + METHOD method_68153 copy (Lnet/minecraft/class_10227;ILjava/lang/Runnable;I)V + METHOD method_68154 copy (Lnet/minecraft/class_10227;ILjava/lang/Runnable;IIIII)V diff --git a/mappings/net/minecraft/client/texture/NativeImageBackedTexture.mapping b/mappings/net/minecraft/client/texture/NativeImageBackedTexture.mapping index d631f2bf52..1e31960168 100644 --- a/mappings/net/minecraft/client/texture/NativeImageBackedTexture.mapping +++ b/mappings/net/minecraft/client/texture/NativeImageBackedTexture.mapping @@ -1,6 +1,15 @@ CLASS net/minecraft/class_1043 net/minecraft/client/texture/NativeImageBackedTexture FIELD field_25794 LOGGER Lorg/slf4j/Logger; FIELD field_5200 image Lnet/minecraft/class_1011; + METHOD (Ljava/lang/String;IIZ)V + ARG 1 textureId + ARG 2 width + ARG 3 height + ARG 4 useStb + METHOD (Ljava/util/function/Supplier;IIZ)V + ARG 2 width + ARG 3 height + ARG 4 useStb METHOD (Ljava/util/function/Supplier;Lnet/minecraft/class_1011;)V ARG 2 image METHOD method_4524 upload ()V diff --git a/mappings/net/minecraft/client/texture/ReloadableTexture.mapping b/mappings/net/minecraft/client/texture/ReloadableTexture.mapping index 3612194bed..f57ee15537 100644 --- a/mappings/net/minecraft/client/texture/ReloadableTexture.mapping +++ b/mappings/net/minecraft/client/texture/ReloadableTexture.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_10537 net/minecraft/client/texture/ReloadableTexture METHOD method_65809 loadContents (Lnet/minecraft/class_3300;)Lnet/minecraft/class_10539; ARG 1 resourceManager METHOD method_65856 load (Lnet/minecraft/class_1011;ZZ)V + ARG 1 image ARG 2 blur ARG 3 clamp METHOD method_65857 reload (Lnet/minecraft/class_10539;)V diff --git a/mappings/net/minecraft/client/texture/Sprite.mapping b/mappings/net/minecraft/client/texture/Sprite.mapping index ac7b3200b8..ce9376c90b 100644 --- a/mappings/net/minecraft/client/texture/Sprite.mapping +++ b/mappings/net/minecraft/client/texture/Sprite.mapping @@ -32,9 +32,11 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite METHOD method_4580 getFrameU (F)F ARG 1 frame METHOD method_4584 upload (Lnet/minecraft/class_10792;)V + ARG 1 texture METHOD method_45851 getContents ()Lnet/minecraft/class_7764; METHOD method_45852 getAtlasId ()Lnet/minecraft/class_2960; METHOD method_4593 getMinV ()F METHOD method_4594 getMinU ()F CLASS class_7770 TickableAnimation METHOD method_45853 tick (Lnet/minecraft/class_10792;)V + ARG 1 texture diff --git a/mappings/net/minecraft/client/texture/SpriteContents.mapping b/mappings/net/minecraft/client/texture/SpriteContents.mapping index 33e2d06bca..1e0f903e27 100644 --- a/mappings/net/minecraft/client/texture/SpriteContents.mapping +++ b/mappings/net/minecraft/client/texture/SpriteContents.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/class_7764 net/minecraft/client/texture/SpriteContents METHOD method_45809 upload (IILnet/minecraft/class_10792;)V ARG 1 x ARG 2 y + ARG 3 texture METHOD method_45810 isPixelTransparent (III)Z ARG 1 frame ARG 2 x @@ -26,6 +27,8 @@ CLASS net/minecraft/class_7764 net/minecraft/client/texture/SpriteContents ARG 2 y ARG 3 unpackSkipPixels ARG 4 unpackSkipRows + ARG 5 images + ARG 6 texture METHOD method_45812 createAnimation (Lnet/minecraft/class_7771;IILnet/minecraft/class_1079;)Lnet/minecraft/class_7764$class_5790; ARG 1 dimensions ARG 2 imageWidth @@ -48,6 +51,7 @@ CLASS net/minecraft/class_7764 net/minecraft/client/texture/SpriteContents ARG 1 x ARG 2 y ARG 3 animator + ARG 4 texture METHOD method_24130 getPixelColor (Lnet/minecraft/class_7764$class_5790;IIII)I COMMENT {@return the pixel color at frame {@code frameIndex} within mipmap {@code layer} at sprite relative coordinates} ARG 1 animation @@ -66,6 +70,7 @@ CLASS net/minecraft/class_7764 net/minecraft/client/texture/SpriteContents METHOD method_33445 upload (IILnet/minecraft/class_10792;)V ARG 1 x ARG 2 y + ARG 3 texture METHOD method_33446 getFrameX (I)I ARG 1 frame METHOD method_33449 (Lnet/minecraft/class_7764$class_5791;)I @@ -77,6 +82,7 @@ CLASS net/minecraft/class_7764 net/minecraft/client/texture/SpriteContents ARG 1 x ARG 2 y ARG 3 frame + ARG 4 texture METHOD method_45823 createAnimator ()Lnet/minecraft/class_7768; CLASS class_5791 AnimationFrame FIELD comp_3445 index I diff --git a/mappings/net/minecraft/client/texture/TextureType.mapping b/mappings/net/minecraft/client/texture/TextureType.mapping index 179acfdcd0..96bbbab3e2 100644 --- a/mappings/net/minecraft/client/texture/TextureType.mapping +++ b/mappings/net/minecraft/client/texture/TextureType.mapping @@ -2,10 +2,13 @@ CLASS net/minecraft/class_10793 net/minecraft/client/texture/TextureType FIELD field_56776 glId I FIELD field_56777 formatId I FIELD field_56778 glType I + FIELD field_57101 pixelSize I METHOD (Ljava/lang/String;IIIII)V ARG 3 glId ARG 4 formatId ARG 5 glType + ARG 6 size METHOD method_67791 glId ()I METHOD method_67792 formatId ()I METHOD method_67793 glType ()I + METHOD method_68155 pixelSize ()I