Refactor select/edit world screens and related mappings

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

@@ -0,0 +1,24 @@
+CLASS net/minecraft/unmapped/C_twjlxgie net/minecraft/client/gui/screen/SymlinkWarningScreen
+	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_zbganpvc (Lnet/minecraft/unmapped/C_buwziidm;)V
+		ARG 1 button
+	METHOD m_zpzfyehy (Lnet/minecraft/unmapped/C_buwziidm;)V
+		ARG 1 button

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

@@ -5,7 +5,7 @@ CLASS net/minecraft/unmapped/C_ibkofvzc net/minecraft/client/gui/screen/world/Cr
 	FIELD f_fyvyzcba PREPARING Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_hqkhcpia header Lnet/minecraft/unmapped/C_mbxnkehf;
 	FIELD f_htfhyyfx packManager Lnet/minecraft/unmapped/C_dqfyacfy;
-	FIELD f_hxpwlzvr ENTER_NAME Lnet/minecraft/unmapped/C_rdaqiwdt;
+	FIELD f_hxpwlzvr ENTER_WORLD_NAME Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_jlpvoazq FOOTER_SEPARATOR_TEXTURE Lnet/minecraft/unmapped/C_ncpywfca;
 	FIELD f_lryffkzq LIGHT_DIRT_BACKGROUND_TEXTURE Lnet/minecraft/unmapped/C_ncpywfca;
 	FIELD f_lzdtplvi HEADER_SEPARATOR_TEXTURE Lnet/minecraft/unmapped/C_ncpywfca;
@@ -42,30 +42,43 @@ CLASS net/minecraft/unmapped/C_ibkofvzc net/minecraft/client/gui/screen/world/Cr
 		ARG 2 info
 		ARG 3 context
 		ARG 4 path
+	METHOD m_dcetjnbf (Ljava/util/List;Ljava/lang/String;)Z
+		ARG 1 name
 	METHOD m_dejxfssq (Lnet/minecraft/unmapped/C_dqfyacfy;)V
 		ARG 1 manager
-	METHOD m_evbwddxa openPackScreen (Lnet/minecraft/unmapped/C_yknpgzdr;)V
+	METHOD m_evbwddxa openDataPacksScreen (Lnet/minecraft/unmapped/C_yknpgzdr;)V
 		ARG 1 settings
 	METHOD m_evhcwytp createDefaultLoadConfig (Lnet/minecraft/unmapped/C_dqfyacfy;Lnet/minecraft/unmapped/C_yknpgzdr;)Lnet/minecraft/unmapped/C_kjxfcecs$C_kculhjuh;
 		ARG 0 resourcePackManager
 		ARG 1 settings
-	METHOD m_ficgwtev createLevelInfo (Z)Lnet/minecraft/unmapped/C_tmnkpzlg;
+	METHOD m_ficgwtev createWorldInfo (Z)Lnet/minecraft/unmapped/C_tmnkpzlg;
 		ARG 1 debugWorld
