20w14a

build.gradle

@@ -22,7 +22,7 @@ plugins {
 	id 'maven-publish'
 }
 
-def minecraft_version = "20w13b"
+def minecraft_version = "20w14a"
 
 def ENV = System.getenv()
 // Fetch build number from Jenkins

mappings/com/mojang/blaze3d/systems/RenderSystem.mapping

@@ -41,8 +41,6 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 		ARG 3 alpha
 	METHOD clearDepth (D)V
 		ARG 0 depth
-	METHOD clearStencil (I)V
-		ARG 0 stencil
 	METHOD color3f (FFF)V
 		ARG 0 red
 		ARG 1 green
@@ -82,15 +80,10 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 		ARG 0 density
 	METHOD fogEnd (F)V
 		ARG 0 end
-	METHOD fogMode (I)V
-		ARG 0 mode
 	METHOD fogMode (Lnet/minecraft/class_4493$class_1028;)V
 		ARG 0 mode
 	METHOD fogStart (F)V
 		ARG 0 start
-	METHOD fogi (II)V
-		ARG 0 pname
-		ARG 1 param
 	METHOD getString (ILjava/util/function/Consumer;)V
 		ARG 0 name
 		ARG 1 consumer
@@ -177,12 +170,6 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 	METHOD pixelStore (II)V
 		ARG 0 pname
 		ARG 1 param
-	METHOD pixelTransfer (IF)V
-		ARG 0 pname
-		ARG 1 param
-	METHOD polygonMode (II)V
-		ARG 0 face
-		ARG 1 mode
 	METHOD polygonOffset (FF)V
 		ARG 0 factor
 		ARG 1 units
@@ -229,8 +216,6 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 		ARG 0 func
 		ARG 1 ref
 		ARG 2 mask
-	METHOD stencilMask (I)V
-		ARG 0 mask
 	METHOD stencilOp (III)V
 		ARG 0 sfail
 		ARG 1 dpfail

mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping

@@ -14,9 +14,7 @@ CLASS net/minecraft/class_2058 net/minecraft/advancement/criterion/FishingRodHoo
 			ARG 2 bobber
 			ARG 3 item
 		METHOD method_8946 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_1536;Ljava/util/Collection;)Z
-			ARG 1 player
 			ARG 2 rodStack
-			ARG 3 bobber
 			ARG 4 fishingLoots
 		METHOD method_8947 create (Lnet/minecraft/class_2073;Lnet/minecraft/class_2048;Lnet/minecraft/class_2073;)Lnet/minecraft/class_2058$class_2060;
 			ARG 0 rod

mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping

@@ -6,4 +6,4 @@ CLASS net/minecraft/class_2650 net/minecraft/block/sapling/LargeTreeSaplingGener
 		ARG 3 x
 		ARG 4 z
 	METHOD method_11443 createLargeTreeFeature (Ljava/util/Random;)Lnet/minecraft/class_2975;
-	METHOD method_11444 generateLargeTree (Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;II)Z
+	METHOD method_11444 generateLargeTree (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;II)Z

mappings/net/minecraft/block/sapling/SaplingGenerator.mapping

@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_2647 net/minecraft/block/sapling/SaplingGenerator
 	METHOD method_11430 createTreeFeature (Ljava/util/Random;Z)Lnet/minecraft/class_2975;
-	METHOD method_11431 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)Z
+	METHOD method_11431 generate (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)Z

mappings/net/minecraft/class_5137.mapping

@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_5137
+	METHOD method_24657 getMovementCooldownTicks ()I

mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping

@@ -1,12 +1,8 @@
 CLASS net/minecraft/class_524 net/minecraft/client/gui/screen/world/EditWorldScreen
-	FIELD field_3167 levelName Ljava/lang/String;
 	FIELD field_3168 saveButton Lnet/minecraft/class_4185;
 	FIELD field_3169 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;
 	FIELD field_3170 levelNameTextField Lnet/minecraft/class_342;
-	METHOD <init> (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Ljava/lang/String;)V
+	METHOD <init> (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_32$class_5143;)V
 		ARG 1 callback
-		ARG 2 levelName
 	METHOD method_2691 commit ()V
-	METHOD method_2701 backupLevel (Lnet/minecraft/class_32;Ljava/lang/String;)V
+	METHOD method_2701 backupLevel (Lnet/minecraft/class_32$class_5143;)Z
-		ARG 0 level
-		ARG 1 name

mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping

@@ -2,6 +2,5 @@ CLASS net/minecraft/class_527 net/minecraft/client/gui/screen/world/OptimizeWorl
 	FIELD field_3232 DIMENSION_COLORS Lit/unimi/dsi/fastutil/objects/Object2IntMap;
 	FIELD field_3233 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;
 	FIELD field_3234 updater Lnet/minecraft/class_1257;
-	METHOD <init> (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Ljava/lang/String;Lnet/minecraft/class_32;Z)V
+	METHOD <init> (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_31;Z)V
 		ARG 1 callback
-		ARG 3 levelStorage

mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping

@@ -15,7 +15,7 @@ CLASS net/minecraft/class_922 net/minecraft/client/render/entity/LivingEntityRen
 		COMMENT Returns the packed overlay color for an entity, determined by its death progress and whether it is flashing.
 		ARG 0 entity
 		ARG 1 whiteOverlayProgress
-	METHOD method_24302 getRenderLayer (Lnet/minecraft/class_1309;ZZ)Lnet/minecraft/class_1921;
+	METHOD method_24302 getRenderLayer (Lnet/minecraft/class_1309;ZZZ)Lnet/minecraft/class_1921;
 		COMMENT Gets the render layer appropriate for rendering the passed entity. Returns null if the entity should not be rendered.
 		ARG 1 entity
 		ARG 2 showBody

mappings/net/minecraft/client/world/ClientChunkManager.mapping

@@ -7,7 +7,7 @@ CLASS net/minecraft/class_631 net/minecraft/client/world/ClientChunkManager
 	METHOD <init> (Lnet/minecraft/class_638;I)V
 		ARG 1 world
 		ARG 2 loadDistance
-	METHOD method_16020 loadChunkFromPacket (IILnet/minecraft/class_4548;Lnet/minecraft/class_2540;Lnet/minecraft/class_2487;I)Lnet/minecraft/class_2818;
+	METHOD method_16020 loadChunkFromPacket (IILnet/minecraft/class_4548;Lnet/minecraft/class_2540;Lnet/minecraft/class_2487;IZ)Lnet/minecraft/class_2818;
 	METHOD method_20180 updateLoadDistance (I)V
 		ARG 1 loadDistance
 	METHOD method_20181 positionEquals (Lnet/minecraft/class_2818;II)Z

mappings/net/minecraft/command/arguments/FunctionArgumentType.mapping

