diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index d7a8012542..a0e964f2c2 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -323,6 +323,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 1 overlay METHOD method_18505 getStatusEffectSpriteManager ()Lnet/minecraft/class_4074; METHOD method_18506 getOverlay ()Lnet/minecraft/class_4071; + METHOD method_18507 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletionStage; + ARG 0 future METHOD method_20539 openPauseMenu (Z)V ARG 1 pause METHOD method_22107 shouldRenderAsync ()Z @@ -352,6 +354,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_24043 createV4ResourcePackFactory (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; ARG 0 packFactory METHOD method_24226 handleResourceReloadException (Ljava/lang/Throwable;)V + ARG 1 throwable METHOD method_24228 (Ljava/util/concurrent/CompletableFuture;Ljava/util/Optional;)V ARG 2 throwable METHOD method_24287 getWindowTitle ()Ljava/lang/String; @@ -389,6 +392,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 3 legacyCustomized ARG 4 onConfirm METHOD method_29603 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Ljava/lang/Thread;)Lnet/minecraft/class_1132; + ARG 1 thread ARG 3 resourceManager METHOD method_29605 (Ljava/lang/Runnable;Ljava/lang/String;Z)V ARG 3 confirmed @@ -397,10 +401,14 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_29607 createWorld (Ljava/lang/String;Lnet/minecraft/class_1940;Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;)V ARG 1 worldName ARG 2 levelInfo - ARG 3 registryTracker + ARG 3 dynamicRegistryManager ARG 4 generatorOptions METHOD method_29610 startIntegratedServer (Ljava/lang/String;Ljava/util/function/Function;Ljava/util/function/Function;ZLnet/minecraft/class_310$class_5366;)V ARG 1 worldName + ARG 2 dataPackSettingsSupplierGetter + ARG 3 savePropertiesSupplierGetter + ARG 4 safeMode + ARG 5 worldLoadAction METHOD method_29611 isFabulousGraphicsOrBetter ()Z METHOD method_29970 setScreenAndRender (Lnet/minecraft/class_437;)V ARG 1 screen @@ -474,9 +482,24 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 2 path METHOD method_38736 createTelemetrySender ()Lnet/minecraft/class_6628; METHOD method_38932 loadBlockList ()V + METHOD method_40183 createSaveLoader (Lnet/minecraft/class_3283;ZLnet/minecraft/class_6904$class_6905;Lnet/minecraft/class_6904$class_6907;)Lnet/minecraft/class_6904; + ARG 1 dataPackManager + ARG 2 safeMode + ARG 3 dataPackSettingsSupplier + ARG 4 savePropertiesSupplier + METHOD method_40184 (Lcom/mojang/serialization/DynamicOps;Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult; + ARG 1 json METHOD method_40185 createServerDataManager (Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_3283; ARG 0 session - METHOD method_40189 (Ljava/lang/Object;)Z + METHOD method_40186 createSaveLoader (Lnet/minecraft/class_32$class_5143;Z)Lnet/minecraft/class_6904; + ARG 1 session + ARG 2 safeMode + METHOD method_40187 (Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;Lnet/minecraft/class_1940;Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair; + ARG 3 resourceManager + ARG 4 dataPackSettings + METHOD method_40188 (Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;Lnet/minecraft/class_1940;Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_6904$class_6907; + ARG 3 session + METHOD method_40189 isCountrySetTo (Ljava/lang/Object;)Z ARG 0 country CLASS class_5366 WorldLoadAction CLASS class_5859 ChatRestriction diff --git a/mappings/net/minecraft/resource/ServerResourceManager.mapping b/mappings/net/minecraft/resource/ServerResourceManager.mapping index e50c093b29..a3337d0eaa 100644 --- a/mappings/net/minecraft/resource/ServerResourceManager.mapping +++ b/mappings/net/minecraft/resource/ServerResourceManager.mapping @@ -10,11 +10,13 @@ CLASS net/minecraft/class_5350 net/minecraft/resource/ServerResourceManager FIELD field_28017 lootFunctionManager Lnet/minecraft/class_5640; FIELD field_36491 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_2170$class_5364;I)V + ARG 1 dynamicRegistryManager ARG 2 commandEnvironment ARG 3 functionPermissionLevel METHOD method_29465 getFunctionLoader ()Lnet/minecraft/class_5349; METHOD method_29466 reload (Lnet/minecraft/class_3300;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_2170$class_5364;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 0 manager + ARG 1 dynamicRegistryManager ARG 2 commandEnvironment ARG 3 functionPermissionLevel ARG 4 prepareExecutor @@ -25,4 +27,15 @@ CLASS net/minecraft/class_5350 net/minecraft/resource/ServerResourceManager METHOD method_29472 getCommandManager ()Lnet/minecraft/class_2170; METHOD method_29473 getServerAdvancementLoader ()Lnet/minecraft/class_2989; METHOD method_32703 getLootFunctionManager ()Lnet/minecraft/class_5640; + METHOD method_40421 refresh (Lnet/minecraft/class_5455;)V + ARG 1 dynamicRegistryManager + METHOD method_40422 repopulateTags (Lnet/minecraft/class_5455;Lnet/minecraft/class_3505$class_6863;)V + ARG 0 dynamicRegistryManager + ARG 1 tags + METHOD method_40423 (Ljava/util/Map$Entry;)Ljava/util/List; + ARG 0 entry + METHOD method_40424 (Lnet/minecraft/class_5321;Ljava/util/Map$Entry;)Lnet/minecraft/class_6862; + ARG 1 entry + METHOD method_40426 (Lnet/minecraft/class_5455;Lnet/minecraft/class_3505$class_6863;)V + ARG 1 tags METHOD method_40427 getResourceReloaders ()Ljava/util/List; diff --git a/mappings/net/minecraft/server/Main.mapping b/mappings/net/minecraft/server/Main.mapping index 875268909f..ec75dc46d8 100644 --- a/mappings/net/minecraft/server/Main.mapping +++ b/mappings/net/minecraft/server/Main.mapping @@ -8,3 +8,8 @@ CLASS net/minecraft/server/Main ARG 2 eraseCache ARG 3 continueCheck ARG 4 generatorOptions + METHOD method_29734 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_3807;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljava/lang/Thread;)Lnet/minecraft/class_3176; + ARG 14 thread + METHOD method_40373 (Lnet/minecraft/class_32$class_5143;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Lnet/minecraft/class_3807;Ljoptsimple/OptionSpec;Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair; + ARG 5 resourceManager + ARG 6 dataPackSettings diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 2549f161fd..16dc298edf 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -31,7 +31,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_24371 saveHandler Lnet/minecraft/class_29; FIELD field_24372 saveProperties Lnet/minecraft/class_5219; FIELD field_25132 registryManager Lnet/minecraft/class_5455$class_6890; - FIELD field_25318 serverResourceManager Lnet/minecraft/server/MinecraftServer$class_6897; + FIELD field_25318 resourceManagerHolder Lnet/minecraft/server/MinecraftServer$class_6897; FIELD field_33205 MILLISECONDS_PER_TICK J FIELD field_33207 LEVEL_PROTOCOL_NAME Ljava/lang/String; FIELD field_33208 LEVEL_PROTOCOL Ljava/lang/String; @@ -90,6 +90,15 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4608 gameProfileRepo Lcom/mojang/authlib/GameProfileRepository; METHOD (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Ljava/net/Proxy;Lcom/mojang/datafixers/DataFixer;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V ARG 1 serverThread + ARG 2 session + ARG 3 dataPackManager + ARG 4 saveLoader + ARG 5 proxy + ARG 6 dataFixer + ARG 7 sessionService + ARG 8 gameProfileRepo + ARG 9 userCache + ARG 10 worldGenerationProgressListenerFactory METHOD method_15876 getMetricsData ()Lnet/minecraft/class_3517; METHOD method_16043 isStopping ()Z METHOD method_16044 getProfiler ()Lnet/minecraft/class_3695; @@ -141,18 +150,25 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_27903 adjustTrackingDistance (I)I ARG 1 initialDistance METHOD method_29435 getWorldRegistryKeys ()Ljava/util/Set; + METHOD method_29437 (Lnet/minecraft/class_5455$class_6890;Lcom/google/common/collect/ImmutableList;)Ljava/util/concurrent/CompletionStage; + ARG 2 resourcePacks METHOD method_29439 reloadResources (Ljava/util/Collection;)Ljava/util/concurrent/CompletableFuture; COMMENT Reloads this server's datapacks. COMMENT COMMENT @return a completable future which specifies whether the reload was successful COMMENT A reload has failed when the future is exceptionally completed. COMMENT @see CompletableFuture + ARG 1 dataPacks + METHOD method_29440 (Ljava/util/Collection;Lnet/minecraft/server/MinecraftServer$class_6897;)V + ARG 2 resourceManagerHolder METHOD method_29735 createDataPackSettings (Lnet/minecraft/class_3283;)Lnet/minecraft/class_5359; ARG 0 dataPackManager METHOD method_29736 loadDataPacks (Lnet/minecraft/class_3283;Lnet/minecraft/class_5359;Z)Lnet/minecraft/class_5359; ARG 0 resourcePackManager ARG 1 dataPackSettings ARG 2 safeMode + METHOD method_29738 (Ljava/util/Collection;Ljava/lang/String;)Z + ARG 1 name METHOD method_29740 startServer (Ljava/util/function/Function;)Lnet/minecraft/server/MinecraftServer; ARG 0 serverFactory METHOD method_29741 runServer ()V @@ -224,6 +240,8 @@ CLASS net/minecraft/server/MinecraftServer COMMENT The command manager is responsible for parsing and dispatching commands. METHOD method_3735 loadWorld ()V METHOD method_3736 shouldSpawnNpcs ()Z + METHOD method_37370 (Ljava/nio/file/Path;)V + ARG 1 path METHOD method_3738 getWorlds ()Ljava/lang/Iterable; METHOD method_3739 getCommandSource ()Lnet/minecraft/class_2168; COMMENT Creates a command source which represents this Minecraft server instance. @@ -378,6 +396,9 @@ CLASS net/minecraft/server/MinecraftServer COMMENT the single player's name, or {@code null} for non-singleplayer servers METHOD method_3851 getAdvancementLoader ()Lnet/minecraft/class_2989; METHOD method_3852 isPvpEnabled ()Z + METHOD method_3854 (Ljava/lang/Thread;Ljava/lang/Throwable;)V + ARG 0 thread + ARG 1 throwable METHOD method_3855 getDataFixer ()Lcom/mojang/datafixers/DataFixer; METHOD method_3856 forcePlayerSampleUpdate ()V METHOD method_3857 getLootManager ()Lnet/minecraft/class_60; @@ -409,6 +430,11 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_39424 hideOnlinePlayers ()Z METHOD method_40056 (Lnet/minecraft/class_3218;)Z ARG 0 world + METHOD method_40374 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;)Lnet/minecraft/server/MinecraftServer$class_6897; + ARG 1 resourceManager + METHOD method_40375 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Ljava/lang/Throwable;)V + ARG 1 resourceManager + ARG 2 throwable METHOD method_40376 createCrashReport (Ljava/lang/Throwable;)Lnet/minecraft/class_128; ARG 0 throwable METHOD method_5387 isMainThread ()Z @@ -421,3 +447,4 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_37330 end (JI)Lnet/minecraft/class_3696; ARG 1 endTime ARG 3 endTick + CLASS class_6897 ResourceManagerHolder diff --git a/mappings/net/minecraft/server/SaveLoader.mapping b/mappings/net/minecraft/server/SaveLoader.mapping new file mode 100644 index 0000000000..547b19a2d2 --- /dev/null +++ b/mappings/net/minecraft/server/SaveLoader.mapping @@ -0,0 +1,36 @@ +CLASS net/minecraft/class_6904 net/minecraft/server/SaveLoader + FIELD comp_358 dynamicRegistryManager Lnet/minecraft/class_5455$class_6890; + FIELD comp_359 saveProperties Lnet/minecraft/class_5219; + METHOD comp_358 dynamicRegistryManager ()Lnet/minecraft/class_5455$class_6890; + METHOD comp_359 saveProperties ()Lnet/minecraft/class_5219; + METHOD method_40428 refresh ()V + METHOD method_40429 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5219;Lnet/minecraft/class_5350;)Lnet/minecraft/class_6904; + ARG 3 resourceManager + METHOD method_40430 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Ljava/lang/Throwable;)V + ARG 1 resourceManager + ARG 2 throwable + METHOD method_40431 ofLoaded (Lnet/minecraft/class_6904$class_6906;Lnet/minecraft/class_6904$class_6905;Lnet/minecraft/class_6904$class_6907;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 0 functionLoaderConfig + ARG 1 dataPackSettingsSupplier + ARG 2 savePropertiesSupplier + ARG 3 prepareExecutor + ARG 4 applyExecutor + CLASS class_6905 DataPackSettingsSupplier + METHOD loadFromWorld (Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_6904$class_6905; + ARG 0 session + CLASS class_6906 FunctionLoaderConfig + FIELD comp_360 dataPackManager Lnet/minecraft/class_3283; + FIELD comp_361 commandEnvironment Lnet/minecraft/class_2170$class_5364; + FIELD comp_362 functionPermissionLevel I + METHOD comp_360 dataPackManager ()Lnet/minecraft/class_3283; + 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 + METHOD loadFromWorld (Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_6904$class_6907; + ARG 0 session + METHOD method_40433 (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 diff --git a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping index 39bca7ac7b..c5357fe962 100644 --- a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping @@ -11,6 +11,15 @@ CLASS net/minecraft/class_3176 net/minecraft/server/dedicated/MinecraftDedicated FIELD field_33431 resourcePackPrompt Lnet/minecraft/class_2561; METHOD (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_3807;Lcom/mojang/datafixers/DataFixer;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V ARG 1 serverThread + ARG 2 session + ARG 3 dataPackManager + ARG 4 saveLoader + ARG 5 propertiesLoader + ARG 6 dataFixer + ARG 7 sessionService + ARG 8 gameProfileRepo + ARG 9 userCache + ARG 10 worldGenerationProgressListenerFactory METHOD method_13941 executeQueuedCommands ()V METHOD method_13942 sleepFiveSeconds ()V METHOD method_13944 getMaxTickTime ()J diff --git a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping index 0346e76dd0..e8c60a7a5f 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping @@ -10,6 +10,13 @@ CLASS net/minecraft/class_1132 net/minecraft/server/integrated/IntegratedServer METHOD (Ljava/lang/Thread;Lnet/minecraft/class_310;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V ARG 1 serverThread ARG 2 client + ARG 3 session + ARG 4 dataPackManager + ARG 5 saveLoader + ARG 6 sessionService + ARG 7 gameProfileRepo + ARG 8 userCache + ARG 9 worldGenerationProgressListenerFactory METHOD method_36439 incrementTotalWorldTimeStat ()V METHOD method_4817 setLocalPlayerUuid (Ljava/util/UUID;)V ARG 1 localPlayerUuid