Merge branch '24w37a' of https://github.com/QuiltMC/quilt-mappings in…

…to fix-a-couple-loot-y-things

restore #636 which appparently got lost in a match
restore VaultBlockEntity::getEjectionItems

buildSrc/src/main/java/quilt/internal/Constants.java

@@ -1,7 +1,7 @@
 package quilt.internal;
 
 public class Constants {
-    public static final String MINECRAFT_VERSION = "24w34a";
+    public static final String MINECRAFT_VERSION = "24w37a";
 
     public static final String MAPPINGS_NAME = "quilt-mappings";
 

mappings/com/mojang/blaze3d/glfw/Window.mapping

@@ -35,7 +35,7 @@ CLASS net/minecraft/unmapped/C_snosbckc com/mojang/blaze3d/glfw/Window
 		ARG 1 guiScale
 		ARG 2 forceUnicodeFont
 	METHOD m_cndxkiao updateWindowRegion ()V
-	METHOD m_czlmnfjn updateFullscreen (Z)V
+	METHOD m_czlmnfjn updateFullscreen (ZLnet/minecraft/unmapped/C_wmelrump;)V
 		ARG 1 vsync
 	METHOD m_djoeuiuz setScaleFactor (D)V
 		ARG 1 scaleFactor
@@ -92,7 +92,7 @@ CLASS net/minecraft/unmapped/C_snosbckc com/mojang/blaze3d/glfw/Window
 	METHOD m_tzsavrbr logGlError (IJ)V
 		ARG 1 error
 		ARG 2 description
-	METHOD m_ugdhvupv swapBuffers ()V
+	METHOD m_ugdhvupv swapBuffers (Lnet/minecraft/unmapped/C_wmelrump;)V
 	METHOD m_vijmoelu setFramebufferHeight (I)V
 		ARG 1 framebufferHeight
 	METHOD m_wkxqajfd getMonitor ()Lnet/minecraft/unmapped/C_ykheakec;

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

@@ -57,8 +57,6 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 		ARG 0 mode
 		ARG 1 first
 		ARG 2 count
-	METHOD flipFrame (J)V
-		ARG 0 window
 	METHOD getSequentialBuffer (Lnet/minecraft/unmapped/C_rnldvdpe$C_ptsbsfse;)Lcom/mojang/blaze3d/systems/RenderSystem$C_qjasdctt;
 		ARG 0 mode
 	METHOD getShaderTexture (I)I

mappings/net/minecraft/SharedConstants.mapping

@@ -94,7 +94,6 @@ CLASS net/minecraft/unmapped/C_otltijcb net/minecraft/SharedConstants
 	FIELD f_vmvthkqh IN_GAME_DEBUG_OUTPUT Z
 	FIELD f_vuaxazth DISABLE_AQUIFERS Z
 	FIELD f_vvzzzkdn MAXIMUM_EXPLOSION_RESISTANCE F
-	FIELD f_wcndudyu ENABLE_RESOURCE_LOADING_TIMES_DEBUGGER Z
 	FIELD f_wevqaylw ENABLE_GAME_EVENT_LISTENERS_DEBUGGER Z
 	FIELD f_wfneyrli DISABLE_BLENDING Z
 	FIELD f_wstfijwu NAMED_RUNNABLES Z

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

@@ -7,7 +7,6 @@ CLASS net/minecraft/unmapped/C_hmkjzbjo net/minecraft/advancement/criterion/Crit
 	FIELD f_breiimnq FISHING_ROD_HOOKED Lnet/minecraft/unmapped/C_wpdvydim;
 	FIELD f_clfbpzez STARTED_RIDING Lnet/minecraft/unmapped/C_fotumhme;
 	FIELD f_cuckeibu TARGET_HIT Lnet/minecraft/unmapped/C_vqqxzpxi;
-	FIELD f_dplfphiw KILLED_BY_CROSSBOW Lnet/minecraft/unmapped/C_thhqzygp;
 	FIELD f_dwegttip THROWN_ITEM_PICKED_UP_BY_ENTITY Lnet/minecraft/unmapped/C_mntpixlf;
 	FIELD f_fgacgrzu CURED_ZOMBIE_VILLAGER Lnet/minecraft/unmapped/C_urcewduq;
 	FIELD f_fupkcsec KILL_MOB_NEAR_SCULK_CATALYST Lnet/minecraft/unmapped/C_hqkuepng;

mappings/net/minecraft/block/AbstractBlock.mapping

@@ -3,14 +3,15 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 	FIELD f_eagudpej slipperiness F
 	FIELD f_gtipwtfw requiredFlags Lnet/minecraft/unmapped/C_czxxrbcp;
 	FIELD f_hcgxjldr jumpVelocityMultiplier F
-	FIELD f_hflsieep lootTableId Lnet/minecraft/unmapped/C_xhhleach;
+	FIELD f_hflsieep lootTableId Ljava/util/Optional;
 	FIELD f_hpfrgdhl velocityMultiplier F
 	FIELD f_hskzbzfq settings Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
 	FIELD f_lyvgdypq soundGroup Lnet/minecraft/unmapped/C_aevintex;
 	FIELD f_mfgswndv dynamicBounds Z
 	FIELD f_nsbwwaru DIRECTIONS [Lnet/minecraft/unmapped/C_xpuuihxf;
 	FIELD f_pqndzdga collidable Z
 	FIELD f_uxluwspt resistance F
+	FIELD f_zawgabdk translationKey Ljava/lang/String;
 	METHOD <init> (Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V
 		ARG 1 settings
 	METHOD m_bhohbmwk getWeakRedstonePower (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xpuuihxf;)I
@@ -48,6 +49,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 	METHOD m_enfnjurp (Ljava/util/function/Function;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 1 codecBuilder
 	METHOD m_ewcsdntg asBlock ()Lnet/minecraft/unmapped/C_mmxmpdoq;
+	METHOD m_fegczxns getTranslationKey ()Ljava/lang/String;
 	METHOD m_fjkbizwn isRedstonePowerSource (Lnet/minecraft/unmapped/C_txtbiemp;)Z
 		ARG 1 state
 	METHOD m_flnjgkno isTransparent (Lnet/minecraft/unmapped/C_txtbiemp;)Z
@@ -134,7 +136,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 		ARG 3 pos
 		ARG 4 stack
 		ARG 5 dropExperience
-	METHOD m_qodrklgm getLootTableId ()Lnet/minecraft/unmapped/C_xhhleach;
+	METHOD m_qodrklgm getLootTableId ()Ljava/util/Optional;
 	METHOD m_qzmkwuwe canReplace (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_aiootljq;)Z
 		ARG 1 state
 		ARG 2 context
@@ -579,7 +581,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 		FIELD f_obppjqdx opaque Z
 		FIELD f_pgktgiev offsetFunction Lnet/minecraft/unmapped/C_triydqro$C_mlfsdncu;
 		FIELD f_piwzbwkw suffocationPredicate Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;
-		FIELD f_pxqjcqnw lootTableId Lnet/minecraft/unmapped/C_xhhleach;
+		FIELD f_pxqjcqnw lootTableId Lnet/minecraft/unmapped/C_jquyxssk;
 		FIELD f_stojhpmj solid Z
 		FIELD f_vgbjitlh spawnsDustParticles Z
 		FIELD f_vncuqezy luminance Ljava/util/function/ToIntFunction;
@@ -609,11 +611,6 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 			ARG 1 predicate
 		METHOD m_edlblpmg offsetType (Lnet/minecraft/unmapped/C_triydqro$C_hqjgaunn;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
 			ARG 1 offsetType
-		METHOD m_egobildr (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Z
-			ARG 0 state
-			ARG 1 state
-			ARG 2 world
-			ARG 3 type
 		METHOD m_etdgbdsz replaceable ()Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
 		METHOD m_fqzrcagx jumpVelocityMultiplier (F)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
 			ARG 1 jumpVelocityMultiplier
@@ -627,19 +624,9 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 		METHOD m_ixvdwzpv ticksRandomly ()Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
 		METHOD m_jjsywpzh slipperiness (F)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
 			ARG 1 slipperiness
-		METHOD m_jzrlfqyp (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z
-			ARG 0 state
-			ARG 1 world
-			ARG 2 pos
 		METHOD m_ksnsduxl create ()Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
-		METHOD m_lmlzohax (Lnet/minecraft/unmapped/C_arllgqae;Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_mlrprqox;
-			ARG 1 state
 		METHOD m_lzknvbog hardness (F)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
 			ARG 1 hardness
-		METHOD m_mbjlohca dropsLike (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
-			COMMENT Specifies that a block should drop the same items as a provided block.
-			ARG 1 source
-				COMMENT the block to copy item drops from
 		METHOD m_mkgblwbl nonSolid ()Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
 		METHOD m_mkiacirn air ()Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
 		METHOD m_mylnzrvw mapColor (Lnet/minecraft/unmapped/C_mlrprqox;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
@@ -665,7 +652,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 			ARG 1 predicate
 		METHOD m_scrsgkaj copy (Lnet/minecraft/unmapped/C_triydqro;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
 			ARG 0 block
-		METHOD m_secizybe (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z
+		METHOD m_secizybe (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Z
 			ARG 0 state
 			ARG 1 world
 			ARG 2 pos

mappings/net/minecraft/block/Block.mapping

@@ -18,7 +18,6 @@ CLASS net/minecraft/unmapped/C_mmxmpdoq net/minecraft/block/Block
 	COMMENT is defined by {@link appendProperties}.
 	COMMENT
 	COMMENT @see BlockState
-	FIELD f_bgfflzvf translationKey Ljava/lang/String;
 	FIELD f_bjwoutju NOTIFY_LISTENERS I
 		COMMENT Notifies listeners and clients who need to react when the block changes.
 	FIELD f_bqorapkz UPDATE_LIMIT I
@@ -67,13 +66,6 @@ CLASS net/minecraft/unmapped/C_mmxmpdoq net/minecraft/block/Block
 	METHOD m_azwoptpw isShapeFullCube (Lnet/minecraft/unmapped/C_zscvhwbd;)Z
 		ARG 0 shape
 	METHOD m_bdlslsvh getStateManager ()Lnet/minecraft/unmapped/C_ezfeikaq;
-	METHOD m_bsuyxxeg getTranslationKey ()Ljava/lang/String;
-		COMMENT {@return the translation key for the name of this block}
-		COMMENT
-		COMMENT <p>By default, it returns {@code block.namespace.path} where {@code
-		COMMENT namespace} and {@code path} are of the identifier used for registering
-		COMMENT this block, but {@code /} in {@code path} is replaced with {@code .}.
-		COMMENT If the block is not registered, it returns {@code block.unregistered_sadface}.
 	METHOD m_bztcfiru getDroppedStacks (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_kvegafmh;)Ljava/util/List;
 		ARG 0 state
 		ARG 1 world
@@ -286,16 +278,6 @@ CLASS net/minecraft/unmapped/C_mmxmpdoq net/minecraft/block/Block
 	CLASS C_miiagdeq
 		METHOD load (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 shape
-	CLASS C_ysitskrk NeighborGroup
-		FIELD f_iuethcuz facing Lnet/minecraft/unmapped/C_xpuuihxf;
-		FIELD f_ovrcrewh other Lnet/minecraft/unmapped/C_txtbiemp;
-		FIELD f_suhtzfht self Lnet/minecraft/unmapped/C_txtbiemp;
-		METHOD <init> (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_xpuuihxf;)V
-			ARG 1 self
-			ARG 2 other
-			ARG 3 facing
-		METHOD equals (Ljava/lang/Object;)Z
-			ARG 1 o
 	CLASS C_znvnetlf
 		METHOD rehash (I)V
 			ARG 1 newSize

mappings/net/minecraft/block/Blocks.mapping

@@ -1,29 +1,6 @@
 CLASS net/minecraft/unmapped/C_jricjyva net/minecraft/block/Blocks
 	FIELD f_lfmqbeqz SHULKER_BOX_SUFFOCATES_PREDICATE Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;
-	METHOD m_agroqyjs stainedGlassOf (Lnet/minecraft/unmapped/C_arllgqae;)Lnet/minecraft/unmapped/C_mmxmpdoq;
-		ARG 0 color
-	METHOD m_cejxlkjq netherStemOf (Lnet/minecraft/unmapped/C_mlrprqox;)Lnet/minecraft/unmapped/C_mmxmpdoq;
-		ARG 0 color
-	METHOD m_dsrskptj shulkerBoxOf (Lnet/minecraft/unmapped/C_arllgqae;Lnet/minecraft/unmapped/C_mlrprqox;)Lnet/minecraft/unmapped/C_mmxmpdoq;
-		ARG 0 dyeColor
-		ARG 1 mapColor
-	METHOD m_fnlerawu (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Z
-		ARG 0 state
-		ARG 1 world
-		ARG 2 pos
-		ARG 3 entityType
-	METHOD m_fwewvidj legacyStairsOf (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_mmxmpdoq;
-	METHOD m_ghajpyfj register (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_mmxmpdoq;
-	METHOD m_gtmmdkuy leavesOf (Lnet/minecraft/unmapped/C_aevintex;)Lnet/minecraft/unmapped/C_mmxmpdoq;
-		ARG 0 soundGroup
-	METHOD m_hjyhmutz buttonOf (Lnet/minecraft/unmapped/C_hgpogkhy;)Lnet/minecraft/unmapped/C_mmxmpdoq;
-		ARG 0 type
-	METHOD m_ilocxcob candleOf (Lnet/minecraft/unmapped/C_mlrprqox;)Lnet/minecraft/unmapped/C_mmxmpdoq;
-		ARG 0 color
-	METHOD m_kgmpoexx pottedVariant (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_mmxmpdoq;
 	METHOD m_knkwxiyx solid (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z
-	METHOD m_mjiljkwg register (Ljava/lang/String;Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_mmxmpdoq;
-		ARG 0 id
 	METHOD m_nmstzpxh spawnable (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Ljava/lang/Boolean;
 		ARG 3 entityType
 	METHOD m_pelkwenc luminanceOf (I)Ljava/util/function/ToIntFunction;
@@ -32,23 +9,6 @@ CLASS net/minecraft/unmapped/C_jricjyva net/minecraft/block/Blocks
 		ARG 3 entityType
 	METHOD m_rzfpgupq allowOcelotsAndParrots (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Ljava/lang/Boolean;
 		ARG 3 entityType
-	METHOD m_sfmefkju stairsOf (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_mmxmpdoq;
-	METHOD m_sfzscxyj createPiston (Z)Lnet/minecraft/unmapped/C_mmxmpdoq;
-		ARG 0 sticky
-	METHOD m_sidkwvli createStoneButton ()Lnet/minecraft/unmapped/C_mmxmpdoq;
-	METHOD m_tldmwsps (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Z
-		ARG 3 entityType
 	METHOD m_tobwsgju waterlogMapColor (Lnet/minecraft/unmapped/C_mlrprqox;)Ljava/util/function/Function;
 		ARG 0 color
-	METHOD m_uvuszloo logOf (Lnet/minecraft/unmapped/C_mlrprqox;Lnet/minecraft/unmapped/C_mlrprqox;Lnet/minecraft/unmapped/C_aevintex;)Lnet/minecraft/unmapped/C_mmxmpdoq;
-		ARG 0 topColor
-		ARG 1 sideColor
-		ARG 2 soundGroup
-	METHOD m_viaczyyb (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Z
-		ARG 3 entityType
-	METHOD m_wgtmwkrm bedOf (Lnet/minecraft/unmapped/C_arllgqae;)Lnet/minecraft/unmapped/C_mmxmpdoq;
-		ARG 0 color
 	METHOD m_wjfyifdb nonSolid (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z
-	METHOD m_zfebkwem logOf (Lnet/minecraft/unmapped/C_mlrprqox;Lnet/minecraft/unmapped/C_mlrprqox;)Lnet/minecraft/unmapped/C_mmxmpdoq;
-		ARG 0 topColor
-		ARG 1 sideColor

mappings/net/minecraft/block/EndGatewayBlock.mapping

@@ -1,4 +1,2 @@
 CLASS net/minecraft/unmapped/C_pwjzqojt net/minecraft/block/EndGatewayBlock
 	FIELD f_lllipcqu CODEC Lcom/mojang/serialization/MapCodec;
-	METHOD m_jeehjmdl getExitVelocity (Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_vgpupfxx;
-		ARG 0 entity

mappings/net/minecraft/block/NetherPortalBlock.mapping

@@ -10,15 +10,12 @@ CLASS net/minecraft/unmapped/C_zpsdinym net/minecraft/block/NetherPortalBlock
 		ARG 4 scaledPos
 		ARG 5 nether
 		ARG 6 border
-	METHOD m_fzuhemna createTransition (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_wauhtoaq$C_tqypnjit;Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_vgpupfxx;FFLnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)Lnet/minecraft/unmapped/C_zbvyjshu;
+	METHOD m_fzuhemna createTransition (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_wauhtoaq$C_tqypnjit;Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)Lnet/minecraft/unmapped/C_zbvyjshu;
 		ARG 1 portalRectangle
 		ARG 2 startAxis
 		ARG 3 offset
 		ARG 4 entity
-		ARG 5 velocity
-		ARG 6 yaw
-		ARG 7 pitch
-		ARG 8 transition
+		ARG 5 transition
 	METHOD m_kvaymgqu createTransition (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_wauhtoaq$C_tqypnjit;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)Lnet/minecraft/unmapped/C_zbvyjshu;
 		ARG 0 entity
 		ARG 2 portalRectangle

mappings/net/minecraft/block/TripwireBlock.mapping

@@ -14,9 +14,6 @@ CLASS net/minecraft/unmapped/C_jioxkxuh net/minecraft/block/TripwireBlock
 	FIELD f_zlnaiupe EAST Lnet/minecraft/unmapped/C_xhwijdsd;
 	METHOD <init> (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V
 		ARG 2 settings
-	METHOD m_fppzmlly updatePowered (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)V
-		ARG 1 world
-		ARG 2 pos
 	METHOD m_ujwatwhc update (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V
 		ARG 1 world
 		ARG 2 pos

mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping

@@ -8,12 +8,3 @@ CLASS net/minecraft/unmapped/C_ooeeaffg net/minecraft/block/dispenser/DispenserB
 		ARG 0 pointer
 		ARG 1 stack
 	METHOD m_ummkrstn registerDefaults ()V
-	CLASS C_pgomfdlr
-		METHOD m_enelnpil fillEmptyBottle (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;
-			ARG 1 dispenser
-			ARG 2 emptyBottleStack
-			ARG 3 filledBottleStack
-	CLASS C_uhouvubq
-		FIELD f_utzfwefr potionDispenserBehavior Lnet/minecraft/unmapped/C_dnfsxzwl;
-	CLASS C_usdpumvw
-		FIELD f_nmnxwggq filledBucketDispenserBehavior Lnet/minecraft/unmapped/C_dnfsxzwl;

mappings/net/minecraft/block/dispenser/DispenserBlock.mapping

@@ -16,8 +16,6 @@ CLASS net/minecraft/unmapped/C_sridforj net/minecraft/block/dispenser/DispenserB
 		ARG 3 offset
 	METHOD m_omkokomw registerBehavior (Lnet/minecraft/unmapped/C_gmbqjnle;)V
 		ARG 0 item
-	METHOD m_rdzqftrz (Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;)V
-		ARG 0 map
 	METHOD m_tfzksanp getDispensePos (Lnet/minecraft/unmapped/C_wzdnszcs;)Lnet/minecraft/unmapped/C_ogbhoqwb;
 		ARG 0 block
 	METHOD m_xmkonidr dispense (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_hynzadkk;)V

mappings/net/minecraft/block/dispenser/ShearsDispenserBehavior.mapping

@@ -2,6 +2,6 @@ CLASS net/minecraft/unmapped/C_lrfsbejz net/minecraft/block/dispenser/ShearsDisp
 	METHOD m_hxxitruh tryShearBlock (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;)Z
 		ARG 0 world
 		ARG 1 pos
-	METHOD m_uymzevnl tryShearEntity (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;)Z
+	METHOD m_uymzevnl tryShearEntity (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z
 		ARG 0 world
 		ARG 1 pos

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

@@ -18,21 +18,21 @@ CLASS net/minecraft/unmapped/C_tlzeicbt net/minecraft/block/entity/BrushableBloc
 		ARG 1 pos
 		ARG 2 state
 	METHOD m_ayzejxpo getBuriedStack ()Lnet/minecraft/unmapped/C_sddaxwyk;
-	METHOD m_bdpdffbi dropContent (Lnet/minecraft/unmapped/C_jzrpycqo;)V
-		ARG 1 player
+	METHOD m_bdpdffbi dropContent (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_sddaxwyk;)V
+		ARG 2 player
 	METHOD m_edqnpwap deserializeLootTable (Lnet/minecraft/unmapped/C_hhlwcnih;)Z
 		ARG 1 nbt
 	METHOD m_ghrzoxmo getCompletionStage ()I
-	METHOD m_hwiincya tickBrushCountReset ()V
-	METHOD m_kfybgynf checkLootInteraction (Lnet/minecraft/unmapped/C_jzrpycqo;)V
-		ARG 1 player
+	METHOD m_hwiincya tickBrushCountReset (Lnet/minecraft/unmapped/C_bdwnwhiu;)V
+	METHOD m_kfybgynf checkLootInteraction (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_sddaxwyk;)V
+		ARG 2 player
 	METHOD m_llghgzmo setLootTable (Lnet/minecraft/unmapped/C_xhhleach;J)V
 		ARG 2 lootTableSeed
 	METHOD m_otxeysvo getHitDirection ()Lnet/minecraft/unmapped/C_xpuuihxf;
 	METHOD m_ozsgysbr serializeLootTable (Lnet/minecraft/unmapped/C_hhlwcnih;)Z
 		ARG 1 nbt
-	METHOD m_rdawolkr completeBrushing (Lnet/minecraft/unmapped/C_jzrpycqo;)V
-		ARG 1 player
-	METHOD m_xibosnri brush (JLnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_xpuuihxf;)Z
+	METHOD m_rdawolkr completeBrushing (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_sddaxwyk;)V
+		ARG 2 player
+	METHOD m_xibosnri brush (JLnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_sddaxwyk;)Z
 		ARG 1 ticks
-		ARG 3 player
+		ARG 4 player