Merge remote-tracking branch 'upstream/23w42a' into chat-reporting

buildSrc/src/main/java/quilt/internal/Constants.java

@@ -1,7 +1,7 @@
 package quilt.internal;
 
 public class Constants {
-    public static final String MINECRAFT_VERSION = "23w41a";
+    public static final String MINECRAFT_VERSION = "23w42a";
 
     public static final String MAPPINGS_NAME = "quilt-mappings";
 

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

@@ -11,7 +11,6 @@ CLASS net/minecraft/unmapped/C_nxnqmnng com/mojang/blaze3d/vertex/BufferBuilder
 	FIELD f_leftmlzx renderedBufferPointer I
 	FIELD f_ltvrvvts vertexCount I
 	FIELD f_lyiiurbq renderedBufferCount I
-	FIELD f_owtoyaja GROWTH_SIZE I
 	FIELD f_pdtfdgmb quadSorting Lnet/minecraft/unmapped/C_onfzhami;
 	FIELD f_qxmawqzf currentElement Lnet/minecraft/unmapped/C_gmhefnuu;
 	FIELD f_wyaejrdq building Z
@@ -40,8 +39,6 @@ CLASS net/minecraft/unmapped/C_nxnqmnng com/mojang/blaze3d/vertex/BufferBuilder
 	METHOD m_rmhuetro createConsumer (ILnet/minecraft/unmapped/C_rnldvdpe$C_pmanqvls;)Lit/unimi/dsi/fastutil/ints/IntConsumer;
 		ARG 1 i
 		ARG 2 indexType
-	METHOD m_srxxjvcm roundBufferSize (I)I
-		ARG 0 amount
 	METHOD m_tsfjiqbz isBuilding ()Z
 	METHOD m_tsiboenc popBatch ()V
 	METHOD m_tygucxqs endOrDiscard ()Lnet/minecraft/unmapped/C_nxnqmnng$C_xzjaxrha;

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

@@ -1,8 +1,5 @@
 CLASS net/minecraft/unmapped/C_hiiunyvh com/mojang/blaze3d/vertex/Tessellator
 	FIELD f_cpckveuj bufferBuilder Lnet/minecraft/unmapped/C_nxnqmnng;
-	FIELD f_euclddcf DEFAULT_BUFFER_CAPACITY I
-	FIELD f_sjdswwsl INSTANCE Lnet/minecraft/unmapped/C_hiiunyvh;
-	FIELD f_zjworvzf MAX_ALLOWED_MEMORY I
 	METHOD <init> (I)V
 		ARG 1 bufferCapacity
 	METHOD m_dlmvcbvx getInstance ()Lnet/minecraft/unmapped/C_hiiunyvh;

mappings/net/minecraft/client/MinecraftClient.mapping

@@ -324,12 +324,11 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient
 	METHOD m_mmruqhcv scheduleStop ()V
 	METHOD m_moxkuxcg disconnect ()V
 	METHOD m_mqdbnddk handleInputEvents ()V
-	METHOD m_ngtmdbml startIntegratedServer (Ljava/lang/String;Lnet/minecraft/unmapped/C_bpwagnit$C_unecclfw;Lnet/minecraft/unmapped/C_dqfyacfy;Lnet/minecraft/unmapped/C_tljyhzqp;Z)V
-		ARG 1 worldId
-		ARG 2 session
-		ARG 3 resourcePackManager
-		ARG 4 worldStem
-		ARG 5 isNewWorld
+	METHOD m_ngtmdbml startIntegratedServer (Lnet/minecraft/unmapped/C_bpwagnit$C_unecclfw;Lnet/minecraft/unmapped/C_dqfyacfy;Lnet/minecraft/unmapped/C_tljyhzqp;Z)V
+		ARG 1 session
+		ARG 2 resourcePackManager
+		ARG 3 worldStem
+		ARG 4 isNewWorld
 	METHOD m_nibdztri isIntegratedServerRunning ()Z
 	METHOD m_njnkxxki getWindowTitle ()Ljava/lang/String;
 	METHOD m_njtkwlge getSearchableContainer (Lnet/minecraft/unmapped/C_zqzigdge$C_gvofkqkn;)Lnet/minecraft/unmapped/C_inuoeylq;
@@ -345,9 +344,9 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient
 	METHOD m_ogdgxfac addDetailsToCrashReport (Lnet/minecraft/unmapped/C_bkefkbum;)Lnet/minecraft/unmapped/C_bkefkbum;
 		ARG 1 report
 	METHOD m_ogqbmqly getBlockRenderManager ()Lnet/minecraft/unmapped/C_vdyoclwy;
-	METHOD m_ohjyajtu printCrashReport (Lnet/minecraft/unmapped/C_bkefkbum;)V
+	METHOD m_ohjyajtu printCrashReport (Lnet/minecraft/unmapped/C_ayfeobid;Ljava/io/File;Lnet/minecraft/unmapped/C_bkefkbum;)V
 		COMMENT Prints the given crash report, and saves it as a file if it's not already.
-		ARG 0 report
+		ARG 2 report
 			COMMENT the crash report to print
 	METHOD m_omcqclml openPauseMenu (Z)V
 		ARG 1 pause

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

@@ -1,17 +1,9 @@
 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_kwgxkubh parent Lnet/minecraft/unmapped/C_wrmtlwqx;
 	FIELD f_mblzcmck id I
 	FIELD f_okzzeovr wrappedText Lnet/minecraft/unmapped/C_ogfbkizf;
-	FIELD f_tgqwhrvb callback Lnet/minecraft/unmapped/C_elvupmqi$C_agdgbivq;
 	FIELD f_vwuzyxro eraseCacheCheckbox Lnet/minecraft/unmapped/C_lvxxsthn;
-	METHOD <init> (Lnet/minecraft/unmapped/C_wrmtlwqx;Lnet/minecraft/unmapped/C_elvupmqi$C_agdgbivq;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_rdaqiwdt;Z)V
-		ARG 1 parent
-		ARG 2 callback
-		ARG 3 title
-		ARG 4 subtitle
-		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/ConfirmLinkScreen.mapping

@@ -7,12 +7,6 @@ CLASS net/minecraft/unmapped/C_vpzsgabs net/minecraft/client/gui/screen/ConfirmL
 		ARG 1 callback
 		ARG 2 link
 		ARG 3 trusted
-	METHOD <init> (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/lang/String;Lnet/minecraft/unmapped/C_rdaqiwdt;Z)V
-		ARG 1 callback
-		ARG 2 linkText
-		ARG 3 link
-		ARG 4 cancelText
-		ARG 5 trusted
 	METHOD <init> (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/lang/String;Z)V
 		ARG 1 callback
 		ARG 2 linkText
@@ -25,10 +19,9 @@ CLASS net/minecraft/unmapped/C_vpzsgabs net/minecraft/client/gui/screen/ConfirmL
 		ARG 4 link
 		ARG 5 cancelText
 		ARG 6 trusted
-	METHOD m_cytdjtgy createPressAction (Ljava/lang/String;Lnet/minecraft/unmapped/C_wrmtlwqx;Z)Lnet/minecraft/unmapped/C_buwziidm$C_zlxjklbn;
-		ARG 0 url
-		ARG 1 parent
-		ARG 2 trusted
+	METHOD m_cytdjtgy createPressAction (Lnet/minecraft/unmapped/C_wrmtlwqx;Ljava/lang/String;)Lnet/minecraft/unmapped/C_buwziidm$C_zlxjklbn;
+		ARG 0 parent
+		ARG 1 url
 	METHOD m_ihsvhqjl getConfirmText (Z)Lnet/minecraft/unmapped/C_npqneive;
 		ARG 0 trusted
 	METHOD m_jiizvmet getConfirmLinkText (ZLjava/lang/String;)Lnet/minecraft/unmapped/C_npqneive;
@@ -43,9 +36,8 @@ CLASS net/minecraft/unmapped/C_vpzsgabs net/minecraft/client/gui/screen/ConfirmL
 	METHOD m_tetcejor copyToClipboard ()V
 	METHOD m_tmbjrlsh (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
-	METHOD m_ulxnbtsb (Ljava/lang/String;Lnet/minecraft/unmapped/C_wrmtlwqx;ZLnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 3 buttonWidget
-	METHOD m_uufhtalw create (Ljava/lang/String;Lnet/minecraft/unmapped/C_wrmtlwqx;Z)V
-		ARG 0 url
-		ARG 1 parent
-		ARG 2 trusted
+	METHOD m_ulxnbtsb (Lnet/minecraft/unmapped/C_wrmtlwqx;Ljava/lang/String;Lnet/minecraft/unmapped/C_buwziidm;)V
+		ARG 2 buttonWidget
+	METHOD m_uufhtalw create (Lnet/minecraft/unmapped/C_wrmtlwqx;Ljava/lang/String;)V
+		ARG 0 parent
+		ARG 1 url

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

@@ -1,8 +1,5 @@
 CLASS net/minecraft/unmapped/C_pnqobjdd net/minecraft/client/gui/screen/DataPackFailureScreen
-	FIELD f_impljejs runServerInSafeMode Ljava/lang/Runnable;
 	FIELD f_pibnbemo wrappedText Lnet/minecraft/unmapped/C_ogfbkizf;
-	METHOD <init> (Ljava/lang/Runnable;)V
-		ARG 1 runServerInSafeMode
 	METHOD m_fyasvnsl (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
 	METHOD m_wnuxnajd (Lnet/minecraft/unmapped/C_buwziidm;)V

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

@@ -28,8 +28,6 @@ CLASS net/minecraft/unmapped/C_gxawvqxt net/minecraft/client/gui/screen/GameMenu
 	METHOD m_gqylrxts initWidgets ()V
 	METHOD m_gxbhjsvd (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
-	METHOD m_kwizwszt (Ljava/lang/String;Z)V
-		ARG 2 confirmed
 	METHOD m_rkfzqxdi createLinkConfirmationButton (Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/lang/String;)Lnet/minecraft/unmapped/C_buwziidm;
 		ARG 1 text
 		ARG 2 url

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

@@ -2,22 +2,14 @@ CLASS net/minecraft/unmapped/C_twjlxgie net/minecraft/client/gui/screen/SymlinkW
 	FIELD f_aiosiosg PACK_SYMLINK_WARNING_TITLE Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_bumywidx grid Lnet/minecraft/unmapped/C_qykucwmu;
 	FIELD f_clkeichn url Ljava/lang/String;
-	FIELD f_fnzmfcnq parent Lnet/minecraft/unmapped/C_wrmtlwqx;
 	FIELD f_toehpsjn WORLD_SYMLINK_WARNING_TITLE Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_trmkzzpe PACK_SYMLINK_WARNING_MESSAGE Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_txvgkbum WORLD_SYMLINK_WARNING_MESSAGE Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_xrjwjadt message Lnet/minecraft/unmapped/C_rdaqiwdt;
-	METHOD <init> (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/lang/String;Lnet/minecraft/unmapped/C_wrmtlwqx;)V
-		ARG 1 title
-		ARG 2 message
-		ARG 3 url
-		ARG 4 parent
 	METHOD m_ceacgooy (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
-	METHOD m_kiswparz createWorldSymlinkWarningScreen (Lnet/minecraft/unmapped/C_wrmtlwqx;)Lnet/minecraft/unmapped/C_wrmtlwqx;
-		ARG 0 parent
-	METHOD m_qsssjrys createPackSymlinkWarningScreen (Lnet/minecraft/unmapped/C_wrmtlwqx;)Lnet/minecraft/unmapped/C_wrmtlwqx;
-		ARG 0 parent
+	METHOD m_kiswparz createWorldSymlinkWarningScreen (Ljava/lang/Runnable;)Lnet/minecraft/unmapped/C_wrmtlwqx;
+	METHOD m_qsssjrys createPackSymlinkWarningScreen (Ljava/lang/Runnable;)Lnet/minecraft/unmapped/C_wrmtlwqx;
 	METHOD m_zbganpvc (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
 	METHOD m_zpzfyehy (Lnet/minecraft/unmapped/C_buwziidm;)V

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

@@ -43,8 +43,6 @@ CLASS net/minecraft/unmapped/C_fvenkkjb net/minecraft/client/gui/screen/TitleScr
 	METHOD m_opljyuxj initWidgetsNormal (II)V
 		ARG 1 y
 		ARG 2 spacingY
-	METHOD m_wgpxuola (ZLnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 2 button
 	METHOD m_whggfbir areRealmsNotificationsEnabled ()Z
 	METHOD m_yxsfehvu (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button

mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping

@@ -36,10 +36,6 @@ CLASS net/minecraft/unmapped/C_brwvrttn net/minecraft/client/gui/screen/multipla
 		ARG 1 client
 	METHOD m_bvcecdny (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
-	METHOD m_klplqoox (Z)V
-		ARG 1 acceptButton
-	METHOD m_lhmjdxyz (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 1 button
 	METHOD m_loaniqzw getWindowHeight ()I
 	METHOD m_mwtmmlvd getListEnd ()I
 	METHOD m_nkvyocid setCurrentTab (Lnet/minecraft/unmapped/C_brwvrttn$C_gjmwpjqo;)V

mappings/net/minecraft/client/gui/screen/multiplayer/report/AbuseReportCategoryScreen.mapping

@@ -15,17 +15,11 @@ CLASS net/minecraft/unmapped/C_eagjljtr net/minecraft/client/gui/screen/multipla
 		ARG 1 parent
 		ARG 2 currentCategory
 		ARG 3 onSelect
-	METHOD m_dnaakdab (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 1 button
 	METHOD m_fhlmchbn getLeft ()I
 	METHOD m_fjffslop getButtonTopY ()I
 	METHOD m_fthjrzrz getTop ()I
-	METHOD m_iqdkahqs (Z)V
-		ARG 1 confirmed
 	METHOD m_jgnecgry getBottom ()I
 	METHOD m_lxksfuxi getRight ()I
-	METHOD m_uicliqmy (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 1 button
 	CLASS C_xmuqmonn CategoryEntryListWidget
 		METHOD <init> (Lnet/minecraft/unmapped/C_eagjljtr;Lnet/minecraft/unmapped/C_ayfeobid;)V
 			ARG 2 client

mappings/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.mapping

@@ -2,11 +2,5 @@ CLASS net/minecraft/unmapped/C_jlqncdix net/minecraft/client/gui/screen/option/A
 	METHOD <init> (Lnet/minecraft/unmapped/C_wrmtlwqx;Lnet/minecraft/unmapped/C_lscptbhn;)V
 		ARG 1 parent
 		ARG 2 gameOptions
-	METHOD m_gaufsevx (Z)V
-		ARG 1 openInBrowser
-	METHOD m_kljmirni (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 1 button
 	METHOD m_npegeftz getOptions (Lnet/minecraft/unmapped/C_lscptbhn;)[Lnet/minecraft/unmapped/C_vbibxkxv;
 		ARG 0 options
-	METHOD m_oitpxwms (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 1 button

mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping

@@ -40,16 +40,12 @@ CLASS net/minecraft/unmapped/C_vndksvfp net/minecraft/client/gui/screen/pack/Pac
 	METHOD m_gnvbxkeb closeDirectoryWatcher ()V
 	METHOD m_hzqrsuug updatePackLists ()V
 	METHOD m_ixpydxed deselectAll ()V
-	METHOD m_jpxlrfcw (Ljava/util/List;Z)V
-		ARG 2 confirmed
 	METHOD m_kdjmhvkp updateFocus (Lnet/minecraft/unmapped/C_redlhkpq;)V
 		ARG 1 packList
 	METHOD m_royhqmpl getPackIconTexture (Lnet/minecraft/unmapped/C_lvnjxuwi;)Lnet/minecraft/unmapped/C_ncpywfca;
 		ARG 1 packProfile
 	METHOD m_tkrwvtas (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
-	METHOD m_xrlgphak (Lnet/minecraft/unmapped/C_lvnjxuwi;Ljava/lang/String;)Lnet/minecraft/unmapped/C_ncpywfca;
-		ARG 2 name
 	METHOD m_yzkvrexg (Ljava/nio/file/Path;Ljava/nio/file/Path;Lorg/apache/commons/lang3/mutable/MutableBoolean;Ljava/nio/file/Path;)V
 		ARG 3 toCopy
 	CLASS C_jmzzpyue DirectoryWatcher

mappings/net/minecraft/client/gui/screen/realms/RealmsConfigureWorldScreen.mapping

@@ -6,7 +6,6 @@ CLASS net/minecraft/unmapped/C_knluxkhz net/minecraft/client/gui/screen/realms/R
 	FIELD f_gtvmwpib EXPIRES_SOON Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_hjkmssag playersButton Lnet/minecraft/unmapped/C_buwziidm;
 	FIELD f_hpstcydf settingsButton Lnet/minecraft/unmapped/C_buwziidm;
-	FIELD f_hpyrpjtt clicks I
 	FIELD f_htocklnt switchMinigameButton Lnet/minecraft/unmapped/C_buwziidm;
 	FIELD f_hzhhnwsl EXPIRES_IN_A_DAY Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_imffmnpi parent Lnet/minecraft/unmapped/C_uncfwjlr;
@@ -77,7 +76,6 @@ CLASS net/minecraft/unmapped/C_knluxkhz net/minecraft/client/gui/screen/realms/R
 		ARG 3 y
 		ARG 4 mouseX
 		ARG 5 mouseY
-	METHOD m_uddgsfrj backButtonClicked ()V
 	METHOD m_uzmgjhyn (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
 	METHOD m_volmzoyc hideRegularButtons ()V

mappings/net/minecraft/client/gui/screen/realms/RealmsMainScreen.mapping

@@ -17,7 +17,7 @@ CLASS net/minecraft/unmapped/C_uncfwjlr net/minecraft/client/gui/screen/realms/R
 	FIELD f_kmjtkmrs LOADING Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_lvbzhuvg LOGO_TEXTURE_WIDTH I
 	FIELD f_lwnbwnwd NO_REALMS Lnet/minecraft/unmapped/C_rdaqiwdt;
-	FIELD f_lzszrazz PENDING_INVITES_TOOLTIP Lnet/minecraft/unmapped/C_skehaijy;
+	FIELD f_lzszrazz PENDING_INVITES_TOOLTIP Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_nkjxtixw LOGO_TEXTURE_HEIGHT I
 	FIELD f_nobpynue seenNotifications Ljava/util/Set;
 	FIELD f_obtmnkgu rateLimiter Lcom/google/common/util/concurrent/RateLimiter;
@@ -40,7 +40,7 @@ CLASS net/minecraft/unmapped/C_uncfwjlr net/minecraft/client/gui/screen/realms/R
 	FIELD f_tqlxeqov fetchTaskListener Lnet/minecraft/unmapped/C_tfgqmjhb$C_zolmsrgs;
 	FIELD f_ubelrngz REALM_EXPIRES_SOON_TEXTURE Lnet/minecraft/unmapped/C_ncpywfca;
 	FIELD f_ueblbptz joinError Ljava/util/concurrent/CompletableFuture;
-	FIELD f_vcnffqmd NO_PENDING_INVITES_TOOLTIP Lnet/minecraft/unmapped/C_skehaijy;
+	FIELD f_vcnffqmd NO_PENDING_INVITES_TOOLTIP Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_vfumkxne realmSelectionList Lnet/minecraft/unmapped/C_uncfwjlr$C_nwsdpuom;
 	FIELD f_xdaouetn lastScreen Lnet/minecraft/unmapped/C_wrmtlwqx;
 	FIELD f_xqcveclg EXPIRED Lnet/minecraft/unmapped/C_rdaqiwdt;

mappings/net/minecraft/client/gui/screen/realms/RealmsParentalConsentScreen.mapping

@@ -1,12 +1,6 @@
 CLASS net/minecraft/unmapped/C_hsixfycg net/minecraft/client/gui/screen/realms/RealmsParentalConsentScreen
 	FIELD f_hcaztgxi PRIVACY_INFO Lnet/minecraft/unmapped/C_rdaqiwdt;
-	FIELD f_jgbjyxol parent Lnet/minecraft/unmapped/C_wrmtlwqx;
-	FIELD f_txsaggpi privacyInfoText Lnet/minecraft/unmapped/C_ogfbkizf;
 	METHOD <init> (Lnet/minecraft/unmapped/C_wrmtlwqx;)V
 		ARG 1 parent
-	METHOD m_fhflujtb (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 0 button
 	METHOD m_vtfpwevy (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 0 button
-	METHOD m_wbczooye (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 1 button

mappings/net/minecraft/client/gui/screen/realms/RealmsPopupScreen.mapping

@@ -29,22 +29,12 @@ CLASS net/minecraft/unmapped/C_bdrgxihd net/minecraft/client/gui/screen/realms/R
 		COMMENT buy button.
 	METHOD m_geeippwx renderTrialAvailableIcon (Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 trialAvailableButton
-	METHOD m_gloayqqr (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 1 button
 	METHOD m_idoipmqw getPopupLeft ()I
 	METHOD m_kqoqfrrw getPopupRight ()I
-	METHOD m_nuwngngp (Z)V
-		ARG 1 confirmed
-	METHOD m_owqwdpqi (Z)V
-		ARG 1 confirmed
 	METHOD m_poxouwwb getPopupBottom ()I
 	METHOD m_qnaijqzp (Lnet/minecraft/unmapped/C_ncpywfca;)Z
 		ARG 0 resource
-	METHOD m_uumxaiww (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 1 button
 	METHOD m_vzxktlyd (Lnet/minecraft/unmapped/C_ncpywfca;)Z
 		ARG 0 image
 	METHOD m_whwtwgih getPopupTop ()I
 	METHOD m_xlqrvrtj addRealmsImageTextures (Lnet/minecraft/unmapped/C_tmnrpasf;)V
-	METHOD m_zbakoptv (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 1 button

mappings/net/minecraft/client/gui/screen/realms/RealmsScreen.mapping

@@ -3,11 +3,8 @@ CLASS net/minecraft/unmapped/C_uoaoqhdu net/minecraft/client/gui/screen/realms/R
 	FIELD f_dtagjwpk labels Ljava/util/List;
 	FIELD f_itiwrdzw TITLE_HEIGHT I
 	FIELD f_ivchwtfm DARK_GRAY I
-	FIELD f_jkrftkld BRIGHT_YELLOW I
 	FIELD f_lavhartt LINK_COLOR I
 	FIELD f_mggdlalg EXPIRATION_NOTIFICATION_DAYS I
-	FIELD f_opxtcqhd YELLOW I
-	FIELD f_qsxrdorm RED_FADE I
 	FIELD f_rdqktngn INFO_COLOR I
 	FIELD f_trxnqhvq MEDIUM_GRAY I
 	FIELD f_tuswrayx MAX_FILE_SIZE J

mappings/net/minecraft/client/gui/screen/realms/RealmsSelectWorldTemplateScreen.mapping

@@ -38,8 +38,6 @@ CLASS net/minecraft/unmapped/C_snhgkfww net/minecraft/client/gui/screen/realms/R
 	METHOD m_freieqju updateButtonStates ()V
 	METHOD m_ftfgplcs (Lnet/minecraft/unmapped/C_snhgkfww;Lnet/minecraft/unmapped/C_fxiqpxaf;)V
 		ARG 1 widget
-	METHOD m_lfwhvdgx (Lnet/minecraft/unmapped/C_dqfkpadj$C_ybeakzky;)I
-		ARG 1 segment
 	METHOD m_lgpvjbsf (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
 	METHOD m_lwdxonym onPublish ()V
@@ -48,8 +46,6 @@ CLASS net/minecraft/unmapped/C_snhgkfww net/minecraft/client/gui/screen/realms/R
 	METHOD m_uiptdlta (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
 	METHOD m_vujbpsqv selectTemplate ()V
-	METHOD m_wqudeywi (Z)V
-		ARG 1 confirmed
 	METHOD m_xswboqfn (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
 	CLASS C_mplfdvxo

mappings/net/minecraft/client/gui/screen/realms/RealmsSettingsScreen.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/unmapped/C_xcndyaoj net/minecraft/client/gui/screen/realms/RealmsSettingsScreen
-	FIELD f_etzcwalj doneButton Lnet/minecraft/unmapped/C_buwziidm;
 	FIELD f_jgstrgzs WORLD_DESCRIPTION Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_mqvlqvwk WORLD_NAME Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_qzstxywb descEdit Lnet/minecraft/unmapped/C_vopzcnhf;
@@ -10,12 +9,8 @@ CLASS net/minecraft/unmapped/C_xcndyaoj net/minecraft/client/gui/screen/realms/R
 	METHOD <init> (Lnet/minecraft/unmapped/C_knluxkhz;Lnet/minecraft/unmapped/C_pwmwypfb;)V
 		ARG 1 parent
 		ARG 2 serverData
-	METHOD m_bbopedop (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 1 button
-	METHOD m_ivxfdwpr (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 1 button
-	METHOD m_miqckkol (Z)V
-		ARG 1 confirmed
+	METHOD m_bbopedop (Lnet/minecraft/unmapped/C_buwziidm;Ljava/lang/String;)V
+		ARG 0 button
 	METHOD m_nlfvlkmg (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
 	METHOD m_wdopzfxj save ()V

mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping

@@ -2,38 +2,5 @@ CLASS net/minecraft/unmapped/C_lzpmzhhp net/minecraft/client/gui/screen/world/Ed
 	FIELD f_fwjuvfcq LOGGER Lorg/slf4j/Logger;
 	FIELD f_ktvyxgtr callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;
 	FIELD f_lfvsjayl storageSession Lnet/minecraft/unmapped/C_bpwagnit$C_unecclfw;
-	FIELD f_pdqdfkrs saveButton Lnet/minecraft/unmapped/C_buwziidm;
-	FIELD f_sdxisgdc worldNameField Lnet/minecraft/unmapped/C_vopzcnhf;
 	FIELD f_ubtnfmpx ENTER_WORLD_NAME Lnet/minecraft/unmapped/C_rdaqiwdt;
-	METHOD <init> (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/unmapped/C_bpwagnit$C_unecclfw;)V
-		ARG 1 callback
-		ARG 2 storageSession
-	METHOD m_bzsgcpmw (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 1 button
-	METHOD m_fldgjuaf (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 1 button
-	METHOD m_izlqhkbn (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 1 button
-	METHOD m_jwufwuwq commit ()V
-	METHOD m_kneqjlhc backupWorld (Lnet/minecraft/unmapped/C_bpwagnit$C_unecclfw;)Z
-		ARG 0 storageSession
-	METHOD m_knuhcgkj (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 1 button
-	METHOD m_lmijghmn onBackupConfirm (Lnet/minecraft/unmapped/C_bpwagnit;Ljava/lang/String;)V
-		ARG 0 storage
-		ARG 1 worldName
-	METHOD m_lnoqfdrp (Ljava/nio/file/Path;)V
-		ARG 0 path
-	METHOD m_mjnawvia (Ljava/nio/file/Path;)Z
-		ARG 0 path
-	METHOD m_nhzjsymx (ZZ)V
-		ARG 1 backup
-		ARG 2 eraseCache
-	METHOD m_oweazxix (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 1 button
-	METHOD m_rrajmgic (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 1 button
-	METHOD m_sbnvkesi (Ljava/lang/String;)V
-		ARG 1 name
-	METHOD m_swqyfiuq (Lnet/minecraft/unmapped/C_buwziidm;)V
-		ARG 1 button
+	METHOD m_jwufwuwq commit (Ljava/lang/String;)V