Various issue fixes (#4031)

* Fix #4015

* Fix #4013

* Fix #3859

* Fix #3791

* Fix #4039

* Fix #4038

* Fix #4037

* Fix #4029

* Fix missing spots

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

mappings/net/minecraft/client/gui/screen/Screen.mapping

@@ -87,7 +87,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 	METHOD method_25441 hasControlDown ()Z
 	METHOD method_25442 hasShiftDown ()Z
 	METHOD method_25443 hasAltDown ()Z
-	METHOD method_29638 filesDragged (Ljava/util/List;)V
+	METHOD method_29638 onFilesDropped (Ljava/util/List;)V
 		ARG 1 paths
 	METHOD method_37056 addElementNarrations (Lnet/minecraft/class_6382;)V
 		ARG 1 builder

mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping

@@ -8,7 +8,7 @@ CLASS net/minecraft/class_492 net/minecraft/client/gui/screen/ingame/MerchantScr
 	FIELD field_2950 TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_32354 TEXTURE_WIDTH I
 	FIELD field_32355 TEXTURE_HEIGHT I
-	FIELD field_32357 XP_BAR_X_OFFSET I
+	FIELD field_32357 EXPERIENCE_BAR_X_OFFSET I
 	FIELD field_32358 TRADE_LIST_AREA_Y_OFFSET I
 	FIELD field_32359 FIRST_BUY_ITEM_X_OFFSET I
 	FIELD field_32360 SECOND_BUY_ITEM_X_OFFSET I

mappings/net/minecraft/client/render/entity/feature/EmissiveFeatureRenderer.mapping

@@ -1,12 +1,12 @@
 CLASS net/minecraft/class_7288 net/minecraft/client/render/entity/feature/EmissiveFeatureRenderer
 	FIELD field_38355 texture Lnet/minecraft/class_2960;
-	FIELD field_38356 animationAngleAdjuster Lnet/minecraft/class_7288$class_7289;
+	FIELD field_38356 animationAlphaAdjuster Lnet/minecraft/class_7288$class_7289;
 	FIELD field_38464 modelPartVisibility Lnet/minecraft/class_7288$class_7311;
 	FIELD field_54861 renderLayerFunction Ljava/util/function/Function;
 	METHOD <init> (Lnet/minecraft/class_3883;Lnet/minecraft/class_2960;Lnet/minecraft/class_7288$class_7289;Lnet/minecraft/class_7288$class_7311;Ljava/util/function/Function;)V
 		ARG 1 context
 		ARG 2 texture
-		ARG 3 animationAngleAdjuster
+		ARG 3 animationAlphaAdjuster
 		ARG 4 modelPartVisibility
 		ARG 5 renderLayerFunction
 	METHOD method_42746 updateModelPartVisibility (Lnet/minecraft/class_10042;)Z
@@ -18,7 +18,7 @@ CLASS net/minecraft/class_7288 net/minecraft/client/render/entity/feature/Emissi
 		ARG 0 part
 	METHOD method_42750 (Lnet/minecraft/class_630;)V
 		ARG 0 part
-	CLASS class_7289 AnimationAngleAdjuster
+	CLASS class_7289 AnimationAlphaAdjuster
 		METHOD apply (Lnet/minecraft/class_10042;F)F
 			ARG 1 state
 			ARG 2 tickDelta

mappings/net/minecraft/client/render/entity/state/WardenEntityRenderState.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_10081 net/minecraft/client/render/entity/state/WardenEntityRenderState
-	FIELD field_53607 tendrilPitch F
-	FIELD field_53608 heartPitch F
+	FIELD field_53607 tendrilAlpha F
+	FIELD field_53608 heartAlpha F
 	FIELD field_53609 roaringAnimationState Lnet/minecraft/class_7094;
 	FIELD field_53610 sniffingAnimationState Lnet/minecraft/class_7094;
 	FIELD field_53611 emergingAnimationState Lnet/minecraft/class_7094;

mappings/net/minecraft/datafixer/fix/VillagerXpRebuildFix.mapping → mappings/net/minecraft/datafixer/fix/VillagerExperienceRebuildFix.mapping

@@ -1,10 +1,10 @@
-CLASS net/minecraft/class_4300 net/minecraft/datafixer/fix/VillagerXpRebuildFix
-	FIELD field_19285 LEVEL_TO_XP [I
+CLASS net/minecraft/class_4300 net/minecraft/datafixer/fix/VillagerExperienceRebuildFix
+	FIELD field_19285 LEVEL_TO_EXPERIENCE [I
 	FIELD field_29914 TRADES_PER_LEVEL I
 	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;Z)V
 		ARG 1 outputSchema
 		ARG 2 changesTyped
-	METHOD method_20482 levelToXp (I)I
+	METHOD method_20482 levelToExperience (I)I
 		ARG 0 level
 	METHOD method_20484 (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
 		ARG 3 villagerTyped
@@ -17,7 +17,7 @@ CLASS net/minecraft/class_4300 net/minecraft/datafixer/fix/VillagerXpRebuildFix
 		ARG 1 level
 	METHOD method_20489 (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/Typed;)Ljava/util/Optional;
 		ARG 1 offersTyped
-	METHOD method_20490 fixXp (Lcom/mojang/datafixers/Typed;I)Lcom/mojang/datafixers/Typed;
+	METHOD method_20490 fixExperience (Lcom/mojang/datafixers/Typed;I)Lcom/mojang/datafixers/Typed;
 		ARG 0 villagerTyped
 		ARG 1 level
 	METHOD method_28265 (ILcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;

mappings/net/minecraft/enchantment/Enchantment.mapping

@@ -226,11 +226,11 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment
 		ARG 3 stack
 		ARG 4 user
 		ARG 5 fishingLuckBonus
-	METHOD method_60056 modifyRepairWithXp (Lnet/minecraft/class_3218;ILnet/minecraft/class_1799;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
+	METHOD method_60056 modifyRepairWithExperience (Lnet/minecraft/class_3218;ILnet/minecraft/class_1799;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
 		ARG 1 world
 		ARG 2 level
 		ARG 3 stack
-		ARG 4 repairWithXp
+		ARG 4 repairWithExperience
 	METHOD method_60057 modifyProjectileCount (Lnet/minecraft/class_3218;ILnet/minecraft/class_1799;Lnet/minecraft/class_1297;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
 		ARG 1 world
 		ARG 2 level

mappings/net/minecraft/enchantment/EnchantmentHelper.mapping

@@ -232,10 +232,10 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper
 		ARG 2 enchantment
 		ARG 3 level
 		ARG 4 context
-	METHOD method_60168 getRepairWithXp (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;I)I
+	METHOD method_60168 getRepairWithExperience (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;I)I
 		ARG 0 world
 		ARG 1 stack
-		ARG 2 baseRepairWithXp
+		ARG 2 baseRepairWithExperience
 	METHOD method_60169 getTridentReturnAcceleration (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;)I
 		ARG 0 world
 		ARG 1 stack

mappings/net/minecraft/entity/Entity.mapping

@@ -372,7 +372,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT {@return the default name of the entity}
 		COMMENT
 		COMMENT @see EntityType#getName
-	METHOD method_23316 offsetX (D)D
+	METHOD method_23316 getBodyX (D)D
 		ARG 1 widthScale
 	METHOD method_23317 getX ()D
 	METHOD method_23318 getY ()D
@@ -383,7 +383,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 1 widthScale
 	METHOD method_23323 getBodyY (D)D
 		ARG 1 heightScale
-	METHOD method_23324 offsetZ (D)D
+	METHOD method_23324 getBodyZ (D)D
 		ARG 1 widthScale
 	METHOD method_23325 getParticleZ (D)D
 		ARG 1 widthScale

mappings/net/minecraft/entity/LivingEntity.mapping

@@ -167,12 +167,12 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		COMMENT <p> The default behavior spawns a wither rose if {@code adversary} is a {@code WitherEntity}.
 		ARG 1 adversary
 			COMMENT the main adversary responsible for this entity's death
-	METHOD method_23883 dropXp (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)V
+	METHOD method_23883 dropExperience (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)V
 		COMMENT Drops experience when this entity is killed.
 		COMMENT
 		COMMENT <p>To control the details of experience dropping, consider overriding
-		COMMENT {@link #shouldAlwaysDropXp()}, {@link #shouldDropXp()}, and
-		COMMENT {@link #getXpToDrop()}.
+		COMMENT {@link #shouldAlwaysDropExperience()}, {@link #shouldDropExperience()}, and
+		COMMENT {@link #getExperienceToDrop()}.
 		ARG 1 world
 		ARG 2 attacker
 	METHOD method_24518 isHolding (Lnet/minecraft/class_1792;)Z
@@ -382,7 +382,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	METHOD method_5936 canPickUpLoot ()Z
 	METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z
 		ARG 1 type
-	METHOD method_59923 getXpToDrop (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)I
+	METHOD method_59923 getExperienceToDrop (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)I
 		ARG 1 world
 		ARG 2 attacker
 	METHOD method_59924 getKnockbackAgainst (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)F
@@ -495,17 +495,17 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	METHOD method_6050 tickStatusEffects ()V
 	METHOD method_6052 getAttacking ()Lnet/minecraft/class_1309;
 	METHOD method_6053 tickGliding ()V
-	METHOD method_6054 shouldDropXp ()Z
+	METHOD method_6054 shouldDropExperience ()Z
 		COMMENT Returns if this entity should drop experience on death when the {@linkplain
 		COMMENT net.minecraft.world.GameRules#DO_MOB_LOOT doMobLoot} game rule is
 		COMMENT enabled and has been attacked by a player.
 		COMMENT
-		COMMENT <p>If {@link #shouldAlwaysDropXp() shouldAlwaysDropXp()} returns {@code
+		COMMENT <p>If {@link #shouldAlwaysDropExperience() shouldAlwaysDropExperience()} returns {@code
 		COMMENT true}, this check is disregarded.
 		COMMENT
-		COMMENT @see #dropXp
-		COMMENT @see #shouldAlwaysDropXp()
-		COMMENT @see #getXpToDrop()
+		COMMENT @see #dropExperience
+		COMMENT @see #shouldAlwaysDropExperience()
+		COMMENT @see #getExperienceToDrop()
 	METHOD method_6055 getHandSwingProgress (F)F
 		ARG 1 tickDelta
 	METHOD method_6056 damageShield (F)V
@@ -532,7 +532,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		ARG 1 world
 		ARG 2 reason
 	METHOD method_6070 tickCramming ()V
-	METHOD method_6071 shouldAlwaysDropXp ()Z
+	METHOD method_6071 shouldAlwaysDropExperience ()Z
 		COMMENT Returns if this entity may always drop experience, skipping any
 		COMMENT other checks.
 		COMMENT
@@ -618,7 +618,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	METHOD method_6107 getSoundVolume ()F
 	METHOD method_6108 updatePostDeath ()V
 	METHOD method_6109 isBaby ()Z
-	METHOD method_6110 getXpToDrop (Lnet/minecraft/class_3218;)I
+	METHOD method_6110 getExperienceToDrop (Lnet/minecraft/class_3218;)I
 		COMMENT Called when this entity is killed and returns the amount of experience
 		COMMENT to drop.
 		COMMENT
@@ -648,7 +648,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	METHOD method_6118 getEquippedStack (Lnet/minecraft/class_1304;)Lnet/minecraft/class_1799;
 		ARG 1 slot
 	METHOD method_6119 tickHandSwing ()V
-	METHOD method_6120 getBaseMovementSpeedMultiplier ()F
+	METHOD method_6120 getBaseWaterMovementSpeedMultiplier ()F
 	METHOD method_6121 tryAttack (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)Z
 		ARG 1 world
 		ARG 2 target

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

@@ -13,10 +13,10 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 		COMMENT The base chance (before applying difficulty) that a mob's equipped item can become enchanted.
 		COMMENT
 		COMMENT @see MobEntity#enchantMainHandItem
-	FIELD field_30087 MINIMUM_DROPPED_XP_PER_EQUIPMENT I
+	FIELD field_30087 MINIMUM_DROPPED_EXPERIENCE_PER_EQUIPMENT I
 		COMMENT The minimum additional experience a mob will drop per item of equipment they have.
 		COMMENT
-		COMMENT @see MobEntity#getXpToDrop
+		COMMENT @see MobEntity#getExperienceToDrop
 	FIELD field_30088 AI_DISABLED_FLAG I
 	FIELD field_30089 LEFT_HANDED_FLAG I
 	FIELD field_30090 ATTACKING_FLAG I

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

@@ -4,23 +4,23 @@ CLASS net/minecraft/class_1569 net/minecraft/entity/mob/Monster
 	COMMENT setting {@link MobEntity#experiencePoints}.
 	COMMENT
 	COMMENT @see net.minecraft.entity.SpawnGroup#MONSTER
-	FIELD field_30464 ZERO_XP I
+	FIELD field_30464 ZERO_EXPERIENCE I
 		COMMENT @apiNote This is used for mobs that do not drop experience.
-	FIELD field_30465 SMALL_MONSTER_XP I
+	FIELD field_30465 SMALL_MONSTER_EXPERIENCE I
 		COMMENT @apiNote This is used for monsters such as
 		COMMENT {@linkplain EndermiteEntity endermites} and
 		COMMENT {@linkplain VexEntity vexes}.
-	FIELD field_30466 NORMAL_MONSTER_XP I
+	FIELD field_30466 NORMAL_MONSTER_EXPERIENCE I
 		COMMENT @apiNote This is used for most of the monsters, such as
 		COMMENT {@linkplain ZombieEntity zombies} and
 		COMMENT {@linkplain SkeletonEntity skeletons}.
-	FIELD field_30467 STRONG_MONSTER_XP I
+	FIELD field_30467 STRONG_MONSTER_EXPERIENCE I
 		COMMENT @apiNote This is used for monsters such as
 		COMMENT {@linkplain BlazeEntity blazes} and
 		COMMENT {@linkplain GuardianEntity guardians}.
-	FIELD field_30468 STRONGER_MONSTER_XP I
+	FIELD field_30468 STRONGER_MONSTER_EXPERIENCE I
 		COMMENT @apiNote This is used for {@linkplain PiglinBruteEntity piglin brutes}
 		COMMENT and {@linkplain RavagerEntity ravagers}.
-	FIELD field_30469 WITHER_XP I
+	FIELD field_30469 WITHER_EXPERIENCE I
 		COMMENT @apiNote This is used for
 		COMMENT {@linkplain net.minecraft.entity.boss.WitherEntity withers}.

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

@@ -12,8 +12,8 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity
 	FIELD field_38148 ANGER Lnet/minecraft/class_2940;
 	FIELD field_38150 DARKNESS_EFFECT_DURATION I
 	FIELD field_38155 ANGRINESS_AMOUNT I
-	FIELD field_38162 tendrilPitch I
-	FIELD field_38163 lastTendrilPitch I
+	FIELD field_38162 tendrilAlpha I
+	FIELD field_38163 lastTendrilAlpha I
 	FIELD field_38164 heartbeatCooldown I
 	FIELD field_38165 lastHeartbeatCooldown I
 	FIELD field_38166 gameEventHandler Lnet/minecraft/class_5715;
@@ -23,7 +23,7 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity
 	FIELD field_44598 vibrationCallback Lnet/minecraft/class_8514$class_5719;
 	FIELD field_44599 vibrationListenerData Lnet/minecraft/class_8514$class_8515;
 	FIELD field_52503 FOLLOW_RANGE I
-	METHOD method_42202 getHeartPitch (F)F
+	METHOD method_42202 getHeartAlpha (F)F
 		ARG 1 tickDelta
 	METHOD method_42204 addDarknessToClosePlayers (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;I)V
 		ARG 0 world
@@ -54,7 +54,7 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity
 	METHOD method_42219 playListeningSound ()V
 	METHOD method_42221 addAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_42222 getAnger ()I
-	METHOD method_42223 getTendrilPitch (F)F
+	METHOD method_42223 getTendrilAlpha (F)F
 		ARG 1 tickDelta
 	METHOD method_42669 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V
 		ARG 1 listenerData

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

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity
 	FIELD field_17047 offerData Lnet/minecraft/class_1916;
-	FIELD field_18877 xp I
+	FIELD field_18877 experience I
 	FIELD field_20299 gossipData Lnet/minecraft/class_2520;
 	FIELD field_30523 BASE_CONVERSION_DELAY I
 	FIELD field_36334 LOGGER Lorg/slf4j/Logger;
@@ -10,13 +10,13 @@ CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity
 	FIELD field_7423 CONVERTING Lnet/minecraft/class_2940;
 	METHOD method_16916 setOfferData (Lnet/minecraft/class_1916;)V
 		ARG 1 offerData
-	METHOD method_19622 setXp (I)V
-		ARG 1 xp
+	METHOD method_19622 setExperience (I)V
+		ARG 1 experience
 	METHOD method_21649 setGossipData (Lnet/minecraft/class_2520;)V
 		ARG 1 gossipData
 	METHOD method_28369 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V
 		ARG 1 villagerData
-	METHOD method_35194 getXp ()I
+	METHOD method_35194 getExperience ()I
 	METHOD method_40125 (Lnet/minecraft/class_6880$class_6883;)V
 		ARG 1 profession
 	METHOD method_56681 (Lnet/minecraft/class_1916;)V

mappings/net/minecraft/network/codec/PacketCodecs.mapping

@@ -2,7 +2,7 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs
 	COMMENT A set of pre-defined packet codecs.
 	COMMENT
 	COMMENT @see PacketCodec
-	FIELD field_48547 BOOL Lnet/minecraft/class_9139;
+	FIELD field_48547 BOOLEAN Lnet/minecraft/class_9139;
 		COMMENT A codec for a boolean value.
 		COMMENT
 		COMMENT @see io.netty.buffer.ByteBuf#readBoolean

mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping

@@ -7,6 +7,7 @@ CLASS net/minecraft/class_8708 net/minecraft/network/packet/s2c/custom/DebugBrai
 		ARG 1 buf
 	CLASS class_4232 Brain
 		FIELD comp_1660 entityId I
+		FIELD comp_1663 experience I
 		FIELD comp_1671 possibleActivities Ljava/util/List;
 		FIELD comp_1672 runningTasks Ljava/util/List;
 		METHOD <init> (Ljava/util/UUID;ILjava/lang/String;Ljava/lang/String;IFFLnet/minecraft/class_243;Ljava/lang/String;Lnet/minecraft/class_11;ZILjava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;)V
@@ -22,6 +23,7 @@ CLASS net/minecraft/class_8708 net/minecraft/network/packet/s2c/custom/DebugBrai
 		METHOD <init> (Lnet/minecraft/class_2540;)V
 			ARG 1 buf
 		METHOD comp_1660 entityId ()I
+		METHOD comp_1663 experience ()I
 		METHOD comp_1671 possibleActivities ()Ljava/util/List;
 		METHOD comp_1672 runningTasks ()Ljava/util/List;
 		METHOD method_23151 isPointOfInterest (Lnet/minecraft/class_2338;)Z

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

@@ -55,4 +55,4 @@ CLASS net/minecraft/class_3054 net/minecraft/server/command/ExperienceCommand
 			ARG 1 level
 		METHOD method_13343 (Lnet/minecraft/class_3222;Ljava/lang/Integer;)Z
 			ARG 0 player
-			ARG 1 xp
+			ARG 1 experience

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

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_3785 net/minecraft/structure/pool/StructurePool
 	FIELD field_16680 elements Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
-	FIELD field_16864 elementCounts Ljava/util/List;
+	FIELD field_16864 elementWeights Ljava/util/List;
 	FIELD field_18707 highestY I
 	FIELD field_24954 REGISTRY_CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_25853 CODEC Lcom/mojang/serialization/Codec;
@@ -9,10 +9,10 @@ CLASS net/minecraft/class_3785 net/minecraft/structure/pool/StructurePool
 	FIELD field_40926 fallback Lnet/minecraft/class_6880;
 	METHOD <init> (Lnet/minecraft/class_6880;Ljava/util/List;)V
 		ARG 1 fallback
-		ARG 2 elementCounts
+		ARG 2 elementWeights
 	METHOD <init> (Lnet/minecraft/class_6880;Ljava/util/List;Lnet/minecraft/class_3785$class_3786;)V
 		ARG 1 fallback
-		ARG 2 elementCountsByGetters
+		ARG 2 elementWeightsByGetters
 		ARG 3 projection
 	METHOD method_16631 getRandomElement (Lnet/minecraft/class_5819;)Lnet/minecraft/class_3784;
 		ARG 1 random

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

@@ -51,13 +51,11 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe
 		ARG 2 key
 	CLASS class_4181 ShapedPoolStructurePiece
 		FIELD comp_2018 pieceShape Lorg/apache/commons/lang3/mutable/MutableObject;
-		FIELD comp_2019 currentSize I
 		METHOD <init> (Lnet/minecraft/class_3790;Lorg/apache/commons/lang3/mutable/MutableObject;I)V
 			ARG 1 piece
 			ARG 2 pieceShape
 			ARG 3 currentSize
 		METHOD comp_2018 pieceShape ()Lorg/apache/commons/lang3/mutable/MutableObject;
-		METHOD comp_2019 currentSize ()I
 	CLASS class_4182 StructurePoolGenerator
 		FIELD field_18700 maxSize I
 		FIELD field_18702 chunkGenerator Lnet/minecraft/class_2794;
@@ -78,7 +76,7 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe
 		METHOD method_19306 generatePiece (Lnet/minecraft/class_3790;Lorg/apache/commons/lang3/mutable/MutableObject;IZLnet/minecraft/class_5539;Lnet/minecraft/class_7138;Lnet/minecraft/class_8891;Lnet/minecraft/class_9822;)V
 			ARG 1 piece
 			ARG 2 pieceShape
-			ARG 3 minY
+			ARG 3 depth
 			ARG 4 modifyBoundingBox
 			ARG 5 world
 			ARG 6 noiseConfig

mappings/net/minecraft/village/TradeOffers.mapping

@@ -4,15 +4,15 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers
 	FIELD field_30615 DEFAULT_MAX_USES I
 	FIELD field_30616 COMMON_MAX_USES I
 	FIELD field_30617 RARE_MAX_USES I
-	FIELD field_30618 NOVICE_SELL_XP I
-	FIELD field_30619 NOVICE_BUY_XP I
-	FIELD field_30620 APPRENTICE_SELL_XP I
-	FIELD field_30621 APPRENTICE_BUY_XP I
-	FIELD field_30622 JOURNEYMAN_SELL_XP I
-	FIELD field_30623 JOURNEYMAN_BUY_XP I
-	FIELD field_30624 EXPERT_SELL_XP I
-	FIELD field_30625 EXPERT_BUY_XP I
-	FIELD field_30626 MASTER_TRADE_XP I
+	FIELD field_30618 NOVICE_SELL_EXPERIENCE I
+	FIELD field_30619 NOVICE_BUY_EXPERIENCE I
+	FIELD field_30620 APPRENTICE_SELL_EXPERIENCE I
+	FIELD field_30621 APPRENTICE_BUY_EXPERIENCE I
+	FIELD field_30622 JOURNEYMAN_SELL_EXPERIENCE I
+	FIELD field_30623 JOURNEYMAN_BUY_EXPERIENCE I
+	FIELD field_30624 EXPERT_SELL_EXPERIENCE I
+	FIELD field_30625 EXPERT_BUY_EXPERIENCE I
+	FIELD field_30626 MASTER_TRADE_EXPERIENCE I
 	FIELD field_30627 LOW_PRICE_MULTIPLIER F
 	FIELD field_30628 HIGH_PRICE_MULTIPLIER F
 	FIELD field_45128 REBALANCED_PROFESSION_TO_LEVELED_TRADE Ljava/util/Map;