Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

23w41a realms #3692

Merged
merged 3 commits into from
Oct 14, 2023
Merged

23w41a realms #3692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
700eb9a
23w41a realms
Shnupbups Oct 11, 2023
527cd71
Merge branch '23w41a' into 23w41a-realms
Shnupbups Oct 14, 2023
a43a43a
Delete CreateSnapshotWorldTask.mapping
Shnupbups Oct 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions mappings/net/minecraft/client/realms/RealmsClient.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ CLASS net/minecraft/class_4341 net/minecraft/client/realms/RealmsClient
FIELD field_43013 DISMISS_ENDPOINT Ljava/lang/String;
FIELD field_43014 NOTIFICATIONS_ENDPOINT Ljava/lang/String;
FIELD field_45232 ENVIRONMENT Lnet/minecraft/class_4341$class_4343;
FIELD field_46687 LIST_USER_WORLDS_ENDPOINT Ljava/lang/String;
FIELD field_46687 LIST_USER_WORLDS_OF_TYPE_ANY_ENDPOINT Ljava/lang/String;
FIELD field_46688 CREATE_PRERELEASE_REALM_ENDPOINT Ljava/lang/String;
FIELD field_46689 LIST_PRERELEASE_ELIGIBLE_WORLDS_ENDPOINT Ljava/lang/String;
METHOD <init> (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_310;)V
Expand Down Expand Up @@ -153,9 +153,9 @@ CLASS net/minecraft/class_4341 net/minecraft/client/realms/RealmsClient
ARG 0 uuids
METHOD method_49572 listNotifications ()Ljava/util/List;
METHOD method_52655 mcoEnabled ()Z
METHOD method_54360 (Ljava/lang/Long;)Lnet/minecraft/class_4877;
ARG 1 worldId
METHOD method_54361 getPrereleaseEligibleWorlds ()Ljava/util/List;
METHOD method_54360 createPrereleaseServer (Ljava/lang/Long;)Lnet/minecraft/class_4877;
ARG 1 parentWorldId
METHOD method_54361 getPrereleaseEligibleServers ()Ljava/util/List;
CLASS class_4342 CompatibleVersionResponse
FIELD field_19582 COMPATIBLE Lnet/minecraft/class_4341$class_4342;
FIELD field_19583 OUTDATED Lnet/minecraft/class_4341$class_4342;
Expand Down
6 changes: 3 additions & 3 deletions mappings/net/minecraft/client/realms/RealmsPeriodicCheckers.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ CLASS net/minecraft/class_7578 net/minecraft/client/realms/RealmsPeriodicChecker
FIELD field_39687 news Lnet/minecraft/class_7581$class_7586;
FIELD field_39688 newsUpdater Lnet/minecraft/class_7579;
FIELD field_43035 notifications Lnet/minecraft/class_7581$class_7586;
FIELD field_46704 periodicRunners Ljava/util/List;
FIELD field_46704 checkers Ljava/util/List;
METHOD <init> (Lnet/minecraft/class_4341;)V
ARG 1 client
METHOD method_54369 getPeriodicRunners ()Ljava/util/List;
CLASS class_8843 ServerListing
METHOD method_54369 getCheckers ()Ljava/util/List;
CLASS class_8843 AvailableServers
5 changes: 3 additions & 2 deletions mappings/net/minecraft/client/realms/dto/RealmsServer.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,14 @@ CLASS net/minecraft/class_4877 net/minecraft/client/realms/dto/RealmsServer
ARG 0 state
METHOD method_25069 getEmptySlots ()Ljava/util/Map;
METHOD method_25070 getWorldType (Ljava/lang/String;)Lnet/minecraft/class_4877$class_4321;
ARG 0 state
ARG 0 worldType
METHOD method_31403 createServerInfo (Ljava/lang/String;)Lnet/minecraft/class_642;
ARG 1 address
METHOD method_54363 isCompatible ()Z
METHOD method_54364 needsUpgrade ()Z
METHOD method_54365 needsDowngrade ()Z
METHOD method_54366 parseCompatibility (Ljava/lang/String;)Lnet/minecraft/class_4877$class_8842;
METHOD method_54366 getCompatibility (Ljava/lang/String;)Lnet/minecraft/class_4877$class_8842;
ARG 0 compatibility
METHOD method_54367 hasParentWorld ()Z
CLASS class_4319 McoServerComparator
FIELD field_19432 refOwner Ljava/lang/String;
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/realms/dto/RealmsWorldResetDto.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ CLASS net/minecraft/class_4884 net/minecraft/client/realms/dto/RealmsWorldResetD
FIELD field_22648 worldTemplateId J
FIELD field_22649 levelType I
FIELD field_22650 generateStructures Z
FIELD field_46703 experiments Ljava/util/Set;
METHOD <init> (Ljava/lang/String;JIZLjava/util/Set;)V
ARG 1 seed
ARG 2 worldTemplateId
ARG 4 levelType
ARG 5 generateStructures
ARG 6 experiments
15 changes: 15 additions & 0 deletions mappings/net/minecraft/client/realms/gui/screen/RealmsCreateRealmScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,25 @@ CLASS net/minecraft/class_4390 net/minecraft/client/realms/gui/screen/RealmsCrea
FIELD field_26487 WORLD_NAME_TEXT Lnet/minecraft/class_2561;
FIELD field_26488 WORLD_DESCRIPTION_TEXT Lnet/minecraft/class_2561;
FIELD field_45242 layout Lnet/minecraft/class_8132;
FIELD field_46705 worldCreator Ljava/lang/Runnable;
FIELD field_46706 TITLE_TEXT Lnet/minecraft/class_2561;
METHOD <init> (Lnet/minecraft/class_4325;J)V
ARG 1 parent
ARG 2 parentId
METHOD <init> (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V
ARG 1 parent
ARG 2 realmsServer
METHOD method_21245 createWorld (Lnet/minecraft/class_4877;)V
ARG 1 realmsServer
METHOD method_52665 (Lnet/minecraft/class_4390;Lnet/minecraft/class_364;)V
ARG 1 child
METHOD method_52666 (Lnet/minecraft/class_4185;)V
ARG 1 button
METHOD method_52667 (Lnet/minecraft/class_4185;Ljava/lang/String;)V
ARG 1 name
METHOD method_54370 createSnapshotWorld (J)V
ARG 1 parentId
METHOD method_54371 (JLnet/minecraft/class_4413;)V
ARG 3 info
METHOD method_54374 (Lnet/minecraft/class_4185;)V
ARG 1 button
10 changes: 9 additions & 1 deletion mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
ARG 2 news
METHOD method_44614 (Ljava/lang/Integer;)V
ARG 1 pendingInvitesCount
METHOD method_44615 (Lnet/minecraft/class_7578$class_8843;)V
ARG 1 availableServers
METHOD method_49285 shouldConfigureButtonBeActive (Lnet/minecraft/class_4877;)Z
ARG 1 server
METHOD method_49288 shouldLeaveButtonBeActive (Lnet/minecraft/class_4877;)Z
Expand Down Expand Up @@ -160,7 +162,7 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
METHOD method_54106 (Ljava/util/List;Ljava/lang/Object;)V
ARG 2 result
METHOD method_54320 updateLoadStatus ()V
METHOD method_54324 resetPeriodicRunners ()V
METHOD method_54324 resetPeriodicCheckers ()V
METHOD method_54328 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V
ARG 1 button
ARG 2 snapshot
Expand Down Expand Up @@ -221,3 +223,9 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
ARG 1 context
METHOD method_53794 getNotificationCount ()I
CLASS class_8802 EmptyEntry
CLASS class_8840 SnapshotEntry
FIELD field_46676 START_TEXT Lnet/minecraft/class_2561;
FIELD field_46678 tooltip Lnet/minecraft/class_7919;
FIELD field_46679 server Lnet/minecraft/class_4877;
METHOD <init> (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V
ARG 2 server
8 changes: 8 additions & 0 deletions mappings/net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ CLASS net/minecraft/class_4409 net/minecraft/client/realms/gui/screen/RealmsRese
FIELD field_27940 mapFeatures Z
FIELD field_45280 layout Lnet/minecraft/class_8132;
FIELD field_46114 TITLE Lnet/minecraft/class_2561;
FIELD field_46708 experiments Ljava/util/Set;
METHOD <init> (Ljava/util/function/Consumer;Lnet/minecraft/class_2561;)V
ARG 1 callback
ARG 2 parentTitle
METHOD method_25202 (Lnet/minecraft/class_4185;)V
ARG 1 button
Expand All @@ -22,3 +24,9 @@ CLASS net/minecraft/class_4409 net/minecraft/client/realms/gui/screen/RealmsRese
METHOD method_52693 createResetWorldInfo ()Lnet/minecraft/class_4413;
METHOD method_52694 (Lnet/minecraft/class_4409;Lnet/minecraft/class_364;)V
ARG 1 child
METHOD method_54376 (Lnet/minecraft/class_3283;)V
ARG 1 packManager
METHOD method_54377 (Lnet/minecraft/class_3283;Lnet/minecraft/class_4185;)V
ARG 2 button
METHOD method_54378 addExperimentsButton (Lnet/minecraft/class_8667;)V
ARG 1 layout
14 changes: 10 additions & 4 deletions ...alms/task/CreateSnapshotWorldTask.mapping → ...ms/task/CreatingSnapshotWorldTask.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
CLASS net/minecraft/class_8844 net/minecraft/client/realms/task/CreateSnapshotWorldTask
CLASS net/minecraft/class_8844 net/minecraft/client/realms/task/CreatingSnapshotWorldTask
FIELD field_46710 LOGGER Lorg/slf4j/Logger;
FIELD field_46711 SNAPSHOT_CREATING Lnet/minecraft/class_2561;
FIELD field_46711 TITLE_TEXT Lnet/minecraft/class_2561;
FIELD field_46712 parentId J
FIELD field_46713 resetWorldInfo Lnet/minecraft/class_4413;
FIELD field_46716 parent Lnet/minecraft/class_4325;
FIELD field_46714 name Ljava/lang/String;
FIELD field_46715 motd Ljava/lang/String;
FIELD field_46716 mainScreen Lnet/minecraft/class_4325;
FIELD field_46717 worldCreationTask Lnet/minecraft/class_4445;
FIELD field_46718 resettingNormalWorldTask Lnet/minecraft/class_5673;
METHOD <init> (Lnet/minecraft/class_4325;JLnet/minecraft/class_4413;Ljava/lang/String;Ljava/lang/String;)V
ARG 1 parent
ARG 1 mainScreen
ARG 2 parentId
ARG 4 resetWorldInfo
ARG 5 name
ARG 6 motd