From 29487527cc2c28520eef9a3dedb090990c999ec6 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Wed, 10 Nov 2021 01:55:55 +0900 Subject: [PATCH] 21w44a client stuff (#2816) * 21w44a client * 21w44a font * 21w44a client util --- .../minecraft/client/font/BlankGlyph.mapping | 2 ++ .../net/minecraft/client/font/FontType.mapping | 2 ++ .../client/font/GlyphAtlasTexture.mapping | 1 + .../client/font/MultilineText.mapping | 2 +- .../minecraft/client/font/TextHandler.mapping | 13 +++++++++++-- .../minecraft/client/font/TextRenderer.mapping | 7 +++++++ .../client/font/TextVisitFactory.mapping | 12 ++++++++++++ .../minecraft/client/font/TrueTypeFont.mapping | 6 ++++++ .../client/font/WhiteRectangleGlyph.mapping | 4 ++++ .../client/texture/AbstractTexture.mapping | 5 +++++ .../client/texture/AsyncTexture.mapping | 10 ++++++++++ .../client/texture/MipmapHelper.mapping | 2 ++ .../client/texture/MissingSprite.mapping | 3 +++ .../client/texture/PlayerSkinProvider.mapping | 2 ++ .../client/texture/PlayerSkinTexture.mapping | 1 + .../client/texture/ResourceTexture.mapping | 3 +++ .../minecraft/client/texture/Sprite.mapping | 18 ++++++++++++++++++ .../client/texture/SpriteAtlasTexture.mapping | 9 +++++++++ .../client/texture/TextureManager.mapping | 2 ++ .../client/texture/TextureStitcher.mapping | 16 ++++++++++++++++ .../minecraft/client/toast/RecipeToast.mapping | 1 + .../minecraft/client/toast/SystemToast.mapping | 2 ++ .../client/toast/ToastManager.mapping | 5 +++++ .../minecraft/client/util/ChatMessages.mapping | 3 +++ .../minecraft/client/util/Clipboard.mapping | 1 + .../minecraft/client/util/InputUtil.mapping | 1 + .../client/util/MonitorFactory.mapping | 2 ++ .../client/util/MonitorTracker.mapping | 1 + .../minecraft/client/util/VideoMode.mapping | 4 ++++ 29 files changed, 137 insertions(+), 3 deletions(-) diff --git a/mappings/net/minecraft/client/font/BlankGlyph.mapping b/mappings/net/minecraft/client/font/BlankGlyph.mapping index 10064d1114..a8b72d24d8 100644 --- a/mappings/net/minecraft/client/font/BlankGlyph.mapping +++ b/mappings/net/minecraft/client/font/BlankGlyph.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_385 net/minecraft/client/font/BlankGlyph FIELD field_2281 IMAGE Lnet/minecraft/class_1011; + FIELD field_32228 WIDTH I + FIELD field_32229 HEIGHT I diff --git a/mappings/net/minecraft/client/font/FontType.mapping b/mappings/net/minecraft/client/font/FontType.mapping index 42eaab8458..5ccf8c2858 100644 --- a/mappings/net/minecraft/client/font/FontType.mapping +++ b/mappings/net/minecraft/client/font/FontType.mapping @@ -9,3 +9,5 @@ CLASS net/minecraft/class_394 net/minecraft/client/font/FontType ARG 1 json METHOD method_2048 byId (Ljava/lang/String;)Lnet/minecraft/class_394; ARG 0 id + METHOD method_2049 (Ljava/util/HashMap;)V + ARG 0 map diff --git a/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping b/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping index 571eb1ba41..240d8e2d0e 100644 --- a/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping +++ b/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_380 net/minecraft/client/font/GlyphAtlasTexture FIELD field_2262 id Lnet/minecraft/class_2960; FIELD field_2263 hasColor Z FIELD field_2264 rootSlot Lnet/minecraft/class_380$class_381; + FIELD field_32227 SLOT_LENGTH I FIELD field_33998 polygonOffsetTextLayer Lnet/minecraft/class_1921; METHOD (Lnet/minecraft/class_2960;Z)V ARG 1 id diff --git a/mappings/net/minecraft/client/font/MultilineText.mapping b/mappings/net/minecraft/client/font/MultilineText.mapping index 1331fea46c..1da4dba5fa 100644 --- a/mappings/net/minecraft/client/font/MultilineText.mapping +++ b/mappings/net/minecraft/client/font/MultilineText.mapping @@ -46,7 +46,7 @@ CLASS net/minecraft/class_5489 net/minecraft/client/font/MultilineText ARG 1 text METHOD method_35725 (Lnet/minecraft/class_327;Lnet/minecraft/class_5481;)Lnet/minecraft/class_5489$class_5490; ARG 1 text - METHOD method_35726 (Lnet/minecraft/class_327;Ljava/util/List;)Lnet/minecraft/class_5489; + METHOD method_35726 createFromTexts (Lnet/minecraft/class_327;Ljava/util/List;)Lnet/minecraft/class_5489; ARG 0 renderer ARG 1 texts CLASS class_5490 Line diff --git a/mappings/net/minecraft/client/font/TextHandler.mapping b/mappings/net/minecraft/client/font/TextHandler.mapping index 0bf081e389..34b410559d 100644 --- a/mappings/net/minecraft/client/font/TextHandler.mapping +++ b/mappings/net/minecraft/client/font/TextHandler.mapping @@ -91,6 +91,7 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler ARG 1 text ARG 2 maxWidth ARG 3 style + ARG 4 lineConsumer METHOD method_30875 getWidth (Lnet/minecraft/class_5481;)F ARG 1 text METHOD method_30876 getStyleAt (Lnet/minecraft/class_5481;I)Lnet/minecraft/class_2583; @@ -106,13 +107,19 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler ARG 4 codePoint METHOD method_30878 (Ljava/util/List;Lnet/minecraft/class_5348;Ljava/lang/Boolean;)V ARG 1 text + ARG 2 lastLineWrapped METHOD method_30879 (Lorg/apache/commons/lang3/mutable/MutableFloat;ILnet/minecraft/class_2583;I)Z ARG 2 index ARG 3 style ARG 4 codePoint - METHOD method_35714 (Lnet/minecraft/class_5348;ILnet/minecraft/class_2583;Lnet/minecraft/class_5348;)Ljava/util/List; + METHOD method_35713 (Ljava/util/List;Lnet/minecraft/class_5348;Lnet/minecraft/class_5348;Ljava/lang/Boolean;)V + ARG 2 text + ARG 3 lastLineWrapped + METHOD method_35714 wrapLines (Lnet/minecraft/class_5348;ILnet/minecraft/class_2583;Lnet/minecraft/class_5348;)Ljava/util/List; + ARG 1 text ARG 2 maxWidth ARG 3 style + ARG 4 wrappedLinePrefix METHOD method_35715 getLimitedStringLength (Ljava/lang/String;ILnet/minecraft/class_2583;)I ARG 1 text ARG 2 maxWidth @@ -121,7 +128,7 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler ARG 1 text ARG 2 maxWidth ARG 3 style - METHOD method_35717 (Ljava/lang/String;ILnet/minecraft/class_2583;)I + METHOD method_35717 getEndingIndex (Ljava/lang/String;ILnet/minecraft/class_2583;)I ARG 1 text ARG 2 maxWidth ARG 3 style @@ -139,6 +146,8 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler ARG 1 lineLength ARG 2 skippedLength ARG 3 style + METHOD method_27504 (Lnet/minecraft/class_5225$class_5345;)Ljava/lang/String; + ARG 0 part CLASS class_5227 LineBreakingVisitor FIELD field_24223 maxWidth F FIELD field_24224 endIndex I diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping index 2cabeb5419..9244cac2c1 100644 --- a/mappings/net/minecraft/client/font/TextRenderer.mapping +++ b/mappings/net/minecraft/client/font/TextRenderer.mapping @@ -11,6 +11,8 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer FIELD field_2001 random Ljava/util/Random; FIELD field_24237 FORWARD_SHIFT Lnet/minecraft/class_1160; FIELD field_24238 handler Lnet/minecraft/class_5225; + FIELD field_32166 Z_INDEX F + FIELD field_35427 ARABIC_SHAPING_LETTERS_SHAPE I METHOD (Ljava/util/function/Function;)V ARG 1 fontStorageAccessor METHOD method_1710 drawGlyph (Lnet/minecraft/class_382;ZZFFFLnet/minecraft/class_1159;Lnet/minecraft/class_4588;FFFFI)V @@ -120,6 +122,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer METHOD method_27515 tweakTransparency (I)I ARG 0 argb METHOD method_27516 (ILnet/minecraft/class_2583;)F + ARG 1 codePoint ARG 2 style METHOD method_27517 drawWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_5481;FFI)I ARG 1 matrices @@ -260,6 +263,10 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 6 matrix ARG 7 vertexConsumers ARG 8 light + METHOD method_37297 (Lnet/minecraft/class_327$class_5232;[FIFIIILnet/minecraft/class_2583;I)Z + ARG 7 index + ARG 8 style + ARG 9 codePoint CLASS class_5232 Drawer FIELD field_24239 vertexConsumers Lnet/minecraft/class_4597; FIELD field_24241 shadow Z diff --git a/mappings/net/minecraft/client/font/TextVisitFactory.mapping b/mappings/net/minecraft/client/font/TextVisitFactory.mapping index 09ab9d19ef..980f88207f 100644 --- a/mappings/net/minecraft/client/font/TextVisitFactory.mapping +++ b/mappings/net/minecraft/client/font/TextVisitFactory.mapping @@ -2,6 +2,10 @@ CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory COMMENT A utility class for visiting the characters of strings, handling surrogate COMMENT code points and formatting codes. FIELD field_24215 VISIT_TERMINATED Ljava/util/Optional; + FIELD field_29861 REPLACEMENT_CHARACTER C + METHOD method_27470 (Lnet/minecraft/class_5224;Lnet/minecraft/class_2583;Ljava/lang/String;)Ljava/util/Optional; + ARG 1 style + ARG 2 string METHOD method_27471 validateSurrogates (Ljava/lang/String;)Ljava/lang/String; COMMENT {@return a new string that has all surrogate characters within} COMMENT The characters are validated from an original string {@code text}. @@ -49,6 +53,10 @@ CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory COMMENT the style of the string ARG 2 visitor COMMENT the visitor of characters + METHOD method_27475 (Ljava/lang/StringBuilder;ILnet/minecraft/class_2583;I)Z + ARG 1 index + ARG 2 style + ARG 3 codePoint METHOD method_27476 visitFormatted (Lnet/minecraft/class_5348;Lnet/minecraft/class_2583;Lnet/minecraft/class_5224;)Z COMMENT Visits the code points for every literal string and the formatting codes COMMENT supplied by the renderable. @@ -90,5 +98,9 @@ CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory COMMENT the style of the string ARG 2 visitor COMMENT the visitor + METHOD method_31401 (Ljava/lang/StringBuilder;ILnet/minecraft/class_2583;I)Z + ARG 1 index + ARG 2 style + ARG 3 codePoint METHOD method_31402 removeFormattingCodes (Lnet/minecraft/class_5348;)Ljava/lang/String; ARG 0 text diff --git a/mappings/net/minecraft/client/font/TrueTypeFont.mapping b/mappings/net/minecraft/client/font/TrueTypeFont.mapping index fedfc87564..5309fa70e7 100644 --- a/mappings/net/minecraft/client/font/TrueTypeFont.mapping +++ b/mappings/net/minecraft/client/font/TrueTypeFont.mapping @@ -21,3 +21,9 @@ CLASS net/minecraft/class_395 net/minecraft/client/font/TrueTypeFont FIELD field_2335 glyphIndex I FIELD field_2337 height I FIELD field_2338 width I + METHOD (Lnet/minecraft/class_395;IIIIFFI)V + ARG 2 x1 + ARG 3 x2 + ARG 4 y2 + ARG 5 y1 + ARG 8 glyphIndex diff --git a/mappings/net/minecraft/client/font/WhiteRectangleGlyph.mapping b/mappings/net/minecraft/client/font/WhiteRectangleGlyph.mapping index 8e0198cdaa..79c8ea0b6a 100644 --- a/mappings/net/minecraft/client/font/WhiteRectangleGlyph.mapping +++ b/mappings/net/minecraft/client/font/WhiteRectangleGlyph.mapping @@ -1,2 +1,6 @@ CLASS net/minecraft/class_4591 net/minecraft/client/font/WhiteRectangleGlyph FIELD field_20913 IMAGE Lnet/minecraft/class_1011; + FIELD field_32230 WIDTH I + FIELD field_32231 HEIGHT I + METHOD method_22945 (Lnet/minecraft/class_1011;)V + ARG 0 image diff --git a/mappings/net/minecraft/client/texture/AbstractTexture.mapping b/mappings/net/minecraft/client/texture/AbstractTexture.mapping index 871da77632..ec0906a344 100644 --- a/mappings/net/minecraft/client/texture/AbstractTexture.mapping +++ b/mappings/net/minecraft/client/texture/AbstractTexture.mapping @@ -1,8 +1,13 @@ CLASS net/minecraft/class_1044 net/minecraft/client/texture/AbstractTexture + FIELD field_32948 DEFAULT_ID I FIELD field_5203 mipmap Z FIELD field_5204 glId I FIELD field_5205 bilinear Z METHOD method_18169 registerTexture (Lnet/minecraft/class_1060;Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;Ljava/util/concurrent/Executor;)V + ARG 1 textureManager + ARG 2 resourceManager + ARG 3 id + ARG 4 executor METHOD method_23207 bindTexture ()V METHOD method_4527 setFilter (ZZ)V ARG 1 bilinear diff --git a/mappings/net/minecraft/client/texture/AsyncTexture.mapping b/mappings/net/minecraft/client/texture/AsyncTexture.mapping index f99f2b7ea2..cada56f06f 100644 --- a/mappings/net/minecraft/client/texture/AsyncTexture.mapping +++ b/mappings/net/minecraft/client/texture/AsyncTexture.mapping @@ -1,3 +1,13 @@ CLASS net/minecraft/class_4005 net/minecraft/client/texture/AsyncTexture FIELD field_17894 future Ljava/util/concurrent/CompletableFuture; + METHOD (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;Ljava/util/concurrent/Executor;)V + ARG 1 resourceManager + ARG 2 id + ARG 3 executor METHOD method_18148 getLoadCompleteFuture ()Ljava/util/concurrent/CompletableFuture; + METHOD method_18149 (Lnet/minecraft/class_1049$class_4006;)Ljava/lang/Void; + ARG 0 texture + METHOD method_22808 createRenderThreadExecutor (Ljava/util/concurrent/Executor;)Ljava/util/concurrent/Executor; + ARG 0 executor + METHOD method_22809 (Ljava/util/concurrent/Executor;Ljava/lang/Runnable;)V + ARG 1 runnable diff --git a/mappings/net/minecraft/client/texture/MipmapHelper.mapping b/mappings/net/minecraft/client/texture/MipmapHelper.mapping index 56279b1a85..86c0efdbac 100644 --- a/mappings/net/minecraft/client/texture/MipmapHelper.mapping +++ b/mappings/net/minecraft/client/texture/MipmapHelper.mapping @@ -17,3 +17,5 @@ CLASS net/minecraft/class_4725 net/minecraft/client/texture/MipmapHelper METHOD method_24102 getMipmapLevelsImages (Lnet/minecraft/class_1011;I)[Lnet/minecraft/class_1011; ARG 0 image ARG 1 mipmap + METHOD method_24103 ([F)V + ARG 0 list diff --git a/mappings/net/minecraft/client/texture/MissingSprite.mapping b/mappings/net/minecraft/client/texture/MissingSprite.mapping index 0d1810f44d..cb8f4f0fc1 100644 --- a/mappings/net/minecraft/client/texture/MissingSprite.mapping +++ b/mappings/net/minecraft/client/texture/MissingSprite.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/class_1047 net/minecraft/client/texture/MissingSprite FIELD field_21748 INFO Lnet/minecraft/class_1058$class_4727; + FIELD field_32952 MISSINGNO_ID Ljava/lang/String; 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 1 texture ARG 2 maxLevel ARG 3 atlasWidth ARG 4 atlasHeight @@ -13,6 +15,7 @@ CLASS net/minecraft/class_1047 net/minecraft/client/texture/MissingSprite 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 0 texture ARG 1 maxLevel ARG 2 atlasWidth ARG 3 atlasHeight diff --git a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping index 001f6c0c12..a3620f1b6a 100644 --- a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping +++ b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_1071 net/minecraft/client/texture/PlayerSkinProvider ARG 1 textureManager ARG 2 skinCacheDir ARG 3 sessionService + METHOD method_22819 (Ljava/util/Map;Lnet/minecraft/class_1071$class_1072;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;)V + ARG 3 textureType METHOD method_4651 loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/class_1071$class_1072;)Lnet/minecraft/class_2960; ARG 1 profileTexture ARG 2 type diff --git a/mappings/net/minecraft/client/texture/PlayerSkinTexture.mapping b/mappings/net/minecraft/client/texture/PlayerSkinTexture.mapping index 3d42fda043..88caabad55 100644 --- a/mappings/net/minecraft/client/texture/PlayerSkinTexture.mapping +++ b/mappings/net/minecraft/client/texture/PlayerSkinTexture.mapping @@ -30,6 +30,7 @@ CLASS net/minecraft/class_1046 net/minecraft/client/texture/PlayerSkinTexture ARG 3 x2 ARG 4 y2 METHOD method_22798 remapTexture (Lnet/minecraft/class_1011;)Lnet/minecraft/class_1011; + ARG 1 image METHOD method_4531 uploadTexture (Lnet/minecraft/class_1011;)V ARG 1 image METHOD method_4534 onTextureLoaded (Lnet/minecraft/class_1011;)V diff --git a/mappings/net/minecraft/client/texture/ResourceTexture.mapping b/mappings/net/minecraft/client/texture/ResourceTexture.mapping index 1ac540907b..f677aa5801 100644 --- a/mappings/net/minecraft/client/texture/ResourceTexture.mapping +++ b/mappings/net/minecraft/client/texture/ResourceTexture.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_1049 net/minecraft/client/texture/ResourceTexture 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 1 image ARG 2 blur ARG 3 clamp CLASS class_4006 TextureData @@ -19,5 +20,7 @@ CLASS net/minecraft/class_1049 net/minecraft/client/texture/ResourceTexture ARG 2 image METHOD method_18155 getMetadata ()Lnet/minecraft/class_1084; METHOD method_18156 load (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1049$class_4006; + ARG 0 resourceManager + ARG 1 id METHOD method_18157 getImage ()Lnet/minecraft/class_1011; METHOD method_18158 checkException ()V diff --git a/mappings/net/minecraft/client/texture/Sprite.mapping b/mappings/net/minecraft/client/texture/Sprite.mapping index 82a88a791a..2d5c913934 100644 --- a/mappings/net/minecraft/client/texture/Sprite.mapping +++ b/mappings/net/minecraft/client/texture/Sprite.mapping @@ -14,19 +14,25 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite FIELD field_5270 uMin F METHOD (Lnet/minecraft/class_1059;Lnet/minecraft/class_1058$class_4727;IIIIILnet/minecraft/class_1011;)V ARG 1 atlas + ARG 2 info ARG 3 maxLevel ARG 4 atlasWidth ARG 5 atlasHeight ARG 6 x ARG 7 y + ARG 8 image METHOD method_23841 getFrameDeltaFactor ()F METHOD method_23842 getAnimationFrameDelta ()F METHOD method_24108 getTextureSpecificVertexConsumer (Lnet/minecraft/class_4588;)Lnet/minecraft/class_4588; + ARG 1 consumer METHOD method_24119 getAtlas ()Lnet/minecraft/class_1059; METHOD method_33437 createAnimation (Lnet/minecraft/class_1058$class_4727;III)Lnet/minecraft/class_1058$class_5790; + ARG 1 info ARG 2 nativeImageWidth ARG 3 nativeImageHeight ARG 4 maxLevel + METHOD method_33439 (Lit/unimi/dsi/fastutil/ints/IntSet;I)Z + ARG 0 index METHOD method_33440 (Ljava/util/List;II)V ARG 1 index ARG 2 time @@ -70,6 +76,9 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite METHOD method_24125 getHeight ()I CLASS class_4728 Interpolation FIELD field_21758 images [Lnet/minecraft/class_1011; + METHOD (Lnet/minecraft/class_1058;Lnet/minecraft/class_1058$class_4727;I)V + ARG 2 info + ARG 3 maxLevel METHOD method_24128 apply (Lnet/minecraft/class_1058$class_5790;)V COMMENT Linearly interpolate between the current and next frame on all mip levels COMMENT based on the tick position within the current frame, @@ -94,9 +103,15 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite FIELD field_28472 frames Ljava/util/List; FIELD field_28473 frameCount I FIELD field_28474 interpolation Lnet/minecraft/class_1058$class_4728; + METHOD (Lnet/minecraft/class_1058;Ljava/util/List;ILnet/minecraft/class_1058$class_4728;)V + ARG 2 frames + ARG 3 frameCount + ARG 4 interpolation METHOD method_33445 upload ()V METHOD method_33446 getFrameX (I)I ARG 1 frame + METHOD method_33449 (Lnet/minecraft/class_1058$class_5791;)I + ARG 0 frame METHOD method_33450 getDistinctFrameCount ()Ljava/util/stream/IntStream; METHOD method_33451 getFrameY (I)I ARG 1 frame @@ -105,3 +120,6 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite CLASS class_5791 AnimationFrame FIELD field_28475 index I FIELD field_28476 time I + METHOD (II)V + ARG 1 index + ARG 2 time diff --git a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping index 9cd42939e0..4d5475f748 100644 --- a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping +++ b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping @@ -11,7 +11,10 @@ CLASS net/minecraft/class_1059 net/minecraft/client/texture/SpriteAtlasTexture METHOD (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_18159 upload (Lnet/minecraft/class_1059$class_4007;)V + ARG 1 data METHOD method_18161 loadSprites (Lnet/minecraft/class_3300;Lnet/minecraft/class_1055;I)Ljava/util/List; + ARG 1 resourceManager + ARG 2 textureStitcher 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 @@ -21,6 +24,10 @@ 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_18165 (Lnet/minecraft/class_2960;)V + ARG 0 id + METHOD method_21688 (Lnet/minecraft/class_1058$class_4727;)Ljava/lang/String; + ARG 0 sprite METHOD method_24105 (ILjava/util/Queue;Ljava/util/List;Lnet/minecraft/class_3300;Lnet/minecraft/class_1058$class_4727;IIII)V ARG 6 atlasWidth ARG 7 atlasHeight @@ -28,11 +35,13 @@ CLASS net/minecraft/class_1059 net/minecraft/client/texture/SpriteAtlasTexture ARG 9 y METHOD method_24106 getId ()Lnet/minecraft/class_2960; METHOD method_24198 applyTextureFilter (Lnet/minecraft/class_1059$class_4007;)V + ARG 1 data METHOD method_4601 clear ()V METHOD method_4603 getTexturePath (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; ARG 1 id METHOD method_4604 loadSprite (Lnet/minecraft/class_3300;Lnet/minecraft/class_1058$class_4727;IIIII)Lnet/minecraft/class_1058; ARG 1 container + ARG 2 info ARG 3 atlasWidth ARG 4 atlasHeight ARG 5 maxLevel diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index 1548127fe2..ac11bafb6d 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -14,6 +14,8 @@ CLASS net/minecraft/class_1060 net/minecraft/client/texture/TextureManager ARG 0 runnable METHOD method_22813 bindTexture (Lnet/minecraft/class_2960;)V ARG 1 id + METHOD method_22814 (Ljava/lang/Runnable;)V + ARG 0 runnable METHOD method_24303 loadTexture (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)Lnet/minecraft/class_1044; ARG 1 id ARG 2 texture diff --git a/mappings/net/minecraft/client/texture/TextureStitcher.mapping b/mappings/net/minecraft/client/texture/TextureStitcher.mapping index 556f925c0e..d2f0b86ab4 100644 --- a/mappings/net/minecraft/client/texture/TextureStitcher.mapping +++ b/mappings/net/minecraft/client/texture/TextureStitcher.mapping @@ -11,12 +11,25 @@ CLASS net/minecraft/class_1055 net/minecraft/client/texture/TextureStitcher ARG 1 maxWidth ARG 2 maxHeight ARG 3 mipLevel + METHOD method_18336 (Lnet/minecraft/class_1055$class_4726;Lnet/minecraft/class_1055$class_1057;)V + ARG 2 slot + METHOD method_18337 (Lnet/minecraft/class_1055$class_1056;)Lnet/minecraft/class_2960; + ARG 0 holder + METHOD method_18338 (Lnet/minecraft/class_1055$class_1056;)Ljava/lang/Integer; + ARG 0 holder + METHOD method_18339 (Lnet/minecraft/class_1055$class_1056;)Ljava/lang/Integer; + ARG 0 holder + METHOD method_21686 (Lnet/minecraft/class_1055$class_1056;)Lnet/minecraft/class_1058$class_4727; + ARG 0 holder METHOD method_4549 getStitchedSprites (Lnet/minecraft/class_1055$class_4726;)V + ARG 1 consumer METHOD method_4550 fit (Lnet/minecraft/class_1055$class_1056;)Z + ARG 1 holder METHOD method_4551 applyMipLevel (II)I ARG 0 size ARG 1 mipLevel METHOD method_4552 growAndFit (Lnet/minecraft/class_1055$class_1056;)Z + ARG 1 holder METHOD method_4553 add (Lnet/minecraft/class_1058$class_4727;)V ARG 1 info METHOD method_4554 getWidth ()I @@ -43,11 +56,14 @@ CLASS net/minecraft/class_1055 net/minecraft/client/texture/TextureStitcher ARG 4 height METHOD method_4565 getTexture ()Lnet/minecraft/class_1055$class_1056; METHOD method_4566 fit (Lnet/minecraft/class_1055$class_1056;)Z + ARG 1 holder METHOD method_4567 getY ()I METHOD method_4568 addAllFilledSlots (Ljava/util/function/Consumer;)V + ARG 1 slotConsumer METHOD method_4569 getX ()I CLASS class_4726 SpriteConsumer METHOD load (Lnet/minecraft/class_1058$class_4727;IIII)V + ARG 1 info ARG 2 width ARG 3 height ARG 4 x diff --git a/mappings/net/minecraft/client/toast/RecipeToast.mapping b/mappings/net/minecraft/client/toast/RecipeToast.mapping index b69839bd45..a2bdd8bef7 100644 --- a/mappings/net/minecraft/client/toast/RecipeToast.mapping +++ b/mappings/net/minecraft/client/toast/RecipeToast.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_366 net/minecraft/client/toast/RecipeToast FIELD field_2204 startTime J FIELD field_26533 TITLE Lnet/minecraft/class_2561; FIELD field_26534 DESCRIPTION Lnet/minecraft/class_2561; + FIELD field_32217 DURATION J METHOD (Lnet/minecraft/class_1860;)V ARG 1 recipes METHOD method_1984 addRecipes (Lnet/minecraft/class_1860;)V diff --git a/mappings/net/minecraft/client/toast/SystemToast.mapping b/mappings/net/minecraft/client/toast/SystemToast.mapping index 7ba6e7c2e4..5a6cd37d7a 100644 --- a/mappings/net/minecraft/client/toast/SystemToast.mapping +++ b/mappings/net/minecraft/client/toast/SystemToast.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast FIELD field_2216 startTime J FIELD field_25037 lines Ljava/util/List; FIELD field_25038 width I + FIELD field_32218 DURATION J + FIELD field_32219 MIN_WIDTH I METHOD (Lnet/minecraft/class_370$class_371;Lnet/minecraft/class_2561;Ljava/util/List;I)V ARG 1 type ARG 2 title diff --git a/mappings/net/minecraft/client/toast/ToastManager.mapping b/mappings/net/minecraft/client/toast/ToastManager.mapping index ab61fb535a..0ca1be5b85 100644 --- a/mappings/net/minecraft/client/toast/ToastManager.mapping +++ b/mappings/net/minecraft/client/toast/ToastManager.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_374 net/minecraft/client/toast/ToastManager FIELD field_2238 client Lnet/minecraft/class_310; FIELD field_2239 visibleEntries [Lnet/minecraft/class_374$class_375; FIELD field_2240 toastQueue Ljava/util/Deque; + FIELD field_32220 MAX_VISIBLE_ENTRIES I METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1995 getClient ()Lnet/minecraft/class_310; @@ -15,7 +16,11 @@ CLASS net/minecraft/class_374 net/minecraft/client/toast/ToastManager METHOD method_2000 clear ()V CLASS class_375 Entry FIELD field_2241 instance Lnet/minecraft/class_368; + FIELD field_2242 showTime J + FIELD field_2243 startTime J FIELD field_2244 visibility Lnet/minecraft/class_368$class_369; + METHOD (Lnet/minecraft/class_374;Lnet/minecraft/class_368;)V + ARG 2 instance METHOD method_2001 getInstance ()Lnet/minecraft/class_368; METHOD method_2002 draw (IILnet/minecraft/class_4587;)Z ARG 1 x diff --git a/mappings/net/minecraft/client/util/ChatMessages.mapping b/mappings/net/minecraft/client/util/ChatMessages.mapping index a9aaaca867..690a8a9186 100644 --- a/mappings/net/minecraft/client/util/ChatMessages.mapping +++ b/mappings/net/minecraft/client/util/ChatMessages.mapping @@ -9,3 +9,6 @@ CLASS net/minecraft/class_341 net/minecraft/client/util/ChatMessages METHOD method_27536 (Lnet/minecraft/class_5222;Lnet/minecraft/class_2583;Ljava/lang/String;)Ljava/util/Optional; ARG 1 style ARG 2 message + METHOD method_30886 (Ljava/util/List;Lnet/minecraft/class_5348;Ljava/lang/Boolean;)V + ARG 1 text + ARG 2 lastLineWrapped diff --git a/mappings/net/minecraft/client/util/Clipboard.mapping b/mappings/net/minecraft/client/util/Clipboard.mapping index 24e62b2906..61675e4258 100644 --- a/mappings/net/minecraft/client/util/Clipboard.mapping +++ b/mappings/net/minecraft/client/util/Clipboard.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_3674 net/minecraft/client/util/Clipboard FIELD field_16236 clipboardBuffer Ljava/nio/ByteBuffer; METHOD method_15977 getClipboard (JLorg/lwjgl/glfw/GLFWErrorCallbackI;)Ljava/lang/String; ARG 1 window + ARG 3 errorCallback METHOD method_15978 setClipboard (JLjava/nio/ByteBuffer;[B)V ARG 0 window ARG 2 clipboardBuffer diff --git a/mappings/net/minecraft/client/util/InputUtil.mapping b/mappings/net/minecraft/client/util/InputUtil.mapping index 150841c638..ce8718a03c 100644 --- a/mappings/net/minecraft/client/util/InputUtil.mapping +++ b/mappings/net/minecraft/client/util/InputUtil.mapping @@ -127,6 +127,7 @@ CLASS net/minecraft/class_3675 net/minecraft/client/util/InputUtil ARG 2 cursorPosCallback ARG 3 mouseButtonCallback ARG 4 scrollCallback + ARG 5 dropCallback METHOD method_15984 setCursorParameters (JIDD)V ARG 0 handler ARG 2 inputModeValue diff --git a/mappings/net/minecraft/client/util/MonitorFactory.mapping b/mappings/net/minecraft/client/util/MonitorFactory.mapping index d20fb09c76..eaeba5a6d9 100644 --- a/mappings/net/minecraft/client/util/MonitorFactory.mapping +++ b/mappings/net/minecraft/client/util/MonitorFactory.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_3676 net/minecraft/client/util/MonitorFactory + METHOD createMonitor (J)Lnet/minecraft/class_313; + ARG 1 pointer diff --git a/mappings/net/minecraft/client/util/MonitorTracker.mapping b/mappings/net/minecraft/client/util/MonitorTracker.mapping index ea27567fcd..6b168e0dff 100644 --- a/mappings/net/minecraft/client/util/MonitorTracker.mapping +++ b/mappings/net/minecraft/client/util/MonitorTracker.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_323 net/minecraft/client/util/MonitorTracker ARG 2 max METHOD method_15992 stop ()V METHOD method_1680 getMonitor (J)Lnet/minecraft/class_313; + ARG 1 pointer METHOD method_1681 getMonitor (Lnet/minecraft/class_1041;)Lnet/minecraft/class_313; ARG 1 window METHOD method_1683 handleMonitorEvent (JI)V diff --git a/mappings/net/minecraft/client/util/VideoMode.mapping b/mappings/net/minecraft/client/util/VideoMode.mapping index 85646d0469..1ed260004a 100644 --- a/mappings/net/minecraft/client/util/VideoMode.mapping +++ b/mappings/net/minecraft/client/util/VideoMode.mapping @@ -13,6 +13,10 @@ CLASS net/minecraft/class_319 net/minecraft/client/util/VideoMode ARG 4 greenBits ARG 5 blueBits ARG 6 refreshRate + METHOD (Lorg/lwjgl/glfw/GLFWVidMode$Buffer;)V + ARG 1 buffer + METHOD (Lorg/lwjgl/glfw/GLFWVidMode;)V + ARG 1 vidMode METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_1665 fromString (Ljava/lang/String;)Ljava/util/Optional;