diff --git a/mappings/net/minecraft/client/realms/RealmsConnect.mapping b/mappings/net/minecraft/client/realms/RealmsConnection.mapping similarity index 97% rename from mappings/net/minecraft/client/realms/RealmsConnect.mapping rename to mappings/net/minecraft/client/realms/RealmsConnection.mapping index d288418cb4..c9dbe4be18 100644 --- a/mappings/net/minecraft/client/realms/RealmsConnect.mapping +++ b/mappings/net/minecraft/client/realms/RealmsConnection.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4902 net/minecraft/client/realms/RealmsConnect +CLASS net/minecraft/class_4902 net/minecraft/client/realms/RealmsConnection FIELD field_22814 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_22815 onlineScreen Lnet/minecraft/class_437; FIELD field_22816 aborted Z diff --git a/mappings/net/minecraft/client/realms/DisconnectedRealmsScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/DisconnectedRealmsScreen.mapping similarity index 100% rename from mappings/net/minecraft/client/realms/DisconnectedRealmsScreen.mapping rename to mappings/net/minecraft/client/realms/gui/screen/DisconnectedRealmsScreen.mapping diff --git a/mappings/net/minecraft/client/realms/RealmsBridge.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsBridgeScreen.mapping similarity index 74% rename from mappings/net/minecraft/client/realms/RealmsBridge.mapping rename to mappings/net/minecraft/client/realms/gui/screen/RealmsBridgeScreen.mapping index 9353aa8f40..2c2367fa79 100644 --- a/mappings/net/minecraft/client/realms/RealmsBridge.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsBridgeScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4901 net/minecraft/client/realms/RealmsBridge +CLASS net/minecraft/class_4901 net/minecraft/client/realms/gui/screen/RealmsBridgeScreen FIELD field_22813 previousScreen Lnet/minecraft/class_437; METHOD method_25475 switchToRealms (Lnet/minecraft/class_437;)V ARG 1 parentScreen diff --git a/mappings/net/minecraft/client/realms/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping similarity index 98% rename from mappings/net/minecraft/client/realms/RealmsMainScreen.mapping rename to mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index ba790bce0a..0f84bcde66 100644 --- a/mappings/net/minecraft/client/realms/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4325 net/minecraft/client/realms/RealmsMainScreen +CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMainScreen FIELD field_19456 createdTrial Z FIELD field_19457 showingPopup Z FIELD field_19458 hasUnreadNews Z diff --git a/mappings/net/minecraft/client/realms/RealmsScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsScreen.mapping similarity index 61% rename from mappings/net/minecraft/client/realms/RealmsScreen.mapping rename to mappings/net/minecraft/client/realms/gui/screen/RealmsScreen.mapping index 39175671b6..a5109df6be 100644 --- a/mappings/net/minecraft/client/realms/RealmsScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4905 net/minecraft/client/realms/RealmsScreen +CLASS net/minecraft/class_4905 net/minecraft/client/realms/gui/screen/RealmsScreen METHOD method_25494 row (I)I COMMENT Moved from RealmsConstants in 20w10a ARG 0 index diff --git a/mappings/net/minecraft/client/realms/CloseServerTask.mapping b/mappings/net/minecraft/client/realms/task/CloseServerTask.mapping similarity index 75% rename from mappings/net/minecraft/client/realms/CloseServerTask.mapping rename to mappings/net/minecraft/client/realms/task/CloseServerTask.mapping index 1c0703a8c3..72fe353b0c 100644 --- a/mappings/net/minecraft/client/realms/CloseServerTask.mapping +++ b/mappings/net/minecraft/client/realms/task/CloseServerTask.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4435 net/minecraft/client/realms/CloseServerTask +CLASS net/minecraft/class_4435 net/minecraft/client/realms/task/CloseServerTask FIELD field_20212 serverData Lnet/minecraft/class_4877; FIELD field_20213 configureScreen Lnet/minecraft/class_4388; METHOD (Lnet/minecraft/class_4877;Lnet/minecraft/class_4388;)V diff --git a/mappings/net/minecraft/client/realms/DownloadTask.mapping b/mappings/net/minecraft/client/realms/task/DownloadTask.mapping similarity index 79% rename from mappings/net/minecraft/client/realms/DownloadTask.mapping rename to mappings/net/minecraft/client/realms/task/DownloadTask.mapping index 251529d6df..3f52a87e11 100644 --- a/mappings/net/minecraft/client/realms/DownloadTask.mapping +++ b/mappings/net/minecraft/client/realms/task/DownloadTask.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4436 net/minecraft/client/realms/DownloadTask +CLASS net/minecraft/class_4436 net/minecraft/client/realms/task/DownloadTask FIELD field_20214 worldId J FIELD field_20215 slot I FIELD field_20216 lastScreen Lnet/minecraft/class_437; diff --git a/mappings/net/minecraft/client/realms/gui/LongRunningTask.mapping b/mappings/net/minecraft/client/realms/task/LongRunningTask.mapping similarity index 88% rename from mappings/net/minecraft/client/realms/gui/LongRunningTask.mapping rename to mappings/net/minecraft/client/realms/task/LongRunningTask.mapping index 24965b1e67..f4822d8d93 100644 --- a/mappings/net/minecraft/client/realms/gui/LongRunningTask.mapping +++ b/mappings/net/minecraft/client/realms/task/LongRunningTask.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4358 net/minecraft/client/realms/gui/LongRunningTask +CLASS net/minecraft/class_4358 net/minecraft/client/realms/task/LongRunningTask FIELD field_19638 longRunningMcoTaskScreen Lnet/minecraft/class_4398; FIELD field_22731 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_21065 aborted ()Z diff --git a/mappings/net/minecraft/client/realms/OpenServerTask.mapping b/mappings/net/minecraft/client/realms/task/OpenServerTask.mapping similarity index 82% rename from mappings/net/minecraft/client/realms/OpenServerTask.mapping rename to mappings/net/minecraft/client/realms/task/OpenServerTask.mapping index 0e0f5d075b..e505f64c34 100644 --- a/mappings/net/minecraft/client/realms/OpenServerTask.mapping +++ b/mappings/net/minecraft/client/realms/task/OpenServerTask.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4437 net/minecraft/client/realms/OpenServerTask +CLASS net/minecraft/class_4437 net/minecraft/client/realms/task/OpenServerTask FIELD field_20218 serverData Lnet/minecraft/class_4877; FIELD field_20219 returnScreen Lnet/minecraft/class_437; FIELD field_20220 join Z diff --git a/mappings/net/minecraft/client/realms/RealmsConnectTask.mapping b/mappings/net/minecraft/client/realms/task/RealmsConnectTask.mapping similarity index 72% rename from mappings/net/minecraft/client/realms/RealmsConnectTask.mapping rename to mappings/net/minecraft/client/realms/task/RealmsConnectTask.mapping index f1d6bc2691..873bd7272e 100644 --- a/mappings/net/minecraft/client/realms/RealmsConnectTask.mapping +++ b/mappings/net/minecraft/client/realms/task/RealmsConnectTask.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4438 net/minecraft/client/realms/RealmsConnectTask +CLASS net/minecraft/class_4438 net/minecraft/client/realms/task/RealmsConnectTask FIELD field_20222 realmsConnect Lnet/minecraft/class_4902; FIELD field_20223 a Lnet/minecraft/class_4878; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4878;)V diff --git a/mappings/net/minecraft/client/realms/RealmsGetServerDetailsTask.mapping b/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping similarity index 84% rename from mappings/net/minecraft/client/realms/RealmsGetServerDetailsTask.mapping rename to mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping index 9807f34256..7303d7286e 100644 --- a/mappings/net/minecraft/client/realms/RealmsGetServerDetailsTask.mapping +++ b/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4439 net/minecraft/client/realms/RealmsGetServerDetailsTask +CLASS net/minecraft/class_4439 net/minecraft/client/realms/task/RealmsGetServerDetailsTask FIELD field_20224 server Lnet/minecraft/class_4877; FIELD field_20225 lastScreen Lnet/minecraft/class_437; FIELD field_20226 mainScreen Lnet/minecraft/class_4325; diff --git a/mappings/net/minecraft/client/realms/ResettingWorldTask.mapping b/mappings/net/minecraft/client/realms/task/ResettingWorldTask.mapping similarity index 86% rename from mappings/net/minecraft/client/realms/ResettingWorldTask.mapping rename to mappings/net/minecraft/client/realms/task/ResettingWorldTask.mapping index aab504ec19..a48fe049ae 100644 --- a/mappings/net/minecraft/client/realms/ResettingWorldTask.mapping +++ b/mappings/net/minecraft/client/realms/task/ResettingWorldTask.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4440 net/minecraft/client/realms/ResettingWorldTask +CLASS net/minecraft/class_4440 net/minecraft/client/realms/task/ResettingWorldTask FIELD field_20228 seed Ljava/lang/String; FIELD field_20229 worldTemplate Lnet/minecraft/class_4890; FIELD field_20230 levelType I diff --git a/mappings/net/minecraft/client/realms/RestoreTask.mapping b/mappings/net/minecraft/client/realms/task/RestoreTask.mapping similarity index 77% rename from mappings/net/minecraft/client/realms/RestoreTask.mapping rename to mappings/net/minecraft/client/realms/task/RestoreTask.mapping index 99ee749f31..436f3fc366 100644 --- a/mappings/net/minecraft/client/realms/RestoreTask.mapping +++ b/mappings/net/minecraft/client/realms/task/RestoreTask.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4441 net/minecraft/client/realms/RestoreTask +CLASS net/minecraft/class_4441 net/minecraft/client/realms/task/RestoreTask FIELD field_20236 backup Lnet/minecraft/class_4867; FIELD field_20237 worldId J FIELD field_20238 lastScreen Lnet/minecraft/class_4388; diff --git a/mappings/net/minecraft/client/realms/SwitchMinigameTask.mapping b/mappings/net/minecraft/client/realms/task/SwitchMinigameTask.mapping similarity index 76% rename from mappings/net/minecraft/client/realms/SwitchMinigameTask.mapping rename to mappings/net/minecraft/client/realms/task/SwitchMinigameTask.mapping index 6c4229eadb..32b65247db 100644 --- a/mappings/net/minecraft/client/realms/SwitchMinigameTask.mapping +++ b/mappings/net/minecraft/client/realms/task/SwitchMinigameTask.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4442 net/minecraft/client/realms/SwitchMinigameTask +CLASS net/minecraft/class_4442 net/minecraft/client/realms/task/SwitchMinigameTask FIELD field_20239 worldId J FIELD field_20240 worldTemplate Lnet/minecraft/class_4890; FIELD field_20241 lastScreen Lnet/minecraft/class_4388; diff --git a/mappings/net/minecraft/client/realms/SwitchSlotTask.mapping b/mappings/net/minecraft/client/realms/task/SwitchSlotTask.mapping similarity index 70% rename from mappings/net/minecraft/client/realms/SwitchSlotTask.mapping rename to mappings/net/minecraft/client/realms/task/SwitchSlotTask.mapping index 965c660d63..0f6d465504 100644 --- a/mappings/net/minecraft/client/realms/SwitchSlotTask.mapping +++ b/mappings/net/minecraft/client/realms/task/SwitchSlotTask.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4443 net/minecraft/client/realms/SwitchSlotTask +CLASS net/minecraft/class_4443 net/minecraft/client/realms/task/SwitchSlotTask FIELD field_20242 worldId J FIELD field_20243 slot I FIELD field_22733 callback Ljava/lang/Runnable; diff --git a/mappings/net/minecraft/client/realms/WorldCreationTask.mapping b/mappings/net/minecraft/client/realms/task/WorldCreationTask.mapping similarity index 79% rename from mappings/net/minecraft/client/realms/WorldCreationTask.mapping rename to mappings/net/minecraft/client/realms/task/WorldCreationTask.mapping index 7590a52af2..f8e8a9e415 100644 --- a/mappings/net/minecraft/client/realms/WorldCreationTask.mapping +++ b/mappings/net/minecraft/client/realms/task/WorldCreationTask.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4445 net/minecraft/client/realms/WorldCreationTask +CLASS net/minecraft/class_4445 net/minecraft/client/realms/task/WorldCreationTask FIELD field_20249 name Ljava/lang/String; FIELD field_20250 motd Ljava/lang/String; FIELD field_20251 worldId J diff --git a/mappings/net/minecraft/client/realms/Errable.mapping b/mappings/net/minecraft/client/realms/util/Errable.mapping similarity index 59% rename from mappings/net/minecraft/client/realms/Errable.mapping rename to mappings/net/minecraft/client/realms/util/Errable.mapping index b34e04b0bd..48c201ea95 100644 --- a/mappings/net/minecraft/client/realms/Errable.mapping +++ b/mappings/net/minecraft/client/realms/util/Errable.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_5221 net/minecraft/client/realms/Errable +CLASS net/minecraft/class_5221 net/minecraft/client/realms/util/Errable METHOD method_21067 error (Lnet/minecraft/class_2561;)V METHOD method_27453 error (Ljava/lang/String;)V