Skip to content

Commit

Permalink
23w42a world loading (#3702)
Browse files Browse the repository at this point in the history
  • Loading branch information
apple502j authored Oct 22, 2023
1 parent 95ddfdd commit d691007
Show file tree
Hide file tree
Showing 13 changed files with 143 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,31 @@ CLASS net/minecraft/class_8897 net/minecraft/client/gui/screen/world/RecoverWorl
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_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_46873 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;
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_46877 exceptionWidget 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 2 callback
ARG 3 session
METHOD method_54583 (Lnet/minecraft/class_32$class_5143;Z)Ljava/lang/Exception;
METHOD method_54583 getLoadingException (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 2 old
METHOD method_54584 toText (Lnet/minecraft/class_32$class_5143;ZLjava/lang/Exception;)Lnet/minecraft/class_2561;
ARG 1 session
ARG 2 old
ARG 3 exception
METHOD method_54585 (Lnet/minecraft/class_310;)V
METHOD method_54585 tryRestore (Lnet/minecraft/class_310;)V
ARG 1 client
METHOD method_54587 (Lnet/minecraft/class_4185;)V
ARG 1 button
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,19 @@ CLASS net/minecraft/class_8669 net/minecraft/client/gui/screen/world/SymlinkWarn
FIELD field_45412 message Lnet/minecraft/class_2561;
FIELD field_45413 link Ljava/lang/String;
FIELD field_45415 grid Lnet/minecraft/class_7845;
FIELD field_46861 onClose Ljava/lang/Runnable;
METHOD <init> (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/lang/String;Ljava/lang/Runnable;)V
ARG 1 title
ARG 2 message
ARG 3 link
ARG 4 onClose
METHOD method_52747 (Lnet/minecraft/class_4185;)V
ARG 1 button
METHOD method_52748 world (Ljava/lang/Runnable;)Lnet/minecraft/class_437;
ARG 0 onClose
METHOD method_52749 (Lnet/minecraft/class_4185;)V
ARG 1 button
METHOD method_52750 pack (Ljava/lang/Runnable;)Lnet/minecraft/class_437;
ARG 0 onClose
METHOD method_52751 (Lnet/minecraft/class_4185;)V
ARG 1 button
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ 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_54628 (Lnet/minecraft/class_32$class_5143;Z)V
ARG 2 edited
METHOD method_54629 isLevelSelectable ()Z
CLASS class_7414 Entry
CLASS class_7415 LoadingEntry
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/nbt/InvalidNbtException.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/class_8910 net/minecraft/nbt/InvalidNbtException
1 change: 1 addition & 0 deletions mappings/net/minecraft/nbt/NbtCompound.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/NbtCompound
ARG 0 reader
ARG 1 key
ARG 2 input
ARG 3 tracker
METHOD method_10582 putString (Ljava/lang/String;Ljava/lang/String;)V
COMMENT Puts a {@link String} to this compound.
COMMENT
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/nbt/NbtCrashException.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/class_8911 net/minecraft/nbt/NbtCrashException
3 changes: 3 additions & 0 deletions mappings/net/minecraft/nbt/NbtException.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CLASS net/minecraft/class_8909 net/minecraft/nbt/NbtException
METHOD <init> (Ljava/lang/String;)V
ARG 1 message
10 changes: 8 additions & 2 deletions mappings/net/minecraft/nbt/NbtIo.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo
COMMENT @throws IOException if the IO operation fails or if the root NBT element is
COMMENT not a compound
COMMENT @throws NbtSizeValidationException if the NBT is too deep
COMMENT @see #readCompressed(File)
COMMENT @see #readCompressed(File, NbtTagSizeTracker)
ARG 0 stream
ARG 1 tagSizeTracker
METHOD method_10630 write (Lnet/minecraft/class_2487;Ljava/io/File;)V
Expand Down Expand Up @@ -78,7 +78,7 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo
COMMENT @throws IOException if the IO operation fails or if the root NBT element is
COMMENT not a compound
COMMENT @throws NbtSizeValidationException if the NBT is too deep
COMMENT @see #readCompressed(InputStream)
COMMENT @see #readCompressed(InputStream, NbtTagSizeTracker)
ARG 0 file
ARG 1 tagSizeTracker
METHOD method_30614 writeCompressed (Lnet/minecraft/class_2487;Ljava/io/File;)V
Expand Down Expand Up @@ -153,3 +153,9 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo
COMMENT @throws NbtSizeValidationException if the {@code tracker}'s validation fails
ARG 0 input
ARG 1 tracker
METHOD method_54661 toCompressedBytes (Lnet/minecraft/class_2487;)[B
COMMENT {@return the compressed byte array serialization of {@code nbt}}
ARG 0 nbt
METHOD method_54662 toBytes (Lnet/minecraft/class_2487;)[B
COMMENT {@return the byte array serialization of {@code nbt}}
ARG 0 nbt
3 changes: 3 additions & 0 deletions mappings/net/minecraft/server/Main.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,15 @@ CLASS net/minecraft/server/Main
ARG 2 eraseCache
ARG 3 continueCheck
ARG 4 dimensionOptionsRegistry
METHOD method_29734 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_3807;Lnet/minecraft/class_7497;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljava/lang/Thread;)Lnet/minecraft/class_3176;
ARG 11 thread
METHOD method_43612 (Lnet/minecraft/class_7237$class_6906;Lcom/mojang/serialization/Dynamic;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Lnet/minecraft/class_3807;Ljoptsimple/OptionSpec;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
ARG 6 applyExecutor
METHOD method_43613 (Lcom/mojang/serialization/Dynamic;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Lnet/minecraft/class_3807;Ljoptsimple/OptionSpec;Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7237$class_7661;
ARG 5 context
METHOD method_46219 createServerConfig (Lnet/minecraft/class_3806;Lcom/mojang/serialization/Dynamic;ZLnet/minecraft/class_3283;)Lnet/minecraft/class_7237$class_6906;
ARG 0 serverPropertiesHandler
ARG 1 dynamic
ARG 2 safeMode
ARG 3 dataPackManager
METHOD method_49066 writePidFile (Ljava/nio/file/Path;)V
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL
METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_32;)V
ARG 1 client
ARG 2 storage
METHOD method_41889 start (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5350;Lnet/minecraft/class_7780;Lnet/minecraft/class_5219;)V
METHOD method_41889 startNewWorld (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5350;Lnet/minecraft/class_7780;Lnet/minecraft/class_5219;)V
ARG 1 session
ARG 2 dataPackContents
ARG 3 dynamicRegistryManager
Expand All @@ -27,7 +27,8 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL
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
ARG 3 callback
ARG 4 onCancel
METHOD method_41901 createSession (Ljava/lang/String;)Lnet/minecraft/class_32$class_5143;
ARG 1 levelName
METHOD method_43324 showPackLoadFailureScreen ()Ljava/util/concurrent/CompletableFuture;
Expand All @@ -44,9 +45,42 @@ 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_54609 (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7237$class_7661;
ARG 1 context
METHOD method_54610 load (Lcom/mojang/serialization/Dynamic;ZLnet/minecraft/class_3283;)Lnet/minecraft/class_6904;
ARG 1 levelProperties
ARG 2 safeMode
ARG 3 dataPackManager
METHOD method_54611 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Ljava/lang/Runnable;Ljava/lang/Boolean;)V
ARG 5 packLoadSuccessful
METHOD method_54612 (Lnet/minecraft/class_32$class_5143;Lcom/mojang/serialization/Dynamic;Ljava/lang/Runnable;ZZ)V
ARG 4 backup
ARG 5 eraseCache
METHOD method_54614 start (Lnet/minecraft/class_32$class_5143;Lcom/mojang/serialization/Dynamic;ZZLjava/lang/Runnable;)V
ARG 1 session
ARG 2 levelProperties
ARG 3 safeMode
ARG 4 canShowBackupPrompt
ARG 5 onCancel
METHOD method_54615 start (Lnet/minecraft/class_32$class_5143;Ljava/lang/Runnable;)V
ARG 1 session
ARG 2 onCancel
METHOD method_54616 (Lnet/minecraft/class_32$class_5143;Ljava/lang/Runnable;Z)V
ARG 3 recovered
METHOD method_54617 (Lnet/minecraft/class_32$class_5143;Ljava/lang/Runnable;ZZ)V
ARG 2 backup
ARG 3 eraseCache
METHOD method_54618 start (Ljava/lang/String;Ljava/lang/Runnable;)V
ARG 1 levelName
ARG 2 onCancel
METHOD method_54619 (Ljava/lang/Throwable;)Ljava/lang/Void;
ARG 1 throwable
METHOD method_54620 (Ljava/lang/Void;)Ljava/lang/Boolean;
ARG 0 v
METHOD method_54622 (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7237$class_7661;
ARG 1 context
METHOD method_54625 (Ljava/lang/Throwable;)Ljava/util/concurrent/CompletionStage;
ARG 1 throwable
CLASS class_7750 CurrentSettings
FIELD comp_1031 levelInfo Lnet/minecraft/class_1940;
FIELD comp_1033 existingDimensionRegistry Lnet/minecraft/class_2378;
Expand Down
35 changes: 35 additions & 0 deletions mappings/net/minecraft/world/level/LevelProperties.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,52 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties
FIELD field_36349 PLAYER_KEY Ljava/lang/String;
FIELD field_40372 specialProperty Lnet/minecraft/class_31$class_7729;
FIELD field_43352 removedFeatures Ljava/util/Set;
FIELD field_46838 LEVEL_NAME_KEY Ljava/lang/String;
METHOD <init> (Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lnet/minecraft/class_31$class_7729;Lcom/mojang/serialization/Lifecycle;)V
ARG 1 levelInfo
ARG 2 generatorOptions
ARG 3 specialProperty
ARG 4 lifecycle
METHOD <init> (Lnet/minecraft/class_2487;ZIIIFJJIIIZIZZZLnet/minecraft/class_2784$class_5200;IILjava/util/UUID;Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/class_236;Lnet/minecraft/class_2487;Lnet/minecraft/class_2881$class_8576;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lnet/minecraft/class_31$class_7729;Lcom/mojang/serialization/Lifecycle;)V
ARG 1 playerData
ARG 2 modded
ARG 3 spawnX
ARG 4 spawnY
ARG 5 spawnZ
ARG 6 spawnAngle
ARG 7 time
ARG 9 timeOfDay
ARG 11 version
ARG 12 clearWeatherTime
ARG 13 rainTime
ARG 14 raining
ARG 15 thunderTime
ARG 16 thundering
ARG 17 initialized
ARG 18 difficultyLocked
ARG 19 worldBorder
ARG 20 wanderingTraderSpawnDelay
ARG 21 wanderingTraderSpawnChance
ARG 22 wanderingTraderId
ARG 23 serverBrands
ARG 24 removedFeatures
ARG 25 scheduledEvents
ARG 26 customBossEvents
ARG 27 dragonFight
ARG 28 levelInfo
ARG 29 generatorOptions
ARG 30 specialProperty
ARG 31 lifecycle
METHOD method_158 updateProperties (Lnet/minecraft/class_5455;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)V
ARG 1 registryManager
ARG 2 levelNbt
ARG 3 playerNbt
METHOD method_29029 readProperties (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_1940;Lnet/minecraft/class_31$class_7729;Lnet/minecraft/class_5285;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_31;
ARG 0 dynamic
ARG 1 info
ARG 2 specialProperty
ARG 3 generatorOptions
ARG 4 lifecycle
METHOD method_45557 (Lcom/mojang/serialization/DataResult$PartialResult;)V
ARG 0 result
METHOD method_45558 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V
Expand Down
38 changes: 35 additions & 3 deletions mappings/net/minecraft/world/level/storage/LevelStorage.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage
FIELD field_44950 ALLOWED_SYMLINKS_FILE_NAME Ljava/lang/String;
FIELD field_44951 DEFAULT_ALLOWED_SYMLINK_MATCHER Ljava/nio/file/PathMatcher;
FIELD field_44952 symlinkFinder Lnet/minecraft/class_8580;
FIELD field_46830 MAX_LEVEL_DATA_SIZE I
FIELD field_46831 handlingError Z
METHOD <init> (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_8580;Lcom/mojang/datafixers/DataFixer;)V
ARG 1 savesDirectory
ARG 2 backupsDirectory
Expand Down Expand Up @@ -56,12 +58,27 @@ 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;
METHOD method_54522 parseDataPacks (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_3283;Z)Lnet/minecraft/class_7237$class_7238;
ARG 0 dynamic
ARG 1 dataPackManager
ARG 2 safeMode
METHOD method_54523 parseSaveProperties (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_7712;Lnet/minecraft/class_2378;Lnet/minecraft/class_5455$class_6890;)Lnet/minecraft/class_8895;
ARG 0 dynamic
ARG 1 dataConfiguration
ARG 2 dimensionsRegistry
ARG 3 registryManager
METHOD method_54524 parseSummary (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_32$class_7411;Z)Lnet/minecraft/class_34;
ARG 1 dynamic
ARG 2 save
ARG 3 locked
METHOD method_54525 wrap (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_5455$class_6890;)Lcom/mojang/serialization/Dynamic;
ARG 0 dynamic
ARG 1 registryManager
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;
METHOD method_54527 readSummary (Lnet/minecraft/class_32$class_7411;Z)Lnet/minecraft/class_34;
ARG 1 save
ARG 2 locked
METHOD method_54528 readLevelProperties (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Lcom/mojang/serialization/Dynamic;
ARG 0 path
ARG 1 dataFixer
Expand Down Expand Up @@ -99,13 +116,26 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage
ARG 3 nbt
METHOD method_27427 createSaveHandler ()Lnet/minecraft/class_29;
METHOD method_29584 getLevelSummary (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_34;
ARG 1 dynamic
METHOD method_52617 getLevelStorage ()Lnet/minecraft/class_32;
METHOD method_54532 tryClose ()V
METHOD method_54539 (Z)Ljava/time/Instant;
METHOD method_54534 (Ljava/lang/String;Lnet/minecraft/class_2487;)V
ARG 1 nbt
METHOD method_54537 save (Ljava/util/function/Consumer;)V
ARG 1 nbtProcessor
METHOD method_54538 save (Lnet/minecraft/class_2487;)V
ARG 1 nbt
METHOD method_54539 getLastModifiedTime (Z)Ljava/time/Instant;
ARG 1 old
METHOD method_54540 removePlayerAndSave (Ljava/lang/String;)V
ARG 1 name
METHOD method_54541 (Ljava/lang/String;Lnet/minecraft/class_2487;)V
ARG 1 nbt
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;
METHOD method_54547 levelDatExists ()Z
METHOD method_54548 tryRestoreBackup ()Z
CLASS 1
METHOD postVisitDirectory (Ljava/lang/Object;Ljava/io/IOException;)Ljava/nio/file/FileVisitResult;
ARG 1 path
Expand All @@ -129,3 +159,5 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage
METHOD method_43426 getLevelDatOldPath ()Ljava/nio/file/Path;
METHOD method_43427 getIconPath ()Ljava/nio/file/Path;
METHOD method_43428 getSessionLockPath ()Ljava/nio/file/Path;
METHOD method_54531 getRawLevelDatPath (Ljava/time/LocalDateTime;)Ljava/nio/file/Path;
ARG 1 dateTime
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CLASS net/minecraft/class_8895 net/minecraft/world/level/storage/ParsedSaveProperties
FIELD comp_2008 properties Lnet/minecraft/class_5219;
METHOD comp_2008 properties ()Lnet/minecraft/class_5219;

0 comments on commit d691007

Please sign in to comment.