FabricMC · Shnupbups · Oct 9, 2024 · Oct 8, 2024 · Oct 8, 2024 · Oct 8, 2024
diff --git a/mappings/net/minecraft/block/CreakingHeartBlock.mapping b/mappings/net/minecraft/block/CreakingHeartBlock.mapping
@@ -4,7 +4,7 @@ CLASS net/minecraft/class_10319 net/minecraft/block/CreakingHeartBlock
 	FIELD field_54740 CREAKING Lnet/minecraft/class_2754;
 	METHOD method_64782 isWorldNaturalAndNight (Lnet/minecraft/class_1937;)Z
 		ARG 0 world
-	METHOD method_64783 isSurroundedByLogs (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z
+	METHOD method_64783 isSurroundedByPaleOakLogs (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z
 		ARG 0 world
 		ARG 1 pos
 	METHOD method_64784 shouldBeEnabled (Lnet/minecraft/class_2680;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z

diff --git a/mappings/net/minecraft/block/RedstoneWireBlock.mapping b/mappings/net/minecraft/block/RedstoneWireBlock.mapping
@@ -54,6 +54,14 @@ CLASS net/minecraft/class_2457 net/minecraft/block/RedstoneWireBlock
 	METHOD method_27846 isFullyConnected (Lnet/minecraft/class_2680;)Z
 		ARG 0 state
 	METHOD method_27936 addPoweredParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;ILnet/minecraft/class_2350;Lnet/minecraft/class_2350;FF)V
+		ARG 0 world
+		ARG 1 random
+		ARG 2 pos
+		ARG 3 color
+		ARG 4 perpendicular
+		ARG 5 direction
+		ARG 6 minOffset
+		ARG 7 maxOffset
 	METHOD method_27937 canRunOnTop (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z
 		ARG 1 world
 		ARG 2 pos
@@ -70,3 +78,5 @@ CLASS net/minecraft/class_2457 net/minecraft/block/RedstoneWireBlock
 	METHOD method_61746 getStrongPower (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)I
 		ARG 1 world
 		ARG 2 pos
+	METHOD method_61747 ([I)V
+		ARG 0 colors
diff --git a/mappings/net/minecraft/block/entity/CreakingHeartBlockEntity.mapping b/mappings/net/minecraft/block/entity/CreakingHeartBlockEntity.mapping
@@ -3,12 +3,14 @@ CLASS net/minecraft/class_10323 net/minecraft/block/entity/CreakingHeartBlockEnt
 	FIELD field_54787 creakingUpdateTimer I
 	FIELD field_54788 trailParticlesSpawnTimer I
 	FIELD field_54789 lastCreakingPuppetPos Lnet/minecraft/class_243;
+	FIELD field_54910 comparatorOutput I
 	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 pos
 		ARG 2 state
 	METHOD method_64800 spawnTrailParticles (Lnet/minecraft/class_3218;IZ)V
 		ARG 1 world
 		ARG 2 count
+		ARG 3 towardsPuppet
 	METHOD method_64801 spawnCreakingPuppet (Lnet/minecraft/class_3218;Lnet/minecraft/class_10323;)Lnet/minecraft/class_10281;
 		ARG 0 world
 		ARG 1 blockEntity
@@ -22,3 +24,6 @@ CLASS net/minecraft/class_10323 net/minecraft/block/entity/CreakingHeartBlockEnt
 		ARG 2 state
 		ARG 3 blockEntity
 	METHOD method_64806 onPuppetDamage ()V
+	METHOD method_65010 getComparatorOutput ()I
+	METHOD method_65011 calcComparatorOutput ()I
+	METHOD method_65012 getDistanceToPuppet ()D
diff --git a/...necraft/client/font/GlyphRenderer.mapping → .../minecraft/client/font/BakedGlyph.mapping b/...necraft/client/font/GlyphRenderer.mapping → .../minecraft/client/font/BakedGlyph.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer
+CLASS net/minecraft/class_382 net/minecraft/client/font/BakedGlyph
 	FIELD field_2272 minX F
 	FIELD field_2273 maxV F
 	FIELD field_2274 minV F
@@ -33,6 +33,12 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer
 		ARG 4 light
 	METHOD method_24045 getLayer (Lnet/minecraft/class_327$class_6415;)Lnet/minecraft/class_1921;
 		ARG 1 layerType
+	METHOD method_65025 draw (Lnet/minecraft/class_382$class_10364;Lorg/joml/Matrix4f;Lnet/minecraft/class_4588;I)V
+		ARG 1 glyph
+		ARG 2 matrices
+		ARG 3 vertexConsumers
+		ARG 4 light
+	CLASS class_10364 DrawnGlyph
 	CLASS class_328 Rectangle
 		FIELD comp_3307 minX F
 		FIELD comp_3308 minY F

diff --git a/mappings/net/minecraft/client/font/EmptyBakedGlyph.mapping b/mappings/net/minecraft/client/font/EmptyBakedGlyph.mapping
@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_384 net/minecraft/client/font/EmptyBakedGlyph
+	FIELD field_38311 INSTANCE Lnet/minecraft/class_384;
diff --git a/mappings/net/minecraft/client/font/EmptyGlyphRenderer.mapping b/mappings/net/minecraft/client/font/EmptyGlyphRenderer.mapping
diff --git a/mappings/net/minecraft/client/font/FontStorage.mapping b/mappings/net/minecraft/client/font/FontStorage.mapping
@@ -1,18 +1,18 @@
 CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage
-	FIELD field_20910 whiteRectangleGlyphRenderer Lnet/minecraft/class_382;
+	FIELD field_20910 whiteRectangleBakedGlyph Lnet/minecraft/class_382;
 	FIELD field_2246 id Lnet/minecraft/class_2960;
 	FIELD field_2248 textureManager Lnet/minecraft/class_1060;
 	FIELD field_2249 charactersByWidth Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
 	FIELD field_2252 RANDOM Lnet/minecraft/class_5819;
-	FIELD field_2253 glyphRendererCache Lnet/minecraft/class_8532;
+	FIELD field_2253 bakedGlyphCache Lnet/minecraft/class_8532;
 	FIELD field_2254 glyphAtlases Ljava/util/List;
-	FIELD field_2256 blankGlyphRenderer Lnet/minecraft/class_382;
+	FIELD field_2256 blankBakedGlyph Lnet/minecraft/class_382;
 	FIELD field_2257 glyphCache Lnet/minecraft/class_8532;
 	FIELD field_39934 MAX_ADVANCE F
 	FIELD field_49120 allFonts Ljava/util/List;
 	FIELD field_49121 availableFonts Ljava/util/List;
 	FIELD field_54819 glyphFinder Ljava/util/function/IntFunction;
-	FIELD field_54820 glyphRendererFinder Ljava/util/function/IntFunction;
+	FIELD field_54820 glyphBaker Ljava/util/function/IntFunction;
 	METHOD <init> (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;)V
 		ARG 1 textureManager
 		ARG 2 id
@@ -26,19 +26,19 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage
 		COMMENT @implNote {@link BuiltinEmptyGlyph#MISSING} is returned for missing code points.
 		ARG 1 codePoint
 		ARG 2 validateAdvance
-	METHOD method_2012 getGlyphRenderer (Lnet/minecraft/class_383;)Lnet/minecraft/class_382;
+	METHOD method_2012 bake (Lnet/minecraft/class_383;)Lnet/minecraft/class_382;
 		ARG 1 c
-	METHOD method_2013 getObfuscatedGlyphRenderer (Lnet/minecraft/class_379;)Lnet/minecraft/class_382;
+	METHOD method_2013 getObfuscatedBakedGlyph (Lnet/minecraft/class_379;)Lnet/minecraft/class_382;
 		ARG 1 glyph
-	METHOD method_2014 getGlyphRenderer (I)Lnet/minecraft/class_382;
+	METHOD method_2014 getBaked (I)Lnet/minecraft/class_382;
 		ARG 1 codePoint
-	METHOD method_22943 getRectangleRenderer ()Lnet/minecraft/class_382;
+	METHOD method_22943 getRectangleBakedGlyph ()Lnet/minecraft/class_382;
 	METHOD method_40038 findGlyph (I)Lnet/minecraft/class_377$class_7647;
 		COMMENT {@return the glyph of {@code codePoint}}
 		COMMENT
 		COMMENT @apiNote Call {@link #getGlyph} instead, as that method provides caching.
 		ARG 1 codePoint
-	METHOD method_41832 findGlyphRenderer (I)Lnet/minecraft/class_382;
+	METHOD method_41832 bake (I)Lnet/minecraft/class_382;
 		ARG 1 codePoint
 	METHOD method_45079 isAdvanceInvalid (Lnet/minecraft/class_379;)Z
 		ARG 0 glyph

diff --git a/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping b/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping
@@ -6,7 +6,7 @@ CLASS net/minecraft/class_380 net/minecraft/client/font/GlyphAtlasTexture
 	METHOD <init> (Lnet/minecraft/class_8538;Z)V
 		ARG 1 textRenderLayers
 		ARG 2 hasColor
-	METHOD method_2022 getGlyphRenderer (Lnet/minecraft/class_383;)Lnet/minecraft/class_382;
+	METHOD method_2022 bake (Lnet/minecraft/class_383;)Lnet/minecraft/class_382;
 		ARG 1 glyph
 	METHOD method_51640 (I)I
 		ARG 0 color

diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping
@@ -202,7 +202,9 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
 		FIELD field_33997 layerType Lnet/minecraft/class_327$class_6415;
 		FIELD field_54817 color I
 		FIELD field_54818 backgroundColor I
+		FIELD field_54911 glyphs Ljava/util/List;
 		METHOD <init> (Lnet/minecraft/class_327;Lnet/minecraft/class_4597;FFIIZLorg/joml/Matrix4f;Lnet/minecraft/class_327$class_6415;I)V
+			ARG 2 vertexConsumers
 			ARG 3 x
 			ARG 4 y
 			ARG 5 color
@@ -221,6 +223,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
 			ARG 8 layerType
 			ARG 9 light
 		METHOD method_27531 drawLayer (F)F
+			ARG 1 x
 		METHOD method_27532 addRectangle (Lnet/minecraft/class_382$class_328;)V
 			ARG 1 rectangle
 	CLASS class_6415 TextLayerType
diff --git a/mappings/net/minecraft/client/gl/GlUniform.mapping b/mappings/net/minecraft/client/gl/GlUniform.mapping
@@ -38,3 +38,8 @@ CLASS net/minecraft/class_284 net/minecraft/client/gl/GlUniform
 	METHOD method_35662 getDataType ()I
 	METHOD method_35663 getIntData ()Ljava/nio/IntBuffer;
 	METHOD method_35664 getFloatData ()Ljava/nio/FloatBuffer;
+	METHOD method_65015 set (Lnet/minecraft/class_10157$class_10159;)V
+		ARG 1 uniform
+	METHOD method_65016 set (Ljava/util/List;I)V
+		ARG 1 values
+		ARG 2 count
diff --git a/mappings/net/minecraft/client/gl/PostEffectPass.mapping b/mappings/net/minecraft/client/gl/PostEffectPass.mapping
@@ -19,6 +19,7 @@ CLASS net/minecraft/class_283 net/minecraft/client/gl/PostEffectPass
 	METHOD method_62258 addSampler (Lnet/minecraft/class_283$class_9971;)V
 		ARG 1 sampler
 	METHOD method_62922 getProgram ()Lnet/minecraft/class_5944;
+	METHOD method_65029 setUniforms ()V
 	CLASS class_9971 Sampler
 		METHOD method_62259 preRender (Lnet/minecraft/class_9916;Ljava/util/Map;)V
 			ARG 1 pass

diff --git a/mappings/net/minecraft/client/gl/ShaderProgram.mapping b/mappings/net/minecraft/client/gl/ShaderProgram.mapping
@@ -31,6 +31,7 @@ CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram
 	FIELD field_53839 samplerTextures Lit/unimi/dsi/fastutil/objects/Object2IntMap;
 	FIELD field_53840 samplerLocations Lit/unimi/dsi/fastutil/ints/IntList;
 	FIELD field_53841 uniformsByName Ljava/util/Map;
+	FIELD field_54926 uniformDefinitionsByName Ljava/util/Map;
 	METHOD <init> (I)V
 		ARG 1 glRef
 	METHOD method_1270 getGlRef ()I
@@ -59,3 +60,5 @@ CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram
 	METHOD method_62900 set (Ljava/util/List;Ljava/util/List;)V
 		ARG 1 uniforms
 		ARG 2 samplers
+	METHOD method_65028 getUniformDefinition (Ljava/lang/String;)Lnet/minecraft/class_10157$class_10159;
+		ARG 1 name
diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping
@@ -71,6 +71,9 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud
 	FIELD field_47550 SCOREBOARD_ENTRY_COMPARATOR Ljava/util/Comparator;
 	FIELD field_47847 layeredDrawer Lnet/minecraft/class_9080;
 	FIELD field_52771 NAUSEA_TEXTURE Lnet/minecraft/class_2960;
+	FIELD field_54912 AIR_BURSTING_TEXTURE Lnet/minecraft/class_2960;
+	FIELD field_54913 AIR_EMPTY_TEXTURE Lnet/minecraft/class_2960;
+	FIELD field_54919 lastBurstBubble I
 	METHOD <init> (Lnet/minecraft/class_310;)V
 		ARG 1 client
 	METHOD method_1731 updateVignetteDarkness (Lnet/minecraft/class_1297;)V
@@ -244,6 +247,26 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud
 	METHOD method_61980 renderNauseaOverlay (Lnet/minecraft/class_332;F)V
 		ARG 1 context
 		ARG 2 nauseaStrength
+	METHOD method_65019 getAirBubbleY (II)I
+		ARG 1 heartCount
+		ARG 2 top
+	METHOD method_65020 playBurstSound (ILnet/minecraft/class_1657;I)V
+		ARG 1 bubble
+		ARG 2 player
+		ARG 3 burstBubbles
+	METHOD method_65021 getAirBubbleDelay (IZ)I
+		ARG 0 air
+		ARG 1 submergedInWater
+	METHOD method_65022 renderAirBubbles (Lnet/minecraft/class_332;Lnet/minecraft/class_1657;III)V
+		ARG 1 context
+		ARG 2 player
+		ARG 3 heartCount
+		ARG 4 top
+		ARG 5 left
+	METHOD method_65024 getAirBubbles (III)I
+		ARG 0 air
+		ARG 1 maxAir
+		ARG 2 delay
 	CLASS class_6411 HeartType
 		FIELD field_33946 POISONED Lnet/minecraft/class_329$class_6411;
 		FIELD field_45329 fullTexture Lnet/minecraft/class_2960;

diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping
@@ -191,6 +191,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 		ARG 1 previouslyDisabled
 	METHOD method_64506 getTextRenderer ()Lnet/minecraft/class_327;
 	METHOD method_64507 shouldHideStatusEffectHud ()Z
+	METHOD method_65027 addCrashReportSection (Lnet/minecraft/class_128;)V
+		ARG 1 report
 	CLASS class_6390 SelectedElementNarrationData
 		FIELD field_33825 selectable Lnet/minecraft/class_6379;
 		FIELD field_33826 index I

diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping
@@ -115,8 +115,8 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB
 			ARG 1 type
 		METHOD <init> (Lnet/minecraft/class_1792;Lnet/minecraft/class_10355;)V
 			ARG 1 primaryIcon
-			ARG 2 group
+			ARG 2 category
 		METHOD <init> (Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;Lnet/minecraft/class_10355;)V
 			ARG 1 primaryIcon
 			ARG 2 secondaryIcon
-			ARG 3 group
+			ARG 3 category
diff --git a/mappings/net/minecraft/client/particle/RedDustParticle.mapping b/mappings/net/minecraft/client/particle/RedDustParticle.mapping
@@ -7,6 +7,7 @@ CLASS net/minecraft/class_671 net/minecraft/client/particle/RedDustParticle
 		ARG 8 velocityX
 		ARG 10 velocityY
 		ARG 12 velocityZ
+		ARG 14 parameters
 		ARG 15 spriteProvider
 	CLASS class_672 Factory
 		FIELD field_17802 spriteProvider Lnet/minecraft/class_4002;

diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping
@@ -24,6 +24,7 @@ CLASS net/minecraft/class_4401 net/minecraft/client/realms/gui/screen/RealmsPend
 	METHOD method_25179 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_52672 handle (Z)V
+		ARG 1 accepted
 	METHOD method_52673 (Lnet/minecraft/class_4401$class_4403;ZLjava/lang/Boolean;)V
 		ARG 3 result
 	METHOD method_52674 (Lnet/minecraft/class_4871;)Lnet/minecraft/class_4401$class_4403;
@@ -32,6 +33,8 @@ CLASS net/minecraft/class_4401 net/minecraft/client/realms/gui/screen/RealmsPend
 		ARG 1 pendingInvites
 	CLASS class_4402 PendingInvitationSelectionList
 		METHOD method_64846 isEmpty ()Z
+		METHOD method_65017 remove (Lnet/minecraft/class_4401$class_4403;)V
+			ARG 1 invitation
 	CLASS class_4403 PendingInvitationSelectionListEntry
 		FIELD field_19953 mPendingInvite Lnet/minecraft/class_4871;
 		FIELD field_19955 buttons Ljava/util/List;

diff --git a/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping b/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping
@@ -28,3 +28,4 @@ CLASS net/minecraft/class_299 net/minecraft/client/recipebook/ClientRecipeBook
 		ARG 1 recipeId
 	METHOD method_64857 markHighlighted (Lnet/minecraft/class_10298;)V
 		ARG 1 recipeId
+	METHOD method_65018 clear ()V
diff --git a/mappings/net/minecraft/client/recipebook/RecipeBookType.mapping b/mappings/net/minecraft/client/recipebook/RecipeBookType.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_10331 net/minecraft/client/recipebook/RecipeBookType
-	FIELD field_54841 groups Ljava/util/List;
+	FIELD field_54841 categories Ljava/util/List;
 	METHOD <init> (Ljava/lang/String;I[Lnet/minecraft/class_10355;)V
-		ARG 3 groups
-	METHOD method_64888 getGroups ()Ljava/util/List;
+		ARG 3 categories
+	METHOD method_64888 getCategories ()Ljava/util/List;
diff --git a/mappings/net/minecraft/client/render/entity/equipment/EquipmentRenderer.mapping b/mappings/net/minecraft/client/render/entity/equipment/EquipmentRenderer.mapping
@@ -13,11 +13,18 @@ CLASS net/minecraft/class_10197 net/minecraft/client/render/entity/equipment/Equ
 		ARG 2 modelId
 		ARG 3 model
 		ARG 4 stack
+		ARG 5 matrices
+		ARG 6 vertexConsumers
+		ARG 7 light
 	METHOD method_64078 render (Lnet/minecraft/class_10186$class_10190;Lnet/minecraft/class_2960;Lnet/minecraft/class_3879;Lnet/minecraft/class_1799;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 matrices
+		ARG 6 vertexConsumers
+		ARG 7 light
+		ARG 8 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;

diff --git a/mappings/net/minecraft/component/type/EquippableComponent.mapping b/mappings/net/minecraft/component/type/EquippableComponent.mapping
@@ -20,6 +20,7 @@ CLASS net/minecraft/class_10192 net/minecraft/component/type/EquippableComponent
 		FIELD field_54238 dispensable Z
 		FIELD field_54239 swappable Z
 		FIELD field_54240 damageOnHurt Z
+		FIELD field_54908 cameraOverlay Ljava/util/Optional;
 		METHOD <init> (Lnet/minecraft/class_1304;)V
 			ARG 1 slot
 		METHOD method_64203 build ()Lnet/minecraft/class_10192;
@@ -37,3 +38,5 @@ CLASS net/minecraft/class_10192 net/minecraft/component/type/EquippableComponent
 			ARG 1 swappable
 		METHOD method_64210 damageOnHurt (Z)Lnet/minecraft/class_10192$class_10217;
 			ARG 1 damageOnHurt
+		METHOD method_65009 cameraOverlay (Lnet/minecraft/class_2960;)Lnet/minecraft/class_10192$class_10217;
+			ARG 1 cameraOverlay
diff --git a/mappings/net/minecraft/datafixer/fix/LockComponentPredicateFix.mapping b/mappings/net/minecraft/datafixer/fix/LockComponentPredicateFix.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/class_10248 net/minecraft/datafixer/fix/LockComponentPredicateFix
+	FIELD field_54895 ESCAPER Lcom/google/common/escape/Escaper;
 	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V
 		ARG 1 outputSchema
 	METHOD method_64411 fixLock (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;

diff --git a/mappings/net/minecraft/item/BundleItem.mapping b/mappings/net/minecraft/item/BundleItem.mapping
@@ -5,6 +5,7 @@ CLASS net/minecraft/class_5537 net/minecraft/item/BundleItem
 	FIELD field_52577 MAX_TOOLTIP_STACKS_SHOWN I
 	FIELD field_52578 MAX_TOOLTIP_STACKS_SHOWN_WHEN_TOO_MANY_TYPES I
 	FIELD field_52579 FULL_ITEM_BAR_COLOR I
+	FIELD field_54111 MAX_USE_TIME I
 	FIELD field_54112 openFrontTexture Lnet/minecraft/class_2960;
 	FIELD field_54113 openBackTexture Lnet/minecraft/class_2960;
 	METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_1792$class_1793;)V
@@ -50,3 +51,6 @@ CLASS net/minecraft/class_5537 net/minecraft/item/BundleItem
 		ARG 0 color
 	METHOD method_64502 onContentChanged (Lnet/minecraft/class_1657;)V
 		ARG 1 user
+	METHOD method_64974 (Lnet/minecraft/class_1792;)Lnet/minecraft/class_5537;
+		ARG 0 item
+	METHOD method_64975 getBundles ()Ljava/util/List;
diff --git a/mappings/net/minecraft/loot/LootTableReporter.mapping b/mappings/net/minecraft/loot/LootTableReporter.mapping
@@ -16,6 +16,7 @@ CLASS net/minecraft/class_58 net/minecraft/loot/LootTableReporter
 		ARG 2 contextType
 		ARG 3 dataLookup
 	METHOD method_22567 validateContext (Lnet/minecraft/class_46;)V
+		ARG 1 contextAware
 	METHOD method_22568 withContextType (Lnet/minecraft/class_176;)Lnet/minecraft/class_58;
 		ARG 1 contextType
 	METHOD method_360 report (Ljava/lang/String;)V

diff --git a/mappings/net/minecraft/loot/context/LootContext.mapping b/mappings/net/minecraft/loot/context/LootContext.mapping
@@ -1,10 +1,10 @@
 CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext
 	FIELD field_44490 lookup Lnet/minecraft/class_7871$class_7872;
-	FIELD field_44881 parameters Lnet/minecraft/class_8567;
+	FIELD field_44881 worldContext Lnet/minecraft/class_8567;
 	FIELD field_923 random Lnet/minecraft/class_5819;
 	FIELD field_927 activeEntries Ljava/util/Set;
 	METHOD <init> (Lnet/minecraft/class_8567;Lnet/minecraft/class_5819;Lnet/minecraft/class_7871$class_7872;)V
-		ARG 1 parameters
+		ARG 1 worldContext
 		ARG 2 random
 		ARG 3 lookup
 	METHOD method_294 getRandom ()Lnet/minecraft/class_5819;
@@ -30,11 +30,13 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext
 		ARG 0 itemModifier
 	METHOD method_51187 predicate (Lnet/minecraft/class_5341;)Lnet/minecraft/class_47$class_8487;
 		ARG 0 predicate
+	METHOD method_65013 get (Lnet/minecraft/class_169;)Ljava/lang/Object;
+		ARG 1 parameter
 	CLASS class_48 Builder
-		FIELD field_44882 parameters Lnet/minecraft/class_8567;
+		FIELD field_44882 worldContext Lnet/minecraft/class_8567;
 		FIELD field_934 random Lnet/minecraft/class_5819;
 		METHOD <init> (Lnet/minecraft/class_8567;)V
-			ARG 1 parameters
+			ARG 1 worldContext
 		METHOD method_304 random (J)Lnet/minecraft/class_47$class_48;
 			ARG 1 seed
 		METHOD method_309 build (Ljava/util/Optional;)Lnet/minecraft/class_47;

diff --git a/mappings/net/minecraft/loot/context/LootContextAware.mapping b/mappings/net/minecraft/loot/context/LootContextAware.mapping
@@ -1,4 +1,4 @@
 CLASS net/minecraft/class_46 net/minecraft/loot/context/LootContextAware
 	METHOD method_292 validate (Lnet/minecraft/class_58;)V
 		ARG 1 reporter
-	METHOD method_293 getRequiredParameters ()Ljava/util/Set;
+	METHOD method_293 getAllowedParameters ()Ljava/util/Set;
diff --git a/mappings/net/minecraft/loot/context/LootContextParameters.mapping b/mappings/net/minecraft/loot/context/LootContextParameters.mapping
@@ -1 +1,13 @@
 CLASS net/minecraft/class_181 net/minecraft/loot/context/LootContextParameters
+	FIELD field_1224 BLOCK_STATE Lnet/minecraft/class_169;
+	FIELD field_1225 EXPLOSION_RADIUS Lnet/minecraft/class_169;
+	FIELD field_1226 THIS_ENTITY Lnet/minecraft/class_169;
+	FIELD field_1227 DIRECT_ATTACKING_ENTITY Lnet/minecraft/class_169;
+	FIELD field_1228 BLOCK_ENTITY Lnet/minecraft/class_169;
+	FIELD field_1229 TOOL Lnet/minecraft/class_169;
+	FIELD field_1230 ATTACKING_ENTITY Lnet/minecraft/class_169;
+	FIELD field_1231 DAMAGE_SOURCE Lnet/minecraft/class_169;
+	FIELD field_1233 LAST_DAMAGE_PLAYER Lnet/minecraft/class_169;
+	FIELD field_24424 ORIGIN Lnet/minecraft/class_169;
+	FIELD field_51805 ENCHANTMENT_LEVEL Lnet/minecraft/class_169;
+	FIELD field_51806 ENCHANTMENT_ACTIVE Lnet/minecraft/class_169;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		CLASS net/minecraft/class_384 net/minecraft/client/font/EmptyBakedGlyph
		FIELD field_38311 INSTANCE Lnet/minecraft/class_384;