diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 294ae4a138..5a68a29749 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -2,7 +2,8 @@ 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 dimensionTracker Lnet/minecraft/class_5318; + FIELD field_25063 registryTracker Lnet/minecraft/class_5318; + FIELD field_25273 worldKeys Ljava/util/Set; FIELD field_3687 random Ljava/util/Random; FIELD field_3688 recipeManager Lnet/minecraft/class_1863; FIELD field_3689 connection Lnet/minecraft/class_2535; @@ -19,6 +20,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_3700 advancementHandler Lnet/minecraft/class_632; FIELD field_3701 loginScreen Lnet/minecraft/class_437; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_2535;Lcom/mojang/authlib/GameProfile;)V + ARG 1 client ARG 2 screen ARG 3 connection ARG 4 profile @@ -57,3 +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_5318; + METHOD method_29356 getWorldKeys ()Ljava/util/Set; diff --git a/mappings/net/minecraft/server/Main.mapping b/mappings/net/minecraft/server/Main.mapping index c785014e0f..0f473a5b51 100644 --- a/mappings/net/minecraft/server/Main.mapping +++ b/mappings/net/minecraft/server/Main.mapping @@ -2,6 +2,11 @@ CLASS net/minecraft/server/Main FIELD field_24625 LOGGER Lorg/apache/logging/log4j/Logger; METHOD main ([Ljava/lang/String;)V ARG 0 args + METHOD method_29173 forceUpgradeWorld (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lcom/google/common/collect/ImmutableSet;)V + ARG 0 session + ARG 1 dataFixer + ARG 2 eraseCache + ARG 4 worlds METHOD method_29734 (Lnet/minecraft/class_5318$class_5319;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_5350;Lnet/minecraft/class_5219;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 0 registryTracker ARG 1 session diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index cdba8fdee1..a573eefb60 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -108,6 +108,7 @@ CLASS net/minecraft/server/MinecraftServer ARG 2 safeMode METHOD method_29740 startServer (Ljava/util/function/Function;)Lnet/minecraft/server/MinecraftServer; ARG 0 serverFactory + METHOD method_29741 runServer ()V METHOD method_30002 getOverworld ()Lnet/minecraft/class_3218; METHOD method_3716 getKeyPair ()Ljava/security/KeyPair; METHOD method_3718 isFlightEnabled ()Z @@ -168,6 +169,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3783 isMonsterSpawningEnabled ()Z METHOD method_3784 getResourcePackUrl ()Ljava/lang/String; METHOD method_3785 isSpawnProtected (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)Z + ARG 1 world ARG 2 pos ARG 3 player METHOD method_3786 createWorlds (Lnet/minecraft/class_3949;)V @@ -230,6 +232,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3846 setPlayerManager (Lnet/minecraft/class_3324;)V ARG 1 playerManager METHOD method_3847 getWorld (Lnet/minecraft/class_5321;)Lnet/minecraft/class_3218; + ARG 1 key METHOD method_3849 setServerName (Ljava/lang/String;)V ARG 1 serverName METHOD method_3850 setWorldHeight (I)V @@ -243,6 +246,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3857 getLootManager ()Lnet/minecraft/class_60; METHOD method_3858 getPlayerNames ()[Ljava/lang/String; METHOD method_3859 populateCrashReport (Lnet/minecraft/class_128;)Lnet/minecraft/class_128; + ARG 1 report METHOD method_3860 isRemote ()Z METHOD method_3861 loadWorldResourcePack ()V METHOD method_3862 getPlayerIdleTimeout ()I diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index 1596b3b14e..5d5957d3c0 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -21,10 +21,15 @@ 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_5318$class_5319; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_5318$class_5319;Lnet/minecraft/class_29;I)V ARG 1 server + ARG 2 tracker + ARG 3 saveHandler + ARG 4 maxPlayers METHOD method_14556 respawnPlayer (Lnet/minecraft/class_3222;Z)Lnet/minecraft/class_3222; ARG 1 player + ARG 2 alive METHOD method_14557 setWhitelistEnabled (Z)V ARG 1 whitelistEnabled METHOD method_14559 getPlayersByIp (Ljava/lang/String;)Ljava/util/List; @@ -55,6 +60,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager METHOD method_14577 savePlayerData (Lnet/minecraft/class_3222;)V ARG 1 player METHOD method_14578 getAdvancementTracker (Lnet/minecraft/class_3222;)Lnet/minecraft/class_2985; + ARG 1 player METHOD method_14579 areCheatsAllowed ()Z METHOD method_14580 getPlayerNames ()[Ljava/lang/String; METHOD method_14581 sendToAll (Lnet/minecraft/class_2596;)V @@ -102,7 +108,9 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager ARG 2 x ARG 4 y ARG 6 z - ARG 10 dimension + ARG 8 distance + ARG 10 worldKey + ARG 11 packet METHOD method_14606 sendWorldInfo (Lnet/minecraft/class_3222;Lnet/minecraft/class_3218;)V ARG 1 player ARG 2 world @@ -126,3 +134,5 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager ARG 2 type ARG 3 senderUuid METHOD method_14617 saveAllPlayerData ()V + METHOD method_18241 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297; + ARG 1 vehicle diff --git a/mappings/net/minecraft/server/command/CommandSource.mapping b/mappings/net/minecraft/server/command/CommandSource.mapping index 3e88e3c711..c89e6a4f9a 100644 --- a/mappings/net/minecraft/server/command/CommandSource.mapping +++ b/mappings/net/minecraft/server/command/CommandSource.mapping @@ -1,6 +1,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_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/command/ServerCommandSource.mapping b/mappings/net/minecraft/server/command/ServerCommandSource.mapping index 17bd42f2a0..8bedee46a8 100644 --- a/mappings/net/minecraft/server/command/ServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/ServerCommandSource.mapping @@ -34,14 +34,16 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 8 server ARG 9 entity ARG 10 silent - ARG 11 resultConsumer + ARG 11 consumer ARG 12 entityAnchor METHOD method_9206 withLevel (I)Lnet/minecraft/class_2168; ARG 1 level METHOD method_9207 getPlayer ()Lnet/minecraft/class_3222; + COMMENT Gets the player from this command source or throws a command syntax exception if this command source is not a player. METHOD method_9208 withPosition (Lnet/minecraft/class_243;)Lnet/minecraft/class_2168; ARG 1 position METHOD method_9209 mergeConsumers (Lcom/mojang/brigadier/ResultConsumer;Ljava/util/function/BinaryOperator;)Lnet/minecraft/class_2168; + ARG 1 consumer METHOD method_9210 getRotation ()Lnet/minecraft/class_241; METHOD method_9211 getMinecraftServer ()Lnet/minecraft/server/MinecraftServer; METHOD method_9212 sendToOps (Lnet/minecraft/class_2561;)V @@ -66,6 +68,10 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 1 position METHOD method_9222 getPosition ()Lnet/minecraft/class_243; METHOD method_9223 getDisplayName ()Lnet/minecraft/class_2561; + METHOD method_9224 (Lcom/mojang/brigadier/context/CommandContext;ZI)V + ARG 0 context + ARG 1 success + ARG 2 result METHOD method_9225 getWorld ()Lnet/minecraft/class_3218; METHOD method_9226 sendFeedback (Lnet/minecraft/class_2561;Z)V ARG 1 message @@ -74,9 +80,10 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 1 world METHOD method_9228 getEntity ()Lnet/minecraft/class_1297; METHOD method_9229 getEntityOrThrow ()Lnet/minecraft/class_1297; + COMMENT Gets the entity from this command source or throws a command syntax exception if this command source is not an entity. METHOD method_9230 withMaxLevel (I)Lnet/minecraft/class_2168; ARG 1 level METHOD method_9231 withConsumer (Lcom/mojang/brigadier/ResultConsumer;)Lnet/minecraft/class_2168; - ARG 1 resultConsumer + ARG 1 consumer METHOD method_9232 withEntity (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2168; ARG 1 entity diff --git a/mappings/net/minecraft/util/snooper/Snooper.mapping b/mappings/net/minecraft/util/snooper/Snooper.mapping index 1ab2f907e6..ecf48be459 100644 --- a/mappings/net/minecraft/util/snooper/Snooper.mapping +++ b/mappings/net/minecraft/util/snooper/Snooper.mapping @@ -10,11 +10,15 @@ CLASS net/minecraft/class_1276 net/minecraft/util/snooper/Snooper FIELD field_5827 listener Lnet/minecraft/class_1279; METHOD (Ljava/lang/String;Lnet/minecraft/class_1279;J)V ARG 1 urlPath + ARG 2 listener + ARG 3 startTime METHOD method_5479 getToken ()Ljava/lang/String; METHOD method_5480 addInitialInfo (Ljava/lang/String;Ljava/lang/Object;)V ARG 1 key + ARG 2 value METHOD method_5481 addInfo (Ljava/lang/String;Ljava/lang/Object;)V ARG 1 key + ARG 2 value METHOD method_5483 isActive ()Z METHOD method_5484 getStartTime ()J METHOD method_5485 update ()V diff --git a/mappings/net/minecraft/util/snooper/SnooperListener.mapping b/mappings/net/minecraft/util/snooper/SnooperListener.mapping index 840651951c..aef1a3dcdd 100644 --- a/mappings/net/minecraft/util/snooper/SnooperListener.mapping +++ b/mappings/net/minecraft/util/snooper/SnooperListener.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_1279 net/minecraft/util/snooper/SnooperListener METHOD method_5495 addSnooperInfo (Lnet/minecraft/class_1276;)V + ARG 1 snooper diff --git a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping index f73e14a3f3..f69c0b3fc4 100644 --- a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping +++ b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions FIELD field_24528 bonusChest Z FIELD field_24532 legacyCustomOptions Ljava/util/Optional; FIELD field_24826 CODEC Lcom/mojang/serialization/Codec; + FIELD field_24827 options Lnet/minecraft/class_2370; METHOD (JZZLnet/minecraft/class_2370;)V ARG 1 seed ARG 3 generateStructures @@ -34,3 +35,4 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions METHOD method_28604 createOverworldGenerator (J)Lnet/minecraft/class_3754; ARG 0 seed METHOD method_28609 getDimensionMap ()Lnet/minecraft/class_2370; + METHOD method_29575 getWorlds ()Lcom/google/common/collect/ImmutableSet; diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index 3e7128b417..6e7683aed7 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -26,15 +26,23 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage FIELD field_23767 lock Lnet/minecraft/class_5125; FIELD field_23768 directory Ljava/nio/file/Path; FIELD field_23769 directoryName Ljava/lang/String; + FIELD field_24190 paths Ljava/util/Map; + METHOD (Lnet/minecraft/class_32;Ljava/lang/String;)V + ARG 2 directoryName METHOD method_27005 getDirectoryName ()Ljava/lang/String; METHOD method_27006 convert (Lnet/minecraft/class_3536;)Z ARG 1 progressListener METHOD method_27008 save (Ljava/lang/String;)V ARG 1 name METHOD method_27010 getDirectory (Lnet/minecraft/class_5218;)Ljava/nio/file/Path; + ARG 1 savePath METHOD method_27012 needsConversion ()Z METHOD method_27013 readLevelProperties (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;)Lnet/minecraft/class_5219; METHOD method_27014 getIconFile ()Ljava/io/File; METHOD method_27015 deleteSessionLock ()V METHOD method_27016 createBackup ()J METHOD method_27017 checkValid ()V + METHOD method_27424 getWorldDirectory (Lnet/minecraft/class_5321;)Ljava/io/File; + ARG 1 key + METHOD method_27428 (Lnet/minecraft/class_5218;)Ljava/nio/file/Path; + ARG 1 path diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index 3ce7907cc5..382951cf0b 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater FIELD field_17622 REGION_FILE_PATTERN Ljava/util/regex/Pattern; FIELD field_19225 eraseCache Z + FIELD field_24083 session Lnet/minecraft/class_32$class_5143; + FIELD field_24084 dataFixer Lcom/mojang/datafixers/DataFixer; + FIELD field_25354 worlds Lcom/google/common/collect/ImmutableSet; FIELD field_5755 persistentStateManager Lnet/minecraft/class_26; FIELD field_5756 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_5757 UPDATE_THREAD_FACTORY Ljava/util/concurrent/ThreadFactory; @@ -13,6 +16,11 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater FIELD field_5766 upgradedChunkCount I FIELD field_5767 updateThread Ljava/lang/Thread; FIELD field_5768 totalChunkCount I + METHOD (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lcom/google/common/collect/ImmutableSet;Z)V + ARG 1 session + ARG 2 dataFixer + ARG 3 worlds + ARG 4 eraseCache METHOD method_17830 getChunkPositions (Lnet/minecraft/class_5321;)Ljava/util/List; METHOD method_5393 getProgress (Lnet/minecraft/class_5321;)F METHOD method_5394 getStatus ()Lnet/minecraft/class_2561;