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.

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

23w42a realms and world stuff #3700

Merged
merged 1 commit into from
Oct 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ CLASS net/minecraft/class_405 net/minecraft/client/gui/screen/BackupPromptScreen
FIELD field_19234 eraseCacheCheckbox Lnet/minecraft/class_4286;
FIELD field_2364 subtitle Lnet/minecraft/class_2561;
FIELD field_2365 wrappedText Lnet/minecraft/class_5489;
FIELD field_46857 callback Lnet/minecraft/class_405$class_406;
METHOD <init> (Ljava/lang/Runnable;Lnet/minecraft/class_405$class_406;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Z)V
ARG 2 callback
ARG 3 title
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,44 @@ CLASS net/minecraft/class_524 net/minecraft/client/gui/screen/world/EditWorldScr
FIELD field_23777 storageSession Lnet/minecraft/class_32$class_5143;
FIELD field_26603 ENTER_NAME_TEXT Lnet/minecraft/class_2561;
FIELD field_3169 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;
FIELD field_46885 RESET_ICON_TEXT Lnet/minecraft/class_2561;
FIELD field_46886 OPEN_FOLDER_TEXT Lnet/minecraft/class_2561;
FIELD field_46887 BACKUP_TEXT Lnet/minecraft/class_2561;
FIELD field_46888 BACKUP_FOLDER_TEXT Lnet/minecraft/class_2561;
FIELD field_46889 OPTIMIZE_TEXT Lnet/minecraft/class_2561;
FIELD field_46890 CONFIRM_TITLE_TEXT Lnet/minecraft/class_2561;
FIELD field_46891 CONFIRM_DESCRIPTION_TEXT Lnet/minecraft/class_2561;
FIELD field_46892 SAVE_TEXT Lnet/minecraft/class_2561;
FIELD field_46896 layout Lnet/minecraft/class_8667;
METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_32$class_5143;Ljava/lang/String;Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;)V
ARG 1 client
ARG 2 session
ARG 3 levelName
ARG 4 callback
METHOD method_2691 commit (Ljava/lang/String;)V
ARG 1 levelName
METHOD method_2701 backupLevel (Lnet/minecraft/class_32$class_5143;)Z
ARG 0 storageSession
METHOD method_54595 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_310;ZZ)V
ARG 3 backup
ARG 4 eraseCache
METHOD method_54596 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_4185;)V
ARG 2 button
METHOD method_54598 (Lnet/minecraft/class_310;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_4185;)V
ARG 3 button
METHOD method_54599 create (Lnet/minecraft/class_310;Lnet/minecraft/class_32$class_5143;Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;)Lnet/minecraft/class_524;
ARG 0 client
ARG 1 session
ARG 2 callback
METHOD method_54600 (Lnet/minecraft/class_310;Lnet/minecraft/class_4185;)V
ARG 1 button
METHOD method_54601 (Lnet/minecraft/class_4185;)V
ARG 1 button
METHOD method_54602 (Lnet/minecraft/class_4185;Ljava/lang/String;)V
ARG 1 name
METHOD method_54603 (Lnet/minecraft/class_342;Lnet/minecraft/class_4185;)V
ARG 2 button
METHOD method_54604 (Lnet/minecraft/class_524;Lnet/minecraft/class_364;)V
ARG 1 child
METHOD method_54606 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_4185;)V
ARG 1 button
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
CLASS net/minecraft/class_8897 net/minecraft/client/gui/screen/world/RecoverWorldScreen
FIELD field_46862 LOGGER Lorg/slf4j/Logger;
FIELD field_46864 TITLE_TEXT Lnet/minecraft/class_2561;
FIELD field_46865 BUG_TRACKER_TEXT Lnet/minecraft/class_2561;
FIELD field_46866 RESTORE_TEXt Lnet/minecraft/class_2561;
FIELD field_46867 NO_FALLBACK_TEXT Lnet/minecraft/class_2561;
FIELD field_46868 DONE_TITLE_TEXT Lnet/minecraft/class_2561;
FIELD field_46869 DONE_SUCCESS_TEXT Lnet/minecraft/class_2561;
FIELD field_46870 DONE_FAILED_TEXT Lnet/minecraft/class_2561;
FIELD field_46871 ISSUE_NONE_TEXT Lnet/minecraft/class_2561;
FIELD field_46872 MISSING_FILE_TEXT Lnet/minecraft/class_2561;
FIELD field_46874 layout Lnet/minecraft/class_8667;
FIELD field_46875 message Lnet/minecraft/class_2561;
FIELD field_46876 messageWidget Lnet/minecraft/class_7940;
FIELD field_46878 session Lnet/minecraft/class_32$class_5143;
METHOD <init> (Lnet/minecraft/class_310;Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_32$class_5143;)V
ARG 1 client
ARG 3 session
METHOD method_54583 (Lnet/minecraft/class_32$class_5143;Z)Ljava/lang/Exception;
ARG 1 session
METHOD method_54584 (Lnet/minecraft/class_32$class_5143;ZLjava/lang/Exception;)Lnet/minecraft/class_2561;
ARG 1 session
ARG 3 exception
METHOD method_54585 (Lnet/minecraft/class_310;)V
ARG 1 client
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ CLASS net/minecraft/class_526 net/minecraft/client/gui/screen/world/SelectWorldS
METHOD method_19939 (Lnet/minecraft/class_4185;)V
ARG 1 button
METHOD method_19940 worldSelected (Lnet/minecraft/class_34;)V
ARG 1 levelSummary
METHOD method_19941 (Lnet/minecraft/class_4185;)V
ARG 1 button
METHOD method_19942 (Lnet/minecraft/class_4185;)V
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid
FIELD field_45575 WARNING_TEXTURE Lnet/minecraft/class_2960;
FIELD field_45576 JOIN_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960;
FIELD field_45577 JOIN_TEXTURE Lnet/minecraft/class_2960;
FIELD field_46897 INCOMPATIBLE_TOOLTIP Lnet/minecraft/class_2561;
METHOD <init> (Lnet/minecraft/class_526;Lnet/minecraft/class_310;IIIIILjava/lang/String;Lnet/minecraft/class_528;)V
ARG 1 parent
ARG 2 client
Expand Down Expand Up @@ -76,6 +77,7 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid
METHOD method_35740 getLevelDisplayName ()Ljava/lang/String;
METHOD method_52205 loadIcon ()V
METHOD method_52265 validateIconPath ()V
METHOD method_54629 isLevelSelectable ()Z
CLASS class_7414 Entry
CLASS class_7415 LoadingEntry
FIELD field_38997 LOADING_LIST_TEXT Lnet/minecraft/class_2561;
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/client/realms/dto/RealmsServer.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,6 @@ CLASS net/minecraft/class_4877 net/minecraft/client/realms/dto/RealmsServer
METHOD valueOf (Ljava/lang/String;)Lnet/minecraft/class_4877$class_4321;
ARG 0 name
CLASS class_8842 Compatibility
METHOD method_54568 isCompatible ()Z
METHOD method_54569 needsUpgrade ()Z
METHOD method_54570 needsDowngrade ()Z
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ CLASS net/minecraft/class_4883 net/minecraft/client/realms/dto/RealmsWorldOption
FIELD field_32107 DEFAULT_DIFFICULTY I
FIELD field_32109 DEFAULT_SLOT_NAME Ljava/lang/String;
FIELD field_32110 DEFAULT_WORLD_TEMPLATE_ID J
FIELD field_46842 DEFAULT_COMPATIBILITY Lnet/minecraft/class_4877$class_8842;
FIELD field_46843 version Ljava/lang/String;
FIELD field_46844 compatibility Lnet/minecraft/class_4877$class_8842;
METHOD <init> (ZZZZIZIIZLjava/lang/String;Ljava/lang/String;Lnet/minecraft/class_4877$class_8842;)V
ARG 1 pvp
ARG 2 spawnAnimals
Expand All @@ -27,6 +30,8 @@ CLASS net/minecraft/class_4883 net/minecraft/client/realms/dto/RealmsWorldOption
ARG 8 gameMode
ARG 9 forceGameMode
ARG 10 slotName
ARG 11 version
ARG 12 comptaibility
METHOD method_25076 getDefaults ()Lnet/minecraft/class_4883;
METHOD method_25077 getSlotName (I)Ljava/lang/String;
ARG 1 index
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,24 @@ CLASS net/minecraft/class_4367 net/minecraft/client/realms/gui/RealmsWorldSlotBu
FIELD field_26470 TOOLTIP Lnet/minecraft/class_2561;
FIELD field_39067 CHECKMARK Lnet/minecraft/class_2960;
FIELD field_44894 MINIGAME_SLOT_NAME Lnet/minecraft/class_2561;
FIELD field_46846 worldTooltip Lnet/minecraft/class_7919;
METHOD <init> (IIIIILnet/minecraft/class_4185$class_4241;)V
ARG 1 x
ARG 2 y
ARG 3 width
ARG 4 height
ARG 5 slotIndex
ARG 6 pressAction
METHOD method_25099 getState ()Lnet/minecraft/class_4367$class_4370;
METHOD method_27455 getAction (Lnet/minecraft/class_4877;ZZ)Lnet/minecraft/class_4367$class_4368;
ARG 0 server
ARG 1 active
ARG 2 minigame
METHOD method_54571 setServer (Lnet/minecraft/class_4877;)V
ARG 1 server
METHOD method_54572 updateTooltip (Lnet/minecraft/class_4367$class_4370;Ljava/lang/String;)V
ARG 1 state
ARG 2 minigameName
CLASS class_4368 Action
FIELD field_19678 NOTHING Lnet/minecraft/class_4367$class_4368;
FIELD field_19679 SWITCH_SLOT Lnet/minecraft/class_4367$class_4368;
Expand All @@ -35,3 +43,8 @@ CLASS net/minecraft/class_4367 net/minecraft/client/realms/gui/RealmsWorldSlotBu
FIELD field_19686 empty Z
FIELD field_19687 minigame Z
FIELD field_19688 action Lnet/minecraft/class_4367$class_4368;
FIELD field_46848 version Ljava/lang/String;
FIELD field_46849 compatibility Lnet/minecraft/class_4877$class_8842;
METHOD <init> (Lnet/minecraft/class_4877;I)V
ARG 1 server
ARG 2 slot
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,12 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
METHOD method_54329 (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Z)V
ARG 2 confirmed
METHOD method_54330 isSnapshotRealmsEligible ()Z
METHOD method_54561 getVersionText (Ljava/lang/String;I)Lnet/minecraft/class_2561;
ARG 0 version
ARG 1 color
METHOD method_54562 getVersionText (Ljava/lang/String;Z)Lnet/minecraft/class_2561;
ARG 0 version
ARG 1 compatible
CLASS class_4329 RealmSelectionList
CLASS class_4330 RealmSelectionListEntry
FIELD field_19518 server Lnet/minecraft/class_4877;
Expand All @@ -188,6 +194,15 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
METHOD method_38506 getRealmsServer ()Lnet/minecraft/class_4877;
METHOD method_52653 play ()V
METHOD method_52654 createRealm ()V
METHOD method_54566 drawDescription (Lnet/minecraft/class_332;II)V
ARG 1 context
ARG 2 y
ARG 3 x
METHOD method_54567 drawServerNameAndVersion (Lnet/minecraft/class_332;III)V
ARG 1 context
ARG 2 y
ARG 3 x
ARG 4 width
CLASS class_4866 Entry
METHOD method_54345 getNameY (I)I
ARG 1 y
Expand Down Expand Up @@ -224,6 +239,11 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
ARG 1 y
METHOD method_54357 getStatusY (I)I
ARG 1 y
METHOD method_54565 drawOwnerOrExpiredText (Lnet/minecraft/class_332;IILnet/minecraft/class_4877;)V
ARG 1 context
ARG 2 y
ARG 3 x
ARG 4 server
CLASS class_8200 VisitButtonEntry
FIELD field_42999 button Lnet/minecraft/class_4185;
METHOD <init> (Lnet/minecraft/class_4325;Lnet/minecraft/class_4185;)V
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
CLASS net/minecraft/class_4400 net/minecraft/client/realms/gui/screen/RealmsParentalConsentScreen
FIELD field_26491 PRIVACY_INFO_TEXT Lnet/minecraft/class_2561;
FIELD field_46851 layout Lnet/minecraft/class_8667;
FIELD field_46852 parent Lnet/minecraft/class_437;
FIELD field_46853 privacyInfoWidget Lnet/minecraft/class_7940;
METHOD <init> (Lnet/minecraft/class_437;)V
ARG 1 parent
METHOD method_54573 (Lnet/minecraft/class_4400;Lnet/minecraft/class_364;)V
ARG 1 child
METHOD method_54574 (Lnet/minecraft/class_4185;)V
ARG 1 button
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ CLASS net/minecraft/class_4422 net/minecraft/client/realms/gui/screen/RealmsSett
ARG 1 button
METHOD method_25254 (Z)V
ARG 1 confirmed
METHOD method_54575 (Lnet/minecraft/class_4185;)V
ARG 1 button
METHOD method_54576 (Lnet/minecraft/class_4185;Ljava/lang/String;)V
ARG 1 name
6 changes: 5 additions & 1 deletion mappings/net/minecraft/client/realms/util/JsonUtils.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ CLASS net/minecraft/class_4431 net/minecraft/client/realms/util/JsonUtils
ARG 0 key
ARG 1 node
ARG 2 defaultValue
METHOD method_21547 getStringOr (Ljava/lang/String;Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/lang/String;
METHOD method_21547 getNullableStringOr (Ljava/lang/String;Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/lang/String;
ARG 0 key
ARG 1 node
ARG 2 defaultValue
Expand All @@ -33,3 +33,7 @@ CLASS net/minecraft/class_4431 net/minecraft/client/realms/util/JsonUtils
ARG 0 key
ARG 1 node
ARG 2 deserializer
METHOD method_54577 getStringOr (Ljava/lang/String;Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/lang/String;
ARG 0 key
ARG 1 node
ARG 2 defaultValue
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,14 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL
METHOD method_41893 (Ljava/lang/Runnable;Lnet/minecraft/class_310;Lnet/minecraft/class_525;Z)V
ARG 3 confirmed
METHOD method_41895 createAndStart (Ljava/lang/String;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Ljava/util/function/Function;Lnet/minecraft/class_437;)V
ARG 1 levelName
ARG 2 levelInfo
ARG 3 dynamicRegistryManager
ARG 4 dimensionsRegistrySupplier
ARG 5 screen
METHOD method_41898 showBackupPromptScreen (Lnet/minecraft/class_32$class_5143;ZLjava/lang/Runnable;Ljava/lang/Runnable;)V
ARG 1 session
ARG 2 customized
ARG 4 callback
METHOD method_41901 createSession (Ljava/lang/String;)Lnet/minecraft/class_32$class_5143;
ARG 1 levelName
Expand All @@ -40,6 +44,9 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL
ARG 1 session
METHOD method_45698 (Ljava/util/function/Function;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7237$class_7661;
ARG 3 context
METHOD method_54617 (Lnet/minecraft/class_32$class_5143;Ljava/lang/Runnable;ZZ)V
ARG 2 backup
ARG 3 eraseCache
CLASS class_7750 CurrentSettings
FIELD comp_1031 levelInfo Lnet/minecraft/class_1940;
FIELD comp_1033 existingDimensionRegistry Lnet/minecraft/class_2378;
Expand Down
20 changes: 20 additions & 0 deletions mappings/net/minecraft/world/level/storage/LevelStorage.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,19 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage
ARG 1 name
METHOD method_52616 (Ljava/nio/file/Path;)Z
ARG 0 path
METHOD method_54524 (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_32$class_7411;Z)Lnet/minecraft/class_34;
ARG 2 save
METHOD method_54526 getLastModifiedTime (Lnet/minecraft/class_32$class_7411;)J
ARG 0 save
METHOD method_54527 (Lnet/minecraft/class_32$class_7411;Z)Lnet/minecraft/class_34;
ARG 1 save
METHOD method_54528 readLevelProperties (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Lcom/mojang/serialization/Dynamic;
ARG 0 path
ARG 1 dataFixer
METHOD method_54529 readLevelProperties (Ljava/nio/file/Path;)Lnet/minecraft/class_2487;
ARG 0 path
METHOD method_54530 getLastModifiedTime (Ljava/nio/file/Path;)Ljava/time/Instant;
ARG 0 path
CLASS class_5143 Session
FIELD field_23767 lock Lnet/minecraft/class_5125;
FIELD field_23768 directory Lnet/minecraft/class_32$class_7411;
Expand All @@ -70,6 +83,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage
METHOD method_27010 getDirectory (Lnet/minecraft/class_5218;)Ljava/nio/file/Path;
ARG 1 savePath
METHOD method_27013 readLevelProperties (Z)Lcom/mojang/serialization/Dynamic;
ARG 1 old
METHOD method_27014 getIconFile ()Ljava/util/Optional;
METHOD method_27015 deleteSessionLock ()V
METHOD method_27016 createBackup ()J
Expand All @@ -86,6 +100,12 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage
METHOD method_27427 createSaveHandler ()Lnet/minecraft/class_29;
METHOD method_29584 getLevelSummary (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_34;
METHOD method_52617 getLevelStorage ()Lnet/minecraft/class_32;
METHOD method_54532 tryClose ()V
METHOD method_54539 (Z)Ljava/time/Instant;
ARG 1 old
METHOD method_54543 getDirectory ()Lnet/minecraft/class_32$class_7411;
METHOD method_54545 readLevelProperties ()Lcom/mojang/serialization/Dynamic;
METHOD method_54546 readOldLevelProperties ()Lcom/mojang/serialization/Dynamic;
CLASS 1
METHOD postVisitDirectory (Ljava/lang/Object;Ljava/io/IOException;)Ljava/nio/file/FileVisitResult;
ARG 1 path
Expand Down
20 changes: 20 additions & 0 deletions mappings/net/minecraft/world/level/storage/LevelSummary.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary
FIELD field_25022 levelInfo Lnet/minecraft/class_1940;
FIELD field_25023 versionInfo Lnet/minecraft/class_5315;
FIELD field_40371 experimental Z
FIELD field_46832 SELECT_WORLD_TEXT Lnet/minecraft/class_2561;
METHOD <init> (Lnet/minecraft/class_1940;Lnet/minecraft/class_5315;Ljava/lang/String;ZZZLjava/nio/file/Path;)V
ARG 1 levelInfo
ARG 2 versionInfo
Expand Down Expand Up @@ -35,6 +36,13 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary
METHOD method_35505 getLevelInfo ()Lnet/minecraft/class_1940;
METHOD method_38496 isVersionAvailable ()Z
METHOD method_45554 isExperimental ()Z
METHOD method_54549 shouldPromptBackup ()Z
METHOD method_54550 wouldBeDowngraded ()Z
METHOD method_54551 getSelectWorldText ()Lnet/minecraft/class_2561;
METHOD method_54552 isSelectable ()Z
METHOD method_54553 isEditable ()Z
METHOD method_54554 isRecreatable ()Z
METHOD method_54555 isDeletable ()Z
CLASS class_5781 ConversionWarning
FIELD field_28440 backup Z
FIELD field_28441 dangerous Z
Expand All @@ -47,6 +55,18 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary
METHOD method_33407 isDangerous ()Z
METHOD method_33408 getTranslationKeySuffix ()Ljava/lang/String;
CLASS class_8578 SymlinkLevelSummary
FIELD field_46836 MORE_INFO_TEXT Lnet/minecraft/class_2561;
FIELD field_46837 TITLE_TEXT Lnet/minecraft/class_2561;
METHOD <init> (Ljava/lang/String;Ljava/nio/file/Path;)V
ARG 1 name
ARG 2 iconPath
CLASS class_8896 RecoveryWarning
FIELD field_46833 WARNING_TEXT Lnet/minecraft/class_2561;
FIELD field_46834 BUTTON_TEXT Lnet/minecraft/class_2561;
FIELD field_46835 lastPlayed J
METHOD <init> (Ljava/lang/String;Ljava/nio/file/Path;J)V
ARG 1 name
ARG 2 iconPath
ARG 3 lastPlayed
METHOD method_54556 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583;
ARG 0 style