1.21-pre1 stuff (FabricMC#3884)

Still lots to do, but I'm going to bed now :)

mappings/net/minecraft/block/EndGatewayBlock.mapping

@@ -1,3 +1,5 @@
 CLASS net/minecraft/class_2329 net/minecraft/block/EndGatewayBlock
 	FIELD field_46343 CODEC Lcom/mojang/serialization/MapCodec;
 	FIELD field_52058 LOGGER Lorg/slf4j/Logger;
+	METHOD method_60989 getTeleportVelocity (Lnet/minecraft/class_1297;)Lnet/minecraft/class_243;
+		ARG 0 entity

mappings/net/minecraft/block/NetherPortalBlock.mapping

@@ -20,10 +20,16 @@ CLASS net/minecraft/class_2423 net/minecraft/block/NetherPortalBlock
 		ARG 5 velocity
 		ARG 6 yaw
 		ARG 7 pitch
+		ARG 8 postDimensionTransition
 	METHOD method_60775 (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Z
 		ARG 2 posx
 	METHOD method_60777 getExitPortalTarget (Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;Lnet/minecraft/class_5459$class_5460;Lnet/minecraft/class_3218;Lnet/minecraft/class_5454$class_9823;)Lnet/minecraft/class_5454;
 		ARG 0 entity
 		ARG 1 pos
 		ARG 2 exitPortalRectangle
 		ARG 3 world
+		ARG 4 postDimensionTransition
+	METHOD method_60990 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Z
+		ARG 2 posx
+	METHOD method_60991 (Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)V
+		ARG 1 entity

mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping

@@ -25,3 +25,4 @@ CLASS net/minecraft/class_2619 net/minecraft/block/entity/JukeboxBlockEntity
 	METHOD method_60784 getManager ()Lnet/minecraft/class_9794;
 	METHOD method_60785 onManagerChange ()V
 	METHOD method_60786 reloadDisc ()V
+	METHOD method_60992 getComparatorOutput ()I

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

@@ -190,6 +190,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 		ARG 6 width
 		ARG 7 height
 	METHOD method_59840 clearTooltip ()V
+	METHOD method_61039 (Ljava/net/URI;Z)V
+		ARG 2 confirmed
 	CLASS class_6390 SelectedElementNarrationData
 		FIELD field_33825 selectable Lnet/minecraft/class_6379;
 		FIELD field_33826 index I

mappings/net/minecraft/client/render/RenderLayer.mapping

@@ -249,6 +249,8 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer
 	METHOD method_60894 isTranslucent ()Z
 	METHOD method_60895 draw (Lnet/minecraft/class_9801;)V
 		ARG 1 buffer
+	METHOD method_61045 getDebugStructureQuads ()Lnet/minecraft/class_1921;
+	METHOD method_61046 getDragonRays ()Lnet/minecraft/class_1921;
 	CLASS class_4687 MultiPhase
 		FIELD field_21403 phases Lnet/minecraft/class_1921$class_4688;
 		FIELD field_21697 affectedOutline Ljava/util/Optional;

mappings/net/minecraft/client/render/WorldRenderer.mapping

@@ -412,6 +412,20 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 		ARG 2 jukeboxPos
 	METHOD method_60892 stopJukeboxSong (Lnet/minecraft/class_2338;)V
 		ARG 1 jukeboxPos
+	METHOD method_61044 renderFilledBoxFace (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_2350;FFFFFFFFFF)V
+		ARG 0 matrices
+		ARG 1 vertexConsumer
+		ARG 2 face
+		ARG 3 minX
+		ARG 4 minY
+		ARG 5 minZ
+		ARG 6 maxX
+		ARG 7 maxY
+		ARG 8 maxZ
+		ARG 9 red
+		ARG 10 green
+		ARG 11 blue
+		ARG 12 alpha
 	METHOD method_8563 addParticle (Lnet/minecraft/class_2394;ZZDDDDDD)V
 		ARG 1 parameters
 		ARG 2 shouldAlwaysSpawn

mappings/net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer.mapping

@@ -2,3 +2,15 @@ CLASS net/minecraft/class_838 net/minecraft/client/render/block/entity/Structure
 	METHOD <init> (Lnet/minecraft/class_5614$class_5615;)V
 		ARG 1 ctx
 	METHOD method_3585 renderInvisibleBlocks (Lnet/minecraft/class_2633;Lnet/minecraft/class_4597;Lnet/minecraft/class_4587;)V
+		ARG 1 entity
+		ARG 2 vertexConsumers
+		ARG 3 matrices
+	METHOD method_61047 (Lnet/minecraft/class_2633;Lnet/minecraft/class_4588;Lnet/minecraft/class_4587;)V
+		ARG 1 entity
+		ARG 2 vertexConsumer
+		ARG 3 matrices
+	METHOD method_61048 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_2350;III)V
+		ARG 4 direction
+		ARG 5 x
+		ARG 6 y
+		ARG 7 z

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

@@ -47,3 +47,21 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer
 		ARG 6 light
 	METHOD method_55831 getShadowRadius (Lnet/minecraft/class_1297;)F
 		ARG 1 entity
+	METHOD method_61049 renderLeash (Lnet/minecraft/class_1297;FLnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1297;)V
+		ARG 1 entity
+		ARG 2 tickDelta
+		ARG 3 matrices
+		ARG 4 vertexConsumers
+		ARG 5 leashHolder
+	METHOD method_61050 renderLeashSegment (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;FFFIIIIFFFFIZ)V
+		ARG 0 vertexConsumer
+		ARG 1 matrix
+		ARG 2 leashedEntityX
+		ARG 3 leashedEntityY
+		ARG 4 leashedEntityZ
+		ARG 5 leashedEntityBlockLight
+		ARG 6 leashHolderBlockLight
+		ARG 7 leashedEntitySkyLight
+		ARG 8 leashHolderSkyLight
+		ARG 13 segmentIndex
+		ARG 14 isLeashKnot

mappings/net/minecraft/client/util/ModelIdentifier.mapping

@@ -1,12 +1,13 @@
 CLASS net/minecraft/class_1091 net/minecraft/client/util/ModelIdentifier
-	FIELD comp_2876 variant Ljava/lang/String;
+	FIELD field_52277 INVENTORY_VARIANT Ljava/lang/String;
 	METHOD <init> (Lnet/minecraft/class_2960;Ljava/lang/String;)V
 		ARG 1 id
 		ARG 2 variant
-	METHOD comp_2876 variant ()Ljava/lang/String;
 	METHOD method_45910 ofVanilla (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_1091;
 		ARG 0 path
 		ARG 1 variant
 	METHOD method_45911 toLowerCase (Ljava/lang/String;)Ljava/lang/String;
 		ARG 0 string
 	METHOD method_4740 getVariant ()Ljava/lang/String;
+	METHOD method_61078 ofInventoryVariant (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1091;
+		ARG 0 id

mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping

@@ -40,3 +40,4 @@ CLASS net/minecraft/class_9285 net/minecraft/component/type/AttributeModifiersCo
 			ARG 0 instance
 		METHOD method_60767 matches (Lnet/minecraft/class_6880;Lnet/minecraft/class_2960;)Z
 			ARG 1 attribute
+			ARG 2 modifierId

mappings/net/minecraft/data/report/PacketReportProvider.mapping

@@ -0,0 +1,4 @@
+CLASS net/minecraft/class_9827 net/minecraft/data/report/PacketReportProvider
+	FIELD field_52278 output Lnet/minecraft/class_7784;
+	METHOD <init> (Lnet/minecraft/class_7784;)V
+		ARG 1 output

mappings/net/minecraft/enchantment/EnchantmentHelper.mapping

@@ -79,6 +79,8 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper
 		ARG 4 enchantment
 		ARG 5 level
 	METHOD method_60123 getTridentSpinAttackStrength (Lnet/minecraft/class_1799;Lnet/minecraft/class_1309;)F
+		ARG 0 stack
+		ARG 1 user
 	METHOD method_60124 onHitBlock (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;Lnet/minecraft/class_1304;Lnet/minecraft/class_243;Lnet/minecraft/class_2680;Ljava/util/function/Consumer;)V
 		ARG 0 world
 		ARG 1 stack
@@ -199,6 +201,9 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper
 		ARG 1 stack
 		ARG 2 user
 	METHOD method_60159 getCrossbowChargeTime (Lnet/minecraft/class_1799;Lnet/minecraft/class_1309;F)F
+		ARG 0 stack
+		ARG 1 user
+		ARG 2 baseCrossbowChargeTime
 	METHOD method_60160 getSmashDamagePerFallenBlock (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;F)F
 		ARG 0 world
 		ARG 1 stack

mappings/net/minecraft/enchantment/EnchantmentLevelBasedValueType.mapping

@@ -23,6 +23,9 @@ CLASS net/minecraft/class_9704 net/minecraft/enchantment/EnchantmentLevelBasedVa
 		ARG 0 base
 	METHOD method_60195 (Lnet/minecraft/class_9704;)Lnet/minecraft/class_9704;
 		ARG 0 type
+	METHOD method_60987 lookup (Ljava/util/List;Lnet/minecraft/class_9704;)Lnet/minecraft/class_9704$class_9819;
+		ARG 0 values
+		ARG 1 fallback
 	CLASS class_9705 Clamped
 		FIELD field_51691 CODEC Lcom/mojang/serialization/MapCodec;
 		METHOD method_60196 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
@@ -46,3 +49,7 @@ CLASS net/minecraft/class_9704 net/minecraft/enchantment/EnchantmentLevelBasedVa
 		FIELD field_51696 CODEC Lcom/mojang/serialization/MapCodec;
 		METHOD method_60202 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 			ARG 0 instance
+	CLASS class_9819 Lookup
+		FIELD field_52226 CODEC Lcom/mojang/serialization/MapCodec;
+		METHOD method_60988 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+			ARG 0 instance

mappings/net/minecraft/entity/Entity.mapping

@@ -219,7 +219,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 2 world
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
-	METHOD method_14245 moveToSpawn (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;
+	METHOD method_14245 getWorldSpawnPos (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;
+		ARG 1 world
+		ARG 2 basePos
 	METHOD method_17681 getWidth ()F
 		COMMENT {@return the width of the entity's current dimension}
 	METHOD method_17682 getHeight ()F
@@ -231,6 +233,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT
 		COMMENT @apiNote Subclasses should return {@code new EntitySpawnS2CPacket(this)},
 		COMMENT unless they use a custom spawning packet.
+		ARG 1 entityTrackerEntry
 	METHOD method_18276 isInSneakingPose ()Z
 		COMMENT {@return whether the entity is in a crouching pose}
 		COMMENT
@@ -2251,6 +2254,10 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 1 portal
 		ARG 2 pos
 	METHOD method_60698 tickPortalTeleportation ()V
+	METHOD method_60950 addPortalChunkTicketAt (Lnet/minecraft/class_2338;)V
+		ARG 1 pos
+	METHOD method_60951 lerpYaw (F)F
+		ARG 1 delta
 	METHOD method_7325 isSpectator ()Z
 		COMMENT {@return whether the entity is a spectator}
 		COMMENT

mappings/net/minecraft/entity/Leashable.mapping

@@ -0,0 +1,58 @@
+CLASS net/minecraft/class_9817 net/minecraft/entity/Leashable
+	FIELD field_52216 LEASH_NBT_KEY Ljava/lang/String;
+	METHOD method_5931 canBeLeashed ()Z
+	METHOD method_5932 detachLeash (ZZ)V
+		ARG 1 sendPacket
+		ARG 2 dropItem
+	METHOD method_60952 getLeashHolder ()Lnet/minecraft/class_1297;
+	METHOD method_60953 isLeashed ()Z
+	METHOD method_60954 mightBeLeashed ()Z
+	METHOD method_60955 getLeashData ()Lnet/minecraft/class_9817$class_9818;
+	METHOD method_60956 shouldTickLeash (Lnet/minecraft/class_1297;F)Z
+		ARG 1 leashHolder
+		ARG 2 distance
+	METHOD method_60957 attachLeash (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;Z)V
+		ARG 0 entity
+		ARG 1 leashHolder
+		ARG 2 sendPacket
+	METHOD method_60958 resolveLeashData (Lnet/minecraft/class_1297;Lnet/minecraft/class_9817$class_9818;)V
+		ARG 0 entity
+		ARG 1 leashData
+	METHOD method_60959 detachLeash (Lnet/minecraft/class_1297;ZZ)V
+		ARG 0 entity
+		ARG 1 sendPacket
+		ARG 2 dropItem
+	METHOD method_60960 setLeashData (Lnet/minecraft/class_9817$class_9818;)V
+		ARG 1 leashData
+	METHOD method_60961 (Ljava/util/UUID;)Lnet/minecraft/class_2520;
+		ARG 0 uuid
+	METHOD method_60962 writeLeashDataToNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_9817$class_9818;)V
+		ARG 1 nbt
+		ARG 2 leashData
+	METHOD method_60963 onShortLeashTick (Lnet/minecraft/class_1297;)V
+		ARG 1 entity
+	METHOD method_60964 attachLeash (Lnet/minecraft/class_1297;Z)V
+		ARG 1 leashHolder
+		ARG 2 sendPacket
+	METHOD method_60965 tickLeash (Lnet/minecraft/class_1297;)V
+		ARG 0 entity
+	METHOD method_60966 getLeashHolder (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297;
+		ARG 0 entity
+	METHOD method_60967 readLeashDataFromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_9817$class_9818;
+		ARG 1 nbt
+	METHOD method_60968 setUnresolvedLeashHolderId (I)V
+		ARG 1 unresolvedLeashHolderId
+	METHOD method_60969 canLeashAttachTo ()Z
+	METHOD method_60970 detachLeash ()V
+	CLASS class_9818 LeashData
+		FIELD field_52217 leashHolder Lnet/minecraft/class_1297;
+		FIELD field_52218 unresolvedLeashData Lcom/mojang/datafixers/util/Either;
+		FIELD field_52219 unresolvedLeashHolderId I
+		METHOD <init> (I)V
+			ARG 1 unresolvedLeashHolderId
+		METHOD <init> (Lcom/mojang/datafixers/util/Either;)V
+			ARG 1 unresolvedLeashData
+		METHOD <init> (Lnet/minecraft/class_1297;)V
+			ARG 1 leashHolder
+		METHOD method_60971 setLeashHolder (Lnet/minecraft/class_1297;)V
+			ARG 1 leashHolder

mappings/net/minecraft/entity/Saddleable.mapping

@@ -3,5 +3,7 @@ CLASS net/minecraft/class_5146 net/minecraft/entity/Saddleable
 	COMMENT dispenser.
 	METHOD method_45328 getSaddleSound ()Lnet/minecraft/class_3414;
 	METHOD method_6576 saddle (Lnet/minecraft/class_1799;Lnet/minecraft/class_3419;)V
+		ARG 1 stack
+		ARG 2 soundCategory
 	METHOD method_6725 isSaddled ()Z
 	METHOD method_6765 canBeSaddled ()Z

mappings/net/minecraft/entity/TrackedPosition.mapping

@@ -19,3 +19,4 @@ CLASS net/minecraft/class_7422 net/minecraft/entity/TrackedPosition
 		ARG 1 pos
 	METHOD method_43494 setPos (Lnet/minecraft/class_243;)V
 		ARG 1 pos
+	METHOD method_60933 getPos ()Lnet/minecraft/class_243;

mappings/net/minecraft/entity/damage/DamageSource.mapping

@@ -37,3 +37,4 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource
 	METHOD method_5529 getAttacker ()Lnet/minecraft/class_1297;
 	METHOD method_5530 isSourceCreativePlayer ()Z
 	METHOD method_60489 isDirect ()Z
+	METHOD method_60948 getWeaponStack ()Lnet/minecraft/class_1799;

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

@@ -30,6 +30,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 	FIELD field_48828 bodyArmorDropChance F
 	FIELD field_48829 bodyArmor Lnet/minecraft/class_1799;
 	FIELD field_51997 RANDOM_SPAWN_BONUS_MODIFIER_ID Lnet/minecraft/class_2960;
+	FIELD field_52221 leashData Lnet/minecraft/class_9817$class_9818;
 	FIELD field_6184 lootTableSeed J
 	FIELD field_6185 targetSelector Lnet/minecraft/class_1355;
 		COMMENT Contains goals used to select this entity's target.

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

@@ -78,6 +78,8 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity
 		ARG 0 stack
 	METHOD method_6001 initAttributes (Lnet/minecraft/class_5819;)V
 		ARG 1 random
+	METHOD method_60977 getInventorySize (I)I
+		ARG 0 columns
 	METHOD method_6702 getInventoryColumns ()I
 	METHOD method_6721 onChestedStatusChanged ()V
 	METHOD method_6723 playJumpSound ()V

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

@@ -8,3 +8,4 @@ CLASS net/minecraft/class_9236 net/minecraft/entity/projectile/AbstractWindCharg
 		ARG 6 y
 		ARG 8 z
 	METHOD method_55055 createExplosion (Lnet/minecraft/class_243;)V
+		ARG 1 pos

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

@@ -5,3 +5,6 @@ CLASS net/minecraft/class_1684 net/minecraft/entity/projectile/thrown/EnderPearl
 	METHOD method_60729 playTeleportSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;)V
 		ARG 1 world
 		ARG 2 pos
+	METHOD method_60985 canTeleportEntityTo (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;)Z
+		ARG 0 entity
+		ARG 1 world

mappings/net/minecraft/entity/vehicle/BoatEntity.mapping

@@ -2,6 +2,7 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity
 	FIELD field_30696 NEXT_PADDLE_PHASE F
 	FIELD field_30699 EMIT_SOUND_EVENT_PADDLE_ROTATION D
 		COMMENT A boat will emit a sound event every time a paddle is near this rotation.
+	FIELD field_52225 leashData Lnet/minecraft/class_9817$class_9818;
 	FIELD field_7684 boatPitch D
 	FIELD field_7685 z D
 	FIELD field_7686 x D

mappings/net/minecraft/item/CrossbowItem.mapping

@@ -33,6 +33,8 @@ CLASS net/minecraft/class_1764 net/minecraft/item/CrossbowItem
 		ARG 1 stack
 		ARG 2 user
 	METHOD method_7775 getPullTime (Lnet/minecraft/class_1799;Lnet/minecraft/class_1309;)I
+		ARG 0 stack
+		ARG 1 user
 	METHOD method_7777 shootAll (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;FFLnet/minecraft/class_1309;)V
 		ARG 1 world
 		ARG 2 shooter

mappings/net/minecraft/item/LeadItem.mapping

@@ -1,4 +1,6 @@
 CLASS net/minecraft/class_1804 net/minecraft/item/LeadItem
+	METHOD method_55761 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;)Z
+		ARG 1 entity
 	METHOD method_7994 attachHeldMobsToBlock (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1269;
 		ARG 0 player
 		ARG 1 world

mappings/net/minecraft/item/RangedWeaponItem.mapping

@@ -31,6 +31,8 @@ CLASS net/minecraft/class_1811 net/minecraft/item/RangedWeaponItem
 	METHOD method_57393 shootAll (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Ljava/util/List;FFZLnet/minecraft/class_1309;)V
 		ARG 1 world
 		ARG 2 shooter
+		ARG 3 hand
+		ARG 4 stack
 		ARG 5 projectiles
 		ARG 6 speed
 		ARG 7 divergence

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

@@ -35,6 +35,11 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn
 		ARG 3 pos
 	METHOD <init> (Lnet/minecraft/class_1297;Lnet/minecraft/class_3231;)V
 		ARG 1 entity
+		ARG 2 entityTrackerEntry
+	METHOD <init> (Lnet/minecraft/class_1297;Lnet/minecraft/class_3231;I)V
+		ARG 1 entity
+		ARG 2 entityTrackerEntry
+		ARG 3 entityData
 	METHOD <init> (Lnet/minecraft/class_9129;)V
 		ARG 1 buf
 	METHOD method_11164 getUuid ()Ljava/util/UUID;

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

@@ -1,16 +1,16 @@
 CLASS net/minecraft/class_2648 net/minecraft/network/packet/s2c/play/OpenHorseScreenS2CPacket
 	FIELD field_12142 horseId I
-	FIELD field_12143 slotCount I
+	FIELD field_12143 slotColumnCount I
 	FIELD field_12144 syncId I
 	FIELD field_47928 CODEC Lnet/minecraft/class_9139;
 	METHOD <init> (III)V
 		ARG 1 syncId
-		ARG 2 slotCount
+		ARG 2 slotColumnCount
 		ARG 3 horseId
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
 	METHOD method_11432 getSyncId ()I
 	METHOD method_11433 getHorseId ()I
-	METHOD method_11434 getSlotCount ()I
+	METHOD method_11434 getSlotColumnCount ()I
 	METHOD method_55880 write (Lnet/minecraft/class_2540;)V
 		ARG 1 buf