Merge branch '24w37a' into 24w37a-stuff

Shnupbups · Sep 12, 2024 · 022adac · 022adac
2 parents f54a2df + 77d1848
commit 022adac
Show file tree

Hide file tree

Showing 20 changed files with 108 additions and 32 deletions.
diff --git a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping
@@ -36,10 +36,10 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen
 		ARG 1 button
 	METHOD method_20375 onDemoDeletionConfirmed (Z)V
 		ARG 1 delete
-	METHOD method_2249 initWidgetsNormal (II)I
+	METHOD method_2249 addNormalWidgets (II)I
 		ARG 1 y
 		ARG 2 spacingY
-	METHOD method_2251 initWidgetsDemo (II)I
+	METHOD method_2251 addDemoWidgets (II)I
 		ARG 1 y
 		ARG 2 spacingY
 	METHOD method_2253 isRealmsNotificationsGuiDisplayed ()Z
@@ -51,7 +51,7 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen
 		ARG 1 button
 	METHOD method_59752 setWidgetAlpha (F)V
 		ARG 1 alpha
-	METHOD method_64237 initWidgetsDevelopment (II)I
+	METHOD method_64237 addCreateTestWorldButton (II)I
 		ARG 1 y
 		ARG 2 spacingY
 	METHOD method_64238 (Lnet/minecraft/class_4185;)V

diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping
@@ -53,7 +53,7 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS
 	METHOD method_30296 getScannedPack (Lnet/minecraft/class_7712;)Lcom/mojang/datafixers/util/Pair;
 		ARG 1 dataConfiguration
 	METHOD method_30297 onCloseScreen ()V
-	METHOD method_31130 create (Lnet/minecraft/class_310;Lnet/minecraft/class_437;)V
+	METHOD method_31130 show (Lnet/minecraft/class_310;Lnet/minecraft/class_437;)V
 		ARG 0 client
 		ARG 1 parent
 	METHOD method_40212 create (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_1940;Lnet/minecraft/class_7193;Ljava/nio/file/Path;)Lnet/minecraft/class_525;
@@ -72,6 +72,10 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS
 	METHOD method_41849 createServerConfig (Lnet/minecraft/class_3283;Lnet/minecraft/class_7712;)Lnet/minecraft/class_7237$class_6906;
 		ARG 0 dataPackManager
 		ARG 1 dataConfiguration
+	METHOD method_41851 (Lnet/minecraft/class_5350;Lnet/minecraft/class_7780;Lnet/minecraft/class_7749;)Lnet/minecraft/class_7193;
+		ARG 0 dataPackContents
+		ARG 1 dynamicRegistries
+		ARG 2 settings
 	METHOD method_41852 showMessage (Lnet/minecraft/class_310;Lnet/minecraft/class_2561;)V
 		ARG 0 client
 		ARG 1 text
@@ -113,6 +117,28 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS
 		ARG 3 throwable
 	METHOD method_59841 (Lnet/minecraft/class_7193;)Lnet/minecraft/class_7193;
 		ARG 0 generatorOptionsHolder
