24w36a stuff (#3977)

* 24w36a stuff * Added stuff from #3975 Co-Authored-By: apple502j <[email protected]> * factory * some more * move --------- Co-authored-by: apple502j <[email protected]>
FabricMC · Sep 5, 2024 · 90bde64 · 90bde64
1 parent eed36e6
commit 90bde64
Show file tree

Hide file tree

Showing 103 changed files with 1,393 additions and 39 deletions.
diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping
@@ -384,6 +384,10 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		ARG 4 player
 		ARG 5 hit
 	METHOD method_63499 getTranslationKey ()Ljava/lang/String;
+	METHOD method_64022 getInsideCollisionShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265;
+		ARG 1 state
+		ARG 2 world
+		ARG 3 pos
 	METHOD method_8389 asItem ()Lnet/minecraft/class_1792;
 		COMMENT {@return the block's corresponding item}
 		COMMENT
@@ -1330,6 +1334,9 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 			ARG 0 direction
 		METHOD method_61766 ([Lnet/minecraft/class_265;)V
 			ARG 0 direction
+		METHOD method_64025 getInsideCollisionShape (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265;
+			ARG 1 world
+			ARG 2 pos
 		CLASS class_3752 ShapeCache
 			FIELD field_16559 DIRECTIONS [Lnet/minecraft/class_2350;
 			FIELD field_17651 exceedsCube Z

diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping
@@ -218,7 +218,7 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks
 		ARG 1 settings
 	METHOD method_63053 register (Lnet/minecraft/class_5321;Ljava/util/function/Function;Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248;
 		ARG 0 key
-		ARG 1 blockFromSettings
+		ARG 1 factory
 		ARG 2 settings
 	METHOD method_63054 (Lnet/minecraft/class_1767;Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248;
 		ARG 1 settings
@@ -245,7 +245,7 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks
 		ARG 0 id
 	METHOD method_63064 register (Ljava/lang/String;Ljava/util/function/Function;Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248;
 		ARG 0 id
-		ARG 1 blockFromSettings
+		ARG 1 factory
 		ARG 2 settings
 	METHOD method_63065 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248;
 		ARG 0 settings

diff --git a/mappings/net/minecraft/block/DispenserBlock.mapping b/mappings/net/minecraft/block/DispenserBlock.mapping
@@ -24,3 +24,5 @@ CLASS net/minecraft/class_2315 net/minecraft/block/DispenserBlock
 		ARG 0 projectile
 	METHOD method_58682 getOutputLocation (Lnet/minecraft/class_2342;)Lnet/minecraft/class_2374;
 		ARG 0 pointer
+	METHOD method_64021 getBehaviorForItem (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2357;
+		ARG 0 stack
diff --git a/mappings/net/minecraft/block/TripwireBlock.mapping b/mappings/net/minecraft/block/TripwireBlock.mapping
@@ -25,7 +25,11 @@ CLASS net/minecraft/class_2538 net/minecraft/block/TripwireBlock
 	METHOD method_10780 updatePowered (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/List;)V
 		ARG 1 world
 		ARG 2 pos
+		ARG 3 entities
 	METHOD method_54060 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_54061 (Lnet/minecraft/class_2538;)Lnet/minecraft/class_2248;
 		ARG 0 block
+	METHOD method_64024 updatePowered (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
+		ARG 1 world
+		ARG 2 pos
diff --git a/mappings/net/minecraft/block/dispenser/EquippableDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/EquippableDispenserBehavior.mapping
@@ -0,0 +1,7 @@
+CLASS net/minecraft/class_10205 net/minecraft/block/dispenser/EquippableDispenserBehavior
+	FIELD field_54201 INSTANCE Lnet/minecraft/class_10205;
+	METHOD method_64105 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1309;)Z
+		ARG 1 entity
+	METHOD method_64106 dispense (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;)Z
+		ARG 0 pointer
+		ARG 1 stack
diff --git a/mappings/net/minecraft/client/gui/DrawContext.mapping b/mappings/net/minecraft/client/gui/DrawContext.mapping
@@ -259,6 +259,7 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext
 		ARG 3 x
 		ARG 4 y
 		ARG 5 positioner
+		ARG 6 texture
 	METHOD method_51436 drawTooltip (Lnet/minecraft/class_327;Ljava/util/List;Lnet/minecraft/class_8000;II)V
 		ARG 1 textRenderer
 		ARG 2 text
@@ -271,6 +272,7 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext
 		ARG 3 data
 		ARG 4 x
 		ARG 5 y
+		ARG 6 texture
 	METHOD method_51438 drawTooltip (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;II)V
 		ARG 1 textRenderer
 		ARG 2 text
@@ -447,6 +449,18 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext
 		ARG 4 y
 		ARG 5 width
 		ARG 6 color
+	METHOD method_64037 drawTooltip (Lnet/minecraft/class_327;Ljava/util/List;IILnet/minecraft/class_2960;)V
+		ARG 1 textRenderer
+		ARG 2 text
+		ARG 3 x
+		ARG 4 y
+		ARG 5 texture
+	METHOD method_64038 drawTooltip (Lnet/minecraft/class_327;Ljava/util/List;Ljava/util/Optional;II)V
+		ARG 1 textRenderer
+		ARG 2 text
+		ARG 3 data
+		ARG 4 x
+		ARG 5 y
 	CLASS class_8214 ScissorStack
 		FIELD field_43099 stack Ljava/util/Deque;
 		METHOD method_49699 pop ()Lnet/minecraft/class_8030;

diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping
@@ -19,3 +19,4 @@ CLASS net/minecraft/class_514 net/minecraft/client/gui/screen/recipebook/Animate
 	METHOD method_2644 getTooltip ()Ljava/util/List;
 	METHOD method_2645 getResultCollection ()Lnet/minecraft/class_516;
 	METHOD method_62048 hasMultipleResults ()Z
+	METHOD method_64053 getCurrentResult ()Lnet/minecraft/class_1799;
diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping
@@ -25,6 +25,7 @@ CLASS net/minecraft/class_513 net/minecraft/client/gui/screen/recipebook/RecipeB
 		ARG 2 resetCurrentPage
 		ARG 3 filteringCraftable
 	METHOD method_2628 drawTooltip (Lnet/minecraft/class_332;II)V
+		ARG 1 context
 		ARG 2 x
 		ARG 3 y
 	METHOD method_2629 onRecipesDisplayed (Ljava/util/List;)V

diff --git a/mappings/net/minecraft/client/gui/tooltip/TooltipBackgroundRenderer.mapping b/mappings/net/minecraft/client/gui/tooltip/TooltipBackgroundRenderer.mapping
@@ -1,9 +1,20 @@
 CLASS net/minecraft/class_8002 net/minecraft/client/gui/tooltip/TooltipBackgroundRenderer
 	COMMENT A class for rendering a background box for a tooltip.
+	FIELD field_54151 DEFAULT_BACKGROUND_TEXTURE Lnet/minecraft/class_2960;
+	FIELD field_54152 DEFAULT_FRAME_TEXTURE Lnet/minecraft/class_2960;
 	METHOD method_47946 render (Lnet/minecraft/class_332;IIIIILnet/minecraft/class_2960;)V
 		ARG 0 context
 		ARG 1 x
 		ARG 2 y
 		ARG 3 width
 		ARG 4 height
 		ARG 5 z
+		ARG 6 texture
+	METHOD method_64049 getBackgroundTexture (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960;
+		ARG 0 texture
+	METHOD method_64050 (Ljava/lang/String;)Ljava/lang/String;
+		ARG 0 name
+	METHOD method_64051 getFrameTexture (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960;
+		ARG 0 texture
+	METHOD method_64052 (Ljava/lang/String;)Ljava/lang/String;
+		ARG 0 name
diff --git a/mappings/net/minecraft/client/input/Input.mapping b/mappings/net/minecraft/client/input/Input.mapping
@@ -1,6 +1,7 @@
 CLASS net/minecraft/class_744 net/minecraft/client/input/Input
 	FIELD field_3905 movementForward F
 	FIELD field_3907 movementSideways F
+	FIELD field_54155 playerInput Lnet/minecraft/class_10185;
 	METHOD method_20622 hasForwardMovement ()Z
 	METHOD method_3128 getMovementInput ()Lnet/minecraft/class_241;
 	METHOD method_3129 tick (ZF)V

diff --git a/mappings/net/minecraft/client/model/ModelPart.mapping b/mappings/net/minecraft/client/model/ModelPart.mapping
@@ -76,6 +76,8 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart
 	METHOD method_41923 resetTransform ()V
 	METHOD method_41924 scale (Lorg/joml/Vector3f;)V
 		ARG 1 vec3f
+	METHOD method_62132 rotate (Lorg/joml/Quaternionf;)V
+		ARG 1 quaternion
 	CLASS class_593 Quad
 		FIELD comp_3184 vertices [Lnet/minecraft/class_630$class_618;
 		FIELD comp_3185 direction Lorg/joml/Vector3f;

diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
@@ -148,6 +148,12 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 	METHOD method_60347 getSearchManager ()Lnet/minecraft/class_1124;
 	METHOD method_60885 getServerLinks ()Lnet/minecraft/class_9782;
 	METHOD method_62147 getFuelRegistry ()Lnet/minecraft/class_9895;
+	METHOD method_62148 startTagReload (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)Lnet/minecraft/class_2378$class_10106;
+		ARG 1 registryRef
+		ARG 2 serialized
 	METHOD method_62149 syncOptions (Lnet/minecraft/class_8791;)V
 		ARG 1 syncedOptions
+	METHOD method_62150 (ZLjava/util/List;Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V
+		ARG 3 registryRef
+		ARG 4 serialized
 	METHOD method_62151 fetchProfileKey ()V
diff --git a/mappings/net/minecraft/client/network/ClientRegistries.mapping b/mappings/net/minecraft/client/network/ClientRegistries.mapping
@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_9173 net/minecraft/client/network/ClientRegistries
 	FIELD field_48767 dynamicRegistries Lnet/minecraft/class_9173$class_9174;
-	FIELD field_48768 tagLoader Lnet/minecraft/class_9173$class_9954;
+	FIELD field_48768 tags Lnet/minecraft/class_9173$class_9954;
 	METHOD method_56583 putDynamicRegistry (Lnet/minecraft/class_5321;Ljava/util/List;)V
 		ARG 1 registryRef
 		ARG 2 entries
@@ -15,3 +15,10 @@ CLASS net/minecraft/class_9173 net/minecraft/client/network/ClientRegistries
 		METHOD method_56588 put (Lnet/minecraft/class_5321;Ljava/util/List;)V
 			ARG 1 registryRef
 			ARG 2 entries
+	CLASS class_9954 Tags
+		FIELD field_53034 tags Ljava/util/Map;
+		METHOD method_62162 put (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V
+			ARG 1 registryRef
+			ARG 2 tags
+		METHOD method_62163 forEach (Ljava/util/function/BiConsumer;)V
+			ARG 1 consumer
diff --git a/mappings/net/minecraft/client/render/DimensionEffects.mapping b/mappings/net/minecraft/client/render/DimensionEffects.mapping
@@ -28,7 +28,7 @@ CLASS net/minecraft/class_5294 net/minecraft/client/render/DimensionEffects
 		ARG 0 map
 	METHOD method_29992 getSkyType ()Lnet/minecraft/class_5294$class_5401;
 	METHOD method_29993 isDarkened ()Z
-	METHOD method_62183 isSunHigh (F)Z
+	METHOD method_62183 isSunRisingOrSetting (F)Z
 		ARG 1 skyAngle
 	METHOD method_62184 getSkyColor (F)I
 		ARG 1 skyAngle

diff --git a/mappings/net/minecraft/client/render/SkyRendering.mapping b/mappings/net/minecraft/client/render/SkyRendering.mapping
@@ -21,7 +21,7 @@ CLASS net/minecraft/class_9975 net/minecraft/client/render/SkyRendering
 		ARG 4 matrices
 	METHOD method_62305 renderSkyDark (Lnet/minecraft/class_4587;)V
 		ARG 1 matrices
-	METHOD method_62306 (Lnet/minecraft/class_4587;Lnet/minecraft/class_289;FI)V
+	METHOD method_62306 renderGlowingSky (Lnet/minecraft/class_4587;Lnet/minecraft/class_289;FI)V
 		ARG 1 matrices
 		ARG 2 tesselator
 		ARG 3 angleRadians

diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping
@@ -254,18 +254,21 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 		ARG 2 frustum
 		ARG 3 output
 	METHOD method_62219 scheduleChunkRenders (IIIIII)V
-		ARG 1 xMin
-		ARG 2 yMin
-		ARG 3 zMin
-		ARG 4 xMax
-		ARG 5 yMax
-		ARG 6 zMax
+		ARG 1 minX
+		ARG 2 minY
+		ARG 3 minZ
+		ARG 4 maxX
+		ARG 5 maxY
+		ARG 6 maxZ
 	METHOD method_62220 getBuiltChunks ()Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
 	METHOD method_62221 getChunkRenderingDataPreparer ()Lnet/minecraft/class_8679;
 	METHOD method_62222 getCapturedFrustum ()Lnet/minecraft/class_4604;
 	METHOD method_62907 getTransparencyPostEffectProcessor ()Lnet/minecraft/class_279;
 	METHOD method_62908 onChunkUnload (J)V
 		ARG 1 sectionPos
+	METHOD method_62910 isLightingEnabledAround (Lnet/minecraft/class_3568;J)Z
+		ARG 0 lightingProvider
+		ARG 1 sectionPos
 	METHOD method_8563 addParticle (Lnet/minecraft/class_2394;ZZDDDDDD)V
 		ARG 1 parameters
 		ARG 2 shouldAlwaysSpawn

diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping
@@ -15,10 +15,18 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis
 	FIELD field_4689 textRenderer Lnet/minecraft/class_327;
 	FIELD field_4692 gameOptions Lnet/minecraft/class_315;
 	FIELD field_4696 renderers Ljava/util/Map;
+	FIELD field_53188 mapRenderer Lnet/minecraft/class_330;
+	FIELD field_54173 equipmentModelLoader Lnet/minecraft/class_10201;
 	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_1060;Lnet/minecraft/class_918;Lnet/minecraft/class_330;Lnet/minecraft/class_776;Lnet/minecraft/class_327;Lnet/minecraft/class_315;Lnet/minecraft/class_5599;Lnet/minecraft/class_10201;)V
 		ARG 1 client
 		ARG 2 textureManager
 		ARG 3 itemRenderer
+		ARG 4 mapRenderer
+		ARG 5 blockRenderManager
+		ARG 6 textRenderer
+		ARG 7 gameOptions
+		ARG 8 modelLoader
+		ARG 9 equipmentModelLoader
 	METHOD method_23161 drawFireVertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFF)V
 		ARG 0 entry
 		ARG 1 vertices

diff --git a/mappings/net/minecraft/client/render/entity/EntityRendererFactory.mapping b/mappings/net/minecraft/client/render/entity/EntityRendererFactory.mapping
@@ -9,13 +9,17 @@ CLASS net/minecraft/class_5617 net/minecraft/client/render/entity/EntityRenderer
 		FIELD field_27766 textRenderer Lnet/minecraft/class_327;
 		FIELD field_38888 blockRenderManager Lnet/minecraft/class_776;
 		FIELD field_53190 mapRenderer Lnet/minecraft/class_330;
+		FIELD field_54174 equipmentModelLoader Lnet/minecraft/class_10201;
+		FIELD field_54175 equipmentRenderer Lnet/minecraft/class_10197;
 		METHOD <init> (Lnet/minecraft/class_898;Lnet/minecraft/class_918;Lnet/minecraft/class_330;Lnet/minecraft/class_776;Lnet/minecraft/class_3300;Lnet/minecraft/class_5599;Lnet/minecraft/class_10201;Lnet/minecraft/class_327;)V
 			ARG 1 renderDispatcher
 			ARG 2 itemRenderer
 			ARG 3 mapRenderer
 			ARG 4 blockRenderManager
 			ARG 5 resourceManager
 			ARG 6 modelLoader
+			ARG 7 equipmentModelLoader
+			ARG 8 textRenderer
 		METHOD method_32166 getRenderDispatcher ()Lnet/minecraft/class_898;
 		METHOD method_32167 getPart (Lnet/minecraft/class_5601;)Lnet/minecraft/class_630;
 			ARG 1 layer
@@ -26,3 +30,5 @@ CLASS net/minecraft/class_5617 net/minecraft/client/render/entity/EntityRenderer
 		METHOD method_43337 getBlockRenderManager ()Lnet/minecraft/class_776;
 		METHOD method_48481 getModelManager ()Lnet/minecraft/class_1092;
 		METHOD method_62427 getMapRenderer ()Lnet/minecraft/class_330;
+		METHOD method_64071 getEquipmentModelLoader ()Lnet/minecraft/class_10201;
+		METHOD method_64072 getEquipmentRenderer ()Lnet/minecraft/class_10197;
diff --git a/mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping
@@ -8,6 +8,7 @@ CLASS net/minecraft/class_1007 net/minecraft/client/render/entity/PlayerEntityRe
 		ARG 3 light
 		ARG 4 skinTexture
 		ARG 5 arm
+		ARG 6 sleeveVisible
 	METHOD method_4210 getArmPose (Lnet/minecraft/class_10055;Lnet/minecraft/class_10055$class_10056;Lnet/minecraft/class_1268;)Lnet/minecraft/class_572$class_573;
 		ARG 0 state
 		ARG 1 handState
@@ -17,11 +18,13 @@ CLASS net/minecraft/class_1007 net/minecraft/client/render/entity/PlayerEntityRe
 		ARG 2 vertexConsumers
 		ARG 3 light
 		ARG 4 skinTexture
+		ARG 5 sleeveVisible
 	METHOD method_4221 renderLeftArm (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_2960;Z)V
 		ARG 1 matrices
 		ARG 2 vertexConsumers
 		ARG 3 light
 		ARG 4 skinTexture
+		ARG 5 sleeveVisible
 	METHOD method_62602 (Lnet/minecraft/class_1299;)Z
 		ARG 0 type
 	METHOD method_62603 updateHandState (Lnet/minecraft/class_742;Lnet/minecraft/class_10055$class_10056;Lnet/minecraft/class_1268;)V

diff --git a/mappings/net/minecraft/client/render/entity/SalmonEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/SalmonEntityRenderer.mapping
@@ -1,2 +1,5 @@
 CLASS net/minecraft/class_938 net/minecraft/client/render/entity/SalmonEntityRenderer
 	FIELD field_4767 TEXTURE Lnet/minecraft/class_2960;
+	FIELD field_53198 smallModel Lnet/minecraft/class_599;
+	FIELD field_53199 mediumModel Lnet/minecraft/class_599;
+	FIELD field_53200 largeModel Lnet/minecraft/class_599;
diff --git a/mappings/net/minecraft/client/render/entity/equipment/EquipmentModelLoader.mapping b/mappings/net/minecraft/client/render/entity/equipment/EquipmentModelLoader.mapping
@@ -0,0 +1,5 @@
+CLASS net/minecraft/class_10201 net/minecraft/client/render/entity/equipment/EquipmentModelLoader
+	FIELD field_54189 EMPTY Lnet/minecraft/class_10186;
+	FIELD field_54190 models Ljava/util/Map;
+	METHOD method_64087 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_10186;
+		ARG 1 id
diff --git a/mappings/net/minecraft/client/render/entity/equipment/EquipmentRenderer.mapping b/mappings/net/minecraft/client/render/entity/equipment/EquipmentRenderer.mapping
@@ -0,0 +1,35 @@
+CLASS net/minecraft/class_10197 net/minecraft/client/render/entity/equipment/EquipmentRenderer
+	FIELD field_54179 equipmentModelLoader Lnet/minecraft/class_10201;
+	FIELD field_54180 layerTextures Ljava/util/function/Function;
+	FIELD field_54181 trimSprites Ljava/util/function/Function;
+	METHOD <init> (Lnet/minecraft/class_10201;Lnet/minecraft/class_1059;)V
+		ARG 1 equipmentModelLoader
+		ARG 2 armorTrimsAtlas
+	METHOD method_64076 getDyeColor (Lnet/minecraft/class_10186$class_10189;I)I
+		ARG 0 layer
+		ARG 1 dyeColor
+	METHOD method_64077 render (Lnet/minecraft/class_10186$class_10190;Lnet/minecraft/class_2960;Lnet/minecraft/class_3879;Lnet/minecraft/class_1799;Ljava/util/function/Function;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V
+		ARG 1 layerType
+		ARG 2 modelId
+		ARG 3 model
+		ARG 4 stack
+		ARG 5 renderLayerFunction
+		ARG 6 matrices
+		ARG 7 vertexConsumers
+		ARG 8 light
+	METHOD method_64078 render (Lnet/minecraft/class_10186$class_10190;Lnet/minecraft/class_2960;Lnet/minecraft/class_3879;Lnet/minecraft/class_1799;Ljava/util/function/Function;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_2960;)V
+		ARG 1 layerType
+		ARG 2 modelId
+		ARG 3 model
+		ARG 4 stack
+		ARG 5 renderLayerFunction
+		ARG 6 matrices
+		ARG 7 vertexConsumers
+		ARG 8 light
+		ARG 9 texture
+	METHOD method_64079 (Lnet/minecraft/class_10197$class_10198;)Lnet/minecraft/class_2960;
+		ARG 0 key
+	METHOD method_64080 (Lnet/minecraft/class_1059;Lnet/minecraft/class_10197$class_10199;)Lnet/minecraft/class_1058;
+		ARG 1 key
+	CLASS class_10198 LayerTextureKey
+	CLASS class_10199 TrimSpriteKey
diff --git a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping
@@ -3,20 +3,24 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe
 	FIELD field_4831 outerModel Lnet/minecraft/class_572;
 	FIELD field_53218 babyInnerModel Lnet/minecraft/class_572;
 	FIELD field_53219 babyOuterModel Lnet/minecraft/class_572;
+	FIELD field_54183 equipmentRenderer Lnet/minecraft/class_10197;
 	METHOD <init> (Lnet/minecraft/class_3883;Lnet/minecraft/class_572;Lnet/minecraft/class_572;Lnet/minecraft/class_10197;)V
 		ARG 1 context
 		ARG 2 innerModel
 		ARG 3 outerModel
+		ARG 4 equipmentRenderer
 	METHOD <init> (Lnet/minecraft/class_3883;Lnet/minecraft/class_572;Lnet/minecraft/class_572;Lnet/minecraft/class_572;Lnet/minecraft/class_572;Lnet/minecraft/class_10197;)V
 		ARG 1 context
 		ARG 2 innerModel
 		ARG 3 outerModel
 		ARG 4 babyInnerModel
 		ARG 5 babyOuterModel
+		ARG 6 equipmentRenderer
 	METHOD method_4169 renderArmor (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_10034;Lnet/minecraft/class_1799;Lnet/minecraft/class_1304;ILnet/minecraft/class_572;)V
 		ARG 1 matrices
 		ARG 2 vertexConsumers
 		ARG 3 state
+		ARG 4 stack
 		ARG 5 slot
 		ARG 6 light
 		ARG 7 armorModel
@@ -28,3 +32,9 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe
 		ARG 2 slot
 	METHOD method_4173 usesInnerModel (Lnet/minecraft/class_1304;)Z
 		ARG 1 slot
+	METHOD method_64081 hasModel (Lnet/minecraft/class_1799;Lnet/minecraft/class_1304;)Z
+		ARG 0 stack
+		ARG 1 slot
+	METHOD method_64082 hasModel (Lnet/minecraft/class_10192;Lnet/minecraft/class_1304;)Z
+		ARG 0 component
+		ARG 1 slot
diff --git a/mappings/net/minecraft/client/render/entity/feature/ElytraFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ElytraFeatureRenderer.mapping
@@ -1,6 +1,10 @@
 CLASS net/minecraft/class_979 net/minecraft/client/render/entity/feature/ElytraFeatureRenderer
 	FIELD field_4852 model Lnet/minecraft/class_563;
 	FIELD field_53215 babyModel Lnet/minecraft/class_563;
+	FIELD field_54185 equipmentRenderer Lnet/minecraft/class_10197;
 	METHOD <init> (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_10197;)V
 		ARG 1 context
 		ARG 2 loader
+		ARG 3 equipmentRenderer
+	METHOD method_64084 getTexture (Lnet/minecraft/class_10034;)Lnet/minecraft/class_2960;
+		ARG 0 state
diff --git a/mappings/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.mapping
@@ -1,6 +1,8 @@
 CLASS net/minecraft/class_4073 net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer
 	FIELD field_53216 model Lnet/minecraft/class_9947;
 	FIELD field_53217 babyModel Lnet/minecraft/class_9947;
+	FIELD field_54182 equipmentRenderer Lnet/minecraft/class_10197;
 	METHOD <init> (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_10197;)V
 		ARG 1 context
 		ARG 2 loader
+		ARG 3 equipmentRenderer