21w13a

build.gradle

@@ -27,7 +27,7 @@ plugins {
 	id 'org.cadixdev.licenser' version '0.5.1'
 }
 
-def minecraft_version = "21w11a"
+def minecraft_version = "21w13a"
 
 def ENV = System.getenv()
 // Fetch build number from Github Actions

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

@@ -1,264 +1,95 @@
-CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
+CLASS com/mojang/blaze3d/platform/GlStateManager
-	FIELD field_20472 BLEND Lnet/minecraft/class_4493$class_1017;
+	FIELD SCISSOR SCISSOR_TEST Lcom/mojang/blaze3d/platform/GlStateManager$class_5518;
-	FIELD field_20473 DEPTH Lnet/minecraft/class_4493$class_1026;
+	METHOD _activeTexture activeTexture (I)V
-	FIELD field_20475 CULL Lnet/minecraft/class_4493$class_1025;
+		ARG 0 texture
-	FIELD field_20476 POLY_OFFSET Lnet/minecraft/class_4493$class_1031;
+	METHOD _bindTexture bindTexture (I)V
-	FIELD field_20477 COLOR_LOGIC Lnet/minecraft/class_4493$class_1021;
+		ARG 0 texture
-	FIELD field_20480 STENCIL Lnet/minecraft/class_4493$class_1035;
+	METHOD _blendEquation blendEquation (I)V
-	FIELD field_20482 activeTexture I
+		ARG 0 mode
-	FIELD field_20483 TEXTURES [Lnet/minecraft/class_4493$class_1039;
+	METHOD _blendFunc blendFunc (II)V
-	FIELD field_20486 COLOR_MASK Lnet/minecraft/class_4493$class_1022;
+		ARG 0 srcFactor
-	FIELD field_26839 SCISSOR_TEST Lnet/minecraft/class_4493$class_5518;
+		ARG 1 dstFactor
-	METHOD method_21906 enableColorLogicOp ()V
+	METHOD _blendFuncSeparate blendFuncSeparate (IIII)V
-	METHOD method_21908 disableColorLogicOp ()V
-	METHOD method_21912 disableTexture ()V
-	METHOD method_21914 genTextures ()I
-	METHOD method_21921 getString (I)Ljava/lang/String;
-		ARG 0 name
-	METHOD method_21923 getInteger (I)I
-		ARG 0 pname
-	METHOD method_21934 getError ()I
-	METHOD method_21936 clearDepth (D)V
-		ARG 0 depth
-	METHOD method_21941 polygonOffset (FF)V
-		ARG 0 factor
-		ARG 1 units
-	METHOD method_21943 clearColor (FFFF)V
-		ARG 0 red
-		ARG 1 green
-		ARG 2 blue
-		ARG 3 alpha
-	METHOD method_21950 blendFuncSeparate (IIII)V
 		ARG 0 srcFactorRGB
 		ARG 1 dstFactorRGB
 		ARG 2 srcFactorAlpha
 		ARG 3 dstFactorAlpha
-	METHOD method_21951 framebufferTexture2D (IIIII)V
+	METHOD _clear clear (IZ)V
-		ARG 0 target
+		ARG 0 mask
-		ARG 1 attachment
+		ARG 1 getError
-		ARG 2 textureTarget
+	METHOD _clearColor clearColor (FFFF)V
-		ARG 3 texture
+		ARG 0 red
-		ARG 4 level
+		ARG 1 green
-	METHOD method_21953 texSubImage2D (IIIIIIIIJ)V
+		ARG 2 blue
-		ARG 0 target
+		ARG 3 alpha
-		ARG 1 level
+	METHOD _clearDepth clearDepth (D)V
-		ARG 2 offsetX
+		ARG 0 depth
-		ARG 3 offsetY
+	METHOD _clearStencil clearStencil (I)V
-		ARG 4 width
+		ARG 0 stencil
-		ARG 5 height
+	METHOD _colorMask colorMask (ZZZZ)V
-		ARG 6 format
+		ARG 0 red
-		ARG 7 type
+		ARG 1 green
-		ARG 8 pixels
+		ARG 2 blue
-	METHOD method_21954 texImage2D (IIIIIIIILjava/nio/IntBuffer;)V
+		ARG 3 alpha
-		ARG 0 target
+	METHOD _deleteTexture deleteTexture (I)V
-		ARG 1 level
+		ARG 0 texture
-		ARG 2 internalFormat
+	METHOD _deleteTextures deleteTextures ([I)V
-		ARG 3 width
+	METHOD _depthFunc depthFunc (I)V
-		ARG 4 height
+		ARG 0 func
-		ARG 5 border
+	METHOD _depthMask depthMask (Z)V
-		ARG 6 format
+		ARG 0 mask
-		ARG 7 type
+	METHOD _disableBlend disableBlend ()V
-		ARG 8 pixels
+	METHOD _disableColorLogicOp disableColorLogicOp ()V
-	METHOD method_21956 readPixels (IIIIIILjava/nio/ByteBuffer;)V
+	METHOD _disableCull disableCull ()V
-		ARG 0 x
+	METHOD _disableDepthTest disableDepthTest ()V
-		ARG 1 y
+	METHOD _disablePolygonOffset disablePolygonOffset ()V
-		ARG 2 width
+	METHOD _disableScissorTest disableScissorTest ()V
-		ARG 3 height
+	METHOD _disableTexture disableTexture ()V
-		ARG 4 format
+	METHOD _disableVertexAttribArray disableVertexAttribArray (I)V
-		ARG 5 type
+		ARG 0 index
-		ARG 6 pixels
+	METHOD _drawElements drawElements (IIIJ)V
-	METHOD method_21957 getTexImage (IIIIJ)V
+		ARG 0 mode
+		ARG 1 first
+		ARG 2 type
+		ARG 3 indices
+	METHOD _enableBlend enableBlend ()V
+	METHOD _enableColorLogicOp enableColorLogicOp ()V
+	METHOD _enableCull enableCull ()V
+	METHOD _enableDepthTest enableDepthTest ()V
+	METHOD _enablePolygonOffset enablePolygonOffset ()V
+	METHOD _enableScissorTest enableScissorTest ()V
+	METHOD _enableVertexAttribArray enableVertexAttribArray (I)V
+		ARG 0 index
+	METHOD _genTexture genTextures ()I
+	METHOD _genTextures genTextures ([I)V
+	METHOD _getError getError ()I
+	METHOD _getInteger getInteger (I)I
+		ARG 0 pname
+	METHOD _getString getString (I)Ljava/lang/String;
+		ARG 0 name
+	METHOD _getTexImage getTexImage (IIIIJ)V
 		ARG 0 target
 		ARG 1 level
 		ARG 2 format
 		ARG 3 type
 		ARG 4 pixels
-	METHOD method_21962 bufferData (ILjava/nio/ByteBuffer;I)V
+	METHOD _getTexLevelParameter getTexLevelParameter (III)I
-		ARG 0 target
-		ARG 1 data
-		ARG 2 usage
-	METHOD method_21964 uniform1 (ILjava/nio/IntBuffer;)V
-		ARG 0 location
-		ARG 1 value
-	METHOD method_21965 clear (IZ)V
-		ARG 0 mask
-		ARG 1 getError
-	METHOD method_21966 uniformMatrix2 (IZLjava/nio/FloatBuffer;)V
-		ARG 0 location
-		ARG 1 transpose
-		ARG 2 value
-	METHOD method_21974 depthMask (Z)V
-		ARG 0 mask
-	METHOD method_21975 colorMask (ZZZZ)V
-		ARG 0 red
-		ARG 1 green
-		ARG 2 blue
-		ARG 3 alpha
-	METHOD method_21984 blendFunc (II)V
-		ARG 0 srcFactor
-		ARG 1 dstFactor
-	METHOD method_21985 texParameter (IIF)V
-		ARG 0 target
-		ARG 1 pname
-		ARG 2 param
-	METHOD method_21986 texParameter (III)V
-		ARG 0 target
-		ARG 1 pname
-		ARG 2 param
-	METHOD method_21990 getUniformLocation (ILjava/lang/CharSequence;)I
-		ARG 0 program
-		ARG 1 name
-	METHOD method_21991 uniform1 (ILjava/nio/FloatBuffer;)V
-		ARG 0 location
-		ARG 1 value
-	METHOD method_21992 uniform2 (ILjava/nio/IntBuffer;)V
-		ARG 0 location
-		ARG 1 value
-	METHOD method_21993 uniformMatrix3 (IZLjava/nio/FloatBuffer;)V
-		ARG 0 location
-		ARG 1 transpose
-		ARG 2 value
-	METHOD method_22001 depthFunc (I)V
-		ARG 0 func
-	METHOD method_22002 getProgram (II)I
-		ARG 0 program
-		ARG 1 pname
-	METHOD method_22003 getTexLevelParameter (III)I
 		ARG 0 target
 		ARG 1 level
 		ARG 2 pname
-	METHOD method_22006 getAttribLocation (ILjava/lang/CharSequence;)I
+	METHOD _glBindAttribLocation bindAttribLocation (IILjava/lang/CharSequence;)V
 		ARG 0 program
-		ARG 1 name
+		ARG 1 index
-	METHOD method_22007 uniform2 (ILjava/nio/FloatBuffer;)V
+		ARG 2 name
-		ARG 0 location
+	METHOD _glBindBuffer bindBuffer (II)V
-		ARG 1 value
-	METHOD method_22008 uniform3 (ILjava/nio/IntBuffer;)V
-		ARG 0 location
-		ARG 1 value
-	METHOD method_22009 uniformMatrix4 (IZLjava/nio/FloatBuffer;)V
-		ARG 0 location
-		ARG 1 transpose
-		ARG 2 value
-	METHOD method_22015 blendEquation (I)V
-		ARG 0 mode
-	METHOD method_22016 attachShader (II)V
-		ARG 0 program
-		ARG 1 shader
-	METHOD method_22017 stencilFunc (III)V
-		ARG 0 func
-		ARG 1 ref
-		ARG 2 mask
-	METHOD method_22018 blendFuncSeparateUntracked (IIII)V
-		ARG 0 srcFactorRGB
-		ARG 1 dstFactorRGB
-		ARG 2 srcFactorAlpha
-		ARG 3 dstFactorAlpha
-	METHOD method_22019 uniform3 (ILjava/nio/FloatBuffer;)V
-		ARG 0 location
-		ARG 1 value
-	METHOD method_22020 uniform4 (ILjava/nio/IntBuffer;)V
-		ARG 0 location
-		ARG 1 value
-	METHOD method_22023 getShader (II)I
-		ARG 0 shader
-		ARG 1 pname
-	METHOD method_22024 stencilOp (III)V
-		ARG 0 sfail
-		ARG 1 dpfail
-		ARG 2 dppass
-	METHOD method_22025 viewport (IIII)V
-		ARG 0 x
-		ARG 1 y
-		ARG 2 width
-		ARG 3 height
-	METHOD method_22026 uniform4 (ILjava/nio/FloatBuffer;)V
-		ARG 0 location
-		ARG 1 value
-	METHOD method_22029 deleteShader (I)V
-		ARG 0 shader
-	METHOD method_22030 uniform1 (II)V
-		ARG 0 location
-		ARG 1 value
-	METHOD method_22035 createShader (I)I
-		ARG 0 type
-	METHOD method_22036 bindBuffer (II)V
 		ARG 0 target
 		ARG 1 buffer
-	METHOD method_22037 drawElements (IIIJ)V
+	METHOD _glBindFramebuffer bindFramebuffer (II)V
-		ARG 0 mode
-		ARG 1 first
-		ARG 2 type
-		ARG 3 indices
-	METHOD method_22041 compileShader (I)V
-		ARG 0 shader
-	METHOD method_22042 bindFramebuffer (II)V
 		ARG 0 target
 		ARG 1 framebuffer
-	METHOD method_22045 useProgram (I)V
+	METHOD _glBindVertexArray bindVertexArray (I)V
-		ARG 0 program
+		ARG 0 array
-	METHOD method_22047 disableDepthTest ()V
+	METHOD _glBlitFrameBuffer blitFramebuffer (IIIIIIIIII)V
-	METHOD method_22048 deleteProgram (I)V
-		ARG 0 program
-	METHOD method_22049 getShaderInfoLog (II)Ljava/lang/String;
-		ARG 0 shader
-		ARG 1 maxLength
-	METHOD method_22050 enableDepthTest ()V
-	METHOD method_22051 linkProgram (I)V
-		ARG 0 program
-	METHOD method_22052 getProgramInfoLog (II)Ljava/lang/String;
-		ARG 0 program
-		ARG 1 maxLength
-	METHOD method_22053 disableBlend ()V
-	METHOD method_22054 deleteBuffer (I)V
-		ARG 0 buffer
-	METHOD method_22056 enableBlend ()V
-	METHOD method_22058 polygonMode (II)V
-		ARG 0 face
-		ARG 1 mode
-	METHOD method_22060 deleteFramebuffer (I)V
-		ARG 0 framebuffer
-	METHOD method_22062 createProgram ()I
-	METHOD method_22063 checkFramebufferStatus (I)I
-		ARG 0 target
-	METHOD method_22065 genBuffer ()I
-	METHOD method_22066 activeTextureUntracked (I)V
-		ARG 0 texture
-	METHOD method_22067 pixelStore (II)V
-		ARG 0 pname
-		ARG 1 param
-	METHOD method_22068 genFramebuffer ()I
-	METHOD method_22075 logicOp (I)V
-		ARG 0 op
-	METHOD method_22076 enableCull ()V
-	METHOD method_22077 activeTexture (I)V
-		ARG 0 texture
-	METHOD method_22078 disableCull ()V
-	METHOD method_22079 deleteTexture (I)V
-		ARG 0 texture
-	METHOD method_22080 enablePolygonOffset ()V
-	METHOD method_22081 bindTexture (I)V
-		ARG 0 texture
-	METHOD method_22082 disablePolygonOffset ()V
-	METHOD method_22085 stencilMask (I)V
-		ARG 0 mask
-	METHOD method_22087 clearStencil (I)V
-		ARG 0 stencil
-	METHOD method_22606 enableVertexAttribArray (I)V
-		ARG 0 index
-	METHOD method_22607 disableVertexAttribArray (I)V
-		ARG 0 index
-	METHOD method_22609 vertexAttribPointer (IIIZIJ)V
-		ARG 0 index
-		ARG 1 size
-		ARG 2 type
-		ARG 3 normalized
-		ARG 4 stride
-		ARG 5 pointer
-	METHOD method_22616 setupLevelDiffuseLighting (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;Lnet/minecraft/class_1159;)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_29332 blitFramebuffer (IIIIIIIIII)V
 		ARG 0 srcX0
 		ARG 1 srcY0
 		ARG 2 srcX1
@@ -269,44 +100,202 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 		ARG 7 dstY1
 		ARG 8 mask
 		ARG 9 filter
-	METHOD method_30498 genTextures ([I)V
+	METHOD _glBufferData bufferData (IJI)V
-	METHOD method_30499 deleteTextures ([I)V
+		ARG 0 target
-	METHOD method_31317 scissor (IIII)V
+		ARG 1 size
+		ARG 3 usage
+	METHOD _glBufferData bufferData (ILjava/nio/ByteBuffer;I)V
+		ARG 0 target
+		ARG 1 data
+		ARG 2 usage
+	METHOD _glDeleteBuffers deleteBuffer (I)V
+		ARG 0 buffer
+	METHOD _glDeleteFramebuffers deleteFramebuffer (I)V
+		ARG 0 framebuffer
+	METHOD _glDeleteVertexArrays deleteVertexArray (I)V
+		ARG 0 array
+	METHOD _glFramebufferTexture2D framebufferTexture2D (IIIII)V
+		ARG 0 target
+		ARG 1 attachment
+		ARG 2 textureTarget
+		ARG 3 texture
+		ARG 4 level
+	METHOD _glGenBuffers genBuffer ()I
+	METHOD _glGenVertexArrays genVertexArray ()I
+	METHOD _glGetAttribLocation getAttribLocation (ILjava/lang/CharSequence;)I
+		ARG 0 program
+		ARG 1 name
+	METHOD _glGetUniformLocation getUniformLocation (ILjava/lang/CharSequence;)I
+		ARG 0 program
+		ARG 1 name
+	METHOD _glMapBuffer mapBuffer (II)Ljava/nio/ByteBuffer;
+		ARG 0 target
+		ARG 1 access
+	METHOD _glUniform1 uniform1 (ILjava/nio/FloatBuffer;)V
+		ARG 0 location
+		ARG 1 value
+	METHOD _glUniform1 uniform1 (ILjava/nio/IntBuffer;)V
+		ARG 0 location
+		ARG 1 value
+	METHOD _glUniform1i uniform1 (II)V
+		ARG 0 location
+		ARG 1 value
+	METHOD _glUniform2 uniform2 (ILjava/nio/FloatBuffer;)V
+		ARG 0 location
+		ARG 1 value
+	METHOD _glUniform2 uniform2 (ILjava/nio/IntBuffer;)V
+		ARG 0 location
+		ARG 1 value
+	METHOD _glUniform3 uniform3 (ILjava/nio/FloatBuffer;)V
+		ARG 0 location
+		ARG 1 value
+	METHOD _glUniform3 uniform3 (ILjava/nio/IntBuffer;)V
+		ARG 0 location
+		ARG 1 value
+	METHOD _glUniform4 uniform4 (ILjava/nio/FloatBuffer;)V
+		ARG 0 location
+		ARG 1 value
+	METHOD _glUniform4 uniform4 (ILjava/nio/IntBuffer;)V
+		ARG 0 location
+		ARG 1 value
+	METHOD _glUniformMatrix2 uniformMatrix2 (IZLjava/nio/FloatBuffer;)V
+		ARG 0 location
+		ARG 1 transpose
+		ARG 2 value
+	METHOD _glUniformMatrix3 uniformMatrix3 (IZLjava/nio/FloatBuffer;)V
+		ARG 0 location
+		ARG 1 transpose
+		ARG 2 value
+	METHOD _glUniformMatrix4 uniformMatrix4 (IZLjava/nio/FloatBuffer;)V
+		ARG 0 location
+		ARG 1 transpose
+		ARG 2 value
+	METHOD _glUnmapBuffer unmapBuffer (I)V
+		ARG 0 target
+	METHOD _glUseProgram useProgram (I)V
+		ARG 0 program
+	METHOD _logicOp logicOp (I)V
+		ARG 0 op
+	METHOD _pixelStore pixelStore (II)V
+		ARG 0 pname
+		ARG 1 param
+	METHOD _polygonMode polygonMode (II)V
+		ARG 0 face
+		ARG 1 mode
+	METHOD _polygonOffset polygonOffset (FF)V
+		ARG 0 factor
+		ARG 1 units
+	METHOD _readPixels readPixels (IIIIIILjava/nio/ByteBuffer;)V
 		ARG 0 x
 		ARG 1 y
 		ARG 2 width
 		ARG 3 height
-	METHOD method_31318 disableScissorTest ()V
+		ARG 4 format
-	METHOD method_31319 enableScissorTest ()V
+		ARG 5 type
-	METHOD method_31945 bufferData (IJI)V
+		ARG 6 pixels
+	METHOD _scissorBox scissor (IIII)V
+		ARG 0 x
+		ARG 1 y
+		ARG 2 width
+		ARG 3 height
+	METHOD _stencilFunc stencilFunc (III)V
+		ARG 0 func
+		ARG 1 ref
+		ARG 2 mask
+	METHOD _stencilMask stencilMask (I)V
+		ARG 0 mask
+	METHOD _stencilOp stencilOp (III)V
+		ARG 0 sfail
+		ARG 1 dpfail
+		ARG 2 dppass
+	METHOD _texImage2D texImage2D (IIIIIIIILjava/nio/IntBuffer;)V
 		ARG 0 target
-		ARG 1 size
+		ARG 1 level
-		ARG 3 usage
+		ARG 2 internalFormat
-	METHOD method_31946 mapBuffer (II)Ljava/nio/ByteBuffer;
+		ARG 3 width
+		ARG 4 height
+		ARG 5 border
+		ARG 6 format
+		ARG 7 type
+		ARG 8 pixels
+	METHOD _texParameter texParameter (IIF)V
 		ARG 0 target
-		ARG 1 access
+		ARG 1 pname
-	METHOD method_31947 unmapBuffer (I)V
+		ARG 2 param
+	METHOD _texParameter texParameter (III)V
 		ARG 0 target
-	METHOD method_34404 bindAttribLocation (IILjava/lang/CharSequence;)V
+		ARG 1 pname
-		ARG 0 program
+		ARG 2 param
-		ARG 1 index
+	METHOD _texSubImage2D texSubImage2D (IIIIIIIIJ)V
-		ARG 2 name
+		ARG 0 target
-	METHOD method_34405 shaderSource (ILjava/util/List;)V
+		ARG 1 level
-		ARG 0 shader
+		ARG 2 offsetX
-		ARG 1 strings
+		ARG 3 offsetY
-	METHOD method_34406 vertexAttribIPointer (IIIIJ)V
+		ARG 4 width
+		ARG 5 height
+		ARG 6 format
+		ARG 7 type
+		ARG 8 pixels
+	METHOD _vertexAttribIPointer vertexAttribIPointer (IIIIJ)V
 		ARG 0 index
 		ARG 1 size
 		ARG 2 type
 		ARG 3 stride
 		ARG 4 pointer
-	METHOD method_34407 genVertexArray ()I
+	METHOD _vertexAttribPointer vertexAttribPointer (IIIZIJ)V
-	METHOD method_34408 bindVertexArray (I)V
+		ARG 0 index
-		ARG 0 array
+		ARG 1 size
-	METHOD method_34409 deleteVertexArray (I)V
+		ARG 2 type
-		ARG 0 array
+		ARG 3 normalized
+		ARG 4 stride
+		ARG 5 pointer
+	METHOD _viewport viewport (IIII)V
+		ARG 0 x
+		ARG 1 y
+		ARG 2 width
+		ARG 3 height
+	METHOD glActiveTexture activeTextureUntracked (I)V
+		ARG 0 texture
+	METHOD glAttachShader attachShader (II)V
+		ARG 0 program
+		ARG 1 shader
+	METHOD glBlendFuncSeparate blendFuncSeparateUntracked (IIII)V
+		ARG 0 srcFactorRGB
+		ARG 1 dstFactorRGB
+		ARG 2 srcFactorAlpha
+		ARG 3 dstFactorAlpha
+	METHOD glCheckFramebufferStatus checkFramebufferStatus (I)I
+		ARG 0 target
+	METHOD glCompileShader compileShader (I)V
+		ARG 0 shader
+	METHOD glCreateProgram createProgram ()I
+	METHOD glCreateShader createShader (I)I
+		ARG 0 type
+	METHOD glDeleteProgram deleteProgram (I)V
+		ARG 0 program
+	METHOD glDeleteShader deleteShader (I)V
+		ARG 0 shader
+	METHOD glGenFramebuffers genFramebuffer ()I
+	METHOD glGetProgramInfoLog getProgramInfoLog (II)Ljava/lang/String;
+		ARG 0 program
+		ARG 1 maxLength
+	METHOD glGetProgrami getProgram (II)I
+		ARG 0 program
+		ARG 1 pname
+	METHOD glGetShaderInfoLog getShaderInfoLog (II)Ljava/lang/String;
+		ARG 0 shader
+		ARG 1 maxLength
+	METHOD glGetShaderi getShader (II)I
+		ARG 0 shader
+		ARG 1 pname
+	METHOD glLinkProgram linkProgram (I)V
+		ARG 0 program
+	METHOD glShaderSource shaderSource (ILjava/util/List;)V
+		ARG 0 shader
+		ARG 1 strings
+	METHOD setupGui3DDiffuseLighting setupGui3dDiffuseLighting (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;)V
 	CLASS class_1017 BlendFuncState
-		FIELD field_5045 capState Lnet/minecraft/class_4493$class_1018;
+		FIELD field_5045 capState Lcom/mojang/blaze3d/platform/GlStateManager$class_1018;
 		FIELD field_5046 dstFactorAlpha I
 		FIELD field_5047 srcFactorAlpha I
 		FIELD field_5048 dstFactorRGB I
@@ -321,7 +310,7 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 			ARG 1 state
 		METHOD method_4471 enable ()V
 	CLASS class_1021 LogicOpState
-		FIELD field_5058 capState Lnet/minecraft/class_4493$class_1018;
+		FIELD field_5058 capState Lcom/mojang/blaze3d/platform/GlStateManager$class_1018;
 		FIELD field_5059 op I
 	CLASS class_1022 ColorMask
 		FIELD field_5060 alpha Z
@@ -329,25 +318,25 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 		FIELD field_5062 green Z
 		FIELD field_5063 red Z
 	CLASS class_1025 CullFaceState
-		FIELD field_5072 capState Lnet/minecraft/class_4493$class_1018;
+		FIELD field_5072 capState Lcom/mojang/blaze3d/platform/GlStateManager$class_1018;
 		FIELD field_5073 mode I
 	CLASS class_1026 DepthTestState
-		FIELD field_5074 capState Lnet/minecraft/class_4493$class_1018;
+		FIELD field_5074 capState Lcom/mojang/blaze3d/platform/GlStateManager$class_1018;
 		FIELD field_5075 func I
 		FIELD field_5076 mask Z
 	CLASS class_1030 LogicOp
 		FIELD field_5108 value I
 	CLASS class_1031 PolygonOffsetState
-		FIELD field_5121 capLine Lnet/minecraft/class_4493$class_1018;
+		FIELD field_5121 capLine Lcom/mojang/blaze3d/platform/GlStateManager$class_1018;
 		FIELD field_5122 units F
-		FIELD field_5123 capFill Lnet/minecraft/class_4493$class_1018;
+		FIELD field_5123 capFill Lcom/mojang/blaze3d/platform/GlStateManager$class_1018;
 		FIELD field_5124 factor F
 	CLASS class_1034 StencilSubState
 		FIELD field_16203 ref I
 		FIELD field_5147 mask I
 		FIELD field_5148 func I
 	CLASS class_1035 StencilState
-		FIELD field_5149 subState Lnet/minecraft/class_4493$class_1034;
+		FIELD field_5149 subState Lcom/mojang/blaze3d/platform/GlStateManager$class_1034;
 		FIELD field_5150 dppass I
 		FIELD field_5151 dpfail I
 		FIELD field_5152 sfail I
@@ -363,4 +352,4 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager
 	CLASS class_4534 DstFactor
 	CLASS class_4535 SrcFactor
 	CLASS class_5518 ScissorTestState
-		FIELD field_26840 capState Lnet/minecraft/class_4493$class_1018;
+		FIELD field_26840 capState Lcom/mojang/blaze3d/platform/GlStateManager$class_1018;

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

@@ -10,7 +10,7 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 	METHOD blendFunc (II)V
 		ARG 0 srcFactor
 		ARG 1 dstFactor
-	METHOD blendFunc (Lnet/minecraft/class_4493$class_4535;Lnet/minecraft/class_4493$class_4534;)V
+	METHOD blendFunc (Lcom/mojang/blaze3d/platform/GlStateManager$class_4535;Lcom/mojang/blaze3d/platform/GlStateManager$class_4534;)V
 		ARG 0 srcFactor
 		ARG 1 dstFactor
 	METHOD blendFuncSeparate (IIII)V
@@ -18,7 +18,7 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 		ARG 1 dstFactorRGB
 		ARG 2 srcFactorAlpha
 		ARG 3 dstFactorAlpha
-	METHOD blendFuncSeparate (Lnet/minecraft/class_4493$class_4535;Lnet/minecraft/class_4493$class_4534;Lnet/minecraft/class_4493$class_4535;Lnet/minecraft/class_4493$class_4534;)V
+	METHOD blendFuncSeparate (Lcom/mojang/blaze3d/platform/GlStateManager$class_4535;Lcom/mojang/blaze3d/platform/GlStateManager$class_4534;Lcom/mojang/blaze3d/platform/GlStateManager$class_4535;Lcom/mojang/blaze3d/platform/GlStateManager$class_4534;)V
 		ARG 0 srcFactor
 		ARG 1 dstFactor
 		ARG 2 srcAlpha
@@ -109,7 +109,7 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 		ARG 0 fps
 	METHOD lineWidth (F)V
 		ARG 0 width
-	METHOD logicOp (Lnet/minecraft/class_4493$class_1030;)V
+	METHOD logicOp (Lcom/mojang/blaze3d/platform/GlStateManager$class_1030;)V
 		ARG 0 op
 	METHOD pixelStore (II)V
 		ARG 0 pname

mappings/net/minecraft/block/AbstractCauldronBlock.mapping

@@ -18,3 +18,4 @@ CLASS net/minecraft/class_2275 net/minecraft/block/AbstractCauldronBlock
 		ARG 4 fluid
 	METHOD method_32765 canBeFilledByDripstone (Lnet/minecraft/class_3611;)Z
 		ARG 1 fluid
+	METHOD method_32766 isFull (Lnet/minecraft/class_2680;)Z

mappings/net/minecraft/block/BigDripleafBlock.mapping

@@ -36,10 +36,6 @@ CLASS net/minecraft/class_5801 net/minecraft/block/BigDripleafBlock
 		ARG 2 pos
 	METHOD method_33611 getShapeForState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265;
 		ARG 0 state
-	METHOD method_33612 getShapeForStateDirection (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265;
-		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_5539;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z
 		ARG 0 world
 		ARG 1 pos

mappings/net/minecraft/block/LeveledCauldronBlock.mapping

@@ -15,5 +15,3 @@ CLASS net/minecraft/class_5556 net/minecraft/block/LeveledCauldronBlock
 		ARG 0 precipitation
 	METHOD method_32353 (Lnet/minecraft/class_1959$class_1963;)Z
 		ARG 0 precipitation
-	METHOD method_32766 isFull (Lnet/minecraft/class_2680;)Z
-		ARG 1 state

mappings/net/minecraft/block/OreBlock.mapping

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_2431 net/minecraft/block/OreBlock
-	FIELD field_27195 experienceDropped Lnet/minecraft/class_4801;
+	FIELD field_27195 experienceDropped Lnet/minecraft/class_6019;
-	METHOD <init> (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_4801;)V
+	METHOD <init> (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_6019;)V
 		ARG 1 settings
 		ARG 2 experienceDropped

mappings/net/minecraft/block/PointedDripstoneBlock.mapping

@@ -80,8 +80,6 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 range
-	METHOD method_32901 getFluidBlockState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680;
-		ARG 0 state
 	METHOD method_33270 (FLnet/minecraft/class_3611;)Z
 		ARG 1 fluid
 	METHOD method_33271 getDripFluid (Lnet/minecraft/class_1937;Lnet/minecraft/class_3611;)Lnet/minecraft/class_3611;

mappings/net/minecraft/class_6025.mapping

@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_6025
+	METHOD method_6139 getOwnerUuid ()Ljava/util/UUID;

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

@@ -1,4 +1,5 @@
 CLASS net/minecraft/class_379 net/minecraft/client/font/Glyph
+	METHOD method_15976 getAscent ()F
 	METHOD method_16797 getBearingX ()F
 	METHOD method_16798 getAdvance (Z)F
 		ARG 1 bold

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

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_383 net/minecraft/client/font/RenderableGlyph
-	METHOD method_15976 getAscent ()F
 	METHOD method_2027 getXMax ()F
 	METHOD method_2028 getYMin ()F
 	METHOD method_2029 getYMax ()F

mappings/net/minecraft/client/gui/screen/SplashScreen.mapping

@@ -7,8 +7,7 @@ CLASS net/minecraft/class_425 net/minecraft/client/gui/screen/SplashScreen
 	FIELD field_18219 reloading Z
 	FIELD field_18220 reloadStartTime J
 	FIELD field_2483 LOGO Lnet/minecraft/class_2960;
-	FIELD field_25041 BRAND_ARGB I
+	FIELD field_25041 BRAND_ARGB Ljava/util/function/IntSupplier;
-	FIELD field_25042 BRAND_RGB I
 	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_4011;Ljava/util/function/Consumer;Z)V
 		ARG 1 client
 		ARG 2 monitor

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

@@ -3,7 +3,6 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre
 	FIELD field_25268 titleY I
 	FIELD field_25269 playerInventoryTitleX I
 	FIELD field_25270 playerInventoryTitleY I
-	FIELD field_2776 x I
 	FIELD field_2777 touchDragSlotStart Lnet/minecraft/class_1735;
 	FIELD field_2778 heldButtonCode I
 	FIELD field_2779 backgroundHeight I
@@ -27,7 +26,6 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre
 	FIELD field_2797 handler Lnet/minecraft/class_1703;
 	FIELD field_2798 cancelNextRelease Z
 	FIELD field_2799 lastClickedSlot Lnet/minecraft/class_1735;
-	FIELD field_2800 y I
 	FIELD field_2801 BACKGROUND_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_2802 touchDropOriginSlot Lnet/minecraft/class_1735;
 	FIELD field_2803 draggedStackRemainder I

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

@@ -1,8 +0,0 @@
-CLASS net/minecraft/class_651 net/minecraft/client/particle/BarrierParticle
-	METHOD <init> (Lnet/minecraft/class_638;DDDLnet/minecraft/class_1935;)V
-		ARG 1 world
-		ARG 2 x
-		ARG 4 y
-		ARG 6 z
-		ARG 8 item
-	CLASS class_652 Factory

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

@@ -4,8 +4,3 @@ CLASS net/minecraft/class_4585 net/minecraft/client/render/FixedColorVertexConsu
 	FIELD field_20891 fixedGreen I
 	FIELD field_20892 fixedBlue I
 	FIELD field_20893 fixedAlpha I
-	METHOD method_22901 fixedColor (IIII)V
-		ARG 1 red
-		ARG 2 green
-		ARG 3 blue
-		ARG 4 alpha

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

@@ -16,8 +16,6 @@ CLASS net/minecraft/class_330 net/minecraft/client/render/MapRenderer
 		ARG 4 state
 		ARG 5 hidePlayerIcons
 		ARG 6 light
-	METHOD method_32599 getMapTextureFromId (I)Lnet/minecraft/class_22;
-		ARG 1 id
 	METHOD method_32601 getMapTexture (ILnet/minecraft/class_22;)Lnet/minecraft/class_330$class_331;
 		ARG 1 id
 		ARG 2 state

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

@@ -6,6 +6,7 @@ CLASS net/minecraft/class_4588 net/minecraft/client/render/VertexConsumer
 		ARG 3 blue
 		ARG 4 alpha
 	METHOD method_1344 next ()V
+	METHOD method_22901 fixedColor (IIII)V
 	METHOD method_22912 vertex (DDD)Lnet/minecraft/class_4588;
 		ARG 1 x
 		ARG 3 y

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

@@ -3,7 +3,6 @@ CLASS net/minecraft/class_296 net/minecraft/client/render/VertexFormatElement
 	FIELD field_1613 index I
 	FIELD field_1614 type Lnet/minecraft/class_296$class_298;
 	FIELD field_1615 format Lnet/minecraft/class_296$class_297;
-	FIELD field_1616 LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD field_21329 size I
 	METHOD <init> (ILnet/minecraft/class_296$class_297;Lnet/minecraft/class_296$class_298;I)V
 		ARG 1 index

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

@@ -3,9 +3,8 @@ CLASS net/minecraft/class_840 net/minecraft/client/render/block/entity/EndPortal
 	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;FLnet/minecraft/class_1159;Lnet/minecraft/class_4588;)V
+	METHOD method_23084 renderSides (Lnet/minecraft/class_2640;Lnet/minecraft/class_1159;Lnet/minecraft/class_4588;)V
 		ARG 1 entity
-		ARG 2 topYOffset
 	METHOD method_23085 renderSide (Lnet/minecraft/class_2640;Lnet/minecraft/class_1159;Lnet/minecraft/class_4588;FFFFFFFFLnet/minecraft/class_2350;)V
 		ARG 1 entity
 		ARG 2 model

mappings/net/minecraft/client/render/model/WeightedBakedModel.mapping

@@ -10,8 +10,3 @@ CLASS net/minecraft/class_1097 net/minecraft/client/render/model/WeightedBakedMo
 		METHOD method_4752 add (Lnet/minecraft/class_1087;I)Lnet/minecraft/class_1097$class_1098;
 			ARG 1 model
 			ARG 2 weight
-	CLASS class_1099 Entry
-		FIELD field_5437 model Lnet/minecraft/class_1087;
-		METHOD <init> (Lnet/minecraft/class_1087;I)V
-			ARG 1 model
-			ARG 2 weight

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

@@ -1,23 +1,28 @@
-CLASS net/minecraft/class_4536 net/minecraft/client/texture/TextureUtil
+CLASS com/mojang/blaze3d/platform/TextureUtil net/minecraft/client/texture/TextureUtil
-	FIELD field_22547 LOGGER Lorg/apache/logging/log4j/Logger;
+	METHOD bind (I)V
-	METHOD method_24956 generateId ()I
-	METHOD method_24957 deleteId (I)V
 		ARG 0 id
-	METHOD method_24958 allocate (III)V
+	METHOD generateTextureId generateId ()I
+	METHOD initTexture uploadImage (Ljava/nio/IntBuffer;II)V
+		COMMENT Uploads {@code imageData} to the bound texture.
+		COMMENT Each integer is interpreted as 0xAARRGGBB.
+		ARG 0 imageData
+		ARG 1 width
+		ARG 2 height
+	METHOD prepareImage allocate (III)V
 		ARG 0 id
 		ARG 1 width
 		ARG 2 height
-	METHOD method_24959 allocate (IIII)V
+	METHOD prepareImage allocate (IIII)V
 		ARG 0 id
 		ARG 1 maxLevel
 		ARG 2 width
 		ARG 3 height
-	METHOD method_24960 allocate (Lnet/minecraft/class_1011$class_1013;III)V
+	METHOD prepareImage allocate (Lnet/minecraft/class_1011$class_1013;III)V
 		ARG 0 internalFormat
 		ARG 1 id
 		ARG 2 width
 		ARG 3 height
-	METHOD method_24961 allocate (Lnet/minecraft/class_1011$class_1013;IIII)V
+	METHOD prepareImage allocate (Lnet/minecraft/class_1011$class_1013;IIII)V
 		COMMENT Allocate uninitialized backing memory for {@code maxLevel+1}
 		COMMENT mip levels to texture {@code id}.
 		ARG 0 internalFormat
@@ -25,15 +30,9 @@ CLASS net/minecraft/class_4536 net/minecraft/client/texture/TextureUtil
 		ARG 2 maxLevel
 		ARG 3 width
 		ARG 4 height
-	METHOD method_24962 readAllToByteBuffer (Ljava/io/InputStream;)Ljava/nio/ByteBuffer;
+	METHOD readResource readAllToByteBuffer (Ljava/io/InputStream;)Ljava/nio/ByteBuffer;
 		ARG 0 inputStream
-	METHOD method_24963 uploadImage (Ljava/nio/IntBuffer;II)V
+	METHOD readResourceAsString readAllToString (Ljava/io/InputStream;)Ljava/lang/String;
-		COMMENT Uploads {@code imageData} to the bound texture.
+		ARG 0 inputStream
-		COMMENT Each integer is interpreted as 0xAARRGGBB.
+	METHOD releaseTextureId deleteId (I)V
-		ARG 0 imageData
-		ARG 1 width
-		ARG 2 height
-	METHOD method_24964 bind (I)V
 		ARG 0 id
-	METHOD method_24965 readAllToString (Ljava/io/InputStream;)Ljava/lang/String;
-		ARG 0 inputStream

mappings/net/minecraft/client/world/ClientChunkManager.mapping

@@ -19,14 +19,11 @@ CLASS net/minecraft/class_631 net/minecraft/client/world/ClientChunkManager
 		ARG 0 chunk
 		ARG 1 x
 		ARG 2 z
-	METHOD method_20182 getLoadedChunkCount ()I
 	METHOD method_20230 getChunkMapRadius (I)I
 		ARG 0 loadDistance
 	METHOD method_20317 setChunkMapCenter (II)V
 		ARG 1 x
 		ARG 2 z
-	METHOD method_28102 tick (Ljava/util/function/BooleanSupplier;)V
-		ARG 1 shouldKeepTicking
 	METHOD method_2859 unload (II)V
 		ARG 1 chunkX
 		ARG 2 chunkZ

mappings/net/minecraft/client/world/ClientWorld.mapping

@@ -82,13 +82,12 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld
 	METHOD method_2942 addEntity (ILnet/minecraft/class_1297;)V
 		ARG 1 id
 		ARG 2 entity
-	METHOD method_2943 randomBlockDisplayTick (IIIILjava/util/Random;ZLnet/minecraft/class_2338$class_2339;)V
+	METHOD method_2943 randomBlockDisplayTick (IIIILjava/util/Random;Lnet/minecraft/class_638$class_6234;Lnet/minecraft/class_2338$class_2339;)V
 		ARG 1 xCenter
 		ARG 2 yCenter
 		ARG 3 zCenter
 		ARG 4 radius
 		ARG 5 random
-		ARG 6 spawnBarrierParticles
 		ARG 7 pos
 	METHOD method_2944 setScoreboard (Lnet/minecraft/class_269;)V
 		ARG 1 scoreboard
@@ -108,7 +107,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld
 		ARG 3 shape
 		ARG 4 y
 	METHOD method_30671 getSpawnAngle ()F
-	METHOD method_32120 asString ()Ljava/lang/String;
 	METHOD method_32124 (Lnet/minecraft/class_1297;)V
 		ARG 1 entity
 	METHOD method_8435 setTimeOfDay (J)V

mappings/net/minecraft/entity/Bucketable.mapping

@@ -1,3 +1,6 @@
 CLASS net/minecraft/class_5761 net/minecraft/entity/Bucketable
+	METHOD method_6452 getFishBucketItem ()Lnet/minecraft/class_1799;
+	METHOD method_6453 isFromBucket ()Z
 	METHOD method_6454 setFromBucket (Z)V
 		ARG 1 fromBucket
+	METHOD method_6455 copyDataToStack (Lnet/minecraft/class_1799;)V

mappings/net/minecraft/entity/Entity.mapping

@@ -208,17 +208,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 1 x
 		ARG 3 y
 		ARG 5 z
-	METHOD method_24204 streamSelfAndPassengers ()Ljava/util/stream/Stream;
-		COMMENT Returns a stream consisting of this entity and its passengers recursively.
-		COMMENT Each entity will appear before any of its passengers.
-		COMMENT
-		COMMENT <p>This may be less costly than {@link #streamPassengersAndSelf()} if the
-		COMMENT stream's iteration would terminates fast, such as finding an arbitrary
-		COMMENT match of entity in the passengers tree.
-		COMMENT
-		COMMENT @implNote The default implementation is not very efficient.
-		COMMENT
-		COMMENT @see #streamPassengersAndSelf()
 	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}.

mappings/net/minecraft/entity/Flutterer.mapping

@@ -1 +1,2 @@
 CLASS net/minecraft/class_1432 net/minecraft/entity/Flutterer
+	METHOD method_6581 isInAir ()Z

mappings/net/minecraft/entity/ai/Durations.mapping

@@ -1,4 +1,4 @@
 CLASS net/minecraft/class_4802 net/minecraft/entity/ai/Durations
-	METHOD method_24505 betweenSeconds (II)Lnet/minecraft/class_4801;
+	METHOD method_24505 betweenSeconds (II)Lnet/minecraft/class_6019;
 		ARG 0 min
 		ARG 1 max

mappings/net/minecraft/entity/ai/brain/sensor/AxolotlHostilesSensor.mapping

@@ -1,8 +0,0 @@
-CLASS net/minecraft/class_5758 net/minecraft/entity/ai/brain/sensor/AxolotlHostilesSensor
-	METHOD method_33208 shouldTarget (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z
-		ARG 1 axolotl
-		ARG 2 hostile
-	METHOD method_33209 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z
-		ARG 2 hostile
-	METHOD method_33210 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z
-		ARG 2 hostile

mappings/net/minecraft/entity/ai/brain/sensor/NearestHostileSensor.mapping

@@ -1,8 +0,0 @@
-CLASS net/minecraft/class_5759 net/minecraft/entity/ai/brain/sensor/NearestHostileSensor
-	METHOD method_19105 isCloseEnoughForDanger (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z
-		ARG 1 entity
-		ARG 2 target
-	METHOD method_19618 getNearestHostile (Lnet/minecraft/class_1309;)Ljava/util/Optional;
-		ARG 1 entity
-	METHOD method_33211 getVisibleMobs (Lnet/minecraft/class_1309;)Ljava/util/Optional;
-		ARG 1 entity

mappings/net/minecraft/entity/ai/brain/sensor/VillagerHostilesSensor.mapping

@@ -2,3 +2,4 @@ CLASS net/minecraft/class_4150 net/minecraft/entity/ai/brain/sensor/VillagerHost
 	FIELD field_18473 SQUARED_DISTANCES_FOR_DANGER Lcom/google/common/collect/ImmutableMap;
 	METHOD method_19104 isHostile (Lnet/minecraft/class_1309;)Z
 		ARG 1 entity
+	METHOD method_19105 isCloseEnoughForDanger (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z

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

@@ -2,7 +2,7 @@ CLASS net/minecraft/class_4103 net/minecraft/entity/ai/brain/task/CompositeTask
 	FIELD field_18344 memoriesToForgetWhenStopped Ljava/util/Set;
 	FIELD field_18345 order Lnet/minecraft/class_4103$class_4104;
 	FIELD field_18346 runMode Lnet/minecraft/class_4103$class_4216;
-	FIELD field_18347 tasks Lnet/minecraft/class_4131;
+	FIELD field_18347 tasks Lnet/minecraft/class_6032;
 	METHOD <init> (Ljava/util/Map;Ljava/util/Set;Lnet/minecraft/class_4103$class_4104;Lnet/minecraft/class_4103$class_4216;Ljava/util/List;)V
 		ARG 1 requiredMemoryState
 		ARG 2 memoriesToForgetWhenStopped
@@ -13,11 +13,10 @@ CLASS net/minecraft/class_4103 net/minecraft/entity/ai/brain/task/CompositeTask
 		FIELD field_18350 listModifier Ljava/util/function/Consumer;
 		METHOD <init> (Ljava/lang/String;ILjava/util/function/Consumer;)V
 			ARG 3 listModifier
-		METHOD method_18939 apply (Lnet/minecraft/class_4131;)V
+		METHOD method_18939 apply (Lnet/minecraft/class_6032;)V
 			ARG 1 list
 	CLASS class_4216 RunMode
-		METHOD method_19559 run (Lnet/minecraft/class_4131;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)V
+		METHOD method_19559 run (Ljava/util/stream/Stream;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)V
-			ARG 1 tasks
 			ARG 2 world
 			ARG 3 entity
 			ARG 4 time

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

@@ -2,8 +2,8 @@ CLASS net/minecraft/class_4809 net/minecraft/entity/ai/brain/task/MemoryTransfer
 	FIELD field_22288 runPredicate Ljava/util/function/Predicate;
 	FIELD field_22289 sourceType Lnet/minecraft/class_4140;
 	FIELD field_22290 targetType Lnet/minecraft/class_4140;
-	FIELD field_22291 duration Lnet/minecraft/class_4801;
+	FIELD field_22291 duration Lnet/minecraft/class_6019;
-	METHOD <init> (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;Lnet/minecraft/class_4801;)V
+	METHOD <init> (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;Lnet/minecraft/class_6019;)V
 		ARG 1 runPredicate
 		ARG 2 sourceType
 		ARG 3 targetType

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

@@ -1,13 +1,13 @@
 CLASS net/minecraft/class_4821 net/minecraft/entity/ai/brain/task/TimeLimitedTask
 	FIELD field_22316 needsTimeReset Z
 	FIELD field_22317 delegateRunning Z
-	FIELD field_22318 timeRange Lnet/minecraft/class_4801;
+	FIELD field_22318 timeRange Lnet/minecraft/class_6019;
 	FIELD field_22319 delegate Lnet/minecraft/class_4097;
 	FIELD field_22320 timeLeft I
-	METHOD <init> (Lnet/minecraft/class_4097;Lnet/minecraft/class_4801;)V
+	METHOD <init> (Lnet/minecraft/class_4097;Lnet/minecraft/class_6019;)V
 		ARG 1 delegate
 		ARG 2 timeRange
-	METHOD <init> (Lnet/minecraft/class_4097;ZLnet/minecraft/class_4801;)V
+	METHOD <init> (Lnet/minecraft/class_4097;ZLnet/minecraft/class_6019;)V
 		ARG 1 delegate
 		ARG 2 skipFirstRun
 		ARG 3 timeRange

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

@@ -1,10 +1,10 @@
 CLASS net/minecraft/class_5355 net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask
-	FIELD field_25357 executionRange Lnet/minecraft/class_4801;
+	FIELD field_25357 executionRange Lnet/minecraft/class_6019;
 	FIELD field_25358 speed Ljava/util/function/Function;
-	METHOD <init> (Lnet/minecraft/class_4801;F)V
+	METHOD <init> (Lnet/minecraft/class_6019;F)V
 		ARG 1 executionRange
 		ARG 2 speed
-	METHOD <init> (Lnet/minecraft/class_4801;Ljava/util/function/Function;)V
+	METHOD <init> (Lnet/minecraft/class_6019;Ljava/util/function/Function;)V
 		ARG 1 executionRange
 		ARG 2 speed
 	METHOD method_29520 getNearestVisibleAdult (Lnet/minecraft/class_1296;)Lnet/minecraft/class_1296;

mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping

@@ -26,7 +26,7 @@ CLASS net/minecraft/class_1408 net/minecraft/entity/ai/pathing/EntityNavigation
 		ARG 2 world
 	METHOD method_18053 onBlockChanged (Lnet/minecraft/class_2338;)V
 		ARG 1 pos
-	METHOD method_18416 findPathToAny (Ljava/util/Set;IZI)Lnet/minecraft/class_11;
+	METHOD method_18416 findPathToAny (Ljava/util/Set;IZIF)Lnet/minecraft/class_11;
 		ARG 1 positions
 		ARG 2 range
 		ARG 4 distance

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

@@ -29,3 +29,4 @@ CLASS net/minecraft/class_5354 net/minecraft/entity/mob/Angerable
 		ARG 1 target
 	METHOD method_6015 setAttacker (Lnet/minecraft/class_1309;)V
 		ARG 1 attacker
+	METHOD method_6065 getAttacker ()Lnet/minecraft/class_1309;

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

@@ -2,7 +2,7 @@ CLASS net/minecraft/class_1560 net/minecraft/entity/mob/EndermanEntity
 	FIELD field_20618 PROVOKED Lnet/minecraft/class_2940;
 	FIELD field_25376 angerTime I
 	FIELD field_25377 targetUuid Ljava/util/UUID;
-	FIELD field_25378 ANGER_TIME_RANGE Lnet/minecraft/class_4801;
+	FIELD field_25378 ANGER_TIME_RANGE Lnet/minecraft/class_6019;
 	FIELD field_7252 ATTACKING_SPEED_BOOST Lnet/minecraft/class_1322;
 	FIELD field_7253 lastAngrySoundAge I
 	FIELD field_7254 ageWhenTargetSet I

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

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_4835 net/minecraft/entity/mob/HoglinBrain
-	FIELD field_22369 AVOID_MEMORY_DURATION Lnet/minecraft/class_4801;
+	FIELD field_22369 AVOID_MEMORY_DURATION Lnet/minecraft/class_6019;
-	FIELD field_25383 WALK_TOWARD_CLOSEST_ADULT_RANGE Lnet/minecraft/class_4801;
+	FIELD field_25383 WALK_TOWARD_CLOSEST_ADULT_RANGE Lnet/minecraft/class_6019;
 	METHOD method_24662 makeRandomWalkTask ()Lnet/minecraft/class_4118;
 	METHOD method_24663 (Lnet/minecraft/class_1309;Lnet/minecraft/class_4760;)V
 		ARG 1 hoglin

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

@@ -1,11 +1,11 @@
 CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
-	FIELD field_22388 HUNT_MEMORY_DURATION Lnet/minecraft/class_4801;
+	FIELD field_22388 HUNT_MEMORY_DURATION Lnet/minecraft/class_6019;
-	FIELD field_22389 MEMORY_TRANSFER_TASK_DURATION Lnet/minecraft/class_4801;
+	FIELD field_22389 MEMORY_TRANSFER_TASK_DURATION Lnet/minecraft/class_6019;
-	FIELD field_22390 RIDE_TARGET_MEMORY_DURATION Lnet/minecraft/class_4801;
+	FIELD field_22390 RIDE_TARGET_MEMORY_DURATION Lnet/minecraft/class_6019;
-	FIELD field_22391 AVOID_MEMORY_DURATION Lnet/minecraft/class_4801;
+	FIELD field_22391 AVOID_MEMORY_DURATION Lnet/minecraft/class_6019;
 	FIELD field_23826 BARTERING_ITEM Lnet/minecraft/class_1792;
-	FIELD field_25384 GO_TO_ZOMBIFIED_MEMORY_DURATION Lnet/minecraft/class_4801;
+	FIELD field_25384 GO_TO_ZOMBIFIED_MEMORY_DURATION Lnet/minecraft/class_6019;
-	FIELD field_25698 GO_TO_NEMESIS_MEMORY_DURATION Lnet/minecraft/class_4801;
+	FIELD field_25698 GO_TO_NEMESIS_MEMORY_DURATION Lnet/minecraft/class_6019;
 	METHOD method_24714 hasBeenHitByPlayer (Lnet/minecraft/class_4836;)Z
 		ARG 0 piglin
 	METHOD method_24717 makeRandomFollowTask ()Lnet/minecraft/class_4118;

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

@@ -13,8 +13,6 @@ CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity
 	METHOD method_21649 setGossipData (Lnet/minecraft/class_2520;)V
 		ARG 1 gossipTag
 	METHOD method_7194 getConversionRate ()I
-	METHOD method_7195 setVillagerData (Lnet/minecraft/class_3850;)V
-		ARG 1 data
 	METHOD method_7197 finishConversion (Lnet/minecraft/class_3218;)V
 		ARG 1 world
 	METHOD method_7198 isConverting ()Z

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

@@ -1,8 +1,8 @@
 CLASS net/minecraft/class_1590 net/minecraft/entity/mob/ZombifiedPiglinEntity
-	FIELD field_25379 ANGER_TIME_RANGE Lnet/minecraft/class_4801;
+	FIELD field_25379 ANGER_TIME_RANGE Lnet/minecraft/class_6019;
 	FIELD field_25380 angerTime I
 	FIELD field_25381 targetUuid Ljava/util/UUID;
-	FIELD field_25382 ANGRY_SOUND_DELAY_RANGE Lnet/minecraft/class_4801;
+	FIELD field_25382 ANGRY_SOUND_DELAY_RANGE Lnet/minecraft/class_6019;
 	FIELD field_7307 ATTACKING_SPEED_BOOST Lnet/minecraft/class_1322;
 	FIELD field_7308 angrySoundDelay I
 	FIELD field_7311 ATTACKING_SPEED_BOOST_ID Ljava/util/UUID;

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

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_5768 net/minecraft/entity/passive/AxolotlBrain
-	FIELD field_28351 WALK_TOWARD_ADULT_RANGE Lnet/minecraft/class_4801;
+	FIELD field_28351 WALK_TOWARD_ADULT_RANGE Lnet/minecraft/class_6019;
 	METHOD method_33241 getTemptItems ()Lnet/minecraft/class_1856;
 	METHOD method_33243 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095;
 		ARG 0 brain

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

@@ -9,15 +9,7 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity
 		ARG 1 variant
 	METHOD method_33221 shouldBabyBeDifferent (Ljava/util/Random;)Z
 		ARG 0 random
-	METHOD method_33222 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
-		ARG 0 entity
-		ARG 1 world
-		ARG 2 spawnReason
-		ARG 3 pos
-		ARG 4 random
 	METHOD method_33223 buffPlayer (Lnet/minecraft/class_1657;)V
-		ARG 1 player
-	METHOD method_33224 isFromBucket ()Z
 	METHOD method_33225 getVariant ()Lnet/minecraft/class_5762$class_5767;
 	METHOD method_33226 isPlayingDead ()Z
 	METHOD method_33227 createAxolotlAttributes ()Lnet/minecraft/class_5132$class_5133;

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

@@ -15,7 +15,7 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity
 	FIELD field_21644 ticksUntilCanPollinate I
 	FIELD field_21645 moveToHiveGoal Lnet/minecraft/class_4466$class_4472;
 	FIELD field_21646 moveToFlowerGoal Lnet/minecraft/class_4466$class_4473;
-	FIELD field_25363 ANGER_TIME_RANGE Lnet/minecraft/class_4801;
+	FIELD field_25363 ANGER_TIME_RANGE Lnet/minecraft/class_6019;
 	FIELD field_25364 targetUuid Ljava/util/UUID;
 	METHOD method_21769 addParticle (Lnet/minecraft/class_1937;DDDDDLnet/minecraft/class_2394;)V
 		ARG 1 world

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

@@ -7,10 +7,6 @@ CLASS net/minecraft/class_1422 net/minecraft/entity/passive/FishEntity
 		ARG 3 pos
 		ARG 4 random
 	METHOD method_26879 createFishAttributes ()Lnet/minecraft/class_5132$class_5133;
-	METHOD method_6452 getFishBucketItem ()Lnet/minecraft/class_1799;
-	METHOD method_6453 isFromBucket ()Z
-	METHOD method_6455 copyDataToStack (Lnet/minecraft/class_1799;)V
-		ARG 1 stack
 	METHOD method_6456 hasSelfControl ()Z
 	METHOD method_6457 getFlopSound ()Lnet/minecraft/class_3414;
 	CLASS class_1423 FishMoveControl

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

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_1439 net/minecraft/entity/passive/IronGolemEntity
-	FIELD field_25365 ANGER_TIME_RANGE Lnet/minecraft/class_4801;
+	FIELD field_25365 ANGER_TIME_RANGE Lnet/minecraft/class_6019;
 	FIELD field_25366 angerTime I
 	FIELD field_25367 angryAt Ljava/util/UUID;
 	FIELD field_6759 lookingAtVillagerTicksLeft I

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

@@ -8,7 +8,6 @@ CLASS net/minecraft/class_3988 net/minecraft/entity/passive/MerchantEntity
 	METHOD method_18008 afterUsing (Lnet/minecraft/class_1914;)V
 		ARG 1 offer
 	METHOD method_18009 hasCustomer ()Z
-	METHOD method_18011 getInventory ()Lnet/minecraft/class_1277;
 	METHOD method_18012 getTradingSound (Z)Lnet/minecraft/class_3414;
 		ARG 1 sold
 	METHOD method_19170 fillRecipesFromPool (Lnet/minecraft/class_1916;[Lnet/minecraft/class_3853$class_1652;I)V

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

@@ -21,7 +21,6 @@ CLASS net/minecraft/class_1453 net/minecraft/entity/passive/ParrotEntity
 	METHOD method_6578 flapWings ()V
 	METHOD method_6580 getSoundPitch (Ljava/util/Random;)F
 		ARG 0 random
-	METHOD method_6581 isInAir ()Z
 	METHOD method_6582 isSongPlaying ()Z
 	METHOD method_6583 getRandomSound (Lnet/minecraft/class_1937;Ljava/util/Random;)Lnet/minecraft/class_3414;
 		ARG 0 world

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

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_1456 net/minecraft/entity/passive/PolarBearEntity
 	FIELD field_25368 targetUuid Ljava/util/UUID;
-	FIELD field_25369 ANGER_TIME_RANGE Lnet/minecraft/class_4801;
+	FIELD field_25369 ANGER_TIME_RANGE Lnet/minecraft/class_6019;
 	FIELD field_25370 angerTime I
 	FIELD field_6837 warningAnimationProgress F
 	FIELD field_6838 lastWarningAnimationProgress F

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

@@ -5,7 +5,6 @@ CLASS net/minecraft/class_1321 net/minecraft/entity/passive/TameableEntity
 	METHOD method_24345 isSitting ()Z
 	METHOD method_24346 setSitting (Z)V
 		ARG 1 sitting
-	METHOD method_6139 getOwnerUuid ()Ljava/util/UUID;
 	METHOD method_6170 setOwner (Lnet/minecraft/class_1657;)V
 		ARG 1 player
 	METHOD method_6171 isOwner (Lnet/minecraft/class_1309;)Z
@@ -16,7 +15,6 @@ CLASS net/minecraft/class_1321 net/minecraft/entity/passive/TameableEntity
 	METHOD method_6174 setOwnerUuid (Ljava/util/UUID;)V
 		ARG 1 uuid
 	METHOD method_6175 onTamedChanged ()V
-	METHOD method_6177 getOwner ()Lnet/minecraft/class_1309;
 	METHOD method_6178 canAttackWithOwner (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z
 		ARG 1 target
 		ARG 2 owner

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

@@ -88,7 +88,5 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity
 		ARG 2 x
 		ARG 4 z
 	METHOD method_30958 releaseAllTickets ()V
-	METHOD method_7221 setVillagerData (Lnet/minecraft/class_3850;)V
-		ARG 1 villagerData
 	METHOD method_7234 wantsToStartBreeding ()Z
 	METHOD method_7239 canBreed ()Z

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

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity
 	FIELD field_18004 FOLLOW_TAMED_PREDICATE Ljava/util/function/Predicate;
-	FIELD field_25371 ANGER_TIME_RANGE Lnet/minecraft/class_4801;
+	FIELD field_25371 ANGER_TIME_RANGE Lnet/minecraft/class_6019;
 	FIELD field_25372 targetUuid Ljava/util/UUID;
 	FIELD field_25373 ANGER_TIME Lnet/minecraft/class_2940;
 	FIELD field_6944 furWet Z

mappings/net/minecraft/item/AxeItem.mapping

@@ -14,4 +14,4 @@ CLASS net/minecraft/class_1743 net/minecraft/item/AxeItem
 	METHOD method_34717 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680;
 		ARG 1 block
 	METHOD method_34718 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680;
-		ARG 1 block
+		ARG 1 block

mappings/net/minecraft/item/FoodComponents.mapping

@@ -40,5 +40,5 @@ CLASS net/minecraft/class_4176 net/minecraft/item/FoodComponents
 	FIELD field_18663 POISONOUS_POTATO Lnet/minecraft/class_4174;
 	FIELD field_20381 HONEY_BOTTLE Lnet/minecraft/class_4174;
 	FIELD field_28647 GLOW_BERRIES Lnet/minecraft/class_4174;
-	METHOD method_19243 create (I)Lnet/minecraft/class_4174;
+	METHOD method_19243 create (I)Lnet/minecraft/class_4174$class_4175;
 		ARG 0 hunger

mappings/net/minecraft/item/ItemUsage.mapping

@@ -15,10 +15,5 @@ CLASS net/minecraft/class_5328 net/minecraft/item/ItemUsage
 	METHOD method_33263 spawnItemContents (Lnet/minecraft/class_1542;Ljava/util/stream/Stream;)V
 		ARG 0 itemEntity
 		ARG 1 contents
-	METHOD method_33264 fillEntityBucket (Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1309;Lnet/minecraft/class_3414;Ljava/util/function/Supplier;)Ljava/util/Optional;
-		ARG 0 player
-		ARG 1 hand
-		ARG 2 entity
-		ARG 3 sound
 	METHOD method_33265 (Lnet/minecraft/class_1937;Lnet/minecraft/class_1542;Lnet/minecraft/class_1799;)V
 		ARG 2 stack

mappings/net/minecraft/recipe/Ingredient.mapping

@@ -9,8 +9,6 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient
 		ARG 0 stacks
 	METHOD method_26965 (Lnet/minecraft/class_1799;)Z
 		ARG 0 stack
-	METHOD method_33268 (Lnet/minecraft/class_2960;)Lcom/google/gson/JsonSyntaxException;
-		ARG 0 id
 	METHOD method_8086 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1856;
 		ARG 0 buf
 	METHOD method_8088 write (Lnet/minecraft/class_2540;)V

mappings/net/minecraft/recipe/ShapedRecipe.mapping

@@ -30,7 +30,7 @@ CLASS net/minecraft/class_1869 net/minecraft/recipe/ShapedRecipe
 		ARG 0 pattern
 	METHOD method_8153 findNextIngredientReverse (Ljava/lang/String;)I
 		ARG 0 pattern
-	METHOD method_8155 getItemStack (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1799;
+	METHOD method_8155 getItemStack (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1792;
 		ARG 0 json
 	METHOD method_8157 getComponents (Lcom/google/gson/JsonObject;)Ljava/util/Map;
 		ARG 0 json

mappings/net/minecraft/resource/Resource.mapping

@@ -4,3 +4,4 @@ CLASS net/minecraft/class_3298 net/minecraft/resource/Resource
 		ARG 1 metaReader
 	METHOD method_14482 getInputStream ()Ljava/io/InputStream;
 	METHOD method_14483 getId ()Lnet/minecraft/class_2960;
+	METHOD method_14484 hasMetadata ()Z

mappings/net/minecraft/resource/ResourceImpl.mapping

@@ -12,4 +12,3 @@ CLASS net/minecraft/class_3306 net/minecraft/resource/ResourceImpl
 		ARG 4 metaInputStream
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
-	METHOD method_14484 hasMetadata ()Z

mappings/net/minecraft/server/MinecraftServer.mapping

@@ -1,4 +1,4 @@
-CLASS net/minecraft/server/MinecraftServer
+CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	COMMENT Represents a logical Minecraft server.
 	COMMENT
 	COMMENT <p>Since Minecraft uses a Client-Server architecture for the game, the server processes all logical game functions.

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

@@ -42,8 +42,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
 		ARG 7 yaw
 		ARG 8 pitch
 		ARG 9 flags
-	METHOD method_14362 validatePlayerMove (Lnet/minecraft/class_2828;)Z
-		ARG 0 packet
 	METHOD method_14363 requestTeleport (DDDFF)V
 		ARG 1 x
 		ARG 3 y
@@ -57,8 +55,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
 		ARG 2 listener
 	METHOD method_14370 executeCommand (Ljava/lang/String;)V
 		ARG 1 input
-	METHOD method_14371 validateVehicleMove (Lnet/minecraft/class_2833;)Z
+	METHOD method_14371 validateVehicleMove (DDDFF)Z
-		ARG 0 packet
 	METHOD method_14372 syncWithPlayerPosition ()V
 	METHOD method_18784 tick ()V
 	METHOD method_19507 isHost ()Z

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

@@ -24,8 +24,6 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager
 		ARG 6 chunkGenerator
 		ARG 7 viewDistance
 		ARG 9 worldGenerationProgressListener
-	METHOD method_12127 tick (Ljava/util/function/BooleanSupplier;)V
-		ARG 1 shouldKeepTicking
 	METHOD method_12129 getChunkGenerator ()Lnet/minecraft/class_2794;
 	METHOD method_14096 updatePosition (Lnet/minecraft/class_3222;)V
 		COMMENT Updates the chunk section position of the {@code player}. This can either be a
@@ -45,7 +43,6 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager
 		ARG 4 create
 	METHOD method_14144 applyViewDistance (I)V
 		ARG 1 watchDistance
-	METHOD method_14151 getLoadedChunkCount ()I
 	METHOD method_14161 tickChunks ()V
 	METHOD method_16155 tick ()Z
 	METHOD method_17297 addTicket (Lnet/minecraft/class_3230;Lnet/minecraft/class_1923;ILjava/lang/Object;)V

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

@@ -23,7 +23,6 @@ CLASS net/minecraft/class_1949 net/minecraft/server/world/ServerTickScheduler
 		ARG 2 src
 		ARG 3 bounds
 		ARG 4 move
-	METHOD method_20825 getTicks ()I
 	METHOD method_8666 copyScheduledTicks (Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;)V
 		ARG 1 box
 		ARG 2 offset

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

@@ -200,7 +200,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
 			COMMENT the items to classify
 		ARG 1 classifier
 			COMMENT the classifier that determines the category of any item
-	METHOD method_31419 getChunkSourceDebugString ()Ljava/lang/String;
 	METHOD method_31420 (Lnet/minecraft/class_3695;Lnet/minecraft/class_1297;)V
 		ARG 2 entity
 	METHOD method_31423 loadEntities (Ljava/util/stream/Stream;)V
@@ -215,7 +214,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
 		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 handleSleeping ()V
 	METHOD method_33144 isSleepingEnabled ()Z
 	METHOD method_8448 updateSleepingPlayers ()V

mappings/net/minecraft/structure/EndCityGenerator.mapping

@@ -1,11 +1,9 @@
 CLASS net/minecraft/class_3342 net/minecraft/structure/EndCityGenerator
-	FIELD field_14383 PLACEMENT_DATA Lnet/minecraft/class_3492;
 	FIELD field_14384 FAT_TOWER Lnet/minecraft/class_3342$class_3344;
 	FIELD field_14385 SMALL_TOWER_BRIDGE_ATTACHMENTS Ljava/util/List;
 	FIELD field_14386 SMALL_TOWER Lnet/minecraft/class_3342$class_3344;
 	FIELD field_14387 BRIDGE_PIECE Lnet/minecraft/class_3342$class_3344;
 	FIELD field_14388 FAT_TOWER_BRIDGE_ATTACHMENTS Ljava/util/List;
-	FIELD field_14389 IGNORE_AIR_PLACEMENT_DATA Lnet/minecraft/class_3492;
 	FIELD field_14390 BUILDING Lnet/minecraft/class_3342$class_3344;
 	METHOD method_14673 createPart (Lnet/minecraft/class_3485;Lnet/minecraft/class_3342$class_3344;ILnet/minecraft/class_3342$class_3343;Lnet/minecraft/class_2338;Ljava/util/List;Ljava/util/Random;)Z
 		ARG 0 manager
@@ -34,19 +32,12 @@ CLASS net/minecraft/class_3342 net/minecraft/structure/EndCityGenerator
 	CLASS 3
 		FIELD field_14394 shipGenerated Z
 	CLASS class_3343 Piece
-		FIELD field_14391 template Ljava/lang/String;
-		FIELD field_14392 ignoreAir Z
-		FIELD field_14393 rotation Lnet/minecraft/class_2470;
-		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
-			ARG 2 tag
 		METHOD <init> (Lnet/minecraft/class_3485;Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Z)V
 			ARG 1 manager
 			ARG 2 template
 			ARG 3 pos
 			ARG 4 rotation
 			ARG 5 ignoreAir
-		METHOD method_14686 initializeStructureData (Lnet/minecraft/class_3485;)V
-			ARG 1 manager
 	CLASS class_3344 Part
 		METHOD method_14687 create (Lnet/minecraft/class_3485;ILnet/minecraft/class_3342$class_3343;Lnet/minecraft/class_2338;Ljava/util/List;Ljava/util/Random;)Z
 			ARG 1 manager

mappings/net/minecraft/structure/IglooGenerator.mapping

@@ -2,15 +2,12 @@ CLASS net/minecraft/class_3351 net/minecraft/structure/IglooGenerator
 	FIELD field_14407 MIDDLE_TEMPLATE Lnet/minecraft/class_2960;
 	FIELD field_14409 TOP_TEMPLATE Lnet/minecraft/class_2960;
 	FIELD field_14410 BOTTOM_TEMPLATE Lnet/minecraft/class_2960;
-	METHOD method_14705 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/List;Ljava/util/Random;)V
+	METHOD method_14705 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Ljava/util/Random;)V
 		ARG 0 manager
 		ARG 1 pos
 		ARG 2 rotation
-		ARG 3 pieces
 		ARG 4 random
 	CLASS class_3352 Piece
-		FIELD field_14411 template Lnet/minecraft/class_2960;
-		FIELD field_14412 rotation Lnet/minecraft/class_2470;
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 tag
 		METHOD <init> (Lnet/minecraft/class_3485;Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;I)V
@@ -19,5 +16,3 @@ CLASS net/minecraft/class_3351 net/minecraft/structure/IglooGenerator
 			ARG 3 pos
 			ARG 4 rotation
 			ARG 5 yOffset
-		METHOD method_14708 initializeStructureData (Lnet/minecraft/class_3485;)V
-			ARG 1 manager

mappings/net/minecraft/structure/MineshaftGenerator.mapping

@@ -1,15 +1,13 @@
 CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator
-	METHOD method_14711 pieceGenerator (Lnet/minecraft/class_3443;Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3353$class_3356;
+	METHOD method_14711 pieceGenerator (Lnet/minecraft/class_3443;Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3353$class_3356;
 		ARG 0 start
-		ARG 1 pieces
 		ARG 2 random
 		ARG 3 x
 		ARG 4 y
 		ARG 5 z
 		ARG 6 orientation
 		ARG 7 chainLength
-	METHOD method_14712 pickPiece (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;ILnet/minecraft/class_3098$class_3100;)Lnet/minecraft/class_3353$class_3356;
+	METHOD method_14712 pickPiece (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;ILnet/minecraft/class_3098$class_3100;)Lnet/minecraft/class_3353$class_3356;
-		ARG 0 pieces
 		ARG 1 random
 		ARG 2 x
 		ARG 3 y
@@ -39,8 +37,7 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator
 			ARG 6 maxY
 			ARG 7 maxX
 			ARG 8 random
-		METHOD method_14714 getBoundingBox (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341;
+		METHOD method_14714 getBoundingBox (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y
@@ -79,8 +76,7 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator
 			ARG 4 minY
 			ARG 5 z
 			ARG 6 maxY
-		METHOD method_14717 getBoundingBox (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341;
+		METHOD method_14717 getBoundingBox (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y
@@ -88,7 +84,7 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator
 			ARG 5 orientation
 	CLASS class_3356 MineshaftPart
 		FIELD field_14421 mineshaftType Lnet/minecraft/class_3098$class_3100;
-		METHOD <init> (Lnet/minecraft/class_3773;ILnet/minecraft/class_3098$class_3100;)V
+		METHOD <init> (Lnet/minecraft/class_3773;ILnet/minecraft/class_3098$class_3100;Lnet/minecraft/class_3341;)V
 			ARG 1 structurePieceType
 			ARG 2 chainLength
 			ARG 3 type
@@ -117,8 +113,7 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator
 			ARG 4 type
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14720 getBoundingBox (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341;
+		METHOD method_14720 getBoundingBox (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y

mappings/net/minecraft/structure/NetherFortressGenerator.mapping

@@ -1,9 +1,8 @@
 CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 	FIELD field_14493 ALL_CORRIDOR_PIECES [Lnet/minecraft/class_3390$class_3404;
 	FIELD field_14494 ALL_BRIDGE_PIECES [Lnet/minecraft/class_3390$class_3404;
-	METHOD method_14795 createPiece (Lnet/minecraft/class_3390$class_3404;Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3403;
+	METHOD method_14795 createPiece (Lnet/minecraft/class_3390$class_3404;Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3403;
 		ARG 0 pieceData
-		ARG 1 pieces
 		ARG 2 random
 		ARG 3 x
 		ARG 4 y
@@ -15,14 +14,9 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 			ARG 1 chainLength
 			ARG 2 boundingBox
 			ARG 3 orientation
-		METHOD <init> (Ljava/util/Random;II)V
-			ARG 1 random
-			ARG 2 x
-			ARG 3 z
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14796 create (Ljava/util/List;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3391;
+		METHOD method_14796 create (Lnet/minecraft/class_6130;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3391;
-			ARG 0 pieces
 			ARG 1 x
 			ARG 2 y
 			ARG 3 z
@@ -37,8 +31,7 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14797 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3392;
+		METHOD method_14797 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3392;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y
@@ -53,8 +46,7 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14798 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3393;
+		METHOD method_14798 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3393;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y
@@ -68,8 +60,7 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 			ARG 3 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14799 create (Ljava/util/List;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3394;
+		METHOD method_14799 create (Lnet/minecraft/class_6130;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3394;
-			ARG 0 pieces
 			ARG 1 x
 			ARG 2 y
 			ARG 3 z
@@ -82,8 +73,7 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 			ARG 3 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14800 create (Ljava/util/List;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3395;
+		METHOD method_14800 create (Lnet/minecraft/class_6130;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3395;
-			ARG 0 pieces
 			ARG 1 x
 			ARG 2 y
 			ARG 3 z
@@ -97,8 +87,7 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14801 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3396;
+		METHOD method_14801 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3396;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y
@@ -112,8 +101,7 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 			ARG 3 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14802 create (Ljava/util/List;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3397;
+		METHOD method_14802 create (Lnet/minecraft/class_6130;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3397;
-			ARG 0 pieces
 			ARG 1 x
 			ARG 2 y
 			ARG 3 z
@@ -128,8 +116,7 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14803 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3398;
+		METHOD method_14803 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3398;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y
@@ -143,8 +130,7 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 			ARG 3 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14804 create (Ljava/util/List;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3399;
+		METHOD method_14804 create (Lnet/minecraft/class_6130;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3399;
-			ARG 0 pieces
 			ARG 1 x
 			ARG 2 y
 			ARG 3 z
@@ -159,8 +145,7 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14805 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3400;
+		METHOD method_14805 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3400;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y
@@ -174,8 +159,7 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 			ARG 3 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14806 create (Ljava/util/List;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3401;
+		METHOD method_14806 create (Lnet/minecraft/class_6130;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3401;
-			ARG 0 pieces
 			ARG 1 x
 			ARG 2 y
 			ARG 3 z
@@ -189,17 +173,15 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 			ARG 3 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14807 create (Ljava/util/List;IIIILnet/minecraft/class_2350;)Lnet/minecraft/class_3390$class_3402;
+		METHOD method_14807 create (Lnet/minecraft/class_6130;IIIILnet/minecraft/class_2350;)Lnet/minecraft/class_3390$class_3402;
-			ARG 0 pieces
 			ARG 1 x
 			ARG 2 y
 			ARG 3 z
 			ARG 4 chainLength
 			ARG 5 orientation
 	CLASS class_3403 Piece
-		METHOD method_14808 fillSEOpening (Lnet/minecraft/class_3390$class_3407;Ljava/util/List;Ljava/util/Random;IIZ)Lnet/minecraft/class_3443;
+		METHOD method_14808 fillSEOpening (Lnet/minecraft/class_3390$class_3407;Lnet/minecraft/class_6130;Ljava/util/Random;IIZ)Lnet/minecraft/class_3443;
 			ARG 1 start
-			ARG 2 pieces
 			ARG 3 random
 			ARG 4 heightOffset
 			ARG 5 leftRightOffset
@@ -208,26 +190,23 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 			ARG 0 boundingBox
 		METHOD method_14810 checkRemainingPieces (Ljava/util/List;)I
 			ARG 1 possiblePieces
-		METHOD method_14811 pickPiece (Lnet/minecraft/class_3390$class_3407;Ljava/util/List;Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3403;
+		METHOD method_14811 pickPiece (Lnet/minecraft/class_3390$class_3407;Ljava/util/List;Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3403;
 			ARG 1 start
 			ARG 2 possiblePieces
-			ARG 3 pieces
 			ARG 4 random
 			ARG 5 x
 			ARG 6 y
 			ARG 7 z
 			ARG 8 orientation
 			ARG 9 chainLength
-		METHOD method_14812 fillNWOpening (Lnet/minecraft/class_3390$class_3407;Ljava/util/List;Ljava/util/Random;IIZ)Lnet/minecraft/class_3443;
+		METHOD method_14812 fillNWOpening (Lnet/minecraft/class_3390$class_3407;Lnet/minecraft/class_6130;Ljava/util/Random;IIZ)Lnet/minecraft/class_3443;
 			ARG 1 start
-			ARG 2 pieces
 			ARG 3 random
 			ARG 4 heightOffset
 			ARG 5 leftRightOffset
 			ARG 6 inside
-		METHOD method_14813 pieceGenerator (Lnet/minecraft/class_3390$class_3407;Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;IZ)Lnet/minecraft/class_3443;
+		METHOD method_14813 pieceGenerator (Lnet/minecraft/class_3390$class_3407;Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;IZ)Lnet/minecraft/class_3443;
 			ARG 1 start
-			ARG 2 pieces
 			ARG 3 random
 			ARG 4 x
 			ARG 5 y
@@ -235,9 +214,8 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 			ARG 7 orientation
 			ARG 8 chainLength
 			ARG 9 inside
-		METHOD method_14814 fillForwardOpening (Lnet/minecraft/class_3390$class_3407;Ljava/util/List;Ljava/util/Random;IIZ)Lnet/minecraft/class_3443;
+		METHOD method_14814 fillForwardOpening (Lnet/minecraft/class_3390$class_3407;Lnet/minecraft/class_6130;Ljava/util/Random;IIZ)Lnet/minecraft/class_3443;
 			ARG 1 start
-			ARG 2 pieces
 			ARG 3 random
 			ARG 4 leftRightOffset
 			ARG 5 heightOffset
@@ -267,8 +245,7 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 			ARG 3 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14817 create (Ljava/util/List;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3405;
+		METHOD method_14817 create (Lnet/minecraft/class_6130;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3405;
-			ARG 0 pieces
 			ARG 1 x
 			ARG 2 y
 			ARG 3 z
@@ -281,8 +258,7 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 			ARG 3 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14818 create (Ljava/util/List;IIIILnet/minecraft/class_2350;)Lnet/minecraft/class_3390$class_3406;
+		METHOD method_14818 create (Lnet/minecraft/class_6130;IIIILnet/minecraft/class_2350;)Lnet/minecraft/class_3390$class_3406;
-			ARG 0 pieces
 			ARG 1 x
 			ARG 2 y
 			ARG 3 z

mappings/net/minecraft/structure/NetherFossilGenerator.mapping

@@ -1,13 +1,10 @@
 CLASS net/minecraft/class_4787 net/minecraft/structure/NetherFossilGenerator
 	FIELD field_22197 FOSSILS [Lnet/minecraft/class_2960;
-	METHOD method_24453 addPieces (Lnet/minecraft/class_3485;Ljava/util/List;Ljava/util/Random;Lnet/minecraft/class_2338;)V
+	METHOD method_24453 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_6130;Ljava/util/Random;Lnet/minecraft/class_2338;)V
 		ARG 0 manager
-		ARG 1 pieces
 		ARG 2 random
 		ARG 3 pos
 	CLASS class_4788 Piece
-		FIELD field_22198 template Lnet/minecraft/class_2960;
-		FIELD field_22199 structureRotation Lnet/minecraft/class_2470;
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 tag
 		METHOD <init> (Lnet/minecraft/class_3485;Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;)V
@@ -15,5 +12,3 @@ CLASS net/minecraft/class_4787 net/minecraft/structure/NetherFossilGenerator
 			ARG 2 template
 			ARG 3 pos
 			ARG 4 rotation
-		METHOD method_24454 initializeStructureData (Lnet/minecraft/class_3485;)V
-			ARG 1 manager

mappings/net/minecraft/structure/OceanMonumentGenerator.mapping

@@ -80,10 +80,9 @@ CLASS net/minecraft/class_3366 net/minecraft/structure/OceanMonumentGenerator
 			ARG 2 length
 			ARG 3 orientation
 			ARG 4 setting
-		METHOD <init> (Lnet/minecraft/class_3773;Lnet/minecraft/class_2350;Lnet/minecraft/class_3341;)V
+		METHOD <init> (Lnet/minecraft/class_3773;Lnet/minecraft/class_2350;ILnet/minecraft/class_3341;)V
 			ARG 1 type
 			ARG 2 orientation
-			ARG 3 boundingBox
 		METHOD method_14770 getIndex (III)I
 			ARG 0 x
 			ARG 1 y

mappings/net/minecraft/structure/OceanRuinGenerator.mapping

@@ -7,42 +7,35 @@ CLASS net/minecraft/class_3409 net/minecraft/structure/OceanRuinGenerator
 	FIELD field_14520 BIG_CRACKED_RUINS [Lnet/minecraft/class_2960;
 	FIELD field_14521 WARM_RUINS [Lnet/minecraft/class_2960;
 	FIELD field_14522 MOSSY_RUINS [Lnet/minecraft/class_2960;
-	METHOD method_14821 getRoomPositions (Ljava/util/Random;II)Ljava/util/List;
+	METHOD method_14821 getRoomPositions (Ljava/util/Random;Lnet/minecraft/class_2338;)Ljava/util/List;
 		ARG 0 random
-		ARG 1 x
+	METHOD method_14822 (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Ljava/util/Random;Lnet/minecraft/class_3114;ZF)V
-		ARG 2 z
-	METHOD method_14822 (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/List;Ljava/util/Random;Lnet/minecraft/class_3114;ZF)V
 		ARG 0 manager
 		ARG 1 pos
 		ARG 2 rotation
-		ARG 3 pieces
 		ARG 4 random
 		ARG 5 config
 		ARG 6 large
 		ARG 7 integrity
 	METHOD method_14824 getRandomWarmRuin (Ljava/util/Random;)Lnet/minecraft/class_2960;
 		ARG 0 random
-	METHOD method_14825 (Lnet/minecraft/class_3485;Ljava/util/Random;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;Lnet/minecraft/class_3114;Ljava/util/List;)V
+	METHOD method_14825 (Lnet/minecraft/class_3485;Ljava/util/Random;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;Lnet/minecraft/class_3114;Lnet/minecraft/class_6130;)V
 		ARG 0 manager
 		ARG 1 random
 		ARG 2 rotation
 		ARG 3 pos
 		ARG 4 config
-		ARG 5 pieces
 	METHOD method_14826 getRandomBigWarmRuin (Ljava/util/Random;)Lnet/minecraft/class_2960;
 		ARG 0 random
-	METHOD method_14827 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/List;Ljava/util/Random;Lnet/minecraft/class_3114;)V
+	METHOD method_14827 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Ljava/util/Random;Lnet/minecraft/class_3114;)V
 		ARG 0 manager
 		ARG 1 pos
 		ARG 2 rotation
-		ARG 3 pieces
 		ARG 4 random
 		ARG 5 config
 	CLASS class_3410 Piece
-		FIELD field_14523 template Lnet/minecraft/class_2960;
 		FIELD field_14524 integrity F
 		FIELD field_14525 large Z
-		FIELD field_14526 rotation Lnet/minecraft/class_2470;
 		FIELD field_14527 biomeType Lnet/minecraft/class_3411$class_3413;
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 tag
@@ -54,5 +47,3 @@ CLASS net/minecraft/class_3409 net/minecraft/structure/OceanRuinGenerator
 			ARG 5 integrity
 			ARG 6 biomeType
 			ARG 7 large
-		METHOD method_14828 initialize (Lnet/minecraft/class_3485;)V
-			ARG 1 structureManager

mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping

@@ -1,18 +1,6 @@
 CLASS net/minecraft/class_5189 net/minecraft/structure/RuinedPortalStructurePiece
-	FIELD field_24018 template Lnet/minecraft/class_2960;
-	FIELD field_24019 rotation Lnet/minecraft/class_2470;
-	FIELD field_24020 mirror Lnet/minecraft/class_2415;
 	FIELD field_24021 verticalPlacement Lnet/minecraft/class_5189$class_5191;
 	FIELD field_24022 properties Lnet/minecraft/class_5189$class_5190;
-	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_5189$class_5191;Lnet/minecraft/class_5189$class_5190;Lnet/minecraft/class_2960;Lnet/minecraft/class_3499;Lnet/minecraft/class_2470;Lnet/minecraft/class_2415;Lnet/minecraft/class_2338;)V
-		ARG 1 pos
-		ARG 2 verticalPlacement
-		ARG 3 properties
-		ARG 4 template
-		ARG 5 structure
-		ARG 6 rotation
-		ARG 7 mirror
-		ARG 8 center
 	METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 		ARG 2 tag
 	METHOD method_27237 getBaseHeight (Lnet/minecraft/class_1936;IILnet/minecraft/class_5189$class_5191;)I
@@ -32,9 +20,6 @@ CLASS net/minecraft/class_5189 net/minecraft/structure/RuinedPortalStructurePiec
 		ARG 1 updated
 	METHOD method_27241 getHeightmapType (Lnet/minecraft/class_5189$class_5191;)Lnet/minecraft/class_2902$class_2903;
 		ARG 0 verticalPlacement
-	METHOD method_27242 processProperties (Lnet/minecraft/class_3499;Lnet/minecraft/class_2338;)V
-		ARG 1 structure
-		ARG 2 center
 	METHOD method_27243 updateNetherracksInBound (Ljava/util/Random;Lnet/minecraft/class_1936;)V
 		ARG 1 random
 		ARG 2 world
@@ -49,7 +34,7 @@ CLASS net/minecraft/class_5189 net/minecraft/structure/RuinedPortalStructurePiec
 		ARG 1 random
 		ARG 2 world
 		ARG 3 pos
-	METHOD method_27247 createLavaReplacementRule ()Lnet/minecraft/class_3821;
+	METHOD method_27247 createLavaReplacementRule (Lnet/minecraft/class_5189$class_5191;Lnet/minecraft/class_5189$class_5190;)Lnet/minecraft/class_3821;
 	METHOD method_27248 updateNetherracks (Ljava/util/Random;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V
 		ARG 1 random
 		ARG 2 world

mappings/net/minecraft/structure/ShipwreckGenerator.mapping

@@ -2,17 +2,14 @@ CLASS net/minecraft/class_3415 net/minecraft/structure/ShipwreckGenerator
 	FIELD field_14534 BEACHED_TEMPLATES [Lnet/minecraft/class_2960;
 	FIELD field_14535 REGULAR_TEMPLATES [Lnet/minecraft/class_2960;
 	FIELD field_14536 DEFAULT_POSITION Lnet/minecraft/class_2338;
-	METHOD method_14834 addParts (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/List;Ljava/util/Random;Lnet/minecraft/class_3172;)V
+	METHOD method_14834 addParts (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Ljava/util/Random;Lnet/minecraft/class_3172;)V
 		ARG 0 structureManager
 		ARG 1 pos
 		ARG 2 rotation
-		ARG 3 children
 		ARG 4 random
 		ARG 5 config
 	CLASS class_3416 Piece
-		FIELD field_14537 template Lnet/minecraft/class_2960;
 		FIELD field_14538 grounded Z
-		FIELD field_14539 rotation Lnet/minecraft/class_2470;
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 tag
 		METHOD <init> (Lnet/minecraft/class_3485;Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Z)V
@@ -21,5 +18,3 @@ CLASS net/minecraft/class_3415 net/minecraft/structure/ShipwreckGenerator
 			ARG 3 pos
 			ARG 4 rotation
 			ARG 5 grounded
-		METHOD method_14837 initializeStructureData (Lnet/minecraft/class_3485;)V
-			ARG 1 manager

mappings/net/minecraft/structure/SimpleStructurePiece.mapping

@@ -9,7 +9,3 @@ CLASS net/minecraft/class_3470 net/minecraft/structure/SimpleStructurePiece
 		ARG 3 world
 		ARG 4 random
 		ARG 5 boundingBox
-	METHOD method_15027 setStructureData (Lnet/minecraft/class_3499;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;)V
-		ARG 1 structure
-		ARG 2 pos
-		ARG 3 placementData

mappings/net/minecraft/structure/StrongholdGenerator.mapping

@@ -4,18 +4,16 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 	FIELD field_15265 ALL_PIECES [Lnet/minecraft/class_3421$class_3427;
 	FIELD field_15266 activePieceType Ljava/lang/Class;
 	FIELD field_15267 possiblePieces Ljava/util/List;
-	METHOD method_14847 createPiece (Ljava/lang/Class;Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3437;
+	METHOD method_14847 createPiece (Ljava/lang/Class;Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3437;
 		ARG 0 pieceType
-		ARG 1 pieces
 		ARG 2 random
 		ARG 3 x
 		ARG 4 y
 		ARG 5 z
 		ARG 6 orientation
 		ARG 7 chainLength
-	METHOD method_14851 pickPiece (Lnet/minecraft/class_3421$class_3434;Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3437;
+	METHOD method_14851 pickPiece (Lnet/minecraft/class_3421$class_3434;Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3437;
 		ARG 0 start
-		ARG 1 pieces
 		ARG 2 random
 		ARG 3 x
 		ARG 4 y
@@ -23,9 +21,8 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 		ARG 6 orientation
 		ARG 7 chainLength
 	METHOD method_14852 checkRemainingPieces ()Z
-	METHOD method_14854 pieceGenerator (Lnet/minecraft/class_3421$class_3434;Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3443;
+	METHOD method_14854 pieceGenerator (Lnet/minecraft/class_3421$class_3434;Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3443;
 		ARG 0 start
-		ARG 1 pieces
 		ARG 2 random
 		ARG 3 x
 		ARG 4 y
@@ -42,8 +39,7 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14856 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3422;
+		METHOD method_14856 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3422;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y
@@ -58,8 +54,7 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 			ARG 3 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14857 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341;
+		METHOD method_14857 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y
@@ -77,8 +72,7 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14858 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3424;
+		METHOD method_14858 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3424;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y
@@ -93,8 +87,7 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14859 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3425;
+		METHOD method_14859 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3425;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y
@@ -110,8 +103,7 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14860 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3426;
+		METHOD method_14860 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3426;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y
@@ -138,8 +130,7 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 			ARG 3 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14863 create (Ljava/util/List;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3428;
+		METHOD method_14863 create (Lnet/minecraft/class_6130;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3428;
-			ARG 0 pieces
 			ARG 1 x
 			ARG 2 y
 			ARG 3 z
@@ -153,8 +144,7 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14864 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3429;
+		METHOD method_14864 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3429;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y
@@ -169,8 +159,7 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_16652 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3430;
+		METHOD method_16652 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3430;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y
@@ -186,8 +175,7 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14865 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3431;
+		METHOD method_14865 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3431;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y
@@ -204,14 +192,11 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD <init> (Lnet/minecraft/class_3773;ILjava/util/Random;II)V
+		METHOD <init> (Lnet/minecraft/class_3773;IIILnet/minecraft/class_2350;)V
 			ARG 1 structurePieceType
 			ARG 2 chainLength
-			ARG 3 random
 			ARG 4 x
-			ARG 5 z
+		METHOD method_14866 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3433;
-		METHOD method_14866 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3433;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y
@@ -234,8 +219,7 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14867 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3435;
+		METHOD method_14867 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3435;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y
@@ -250,8 +234,7 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
-		METHOD method_14868 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3436;
+		METHOD method_14868 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3436;
-			ARG 0 pieces
 			ARG 1 random
 			ARG 2 x
 			ARG 3 y
@@ -262,9 +245,8 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 		FIELD field_15287 entryDoor Lnet/minecraft/class_3421$class_3437$class_3438;
 		METHOD method_14869 getRandomEntrance (Ljava/util/Random;)Lnet/minecraft/class_3421$class_3437$class_3438;
 			ARG 1 random
-		METHOD method_14870 fillNWOpening (Lnet/minecraft/class_3421$class_3434;Ljava/util/List;Ljava/util/Random;II)Lnet/minecraft/class_3443;
+		METHOD method_14870 fillNWOpening (Lnet/minecraft/class_3421$class_3434;Lnet/minecraft/class_6130;Ljava/util/Random;II)Lnet/minecraft/class_3443;
 			ARG 1 start
-			ARG 2 pieces
 			ARG 3 random
 			ARG 4 heightOffset
 			ARG 5 leftRightOffset
@@ -278,15 +260,13 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 			ARG 5 x
 			ARG 6 y
 			ARG 7 z
-		METHOD method_14873 fillSEOpening (Lnet/minecraft/class_3421$class_3434;Ljava/util/List;Ljava/util/Random;II)Lnet/minecraft/class_3443;
+		METHOD method_14873 fillSEOpening (Lnet/minecraft/class_3421$class_3434;Lnet/minecraft/class_6130;Ljava/util/Random;II)Lnet/minecraft/class_3443;
 			ARG 1 start
-			ARG 2 pieces
 			ARG 3 random
 			ARG 4 heightOffset
 			ARG 5 leftRightOffset
-		METHOD method_14874 fillForwardOpening (Lnet/minecraft/class_3421$class_3434;Ljava/util/List;Ljava/util/Random;II)Lnet/minecraft/class_3443;
+		METHOD method_14874 fillForwardOpening (Lnet/minecraft/class_3421$class_3434;Lnet/minecraft/class_6130;Ljava/util/Random;II)Lnet/minecraft/class_3443;
 			ARG 1 start
-			ARG 2 pieces
 			ARG 3 random
 			ARG 4 leftRightOffset
 			ARG 5 heightOffset

mappings/net/minecraft/structure/StructurePiece.mapping

@@ -7,7 +7,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 	FIELD field_15315 boundingBox Lnet/minecraft/class_3341;
 	FIELD field_15316 chainLength I
 	FIELD field_16712 type Lnet/minecraft/class_3773;
-	METHOD <init> (Lnet/minecraft/class_3773;I)V
+	METHOD <init> (Lnet/minecraft/class_3773;ILnet/minecraft/class_3341;)V
 		ARG 1 type
 		ARG 2 length
 	METHOD <init> (Lnet/minecraft/class_3773;Lnet/minecraft/class_2487;)V
@@ -17,8 +17,6 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 		ARG 1 world
 		ARG 2 boundingBox
 		ARG 3 random
-		ARG 4 x
-		ARG 5 y
 		ARG 6 z
 		ARG 7 lootTableId
 	METHOD method_14916 orientateChest (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680;
@@ -29,12 +27,9 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 		ARG 1 world
 		ARG 2 block
 		ARG 3 x
-		ARG 4 y
-		ARG 5 z
 		ARG 6 box
-	METHOD method_14918 fillOpenings (Lnet/minecraft/class_3443;Ljava/util/List;Ljava/util/Random;)V
+	METHOD method_14918 fillOpenings (Lnet/minecraft/class_3443;Lnet/minecraft/class_6130;Ljava/util/Random;)V
 		ARG 1 start
-		ARG 2 pieces
 		ARG 3 random
 	METHOD method_14919 fillHalfEllipsoid (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIIIILnet/minecraft/class_2680;Z)V
 		ARG 1 world
@@ -69,16 +64,12 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 	METHOD method_14929 getBlockAt (Lnet/minecraft/class_1922;IIILnet/minecraft/class_3341;)Lnet/minecraft/class_2680;
 		ARG 1 world
 		ARG 2 x
-		ARG 3 y
-		ARG 4 z
 		ARG 5 box
 	METHOD method_14930 addDispenser (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;IIILnet/minecraft/class_2350;Lnet/minecraft/class_2960;)Z
 		ARG 1 world
 		ARG 2 boundingBox
 		ARG 3 random
 		ARG 4 x
-		ARG 5 y
-		ARG 6 z
 		ARG 7 facing
 		ARG 8 lootTableId
 	METHOD method_14931 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_2338;)Z
@@ -89,9 +80,6 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 		ARG 5 boundingBox
 		ARG 6 chunkPos
 		ARG 7 pos
-	METHOD method_14932 getOverlappingPiece (Ljava/util/List;Lnet/minecraft/class_3341;)Lnet/minecraft/class_3443;
-		ARG 0 pieces
-		ARG 1 box
 	METHOD method_14933 fillWithOutlineUnderSeaLevel (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;FIIIIIILnet/minecraft/class_2680;Lnet/minecraft/class_2680;ZZ)V
 		ARG 1 world
 		ARG 2 box
@@ -113,8 +101,6 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 		ARG 1 world
 		ARG 2 state
 		ARG 3 x
-		ARG 4 y
-		ARG 5 z
 		ARG 6 box
 	METHOD method_14938 fillWithOutline (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIIIIZLjava/util/Random;Lnet/minecraft/class_3443$class_3444;)V
 		ARG 1 world
@@ -183,7 +169,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 		ARG 3 y
 		ARG 4 z
 		ARG 5 box
-	METHOD method_33781 offsetPos (III)Lnet/minecraft/class_2338;
+	METHOD method_33781 offsetPos (III)Lnet/minecraft/class_2338$class_2339;
 		ARG 1 x
 		ARG 2 y
 		ARG 3 z

mappings/net/minecraft/structure/StructurePieceWithDimensions.mapping

@@ -3,15 +3,13 @@ CLASS net/minecraft/class_3418 net/minecraft/structure/StructurePieceWithDimensi
 	FIELD field_15242 depth I
 	FIELD field_15243 height I
 	FIELD field_15244 width I
-	METHOD <init> (Lnet/minecraft/class_3773;Ljava/util/Random;IIIIII)V
+	METHOD <init> (Lnet/minecraft/class_3773;IIIIIILnet/minecraft/class_2350;)V
 		ARG 1 type
-		ARG 2 random
 		ARG 3 x
 		ARG 4 y
 		ARG 5 z
 		ARG 6 width
 		ARG 7 height
-		ARG 8 depth
 	METHOD method_14839 (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;I)Z
 		ARG 1 world
 		ARG 2 boundingBox

mappings/net/minecraft/structure/StructureStart.mapping

@@ -11,22 +11,17 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart
 		COMMENT intersecting chunks, since it is only updated when an actual reference
 		COMMENT is created in such chunks (when they enter the corresponding chunk generation
 		COMMENT phase).
-	FIELD field_15330 boundingBox Lnet/minecraft/class_3341;
 	FIELD field_16713 DEFAULT Lnet/minecraft/class_3449;
 	FIELD field_16714 feature Lnet/minecraft/class_3195;
 	FIELD field_16715 random Lnet/minecraft/class_2919;
 	FIELD field_29070 pos Lnet/minecraft/class_1923;
-	METHOD <init> (Lnet/minecraft/class_3195;Lnet/minecraft/class_1923;Lnet/minecraft/class_3341;IJ)V
+	METHOD <init> (Lnet/minecraft/class_3195;Lnet/minecraft/class_1923;IJ)V
 		ARG 1 feature
 		ARG 2 pos
-		ARG 3 box
-		ARG 4 references
-		ARG 5 worldSeed
 	METHOD method_14962 getBlockPos ()Lnet/minecraft/class_2338;
 	METHOD method_14963 getChildren ()Ljava/util/List;
 	METHOD method_14964 incrementReferences ()V
-	METHOD method_14968 getBoundingBox ()Lnet/minecraft/class_3341;
+	METHOD method_14969 setBoundingBoxFromChildren ()Lnet/minecraft/class_3341;
-	METHOD method_14969 setBoundingBoxFromChildren ()V
 	METHOD method_14970 getReferenceCountToBeInExistingChunk ()I
 	METHOD method_14972 toNbt (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487;
 		ARG 1 world

mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping

@@ -86,9 +86,6 @@ CLASS net/minecraft/class_3471 net/minecraft/structure/WoodlandMansionGenerator
 			ARG 3 value
 	CLASS class_3479 ThirdFloorRoomPool
 	CLASS class_3480 Piece
-		FIELD field_15455 template Ljava/lang/String;
-		FIELD field_15456 mirror Lnet/minecraft/class_2415;
-		FIELD field_15457 rotation Lnet/minecraft/class_2470;
 		METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V
 			ARG 2 nbt
 		METHOD <init> (Lnet/minecraft/class_3485;Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;)V
@@ -102,5 +99,3 @@ CLASS net/minecraft/class_3471 net/minecraft/structure/WoodlandMansionGenerator
 			ARG 3 pos
 			ARG 4 rotation
 			ARG 5 mirror
-		METHOD method_15068 setupPlacement (Lnet/minecraft/class_3485;)V
-			ARG 1 structureManager

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

@@ -5,7 +5,4 @@ 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_2382;
-		ARG 1 structureManager
-		ARG 2 rotation
 	METHOD method_19299 createDefaultJigsawNbt ()Lnet/minecraft/class_2487;

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

@@ -3,6 +3,7 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement
 	FIELD field_24953 CODEC Lcom/mojang/serialization/Codec;
 	METHOD <init> (Lnet/minecraft/class_3785$class_3786;)V
 		ARG 1 projection
+	METHOD method_16601 getStart (Lnet/minecraft/class_3485;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2382;
 	METHOD method_16622 setProjection (Lnet/minecraft/class_3785$class_3786;)Lnet/minecraft/class_3784;
 		ARG 1 projection
 	METHOD method_16624 getProjection ()Lnet/minecraft/class_3785$class_3786;

mappings/net/minecraft/util/Util.mapping

@@ -110,8 +110,7 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util
 	METHOD method_32309 getRandom (Ljava/util/List;Ljava/util/Random;)Ljava/lang/Object;
 		ARG 0 list
 		ARG 1 random
-	METHOD method_33141 toArray (Ljava/util/stream/DoubleStream;I)Lcom/mojang/serialization/DataResult;
+	METHOD method_33141 toArray (Ljava/util/List;I)Lcom/mojang/serialization/DataResult;
-		ARG 0 stream
 		ARG 1 length
 	METHOD method_33559 error (Ljava/lang/String;)V
 		ARG 0 message

mappings/net/minecraft/util/collection/WeightedList.mapping

@@ -1,48 +0,0 @@
-CLASS net/minecraft/class_4131 net/minecraft/util/collection/WeightedList
-	FIELD field_18397 entries Ljava/util/List;
-	FIELD field_18398 random Ljava/util/Random;
-	METHOD <init> (Ljava/util/List;)V
-		ARG 1 entries
-	METHOD method_19029 shuffle ()Lnet/minecraft/class_4131;
-	METHOD method_19031 add (Ljava/lang/Object;I)Lnet/minecraft/class_4131;
-		ARG 1 item
-		ARG 2 weight
-	METHOD method_19032 stream ()Ljava/util/stream/Stream;
-	METHOD method_23332 (Ljava/lang/Object;)D
-		ARG 0 object
-	METHOD method_23333 shuffle (Ljava/util/Random;)Lnet/minecraft/class_4131;
-		ARG 1 random
-	METHOD method_23334 (Ljava/util/Random;Lnet/minecraft/class_4131$class_4132;)V
-		ARG 1 entry
-	METHOD method_23337 pickRandom (Ljava/util/Random;)Ljava/lang/Object;
-		ARG 1 random
-	METHOD method_28337 (Lnet/minecraft/class_4131;)Ljava/util/List;
-		ARG 0 list
-	METHOD method_28338 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
-		ARG 0 codec
-	METHOD method_28339 isEmpty ()Z
-	CLASS class_4132 Entry
-		FIELD field_18400 data Ljava/lang/Object;
-		FIELD field_18401 weight I
-		FIELD field_18402 shuffledOrder D
-		METHOD <init> (Ljava/lang/Object;I)V
-			ARG 1 data
-			ARG 2 weight
-		METHOD method_19033 getShuffledOrder ()D
-		METHOD method_19034 setShuffledOrder (F)V
-			ARG 1 random
-		METHOD method_19035 getElement ()Ljava/lang/Object;
-		METHOD method_28341 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
-			ARG 0 codec
-		CLASS 1
-			METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
-				ARG 1 ops
-				ARG 2 object
-			METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
-				ARG 1 entry
-				ARG 2 ops
-				ARG 3 object
-			METHOD method_28344 (Lcom/mojang/serialization/Dynamic;Ljava/lang/Object;)Lnet/minecraft/class_4131$class_4132;
-				ARG 1 object
-			METHOD method_28345 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_4131$class_4132;)Lcom/mojang/datafixers/util/Pair;
-				ARG 1 entry

mappings/net/minecraft/util/dynamic/Codecs.mapping

@@ -2,30 +2,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs
 	COMMENT A few extensions for {@link Codec} or {@link DynamicOps}.
 	COMMENT
 	COMMENT <p>Expect its removal once Mojang updates DataFixerUpper.
-	FIELD field_28095 DOUBLE_STREAM Lcom/mojang/serialization/Codec;
-		COMMENT A codec for double streams.
-		COMMENT
-		COMMENT @see Codec#INT_STREAM
-	METHOD method_32848 getDoubleStream (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
-		COMMENT Decodes a double stream from {@code input}.
-		COMMENT
-		COMMENT @param <T> the input data type
-		COMMENT @see DynamicOps#getIntStream(Object)
-		ARG 0 ops
-		ARG 1 input
-	METHOD method_32849 (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Ljava/util/stream/Stream;)Lcom/mojang/serialization/DataResult;
-		ARG 2 stream
-	METHOD method_32850 createDoubleList (Lcom/mojang/serialization/DynamicOps;Ljava/util/stream/DoubleStream;)Ljava/lang/Object;
-		COMMENT Encodes a double stream to data of type {@code T}.
-		COMMENT
-		COMMENT @param <T> the output data type
-		COMMENT @see DynamicOps#createIntList(java.util.stream.IntStream)
-		ARG 0 ops
-		ARG 1 input
-	METHOD method_32851 (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)D
-		ARG 1 element
-	METHOD method_32852 (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Z
-		ARG 1 element
 	METHOD method_33817 xor (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
 		COMMENT Returns an exclusive-or codec for {@link Either} instances.
 		COMMENT
@@ -44,13 +20,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs
 			COMMENT the first codec
 		ARG 1 second
 			COMMENT the second codec
-	CLASS 1
-		METHOD read (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
-			ARG 1 ops
-			ARG 2 input
-		METHOD write (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/lang/Object;
-			ARG 1 ops
-			ARG 2 value
 	CLASS class_5839 Xor
 		COMMENT @see com.mojang.serialization.codecs.EitherCodec
 		FIELD field_28868 first Lcom/mojang/serialization/Codec;

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

@@ -19,11 +19,6 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox
 		COMMENT {@link #maxX}, {@link #maxY}, {@link #maxZ}.
 	METHOD <init> (IIIIII)V
 		ARG 1 minX
-		ARG 2 minY
-		ARG 3 minZ
-		ARG 4 maxX
-		ARG 5 maxY
-		ARG 6 maxZ
 	METHOD <init> (Lnet/minecraft/class_2338;)V
 		COMMENT Creates a box enclosing only {@code pos}.
 		ARG 1 pos
@@ -40,16 +35,8 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox
 	METHOD method_14662 contains (Lnet/minecraft/class_2382;)Z
 		ARG 1 vec
 	METHOD method_14663 getBlockCountY ()I
-	METHOD method_14664 getBlockCountZ ()I
 	METHOD method_14665 empty ()Lnet/minecraft/class_3341;
 		COMMENT Creates an empty box.
-	METHOD method_14666 create (IIIIII)Lnet/minecraft/class_3341;
-		ARG 0 x1
-		ARG 1 y1
-		ARG 2 z1
-		ARG 3 x2
-		ARG 4 y2
-		ARG 5 z2
 	METHOD method_14667 rotated (IIIIIIIIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341;
 		ARG 0 x
 		ARG 1 y
@@ -61,8 +48,6 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox
 		ARG 7 sizeY
 		ARG 8 sizeZ
 		ARG 9 facing
-	METHOD method_14668 encompass (Lnet/minecraft/class_3341;)V
-		ARG 1 region
 	METHOD method_14669 intersectsXZ (IIII)Z
 		ARG 1 minX
 		ARG 2 minZ
@@ -79,7 +64,6 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox
 		ARG 3 z
 	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;)Lnet/minecraft/class_3341;
 		ARG 1 vec
 	METHOD method_34389 encompass (Lnet/minecraft/class_2338;)Lnet/minecraft/class_3341;

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

@@ -24,8 +24,6 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos
 		ARG 1 pos
 	METHOD <init> (Lnet/minecraft/class_243;)V
 		ARG 1 pos
-	METHOD method_10059 subtract (Lnet/minecraft/class_2382;)Lnet/minecraft/class_2338;
-		ARG 1 pos
 	METHOD method_10060 offset (JLnet/minecraft/class_2350;)J
 		ARG 0 value
 		ARG 2 direction
@@ -55,12 +53,6 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos
 	METHOD method_10077 south (I)Lnet/minecraft/class_2338;
 		ARG 1 distance
 	METHOD method_10078 east ()Lnet/minecraft/class_2338;
-	METHOD method_10080 add (DDD)Lnet/minecraft/class_2338;
-		ARG 1 x
-		ARG 3 y
-		ARG 5 z
-	METHOD method_10081 add (Lnet/minecraft/class_2382;)Lnet/minecraft/class_2338;
-		ARG 1 pos
 	METHOD method_10083 unpackLongZ (J)I
 		ARG 0 packedPos
 	METHOD method_10084 up ()Lnet/minecraft/class_2338;
@@ -74,8 +66,6 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos
 		ARG 0 y
 	METHOD method_10092 fromLong (J)Lnet/minecraft/class_2338;
 		ARG 0 packedPos
-	METHOD method_10093 offset (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2338;
-		ARG 1 direction
 	METHOD method_10094 iterate (IIIIII)Ljava/lang/Iterable;
 		ARG 0 startX
 		ARG 1 startY
@@ -186,9 +176,6 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos
 		ARG 1 radius
 		ARG 2 firstDirection
 		ARG 3 secondDirection
-	METHOD method_30513 offset (Lnet/minecraft/class_2350$class_2351;I)Lnet/minecraft/class_2338;
-		ARG 1 axis
-		ARG 2 distance
 	METHOD method_33096 withY (I)Lnet/minecraft/class_2338;
 		ARG 1 y
 	METHOD method_34848 iterateRandomly (Ljava/util/Random;ILnet/minecraft/class_2338;I)Ljava/lang/Iterable;

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

@@ -1,15 +0,0 @@
-CLASS net/minecraft/class_4801 net/minecraft/util/math/IntRange
-	COMMENT An integer range, inclusive on both ends. Used to choose a random
-	COMMENT duration of memory.
-	FIELD field_22278 min I
-	FIELD field_22279 max I
-	METHOD <init> (II)V
-		ARG 1 min
-		ARG 2 max
-	METHOD method_24502 between (II)Lnet/minecraft/class_4801;
-		ARG 0 min
-		ARG 1 max
-	METHOD method_24503 choose (Ljava/util/Random;)I
-		ARG 1 random
-	METHOD method_29492 getMin ()I
-	METHOD method_29493 getMax ()I

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

@@ -12,10 +12,6 @@ CLASS net/minecraft/class_4581 net/minecraft/util/math/Matrix3f
 	FIELD field_21639 a20 F
 	FIELD field_21640 a21 F
 	FIELD field_21641 a22 F
-	METHOD <init> (Lnet/minecraft/class_1158;)V
-		ARG 1 quaternion
-	METHOD <init> (Lnet/minecraft/class_1159;)V
-		ARG 1 source
 	METHOD <init> (Lnet/minecraft/class_4581;)V
 		ARG 1 source
 	METHOD method_22847 transpose ()V

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

@@ -15,10 +15,6 @@ CLASS net/minecraft/class_1159 net/minecraft/util/math/Matrix4f
 	FIELD field_21665 a31 F
 	FIELD field_21666 a32 F
 	FIELD field_21667 a33 F
-	METHOD <init> (Lnet/minecraft/class_1158;)V
-		ARG 1 quaternion
-	METHOD <init> (Lnet/minecraft/class_1159;)V
-		ARG 1 source
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
 	METHOD method_22668 loadIdentity ()V

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

@@ -4,7 +4,6 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d
 	FIELD field_1351 y D
 	FIELD field_1352 x D
 	FIELD field_1353 ZERO Lnet/minecraft/class_243;
-	FIELD field_28243 CODEC Lcom/mojang/serialization/Codec;
 	METHOD <init> (DDD)V
 		ARG 1 x
 		ARG 3 y

mappings/net/minecraft/util/registry/Registry.mapping

@@ -144,6 +144,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
 		ARG 2 id
 		ARG 3 entry
 	METHOD method_10235 getIds ()Ljava/util/Set;
+	METHOD method_10240 getRandom (Ljava/util/Random;)Ljava/lang/Object;
 	METHOD method_10247 create (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;)Lnet/minecraft/class_2378;
 		ARG 0 key
 		ARG 1 defaultEntry

mappings/net/minecraft/util/registry/SimpleRegistry.mapping

@@ -8,8 +8,6 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry
 	FIELD field_26683 entryToRawId Lit/unimi/dsi/fastutil/objects/Object2IntMap;
 	FIELD field_26731 entryToLifecycle Ljava/util/Map;
 	FIELD field_26732 lifecycle Lcom/mojang/serialization/Lifecycle;
-	METHOD method_10240 getRandom (Ljava/util/Random;)Ljava/lang/Object;
-		ARG 1 random
 	METHOD method_29098 createRegistryManagerCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
 		ARG 0 key
 		ARG 1 lifecycle

mappings/net/minecraft/village/VillagerDataContainer.mapping

@@ -1,2 +1,3 @@
 CLASS net/minecraft/class_3851 net/minecraft/village/VillagerDataContainer
+	METHOD method_7195 setVillagerData (Lnet/minecraft/class_3850;)V
 	METHOD method_7231 getVillagerData ()Lnet/minecraft/class_3850;

mappings/net/minecraft/world/MobSpawnerLogic.mapping

@@ -3,7 +3,7 @@ CLASS net/minecraft/class_1917 net/minecraft/world/MobSpawnerLogic
 	FIELD field_9149 spawnCount I
 	FIELD field_9150 maxSpawnDelay I
 	FIELD field_9151 minSpawnDelay I
-	FIELD field_9152 spawnPotentials Ljava/util/List;
+	FIELD field_9152 spawnPotentials Lnet/minecraft/class_6012;
 	FIELD field_9153 renderedEntity Lnet/minecraft/class_1297;
 	FIELD field_9154 spawnDelay I
 	FIELD field_9155 spawnEntry Lnet/minecraft/class_1952;

mappings/net/minecraft/world/SpawnHelper.mapping

@@ -54,7 +54,7 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper
 	METHOD method_27822 getBiomeDirectly (Lnet/minecraft/class_2338;Lnet/minecraft/class_2791;)Lnet/minecraft/class_1959;
 		ARG 0 pos
 		ARG 1 chunk
-	METHOD method_29950 getSpawnEntries (Lnet/minecraft/class_3218;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Lnet/minecraft/class_2338;Lnet/minecraft/class_1959;)Ljava/util/List;
+	METHOD method_29950 getSpawnEntries (Lnet/minecraft/class_3218;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Lnet/minecraft/class_2338;Lnet/minecraft/class_1959;)Lnet/minecraft/class_6012;
 		ARG 0 world
 		ARG 1 structureAccessor
 		ARG 2 chunkGenerator

mappings/net/minecraft/world/TestableWorld.mapping

@@ -2,3 +2,4 @@ CLASS net/minecraft/class_3746 net/minecraft/world/TestableWorld
 	METHOD method_16358 testBlockState (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;)Z
 		ARG 1 pos
 		ARG 2 state
+	METHOD method_8598 getTopPosition (Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;

mappings/net/minecraft/world/TickScheduler.mapping

@@ -1,4 +1,5 @@
 CLASS net/minecraft/class_1951 net/minecraft/world/TickScheduler
+	METHOD method_20825 getTicks ()I
 	METHOD method_8674 isScheduled (Lnet/minecraft/class_2338;Ljava/lang/Object;)Z
 		ARG 1 pos
 		ARG 2 object

mappings/net/minecraft/world/World.mapping

@@ -79,6 +79,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
 		COMMENT <p>Debug worlds are not modifiable and are typically meant for development and debug use only.
 		COMMENT See <a href="https://minecraft.gamepedia.com/Debug_mode">the minecraft wiki</a> as well.
 	METHOD method_27983 getRegistryKey ()Lnet/minecraft/class_5321;
+	METHOD method_31419 asString ()Ljava/lang/String;
 	METHOD method_31592 getEntityLookup ()Lnet/minecraft/class_5577;
 	METHOD method_31594 addBlockEntityTicker (Lnet/minecraft/class_5562;)V
 		ARG 1 ticker
@@ -219,7 +220,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
 	METHOD method_8501 setBlockState (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z
 		ARG 1 pos
 		ARG 2 state
-	METHOD method_8503 getServer ()Lnet/minecraft/server/MinecraftServer;
 	METHOD method_8505 canPlayerModifyAt (Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;)Z
 		ARG 1 player
 		ARG 2 pos

mappings/net/minecraft/world/WorldAccess.mapping

@@ -3,6 +3,7 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess
 		ARG 1 eventId
 		ARG 2 pos
 		ARG 3 data
+	METHOD method_32819 getLogicalHeight ()I
 	METHOD method_32887 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;)V
 		ARG 1 entity
 		ARG 2 event
@@ -48,3 +49,4 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess
 		ARG 2 eventId
 		ARG 3 pos
 		ARG 4 data
+	METHOD method_8503 getServer ()Lnet/minecraft/server/MinecraftServer;

mappings/net/minecraft/world/biome/SpawnSettings.mapping

@@ -14,7 +14,7 @@ CLASS net/minecraft/class_5483 net/minecraft/world/biome/SpawnSettings
 	METHOD method_31002 getCreatureSpawnProbability ()F
 	METHOD method_31003 getSpawnDensity (Lnet/minecraft/class_1299;)Lnet/minecraft/class_5483$class_5265;
 		ARG 1 entityType
-	METHOD method_31004 getSpawnEntries (Lnet/minecraft/class_1311;)Ljava/util/List;
+	METHOD method_31004 getSpawnEntries (Lnet/minecraft/class_1311;)Lnet/minecraft/class_6012;
 		ARG 1 spawnGroup
 	METHOD method_31082 isPlayerSpawnFriendly ()Z
 	CLASS class_1964 SpawnEntry

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

@@ -10,4 +10,3 @@ CLASS net/minecraft/class_2834 net/minecraft/world/chunk/ArrayPalette
 		ARG 2 integer
 		ARG 3 resizeListener
 		ARG 4 valueDeserializer
-	METHOD method_12282 getSize ()I

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

@@ -13,4 +13,3 @@ CLASS net/minecraft/class_2814 net/minecraft/world/chunk/BiMapPalette
 		ARG 5 elementSerializer
 	METHOD method_12196 writeNbt (Lnet/minecraft/class_2499;)V
 		ARG 1 tag
-	METHOD method_12197 getIndexBits ()I

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

@@ -15,10 +15,12 @@ CLASS net/minecraft/class_2802 net/minecraft/world/chunk/ChunkManager
 		ARG 1 chunkX
 		ARG 2 chunkZ
 		ARG 3 create
+	METHOD method_12127 tick (Ljava/util/function/BooleanSupplier;)V
 	METHOD method_12128 setMobSpawnOptions (ZZ)V
 		ARG 1 spawnMonsters
 		ARG 2 spawnAnimals
 	METHOD method_12130 getLightingProvider ()Lnet/minecraft/class_3568;
+	METHOD method_14151 getLoadedChunkCount ()I
 	METHOD method_20529 shouldTickBlock (Lnet/minecraft/class_2338;)Z
 		ARG 1 pos
 	METHOD method_20591 shouldTickChunk (Lnet/minecraft/class_1923;)Z

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

@@ -1,4 +1,5 @@
 CLASS net/minecraft/class_2837 net/minecraft/world/chunk/Palette
+	METHOD method_12197 getIndexBits ()I
 	METHOD method_12286 readNbt (Lnet/minecraft/class_2499;)V
 		ARG 1 tag
 	METHOD method_12287 toPacket (Lnet/minecraft/class_2540;)V

mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping

@@ -10,25 +10,12 @@ CLASS net/minecraft/class_3558 net/minecraft/world/chunk/light/ChunkLightProvide
 		ARG 1 chunkProvider
 		ARG 2 type
 		ARG 3 lightStorage
-	METHOD method_15512 setColumnEnabled (Lnet/minecraft/class_1923;Z)V
-		ARG 1 pos
-		ARG 2 enabled
-	METHOD method_15513 checkBlock (Lnet/minecraft/class_2338;)V
-		ARG 1 pos
-	METHOD method_15514 addLightSource (Lnet/minecraft/class_2338;I)V
-		ARG 1 pos
-		ARG 2 level
 	METHOD method_15515 enqueueSectionData (JLnet/minecraft/class_2804;Z)V
 		ARG 1 sectionPos
 		ARG 3 lightArray
-	METHOD method_15516 doLightUpdates (IZZ)I
-		ARG 1 maxSteps
-		ARG 2 doSkylight
-		ARG 3 skipEdgeLightPropagation
 	METHOD method_15517 getCurrentLevelFromSection (Lnet/minecraft/class_2804;J)I
 		ARG 1 section
 		ARG 2 blockPos
-	METHOD method_15518 hasUpdates ()Z
 	METHOD method_17529 getChunk (II)Lnet/minecraft/class_1922;
 		ARG 1 chunkX
 		ARG 2 chunkZ

mappings/net/minecraft/world/chunk/light/LightingProvider.mapping

@@ -6,25 +6,12 @@ CLASS net/minecraft/class_3568 net/minecraft/world/chunk/light/LightingProvider
 		ARG 1 chunkProvider
 		ARG 2 hasBlockLight
 		ARG 3 hasSkyLight
-	METHOD method_15557 setColumnEnabled (Lnet/minecraft/class_1923;Z)V
-		ARG 1 pos
-		ARG 2 lightEnabled
 	METHOD method_15558 enqueueSectionData (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;Lnet/minecraft/class_2804;Z)V
 		ARG 1 lightType
 		ARG 2 pos
 		ARG 3 nibbles
-	METHOD method_15559 checkBlock (Lnet/minecraft/class_2338;)V
-		ARG 1 pos
-	METHOD method_15560 addLightSource (Lnet/minecraft/class_2338;I)V
-		ARG 1 pos
-		ARG 2 level
-	METHOD method_15561 hasUpdates ()Z
 	METHOD method_15562 get (Lnet/minecraft/class_1944;)Lnet/minecraft/class_3562;
 		ARG 1 lightType
-	METHOD method_15563 doLightUpdates (IZZ)I
-		ARG 1 maxUpdateCount
-		ARG 2 doSkylight
-		ARG 3 skipEdgeLightPropagation
 	METHOD method_20601 setRetainData (Lnet/minecraft/class_1923;Z)V
 		ARG 1 pos
 		ARG 2 retainData

mappings/net/minecraft/world/chunk/light/LightingView.mapping

@@ -1,4 +1,9 @@
 CLASS net/minecraft/class_3565 net/minecraft/world/chunk/light/LightingView
+	METHOD method_15512 setColumnEnabled (Lnet/minecraft/class_1923;Z)V
+	METHOD method_15513 checkBlock (Lnet/minecraft/class_2338;)V
+	METHOD method_15514 addLightSource (Lnet/minecraft/class_2338;I)V
+	METHOD method_15516 doLightUpdates (IZZ)I
+	METHOD method_15518 hasUpdates ()Z
 	METHOD method_15551 setSectionStatus (Lnet/minecraft/class_4076;Z)V
 		ARG 1 pos
 		ARG 2 notReady

mappings/net/minecraft/world/entity/EntityLike.mapping

@@ -1,5 +1,6 @@
 CLASS net/minecraft/class_5568 net/minecraft/world/entity/EntityLike
 	COMMENT A prototype of entity that's suitable for entity manager to handle.
+	METHOD method_24204 streamSelfAndPassengers ()Ljava/util/stream/Stream;
 	METHOD method_24515 getBlockPos ()Lnet/minecraft/class_2338;
 	METHOD method_31744 setListener (Lnet/minecraft/class_5569;)V
 		ARG 1 listener

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

@@ -1,8 +1,8 @@
 CLASS net/minecraft/class_2984 net/minecraft/world/gen/CountConfig
-	FIELD field_13385 count Lnet/minecraft/class_5428;
+	FIELD field_13385 count Lnet/minecraft/class_6017;
 	FIELD field_24878 CODEC Lcom/mojang/serialization/Codec;
 	METHOD <init> (I)V
 		ARG 1 count
-	METHOD <init> (Lnet/minecraft/class_5428;)V
+	METHOD <init> (Lnet/minecraft/class_6017;)V
 		ARG 1 distribution
-	METHOD method_30396 getCount ()Lnet/minecraft/class_5428;
+	METHOD method_30396 getCount ()Lnet/minecraft/class_6017;

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

@@ -4,5 +4,3 @@ CLASS net/minecraft/class_5820 net/minecraft/world/gen/SimpleRandom
 		ARG 1 seed
 	METHOD method_33651 next (I)I
 		ARG 1 bits
-	METHOD setSeed (J)V
-		ARG 1 seed

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

@@ -28,8 +28,6 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor
 	METHOD method_27834 shouldGenerateStructures ()Z
 	METHOD method_28386 (Lnet/minecraft/class_2338;Lnet/minecraft/class_3443;)Z
 		ARG 1 piece
-	METHOD method_28387 (Lnet/minecraft/class_2338;Lnet/minecraft/class_3449;)Z
-		ARG 1 structureStart
 	METHOD method_28388 getStructureAt (Lnet/minecraft/class_2338;ZLnet/minecraft/class_3195;)Lnet/minecraft/class_3449;
 		ARG 1 pos
 		ARG 2 matchChildren

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

@@ -1,22 +0,0 @@
-CLASS net/minecraft/class_5428 net/minecraft/world/gen/UniformIntDistribution
-	FIELD field_25809 CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_25810 base I
-	FIELD field_25811 spread I
-	METHOD <init> (II)V
-		ARG 1 base
-		ARG 2 spread
-	METHOD method_30314 of (I)Lnet/minecraft/class_5428;
-		COMMENT Creates a distribution with a constant value.
-		ARG 0 value
-			COMMENT the constant value
-	METHOD method_30315 of (II)Lnet/minecraft/class_5428;
-		ARG 0 base
-		ARG 1 spread
-	METHOD method_30316 createValidatedCodec (III)Lcom/mojang/serialization/Codec;
-		ARG 0 minBase
-		ARG 1 maxBase
-		ARG 2 maxSpread
-	METHOD method_30321 getValue (Ljava/util/Random;)I
-		ARG 1 random
-	METHOD method_32870 minValue ()I
-	METHOD method_32871 maxValue ()I

mappings/net/minecraft/world/gen/carver/CarverConfig.mapping

@@ -1,7 +1,3 @@
 CLASS net/minecraft/class_5871 net/minecraft/world/gen/carver/CarverConfig
 	FIELD field_29053 debugConfig Lnet/minecraft/class_5872;
-	FIELD field_29054 CONFIG_CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_29054 CONFIG_CODEC Lcom/mojang/serialization/MapCodec;
-	METHOD <init> (FLnet/minecraft/class_5872;)V
-		ARG 1 chance
-		ARG 2 debugConfig
-	METHOD method_33969 getDebugConfig ()Lnet/minecraft/class_5872;

mappings/net/minecraft/world/gen/carver/CaveCarver.mapping

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_2925 net/minecraft/world/gen/carver/CaveCarver
-	METHOD method_12674 carveCave (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;JIDDDFDLjava/util/BitSet;Lnet/minecraft/class_2939$class_5874;)V
+	METHOD method_12674 carveCave (Lnet/minecraft/class_5873;Lnet/minecraft/class_6108;Lnet/minecraft/class_2791;Ljava/util/function/Function;JIDDDFDLjava/util/BitSet;Lnet/minecraft/class_2939$class_5874;)V
 		ARG 1 context
 		ARG 2 config
 		ARG 3 chunk
@@ -13,7 +13,7 @@ CLASS net/minecraft/class_2925 net/minecraft/world/gen/carver/CaveCarver
 		ARG 15 yawPitchRatio
 		ARG 17 carvingMask
 		ARG 18 skipPredicate
-	METHOD method_12675 carveTunnels (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;JIDDDDDFFFIIDLjava/util/BitSet;Lnet/minecraft/class_2939$class_5874;)V
+	METHOD method_12675 carveTunnels (Lnet/minecraft/class_5873;Lnet/minecraft/class_6108;Lnet/minecraft/class_2791;Ljava/util/function/Function;JIDDDDDFFFIIDLjava/util/BitSet;Lnet/minecraft/class_2939$class_5874;)V
 		ARG 1 context
 		ARG 2 config
 		ARG 3 chunk
@@ -37,9 +37,6 @@ CLASS net/minecraft/class_2925 net/minecraft/world/gen/carver/CaveCarver
 		ARG 1 random
 	METHOD method_16577 getMaxCaveCount ()I
 	METHOD method_16578 getTunnelSystemHeightWidthRatio ()D
-	METHOD method_16579 getCaveY (Lnet/minecraft/class_5873;Ljava/util/Random;)I
-		ARG 1 context
-		ARG 2 random
 	METHOD method_33974 isPositionExcluded (DDDD)Z
 		ARG 0 scaledRelativeX
 		ARG 2 scaledRelativeY

mappings/net/minecraft/world/gen/carver/RavineCarver.mapping

@@ -23,10 +23,6 @@ CLASS net/minecraft/class_5870 net/minecraft/world/gen/carver/RavineCarver
 		ARG 18 branchCount
 		ARG 19 yawPitchRatio
 		ARG 21 carvingMask
-	METHOD method_33963 getY (Lnet/minecraft/class_5873;Lnet/minecraft/class_5869;Ljava/util/Random;)I
-		ARG 1 context
-		ARG 2 config
-		ARG 3 random
 	METHOD method_33964 isPositionExcluded (Lnet/minecraft/class_5873;[FDDDI)Z
 		ARG 1 context
 		ARG 2 horizontalStretchFactors

mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping

@@ -1,35 +1,2 @@
 CLASS net/minecraft/class_5869 net/minecraft/world/gen/carver/RavineCarverConfig
 	FIELD field_29041 RAVINE_CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_29042 bottom Lnet/minecraft/class_5843;
-	FIELD field_29043 top Lnet/minecraft/class_5843;
-	FIELD field_29044 yScale Lnet/minecraft/class_5428;
-	FIELD field_29045 distanceFactor Lnet/minecraft/class_5863;
-	FIELD field_29046 verticalRotation Lnet/minecraft/class_5863;
-	FIELD field_29047 thickness Lnet/minecraft/class_5863;
-	FIELD field_29048 widthSmoothness I
-	FIELD field_29049 horizontalRadiusFactor Lnet/minecraft/class_5863;
-	FIELD field_29050 verticalRadiusDefaultFactor F
-	FIELD field_29051 verticalRadiusCenterFactor F
-	METHOD <init> (FLnet/minecraft/class_5872;Lnet/minecraft/class_5843;Lnet/minecraft/class_5843;Lnet/minecraft/class_5428;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;ILnet/minecraft/class_5863;FF)V
-		ARG 1 probability
-		ARG 2 debugConfig
-		ARG 3 bottom
-		ARG 4 top
-		ARG 5 yScale
-		ARG 6 distanceFactor
-		ARG 7 verticalRotation
-		ARG 8 thickness
-		ARG 9 widthSmoothness
-		ARG 10 horizontalRadiusFactor
-		ARG 11 verticalRadiusDefaultFactor
-		ARG 12 verticalRadiusCenterFactor
-	METHOD method_33947 getBottom ()Lnet/minecraft/class_5843;
-	METHOD method_33950 getTop ()Lnet/minecraft/class_5843;
-	METHOD method_33951 getYScale ()Lnet/minecraft/class_5428;
-	METHOD method_33952 getDistanceFactor ()Lnet/minecraft/class_5863;
-	METHOD method_33953 getVerticalRotation ()Lnet/minecraft/class_5863;
-	METHOD method_33954 getThickness ()Lnet/minecraft/class_5863;
-	METHOD method_33955 getWidthSmoothness ()I
-	METHOD method_33956 getHorizontalRadiusFactor ()Lnet/minecraft/class_5863;
-	METHOD method_33957 getVerticalRadiusDefaultFactor ()F
-	METHOD method_33958 getVerticalRadiusCenterFactor ()F

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

@@ -60,7 +60,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
 		COMMENT Places the surface blocks of the biomes after the noise has been generated.
 		ARG 1 region
 		ARG 2 chunk
-	METHOD method_12113 getEntitySpawnList (Lnet/minecraft/class_1959;Lnet/minecraft/class_5138;Lnet/minecraft/class_1311;Lnet/minecraft/class_2338;)Ljava/util/List;
+	METHOD method_12113 getEntitySpawnList (Lnet/minecraft/class_1959;Lnet/minecraft/class_5138;Lnet/minecraft/class_1311;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6012;
 		ARG 1 biome
 		ARG 2 accessor
 		ARG 3 group

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

@@ -7,7 +7,7 @@ CLASS net/minecraft/class_5432 net/minecraft/world/gen/decorator/Decoratable
 		COMMENT allows positions with a {@code 1 / count} chance,
 		COMMENT e.g. a count of 2 would give approximately half of the input positions.
 		ARG 1 chance
-	METHOD method_30373 repeat (Lnet/minecraft/class_5428;)Ljava/lang/Object;
+	METHOD method_30373 repeat (Lnet/minecraft/class_6017;)Ljava/lang/Object;
 		COMMENT Applies the {@code minecraft:count} decorator, which repeats
 		COMMENT the input positions by the value of the {@code count} distribution.
 		ARG 1 count

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

@@ -1,9 +1,9 @@
 CLASS net/minecraft/class_5156 net/minecraft/world/gen/feature/BasaltColumnsFeatureConfig
 	FIELD field_24877 CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_25841 reach Lnet/minecraft/class_5428;
+	FIELD field_25841 reach Lnet/minecraft/class_6017;
-	FIELD field_25842 height Lnet/minecraft/class_5428;
+	FIELD field_25842 height Lnet/minecraft/class_6017;
-	METHOD <init> (Lnet/minecraft/class_5428;Lnet/minecraft/class_5428;)V
+	METHOD <init> (Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;)V
 		ARG 1 reach
 		ARG 2 height
-	METHOD method_30391 getReach ()Lnet/minecraft/class_5428;
+	METHOD method_30391 getReach ()Lnet/minecraft/class_6017;
-	METHOD method_30394 getHeight ()Lnet/minecraft/class_5428;
+	METHOD method_30394 getHeight ()Lnet/minecraft/class_6017;

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

@@ -2,14 +2,14 @@ CLASS net/minecraft/class_5158 net/minecraft/world/gen/feature/DeltaFeatureConfi
 	FIELD field_23895 contents Lnet/minecraft/class_2680;
 	FIELD field_23896 rim Lnet/minecraft/class_2680;
 	FIELD field_24881 CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_25843 size Lnet/minecraft/class_5428;
+	FIELD field_25843 size Lnet/minecraft/class_6017;
-	FIELD field_25844 rimSize Lnet/minecraft/class_5428;
+	FIELD field_25844 rimSize Lnet/minecraft/class_6017;
-	METHOD <init> (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_5428;Lnet/minecraft/class_5428;)V
+	METHOD <init> (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;)V
 		ARG 1 contents
 		ARG 2 rim
 		ARG 3 size
 		ARG 4 rimSize
 	METHOD method_30397 getContents ()Lnet/minecraft/class_2680;
 	METHOD method_30400 getRim ()Lnet/minecraft/class_2680;
-	METHOD method_30402 getSize ()Lnet/minecraft/class_5428;
+	METHOD method_30402 getSize ()Lnet/minecraft/class_6017;
-	METHOD method_30403 getRimSize ()Lnet/minecraft/class_5428;
+	METHOD method_30403 getRimSize ()Lnet/minecraft/class_6017;

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

@@ -2,9 +2,9 @@ CLASS net/minecraft/class_3013 net/minecraft/world/gen/feature/DiskFeatureConfig
 	FIELD field_13469 targets Ljava/util/List;
 	FIELD field_13470 state Lnet/minecraft/class_2680;
 	FIELD field_13471 halfHeight I
-	FIELD field_13472 radius Lnet/minecraft/class_5428;
+	FIELD field_13472 radius Lnet/minecraft/class_6017;
 	FIELD field_24882 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Lnet/minecraft/class_2680;Lnet/minecraft/class_5428;ILjava/util/List;)V
+	METHOD <init> (Lnet/minecraft/class_2680;Lnet/minecraft/class_6017;ILjava/util/List;)V
 		ARG 1 state
 		ARG 2 radius
 		ARG 3 halfHeight

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

@@ -1,17 +1,17 @@
 CLASS net/minecraft/class_5731 net/minecraft/world/gen/feature/DripstoneClusterFeatureConfig
 	FIELD field_28213 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_28214 floorToCeilingSearchRange I
-	FIELD field_28215 height Lnet/minecraft/class_5428;
+	FIELD field_28215 height Lnet/minecraft/class_6017;
-	FIELD field_28216 radius Lnet/minecraft/class_5428;
+	FIELD field_28216 radius Lnet/minecraft/class_6017;
 	FIELD field_28217 maxStalagmiteStalactiteHeightDiff I
 	FIELD field_28218 heightDeviation I
-	FIELD field_28219 dripstoneBlockLayerThickness Lnet/minecraft/class_5428;
+	FIELD field_28219 dripstoneBlockLayerThickness Lnet/minecraft/class_6017;
 	FIELD field_28220 density Lnet/minecraft/class_5863;
 	FIELD field_28221 wetness Lnet/minecraft/class_5863;
 	FIELD field_28224 chanceOfDripstoneColumnAtMaxDistanceFromCenter F
 	FIELD field_28225 maxDistanceFromCenterAffectingChanceOfDripstoneColumn I
 	FIELD field_28226 maxDistanceFromCenterAffectingHeightBias I
-	METHOD <init> (ILnet/minecraft/class_5428;Lnet/minecraft/class_5428;IILnet/minecraft/class_5428;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;FII)V
+	METHOD <init> (ILnet/minecraft/class_6017;Lnet/minecraft/class_6017;IILnet/minecraft/class_6017;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;FII)V
 		ARG 1 floorToCeilingSearchRange
 		ARG 2 height
 		ARG 3 radius

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

@@ -1,11 +1,11 @@
 CLASS net/minecraft/class_5924 net/minecraft/world/gen/feature/GrowingPlantFeatureConfig
 	FIELD field_29259 CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_29260 heightDistribution Lnet/minecraft/class_4131;
+	FIELD field_29260 heightDistribution Lnet/minecraft/class_6005;
 	FIELD field_29261 direction Lnet/minecraft/class_2350;
 	FIELD field_29262 bodyProvider Lnet/minecraft/class_4651;
 	FIELD field_29263 headProvider Lnet/minecraft/class_4651;
 	FIELD field_29264 allowWater Z
-	METHOD <init> (Lnet/minecraft/class_4131;Lnet/minecraft/class_2350;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Z)V
+	METHOD <init> (Lnet/minecraft/class_6005;Lnet/minecraft/class_2350;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Z)V
 		ARG 1 heightDistribution
 		ARG 2 direction
 		ARG 3 bodyProvider

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

@@ -5,9 +5,9 @@ CLASS net/minecraft/class_5434 net/minecraft/world/gen/feature/JigsawFeature
 		ARG 1 codec
 		ARG 2 structureStartY
 		ARG 4 surface
-	METHOD method_30386 (Lnet/minecraft/class_3195;Lnet/minecraft/class_1923;Lnet/minecraft/class_3341;IJ)Lnet/minecraft/class_3449;
+	METHOD method_30386 (Lnet/minecraft/class_3195;Lnet/minecraft/class_1923;IJ)Lnet/minecraft/class_3449;
 		ARG 1 feature
 	CLASS class_5435 Start
 		FIELD field_25838 jigsawFeature Lnet/minecraft/class_5434;
-		METHOD <init> (Lnet/minecraft/class_5434;Lnet/minecraft/class_1923;Lnet/minecraft/class_3341;IJ)V
+		METHOD <init> (Lnet/minecraft/class_5434;Lnet/minecraft/class_1923;IJ)V
 			ARG 1 feature

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

@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_5732 net/minecraft/world/gen/feature/LargeDripstoneFeatureConfig
 	FIELD field_28227 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_28228 floorToCeilingSearchRange I
-	FIELD field_28229 columnRadius Lnet/minecraft/class_5428;
+	FIELD field_28229 columnRadius Lnet/minecraft/class_6017;
 	FIELD field_28230 heightScale Lnet/minecraft/class_5863;
 	FIELD field_28231 maxColumnRadiusToCaveHeightRatio F
 	FIELD field_28232 stalactiteBluntness Lnet/minecraft/class_5863;
@@ -9,7 +9,7 @@ CLASS net/minecraft/class_5732 net/minecraft/world/gen/feature/LargeDripstoneFea
 	FIELD field_28234 windSpeed Lnet/minecraft/class_5863;
 	FIELD field_28235 minRadiusForWind I
 	FIELD field_28236 minBluntnessForWind F
-	METHOD <init> (ILnet/minecraft/class_5428;Lnet/minecraft/class_5863;FLnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;IF)V
+	METHOD <init> (ILnet/minecraft/class_6017;Lnet/minecraft/class_5863;FLnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;IF)V
 		ARG 1 floorToCeilingSearchRange
 		ARG 2 columnRadius
 		ARG 3 heightScale

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

@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_3108 net/minecraft/world/gen/feature/NetherFortressFeature
-	FIELD field_13705 MONSTER_SPAWNS Ljava/util/List;
+	FIELD field_13705 MONSTER_SPAWNS Lnet/minecraft/class_6012;
 	CLASS class_3109 Start

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

@@ -1,6 +1,3 @@
 CLASS net/minecraft/class_3116 net/minecraft/world/gen/feature/OceanMonumentFeature
-	FIELD field_13716 MONSTER_SPAWNS Ljava/util/List;
+	FIELD field_13716 MONSTER_SPAWNS Lnet/minecraft/class_6012;
 	CLASS class_3117 Start
-		FIELD field_13717 initialized Z
-		METHOD method_16588 init (Lnet/minecraft/class_1923;)V
-			ARG 1 pos

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

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_3770 net/minecraft/world/gen/feature/PillagerOutpostFeature
-	FIELD field_16656 MONSTER_SPAWNS Ljava/util/List;
+	FIELD field_16656 MONSTER_SPAWNS Lnet/minecraft/class_6012;
 	METHOD method_30845 isVillageNearby (Lnet/minecraft/class_2794;JLnet/minecraft/class_2919;Lnet/minecraft/class_1923;)Z
 		ARG 1 generator
 		ARG 2 worldSeed

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

@@ -2,9 +2,9 @@ CLASS net/minecraft/class_5437 net/minecraft/world/gen/feature/ReplaceBlobsFeatu
 	FIELD field_25848 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_25849 target Lnet/minecraft/class_2680;
 	FIELD field_25850 state Lnet/minecraft/class_2680;
-	FIELD field_25851 radius Lnet/minecraft/class_5428;
+	FIELD field_25851 radius Lnet/minecraft/class_6017;
-	METHOD <init> (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_5428;)V
+	METHOD <init> (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_6017;)V
 		ARG 1 target
 		ARG 2 state
 		ARG 3 radius
-	METHOD method_30405 getRadius ()Lnet/minecraft/class_5428;
+	METHOD method_30405 getRadius ()Lnet/minecraft/class_6017;

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

@@ -8,7 +8,7 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature
 	FIELD field_26362 JIGSAW_ID Lnet/minecraft/class_2960;
 	METHOD <init> (Lcom/mojang/serialization/Codec;)V
 		ARG 1 codec
-	METHOD method_13149 getMonsterSpawns ()Ljava/util/List;
+	METHOD method_13149 getMonsterSpawns ()Lnet/minecraft/class_6012;
 	METHOD method_14015 locateStructure (Lnet/minecraft/class_4538;Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;IZJLnet/minecraft/class_5314;)Lnet/minecraft/class_2338;
 		COMMENT Tries to find the closest structure of this type near a given block.
 		COMMENT <p>
@@ -39,7 +39,7 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature
 		ARG 6 pos
 		ARG 9 config
 		ARG 10 world
-	METHOD method_16140 getCreatureSpawns ()Ljava/util/List;
+	METHOD method_16140 getCreatureSpawns ()Lnet/minecraft/class_6012;
 	METHOD method_27218 getStartChunk (Lnet/minecraft/class_5314;JLnet/minecraft/class_2919;II)Lnet/minecraft/class_1923;
 		COMMENT Determines the cell of the structure placement grid a chunk belongs to, and
 		COMMENT returns the chunk within that cell, that this structure will actually be placed at.
@@ -59,11 +59,8 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature
 		COMMENT If true, this structure's start position will be uniformly distributed within
 		COMMENT a placement grid cell. If false, the structure's starting point will be biased
 		COMMENT towards the center of the cell.
-	METHOD method_28656 createStart (Lnet/minecraft/class_1923;Lnet/minecraft/class_3341;IJ)Lnet/minecraft/class_3449;
+	METHOD method_28656 createStart (Lnet/minecraft/class_1923;IJ)Lnet/minecraft/class_3449;
 		ARG 1 pos
-		ARG 2 box
-		ARG 3 references
-		ARG 4 worldSeed
 	METHOD method_28657 tryPlaceStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;Lnet/minecraft/class_1959;ILnet/minecraft/class_2919;Lnet/minecraft/class_5314;Lnet/minecraft/class_3037;Lnet/minecraft/class_5539;)Lnet/minecraft/class_3449;
 		COMMENT Tries to place a starting point for this type of structure in the given chunk.
 		COMMENT <p>
@@ -96,9 +93,6 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature
 	METHOD method_28664 init ()V
 	METHOD method_28665 getCodec ()Lcom/mojang/serialization/Codec;
 	CLASS class_3774 StructureStartFactory
-		METHOD create (Lnet/minecraft/class_3195;Lnet/minecraft/class_1923;Lnet/minecraft/class_3341;IJ)Lnet/minecraft/class_3449;
+		METHOD create (Lnet/minecraft/class_3195;Lnet/minecraft/class_1923;IJ)Lnet/minecraft/class_3449;
 			ARG 1 feature
 			ARG 2 pos
-			ARG 3 box
-			ARG 4 references
-			ARG 5 worldSeed

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

@@ -1,4 +1,4 @@
 CLASS net/minecraft/class_3197 net/minecraft/world/gen/feature/SwampHutFeature
-	FIELD field_13882 MONSTER_SPAWNS Ljava/util/List;
+	FIELD field_13882 MONSTER_SPAWNS Lnet/minecraft/class_6012;
-	FIELD field_16435 CREATURE_SPAWNS Ljava/util/List;
+	FIELD field_16435 CREATURE_SPAWNS Lnet/minecraft/class_6012;
 	CLASS class_3198 Start

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

@@ -3,14 +3,9 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 state
-	METHOD method_12775 generate (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_2338;Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)Z
+	METHOD method_12775 generate (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_2338;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;Lnet/minecraft/class_4643;)Z
 		ARG 1 world
-		ARG 2 random
 		ARG 3 pos
-		ARG 4 logPositions
-		ARG 5 leavesPositions
-		ARG 6 box
-		ARG 7 config
 	METHOD method_16416 isVine (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z
 		ARG 0 world
 		ARG 1 pos
@@ -40,19 +35,11 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature
 		ARG 0 world
 		ARG 1 pos
 	METHOD method_23380 placeLogsAndLeaves (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;Ljava/util/Set;Ljava/util/Set;)Lnet/minecraft/class_251;
-		ARG 1 world
-		ARG 2 box
-		ARG 3 logs
-		ARG 4 leaves
-	METHOD method_23381 (Lnet/minecraft/class_5281;Ljava/util/Random;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4662;)V
-		ARG 6 decorator
 	METHOD method_23384 (Lnet/minecraft/class_2680;)Z
 		ARG 0 state
 	METHOD method_27371 canReplace (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z
 		ARG 0 world
 		ARG 1 pos
-	METHOD method_27372 (Lnet/minecraft/class_4643;Lnet/minecraft/class_5281;Ljava/util/Random;IIILjava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4647$class_5208;)V
-		ARG 8 node
 	METHOD method_29963 getTopPosition (Lnet/minecraft/class_3746;ILnet/minecraft/class_2338;Lnet/minecraft/class_4643;)I
 		ARG 1 world
 		ARG 2 height

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

@@ -4,13 +4,13 @@ CLASS net/minecraft/class_5927 net/minecraft/world/gen/feature/VegetationPatchFe
 	FIELD field_29287 groundState Lnet/minecraft/class_4651;
 	FIELD field_29288 vegetationFeature Ljava/util/function/Supplier;
 	FIELD field_29289 surface Lnet/minecraft/class_5932;
-	FIELD field_29290 depth Lnet/minecraft/class_5428;
+	FIELD field_29290 depth Lnet/minecraft/class_6017;
 	FIELD field_29291 extraBottomBlockChance F
 	FIELD field_29292 verticalRange I
 	FIELD field_29293 vegetationChance F
-	FIELD field_29294 horizontalRadius Lnet/minecraft/class_5428;
+	FIELD field_29294 horizontalRadius Lnet/minecraft/class_6017;
 	FIELD field_29295 extraEdgeColumnChance F
-	METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_4651;Ljava/util/function/Supplier;Lnet/minecraft/class_5932;Lnet/minecraft/class_5428;FIFLnet/minecraft/class_5428;F)V
+	METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_4651;Ljava/util/function/Supplier;Lnet/minecraft/class_5932;Lnet/minecraft/class_6017;FIFLnet/minecraft/class_6017;F)V
 		ARG 1 replaceable
 		ARG 2 groundState
 		ARG 3 vegetationFeature

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

@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_4646 net/minecraft/world/gen/foliage/BlobFoliagePlacer
 	FIELD field_23752 height I
 	FIELD field_24927 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Lnet/minecraft/class_5428;Lnet/minecraft/class_5428;I)V
+	METHOD <init> (Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;I)V
 		ARG 1 radius
 		ARG 2 offset
 		ARG 3 height

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

@@ -1,33 +1,18 @@
 CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer
-	FIELD field_21296 radius Lnet/minecraft/class_5428;
+	FIELD field_21296 radius Lnet/minecraft/class_6017;
-	FIELD field_23753 offset Lnet/minecraft/class_5428;
+	FIELD field_23753 offset Lnet/minecraft/class_6017;
 	FIELD field_24931 TYPE_CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Lnet/minecraft/class_5428;Lnet/minecraft/class_5428;)V
+	METHOD <init> (Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;)V
 		ARG 1 radius
 		ARG 2 offset
-	METHOD method_23448 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4643;ILnet/minecraft/class_4647$class_5208;IILjava/util/Set;ILnet/minecraft/class_3341;)V
+	METHOD method_23448 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_4643;ILnet/minecraft/class_4647$class_5208;III)V
 		COMMENT This is the main method used to generate foliage.
-		ARG 1 world
-		ARG 2 random
-		ARG 3 config
-		ARG 4 trunkHeight
-		ARG 5 treeNode
-		ARG 6 foliageHeight
 		ARG 7 radius
-		ARG 8 leaves
 		ARG 9 offset
-		ARG 10 box
+	METHOD method_23449 generateSquare (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;IIZ)V
-	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 positions
 		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
@@ -43,16 +28,7 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer
 		ARG 1 random
 		ARG 2 trunkHeight
 		ARG 3 config
-	METHOD method_27385 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4643;ILnet/minecraft/class_4647$class_5208;IILjava/util/Set;Lnet/minecraft/class_3341;)V
+	METHOD method_27385 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_4643;ILnet/minecraft/class_4647$class_5208;II)V
-		ARG 1 world
-		ARG 2 random
-		ARG 3 config
-		ARG 4 trunkHeight
-		ARG 5 treeNode
-		ARG 6 foliageHeight
-		ARG 7 radius
-		ARG 8 leaves
-		ARG 9 box
 	METHOD method_27386 getRandomOffset (Ljava/util/Random;)I
 		ARG 1 random
 	METHOD method_27387 isPositionInvalid (Ljava/util/Random;IIIIZ)Z
@@ -65,13 +41,9 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer
 		ARG 6 giantTrunk
 	METHOD method_28843 getType ()Lnet/minecraft/class_4648;
 	METHOD method_30411 fillFoliagePlacerFields (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/Products$P2;
-	METHOD method_34359 placeFoliageBlock (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4643;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_2338$class_2339;)V
+	METHOD method_34359 placeFoliageBlock (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;)V
-		ARG 1 world
 		ARG 2 random
 		ARG 3 config
-		ARG 4 positions
-		ARG 5 box
-		ARG 6 mutablePos
 	CLASS class_5208 TreeNode
 		COMMENT A point on a tree to generate foliage around
 		FIELD field_24158 center Lnet/minecraft/class_2338;

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

@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_5209 net/minecraft/world/gen/foliage/JungleFoliagePlacer
 	FIELD field_24166 height I
 	FIELD field_24933 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Lnet/minecraft/class_5428;Lnet/minecraft/class_5428;I)V
+	METHOD <init> (Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;I)V
 		ARG 1 radius
 		ARG 2 offset
 		ARG 3 height

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

@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_5210 net/minecraft/world/gen/foliage/MegaPineFoliagePlacer
-	FIELD field_24168 crownHeight Lnet/minecraft/class_5428;
+	FIELD field_24168 crownHeight Lnet/minecraft/class_6017;
 	FIELD field_24934 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Lnet/minecraft/class_5428;Lnet/minecraft/class_5428;Lnet/minecraft/class_5428;)V
+	METHOD <init> (Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;)V
 		ARG 1 radius
 		ARG 2 offset
 		ARG 3 crownHeight

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

@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_4649 net/minecraft/world/gen/foliage/PineFoliagePlacer
-	FIELD field_23755 height Lnet/minecraft/class_5428;
+	FIELD field_23755 height Lnet/minecraft/class_6017;
 	FIELD field_24935 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Lnet/minecraft/class_5428;Lnet/minecraft/class_5428;Lnet/minecraft/class_5428;)V
+	METHOD <init> (Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;)V
 		ARG 1 radius
 		ARG 2 offset
 		ARG 3 height

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

@@ -1,8 +1,8 @@
 CLASS net/minecraft/class_5928 net/minecraft/world/gen/foliage/RandomSpreadFoliagePlacer
 	FIELD field_29297 CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_29298 foliageHeight Lnet/minecraft/class_5428;
+	FIELD field_29298 foliageHeight Lnet/minecraft/class_6017;
 	FIELD field_29299 leafPlacementAttempts I
-	METHOD <init> (Lnet/minecraft/class_5428;Lnet/minecraft/class_5428;Lnet/minecraft/class_5428;I)V
+	METHOD <init> (Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;I)V
 		ARG 1 radius
 		ARG 2 offset
 		ARG 3 foliageHeight

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

@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_4650 net/minecraft/world/gen/foliage/SpruceFoliagePlacer
-	FIELD field_23757 trunkHeight Lnet/minecraft/class_5428;
+	FIELD field_23757 trunkHeight Lnet/minecraft/class_6017;
 	FIELD field_24936 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Lnet/minecraft/class_5428;Lnet/minecraft/class_5428;Lnet/minecraft/class_5428;)V
+	METHOD <init> (Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;)V
 		ARG 1 radius
 		ARG 2 offset
 		ARG 3 trunkHeight

mappings/net/minecraft/world/gen/stateprovider/RandomizedIntBlockStateProvider.mapping

@@ -4,12 +4,12 @@ CLASS net/minecraft/class_5929 net/minecraft/world/gen/stateprovider/RandomizedI
 	FIELD field_29302 source Lnet/minecraft/class_4651;
 	FIELD field_29303 propertyName Ljava/lang/String;
 	FIELD field_29304 property Lnet/minecraft/class_2758;
-	FIELD field_29305 values Lnet/minecraft/class_5428;
+	FIELD field_29305 values Lnet/minecraft/class_6017;
-	METHOD <init> (Lnet/minecraft/class_4651;Ljava/lang/String;Lnet/minecraft/class_5428;)V
+	METHOD <init> (Lnet/minecraft/class_4651;Ljava/lang/String;Lnet/minecraft/class_6017;)V
 		ARG 1 source
 		ARG 2 propertyName
 		ARG 3 values
-	METHOD <init> (Lnet/minecraft/class_4651;Lnet/minecraft/class_2758;Lnet/minecraft/class_5428;)V
+	METHOD <init> (Lnet/minecraft/class_4651;Lnet/minecraft/class_2758;Lnet/minecraft/class_6017;)V
 		ARG 1 source
 		ARG 2 property
 		ARG 3 values

mappings/net/minecraft/world/gen/stateprovider/WeightedBlockStateProvider.mapping

@@ -1,10 +1,7 @@
 CLASS net/minecraft/class_4657 net/minecraft/world/gen/stateprovider/WeightedBlockStateProvider
-	FIELD field_21315 states Lnet/minecraft/class_4131;
+	FIELD field_21315 states Lnet/minecraft/class_6005;
 	FIELD field_24946 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Lnet/minecraft/class_4131;)V
+	METHOD <init> (Lnet/minecraft/class_6005;)V
 		ARG 1 states
-	METHOD method_23458 addState (Lnet/minecraft/class_2680;I)Lnet/minecraft/class_4657;
+	METHOD method_28868 wrap (Lnet/minecraft/class_6005;)Lcom/mojang/serialization/DataResult;
-		ARG 1 state
-		ARG 2 weight
-	METHOD method_28868 wrap (Lnet/minecraft/class_4131;)Lcom/mojang/serialization/DataResult;
 		ARG 0 states

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

@@ -1,3 +1,4 @@
 CLASS net/minecraft/class_3531 net/minecraft/world/gen/surfacebuilder/SurfaceConfig
+	METHOD method_15330 getUnderwaterMaterial ()Lnet/minecraft/class_2680;
 	METHOD method_15336 getUnderMaterial ()Lnet/minecraft/class_2680;
 	METHOD method_15337 getTopMaterial ()Lnet/minecraft/class_2680;

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

@@ -7,7 +7,6 @@ CLASS net/minecraft/class_3527 net/minecraft/world/gen/surfacebuilder/TernarySur
 		ARG 1 topMaterial
 		ARG 2 underMaterial
 		ARG 3 underwaterMaterial
-	METHOD method_15330 getUnderwaterMaterial ()Lnet/minecraft/class_2680;
 	METHOD method_29004 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_29005 (Lnet/minecraft/class_3527;)Lnet/minecraft/class_2680;

mappings/net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator.mapping

@@ -5,13 +5,5 @@ CLASS net/minecraft/class_4658 net/minecraft/world/gen/treedecorator/AlterGround
 		ARG 1 provider
 	METHOD method_23460 (ILnet/minecraft/class_2338;)Z
 		ARG 1 pos
-	METHOD method_23461 (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_2338;)V
+	METHOD method_23462 setArea (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_2338;)V
-		ARG 3 pos
+	METHOD method_23463 setColumn (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_2338;)V
-	METHOD method_23462 setArea (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;)V
-		ARG 1 world
-		ARG 2 random
-		ARG 3 pos
-	METHOD method_23463 setColumn (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;)V
-		ARG 1 world
-		ARG 2 random
-		ARG 3 pos

mappings/net/minecraft/world/gen/treedecorator/CocoaBeansTreeDecorator.mapping

@@ -5,5 +5,3 @@ CLASS net/minecraft/class_4660 net/minecraft/world/gen/treedecorator/CocoaBeansT
 		ARG 1 probability
 	METHOD method_23465 (ILnet/minecraft/class_2338;)Z
 		ARG 1 pos
-	METHOD method_23466 (Ljava/util/Random;Lnet/minecraft/class_5281;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;)V
-		ARG 5 pos

mappings/net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator.mapping

@@ -1,12 +1,5 @@
 CLASS net/minecraft/class_4661 net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator
 	FIELD field_24960 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_24961 INSTANCE Lnet/minecraft/class_4661;
-	METHOD method_23467 placeVines (Lnet/minecraft/class_3747;Lnet/minecraft/class_2338;Lnet/minecraft/class_2746;Ljava/util/Set;Lnet/minecraft/class_3341;)V
+	METHOD method_23467 placeVines (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;Lnet/minecraft/class_2746;Ljava/util/function/BiConsumer;)V
 		COMMENT Places a vine at a given position and then up to 4 more vines going downwards.
-		ARG 1 world
-		ARG 2 pos
-		ARG 3 side
-		ARG 4 placedStates
-		ARG 5 box
-	METHOD method_23468 (Ljava/util/Random;Lnet/minecraft/class_5281;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;)V
-		ARG 5 pos

mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping

@@ -1,23 +1,7 @@
 CLASS net/minecraft/class_4662 net/minecraft/world/gen/treedecorator/TreeDecorator
 	COMMENT Tree decorators can add additional blocks to trees, such as vines or beehives.
 	FIELD field_24962 TYPE_CODEC Lcom/mojang/serialization/Codec;
-	METHOD method_23469 generate (Lnet/minecraft/class_5281;Ljava/util/Random;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Lnet/minecraft/class_3341;)V
+	METHOD method_23469 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Ljava/util/List;Ljava/util/List;)V
-		ARG 1 world
-		ARG 2 random
-		ARG 3 logPositions
 		ARG 4 leavesPositions
-		ARG 5 placedStates
+	METHOD method_23471 placeVine (Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_2746;)V
-		ARG 6 box
-	METHOD method_23470 setBlockStateAndEncompassPosition (Lnet/minecraft/class_1945;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Set;Lnet/minecraft/class_3341;)V
-		ARG 1 world
-		ARG 2 pos
-		ARG 3 state
-		ARG 4 placedStates
-		ARG 5 box
-	METHOD method_23471 placeVine (Lnet/minecraft/class_1945;Lnet/minecraft/class_2338;Lnet/minecraft/class_2746;Ljava/util/Set;Lnet/minecraft/class_3341;)V
-		ARG 1 world
-		ARG 2 pos
-		ARG 3 directionProperty
-		ARG 4 placedStates
-		ARG 5 box
 	METHOD method_28893 getType ()Lnet/minecraft/class_4663;

mappings/net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator.mapping

@@ -1,5 +1,3 @@
 CLASS net/minecraft/class_4664 net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator
 	FIELD field_24964 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_24965 INSTANCE Lnet/minecraft/class_4664;
-	METHOD method_23474 (Ljava/util/Random;Lnet/minecraft/class_5281;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;)V
-		ARG 5 pos

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

@@ -1,8 +1,8 @@
 CLASS net/minecraft/class_5930 net/minecraft/world/gen/trunk/BendingTrunkPlacer
 	FIELD field_29306 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_29307 minHeightForLeaves I
-	FIELD field_29308 bendLength Lnet/minecraft/class_5428;
+	FIELD field_29308 bendLength Lnet/minecraft/class_6017;
-	METHOD <init> (IIIILnet/minecraft/class_5428;)V
+	METHOD <init> (IIIILnet/minecraft/class_6017;)V
 		ARG 1 baseHeight
 		ARG 2 firstRandomHeight
 		ARG 3 secondRandomHeight

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

@@ -1,13 +1,3 @@
 CLASS net/minecraft/class_5214 net/minecraft/world/gen/trunk/GiantTrunkPlacer
 	FIELD field_24969 CODEC Lcom/mojang/serialization/Codec;
-	METHOD method_27399 setLog (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;III)V
+	METHOD method_27399 setLog (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;III)V
-		ARG 0 world
-		ARG 1 random
-		ARG 2 mutable
-		ARG 3 placedStates
-		ARG 4 box
-		ARG 5 config
-		ARG 6 pos
-		ARG 7 x
-		ARG 8 y
-		ARG 9 z

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

@@ -3,24 +3,8 @@ CLASS net/minecraft/class_5212 net/minecraft/world/gen/trunk/LargeOakTrunkPlacer
 	METHOD method_27391 isHighEnough (II)Z
 		ARG 1 treeHeight
 		ARG 2 height
-	METHOD method_27392 makeBranches (Lnet/minecraft/class_3747;Ljava/util/Random;ILnet/minecraft/class_2338;Ljava/util/List;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)V
+	METHOD method_27392 makeBranches (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;ILnet/minecraft/class_2338;Ljava/util/List;Lnet/minecraft/class_4643;)V
-		ARG 1 world
+	METHOD method_27393 makeOrCheckBranch (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ZLnet/minecraft/class_4643;)Z
-		ARG 2 random
-		ARG 3 treeHeight
-		ARG 4 treePos
-		ARG 5 branches
-		ARG 6 placedStates
-		ARG 7 box
-		ARG 8 config
-	METHOD method_27393 makeOrCheckBranch (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ZLjava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)Z
-		ARG 1 world
-		ARG 2 random
-		ARG 3 start
-		ARG 4 end
-		ARG 5 make
-		ARG 6 placedStates
-		ARG 7 box
-		ARG 8 config
 	METHOD method_27394 getLongestSide (Lnet/minecraft/class_2338;)I
 		ARG 1 offset
 	METHOD method_27395 getLogAxis (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2350$class_2351;
@@ -28,8 +12,6 @@ CLASS net/minecraft/class_5212 net/minecraft/world/gen/trunk/LargeOakTrunkPlacer
 		ARG 2 branchEnd
 	METHOD method_27396 shouldGenerateBranch (II)F
 		COMMENT If the returned value is greater than or equal to 0, a branch will be generated.
-		ARG 1 trunkHeight
-		ARG 2 y
 	CLASS class_5213 BranchPosition
 		FIELD field_24169 node Lnet/minecraft/class_4647$class_5208;
 		FIELD field_24170 endY I

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

@@ -7,44 +7,16 @@ CLASS net/minecraft/class_5141 net/minecraft/world/gen/trunk/TrunkPlacer
 		ARG 1 baseHeight
 		ARG 2 firstRandomHeight
 		ARG 3 secondRandomHeight
-	METHOD method_26991 generate (Lnet/minecraft/class_3747;Ljava/util/Random;ILnet/minecraft/class_2338;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)Ljava/util/List;
+	METHOD method_26991 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;ILnet/minecraft/class_2338;Lnet/minecraft/class_4643;)Ljava/util/List;
 		COMMENT Generates the trunk blocks and return a list of tree nodes to place foliage around
-		ARG 1 world
-		ARG 2 random
-		ARG 3 trunkHeight
-		ARG 4 pos
-		ARG 5 placedStates
-		ARG 6 box
-		ARG 7 config
 	METHOD method_26993 getHeight (Ljava/util/Random;)I
 		ARG 1 random
-	METHOD method_27400 setToDirt (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;)V
+	METHOD method_27400 setToDirt (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;)V
-		ARG 0 world
+	METHOD method_27401 trySetState (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_4643;)V
-		ARG 1 random
+	METHOD method_27402 getAndSetState (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;Ljava/util/function/Function;)Z
-		ARG 2 pos
-		ARG 3 config
-	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
-		ARG 2 pos
-		ARG 3 placedStates
-		ARG 4 box
-		ARG 5 config
-	METHOD method_27402 getAndSetState (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)Z
-		ARG 0 world
-		ARG 1 random
-		ARG 2 pos
-		ARG 3 placedStates
-		ARG 4 box
-		ARG 5 config
 	METHOD method_27403 canGenerate (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z
 		ARG 0 world
 		ARG 1 pos
-	METHOD method_27404 setBlockState (Lnet/minecraft/class_1945;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3341;)V
-		ARG 0 world
-		ARG 1 pos
-		ARG 2 state
-		ARG 3 box
 	METHOD method_27405 (Lnet/minecraft/class_2680;)Z
 		ARG 0 state
 	METHOD method_28903 getType ()Lnet/minecraft/class_5142;