+	METHOD method_64243 (Lnet/minecraft/class_5350;Lnet/minecraft/class_7780;Lnet/minecraft/class_7749;)Lnet/minecraft/class_7193;
+		ARG 0 dataPackContents
+		ARG 1 dynamicRegistries
+		ARG 2 settings
+	METHOD method_64244 show (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Ljava/util/function/Function;Lnet/minecraft/class_10221;Lnet/minecraft/class_5321;)V
+		ARG 0 client
+		ARG 1 parent
+		ARG 2 settingsSupplier
+		ARG 3 generatorOptionsFactory
+		ARG 4 presetKey
+	METHOD method_64245 (Lnet/minecraft/class_10221;Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Lnet/minecraft/class_7780;Lnet/minecraft/class_7749;)Lnet/minecraft/class_7193;
+		ARG 1 resourceManager
+		ARG 2 dataPackContents
+		ARG 3 dynamicRegistries
+		ARG 4 settings
+	METHOD method_64246 (Ljava/util/function/Function;Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7237$class_7661;
+		ARG 1 context
+	METHOD method_64247 (Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7726;
+		ARG 0 context
+	METHOD method_64248 showTestWorld (Lnet/minecraft/class_310;Lnet/minecraft/class_437;)V
+		ARG 0 client
+		ARG 1 parent
 	CLASS class_8093 GameTab
 		FIELD field_42175 GAME_TAB_TITLE_TEXT Lnet/minecraft/class_2561;
 		FIELD field_42176 ALLOW_COMMANDS_TEXT Lnet/minecraft/class_2561;

diff --git a/mappings/net/minecraft/client/gui/screen/world/InitialWorldOptions.mapping b/mappings/net/minecraft/client/gui/screen/world/InitialWorldOptions.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_10220 net/minecraft/client/gui/screen/world/InitialWorldOptions
diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldCreator.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldCreator.mapping
@@ -87,6 +87,16 @@ CLASS net/minecraft/class_8100 net/minecraft/client/gui/screen/world/WorldCreato
 	METHOD method_49703 getWorldDirectoryName ()Ljava/lang/String;
 	METHOD method_49704 toDirectoryName (Ljava/lang/String;)Ljava/lang/String;
 		ARG 1 worldName
+	METHOD method_64249 (Lnet/minecraft/class_5321;Lnet/minecraft/class_2378;)Ljava/util/Optional;
+		ARG 1 registry
+	METHOD method_64250 (Lnet/minecraft/class_1928$class_4313;)V
+		ARG 1 rule
+	METHOD method_64251 (Lnet/minecraft/class_3232;)V
+		ARG 1 config
+	METHOD method_64252 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_3232;
+		ARG 0 preset
+	METHOD method_64253 (Lnet/minecraft/class_7193;Lnet/minecraft/class_5321;)Ljava/util/Optional;
+		ARG 1 presetKey
 	CLASS class_4539 Mode
 		FIELD field_20629 defaultGameMode Lnet/minecraft/class_1934;
 		FIELD field_42224 name Lnet/minecraft/class_2561;

diff --git a/mappings/net/minecraft/client/world/GeneratorOptionsFactory.mapping b/mappings/net/minecraft/client/world/GeneratorOptionsFactory.mapping
@@ -0,0 +1,5 @@
+CLASS net/minecraft/class_10221 net/minecraft/client/world/GeneratorOptionsFactory
+	METHOD apply (Lnet/minecraft/class_5350;Lnet/minecraft/class_7780;Lnet/minecraft/class_7749;)Lnet/minecraft/class_7193;
+		ARG 1 dataPackContents
+		ARG 2 dynamicRegistries
+		ARG 3 settings
diff --git a/mappings/net/minecraft/registry/tag/TagKey.mapping b/mappings/net/minecraft/registry/tag/TagKey.mapping
@@ -8,14 +8,14 @@ CLASS net/minecraft/class_6862 net/minecraft/registry/tag/TagKey
 	METHOD method_40089 (Lnet/minecraft/class_6862;)Ljava/lang/String;
 		ARG 0 string
 	METHOD method_40090 unprefixedCodec (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/Codec;
-		ARG 0 registry
+		ARG 0 registryRef
 	METHOD method_40091 (Lnet/minecraft/class_5321;Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
 		ARG 1 string
 	METHOD method_40092 of (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Lnet/minecraft/class_6862;
-		ARG 0 registry
+		ARG 0 registryRef
 		ARG 1 id
 	METHOD method_40093 codec (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/Codec;
-		ARG 0 registry
+		ARG 0 registryRef
 	METHOD method_40094 (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Lnet/minecraft/class_6862;
 		ARG 1 id
 	METHOD method_40095 (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Lnet/minecraft/class_6862;
@@ -27,4 +27,4 @@ CLASS net/minecraft/class_6862 net/minecraft/registry/tag/TagKey
 	METHOD method_64142 (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Lnet/minecraft/class_6862;
 		ARG 1 id
 	METHOD method_64143 packetCodec (Lnet/minecraft/class_5321;)Lnet/minecraft/class_9139;
-		ARG 0 registry
+		ARG 0 registryRef
diff --git a/mappings/net/minecraft/resource/ResourceReloader.mapping b/mappings/net/minecraft/resource/ResourceReloader.mapping
@@ -33,6 +33,8 @@ CLASS net/minecraft/class_3302 net/minecraft/resource/ResourceReloader
 			COMMENT the synchronizer
 		ARG 2 manager
 			COMMENT the resource manager
+		ARG 3 prepareExecutor
+		ARG 4 applyExecutor
 	CLASS class_4045 Synchronizer
 		COMMENT A synchronizer to indicate completion of a reloader's prepare stage and
 		COMMENT to allow start of the apply stage only if all reloaders have finished

diff --git a/mappings/net/minecraft/resource/SinglePreparationResourceReloader.mapping b/mappings/net/minecraft/resource/SinglePreparationResourceReloader.mapping
@@ -25,3 +25,5 @@ CLASS net/minecraft/class_4080 net/minecraft/resource/SinglePreparationResourceR
 			COMMENT the resource manager
 		ARG 2 profiler
 			COMMENT the prepare profiler
+	METHOD method_18790 (Lnet/minecraft/class_3300;Ljava/lang/Object;)V
+		ARG 2 prepared
diff --git a/mappings/net/minecraft/server/command/GameRuleCommand.mapping b/mappings/net/minecraft/server/command/GameRuleCommand.mapping
@@ -1,6 +1,7 @@
 CLASS net/minecraft/class_3065 net/minecraft/server/command/GameRuleCommand
 	METHOD method_13392 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
+		ARG 1 commandRegistryAccess
 	METHOD method_13393 (Lnet/minecraft/class_2168;)Z
 		ARG 0 source
 	METHOD method_13394 executeSet (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_1928$class_4313;)I

diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping
@@ -59,7 +59,9 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 	FIELD field_51875 movement Lnet/minecraft/class_243;
 	FIELD field_52358 particlesMode Lnet/minecraft/class_4066;
 	FIELD field_54048 playerInput Lnet/minecraft/class_10185;
-	FIELD field_54208 thrownEnderPearls Ljava/util/Set;
+	FIELD field_54208 enderPearls Ljava/util/Set;
+	FIELD field_54209 ENDER_PEARLS_KEY Ljava/lang/String;
+	FIELD field_54210 ENDER_PEARLS_DIMENSION_KEY Ljava/lang/String;
 	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3218;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_8791;)V
 		ARG 1 server
 		ARG 2 world
@@ -293,33 +295,33 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 		ARG 1 playerInput
 	METHOD method_63562 getPlayerInput ()Lnet/minecraft/class_10185;
 	METHOD method_63563 getInputVelocityForMinecart ()Lnet/minecraft/class_243;
-	METHOD method_64123 addEnderPearlChunkTicket (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;)J
+	METHOD method_64123 addEnderPearlTicket (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;)J
 		ARG 0 world
 		ARG 1 chunkPos
-	METHOD method_64124 addThrownEnderPearl (Lnet/minecraft/class_1684;)V
+	METHOD method_64124 addEnderPearl (Lnet/minecraft/class_1684;)V
 		ARG 1 enderPearl
-	METHOD method_64125 readRootVehicleFromNbt (Ljava/util/Optional;)V
+	METHOD method_64125 readRootVehicle (Ljava/util/Optional;)V
 		ARG 1 nbt
 	METHOD method_64126 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V
 		ARG 1 dimension
 	METHOD method_64127 (Lnet/minecraft/class_2520;)V
-		ARG 1 nbtx
-	METHOD method_64128 getThrownEnderPearls ()Ljava/util/Set;
+		ARG 1 enderPearlNbt
+	METHOD method_64128 getEnderPearls ()Ljava/util/Set;
 	METHOD method_64129 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297;
-		ARG 1 entity
-	METHOD method_64130 removeThrownEnderPearl (Lnet/minecraft/class_1684;)V
 		ARG 1 enderPearl
-	METHOD method_64131 readEnderPearlsFromNbt (Ljava/util/Optional;)V
+	METHOD method_64130 removeEnderPearl (Lnet/minecraft/class_1684;)V
+		ARG 1 enderPearl
+	METHOD method_64131 readEnderPearls (Ljava/util/Optional;)V
 		ARG 1 nbt
 	METHOD method_64132 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297;
 		ARG 1 entity
-	METHOD method_64133 addOrUpdateEnderPearlChunkTicket (Lnet/minecraft/class_1684;)J
+	METHOD method_64133 handleThrownEnderPearl (Lnet/minecraft/class_1684;)J
 		ARG 1 enderPearl
-	METHOD method_64134 sendPlayerMarkerPacket (Lnet/minecraft/class_1799;)V
+	METHOD method_64134 sendMapPacket (Lnet/minecraft/class_1799;)V
 		ARG 1 stack
-	METHOD method_64135 writeRootVehicleToNbt (Lnet/minecraft/class_2487;)V
+	METHOD method_64135 writeRootVehicle (Lnet/minecraft/class_2487;)V
 		ARG 1 nbt
-	METHOD method_64136 writeEnderPearlsToNbt (Lnet/minecraft/class_2487;)V
+	METHOD method_64136 writeEnderPearls (Lnet/minecraft/class_2487;)V
 		ARG 1 nbt
 	METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z
 		ARG 1 gameMode

diff --git a/mappings/net/minecraft/state/State.mapping b/mappings/net/minecraft/state/State.mapping
@@ -3,7 +3,7 @@ CLASS net/minecraft/class_2688 net/minecraft/state/State
 	FIELD field_24738 propertyMap Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;
 	FIELD field_24739 owner Ljava/lang/Object;
 	FIELD field_24740 codec Lcom/mojang/serialization/MapCodec;
-	FIELD field_24741 withTable Ljava/util/Map;
+	FIELD field_24741 withMap Ljava/util/Map;
 	FIELD field_31385 NAME Ljava/lang/String;
 	FIELD field_31386 PROPERTIES Ljava/lang/String;
 	METHOD <init> (Ljava/lang/Object;Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;Lcom/mojang/serialization/MapCodec;)V
@@ -26,7 +26,7 @@ CLASS net/minecraft/class_2688 net/minecraft/state/State
 	METHOD method_28495 getNext (Ljava/util/List;Ljava/lang/Object;)Ljava/lang/Object;
 		ARG 0 values
 		ARG 1 value
-	METHOD method_28496 createWithTable (Ljava/util/Map;)V
+	METHOD method_28496 createWithMap (Ljava/util/Map;)V
 		ARG 1 states
 	METHOD method_28497 (Ljava/util/function/Function;Ljava/lang/Object;)Lcom/mojang/serialization/MapCodec;
 		ARG 1 owner
@@ -38,6 +38,8 @@ CLASS net/minecraft/class_2688 net/minecraft/state/State
 	METHOD method_28500 getOrEmpty (Lnet/minecraft/class_2769;)Ljava/util/Optional;
 		ARG 1 property
 	METHOD method_28501 getProperties ()Ljava/util/Collection;
+	METHOD method_38860 (Lnet/minecraft/class_2688;Ljava/util/Optional;)Lnet/minecraft/class_2688;
+		ARG 1 state
 	METHOD method_47968 withIfExists (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/Object;
 		ARG 1 property
 		ARG 2 value
@@ -48,8 +50,8 @@ CLASS net/minecraft/class_2688 net/minecraft/state/State
 		ARG 1 property
 	METHOD method_64216 with (Lnet/minecraft/class_2769;Ljava/lang/Comparable;Ljava/lang/Comparable;)Ljava/lang/Object;
 		ARG 1 property
-		ARG 2 value
-		ARG 3 existingValue
+		ARG 2 newValue
+		ARG 3 oldValue
 	METHOD method_64217 (Ljava/util/Map;Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/Object;
 		ARG 3 value
 	CLASS 1

diff --git a/mappings/net/minecraft/state/StateManager.mapping b/mappings/net/minecraft/state/StateManager.mapping
@@ -16,11 +16,21 @@ CLASS net/minecraft/class_2689 net/minecraft/state/StateManager
 	METHOD method_11663 getProperty (Ljava/lang/String;)Lnet/minecraft/class_2769;
 		ARG 1 name
 	METHOD method_11664 getDefaultState ()Lnet/minecraft/class_2688;
+	METHOD method_11666 (Lnet/minecraft/class_2769;Ljava/util/List;)Ljava/util/stream/Stream;
+		ARG 1 entries
+	METHOD method_28484 (Lnet/minecraft/class_2689$class_2691;Ljava/lang/Object;Lcom/mojang/serialization/MapCodec;Ljava/util/Map;Ljava/util/List;Ljava/util/List;)V
+		ARG 5 entries
+	METHOD method_30037 (Lnet/minecraft/class_2769;Lnet/minecraft/class_2688;)Lcom/mojang/datafixers/util/Pair;
+		ARG 1 state
+	METHOD method_30038 (Lnet/minecraft/class_2769;Lcom/mojang/datafixers/util/Pair;)Lnet/minecraft/class_2688;
+		ARG 1 pair
 	METHOD method_30040 addFieldToMapCodec (Lcom/mojang/serialization/MapCodec;Ljava/util/function/Supplier;Ljava/lang/String;Lnet/minecraft/class_2769;)Lcom/mojang/serialization/MapCodec;
 		ARG 0 mapCodec
 		ARG 1 defaultStateGetter
 		ARG 2 key
 		ARG 3 property
+	METHOD method_38859 (Ljava/lang/String;)V
+		ARG 0 value
 	CLASS class_2690 Builder
 		FIELD field_12318 owner Ljava/lang/Object;
 		FIELD field_12319 namedProperties Ljava/util/Map;

diff --git a/mappings/net/minecraft/state/property/DirectionProperty.mapping b/mappings/net/minecraft/state/property/DirectionProperty.mapping
@@ -5,15 +5,15 @@ CLASS net/minecraft/class_2753 net/minecraft/state/property/DirectionProperty
 	COMMENT usages.
 	METHOD <init> (Ljava/lang/String;Ljava/util/List;)V
 		ARG 1 name
-		ARG 2 values
+		ARG 2 directions
 	METHOD method_11843 of (Ljava/lang/String;Ljava/util/List;)Lnet/minecraft/class_2753;
 		COMMENT Creates a direction property with the given values.
 		COMMENT
 		COMMENT @see #of(String)
 		ARG 0 name
 			COMMENT the name of the property; see {@linkplain Property#name the note on the
 			COMMENT name}
-		ARG 1 values
+		ARG 1 directions
 	METHOD method_11844 of (Ljava/lang/String;Ljava/util/function/Predicate;)Lnet/minecraft/class_2753;
 		COMMENT Creates a direction property with the values allowed by the given
 		COMMENT filter out of all 6 directions.

diff --git a/mappings/net/minecraft/state/property/EnumProperty.mapping b/mappings/net/minecraft/state/property/EnumProperty.mapping
@@ -17,6 +17,11 @@ CLASS net/minecraft/class_2754 net/minecraft/state/property/EnumProperty
 	COMMENT usages.
 	FIELD field_12595 values Ljava/util/List;
 	FIELD field_12596 byName Ljava/util/Map;
+	FIELD field_54243 minOrdinal I
+	FIELD field_54244 maxOrdinal I
+	FIELD field_54245 HAS_HOLES I
+		COMMENT Indicates that enums' ordinals are non-consecutive (thus, having "holes").
+		COMMENT This makes some lookups' average speed from O(1) to O(n).
 	METHOD <init> (Ljava/lang/String;Ljava/lang/Class;Ljava/util/List;)V
 		ARG 1 name
 		ARG 2 type
@@ -77,3 +82,7 @@ CLASS net/minecraft/class_2754 net/minecraft/state/property/EnumProperty
 			COMMENT name}
 		ARG 1 type
 			COMMENT the type of the values the property contains
+	METHOD method_38863 (Ljava/lang/Enum;)Z
+		ARG 0 enum_
+	METHOD method_64220 (Ljava/util/List;[II)Z
+		ARG 2 index
diff --git a/mappings/net/minecraft/state/property/Property.mapping b/mappings/net/minecraft/state/property/Property.mapping
@@ -43,7 +43,7 @@ CLASS net/minecraft/class_2769 net/minecraft/state/property/Property
 		ARG 2 state
 		ARG 3 input
 	METHOD method_35308 getCodec ()Lcom/mojang/serialization/Codec;
-	METHOD method_64218 getValueIndex (Ljava/lang/Comparable;)I
+	METHOD method_64218 ordinal (Ljava/lang/Comparable;)I
 		ARG 1 value
 	CLASS class_4933 Value
 		FIELD comp_70 property Lnet/minecraft/class_2769;

diff --git a/mappings/net/minecraft/util/math/ChunkPos.mapping b/mappings/net/minecraft/util/math/ChunkPos.mapping
@@ -69,9 +69,9 @@ CLASS net/minecraft/class_1923 net/minecraft/util/math/ChunkPos
 		ARG 1 x
 		ARG 2 z
 	METHOD method_64211 (Ljava/util/stream/IntStream;)Lcom/mojang/serialization/DataResult;
-		ARG 0 intStream
+		ARG 0 stream
 	METHOD method_64212 ([I)Lnet/minecraft/class_1923;
-		ARG 0 intArray
+		ARG 0 coords
 	METHOD method_64213 (Lnet/minecraft/class_1923;)Ljava/util/stream/IntStream;
 		ARG 0 chunkPos
 	METHOD method_8323 getStartPos ()Lnet/minecraft/class_2338;

diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping
@@ -199,11 +199,13 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers
 			ARG 3 count
 			ARG 4 experience
 		METHOD <init> (Lnet/minecraft/class_1792;IIII)V
+			ARG 1 item
 			ARG 2 price
 			ARG 3 count
 			ARG 4 maxUses
 			ARG 5 experience
 		METHOD <init> (Lnet/minecraft/class_1792;IIIIF)V
+			ARG 1 item
 			ARG 2 price
 			ARG 3 count
 			ARG 4 maxUses
@@ -218,11 +220,13 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers
 			ARG 6 multiplier
 			ARG 7 enchantmentProviderKey
 		METHOD <init> (Lnet/minecraft/class_1799;IIII)V
+			ARG 1 stack
 			ARG 2 price
 			ARG 3 count
 			ARG 4 maxUses
 			ARG 5 experience
 		METHOD <init> (Lnet/minecraft/class_1799;IIIIF)V
+			ARG 1 stack
 			ARG 2 price
 			ARG 3 count
 			ARG 4 maxUses

diff --git a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping
@@ -32,4 +32,4 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions
 	METHOD method_46720 parseSeed (Ljava/lang/String;)Ljava/util/OptionalLong;
 		ARG 0 seed
 	METHOD method_46721 getRandomSeed ()J
-	METHOD method_64223 createRandomWithoutStructures ()Lnet/minecraft/class_5285;
+	METHOD method_64223 createTestWorld ()Lnet/minecraft/class_5285;
diff --git a/mappings/net/minecraft/world/gen/WorldPresets.mapping b/mappings/net/minecraft/world/gen/WorldPresets.mapping
@@ -17,7 +17,7 @@ CLASS net/minecraft/class_5317 net/minecraft/world/gen/WorldPresets
 		ARG 0 registries
 	METHOD method_45547 (Lnet/minecraft/class_5363;)Ljava/util/Optional;
 		ARG 0 overworld
-	METHOD method_64225 getTestWorldOptions (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_7723;
+	METHOD method_64225 createTestOptions (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_7723;
 		ARG 0 registries
 	CLASS class_7146 Registrar
 		FIELD field_37730 biomeLookup Lnet/minecraft/class_7871;

diff --git a/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping
@@ -94,6 +94,8 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer
 		ARG 4 chance
 		ARG 5 origin
 		ARG 6 pos
+	METHOD method_64224 (Lnet/minecraft/class_2680;)Z
+		ARG 0 state
 	CLASS class_5208 TreeNode
 		COMMENT A point on a tree to generate foliage around
 		FIELD field_24158 center Lnet/minecraft/class_2338;