@@ -9,12 +9,10 @@ CLASS net/minecraft/class_2284 net/minecraft/command/arguments/FunctionArgumentT
 	METHOD method_9767 getFunctionTag (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494;
 		ARG 0 context
 		ARG 1 id
-	METHOD method_9768 getFunctionOrTag (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcom/mojang/datafixers/util/Either;
+	METHOD method_9768 getFunctionOrTag (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcom/mojang/datafixers/util/Pair;
-		ARG 0 context
-		ARG 1 name
 	METHOD method_9769 getFunctions (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/Collection;
 		ARG 0 context
 		ARG 1 name
 	CLASS class_2285 FunctionArgument
-		METHOD method_9770 getFunctionOrTag (Lcom/mojang/brigadier/context/CommandContext;)Lcom/mojang/datafixers/util/Either;
+		METHOD method_9770 getFunctionOrTag (Lcom/mojang/brigadier/context/CommandContext;)Lcom/mojang/datafixers/util/Pair;
 		METHOD method_9771 getFunctions (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection;

mappings/net/minecraft/data/client/model/TextureKey.mapping

@@ -1,10 +1,5 @@
 CLASS net/minecraft/class_4945 net/minecraft/data/client/model/TextureKey
 	FIELD field_23007 name Ljava/lang/String;
 	FIELD field_23008 parent Lnet/minecraft/class_4945;
-	METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
-		ARG 3 name
-	METHOD <init> (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_4945;)V
-		ARG 3 name
-		ARG 4 parent
 	METHOD method_25912 getName ()Ljava/lang/String;
 	METHOD method_25913 getParent ()Lnet/minecraft/class_4945;

mappings/net/minecraft/data/server/AbstractTagProvider.mapping

@@ -7,6 +7,5 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/AbstractTagProvider
 	METHOD <init> (Lnet/minecraft/class_2403;Lnet/minecraft/class_2378;)V
 		ARG 1 root
 	METHOD method_10510 getOutput (Lnet/minecraft/class_2960;)Ljava/nio/file/Path;
-	METHOD method_10511 setContainer (Lnet/minecraft/class_3503;)V
+	METHOD method_10512 getOrCreateTagBuilder (Lnet/minecraft/class_3494$class_5123;)Lnet/minecraft/class_3494$class_5124;
-	METHOD method_10512 getOrCreateTagBuilder (Lnet/minecraft/class_3494;)Lnet/minecraft/class_3494$class_3495;
 	METHOD method_10514 configure ()V

mappings/net/minecraft/data/server/ItemTagsProvider.mapping

@@ -1,4 +1,2 @@
 CLASS net/minecraft/class_2471 net/minecraft/data/server/ItemTagsProvider
-	FIELD field_11469 LOG Lorg/apache/logging/log4j/Logger;
+	METHOD method_10505 copy (Lnet/minecraft/class_3494$class_5123;Lnet/minecraft/class_3494$class_5123;)V
-	METHOD method_10504 convert (Lnet/minecraft/class_3494$class_3496;)Lnet/minecraft/class_3494$class_3496;
-	METHOD method_10505 copy (Lnet/minecraft/class_3494;Lnet/minecraft/class_3494;)V

mappings/net/minecraft/entity/FishingBobberEntity.mapping

@@ -5,7 +5,6 @@ CLASS net/minecraft/class_1536 net/minecraft/entity/FishingBobberEntity
 	FIELD field_23233 outOfOpenWaterTicks I
 	FIELD field_23234 CAUGHT_FISH Lnet/minecraft/class_2940;
 	FIELD field_7165 hookedEntity Lnet/minecraft/class_1297;
-	FIELD field_7166 selfHitTimer I
 	FIELD field_7167 removalTimer I
 	FIELD field_7168 lureLevel I
 	FIELD field_7169 fishAngle F
@@ -15,7 +14,6 @@ CLASS net/minecraft/class_1536 net/minecraft/entity/FishingBobberEntity
 	FIELD field_7173 hookCountdown I
 	FIELD field_7174 waitCountdown I
 	FIELD field_7175 state Lnet/minecraft/class_1536$class_1537;
-	FIELD field_7177 owner Lnet/minecraft/class_1657;
 	METHOD <init> (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;II)V
 		ARG 1 thrower
 		ARG 2 world
@@ -32,8 +30,6 @@ CLASS net/minecraft/class_1536 net/minecraft/entity/FishingBobberEntity
 		ARG 2 owner
 		ARG 3 lureLevel
 		ARG 4 luckOfTheSeaLevel
-	METHOD method_18060 canCollide (Lnet/minecraft/class_1297;)Z
-		ARG 1 entity
 	METHOD method_26086 isOpenOrWaterAround (Lnet/minecraft/class_2338;)Z
 		ARG 1 pos
 	METHOD method_26088 isInOpenWater ()Z
@@ -46,11 +42,10 @@ CLASS net/minecraft/class_1536 net/minecraft/entity/FishingBobberEntity
 	METHOD method_6949 tickFishingLogic (Lnet/minecraft/class_2338;)V
 		ARG 1 pos
 	METHOD method_6951 updateHookedEntityId ()V
-	METHOD method_6952 smoothenMovement ()V
 	METHOD method_6954 pullHookedEntity ()V
 	METHOD method_6957 use (Lnet/minecraft/class_1799;)I
 		ARG 1 usedItem
 	METHOD method_6958 checkForCollision ()V
-	METHOD method_6959 removeIfInvalid ()Z
+	METHOD method_6959 removeIfInvalid (Lnet/minecraft/class_1657;)Z
 	CLASS class_1537 State
 	CLASS class_4984 PositionType

mappings/net/minecraft/entity/LivingEntity.mapping

@@ -51,7 +51,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	FIELD field_6257 LIVING_FLAGS Lnet/minecraft/class_2940;
 	FIELD field_6258 attackingPlayer Lnet/minecraft/class_1657;
 	FIELD field_6259 prevHeadYaw F
-	FIELD field_6260 attributes Lnet/minecraft/class_1325;
+	FIELD field_6260 attributes Lnet/minecraft/class_5131;
 	FIELD field_6261 pushCooldown I
 	FIELD field_6262 randomSmallSeed F
 	FIELD field_6263 serverZ D
@@ -180,7 +180,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		ARG 1 hand
 	METHOD method_5999 isUndead ()Z
 	METHOD method_6000 enterCombat ()V
-	METHOD method_6001 initAttributes ()V
 	METHOD method_6002 getDeathSound ()Lnet/minecraft/class_3414;
 	METHOD method_6003 getRoll ()I
 	METHOD method_6005 takeKnockback (FDD)V
@@ -388,7 +387,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		ARG 1 movementSpeed
 	METHOD method_6126 applyFrostWalker (Lnet/minecraft/class_2338;)V
 		ARG 1 pos
-	METHOD method_6127 getAttributes ()Lnet/minecraft/class_1325;
+	METHOD method_6127 getAttributes ()Lnet/minecraft/class_5131;
 	METHOD method_6128 isFallFlying ()Z
 	METHOD method_6129 onStatusEffectRemoved (Lnet/minecraft/class_1293;)V
 		ARG 1 effect

mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping

@@ -5,7 +5,6 @@ CLASS net/minecraft/class_1408 net/minecraft/entity/ai/pathing/EntityNavigation
 	FIELD field_6668 speed D
 	FIELD field_6669 lastActiveTickMs J
 	FIELD field_6670 currentNodeMs J
-	FIELD field_6671 followRange Lnet/minecraft/class_1324;
 	FIELD field_6672 pathStartPos Lnet/minecraft/class_243;
 	FIELD field_6673 pathNodeNavigator Lnet/minecraft/class_13;
 	FIELD field_6674 pathStartTime I

mappings/net/minecraft/entity/attribute/AbstractEntityAttribute.mapping

@@ -1,13 +0,0 @@
-CLASS net/minecraft/class_1326 net/minecraft/entity/attribute/AbstractEntityAttribute
-	FIELD field_6337 defaultValue D
-	FIELD field_6338 tracked Z
-	FIELD field_6339 id Ljava/lang/String;
-	FIELD field_6340 parent Lnet/minecraft/class_1320;
-	METHOD <init> (Lnet/minecraft/class_1320;Ljava/lang/String;D)V
-		ARG 1 parent
-		ARG 2 id
-		ARG 3 defaultValue
-	METHOD equals (Ljava/lang/Object;)Z
-		ARG 1 o
-	METHOD method_6212 setTracked (Z)Lnet/minecraft/class_1326;
-		ARG 1 tracked

mappings/net/minecraft/entity/attribute/AbstractEntityAttributeContainer.mapping

@@ -1,21 +0,0 @@
-CLASS net/minecraft/class_1325 net/minecraft/entity/attribute/AbstractEntityAttributeContainer
-	FIELD field_6334 instancesByKey Ljava/util/Map;
-	FIELD field_6335 instancesById Ljava/util/Map;
-	FIELD field_6336 attributeHierarchy Lcom/google/common/collect/Multimap;
-	METHOD method_22324 copyFrom (Lnet/minecraft/class_1325;)V
-		ARG 1 attributeContainer
-	METHOD method_6204 values ()Ljava/util/Collection;
-	METHOD method_6205 get (Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324;
-		ARG 1 attribute
-	METHOD method_6206 createInstance (Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324;
-		ARG 1 attribute
-	METHOD method_6207 get (Ljava/lang/String;)Lnet/minecraft/class_1324;
-		ARG 1 name
-	METHOD method_6208 register (Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324;
-		ARG 1 attribute
-	METHOD method_6209 removeAll (Lcom/google/common/collect/Multimap;)V
-		ARG 1 modifiers
-	METHOD method_6210 replaceAll (Lcom/google/common/collect/Multimap;)V
-		ARG 1 modifiers
-	METHOD method_6211 add (Lnet/minecraft/class_1324;)V
-		ARG 1 instance

mappings/net/minecraft/entity/attribute/ClampedEntityAttribute.mapping

@@ -1,13 +1,3 @@
 CLASS net/minecraft/class_1329 net/minecraft/entity/attribute/ClampedEntityAttribute
 	FIELD field_6351 maxValue D
-	FIELD field_6352 name Ljava/lang/String;
 	FIELD field_6353 minValue D
-	METHOD <init> (Lnet/minecraft/class_1320;Ljava/lang/String;DDD)V
-		ARG 1 parent
-		ARG 2 id
-		ARG 3 defaultValue
-		ARG 5 minValue
-		ARG 7 maxValue
-	METHOD method_6221 getName ()Ljava/lang/String;
-	METHOD method_6222 setName (Ljava/lang/String;)Lnet/minecraft/class_1329;
-		ARG 1 name

mappings/net/minecraft/entity/attribute/EntityAttribute.mapping

@@ -1,7 +1,5 @@
 CLASS net/minecraft/class_1320 net/minecraft/entity/attribute/EntityAttribute
 	METHOD method_6165 clamp (D)D
 		ARG 1 value
-	METHOD method_6166 getParent ()Lnet/minecraft/class_1320;
-	METHOD method_6167 getId ()Ljava/lang/String;
 	METHOD method_6168 isTracked ()Z
 	METHOD method_6169 getDefaultValue ()D

mappings/net/minecraft/entity/attribute/EntityAttributeContainer.mapping

@@ -1,5 +0,0 @@
-CLASS net/minecraft/class_1327 net/minecraft/entity/attribute/EntityAttributeContainer
-	FIELD field_6341 instancesByName Ljava/util/Map;
-	FIELD field_6342 trackedAttributes Ljava/util/Set;
-	METHOD method_6213 buildTrackedAttributesCollection ()Ljava/util/Collection;
-	METHOD method_6215 getTrackedAttributes ()Ljava/util/Set;

mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping

@@ -1,6 +1,4 @@
 CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeInstance
-	METHOD method_22323 copyFrom (Lnet/minecraft/class_1324;)V
-		ARG 1 other
 	METHOD method_6192 setBaseValue (D)V
 		ARG 1 baseValue
 	METHOD method_6193 getModifiers (Lnet/minecraft/class_1322$class_1323;)Ljava/util/Set;

mappings/net/minecraft/entity/attribute/EntityAttributeInstanceImpl.mapping

@@ -1,16 +0,0 @@
-CLASS net/minecraft/class_1328 net/minecraft/entity/attribute/EntityAttributeInstanceImpl
-	FIELD field_6343 modifiersByUuid Ljava/util/Map;
-	FIELD field_6344 needsRefresh Z
-	FIELD field_6345 modifiersByName Ljava/util/Map;
-	FIELD field_6346 container Lnet/minecraft/class_1325;
-	FIELD field_6347 modifiersByOperation Ljava/util/Map;
-	FIELD field_6348 cachedValue D
-	FIELD field_6349 baseValue D
-	FIELD field_6350 attribute Lnet/minecraft/class_1320;
-	METHOD <init> (Lnet/minecraft/class_1325;Lnet/minecraft/class_1320;)V
-		ARG 1 container
-		ARG 2 attribute
-	METHOD method_6217 invalidateCache ()V
-	METHOD method_6218 getAllModifiers (Lnet/minecraft/class_1322$class_1323;)Ljava/util/Collection;
-		ARG 1 operation
-	METHOD method_6220 computeValue ()D

mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping

@@ -1,7 +1,6 @@
 CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeModifier
 	FIELD field_6323 amount D
 	FIELD field_6324 operation Lnet/minecraft/class_1322$class_1323;
-	FIELD field_6325 serialize Z
 	FIELD field_6326 nameGetter Ljava/util/function/Supplier;
 	FIELD field_6327 uuid Ljava/util/UUID;
 	METHOD <init> (Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)V
@@ -23,9 +22,6 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod
 	METHOD method_6182 getOperation ()Lnet/minecraft/class_1322$class_1323;
 	METHOD method_6185 getName ()Ljava/lang/String;
 	METHOD method_6186 getAmount ()D
-	METHOD method_6187 setSerialize (Z)Lnet/minecraft/class_1322;
-		ARG 1 serialize
-	METHOD method_6188 shouldSerialize ()Z
 	METHOD method_6189 getId ()Ljava/util/UUID;
 	CLASS class_1323 Operation
 		FIELD field_6329 id I

mappings/net/minecraft/entity/attribute/EntityAttributes.mapping

@@ -1,27 +0,0 @@
-CLASS net/minecraft/class_1612 net/minecraft/entity/attribute/EntityAttributes
-	FIELD field_7354 LOGGER Lorg/apache/logging/log4j/Logger;
-	FIELD field_7355 FLYING_SPEED Lnet/minecraft/class_1320;
-	FIELD field_7356 ATTACK_SPEED Lnet/minecraft/class_1320;
-	FIELD field_7357 MOVEMENT_SPEED Lnet/minecraft/class_1320;
-	FIELD field_7358 ARMOR Lnet/minecraft/class_1320;
-	FIELD field_7359 MAX_HEALTH Lnet/minecraft/class_1320;
-	FIELD field_7360 KNOCKBACK_RESISTANCE Lnet/minecraft/class_1320;
-	FIELD field_7361 ATTACK_KNOCKBACK Lnet/minecraft/class_1320;
-	FIELD field_7362 LUCK Lnet/minecraft/class_1320;
-	FIELD field_7363 ATTACK_DAMAGE Lnet/minecraft/class_1320;
-	FIELD field_7364 ARMOR_TOUGHNESS Lnet/minecraft/class_1320;
-	FIELD field_7365 FOLLOW_RANGE Lnet/minecraft/class_1320;
-	METHOD method_7130 toTag (Lnet/minecraft/class_1324;)Lnet/minecraft/class_2487;
-		ARG 0 instance
-	METHOD method_7131 fromTag (Lnet/minecraft/class_1325;Lnet/minecraft/class_2499;)V
-		ARG 0 container
-		ARG 1 tag
-	METHOD method_7132 fromTag (Lnet/minecraft/class_1324;Lnet/minecraft/class_2487;)V
-		ARG 0 instance
-		ARG 1 tag
-	METHOD method_7133 createFromTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1322;
-		ARG 0 tag
-	METHOD method_7134 toTag (Lnet/minecraft/class_1325;)Lnet/minecraft/class_2499;
-		ARG 0 container
-	METHOD method_7135 toTag (Lnet/minecraft/class_1322;)Lnet/minecraft/class_2487;
-		ARG 0 modifier

mappings/net/minecraft/entity/effect/StatusEffect.mapping

@@ -12,7 +12,7 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect
 		ARG 2 amplifier
 	METHOD method_5554 getRawId (Lnet/minecraft/class_1291;)I
 		ARG 0 type
-	METHOD method_5555 onApplied (Lnet/minecraft/class_1309;Lnet/minecraft/class_1325;I)V
+	METHOD method_5555 onApplied (Lnet/minecraft/class_1309;Lnet/minecraft/class_5131;I)V
 		ARG 1 entity
 		ARG 2 attributes
 		ARG 3 amplifier
@@ -20,7 +20,7 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect
 	METHOD method_5559 loadTranslationKey ()Ljava/lang/String;
 	METHOD method_5560 getName ()Lnet/minecraft/class_2561;
 	METHOD method_5561 isInstant ()Z
-	METHOD method_5562 onRemoved (Lnet/minecraft/class_1309;Lnet/minecraft/class_1325;I)V
+	METHOD method_5562 onRemoved (Lnet/minecraft/class_1309;Lnet/minecraft/class_5131;I)V
 		ARG 1 entity
 		ARG 2 attributes
 		ARG 3 amplifier

mappings/net/minecraft/entity/mob/HoglinBrain.mapping

@@ -8,9 +8,7 @@ CLASS net/minecraft/class_4835 net/minecraft/entity/mob/HoglinBrain
 	METHOD method_24665 onAttacking (Lnet/minecraft/class_4760;Lnet/minecraft/class_1309;)V
 		ARG 0 hoglin
 		ARG 1 target
-	METHOD method_24666 addCoreTasks (Lnet/minecraft/class_4760;Lnet/minecraft/class_4095;)V
+	METHOD method_24666 addCoreTasks (Lnet/minecraft/class_4095;)V
-		ARG 0 hoglin
-		ARG 1 brain
 	METHOD method_24668 create (Lnet/minecraft/class_4760;Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4095;
 		ARG 0 hoglin
 		ARG 1 data
@@ -24,23 +22,17 @@ CLASS net/minecraft/class_4835 net/minecraft/entity/mob/HoglinBrain
 	METHOD method_24672 onAttacked (Lnet/minecraft/class_4760;Lnet/minecraft/class_1309;)V
 		ARG 0 hoglin
 		ARG 1 attacker
-	METHOD method_24673 addIdleTasks (Lnet/minecraft/class_4760;Lnet/minecraft/class_4095;)V
+	METHOD method_24673 addIdleTasks (Lnet/minecraft/class_4095;)V
-		ARG 0 hoglin
-		ARG 1 brain
 	METHOD method_24675 askAdultsToAvoid (Lnet/minecraft/class_4760;Lnet/minecraft/class_1309;)V
 		ARG 0 hoglin
 		ARG 1 target
-	METHOD method_24676 addFightTasks (Lnet/minecraft/class_4760;Lnet/minecraft/class_4095;)V
+	METHOD method_24676 addFightTasks (Lnet/minecraft/class_4095;)V
-		ARG 0 hoglin
-		ARG 1 brain
 	METHOD method_24677 isNearPlayer (Lnet/minecraft/class_4760;)Z
 		ARG 0 hoglin
 	METHOD method_24678 avoidEnemy (Lnet/minecraft/class_4760;Lnet/minecraft/class_1309;)V
 		ARG 0 hoglin
 		ARG 1 target
-	METHOD method_24679 addAvoidTasks (Lnet/minecraft/class_4760;Lnet/minecraft/class_4095;)V
+	METHOD method_24679 addAvoidTasks (Lnet/minecraft/class_4095;)V
-		ARG 0 hoglin
-		ARG 1 brain
 	METHOD method_24681 avoid (Lnet/minecraft/class_4760;Lnet/minecraft/class_1309;)V
 		ARG 0 hoglin
 		ARG 1 target

mappings/net/minecraft/entity/mob/HoglinEntity.mapping

@@ -6,9 +6,6 @@ CLASS net/minecraft/class_4760 net/minecraft/entity/mob/HoglinEntity
 	METHOD method_24349 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
 		ARG 1 world
 		ARG 3 pos
-	METHOD method_24655 stunVelocity (Lnet/minecraft/class_1309;)V
-	METHOD method_24656 getAttackDamage ()F
-	METHOD method_24657 getMovementCooldownTicks ()I
 	METHOD method_24658 isAdult ()Z
 	METHOD method_24659 playFightSound ()V
 	METHOD method_24661 playRetreatSound ()V

mappings/net/minecraft/entity/mob/PiglinBrain.mapping

@@ -61,8 +61,6 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
 	METHOD method_24738 makeGoToSoulFireTask ()Lnet/minecraft/class_4121;
 	METHOD method_24739 isGoldHoldingPlayer (Lnet/minecraft/class_1309;)Z
 		ARG 0 target
-	METHOD method_24740 (Lnet/minecraft/class_1309;Lnet/minecraft/class_4836;)V
-		ARG 1 piglin
 	METHOD method_24741 consumeOffHandItem (Lnet/minecraft/class_4836;Z)V
 		ARG 0 piglin
 	METHOD method_24742 angerAtCloserTargets (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)V

mappings/net/minecraft/entity/mob/ZombieEntity.mapping

@@ -3,7 +3,6 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity
 	FIELD field_7424 ticksUntilWaterConversion I
 	FIELD field_7425 CONVERTING_IN_WATER Lnet/minecraft/class_2940;
 	FIELD field_7426 inWaterTime I
-	FIELD field_7428 SPAWN_REINFORCEMENTS Lnet/minecraft/class_1320;
 	FIELD field_7429 BABY_SPEED_ID Ljava/util/UUID;
 	FIELD field_7430 BABY_SPEED_BONUS Lnet/minecraft/class_1322;
 	FIELD field_7432 canBreakDoors Z
@@ -13,6 +12,7 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity
 		ARG 1 world
 	METHOD method_20009 (Lnet/minecraft/class_1267;)Z
 		ARG 0 difficulty
+	METHOD method_6001 initAttributes ()V
 	METHOD method_7200 convertTo (Lnet/minecraft/class_1299;)V
 		ARG 1 entityType
 	METHOD method_7201 setCanBreakDoors (Z)V

mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping

@@ -16,9 +16,9 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity
 	FIELD field_6971 eatingGrassTicks I
 	FIELD field_6972 OWNER_UUID Lnet/minecraft/class_2940;
 	FIELD field_6973 eatingTicks I
-	FIELD field_6974 JUMP_STRENGTH Lnet/minecraft/class_1320;
 	FIELD field_6975 soundTicks I
 	FIELD field_6976 jumpStrength F
+	METHOD method_6001 initAttributes ()V
 	METHOD method_6722 openInventory (Lnet/minecraft/class_1657;)V
 		ARG 1 player
 	METHOD method_6723 playJumpSound ()V

mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping

@@ -2,7 +2,6 @@ CLASS net/minecraft/class_1668 net/minecraft/entity/projectile/ExplosiveProjecti
 	FIELD field_7599 posZ D
 	FIELD field_7600 posY D
 	FIELD field_7601 posX D
-	FIELD field_7602 ticks I
 	METHOD <init> (Lnet/minecraft/class_1299;DDDDDDLnet/minecraft/class_1937;)V
 		ARG 1 type
 		ARG 2 x

mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping

@@ -5,7 +5,6 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/PersistentProject
 	FIELD field_7574 shake I
 	FIELD field_7575 punch I
 	FIELD field_7576 inGroundTime I
-	FIELD field_7577 flyingTick I
 	FIELD field_7578 life I
 	FIELD field_7579 piercingKilledEntities Ljava/util/List;
 	FIELD field_7584 sound Lnet/minecraft/class_3414;

mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping

@@ -11,7 +11,6 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity
 		ARG 1 blockHitResult
 	METHOD method_24921 getOwner ()Lnet/minecraft/class_1297;
 	METHOD method_7432 setOwner (Lnet/minecraft/class_1297;)V
-		ARG 1 entity
 	METHOD method_7454 onEntityHit (Lnet/minecraft/class_3966;)V
 		ARG 1 entityHitResult
 	METHOD method_7485 setVelocity (DDDFF)V

mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping

@@ -1,15 +1,7 @@
 CLASS net/minecraft/class_1675 net/minecraft/entity/projectile/ProjectileUtil
-	METHOD method_18074 getCollision (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;Lnet/minecraft/class_3959$class_3960;Z)Lnet/minecraft/class_239;
+	METHOD method_18074 getCollision (Lnet/minecraft/class_1297;Ljava/util/function/Predicate;Lnet/minecraft/class_3959$class_3960;)Lnet/minecraft/class_239;
-		ARG 0 entity
-		ARG 1 box
-		ARG 2 entityCollisionPredicate
-		ARG 3 shapeType
 	METHOD method_18075 rayTrace (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Ljava/util/function/Predicate;D)Lnet/minecraft/class_3966;
-	METHOD method_18076 getCollision (Lnet/minecraft/class_1297;ZZLnet/minecraft/class_1297;Lnet/minecraft/class_3959$class_3960;)Lnet/minecraft/class_239;
-		ARG 0 entity
-		ARG 4 shapeType
 	METHOD method_18077 getEntityCollision (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Lnet/minecraft/class_3966;
-	METHOD method_18078 getEntityCollision (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Ljava/util/function/Predicate;D)Lnet/minecraft/class_3966;
 	METHOD method_18812 getHandPossiblyHolding (Lnet/minecraft/class_1309;Lnet/minecraft/class_1792;)Lnet/minecraft/class_1268;
 		ARG 0 entity
 		ARG 1 item
@@ -17,10 +9,3 @@ CLASS net/minecraft/class_1675 net/minecraft/entity/projectile/ProjectileUtil
 		ARG 0 entity
 		ARG 1 stack
 		ARG 2 damageModifier
-	METHOD method_7482 getCollision (Lnet/minecraft/class_1297;ZZLnet/minecraft/class_1297;Lnet/minecraft/class_3959$class_3960;ZLjava/util/function/Predicate;Lnet/minecraft/class_238;)Lnet/minecraft/class_239;
-		ARG 0 entity
-		ARG 4 shapeType
-		ARG 6 entityCollisionPredicate
-		ARG 7 boz
-	METHOD method_7483 getEntityAndRidingEntity (Lnet/minecraft/class_1297;)Ljava/util/Set;
-		ARG 0 entity

mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping

@@ -1,9 +1,4 @@
 CLASS net/minecraft/class_1682 net/minecraft/entity/projectile/thrown/ThrownEntity
-	FIELD field_7639 blockY I
-	FIELD field_7640 blockX I
-	FIELD field_7641 blockZ I
-	FIELD field_7643 shake I
-	FIELD field_7645 inGround Z
 	METHOD <init> (Lnet/minecraft/class_1299;DDDLnet/minecraft/class_1937;)V
 		ARG 1 type
 		ARG 2 x

mappings/net/minecraft/item/Item.mapping

@@ -49,7 +49,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 		ARG 2 world
 		ARG 3 player
 	METHOD method_7844 getModifiers (Lnet/minecraft/class_1304;)Lcom/google/common/collect/Multimap;
-		ARG 1 slot
 	METHOD method_7845 hasPropertyGetters ()Z
 	METHOD method_7846 isDamageable ()Z
 	METHOD method_7847 useOnEntity (Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;Lnet/minecraft/class_1309;Lnet/minecraft/class_1268;)Z

mappings/net/minecraft/item/ItemStack.mapping

@@ -42,8 +42,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 	METHOD method_7914 getMaxCount ()I
 	METHOD method_7915 fromTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1799;
 		ARG 0 tag
-	METHOD method_7916 addAttributeModifier (Ljava/lang/String;Lnet/minecraft/class_1322;Lnet/minecraft/class_1304;)V
+	METHOD method_7916 addAttributeModifier (Lnet/minecraft/class_1320;Lnet/minecraft/class_1322;Lnet/minecraft/class_1304;)V
-		ARG 1 name
 		ARG 2 modifier
 		ARG 3 slot
 	METHOD method_7917 inventoryTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;IZ)V
@@ -66,7 +65,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 		ARG 1 state
 	METHOD method_7925 removeCustomName ()V
 	METHOD method_7926 getAttributeModifiers (Lnet/minecraft/class_1304;)Lcom/google/common/collect/Multimap;
-		ARG 1 slot
 	METHOD method_7927 setRepairCost (I)V
 		ARG 1 repairCost
 	METHOD method_7928 getRepairCost ()I
@@ -76,7 +74,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 		ARG 1 world
 		ARG 2 user
 		ARG 3 remainingUseTicks
-	METHOD method_7931 createModifierFormat ()Ljava/text/DecimalFormat;
 	METHOD method_7932 getRarity ()Lnet/minecraft/class_1814;
 	METHOD method_7933 increment (I)V
 		ARG 1 amount

mappings/net/minecraft/item/MiningToolItem.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_1766 net/minecraft/item/MiningToolItem
-	FIELD field_7938 attackSpeed F
 	FIELD field_7939 attackDamage F
 	FIELD field_7940 miningSpeed F
 	FIELD field_7941 effectiveBlocks Ljava/util/Set;

mappings/net/minecraft/item/OnAStickItem.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_1758 net/minecraft/item/OnAStickItem
 	FIELD field_23253 target Lnet/minecraft/class_1299;
-	METHOD <init> (Lnet/minecraft/class_1792$class_1793;Lnet/minecraft/class_1299;)V
+	METHOD <init> (Lnet/minecraft/class_1792$class_1793;Lnet/minecraft/class_1299;I)V
 		ARG 1 settings
 		ARG 2 target
 	METHOD method_20271 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V

mappings/net/minecraft/item/SwordItem.mapping

@@ -1,8 +1,6 @@
 CLASS net/minecraft/class_1829 net/minecraft/item/SwordItem
-	FIELD field_8919 attackSpeed F
 	FIELD field_8920 attackDamage F
 	METHOD <init> (Lnet/minecraft/class_1832;IFLnet/minecraft/class_1792$class_1793;)V
-		ARG 1 material
 		ARG 2 attackDamage
 		ARG 3 attackSpeed
 		ARG 4 settings

mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping

@@ -7,12 +7,11 @@ CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunct
 		FIELD field_1107 name Ljava/lang/String;
 		FIELD field_1108 amountRange Lnet/minecraft/class_61;
 		FIELD field_1109 operation Lnet/minecraft/class_1322$class_1323;
-		FIELD field_1110 attribute Ljava/lang/String;
+		FIELD field_1110 attribute Lnet/minecraft/class_1320;
 		FIELD field_1111 id Ljava/util/UUID;
 		FIELD field_1112 slots [Lnet/minecraft/class_1304;
-		METHOD <init> (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_1322$class_1323;Lnet/minecraft/class_61;[Lnet/minecraft/class_1304;Ljava/util/UUID;)V
+		METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_1320;Lnet/minecraft/class_1322$class_1323;Lnet/minecraft/class_61;[Lnet/minecraft/class_1304;Ljava/util/UUID;)V
 			ARG 1 name
-			ARG 2 attribute
 			ARG 3 operation
 			ARG 4 amountRange
 			ARG 5 slots

mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping

@@ -9,10 +9,9 @@ CLASS net/minecraft/class_2781 net/minecraft/network/packet/s2c/play/EntityAttri
 	CLASS class_2782 Entry
 		FIELD field_12722 baseValue D
 		FIELD field_12723 modifiers Ljava/util/Collection;
-		FIELD field_12724 id Ljava/lang/String;
+		FIELD field_12724 id Lnet/minecraft/class_1320;
-		METHOD <init> (Lnet/minecraft/class_2781;Ljava/lang/String;DLjava/util/Collection;)V
+		METHOD <init> (Lnet/minecraft/class_2781;Lnet/minecraft/class_1320;DLjava/util/Collection;)V
 			ARG 1 id
-			ARG 2 baseValue
 		METHOD method_11939 getModifiers ()Ljava/util/Collection;
-		METHOD method_11940 getId ()Ljava/lang/String;
+		METHOD method_11940 getId ()Lnet/minecraft/class_1320;
 		METHOD method_11941 getBaseValue ()D

mappings/net/minecraft/recipe/Ingredient.mapping

@@ -3,7 +3,6 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient
 	FIELD field_9017 EMPTY Lnet/minecraft/class_1856;
 	FIELD field_9018 matchingStacks [Lnet/minecraft/class_1799;
 	FIELD field_9019 entries [Lnet/minecraft/class_1856$class_1859;
-	FIELD field_9020 NON_EMPTY Ljava/util/function/Predicate;
 	METHOD <init> (Ljava/util/stream/Stream;)V
 		ARG 1 entries
 	METHOD method_8086 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1856;
@@ -20,8 +19,6 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient
 	METHOD method_8094 (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1856$class_1857;
 		ARG 0 stack
 	METHOD method_8096 cacheMatchingStacks ()V
-	METHOD method_8098 (Lnet/minecraft/class_1935;)Lnet/minecraft/class_1856$class_1857;
-		ARG 0 item
 	METHOD method_8100 getIds ()Lit/unimi/dsi/fastutil/ints/IntList;
 	METHOD method_8101 ofStacks ([Lnet/minecraft/class_1799;)Lnet/minecraft/class_1856;
 		ARG 0 stacks

mappings/net/minecraft/server/MinecraftServer.mapping

@@ -33,7 +33,6 @@ CLASS net/minecraft/server/MinecraftServer
 	FIELD field_4562 commandManager Lnet/minecraft/class_2170;
 	FIELD field_4563 networkIo Lnet/minecraft/class_3242;
 	FIELD field_4564 motd Ljava/lang/String;
-	FIELD field_4565 levelName Ljava/lang/String;
 	FIELD field_4566 recipeManager Lnet/minecraft/class_1863;
 	FIELD field_4567 advancementLoader Lnet/minecraft/class_2989;
 	FIELD field_4568 serverGuiTickables Ljava/util/List;
@@ -61,7 +60,6 @@ CLASS net/minecraft/server/MinecraftServer
 	FIELD field_4591 commandFunctionManager Lnet/minecraft/class_2991;
 	FIELD field_4592 tickTime F
 	FIELD field_4593 metadata Lnet/minecraft/class_2926;
-	FIELD field_4594 authService Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;
 	FIELD field_4595 dataPackManager Lnet/minecraft/class_3283;
 	FIELD field_4596 playerIdleTimeout I
 	FIELD field_4597 profilerStartQueued Z
@@ -70,15 +68,8 @@ CLASS net/minecraft/server/MinecraftServer
 	FIELD field_4602 random Ljava/util/Random;
 	FIELD field_4603 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService;
 	FIELD field_4604 pvpEnabled Z
-	FIELD field_4605 gameDir Ljava/io/File;
-	FIELD field_4606 levelStorage Lnet/minecraft/class_32;
 	FIELD field_4607 resourcePackUrl Ljava/lang/String;
 	FIELD field_4608 gameProfileRepo Lcom/mojang/authlib/GameProfileRepository;
-	METHOD <init> (Ljava/io/File;Ljava/net/Proxy;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_2170;Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;Ljava/lang/String;)V
-		ARG 1 gameDir
-		ARG 5 authService
-		ARG 6 sessionService
-		ARG 10 levelName
 	METHOD main ([Ljava/lang/String;)V
 		ARG 0 args
 	METHOD method_15876 getMetricsData ()Lnet/minecraft/class_3517;
@@ -136,10 +127,7 @@ CLASS net/minecraft/server/MinecraftServer
 		ARG 1 whitelistEnabled
 	METHOD method_3732 shouldBroadcastRconToOps ()Z
 	METHOD method_3734 getCommandManager ()Lnet/minecraft/class_2170;
-	METHOD method_3735 loadWorld (Ljava/lang/String;Ljava/lang/String;JLnet/minecraft/class_4952;)V
+	METHOD method_3735 loadWorld (Ljava/lang/String;JLnet/minecraft/class_4952;)V
-		ARG 1 name
-		ARG 2 serverName
-		ARG 3 seed
 	METHOD method_3736 shouldSpawnNpcs ()Z
 	METHOD method_3738 getWorlds ()Ljava/lang/Iterable;
 	METHOD method_3739 getCommandSource ()Lnet/minecraft/class_2168;
@@ -157,7 +145,6 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD method_3750 isStopped ()Z
 	METHOD method_3752 reloadDataPacks (Lnet/minecraft/class_31;)V
 	METHOD method_3754 isHardcore ()Z
-	METHOD method_3755 upgradeWorld (Ljava/lang/String;)V
 	METHOD method_3756 getServerPort ()I
 	METHOD method_3758 getFile (Ljava/lang/String;)Ljava/io/File;
 	METHOD method_3759 isUsingNativeTransport ()Z
@@ -188,7 +175,6 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD method_3779 setServerPort (I)V
 		ARG 1 serverPort
 	METHOD method_3780 getTicks ()I
-	METHOD method_3781 getLevelStorage ()Lnet/minecraft/class_32;
 	METHOD method_3782 shutdown ()V
 	METHOD method_3783 isMonsterSpawningEnabled ()Z
 	METHOD method_3784 getResourcePackUrl ()Ljava/lang/String;
@@ -222,7 +208,6 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD method_3812 areCommandBlocksEnabled ()Z
 	METHOD method_3813 tickWorlds (Ljava/util/function/BooleanSupplier;)V
 		ARG 1 shouldKeepTicking
-	METHOD method_3814 hasGameDir ()Z
 	METHOD method_3815 setPvpEnabled (Z)V
 		ARG 1 pvpEnabled
 	METHOD method_3816 isDedicated ()Z
@@ -282,7 +267,6 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD method_3862 getPlayerIdleTimeout ()I
 	METHOD method_3864 setOnlineMode (Z)V
 		ARG 1 onlineMode
-	METHOD method_3865 getLevelName ()Ljava/lang/String;
 	METHOD method_3866 shouldKeepTicking ()Z
 	METHOD method_5387 isMainThread ()Z
 	CLASS 1

mappings/net/minecraft/server/command/ScheduleCommand.mapping

@@ -1,6 +1,5 @@
 CLASS net/minecraft/class_3112 net/minecraft/server/command/ScheduleCommand
 	FIELD field_13706 SAME_TICK_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
-	METHOD method_13566 execute (Lnet/minecraft/class_2168;Lcom/mojang/datafixers/util/Either;IZ)I
+	METHOD method_13566 execute (Lnet/minecraft/class_2168;Lcom/mojang/datafixers/util/Pair;IZ)I
-		ARG 2 time
 	METHOD method_13567 register (Lcom/mojang/brigadier/CommandDispatcher;)V
 		ARG 0 dispatcher

mappings/net/minecraft/server/integrated/IntegratedServer.mapping

@@ -6,13 +6,9 @@ CLASS net/minecraft/class_1132 net/minecraft/server/integrated/IntegratedServer
 	FIELD field_5522 lanPort I
 	FIELD field_5523 levelInfo Lnet/minecraft/class_1940;
 	FIELD field_5524 paused Z
-	METHOD <init> (Lnet/minecraft/class_310;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_1940;Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V
+	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_32$class_5143;Ljava/lang/String;Lnet/minecraft/class_1940;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V
 		ARG 1 client
-		ARG 2 levelName
 		ARG 3 displayName
 		ARG 4 levelInfo
-		ARG 5 authService
-		ARG 6 sessionService
-		ARG 7 profileRepo
 	METHOD method_4817 setLocalPlayerUuid (Ljava/util/UUID;)V
 		ARG 1 localPlayerUuid

mappings/net/minecraft/server/world/ServerChunkManager.mapping

@@ -15,7 +15,7 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager
 	FIELD field_19335 chunkPosCache [J
 	FIELD field_19336 chunkStatusCache [Lnet/minecraft/class_2806;
 	FIELD field_19337 chunkCache [Lnet/minecraft/class_2791;
-	METHOD <init> (Lnet/minecraft/class_3218;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_2794;ILnet/minecraft/class_3949;Ljava/util/function/Supplier;)V
+	METHOD <init> (Lnet/minecraft/class_3218;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_2794;IZLnet/minecraft/class_3949;Ljava/util/function/Supplier;)V
 		ARG 1 world
 		ARG 2 worldDirectory
 		ARG 3 dataFixer
@@ -23,8 +23,6 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager
 		ARG 5 workerExecutor
 		ARG 6 chunkGenerator
 		ARG 7 viewDistance
-		ARG 8 progressListener
-		ARG 9 mainWorldPersistentStateManagerGetter
 	METHOD method_12129 getChunkGenerator ()Lnet/minecraft/class_2794;
 	METHOD method_14096 updateCameraPosition (Lnet/minecraft/class_3222;)V
 		ARG 1 player

mappings/net/minecraft/server/world/ServerWorld.mapping

@@ -22,7 +22,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
 	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_29;Lnet/minecraft/class_31;Lnet/minecraft/class_2874;Lnet/minecraft/class_3949;)V
 		ARG 1 server
 		ARG 2 workerExecutor
-		ARG 3 worldSaveHandler
 		ARG 4 properties
 		ARG 5 dimensionType
 	METHOD method_14166 spawnParticles (Lnet/minecraft/class_3222;Lnet/minecraft/class_2394;ZDDDIDDDD)Z
@@ -157,5 +156,4 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
 		ARG 1 levelInfo
 	METHOD method_8416 addLightning (Lnet/minecraft/class_1538;)V
 	METHOD method_8448 updateSleepingPlayers ()V
-	METHOD method_8468 checkSessionLock ()V
 	METHOD method_8487 locateStructure (Ljava/lang/String;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338;

mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping

@@ -24,7 +24,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
 	FIELD field_18243 watchDistance I
 	FIELD field_18307 loadedChunks Lit/unimi/dsi/fastutil/longs/LongSet;
 	FIELD field_18808 pointOfInterestStorage Lnet/minecraft/class_4153;
-	METHOD <init> (Lnet/minecraft/class_3218;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_1255;Lnet/minecraft/class_2823;Lnet/minecraft/class_2794;Lnet/minecraft/class_3949;Ljava/util/function/Supplier;I)V
+	METHOD <init> (Lnet/minecraft/class_3218;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_1255;Lnet/minecraft/class_2823;Lnet/minecraft/class_2794;Lnet/minecraft/class_3949;Ljava/util/function/Supplier;IZ)V
 		ARG 1 world
 		ARG 3 dataFixer
 		ARG 5 workerExecutor

mappings/net/minecraft/structure/StructurePiece.mapping

@@ -67,12 +67,8 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 		ARG 6 z
 		ARG 7 facing
 		ARG 8 lootTbaleId
-	METHOD method_14931 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_2338;)Z
+	METHOD method_14931 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_2338;)Z
 		ARG 1 world
-		ARG 2 generator
-		ARG 3 random
-		ARG 4 box
-		ARG 5 pos
 	METHOD method_14932 getOverlappingPiece (Ljava/util/List;Lnet/minecraft/class_3341;)Lnet/minecraft/class_3443;
 	METHOD method_14933 fillWithOutlineUnderSealevel (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;Ljava/util/Random;FIIIIIILnet/minecraft/class_2680;Lnet/minecraft/class_2680;ZZ)V
 		ARG 3 random

mappings/net/minecraft/structure/StructureStart.mapping

@@ -25,10 +25,8 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart
 	METHOD method_14972 toTag (II)Lnet/minecraft/class_2487;
 		ARG 1 chunkX
 		ARG 2 chunkZ
-	METHOD method_14974 generateStructure (Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;)V
+	METHOD method_14974 generateStructure (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;)V
 		ARG 1 world
-		ARG 4 box
-		ARG 5 pos
 	METHOD method_14979 isInExistingChunk ()Z
 	METHOD method_16655 initialize (Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;IILnet/minecraft/class_1959;)V
 		ARG 1 chunkGenerator

mappings/net/minecraft/structure/pool/StructurePoolElement.mapping

@@ -4,7 +4,7 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement
 		ARG 1 projection
 	METHOD method_16624 getProjection ()Lnet/minecraft/class_3785$class_3786;
 	METHOD method_16625 rawToDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic;
-	METHOD method_16626 generate (Lnet/minecraft/class_3485;Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;Ljava/util/Random;)Z
+	METHOD method_16626 generate (Lnet/minecraft/class_3485;Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;Ljava/util/Random;)Z
 		ARG 1 structureManager
 		ARG 2 world
 	METHOD method_16627 getStructureBlockInfos (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/Random;)Ljava/util/List;

mappings/net/minecraft/tag/BlockTags.mapping

@@ -1,11 +1,6 @@
 CLASS net/minecraft/class_3481 net/minecraft/tag/BlockTags
-	FIELD field_15473 latestVersion I
+	METHOD method_15069 register (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123;
-	FIELD field_15484 container Lnet/minecraft/class_3503;
-	METHOD method_15069 register (Ljava/lang/String;)Lnet/minecraft/class_3494;
 		ARG 0 id
 	METHOD method_15070 setContainer (Lnet/minecraft/class_3503;)V
 		ARG 0 container
 	METHOD method_15073 getContainer ()Lnet/minecraft/class_3503;
-	CLASS class_3482 CachingTag
-		FIELD field_15505 delegate Lnet/minecraft/class_3494;
-		FIELD field_15506 version I

mappings/net/minecraft/tag/EntityTypeTags.mapping

@@ -1,11 +1,6 @@
 CLASS net/minecraft/class_3483 net/minecraft/tag/EntityTypeTags
-	FIELD field_15508 container Lnet/minecraft/class_3503;
+	METHOD method_15077 register (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123;
-	FIELD field_15509 latestVersion I
-	METHOD method_15077 register (Ljava/lang/String;)Lnet/minecraft/class_3494;
 		ARG 0 id
 	METHOD method_15078 setContainer (Lnet/minecraft/class_3503;)V
 		ARG 0 container
 	METHOD method_15082 getContainer ()Lnet/minecraft/class_3503;
-	CLASS class_3484 CachingTag
-		FIELD field_15510 delegate Lnet/minecraft/class_3494;
-		FIELD field_15511 version I

mappings/net/minecraft/tag/FluidTags.mapping

@@ -1,11 +1,6 @@
 CLASS net/minecraft/class_3486 net/minecraft/tag/FluidTags
-	FIELD field_15519 latestVersion I
+	METHOD method_15095 register (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123;
-	FIELD field_15520 container Lnet/minecraft/class_3503;
-	METHOD method_15095 register (Ljava/lang/String;)Lnet/minecraft/class_3494;
 		ARG 0 id
 	METHOD method_15096 setContainer (Lnet/minecraft/class_3503;)V
 		ARG 0 container
 	METHOD method_22448 getContainer ()Lnet/minecraft/class_3503;
-	CLASS class_3487 CachingTag
-		FIELD field_15521 delegate Lnet/minecraft/class_3494;
-		FIELD field_15522 version I

mappings/net/minecraft/tag/ItemTags.mapping

@@ -1,11 +1,6 @@
 CLASS net/minecraft/class_3489 net/minecraft/tag/ItemTags
-	FIELD field_15530 container Lnet/minecraft/class_3503;
+	METHOD method_15102 register (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123;
-	FIELD field_15559 latestVersion I
-	METHOD method_15102 register (Ljava/lang/String;)Lnet/minecraft/class_3494;
 		ARG 0 id
 	METHOD method_15103 setContainer (Lnet/minecraft/class_3503;)V
 		ARG 0 container
 	METHOD method_15106 getContainer ()Lnet/minecraft/class_3503;
-	CLASS class_3490 CachingTag
-		FIELD field_15561 delegate Lnet/minecraft/class_3494;
-		FIELD field_15562 version I

mappings/net/minecraft/tag/RegistryTagManager.mapping

@@ -11,13 +11,3 @@ CLASS net/minecraft/class_3505 net/minecraft/tag/RegistryTagManager
 	METHOD method_15204 toPacket (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
 	METHOD method_15205 fluids ()Lnet/minecraft/class_3493;
-	CLASS class_4015 BuilderHolder
-		FIELD field_17938 blocks Ljava/util/Map;
-		FIELD field_17939 items Ljava/util/Map;
-		FIELD field_17940 fluids Ljava/util/Map;
-		FIELD field_17941 entityTypes Ljava/util/Map;
-		METHOD <init> (Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
-			ARG 1 blocks
-			ARG 2 items
-			ARG 3 fluids
-			ARG 4 entityTypes

mappings/net/minecraft/tag/Tag.mapping

@@ -9,72 +9,14 @@ CLASS net/minecraft/class_3494 net/minecraft/tag/Tag
 	COMMENT
 	COMMENT <p>Its entries' iteration may be ordered
 	COMMENT or unordered, depending on the configuration from the tag builder.
-	FIELD field_15578 entries Ljava/util/Collection;
+	METHOD method_15138 values ()Ljava/util/List;
-	FIELD field_15579 values Ljava/util/Set;
-	FIELD field_15580 id Lnet/minecraft/class_2960;
-	METHOD <init> (Lnet/minecraft/class_2960;)V
-		ARG 1 id
-	METHOD <init> (Lnet/minecraft/class_2960;Ljava/util/Collection;Z)V
-		ARG 1 id
-		ARG 2 entries
-		ARG 3 ordered
-	METHOD method_15138 values ()Ljava/util/Collection;
-	METHOD method_15139 entries ()Ljava/util/Collection;
-	METHOD method_15140 toJson (Ljava/util/function/Function;)Lcom/google/gson/JsonObject;
-		ARG 1 idGetter
 	METHOD method_15141 contains (Ljava/lang/Object;)Z
 		ARG 1 entry
 	METHOD method_15142 getRandom (Ljava/util/Random;)Ljava/lang/Object;
 		ARG 1 random
-	METHOD method_15143 getId ()Lnet/minecraft/class_2960;
 	CLASS class_3495 Builder
 		COMMENT A builder class to ease the creation of tags. It can also be used as a
 		COMMENT mutable form of a tag.
-		FIELD field_15581 ordered Z
-		FIELD field_15582 entries Ljava/util/Set;
-		METHOD method_15144 build (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494;
-			ARG 1 id
-		METHOD method_15146 create ()Lnet/minecraft/class_3494$class_3495;
-		METHOD method_15147 fromJson (Ljava/util/function/Function;Lcom/google/gson/JsonObject;)Lnet/minecraft/class_3494$class_3495;
-			ARG 1 entryGetter
-			ARG 2 json
-		METHOD method_15148 add (Lnet/minecraft/class_3494;)Lnet/minecraft/class_3494$class_3495;
-			ARG 1 tag
-		METHOD method_15149 add (Lnet/minecraft/class_3494$class_3496;)Lnet/minecraft/class_3494$class_3495;
-			ARG 1 entry
-		METHOD method_15150 add ([Ljava/lang/Object;)Lnet/minecraft/class_3494$class_3495;
-			ARG 1 entries
-		METHOD method_15152 applyTagGetter (Ljava/util/function/Function;)Z
-			ARG 1 tagGetter
-		METHOD method_15153 add (Ljava/lang/Object;)Lnet/minecraft/class_3494$class_3495;
-			ARG 1 entry
-		METHOD method_15154 ordered (Z)Lnet/minecraft/class_3494$class_3495;
-			ARG 1 ordered
 	CLASS class_3496 Entry
-		METHOD method_15155 toJson (Lcom/google/gson/JsonArray;Ljava/util/function/Function;)V
-			ARG 1 targetArray
-			ARG 2 idGetter
-		METHOD method_15156 applyTagGetter (Ljava/util/function/Function;)Z
-			COMMENT Resolves the tag entry, given the availalbe tags.
-			COMMENT
-			COMMENT @return true if the tag entry has been resolved
-			ARG 1 tagGetter
-				COMMENT the getter for resolved tags, consuming tag identifiers
-		METHOD method_15157 build (Ljava/util/Collection;)V
-			COMMENT Build this tag entry by adding elements to the backing collection of
-			COMMENT a tag.
-			ARG 1 targetCollection
-				COMMENT the collection to which the tag entries should be added
 	CLASS class_3497 TagEntry
-		FIELD field_15583 tag Lnet/minecraft/class_3494;
 		FIELD field_15584 id Lnet/minecraft/class_2960;
-		METHOD <init> (Lnet/minecraft/class_2960;)V
-			ARG 1 id
-		METHOD <init> (Lnet/minecraft/class_3494;)V
-			ARG 1 tag
-		METHOD method_15158 getId ()Lnet/minecraft/class_2960;
-	CLASS class_3498 CollectionEntry
-		FIELD field_15585 values Ljava/util/Collection;
-		METHOD <init> (Ljava/util/Collection;)V
-			ARG 1 values
-		METHOD method_15159 getValues ()Ljava/util/Collection;

mappings/net/minecraft/tag/TagContainer.mapping

@@ -1,17 +1,14 @@
 CLASS net/minecraft/class_3503 net/minecraft/tag/TagContainer
-	FIELD field_15601 ordered Z
+	FIELD field_15602 entries Lcom/google/common/collect/BiMap;
-	FIELD field_15602 entries Ljava/util/Map;
 	FIELD field_15603 JSON_EXTENSION_LENGTH I
 	FIELD field_15605 dataType Ljava/lang/String;
 	FIELD field_15606 entryType Ljava/lang/String;
 	FIELD field_15607 LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD field_15608 GSON Lcom/google/gson/Gson;
 	FIELD field_15609 getter Ljava/util/function/Function;
-	METHOD <init> (Ljava/util/function/Function;Ljava/lang/String;ZLjava/lang/String;)V
+	METHOD <init> (Ljava/util/function/Function;Ljava/lang/String;Ljava/lang/String;)V
 		ARG 1 getter
 		ARG 2 dataType
-		ARG 3 ordered
-		ARG 4 entryType
 	METHOD method_15188 getOrCreate (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494;
 		ARG 1 id
 	METHOD method_15189 getKeys ()Ljava/util/Collection;
@@ -24,6 +21,5 @@ CLASS net/minecraft/class_3503 net/minecraft/tag/TagContainer
 		ARG 1 id
 	METHOD method_15196 getEntries ()Ljava/util/Map;
 	METHOD method_18242 applyReload (Ljava/util/Map;)V
-		ARG 1 preparedBuilders
 	METHOD method_20735 setEntries (Ljava/util/Map;)V
 		ARG 1 entries

mappings/net/minecraft/util/collection/LowercaseMap.mapping

@@ -1,2 +0,0 @@
-CLASS net/minecraft/class_3522 net/minecraft/util/collection/LowercaseMap
-	FIELD field_15666 delegate Ljava/util/Map;

mappings/net/minecraft/util/math/Direction.mapping

@@ -46,7 +46,6 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction
 	METHOD method_10160 rotateYCounterclockwise ()Lnet/minecraft/class_2350;
 	METHOD method_10161 getHorizontal ()I
 	METHOD method_10162 random (Ljava/util/Random;)Lnet/minecraft/class_2350;
-		ARG 0 random
 	METHOD method_10163 getVector ()Lnet/minecraft/class_2382;
 	METHOD method_10164 getOffsetY ()I
 	METHOD method_10165 getOffsetZ ()I
@@ -83,7 +82,6 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction
 		METHOD method_10179 isHorizontal ()Z
 		METHOD method_10180 getType ()Lnet/minecraft/class_2350$class_2353;
 		METHOD method_16699 pickRandomAxis (Ljava/util/Random;)Lnet/minecraft/class_2350$class_2351;
-			ARG 0 random
 	CLASS class_2352 AxisDirection
 		FIELD field_11057 desc Ljava/lang/String;
 		FIELD field_11059 offset I

mappings/net/minecraft/world/CollisionView.mapping

@@ -3,10 +3,7 @@ CLASS net/minecraft/class_1941 net/minecraft/world/CollisionView
 		ARG 1 entity
 	METHOD method_18026 doesNotCollide (Lnet/minecraft/class_238;)Z
 		ARG 1 box
-	METHOD method_20743 getEntityCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/Set;)Ljava/util/stream/Stream;
+	METHOD method_20743 getEntityCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/stream/Stream;
-		ARG 1 entity
-		ARG 2 box
-		ARG 3 excluded
 	METHOD method_20812 getBlockCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Ljava/util/stream/Stream;
 		ARG 1 entity
 		ARG 2 box
@@ -16,14 +13,8 @@ CLASS net/minecraft/class_1941 net/minecraft/world/CollisionView
 	METHOD method_8587 doesNotCollide (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z
 		ARG 1 entity
 		ARG 2 box
-	METHOD method_8590 doesNotCollide (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/Set;)Z
+	METHOD method_8590 doesNotCollide (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Z
-		ARG 1 entity
+	METHOD method_8600 getCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/stream/Stream;
-		ARG 2 entityBoundingBox
-		ARG 3 otherEntities
-	METHOD method_8600 getCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/Set;)Ljava/util/stream/Stream;
-		ARG 1 entity
-		ARG 2 box
-		ARG 3 excluded
 	METHOD method_8606 intersectsEntities (Lnet/minecraft/class_1297;)Z
 		ARG 1 entity
 	METHOD method_8611 intersectsEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_265;)Z

mappings/net/minecraft/world/EntityView.mapping

@@ -51,10 +51,7 @@ CLASS net/minecraft/class_1924 net/minecraft/world/EntityView
 		ARG 8 z
 	METHOD method_18470 getPlayerByUuid (Ljava/util/UUID;)Lnet/minecraft/class_1657;
 		ARG 1 uuid
-	METHOD method_20743 getEntityCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/Set;)Ljava/util/stream/Stream;
+	METHOD method_20743 getEntityCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/stream/Stream;
-		ARG 1 entity
-		ARG 2 box
-		ARG 3 excluded
 	METHOD method_21726 getClosestEntity (Ljava/lang/Class;Lnet/minecraft/class_4051;Lnet/minecraft/class_1309;DDDLnet/minecraft/class_238;)Lnet/minecraft/class_1309;
 		ARG 1 entityClass
 		ARG 2 targetPredicate
@@ -87,8 +84,6 @@ CLASS net/minecraft/class_1924 net/minecraft/world/EntityView
 		ARG 2 box
 	METHOD method_8336 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Ljava/util/stream/Stream;
 		ARG 1 e
-	METHOD method_8337 (Ljava/util/Set;Lnet/minecraft/class_1297;)Z
-		ARG 1 e
 	METHOD method_8338 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Z
 		ARG 1 e
 	METHOD method_8390 getEntities (Ljava/lang/Class;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/List;

mappings/net/minecraft/world/SessionLockException.mapping

@@ -1 +0,0 @@
-CLASS net/minecraft/class_1939 net/minecraft/world/SessionLockException

mappings/net/minecraft/world/SpawnHelper.mapping

@@ -13,10 +13,7 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper
 		ARG 1 entityType
 		ARG 2 x
 		ARG 3 z
-	METHOD method_8659 containsSpawnEntry (Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Lnet/minecraft/class_1959$class_1964;Lnet/minecraft/class_2338;)Z
+	METHOD method_8659 containsSpawnEntry (Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Lnet/minecraft/class_1959$class_1964;Lnet/minecraft/class_2338;)Z
-		ARG 0 chunkGenerator
-		ARG 1 entityCategory
-		ARG 3 pos
 	METHOD method_8660 canSpawn (Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z
 		ARG 0 location
 		ARG 1 world
@@ -36,8 +33,4 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper
 		ARG 0 category
 		ARG 1 world
 		ARG 2 chunk
-	METHOD method_8664 pickRandomSpawnEntry (Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Ljava/util/Random;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959$class_1964;
+	METHOD method_8664 pickRandomSpawnEntry (Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Ljava/util/Random;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959$class_1964;
-		ARG 0 chunkGenerator
-		ARG 1 entityCategory
-		ARG 2 random
-		ARG 3 pos

mappings/net/minecraft/world/WorldSaveHandler.mapping

@@ -1,7 +1,6 @@
 CLASS net/minecraft/class_29 net/minecraft/world/WorldSaveHandler
 	FIELD field_144 playerDataDir Ljava/io/File;
 	FIELD field_145 worldDir Ljava/io/File;
-	FIELD field_146 saveStartTime J
 	FIELD field_147 structureManager Lnet/minecraft/class_3485;
 	FIELD field_148 dataFixer Lcom/mojang/datafixers/DataFixer;
 	FIELD field_149 LOGGER Lorg/apache/logging/log4j/Logger;
@@ -11,7 +10,6 @@ CLASS net/minecraft/class_29 net/minecraft/world/WorldSaveHandler
 		ARG 2 worldName
 		ARG 3 server
 		ARG 4 dataFixer
-	METHOD method_128 writeSessionLock ()V
 	METHOD method_130 getDataFixer ()Lcom/mojang/datafixers/DataFixer;
 	METHOD method_131 saveWorld (Lnet/minecraft/class_31;Lnet/minecraft/class_2487;)V
 		ARG 1 levelProperties
@@ -21,5 +19,4 @@ CLASS net/minecraft/class_29 net/minecraft/world/WorldSaveHandler
 	METHOD method_134 getStructureManager ()Lnet/minecraft/class_3485;
 	METHOD method_136 saveWorld (Lnet/minecraft/class_31;)V
 		ARG 1 levelProperties
-	METHOD method_137 checkSessionLock ()V
 	METHOD method_263 getSavedPlayerIds ()[Ljava/lang/String;

mappings/net/minecraft/world/biome/Biome.mapping

@@ -57,13 +57,8 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome
 	METHOD method_8698 getFoliageColor ()I
 	METHOD method_8700 getEntitySpawnList (Lnet/minecraft/class_1311;)Ljava/util/List;
 		ARG 1 category
-	METHOD method_8702 generateFeatureStep (Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_2794;Lnet/minecraft/class_1936;JLnet/minecraft/class_2919;Lnet/minecraft/class_2338;)V
+	METHOD method_8702 generateFeatureStep (Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1936;JLnet/minecraft/class_2919;Lnet/minecraft/class_2338;)V
 		ARG 1 step
-		ARG 2 chunkGenerator
-		ARG 3 world
-		ARG 4 populationSeed
-		ARG 6 random
-		ARG 7 pos
 	METHOD method_8703 buildSurface (Ljava/util/Random;Lnet/minecraft/class_2791;IIIDLnet/minecraft/class_2680;Lnet/minecraft/class_2680;IJ)V
 		ARG 1 random
 		ARG 2 chunk

mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping

@@ -7,9 +7,8 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
 		ARG 1 world
 		ARG 2 biomeSource
 		ARG 3 config
-	METHOD method_12088 populateNoise (Lnet/minecraft/class_1936;Lnet/minecraft/class_2791;)V
+	METHOD method_12088 populateNoise (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V
 		ARG 1 world
-		ARG 2 chunk
 	METHOD method_12097 hasStructure (Lnet/minecraft/class_1959;Lnet/minecraft/class_3195;)Z
 		ARG 1 biome
 		ARG 2 feature
@@ -20,10 +19,8 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
 		ARG 3 spawnAnimals
 	METHOD method_12100 getSpawnHeight ()I
 	METHOD method_12101 getSeed ()J
-	METHOD method_12102 generateFeatures (Lnet/minecraft/class_3233;)V
+	METHOD method_12102 generateFeatures (Lnet/minecraft/class_3233;Lnet/minecraft/class_5138;)V
-		ARG 1 region
+	METHOD method_12103 locateStructure (Lnet/minecraft/class_3218;Ljava/lang/String;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338;
-	METHOD method_12103 locateStructure (Lnet/minecraft/class_1937;Ljava/lang/String;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338;
-		ARG 1 world
 		ARG 2 id
 		ARG 3 center
 		ARG 4 radius
@@ -39,13 +36,10 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
 	METHOD method_12110 buildSurface (Lnet/minecraft/class_3233;Lnet/minecraft/class_2791;)V
 		ARG 1 region
 		ARG 2 chunk
-	METHOD method_12113 getEntitySpawnList (Lnet/minecraft/class_1311;Lnet/minecraft/class_2338;)Ljava/util/List;
+	METHOD method_12113 getEntitySpawnList (Lnet/minecraft/class_5138;Lnet/minecraft/class_1311;Lnet/minecraft/class_2338;)Ljava/util/List;
-		ARG 1 category
+	METHOD method_16129 setStructureStarts (Lnet/minecraft/class_5138;Lnet/minecraft/class_4543;Lnet/minecraft/class_2791;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;)V
-		ARG 2 pos
+	METHOD method_16130 addStructureReferences (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V
-	METHOD method_16129 setStructureStarts (Lnet/minecraft/class_4543;Lnet/minecraft/class_2791;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;)V
-	METHOD method_16130 addStructureReferences (Lnet/minecraft/class_1936;Lnet/minecraft/class_2791;)V
 		ARG 1 world
-		ARG 2 chunk
 	METHOD method_16397 getHeight (IILnet/minecraft/class_2902$class_2903;)I
 		ARG 1 x
 		ARG 2 z

mappings/net/minecraft/world/gen/decorator/ConfiguredDecorator.mapping

@@ -5,11 +5,8 @@ CLASS net/minecraft/class_3243 net/minecraft/world/gen/decorator/ConfiguredDecor
 		ARG 1 decorator
 	METHOD <init> (Lnet/minecraft/class_3284;Lnet/minecraft/class_2998;)V
 		ARG 1 decorator
-	METHOD method_14358 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2975;)Z
+	METHOD method_14358 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2975;)Z
 		ARG 1 world
-		ARG 2 generator
-		ARG 3 random
-		ARG 4 pos
 	METHOD method_14359 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3243;
 		ARG 0 dynamic
 	METHOD method_16641 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic;

mappings/net/minecraft/world/gen/decorator/Decorator.mapping

@@ -12,10 +12,6 @@ CLASS net/minecraft/class_3284 net/minecraft/world/gen/decorator/Decorator
 		ARG 3 random
 		ARG 4 config
 		ARG 5 pos
-	METHOD method_15927 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2998;Lnet/minecraft/class_2975;)Z
+	METHOD method_15927 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2998;Lnet/minecraft/class_2975;)Z
 		ARG 1 world
-		ARG 2 generator
-		ARG 3 random
-		ARG 4 pos
-		ARG 5 decoratorConfig
 	METHOD method_23475 configure (Lnet/minecraft/class_2998;)Lnet/minecraft/class_3243;

mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping

@@ -1,13 +1,6 @@
 CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/AbstractTreeFeature
 	METHOD method_12773 setBlockState (Lnet/minecraft/class_1945;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3341;)V
-		ARG 1 world
-		ARG 2 pos
-		ARG 3 state
-		ARG 4 box
 	METHOD method_12774 setBlockStateWithoutUpdatingNeighbors (Lnet/minecraft/class_1945;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
-		ARG 1 world
-		ARG 2 pos
-		ARG 3 state
 	METHOD method_12775 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)Z
 		ARG 1 world
 		ARG 2 random
@@ -66,11 +59,6 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/AbstractTreeFeatu
 	METHOD method_23381 (Lnet/minecraft/class_1936;Ljava/util/Random;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4662;)V
 		ARG 6 decorator
 	METHOD method_23382 setLogBlockState (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)Z
-		ARG 1 world
-		ARG 3 pos
-		ARG 4 logPositions
-		ARG 5 box
-		ARG 6 config
 	METHOD method_23383 setLeavesBlockState (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)Z
 		ARG 1 world
 		ARG 3 pos

mappings/net/minecraft/world/gen/feature/AcaciaTreeFeature.mapping

@@ -1 +0,0 @@
-CLASS net/minecraft/class_4627 net/minecraft/world/gen/feature/AcaciaTreeFeature

mappings/net/minecraft/world/gen/feature/BranchedTreeFeature.mapping

@@ -1,17 +1,2 @@
 CLASS net/minecraft/class_4626 net/minecraft/world/gen/feature/BranchedTreeFeature
-	METHOD method_23378 findPositionToGenerate (Lnet/minecraft/class_3747;IIILnet/minecraft/class_2338;Lnet/minecraft/class_4640;)Ljava/util/Optional;
+	METHOD method_23378 findPositionToGenerate (Lnet/minecraft/class_3747;IILnet/minecraft/class_2338;Lnet/minecraft/class_4640;)Ljava/util/Optional;
-		ARG 1 world
-		ARG 2 baseHeight
-		ARG 3 trunkHeight
-		ARG 4 foliageRadius
-		ARG 5 pos
-		ARG 6 config
-	METHOD method_23379 generate (Lnet/minecraft/class_3747;Ljava/util/Random;ILnet/minecraft/class_2338;ILjava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4640;)V
-		ARG 1 world
-		ARG 2 random
-		ARG 3 height
-		ARG 4 pos
-		ARG 5 trunkTopOffset
-		ARG 6 logPositions
-		ARG 7 box
-		ARG 8 config

mappings/net/minecraft/world/gen/feature/BranchedTreeFeatureConfig.mapping

@@ -1,68 +1,23 @@
 CLASS net/minecraft/class_4640 net/minecraft/world/gen/feature/BranchedTreeFeatureConfig
 	FIELD field_21259 foliagePlacer Lnet/minecraft/class_4647;
-	FIELD field_21260 heightRandA I
-	FIELD field_21261 heightRandB I
-	FIELD field_21262 trunkHeight I
-	FIELD field_21263 trunkHeightRandom I
-	FIELD field_21264 trunkTopOffset I
-	FIELD field_21265 trunkTopOffsetRandom I
-	FIELD field_21266 foliageHeight I
-	FIELD field_21267 foliageHeightRandom I
 	FIELD field_21268 maxFluidDepth I
 	FIELD field_21269 noVines Z
-	METHOD <init> (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Ljava/util/List;IIIIIIIIIIZ)V
+	METHOD <init> (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5141;Ljava/util/List;IZ)V
 		ARG 1 trunkProvider
 		ARG 2 leavesProvider
 		ARG 3 foliagePlacer
-		ARG 4 treeDecorators
-		ARG 5 baseHeight
 		ARG 6 heightRandA
-		ARG 7 heightRandB
-		ARG 8 trunkHeight
-		ARG 9 trunkHeightRandom
-		ARG 10 trunkTopOffset
-		ARG 11 trunkTopOffsetRandom
-		ARG 12 foliageHeight
-		ARG 13 foliageHeightRandom
-		ARG 14 maxFluidDepth
-		ARG 15 noVines
 	METHOD method_23426 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4640;
 		ARG 0 dynamic
 	CLASS class_4641 Builder
 		FIELD field_21270 foliagePlacer Lnet/minecraft/class_4647;
 		FIELD field_21271 treeDecorators Ljava/util/List;
-		FIELD field_21272 height I
-		FIELD field_21273 heightRandA I
-		FIELD field_21274 heightRandB I
-		FIELD field_21275 trunkHeight I
-		FIELD field_21276 trunkHeightRandom I
-		FIELD field_21277 trunkTopOffset I
-		FIELD field_21278 trunkTopOffsetRandom I
-		FIELD field_21279 foliageHeight I
-		FIELD field_21280 foliageHeightRandom I
 		FIELD field_21281 maxWaterDepth I
 		FIELD field_21282 noVines Z
-		METHOD <init> (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;)V
+		METHOD <init> (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5141;)V
 			ARG 1 trunkProvider
 			ARG 2 leavesProvider
 		METHOD method_23427 noVines ()Lnet/minecraft/class_4640$class_4641;
 		METHOD method_23429 treeDecorators (Ljava/util/List;)Lnet/minecraft/class_4640$class_4641;
 			ARG 1 treeDecorators
-		METHOD method_23430 heightRandA (I)Lnet/minecraft/class_4640$class_4641;
-			ARG 1 heightRandA
-		METHOD method_23432 heightRandB (I)Lnet/minecraft/class_4640$class_4641;
-			ARG 1 heightRandB
-		METHOD method_23433 trunkHeight (I)Lnet/minecraft/class_4640$class_4641;
-			ARG 1 trunkHeight
-		METHOD method_23434 trunkHeightRandom (I)Lnet/minecraft/class_4640$class_4641;
-			ARG 1 trunkHeightRandom
-		METHOD method_23435 trunkTopOffset (I)Lnet/minecraft/class_4640$class_4641;
-			ARG 1 trunkTopOffset
-		METHOD method_23436 trunkTopOffsetRandom (I)Lnet/minecraft/class_4640$class_4641;
-			ARG 1 trunkTopOffsetRandom
-		METHOD method_23437 foliageHeight (I)Lnet/minecraft/class_4640$class_4641;
-			ARG 1 foliageHeight
-		METHOD method_23438 foliageHeightRandom (I)Lnet/minecraft/class_4640$class_4641;
-			ARG 1 foliageHeightRandom
 		METHOD method_23439 maxFluidDepth (I)Lnet/minecraft/class_4640$class_4641;
-			ARG 1 maxFluidDepth

mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping

@@ -9,10 +9,7 @@ CLASS net/minecraft/class_2975 net/minecraft/world/gen/feature/ConfiguredFeature
 		ARG 2 config
 	METHOD method_12861 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_2975;
 		ARG 0 dynamic
-	METHOD method_12862 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
+	METHOD method_12862 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
-		ARG 1 world
-		ARG 2 generator
-		ARG 3 random
 	METHOD method_16584 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic;
 		ARG 1 ops
 	METHOD method_23387 withChance (F)Lnet/minecraft/class_3226;

mappings/net/minecraft/world/gen/feature/Feature.mapping

@@ -28,12 +28,8 @@ CLASS net/minecraft/class_3031 net/minecraft/world/gen/feature/Feature
 	METHOD method_13150 register (Ljava/lang/String;Lnet/minecraft/class_3031;)Lnet/minecraft/class_3031;
 		ARG 0 name
 		ARG 1 feature
-	METHOD method_13151 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_3037;)Z
+	METHOD method_13151 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_3037;)Z
 		ARG 1 world
-		ARG 2 generator
-		ARG 3 random
-		ARG 4 pos
-		ARG 5 config
 	METHOD method_13152 (Lcom/google/common/collect/HashBiMap;)V
 		ARG 0 map
 	METHOD method_13153 setBlockState (Lnet/minecraft/class_1945;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V

mappings/net/minecraft/world/gen/feature/LargeOakTreeFeature.mapping

@@ -10,7 +10,6 @@ CLASS net/minecraft/class_2948 net/minecraft/world/gen/feature/LargeOakTreeFeatu
 		ARG 1 treeHeight
 		ARG 2 height
 	METHOD method_12802 makeLeaves (Lnet/minecraft/class_3747;Ljava/util/Random;ILnet/minecraft/class_2338;Ljava/util/List;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4640;)V
-		ARG 1 world
 		ARG 4 pos
 		ARG 7 box
 		ARG 8 config
@@ -43,18 +42,6 @@ CLASS net/minecraft/class_2948 net/minecraft/world/gen/feature/LargeOakTreeFeatu
 	METHOD method_12809 getLogAxis (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2350$class_2351;
 		ARG 1 branchStart
 		ARG 2 branchEnd
-	METHOD method_12810 makeLeaves (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4640;)V
-		ARG 1 world
-		ARG 3 pos
-		ARG 4 leaves
-		ARG 5 box
-		ARG 6 config
-	METHOD method_12811 makeLeafLayer (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;FLjava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4640;)V
-		ARG 1 world
-		ARG 3 pos
-		ARG 5 leaves
-		ARG 6 box
-		ARG 7 config
 	CLASS class_2949 BranchPos
 		FIELD field_13344 endY I
 		METHOD <init> (Lnet/minecraft/class_2338;I)V

mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping

@@ -6,9 +6,6 @@ CLASS net/minecraft/class_3226 net/minecraft/world/gen/feature/RandomFeatureEntr
 		ARG 2 chance
 	METHOD method_14270 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3226;
 		ARG 0 dynamic
-	METHOD method_14271 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
+	METHOD method_14271 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
-		ARG 1 world
-		ARG 3 random
-		ARG 4 pos
 	METHOD method_16599 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic;
 		ARG 1 dynamic

mappings/net/minecraft/world/gen/feature/StructureFeature.mapping

@@ -1,26 +1,17 @@
 CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature
 	FIELD field_13879 LOGGER Lorg/apache/logging/log4j/Logger;
-	METHOD method_14015 locateStructure (Lnet/minecraft/class_1937;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338;
+	METHOD method_14015 locateStructure (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338;
 		ARG 5 skipExistingChunks
 	METHOD method_14016 getStructureStartFactory ()Lnet/minecraft/class_3195$class_3774;
-	METHOD method_14017 getStructureStarts (Lnet/minecraft/class_1936;II)Ljava/util/List;
-		ARG 1 world
-		ARG 2 chunkX
-		ARG 3 chunkZ
 	METHOD method_14018 getStart (Lnet/minecraft/class_2794;Ljava/util/Random;IIII)Lnet/minecraft/class_1923;
 		ARG 2 random
 	METHOD method_14019 getName ()Ljava/lang/String;
 	METHOD method_14021 getRadius ()I
-	METHOD method_14023 isApproximatelyInsideStructure (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z
+	METHOD method_14023 isApproximatelyInsideStructure (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;)Z
 		ARG 1 world
-		ARG 2 pos
+	METHOD method_14024 isInsideStructure (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;)Z
-	METHOD method_14024 isInsideStructure (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z
 		ARG 1 world
-		ARG 2 pos
+	METHOD method_14025 isInsideStructure (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_3449;
-	METHOD method_14025 isInsideStructure (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_3449;
-		ARG 1 world
-		ARG 2 pos
-		ARG 3 exact
 	METHOD method_14026 shouldStartAt (Lnet/minecraft/class_4543;Lnet/minecraft/class_2794;Ljava/util/Random;IILnet/minecraft/class_1959;)Z
 		ARG 4 chunkX
 		ARG 5 chunkZ

mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping

@@ -1,7 +1,4 @@
 CLASS net/minecraft/class_3197 net/minecraft/world/gen/feature/SwampHutFeature
 	FIELD field_13882 MONSTER_SPAWNS Ljava/util/List;
 	FIELD field_16435 CREATURE_SPAWNS Ljava/util/List;
-	METHOD method_14029 (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z
-		ARG 1 world
-		ARG 2 pos
 	CLASS class_3198 Start

mappings/net/minecraft/world/gen/foliage/BlobFoliagePlacer.mapping

@@ -1,4 +1 @@
 CLASS net/minecraft/class_4646 net/minecraft/world/gen/foliage/BlobFoliagePlacer
-	METHOD <init> (II)V
-		ARG 1 radius
-		ARG 2 radiusRandom

mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping

@@ -2,11 +2,10 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer
 	FIELD field_21296 radius I
 	FIELD field_21297 randomRadius I
 	FIELD field_21298 type Lnet/minecraft/class_4648;
-	METHOD <init> (IILnet/minecraft/class_4648;)V
+	METHOD <init> (IIIILnet/minecraft/class_4648;)V
 		ARG 1 radius
 		ARG 2 randomRadius
-		ARG 3 type
+	METHOD method_23447 getRadiusForPlacement (III)I
-	METHOD method_23447 getRadiusForPlacement (IIII)I
 		COMMENT This method is used to ensure that a tree can place foliage when it generates.
 		COMMENT
 		COMMENT <p>It runs for every y-level of the tree being generated.
@@ -16,29 +15,9 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer
 			COMMENT the height of the full tree
 		ARG 3 radius
 			COMMENT the radius of the foliage
-		ARG 4 currentTreeHeight
+	METHOD method_23448 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4640;ILnet/minecraft/class_2338;IILjava/util/Set;)V
-			COMMENT the current y-level of the tree being tested.
-	METHOD method_23448 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4640;IIILnet/minecraft/class_2338;Ljava/util/Set;)V
 		COMMENT This is the main method used to generate foliage.
-		ARG 1 world
+	METHOD method_23449 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4640;Lnet/minecraft/class_2338;IIILjava/util/Set;)V
-		ARG 3 config
-		ARG 4 baseHeight
-			COMMENT the height of the full tree
-		ARG 5 trunkHeight
-			COMMENT the height of just the trunk, or the part of the tree without leaves
-		ARG 6 radius
-			COMMENT the radius of the foliage
-		ARG 7 pos
-		ARG 8 leaves
-	METHOD method_23449 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4640;ILnet/minecraft/class_2338;IILjava/util/Set;)V
-		ARG 1 world
-		ARG 2 random
-		ARG 3 config
-		ARG 4 baseHeight
-		ARG 5 pos
-		ARG 6 y
-		ARG 7 radius
-		ARG 8 leaves
 	METHOD method_23450 placeLeaves (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_4640;Ljava/util/Set;)V
 		ARG 1 world
 		ARG 2 random
@@ -51,7 +30,5 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer
 		ARG 4 y
 		ARG 5 z
 		ARG 6 radius
-	METHOD method_23452 getRadius (Ljava/util/Random;IILnet/minecraft/class_4640;)I
+	METHOD method_23452 getRadius (Ljava/util/Random;ILnet/minecraft/class_4640;)I
 		ARG 2 baseHeight
-		ARG 3 trunkHeight
-		ARG 4 config

mappings/net/minecraft/world/level/storage/AnvilLevelStorage.mapping

@@ -6,5 +6,5 @@ CLASS net/minecraft/class_24 net/minecraft/world/level/storage/AnvilLevelStorage
 		ARG 1 baseFolder
 		ARG 4 progressStart
 	METHOD method_117 addRegionFiles (Ljava/io/File;Ljava/util/Collection;)V
-	METHOD method_118 makeMcrLevelDatBackup (Ljava/nio/file/Path;Ljava/lang/String;)V
+	METHOD method_118 makeMcrLevelDatBackup (Ljava/io/File;)V
-	METHOD method_234 convertLevel (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Ljava/lang/String;Lnet/minecraft/class_3536;)Z
+	METHOD method_234 convertLevel (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3536;)Z

mappings/net/minecraft/world/level/storage/LevelStorage.mapping

@@ -11,39 +11,10 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage
 	METHOD method_17926 readLevelProperties (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_31;
 		ARG 0 file
 		ARG 1 dataFixer
-	METHOD method_17927 convertLevel (Ljava/lang/String;Lnet/minecraft/class_3536;)Z
-		ARG 1 name
-		ARG 2 progressListener
-	METHOD method_17928 getLevelProperties (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Ljava/lang/String;)Lnet/minecraft/class_31;
-		ARG 0 savesDirectory
-		ARG 1 dataFixer
-		ARG 2 name
-	METHOD method_17929 createSaveHandler (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Ljava/lang/String;Lnet/minecraft/server/MinecraftServer;)Lnet/minecraft/class_29;
-		ARG 0 savesDirectory
-		ARG 1 dataFixer
-		ARG 2 name
-		ARG 3 server
-	METHOD method_17930 deleteFilesRecursively ([Ljava/io/File;)Z
-		ARG 0 files
 	METHOD method_17931 getCurrentVersion ()I
 	METHOD method_19636 getSavesDirectory ()Ljava/nio/file/Path;
 	METHOD method_230 levelExists (Ljava/lang/String;)Z
 		ARG 1 name
-	METHOD method_231 getLevelProperties (Ljava/lang/String;)Lnet/minecraft/class_31;
-	METHOD method_233 deleteLevel (Ljava/lang/String;)Z
-		ARG 1 name
 	METHOD method_235 getLevelList ()Ljava/util/List;
 	METHOD method_236 getBackupsDirectory ()Ljava/nio/file/Path;
-	METHOD method_237 backupLevel (Ljava/lang/String;)J
-		ARG 1 name
-	METHOD method_239 resolveFile (Ljava/lang/String;Ljava/lang/String;)Ljava/io/File;
 	METHOD method_240 isLevelNameValid (Ljava/lang/String;)Z
-	METHOD method_241 renameLevel (Ljava/lang/String;Ljava/lang/String;)V
-		ARG 1 name
-		ARG 2 newName
-	METHOD method_242 createSaveHandler (Ljava/lang/String;Lnet/minecraft/server/MinecraftServer;)Lnet/minecraft/class_29;
-		ARG 1 name
-		ARG 2 server
-	METHOD method_243 resolvePath (Ljava/lang/String;)Ljava/nio/file/Path;
-	METHOD method_244 requiresConversion (Ljava/lang/String;)Z
-		ARG 1 name

mappings/net/minecraft/world/level/storage/LevelSummary.mapping

@@ -11,7 +11,7 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary
 	FIELD field_214 versionName Ljava/lang/String;
 	FIELD field_215 versionId I
 	FIELD field_216 isSnapshot Z
-	METHOD <init> (Lnet/minecraft/class_31;Ljava/lang/String;Ljava/lang/String;JZ)V
+	METHOD <init> (Lnet/minecraft/class_31;Ljava/lang/String;Ljava/lang/String;JZZLjava/io/File;)V
 		ARG 1 properties
 		ARG 2 name
 		ARG 3 displayName

mappings/net/minecraft/world/storage/RegionBasedStorage.mapping

@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_2867 net/minecraft/world/storage/RegionBasedStorage
 	FIELD field_17657 cachedRegionFiles Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;
 	FIELD field_18690 directory Ljava/io/File;
-	METHOD <init> (Ljava/io/File;)V
+	METHOD <init> (Ljava/io/File;Z)V
 		ARG 1 directory
 	METHOD method_12440 getRegionFile (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2861;
 		ARG 1 pos

mappings/net/minecraft/world/storage/RegionFile.mapping

@@ -8,10 +8,10 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile
 	FIELD field_20440 saveTimes Ljava/nio/IntBuffer;
 	FIELD field_20441 sectors Lnet/minecraft/class_4485;
 	FIELD field_20657 directory Ljava/nio/file/Path;
-	METHOD <init> (Ljava/io/File;Ljava/io/File;)V
+	METHOD <init> (Ljava/io/File;Ljava/io/File;Z)V
 		ARG 1 file
 		ARG 2 directory
-	METHOD <init> (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_4486;)V
+	METHOD <init> (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_4486;Z)V
 		ARG 1 file
 		ARG 2 directory
 	METHOD method_12419 getSectorData (Lnet/minecraft/class_1923;)I

mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping

@@ -7,12 +7,8 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase
 	FIELD field_19228 dataFixer Lcom/mojang/datafixers/DataFixer;
 	FIELD field_19229 dataFixType Lnet/minecraft/class_4284;
 	FIELD field_21505 worker Lnet/minecraft/class_4698;
-	METHOD <init> (Ljava/io/File;Ljava/util/function/BiFunction;Ljava/util/function/Function;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;)V
+	METHOD <init> (Ljava/io/File;Lnet/minecraft/class_5128;Ljava/util/function/BiFunction;Ljava/util/function/Function;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;Z)V
 		ARG 1 directory
-		ARG 2 deserializer
-		ARG 3 factory
-		ARG 4 dataFixer
-		ARG 5 dataFixType
 	METHOD method_19288 onUpdate (J)V
 		ARG 1 pos
 	METHOD method_19289 loadDataAt (Lnet/minecraft/class_1923;)V
@@ -26,7 +22,7 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase
 		ARG 1 pos
 	METHOD method_19294 get (J)Ljava/util/Optional;
 		ARG 1 pos
-	METHOD method_19295 getOrCreate (J)Lnet/minecraft/class_4213;
+	METHOD method_19295 getOrCreate (J)Ljava/lang/Object;
 		ARG 1 pos
 	METHOD method_20369 getDataVersion (Lcom/mojang/datafixers/Dynamic;)I
 	METHOD method_20370 save (Lnet/minecraft/class_1923;)V

mappings/net/minecraft/world/updater/WorldUpdater.mapping

@@ -16,8 +16,6 @@ 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 <init> (Ljava/lang/String;Lnet/minecraft/class_32;Lnet/minecraft/class_31;Z)V
-		ARG 4 eraseCache
 	METHOD method_17830 getChunkPositions (Lnet/minecraft/class_2874;)Ljava/util/List;
 		ARG 1 dimensionType
 	METHOD method_5393 getProgress (Lnet/minecraft/class_2874;)F