diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 2ed727bb8a..921a605542 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_16771 sessionId Ljava/util/UUID; FIELD field_19144 chunkLoadDistance I FIELD field_24321 worldProperties Lnet/minecraft/class_638$class_5271; - FIELD field_25063 registryTracker Lnet/minecraft/class_5455; + FIELD field_25063 registryManager Lnet/minecraft/class_5455; FIELD field_25273 worldKeys Ljava/util/Set; FIELD field_3687 random Ljava/util/Random; FIELD field_3688 recipeManager Lnet/minecraft/class_1863; @@ -59,5 +59,5 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_2888 validateResourcePackUrl (Ljava/lang/String;)Z ARG 1 url METHOD method_2890 getWorld ()Lnet/minecraft/class_638; - METHOD method_29091 getRegistryTracker ()Lnet/minecraft/class_5455; + METHOD method_29091 getRegistryManager ()Lnet/minecraft/class_5455; METHOD method_29356 getWorldKeys ()Ljava/util/Set; diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping index 021d9eb9ee..61a679bc15 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C FIELD field_12280 playerEntityId I FIELD field_12281 hardcore Z FIELD field_12282 gameMode Lnet/minecraft/class_1934; - FIELD field_12284 dimensionTracker Lnet/minecraft/class_5455$class_5457; + FIELD field_12284 registryManager Lnet/minecraft/class_5455$class_5457; FIELD field_19145 chunkLoadDistance I FIELD field_20665 sha256Seed J FIELD field_20666 flatWorld Z @@ -25,7 +25,7 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C METHOD method_11561 getGameMode ()Lnet/minecraft/class_1934; METHOD method_11562 hasReducedDebugInfo ()Z METHOD method_11564 getEntityId ()I - METHOD method_11565 getDimension ()Lnet/minecraft/class_5455; + METHOD method_11565 getRegistryManager ()Lnet/minecraft/class_5455; METHOD method_11568 isFlatWorld ()Z METHOD method_20204 getChunkLoadDistance ()I METHOD method_22423 getSha256Seed ()J diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index e0097c5248..19a775a639 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_23784 session Lnet/minecraft/class_32$class_5143; FIELD field_24370 structureManager Lnet/minecraft/class_3485; FIELD field_24372 saveProperties Lnet/minecraft/class_5219; - FIELD field_25132 dimensionTracker Lnet/minecraft/class_5455$class_5457; + FIELD field_25132 registryManager Lnet/minecraft/class_5455$class_5457; FIELD field_25318 serverResourceManager Lnet/minecraft/class_5350; FIELD field_4543 onlineMode Z FIELD field_4544 running Z @@ -110,6 +110,7 @@ CLASS net/minecraft/server/MinecraftServer ARG 0 serverFactory METHOD method_29741 runServer ()V METHOD method_30002 getOverworld ()Lnet/minecraft/class_3218; + METHOD method_30611 getRegistryManager ()Lnet/minecraft/class_5455; METHOD method_30612 getRateLimit ()I METHOD method_3716 getKeyPair ()Ljava/security/KeyPair; METHOD method_3718 isFlightEnabled ()Z diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index 570bbd0cd0..94148f5d71 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -21,10 +21,10 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager FIELD field_14362 statisticsMap Ljava/util/Map; FIELD field_14363 gameMode Lnet/minecraft/class_1934; FIELD field_14364 BANNED_IPS_FILE Ljava/io/File; - FIELD field_24626 registryTracker Lnet/minecraft/class_5455$class_5457; + FIELD field_24626 registryManager Lnet/minecraft/class_5455$class_5457; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_29;I)V ARG 1 server - ARG 2 tracker + ARG 2 registryManager ARG 3 saveHandler ARG 4 maxPlayers METHOD method_14556 respawnPlayer (Lnet/minecraft/class_3222;Z)Lnet/minecraft/class_3222; diff --git a/mappings/net/minecraft/server/command/CommandSource.mapping b/mappings/net/minecraft/server/command/CommandSource.mapping index c89e6a4f9a..71a1deae7c 100644 --- a/mappings/net/minecraft/server/command/CommandSource.mapping +++ b/mappings/net/minecraft/server/command/CommandSource.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2172 net/minecraft/server/command/CommandSource METHOD method_17771 getBlockPositionSuggestions ()Ljava/util/Collection; METHOD method_17772 getPositionSuggestions ()Ljava/util/Collection; METHOD method_29310 getWorldKeys ()Ljava/util/Set; + METHOD method_30497 getRegistryManager ()Lnet/minecraft/class_5455; METHOD method_9250 forEachMatching (Ljava/lang/Iterable;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Function;Ljava/util/function/Consumer;)V ARG 0 candidates ARG 3 identifier diff --git a/mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping b/mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping index e501818006..83399f878a 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping @@ -2,5 +2,5 @@ CLASS net/minecraft/class_1130 net/minecraft/server/integrated/IntegratedPlayerM FIELD field_5514 userData Lnet/minecraft/class_2487; METHOD (Lnet/minecraft/class_1132;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_29;)V ARG 1 server - ARG 2 tracker + ARG 2 registryManager ARG 3 saveHandler diff --git a/mappings/net/minecraft/util/dynamic/RegistryOps.mapping b/mappings/net/minecraft/util/dynamic/RegistryOps.mapping index b06491858e..0a71083787 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryOps.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryOps.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_5382 net/minecraft/util/dynamic/RegistryOps FIELD field_25509 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_25510 resourceManager Lnet/minecraft/class_3300; - FIELD field_25511 registryTracker Lnet/minecraft/class_5455; + FIELD field_25511 registryManager Lnet/minecraft/class_5455; FIELD field_25512 valueHolders Ljava/util/Map; METHOD (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_3300;Lnet/minecraft/class_5455;)V ARG 1 delegate diff --git a/mappings/net/minecraft/util/dynamic/RegistryReadingOps.mapping b/mappings/net/minecraft/util/dynamic/RegistryReadingOps.mapping index 8991f7ab1f..7a9befde0e 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryReadingOps.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryReadingOps.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_5384 net/minecraft/util/dynamic/RegistryReadingOps COMMENT A dynamic ops that encode an id for a registry element rather than a full object. COMMENT COMMENT @see RegistryElementCodec#encode(Object, DynamicOps, Object) - FIELD field_25514 tracker Lnet/minecraft/class_5455; + FIELD field_25514 manager Lnet/minecraft/class_5455; METHOD (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;)V ARG 1 delegate ARG 2 tracker diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index edfdf16093..2688314abd 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -77,6 +77,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_27982 isDebugWorld ()Z METHOD method_27983 getRegistryKey ()Lnet/minecraft/class_5321; METHOD method_29287 getDimensionRegistryKey ()Lnet/minecraft/class_5321; + METHOD method_30349 getRegistryManager ()Lnet/minecraft/class_5455; METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V ARG 1 pos ARG 2 oldState diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index 0ecf8b1b29..5b55b5473e 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -64,7 +64,7 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType METHOD method_28517 (J)Lnet/minecraft/class_2370; ARG 0 seed METHOD method_28523 addRegistryDefaults (Lnet/minecraft/class_5455$class_5457;)Lnet/minecraft/class_5455$class_5457; - ARG 0 registryTracker + ARG 0 registryManager METHOD method_28533 createEndGenerator (J)Lnet/minecraft/class_2794; ARG 0 seed METHOD method_28535 createNetherGenerator (J)Lnet/minecraft/class_2794;