From 4166cdcc0607454992a9010884625b95ef3d2030 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Mon, 30 Oct 2023 22:32:06 +0900 Subject: [PATCH] Repackage GUI classes (#3710) --- .../client/gui/screen/{ => multiplayer}/AddServerScreen.mapping | 2 +- .../client/gui/screen/{ => multiplayer}/ConnectScreen.mapping | 2 +- .../gui/screen/{ => multiplayer}/DirectConnectScreen.mapping | 2 +- .../client/gui/screen/{ => world}/BackupPromptScreen.mapping | 2 +- .../gui/screen/{ => world}/CustomizeBuffetLevelScreen.mapping | 2 +- .../gui/screen/{ => world}/CustomizeFlatLevelScreen.mapping | 2 +- .../DataPackFailureScreen.mapping} | 2 +- .../client/gui/screen/{ => world}/LevelLoadingScreen.mapping | 2 +- .../client/gui/screen/{ => world}/PresetsScreen.mapping | 2 +- .../gui => server}/WorldGenerationProgressTracker.mapping | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename mappings/net/minecraft/client/gui/screen/{ => multiplayer}/AddServerScreen.mapping (92%) rename mappings/net/minecraft/client/gui/screen/{ => multiplayer}/ConnectScreen.mapping (94%) rename mappings/net/minecraft/client/gui/screen/{ => multiplayer}/DirectConnectScreen.mapping (89%) rename mappings/net/minecraft/client/gui/screen/{ => world}/BackupPromptScreen.mapping (90%) rename mappings/net/minecraft/client/gui/screen/{ => world}/CustomizeBuffetLevelScreen.mapping (94%) rename mappings/net/minecraft/client/gui/screen/{ => world}/CustomizeFlatLevelScreen.mapping (95%) rename mappings/net/minecraft/client/gui/screen/{DatapackFailureScreen.mapping => world/DataPackFailureScreen.mapping} (81%) rename mappings/net/minecraft/client/gui/screen/{ => world}/LevelLoadingScreen.mapping (88%) rename mappings/net/minecraft/client/gui/screen/{ => world}/PresetsScreen.mapping (97%) rename mappings/net/minecraft/{client/gui => server}/WorldGenerationProgressTracker.mapping (86%) diff --git a/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/AddServerScreen.mapping similarity index 92% rename from mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping rename to mappings/net/minecraft/client/gui/screen/multiplayer/AddServerScreen.mapping index c043538575..1270bb48e8 100644 --- a/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/AddServerScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_422 net/minecraft/client/gui/screen/AddServerScreen +CLASS net/minecraft/class_422 net/minecraft/client/gui/screen/multiplayer/AddServerScreen FIELD field_19236 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; FIELD field_21791 parent Lnet/minecraft/class_437; FIELD field_2469 server Lnet/minecraft/class_642; diff --git a/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping similarity index 94% rename from mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping rename to mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping index 319369c8cf..b25d49b6a8 100644 --- a/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_412 net/minecraft/client/gui/screen/ConnectScreen +CLASS net/minecraft/class_412 net/minecraft/client/gui/screen/multiplayer/ConnectScreen COMMENT The connection screen is used to initiate a connection to a remote server. COMMENT This is only used when connecting over LAN or to a remote dedicated server. FIELD field_19097 lastNarrationTime J diff --git a/mappings/net/minecraft/client/gui/screen/DirectConnectScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/DirectConnectScreen.mapping similarity index 89% rename from mappings/net/minecraft/client/gui/screen/DirectConnectScreen.mapping rename to mappings/net/minecraft/client/gui/screen/multiplayer/DirectConnectScreen.mapping index a7d62606b3..006fcdc167 100644 --- a/mappings/net/minecraft/client/gui/screen/DirectConnectScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/DirectConnectScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_420 net/minecraft/client/gui/screen/DirectConnectScreen +CLASS net/minecraft/class_420 net/minecraft/client/gui/screen/multiplayer/DirectConnectScreen FIELD field_19235 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; FIELD field_21790 parent Lnet/minecraft/class_437; FIELD field_2460 serverEntry Lnet/minecraft/class_642; diff --git a/mappings/net/minecraft/client/gui/screen/BackupPromptScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/BackupPromptScreen.mapping similarity index 90% rename from mappings/net/minecraft/client/gui/screen/BackupPromptScreen.mapping rename to mappings/net/minecraft/client/gui/screen/world/BackupPromptScreen.mapping index f69fe50487..724aae19d1 100644 --- a/mappings/net/minecraft/client/gui/screen/BackupPromptScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/BackupPromptScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_405 net/minecraft/client/gui/screen/BackupPromptScreen +CLASS net/minecraft/class_405 net/minecraft/client/gui/screen/world/BackupPromptScreen FIELD field_19232 showEraseCacheCheckbox Z FIELD field_19234 eraseCacheCheckbox Lnet/minecraft/class_4286; FIELD field_2364 subtitle Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CustomizeBuffetLevelScreen.mapping similarity index 94% rename from mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping rename to mappings/net/minecraft/client/gui/screen/world/CustomizeBuffetLevelScreen.mapping index e3d7879784..026fb83c8a 100644 --- a/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CustomizeBuffetLevelScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_415 net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen +CLASS net/minecraft/class_415 net/minecraft/client/gui/screen/world/CustomizeBuffetLevelScreen FIELD field_2438 confirmButton Lnet/minecraft/class_4185; FIELD field_2441 biomeSelectionList Lnet/minecraft/class_415$class_4190; FIELD field_24562 parent Lnet/minecraft/class_437; diff --git a/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CustomizeFlatLevelScreen.mapping similarity index 95% rename from mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping rename to mappings/net/minecraft/client/gui/screen/world/CustomizeFlatLevelScreen.mapping index 0636b6a0ea..4ac164db83 100644 --- a/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CustomizeFlatLevelScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_413 net/minecraft/client/gui/screen/CustomizeFlatLevelScreen +CLASS net/minecraft/class_413 net/minecraft/client/gui/screen/world/CustomizeFlatLevelScreen FIELD field_2418 tileText Lnet/minecraft/class_2561; FIELD field_2419 config Lnet/minecraft/class_3232; FIELD field_2421 widgetButtonRemoveLayer Lnet/minecraft/class_4185; diff --git a/mappings/net/minecraft/client/gui/screen/DatapackFailureScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/DataPackFailureScreen.mapping similarity index 81% rename from mappings/net/minecraft/client/gui/screen/DatapackFailureScreen.mapping rename to mappings/net/minecraft/client/gui/screen/world/DataPackFailureScreen.mapping index 5fa9203b53..03725d7857 100644 --- a/mappings/net/minecraft/client/gui/screen/DatapackFailureScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/DataPackFailureScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5346 net/minecraft/client/gui/screen/DatapackFailureScreen +CLASS net/minecraft/class_5346 net/minecraft/client/gui/screen/world/DataPackFailureScreen FIELD field_25265 wrappedText Lnet/minecraft/class_5489; FIELD field_46859 goBack Ljava/lang/Runnable; FIELD field_46860 runServerInSafeMode Ljava/lang/Runnable; diff --git a/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/LevelLoadingScreen.mapping similarity index 88% rename from mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping rename to mappings/net/minecraft/client/gui/screen/world/LevelLoadingScreen.mapping index efc25a0d74..5c72288c6a 100644 --- a/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/LevelLoadingScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3928 net/minecraft/client/gui/screen/LevelLoadingScreen +CLASS net/minecraft/class_3928 net/minecraft/client/gui/screen/world/LevelLoadingScreen FIELD field_17406 progressProvider Lnet/minecraft/class_3953; FIELD field_17407 STATUS_TO_COLOR Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_19101 lastNarrationTime J diff --git a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/PresetsScreen.mapping similarity index 97% rename from mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/world/PresetsScreen.mapping index 43af2c7b6b..2308fced7b 100644 --- a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/PresetsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen +CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/world/PresetsScreen FIELD field_25043 LOGGER Lorg/slf4j/Logger; FIELD field_25044 config Lnet/minecraft/class_3232; FIELD field_2519 parent Lnet/minecraft/class_413; diff --git a/mappings/net/minecraft/client/gui/WorldGenerationProgressTracker.mapping b/mappings/net/minecraft/server/WorldGenerationProgressTracker.mapping similarity index 86% rename from mappings/net/minecraft/client/gui/WorldGenerationProgressTracker.mapping rename to mappings/net/minecraft/server/WorldGenerationProgressTracker.mapping index 1abd3e6770..cde1fd2928 100644 --- a/mappings/net/minecraft/client/gui/WorldGenerationProgressTracker.mapping +++ b/mappings/net/minecraft/server/WorldGenerationProgressTracker.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3953 net/minecraft/client/gui/WorldGenerationProgressTracker +CLASS net/minecraft/class_3953 net/minecraft/server/WorldGenerationProgressTracker FIELD field_17474 progressLogger Lnet/minecraft/class_3951; FIELD field_17475 chunkStatuses Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap; FIELD field_17476 spawnPos Lnet/minecraft/class_1923;