1.20.5-pre2 stuff (FabricMC#3845)

YanisBft · Apr 16, 2024 · 9f0b05e · 9f0b05e
1 parent 5d7a623
commit 9f0b05e
Show file tree

Hide file tree

Showing 26 changed files with 124 additions and 11 deletions.
diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping
@@ -198,6 +198,10 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks
 		ARG 0 block
 	METHOD method_56717 (Lnet/minecraft/class_2680;)I
 		ARG 0 state
+	METHOD method_59823 createMapColorFromWaterloggedBlockState (Lnet/minecraft/class_3620;)Ljava/util/function/Function;
+		ARG 0 mapColor
+	METHOD method_59824 (Lnet/minecraft/class_3620;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3620;
+		ARG 1 state
 	METHOD method_9492 register (Ljava/lang/String;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248;
 		ARG 0 id
 		ARG 1 block
diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping
@@ -193,6 +193,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	METHOD method_1480 getItemRenderer ()Lnet/minecraft/class_918;
 	METHOD method_1481 joinWorld (Lnet/minecraft/class_638;Lnet/minecraft/class_434$class_9678;)V
 		ARG 1 world
+		ARG 2 worldEntryReason
 	METHOD method_1483 getSoundManager ()Lnet/minecraft/class_1144;
 	METHOD method_1484 getSearchProvider (Lnet/minecraft/class_1124$class_1125;)Lnet/minecraft/class_1129;
 		ARG 1 key

diff --git a/mappings/net/minecraft/client/gui/screen/DownloadingTerrainScreen.mapping b/mappings/net/minecraft/client/gui/screen/DownloadingTerrainScreen.mapping
@@ -3,5 +3,10 @@ CLASS net/minecraft/class_434 net/minecraft/client/gui/screen/DownloadingTerrain
 	FIELD field_36365 MIN_LOAD_TIME_MS J
 	FIELD field_36368 loadStartTime J
 	FIELD field_46575 shouldClose Ljava/util/function/BooleanSupplier;
+	FIELD field_51485 worldEntryReason Lnet/minecraft/class_434$class_9678;
+	FIELD field_51486 backgroundSprite Lnet/minecraft/class_1058;
 	METHOD <init> (Ljava/util/function/BooleanSupplier;Lnet/minecraft/class_434$class_9678;)V
 		ARG 1 shouldClose
+		ARG 2 worldEntryReason
+	METHOD method_59838 getBackgroundSprite ()Lnet/minecraft/class_1058;
+	CLASS class_9678 WorldEntryReason
diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping
@@ -196,6 +196,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 		ARG 5 v
 		ARG 6 width
 		ARG 7 height
+	METHOD method_59840 clearTooltip ()V
 	CLASS class_6390 SelectedElementNarrationData
 		FIELD field_33825 selectable Lnet/minecraft/class_6379;
 		FIELD field_33826 index I

diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
@@ -142,3 +142,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 	METHOD method_54134 clearWorld ()V
 	METHOD method_55823 getScoreboard ()Lnet/minecraft/class_269;
 	METHOD method_59754 getBrewingRecipeRegistry ()Lnet/minecraft/class_1845;
+	METHOD method_59842 getWorldEntryReason (ZLnet/minecraft/class_5321;Lnet/minecraft/class_5321;)Lnet/minecraft/class_434$class_9678;
+		ARG 1 dead
+		ARG 2 from
+		ARG 3 to
diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping
@@ -588,6 +588,9 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 		ARG 0 value
 	METHOD method_57702 getMenuBackgroundBlurriness ()Lnet/minecraft/class_7172;
 	METHOD method_57703 getMenuBackgroundBlurrinessValue ()D
+	METHOD method_59835 getPercentOrOffValueText (Lnet/minecraft/class_2561;D)Lnet/minecraft/class_2561;
+		ARG 0 prefix
+		ARG 1 value
 	CLASS 2
 		METHOD method_33676 find (Ljava/lang/String;)Ljava/lang/String;
 			ARG 1 key

diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping
@@ -400,6 +400,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer
 	METHOD method_57796 renderBlur (F)V
 		ARG 1 delta
 	METHOD method_57797 loadBlurPostProcessor (Lnet/minecraft/class_5912;)V
+		ARG 1 resourceFactory
 	CLASS 1
 		METHOD method_45775 (Lnet/minecraft/class_2960;)Z
 			ARG 0 id

diff --git a/mappings/net/minecraft/command/argument/MessageArgumentType.mapping b/mappings/net/minecraft/command/argument/MessageArgumentType.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentType
+	FIELD field_51482 MESSAGE_TOO_LONG_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;
 	FIELD field_9876 EXAMPLES Ljava/util/Collection;
 	METHOD method_45562 getSignedMessage (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Ljava/util/function/Consumer;)V
 		ARG 0 context
@@ -17,6 +18,9 @@ CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentTyp
 		ARG 0 callback
 		ARG 1 source
 		ARG 2 message
+	METHOD method_59836 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
+		ARG 0 length
+		ARG 1 maxLength
 	METHOD method_9339 getMessage (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2561;
 		ARG 0 context
 		ARG 1 name
@@ -40,15 +44,9 @@ CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentTyp
 			ARG 0 reader
 			ARG 1 canUseSelectors
 	CLASS class_2198 MessageSelector
-		FIELD comp_2655 start I
-		FIELD comp_2656 end I
-		FIELD comp_2657 selector Lnet/minecraft/class_2300;
 		METHOD <init> (IILnet/minecraft/class_2300;)V
 			ARG 1 start
 			ARG 2 end
 			ARG 3 selector
-		METHOD comp_2655 start ()I
-		METHOD comp_2656 end ()I
-		METHOD comp_2657 selector ()Lnet/minecraft/class_2300;
 		METHOD method_9345 format (Lnet/minecraft/class_2168;)Lnet/minecraft/class_2561;
 			ARG 1 source
diff --git a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping
@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_9302 net/minecraft/component/type/WrittenBookContentComponent
-	FIELD comp_2422 pages Ljava/util/List;
 	FIELD field_49375 MAX_SERIALIZED_PAGE_LENGTH I
 	FIELD field_49378 MAX_TITLE_LENGTH I
 	FIELD field_49379 MAX_GENERATION I

diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
@@ -2291,6 +2291,15 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 1 entity
 	METHOD method_59657 getPassengerNearestTo (Lnet/minecraft/class_243;)Ljava/util/Optional;
 		ARG 1 pos
+	METHOD method_59816 collectCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Ljava/util/List;Lnet/minecraft/class_238;)Ljava/util/List;
+		ARG 0 entity
+		ARG 1 world
+		ARG 2 collisions
+		ARG 3 entityBoundingBox
+	METHOD method_59817 findPotentialStepHeights (Lnet/minecraft/class_238;Ljava/util/List;F)[F
+		ARG 0 entityBoundingBox
+		ARG 1 collisions
+		ARG 2 maxStepHeight
 	METHOD method_5982 checkDespawn ()V
 		COMMENT Checks whether the entity should be despawned.
 		COMMENT

diff --git a/mappings/net/minecraft/loot/function/SetFireworksLootFunction.mapping b/mappings/net/minecraft/loot/function/SetFireworksLootFunction.mapping
@@ -5,10 +5,15 @@ CLASS net/minecraft/class_9376 net/minecraft/loot/function/SetFireworksLootFunct
 	FIELD field_49885 flightDuration Ljava/util/Optional;
 	METHOD <init> (Ljava/util/List;Ljava/util/Optional;Ljava/util/Optional;)V
 		ARG 1 conditions
+		ARG 2 explosions
+		ARG 3 flightDuration
 	METHOD method_58212 apply (Lnet/minecraft/class_9284;)Lnet/minecraft/class_9284;
+		ARG 1 fireworksComponent
 	METHOD method_58214 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_58215 (Lnet/minecraft/class_9376;)Ljava/util/Optional;
 		ARG 0 function
 	METHOD method_58216 (Lnet/minecraft/class_9376;)Ljava/util/Optional;
 		ARG 0 function
+	METHOD method_59833 (Lnet/minecraft/class_9284;Lnet/minecraft/class_9368$class_9677;)Ljava/util/List;
+		ARG 1 values
diff --git a/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping b/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping
@@ -11,7 +11,7 @@ CLASS net/minecraft/class_5628 net/minecraft/nbt/visitor/NbtTextFormatter
 	FIELD field_27838 KEY_VALUE_SEPARATOR Ljava/lang/String;
 	FIELD field_27839 ENTRY_SEPARATOR Ljava/lang/String;
 	FIELD field_27840 prefix Ljava/lang/String;
-	FIELD field_27841 indentationLevel I
+	FIELD field_27841 depth I
 	FIELD field_27842 result Lnet/minecraft/class_2561;
 	FIELD field_33272 SQUARE_OPEN_BRACKET Ljava/lang/String;
 	FIELD field_33273 SQUARE_CLOSE_BRACKET Ljava/lang/String;
@@ -20,11 +20,19 @@ CLASS net/minecraft/class_5628 net/minecraft/nbt/visitor/NbtTextFormatter
 	FIELD field_33276 CURLY_OPEN_BRACKET Ljava/lang/String;
 	FIELD field_33277 CURLY_CLOSE_BRACKET Ljava/lang/String;
 	FIELD field_33278 NEW_LINE Ljava/lang/String;
+	FIELD field_51498 ELLIPSIS Lnet/minecraft/class_2561;
+	FIELD field_51499 indentationLevel I
+	METHOD <init> (Ljava/lang/String;)V
+		ARG 1 prefix
 	METHOD <init> (Ljava/lang/String;II)V
 		ARG 1 prefix
 		ARG 2 indentationLevel
+		ARG 3 depth
 	METHOD method_32304 escapeName (Ljava/lang/String;)Lnet/minecraft/class_2561;
 		ARG 0 name
 	METHOD method_32305 apply (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2561;
 		COMMENT {@return the textified NBT {@code element}}
 		ARG 1 element
+	METHOD method_59850 createSubElementText (Lnet/minecraft/class_2520;Z)Lnet/minecraft/class_2561;
+		ARG 1 element
+		ARG 2 indent
diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping
@@ -119,6 +119,7 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection
 	METHOD method_48311 addHandlers (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;ZLnet/minecraft/class_8762;)V
 		ARG 0 pipeline
 		ARG 1 side
+		ARG 3 packetSizeLogger
 	METHOD method_52271 connect (Ljava/net/InetSocketAddress;ZLnet/minecraft/class_2535;)Lio/netty/channel/ChannelFuture;
 		ARG 0 address
 		ARG 1 useEpoll
@@ -191,6 +192,8 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection
 		ARG 0 sendingSide
 	METHOD method_56334 getInboundHandlerName (Z)Ljava/lang/String;
 		ARG 0 receivingSide
+	METHOD method_59852 (Lnet/minecraft/class_8762;Z)Lio/netty/channel/ChannelInboundHandler;
+		ARG 0 packetSizeLogger
 	CLASS 1
 		METHOD initChannel (Lio/netty/channel/Channel;)V
 			ARG 1 channel

diff --git a/mappings/net/minecraft/network/NetworkThreadUtils.mapping b/mappings/net/minecraft/network/NetworkThreadUtils.mapping
@@ -12,3 +12,7 @@ CLASS net/minecraft/class_2600 net/minecraft/network/NetworkThreadUtils
 		ARG 0 report
 		ARG 1 listener
 		ARG 2 packet
+	METHOD method_59854 createCrashException (Ljava/lang/Exception;Lnet/minecraft/class_2596;Lnet/minecraft/class_2547;)Lnet/minecraft/class_148;
+		ARG 0 exception
+		ARG 1 packet
+		ARG 2 listener
diff --git a/mappings/net/minecraft/network/listener/PacketListener.mapping b/mappings/net/minecraft/network/listener/PacketListener.mapping
@@ -18,3 +18,6 @@ CLASS net/minecraft/class_2547 net/minecraft/network/listener/PacketListener
 		ARG 1 section
 	METHOD method_55622 fillCrashReport (Lnet/minecraft/class_128;)V
 		ARG 1 report
+	METHOD method_59807 onPacketException (Lnet/minecraft/class_2596;Ljava/lang/Exception;)V
+		ARG 1 packet
+		ARG 2 exception
diff --git a/mappings/net/minecraft/network/listener/ServerCrashSafePacketListener.mapping b/mappings/net/minecraft/network/listener/ServerCrashSafePacketListener.mapping
@@ -3,3 +3,4 @@ CLASS net/minecraft/class_6857 net/minecraft/network/listener/ServerCrashSafePac
 	COMMENT
 	COMMENT @implNote Serverbound packet listeners log any uncaught exceptions
 	COMMENT without crashing.
+	FIELD field_51479 LOGGER Lorg/slf4j/Logger;
diff --git a/mappings/net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket.mapping
@@ -1,6 +1,4 @@
 CLASS net/minecraft/class_2811 net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket
 	FIELD comp_2649 syncId I
-	FIELD comp_2650 buttonId I
 	FIELD field_48188 CODEC Lnet/minecraft/class_9139;
 	METHOD comp_2649 syncId ()I
-	METHOD comp_2650 buttonId ()I
diff --git a/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping
@@ -2,5 +2,8 @@ CLASS net/minecraft/class_2873 net/minecraft/network/packet/c2s/play/CreativeInv
 	FIELD comp_2609 slot S
 	FIELD comp_2610 stack Lnet/minecraft/class_1799;
 	FIELD field_48219 CODEC Lnet/minecraft/class_9139;
+	METHOD <init> (ILnet/minecraft/class_1799;)V
+		ARG 1 slot
+		ARG 2 stack
 	METHOD comp_2609 slot ()S
 	METHOD comp_2610 stack ()Lnet/minecraft/class_1799;
diff --git a/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping b/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping
@@ -0,0 +1,10 @@
+CLASS net/minecraft/class_9679 net/minecraft/particle/AbstractDustParticleEffect
+	FIELD field_51493 scale F
+	FIELD field_51494 MIN_SCALE F
+	FIELD field_51495 MAX_SCALE F
+	FIELD field_51496 SCALE_CODEC Lcom/mojang/serialization/Codec;
+	METHOD <init> (F)V
+		ARG 1 scale
+	METHOD method_59844 (Ljava/lang/Float;)Lcom/mojang/serialization/DataResult;
+		ARG 0 scale
+	METHOD method_59846 getScale ()F
diff --git a/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping b/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping
@@ -4,7 +4,9 @@ CLASS net/minecraft/class_5743 net/minecraft/particle/DustColorTransitionParticl
 	FIELD field_28269 CODEC Lcom/mojang/serialization/MapCodec;
 	FIELD field_28271 toColor Lorg/joml/Vector3f;
 	FIELD field_48454 PACKET_CODEC Lnet/minecraft/class_9139;
+	FIELD field_51491 fromColor Lorg/joml/Vector3f;
 	METHOD <init> (Lorg/joml/Vector3f;Lorg/joml/Vector3f;F)V
+		ARG 1 fromColor
 		ARG 2 toColor
 		ARG 3 scale
 	METHOD method_33107 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;

diff --git a/mappings/net/minecraft/particle/DustParticleEffect.mapping b/mappings/net/minecraft/particle/DustParticleEffect.mapping
@@ -3,9 +3,14 @@ CLASS net/minecraft/class_2390 net/minecraft/particle/DustParticleEffect
 	FIELD field_25124 CODEC Lcom/mojang/serialization/MapCodec;
 	FIELD field_28272 RED Lorg/joml/Vector3f;
 	FIELD field_48455 PACKET_CODEC Lnet/minecraft/class_9139;
+	FIELD field_51492 color Lorg/joml/Vector3f;
+	METHOD <init> (Lorg/joml/Vector3f;F)V
+		ARG 1 color
+		ARG 2 scale
 	METHOD method_33115 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_33117 (Lnet/minecraft/class_2390;)Lorg/joml/Vector3f;
 		ARG 0 effect
 	METHOD method_56175 (Lnet/minecraft/class_2390;)Lorg/joml/Vector3f;
 		ARG 0 effect
+	METHOD method_59843 getColor ()Lorg/joml/Vector3f;
diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping
@@ -5,6 +5,7 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager
 	FIELD field_19359 GSON Lcom/google/gson/Gson;
 	FIELD field_36308 recipesById Ljava/util/Map;
 	FIELD field_48848 registryLookup Lnet/minecraft/class_7225$class_7874;
+	FIELD field_51481 recipesByType Lcom/google/common/collect/Multimap;
 	FIELD field_9024 errored Z
 		COMMENT This isn't quite indicating an errored state; its value is only set to
 		COMMENT {@code false} and is never {@code true}, and isn't used anywhere.
@@ -27,6 +28,8 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager
 			COMMENT the recipe's ID
 		ARG 1 json
 		ARG 2 registryLookup
+	METHOD method_17876 (Lnet/minecraft/class_1937;Lnet/minecraft/class_8786;)Ljava/lang/String;
+		ARG 1 entry
 	METHOD method_17877 getAllMatches (Lnet/minecraft/class_3956;Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;)Ljava/util/List;
 		COMMENT Creates a list of all recipes of the given {@code type} that match the
 		COMMENT given {@code inventory} and {@code world}. The list is ordered by the
@@ -62,6 +65,8 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager
 		COMMENT return {@code false} without mods.
 	METHOD method_42297 (Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;Lnet/minecraft/class_8786;)Z
 		ARG 2 recipe
+	METHOD method_42298 (Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;Lnet/minecraft/class_8786;)Z
+		ARG 2 entry
 	METHOD method_42299 getFirstMatch (Lnet/minecraft/class_3956;Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;Lnet/minecraft/class_2960;)Ljava/util/Optional;
 		ARG 1 type
 		ARG 2 inventory
@@ -73,6 +78,12 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager
 		COMMENT Creates a cached match getter. This is optimized for getting matches of the same
 		COMMENT recipe repeatedly, such as furnaces.
 		ARG 0 type
+	METHOD method_59821 get (Lnet/minecraft/class_3956;Lnet/minecraft/class_2960;)Lnet/minecraft/class_8786;
+		COMMENT {@return a recipe with the given {@code id} and {@code type}, or empty if there is no such recipe}
+		ARG 1 type
+			COMMENT the type of the desired recipe
+		ARG 2 id
+			COMMENT the ID of the desired recipe
 	METHOD method_8126 values ()Ljava/util/Collection;
 		COMMENT {@return all recipes in this manager}
 		COMMENT

diff --git a/mappings/net/minecraft/resource/ResourcePackManager.mapping b/mappings/net/minecraft/resource/ResourcePackManager.mapping
@@ -31,3 +31,7 @@ CLASS net/minecraft/class_3283 net/minecraft/resource/ResourcePackManager
 		ARG 1 profile
 	METHOD method_49428 disable (Ljava/lang/String;)Z
 		ARG 1 profile
+	METHOD method_59808 (Lnet/minecraft/class_3288;)Ljava/lang/String;
+		ARG 0 profile
+	METHOD method_59809 listPacks (Ljava/util/Collection;)Ljava/lang/String;
+		ARG 0 profiles
diff --git a/mappings/net/minecraft/resource/featuretoggle/FeatureSet.mapping b/mappings/net/minecraft/resource/featuretoggle/FeatureSet.mapping
@@ -28,3 +28,7 @@ CLASS net/minecraft/class_7699 net/minecraft/resource/featuretoggle/FeatureSet
 	METHOD method_45404 combine (Lnet/minecraft/class_7699;)Lnet/minecraft/class_7699;
 		ARG 1 features
 	METHOD method_58398 isEmpty ()Z
+	METHOD method_59819 intersects (Lnet/minecraft/class_7699;)Z
+		ARG 1 features
+	METHOD method_59820 subtract (Lnet/minecraft/class_7699;)Lnet/minecraft/class_7699;
+		ARG 1 features
diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping
@@ -158,8 +158,12 @@ CLASS net/minecraft/server/MinecraftServer
 		ARG 2 resourceManagerHolder
 	METHOD method_29735 createDataPackSettings (Lnet/minecraft/class_3283;Z)Lnet/minecraft/class_5359;
 		ARG 0 dataPackManager
+		ARG 1 allowEnabling
 	METHOD method_29736 loadDataPacks (Lnet/minecraft/class_3283;Lnet/minecraft/class_7712;ZZ)Lnet/minecraft/class_7712;
-		ARG 2 safeMode
+		ARG 0 resourcePackManager
+		ARG 1 dataConfiguration
+		ARG 2 initMode
+		ARG 3 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;
@@ -463,6 +467,14 @@ CLASS net/minecraft/server/MinecraftServer
 		ARG 1 pos
 	METHOD method_58576 getReloadableRegistries ()Lnet/minecraft/class_9383$class_9385;
 	METHOD method_59777 getBrewingRecipeRegistry ()Lnet/minecraft/class_1845;
+	METHOD method_59847 forceEnableRequestedFeatures (Lnet/minecraft/class_3283;Lnet/minecraft/class_7699;)V
+		ARG 0 resourcePackManager
+		ARG 1 enabledFeatures
+	METHOD method_59848 loadDataPacks (Lnet/minecraft/class_3283;Ljava/util/Collection;Lnet/minecraft/class_7699;Z)Lnet/minecraft/class_7712;
+		ARG 0 resourcePackManager
+		ARG 1 enabledProfiles
+		ARG 2 enabledFeatures
+		ARG 3 allowEnabling
 	CLASS class_6414 DebugStart
 		FIELD field_33980 time J
 		FIELD field_33981 tick I

diff --git a/mappings/net/minecraft/util/collection/ListOperation.mapping b/mappings/net/minecraft/util/collection/ListOperation.mapping
@@ -11,6 +11,9 @@ CLASS net/minecraft/class_9368 net/minecraft/util/collection/ListOperation
 		ARG 1 operation
 	METHOD method_58459 (Lnet/minecraft/class_9368$class_9373;)Lcom/mojang/serialization/MapCodec;
 		ARG 0 mode
+	METHOD method_59742 apply (Ljava/util/List;Ljava/util/List;)Ljava/util/List;
+		ARG 1 current
+		ARG 2 values
 	CLASS class_9369 Append
 		FIELD field_49847 INSTANCE Lnet/minecraft/class_9368$class_9369;
 		FIELD field_49848 CODEC Lcom/mojang/serialization/MapCodec;
@@ -38,3 +41,15 @@ CLASS net/minecraft/class_9368 net/minecraft/util/collection/ListOperation
 			ARG 3 id
 			ARG 4 codec
 		METHOD method_58197 getCodec ()Lcom/mojang/serialization/MapCodec;
+	CLASS class_9677 Values
+		METHOD method_59828 createCodec (Lcom/mojang/serialization/Codec;I)Lcom/mojang/serialization/Codec;
+			ARG 0 codec
+			ARG 1 maxSize
+		METHOD method_59829 (Lcom/mojang/serialization/Codec;ILcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+			ARG 2 instance
+		METHOD method_59830 (Lnet/minecraft/class_9368$class_9677;)Lnet/minecraft/class_9368;
+			ARG 0 values
+		METHOD method_59831 apply (Ljava/util/List;)Ljava/util/List;
+			ARG 1 current
+		METHOD method_59832 (Lnet/minecraft/class_9368$class_9677;)Ljava/util/List;
+			ARG 0 values