21w10a

build.gradle

@@ -22,7 +22,7 @@ plugins {
 	id 'java' // for jd gen
 }
 
-def minecraft_version = "21w08b"
+def minecraft_version = "21w10a"
 
 def ENV = System.getenv()
 // Fetch build number from Github Actions

mappings/com/mojang/blaze3d/platform/FramebufferInfo.mapping

@@ -1,17 +0,0 @@
-CLASS net/minecraft/class_4492 com/mojang/blaze3d/platform/FramebufferInfo
-	COMMENT Contains global constants for the frame buffer and frame buffer states,
-	COMMENT normalized to the current implementation running on the target system.
-	FIELD field_20457 FRAME_BUFFER I
-	FIELD field_20458 RENDER_BUFFER I
-	FIELD field_20459 COLOR_ATTACHMENT I
-	FIELD field_20460 DEPTH_ATTACHMENT I
-	FIELD field_20461 FRAME_BUFFER_COMPLETE I
-		COMMENT @see org.lwjgl.opengl.GL30#GL_FRAMEBUFFER_COMPLETE
-	FIELD field_20462 FRAME_BUFFER_INCOMPLETE_ATTACHMENT I
-		COMMENT @see org.lwjgl.opengl.GL30#GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT
-	FIELD field_20463 FRAME_BUFFER_INCOMPLETE_MISSING_ATTACHMENT I
-		COMMENT @see org.lwjgl.opengl.GL30#GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT
-	FIELD field_20464 FRAME_BUFFER_INCOMPLETE_DRAW_BUFFER I
-		COMMENT @see org.lwjgl.opengl.GL30#GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER
-	FIELD field_20465 FRAME_BUFFER_INCOMPLETE_READ_BUFFER I
-		COMMENT @see org.lwjgl.opengl.GL30#GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER

mappings/com/mojang/blaze3d/platform/GLX.mapping

@@ -13,8 +13,6 @@ CLASS com/mojang/blaze3d/platform/GLX
 		ARG 0 callback
 	METHOD _shouldClose (Lnet/minecraft/class_1041;)Z
 		ARG 0 window
-	METHOD getErrorString (I)Ljava/lang/String;
-		ARG 0 code
 	METHOD make (Ljava/lang/Object;Ljava/util/function/Consumer;)Ljava/lang/Object;
 		ARG 0 object
 		ARG 1 initializer

mappings/com/mojang/blaze3d/platform/GlStateManager.mapping

@@ -1,97 +1,33 @@
 CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
