Rescue rai from mappings nightmare (#576)

* Rescue rai from mappings nightmare

* More mappings

* Follow the review

* Apply review suggestions, more mappings

* Review time; more mappings

* Partially address review; more mappings

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

mappings/com/mojang/blaze3d/vertex/VertexConsumer.mapping

@@ -9,7 +9,15 @@ CLASS net/minecraft/unmapped/C_igthdzux com/mojang/blaze3d/vertex/VertexConsumer
 		ARG 5 z
 	METHOD m_etjvwphb light (I)Lnet/minecraft/unmapped/C_igthdzux;
 		ARG 1 uv
+	METHOD m_goritysv vertex (Lnet/minecraft/unmapped/C_cnszsxvd$C_pqokfevb;FFF)Lnet/minecraft/unmapped/C_igthdzux;
+		ARG 2 x
+		ARG 3 y
+		ARG 4 z
 	METHOD m_ifjtzebj unfixColor ()V
+	METHOD m_lfedagne normal (Lnet/minecraft/unmapped/C_cnszsxvd$C_pqokfevb;FFF)Lnet/minecraft/unmapped/C_igthdzux;
+		ARG 2 x
+		ARG 3 y
+		ARG 4 z
 	METHOD m_llqefzuv overlay (II)Lnet/minecraft/unmapped/C_igthdzux;
 		ARG 1 u
 		ARG 2 v

mappings/net/minecraft/block/entity/BlockEntity.mapping

@@ -19,17 +19,24 @@ CLASS net/minecraft/unmapped/C_kvegafmh net/minecraft/block/entity/BlockEntity
 	METHOD m_culdahst readBlockPosFromNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_hynzadkk;
 		ARG 0 nbt
 	METHOD m_dzrbmfhv toIdentifiedNbt (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_hhlwcnih;
+		ARG 1 lookupProvider
 	METHOD m_escrnqip toSyncedNbt (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_hhlwcnih;
 		COMMENT Serializes the state of this block entity that is observable by clients.
 		COMMENT It is sent alongside the initial chunk data, as well as when the block
 		COMMENT entity implements {@link #toUpdatePacket} and decides to use the
 		COMMENT shorthand implementation as described in its javadoc.
+		ARG 1 lookupProvider
 	METHOD m_ftinwujz markRemoved ()V
 	METHOD m_ghbzlfof toNbt (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_hhlwcnih;
+		ARG 1 lookupProvider
+	METHOD m_gmqocbcr (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V
+		ARG 1 nbt
+		ARG 2 lookupProvider
 	METHOD m_idcywgkm createFromNbt (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_kvegafmh;
 		ARG 0 pos
 		ARG 1 state
 		ARG 2 nbt
+		ARG 3 lookupProvider
 	METHOD m_jcglyghm writeIdentifyingLocatingData (Lnet/minecraft/unmapped/C_hhlwcnih;)V
 		ARG 1 nbt
 	METHOD m_jlguerjg copyItemDataRequiresOperator ()Z
@@ -48,21 +55,34 @@ CLASS net/minecraft/unmapped/C_kvegafmh net/minecraft/block/entity/BlockEntity
 		COMMENT {@link net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket#of(BlockEntity) BlockEntityUpdateS2CPacket.of(this)}.
 		COMMENT <p>
 		COMMENT The NBT will be passed to (TODO: restore link) on the client.
+	METHOD m_pcgjfrqh (Lnet/minecraft/unmapped/C_hhlwcnih;)V
+		ARG 1 nbt
 	METHOD m_phlhitmt markDirty ()V
 		COMMENT Marks this block entity as "dirty", in other words it marks it as needing to be saved to disk.
 	METHOD m_pnogyfzc hasWorld ()Z
 	METHOD m_pvqmpwkq writeNbtToStack (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V
 		ARG 1 stack
+		ARG 2 lookupProvider
 	METHOD m_qihknhoq getPos ()Lnet/minecraft/unmapped/C_hynzadkk;
+	METHOD m_qmckaiuk (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_hhlwcnih;
+		ARG 1 lookupProvider
 	METHOD m_qopnimsa writeNbt (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V
 		COMMENT Writes this block entity's custom data to the given NBT compound.
 		ARG 1 nbt
 			COMMENT the NBT to write to
+		ARG 2 lookupProvider
 	METHOD m_qrmwzmws onSyncedBlockEvent (II)Z
 		ARG 1 type
 		ARG 2 data
+	METHOD m_rjyhuhsi (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V
+		ARG 1 nbt
+		ARG 2 lookupProvider
 	METHOD m_rtxjwbev getWorld ()Lnet/minecraft/unmapped/C_cdctfzbn;
+	METHOD m_trzmaydr (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V
+		ARG 1 nbt
+		ARG 2 lookupProvider
 	METHOD m_xokvytvt toIdentifiedLocatedNbt (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_hhlwcnih;
+		ARG 1 lookupProvider
 	METHOD m_yymkkcjv populateCrashReport (Lnet/minecraft/unmapped/C_qympisds;)V
 		ARG 1 crashReportSection
 	METHOD m_zasadoxf writeIdentifyingData (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_wgqvodus;)V

mappings/net/minecraft/client/MinecraftClient.mapping

@@ -133,6 +133,7 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient
 	FIELD f_lyhucjkw soundManager Lnet/minecraft/unmapped/C_hfmtwavd;
 	FIELD f_lzdqneej blockEntityRenderDispatcher Lnet/minecraft/unmapped/C_sicqxpzm;
 	FIELD f_mcryntrs interactionManager Lnet/minecraft/unmapped/C_uxbydbcj;
+	FIELD f_mexskmmu mapDecorationSpriteManager Lnet/minecraft/unmapped/C_qlzllcic;
 	FIELD f_mhjdihfd resourceReloadLogger Lnet/minecraft/unmapped/C_ykwlusnp;
 	FIELD f_mjmiqpir onlineChatEnabled Z
 	FIELD f_mvfcsyrr lastInputType Lnet/minecraft/unmapped/C_qdenxghm;
@@ -309,7 +310,11 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient
 		ARG 1 crashReport
 	METHOD m_kjzoybfi getCreativeHotbarStorage ()Lnet/minecraft/unmapped/C_twtdhnqb;
 	METHOD m_kqqsfyyw getSession ()Lnet/minecraft/unmapped/C_cwfizcnb;
+	METHOD m_kteymuap (Lnet/minecraft/unmapped/C_rdaqiwdt;)V
+		ARG 0 message
 	METHOD m_kuckpnkp getTickDelta ()F
+	METHOD m_kwnconmd (Ljava/io/File;Lnet/minecraft/unmapped/C_cpwnhism;)Lnet/minecraft/unmapped/C_cpwnhism;
+		ARG 1 style
 	METHOD m_kxlqcbtr tick ()V
 	METHOD m_lcfptbuw handleBlockBreaking (Z)V
 		ARG 1 completeBreak
@@ -450,6 +455,8 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient
 	METHOD m_usvofotc getCameraEntity ()Lnet/minecraft/unmapped/C_astfners;
 	METHOD m_uubvcnee isRunning ()Z
 	METHOD m_uwrhtvvb getToastManager ()Lnet/minecraft/unmapped/C_eqfjupcc;
+	METHOD m_vaqurzvd (Ljava/io/File;Lnet/minecraft/unmapped/C_cpwnhism;)Lnet/minecraft/unmapped/C_cpwnhism;
+		ARG 1 style
 	METHOD m_vbjxrdgk getDataFixer ()Lcom/mojang/datafixers/DataFixer;
 	METHOD m_vgywindm run ()V
 	METHOD m_vwmthlxi disconnect (Lnet/minecraft/unmapped/C_wrmtlwqx;)V
@@ -466,6 +473,7 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient
 	METHOD m_yadnzivw isDemo ()Z
 	METHOD m_yknnrfie createSignatureValidator ()Lnet/minecraft/unmapped/C_yvuwcvkm;
 	METHOD m_ymfxsgvs getChatNarratorManager ()Lnet/minecraft/unmapped/C_qwmxzagq;
+	METHOD m_yoajyhla getMapDecorationSpriteManager ()Lnet/minecraft/unmapped/C_qlzllcic;
 	METHOD m_yqabtlyp forcedNameChange ()Z
 	METHOD m_yxvsqbme hasReducedDebugInfo ()Z
 	METHOD m_yyiisqrp isWindowFocused ()Z

mappings/net/minecraft/client/Mouse.mapping

@@ -4,13 +4,14 @@ CLASS net/minecraft/unmapped/C_zgebrxop net/minecraft/client/Mouse
 	FIELD f_etyaqouj glfwTime D
 	FIELD f_jyymxfnt cursorXSmoother Lnet/minecraft/unmapped/C_wnbyzpdi;
 	FIELD f_lazttkdj leftClicked Z
+	FIELD f_mkxxdntm lastMouseUpdateTime D
 	FIELD f_mrhqmiqv y D
-	FIELD f_okstrpms accumulatedScrollX D
+	FIELD f_okstrpms scrollDeltaX D
 	FIELD f_ooacsdpr activeButton I
 	FIELD f_pdoxoshr rightClicked Z
 	FIELD f_pobldenb cursorLocked Z
 	FIELD f_qnxgfpgl ignorePastPos Z
-	FIELD f_rlvqfnpm accumulatedScrollY D
+	FIELD f_rlvqfnpm scrollDeltaY D
 	FIELD f_urvgkvpt tapTicks I
 	FIELD f_vqrnspgs middleClicked Z
 	FIELD f_vykvmmai cursorDeltaX D
@@ -35,12 +36,14 @@ CLASS net/minecraft/unmapped/C_zgebrxop net/minecraft/client/Mouse
 		ARG 3 scrollDeltaX
 		ARG 5 scrollDeltaY
 	METHOD m_iinagrxf hasRightClicked ()Z
+	METHOD m_kntjwzil handleCursorMovement ()V
 	METHOD m_prqrcker (JIJ)V
 		ARG 1 window
 		ARG 3 count
 		ARG 4 names
 	METHOD m_qkmypnyd isCursorLocked ()Z
 	METHOD m_rfgltetm updateLookDirection (D)V
+		ARG 1 mouseUpdateTimeDelta
 	METHOD m_ryeoqosd (JDD)V
 		ARG 1 window
 		ARG 3 offsetX

mappings/net/minecraft/client/gui/GuiGraphics.mapping

@@ -200,6 +200,9 @@ CLASS net/minecraft/unmapped/C_sedilmty net/minecraft/client/gui/GuiGraphics
 		ARG 5 y
 		ARG 6 seed
 		ARG 7 z
+	METHOD m_jsybuzsa scissorContains (II)Z
+		ARG 1 x
+		ARG 2 y
 	METHOD m_jzpbdcnw drawTooltip (Lnet/minecraft/unmapped/C_mavozmpp;Ljava/util/List;II)V
 		ARG 1 textRenderer
 		ARG 2 tooltip
@@ -295,6 +298,13 @@ CLASS net/minecraft/unmapped/C_sedilmty net/minecraft/client/gui/GuiGraphics
 		ARG 3 y
 		ARG 4 width
 		ARG 5 height
+	METHOD m_qsqjleim fillRenderLayer (Lnet/minecraft/unmapped/C_tizlwnnv;IIIII)V
+		ARG 1 layer
+		ARG 2 startX
+		ARG 3 startY
+		ARG 4 endX
+		ARG 5 endY
+		ARG 6 z
 	METHOD m_qstrpmyr fill (IIIII)V
 		ARG 1 x1
 		ARG 2 y1
@@ -456,4 +466,7 @@ CLASS net/minecraft/unmapped/C_sedilmty net/minecraft/client/gui/GuiGraphics
 		FIELD f_qblwlwvg stack Ljava/util/Deque;
 		METHOD m_adcpupvd push (Lnet/minecraft/unmapped/C_erwldarl;)Lnet/minecraft/unmapped/C_erwldarl;
 			ARG 1 area
+		METHOD m_kevgcgwr contains (II)Z
+			ARG 1 x
+			ARG 2 y
 		METHOD m_pcisyrcm pop ()Lnet/minecraft/unmapped/C_erwldarl;

mappings/net/minecraft/client/gui/RotatingCubeMapRenderer.mapping

@@ -3,8 +3,15 @@ CLASS net/minecraft/unmapped/C_dmftscsi net/minecraft/client/gui/RotatingCubeMap
 	FIELD f_inbshiyx client Lnet/minecraft/unmapped/C_ayfeobid;
 	FIELD f_iqlcsvnk pitch F
 	FIELD f_kcqgfpau yaw F
+	FIELD f_osoztqqz PANORAMA_OVERLAY Lnet/minecraft/unmapped/C_ncpywfca;
 	METHOD <init> (Lnet/minecraft/unmapped/C_jbfwoepk;)V
 		ARG 1 cubeMap
 	METHOD m_gvslwppt wrap (FF)F
 		ARG 0 value
 		ARG 1 max
+	METHOD m_ptrewkqw render (Lnet/minecraft/unmapped/C_sedilmty;IIFF)V
+		ARG 1 graphics
+		ARG 2 width
+		ARG 3 height
+		ARG 4 alpha
+		ARG 5 tickDelta

mappings/net/minecraft/client/gui/hud/in_game/InGameHud.mapping

@@ -97,6 +97,13 @@ CLASS net/minecraft/unmapped/C_nepwsmgw net/minecraft/client/gui/hud/in_game/InG
 	METHOD m_btqrbwce renderCrosshair (Lnet/minecraft/unmapped/C_sedilmty;F)V
 		ARG 1 graphics
 		ARG 2 tickDelta
+	METHOD m_cdocxyqv renderArmorBar (Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_jzrpycqo;IIII)V
+		ARG 0 graphics
+		ARG 1 player
+		ARG 2 y
+		ARG 3 uncappedMaxHealth
+		ARG 4 cappedMaxHealth
+		ARG 5 x
 	METHOD m_ciysbohv getSpectatorHud ()Lnet/minecraft/unmapped/C_ybztcyiy;
 	METHOD m_ckjzczem (Lnet/minecraft/unmapped/C_lfemghur;)Z
 		ARG 0 entry
@@ -152,6 +159,11 @@ CLASS net/minecraft/unmapped/C_nepwsmgw net/minecraft/client/gui/hud/in_game/InG
 		ARG 2 tickDelta
 	METHOD m_mocrhtmt (Lnet/minecraft/unmapped/C_ymwyplge;Lnet/minecraft/unmapped/C_zhwspcux;Lnet/minecraft/unmapped/C_lfemghur;)Lnet/minecraft/unmapped/C_nepwsmgw$C_utdjjnqv;
 		ARG 3 entry
+	METHOD m_nenfurdx renderHungerBar (Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_jzrpycqo;II)V
+		ARG 1 graphics
+		ARG 2 player
+		ARG 3 y
+		ARG 4 x
 	METHOD m_nfjwrptj getTextRenderer ()Lnet/minecraft/unmapped/C_mavozmpp;
 	METHOD m_oafggdwi renderStatusEffectOverlay (Lnet/minecraft/unmapped/C_sedilmty;F)V
 		ARG 1 graphics

mappings/net/minecraft/client/gui/screen/BackupPromptScreen.mapping

@@ -1,12 +1,17 @@
 CLASS net/minecraft/unmapped/C_elvupmqi net/minecraft/client/gui/screen/BackupPromptScreen
 	FIELD f_bbxlfnbn showEraseCacheCheckbox Z
-	FIELD f_khazxlgf subtitle Lnet/minecraft/unmapped/C_rdaqiwdt;
+	FIELD f_fewgdmzl onCancelled Ljava/lang/Runnable;
+	FIELD f_khazxlgf description Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_mblzcmck id I
 	FIELD f_okzzeovr wrappedText Lnet/minecraft/unmapped/C_ogfbkizf;
 	FIELD f_vwuzyxro eraseCacheCheckbox Lnet/minecraft/unmapped/C_lvxxsthn;
 	FIELD f_wwwbtzmt callback Lnet/minecraft/unmapped/C_elvupmqi$C_agdgbivq;
 	METHOD <init> (Ljava/lang/Runnable;Lnet/minecraft/unmapped/C_elvupmqi$C_agdgbivq;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_rdaqiwdt;Z)V
+		ARG 1 onCancelled
 		ARG 2 callback
+		ARG 3 title
+		ARG 4 description
+		ARG 5 showEraseCacheCheckbox
 	METHOD m_asphyiui (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
 	METHOD m_ojwzmwxa (Lnet/minecraft/unmapped/C_buwziidm;)V

mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping

@@ -34,6 +34,8 @@ CLASS net/minecraft/unmapped/C_emwfaans net/minecraft/client/gui/screen/CreditsS
 		ARG 2 centered
 	METHOD m_qkovhjee addText (Ljava/lang/String;)V
 		ARG 1 text
+	METHOD m_qmxvybgr renderVignette (Lnet/minecraft/unmapped/C_sedilmty;)V
+		ARG 1 graphics
 	METHOD m_rtotlury close ()V
 	METHOD m_zmzhxysr addEmptyLine ()V
 	CLASS C_ccygjmib CreditsReader

mappings/net/minecraft/client/gui/screen/OutOfMemoryScreen.mapping

@@ -1,4 +1,7 @@
 CLASS net/minecraft/unmapped/C_cmddraud net/minecraft/client/gui/screen/OutOfMemoryScreen
+	FIELD f_gkwqzswk MESSAGE_WIDTH I
+	FIELD f_ouzyuzpz TITLE Lnet/minecraft/unmapped/C_rdaqiwdt;
+	FIELD f_tuzvsdri MESSAGE Lnet/minecraft/unmapped/C_rdaqiwdt;
 	METHOD m_gkpglalq (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
 	METHOD m_qgvgerpk (Lnet/minecraft/unmapped/C_buwziidm;)V

mappings/net/minecraft/client/gui/screen/Screen.mapping

@@ -36,6 +36,13 @@ CLASS net/minecraft/unmapped/C_wrmtlwqx net/minecraft/client/gui/screen/Screen
 	METHOD m_acdaclus isPauseScreen ()Z
 	METHOD m_awpofqnh removed ()V
 	METHOD m_bdijjzsm applyNarratorModeChangeDelay ()V
+	METHOD m_bncrkgkz (F)V
+		ARG 1 tickDelta
+	METHOD m_bovegipe renderPanorama (Lnet/minecraft/unmapped/C_sedilmty;F)V
+		ARG 1 graphics
+		ARG 2 tickDelta
+	METHOD m_bplrnryk renderMenuBackground (Lnet/minecraft/unmapped/C_sedilmty;)V
+		ARG 1 graphics
 	METHOD m_ckkbzfqx createTabNavigation (Lnet/minecraft/unmapped/C_veciqgge;)Lnet/minecraft/unmapped/C_ltcpucbp$C_ypmtwpcy;
 		ARG 1 direction
 	METHOD m_diqdtrjj init (Lnet/minecraft/unmapped/C_ayfeobid;II)V
@@ -66,6 +73,15 @@ CLASS net/minecraft/unmapped/C_wrmtlwqx net/minecraft/client/gui/screen/Screen
 		ARG 0 keyCode
 	METHOD m_guegvdae isSelectAll (I)Z
 		ARG 0 code
+	METHOD m_hjitkdkn renderMenuBackgroundTexture (Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_ncpywfca;IIFFII)V
+		ARG 0 graphics
+		ARG 1 texture
+		ARG 2 x
+		ARG 3 y
+		ARG 4 u
+		ARG 5 v
+		ARG 6 width
+		ARG 7 height
 	METHOD m_htvzhlss repositionElements ()V
 	METHOD m_ioaopcny wrapScreenError (Ljava/lang/Runnable;Ljava/lang/String;Ljava/lang/String;)V
 		ARG 0 task
@@ -153,6 +169,12 @@ CLASS net/minecraft/unmapped/C_wrmtlwqx net/minecraft/client/gui/screen/Screen
 	METHOD m_wcypszzy applyMousePressScrollNarratorDelay ()V
 	METHOD m_wjyrnuws addDrawable (Lnet/minecraft/unmapped/C_dtfldood;)Lnet/minecraft/unmapped/C_dtfldood;
 		ARG 1 drawable
+	METHOD m_wvbxumwq renderMenuBackground (Lnet/minecraft/unmapped/C_sedilmty;IIII)V
+		ARG 1 graphics
+		ARG 2 x
+		ARG 3 y
+		ARG 4 width
+		ARG 5 height
 	METHOD m_wzyluyjp setDeferredTooltip (Ljava/util/List;)V
 		ARG 1 tooltip
 	METHOD m_xaqeivsh init ()V

mappings/net/minecraft/client/gui/screen/ScreenArea.mapping

@@ -26,6 +26,9 @@ CLASS net/minecraft/unmapped/C_erwldarl net/minecraft/client/gui/screen/ScreenAr
 	METHOD m_mkriewtk right ()I
 	METHOD m_qhwkykyi intersection (Lnet/minecraft/unmapped/C_erwldarl;)Lnet/minecraft/unmapped/C_erwldarl;
 		ARG 1 area
+	METHOD m_qudwbqdg contains (II)Z
+		ARG 1 x
+		ARG 2 y
 	METHOD m_rvxjswxu getSize (Lnet/minecraft/unmapped/C_hoesqbkz;)I
 		ARG 1 axis
 	METHOD m_tsklahog getBoundInDirection (Lnet/minecraft/unmapped/C_veciqgge;)I

mappings/net/minecraft/client/gui/screen/StatsScreen.mapping

@@ -1,6 +1,7 @@
 CLASS net/minecraft/unmapped/C_ctfuumpt net/minecraft/client/gui/screen/StatsScreen
 	FIELD f_aoxunbob DOWNLOADING_STATS Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_bhptotct HEADER_TEXTURE Lnet/minecraft/unmapped/C_ncpywfca;
+	FIELD f_cucatyup TITLE Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_hffkyvdd generalStats Lnet/minecraft/unmapped/C_ctfuumpt$C_vksnltzx;
 	FIELD f_iuinfljj NONE Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_lmaweetq SLOT_ICON_TEXTURE Lnet/minecraft/unmapped/C_ncpywfca;

mappings/net/minecraft/client/gui/screen/TitleScreen.mapping

@@ -2,9 +2,11 @@ CLASS net/minecraft/unmapped/C_fvenkkjb net/minecraft/client/gui/screen/TitleScr
 	FIELD f_afbyvubh backgroundFadeStart J
 	FIELD f_bmhmjgwk COPYRIGHT Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_dtmheaju logoRenderer Lnet/minecraft/unmapped/C_siglwpps;
+	FIELD f_dyajuhsh backgroundFade F
 	FIELD f_ejkdvxtu buttonResetDemo Lnet/minecraft/unmapped/C_buwziidm;
 	FIELD f_fetehicy LOGGER Lorg/slf4j/Logger;
 	FIELD f_lrsxhjvr warningMessage Lnet/minecraft/unmapped/C_fvenkkjb$C_ztkvqriy;
+	FIELD f_lvqdedcp BACKGROUND_FADE_TIME F
 	FIELD f_mljnrxlk realmsNotificationGui Lnet/minecraft/unmapped/C_whfmirsi;
 	FIELD f_nzgjdrfg DEMO_WORLD_NAME Ljava/lang/String;
 	FIELD f_phbtavme splashTextRenderer Lnet/minecraft/unmapped/C_vayghdrj;

mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping

@@ -14,6 +14,7 @@ CLASS net/minecraft/unmapped/C_hejpktqu net/minecraft/client/gui/screen/advancem
 	FIELD f_szqkwjov PAGE_Y_OFFSET I
 	FIELD f_ululreqo selectedTab Lnet/minecraft/unmapped/C_jijouocm;
 	FIELD f_vhllczpn BACKGROUND_TILE_COUNT_Y I
+	FIELD f_withhsec parent Lnet/minecraft/unmapped/C_wrmtlwqx;
 	FIELD f_wludnbut SCROLL_MULTIPLIER D
 	FIELD f_xetahiww ADVANCEMENTS Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_xpswrzwd TITLE_Y_OFFSET I
@@ -22,17 +23,22 @@ CLASS net/minecraft/unmapped/C_hejpktqu net/minecraft/client/gui/screen/advancem
 	FIELD f_zvudtfwv TITLE_X_OFFSET I
 	METHOD <init> (Lnet/minecraft/unmapped/C_wojlspxv;)V
 		ARG 1 advancementHandler
+	METHOD <init> (Lnet/minecraft/unmapped/C_wojlspxv;Lnet/minecraft/unmapped/C_wrmtlwqx;)V
+		ARG 2 parent
 	METHOD m_drhicdbj drawWidgets (Lnet/minecraft/unmapped/C_sedilmty;II)V
+		ARG 1 graphics
 		ARG 2 x
 		ARG 3 y
 	METHOD m_ircfxfxr getAdvancementWidget (Lnet/minecraft/unmapped/C_seqaydby;)Lnet/minecraft/unmapped/C_lmrhoxpe;
 		ARG 1 node
 	METHOD m_mswxhxpr drawWidgetTooltip (Lnet/minecraft/unmapped/C_sedilmty;IIII)V
+		ARG 1 graphics
 		ARG 2 mouseX
 		ARG 3 mouseY
 		ARG 4 x
 		ARG 5 y
 	METHOD m_yzkifjcp drawAdvancementTree (Lnet/minecraft/unmapped/C_sedilmty;IIII)V
+		ARG 1 graphics
 		ARG 2 mouseX
 		ARG 3 mouseY
 		ARG 4 x

mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping

@@ -9,13 +9,22 @@ CLASS net/minecraft/unmapped/C_lkskxcwz net/minecraft/client/gui/screen/ingame/I
 	METHOD m_ekzothcc (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
 	METHOD m_jzlajcdh drawEntity (Lnet/minecraft/unmapped/C_sedilmty;FFFLorg/joml/Vector3f;Lorg/joml/Quaternionf;Lorg/joml/Quaternionf;Lnet/minecraft/unmapped/C_usxaxydn;)V
+		ARG 0 graphics
+		ARG 1 x
+		ARG 2 y
+		ARG 3 size
+		ARG 4 offset
 		ARG 5 matrixMultiplier
 		ARG 6 rotation
 		ARG 7 entity
 	METHOD m_yyefzvem drawEntity (Lnet/minecraft/unmapped/C_sedilmty;IIIIIFFFLnet/minecraft/unmapped/C_usxaxydn;)V
-		ARG 1 x
-		ARG 2 y
-		ARG 3 size
-		ARG 6 lookX
-		ARG 7 lookY
+		ARG 0 graphics
+		ARG 1 x1
+		ARG 2 y1
+		ARG 3 x2
+		ARG 4 y2
+		ARG 5 size
+		ARG 6 offsetY
+		ARG 7 lookX
+		ARG 8 lookY
 		ARG 9 entity

mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping

@@ -18,6 +18,7 @@ CLASS net/minecraft/unmapped/C_ktalreqx net/minecraft/client/gui/screen/ingame/S
 	FIELD f_tgxlaroz DISPLAY_Z_OFFSET I
 	FIELD f_ujfmbugk DISPLAY_X_OFFSET I
 	FIELD f_uyerzhol ingredientSlot Lnet/minecraft/unmapped/C_vvwjfbwu;
+	FIELD f_vroooedc DISPLAY_TRANSLATION Lorg/joml/Vector3f;
 	FIELD f_vzkmspop ERROR_ICON_HEIGHT I
 	FIELD f_xnxhcvvj ERROR_ICON_Y I
 	FIELD f_xtkpzwbf UPGRADE_ERROR_TOOLTIP Lnet/minecraft/unmapped/C_rdaqiwdt;