+	METHOD m_fiszvdug (Ljava/util/function/Consumer;Ljava/lang/Void;Ljava/lang/Throwable;)Ljava/lang/Object;
+		ARG 2 result
+		ARG 3 exception
 	METHOD m_fqtykenm clearDataPackTempDir ()V
 	METHOD m_fsncvugn createStorageSession ()Ljava/util/Optional;
 	METHOD m_hmlmjfjy (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
+	METHOD m_hpinockj (Ljava/nio/file/Path;Ljava/nio/file/Path;)Z
+		ARG 1 path
+	METHOD m_jygzlswq (Ljava/util/function/Consumer;Z)V
+		ARG 2 confirmed
 	METHOD m_kfiwihuq copyDataPack (Ljava/nio/file/Path;Ljava/nio/file/Path;Ljava/nio/file/Path;)V
 		ARG 0 srcFolder
 		ARG 1 destFolder
 		ARG 2 dataPackFile
 	METHOD m_kvlyrphw openExperimentsScreen (Lnet/minecraft/unmapped/C_yknpgzdr;)V
 		ARG 1 settings
+	METHOD m_lwkgzddp (Lnet/minecraft/unmapped/C_dqfyacfy;Lnet/minecraft/unmapped/C_yknpgzdr;Ljava/util/function/Consumer;Z)V
+		ARG 4 proceed
 	METHOD m_odrhilcd createNewWorld (Lnet/minecraft/unmapped/C_jmmczzpb$C_ooteyfin;Lnet/minecraft/unmapped/C_bcpxdrik;Lcom/mojang/serialization/Lifecycle;)V
 		ARG 1 type
 		ARG 2 manager
 		ARG 3 lifecycle
 	METHOD m_oitudqud onCloseScreen ()V
+	METHOD m_oolkgqdp (Lnet/minecraft/unmapped/C_kjxfcecs$C_hkmknvtj;)Lnet/minecraft/unmapped/C_kjxfcecs$C_ijyqofsr;
+		ARG 1 context
 	METHOD m_oopecwxc (Lnet/minecraft/unmapped/C_kpvuxmkp;)V
 		ARG 1 widget
 	METHOD m_pcylhjnh getWorldCreator ()Lnet/minecraft/unmapped/C_hypraqfe;
@@ -75,9 +88,26 @@ CLASS net/minecraft/unmapped/C_ibkofvzc net/minecraft/client/gui/screen/world/Cr
 	METHOD m_sgacyucm showMessage (Lnet/minecraft/unmapped/C_ayfeobid;Lnet/minecraft/unmapped/C_rdaqiwdt;)V
 		ARG 0 client
 		ARG 1 message
+	METHOD m_sopqrewi (Ljava/nio/file/Path;)Z
+		ARG 1 path
+	METHOD m_spzhhpkv (Lnet/minecraft/unmapped/C_carvbxzj;Lnet/minecraft/unmapped/C_migzkpst;Lnet/minecraft/unmapped/C_bcpxdrik;Lnet/minecraft/unmapped/C_ibkofvzc$C_mxqwwbun;)Lnet/minecraft/unmapped/C_njsjipmy;
+		ARG 0 resourceManager
+		ARG 1 resources
+		ARG 2 registryManager
+		ARG 3 worldCreationSettings
+	METHOD m_udkaeyin (Lcom/mojang/serialization/DynamicOps;Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult;
+		ARG 1 encodedOptions
 	METHOD m_umnykrgq getScannedPack (Lnet/minecraft/unmapped/C_yknpgzdr;)Lcom/mojang/datafixers/util/Pair;
 		ARG 1 settings
-	METHOD m_xdqbchlc createLevel ()V
+	METHOD m_vfaqeuwk (Lnet/minecraft/unmapped/C_ibkofvzc;Lnet/minecraft/unmapped/C_fxiqpxaf;)V
+		ARG 1 widget
+	METHOD m_vflacjtp (Lorg/apache/commons/lang3/mutable/MutableObject;Ljava/nio/file/Path;Ljava/nio/file/Path;)V
+		ARG 2 dataPackFile
+	METHOD m_wobxfjlo (Ljava/nio/file/Path;)V
+		ARG 0 path
+	METHOD m_xdqbchlc createWorld ()V
+	METHOD m_xtzltras (Ljava/nio/file/Path;Ljava/nio/file/Path;)V
+		ARG 2 dataPackFile
 	METHOD m_ycpfvuja getDataPackTempDir ()Ljava/nio/file/Path;
 	METHOD m_zeghowdv applyDataPacks (Lnet/minecraft/unmapped/C_dqfyacfy;ZLjava/util/function/Consumer;)V
 		ARG 1 dataPackManager
@@ -86,12 +116,35 @@ CLASS net/minecraft/unmapped/C_ibkofvzc net/minecraft/client/gui/screen/world/Cr
 	METHOD m_znmcttwr (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
 	CLASS C_dzlctpdf GameTab
-		FIELD f_cdxgyrot nameInput Lnet/minecraft/unmapped/C_vopzcnhf;
+		FIELD f_cdxgyrot worldNameField Lnet/minecraft/unmapped/C_vopzcnhf;
 		FIELD f_qwzkbduc GAME_TAB_TITLE Lnet/minecraft/unmapped/C_rdaqiwdt;
 		FIELD f_uckqwzac ALLOW_COMMANDS Lnet/minecraft/unmapped/C_rdaqiwdt;
+		METHOD m_bcjirrvc (Ljava/lang/Boolean;)Lnet/minecraft/unmapped/C_skehaijy;
+			ARG 0 allowCommandsInfo
+		METHOD m_gfyfwlet (Lnet/minecraft/unmapped/C_hypraqfe$C_ohbtvxdv;)Lnet/minecraft/unmapped/C_rdaqiwdt;
+			ARG 0 gameMode
+		METHOD m_hnuqqiup (Lnet/minecraft/unmapped/C_ikfvpkkf;Lnet/minecraft/unmapped/C_hypraqfe;)V
+			ARG 1 worldCreator
+		METHOD m_huphbglj (Lnet/minecraft/unmapped/C_hypraqfe;)V
+			ARG 1 worldCreator
+		METHOD m_qbjnnmrx (Lnet/minecraft/unmapped/C_ikfvpkkf;Ljava/lang/Boolean;)V
+			ARG 1 button
+			ARG 2 cheatsEnabled
+		METHOD m_vwtbiafd (Lnet/minecraft/unmapped/C_ikfvpkkf;Lnet/minecraft/unmapped/C_mpbjgxic;)V
+			ARG 1 button
+			ARG 2 difficulty
+		METHOD m_wthzkzlp (Lnet/minecraft/unmapped/C_ikfvpkkf;Lnet/minecraft/unmapped/C_hypraqfe;)V
+			ARG 2 worldCreator
+		METHOD m_yjsbiijn (Lnet/minecraft/unmapped/C_buwziidm;)V
+			ARG 1 button
+		METHOD m_ytdkulul (Lnet/minecraft/unmapped/C_ikfvpkkf;Lnet/minecraft/unmapped/C_hypraqfe$C_ohbtvxdv;)V
+			ARG 1 button
+			ARG 2 gameMode
+		METHOD m_zfatltbw (Lnet/minecraft/unmapped/C_ikfvpkkf;Lnet/minecraft/unmapped/C_hypraqfe;)V
+			ARG 2 worldCreator
 	CLASS C_emutyvqg WorldTab
 		FIELD f_cobovsbo BONUS_ITEMS Lnet/minecraft/unmapped/C_rdaqiwdt;
-		FIELD f_glihoeql seedInput Lnet/minecraft/unmapped/C_vopzcnhf;
+		FIELD f_glihoeql seedField Lnet/minecraft/unmapped/C_vopzcnhf;
 		FIELD f_ixnusskg customizeTypeButton Lnet/minecraft/unmapped/C_buwziidm;
 		FIELD f_klvpqniw AMPLIFIED_INFO Lnet/minecraft/unmapped/C_rdaqiwdt;
 		FIELD f_mkhygczv SEED_INFO Lnet/minecraft/unmapped/C_rdaqiwdt;
@@ -101,12 +154,35 @@ CLASS net/minecraft/unmapped/C_ibkofvzc net/minecraft/client/gui/screen/world/Cr
 		FIELD f_rrexmrsz WORLD_TAB_TITLE Lnet/minecraft/unmapped/C_rdaqiwdt;
 		FIELD f_yymywohx MAP_FEATURES Lnet/minecraft/unmapped/C_rdaqiwdt;
 		METHOD m_awomnjir createWorldTypeSupplier ()Lnet/minecraft/unmapped/C_ikfvpkkf$C_qjymjbvs;
+		METHOD m_bcutemao (Lnet/minecraft/unmapped/C_ikfvpkkf;Lnet/minecraft/unmapped/C_hypraqfe$C_jbuehfan;)V
+			ARG 1 button
+			ARG 2 worldType
 		METHOD m_igcilysz openPresetsScreen ()V
+		METHOD m_lsbasbdi (Lnet/minecraft/unmapped/C_ikfvpkkf;Lnet/minecraft/unmapped/C_hypraqfe;)V
+			ARG 2 worldCreator
+		METHOD m_lyzestkz (Lnet/minecraft/unmapped/C_buwziidm;)V
+			ARG 1 button
+		METHOD m_rinurbgd (Ljava/lang/String;)V
+			ARG 1 seed
+		METHOD m_vdchsjiw (Lnet/minecraft/unmapped/C_jskhqate;Lnet/minecraft/unmapped/C_hypraqfe;)V
+			ARG 1 worldCreator
+		METHOD m_wbhktorn (Lnet/minecraft/unmapped/C_qykucwmu$C_iamgoveg;Lnet/minecraft/unmapped/C_dpukplka;)V
+			ARG 1 grid
+		METHOD m_whvqigyv (Lnet/minecraft/unmapped/C_hypraqfe;)V
+			ARG 1 worldCreator
 		METHOD m_yuppgxdl createButtonNarration (Lnet/minecraft/unmapped/C_ikfvpkkf;)Lnet/minecraft/unmapped/C_npqneive;
 			ARG 0 button
 	CLASS C_eyotidzo MoreTab
 		FIELD f_eowlglnv GAME_RULES Lnet/minecraft/unmapped/C_rdaqiwdt;
 		FIELD f_lhxnvfat DATA_PACKS Lnet/minecraft/unmapped/C_rdaqiwdt;
-		FIELD f_vuqzvibe MORE_TAB_TITLE Lnet/minecraft/unmapped/C_rdaqiwdt;
-		METHOD m_qeuzybrv openGameRulesScreen ()V
+		FIELD f_vuqzvibe TITLE Lnet/minecraft/unmapped/C_rdaqiwdt;
+		METHOD m_dlifpsxb (Lnet/minecraft/unmapped/C_buwziidm;)V
+			ARG 1 button
+		METHOD m_jtffqjig (Ljava/util/Optional;)V
+			ARG 1 gameRules
+		METHOD m_qeuzybrv openEditGameRulesScreen ()V
+		METHOD m_rbufnqbu (Lnet/minecraft/unmapped/C_buwziidm;)V
+			ARG 1 button
+		METHOD m_woomufvk (Lnet/minecraft/unmapped/C_buwziidm;)V
+			ARG 1 button
 	CLASS C_mxqwwbun WorldCreationSettings

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

@@ -3,20 +3,37 @@ CLASS net/minecraft/unmapped/C_lzpmzhhp net/minecraft/client/gui/screen/world/Ed
 	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 levelNameTextField Lnet/minecraft/unmapped/C_vopzcnhf;
-	FIELD f_ubtnfmpx ENTER_NAME Lnet/minecraft/unmapped/C_rdaqiwdt;
+	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 backupLevel (Lnet/minecraft/unmapped/C_bpwagnit$C_unecclfw;)Z
+	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 levelName
+		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

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

@@ -1,7 +1,7 @@
 CLASS net/minecraft/unmapped/C_yrypplpi net/minecraft/client/gui/screen/world/SelectWorldScreen
 	FIELD f_hcdzmiym deleteButton Lnet/minecraft/unmapped/C_buwziidm;
 	FIELD f_nmjfmdxl TEST_OPTIONS Lnet/minecraft/unmapped/C_naismckd;
-	FIELD f_ptrrkyoc levelList Lnet/minecraft/unmapped/C_wwgrvynj;
+	FIELD f_ptrrkyoc worldEntryList Lnet/minecraft/unmapped/C_wwgrvynj;
 	FIELD f_pykxvhvu editButton Lnet/minecraft/unmapped/C_buwziidm;
 	FIELD f_saitbzko searchBox Lnet/minecraft/unmapped/C_vopzcnhf;
 	FIELD f_urhieblf selectButton Lnet/minecraft/unmapped/C_buwziidm;
@@ -18,7 +18,7 @@ CLASS net/minecraft/unmapped/C_yrypplpi net/minecraft/client/gui/screen/world/Se
 		ARG 1 button
 	METHOD m_qjteouzv (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
-	METHOD m_rkjktgal worldSelected (ZZ)V
+	METHOD m_rkjktgal updateButtonActivationStates (ZZ)V
 		ARG 1 active
 		ARG 2 deleteButtonActive
 	METHOD m_wgobpizb (Ljava/lang/String;)V

mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping → mappings/net/minecraft/client/gui/screen/world/WorldEntryListWidget.mapping

@@ -1,72 +1,84 @@
-CLASS net/minecraft/unmapped/C_wwgrvynj net/minecraft/client/gui/screen/world/WorldListWidget
+CLASS net/minecraft/unmapped/C_wwgrvynj net/minecraft/client/gui/screen/world/WorldEntryListWidget
 	FIELD f_ahgrbbnb DATE_FORMAT Ljava/text/DateFormat;
-	FIELD f_biwkcpnf SNAPSHOT_FIRST_LINE Lnet/minecraft/unmapped/C_rdaqiwdt;
-	FIELD f_bnkwjzpz worldListFuture Ljava/util/concurrent/CompletableFuture;
+	FIELD f_biwkcpnf SNAPSHOT_TOOLTIP_FIRST_LINE Lnet/minecraft/unmapped/C_rdaqiwdt;
+	FIELD f_bnkwjzpz summaryListFuture Ljava/util/concurrent/CompletableFuture;
 	FIELD f_bvfzqfwz CONVERSION_TOOLTIP Lnet/minecraft/unmapped/C_rdaqiwdt;
-	FIELD f_giqqdqgq worlds Ljava/util/List;
-	FIELD f_gmbxrzpw FROM_NEWER_VERSION_FIRST_LINE Lnet/minecraft/unmapped/C_rdaqiwdt;
-	FIELD f_gmmkqxli SNAPSHOT_SECOND_LINE Lnet/minecraft/unmapped/C_rdaqiwdt;
+	FIELD f_eeylljiq HIGHLIGHTED_WARNING_TEXTURE Lnet/minecraft/unmapped/C_ncpywfca;
+	FIELD f_excqbqjh HIGHLIGHTED_JOIN_TEXTURE Lnet/minecraft/unmapped/C_ncpywfca;
+	FIELD f_giqqdqgq summaries Ljava/util/List;
+	FIELD f_gmbxrzpw FROM_NEWER_VERSION_TOOLTIP_FIRST_LINE Lnet/minecraft/unmapped/C_rdaqiwdt;
+	FIELD f_gmmkqxli SNAPSHOT_TOOLTIP_SECOND_LINE Lnet/minecraft/unmapped/C_rdaqiwdt;
+	FIELD f_hkspkame ERROR_TEXTURE Lnet/minecraft/unmapped/C_ncpywfca;
+	FIELD f_ijizppsv HIGHLIGHTED_ERROR_TEXTURE Lnet/minecraft/unmapped/C_ncpywfca;
+	FIELD f_iryfsjin HIGHLIGHTED_MARKED_JOIN_TEXTURE Lnet/minecraft/unmapped/C_ncpywfca;
+	FIELD f_iudprwiz JOIN_TEXTURE Lnet/minecraft/unmapped/C_ncpywfca;
 	FIELD f_iwchirdh loadingEntry Lnet/minecraft/unmapped/C_wwgrvynj$C_chlqbstq;
 	FIELD f_lejfmpml query Ljava/lang/String;
 	FIELD f_mbtquola parent Lnet/minecraft/unmapped/C_yrypplpi;
-	FIELD f_neodhkus FROM_NEWER_VERSION_SECOND_LINE Lnet/minecraft/unmapped/C_rdaqiwdt;
+	FIELD f_neodhkus FROM_NEWER_VERSION_TOOLTIP_SECOND_LINE Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_nhmjctua LOGGER Lorg/slf4j/Logger;
+	FIELD f_okvxmmxk EXPERIMENTAL Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_rtudrfdo LOCKED Lnet/minecraft/unmapped/C_rdaqiwdt;
+	FIELD f_snbxmdyx WARNING_TEXTURE Lnet/minecraft/unmapped/C_ncpywfca;
 	FIELD f_xjlsplba UNKNOWN_SERVER_LOCATION Lnet/minecraft/unmapped/C_ncpywfca;
+	FIELD f_xshrcksa MARKED_JOIN_TEXTURE Lnet/minecraft/unmapped/C_ncpywfca;
 	METHOD <init> (Lnet/minecraft/unmapped/C_yrypplpi;Lnet/minecraft/unmapped/C_ayfeobid;IIIIILjava/lang/String;Lnet/minecraft/unmapped/C_wwgrvynj;)V
 		ARG 1 parent
 		ARG 2 client
 		ARG 3 screenWidth
 		ARG 4 screenHeight
 		ARG 5 top
 		ARG 6 bottom
-		ARG 7 itemHeight
+		ARG 7 entryHeight
 		ARG 8 query
-		ARG 9 previousList
+		ARG 9 prev
 	METHOD m_adqicvjj narrateScreen ()V
-	METHOD m_bhyykuuh worldNameMatches (Ljava/lang/String;Lnet/minecraft/unmapped/C_wfuumzdp;)Z
+	METHOD m_bhyykuuh summaryMatches (Ljava/lang/String;Lnet/minecraft/unmapped/C_wfuumzdp;)Z
+		COMMENT Whether the given {@code summary} matches the given {@code query}.
 		ARG 1 query
 		ARG 2 summary
-	METHOD m_egkdspch finalizeWorlds ()Ljava/util/List;
+	METHOD m_egkdspch finalizeSummaryList ()Ljava/util/List;
 	METHOD m_fapsoaqi getSelectedAsOptional ()Ljava/util/Optional;
 	METHOD m_fftsxclm (Ljava/lang/Throwable;)Ljava/util/List;
 		ARG 1 throwable
-	METHOD m_gojurhkm generateListFuture ()Ljava/util/concurrent/CompletableFuture;
-	METHOD m_hexfpxkc filterWorlds (Ljava/util/List;)V
-		ARG 1 worlds
+	METHOD m_gojurhkm createSummaryListFuture ()Ljava/util/concurrent/CompletableFuture;
+	METHOD m_hexfpxkc filterEntries (Ljava/util/List;)V
+		ARG 1 summaries
 	METHOD m_irbmeiln resetEntries ()V
 	METHOD m_jtfjknzc filter (Ljava/lang/String;Ljava/util/List;)V
 		ARG 1 query
-		ARG 2 levels
+		ARG 2 summaries
 	METHOD m_lmtvmxlw getParent ()Lnet/minecraft/unmapped/C_yrypplpi;
 	METHOD m_pfgywwta filter (Ljava/lang/String;)V
 		ARG 1 query
-	METHOD m_qcspbwca failedLoadingWorld (Lnet/minecraft/unmapped/C_rdaqiwdt;)V
+	METHOD m_qcspbwca openUnableToLoadErrorScreen (Lnet/minecraft/unmapped/C_rdaqiwdt;)V
 		ARG 1 reason
-	METHOD m_qscakuku regenerateList ()V
+	METHOD m_qscakuku recreateSummaryList ()V
 	CLASS C_chlqbstq LoadingWorldEntry
 		FIELD f_vrjbextc client Lnet/minecraft/unmapped/C_ayfeobid;
-		FIELD f_zcqqkjsr LOADING_WORLD_LIST Lnet/minecraft/unmapped/C_rdaqiwdt;
+		FIELD f_zcqqkjsr LOADING_WORLD_ENTRY_LIST Lnet/minecraft/unmapped/C_rdaqiwdt;
 		METHOD <init> (Lnet/minecraft/unmapped/C_ayfeobid;)V
 			ARG 1 client
-	CLASS C_hdxtychi AbstractWorldEntry
+	CLASS C_hdxtychi AbstractEntry
 		METHOD close close ()V
 		METHOD m_ogqmiqlf selectable ()Z
-	CLASS C_jmifisfh Entry
+	CLASS C_jmifisfh WorldEntry
 		FIELD f_bkumfwbx ICON_HEIGHT I
 		FIELD f_fdtzlxdn iconFile Ljava/nio/file/Path;
 		FIELD f_gtvmqlxk time J
 		FIELD f_joioyrhf ICON_WIDTH I
 		FIELD f_omidysif client Lnet/minecraft/unmapped/C_ayfeobid;
-		FIELD f_peqbzsmm level Lnet/minecraft/unmapped/C_wfuumzdp;
-		FIELD f_ppbktwyr screen Lnet/minecraft/unmapped/C_yrypplpi;
+		FIELD f_peqbzsmm summary Lnet/minecraft/unmapped/C_wfuumzdp;
+		FIELD f_ppbktwyr parent Lnet/minecraft/unmapped/C_yrypplpi;
 		FIELD f_xbclkcsq icon Lnet/minecraft/unmapped/C_zhalennh;
 		METHOD <init> (Lnet/minecraft/unmapped/C_wwgrvynj;Lnet/minecraft/unmapped/C_wwgrvynj;Lnet/minecraft/unmapped/C_wfuumzdp;)V
-			ARG 2 levelList
-			ARG 3 level
+			ARG 2 worldEntryList
+			ARG 3 summary
 		METHOD m_aehstgkl recreate ()V
 		METHOD m_fijclnvs (Lnet/minecraft/unmapped/C_tmnkpzlg;Lnet/minecraft/unmapped/C_njsjipmy;Ljava/nio/file/Path;Z)V
 			ARG 4 isAcceptButton
+		METHOD m_fyvuyosl (Lnet/minecraft/unmapped/C_bpwagnit$C_unecclfw;Ljava/lang/String;Z)V
+			ARG 3 edited
 		METHOD m_hnhktyvf getLevelDisplayName ()Ljava/lang/String;
 		METHOD m_kdbxpczb start ()V
 		METHOD m_ldplqrie resolveIconFile ()V
@@ -76,6 +88,8 @@ CLASS net/minecraft/unmapped/C_wwgrvynj net/minecraft/client/gui/screen/world/Wo
 			ARG 1 confirmed
 		METHOD m_nopgjise deleteIfConfirmed ()V
 		METHOD m_qwbzirnn delete ()V
+		METHOD m_tadilhdw (Z)V
+			ARG 1 confirmed
 		METHOD m_yvhlumjw (ZZ)V
 			ARG 1 backup
 			ARG 2 eraseCache

mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping

@@ -13,6 +13,8 @@ CLASS net/minecraft/unmapped/C_buwziidm net/minecraft/client/gui/widget/ButtonWi
 		ARG 5 message
 		ARG 6 onPress
 		ARG 7 narrationFactory
+	METHOD m_jydvjmlj (Ljava/util/function/Supplier;)Lnet/minecraft/unmapped/C_npqneive;
+		ARG 0 textSupplier
 	METHOD m_vugdzaek builder (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_buwziidm$C_zlxjklbn;)Lnet/minecraft/unmapped/C_buwziidm$C_evfntova;
 		ARG 0 message
 		ARG 1 onPress