From e722042166c14e4d046a496c59ed1b857a8efe14 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sun, 20 Mar 2022 00:56:00 +0900 Subject: [PATCH] 22w11a save loading (#3045) * 22w11a save loading * Update mappings/net/minecraft/server/SaveLoader.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Rename stuff Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- mappings/net/minecraft/class_7237.mapping | 10 ---- .../world/GeneratorOptionsHolder.mapping | 15 +++++ .../net/minecraft/server/SaveLoader.mapping | 7 ++- .../net/minecraft/server/SaveLoading.mapping | 35 +++++++++++ .../integrated/IntegratedServerLoader.mapping | 60 +++++++++++++++++++ 5 files changed, 115 insertions(+), 12 deletions(-) delete mode 100644 mappings/net/minecraft/class_7237.mapping create mode 100644 mappings/net/minecraft/client/world/GeneratorOptionsHolder.mapping create mode 100644 mappings/net/minecraft/server/SaveLoading.mapping create mode 100644 mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping diff --git a/mappings/net/minecraft/class_7237.mapping b/mappings/net/minecraft/class_7237.mapping deleted file mode 100644 index 29c3f4eca4..0000000000 --- a/mappings/net/minecraft/class_7237.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS net/minecraft/class_7237 - CLASS class_6906 FunctionLoaderConfig - FIELD comp_361 commandEnvironment Lnet/minecraft/class_2170$class_5364; - FIELD comp_362 functionPermissionLevel I - METHOD comp_361 commandEnvironment ()Lnet/minecraft/class_2170$class_5364; - METHOD comp_362 functionPermissionLevel ()I - CLASS class_6907 SavePropertiesSupplier - METHOD get (Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair; - ARG 1 resourceManager - ARG 2 dataPackSettings diff --git a/mappings/net/minecraft/client/world/GeneratorOptionsHolder.mapping b/mappings/net/minecraft/client/world/GeneratorOptionsHolder.mapping new file mode 100644 index 0000000000..db9723a6a6 --- /dev/null +++ b/mappings/net/minecraft/client/world/GeneratorOptionsHolder.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_7193 net/minecraft/client/world/GeneratorOptionsHolder + FIELD comp_616 generatorOptions Lnet/minecraft/class_5285; + FIELD comp_618 dynamicRegistryManager Lnet/minecraft/class_5455$class_6890; + FIELD comp_619 dataPackContents Lnet/minecraft/class_5350; + METHOD comp_616 generatorOptions ()Lnet/minecraft/class_5285; + METHOD comp_618 dynamicRegistryManager ()Lnet/minecraft/class_5455$class_6890; + METHOD comp_619 dataPackContents ()Lnet/minecraft/class_5350; + METHOD method_41864 with (Lnet/minecraft/class_5285;)Lnet/minecraft/class_7193; + ARG 1 generatorOptions + METHOD method_41865 apply (Lnet/minecraft/class_7193$class_7194;)Lnet/minecraft/class_7193; + ARG 1 modifier + METHOD method_41866 apply (Lnet/minecraft/class_7193$class_7195;)Lnet/minecraft/class_7193; + ARG 1 modifier + CLASS class_7194 Modifier + CLASS class_7195 RegistryAwareModifier diff --git a/mappings/net/minecraft/server/SaveLoader.mapping b/mappings/net/minecraft/server/SaveLoader.mapping index a517735677..2d82a219b5 100644 --- a/mappings/net/minecraft/server/SaveLoader.mapping +++ b/mappings/net/minecraft/server/SaveLoader.mapping @@ -5,5 +5,8 @@ CLASS net/minecraft/class_6904 net/minecraft/server/SaveLoader METHOD comp_357 dataPackContents ()Lnet/minecraft/class_5350; METHOD comp_358 dynamicRegistryManager ()Lnet/minecraft/class_5455$class_6890; METHOD comp_359 saveProperties ()Lnet/minecraft/class_5219; - METHOD method_40431 ofLoaded (Lnet/minecraft/class_7237$class_6906;Lnet/minecraft/class_7237$class_6907;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 3 prepareExecutor + METHOD method_40431 load (Lnet/minecraft/class_7237$class_6906;Lnet/minecraft/class_7237$class_6907;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 0 serverConfig + ARG 1 savePropertiesSupplier + ARG 2 prepareExecutor + ARG 3 applyExecutor diff --git a/mappings/net/minecraft/server/SaveLoading.mapping b/mappings/net/minecraft/server/SaveLoading.mapping new file mode 100644 index 0000000000..488855753b --- /dev/null +++ b/mappings/net/minecraft/server/SaveLoading.mapping @@ -0,0 +1,35 @@ +CLASS net/minecraft/class_7237 net/minecraft/server/SaveLoading + METHOD method_42096 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Ljava/lang/Throwable;)V + ARG 1 dataPackContents + ARG 2 throwable + METHOD method_42097 (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7237$class_7239;Lnet/minecraft/class_6860;Ljava/lang/Object;Lnet/minecraft/class_5350;)Ljava/lang/Object; + ARG 4 dataPackContents + METHOD method_42098 load (Lnet/minecraft/class_7237$class_6906;Lnet/minecraft/class_7237$class_6907;Lnet/minecraft/class_7237$class_7239;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 0 serverConfig + ARG 1 loadContextSupplier + ARG 2 saveApplierFactory + ARG 3 prepareExecutor + ARG 4 applyExecutor + CLASS class_6906 ServerConfig + FIELD comp_361 commandEnvironment Lnet/minecraft/class_2170$class_5364; + FIELD comp_362 functionPermissionLevel I + FIELD comp_634 dataPacks Lnet/minecraft/class_7237$class_7238; + METHOD comp_361 commandEnvironment ()Lnet/minecraft/class_2170$class_5364; + METHOD comp_362 functionPermissionLevel ()I + METHOD comp_634 dataPacks ()Lnet/minecraft/class_7237$class_7238; + CLASS class_6907 LoadContextSupplier + METHOD get (Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair; + ARG 1 resourceManager + ARG 2 dataPackSettings + CLASS class_7238 DataPacks + FIELD comp_635 manager Lnet/minecraft/class_3283; + FIELD comp_636 settings Lnet/minecraft/class_5359; + METHOD comp_635 manager ()Lnet/minecraft/class_3283; + METHOD comp_636 settings ()Lnet/minecraft/class_5359; + METHOD method_42099 load ()Lcom/mojang/datafixers/util/Pair; + CLASS class_7239 SaveApplierFactory + METHOD create (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Lnet/minecraft/class_5455$class_6890;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 resourceManager + ARG 2 dataPackContents + ARG 3 dynamicRegistryManager + ARG 4 loadContext diff --git a/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping b/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping new file mode 100644 index 0000000000..ba86839590 --- /dev/null +++ b/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping @@ -0,0 +1,60 @@ +CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerLoader + FIELD field_37913 LOGGER Lorg/slf4j/Logger; + FIELD field_37914 client Lnet/minecraft/class_310; + FIELD field_37915 storage Lnet/minecraft/class_32; + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_32;)V + ARG 1 client + ARG 2 storage + METHOD method_41885 (Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lnet/minecraft/class_5455;Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair; + ARG 3 resourceManager + ARG 4 dataPackSettings + METHOD method_41886 createDataPackManager (Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_3283; + ARG 0 session + METHOD method_41887 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair; + ARG 1 resourceManager + ARG 2 dataPackSettings + METHOD method_41888 close (Lnet/minecraft/class_32$class_5143;Ljava/lang/String;)V + ARG 0 session + ARG 1 levelName + METHOD method_41889 start (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5350;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5219;)V + ARG 1 session + ARG 2 dataPackContents + ARG 3 dynamicRegistryManager + ARG 4 saveProperties + METHOD method_41890 createSaveLoader (Lnet/minecraft/class_32$class_5143;Z)Lnet/minecraft/class_6904; + ARG 1 session + ARG 2 safeMode + METHOD method_41891 createSaveLoader (Lnet/minecraft/class_32$class_5143;ZLnet/minecraft/class_3283;)Lnet/minecraft/class_6904; + ARG 1 session + ARG 2 safeMode + ARG 3 dataPackManager + METHOD method_41892 tryLoad (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lcom/mojang/serialization/Lifecycle;Ljava/lang/Runnable;)V + ARG 0 client + ARG 1 parent + ARG 2 lifecycle + ARG 3 loader + METHOD method_41893 (Ljava/lang/Runnable;Lnet/minecraft/class_310;Lnet/minecraft/class_525;Z)V + ARG 3 confirmed + METHOD method_41894 start (Ljava/lang/String;)V + ARG 1 levelName + METHOD method_41895 createAndStart (Ljava/lang/String;Lnet/minecraft/class_1940;Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;)V + ARG 1 levelName + ARG 2 levelInfo + ARG 3 dynamicRegistryManager + ARG 4 generatorOptions + METHOD method_41896 (Ljava/lang/String;Ljava/lang/Runnable;ZZ)V + ARG 3 backup + ARG 4 eraseCache + METHOD method_41898 showBackupPromptScreen (Ljava/lang/String;ZLjava/lang/Runnable;)V + ARG 1 levelName + ARG 2 customized + ARG 3 callback + METHOD method_41899 start (Ljava/lang/String;ZZ)V + ARG 1 levelName + ARG 2 safeMode + ARG 3 canShowBackupPrompt + METHOD method_41900 createSaveLoader (Lnet/minecraft/class_7237$class_7238;Lnet/minecraft/class_7237$class_6907;)Lnet/minecraft/class_6904; + ARG 1 dataPacks + ARG 2 savePropertiesSupplier + METHOD method_41901 createSession (Ljava/lang/String;)Lnet/minecraft/class_32$class_5143; + ARG 1 levelName