-	FIELD field_20466 MATRIX_BUFFER Ljava/nio/FloatBuffer;
-	FIELD field_20468 ALPHA_TEST Lnet/minecraft/class_4493$class_1016;
-	FIELD field_20469 LIGHTING Lnet/minecraft/class_4493$class_1018;
-	FIELD field_20470 LIGHT_ENABLE [Lnet/minecraft/class_4493$class_1018;
-	FIELD field_20471 COLOR_MATERIAL Lnet/minecraft/class_4493$class_1023;
 	FIELD field_20472 BLEND Lnet/minecraft/class_4493$class_1017;
 	FIELD field_20473 DEPTH Lnet/minecraft/class_4493$class_1026;
-	FIELD field_20474 FOG Lnet/minecraft/class_4493$class_1029;
 	FIELD field_20475 CULL Lnet/minecraft/class_4493$class_1025;
 	FIELD field_20476 POLY_OFFSET Lnet/minecraft/class_4493$class_1031;
 	FIELD field_20477 COLOR_LOGIC Lnet/minecraft/class_4493$class_1021;
-	FIELD field_20478 TEX_GEN Lnet/minecraft/class_4493$class_1038;
 	FIELD field_20480 STENCIL Lnet/minecraft/class_4493$class_1035;
 	FIELD field_20482 activeTexture I
 	FIELD field_20483 TEXTURES [Lnet/minecraft/class_4493$class_1039;
-	FIELD field_20484 modelShadeMode I
-	FIELD field_20485 RESCALE_NORMAL Lnet/minecraft/class_4493$class_1018;
 	FIELD field_20486 COLOR_MASK Lnet/minecraft/class_4493$class_1022;
-	FIELD field_20487 COLOR Lnet/minecraft/class_4493$class_1020;
-	FIELD field_20488 fboMode Lnet/minecraft/class_4493$class_1010;
-	FIELD field_20771 colorBuffer Ljava/nio/FloatBuffer;
-	FIELD field_25251 fboBlitMode Lnet/minecraft/class_4493$class_5343;
 	FIELD field_26839 SCISSOR_TEST Lnet/minecraft/class_4493$class_5518;
 	METHOD method_21906 enableColorLogicOp ()V
-	METHOD method_21907 matrixMode (I)V
-		ARG 0 mode
 	METHOD method_21908 disableColorLogicOp ()V
-	METHOD method_21910 enableTexture ()V
-	METHOD method_21911 disableClientState (I)V
-		ARG 0 cap
 	METHOD method_21912 disableTexture ()V
-	METHOD method_21913 enableClientState (I)V
-		ARG 0 cap
 	METHOD method_21914 genTextures ()I
-	METHOD method_21920 enableRescaleNormal ()V
 	METHOD method_21921 getString (I)Ljava/lang/String;
 		ARG 0 name
-	METHOD method_21922 disableRescaleNormal ()V
 	METHOD method_21923 getInteger (I)I
 		ARG 0 pname
-	METHOD method_21924 loadIdentity ()V
-	METHOD method_21926 pushMatrix ()V
-	METHOD method_21928 popMatrix ()V
-	METHOD method_21930 clearCurrentColor ()V
 	METHOD method_21934 getError ()I
-	METHOD method_21935 pushLightingAttributes ()V
 	METHOD method_21936 clearDepth (D)V
 		ARG 0 depth
-	METHOD method_21937 scaled (DDD)V
-		ARG 0 x
-		ARG 2 y
-		ARG 4 z
-	METHOD method_21938 translated (DDD)V
-		ARG 0 x
-		ARG 2 y
-		ARG 4 z
-	METHOD method_21939 ortho (DDDDDD)V
-		ARG 0 l
-		ARG 2 r
-		ARG 4 b
-		ARG 6 t
-		ARG 8 n
-		ARG 10 f
-	METHOD method_21940 fogDensity (F)V
-		ARG 0 density
 	METHOD method_21941 polygonOffset (FF)V
 		ARG 0 factor
 		ARG 1 units
-	METHOD method_21942 normal3f (FFF)V
-		ARG 0 nx
-		ARG 1 ny
-		ARG 2 nz
 	METHOD method_21943 clearColor (FFFF)V
 		ARG 0 red
 		ARG 1 green
 		ARG 2 blue
 		ARG 3 alpha
-	METHOD method_21944 enableLight (I)V
-		ARG 0 light
-	METHOD method_21945 alphaFunc (IF)V
-		ARG 0 func
-		ARG 1 ref
-	METHOD method_21946 multiTexCoords2f (IFF)V
-		ARG 0 texture
-		ARG 1 s
-		ARG 2 t
-	METHOD method_21947 colorMaterial (II)V
-		ARG 0 face
-		ARG 1 mode
-	METHOD method_21949 texEnv (III)V
-		ARG 0 target
-		ARG 1 pname
-		ARG 2 param
 	METHOD method_21950 blendFuncSeparate (IIII)V
 		ARG 0 srcFactorRGB
 		ARG 1 dstFactorRGB
@@ -137,20 +73,10 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 		ARG 2 format
 		ARG 3 type
 		ARG 4 pixels
-	METHOD method_21960 light (IILjava/nio/FloatBuffer;)V
-		ARG 0 light
-		ARG 1 pname
-		ARG 2 params
-	METHOD method_21961 shaderSource (ILjava/lang/CharSequence;)V
-		ARG 0 shader
-		ARG 1 source
 	METHOD method_21962 bufferData (ILjava/nio/ByteBuffer;I)V
 		ARG 0 target
 		ARG 1 data
 		ARG 2 usage
-	METHOD method_21963 lightModel (ILjava/nio/FloatBuffer;)V
-		ARG 0 pname
-		ARG 1 params
 	METHOD method_21964 uniform1 (ILjava/nio/IntBuffer;)V
 		ARG 0 location
 		ARG 1 value
@@ -161,26 +87,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 		ARG 0 location
 		ARG 1 transpose
 		ARG 2 value
-	METHOD method_21968 enableTexGen (Lnet/minecraft/class_4493$class_1036;)V
-		ARG 0 coord
-	METHOD method_21969 texGenMode (Lnet/minecraft/class_4493$class_1036;I)V
-		ARG 0 coord
-		ARG 1 mode
-	METHOD method_21970 texGenParam (Lnet/minecraft/class_4493$class_1036;ILjava/nio/FloatBuffer;)V
-		ARG 0 coord
-		ARG 1 pname
-		ARG 2 params
-	METHOD method_21971 multMatrix (Lnet/minecraft/class_1159;)V
-		ARG 0 matrix
-	METHOD method_21972 multMatrix (Ljava/nio/FloatBuffer;)V
-		ARG 0 matrix
-	METHOD method_21973 initFramebufferSupport (Lorg/lwjgl/opengl/GLCapabilities;)Ljava/lang/String;
-		COMMENT Configures the frame buffer and populates {@link FramebufferInfo} with the appropriate constants
-		COMMENT for the current GLCapabilities.
-		COMMENT
-		COMMENT @return human-readable string representing the selected frame buffer technology
-		COMMENT @throws IllegalStateException if no known frame buffer technology is supported
-		ARG 0 capabilities
 	METHOD method_21974 depthMask (Z)V
 		ARG 0 mask
 	METHOD method_21975 colorMask (ZZZZ)V
@@ -188,21 +94,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 		ARG 1 green
 		ARG 2 blue
 		ARG 3 alpha
-	METHOD method_21976 pushTextureAttributes ()V
-	METHOD method_21978 fogStart (F)V
-		ARG 0 start
-	METHOD method_21980 scalef (FFF)V
-		ARG 0 x
-		ARG 1 y
-		ARG 2 z
-	METHOD method_21981 rotatef (FFFF)V
-		ARG 0 angle
-		ARG 1 x
-		ARG 2 y
-		ARG 3 z
-	METHOD method_21983 pixelTransfer (IF)V
-		ARG 0 pname
-		ARG 1 param
 	METHOD method_21984 blendFunc (II)V
 		ARG 0 srcFactor
 		ARG 1 dstFactor
@@ -214,9 +105,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 		ARG 0 target
 		ARG 1 pname
 		ARG 2 param
-	METHOD method_21989 getFloat (ILjava/nio/FloatBuffer;)V
-		ARG 0 pname
-		ARG 1 params
 	METHOD method_21990 getUniformLocation (ILjava/lang/CharSequence;)I
 		ARG 0 program
 		ARG 1 name
@@ -230,20 +118,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 		ARG 0 location
 		ARG 1 transpose
 		ARG 2 value
-	METHOD method_21995 disableTexGen (Lnet/minecraft/class_4493$class_1036;)V
-		ARG 0 coord
-	METHOD method_21997 popAttributes ()V
-	METHOD method_21998 fogEnd (F)V
-		ARG 0 end
-	METHOD method_21999 translatef (FFF)V
-		ARG 0 x
-		ARG 1 y
-		ARG 2 z
-	METHOD method_22000 color4f (FFFF)V
-		ARG 0 red
-		ARG 1 green
-		ARG 2 blue
-		ARG 3 alpha
 	METHOD method_22001 depthFunc (I)V
 		ARG 0 func
 	METHOD method_22002 getProgram (II)I
@@ -266,11 +140,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 		ARG 0 location
 		ARG 1 transpose
 		ARG 2 value
-	METHOD method_22010 getGenCoordState (Lnet/minecraft/class_4493$class_1036;)Lnet/minecraft/class_4493$class_1037;
-		ARG 0 coord
-	METHOD method_22012 disableAlphaTest ()V
-	METHOD method_22013 lineWidth (F)V
-		ARG 0 width
 	METHOD method_22015 blendEquation (I)V
 		ARG 0 mode
 	METHOD method_22016 attachShader (II)V
@@ -291,7 +160,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 	METHOD method_22020 uniform4 (ILjava/nio/IntBuffer;)V
 		ARG 0 location
 		ARG 1 value
-	METHOD method_22021 enableAlphaTest ()V
 	METHOD method_22023 getShader (II)I
 		ARG 0 shader
 		ARG 1 pname
@@ -307,25 +175,11 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 	METHOD method_22026 uniform4 (ILjava/nio/FloatBuffer;)V
 		ARG 0 location
 		ARG 1 value
-	METHOD method_22028 enableLighting ()V
 	METHOD method_22029 deleteShader (I)V
 		ARG 0 shader
 	METHOD method_22030 uniform1 (II)V
 		ARG 0 location
 		ARG 1 value
-	METHOD method_22031 normalPointer (IIJ)V
-		ARG 0 type
-		ARG 1 stride
-		ARG 2 pointer
-	METHOD method_22032 texCoordPointer (IIIJ)V
-		ARG 0 size
-		ARG 1 type
-		ARG 2 stride
-		ARG 3 pointer
-	METHOD method_22033 fog (I[F)V
-		ARG 0 pname
-		ARG 1 params
-	METHOD method_22034 disableLighting ()V
 	METHOD method_22035 createShader (I)I
 		ARG 0 type
 	METHOD method_22036 bindBuffer (II)V
@@ -336,23 +190,11 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 		ARG 1 first
 		ARG 2 type
 		ARG 3 indices
-	METHOD method_22038 vertexPointer (IIIJ)V
-		ARG 0 size
-		ARG 1 type
-		ARG 2 stride
-		ARG 3 pointer
-	METHOD method_22040 enableColorMaterial ()V
 	METHOD method_22041 compileShader (I)V
 		ARG 0 shader
 	METHOD method_22042 bindFramebuffer (II)V
 		ARG 0 target
 		ARG 1 framebuffer
-	METHOD method_22043 colorPointer (IIIJ)V
-		ARG 0 size
-		ARG 1 type
-		ARG 2 stride
-		ARG 3 pointer
-	METHOD method_22044 disableColorMaterial ()V
 	METHOD method_22045 useProgram (I)V
 		ARG 0 program
 	METHOD method_22047 disableDepthTest ()V
@@ -370,9 +212,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 	METHOD method_22053 disableBlend ()V
 	METHOD method_22054 deleteBuffers (I)V
 		ARG 0 buffer
-	METHOD method_22055 fogi (II)V
-		ARG 0 pname
-		ARG 1 param
 	METHOD method_22056 enableBlend ()V
 	METHOD method_22058 polygonMode (II)V
 		ARG 0 face
@@ -389,12 +228,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 		ARG 0 pname
 		ARG 1 param
 	METHOD method_22068 genFramebuffers ()I
-	METHOD method_22069 clientActiveTexture (I)V
-		ARG 0 texture
-	METHOD method_22071 fogMode (I)V
-		ARG 0 mode
-	METHOD method_22072 enableFog ()V
-	METHOD method_22074 disableFog ()V
 	METHOD method_22075 logicOp (I)V
 		ARG 0 op
 	METHOD method_22076 enableCull ()V
@@ -407,12 +240,8 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 	METHOD method_22081 bindTexture (I)V
 		ARG 0 texture
 	METHOD method_22082 disablePolygonOffset ()V
-	METHOD method_22083 shadeModel (I)V
-		ARG 0 mode
-	METHOD method_22084 enableLineOffset ()V
 	METHOD method_22085 stencilMask (I)V
 		ARG 0 mask
-	METHOD method_22086 disableLineOffset ()V
 	METHOD method_22087 clearStencil (I)V
 		ARG 0 stencil
 	METHOD method_22606 enableVertexAttribArray (I)V
@@ -426,49 +255,9 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 		ARG 3 normalized
 		ARG 4 stride
 		ARG 5 pointer
-	METHOD method_22610 setupOverlayColor (II)V
-		ARG 0 texture
-		ARG 1 size
-	METHOD method_22613 getBuffer (FFFF)Ljava/nio/FloatBuffer;
-		ARG 0 a
-		ARG 1 b
-		ARG 2 c
-		ARG 3 d
 	METHOD method_22616 setupLevelDiffuseLighting (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;Lnet/minecraft/class_1159;)V
-	METHOD method_22618 teardownOverlayColor ()V
-	METHOD method_22883 blendColor (FFFF)V
-		ARG 0 red
-		ARG 1 green
-		ARG 2 blue
-		ARG 3 alpha
-	METHOD method_22885 combineColor (IIII)V
-		ARG 0 combineColor
-		ARG 1 source0Color
-		ARG 2 source1Color
-		ARG 3 source2Color
-	METHOD method_22886 combineAlpha (II)V
-		ARG 0 combineAlpha
-		ARG 1 source0Alpha
-	METHOD method_22887 setupEndPortalTexGen ()V
-	METHOD method_22888 clearTexGen ()V
-	METHOD method_22889 mulTextureByProjModelView ()V
-	METHOD method_23281 combineColor (II)V
-		ARG 0 combineColor
-		ARG 1 source0Color
-	METHOD method_23282 setupOutline ()V
-	METHOD method_23283 teardownOutline ()V
 	METHOD method_24221 setupGuiFlatDiffuseLighting (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;)V
 	METHOD method_24222 setupGui3dDiffuseLighting (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;)V
-	METHOD method_29330 supportsGl30 ()Z
-	METHOD method_29331 copyTexSubImage2d (IIIIIIII)V
-		ARG 0 target
-		ARG 1 level
-		ARG 2 xOffset
-		ARG 3 yOffset
-		ARG 4 x
-		ARG 5 y
-		ARG 6 width
-		ARG 7 height
 	METHOD method_29332 blitFramebuffer (IIIIIIIIII)V
 		ARG 0 srcX0
 		ARG 1 srcY0
@@ -480,8 +269,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 		ARG 7 dstY1
 		ARG 8 mask
 		ARG 9 filter
-	METHOD method_29333 getFramebufferDepthAttachment ()I
-	METHOD method_29334 getActiveBoundTexture ()I
 	METHOD method_30498 genTextures ([I)V
 	METHOD method_30499 deleteTextures ([I)V
 	METHOD method_31317 scissor (IIII)V
@@ -499,11 +286,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 		ARG 1 access
 	METHOD method_31947 unmapBuffer (I)V
 		ARG 0 target
-	CLASS class_1010 FBOMode
-	CLASS class_1016 AlphaTestState
-		FIELD field_5042 capState Lnet/minecraft/class_4493$class_1018;
-		FIELD field_5043 ref F
-		FIELD field_5044 func I
 	CLASS class_1017 BlendFuncState
 		FIELD field_5045 capState Lnet/minecraft/class_4493$class_1018;
 		FIELD field_5046 dstFactorAlpha I
@@ -519,16 +301,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 		METHOD method_4470 setState (Z)V
 			ARG 1 state
 		METHOD method_4471 enable ()V
-	CLASS class_1020 Color4
-		FIELD field_5054 alpha F
-		FIELD field_5055 blue F
-		FIELD field_5056 green F
-		FIELD field_5057 red F
-		METHOD <init> (FFFF)V
-			ARG 1 red
-			ARG 2 green
-			ARG 3 blue
-			ARG 4 alpha
 	CLASS class_1021 LogicOpState
 		FIELD field_5058 capState Lnet/minecraft/class_4493$class_1018;
 		FIELD field_5059 op I
@@ -537,10 +309,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 		FIELD field_5061 blue Z
 		FIELD field_5062 green Z
 		FIELD field_5063 red Z
-	CLASS class_1023 ColorMaterialState
-		FIELD field_5064 capState Lnet/minecraft/class_4493$class_1018;
-		FIELD field_5065 mode I
-		FIELD field_5066 face I
 	CLASS class_1025 CullFaceState
 		FIELD field_5072 capState Lnet/minecraft/class_4493$class_1018;
 		FIELD field_5073 mode I
@@ -548,14 +316,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 		FIELD field_5074 capState Lnet/minecraft/class_4493$class_1018;
 		FIELD field_5075 func I
 		FIELD field_5076 mask Z
-	CLASS class_1028 FogMode
-		FIELD field_5093 value I
-	CLASS class_1029 FogState
-		FIELD field_5098 end F
-		FIELD field_5099 start F
-		FIELD field_5100 capState Lnet/minecraft/class_4493$class_1018;
-		FIELD field_5101 density F
-		FIELD field_5102 mode I
 	CLASS class_1030 LogicOp
 		FIELD field_5108 value I
 	CLASS class_1031 PolygonOffsetState
@@ -573,21 +333,8 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 		FIELD field_5151 dpfail I
 		FIELD field_5152 sfail I
 		FIELD field_5153 mask I
-	CLASS class_1036 TexCoord
-	CLASS class_1037 TexGenCoordState
-		FIELD field_5159 capState Lnet/minecraft/class_4493$class_1018;
-		FIELD field_5160 mode I
-		FIELD field_5161 coord I
-		METHOD <init> (II)V
-			ARG 1 coord
-			ARG 2 cap
-	CLASS class_1038 TexGenState
-		FIELD field_5162 s Lnet/minecraft/class_4493$class_1037;
-		FIELD field_5163 t Lnet/minecraft/class_4493$class_1037;
-		FIELD field_5164 r Lnet/minecraft/class_4493$class_1037;
-		FIELD field_5165 q Lnet/minecraft/class_4493$class_1037;
 	CLASS class_1039 Texture2DState
-		FIELD field_5166 capState Lnet/minecraft/class_4493$class_1018;
+		FIELD field_5166 capState Z
 		FIELD field_5167 boundTexture I
 	CLASS class_1040 Viewport
 		FIELD field_5168 height I
@@ -596,6 +343,5 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 		FIELD field_5172 x I
 	CLASS class_4534 DstFactor
 	CLASS class_4535 SrcFactor
-	CLASS class_5343 FBOBlitMode
 	CLASS class_5518 ScissorTestState
 		FIELD field_26840 capState Lnet/minecraft/class_4493$class_1018;

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

@@ -1,18 +1,10 @@
 CLASS com/mojang/blaze3d/systems/RenderSystem
 	METHOD activeTexture (I)V
 		ARG 0 texture
-	METHOD alphaFunc (IF)V
-		ARG 0 func
-		ARG 1 ref
 	METHOD assertThread (Ljava/util/function/Supplier;)V
 		ARG 0 check
 	METHOD bindTexture (I)V
 		ARG 0 texture
-	METHOD blendColor (FFFF)V
-		ARG 0 red
-		ARG 1 green
-		ARG 2 blue
-		ARG 3 alpha
 	METHOD blendEquation (I)V
 		ARG 0 mode
 	METHOD blendFunc (II)V
@@ -41,23 +33,11 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 		ARG 3 alpha
 	METHOD clearDepth (D)V
 		ARG 0 depth
-	METHOD color3f (FFF)V
-		ARG 0 red
-		ARG 1 green
-		ARG 2 blue
-	METHOD color4f (FFFF)V
-		ARG 0 red
-		ARG 1 green
-		ARG 2 blue
-		ARG 3 alpha
 	METHOD colorMask (ZZZZ)V
 		ARG 0 red
 		ARG 1 green
 		ARG 2 blue
 		ARG 3 alpha
-	METHOD colorMaterial (II)V
-		ARG 0 face
-		ARG 1 mode
 	METHOD deleteTexture (I)V
 		ARG 0 texture
 	METHOD depthFunc (I)V
@@ -70,26 +50,9 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 		ARG 2 count
 	METHOD flipFrame (J)V
 		ARG 0 window
-	METHOD fog (IFFFF)V
-		ARG 0 pname
-		ARG 1 red
-		ARG 2 green
-		ARG 3 blue
-		ARG 4 alpha
-	METHOD fogDensity (F)V
-		ARG 0 density
-	METHOD fogEnd (F)V
-		ARG 0 end
-	METHOD fogMode (Lnet/minecraft/class_4493$class_1028;)V
-		ARG 0 mode
-	METHOD fogStart (F)V
-		ARG 0 start
 	METHOD getString (ILjava/util/function/Consumer;)V
 		ARG 0 name
 		ARG 1 consumer
-	METHOD glBindBuffer (ILjava/util/function/Supplier;)V
-		ARG 0 target
-		ARG 1 buffer
 	METHOD glBufferData (ILjava/nio/ByteBuffer;I)V
 		ARG 0 target
 		ARG 1 data
@@ -98,10 +61,6 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 		ARG 0 buffer
 	METHOD glGenBuffers (Ljava/util/function/Consumer;)V
 		ARG 0 consumer
-	METHOD glMultiTexCoord2f (IFF)V
-		ARG 0 texture
-		ARG 1 s
-		ARG 2 t
 	METHOD glUniform1 (ILjava/nio/FloatBuffer;)V
 		ARG 0 location
 		ARG 1 value
@@ -152,21 +111,6 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 		ARG 0 width
 	METHOD logicOp (Lnet/minecraft/class_4493$class_1030;)V
 		ARG 0 op
-	METHOD matrixMode (I)V
-		ARG 0 mode
-	METHOD multMatrix (Lnet/minecraft/class_1159;)V
-		ARG 0 matrix
-	METHOD normal3f (FFF)V
-		ARG 0 nx
-		ARG 1 ny
-		ARG 2 nz
-	METHOD ortho (DDDDDD)V
-		ARG 0 l
-		ARG 2 r
-		ARG 4 b
-		ARG 6 t
-		ARG 8 n
-		ARG 10 f
 	METHOD pixelStore (II)V
 		ARG 0 pname
 		ARG 1 param
@@ -185,19 +129,6 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 		ARG 0 renderCall
 	METHOD renderCrosshair (I)V
 		ARG 0 size
-	METHOD rotatef (FFFF)V
-		ARG 0 angle
-		ARG 1 x
-		ARG 2 y
-		ARG 3 z
-	METHOD scaled (DDD)V
-		ARG 0 x
-		ARG 2 y
-		ARG 4 z
-	METHOD scalef (FFF)V
-		ARG 0 x
-		ARG 1 y
-		ARG 2 z
 	METHOD setErrorCallback (Lorg/lwjgl/glfw/GLFWErrorCallbackI;)V
 		ARG 0 callback
 	METHOD setupDefaultState (IIII)V
@@ -208,8 +139,6 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 	METHOD setupOverlayColor (Ljava/util/function/IntSupplier;I)V
 		ARG 0 texture
 		ARG 1 size
-	METHOD shadeModel (I)V
-		ARG 0 mode
 	METHOD stencilFunc (III)V
 		ARG 0 func
 		ARG 1 ref
@@ -222,14 +151,6 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 		ARG 0 target
 		ARG 1 pname
 		ARG 2 param
-	METHOD translated (DDD)V
-		ARG 0 x
-		ARG 2 y
-		ARG 4 z
-	METHOD translatef (FFF)V
-		ARG 0 x
-		ARG 1 y
-		ARG 2 z
 	METHOD viewport (IIII)V
 		ARG 0 x
 		ARG 1 y

mappings/net/minecraft/block/AbstractSignBlock.mapping

@@ -2,7 +2,6 @@ CLASS net/minecraft/class_2478 net/minecraft/block/AbstractSignBlock
 	FIELD field_11491 WATERLOGGED Lnet/minecraft/class_2746;
 	FIELD field_11492 SHAPE Lnet/minecraft/class_265;
 	FIELD field_21675 type Lnet/minecraft/class_4719;
-	FIELD field_28426 LIT Lnet/minecraft/class_2746;
 	METHOD <init> (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_4719;)V
 		ARG 1 settings
 		ARG 2 type

mappings/net/minecraft/block/BigDripleafBlock.mapping

@@ -9,8 +9,7 @@ CLASS net/minecraft/class_5801 net/minecraft/block/BigDripleafBlock
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 soundEvent
-	METHOD method_33603 grow (Lnet/minecraft/class_1937;Ljava/util/Random;Lnet/minecraft/class_2338;)V
+	METHOD method_33603 grow (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;)V
-		ARG 0 world
 		ARG 1 random
 		ARG 2 pos
 	METHOD method_33604 changeTilt (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5816;)V
@@ -37,8 +36,7 @@ CLASS net/minecraft/class_5801 net/minecraft/block/BigDripleafBlock
 		ARG 0 state
 	METHOD method_33613 getShapeForStateTilt (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265;
 		ARG 0 state
-	METHOD method_33725 canGrowInto (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z
+	METHOD method_33725 canGrowInto (Lnet/minecraft/class_5539;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z
-		ARG 0 world
 		ARG 1 pos
 		ARG 2 state
 	METHOD method_33726 placeDripleafAt (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Lnet/minecraft/class_2350;)Z

mappings/net/minecraft/block/BubbleColumnBlock.mapping

@@ -1,12 +1,3 @@
 CLASS net/minecraft/class_2258 net/minecraft/block/BubbleColumnBlock
 	FIELD field_10680 DRAG Lnet/minecraft/class_2746;
-	METHOD method_9656 calculateDrag (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z
+	METHOD method_9658 isStillWater (Lnet/minecraft/class_2680;)Z
-		ARG 0 world
-		ARG 1 pos
-	METHOD method_9657 update (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Z)V
-		ARG 0 world
-		ARG 1 pos
-		ARG 2 drag
-	METHOD method_9658 isStillWater (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z
-		ARG 0 world
-		ARG 1 pos

mappings/net/minecraft/block/MossBlock.mapping

@@ -1,15 +1 @@
 CLASS net/minecraft/class_5807 net/minecraft/block/MossBlock
-	METHOD method_33628 placePlantsAround (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
-		ARG 0 world
-		ARG 1 random
-		ARG 2 pos
-	METHOD method_33629 getPlant (Ljava/util/Random;)Lnet/minecraft/class_2680;
-		ARG 0 random
-	METHOD method_33630 placePlant (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_2338;)I
-		ARG 0 world
-		ARG 1 random
-		ARG 2 pos
-	METHOD method_33631 replace (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_2338;)V
-		ARG 0 world
-		ARG 1 random
-		ARG 2 pos

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

@@ -7,7 +7,7 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt
 	FIELD field_12097 powered Z
 	FIELD field_12098 metadata Ljava/lang/String;
 	FIELD field_12099 ignoreEntities Z
-	FIELD field_12100 size Lnet/minecraft/class_2338;
+	FIELD field_12100 size Lnet/minecraft/class_2382;
 	FIELD field_12101 integrity F
 	FIELD field_12102 structureName Lnet/minecraft/class_2960;
 	FIELD field_12103 seed J
@@ -25,16 +25,13 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt
 	METHOD method_11347 setShowAir (Z)V
 		ARG 1 showAir
 	METHOD method_11348 updateBlockMode ()V
-	METHOD method_11349 getSize ()Lnet/minecraft/class_2338;
+	METHOD method_11349 getSize ()Lnet/minecraft/class_2382;
 	METHOD method_11351 openScreen (Lnet/minecraft/class_1657;)Z
 		ARG 1 player
 	METHOD method_11352 setIgnoreEntities (Z)V
 		ARG 1 ignoreEntities
 	METHOD method_11353 getRotation ()Lnet/minecraft/class_2470;
 	METHOD method_11354 isPowered ()Z
-	METHOD method_11355 makeBoundingBox (Lnet/minecraft/class_2338;Ljava/util/List;)Lnet/minecraft/class_3341;
-		ARG 1 center
-		ARG 2 corners
 	METHOD method_11356 setMirror (Lnet/minecraft/class_2415;)V
 		ARG 1 mirror
 	METHOD method_11357 shouldShowBoundingBox ()Z
@@ -46,16 +43,11 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt
 	METHOD method_11362 getStructureName ()Ljava/lang/String;
 	METHOD method_11363 setMetadata (Ljava/lang/String;)V
 		ARG 1 metadata
-	METHOD method_11364 findCorners (Ljava/util/List;)Ljava/util/List;
-		ARG 1 structureBlockEntities
 	METHOD method_11365 saveStructure ()Z
 	METHOD method_11366 saveStructure (Z)Z
 	METHOD method_11367 shouldIgnoreEntities ()Z
 	METHOD method_11368 loadStructure (Lnet/minecraft/class_3218;Z)Z
 		ARG 1 world
-	METHOD method_11369 findStructureBlockEntities (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Ljava/util/List;
-		ARG 1 pos1
-		ARG 2 pos2
 	METHOD method_11370 setIntegrity (F)V
 		ARG 1 integrity
 	METHOD method_11371 getSeed ()J
@@ -66,8 +58,7 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt
 	METHOD method_11375 shouldShowAir ()Z
 	METHOD method_11376 loadStructure (Lnet/minecraft/class_3218;)Z
 		ARG 1 world
-	METHOD method_11377 setSize (Lnet/minecraft/class_2338;)V
+	METHOD method_11377 setSize (Lnet/minecraft/class_2382;)V
-		ARG 1 pos
 	METHOD method_11378 setOffset (Lnet/minecraft/class_2338;)V
 		ARG 1 pos
 	METHOD method_11379 setPowered (Z)V

mappings/net/minecraft/class_5912.mapping

@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_5912
+	METHOD method_14486 getResource (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3298;

mappings/net/minecraft/client/gl/Framebuffer.mapping

@@ -41,7 +41,6 @@ CLASS net/minecraft/class_276 net/minecraft/client/gl/Framebuffer
 	METHOD method_1238 delete ()V
 	METHOD method_1239 checkFramebufferStatus ()V
 	METHOD method_1240 endWrite ()V
-	METHOD method_1241 beginRead ()V
 	METHOD method_1242 endRead ()V
 	METHOD method_22594 draw (IIZ)V
 		ARG 1 width

mappings/net/minecraft/client/gl/GlDebug.mapping

@@ -1,18 +1,9 @@
 CLASS net/minecraft/class_1008 net/minecraft/client/gl/GlDebug
 	FIELD field_4915 KHR_VERBOSITY_LEVELS Ljava/util/List;
-	FIELD field_4916 floatBuffer Ljava/nio/FloatBuffer;
-	FIELD field_4917 intBuffer Ljava/nio/IntBuffer;
-	FIELD field_4918 SEMICOLON_JOINER Lcom/google/common/base/Joiner;
 	FIELD field_4919 ARB_VERBOSITY_LEVELS Ljava/util/List;
-	FIELD field_4920 NEWLINE_JOINER Lcom/google/common/base/Joiner;
 	FIELD field_4921 LOGGER Lorg/apache/logging/log4j/Logger;
-	FIELD field_4922 CONSTANTS Ljava/util/Map;
-	FIELD field_4924 byteBuffer Ljava/nio/ByteBuffer;
 	METHOD method_4222 getSource (I)Ljava/lang/String;
 		ARG 0 opcode
-	METHOD method_4223 registerConstant (ILjava/lang/String;)V
-		ARG 0 constant
-		ARG 1 description
 	METHOD method_4224 info (IIIIIJJ)V
 		ARG 0 source
 		ARG 1 type

mappings/net/minecraft/client/gl/GlShader.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_281 net/minecraft/client/gl/GlShader
-	FIELD field_1522 refCount I
 	FIELD field_1523 shaderRef I
 	FIELD field_1524 shaderType Lnet/minecraft/class_281$class_282;
 	FIELD field_1525 name Ljava/lang/String;
@@ -10,10 +9,8 @@ CLASS net/minecraft/class_281 net/minecraft/client/gl/GlShader
 	METHOD method_1280 getName ()Ljava/lang/String;
 	METHOD method_1281 attachTo (Lnet/minecraft/class_3679;)V
 	METHOD method_1282 release ()V
-	METHOD method_1283 createFromResource (Lnet/minecraft/class_281$class_282;Ljava/lang/String;Ljava/io/InputStream;Ljava/lang/String;)Lnet/minecraft/class_281;
+	METHOD method_1283 createFromResource (Lnet/minecraft/class_281$class_282;Ljava/lang/String;Ljava/io/InputStream;Ljava/lang/String;Lnet/minecraft/class_5913;)Lnet/minecraft/class_281;
-		ARG 0 type
 		ARG 1 name
-		ARG 2 sourceCode
 	CLASS class_282 Type
 		FIELD field_1526 name Ljava/lang/String;
 		FIELD field_1527 loadedShaders Ljava/util/Map;

mappings/net/minecraft/client/gl/JsonGlProgram.mapping

@@ -4,7 +4,7 @@ CLASS net/minecraft/class_280 net/minecraft/client/gl/JsonGlProgram
 	FIELD field_1505 activeProgramRef I
 	FIELD field_1506 samplerShaderLocs Ljava/util/List;
 	FIELD field_1507 uniformLocs Ljava/util/List;
-	FIELD field_1508 vertexShader Lnet/minecraft/class_281;
+	FIELD field_1508 vertexShader Lnet/minecraft/class_5937;
 	FIELD field_1509 name Ljava/lang/String;
 	FIELD field_1510 uniformByName Ljava/util/Map;
 	FIELD field_1511 uniformStateDirty Z
@@ -14,7 +14,7 @@ CLASS net/minecraft/class_280 net/minecraft/client/gl/JsonGlProgram
 	FIELD field_1516 samplerBinds Ljava/util/Map;
 	FIELD field_1517 blendState Lnet/minecraft/class_277;
 	FIELD field_1518 attribLocs Ljava/util/List;
-	FIELD field_1519 fragmentShader Lnet/minecraft/class_281;
+	FIELD field_1519 fragmentShader Lnet/minecraft/class_5937;
 	FIELD field_1520 dummyUniform Lnet/minecraft/class_278;
 	FIELD field_1521 programRef I
 	METHOD <init> (Lnet/minecraft/class_3300;Ljava/lang/String;)V
@@ -33,7 +33,7 @@ CLASS net/minecraft/class_280 net/minecraft/client/gl/JsonGlProgram
 	METHOD method_1277 enable ()V
 	METHOD method_16035 deserializeBlendState (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_277;
 		ARG 0 json
-	METHOD method_16036 getShader (Lnet/minecraft/class_3300;Lnet/minecraft/class_281$class_282;Ljava/lang/String;)Lnet/minecraft/class_281;
+	METHOD method_16036 getShader (Lnet/minecraft/class_3300;Lnet/minecraft/class_281$class_282;Ljava/lang/String;)Lnet/minecraft/class_5937;
 		ARG 0 resourceManager
 		ARG 1 type
 		ARG 2 name

mappings/net/minecraft/client/gl/VertexBuffer.mapping

@@ -2,8 +2,6 @@ CLASS net/minecraft/class_291 net/minecraft/client/gl/VertexBuffer
 	FIELD field_1593 vertexCount I
 	FIELD field_1594 vertexBufferId I
 	FIELD field_27366 indexBufferId I
-	METHOD method_1351 draw (Lnet/minecraft/class_1159;)V
-		ARG 1 matrix
 	METHOD method_1352 upload (Lnet/minecraft/class_287;)V
 		ARG 1 buffer
 	METHOD method_1353 bind ()V

mappings/net/minecraft/client/gui/WorldGenerationProgressTracker.mapping

@@ -8,7 +8,6 @@ CLASS net/minecraft/class_3953 net/minecraft/client/gui/WorldGenerationProgressT
 	FIELD field_17480 running Z
 	METHOD <init> (I)V
 		ARG 1 radius
-	METHOD method_17675 start ()V
 	METHOD method_17676 getChunkStatus (II)Lnet/minecraft/class_2806;
 		ARG 1 x
 		ARG 2 z

mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping

@@ -4,6 +4,6 @@ CLASS net/minecraft/class_3934 net/minecraft/client/gui/screen/ingame/Cartograph
 		ARG 1 handler
 		ARG 2 inventory
 		ARG 3 title
-	METHOD method_17566 drawMap (Ljava/lang/Integer;Lnet/minecraft/class_22;IIF)V
+	METHOD method_17566 drawMap (Lnet/minecraft/class_4587;Ljava/lang/Integer;Lnet/minecraft/class_22;IIF)V
 	METHOD method_17567 drawMap (Lnet/minecraft/class_4587;Ljava/lang/Integer;Lnet/minecraft/class_22;ZZZZ)V
 		ARG 1 matrices

mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping

@@ -43,8 +43,6 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv
 	CLASS class_482 LockableSlot
 	CLASS class_483 CreativeScreenHandler
 		FIELD field_2897 itemList Lnet/minecraft/class_2371;
-		METHOD <init> (Lnet/minecraft/class_1657;)V
-			ARG 1 player
 		METHOD method_2473 scrollItems (F)V
 			ARG 1 position
 		METHOD method_2474 shouldShowScrollbar ()Z

mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScreen
-	FIELD field_17410 playerInventory Lnet/minecraft/class_1661;
 	FIELD field_25267 titleX I
 	FIELD field_25268 titleY I
 	FIELD field_25269 playerInventoryTitleX I

mappings/net/minecraft/client/network/AbstractClientPlayerEntity.mapping

@@ -10,7 +10,7 @@ CLASS net/minecraft/class_742 net/minecraft/client/network/AbstractClientPlayerE
 	METHOD method_3117 getSkinTexture ()Lnet/minecraft/class_2960;
 	METHOD method_3118 getSpeed ()F
 	METHOD method_3119 getCapeTexture ()Lnet/minecraft/class_2960;
-	METHOD method_3120 loadSkin (Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_1046;
+	METHOD method_3120 loadSkin (Lnet/minecraft/class_2960;Ljava/lang/String;)V
 		ARG 0 id
 		ARG 1 playerName
 	METHOD method_3121 getModel ()Ljava/lang/String;

mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping

@@ -55,13 +55,12 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti
 		ARG 1 player
 		ARG 2 entity
 		ARG 3 hand
-	METHOD method_2906 clickSlot (IIILnet/minecraft/class_1713;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799;
+	METHOD method_2906 clickSlot (IIILnet/minecraft/class_1713;Lnet/minecraft/class_1657;)V
 		COMMENT @see net.minecraft.screen.ScreenHandler#onSlotClick(int, int, net.minecraft.screen.slot.SlotActionType, net.minecraft.entity.player.PlayerEntity)
 		ARG 1 syncId
 		ARG 2 slotId
 		ARG 3 clickData
 		ARG 4 actionType
-		ARG 5 player
 	METHOD method_2907 setGameMode (Lnet/minecraft/class_1934;)V
 		ARG 1 gameMode
 	METHOD method_2908 hasStatusBars ()Z

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

@@ -1,6 +1,3 @@
 CLASS net/minecraft/class_286 net/minecraft/client/render/BufferRenderer
 	METHOD method_1309 draw (Lnet/minecraft/class_287;)V
 		ARG 0 bufferBuilder
-	METHOD method_22639 draw (Ljava/nio/ByteBuffer;Lnet/minecraft/class_293$class_5596;Lnet/minecraft/class_293;ILnet/minecraft/class_293$class_5595;IZ)V
-		ARG 0 buffer
-		ARG 2 vertexFormat

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

@@ -1,8 +1,6 @@
 CLASS net/minecraft/class_308 net/minecraft/client/render/DiffuseLighting
-	METHOD method_1450 disable ()V
 	METHOD method_1452 enableForLevel (Lnet/minecraft/class_1159;)V
 		ARG 0 modelMatrix
-	METHOD method_22890 enable ()V
 	METHOD method_24210 disableGuiDepthLighting ()V
 	METHOD method_24211 enableGuiDepthLighting ()V
 	METHOD method_27869 (Lnet/minecraft/class_1159;)V

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

@@ -33,8 +33,6 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer
 	FIELD field_4027 ticks I
 	FIELD field_4028 lightmapTextureManager Lnet/minecraft/class_765;
 	FIELD field_4029 floatingItemWidth F
-	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_3300;Lnet/minecraft/class_4599;)V
-		ARG 1 client
 	METHOD method_19418 getCamera ()Lnet/minecraft/class_4184;
 	METHOD method_22709 loadProjectionMatrix (Lnet/minecraft/class_1159;)V
 	METHOD method_22973 getBasicProjectionMatrix (D)Lnet/minecraft/class_1159;

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

@@ -42,11 +42,9 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer
 		ARG 0 texture
 	METHOD method_23572 getEntitySolid (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
 		ARG 0 texture
-	METHOD method_23573 getEntityAlpha (Lnet/minecraft/class_2960;F)Lnet/minecraft/class_1921;
+	METHOD method_23573 getEntityAlpha (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
 		ARG 0 texture
-		ARG 1 alpha
+	METHOD method_23574 getEndPortal ()Lnet/minecraft/class_1921;
-	METHOD method_23574 getEndPortal (I)Lnet/minecraft/class_1921;
-		ARG 0 layer
 	METHOD method_23576 getEntityCutout (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
 		ARG 0 texture
 	METHOD method_23577 getSolid ()Lnet/minecraft/class_1921;
@@ -87,7 +85,6 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer
 		ARG 4 hasCrumbling
 		ARG 5 translucent
 		ARG 6 phases
-	METHOD method_24051 createTranslucentPhaseData ()Lnet/minecraft/class_1921$class_4688;
 	METHOD method_24293 getEntityCutoutNoCull (Lnet/minecraft/class_2960;Z)Lnet/minecraft/class_1921;
 		ARG 0 texture
 		ARG 1 affectsOutline
@@ -138,18 +135,13 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer
 			ARG 4 hasCrumbling
 			ARG 5 translucent
 			ARG 6 phases
-		CLASS class_4721 HashStrategy
 	CLASS class_4688 MultiPhaseParameters
-		FIELD field_21406 texture Lnet/minecraft/class_4668$class_4683;
+		FIELD field_21406 texture Lnet/minecraft/class_4668$class_5939;
 		FIELD field_21407 transparency Lnet/minecraft/class_4668$class_4685;
-		FIELD field_21408 diffuseLighting Lnet/minecraft/class_4668$class_4673;
-		FIELD field_21409 shadeModel Lnet/minecraft/class_4668$class_4681;
-		FIELD field_21410 alpha Lnet/minecraft/class_4668$class_4669;
 		FIELD field_21411 depthTest Lnet/minecraft/class_4668$class_4672;
 		FIELD field_21412 cull Lnet/minecraft/class_4668$class_4671;
 		FIELD field_21413 lightmap Lnet/minecraft/class_4668$class_4676;
 		FIELD field_21414 overlay Lnet/minecraft/class_4668$class_4679;
-		FIELD field_21415 fog Lnet/minecraft/class_4668$class_4674;
 		FIELD field_21416 layering Lnet/minecraft/class_4668$class_4675;
 		FIELD field_21417 target Lnet/minecraft/class_4668$class_4678;
 		FIELD field_21418 texturing Lnet/minecraft/class_4668$class_4684;
@@ -157,50 +149,22 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer
 		FIELD field_21420 lineWidth Lnet/minecraft/class_4668$class_4677;
 		FIELD field_21422 phases Lcom/google/common/collect/ImmutableList;
 		FIELD field_21852 outlineMode Lnet/minecraft/class_1921$class_4750;
-		METHOD <init> (Lnet/minecraft/class_4668$class_4683;Lnet/minecraft/class_4668$class_4685;Lnet/minecraft/class_4668$class_4673;Lnet/minecraft/class_4668$class_4681;Lnet/minecraft/class_4668$class_4669;Lnet/minecraft/class_4668$class_4672;Lnet/minecraft/class_4668$class_4671;Lnet/minecraft/class_4668$class_4676;Lnet/minecraft/class_4668$class_4679;Lnet/minecraft/class_4668$class_4674;Lnet/minecraft/class_4668$class_4675;Lnet/minecraft/class_4668$class_4678;Lnet/minecraft/class_4668$class_4684;Lnet/minecraft/class_4668$class_4686;Lnet/minecraft/class_4668$class_4677;Lnet/minecraft/class_1921$class_4750;)V
-			ARG 1 texture
-			ARG 2 transparency
-			ARG 3 diffuseLighting
-			ARG 4 shadeModel
-			ARG 5 alpha
-			ARG 6 depthTest
-			ARG 7 cull
-			ARG 8 lightmap
-			ARG 9 overlay
-			ARG 10 fog
-			ARG 11 layering
-			ARG 12 target
-			ARG 13 texturing
-			ARG 14 writeMaskState
-			ARG 15 lineWidth
-			ARG 16 outlineMode
 		METHOD method_23598 builder ()Lnet/minecraft/class_1921$class_4688$class_4689;
 		CLASS class_4689 Builder
-			FIELD field_21423 texture Lnet/minecraft/class_4668$class_4683;
 			FIELD field_21424 transparency Lnet/minecraft/class_4668$class_4685;
-			FIELD field_21425 diffuseLighting Lnet/minecraft/class_4668$class_4673;
-			FIELD field_21426 shadeModel Lnet/minecraft/class_4668$class_4681;
-			FIELD field_21427 alpha Lnet/minecraft/class_4668$class_4669;
 			FIELD field_21428 depthTest Lnet/minecraft/class_4668$class_4672;
 			FIELD field_21429 cull Lnet/minecraft/class_4668$class_4671;
 			FIELD field_21430 lightmap Lnet/minecraft/class_4668$class_4676;
 			FIELD field_21431 overlay Lnet/minecraft/class_4668$class_4679;
-			FIELD field_21432 fog Lnet/minecraft/class_4668$class_4674;
 			FIELD field_21433 layering Lnet/minecraft/class_4668$class_4675;
 			FIELD field_21434 target Lnet/minecraft/class_4668$class_4678;
 			FIELD field_21435 texturing Lnet/minecraft/class_4668$class_4684;
 			FIELD field_21436 writeMaskState Lnet/minecraft/class_4668$class_4686;
 			FIELD field_21437 lineWidth Lnet/minecraft/class_4668$class_4677;
-			METHOD method_23602 alpha (Lnet/minecraft/class_4668$class_4669;)Lnet/minecraft/class_1921$class_4688$class_4689;
-				ARG 1 alpha
 			METHOD method_23603 cull (Lnet/minecraft/class_4668$class_4671;)Lnet/minecraft/class_1921$class_4688$class_4689;
 				ARG 1 cull
 			METHOD method_23604 depthTest (Lnet/minecraft/class_4668$class_4672;)Lnet/minecraft/class_1921$class_4688$class_4689;
 				ARG 1 depthTest
-			METHOD method_23605 diffuseLighting (Lnet/minecraft/class_4668$class_4673;)Lnet/minecraft/class_1921$class_4688$class_4689;
-				ARG 1 diffuseLighting
-			METHOD method_23606 fog (Lnet/minecraft/class_4668$class_4674;)Lnet/minecraft/class_1921$class_4688$class_4689;
-				ARG 1 fog
 			METHOD method_23607 layering (Lnet/minecraft/class_4668$class_4675;)Lnet/minecraft/class_1921$class_4688$class_4689;
 				ARG 1 layering
 			METHOD method_23608 lightmap (Lnet/minecraft/class_4668$class_4676;)Lnet/minecraft/class_1921$class_4688$class_4689;
@@ -211,10 +175,6 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer
 				ARG 1 target
 			METHOD method_23611 overlay (Lnet/minecraft/class_4668$class_4679;)Lnet/minecraft/class_1921$class_4688$class_4689;
 				ARG 1 overlay
-			METHOD method_23612 shadeModel (Lnet/minecraft/class_4668$class_4681;)Lnet/minecraft/class_1921$class_4688$class_4689;
-				ARG 1 shadeModel
-			METHOD method_23613 texture (Lnet/minecraft/class_4668$class_4683;)Lnet/minecraft/class_1921$class_4688$class_4689;
-				ARG 1 texture
 			METHOD method_23614 texturing (Lnet/minecraft/class_4668$class_4684;)Lnet/minecraft/class_1921$class_4688$class_4689;
 				ARG 1 texturing
 			METHOD method_23615 transparency (Lnet/minecraft/class_4668$class_4685;)Lnet/minecraft/class_1921$class_4688$class_4689;

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

@@ -9,9 +9,6 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase
 	FIELD field_21351 DEPTH_MASK Lnet/minecraft/class_4668$class_4686;
 	FIELD field_21352 NO_LAYERING Lnet/minecraft/class_4668$class_4675;
 	FIELD field_21353 POLYGON_OFFSET_LAYERING Lnet/minecraft/class_4668$class_4675;
-	FIELD field_21355 NO_FOG Lnet/minecraft/class_4668$class_4674;
-	FIELD field_21356 FOG Lnet/minecraft/class_4668$class_4674;
-	FIELD field_21357 BLACK_FOG Lnet/minecraft/class_4668$class_4674;
 	FIELD field_21358 MAIN_TARGET Lnet/minecraft/class_4668$class_4678;
 	FIELD field_21359 OUTLINE_TARGET Lnet/minecraft/class_4668$class_4678;
 	FIELD field_21360 FULL_LINE_WIDTH Lnet/minecraft/class_4668$class_4677;
@@ -24,24 +21,16 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase
 	FIELD field_21368 GLINT_TRANSPARENCY Lnet/minecraft/class_4668$class_4685;
 	FIELD field_21369 CRUMBLING_TRANSPARENCY Lnet/minecraft/class_4668$class_4685;
 	FIELD field_21370 TRANSLUCENT_TRANSPARENCY Lnet/minecraft/class_4668$class_4685;
-	FIELD field_21371 ZERO_ALPHA Lnet/minecraft/class_4668$class_4669;
-	FIELD field_21372 ONE_TENTH_ALPHA Lnet/minecraft/class_4668$class_4669;
-	FIELD field_21373 HALF_ALPHA Lnet/minecraft/class_4668$class_4669;
-	FIELD field_21374 SHADE_MODEL Lnet/minecraft/class_4668$class_4681;
-	FIELD field_21375 SMOOTH_SHADE_MODEL Lnet/minecraft/class_4668$class_4681;
 	FIELD field_21376 MIPMAP_BLOCK_ATLAS_TEXTURE Lnet/minecraft/class_4668$class_4683;
 	FIELD field_21377 BLOCK_ATLAS_TEXTURE Lnet/minecraft/class_4668$class_4683;
-	FIELD field_21378 NO_TEXTURE Lnet/minecraft/class_4668$class_4683;
+	FIELD field_21378 NO_TEXTURE Lnet/minecraft/class_4668$class_5939;
 	FIELD field_21379 DEFAULT_TEXTURING Lnet/minecraft/class_4668$class_4684;
-	FIELD field_21380 OUTLINE_TEXTURING Lnet/minecraft/class_4668$class_4684;
 	FIELD field_21381 GLINT_TEXTURING Lnet/minecraft/class_4668$class_4684;
 	FIELD field_21382 ENTITY_GLINT_TEXTURING Lnet/minecraft/class_4668$class_4684;
 	FIELD field_21383 ENABLE_LIGHTMAP Lnet/minecraft/class_4668$class_4676;
 	FIELD field_21384 DISABLE_LIGHTMAP Lnet/minecraft/class_4668$class_4676;
 	FIELD field_21385 ENABLE_OVERLAY_COLOR Lnet/minecraft/class_4668$class_4679;
 	FIELD field_21386 DISABLE_OVERLAY_COLOR Lnet/minecraft/class_4668$class_4679;
-	FIELD field_21387 ENABLE_DIFFUSE_LIGHTING Lnet/minecraft/class_4668$class_4673;
-	FIELD field_21388 DISABLE_DIFFUSE_LIGHTING Lnet/minecraft/class_4668$class_4673;
 	FIELD field_22241 VIEW_OFFSET_Z_LAYERING Lnet/minecraft/class_4668$class_4675;
 	FIELD field_25280 TRANSLUCENT_TARGET Lnet/minecraft/class_4668$class_4678;
 	FIELD field_25281 PARTICLES_TARGET Lnet/minecraft/class_4668$class_4678;
@@ -56,10 +45,6 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase
 	METHOD method_23517 setupGlintTexturing (F)V
 		ARG 0 scale
 	METHOD method_23518 endDrawing ()V
-	CLASS class_4669 Alpha
-		FIELD field_21389 alpha F
-		METHOD <init> (F)V
-			ARG 1 alpha
 	CLASS class_4670 Toggleable
 		FIELD field_21390 enabled Z
 	CLASS class_4671 Cull
@@ -70,10 +55,6 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase
 		FIELD field_22242 depthFunction Ljava/lang/String;
 			COMMENT A string representation of the comparison function used by this {@code DepthTest} phase.
 			COMMENT @see org.lwjgl.opengl.GL11#glDepthFunc(int)
-	CLASS class_4673 DiffuseLighting
-		METHOD <init> (Z)V
-			ARG 1 guiLighting
-	CLASS class_4674 Fog
 	CLASS class_4675 Layering
 	CLASS class_4676 Lightmap
 		METHOD <init> (Z)V
@@ -84,14 +65,6 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase
 	CLASS class_4679 Overlay
 		METHOD <init> (Z)V
 			ARG 1 overlayColor
-	CLASS class_4680 PortalTexturing
-		FIELD field_21393 layer I
-		METHOD <init> (I)V
-			ARG 1 layer
-	CLASS class_4681 ShadeModel
-		FIELD field_21394 smooth Z
-		METHOD <init> (Z)V
-			ARG 1 smooth
 	CLASS class_4682 OffsetTexturing
 		FIELD field_21395 x F
 		FIELD field_21396 y F
@@ -102,11 +75,6 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase
 		FIELD field_21397 id Ljava/util/Optional;
 		FIELD field_21398 bilinear Z
 		FIELD field_21399 mipmap Z
-		METHOD <init> (Lnet/minecraft/class_2960;ZZ)V
-			ARG 1 id
-			ARG 2 bilinear
-			ARG 3 mipmap
-		METHOD method_23564 getId ()Ljava/util/Optional;
 	CLASS class_4684 Texturing
 	CLASS class_4685 Transparency
 	CLASS class_4686 WriteMaskState
@@ -115,3 +83,5 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase
 		METHOD <init> (ZZ)V
 			ARG 1 color
 			ARG 2 depth
+	CLASS class_5939
+		METHOD method_23564 getId ()Ljava/util/Optional;

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

@@ -7,8 +7,7 @@ CLASS net/minecraft/class_293 net/minecraft/client/render/VertexFormat
 	METHOD method_1357 getElements ()Lcom/google/common/collect/ImmutableList;
 	METHOD method_1359 getVertexSizeInteger ()I
 	METHOD method_1362 getVertexSize ()I
-	METHOD method_22649 startDrawing (J)V
+	METHOD method_22649 startDrawing ()V
-		ARG 1 pointer
 	METHOD method_22651 endDrawing ()V
 	CLASS class_5595 IntType
 		FIELD field_27371 BYTE Lnet/minecraft/class_293$class_5595;

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

@@ -18,10 +18,8 @@ CLASS net/minecraft/class_296 net/minecraft/client/render/VertexFormatElement
 	METHOD method_1385 getIndex ()I
 	METHOD method_1386 getFormat ()Lnet/minecraft/class_296$class_297;
 	METHOD method_1387 getSize ()I
-	METHOD method_22652 startDrawing (JI)V
+	METHOD method_22652 startDrawing (IJI)V
-		ARG 1 pointer
+	METHOD method_22653 endDrawing (I)V
-		ARG 3 stride
-	METHOD method_22653 endDrawing ()V
 	CLASS class_297 Format
 		FIELD field_1618 size I
 		FIELD field_1626 name Ljava/lang/String;
@@ -36,20 +34,20 @@ CLASS net/minecraft/class_296 net/minecraft/client/render/VertexFormatElement
 	CLASS class_298 Type
 		FIELD field_1630 name Ljava/lang/String;
 		FIELD field_20783 starter Lnet/minecraft/class_296$class_298$class_4575;
-		FIELD field_20784 finisher Ljava/util/function/IntConsumer;
+		FIELD field_20784 finisher Lnet/minecraft/class_296$class_298$class_5938;
-		METHOD <init> (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_296$class_298$class_4575;Ljava/util/function/IntConsumer;)V
+		METHOD <init> (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_296$class_298$class_4575;Lnet/minecraft/class_296$class_298$class_5938;)V
 			ARG 3 name
 		METHOD method_1392 getName ()Ljava/lang/String;
-		METHOD method_22654 endDrawing (I)V
+		METHOD method_22654 endDrawing (II)V
 			ARG 1 elementIndex
-		METHOD method_22655 startDrawing (IIIJI)V
+		METHOD method_22655 startDrawing (IIIJII)V
 			ARG 1 count
 			ARG 2 glId
 			ARG 3 stride
 			ARG 4 pointer
 			ARG 6 elementIndex
 		CLASS class_4575 Starter
-			METHOD setupBufferState (IIIJI)V
+			METHOD setupBufferState (IIIJII)V
 				ARG 1 count
 				ARG 2 glId
 				ARG 3 stride

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

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
-	FIELD field_20791 vertexFormat Lnet/minecraft/class_293;
 	FIELD field_20792 frame I
 	FIELD field_20797 RAIN Lnet/minecraft/class_2960;
 	FIELD field_20798 SNOW Lnet/minecraft/class_2960;
@@ -46,7 +45,6 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 	FIELD field_4096 lastCameraZ D
 	FIELD field_4097 lastCloudsBlockY I
 	FIELD field_4098 MOON_PHASES Lnet/minecraft/class_2960;
-	FIELD field_4100 skyVertexFormat Lnet/minecraft/class_293;
 	FIELD field_4101 entityOutlinesFramebuffer Lnet/minecraft/class_276;
 	FIELD field_4102 darkSkyBuffer Lnet/minecraft/class_291;
 	FIELD field_4103 lastTranslucentSortY D
@@ -199,16 +197,15 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 		ARG 3 playing
 	METHOD method_3250 renderEndSky (Lnet/minecraft/class_4587;)V
 		ARG 1 matrices
-	METHOD method_3251 renderLayer (Lnet/minecraft/class_1921;Lnet/minecraft/class_4587;DDD)V
+	METHOD method_3251 renderLayer (Lnet/minecraft/class_1921;Lnet/minecraft/class_4587;DDDLnet/minecraft/class_1159;)V
 		ARG 1 renderLayer
 		ARG 2 matrices
 	METHOD method_3252 tick ()V
 	METHOD method_3254 drawEntityOutlinesFramebuffer ()V
 	METHOD method_3255 renderStars (Lnet/minecraft/class_287;)V
 		ARG 1 buffer
-	METHOD method_3257 renderSky (Lnet/minecraft/class_4587;F)V
+	METHOD method_3257 renderSky (Lnet/minecraft/class_4587;Lnet/minecraft/class_1159;F)V
 		ARG 1 matrices
-		ARG 2 tickDelta
 	METHOD method_3258 drawBox (Lnet/minecraft/class_287;DDDDDDFFFF)V
 		ARG 0 buffer
 		ARG 1 x1
@@ -221,12 +218,8 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 		ARG 14 green
 		ARG 15 blue
 		ARG 16 alpha
-	METHOD method_3259 renderClouds (Lnet/minecraft/class_4587;FDDD)V
+	METHOD method_3259 renderClouds (Lnet/minecraft/class_4587;Lnet/minecraft/class_1159;FDDD)V
 		ARG 1 matrices
-		ARG 2 tickDelta
-		ARG 3 cameraX
-		ARG 5 cameraY
-		ARG 7 cameraZ
 	METHOD method_3265 renderDarkSky ()V
 	METHOD method_3268 getRandomParticleSpawnChance (Z)Lnet/minecraft/class_4066;
 		ARG 1 canSpawnOnMinimal
@@ -267,10 +260,6 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 		ARG 9 velocityX
 		ARG 11 velocityY
 		ARG 13 velocityZ
-	METHOD method_3283 renderSkyHalf (Lnet/minecraft/class_287;FZ)V
-		ARG 1 buffer
-		ARG 2 y
-		ARG 3 bottom
 	METHOD method_3288 spawnParticle (Lnet/minecraft/class_2394;ZZDDDDDD)Lnet/minecraft/class_703;
 		ARG 1 parameters
 		ARG 2 alwaysSpawn

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

@@ -1,18 +1,12 @@
 CLASS net/minecraft/class_840 net/minecraft/client/render/block/entity/EndPortalBlockEntityRenderer
-	FIELD field_21732 PORTAL_RENDER_LAYERS Ljava/util/List;
-	FIELD field_27757 dispatcher Lnet/minecraft/class_824;
-	FIELD field_4405 RANDOM Ljava/util/Random;
 	FIELD field_4406 SKY_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_4407 PORTAL_TEXTURE Lnet/minecraft/class_2960;
 	METHOD <init> (Lnet/minecraft/class_5614$class_5615;)V
 		ARG 1 ctx
-	METHOD method_23084 renderSides (Lnet/minecraft/class_2640;FFLnet/minecraft/class_1159;Lnet/minecraft/class_4588;)V
+	METHOD method_23084 renderSides (Lnet/minecraft/class_2640;FLnet/minecraft/class_1159;Lnet/minecraft/class_4588;)V
 		ARG 1 entity
 		ARG 2 topYOffset
-		ARG 3 brightness
+	METHOD method_23085 renderSide (Lnet/minecraft/class_2640;Lnet/minecraft/class_1159;Lnet/minecraft/class_4588;FFFFFFFFLnet/minecraft/class_2350;)V
-		ARG 4 model
-		ARG 5 vertices
-	METHOD method_23085 renderSide (Lnet/minecraft/class_2640;Lnet/minecraft/class_1159;Lnet/minecraft/class_4588;FFFFFFFFFFFLnet/minecraft/class_2350;)V
 		ARG 1 entity
 		ARG 2 model
 		ARG 3 vertices
@@ -24,10 +18,4 @@ CLASS net/minecraft/class_840 net/minecraft/client/render/block/entity/EndPortal
 		ARG 9 z2
 		ARG 10 z3
 		ARG 11 z4
-		ARG 12 red
-		ARG 13 green
-		ARG 14 blue
-	METHOD method_3592 getDetailLevel (D)I
-		COMMENT Decides how many layers of texture to show on a portal block based on its distance from the camera.
-		ARG 1 distance
 	METHOD method_3594 getTopYOffset ()F

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

@@ -63,7 +63,7 @@ CLASS net/minecraft/class_895 net/minecraft/client/render/entity/EnderDragonEnti
 		FIELD field_3637 neck Lnet/minecraft/class_630;
 		METHOD <init> (Lnet/minecraft/class_630;)V
 			ARG 1 part
-		METHOD method_23838 setLimbRotation (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;IIFLnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_630;)V
+		METHOD method_23838 setLimbRotation (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;IIFLnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_630;F)V
 			ARG 1 matrices
 			ARG 2 vertices
 			ARG 3 light

mappings/net/minecraft/client/render/item/ItemRenderer.mapping

@@ -109,7 +109,6 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer
 		ARG 3 y
 	METHOD method_4012 getModels ()Lnet/minecraft/class_763;
 	METHOD method_4019 getHeldItemModel (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;I)Lnet/minecraft/class_1087;
-		ARG 1 stack
 		ARG 2 world
 		ARG 3 entity
 		ARG 4 seed

mappings/net/minecraft/client/texture/NativeImage.mapping

@@ -101,8 +101,6 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage
 		ARG 7 height
 		ARG 8 mipmap
 		ARG 9 close
-	METHOD method_4313 setTextureClamp (Z)V
-		ARG 0 clamp
 	METHOD method_4314 writeFile (Ljava/nio/file/Path;)V
 		ARG 1 path
 	METHOD method_4315 getPixelColor (II)I

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

@@ -1,5 +1,3 @@
 CLASS net/minecraft/class_311 net/minecraft/client/util/GlAllocationUtils
 	METHOD method_1596 allocateByteBuffer (I)Ljava/nio/ByteBuffer;
 		ARG 0 size
-	METHOD method_1597 allocateFloatBuffer (I)Ljava/nio/FloatBuffer;
-		ARG 0 size

mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping

@@ -82,10 +82,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGe
 	METHOD method_25550 registerNorthDefaultHorizontalRotatable (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;)V
 		ARG 1 block
 		ARG 2 texture
-	METHOD method_25551 registerSingleton (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;Lnet/minecraft/class_4942;)V
-		ARG 1 block
-		ARG 2 texture
-		ARG 3 model
 	METHOD method_25553 registerAxisRotated (Lnet/minecraft/class_2248;Lnet/minecraft/class_4946$class_4947;)V
 		ARG 1 block
 		ARG 2 modelFactory
@@ -254,9 +250,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGe
 	METHOD method_25657 registerSunflower ()V
 	METHOD method_25658 registerDoor (Lnet/minecraft/class_2248;)V
 		ARG 1 doorBlock
-	METHOD method_25659 registerCubeColumn (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V
-		ARG 1 block
-		ARG 2 endTexture
 	METHOD method_25660 registerBuiltinWithParticle (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;)V
 		ARG 1 block
 		ARG 2 particleSource

mappings/net/minecraft/data/client/model/TexturedModel.mapping

@@ -49,5 +49,3 @@ CLASS net/minecraft/class_4946 net/minecraft/data/client/model/TexturedModel
 		METHOD method_25923 upload (Lnet/minecraft/class_2248;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_2960;
 			ARG 1 block
 			ARG 2 writer
-		METHOD method_25924 withTexture (Ljava/util/function/Consumer;)Lnet/minecraft/class_4946$class_4947;
-			ARG 1 textureConsumer

mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping

@@ -13,7 +13,6 @@ CLASS net/minecraft/class_1533 net/minecraft/entity/decoration/ItemFrameEntity
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 facing
-	METHOD method_33339 isGlowItemFrame ()Z
 	METHOD method_33340 getAsItemStack ()Lnet/minecraft/class_1799;
 	METHOD method_6933 setHeldItemStack (Lnet/minecraft/class_1799;Z)V
 		ARG 1 value

mappings/net/minecraft/entity/player/PlayerInventory.mapping

@@ -6,7 +6,6 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory
 	FIELD field_7546 player Lnet/minecraft/class_1657;
 	FIELD field_7547 main Lnet/minecraft/class_2371;
 	FIELD field_7548 armor Lnet/minecraft/class_2371;
-	FIELD field_7549 cursorStack Lnet/minecraft/class_1799;
 	METHOD <init> (Lnet/minecraft/class_1657;)V
 		ARG 1 player
 	METHOD method_29280 remove (Ljava/util/function/Predicate;ILnet/minecraft/class_1263;)I
@@ -65,10 +64,7 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory
 		ARG 1 stack
 	METHOD method_7395 getSlotWithStack (Lnet/minecraft/class_1799;)I
 		ARG 1 stack
-	METHOD method_7396 setCursorStack (Lnet/minecraft/class_1799;)V
-		ARG 1 stack
 	METHOD method_7397 deserialize (Lnet/minecraft/class_2499;)V
 		ARG 1 tag
 	METHOD method_7398 offerOrDrop (Lnet/minecraft/class_1799;)V
 		ARG 1 stack
-	METHOD method_7399 getCursorStack ()Lnet/minecraft/class_1799;

mappings/net/minecraft/item/Item.mapping

@@ -22,17 +22,15 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 	METHOD method_24357 damage (Lnet/minecraft/class_1282;)Z
 		ARG 1 source
 	METHOD method_24358 isFireproof ()Z
-	METHOD method_31565 onStackClicked (Lnet/minecraft/class_1799;Lnet/minecraft/class_1735;Lnet/minecraft/class_5536;Lnet/minecraft/class_1661;)Z
+	METHOD method_31565 onStackClicked (Lnet/minecraft/class_1799;Lnet/minecraft/class_1735;Lnet/minecraft/class_5536;Lnet/minecraft/class_1657;)Z
 		ARG 1 stack
 		ARG 2 slot
 		ARG 3 clickType
-		ARG 4 playerInventory
+	METHOD method_31566 onClicked (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1735;Lnet/minecraft/class_5536;Lnet/minecraft/class_1657;Lnet/minecraft/class_5630;)Z
-	METHOD method_31566 onClicked (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1735;Lnet/minecraft/class_5536;Lnet/minecraft/class_1661;)Z
 		ARG 1 stack
 		ARG 2 otherStack
 		ARG 3 slot
 		ARG 4 clickType
-		ARG 5 playerInventory
 	METHOD method_31567 isItemBarVisible (Lnet/minecraft/class_1799;)Z
 		ARG 1 stack
 	METHOD method_31568 hasStoredInventory ()Z

mappings/net/minecraft/item/ItemStack.mapping

@@ -48,15 +48,13 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 		ARG 1 tag
 	METHOD method_31574 isOf (Lnet/minecraft/class_1792;)Z
 		ARG 1 item
-	METHOD method_31575 onStackClicked (Lnet/minecraft/class_1735;Lnet/minecraft/class_5536;Lnet/minecraft/class_1661;)Z
+	METHOD method_31575 onStackClicked (Lnet/minecraft/class_1735;Lnet/minecraft/class_5536;Lnet/minecraft/class_1657;)Z
 		ARG 1 slot
 		ARG 2 clickType
-		ARG 3 playerInventory
+	METHOD method_31576 onClicked (Lnet/minecraft/class_1799;Lnet/minecraft/class_1735;Lnet/minecraft/class_5536;Lnet/minecraft/class_1657;Lnet/minecraft/class_5630;)Z
-	METHOD method_31576 onClicked (Lnet/minecraft/class_1799;Lnet/minecraft/class_1735;Lnet/minecraft/class_5536;Lnet/minecraft/class_1661;)Z
 		ARG 1 stack
 		ARG 2 slot
 		ARG 3 clickType
-		ARG 4 playerInventory
 	METHOD method_31577 canCombine (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z
 		ARG 0 stack
 		ARG 1 otherStack

mappings/net/minecraft/nbt/ListTag.mapping

@@ -23,8 +23,6 @@ CLASS net/minecraft/class_2499 net/minecraft/nbt/ListTag
 		ARG 1 index
 	METHOD method_10609 getShort (I)S
 		ARG 1 index
-	METHOD method_10610 getIntArray (I)[I
-		ARG 1 index
 	METHOD method_10611 getDouble (I)D
 		ARG 1 index
 	METHOD method_17809 forgetTypeIfEmpty ()V

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

@@ -89,8 +89,6 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi
 		ARG 1 packet
 	METHOD method_11122 onHealthUpdate (Lnet/minecraft/class_2749;)V
 		ARG 1 packet
-	METHOD method_11123 onConfirmScreenAction (Lnet/minecraft/class_2644;)V
-		ARG 1 packet
 	METHOD method_11124 onExplosion (Lnet/minecraft/class_2664;)V
 		ARG 1 packet
 	METHOD method_11125 onPlaySoundFromEntity (Lnet/minecraft/class_2765;)V

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

@@ -68,8 +68,6 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi
 		ARG 1 packet
 	METHOD method_12078 onVehicleMove (Lnet/minecraft/class_2833;)V
 		ARG 1 packet
-	METHOD method_12079 onConfirmScreenAction (Lnet/minecraft/class_2809;)V
-		ARG 1 packet
 	METHOD method_12080 onMerchantTradeSelect (Lnet/minecraft/class_2863;)V
 		ARG 1 packet
 	METHOD method_12081 onResourcePackStatus (Lnet/minecraft/class_2856;)V

mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping

@@ -4,17 +4,8 @@ CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickSlotC2
 	FIELD field_12817 clickData I
 	FIELD field_12818 slot I
 	FIELD field_12819 syncId I
-	FIELD field_12820 actionId S
-	METHOD <init> (IIILnet/minecraft/class_1713;Lnet/minecraft/class_1799;S)V
-		ARG 1 syncId
-		ARG 2 slot
-		ARG 3 clickData
-		ARG 4 actionType
-		ARG 5 stack
-		ARG 6 actionId
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
-	METHOD method_12189 getActionId ()S
 	METHOD method_12190 getStack ()Lnet/minecraft/class_1799;
 	METHOD method_12192 getSlot ()I
 	METHOD method_12193 getClickData ()I

mappings/net/minecraft/network/packet/c2s/play/ConfirmScreenActionC2SPacket.mapping

@@ -1,12 +0,0 @@
-CLASS net/minecraft/class_2809 net/minecraft/network/packet/c2s/play/ConfirmScreenActionC2SPacket
-	FIELD field_12809 actionId S
-	FIELD field_12810 accepted Z
-	FIELD field_12811 syncId I
-	METHOD <init> (ISZ)V
-		ARG 1 syncId
-		ARG 2 actionId
-		ARG 3 accepted
-	METHOD <init> (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD method_12176 getActionId ()S
-	METHOD method_12178 getSyncId ()I

mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping

@@ -2,7 +2,7 @@ CLASS net/minecraft/class_2875 net/minecraft/network/packet/c2s/play/UpdateStruc
 	FIELD field_13080 structureName Ljava/lang/String;
 	FIELD field_13081 mirror Lnet/minecraft/class_2415;
 	FIELD field_13082 action Lnet/minecraft/class_2633$class_2634;
-	FIELD field_13083 size Lnet/minecraft/class_2338;
+	FIELD field_13083 size Lnet/minecraft/class_2382;
 	FIELD field_13084 mode Lnet/minecraft/class_2776;
 	FIELD field_13085 metadata Ljava/lang/String;
 	FIELD field_13086 showBoundingBox Z
@@ -13,13 +13,12 @@ CLASS net/minecraft/class_2875 net/minecraft/network/packet/c2s/play/UpdateStruc
 	FIELD field_13091 offset Lnet/minecraft/class_2338;
 	FIELD field_13092 seed J
 	FIELD field_13093 pos Lnet/minecraft/class_2338;
-	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2633$class_2634;Lnet/minecraft/class_2776;Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Ljava/lang/String;ZZZFJ)V
+	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2633$class_2634;Lnet/minecraft/class_2776;Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Ljava/lang/String;ZZZFJ)V
 		ARG 1 pos
 		ARG 2 action
 		ARG 3 mode
 		ARG 4 structureName
 		ARG 5 offset
-		ARG 6 size
 		ARG 7 mirror
 		ARG 8 rotation
 		ARG 9 metadata
@@ -30,7 +29,7 @@ CLASS net/minecraft/class_2875 net/minecraft/network/packet/c2s/play/UpdateStruc
 		ARG 14 seed
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
-	METHOD method_12492 getSize ()Lnet/minecraft/class_2338;
+	METHOD method_12492 getSize ()Lnet/minecraft/class_2382;
 	METHOD method_12493 getMirror ()Lnet/minecraft/class_2415;
 	METHOD method_12494 getIntegrity ()F
 	METHOD method_12496 getOffset ()Lnet/minecraft/class_2338;

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

@@ -1,13 +0,0 @@
-CLASS net/minecraft/class_2644 net/minecraft/network/packet/s2c/play/ConfirmScreenActionS2CPacket
-	FIELD field_12134 actionId S
-	FIELD field_12135 accepted Z
-	FIELD field_12136 syncId I
-	METHOD <init> (ISZ)V
-		ARG 1 syncId
-		ARG 2 actionId
-		ARG 3 accepted
-	METHOD <init> (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD method_11423 getActionId ()S
-	METHOD method_11425 getSyncId ()I
-	METHOD method_11426 wasAccepted ()Z

mappings/net/minecraft/resource/ResourceManager.mapping

@@ -1,15 +1,5 @@
 CLASS net/minecraft/class_3300 net/minecraft/resource/ResourceManager
 	COMMENT Provides resource loading capabilities to Minecraft.
-	METHOD method_14486 getResource (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3298;
-		COMMENT Finds and returns the corresponding resource for a resource's identifier.
-		COMMENT
-		COMMENT <p>Starts by scanning each resource pack from highest priority to lowest. If no resource packs were found
-		COMMENT to contain the requested entry, will throw a {@code FileNotFoundException}.
-		COMMENT
-		COMMENT @throws java.io.FileNotFoundException if the identified resource could not be found, or could not be loaded.
-		COMMENT @throws IOException if the identified resource was found but a stream to it could not be opened.
-		ARG 1 id
-			COMMENT the resource identifier to search for
 	METHOD method_14487 getAllNamespaces ()Ljava/util/Set;
 		COMMENT Gets a set of all namespaces offered by the resource packs loaded by this manager.
 	METHOD method_14488 findResources (Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Collection;

mappings/net/minecraft/screen/CraftingScreenHandler.mapping

@@ -10,8 +10,7 @@ CLASS net/minecraft/class_1714 net/minecraft/screen/CraftingScreenHandler
 		ARG 1 syncId
 		ARG 2 playerInventory
 		ARG 3 context
-	METHOD method_17399 updateResult (ILnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1715;Lnet/minecraft/class_1731;)V
+	METHOD method_17399 updateResult (Lnet/minecraft/class_1703;Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1715;Lnet/minecraft/class_1731;)V
-		ARG 0 syncId
 		ARG 1 world
 		ARG 2 player
 		ARG 3 craftingInventory

mappings/net/minecraft/screen/ForgingScreenHandler.mapping

@@ -8,7 +8,7 @@ CLASS net/minecraft/class_4861 net/minecraft/screen/ForgingScreenHandler
 		ARG 2 syncId
 		ARG 3 playerInventory
 		ARG 4 context
-	METHOD method_24923 onTakeOutput (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;
+	METHOD method_24923 onTakeOutput (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V
 		ARG 1 player
 		ARG 2 stack
 	METHOD method_24925 canUse (Lnet/minecraft/class_2680;)Z

mappings/net/minecraft/screen/ScreenHandler.mapping

@@ -2,9 +2,7 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler
 	FIELD field_17285 properties Ljava/util/List;
 	FIELD field_17493 type Lnet/minecraft/class_3917;
 	FIELD field_7757 quickCraftSlots Ljava/util/Set;
-	FIELD field_7758 actionId S
 	FIELD field_7759 quickCraftStage I
-	FIELD field_7760 restrictedPlayers Ljava/util/Set;
 	FIELD field_7761 slots Lnet/minecraft/class_2371;
 	FIELD field_7762 quickCraftButton I
 	FIELD field_7763 syncId I
@@ -12,7 +10,6 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler
 		COMMENT A list of item stacks that is used for tracking changes in {@link #sendContentUpdates()}.
 	FIELD field_7765 listeners Ljava/util/List;
 	METHOD <init> (Lnet/minecraft/class_3917;I)V
-		ARG 1 type
 		ARG 2 syncId
 	METHOD method_17358 getType ()Lnet/minecraft/class_3917;
 	METHOD method_17359 checkSize (Lnet/minecraft/class_1263;I)V
@@ -37,7 +34,7 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler
 	METHOD method_17696 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Ljava/lang/Boolean;
 		ARG 2 world
 		ARG 3 pos
-	METHOD method_30010 internalOnSlotClick (IILnet/minecraft/class_1713;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799;
+	METHOD method_30010 internalOnSlotClick (IILnet/minecraft/class_1713;Lnet/minecraft/class_1657;)V
 		COMMENT The actual logic that handles a slot click. Called by {@link #onSlotClick
 		COMMENT (int, int, SlotActionType, PlayerEntity)} in a try-catch block that wraps
 		COMMENT exceptions from this method into a crash report.
@@ -45,9 +42,6 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler
 		ARG 2 clickData
 		ARG 3 actionType
 		ARG 4 player
-	METHOD method_7590 setPlayerRestriction (Lnet/minecraft/class_1657;Z)V
-		ARG 1 player
-		ARG 2 unrestricted
 	METHOD method_7591 packQuickCraftData (II)I
 		ARG 0 quickCraftStage
 		ARG 1 buttonId
@@ -55,7 +49,7 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler
 		ARG 0 slot
 		ARG 1 stack
 		ARG 2 allowOverflow
-	METHOD method_7593 onSlotClick (IILnet/minecraft/class_1713;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799;
+	METHOD method_7593 onSlotClick (IILnet/minecraft/class_1713;Lnet/minecraft/class_1657;)V
 		COMMENT Performs a slot click. This can behave in many different ways depending mainly on the action type.
 		COMMENT @return The stack that was clicked on before anything changed, used mostly for verifying that the client and server are in sync
 		ARG 1 slotIndex
@@ -66,9 +60,7 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler
 	METHOD method_7594 unpackQuickCraftStage (I)I
 		ARG 0 quickCraftData
 	METHOD method_7595 close (Lnet/minecraft/class_1657;)V
-		ARG 1 player
 	METHOD method_7596 addListener (Lnet/minecraft/class_1712;)V
-		ARG 1 listener
 	METHOD method_7597 canUse (Lnet/minecraft/class_1657;)Z
 		ARG 1 player
 	METHOD method_7600 shouldQuickCraftContinue (ILnet/minecraft/class_1657;)Z
@@ -101,8 +93,6 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler
 	METHOD method_7613 canInsertIntoSlot (Lnet/minecraft/class_1799;Lnet/minecraft/class_1735;)Z
 		ARG 1 stack
 		ARG 2 slot
-	METHOD method_7614 getNextActionId (Lnet/minecraft/class_1661;)S
-		ARG 1 playerInventory
 	METHOD method_7615 canInsertIntoSlot (Lnet/minecraft/class_1735;)Z
 		ARG 1 slot
 	METHOD method_7616 insertItem (Lnet/minecraft/class_1799;IIZ)Z
@@ -123,8 +113,5 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler
 	METHOD method_7620 unpackQuickCraftButton (I)I
 		ARG 0 quickCraftData
 	METHOD method_7621 addSlot (Lnet/minecraft/class_1735;)Lnet/minecraft/class_1735;
-		ARG 1 slot
-	METHOD method_7622 isNotRestricted (Lnet/minecraft/class_1657;)Z
-		ARG 1 player
 	METHOD method_7623 sendContentUpdates ()V
 		COMMENT Sends updates to listeners if any properties or slot stacks have changed.

mappings/net/minecraft/screen/ScreenHandlerListener.mapping

@@ -3,9 +3,6 @@ CLASS net/minecraft/class_1712 net/minecraft/screen/ScreenHandlerListener
 		ARG 1 handler
 		ARG 2 property
 		ARG 3 value
-	METHOD method_7634 onHandlerRegistered (Lnet/minecraft/class_1703;Lnet/minecraft/class_2371;)V
-		ARG 1 handler
-		ARG 2 stacks
 	METHOD method_7635 onSlotUpdate (Lnet/minecraft/class_1703;ILnet/minecraft/class_1799;)V
 		ARG 1 handler
 		ARG 2 slotId

mappings/net/minecraft/screen/slot/Slot.mapping

@@ -9,7 +9,7 @@ CLASS net/minecraft/class_1735 net/minecraft/screen/slot/Slot
 		ARG 2 index
 		ARG 3 x
 		ARG 4 y
-	METHOD method_7667 onTakeItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;
+	METHOD method_7667 onTakeItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V
 		ARG 1 player
 		ARG 2 stack
 	METHOD method_7668 markDirty ()V

mappings/net/minecraft/server/WorldGenerationProgressListener.mapping

@@ -5,3 +5,4 @@ CLASS net/minecraft/class_3949 net/minecraft/server/WorldGenerationProgressListe
 		ARG 1 pos
 		ARG 2 status
 	METHOD method_17671 stop ()V
+	METHOD method_17675 start ()V

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

@@ -15,7 +15,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
 	FIELD field_14129 ridingEntity Z
 	FIELD field_14130 lastTickX D
 	FIELD field_14131 floating Z
-	FIELD field_14132 transactions Lit/unimi/dsi/fastutil/ints/Int2ShortMap;
 	FIELD field_14133 creativeItemDropThreshold I
 	FIELD field_14134 keepAliveId J
 	FIELD field_14135 lastTickMovePacketsCount I
@@ -94,8 +93,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
 	METHOD method_31282 onSignUpdate (Lnet/minecraft/class_2877;Ljava/util/List;)V
 		ARG 1 packet
 		ARG 2 signText
-	METHOD method_31286 sendMessage (Ljava/lang/String;)V
-		ARG 1 message
 	METHOD method_33562 requestTeleportAndDismount (DDDFF)V
 		ARG 1 x
 		ARG 3 y

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

@@ -25,7 +25,6 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 	FIELD field_13988 removedEntities Lit/unimi/dsi/fastutil/ints/IntList;
 	FIELD field_13989 notInAnyWorld Z
 	FIELD field_13990 cameraPosition Lnet/minecraft/class_4076;
-	FIELD field_13991 skipPacketSlotUpdates Z
 	FIELD field_13992 levitationStartPos Lnet/minecraft/class_243;
 	FIELD field_13993 clientChatVisibility Lnet/minecraft/class_1659;
 	FIELD field_13994 enteredNetherPos Lnet/minecraft/class_243;
@@ -46,9 +45,6 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 	METHOD method_14203 copyFrom (Lnet/minecraft/class_3222;Z)V
 		ARG 1 oldPlayer
 		ARG 2 alive
-	METHOD method_14204 refreshScreenHandler (Lnet/minecraft/class_1703;)V
-		COMMENT Sends packets to the client that refresh the current screen handler's items.
-		ARG 1 handler
 	METHOD method_14205 sendInitialChunkPackets (Lnet/minecraft/class_1923;Lnet/minecraft/class_2596;Lnet/minecraft/class_2596;)V
 	METHOD method_14206 getPlayerListName ()Lnet/minecraft/class_2561;
 	METHOD method_14207 handleFall (DZ)V
@@ -90,13 +86,12 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 	METHOD method_14231 onDisconnect ()V
 	METHOD method_14232 getCameraPosition ()Lnet/minecraft/class_4076;
 	METHOD method_14234 updateLastActionTime ()V
-	METHOD method_14235 onSpawn ()V
+	METHOD method_14235 onSpawn (Lnet/minecraft/class_1703;)V
 	METHOD method_14236 getAdvancementTracker ()Lnet/minecraft/class_2985;
 	METHOD method_14237 incrementScreenHandlerSyncId ()V
 	METHOD method_14238 getClientChatVisibility ()Lnet/minecraft/class_1659;
 	METHOD method_14239 isDisconnected ()Z
 	METHOD method_14240 onTeleportationDone ()V
-	METHOD method_14241 updateCursorStack ()V
 	METHOD method_14242 getCameraEntity ()Lnet/minecraft/class_1297;
 	METHOD method_14244 calculateSpawnOffsetMultiplier (I)I
 		ARG 1 horizontalSpawnArea

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

@@ -203,10 +203,10 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
 	METHOD method_31419 getChunkSourceDebugString ()Ljava/lang/String;
 	METHOD method_31420 (Lnet/minecraft/class_3695;Lnet/minecraft/class_1297;)V
 		ARG 2 entity
-	METHOD method_31424 getDragonPart (I)Lnet/minecraft/class_1297;
-		ARG 1 id
 	METHOD method_31423 loadEntities (Ljava/util/stream/Stream;)V
 		ARG 1 entities
+	METHOD method_31424 getDragonPart (I)Lnet/minecraft/class_1297;
+		ARG 1 id
 	METHOD method_31426 addEntities (Ljava/util/stream/Stream;)V
 		ARG 1 entities
 	METHOD method_31430 shouldCancelSpawn (Lnet/minecraft/class_1297;)Z

mappings/net/minecraft/structure/Structure.mapping

@@ -1,9 +1,9 @@
 CLASS net/minecraft/class_3499 net/minecraft/structure/Structure
 	FIELD field_15586 blockInfoLists Ljava/util/List;
-	FIELD field_15587 size Lnet/minecraft/class_2338;
+	FIELD field_15587 size Lnet/minecraft/class_2382;
 	FIELD field_15588 author Ljava/lang/String;
 	FIELD field_15589 entities Ljava/util/List;
-	METHOD method_15160 getSize ()Lnet/minecraft/class_2338;
+	METHOD method_15160 getSize ()Lnet/minecraft/class_2382;
 	METHOD method_15161 setAuthor (Ljava/lang/String;)V
 		ARG 1 name
 	METHOD method_15162 applyTransformedOffset (Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;II)Lnet/minecraft/class_2338;
@@ -21,7 +21,7 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure
 		ARG 2 placementData
 		ARG 3 block
 		ARG 4 transformed
-	METHOD method_15166 getRotatedSize (Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338;
+	METHOD method_15166 getRotatedSize (Lnet/minecraft/class_2470;)Lnet/minecraft/class_2382;
 		ARG 1 rotation
 	METHOD method_15167 offsetByTransformedSize (Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338;
 		ARG 1 pos
@@ -41,10 +41,9 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure
 		ARG 2 pos
 		ARG 4 placementData
 		ARG 5 random
-	METHOD method_15174 saveFromWorld (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ZLnet/minecraft/class_2248;)V
+	METHOD method_15174 saveFromWorld (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;ZLnet/minecraft/class_2248;)V
 		ARG 1 world
 		ARG 2 start
-		ARG 3 size
 		ARG 4 includeEntities
 		ARG 5 ignoredBlock
 	METHOD method_15175 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
@@ -73,11 +72,6 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure
 	METHOD method_15183 readNbt (Lnet/minecraft/class_2487;)V
 		ARG 1 tag
 	METHOD method_15184 createDoubleListTag ([D)Lnet/minecraft/class_2499;
-	METHOD method_16186 mirrorBoundingBox (Lnet/minecraft/class_2470;IILnet/minecraft/class_3341;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)V
-		ARG 1 rotation
-		ARG 2 offsetX
-		ARG 3 offsetZ
-		ARG 4 boundingBox
 	METHOD method_16187 calculateBoundingBox (Lnet/minecraft/class_3492;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3341;
 		ARG 1 placementData
 		ARG 2 pos

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

@@ -5,7 +5,7 @@ CLASS net/minecraft/class_3776 net/minecraft/structure/pool/FeaturePoolElement
 	METHOD <init> (Ljava/util/function/Supplier;Lnet/minecraft/class_3785$class_3786;)V
 		ARG 1 feature
 		ARG 2 projection
-	METHOD method_16601 getStart (Lnet/minecraft/class_3485;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338;
+	METHOD method_16601 getStart (Lnet/minecraft/class_3485;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2382;
 		ARG 1 structureManager
 		ARG 2 rotation
 	METHOD method_19299 createDefaultJigsawNbt ()Lnet/minecraft/class_2487;

mappings/net/minecraft/test/StructureTestUtil.mapping

@@ -24,10 +24,9 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil
 		ARG 1 pos
 		ARG 2 rotation
 		ARG 4 world
-	METHOD method_22251 createTestArea (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V
+	METHOD method_22251 createTestArea (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V
 		ARG 0 structure
 		ARG 1 pos
-		ARG 2 size
 		ARG 3 rotation
 		ARG 4 world
 	METHOD method_22252 placeStructure (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Z)Lnet/minecraft/class_2633;
@@ -59,7 +58,7 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil
 		ARG 1 world
 	METHOD method_29408 getRotation (I)Lnet/minecraft/class_2470;
 		ARG 0 steps
-	METHOD method_29409 getStructureBlockBox (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;)Lnet/minecraft/class_3341;
+	METHOD method_29409 getStructureBlockBox (Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;)Lnet/minecraft/class_3341;
 		ARG 2 rotation
 	METHOD method_29410 getStructureBlockBox (Lnet/minecraft/class_2633;)Lnet/minecraft/class_3341;
 		ARG 0 structureBlockEntity

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

@@ -12,17 +12,11 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox
 		ARG 4 maxX
 		ARG 5 maxY
 		ARG 6 maxZ
-	METHOD <init> (Lnet/minecraft/class_2382;Lnet/minecraft/class_2382;)V
-		ARG 1 v1
-		ARG 2 v2
-	METHOD <init> ([I)V
-		ARG 1 data
 	METHOD method_14657 intersects (Lnet/minecraft/class_3341;)Z
 		ARG 1 other
-	METHOD method_14658 toNbt ()Lnet/minecraft/class_2495;
 	METHOD method_14659 getDimensions ()Lnet/minecraft/class_2382;
 	METHOD method_14660 getBlockCountX ()I
-	METHOD method_14661 move (III)V
+	METHOD method_14661 move (III)Lnet/minecraft/class_3341;
 		ARG 1 dx
 		ARG 2 dy
 		ARG 3 dz
@@ -60,8 +54,8 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox
 		ARG 1 x
 		ARG 2 y
 		ARG 3 z
-	METHOD method_22874 getCenter ()Lnet/minecraft/class_2382;
+	METHOD method_22874 getCenter ()Lnet/minecraft/class_2338;
 		COMMENT @implNote Biased toward the minimum bound corner of the box.
 	METHOD method_27234 infinite ()Lnet/minecraft/class_3341;
-	METHOD method_29299 move (Lnet/minecraft/class_2382;)V
+	METHOD method_29299 move (Lnet/minecraft/class_2382;)Lnet/minecraft/class_3341;
 		ARG 1 vec

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

@@ -43,10 +43,6 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos
 		ARG 1 y
 		ARG 2 z
 	METHOD method_10067 west ()Lnet/minecraft/class_2338;
-	METHOD method_10069 add (III)Lnet/minecraft/class_2338;
-		ARG 1 x
-		ARG 2 y
-		ARG 3 z
 	METHOD method_10070 rotate (Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338;
 		ARG 1 rotation
 	METHOD method_10071 unpackLongY (J)I

mappings/net/minecraft/world/gen/NoiseCaveSampler.mapping

@@ -21,12 +21,11 @@ CLASS net/minecraft/class_5833 net/minecraft/world/gen/NoiseCaveSampler
 		ARG 1 x
 		ARG 2 y
 		ARG 3 z
-	METHOD method_33747 sample (IIIDD)D
+	METHOD method_33747 sample (IIID)D
 		ARG 1 x
 		ARG 2 y
 		ARG 3 z
 		ARG 4 noise
-		ARG 6 offset
 	METHOD method_33748 sample (Lnet/minecraft/class_5216;DDDD)D
 		ARG 0 sampler
 		ARG 1 x

mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping

@@ -55,9 +55,8 @@ CLASS net/minecraft/class_5818 net/minecraft/world/gen/NoiseColumnSampler
 		ARG 7 noiseSizeY
 	METHOD method_33649 ([F)V
 		ARG 0 array
-	METHOD method_33759 sampleNoiseCaves (IIIDD)D
+	METHOD method_33759 sampleNoiseCaves (IIID)D
 		ARG 1 x
 		ARG 2 y
 		ARG 3 z
 		ARG 4 noise
-		ARG 6 offset

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

@@ -53,8 +53,6 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator
 		ARG 5 y
 		ARG 6 z
 		ARG 7 noise
-	METHOD method_33644 swapElements ([Ljava/lang/Object;)V
-		ARG 1 array
 	METHOD method_33754 populateNoise (Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;II)Lnet/minecraft/class_2791;
 		ARG 1 accessor
 		ARG 2 chunk

mappings/net/minecraft/world/gen/decorator/AbstractHeightmapDecorator.mapping

@@ -1,3 +0,0 @@
-CLASS net/minecraft/class_5445 net/minecraft/world/gen/decorator/AbstractHeightmapDecorator
-	METHOD method_30463 getHeightmapType (Lnet/minecraft/class_2998;)Lnet/minecraft/class_2902$class_2903;
-		ARG 1 config

mappings/net/minecraft/world/gen/decorator/MotionBlockingHeightmapDecorator.mapping

@@ -1 +0,0 @@
-CLASS net/minecraft/class_5447 net/minecraft/world/gen/decorator/MotionBlockingHeightmapDecorator

mappings/net/minecraft/world/gen/decorator/TopSolidHeightmapDecorator.mapping

@@ -1 +0,0 @@
-CLASS net/minecraft/class_3318 net/minecraft/world/gen/decorator/TopSolidHeightmapDecorator

mappings/net/minecraft/world/gen/decorator/WorldSurfaceHeightmapDecorator.mapping

@@ -1 +0,0 @@
-CLASS net/minecraft/class_5446 net/minecraft/world/gen/decorator/WorldSurfaceHeightmapDecorator

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

@@ -5,7 +5,6 @@ CLASS net/minecraft/class_5464 net/minecraft/world/gen/feature/ConfiguredFeature
 	FIELD field_29086 GOLD_ORE_TARGETS Lcom/google/common/collect/ImmutableList;
 	FIELD field_29087 DIAMOND_ORE_TARGETS Lcom/google/common/collect/ImmutableList;
 	FIELD field_29088 LAPIS_ORE_TARGETS Lcom/google/common/collect/ImmutableList;
-	FIELD field_29089 COAL_CONFIG Lnet/minecraft/class_3124;
 	FIELD field_29090 IRON_CONFIG Lnet/minecraft/class_3124;
 	FIELD field_29091 REDSTONE_CONFIG Lnet/minecraft/class_3124;
 	METHOD method_30590 register (Ljava/lang/String;Lnet/minecraft/class_2975;)Lnet/minecraft/class_2975;

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

@@ -1,19 +1 @@
 CLASS net/minecraft/class_3044 net/minecraft/world/gen/feature/FossilFeature
-	FIELD field_13610 SKULL_4_COAL Lnet/minecraft/class_2960;
-	FIELD field_13611 SKULL_1 Lnet/minecraft/class_2960;
-	FIELD field_13612 SKULL_3 Lnet/minecraft/class_2960;
-	FIELD field_13613 SKULL_2_COAL Lnet/minecraft/class_2960;
-	FIELD field_13614 SKULL_1_COAL Lnet/minecraft/class_2960;
-	FIELD field_13615 SPINE_2 Lnet/minecraft/class_2960;
-	FIELD field_13616 SPINE_4_COAL Lnet/minecraft/class_2960;
-	FIELD field_13617 FOSSILS [Lnet/minecraft/class_2960;
-	FIELD field_13618 SPINE_2_COAL Lnet/minecraft/class_2960;
-	FIELD field_13619 SPINE_4 Lnet/minecraft/class_2960;
-	FIELD field_13620 SPINE_1_COAL Lnet/minecraft/class_2960;
-	FIELD field_13621 SKULL_2 Lnet/minecraft/class_2960;
-	FIELD field_13622 SKULL_4 Lnet/minecraft/class_2960;
-	FIELD field_13623 SKULL_3_COAL Lnet/minecraft/class_2960;
-	FIELD field_13624 SPINE_1 Lnet/minecraft/class_2960;
-	FIELD field_13625 SPINE_3_COAL Lnet/minecraft/class_2960;
-	FIELD field_13626 COAL_FOSSILS [Lnet/minecraft/class_2960;
-	FIELD field_13627 SPINE_3 Lnet/minecraft/class_2960;

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

@@ -1,11 +1,10 @@
 CLASS net/minecraft/class_3175 net/minecraft/world/gen/feature/SimpleBlockFeatureConfig
 	FIELD field_13805 placeIn Ljava/util/List;
 	FIELD field_13806 placeUnder Ljava/util/List;
-	FIELD field_13807 toPlace Lnet/minecraft/class_2680;
+	FIELD field_13807 toPlace Lnet/minecraft/class_4651;
 	FIELD field_13808 placeOn Ljava/util/List;
 	FIELD field_24909 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Lnet/minecraft/class_2680;Ljava/util/List;Ljava/util/List;Ljava/util/List;)V
+	METHOD <init> (Lnet/minecraft/class_4651;Ljava/util/List;Ljava/util/List;Ljava/util/List;)V
-		ARG 1 toPlace
 		ARG 2 placeOn
 		ARG 3 placeIn
 		ARG 4 placeUnder

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

@@ -1,49 +1,26 @@
 CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig
 	FIELD field_21288 trunkProvider Lnet/minecraft/class_4651;
-	FIELD field_21289 leavesProvider Lnet/minecraft/class_4651;
 	FIELD field_21290 decorators Ljava/util/List;
-	FIELD field_21291 maxWaterDepth I
-	FIELD field_21593 skipFluidCheck Z
 	FIELD field_24135 foliagePlacer Lnet/minecraft/class_4647;
 	FIELD field_24136 trunkPlacer Lnet/minecraft/class_5141;
 	FIELD field_24137 minimumSize Lnet/minecraft/class_5201;
 	FIELD field_24138 ignoreVines Z
-	FIELD field_24139 heightmap Lnet/minecraft/class_2902$class_2903;
 	FIELD field_24921 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5141;Lnet/minecraft/class_5201;Ljava/util/List;IZLnet/minecraft/class_2902$class_2903;)V
+	METHOD <init> (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_4651;Lnet/minecraft/class_5201;Ljava/util/List;ZZ)V
 		ARG 1 trunkProvider
-		ARG 2 leavesProvider
-		ARG 3 foliagePlacer
-		ARG 4 trunkPlacer
-		ARG 5 minimumSize
-		ARG 6 decorators
-		ARG 7 maxWaterDepth
 		ARG 8 ignoreVines
-		ARG 9 heightmap
-	METHOD method_23916 ignoreFluidCheck ()V
 	METHOD method_27373 setTreeDecorators (Ljava/util/List;)Lnet/minecraft/class_4643;
 		ARG 1 decorators
 	CLASS class_4644 Builder
 		FIELD field_21292 trunkProvider Lnet/minecraft/class_4651;
-		FIELD field_21293 leavesProvider Lnet/minecraft/class_4651;
 		FIELD field_21294 decorators Ljava/util/List;
-		FIELD field_21295 maxWaterDepth I
 		FIELD field_24140 foliagePlacer Lnet/minecraft/class_4647;
 		FIELD field_24141 trunkPlacer Lnet/minecraft/class_5141;
 		FIELD field_24142 minimumSize Lnet/minecraft/class_5201;
 		FIELD field_24143 ignoreVines Z
-		FIELD field_24144 heightmap Lnet/minecraft/class_2902$class_2903;
+		METHOD <init> (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5201;)V
-		METHOD <init> (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5141;Lnet/minecraft/class_5201;)V
-			ARG 1 trunkProvider
-			ARG 2 leavesProvider
-			ARG 3 foliagePlacer
-			ARG 4 trunkPlacer
 			ARG 5 minimumSize
 		METHOD method_23445 build ()Lnet/minecraft/class_4643;
-		METHOD method_23446 maxWaterDepth (I)Lnet/minecraft/class_4643$class_4644;
-			ARG 1 maxWaterDepth
 		METHOD method_27374 ignoreVines ()Lnet/minecraft/class_4643$class_4644;
-		METHOD method_27375 heightmap (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_4643$class_4644;
-			ARG 1 heightmap
 		METHOD method_27376 decorators (Ljava/util/List;)Lnet/minecraft/class_4643$class_4644;
 			ARG 1 decorators

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

@@ -1,2 +1 @@
 CLASS net/minecraft/class_3219 net/minecraft/world/gen/feature/VinesFeature
-	FIELD field_17396 DIRECTIONS [Lnet/minecraft/class_2350;

mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping

@@ -19,15 +19,10 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer
 		ARG 10 box
 	METHOD method_23449 generateSquare (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;ILjava/util/Set;IZLnet/minecraft/class_3341;)V
 		COMMENT Generates a square of leaves with the given radius. Sub-classes can use the method {@code isInvalidForLeaves} to exclude certain positions, such as corners.
-		ARG 1 world
-		ARG 2 random
-		ARG 3 config
 		ARG 4 pos
 		ARG 5 radius
-		ARG 6 leaves
 		ARG 7 y
 		ARG 8 giantTrunk
-		ARG 9 box
 	METHOD method_23451 isInvalidForLeaves (Ljava/util/Random;IIIIZ)Z
 		COMMENT Used to exclude certain positions such as corners when creating a square of leaves.
 		ARG 1 random

mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping

@@ -18,9 +18,7 @@ CLASS net/minecraft/class_5141 net/minecraft/world/gen/trunk/TrunkPlacer
 		ARG 7 config
 	METHOD method_26993 getHeight (Ljava/util/Random;)I
 		ARG 1 random
-	METHOD method_27400 setToDirt (Lnet/minecraft/class_3747;Lnet/minecraft/class_2338;)V
+	METHOD method_27400 setToDirt (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;)V
-		ARG 0 world
-		ARG 1 pos
 	METHOD method_27401 trySetState (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)V
 		ARG 0 world
 		ARG 1 random