22w12a

build.gradle

@@ -27,7 +27,7 @@ plugins {
 	id 'net.fabricmc.filament' version '0.3.0'
 }
 
-def minecraft_version = "22w11a"
+def minecraft_version = "22w12a"
 
 def ENV = System.getenv()
 // Fetch build number from Github Actions

mappings/net/minecraft/block/AbstractBlock.mapping

@@ -315,8 +315,6 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 			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 method_16229 dropsNothing ()Lnet/minecraft/class_4970$class_2251;
-			COMMENT Specifies that a block drops nothing when broken.
 		METHOD method_22488 nonOpaque ()Lnet/minecraft/class_4970$class_2251;
 			COMMENT Specifies that a block should be non-opaque and light should be allowed to pass through.
 		METHOD method_23351 velocityMultiplier (F)Lnet/minecraft/class_4970$class_2251;

mappings/net/minecraft/block/BlockEntityProvider.mapping

@@ -6,6 +6,5 @@ CLASS net/minecraft/class_2343 net/minecraft/block/BlockEntityProvider
 		ARG 1 world
 		ARG 2 state
 		ARG 3 type
-	METHOD method_32896 getGameEventListener (Lnet/minecraft/class_1937;Lnet/minecraft/class_2586;)Lnet/minecraft/class_5714;
+	METHOD method_32896 getGameEventListener (Lnet/minecraft/class_3218;Lnet/minecraft/class_2586;)Lnet/minecraft/class_5714;
-		ARG 1 world
 		ARG 2 blockEntity

mappings/net/minecraft/block/SculkSensorBlock.mapping

@@ -15,11 +15,7 @@ CLASS net/minecraft/class_5703 net/minecraft/block/SculkSensorBlock
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 state
-	METHOD method_32904 setActive (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)V
+	METHOD method_32904 setActive (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)V
-		ARG 0 world
-		ARG 1 pos
-		ARG 2 state
-		ARG 3 power
 	METHOD method_32905 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5704;)V
 		ARG 0 world
 		ARG 1 pos

mappings/net/minecraft/block/SculkShriekerBlock.mapping

@@ -1,3 +0,0 @@
-CLASS net/minecraft/class_7127 net/minecraft/block/SculkShriekerBlock
-	FIELD field_37606 SHAPE Lnet/minecraft/class_265;
-	FIELD field_37607 SHRIEKING Lnet/minecraft/class_2746;

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

@@ -9,7 +9,6 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn
 	FIELD field_11988 cookTimeTotal I
 	FIELD field_11989 cookTime I
 	FIELD field_17374 propertyDelegate Lnet/minecraft/class_3913;
-	FIELD field_17582 recipeType Lnet/minecraft/class_3956;
 	METHOD <init> (Lnet/minecraft/class_2591;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3956;)V
 		ARG 1 blockEntityType
 		ARG 2 pos
@@ -37,10 +36,7 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn
 		ARG 0 recipe
 		ARG 1 slots
 		ARG 2 count
-	METHOD method_17029 getCookTime (Lnet/minecraft/class_1937;Lnet/minecraft/class_3956;Lnet/minecraft/class_1263;)I
+	METHOD method_17029 getCookTime (Lnet/minecraft/class_1937;Lnet/minecraft/class_2609;)I
-		ARG 0 world
-		ARG 1 recipeType
-		ARG 2 inventory
 	METHOD method_17760 dropExperience (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;IF)V
 		ARG 0 world
 		ARG 1 pos

mappings/net/minecraft/class_7248.mapping

@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_7248
+	METHOD method_6722 openInventory (Lnet/minecraft/class_1657;)V

mappings/net/minecraft/class_7265.mapping

@@ -0,0 +1,4 @@
+CLASS net/minecraft/class_7265
+	METHOD method_19538 getPos ()Lnet/minecraft/class_243;
+	METHOD method_31481 isRemoved ()Z
+	METHOD method_37908 getWorld ()Lnet/minecraft/class_1937;

mappings/net/minecraft/client/font/Glyph.mapping

@@ -5,3 +5,4 @@ CLASS net/minecraft/class_379 net/minecraft/client/font/Glyph
 		ARG 1 bold
 	METHOD method_16799 getBoldOffset ()F
 	METHOD method_16800 getShadowOffset ()F
+	CLASS class_7167 EmptyGlyph

mappings/net/minecraft/client/font/SpaceFont.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_7166 net/minecraft/client/font/SpaceFont
-	FIELD field_37841 EMPTY_GLYPH_RENDERER Lnet/minecraft/class_384;
 	FIELD field_37842 codePointsToGlyphs Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
 	METHOD <init> (Lit/unimi/dsi/fastutil/ints/Int2FloatMap;)V
 		ARG 1 codePointsToAdvances
@@ -9,4 +8,3 @@ CLASS net/minecraft/class_7166 net/minecraft/client/font/SpaceFont
 		ARG 1 entry
 	METHOD method_41717 (Lit/unimi/dsi/fastutil/ints/Int2FloatMap;Lnet/minecraft/class_3300;)Lnet/minecraft/class_390;
 		ARG 0 manager
-	CLASS class_7167 EmptyGlyph

mappings/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.mapping

@@ -9,5 +9,5 @@ CLASS net/minecraft/class_4189 net/minecraft/client/gui/screen/option/Accessibil
 		ARG 1 button
 	METHOD method_31386 (Z)V
 		ARG 1 openInBrowser
