mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename ServerResourceManager (#3029) 

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
apple502j 2022-02-24 06:59:26 +09:00 committed by GitHub
parent 15cdad81b0
commit ce775e378d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping
View File

@ -108,7 +108,7 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS
ARG 1 button
METHOD method_32672 getDifficulty ()Lnet/minecraft/class_1267;
METHOD method_37088 (Lnet/minecraft/class_5359;Lnet/minecraft/class_6904;)V
ARG 2 serverResourceManager
ARG 2 saveLoader
METHOD method_37089 (Ljava/lang/Void;Ljava/lang/Throwable;)Ljava/lang/Object;
ARG 1 v
ARG 2 throwable

2
mappings/net/minecraft/resource/SimpleResourceReload.mapping
View File

@ -47,7 +47,7 @@ CLASS net/minecraft/class_4014 net/minecraft/resource/SimpleResourceReload
COMMENT to the {@code reloaders}.
COMMENT
COMMENT @apiNote In vanilla, this is respectively called by {@link ReloadableResourceManagerImpl}
COMMENT on the client and {@link ServerResourceManager} on the server.
COMMENT on the client and {@link net.minecraft.server.DataPackContents} on the server.
ARG 0 manager
COMMENT the resource manager, providing resources to the reloaders
ARG 1 reloaders

19
mappings/net/minecraft/resource/ServerResourceManager.mapping → mappings/net/minecraft/server/DataPackContents.mapping
View File

@ -1,4 +1,8 @@
CLASS net/minecraft/class_5350 net/minecraft/resource/ServerResourceManager
CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents
COMMENT Contains loaders for contents controllable by data packs.
COMMENT
COMMENT <p>This can be accessed via {@link MinecraftServer$ResourceManagerHolder#dataPackContents}.
COMMENT There are shortcut methods to access individual loaders on {@link MinecraftServer}.
FIELD field_25334 COMPLETED_UNIT Ljava/util/concurrent/CompletableFuture;
FIELD field_25336 commandManager Lnet/minecraft/class_2170;
FIELD field_25337 recipeManager Lnet/minecraft/class_1863;
@ -14,7 +18,14 @@ CLASS net/minecraft/class_5350 net/minecraft/resource/ServerResourceManager
ARG 2 commandEnvironment
ARG 3 functionPermissionLevel
METHOD method_29465 getFunctionLoader ()Lnet/minecraft/class_5349;
COMMENT {@return the function loader}
COMMENT
COMMENT <p>Function loader loads the {@linkplain net.minecraft.server.function.CommandFunction
COMMENT functions} in data packs.
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;
COMMENT Reloads the data packs contents.
COMMENT
COMMENT @see MinecraftServer#reloadResources
ARG 0 manager
ARG 1 dynamicRegistryManager
ARG 2 commandEnvironment
@ -23,9 +34,13 @@ CLASS net/minecraft/class_5350 net/minecraft/resource/ServerResourceManager
ARG 5 applyExecutor
METHOD method_29468 getLootConditionManager ()Lnet/minecraft/class_4567;
METHOD method_29469 getLootManager ()Lnet/minecraft/class_60;
COMMENT @see MinecraftServer#getLootManager
METHOD method_29471 getRecipeManager ()Lnet/minecraft/class_1863;
COMMENT @see MinecraftServer#getRecipeManager
METHOD method_29472 getCommandManager ()Lnet/minecraft/class_2170;
COMMENT @see MinecraftServer#getCommandManager
METHOD method_29473 getServerAdvancementLoader ()Lnet/minecraft/class_2989;
COMMENT @see MinecraftServer#getAdvancementLoader
METHOD method_32703 getLootFunctionManager ()Lnet/minecraft/class_5640;
METHOD method_40421 refresh (Lnet/minecraft/class_5455;)V
ARG 1 dynamicRegistryManager
@ -38,4 +53,4 @@ CLASS net/minecraft/class_5350 net/minecraft/resource/ServerResourceManager
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;
METHOD method_40427 getContents ()Ljava/util/List;

6
mappings/net/minecraft/server/MinecraftServer.mapping
View File

@ -431,9 +431,9 @@ CLASS net/minecraft/server/MinecraftServer
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
ARG 1 dataPackContents
METHOD method_40375 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Ljava/lang/Throwable;)V
ARG 1 resourceManager
ARG 1 dataPackContents
ARG 2 throwable
METHOD method_40376 createCrashReport (Ljava/lang/Throwable;)Lnet/minecraft/class_128;
ARG 0 throwable
@ -448,3 +448,5 @@ CLASS net/minecraft/server/MinecraftServer
ARG 1 endTime
ARG 3 endTick
CLASS class_6897 ResourceManagerHolder
FIELD comp_353 dataPackContents Lnet/minecraft/class_5350;
METHOD comp_353 dataPackContents ()Lnet/minecraft/class_5350;

6
mappings/net/minecraft/server/SaveLoader.mapping
View File

@ -1,13 +1,15 @@
CLASS net/minecraft/class_6904 net/minecraft/server/SaveLoader
FIELD comp_357 dataPackContents Lnet/minecraft/class_5350;
FIELD comp_358 dynamicRegistryManager Lnet/minecraft/class_5455$class_6890;
FIELD comp_359 saveProperties Lnet/minecraft/class_5219;
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_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
ARG 3 dataPackContents
METHOD method_40430 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Ljava/lang/Throwable;)V
ARG 1 resourceManager
ARG 1 dataPackContents
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

2
mappings/net/minecraft/test/TestServer.mapping
View File

@ -10,7 +10,7 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer
ARG 1 serverThread
ARG 2 session
ARG 3 dataPackManager
ARG 4 serverResourceManager
ARG 4 saveLoader
ARG 5 batches
ARG 6 pos
METHOD method_36094 (Lnet/minecraft/class_1928;)V