-	METHOD method_41839 getOptions (Lnet/minecraft/class_315;)[Lnet/minecraft/class_316;
+	METHOD method_41839 getOptions (Lnet/minecraft/class_315;)[Lnet/minecraft/class_7172;
 		ARG 0 gameOptions

mappings/net/minecraft/client/gui/screen/option/MouseOptionsScreen.mapping

@@ -5,5 +5,5 @@ CLASS net/minecraft/class_4288 net/minecraft/client/gui/screen/option/MouseOptio
 		ARG 2 gameOptions
 	METHOD method_20411 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
-	METHOD method_41841 getOptons (Lnet/minecraft/class_315;)[Lnet/minecraft/class_316;
+	METHOD method_41841 getOptons (Lnet/minecraft/class_315;)[Lnet/minecraft/class_7172;
 		ARG 0 gameOptions

mappings/net/minecraft/client/gui/screen/option/OnlineOptionsScreen.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_6777 net/minecraft/client/gui/screen/option/OnlineOptionsScreen
-	FIELD field_35638 OPTIONS [Lnet/minecraft/class_316;
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
 		ARG 1 parent
 		ARG 2 gameOptions

mappings/net/minecraft/client/gui/screen/option/SimpleOptionsScreen.mapping

@@ -1,8 +1,8 @@
 CLASS net/minecraft/class_5500 net/minecraft/client/gui/screen/option/SimpleOptionsScreen
-	FIELD field_26679 options [Lnet/minecraft/class_316;
+	FIELD field_26679 options [Lnet/minecraft/class_7172;
 	FIELD field_26680 narratorButton Lnet/minecraft/class_339;
 	FIELD field_26681 buttonList Lnet/minecraft/class_353;
-	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;Lnet/minecraft/class_2561;[Lnet/minecraft/class_316;)V
+	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;Lnet/minecraft/class_2561;[Lnet/minecraft/class_7172;)V
 		ARG 1 parent
 		ARG 2 gameOptions
 		ARG 3 title

mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping

@@ -21,5 +21,5 @@ CLASS net/minecraft/class_446 net/minecraft/client/gui/screen/option/VideoOption
 		ARG 2 value
 	METHOD method_41845 (Lnet/minecraft/class_313;Lnet/minecraft/class_2588;Ljava/lang/Integer;)Lnet/minecraft/class_2561;
 		ARG 2 value
-	METHOD method_41846 getOptions (Lnet/minecraft/class_315;)[Lnet/minecraft/class_316;
+	METHOD method_41846 getOptions (Lnet/minecraft/class_315;)[Lnet/minecraft/class_7172;
 		ARG 0 gameOptions

mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping

@@ -1,15 +1,15 @@
 CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/ButtonListWidget
-	METHOD method_20406 addSingleOptionEntry (Lnet/minecraft/class_316;)I
+	METHOD method_20406 addSingleOptionEntry (Lnet/minecraft/class_7172;)I
 		ARG 1 option
-	METHOD method_20407 addOptionEntry (Lnet/minecraft/class_316;Lnet/minecraft/class_316;)V
+	METHOD method_20407 addOptionEntry (Lnet/minecraft/class_7172;Lnet/minecraft/class_7172;)V
 		ARG 1 firstOption
 		ARG 2 secondOption
-	METHOD method_20408 addAll ([Lnet/minecraft/class_316;)V
+	METHOD method_20408 addAll ([Lnet/minecraft/class_7172;)V
 		ARG 1 options
 	METHOD method_29624 getHoveredButton (DD)Ljava/util/Optional;
 		ARG 1 mouseX
 		ARG 3 mouseY
-	METHOD method_31046 getButtonFor (Lnet/minecraft/class_316;)Lnet/minecraft/class_339;
+	METHOD method_31046 getButtonFor (Lnet/minecraft/class_7172;)Lnet/minecraft/class_339;
 		ARG 1 option
 	CLASS class_354 ButtonEntry
 		FIELD field_18214 buttons Ljava/util/List;
@@ -18,11 +18,11 @@ CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/ButtonListWidget
 			ARG 1 optionsToButtons
 		METHOD method_18622 (ILnet/minecraft/class_4587;IIFLnet/minecraft/class_339;)V
 			ARG 5 button
-		METHOD method_20409 create (Lnet/minecraft/class_315;ILnet/minecraft/class_316;)Lnet/minecraft/class_353$class_354;
+		METHOD method_20409 create (Lnet/minecraft/class_315;ILnet/minecraft/class_7172;)Lnet/minecraft/class_353$class_354;
 			ARG 0 options
 			ARG 1 width
 			ARG 2 option
-		METHOD method_20410 create (Lnet/minecraft/class_315;ILnet/minecraft/class_316;Lnet/minecraft/class_316;)Lnet/minecraft/class_353$class_354;
+		METHOD method_20410 create (Lnet/minecraft/class_315;ILnet/minecraft/class_7172;Lnet/minecraft/class_7172;)Lnet/minecraft/class_353$class_354;
 			ARG 0 options
 			ARG 1 width
 			ARG 2 firstOption

mappings/net/minecraft/client/gui/widget/CyclingButtonWidget.mapping

@@ -8,9 +8,9 @@ CLASS net/minecraft/class_5676 net/minecraft/client/gui/widget/CyclingButtonWidg
 	FIELD field_27967 valueToText Ljava/util/function/Function;
 	FIELD field_27968 narrationMessageFactory Ljava/util/function/Function;
 	FIELD field_27969 callback Lnet/minecraft/class_5676$class_5678;
-	FIELD field_27970 tooltipFactory Lnet/minecraft/class_316$class_5679;
+	FIELD field_27970 tooltipFactory Lnet/minecraft/class_7172$class_7277;
 	FIELD field_27971 optionTextOmitted Z
-	METHOD <init> (IIIILnet/minecraft/class_2561;Lnet/minecraft/class_2561;ILjava/lang/Object;Lnet/minecraft/class_5676$class_5680;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/class_5676$class_5678;Lnet/minecraft/class_316$class_5679;Z)V
+	METHOD <init> (IIIILnet/minecraft/class_2561;Lnet/minecraft/class_2561;ILjava/lang/Object;Lnet/minecraft/class_5676$class_5680;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/class_5676$class_5678;Lnet/minecraft/class_7172$class_7277;Z)V
 		ARG 1 x
 		ARG 2 y
 		ARG 3 width
@@ -82,7 +82,7 @@ CLASS net/minecraft/class_5676 net/minecraft/client/gui/widget/CyclingButtonWidg
 		FIELD field_27972 initialIndex I
 		FIELD field_27973 value Ljava/lang/Object;
 		FIELD field_27974 valueToText Ljava/util/function/Function;
-		FIELD field_27975 tooltipFactory Lnet/minecraft/class_316$class_5679;
+		FIELD field_27975 tooltipFactory Lnet/minecraft/class_7172$class_7277;
 		FIELD field_27976 narrationMessageFactory Ljava/util/function/Function;
 		FIELD field_27977 values Lnet/minecraft/class_5676$class_5680;
 		FIELD field_27978 optionTextOmitted Z
@@ -105,7 +105,7 @@ CLASS net/minecraft/class_5676 net/minecraft/client/gui/widget/CyclingButtonWidg
 			ARG 4 height
 			ARG 5 optionText
 			ARG 6 callback
-		METHOD method_32618 tooltip (Lnet/minecraft/class_316$class_5679;)Lnet/minecraft/class_5676$class_5677;
+		METHOD method_32618 tooltip (Lnet/minecraft/class_7172$class_7277;)Lnet/minecraft/class_5676$class_5677;
 			COMMENT Sets the tooltip factory that provides tooltips for any of the values.
 			COMMENT
 			COMMENT <p>If this is not called, the values simply won't have tooltips.

mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping

@@ -1,11 +0,0 @@
-CLASS net/minecraft/class_4040 net/minecraft/client/gui/widget/DoubleOptionSliderWidget
-	FIELD field_18012 option Lnet/minecraft/class_4067;
-	FIELD field_27984 orderedTooltip Lnet/minecraft/class_316$class_5679;
-	METHOD <init> (Lnet/minecraft/class_315;IIIILnet/minecraft/class_4067;Lnet/minecraft/class_316$class_5679;)V
-		ARG 1 gameOptions
-		ARG 2 x
-		ARG 3 y
-		ARG 4 width
-		ARG 5 height
-		ARG 6 option
-		ARG 7 orderedTooltip

mappings/net/minecraft/client/input/Input.mapping

@@ -9,5 +9,5 @@ CLASS net/minecraft/class_744 net/minecraft/client/input/Input
 	FIELD field_3910 pressingForward Z
 	METHOD method_20622 hasForwardMovement ()Z
 	METHOD method_3128 getMovementInput ()Lnet/minecraft/class_241;
-	METHOD method_3129 tick (Z)V
+	METHOD method_3129 tick (ZF)V
 		ARG 1 slowDown

mappings/net/minecraft/client/option/CyclingOption.mapping

@@ -1,65 +0,0 @@
-CLASS net/minecraft/class_4064 net/minecraft/client/option/CyclingOption
-	FIELD field_18169 setter Lnet/minecraft/class_4064$class_5675;
-	FIELD field_27953 getter Ljava/util/function/Function;
-	FIELD field_27954 buttonBuilderFactory Ljava/util/function/Supplier;
-	FIELD field_27955 tooltips Ljava/util/function/Function;
-	METHOD <init> (Ljava/lang/String;Ljava/util/function/Function;Lnet/minecraft/class_4064$class_5675;Ljava/util/function/Supplier;)V
-		ARG 1 key
-		ARG 2 getter
-		ARG 3 setter
-		ARG 4 buttonBuilderFactory
-	METHOD method_32519 (Lnet/minecraft/class_315;Lnet/minecraft/class_5676;Ljava/lang/Object;)V
-		ARG 2 button
-		ARG 3 value
-	METHOD method_32521 create (Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/function/BooleanSupplier;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/class_4064$class_5675;)Lnet/minecraft/class_4064;
-		ARG 0 key
-		ARG 1 defaults
-		ARG 2 alternatives
-		ARG 3 alternativeToggle
-		ARG 4 valueToText
-		ARG 5 getter
-		ARG 6 setter
-	METHOD method_32522 create (Ljava/lang/String;Ljava/util/function/Function;Lnet/minecraft/class_4064$class_5675;)Lnet/minecraft/class_4064;
-		ARG 0 key
-		ARG 1 getter
-		ARG 2 setter
-	METHOD method_32523 create (Ljava/lang/String;Ljava/util/function/Supplier;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/class_4064$class_5675;)Lnet/minecraft/class_4064;
-		ARG 0 key
-		ARG 1 valuesSupplier
-		ARG 2 valueToText
-		ARG 3 getter
-		ARG 4 setter
-	METHOD method_32524 create (Ljava/lang/String;Lnet/minecraft/class_2561;Ljava/util/function/Function;Lnet/minecraft/class_4064$class_5675;)Lnet/minecraft/class_4064;
-		ARG 0 key
-		ARG 1 tooltip
-		ARG 2 getter
-		ARG 3 setter
-	METHOD method_32525 create (Ljava/lang/String;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/util/function/Function;Lnet/minecraft/class_4064$class_5675;)Lnet/minecraft/class_4064;
-		ARG 0 key
-		ARG 1 on
-		ARG 2 off
-		ARG 3 getter
-		ARG 4 setter
-	METHOD method_32526 create (Ljava/lang/String;[Ljava/lang/Object;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/class_4064$class_5675;)Lnet/minecraft/class_4064;
-		ARG 0 key
-		ARG 1 values
-		ARG 2 valueToText
-		ARG 3 getter
-		ARG 4 setter
-	METHOD method_32527 (Ljava/util/List;Ljava/lang/Boolean;)Ljava/util/List;
-		ARG 1 value
-	METHOD method_32528 tooltip (Ljava/util/function/Function;)Lnet/minecraft/class_4064;
-		ARG 1 tooltips
-	METHOD method_32532 (Lnet/minecraft/class_2561;Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679;
-		ARG 1 client
-	METHOD method_35694 create (Ljava/lang/String;Ljava/util/List;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/class_4064$class_5675;)Lnet/minecraft/class_4064;
-		ARG 0 key
-		ARG 1 values
-		ARG 2 valueToText
-		ARG 3 getter
-		ARG 4 setter
-	CLASS class_5675 Setter
-		METHOD accept (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Object;)V
-			ARG 1 gameOptions
-			ARG 2 option
-			ARG 3 value

mappings/net/minecraft/client/option/DoubleOption.mapping

@@ -1,54 +0,0 @@
-CLASS net/minecraft/class_4067 net/minecraft/client/option/DoubleOption
-	FIELD field_18204 step F
-	FIELD field_18205 min D
-	FIELD field_18206 max D
-	FIELD field_18207 getter Ljava/util/function/Function;
-	FIELD field_18208 setter Ljava/util/function/BiConsumer;
-	FIELD field_18209 displayStringGetter Ljava/util/function/BiFunction;
-	FIELD field_27958 tooltipsGetter Ljava/util/function/Function;
-	METHOD <init> (Ljava/lang/String;DDFLjava/util/function/Function;Ljava/util/function/BiConsumer;Ljava/util/function/BiFunction;)V
-		ARG 1 key
-		ARG 2 min
-		ARG 4 max
-		ARG 6 step
-		ARG 7 getter
-		ARG 8 setter
-		ARG 9 displayStringGetter
-	METHOD <init> (Ljava/lang/String;DDFLjava/util/function/Function;Ljava/util/function/BiConsumer;Ljava/util/function/BiFunction;Ljava/util/function/Function;)V
-		ARG 1 key
-		ARG 2 min
-		ARG 4 max
-		ARG 6 step
-		ARG 7 getter
-		ARG 8 setter
-		ARG 9 displayStringGetter
-		ARG 10 tooltipsGetter
-	METHOD method_18611 getRatio (D)D
-		ARG 1 value
-	METHOD method_18612 setMax (F)V
-		ARG 1 max
-	METHOD method_18613 get (Lnet/minecraft/class_315;)D
-		ARG 1 options
-	METHOD method_18614 set (Lnet/minecraft/class_315;D)V
-		ARG 1 options
-		ARG 2 value
-	METHOD method_18615 getMin ()D
-	METHOD method_18616 getValue (D)D
-		ARG 1 ratio
-	METHOD method_18617 getMax ()D
-	METHOD method_18618 adjust (D)D
-		ARG 1 value
-	METHOD method_18619 getDisplayString (Lnet/minecraft/class_315;)Lnet/minecraft/class_2561;
-		ARG 1 options
-	METHOD method_41809 getPixelValueText (I)Lnet/minecraft/class_2561;
-		ARG 1 value
-	METHOD method_41810 (Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679;
-		ARG 0 client
-	METHOD method_41811 (Ljava/lang/Double;)Ljava/util/List;
-		ARG 0 value
-	METHOD method_41812 getGenericValueText (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561;
-		ARG 1 value
-	METHOD method_41813 getGenericValueText (I)Lnet/minecraft/class_2561;
-		ARG 1 value
-	METHOD method_41814 getPercentValueText (D)Lnet/minecraft/class_2561;
-		ARG 1 value

mappings/net/minecraft/client/option/GameOptions.mapping

@@ -1,13 +1,13 @@
 CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
-	FIELD field_1814 cloudRenderMode Lnet/minecraft/class_4063;
+	FIELD field_1814 cloudRenderMode Lnet/minecraft/class_7172;
 	FIELD field_1815 hideServerAddress Z
 	FIELD field_1816 smoothCameraKey Lnet/minecraft/class_304;
 		COMMENT A key binding for toggling smooth camera.
 		COMMENT Not bound to any keys by default.
-	FIELD field_1817 chatLinksPrompt Z
+	FIELD field_1817 chatLinksPrompt Lnet/minecraft/class_7172;
-	FIELD field_1818 showSubtitles Z
+	FIELD field_1818 showSubtitles Lnet/minecraft/class_7172;
-	FIELD field_1819 forceUnicodeFont Z
+	FIELD field_1819 forceUnicodeFont Lnet/minecraft/class_7172;
-	FIELD field_1820 chatOpacity D
+	FIELD field_1820 chatOpacity Lnet/minecraft/class_7172;
 	FIELD field_1822 inventoryKey Lnet/minecraft/class_304;
 		COMMENT A key binding for opening {@linkplain net.minecraft.client.gui.screen.ingame.InventoryScreen the inventory screen}.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_E the E key} by default.
@@ -19,8 +19,8 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 	FIELD field_1826 fov Lnet/minecraft/class_7172;
 	FIELD field_1827 advancedItemTooltips Z
 	FIELD field_1828 fullscreenResolution Ljava/lang/String;
-	FIELD field_1829 mainArm Lnet/minecraft/class_1306;
+	FIELD field_1829 mainArm Lnet/minecraft/class_7172;
-	FIELD field_1830 realmsNotifications Z
+	FIELD field_1830 realmsNotifications Lnet/minecraft/class_7172;
 	FIELD field_1831 swapHandsKey Lnet/minecraft/class_304;
 		COMMENT A key binding for swapping the items in the selected slot and the off hand.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_F the F key} by default.
@@ -45,10 +45,10 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 		COMMENT <p>Key bindings in this array are shown and can be configured in
 		COMMENT {@linkplain net.minecraft.client.gui.screen.option.ControlsOptionsScreen
 		COMMENT the controls options screen}.
-	FIELD field_1840 gamma D
+	FIELD field_1840 gamma Lnet/minecraft/class_7172;
 	FIELD field_1841 ao Lnet/minecraft/class_7172;
 	FIELD field_1842 hudHidden Z
-	FIELD field_1843 mouseSensitivity D
+	FIELD field_1843 mouseSensitivity Lnet/minecraft/class_7172;
 	FIELD field_1844 advancementsKey Lnet/minecraft/class_304;
 		COMMENT A key binding for opening {@linkplain net.minecraft.client.gui.screen.advancement.AdvancementsScreen the advancements screen}.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_L the L key} by default.
@@ -57,51 +57,50 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 		COMMENT the chat screen} with the {@code /} already typed.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_SLASH the slash key} by default.
 	FIELD field_1846 incompatibleResourcePacks Ljava/util/List;
-	FIELD field_1848 autoJump Z
+	FIELD field_1848 autoJump Lnet/minecraft/class_7172;
 	FIELD field_1849 rightKey Lnet/minecraft/class_304;
 		COMMENT A key binding for moving right.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_D the D key} by default.
-	FIELD field_1851 difficulty Lnet/minecraft/class_1267;
 	FIELD field_1852 hotbarKeys [Lnet/minecraft/class_304;
 		COMMENT Key bindings for selecting hotbar slots.
 		COMMENT Bound to the corresponding number keys (from {@linkplain
 		COMMENT org.lwjgl.glfw.GLFW#GLFW_KEY_1 the 1 key} to {@linkplain
 		COMMENT org.lwjgl.glfw.GLFW#GLFW_KEY_9 the 9 key}) by default.
 	FIELD field_1853 COLON_SPLITTER Lcom/google/common/base/Splitter;
-	FIELD field_1854 touchscreen Z
+	FIELD field_1854 touchscreen Lnet/minecraft/class_7172;
-	FIELD field_1856 mipmapLevels I
+	FIELD field_1856 mipmapLevels Lnet/minecraft/class_7172;
-	FIELD field_1857 fullscreen Z
+	FIELD field_1857 fullscreen Lnet/minecraft/class_7172;
 	FIELD field_1859 STRING_LIST_TYPE Lcom/google/gson/reflect/TypeToken;
 	FIELD field_1863 client Lnet/minecraft/class_310;
 	FIELD field_1864 lastServer Ljava/lang/String;
-	FIELD field_1865 invertYMouse Z
+	FIELD field_1865 invertYMouse Lnet/minecraft/class_7172;
 	FIELD field_1866 debugEnabled Z
 	FIELD field_1867 sprintKey Lnet/minecraft/class_304;
 		COMMENT A key binding for sprinting.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_LEFT_CONTROL the left control key} by default.
-	FIELD field_1868 guiScale I
+	FIELD field_1868 guiScale Lnet/minecraft/class_7172;
 	FIELD field_1869 dropKey Lnet/minecraft/class_304;
 		COMMENT A key binding for dropping the item in the selected slot.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_Q the Q key} by default.
 		COMMENT
 		COMMENT <p>The selected slot is the slot the mouse is over when in a screen.
 		COMMENT Otherwise, it is the main hand.
-	FIELD field_1870 viewDistance I
+	FIELD field_1870 viewDistance Lnet/minecraft/class_7172;
 	FIELD field_1871 pickItemKey Lnet/minecraft/class_304;
 		COMMENT A key binding for holding an item corresponding to the {@linkplain net.minecraft.entity.Entity#getPickBlockStack() entity}
 		COMMENT or {@linkplain net.minecraft.block.Block#getPickStack(net.minecraft.world.BlockView,
 		COMMENT net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState) block} the player is looking at.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_MOUSE_BUTTON_MIDDLE the middle mouse button} by default.
-	FIELD field_18725 backgroundForChatOnly Z
+	FIELD field_18725 backgroundForChatOnly Lnet/minecraft/class_7172;
-	FIELD field_18726 textBackgroundOpacity D
+	FIELD field_18726 textBackgroundOpacity Lnet/minecraft/class_7172;
 	FIELD field_1872 overrideWidth I
-	FIELD field_1873 autoSuggestions Z
+	FIELD field_1873 autoSuggestions Lnet/minecraft/class_7172;
 	FIELD field_1874 loadToolbarActivatorKey Lnet/minecraft/class_304;
 		COMMENT A key binding for loading the hotbar items in {@linkplain net.minecraft.world.GameMode#CREATIVE creative mode}.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_X the X key} by default.
 	FIELD field_1875 tutorialStep Lnet/minecraft/class_1157;
 	FIELD field_1876 useNativeTransport Z
-	FIELD field_1877 chatVisibility Lnet/minecraft/class_1659;
+	FIELD field_1877 chatVisibility Lnet/minecraft/class_7172;
 	FIELD field_1878 biomeBlendRadius Lnet/minecraft/class_7172;
 	FIELD field_1879 saveToolbarActivatorKey Lnet/minecraft/class_304;
 		COMMENT A key binding for saving the hotbar items in {@linkplain net.minecraft.world.GameMode#CREATIVE creative mode}.
@@ -110,29 +109,29 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 	FIELD field_1881 backKey Lnet/minecraft/class_304;
 		COMMENT A key binding for moving backward.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_S the S key} by default.
-	FIELD field_1882 particles Lnet/minecraft/class_4066;
+	FIELD field_1882 particles Lnet/minecraft/class_7172;
 	FIELD field_1883 language Ljava/lang/String;
-	FIELD field_1884 enableVsync Z
+	FIELD field_1884 enableVsync Lnet/minecraft/class_7172;
 	FIELD field_1885 overrideHeight I
 	FIELD field_1886 attackKey Lnet/minecraft/class_304;
 		COMMENT A key binding for attacking an entity or breaking a block.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_MOUSE_BUTTON_LEFT the left mouse button} by default.
 	FIELD field_1887 resourcePacks Ljava/util/List;
-	FIELD field_1888 entityShadows Z
+	FIELD field_1888 entityShadows Lnet/minecraft/class_7172;
 	FIELD field_1889 mouseWheelSensitivity Lnet/minecraft/class_7172;
 	FIELD field_1890 chatKey Lnet/minecraft/class_304;
 		COMMENT A key binding for opening {@linkplain net.minecraft.client.gui.screen.ChatScreen the chat screen}.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_T the T key} by default.
-	FIELD field_1891 bobView Z
+	FIELD field_1891 bobView Lnet/minecraft/class_7172;
 	FIELD field_1892 enabledPlayerModelParts Ljava/util/Set;
 	FIELD field_1893 debugTpsEnabled Z
 	FIELD field_1894 forwardKey Lnet/minecraft/class_304;
 		COMMENT A key binding for moving forward.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_W the W key} by default.
-	FIELD field_1895 attackIndicator Lnet/minecraft/class_4061;
+	FIELD field_1895 attackIndicator Lnet/minecraft/class_7172;
-	FIELD field_1896 narrator Lnet/minecraft/class_4065;
+	FIELD field_1896 narrator Lnet/minecraft/class_7172;
 	FIELD field_1897 optionsFile Ljava/io/File;
-	FIELD field_1900 chatColors Z
+	FIELD field_1900 chatColors Lnet/minecraft/class_7172;
 	FIELD field_1901 glDebugVerbosity I
 	FIELD field_1903 jumpKey Lnet/minecraft/class_304;
 		COMMENT A key binding for jumping.
@@ -147,53 +146,52 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 	FIELD field_1907 playerListKey Lnet/minecraft/class_304;
 		COMMENT A key binding for displaying {@linkplain net.minecraft.client.gui.hud.PlayerListHud the player list}.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_TAB the tab key} by default.
-	FIELD field_1908 chatScale D
+	FIELD field_1908 chatScale Lnet/minecraft/class_7172;
-	FIELD field_1909 maxFps I
+	FIELD field_1909 maxFps Lnet/minecraft/class_7172;
-	FIELD field_1910 reducedDebugInfo Z
+	FIELD field_1910 reducedDebugInfo Lnet/minecraft/class_7172;
-	FIELD field_1911 chatLinks Z
+	FIELD field_1911 chatLinks Lnet/minecraft/class_7172;
 	FIELD field_1913 leftKey Lnet/minecraft/class_304;
 		COMMENT A key binding for moving left.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_A the A key} by default.
 	FIELD field_1914 smoothCameraEnabled Z
-	FIELD field_1915 chatWidth D
+	FIELD field_1915 chatWidth Lnet/minecraft/class_7172;
 	FIELD field_1916 soundVolumeLevels Lit/unimi/dsi/fastutil/objects/Object2FloatMap;
-	FIELD field_19244 discreteMouseScroll Z
+	FIELD field_19244 discreteMouseScroll Lnet/minecraft/class_7172;
 	FIELD field_20308 rawMouseInput Lnet/minecraft/class_7172;
-	FIELD field_21332 sneakToggled Z
+	FIELD field_21332 sneakToggled Lnet/minecraft/class_7172;
-	FIELD field_21333 sprintToggled Z
+	FIELD field_21333 sprintToggled Lnet/minecraft/class_7172;
 	FIELD field_21840 skipMultiplayerWarning Z
-	FIELD field_23932 chatLineSpacing D
+	FIELD field_23932 chatLineSpacing Lnet/minecraft/class_7172;
-	FIELD field_23933 chatDelay D
+	FIELD field_23933 chatDelay Lnet/minecraft/class_7172;
-	FIELD field_24214 entityDistanceScaling F
+	FIELD field_24214 entityDistanceScaling Lnet/minecraft/class_7172;
-	FIELD field_25444 graphicsMode Lnet/minecraft/class_5365;
+	FIELD field_25444 graphicsMode Lnet/minecraft/class_7172;
 	FIELD field_25623 syncChunkWrites Z
-	FIELD field_26675 distortionEffectScale F
+	FIELD field_26675 distortionEffectScale Lnet/minecraft/class_7172;
-	FIELD field_26676 fovEffectScale F
+	FIELD field_26676 fovEffectScale Lnet/minecraft/class_7172;
 	FIELD field_26677 perspective Lnet/minecraft/class_5498;
 	FIELD field_26844 joinedFirstServer Z
 	FIELD field_26845 socialInteractionsKey Lnet/minecraft/class_304;
 		COMMENT A key binding for opening {@linkplain net.minecraft.client.gui.screen.multiplayer.SocialInteractionsScreen the social interactions screen}.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_P the P key} by default.
-	FIELD field_26926 hideMatchedNames Z
+	FIELD field_26926 hideMatchedNames Lnet/minecraft/class_7172;
 	FIELD field_28777 hideBundleTutorial Z
 	FIELD field_32156 monochromeLogo Lnet/minecraft/class_7172;
-	FIELD field_34783 soundDevice Ljava/lang/String;
+	FIELD field_34783 soundDevice Lnet/minecraft/class_7172;
 	FIELD field_34784 serverViewDistance I
 	FIELD field_34785 EMPTY_STRING Ljava/lang/String;
 	FIELD field_34786 hideLightningFlashes Lnet/minecraft/class_7172;
 	FIELD field_34787 chunkBuilderMode Lnet/minecraft/class_7172;
-	FIELD field_34959 simulationDistance I
+	FIELD field_34959 simulationDistance Lnet/minecraft/class_7172;
-	FIELD field_35426 showAutosaveIndicator Z
+	FIELD field_35426 showAutosaveIndicator Lnet/minecraft/class_7172;
-	FIELD field_35637 allowServerListing Z
+	FIELD field_35637 allowServerListing Lnet/minecraft/class_7172;
 	FIELD field_37208 skipRealms32BitWarning Z
-	FIELD field_37877 directionalAudio Z
+	FIELD field_37877 directionalAudio Lnet/minecraft/class_7172;
 	FIELD field_37878 DARK_MOJANG_STUDIOS_BACKGROUND_COLOR_TOOLTIP Lnet/minecraft/class_2561;
 	FIELD field_37879 HIDE_LIGHTNING_FLASHES_TOOLTIP Lnet/minecraft/class_2561;
 	FIELD field_37880 NONE_CHUNK_BUILDER_MODE_TOOLTIP Lnet/minecraft/class_2561;
 	FIELD field_37881 BY_PLAYER_CHUNK_BUILDER_MODE_TOOLTIP Lnet/minecraft/class_2561;
 	FIELD field_37882 NEARBY_CHUNK_BUILDER_MODE_TOOLTIP Lnet/minecraft/class_2561;
 	METHOD <init> (Lnet/minecraft/class_310;Ljava/io/File;)V
-		ARG 1 client
 		ARG 2 optionsFile
 	METHOD method_1624 setSoundVolume (Lnet/minecraft/class_3419;F)V
 		ARG 1 category
@@ -240,12 +238,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 		ARG 0 value
 	METHOD method_32596 isFalse (Ljava/lang/String;)Z
 		ARG 0 value
-	METHOD method_33663 saveArm (Lnet/minecraft/class_1306;)Ljava/lang/String;
-		ARG 0 arm
-	METHOD method_33664 (Lnet/minecraft/class_4060;)Ljava/lang/String;
-		ARG 0 ao
-	METHOD method_33665 saveCloudRenderMode (Lnet/minecraft/class_4063;)Ljava/lang/String;
-		ARG 0 mode
 	METHOD method_33666 accept (Lnet/minecraft/class_315$class_5823;)V
 		ARG 1 visitor
 	METHOD method_33667 (Lnet/minecraft/class_315$class_5823;Lnet/minecraft/class_3419;Ljava/lang/Float;)Ljava/lang/Float;
@@ -255,12 +247,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 		ARG 0 map
 	METHOD method_33671 parseList (Ljava/lang/String;)Ljava/util/List;
 		ARG 0 content
-	METHOD method_33672 loadCloudRenderMode (Ljava/lang/String;)Lnet/minecraft/class_4063;
-		ARG 0 literal
-	METHOD method_33674 loadAo (Ljava/lang/String;)Lnet/minecraft/class_4060;
-		ARG 0 value
-	METHOD method_33675 loadArm (Ljava/lang/String;)Lnet/minecraft/class_1306;
-		ARG 0 arm
 	METHOD method_37293 (Lcom/mojang/datafixers/util/Pair;)Ljava/lang/String;
 		ARG 0 option
 	METHOD method_37294 getOptionsFile ()Ljava/io/File;
@@ -271,7 +257,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 	METHOD method_41772 getMonochromeLogo ()Lnet/minecraft/class_7172;
 	METHOD method_41773 toMouseWheelSensitivitySliderProgressValue (D)I
 		ARG 0 value
-	METHOD method_41774 (Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679;
+	METHOD method_41774 (Lnet/minecraft/class_310;)Lnet/minecraft/class_7172$class_7277;
 		ARG 0 client
 	METHOD method_41775 (Lnet/minecraft/class_310;Lnet/minecraft/class_6597;)Ljava/util/List;
 		ARG 1 value
@@ -297,7 +283,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 	METHOD method_41784 getHideLightningFlashes ()Lnet/minecraft/class_7172;
 	METHOD method_41785 (Lnet/minecraft/class_4060;)V
 		ARG 0 value
-	METHOD method_41786 (Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679;
+	METHOD method_41786 (Lnet/minecraft/class_310;)Lnet/minecraft/class_7172$class_7277;
 		ARG 0 client
 	METHOD method_41787 (Lnet/minecraft/class_6597;)Lnet/minecraft/class_2561;
 		ARG 0 value
@@ -315,7 +301,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 		ARG 0 value
 	METHOD method_41794 (Lnet/minecraft/class_4060;)Lnet/minecraft/class_2561;
 		ARG 0 aoMode
-	METHOD method_41795 (Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679;
+	METHOD method_41795 (Lnet/minecraft/class_310;)Lnet/minecraft/class_7172$class_7277;
 		ARG 0 client
 	METHOD method_41796 (Ljava/lang/Double;)V
 		ARG 0 value
@@ -343,9 +329,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 		METHOD method_33677 print (Ljava/lang/String;)V
 			ARG 1 key
 	CLASS class_5823 Visitor
-		METHOD method_33678 visitDouble (Ljava/lang/String;D)D
-			ARG 1 key
-			ARG 2 current
 		METHOD method_33679 visitFloat (Ljava/lang/String;F)F
 			ARG 1 key
 			ARG 2 current
@@ -357,11 +340,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 			ARG 2 current
 			ARG 3 decoder
 			ARG 4 encoder
-		METHOD method_33682 visitObject (Ljava/lang/String;Ljava/lang/Object;Ljava/util/function/IntFunction;Ljava/util/function/ToIntFunction;)Ljava/lang/Object;
-			ARG 1 key
-			ARG 2 current
-			ARG 3 decoder
-			ARG 4 encoder
 		METHOD method_33683 visitString (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 			ARG 1 key
 			ARG 2 current

mappings/net/minecraft/client/option/Option.mapping

@@ -1,420 +0,0 @@
-CLASS net/minecraft/class_316 net/minecraft/client/option/Option
-	FIELD field_18184 ENTITY_SHADOWS Lnet/minecraft/class_4064;
-	FIELD field_18185 FORCE_UNICODE_FONT Lnet/minecraft/class_4064;
-	FIELD field_18186 REALMS_NOTIFICATIONS Lnet/minecraft/class_4064;
-	FIELD field_18187 REDUCED_DEBUG_INFO Lnet/minecraft/class_4064;
-	FIELD field_18188 SUBTITLES Lnet/minecraft/class_4064;
-	FIELD field_18190 MIPMAP_LEVELS Lnet/minecraft/class_4067;
-	FIELD field_18192 ATTACK_INDICATOR Lnet/minecraft/class_4064;
-	FIELD field_18193 MAIN_HAND Lnet/minecraft/class_4064;
-	FIELD field_18194 NARRATOR Lnet/minecraft/class_4064;
-	FIELD field_18195 AUTO_JUMP Lnet/minecraft/class_4064;
-	FIELD field_18196 AUTO_SUGGESTIONS Lnet/minecraft/class_4064;
-	FIELD field_18723 TEXT_BACKGROUND_OPACITY Lnet/minecraft/class_4067;
-	FIELD field_18724 TEXT_BACKGROUND Lnet/minecraft/class_4064;
-	FIELD field_1917 CHAT_COLOR Lnet/minecraft/class_4064;
-	FIELD field_1919 PARTICLES Lnet/minecraft/class_4064;
-	FIELD field_1920 CHAT_LINKS Lnet/minecraft/class_4064;
-	FIELD field_1921 CHAT_OPACITY Lnet/minecraft/class_4067;
-	FIELD field_1922 GUI_SCALE Lnet/minecraft/class_4064;
-	FIELD field_1923 VISIBILITY Lnet/minecraft/class_4064;
-	FIELD field_19243 DISCRETE_MOUSE_SCROLL Lnet/minecraft/class_4064;
-	FIELD field_1925 CHAT_LINKS_PROMPT Lnet/minecraft/class_4064;
-	FIELD field_1927 VSYNC Lnet/minecraft/class_4064;
-	FIELD field_1930 TOUCHSCREEN Lnet/minecraft/class_4064;
-	FIELD field_1932 FULLSCREEN Lnet/minecraft/class_4064;
-	FIELD field_1933 RENDER_DISTANCE Lnet/minecraft/class_4067;
-	FIELD field_1934 VIEW_BOBBING Lnet/minecraft/class_4064;
-	FIELD field_1935 FRAMERATE_LIMIT Lnet/minecraft/class_4067;
-	FIELD field_1937 CLOUDS Lnet/minecraft/class_4064;
-	FIELD field_1938 GRAPHICS Lnet/minecraft/class_4064;
-	FIELD field_1941 CHAT_WIDTH Lnet/minecraft/class_4067;
-	FIELD field_1944 SENSITIVITY Lnet/minecraft/class_4067;
-	FIELD field_1945 GAMMA Lnet/minecraft/class_4067;
-	FIELD field_1946 CHAT_SCALE Lnet/minecraft/class_4067;
-	FIELD field_1963 INVERT_MOUSE Lnet/minecraft/class_4064;
-	FIELD field_1966 key Lnet/minecraft/class_2561;
-	FIELD field_21330 SNEAK_TOGGLED Lnet/minecraft/class_4064;
-	FIELD field_21331 SPRINT_TOGGLED Lnet/minecraft/class_4064;
-	FIELD field_23930 CHAT_LINE_SPACING Lnet/minecraft/class_4067;
-	FIELD field_23931 CHAT_DELAY_INSTANT Lnet/minecraft/class_4067;
-	FIELD field_24213 ENTITY_DISTANCE_SCALING Lnet/minecraft/class_4067;
-	FIELD field_25672 FAST_GRAPHICS_TOOLTIP Lnet/minecraft/class_2561;
-	FIELD field_25673 FABULOUS_GRAPHICS_TOOLTIP Lnet/minecraft/class_2561;
-	FIELD field_25674 FANCY_GRAPHICS_TOOLTIP Lnet/minecraft/class_2561;
-	FIELD field_26671 FOV_EFFECT_SCALE_TOOLTIP Lnet/minecraft/class_2561;
-	FIELD field_26672 DISTORTION_EFFECT_SCALE_TOOLTIP Lnet/minecraft/class_2561;
-	FIELD field_26673 FOV_EFFECT_SCALE Lnet/minecraft/class_4067;
-	FIELD field_26674 DISTORTION_EFFECT_SCALE Lnet/minecraft/class_4067;
-	FIELD field_26924 HIDE_MATCHED_NAMES Lnet/minecraft/class_4064;
-	FIELD field_26925 HIDE_MATCHED_NAMES_TOOLTIP Lnet/minecraft/class_2561;
-	FIELD field_27956 TOGGLE_TEXT Lnet/minecraft/class_2561;
-	FIELD field_27957 HOLD_TEXT Lnet/minecraft/class_2561;
-	FIELD field_34779 AUDIO_DEVICE Lnet/minecraft/class_4064;
-	FIELD field_34958 SIMULATION_DISTANCE Lnet/minecraft/class_4067;
-	FIELD field_35425 SHOW_AUTOSAVE_INDICATOR Lnet/minecraft/class_4064;
-	FIELD field_35635 ALLOW_SERVER_LISTING Lnet/minecraft/class_4064;
-	FIELD field_35636 ALLOW_SERVER_LISTING_TOOLTIP Lnet/minecraft/class_2561;
-	FIELD field_37858 DIRECTIONAL_AUDIO Lnet/minecraft/class_4064;
-	FIELD field_37860 DIRECTIONAL_AUDIO_ON_TEXT Lnet/minecraft/class_2561;
-	FIELD field_37861 DIRECTIONAL_AUDIO_OFF_TEXT Lnet/minecraft/class_2561;
-	METHOD <init> (Ljava/lang/String;)V
-		ARG 1 key
-	METHOD method_18513 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
-	METHOD method_18514 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
-	METHOD method_18518 getDisplayPrefix ()Lnet/minecraft/class_2561;
-	METHOD method_18520 createButton (Lnet/minecraft/class_315;III)Lnet/minecraft/class_339;
-		ARG 1 options
-		ARG 2 x
-		ARG 3 y
-		ARG 4 width
-	METHOD method_18522 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
-	METHOD method_18523 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 bobView
-	METHOD method_18524 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 entityDistanceScaling
-	METHOD method_18528 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
-	METHOD method_18529 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 fullscreen
-	METHOD method_18530 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 viewDistance
-	METHOD method_18534 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 touchscreen
-	METHOD method_18539 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
-	METHOD method_18541 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 mipmapLevels
-	METHOD method_18545 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
-	METHOD method_18546 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 showSubtitles
-	METHOD method_18547 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 gamma
-	METHOD method_18552 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 reducedDebugInfo
-	METHOD method_18557 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
-	METHOD method_18558 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 realmsNotifications
-	METHOD method_18559 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 maxFps
-	METHOD method_18564 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 invertYMouse
-	METHOD method_18569 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
-	METHOD method_18570 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 forceUnicodeFont
-	METHOD method_18571 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 chatWidth
-	METHOD method_18574 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
-	METHOD method_18575 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 entityShadows
-	METHOD method_18576 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 chatScale
-	METHOD method_18578 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
-	METHOD method_18579 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 enableVsync
-	METHOD method_18580 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 chatOpacity
-	METHOD method_18583 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 chatLinksPrompt
-	METHOD method_18587 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 chatLinks
-	METHOD method_18591 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 chatColors
-	METHOD method_18594 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 autoSuggestions
-	METHOD method_18596 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 autoJump
-	METHOD method_18598 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
-	METHOD method_18599 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
-	METHOD method_18601 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
-	METHOD method_18602 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
-	METHOD method_18604 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
-	METHOD method_18606 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
-	METHOD method_19339 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
-	METHOD method_19340 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 textBackgroundOpacity
-	METHOD method_19342 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
-	METHOD method_27140 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
-	METHOD method_27141 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
-	METHOD method_27142 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
-	METHOD method_27143 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 chatDelay
-	METHOD method_27144 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
-	METHOD method_27145 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 chatLineSpacing
-	METHOD method_27467 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
-	METHOD method_27468 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 simulationDistance
-	METHOD method_27469 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
-	METHOD method_31037 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
-	METHOD method_31038 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
-	METHOD method_31040 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 distortionEffectScale
-	METHOD method_31042 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 fovEffectScale
-	METHOD method_31404 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 hideMatchedNames
-	METHOD method_32534 (Lnet/minecraft/class_315;)Lnet/minecraft/class_5365;
-		ARG 0 gameOptions
-	METHOD method_32535 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4061;
-		ARG 0 gameOptions
-	METHOD method_32537 (Lnet/minecraft/class_315;)Lnet/minecraft/class_1659;
-		ARG 0 gameOptions
-	METHOD method_32539 (Lnet/minecraft/class_1659;)Lnet/minecraft/class_2561;
-		ARG 0 chatVisibility
-	METHOD method_32541 (Lnet/minecraft/class_4061;)Lnet/minecraft/class_2561;
-		ARG 0 attackIndicator
-	METHOD method_32542 (Lnet/minecraft/class_4063;)Lnet/minecraft/class_2561;
-		ARG 0 cloudRenderMode
-	METHOD method_32543 (Lnet/minecraft/class_5365;)Lnet/minecraft/class_2561;
-		ARG 0 graphicsMode
-	METHOD method_32544 (Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679;
-		ARG 0 client
-	METHOD method_32545 (Lnet/minecraft/class_4065;)Lnet/minecraft/class_2561;
-		ARG 0 narrator
-	METHOD method_32546 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32547 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_1306;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 mainArm
-	METHOD method_32548 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_4061;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 attackIndicator
-	METHOD method_32551 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_4063;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 cloudRenderMode
-	METHOD method_32552 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_5365;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 graphicsMode
-	METHOD method_32553 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_4065;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 narrator
-	METHOD method_32554 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_4066;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 particlesMode
-	METHOD method_32555 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Integer;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 guiScale
-	METHOD method_32556 (Lnet/minecraft/class_4066;)Lnet/minecraft/class_2561;
-		ARG 0 particlesMode
-	METHOD method_32557 (Ljava/lang/Integer;)Lnet/minecraft/class_2561;
-		ARG 0 guiScale
-	METHOD method_32558 (Ljava/util/List;Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_5365;)Ljava/util/List;
-		ARG 3 graphicsMode
-	METHOD method_32560 (Lnet/minecraft/class_5365;)Z
-		ARG 0 graphicsMode
-	METHOD method_32562 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32565 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32566 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32567 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 sprintToggled
-	METHOD method_32568 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32569 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 sneakToggled
-	METHOD method_32571 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32572 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32573 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32574 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
-	METHOD method_32575 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32576 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
-	METHOD method_32577 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32578 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32579 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32580 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32581 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32582 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32583 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32584 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32585 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32586 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32587 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_32588 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 backgroundForChatOnly
-	METHOD method_32589 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4066;
-		ARG 0 gameOptions
-	METHOD method_32590 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4065;
-		ARG 0 gameOptions
-	METHOD method_32592 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4063;
-		ARG 0 gameOptions
-	METHOD method_32593 (Lnet/minecraft/class_315;)Ljava/lang/Integer;
-		ARG 0 gameOptions
-	METHOD method_38511 (Lnet/minecraft/class_315;)Ljava/lang/String;
-		ARG 0 gameOptions
-	METHOD method_38514 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_1659;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 chatVisibility
-	METHOD method_38516 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/String;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 audioDevice
-	METHOD method_38518 (Ljava/lang/String;)Lnet/minecraft/class_2561;
-		ARG 0 device
-	METHOD method_38737 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
-	METHOD method_38738 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
-	METHOD method_38739 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 mouseSensitivity
-	METHOD method_39189 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_39190 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 showAutosaveIndicator
-	METHOD method_39416 (Lnet/minecraft/class_315;)Lnet/minecraft/class_1306;
-		ARG 0 gameOptions
-	METHOD method_39419 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 discreteMouseScroll
-	METHOD method_39484 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_39485 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 allowServerListing
-	METHOD method_41736 emptyTooltipFactoryGetter ()Ljava/util/function/Function;
-	METHOD method_41737 (Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679;
-		ARG 0 client
-	METHOD method_41738 (Lnet/minecraft/class_310;Ljava/lang/Boolean;)Ljava/util/List;
-		ARG 1 value
-	METHOD method_41739 (Lnet/minecraft/class_310;Ljava/lang/Double;)Ljava/util/List;
-		ARG 1 value
-	METHOD method_41740 (Ljava/lang/Object;)Ljava/util/List;
-		ARG 0 value
-	METHOD method_41741 (Lnet/minecraft/class_310;Ljava/lang/Double;)Ljava/util/List;
-		ARG 1 value
-	METHOD method_41742 (Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679;
-		ARG 0 client
-	METHOD method_41743 (Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679;
-		ARG 0 client
-	METHOD method_41744 (Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679;
-		ARG 0 client
-	METHOD method_41745 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_41746 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 directionalAudio
-	CLASS class_5679 TooltipFactory

mappings/net/minecraft/client/option/SimpleOption.mapping

@@ -6,17 +6,14 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption
 	FIELD field_37866 defaultValue Ljava/lang/Object;
 	FIELD field_37867 changeCallback Ljava/util/function/Consumer;
 	FIELD field_37868 value Ljava/lang/Object;
-	METHOD <init> (Ljava/lang/String;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/class_7172$class_7178;Ljava/lang/Object;Ljava/util/function/Consumer;)V
+	METHOD <init> (Ljava/lang/String;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/class_7172$class_7178;Lcom/mojang/serialization/Codec;Ljava/lang/Object;Ljava/util/function/Consumer;)V
-		ARG 1 key
 		ARG 2 tooltipFactoryGetter
 		ARG 3 textGetter
 		ARG 4 callbacks
-		ARG 5 defaultValue
+	METHOD method_18520 createButton (Lnet/minecraft/class_315;III)Lnet/minecraft/class_339;
-		ARG 6 changeCallback
 	METHOD method_41747 (Ljava/lang/Boolean;)Lnet/minecraft/class_2561;
 		ARG 0 value
 	METHOD method_41748 setValue (Ljava/lang/Object;)V
-		ARG 1 value
 	METHOD method_41749 ofBoolean (Ljava/lang/String;Ljava/util/function/Function;Z)Lnet/minecraft/class_7172;
 		ARG 0 key
 		ARG 1 tooltipFactoryGetter
@@ -35,25 +32,17 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption
 	METHOD method_41753 getValue ()Ljava/lang/Object;
 	METHOD method_41754 getCallbacks ()Lnet/minecraft/class_7172$class_7178;
 	CLASS class_7173 PotentialValuesBasedCallbacks
-		METHOD method_41755 (Lnet/minecraft/class_316$class_5679;IIILnet/minecraft/class_315;Lnet/minecraft/class_7172;)Lnet/minecraft/class_339;
+		METHOD method_41755 (Lnet/minecraft/class_7172$class_7277;IIILnet/minecraft/class_315;Lnet/minecraft/class_7172;)Lnet/minecraft/class_339;
 			ARG 6 option
 		METHOD method_41757 (Lnet/minecraft/class_7172;Lnet/minecraft/class_315;Lnet/minecraft/class_5676;Ljava/lang/Object;)V
 			ARG 2 button
 			ARG 3 value
 	CLASS class_7174 IntSliderCallbacks
-		METHOD method_41760 (Lnet/minecraft/class_315;IIILnet/minecraft/class_316$class_5679;Lnet/minecraft/class_7172;)Lnet/minecraft/class_339;
-			ARG 6 option
-		METHOD method_41762 withModifier (Ljava/util/function/IntFunction;Ljava/util/function/ToIntFunction;)Lnet/minecraft/class_7172$class_7176;
-			ARG 1 sliderProgressValueToValue
-			ARG 2 valueToSliderProgressValue
-		CLASS 1
-			METHOD method_41766 (Lnet/minecraft/class_315;IIILnet/minecraft/class_316$class_5679;Lnet/minecraft/class_7172;)Lnet/minecraft/class_339;
-				ARG 6 option
 	CLASS class_7175 OptionSliderWidgetImpl
 		FIELD field_37872 option Lnet/minecraft/class_7172;
 		FIELD field_37873 callbacks Lnet/minecraft/class_7172$class_7176;
-		FIELD field_37874 tooltipFactory Lnet/minecraft/class_316$class_5679;
+		FIELD field_37874 tooltipFactory Lnet/minecraft/class_7172$class_7277;
-		METHOD <init> (Lnet/minecraft/class_315;IIIILnet/minecraft/class_7172;Lnet/minecraft/class_7172$class_7176;Lnet/minecraft/class_316$class_5679;)V
+		METHOD <init> (Lnet/minecraft/class_315;IIIILnet/minecraft/class_7172;Lnet/minecraft/class_7172$class_7176;Lnet/minecraft/class_7172$class_7277;)V
 			ARG 1 options
 			ARG 2 x
 			ARG 3 y
@@ -68,14 +57,18 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption
 		METHOD method_41765 toSliderProgress (Ljava/lang/Object;)D
 			ARG 1 value
 	CLASS class_7177 DoubleSliderCallbacks
-		METHOD method_41769 (Lnet/minecraft/class_315;IIILnet/minecraft/class_316$class_5679;Lnet/minecraft/class_7172;)Lnet/minecraft/class_339;
+		METHOD method_41769 (Lnet/minecraft/class_315;IIILnet/minecraft/class_7172$class_7277;Lnet/minecraft/class_7172;)Lnet/minecraft/class_339;
 			ARG 6 option
 	CLASS class_7178 Callbacks
-		METHOD method_41756 getButtonCreator (Lnet/minecraft/class_316$class_5679;Lnet/minecraft/class_315;III)Ljava/util/function/Function;
+		METHOD method_41756 getButtonCreator (Lnet/minecraft/class_7172$class_7277;Lnet/minecraft/class_315;III)Ljava/util/function/Function;
 			ARG 1 tooltipFactory
 			ARG 2 gameOptions
 			ARG 3 x
 			ARG 4 y
 			ARG 5 width
-		METHOD method_41758 validate (Ljava/lang/Object;)Z
+		METHOD method_41758 validate (Ljava/lang/Object;)Ljava/util/Optional;
 			ARG 1 value
+	CLASS class_7275
+		CLASS 1
+			METHOD method_41766 (Lnet/minecraft/class_315;IIILnet/minecraft/class_7172$class_7277;Lnet/minecraft/class_7172;)Lnet/minecraft/class_339;
+				ARG 6 option

mappings/net/minecraft/client/particle/VibrationParticle.mapping

@@ -1,9 +1,7 @@
 CLASS net/minecraft/class_5737 net/minecraft/client/particle/VibrationParticle
-	FIELD field_28249 vibration Lnet/minecraft/class_5720;
+	FIELD field_28249 vibration Lnet/minecraft/class_5716;
-	METHOD <init> (Lnet/minecraft/class_638;Lnet/minecraft/class_5720;I)V
+	METHOD <init> (Lnet/minecraft/class_638;DDDLnet/minecraft/class_5716;I)V
 		ARG 1 world
-		ARG 2 vibration
-		ARG 3 maxAge
 	METHOD method_33077 (FFLnet/minecraft/class_1158;)V
 		ARG 2 quaternion
 	METHOD method_33078 render (Lnet/minecraft/class_4588;Lnet/minecraft/class_4184;FLjava/util/function/Consumer;)V

mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping

@@ -55,7 +55,6 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
 	FIELD field_22559 WORLD_ICON Lnet/minecraft/class_2960;
 	FIELD field_22560 REALMS Lnet/minecraft/class_2960;
 	FIELD field_22561 CONFIGURE_ICON Lnet/minecraft/class_2960;
-	FIELD field_22562 QUESTIONMARK Lnet/minecraft/class_2960;
 	FIELD field_22563 NEWS_ICON Lnet/minecraft/class_2960;
 	FIELD field_22564 POPUP Lnet/minecraft/class_2960;
 	FIELD field_24198 hoverState Lnet/minecraft/class_4325$class_5220;
@@ -76,7 +75,6 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
 	FIELD field_26461 CLOSED_TEXT Lnet/minecraft/class_2561;
 	FIELD field_26462 LEAVE_TEXT Lnet/minecraft/class_2561;
 	FIELD field_26463 CONFIGURE_TEXT Lnet/minecraft/class_2561;
-	FIELD field_26464 INFO_TEXT Lnet/minecraft/class_2561;
 	FIELD field_26465 NEWS_TEXT Lnet/minecraft/class_2561;
 	FIELD field_26466 popupText Lnet/minecraft/class_5489;
 	FIELD field_33774 TRIAL_NARRATION Lnet/minecraft/class_2561;
@@ -108,13 +106,6 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
 		ARG 3 y
 		ARG 4 mouseX
 		ARG 5 mouseY
-	METHOD method_20848 renderMoreInfo (Lnet/minecraft/class_4587;IIIIZ)V
-		ARG 1 matrices
-		ARG 2 mouseX
-		ARG 3 mouseY
-		ARG 4 x
-		ARG 5 y
-		ARG 6 hovered
 	METHOD method_20849 drawInvitationPendingIcon (Lnet/minecraft/class_4587;IIIIZZ)V
 		ARG 1 matrices
 		ARG 2 mouseX
@@ -282,9 +273,6 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
 			ARG 4 y
 			ARG 5 mouseX
 			ARG 6 mouseY
-	CLASS class_4332 ShowPopupButton
-		METHOD method_25026 (Lnet/minecraft/class_4325;Lnet/minecraft/class_4185;)V
-			ARG 1 button
 	CLASS class_4866 Entry
 		METHOD method_38506 getRealmsServer ()Lnet/minecraft/class_4877;
 	CLASS class_5220 HoverState

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

@@ -16,7 +16,7 @@ CLASS net/minecraft/class_758 net/minecraft/client/render/BackgroundRenderer
 		ARG 2 world
 		ARG 3 viewDistance
 		ARG 4 skyDarkness
-	METHOD method_3211 applyFog (Lnet/minecraft/class_4184;Lnet/minecraft/class_758$class_4596;FZ)V
+	METHOD method_3211 applyFog (Lnet/minecraft/class_4184;Lnet/minecraft/class_758$class_4596;FZF)V
 		ARG 0 camera
 		ARG 1 fogType
 		ARG 2 viewDistance

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

@@ -22,9 +22,7 @@ CLASS net/minecraft/class_765 net/minecraft/client/render/LightmapTextureManager
 	METHOD <init> (Lnet/minecraft/class_757;Lnet/minecraft/class_310;)V
 		ARG 1 renderer
 		ARG 2 client
-	METHOD method_23284 getBrightness (Lnet/minecraft/class_1937;I)F
+	METHOD method_23284 getBrightness (Lnet/minecraft/class_2874;I)F
-		ARG 1 world
-		ARG 2 lightLevel
 	METHOD method_23687 pack (II)I
 		ARG 0 block
 		ARG 1 sky

mappings/net/minecraft/client/render/debug/GameEventDebugRenderer.mapping

@@ -4,11 +4,10 @@ CLASS net/minecraft/class_5739 net/minecraft/client/render/debug/GameEventDebugR
 	FIELD field_28257 listeners Ljava/util/List;
 	METHOD <init> (Lnet/minecraft/class_310;)V
 		ARG 1 client
-	METHOD method_33086 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5739$class_5741;)Z
+	METHOD method_33086 (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;Lnet/minecraft/class_5739$class_5741;)Z
 		ARG 2 listener
-	METHOD method_33087 addEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_2338;)V
+	METHOD method_33087 addEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;)V
 		ARG 1 event
-		ARG 2 pos
 	METHOD method_33088 addListener (Lnet/minecraft/class_5716;I)V
 		ARG 1 positionSource
 		ARG 2 range
@@ -18,20 +17,17 @@ CLASS net/minecraft/class_5739 net/minecraft/client/render/debug/GameEventDebugR
 		ARG 2 green
 		ARG 3 blue
 		ARG 4 alpha
-	METHOD method_33090 (Lnet/minecraft/class_287;DDDLnet/minecraft/class_2338;)V
-		ARG 7 pos
-	METHOD method_33091 (Lnet/minecraft/class_5739$class_5741;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;DDDLnet/minecraft/class_2338;)V
-		ARG 9 pos
-	METHOD method_33092 (Lnet/minecraft/class_2338;)V
-		ARG 0 pos
 	CLASS class_5740 Entry
-		FIELD field_28258 startingMs J
+		FIELD comp_678 startingMs J
-		FIELD field_28259 event Lnet/minecraft/class_5712;
+		FIELD comp_679 event Lnet/minecraft/class_5712;
-		FIELD field_28260 pos Lnet/minecraft/class_243;
+		FIELD comp_680 pos Lnet/minecraft/class_243;
 		METHOD <init> (JLnet/minecraft/class_5712;Lnet/minecraft/class_243;)V
 			ARG 1 startingMs
 			ARG 3 event
 			ARG 4 pos
+		METHOD comp_678 startingMs ()J
+		METHOD comp_679 event ()Lnet/minecraft/class_5712;
+		METHOD comp_680 pos ()Lnet/minecraft/class_243;
 		METHOD method_33093 hasExpired ()Z
 	CLASS class_5741 Listener
 		FIELD field_28261 positionSource Lnet/minecraft/class_5716;
@@ -41,6 +37,5 @@ CLASS net/minecraft/class_5739 net/minecraft/client/render/debug/GameEventDebugR
 			ARG 2 range
 		METHOD method_33094 getPos (Lnet/minecraft/class_1937;)Ljava/util/Optional;
 			ARG 1 world
-		METHOD method_33095 isTooFar (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z
+		METHOD method_33095 isTooFar (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;)Z
 			ARG 1 world
-			ARG 2 pos

mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping

@@ -116,7 +116,7 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRen
 		FIELD field_22406 health F
 		FIELD field_22407 maxHealth F
 		FIELD field_25287 potentialJobSites Ljava/util/Set;
-		METHOD <init> (Ljava/util/UUID;ILjava/lang/String;Ljava/lang/String;IFFLnet/minecraft/class_2374;Ljava/lang/String;Lnet/minecraft/class_11;Z)V
+		METHOD <init> (Ljava/util/UUID;ILjava/lang/String;Ljava/lang/String;IFFLnet/minecraft/class_2374;Ljava/lang/String;Lnet/minecraft/class_11;ZI)V
 			ARG 1 uuid
 			ARG 2 entityId
 			ARG 3 name

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

@@ -1,4 +1,2 @@
 CLASS net/minecraft/class_881 net/minecraft/client/render/entity/BoatEntityRenderer
 	FIELD field_27758 texturesAndModels Ljava/util/Map;
-	METHOD method_32163 (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_1690$class_1692;)Lcom/mojang/datafixers/util/Pair;
-		ARG 1 boatType

mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping

@@ -53,7 +53,7 @@ CLASS net/minecraft/class_554 net/minecraft/client/render/entity/model/BoatEntit
 	FIELD field_32465 LEFT Ljava/lang/String;
 		COMMENT The key of the left model part, whose value is {@value}.
 	FIELD field_3326 waterPatch Lnet/minecraft/class_630;
-	METHOD <init> (Lnet/minecraft/class_630;)V
+	METHOD <init> (Lnet/minecraft/class_630;Z)V
 		ARG 1 root
 	METHOD method_22954 getWaterPatch ()Lnet/minecraft/class_630;
 	METHOD method_2797 setPaddleAngle (Lnet/minecraft/class_1690;ILnet/minecraft/class_630;F)V
@@ -61,4 +61,4 @@ CLASS net/minecraft/class_554 net/minecraft/client/render/entity/model/BoatEntit
 		ARG 1 sigma
 		ARG 2 part
 		ARG 3 angle
-	METHOD method_31985 getTexturedModelData ()Lnet/minecraft/class_5607;
+	METHOD method_31985 getTexturedModelData (Z)Lnet/minecraft/class_5607;

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

@@ -14,15 +14,3 @@ CLASS net/minecraft/class_3521 net/minecraft/client/util/NetworkUtils
 		ARG 4 progressListener
 		ARG 5 proxy
 	METHOD method_15302 findLocalPort ()I
-	METHOD method_34936 post (Ljava/net/URL;Ljava/lang/String;ZLjava/net/Proxy;)Ljava/lang/String;
-		ARG 0 url
-		ARG 1 content
-		ARG 2 ignoreError
-		ARG 3 proxy
-	METHOD method_34937 post (Ljava/net/URL;Ljava/util/Map;ZLjava/net/Proxy;)Ljava/lang/String;
-		ARG 0 url
-		ARG 1 query
-		ARG 2 ignoreError
-		ARG 3 proxy
-	METHOD method_34938 makeQueryString (Ljava/util/Map;)Ljava/lang/String;
-		ARG 0 query

mappings/net/minecraft/entity/Entity.mapping

@@ -260,7 +260,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	METHOD method_24516 isInRange (Lnet/minecraft/class_1297;D)Z
 		COMMENT Checks if the distance between this entity and the {@code other} entity is less
 		COMMENT than {@code radius}.
-		ARG 1 other
 		ARG 2 radius
 	METHOD method_24826 getPassengerDismountOffset (DDF)Lnet/minecraft/class_243;
 		ARG 0 vehicleWidth
@@ -379,14 +378,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 2 entity
 	METHOD method_32876 emitGameEvent (Lnet/minecraft/class_5712;)V
 		ARG 1 event
-	METHOD method_32877 getGameEventHandler ()Lnet/minecraft/class_5715;
-		COMMENT Returns the game event handler for this entity.
-		COMMENT
-		COMMENT <p>Subclasses interested in listening to game events as an entity should return a
-		COMMENT handler so the {@link net.minecraft.world.event.listener.GameEventListener listener}
-		COMMENT used to receive game events can be registered to the correct dispatchers.
-		COMMENT
-		COMMENT @implNote The vanilla implementation always returns {@code null}.
 	METHOD method_33189 occludeVibrationSignals ()Z
 	METHOD method_33331 (Lnet/minecraft/class_4048;Lnet/minecraft/class_243;)V
 		ARG 2 pos
@@ -395,13 +386,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 1 destX
 		ARG 3 destY
 		ARG 5 destZ
-	METHOD method_33568 emitGameEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;)V
-		ARG 1 event
-		ARG 2 entity
-		ARG 3 pos
-	METHOD method_33569 emitGameEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_2338;)V
-		ARG 1 event
-		ARG 2 pos
 	METHOD method_33570 getMoveEffect ()Lnet/minecraft/class_1297$class_5799;
 		COMMENT Returns the possible effect(s) of an entity moving.
 		COMMENT
@@ -420,7 +404,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT any move effect}, from {@link #move(MovementType, Vec3d)}
 	METHOD method_33574 setPosition (Lnet/minecraft/class_243;)V
 		ARG 1 pos
-	METHOD method_33575 getCameraBlockPos ()Lnet/minecraft/class_2338;
 	METHOD method_33724 isRegionUnloaded ()Z
 		COMMENT Returns whether any part of this entity's bounding box is in an unloaded
 		COMMENT region of the world the entity is in.

mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping

@@ -1,14 +1,11 @@
 CLASS net/minecraft/class_4828 net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask
 	FIELD field_22329 alternativeCondition Ljava/util/function/Predicate;
 	FIELD field_30177 REMEMBER_TIME I
-	FIELD field_30178 forgetCallback Ljava/util/function/Consumer;
+	FIELD field_30178 forgetCallback Ljava/util/function/BiConsumer;
-	METHOD <init> (Ljava/util/function/Consumer;)V
-		ARG 1 forgetCallback
 	METHOD <init> (Ljava/util/function/Predicate;)V
 		ARG 1 alternativeCondition
-	METHOD <init> (Ljava/util/function/Predicate;Ljava/util/function/Consumer;)V
+	METHOD <init> (Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;Z)V
 		ARG 1 condition
-		ARG 2 forgetCallback
 	METHOD method_24621 cannotReachTarget (Lnet/minecraft/class_1309;)Z
 		ARG 0 entity
 	METHOD method_24622 isAttackTargetInAnotherWorld (Lnet/minecraft/class_1308;)Z

mappings/net/minecraft/entity/ai/brain/task/GoToCelebrateTask.mapping

@@ -1,11 +1,7 @@
 CLASS net/minecraft/class_4814 net/minecraft/entity/ai/brain/task/GoToCelebrateTask
 	FIELD field_22304 completionRange I
 	FIELD field_23130 speed F
-	METHOD <init> (IF)V
-		ARG 1 completionRange
-		ARG 2 speed
 	METHOD method_24576 getCelebrateLocation (Lnet/minecraft/class_1308;)Lnet/minecraft/class_2338;
-		ARG 0 entity
 	METHOD method_24577 fuzz (Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;
 		ARG 0 mob
 		ARG 1 pos

mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping

@@ -76,9 +76,6 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil
 		ARG 0 mob
 		ARG 1 target
 		ARG 2 rangedWeaponReachReduction
-	METHOD method_25941 isTargetWithinMeleeRange (Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)Z
-		ARG 0 source
-		ARG 1 target
 	METHOD method_29247 (Lnet/minecraft/class_1646;Lnet/minecraft/class_1309;)Z
 		ARG 1 entity
 	METHOD method_29248 streamSeenVillagers (Lnet/minecraft/class_1646;Ljava/util/function/Predicate;)Ljava/util/stream/Stream;

mappings/net/minecraft/entity/effect/StatusEffect.mapping

@@ -4,7 +4,6 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect
 	FIELD field_5885 attributeModifiers Ljava/util/Map;
 	FIELD field_5886 color I
 	METHOD <init> (Lnet/minecraft/class_4081;I)V
-		ARG 1 category
 		ARG 2 color
 	METHOD method_18792 getCategory ()Lnet/minecraft/class_4081;
 	METHOD method_5552 canApplyUpdateEffect (II)Z

mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping

@@ -35,7 +35,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 		ARG 4 ambient
 		ARG 5 showParticles
 		ARG 6 showIcon
-	METHOD <init> (Lnet/minecraft/class_1291;IIZZZLnet/minecraft/class_1293;)V
+	METHOD <init> (Lnet/minecraft/class_1291;IIZZZLnet/minecraft/class_1293;Ljava/util/Optional;)V
 		ARG 1 type
 		ARG 2 duration
 		ARG 3 amplifier
@@ -43,8 +43,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 		ARG 5 showParticles
 		ARG 6 showIcon
 		ARG 7 hiddenEffect
-	METHOD <init> (Lnet/minecraft/class_1293;)V
-		ARG 1 statusEffectInstance
 	METHOD compareTo (Ljava/lang/Object;)I
 		ARG 1 that
 	METHOD equals (Ljava/lang/Object;)Z

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

@@ -1,5 +1,3 @@
 CLASS net/minecraft/class_1550 net/minecraft/entity/mob/ElderGuardianEntity
 	FIELD field_17492 SCALE F
 	METHOD method_26909 createElderGuardianAttributes ()Lnet/minecraft/class_5132$class_5133;
-	METHOD method_7011 (Lnet/minecraft/class_3222;)Z
-		ARG 1 player

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

@@ -190,7 +190,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 	METHOD method_5955 prefersNewEquipment (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z
 		ARG 1 newStack
 		ARG 2 oldStack
-	METHOD method_5956 canBeControlledByRider ()Z
 	METHOD method_5957 canSpawn (Lnet/minecraft/class_4538;)Z
 		ARG 1 world
 	METHOD method_5958 mobTick ()V

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

@@ -60,7 +60,7 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity
 		ARG 1 air
 	METHOD method_33231 setPlayingDead (Z)V
 		ARG 1 playingDead
-	METHOD method_35175 appreciatePlayer (Lnet/minecraft/class_5762;)V
+	METHOD method_35175 appreciatePlayer (Lnet/minecraft/class_5762;Lnet/minecraft/class_1309;)V
 		ARG 0 axolotl
 	METHOD method_36282 hydrateFromPotion ()V
 	METHOD method_38987 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z

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

@@ -46,7 +46,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity
 		ARG 1 inventory
 	METHOD method_6001 initAttributes ()V
 	METHOD method_6721 onChestedStatusChanged ()V
-	METHOD method_6722 openInventory (Lnet/minecraft/class_1657;)V
+	METHOD method_6722 (Lnet/minecraft/class_1657;)V
 		ARG 1 player
 	METHOD method_6723 playJumpSound ()V
 	METHOD method_6724 isEatingGrass ()Z

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

@@ -4,3 +4,4 @@ CLASS net/minecraft/class_1452 net/minecraft/entity/passive/PigEntity
 	FIELD field_6816 SADDLED Lnet/minecraft/class_2940;
 	FIELD field_6817 BREEDING_INGREDIENT Lnet/minecraft/class_1856;
 	METHOD method_26890 createPigAttributes ()Lnet/minecraft/class_5132$class_5133;
+	METHOD method_5956 canBeControlledByRider (Lnet/minecraft/class_1297;)Z

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

@@ -44,8 +44,6 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity
 		COMMENT Resets the special price of all the trade offers of this villager.
 	METHOD method_19188 canLevelUp ()Z
 	METHOD method_19189 getAvailableFood ()I
-	METHOD method_19190 spawnIronGolem (Lnet/minecraft/class_3218;)Lnet/minecraft/class_1439;
-		ARG 1 world
 	METHOD method_19191 beginTradeWith (Lnet/minecraft/class_1657;)V
 		ARG 1 customer
 	METHOD method_19192 prepareOffersFor (Lnet/minecraft/class_1657;)V
@@ -72,7 +70,6 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity
 	METHOD method_20687 canSummonGolem (J)Z
 		ARG 1 time
 	METHOD method_20688 summonGolem (Lnet/minecraft/class_3218;JI)V
-		ARG 1 world
 		ARG 2 time
 		ARG 4 requiredCount
 	METHOD method_20690 notifyDeath (Lnet/minecraft/class_1297;)V
@@ -102,10 +99,6 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity
 		ARG 0 villager
 		ARG 1 poiType
 	METHOD method_29279 isNatural ()Z
-	METHOD method_30023 getHighestOpenPositionOnOffset (Lnet/minecraft/class_2338;DD)Lnet/minecraft/class_2338;
-		ARG 1 pos
-		ARG 2 x
-		ARG 4 z
 	METHOD method_30958 releaseAllTickets ()V
 	METHOD method_7234 wantsToStartBreeding ()Z
 	METHOD method_7239 canBreed ()Z

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

@@ -14,5 +14,3 @@ CLASS net/minecraft/class_1693 net/minecraft/entity/vehicle/StorageMinecartEntit
 	METHOD method_7562 setLootTable (Lnet/minecraft/class_2960;J)V
 		ARG 1 id
 		ARG 2 lootSeed
-	METHOD method_7563 generateLoot (Lnet/minecraft/class_1657;)V
-		ARG 1 player

mappings/net/minecraft/item/BoatItem.mapping

@@ -1,6 +1,3 @@
 CLASS net/minecraft/class_1749 net/minecraft/item/BoatItem
 	FIELD field_17497 RIDERS Ljava/util/function/Predicate;
 	FIELD field_7902 type Lnet/minecraft/class_1690$class_1692;
-	METHOD <init> (Lnet/minecraft/class_1690$class_1692;Lnet/minecraft/class_1792$class_1793;)V
-		ARG 1 type
-		ARG 2 settings

mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping

@@ -171,8 +171,6 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi
 		ARG 1 packet
 	METHOD method_21707 onPlayerActionResponse (Lnet/minecraft/class_4463;)V
 		ARG 1 packet
-	METHOD method_33135 onVibration (Lnet/minecraft/class_5747;)V
-		ARG 1 packet
 	METHOD method_34071 onTitleClear (Lnet/minecraft/class_5888;)V
 		ARG 1 packet
 	METHOD method_34072 onWorldBorderInitialize (Lnet/minecraft/class_5889;)V

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

@@ -1,7 +0,0 @@
-CLASS net/minecraft/class_5747 net/minecraft/network/packet/s2c/play/VibrationS2CPacket
-	FIELD field_28283 vibration Lnet/minecraft/class_5720;
-	METHOD <init> (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD <init> (Lnet/minecraft/class_5720;)V
-		ARG 1 vibration
-	METHOD method_33137 getVibration ()Lnet/minecraft/class_5720;

mappings/net/minecraft/particle/ParticleTypes.mapping

@@ -3,6 +3,3 @@ CLASS net/minecraft/class_2398 net/minecraft/particle/ParticleTypes
 	METHOD method_10303 register (Ljava/lang/String;Z)Lnet/minecraft/class_2400;
 		ARG 0 name
 		ARG 1 alwaysShow
-	METHOD method_10304 register (Ljava/lang/String;Lnet/minecraft/class_2394$class_2395;Ljava/util/function/Function;)Lnet/minecraft/class_2396;
-		ARG 0 name
-		ARG 1 factory

mappings/net/minecraft/particle/VibrationParticleEffect.mapping

@@ -1,11 +1,6 @@
 CLASS net/minecraft/class_5745 net/minecraft/particle/VibrationParticleEffect
 	FIELD field_28277 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_28278 PARAMETERS_FACTORY Lnet/minecraft/class_2394$class_2395;
-	FIELD field_28279 vibration Lnet/minecraft/class_5720;
+	METHOD method_33124 (Lnet/minecraft/class_5745;)Lnet/minecraft/class_5716;
-	METHOD <init> (Lnet/minecraft/class_5720;)V
-		ARG 1 vibration
-	METHOD method_33123 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
-		ARG 0 instance
-	METHOD method_33124 (Lnet/minecraft/class_5745;)Lnet/minecraft/class_5720;
 		ARG 0 effect
-	METHOD method_33125 getVibration ()Lnet/minecraft/class_5720;
+	METHOD method_33125 getVibration ()Lnet/minecraft/class_5716;

mappings/net/minecraft/recipe/RecipeManager.mapping

@@ -11,8 +11,6 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager
 	FIELD field_9027 LOGGER Lorg/slf4j/Logger;
 	METHOD method_17717 getAllOfType (Lnet/minecraft/class_3956;)Ljava/util/Map;
 		ARG 1 type
-	METHOD method_17718 (Lnet/minecraft/class_3956;Lnet/minecraft/class_1937;Lnet/minecraft/class_1263;Lnet/minecraft/class_1860;)Ljava/util/stream/Stream;
-		ARG 3 recipe
 	METHOD method_17720 deserialize (Lnet/minecraft/class_2960;Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1860;
 		COMMENT Reads a recipe from a JSON object.
 		COMMENT
@@ -32,8 +30,6 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager
 		ARG 0 map
 	METHOD method_17723 (Ljava/util/Map;)Ljava/util/stream/Stream;
 		ARG 0 map
-	METHOD method_17874 (Lnet/minecraft/class_3956;Lnet/minecraft/class_1937;Lnet/minecraft/class_1263;Lnet/minecraft/class_1860;)Ljava/util/stream/Stream;
-		ARG 3 recipe
 	METHOD method_17876 (Lnet/minecraft/class_1860;)Ljava/lang/String;
 		ARG 0 recipe
 	METHOD method_17877 getAllMatches (Lnet/minecraft/class_3956;Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;)Ljava/util/List;
@@ -74,8 +70,6 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager
 		COMMENT @return the created list of recipes of the given {@code type}
 		ARG 1 type
 			COMMENT the desired recipe type
-	METHOD method_30028 (Lnet/minecraft/class_1860;)Lnet/minecraft/class_1860;
-		ARG 0 recipe
 	METHOD method_35227 isErrored ()Z
 		COMMENT {@return the {@link #errored} field} This is unused in vanilla and will only
 		COMMENT return {@code false} without mods.

mappings/net/minecraft/recipe/RecipeType.mapping

@@ -3,16 +3,5 @@ CLASS net/minecraft/class_3956 net/minecraft/recipe/RecipeType
 	COMMENT recipes under a given type.
 	COMMENT
 	COMMENT @param <T> the common supertype of recipes within a recipe type
-	METHOD method_17725 match (Lnet/minecraft/class_1860;Lnet/minecraft/class_1937;Lnet/minecraft/class_1263;)Ljava/util/Optional;
-		COMMENT {@return the given {@code recipe} if it matches, otherwise empty}
-		COMMENT
-		COMMENT <p>This utility method casts the {@code recipe} from {@code Recipe<C>} to
-		COMMENT {@code T} conveniently.
-		ARG 1 recipe
-			COMMENT the recipe to match and cast
-		ARG 2 world
-			COMMENT the input world
-		ARG 3 inventory
-			COMMENT the input inventory
 	METHOD method_17726 register (Ljava/lang/String;)Lnet/minecraft/class_3956;
 		ARG 0 id

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

@@ -1,7 +1,6 @@
 CLASS net/minecraft/class_4799 net/minecraft/server/command/LocateBiomeCommand
 	FIELD field_22253 NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_33395 RADIUS I
-	FIELD field_33396 BLOCK_CHECK_INTERVAL I
 	METHOD method_24491 register (Lcom/mojang/brigadier/CommandDispatcher;)V
 		ARG 0 dispatcher
 	METHOD method_24492 (Lcom/mojang/brigadier/context/CommandContext;)I

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

@@ -8,14 +8,12 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand
 		ARG 3 y2
 	METHOD method_13443 register (Lcom/mojang/brigadier/CommandDispatcher;)V
 		ARG 0 dispatcher
-	METHOD method_13447 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583;
-		ARG 1 style
 	METHOD method_13448 (Lnet/minecraft/class_2168;)Z
 		ARG 0 source
 	METHOD method_13457 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;)I
 		ARG 0 source
 		ARG 1 structureFeature
-	METHOD method_24499 sendCoordinates (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;Lnet/minecraft/class_2338;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;)I
+	METHOD method_24499 sendCoordinates (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;Lnet/minecraft/class_2338;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;Z)I
 		ARG 0 source
 		ARG 1 structureFeature
 		ARG 2 currentPos

mappings/net/minecraft/server/filter/TextFilterer.mapping

@@ -6,20 +6,9 @@ CLASS net/minecraft/class_5514 net/minecraft/server/filter/TextFilterer
 	FIELD field_26827 joinEndpoint Ljava/net/URL;
 	FIELD field_26828 leaveEndpoint Ljava/net/URL;
 	FIELD field_26829 apiKey Ljava/lang/String;
-	FIELD field_26830 ruleId I
-	FIELD field_26831 serverId Ljava/lang/String;
 	FIELD field_26832 ignorer Lnet/minecraft/class_5514$class_5515;
 	FIELD field_26833 executor Ljava/util/concurrent/ExecutorService;
-	FIELD field_36318 roomId Ljava/lang/String;
+	METHOD <init> (Ljava/net/URL;Lnet/minecraft/class_5514$class_7242;Ljava/net/URL;Lnet/minecraft/class_5514$class_7241;Ljava/net/URL;Lnet/minecraft/class_5514$class_7241;Ljava/lang/String;Lnet/minecraft/class_5514$class_5515;I)V
-	METHOD <init> (Ljava/net/URL;Ljava/net/URL;Ljava/net/URL;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Lnet/minecraft/class_5514$class_5515;I)V
-		ARG 1 chatEndpoint
-		ARG 2 joinEndpoint
-		ARG 3 leaveEndpoint
-		ARG 4 apiKey
-		ARG 5 ruleId
-		ARG 6 serverId
-		ARG 7 roomId
-		ARG 8 ignorer
 		ARG 9 parallelism
 	METHOD method_31295 sendJsonRequest (Lcom/google/gson/JsonObject;Ljava/net/URL;)Lcom/google/gson/JsonObject;
 		ARG 1 payload
@@ -31,10 +20,9 @@ CLASS net/minecraft/class_5514 net/minecraft/server/filter/TextFilterer
 		ARG 2 message
 		ARG 3 ignorer
 		ARG 4 executor
-	METHOD method_31299 sendJoinOrLeaveRequest (Lcom/mojang/authlib/GameProfile;Ljava/net/URL;Ljava/util/concurrent/Executor;)V
+	METHOD method_31299 sendJoinOrLeaveRequest (Lcom/mojang/authlib/GameProfile;Ljava/net/URL;Lnet/minecraft/class_5514$class_7241;Ljava/util/concurrent/Executor;)V
 		ARG 1 gameProfile
 		ARG 2 endpoint
-		ARG 3 executor
 	METHOD method_31300 consumeFully (Ljava/io/InputStream;)V
 		ARG 1 inputStream
 	METHOD method_31301 (Ljava/lang/Runnable;)Ljava/lang/Thread;

mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping

@@ -35,8 +35,7 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL
 		ARG 3 loader
 	METHOD method_41893 (Ljava/lang/Runnable;Lnet/minecraft/class_310;Lnet/minecraft/class_525;Z)V
 		ARG 3 confirmed
-	METHOD method_41894 start (Ljava/lang/String;)V
+	METHOD method_41894 start (Lnet/minecraft/class_437;Ljava/lang/String;)V
-		ARG 1 levelName
 	METHOD method_41895 createAndStart (Ljava/lang/String;Lnet/minecraft/class_1940;Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;)V
 		ARG 1 levelName
 		ARG 2 levelInfo
@@ -45,14 +44,8 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL
 	METHOD method_41896 (Ljava/lang/String;Ljava/lang/Runnable;ZZ)V
 		ARG 3 backup
 		ARG 4 eraseCache
-	METHOD method_41898 showBackupPromptScreen (Ljava/lang/String;ZLjava/lang/Runnable;)V
+	METHOD method_41898 showBackupPromptScreen (Lnet/minecraft/class_437;Ljava/lang/String;ZLjava/lang/Runnable;)V
-		ARG 1 levelName
+	METHOD method_41899 start (Lnet/minecraft/class_437;Ljava/lang/String;ZZ)V
-		ARG 2 customized
-		ARG 3 callback
-	METHOD method_41899 start (Ljava/lang/String;ZZ)V
-		ARG 1 levelName
-		ARG 2 safeMode
-		ARG 3 canShowBackupPrompt
 	METHOD method_41900 createSaveLoader (Lnet/minecraft/class_7237$class_7238;Lnet/minecraft/class_7237$class_6907;)Lnet/minecraft/class_6904;
 		ARG 1 dataPacks
 		ARG 2 savePropertiesSupplier

mappings/net/minecraft/server/network/DebugInfoSender.mapping

@@ -54,10 +54,9 @@ CLASS net/minecraft/class_4209 net/minecraft/server/network/DebugInfoSender
 	METHOD method_24819 sendPoi (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V
 		ARG 0 world
 		ARG 1 pos
-	METHOD method_33139 sendGameEvent (Lnet/minecraft/class_1937;Lnet/minecraft/class_5712;Lnet/minecraft/class_2338;)V
+	METHOD method_33139 sendGameEvent (Lnet/minecraft/class_1937;Lnet/minecraft/class_5712;Lnet/minecraft/class_243;)V
 		ARG 0 world
 		ARG 1 event
-		ARG 2 pos
 	METHOD method_33140 sendGameEventListener (Lnet/minecraft/class_1937;Lnet/minecraft/class_5714;)V
 		ARG 0 world
 		ARG 1 eventListener

mappings/net/minecraft/server/world/ServerWorld.mapping

@@ -29,7 +29,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
 	FIELD field_35565 blockEventQueue Ljava/util/List;
 	FIELD field_36208 structureLocator Lnet/minecraft/class_6832;
 	FIELD field_36317 duringListenerUpdate Z
-	FIELD field_37279 neighborUpdater Lnet/minecraft/class_7165;
 	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_5321;Lnet/minecraft/class_5363;Lnet/minecraft/class_3949;ZJLjava/util/List;Z)V
 		ARG 1 server
 		ARG 2 workerExecutor
@@ -240,11 +239,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
 	METHOD method_23659 (Lnet/minecraft/class_3341;Lnet/minecraft/class_1919;)Z
 		ARG 1 event
 	METHOD method_23660 wakeSleepingPlayers ()V
-	METHOD method_24500 locateBiome (Ljava/util/function/Predicate;Lnet/minecraft/class_2338;II)Lcom/mojang/datafixers/util/Pair;
-		ARG 1 biomeEntryPredicate
-		ARG 2 pos
-		ARG 3 radius
-		ARG 4 blockCheckInterval
 	METHOD method_27056 getStructureAccessor ()Lnet/minecraft/class_5138;
 	METHOD method_27909 iterateEntities ()Ljava/lang/Iterable;
 	METHOD method_27910 setWeather (IIZZ)V
@@ -327,10 +321,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
 		ARG 1 entity
 	METHOD method_32310 (Lnet/minecraft/class_2487;)Lnet/minecraft/class_3767;
 		ARG 1 nbt
-	METHOD method_32817 sendVibrationPacket (Lnet/minecraft/class_5720;)V
-		ARG 1 vibration
-	METHOD method_32818 (Lnet/minecraft/class_2338;Lnet/minecraft/class_5747;Lnet/minecraft/class_3222;)V
-		ARG 3 player
 	METHOD method_32819 getLogicalHeight ()I
 	METHOD method_33143 sendSleepingStatus ()V
 		COMMENT Sends sleeping status action bar messages to players in this world.

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

@@ -10,7 +10,7 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe
 		ARG 6 results
 		ARG 7 random
 		ARG 8 world
-	METHOD method_30419 generate (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_6880;ILnet/minecraft/class_3778$class_3779;Lnet/minecraft/class_2338;ZLjava/util/Optional;)Ljava/util/Optional;
+	METHOD method_30419 generate (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_6880;ILnet/minecraft/class_3778$class_3779;Lnet/minecraft/class_2338;ZLjava/util/Optional;I)Ljava/util/Optional;
 	CLASS class_3779 PieceFactory
 		METHOD create (Lnet/minecraft/class_3485;Lnet/minecraft/class_3784;Lnet/minecraft/class_2338;ILnet/minecraft/class_2470;Lnet/minecraft/class_3341;)Lnet/minecraft/class_3790;
 			ARG 1 structureManager

mappings/net/minecraft/unused/packageinfo/PackageInfo7263.mapping

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7263 net/minecraft/unused/packageinfo/PackageInfo7263

mappings/net/minecraft/util/math/ChunkSectionPos.mapping

@@ -26,8 +26,7 @@ CLASS net/minecraft/class_4076 net/minecraft/util/math/ChunkSectionPos
 		COMMENT @see #asLong
 		ARG 0 packed
 		ARG 2 direction
-	METHOD method_18680 from (Lnet/minecraft/class_1297;)Lnet/minecraft/class_4076;
+	METHOD method_18680 from (Lnet/minecraft/class_2374;)Lnet/minecraft/class_4076;
-		ARG 0 entity
 	METHOD method_18681 from (Lnet/minecraft/class_1923;I)Lnet/minecraft/class_4076;
 		COMMENT Creates a chunk section position from a chunk position and the y-coordinate of the vertical section.
 		ARG 0 chunkPos

mappings/net/minecraft/util/math/ColumnPos.mapping

@@ -1,11 +1,8 @@
 CLASS net/minecraft/class_2265 net/minecraft/util/math/ColumnPos
-	FIELD field_10707 z I
+	FIELD comp_638 x I
-	FIELD field_10708 x I
+	FIELD comp_639 z I
-	METHOD <init> (II)V
+	METHOD comp_638 x ()I
-		ARG 1 x
+	METHOD comp_639 z ()I
-		ARG 2 z
-	METHOD <init> (Lnet/minecraft/class_2338;)V
-		ARG 1 pos
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
 	METHOD method_34873 toChunkPos ()Lnet/minecraft/class_1923;

mappings/net/minecraft/util/math/noise/InterpolatedNoiseSampler.mapping

@@ -4,22 +4,12 @@ CLASS net/minecraft/class_5822 net/minecraft/util/math/noise/InterpolatedNoiseSa
 	FIELD field_28776 interpolationNoise Lnet/minecraft/class_3537;
 	FIELD field_34752 xzScale D
 	FIELD field_34753 yScale D
-	FIELD field_34754 xzMainScale D
+	FIELD field_37206 CODEC Lnet/minecraft/class_7243;
-	FIELD field_34755 yMainScale D
+	METHOD <init> (Lnet/minecraft/class_3537;Lnet/minecraft/class_3537;Lnet/minecraft/class_3537;DDDDD)V
-	FIELD field_34756 cellWidth I
-	FIELD field_34757 cellHeight I
-	FIELD field_37206 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Lnet/minecraft/class_3537;Lnet/minecraft/class_3537;Lnet/minecraft/class_3537;Lnet/minecraft/class_5308;II)V
 		ARG 1 lowerInterpolatedNoise
 		ARG 2 upperInterpolatedNoise
 		ARG 3 interpolationNoise
-		ARG 4 config
+	METHOD <init> (Lnet/minecraft/class_5819;DDDDD)V
-		ARG 5 cellWidth
-		ARG 6 cellHeight
-	METHOD <init> (Lnet/minecraft/class_5819;Lnet/minecraft/class_5308;II)V
 		ARG 1 random
-		ARG 2 config
-		ARG 3 cellWidth
-		ARG 4 cellHeight
 	METHOD method_39117 addDebugInfo (Ljava/lang/StringBuilder;)V
 		ARG 1 info

mappings/net/minecraft/world/Vibration.mapping

@@ -1,19 +0,0 @@
-CLASS net/minecraft/class_5720 net/minecraft/world/Vibration
-	FIELD field_28193 CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_28194 origin Lnet/minecraft/class_2338;
-	FIELD field_28195 destination Lnet/minecraft/class_5716;
-	FIELD field_28196 arrivalInTicks I
-	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_5716;I)V
-		ARG 1 origin
-		ARG 2 destination
-		ARG 3 arrivalInTicks
-	METHOD method_32971 getArrivalInTicks ()I
-	METHOD method_32973 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
-		ARG 0 instance
-	METHOD method_32974 readFromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5720;
-		ARG 0 buf
-	METHOD method_32975 writeToBuf (Lnet/minecraft/class_2540;Lnet/minecraft/class_5720;)V
-		ARG 0 buf
-		ARG 1 vibration
-	METHOD method_32976 getOrigin ()Lnet/minecraft/class_2338;
-	METHOD method_32978 getDestination ()Lnet/minecraft/class_5716;

mappings/net/minecraft/world/World.mapping

@@ -29,7 +29,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
 	FIELD field_9251 thunderGradientPrev F
 	FIELD field_9253 rainGradientPrev F
 	FIELD field_9256 lcgBlockSeed I
-	METHOD <init> (Lnet/minecraft/class_5269;Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;Ljava/util/function/Supplier;ZZJ)V
+	METHOD <init> (Lnet/minecraft/class_5269;Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;Ljava/util/function/Supplier;ZZJI)V
 		ARG 1 properties
 		ARG 2 registryRef
 		ARG 4 profiler
@@ -126,17 +126,11 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
 		ARG 2 state
 	METHOD method_31596 (Ljava/util/function/Predicate;Ljava/util/List;Lnet/minecraft/class_5575;Lnet/minecraft/class_1297;)V
 		ARG 3 entity
-	METHOD method_32886 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_5712;Lnet/minecraft/class_2338;I)V
-		ARG 1 entity
-		ARG 2 gameEvent
-		ARG 3 pos
-		ARG 4 range
 	METHOD method_38989 shouldUpdatePostDeath (Lnet/minecraft/class_1297;)Z
 		ARG 1 entity
 	METHOD method_39425 shouldTickBlocksInChunk (J)Z
 		COMMENT {@return whether the blocks in the specified chunk should get ticked}
 		ARG 1 chunkPos
-	METHOD method_41249 getNeighborUpdater ()Lnet/minecraft/class_7165;
 	METHOD method_41410 updateNeighbor (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;Z)V
 		ARG 1 state
 		ARG 2 pos

mappings/net/minecraft/world/WorldAccess.mapping

@@ -3,25 +3,14 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess
 		ARG 1 eventId
 		ARG 2 pos
 		ARG 3 data
-	METHOD method_32887 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;)V
+	METHOD method_32888 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_5712;Lnet/minecraft/class_243;)V
-		ARG 1 entity
-		ARG 2 event
-		ARG 3 emitter
-	METHOD method_32888 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_5712;Lnet/minecraft/class_2338;)V
 		COMMENT Emits an game event.
 		ARG 1 entity
 			COMMENT the entity that triggered the game event, or {@code null} for events
 			COMMENT not triggered by entities (such as dispensers)
 		ARG 2 event
 			COMMENT the game event
-		ARG 3 pos
+	METHOD method_33596 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_5712;Lnet/minecraft/class_2338;)V
-			COMMENT the position where the event occurred
-	METHOD method_32889 emitGameEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_2338;)V
-		ARG 1 event
-		ARG 2 pos
-	METHOD method_33596 emitGameEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;)V
-		ARG 1 event
-		ARG 2 emitter
 	METHOD method_39224 getTickOrder ()J
 	METHOD method_39279 createAndScheduleBlockTick (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;I)V
 		ARG 1 pos

mappings/net/minecraft/world/WorldView.mapping

@@ -39,7 +39,6 @@ CLASS net/minecraft/class_4538 net/minecraft/world/WorldView
 		COMMENT @see BlockRenderView#isSkyVisible
 		ARG 1 pos
 	METHOD method_22349 getBrightness (Lnet/minecraft/class_2338;)F
-		ARG 1 pos
 	METHOD method_22350 getChunk (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2791;
 		COMMENT {@return the chunk that contains {@code pos}}
 		ARG 1 pos

mappings/net/minecraft/world/block/ChainRestrictedNeighborUpdater.mapping

@@ -1,11 +1,9 @@
 CLASS net/minecraft/class_7159 net/minecraft/world/block/ChainRestrictedNeighborUpdater
 	FIELD field_37829 LOGGER Lorg/slf4j/Logger;
-	FIELD field_37830 world Lnet/minecraft/class_3218;
+	FIELD field_37830 world Lnet/minecraft/class_1937;
 	FIELD field_37831 queue Ljava/util/ArrayDeque;
 	FIELD field_37832 pending Ljava/util/List;
 	FIELD field_37833 depth I
-	METHOD <init> (Lnet/minecraft/class_3218;)V
-		ARG 1 world
 	METHOD method_41702 runQueuedUpdates ()V
 	METHOD method_41706 enqueue (Lnet/minecraft/class_2338;Lnet/minecraft/class_7159$class_7162;)V
 		ARG 1 pos
@@ -25,8 +23,7 @@ CLASS net/minecraft/class_7159 net/minecraft/world/block/ChainRestrictedNeighbor
 			ARG 2 sourceBlock
 			ARG 3 except
 	CLASS class_7162 Entry
-		METHOD method_41707 update (Lnet/minecraft/class_3218;)Z
+		METHOD method_41707 update (Lnet/minecraft/class_1937;)Z
-			ARG 1 world
 	CLASS class_7163 SimpleEntry
 		FIELD comp_590 sourceBlock Lnet/minecraft/class_2248;
 		FIELD comp_591 sourcePos Lnet/minecraft/class_2338;

mappings/net/minecraft/world/block/NeighborUpdater.mapping

@@ -1,6 +1,5 @@
 CLASS net/minecraft/class_7165 net/minecraft/world/block/NeighborUpdater
 	FIELD field_37839 UPDATE_ORDER [Lnet/minecraft/class_2350;
-	FIELD field_37840 NOOP Lnet/minecraft/class_7165;
 	METHOD method_41703 updateNeighbor (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;Z)V
 		ARG 1 state
 		ARG 2 pos
@@ -15,8 +14,7 @@ CLASS net/minecraft/class_7165 net/minecraft/world/block/NeighborUpdater
 		ARG 1 pos
 		ARG 2 sourceBlock
 		ARG 3 except
-	METHOD method_41708 tryNeighborUpdate (Lnet/minecraft/class_3218;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;Z)V
+	METHOD method_41708 tryNeighborUpdate (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;Z)V
-		ARG 0 world
 		ARG 1 state
 		ARG 2 pos
 		ARG 3 sourceBlock

mappings/net/minecraft/world/block/SimpleNeighborUpdater.mapping

@@ -1,4 +1,2 @@
 CLASS net/minecraft/class_7164 net/minecraft/world/block/SimpleNeighborUpdater
-	FIELD field_37838 world Lnet/minecraft/class_3218;
+	FIELD field_37838 world Lnet/minecraft/class_1937;
-	METHOD <init> (Lnet/minecraft/class_3218;)V
-		ARG 1 world

mappings/net/minecraft/world/chunk/WorldChunk.mapping

@@ -38,7 +38,6 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk
 		ARG 1 pos
 	METHOD method_12214 getBlockEntities ()Ljava/util/Map;
 	METHOD method_12216 addBlockEntity (Lnet/minecraft/class_2586;)V
-		ARG 1 blockEntity
 	METHOD method_12221 runPostProcessing ()V
 	METHOD method_12223 isEmpty ()Z
 	METHOD method_12224 loadFromPacket (Lnet/minecraft/class_2540;Lnet/minecraft/class_2487;Ljava/util/function/Consumer;)V
@@ -70,13 +69,11 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk
 		ARG 1 pos
 	METHOD method_31725 removeBlockEntityTicker (Lnet/minecraft/class_2338;)V
 		ARG 1 pos
-	METHOD method_32917 (I)Lnet/minecraft/class_5713;
+	METHOD method_32917 (Lnet/minecraft/class_3218;I)Lnet/minecraft/class_5713;
 		ARG 1 sectionCoord
-	METHOD method_32918 removeGameEventListener (Lnet/minecraft/class_2586;)V
+	METHOD method_32918 removeGameEventListener (Lnet/minecraft/class_2586;Lnet/minecraft/class_3218;)V
 		ARG 1 blockEntity
-	METHOD method_32919 updateGameEventListener (Lnet/minecraft/class_2586;)V
+	METHOD method_32919 updateGameEventListener (Lnet/minecraft/class_2586;Lnet/minecraft/class_3218;)V
-		ARG 1 blockEntity
-	METHOD method_32920 (Lnet/minecraft/class_2586;)V
 		ARG 1 blockEntity
 	METHOD method_38289 clear ()V
 	METHOD method_38290 (Lnet/minecraft/class_2818$class_5564;)V

mappings/net/minecraft/world/dimension/DimensionType.mapping

@@ -1,25 +1,23 @@
 CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType
-	FIELD field_13073 hasSkyLight Z
+	FIELD comp_641 fixedTime Ljava/util/OptionalLong;
-	FIELD field_24504 hasCeiling Z
+	FIELD comp_642 hasSkyLight Z
-	FIELD field_24505 ultrawarm Z
+	FIELD comp_643 hasCeiling Z
+	FIELD comp_644 ultrawarm Z
+	FIELD comp_645 natural Z
+	FIELD comp_646 coordinateScale D
+	FIELD comp_647 piglinSafe Z
+	FIELD comp_648 bedWorks Z
+	FIELD comp_649 respawnAnchorWorks Z
+	FIELD comp_650 hasRaids Z
+	FIELD comp_651 minimumY I
+	FIELD comp_652 height I
+	FIELD comp_653 logicalHeight I
+	FIELD comp_654 infiniburn Lnet/minecraft/class_6862;
+	FIELD comp_655 effects Lnet/minecraft/class_2960;
+	FIELD comp_656 ambientLight F
 	FIELD field_24752 MOON_SIZES [F
 	FIELD field_24756 REGISTRY_CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_24757 CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_24761 fixedTime Ljava/util/OptionalLong;
-	FIELD field_24762 natural Z
-	FIELD field_24764 hasEnderDragonFight Z
-	FIELD field_24766 ambientLight F
-	FIELD field_24767 brightnessByLightLevel [F
-	FIELD field_25612 piglinSafe Z
-	FIELD field_25613 bedWorks Z
-	FIELD field_25614 respawnAnchorWorks Z
-	FIELD field_25615 hasRaids Z
-	FIELD field_25616 minimumY I
-	FIELD field_25617 infiniburn Lnet/minecraft/class_6862;
-	FIELD field_26706 coordinateScale D
-	FIELD field_26751 effects Lnet/minecraft/class_2960;
-	FIELD field_28131 height I
-	FIELD field_28132 logicalHeight I
 	FIELD field_28133 SIZE_BITS_Y I
 	FIELD field_28134 MAX_HEIGHT I
 	FIELD field_28135 MAX_COLUMN_HEIGHT I
@@ -27,46 +25,32 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType
 	METHOD <init> (Ljava/util/OptionalLong;ZZZZDZZZZIIILnet/minecraft/class_6862;Lnet/minecraft/class_2960;F)V
 		ARG 1 fixedTime
 		ARG 2 hasSkylight
-		ARG 3 hasCeiling
 		ARG 4 ultrawarm
-		ARG 5 natural
 		ARG 6 coordinateScale
-		ARG 8 piglinSafe
-		ARG 9 bedWorks
-		ARG 10 respawnAnchorWorks
-		ARG 11 hasRaids
-		ARG 12 minimumY
-		ARG 13 height
-		ARG 14 logicalHeight
-		ARG 16 effects
-		ARG 17 ambientLight
-	METHOD <init> (Ljava/util/OptionalLong;ZZZZDZZZZZIIILnet/minecraft/class_6862;Lnet/minecraft/class_2960;F)V
-		ARG 1 fixedTime
-		ARG 2 hasSkylight
-		ARG 3 hasCeiling
-		ARG 4 ultrawarm
-		ARG 5 natural
-		ARG 6 coordinateScale
-		ARG 8 hasEnderDragonFight
 		ARG 9 piglinSafe
-		ARG 10 bedWorks
 		ARG 11 respawnAnchorWorks
-		ARG 12 hasRaids
+	METHOD comp_641 fixedTime ()Ljava/util/OptionalLong;
-		ARG 13 minimumY
+	METHOD comp_642 hasSkyLight ()Z
-		ARG 14 height
+	METHOD comp_643 hasCeiling ()Z
-		ARG 15 logicalHeight
+	METHOD comp_644 ultrawarm ()Z
-		ARG 17 effects
+	METHOD comp_645 natural ()Z
-		ARG 18 ambientLight
+	METHOD comp_646 coordinateScale ()D
+	METHOD comp_647 piglinSafe ()Z
+	METHOD comp_648 bedWorks ()Z
+	METHOD comp_649 respawnAnchorWorks ()Z
+	METHOD comp_650 hasRaids ()Z
+	METHOD comp_651 minimumY ()I
+	METHOD comp_652 height ()I
+	METHOD comp_653 logicalHeight ()I
+	METHOD comp_654 infiniburn ()Lnet/minecraft/class_6862;
+	METHOD comp_655 effects ()Lnet/minecraft/class_2960;
+		COMMENT {@return the ID of this dimension's {@linkplain net.minecraft.client.render.DimensionEffects effects}}
+		COMMENT
+		COMMENT @see net.minecraft.client.render.DimensionEffects#byDimensionType(DimensionType)
+	METHOD comp_656 ambientLight ()F
 	METHOD method_12488 getSaveDirectory (Lnet/minecraft/class_5321;Ljava/nio/file/Path;)Ljava/nio/file/Path;
 		ARG 0 worldRef
 		ARG 1 worldDirectory
-	METHOD method_12491 hasSkyLight ()Z
-	METHOD method_27998 hasCeiling ()Z
-	METHOD method_27999 isUltrawarm ()Z
-	METHOD method_28515 computeBrightnessByLightLevel (F)[F
-		ARG 0 ambientLight
-	METHOD method_28516 getBrightness (I)F
-		ARG 1 lightLevel
 	METHOD method_28521 worldFromDimensionNbt (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/DataResult;
 		ARG 0 nbt
 	METHOD method_28522 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
@@ -79,41 +63,7 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType
 		COMMENT <p>This is typically used to determine the size of the moon that should be rendered.
 		ARG 1 time
 			COMMENT the time to calculate the index from
-	METHOD method_28537 isNatural ()Z
-	METHOD method_28540 hasEnderDragonFight ()Z
-	METHOD method_29955 isPiglinSafe ()Z
-	METHOD method_29956 isBedWorking ()Z
-	METHOD method_29957 isRespawnAnchorWorking ()Z
-	METHOD method_29958 hasRaids ()Z
-	METHOD method_29959 getMinimumY ()I
 	METHOD method_29960 hasFixedTime ()Z
-	METHOD method_29961 getInfiniburnBlocks ()Lnet/minecraft/class_6862;
 	METHOD method_31109 getCoordinateScaleFactor (Lnet/minecraft/class_2874;Lnet/minecraft/class_2874;)D
 		ARG 0 fromDimension
 		ARG 1 toDimension
-	METHOD method_31110 getCoordinateScale ()D
-	METHOD method_31181 getEffects ()Lnet/minecraft/class_2960;
-		COMMENT {@return the ID of this dimension's {@linkplain net.minecraft.client.render.DimensionEffects effects}}
-		COMMENT
-		COMMENT @see net.minecraft.client.render.DimensionEffects#byDimensionType(DimensionType)
-	METHOD method_32922 create (Ljava/util/OptionalLong;ZZZZDZZZZZIIILnet/minecraft/class_6862;Lnet/minecraft/class_2960;F)Lnet/minecraft/class_2874;
-		ARG 0 fixedTime
-		ARG 1 hasSkylight
-		ARG 2 hasCeiling
-		ARG 3 ultrawarm
-		ARG 4 natural
-		ARG 5 coordinateScale
-		ARG 7 hasEnderDragonFight
-		ARG 8 piglinSafe
-		ARG 9 bedWorks
-		ARG 10 respawnAnchorWorks
-		ARG 11 hasRaids
-		ARG 12 minimumY
-		ARG 13 height
-		ARG 14 logicalHeight
-		ARG 16 effects
-		ARG 17 ambientLight
-	METHOD method_32923 checkHeight (Lnet/minecraft/class_2874;)Lcom/mojang/serialization/DataResult;
-		ARG 0 type
-	METHOD method_32924 getHeight ()I
-	METHOD method_32925 getLogicalHeight ()I

mappings/net/minecraft/world/event/BlockPositionSource.mapping

@@ -1,10 +1,6 @@
 CLASS net/minecraft/class_5707 net/minecraft/world/event/BlockPositionSource
 	FIELD field_28137 CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_28138 pos Ljava/util/Optional;
+	FIELD field_28138 pos Lnet/minecraft/class_2338;
-	METHOD <init> (Ljava/util/Optional;)V
-		ARG 1 pos
-	METHOD <init> (Lnet/minecraft/class_2338;)V
-		ARG 1 pos
 	METHOD method_32927 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	CLASS class_5708 Type

mappings/net/minecraft/world/event/EntityPositionSource.mapping

@@ -2,7 +2,7 @@ CLASS net/minecraft/class_5709 net/minecraft/world/event/EntityPositionSource
 	FIELD field_28139 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_28140 entityId I
 	FIELD field_28141 entity Ljava/util/Optional;
-	METHOD <init> (I)V
+	METHOD <init> (IF)V
 		ARG 1 entityId
 	METHOD method_32932 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance

mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping

@@ -11,16 +11,11 @@ CLASS net/minecraft/class_5715 net/minecraft/world/event/listener/EntityGameEven
 	FIELD field_28183 sectionPos Lnet/minecraft/class_4076;
 	METHOD <init> (Lnet/minecraft/class_5714;)V
 		ARG 1 listener
-	METHOD method_32949 onEntityRemoval (Lnet/minecraft/class_1937;)V
+	METHOD method_32949 onEntityRemoval (Lnet/minecraft/class_3218;)V
-		ARG 1 world
+	METHOD method_32950 updateDispatcher (Lnet/minecraft/class_4538;Lnet/minecraft/class_4076;Ljava/util/function/Consumer;)V
-	METHOD method_32950 updateDispatcher (Lnet/minecraft/class_1937;Lnet/minecraft/class_4076;Ljava/util/function/Consumer;)V
-		ARG 1 world
-		ARG 2 sectionPos
-		ARG 3 action
 	METHOD method_32951 (Lnet/minecraft/class_5713;)V
 		ARG 1 dispatcher
-	METHOD method_32952 onEntitySetPos (Lnet/minecraft/class_1937;)V
+	METHOD method_32952 onEntitySetPos (Lnet/minecraft/class_3218;)V
-		ARG 1 world
 	METHOD method_32953 (Lnet/minecraft/class_5713;)V
 		ARG 1 dispatcher
 	METHOD method_32954 (Lnet/minecraft/class_5713;)V

mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping

@@ -4,14 +4,12 @@ CLASS net/minecraft/class_5713 net/minecraft/world/event/listener/GameEventDispa
 		COMMENT An unmodifiable, empty (non-operative) dispatcher.
 	METHOD method_32942 isEmpty ()Z
 		COMMENT Returns whether this dispatcher has no listeners.
-	METHOD method_32943 dispatch (Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;)V
+	METHOD method_32943 dispatch (Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;)V
 		COMMENT Dispatches an event to all the listeners in this dispatcher.
 		ARG 1 event
 			COMMENT the event
 		ARG 2 entity
 			COMMENT an entity related to the event
-		ARG 3 pos
-			COMMENT the block position of the event
 	METHOD method_32944 addListener (Lnet/minecraft/class_5714;)V
 		COMMENT Adds a listener to this dispatcher.
 		ARG 1 listener

mappings/net/minecraft/world/event/listener/GameEventListener.mapping

@@ -2,13 +2,11 @@ CLASS net/minecraft/class_5714 net/minecraft/world/event/listener/GameEventListe
 	COMMENT A game event listener listens to game events from {@link GameEventDispatcher}s.
 	METHOD method_32946 getPositionSource ()Lnet/minecraft/class_5716;
 		COMMENT Returns the position source of this listener.
-	METHOD method_32947 listen (Lnet/minecraft/class_1937;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;)Z
+	METHOD method_32947 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;)Z
 		COMMENT Listens to an incoming game event.
 		COMMENT
 		COMMENT @return {@code true} if the game event has been accepted by this listener
-		ARG 1 world
 		ARG 2 event
 		ARG 3 entity
-		ARG 4 pos
 	METHOD method_32948 getRange ()I
 		COMMENT Returns the range, in blocks, of the listener.

mappings/net/minecraft/world/event/listener/SculkSensorListener.mapping

@@ -2,39 +2,19 @@ CLASS net/minecraft/class_5718 net/minecraft/world/event/listener/SculkSensorLis
 	FIELD field_28187 positionSource Lnet/minecraft/class_5716;
 	FIELD field_28188 range I
 	FIELD field_28189 callback Lnet/minecraft/class_5718$class_5719;
-	FIELD field_28190 event Ljava/util/Optional;
+	FIELD field_28190 event Lnet/minecraft/class_5718$class_7269;
 	FIELD field_28191 distance I
 	FIELD field_28192 delay I
-	METHOD <init> (Lnet/minecraft/class_5716;ILnet/minecraft/class_5718$class_5719;)V
-		ARG 1 positionSource
-		ARG 2 range
-		ARG 3 listener
 	METHOD method_32964 tick (Lnet/minecraft/class_1937;)V
-		ARG 1 world
+	METHOD method_32966 isOccluded (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z
-	METHOD method_32965 listen (Lnet/minecraft/class_1937;Lnet/minecraft/class_5712;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)V
-		ARG 1 world
-		ARG 2 event
-		ARG 3 pos
-		ARG 4 sourcePos
-	METHOD method_32966 isOccluded (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Z
-		ARG 1 world
-		ARG 2 pos
-		ARG 3 sourcePos
 	METHOD method_32967 (Lnet/minecraft/class_2680;)Z
 		ARG 0 state
-	METHOD method_32968 shouldActivate (Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;)Z
-		ARG 1 event
-		ARG 2 entity
 	CLASS class_5719 Callback
-		METHOD method_32969 accept (Lnet/minecraft/class_1937;Lnet/minecraft/class_5714;Lnet/minecraft/class_5712;I)V
+		METHOD method_32969 accept (Lnet/minecraft/class_3218;Lnet/minecraft/class_5714;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;I)V
 			COMMENT Accepts a game event after delay.
-			ARG 1 world
 			ARG 2 listener
-			ARG 3 event
+		METHOD method_32970 accepts (Lnet/minecraft/class_3218;Lnet/minecraft/class_5714;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;)Z
-			ARG 4 distance
-		METHOD method_32970 accepts (Lnet/minecraft/class_1937;Lnet/minecraft/class_5714;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;)Z
 			COMMENT Returns whether the callback wants to accept this event.
-			ARG 1 world
 			ARG 2 listener
 			ARG 3 pos
 			ARG 4 event

mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping

@@ -4,12 +4,5 @@ CLASS net/minecraft/class_5711 net/minecraft/world/event/listener/SimpleGameEven
 	COMMENT
 	COMMENT @apiNote Vanilla Minecraft creates it on a per-chunk-section basis.
 	FIELD field_28142 listeners Ljava/util/List;
-	FIELD field_28143 world Lnet/minecraft/class_1937;
+	FIELD field_28143 world Lnet/minecraft/class_3218;
-	METHOD <init> (Lnet/minecraft/class_1937;)V
+	METHOD method_32936 dispatchTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_5714;)Z
-		ARG 1 world
-	METHOD method_32936 dispatchTo (Lnet/minecraft/class_1937;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;Lnet/minecraft/class_5714;)Z
-		ARG 1 world
-		ARG 2 event
-		ARG 3 entity
-		ARG 4 pos
-		ARG 5 listener

mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping

@@ -2,13 +2,9 @@ CLASS net/minecraft/class_6350 net/minecraft/world/gen/chunk/AquiferSampler
 	METHOD method_33742 needsFluidTick ()Z
 	METHOD method_36381 seaLevel (Lnet/minecraft/class_6350$class_6565;)Lnet/minecraft/class_6350;
 		ARG 0 fluidLevelSampler
-	METHOD method_36382 aquifer (Lnet/minecraft/class_6568;Lnet/minecraft/class_1923;Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;Lnet/minecraft/class_6574;IILnet/minecraft/class_6350$class_6565;)Lnet/minecraft/class_6350;
+	METHOD method_36382 aquifer (Lnet/minecraft/class_6568;Lnet/minecraft/class_1923;Lnet/minecraft/class_6953;Lnet/minecraft/class_6574;IILnet/minecraft/class_6350$class_6565;)Lnet/minecraft/class_6350;
 		ARG 0 chunkNoiseSampler
 		ARG 1 chunkPos
-		ARG 6 randomDeriver
-		ARG 7 minY
-		ARG 8 height
-		ARG 9 fluidLevelSampler
 	METHOD method_38317 apply (Lnet/minecraft/class_6910$class_6912;D)Lnet/minecraft/class_2680;
 	CLASS class_5832 Impl
 		FIELD field_28813 barrierNoise Lnet/minecraft/class_6910;
@@ -26,13 +22,9 @@ CLASS net/minecraft/class_6350 net/minecraft/world/gen/chunk/AquiferSampler
 		FIELD field_34580 fluidLevelSampler Lnet/minecraft/class_6350$class_6565;
 		FIELD field_35122 fluidLevelFloodednessNoise Lnet/minecraft/class_6910;
 		FIELD field_35123 fluidLevelSpreadNoise Lnet/minecraft/class_6910;
-		METHOD <init> (Lnet/minecraft/class_6568;Lnet/minecraft/class_1923;Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;Lnet/minecraft/class_6574;IILnet/minecraft/class_6350$class_6565;)V
+		METHOD <init> (Lnet/minecraft/class_6568;Lnet/minecraft/class_1923;Lnet/minecraft/class_6953;Lnet/minecraft/class_6574;IILnet/minecraft/class_6350$class_6565;)V
 			ARG 1 chunkNoiseSampler
 			ARG 2 chunkPos
-			ARG 7 randomDeriver
-			ARG 8 minY
-			ARG 9 height
-			ARG 10 fluidLevelSampler
 		METHOD method_33734 getLocalX (I)I
 			ARG 1 x
 		METHOD method_33735 calculateDensity (Lnet/minecraft/class_6910$class_6912;Lorg/apache/commons/lang3/mutable/MutableDouble;Lnet/minecraft/class_6350$class_6351;Lnet/minecraft/class_6350$class_6351;)D

mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping

@@ -13,7 +13,7 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler
 	FIELD field_36584 blockStateSampler Lnet/minecraft/class_6568$class_6569;
 	FIELD field_36590 horizontalBlockSize I
 	FIELD field_36591 verticalBlockSize I
-	METHOD <init> (ILnet/minecraft/class_5539;Lnet/minecraft/class_6953;IILnet/minecraft/class_6916$class_7050;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;Lnet/minecraft/class_6574;Lnet/minecraft/class_6574;)V
+	METHOD <init> (ILnet/minecraft/class_7138;IILnet/minecraft/class_5309;Lnet/minecraft/class_6916$class_7050;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)V
 		ARG 1 horizontalSize
 	METHOD method_38336 sampleStartNoise ()V
 	METHOD method_38337 sampleNoiseY (ID)V
@@ -34,9 +34,8 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler
 	METHOD method_38362 sampleNoiseCorners (II)V
 		ARG 1 noiseY
 		ARG 2 noiseZ
-	METHOD method_39543 create (Lnet/minecraft/class_2791;Lnet/minecraft/class_6953;Lnet/minecraft/class_6916$class_7050;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;Lnet/minecraft/class_6574;Lnet/minecraft/class_6574;)Lnet/minecraft/class_6568;
+	METHOD method_39543 create (Lnet/minecraft/class_2791;Lnet/minecraft/class_7138;Lnet/minecraft/class_6916$class_7050;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)Lnet/minecraft/class_6568;
 		ARG 0 chunk
-		ARG 1 noiseRouter
 	METHOD method_40531 createMultiNoiseSampler (Lnet/minecraft/class_6953;Ljava/util/List;)Lnet/minecraft/class_6544$class_6552;
 	METHOD method_40536 sampleBlockState ()Lnet/minecraft/class_2680;
 	CLASS class_5917 NoiseInterpolator

mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping

@@ -1,40 +1,22 @@
 CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConfig
 	FIELD comp_173 minimumY I
 	FIELD comp_174 height I
-	FIELD comp_175 sampling Lnet/minecraft/class_5308;
-	FIELD comp_176 topSlide Lnet/minecraft/class_5310;
-	FIELD comp_177 bottomSlide Lnet/minecraft/class_5310;
 	FIELD comp_178 horizontalSize I
 	FIELD comp_179 verticalSize I
 	FIELD field_24804 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;II)V
+	METHOD <init> (IIII)V
 		ARG 1 minimumY
 		ARG 2 height
-		ARG 3 sampling
-		ARG 4 topSlide
-		ARG 5 bottomSlide
-		ARG 6 horizontalSize
-		ARG 7 verticalSize
 	METHOD comp_173 minimumY ()I
 	METHOD comp_174 height ()I
-	METHOD comp_175 sampling ()Lnet/minecraft/class_5308;
-	METHOD comp_176 topSlide ()Lnet/minecraft/class_5310;
-	METHOD comp_177 bottomSlide ()Lnet/minecraft/class_5310;
 	METHOD comp_178 horizontalSize ()I
 	METHOD comp_179 verticalSize ()I
 	METHOD method_28582 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
-	METHOD method_32994 create (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;II)Lnet/minecraft/class_5309;
+	METHOD method_32994 create (IIII)Lnet/minecraft/class_5309;
 		ARG 0 minimumY
 		ARG 1 height
-		ARG 2 sampling
-		ARG 3 topSlide
-		ARG 4 bottomSlide
-		ARG 5 horizontalSize
-		ARG 6 verticalSize
 	METHOD method_32995 checkHeight (Lnet/minecraft/class_5309;)Lcom/mojang/serialization/DataResult;
 		ARG 0 config
 	METHOD method_39545 verticalBlockSize ()I
 	METHOD method_39546 horizontalBlockSize ()I
-	METHOD method_39547 verticalBlockCount ()I
-	METHOD method_39548 minimumBlockY ()I

mappings/net/minecraft/world/gen/chunk/NoiseSamplingConfig.mapping

@@ -1,18 +0,0 @@
-CLASS net/minecraft/class_5308 net/minecraft/world/gen/chunk/NoiseSamplingConfig
-	FIELD comp_503 xzScale D
-	FIELD comp_504 yScale D
-	FIELD comp_505 xzFactor D
-	FIELD comp_506 yFactor D
-	FIELD field_24799 CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_25188 CODEC_RANGE Lcom/mojang/serialization/Codec;
-	METHOD <init> (DDDD)V
-		ARG 1 xzScale
-		ARG 3 yScale
-		ARG 5 xzFactor
-		ARG 7 yFactor
-	METHOD comp_503 xzScale ()D
-	METHOD comp_504 yScale ()D
-	METHOD comp_505 xzFactor ()D
-	METHOD comp_506 yFactor ()D
-	METHOD method_28577 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
-		ARG 0 instance

mappings/net/minecraft/world/gen/chunk/SlideConfig.mapping

@@ -1,14 +0,0 @@
-CLASS net/minecraft/class_5310 net/minecraft/world/gen/chunk/SlideConfig
-	FIELD comp_432 target D
-	FIELD comp_433 size I
-	FIELD comp_434 offset I
-	FIELD field_24817 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (DII)V
-		ARG 1 target
-		ARG 3 size
-		ARG 4 offset
-	METHOD comp_432 target ()D
-	METHOD comp_433 size ()I
-	METHOD comp_434 offset ()I
-	METHOD method_28595 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
-		ARG 0 instance

mappings/net/minecraft/world/gen/densityfunction/DensityFunction.mapping

@@ -13,7 +13,7 @@ CLASS net/minecraft/class_6910 net/minecraft/world/gen/densityfunction/DensityFu
 	METHOD method_40474 halfNegative ()Lnet/minecraft/class_6910;
 	METHOD method_40475 quarterNegative ()Lnet/minecraft/class_6910;
 	METHOD method_40476 squeeze ()Lnet/minecraft/class_6910;
-	METHOD method_41062 getCodec ()Lcom/mojang/serialization/Codec;
+	METHOD method_41062 getCodec ()Lnet/minecraft/class_7243;
 	CLASS class_6912 NoisePos
 		METHOD method_39327 getBlender ()Lnet/minecraft/class_6748;
 	CLASS class_6914 UnblendedNoisePos

mappings/net/minecraft/world/gen/densityfunction/DensityFunctionTypes.mapping

@@ -14,7 +14,6 @@ CLASS net/minecraft/class_6916 net/minecraft/world/gen/densityfunction/DensityFu
 	METHOD method_40487 shiftedNoise (Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;DLnet/minecraft/class_6880;)Lnet/minecraft/class_6910;
 		ARG 4 noiseParameters
 	METHOD method_40491 weirdScaledSampler (Lnet/minecraft/class_6910;Lnet/minecraft/class_6880;Lnet/minecraft/class_6916$class_6944$class_7048;)Lnet/minecraft/class_6910;
-	METHOD method_40492 slide (Lnet/minecraft/class_5309;Lnet/minecraft/class_6910;)Lnet/minecraft/class_6910;
 	METHOD method_40493 noise (Lnet/minecraft/class_6880;)Lnet/minecraft/class_6910;
 		ARG 0 noiseParameters
 	METHOD method_40494 noise (Lnet/minecraft/class_6880;D)Lnet/minecraft/class_6910;
@@ -55,74 +54,56 @@ CLASS net/minecraft/class_6916 net/minecraft/world/gen/densityfunction/DensityFu
 	METHOD method_40512 blendDensity (Lnet/minecraft/class_6910;)Lnet/minecraft/class_6910;
 	METHOD method_41066 registerAndGetDefault (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/Codec;
 		ARG 0 registry
-	METHOD method_41067 register (Lnet/minecraft/class_2378;Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
+	METHOD method_41067 register (Lnet/minecraft/class_2378;Ljava/lang/String;Lnet/minecraft/class_7243;)Lcom/mojang/serialization/Codec;
 		ARG 0 registry
 		ARG 1 id
-		ARG 2 codec
 	METHOD method_41528 spline (Lnet/minecraft/class_6492;)Lnet/minecraft/class_6910;
 		ARG 0 spline
 	CLASS class_6919 BlendAlpha
-		FIELD field_37079 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_37079 CODEC Lnet/minecraft/class_7243;
 	CLASS class_6920 BlendDensity
-		FIELD field_37080 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_37080 CODEC Lnet/minecraft/class_7243;
 	CLASS class_6921 BlendOffset
-		FIELD field_37081 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_37081 CODEC Lnet/minecraft/class_7243;
 	CLASS class_6922 Clamp
-		FIELD field_37082 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_37082 CODEC Lnet/minecraft/class_7243;
 	CLASS class_6923 Constant
 		FIELD field_36553 ZERO Lnet/minecraft/class_6916$class_6923;
-		FIELD field_37084 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_37084 CODEC Lnet/minecraft/class_7243;
 	CLASS class_6924 EndIslands
-		FIELD field_37085 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_37085 CODEC Lnet/minecraft/class_7243;
 		METHOD <init> (J)V
 			ARG 1 seed
 	CLASS class_6925
 		CLASS class_6926 Type
 			FIELD field_37086 name Ljava/lang/String;
-			FIELD field_37087 codec Lcom/mojang/serialization/Codec;
+			FIELD field_37087 codec Lnet/minecraft/class_7243;
 			METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
 				ARG 3 name
 	CLASS class_6927
 		CLASS class_6928 Type
 			FIELD field_37088 name Ljava/lang/String;
-			FIELD field_37089 codec Lcom/mojang/serialization/Codec;
+			FIELD field_37089 codec Lnet/minecraft/class_7243;
 			METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
 				ARG 3 name
 	CLASS class_6929
 		CLASS class_6930 SpecificType
 	CLASS class_6931 Noise
-		FIELD field_37091 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_37091 CODEC Lnet/minecraft/class_7243;
-		METHOD method_41084 of (Lnet/minecraft/class_6880;DD)Lnet/minecraft/class_6916$class_6931;
-			ARG 0 noiseData
-			ARG 1 xzScale
-			ARG 3 yScale
 	CLASS class_6932
 		METHOD method_40520 apply (D)D
 	CLASS class_6933 RangeChoice
-		FIELD field_37093 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_37093 CODEC Lnet/minecraft/class_7243;
 	CLASS class_6934 Shift
-		FIELD field_37094 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_37094 CODEC Lnet/minecraft/class_7243;
 	CLASS class_6937 ShiftA
-		FIELD field_37095 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_37095 CODEC Lnet/minecraft/class_7243;
 	CLASS class_6938 ShiftB
-		FIELD field_37096 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_37096 CODEC Lnet/minecraft/class_7243;
 	CLASS class_6940 ShiftedNoise
-		FIELD field_37097 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_37097 CODEC Lnet/minecraft/class_7243;
-		METHOD method_41091 create (Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;DDLnet/minecraft/class_6880;)Lnet/minecraft/class_6916$class_6940;
-			ARG 0 shiftX
-			ARG 1 shiftY
-			ARG 2 shiftZ
-			ARG 3 xzScale
-			ARG 5 yScale
-			ARG 7 noiseData
-	CLASS class_6941 Slide
-		FIELD field_37099 CODEC Lcom/mojang/serialization/Codec;
 	CLASS class_6944 WeirdScaledSampler
-		FIELD field_37064 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_37064 CODEC Lnet/minecraft/class_7243;
-		METHOD method_41073 create (Lnet/minecraft/class_6910;Lnet/minecraft/class_6880;Lnet/minecraft/class_6916$class_6944$class_7048;)Lnet/minecraft/class_6916$class_6944;
-			ARG 0 input
-			ARG 1 noiseData
-			ARG 2 rarityValueMapper
 		CLASS class_7048 RarityValueMapper
 			FIELD field_37068 CODEC Lcom/mojang/serialization/Codec;
 			FIELD field_37069 TYPES_MAP Ljava/util/Map;
@@ -132,10 +113,10 @@ CLASS net/minecraft/class_6916 net/minecraft/world/gen/densityfunction/DensityFu
 				ARG 3 name
 				ARG 4 scaleFunction
 	CLASS class_6945 YClampedGradient
-		FIELD field_37074 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_37074 CODEC Lnet/minecraft/class_7243;
 	CLASS class_7049 Beardifier
 	CLASS class_7050
-		FIELD field_37078 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_37078 CODEC Lnet/minecraft/class_7243;
 	CLASS class_7051 RegistryEntryHolder
 	CLASS class_7052 Wrapper
 	CLASS class_7055 Operation
@@ -145,9 +126,9 @@ CLASS net/minecraft/class_6916 net/minecraft/world/gen/densityfunction/DensityFu
 			ARG 1 argument1
 			ARG 2 argument2
 		CLASS class_6918 Type
-			FIELD field_37111 codec Lcom/mojang/serialization/Codec;
+			FIELD field_37111 codec Lnet/minecraft/class_7243;
 			FIELD field_37112 name Ljava/lang/String;
 			METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
 				ARG 3 name
 	CLASS class_7076 Spline
-		FIELD field_37255 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_37255 CODEC Lnet/minecraft/class_7243;

mappings/net/minecraft/world/gen/feature/EndCityFeature.mapping

@@ -1,9 +1,4 @@
 CLASS net/minecraft/class_3021 net/minecraft/world/gen/feature/EndCityFeature
-	FIELD field_31502 Z_SEED_MULTIPLIER I
 	FIELD field_37792 CODEC Lcom/mojang/serialization/Codec;
-	METHOD method_13085 getGenerationHeight (Lnet/minecraft/class_1923;Lnet/minecraft/class_2794;Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;)I
+	METHOD method_39817 (Lnet/minecraft/class_6626;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3195$class_7149;)V
-		ARG 0 pos
-		ARG 1 chunkGenerator
-		ARG 2 world
-	METHOD method_39817 (Lnet/minecraft/class_6626;Lnet/minecraft/class_2338;Lnet/minecraft/class_3195$class_7149;)V
 		ARG 1 collector

mappings/net/minecraft/world/gen/noise/NoiseConfig.mapping

@@ -1,12 +1,8 @@
 CLASS net/minecraft/class_7138 net/minecraft/world/gen/noise/NoiseConfig
-	FIELD comp_541 legacyWorldSeed J
+	FIELD field_38255 legacyWorldSeed J
-	FIELD comp_542 noiseParametersRegistry Lnet/minecraft/class_2378;
+	FIELD field_38256 noiseParametersRegistry Lnet/minecraft/class_2378;
-	FIELD comp_545 surfaceBuilder Lnet/minecraft/class_6724;
+	FIELD field_38259 surfaceBuilder Lnet/minecraft/class_6724;
-	FIELD comp_549 randomDerivers Ljava/util/Map;
+	FIELD field_38263 randomDerivers Ljava/util/Map;
-	METHOD comp_541 legacyWorldSeed ()J
-	METHOD comp_542 noiseParametersRegistry ()Lnet/minecraft/class_2378;
-	METHOD comp_545 surfaceBuilder ()Lnet/minecraft/class_6724;
-	METHOD comp_549 randomDerivers ()Ljava/util/Map;
 	METHOD method_41556 create (Lnet/minecraft/class_5284;Lnet/minecraft/class_2378;J)Lnet/minecraft/class_7138;
 		ARG 0 chunkGeneratorSettings
 		ARG 1 noiseParametersRegistry
@@ -23,3 +19,5 @@ CLASS net/minecraft/class_7138 net/minecraft/world/gen/noise/NoiseConfig
 		ARG 1 id
 	METHOD method_41561 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_6574;
 		ARG 2 id2
+	METHOD method_42369 legacyWorldSeed ()J
+	METHOD method_42372 surfaceBuilder ()Lnet/minecraft/class_6724;

mappings/net/minecraft/world/gen/noise/NoiseParametersKeys.mapping

@@ -1,7 +1,3 @@
 CLASS net/minecraft/class_6731 net/minecraft/world/gen/noise/NoiseParametersKeys
-	METHOD method_39173 createNoiseSampler (Lnet/minecraft/class_2378;Lnet/minecraft/class_6574;Lnet/minecraft/class_5321;)Lnet/minecraft/class_5216;
-		ARG 0 noiseRegistry
-		ARG 1 randomDeriver
-		ARG 2 noise
 	METHOD method_39174 register (Ljava/lang/String;)Lnet/minecraft/class_5321;
 		ARG 0 id

mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping

@@ -56,16 +56,16 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu
 		ARG 2 secondaryDepthRange
 		ARG 3 verticalSurfaceType
 	CLASS class_6687 TerracottaBandsMaterialRule
-		FIELD field_35226 RULE_CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_35226 RULE_CODEC Lnet/minecraft/class_7243;
 		METHOD apply (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 context
 	CLASS class_6689 BiomeMaterialCondition
-		FIELD field_35228 CONDITION_CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_35228 CONDITION_CODEC Lnet/minecraft/class_7243;
 		METHOD apply (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 context
 		CLASS class_6690 BiomePredicate
 	CLASS class_6691 BlockMaterialRule
-		FIELD field_35231 RULE_CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_35231 RULE_CODEC Lnet/minecraft/class_7243;
 		METHOD <init> (Lnet/minecraft/class_2680;)V
 			ARG 1 resultState
 		METHOD apply (Ljava/lang/Object;)Ljava/lang/Object;
@@ -74,7 +74,7 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu
 		METHOD method_39069 get ()Z
 	CLASS class_6693 MaterialCondition
 		FIELD field_35232 CODEC Lcom/mojang/serialization/Codec;
-		METHOD method_39064 codec ()Lcom/mojang/serialization/Codec;
+		METHOD method_39064 codec ()Lnet/minecraft/class_7243;
 		METHOD method_39070 registerAndGetDefault (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/Codec;
 	CLASS class_6694 MaterialRuleContext
 		FIELD field_35233 surfaceBuilder Lnet/minecraft/class_6724;
@@ -115,7 +115,7 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu
 		CLASS class_6771 SurfacePredicate
 		CLASS class_6772 BiomeTemperaturePredicate
 	CLASS class_6701 HoleMaterialCondition
-		FIELD field_35244 CONDITION_CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_35244 CONDITION_CODEC Lnet/minecraft/class_7243;
 		METHOD apply (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 context
 	CLASS class_6702 LazyAbstractPredicate
@@ -131,34 +131,34 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu
 			COMMENT
 			COMMENT @return the unique value for this position
 	CLASS class_6703 NoiseThresholdMaterialCondition
-		FIELD field_35248 CONDITION_CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_35248 CONDITION_CODEC Lnet/minecraft/class_7243;
 		METHOD apply (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 context
 		CLASS class_6704 NoiseThresholdPredicate
 	CLASS class_6706 InvertedBooleanSupplier
 	CLASS class_6707 NotMaterialCondition
-		FIELD field_35251 CONDITION_CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_35251 CONDITION_CODEC Lnet/minecraft/class_7243;
 		METHOD apply (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 context
 	CLASS class_6708 MaterialRule
 		FIELD field_35252 CODEC Lcom/mojang/serialization/Codec;
-		METHOD method_39061 codec ()Lcom/mojang/serialization/Codec;
+		METHOD method_39061 codec ()Lnet/minecraft/class_7243;
 		METHOD method_39085 registerAndGetDefault (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/Codec;
 	CLASS class_6709 SequenceBlockStateRule
 		COMMENT Applies the given block state rules in sequence, and returns the first result that
 		COMMENT isn't {@code null}. Returns {@code null} if none of the passed rules match.
 	CLASS class_6710 SequenceMaterialRule
-		FIELD field_35253 RULE_CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_35253 RULE_CODEC Lnet/minecraft/class_7243;
 		METHOD apply (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 context
 	CLASS class_6711 SimpleBlockStateRule
 		COMMENT Always returns the given {@link BlockState}.
 	CLASS class_6712 SteepMaterialCondition
-		FIELD field_35255 CONDITION_CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_35255 CONDITION_CODEC Lnet/minecraft/class_7243;
 		METHOD apply (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 context
 	CLASS class_6713 StoneDepthMaterialCondition
-		FIELD field_35257 CONDITION_CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_35257 CONDITION_CODEC Lnet/minecraft/class_7243;
 		METHOD apply (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 context
 		CLASS class_6714 StoneDepthPredicate
@@ -169,34 +169,34 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu
 			ARG 2 y
 			ARG 3 z
 	CLASS class_6716 TemperatureMaterialCondition
-		FIELD field_35261 CONDITION_CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_35261 CONDITION_CODEC Lnet/minecraft/class_7243;
 		METHOD apply (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 context
 	CLASS class_6717 ConditionalBlockStateRule
 		COMMENT Applies another block state rule if the given predicate matches, and returns
 		COMMENT {@code null} otherwise.
 	CLASS class_6718 ConditionMaterialRule
-		FIELD field_35263 RULE_CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_35263 RULE_CODEC Lnet/minecraft/class_7243;
 		METHOD apply (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 context
 	CLASS class_6720 WaterMaterialCondition
-		FIELD field_35264 CONDITION_CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_35264 CONDITION_CODEC Lnet/minecraft/class_7243;
 		METHOD apply (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 context
 		CLASS class_6721 WaterPredicate
 	CLASS class_6722 AboveYMaterialCondition
-		FIELD field_35266 CONDITION_CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_35266 CONDITION_CODEC Lnet/minecraft/class_7243;
 		METHOD apply (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 context
 		CLASS class_6723 AboveYPredicate
 	CLASS class_6770 SurfaceMaterialCondition
-		FIELD field_35601 CONDITION_CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_35601 CONDITION_CODEC Lnet/minecraft/class_7243;
 		METHOD apply (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 context
 	CLASS class_6773 HorizontalLazyAbstractPredicate
 	CLASS class_6774 FullLazyAbstractPredicate
 	CLASS class_6775 VerticalGradientMaterialCondition
-		FIELD field_35626 CONDITION_CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_35626 CONDITION_CODEC Lnet/minecraft/class_7243;
 		METHOD apply (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 context
 		CLASS class_6776 VerticalGradientPredicate

mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping

@@ -21,8 +21,7 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui
 	FIELD field_35499 icebergPillarRoofNoise Lnet/minecraft/class_5216;
 	FIELD field_35500 icebergSurfaceNoise Lnet/minecraft/class_5216;
 	FIELD field_35680 surfaceSecondaryNoise Lnet/minecraft/class_5216;
-	METHOD <init> (Lnet/minecraft/class_2378;Lnet/minecraft/class_2680;ILnet/minecraft/class_6574;)V
+	METHOD <init> (Lnet/minecraft/class_7138;Lnet/minecraft/class_2680;ILnet/minecraft/class_6574;)V
-		ARG 1 noiseRegistry
 		ARG 2 defaultState
 		ARG 3 seaLevel
 	METHOD method_39102 placeBadlandsPillar (Lnet/minecraft/class_6557;IIILnet/minecraft/class_5539;)V