diff --git a/mappings/com/mojang/blaze3d/buffers/GpuBuffer.mapping b/mappings/com/mojang/blaze3d/buffers/GpuBuffer.mapping index c96895c376..5a5fb4644d 100644 --- a/mappings/com/mojang/blaze3d/buffers/GpuBuffer.mapping +++ b/mappings/com/mojang/blaze3d/buffers/GpuBuffer.mapping @@ -2,6 +2,14 @@ CLASS com/mojang/blaze3d/buffers/GpuBuffer METHOD (IJ)V ARG 1 size ARG 2 usage + METHOD map (JJZZ)Lcom/mojang/blaze3d/buffers/GpuBufferSlice$class_1_892; + ARG 1 offset + ARG 3 size + ARG 5 read + ARG 6 write + METHOD map (ZZ)Lcom/mojang/blaze3d/buffers/GpuBufferSlice$class_1_892; + ARG 1 read + ARG 2 write METHOD slice (JJ)Lcom/mojang/blaze3d/buffers/GpuBufferSlice; ARG 1 start ARG 3 length diff --git a/mappings/com/mojang/blaze3d/buffers/GpuBufferSlice.mapping b/mappings/com/mojang/blaze3d/buffers/GpuBufferSlice.mapping index 2ed81e215b..7959593129 100644 --- a/mappings/com/mojang/blaze3d/buffers/GpuBufferSlice.mapping +++ b/mappings/com/mojang/blaze3d/buffers/GpuBufferSlice.mapping @@ -1,4 +1,8 @@ CLASS com/mojang/blaze3d/buffers/GpuBufferSlice + METHOD map (ZZ)Lcom/mojang/blaze3d/buffers/GpuBufferSlice$class_1_892; + ARG 1 read + ARG 2 write METHOD slice (JJ)Lcom/mojang/blaze3d/buffers/GpuBufferSlice; ARG 1 offset ARG 3 length + CLASS class_1_892 Mapped diff --git a/mappings/com/mojang/blaze3d/opengl/GlStateManager.mapping b/mappings/com/mojang/blaze3d/opengl/GlStateManager.mapping index 8c96eeb34b..a4f4d18276 100644 --- a/mappings/com/mojang/blaze3d/opengl/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/opengl/GlStateManager.mapping @@ -29,10 +29,17 @@ CLASS com/mojang/blaze3d/opengl/GlStateManager ARG 2 pname METHOD _glBindAttribLocation (IILjava/lang/CharSequence;)V ARG 1 index + METHOD _glBindFramebuffer (II)V + ARG 0 target + ARG 1 framebuffer METHOD _glBindVertexArray (I)V ARG 0 array METHOD _glFramebufferTexture2D (IIIII)V + ARG 0 target + ARG 1 attachment ARG 2 textureTarget + ARG 3 texture + ARG 4 level METHOD _glMapBufferRange (IJJI)Ljava/nio/ByteBuffer; ARG 3 range METHOD _glUniform1i (II)V @@ -73,6 +80,8 @@ CLASS com/mojang/blaze3d/opengl/GlStateManager ARG 4 pointer METHOD _vertexAttribPointer (IIIZIJ)V ARG 5 pointer + METHOD getFrameBuffer (I)I + ARG 0 target METHOD glBlendFuncSeparate (IIII)V ARG 0 srcFactorRgb ARG 1 dstFactorRgb diff --git a/mappings/com/mojang/blaze3d/pipeline/RenderPassDescription.mapping b/mappings/com/mojang/blaze3d/pipeline/RenderPassDescription.mapping new file mode 100644 index 0000000000..62a266dfd2 --- /dev/null +++ b/mappings/com/mojang/blaze3d/pipeline/RenderPassDescription.mapping @@ -0,0 +1,26 @@ +CLASS net/minecraft/class_1_900 com/mojang/blaze3d/pipeline/RenderPassDescription + FIELD field_1_6324 colorAttachments Ljava/util/List; + FIELD field_1_6325 depthAttachment Lnet/minecraft/class_1_900$class_1_901; + FIELD field_1_6326 labelGetter Ljava/util/function/Supplier; + FIELD field_1_6327 renderArea Lcom/mojang/blaze3d/systems/RenderPass$class_1_837; + METHOD (Ljava/util/function/Supplier;)V + ARG 1 labelGetter + METHOD method_1_5424 getColorAttachments ()Ljava/util/List; + METHOD method_1_5425 withLabel (Ljava/util/function/Supplier;)Lnet/minecraft/class_1_900; + ARG 0 labelGetter + METHOD method_1_5426 getDepthAttachment ()Lnet/minecraft/class_1_900$class_1_901; + METHOD method_1_5427 getLabelGetter ()Ljava/util/function/Supplier; + METHOD method_1_5428 color (Lcom/mojang/blaze3d/textures/GpuTextureView;)Lnet/minecraft/class_1_900; + ARG 1 textureView + METHOD method_1_5429 color (Lcom/mojang/blaze3d/textures/GpuTextureView;Ljava/util/Optional;)Lnet/minecraft/class_1_900; + ARG 1 textureView + ARG 2 clearColor + METHOD method_1_5430 depth (Lcom/mojang/blaze3d/textures/GpuTextureView;)Lnet/minecraft/class_1_900; + ARG 1 textureView + METHOD method_1_5431 depth (Lcom/mojang/blaze3d/textures/GpuTextureView;Ljava/util/OptionalDouble;)Lnet/minecraft/class_1_900; + ARG 1 textureView + ARG 2 clearColor + METHOD method_1_5432 renderArea (Lcom/mojang/blaze3d/systems/RenderPass$class_1_837;)Lnet/minecraft/class_1_900; + ARG 1 renderArea + METHOD method_1_5433 withoutColor ()Lnet/minecraft/class_1_900; + CLASS class_1_901 Attachment diff --git a/mappings/com/mojang/blaze3d/systems/CommandEncoder.mapping b/mappings/com/mojang/blaze3d/systems/CommandEncoder.mapping index c2eca6a3dc..b8681c817b 100644 --- a/mappings/com/mojang/blaze3d/systems/CommandEncoder.mapping +++ b/mappings/com/mojang/blaze3d/systems/CommandEncoder.mapping @@ -7,10 +7,12 @@ CLASS com/mojang/blaze3d/systems/CommandEncoder ARG 3 backend METHOD clearColorAndDepthTextures (Lcom/mojang/blaze3d/textures/GpuTexture;Lorg/joml/Vector4fc;Lcom/mojang/blaze3d/textures/GpuTexture;D)V ARG 1 colorAttachment + ARG 2 clearColor ARG 3 depthAttachment ARG 4 depth METHOD clearColorAndDepthTextures (Lcom/mojang/blaze3d/textures/GpuTexture;Lorg/joml/Vector4fc;Lcom/mojang/blaze3d/textures/GpuTexture;DIIII)V ARG 1 colorAttachment + ARG 2 clearColor ARG 3 depthAttachment ARG 4 depth ARG 6 scissorX @@ -19,6 +21,7 @@ CLASS com/mojang/blaze3d/systems/CommandEncoder ARG 9 scissorTop METHOD clearColorTexture (Lcom/mojang/blaze3d/textures/GpuTexture;Lorg/joml/Vector4fc;)V ARG 1 texture + ARG 2 clearColor METHOD clearDepthTexture (Lcom/mojang/blaze3d/textures/GpuTexture;D)V ARG 1 texture ARG 2 depth @@ -54,17 +57,22 @@ CLASS com/mojang/blaze3d/systems/CommandEncoder METHOD createRenderPass (Ljava/util/function/Supplier;Lcom/mojang/blaze3d/textures/GpuTextureView;Ljava/util/Optional;)Lcom/mojang/blaze3d/systems/RenderPass; ARG 1 labelGetter ARG 2 colorAttachment + ARG 3 clearColor METHOD createRenderPass (Ljava/util/function/Supplier;Lcom/mojang/blaze3d/textures/GpuTextureView;Ljava/util/Optional;Lcom/mojang/blaze3d/textures/GpuTextureView;Ljava/util/OptionalDouble;)Lcom/mojang/blaze3d/systems/RenderPass; ARG 1 labelGetter ARG 2 colorAttachment + ARG 3 clearColor ARG 4 depthAttachment ARG 5 clearDepth METHOD createRenderPass (Ljava/util/function/Supplier;Lcom/mojang/blaze3d/textures/GpuTextureView;Ljava/util/Optional;Lcom/mojang/blaze3d/textures/GpuTextureView;Ljava/util/OptionalDouble;Lcom/mojang/blaze3d/systems/RenderPass$class_1_837;)Lcom/mojang/blaze3d/systems/RenderPass; ARG 1 labelGetter ARG 2 colorAttachment + ARG 3 clearColor ARG 4 depthAttachment ARG 5 clearDepth ARG 6 renderArea + METHOD createRenderPass (Lnet/minecraft/class_1_900;)Lcom/mojang/blaze3d/systems/RenderPass; + ARG 1 description METHOD verifyColorTexture (Lcom/mojang/blaze3d/textures/GpuTexture;)V ARG 1 texture METHOD verifyDepthTexture (Lcom/mojang/blaze3d/textures/GpuTexture;)V diff --git a/mappings/com/mojang/blaze3d/systems/CommandEncoderBackend.mapping b/mappings/com/mojang/blaze3d/systems/CommandEncoderBackend.mapping index 855dd9b7c0..49659f7e0f 100644 --- a/mappings/com/mojang/blaze3d/systems/CommandEncoderBackend.mapping +++ b/mappings/com/mojang/blaze3d/systems/CommandEncoderBackend.mapping @@ -1,10 +1,12 @@ CLASS net/minecraft/class_1_154 com/mojang/blaze3d/systems/CommandEncoderBackend METHOD method_1_1381 clearColorAndDepthTextures (Lcom/mojang/blaze3d/textures/GpuTexture;Lorg/joml/Vector4fc;Lcom/mojang/blaze3d/textures/GpuTexture;D)V ARG 1 colorAttachment + ARG 2 clearColor ARG 3 depthAttachment ARG 4 depth METHOD method_1_1382 clearColorAndDepthTextures (Lcom/mojang/blaze3d/textures/GpuTexture;Lorg/joml/Vector4fc;Lcom/mojang/blaze3d/textures/GpuTexture;DIIII)V ARG 1 colorAttachment + ARG 2 clearColor ARG 3 depthAttachment ARG 4 depth ARG 6 scissorX @@ -13,6 +15,7 @@ CLASS net/minecraft/class_1_154 com/mojang/blaze3d/systems/CommandEncoderBackend ARG 9 scissorHeight METHOD method_1_1383 clearColorTexture (Lcom/mojang/blaze3d/textures/GpuTexture;Lorg/joml/Vector4fc;)V ARG 1 texture + ARG 2 clearColor METHOD method_1_1384 clearDepthTexture (Lcom/mojang/blaze3d/textures/GpuTexture;D)V ARG 1 texture ARG 2 depth @@ -47,6 +50,7 @@ CLASS net/minecraft/class_1_154 com/mojang/blaze3d/systems/CommandEncoderBackend ARG 2 to METHOD method_1_1389 createFence ()Lcom/mojang/blaze3d/buffers/GpuFence; METHOD method_1_1391 createRenderPass (Lnet/minecraft/class_1_900;)Lnet/minecraft/class_1_149; + ARG 1 description METHOD method_1_1397 writeToBuffer (Lcom/mojang/blaze3d/buffers/GpuBufferSlice;Ljava/nio/ByteBuffer;)V ARG 1 slice ARG 2 source diff --git a/mappings/com/mojang/blaze3d/systems/GpuFeatures.mapping b/mappings/com/mojang/blaze3d/systems/GpuFeatures.mapping new file mode 100644 index 0000000000..b1b08c4b3d --- /dev/null +++ b/mappings/com/mojang/blaze3d/systems/GpuFeatures.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1_893 com/mojang/blaze3d/systems/GpuFeatures diff --git a/mappings/com/mojang/blaze3d/systems/RenderPass.mapping b/mappings/com/mojang/blaze3d/systems/RenderPass.mapping index c3d1698b1a..e875367abe 100644 --- a/mappings/com/mojang/blaze3d/systems/RenderPass.mapping +++ b/mappings/com/mojang/blaze3d/systems/RenderPass.mapping @@ -4,6 +4,8 @@ CLASS com/mojang/blaze3d/systems/RenderPass METHOD (Lnet/minecraft/class_1_149;Lnet/minecraft/class_1_147;Ljava/util/List;Ljava/lang/Runnable;Lcom/mojang/blaze3d/systems/RenderPass$class_1_837;)V ARG 1 backend ARG 2 device + ARG 3 colorAttachments + ARG 4 onFinish ARG 5 renderArea METHOD bindTexture (Ljava/lang/String;Lcom/mojang/blaze3d/textures/GpuTextureView;Lnet/minecraft/class_12137;)V ARG 1 name @@ -42,7 +44,8 @@ CLASS com/mojang/blaze3d/systems/RenderPass ARG 1 name ARG 2 slice METHOD setVertexBuffer (ILcom/mojang/blaze3d/buffers/GpuBufferSlice;)V - ARG 1 index + ARG 1 slot + ARG 2 vertexBuffer METHOD writeTimestamp (Lnet/minecraft/class_1_685;I)V ARG 1 timestampQueryPool ARG 2 index diff --git a/mappings/com/mojang/blaze3d/systems/RenderPassBackend.mapping b/mappings/com/mojang/blaze3d/systems/RenderPassBackend.mapping index 1d73c8a9a8..939767c311 100644 --- a/mappings/com/mojang/blaze3d/systems/RenderPassBackend.mapping +++ b/mappings/com/mojang/blaze3d/systems/RenderPassBackend.mapping @@ -38,7 +38,8 @@ CLASS net/minecraft/class_1_149 com/mojang/blaze3d/systems/RenderPassBackend ARG 1 name ARG 2 slice METHOD method_1_1338 setVertexBuffer (ILcom/mojang/blaze3d/buffers/GpuBufferSlice;)V - ARG 1 index + ARG 1 slot + ARG 2 vertexBuffer METHOD method_1_4243 writeTimestamp (Lnet/minecraft/class_1_685;I)V ARG 1 timestampQueryPool ARG 2 index diff --git a/mappings/net/minecraft/class_1_899.mapping b/mappings/net/minecraft/class_1_899.mapping deleted file mode 100644 index 34d11e95b7..0000000000 --- a/mappings/net/minecraft/class_1_899.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_1_899 - METHOD method_68427 getGlId ()I diff --git a/mappings/net/minecraft/client/gl/GlBackend.mapping b/mappings/net/minecraft/client/gl/GlBackend.mapping index c9f58f7a6a..ac9b313b5f 100644 --- a/mappings/net/minecraft/client/gl/GlBackend.mapping +++ b/mappings/net/minecraft/client/gl/GlBackend.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_10865 net/minecraft/client/gl/GlBackend FIELD field_1_3390 deviceInfo Lnet/minecraft/class_1_664; + FIELD field_1_6266 framebufferManager Lnet/minecraft/class_1_894; FIELD field_57853 LOGGER Lorg/slf4j/Logger; FIELD field_57854 commandEncoder Lnet/minecraft/class_1_154; FIELD field_57855 glDebug Lnet/minecraft/class_1008; @@ -20,6 +21,7 @@ CLASS net/minecraft/class_10865 net/minecraft/client/gl/GlBackend ARG 1 contextId ARG 3 defaultShaderSourceGetter ARG 4 debugOptions + METHOD method_1_5402 getFramebufferManager ()Lnet/minecraft/class_1_894; METHOD method_68377 getDebugLabelManager ()Lnet/minecraft/class_10861; METHOD method_68378 getCompiledShader (Lnet/minecraft/class_2960;Lcom/mojang/blaze3d/shaders/ShaderType;Lnet/minecraft/class_10149;Lnet/minecraft/class_12289;)Lnet/minecraft/class_10141; ARG 1 id diff --git a/mappings/net/minecraft/client/gl/BufferManager.mapping b/mappings/net/minecraft/client/gl/GlBufferManager.mapping similarity index 83% rename from mappings/net/minecraft/client/gl/BufferManager.mapping rename to mappings/net/minecraft/client/gl/GlBufferManager.mapping index 42f663c9a2..673f8f5d0c 100644 --- a/mappings/net/minecraft/client/gl/BufferManager.mapping +++ b/mappings/net/minecraft/client/gl/GlBufferManager.mapping @@ -1,10 +1,18 @@ -CLASS net/minecraft/class_10874 net/minecraft/client/gl/BufferManager +CLASS net/minecraft/class_10874 net/minecraft/client/gl/GlBufferManager + METHOD method_1_5416 setupFramebuffer (IIIII)V + ARG 1 framebuffer + ARG 2 colorTexture + ARG 3 depthTexture + ARG 4 level + ARG 5 target METHOD method_68431 createFramebuffer ()I METHOD method_68432 setupFramebuffer (I[I[IIII)V ARG 1 framebuffer - ARG 4 mipLevel - ARG 5 bindTarget - ARG 6 depthAttachment + ARG 2 colorTextures + ARG 3 colorLevels + ARG 4 depthTexture + ARG 5 depthLevel + ARG 6 target METHOD method_68812 setupBlitFramebuffer (IIIIIIIIIIII)V ARG 1 readFramebuffer ARG 2 writeFramebuffer @@ -21,6 +29,7 @@ CLASS net/minecraft/class_10874 net/minecraft/client/gl/BufferManager METHOD method_68813 create (Lorg/lwjgl/opengl/GLCapabilities;Ljava/util/Set;Lnet/minecraft/class_11541;)Lnet/minecraft/class_10874; ARG 0 capabilities ARG 1 usedCapabilities + ARG 2 deviceInfo METHOD method_71023 createBuffer ()I METHOD method_71024 unmapBuffer (II)V ARG 1 buffer diff --git a/mappings/net/minecraft/client/gl/GlCommandEncoderBackend.mapping b/mappings/net/minecraft/client/gl/GlCommandEncoderBackend.mapping index 4a90636116..552422d796 100644 --- a/mappings/net/minecraft/client/gl/GlCommandEncoderBackend.mapping +++ b/mappings/net/minecraft/client/gl/GlCommandEncoderBackend.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_10860 net/minecraft/client/gl/GlCommandEncoderBackend + FIELD field_1_6298 vertexBuffer Lnet/minecraft/class_10869$class_10872; + FIELD field_1_6299 colorAttachmentTextures Ljava/util/List; FIELD field_57843 LOGGER Lorg/slf4j/Logger; FIELD field_57844 backend Lnet/minecraft/class_10865; FIELD field_57845 temporaryFb1 I diff --git a/mappings/net/minecraft/client/gl/GlFramebufferManager.mapping b/mappings/net/minecraft/client/gl/GlFramebufferManager.mapping new file mode 100644 index 0000000000..3202ff798c --- /dev/null +++ b/mappings/net/minecraft/client/gl/GlFramebufferManager.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_1_894 net/minecraft/client/gl/GlFramebufferManager + FIELD field_1_6294 framebuffersByAttachment Lit/unimi/dsi/fastutil/objects/Object2IntMap; + METHOD method_1_5412 create (Lnet/minecraft/class_1_894$class_1_895;Lnet/minecraft/class_10874;Ljava/util/List;Lnet/minecraft/class_1_899;)I + ARG 1 key + ARG 2 bufferManager + ARG 3 colorTextures + ARG 4 depthTexture + METHOD method_1_5413 remove (Lnet/minecraft/class_1_894$class_1_895;)V + ARG 1 key + METHOD method_1_5414 get (Lnet/minecraft/class_10874;Ljava/util/List;Lnet/minecraft/class_1_899;)I + ARG 1 bufferManager + ARG 2 colorTextures + ARG 3 depthTexture + METHOD method_1_5415 (Lnet/minecraft/class_1_894$class_1_895;Lnet/minecraft/class_10874;Ljava/util/List;Lnet/minecraft/class_1_899;Ljava/lang/Object;)I + ARG 5 key + CLASS class_1_895 AttachmentsKey + FIELD field_1_6295 textures Ljava/util/List; + FIELD field_1_6296 idsAndBaseMipLevels [I + COMMENT An interleaved array of OpenGL texture IDs and base mipmap levels. + FIELD field_1_6297 hashCode I + METHOD (Ljava/util/List;Lnet/minecraft/class_1_899;)V + ARG 1 colorTextures + ARG 2 depthTexture + METHOD equals (Ljava/lang/Object;)Z + ARG 1 other diff --git a/mappings/net/minecraft/client/gl/GlGpuBuffer.mapping b/mappings/net/minecraft/client/gl/GlGpuBuffer.mapping index a123bcc2d3..2e55e16194 100644 --- a/mappings/net/minecraft/client/gl/GlGpuBuffer.mapping +++ b/mappings/net/minecraft/client/gl/GlGpuBuffer.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_10859 net/minecraft/client/gl/GlGpuBuffer + FIELD field_1_6261 hasBufferStorage Z + FIELD field_1_6262 flags I + FIELD field_1_6263 numMaps I FIELD field_57838 POOL Lcom/mojang/jtracy/MemoryPool; FIELD field_57839 closed Z FIELD field_57841 debugLabelSupplier Ljava/util/function/Supplier; @@ -11,3 +14,8 @@ CLASS net/minecraft/class_10859 net/minecraft/client/gl/GlGpuBuffer ARG 3 usage ARG 4 size ARG 6 id + ARG 7 hasBufferStorage + METHOD method_1_5400 assertUsable ()V + METHOD method_1_5401 releaseMap ()V + CLASS 1 1 + FIELD field_1_6264 closed Z diff --git a/mappings/net/minecraft/client/gl/GlRenderPassBackend.mapping b/mappings/net/minecraft/client/gl/GlRenderPassBackend.mapping index a84bd3679a..ce96e1a853 100644 --- a/mappings/net/minecraft/client/gl/GlRenderPassBackend.mapping +++ b/mappings/net/minecraft/client/gl/GlRenderPassBackend.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_10866 net/minecraft/client/gl/GlRenderPassBackend FIELD field_1_1151 device Lnet/minecraft/class_10865; + FIELD field_1_5954 defaultScissorState Lnet/minecraft/class_11219; + FIELD field_1_6269 numColorAttachments I + FIELD field_1_6270 dirty Z FIELD field_57867 IS_DEVELOPMENT Z FIELD field_57868 pipeline Lnet/minecraft/class_10867; FIELD field_57869 vertexBuffers [Lcom/mojang/blaze3d/buffers/GpuBufferSlice; @@ -15,6 +18,8 @@ CLASS net/minecraft/class_10866 net/minecraft/client/gl/GlRenderPassBackend ARG 1 resourceManager ARG 2 device ARG 3 hasDepth + ARG 4 numColorAttachments + ARG 5 defaultScissorState METHOD method_68407 hasDepth ()Z METHOD method_70808 isScissorEnabled ()Z METHOD method_70809 getScissorX ()I diff --git a/mappings/net/minecraft/client/gl/GlTextureLike.mapping b/mappings/net/minecraft/client/gl/GlTextureLike.mapping new file mode 100644 index 0000000000..97a62ae0bf --- /dev/null +++ b/mappings/net/minecraft/client/gl/GlTextureLike.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_1_899 net/minecraft/client/gl/GlTextureLike + METHOD method_1_5421 addKey (Lnet/minecraft/class_1_894$class_1_895;)V + ARG 1 key + METHOD method_1_5422 getBaseMipLevel ()I + METHOD method_1_5423 removeKey (Lnet/minecraft/class_1_894$class_1_895;)V + ARG 1 key + METHOD method_68427 getGlId ()I diff --git a/mappings/net/minecraft/client/gl/VertexBufferManager.mapping b/mappings/net/minecraft/client/gl/VertexBufferManager.mapping index 0d2f9152fd..4f4d07d1a3 100644 --- a/mappings/net/minecraft/client/gl/VertexBufferManager.mapping +++ b/mappings/net/minecraft/client/gl/VertexBufferManager.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_10869 net/minecraft/client/gl/VertexBufferManager METHOD method_68428 setupBuffer ([Lcom/mojang/blaze3d/vertex/VertexFormat;[Lcom/mojang/blaze3d/buffers/GpuBufferSlice;Lnet/minecraft/class_10869$class_10872;)Lnet/minecraft/class_10869$class_10872; + ARG 1 vertexFormatBindings + ARG 2 vertexBuffers + ARG 3 previousBuffer METHOD method_68429 create (Lorg/lwjgl/opengl/GLCapabilities;Lnet/minecraft/class_10861;Ljava/util/Set;)Lnet/minecraft/class_10869; ARG 0 capabilities ARG 1 labeler @@ -10,7 +13,9 @@ CLASS net/minecraft/class_10869 net/minecraft/client/gl/VertexBufferManager METHOD (Lnet/minecraft/class_10861;)V ARG 1 labeler METHOD method_68430 setupBuffer ([Lcom/mojang/blaze3d/vertex/VertexFormat;Z[Lcom/mojang/blaze3d/buffers/GpuBufferSlice;)V + ARG 0 vertexFormatBindings ARG 1 vbaIsNew + ARG 2 vertexBuffers CLASS class_10871 ARBVertexBufferManager FIELD field_57891 cache Ljava/util/Map; FIELD field_57892 labeler Lnet/minecraft/class_10861; @@ -18,6 +23,8 @@ CLASS net/minecraft/class_10869 net/minecraft/client/gl/VertexBufferManager METHOD (Lnet/minecraft/class_10861;)V ARG 1 labeler CLASS class_10872 AllocatedBuffer + FIELD field_1_6300 vertexFormatDescription Ljava/lang/String; FIELD field_57893 glId I METHOD (I[Lcom/mojang/blaze3d/vertex/VertexFormat;)V ARG 1 glId + ARG 2 vertexFormats diff --git a/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping b/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping index a450e4be2e..eb29871c62 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping @@ -26,6 +26,8 @@ CLASS net/minecraft/class_521 net/minecraft/client/gui/screen/pack/PackListWidge FIELD field_19128 client Lnet/minecraft/class_310; FIELD field_19129 pack Lnet/minecraft/class_5369$class_5371; FIELD field_19130 widget Lnet/minecraft/class_521; + FIELD field_32403 TEXT_MAX_WIDTH I + FIELD field_64204 ICON_SIZE I FIELD field_64205 nameWidget Lnet/minecraft/class_7842; FIELD field_64206 descriptionWidget Lnet/minecraft/class_7940; METHOD (Lnet/minecraft/class_521;Lnet/minecraft/class_310;Lnet/minecraft/class_521;Lnet/minecraft/class_5369$class_5371;)V diff --git a/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping index f39e59090e..ee3812759d 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping @@ -22,6 +22,8 @@ CLASS net/minecraft/class_5375 net/minecraft/client/gui/screen/pack/PackScreen ARG 2 applier ARG 3 file ARG 4 title + METHOD method_1_5449 setSearch (Ljava/lang/String;)V + ARG 1 search METHOD method_29669 copyPacks (Lnet/minecraft/class_310;Ljava/util/List;Ljava/nio/file/Path;)V ARG 0 client ARG 1 srcPaths @@ -49,14 +51,18 @@ CLASS net/minecraft/class_5375 net/minecraft/client/gui/screen/pack/PackScreen METHOD method_30291 closeDirectoryWatcher ()V METHOD method_52760 streamFileNames (Ljava/util/Collection;)Ljava/util/stream/Stream; ARG 0 paths + METHOD method_57755 (Lnet/minecraft/class_5375;Lnet/minecraft/class_339;)V + ARG 1 child METHOD method_74709 setSearch (Ljava/lang/String;Lnet/minecraft/class_5369$class_5372;)V ARG 1 search + ARG 2 focused METHOD method_74710 (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_5369$class_5371;)Z ARG 2 pack METHOD method_74711 filter (Ljava/lang/String;Ljava/util/stream/Stream;Lnet/minecraft/class_521;Lnet/minecraft/class_5369$class_5372;)V ARG 1 search ARG 2 packs ARG 3 listWidget + ARG 4 focused CLASS class_5426 DirectoryWatcher FIELD field_25790 watchService Ljava/nio/file/WatchService; FIELD field_25791 path Ljava/nio/file/Path; diff --git a/mappings/net/minecraft/client/render/entity/TntEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/TntEntityRenderer.mapping index a0824f15cd..180fe4450c 100644 --- a/mappings/net/minecraft/client/render/entity/TntEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/TntEntityRenderer.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_956 net/minecraft/client/render/entity/TntEntityRenderer FIELD field_1_2179 blockModelManager Lnet/minecraft/class_1_394; FIELD field_1_2284 ID Lnet/minecraft/class_1_436; + METHOD method_1_5207 getSwell (F)F + ARG 0 fuse + METHOD method_1_5208 shouldRenderOverlay (F)Z + ARG 0 fuse diff --git a/mappings/net/minecraft/client/texture/GlTexture.mapping b/mappings/net/minecraft/client/texture/GlTexture.mapping index 4daa144338..5d315fc5ca 100644 --- a/mappings/net/minecraft/client/texture/GlTexture.mapping +++ b/mappings/net/minecraft/client/texture/GlTexture.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_10868 net/minecraft/client/texture/GlTexture + FIELD field_1_6267 keys Ljava/util/List; + FIELD field_1_6268 framebufferManager Lnet/minecraft/class_1_894; FIELD field_57882 glId I FIELD field_57883 closed Z FIELD field_60565 refCount I @@ -12,6 +14,7 @@ CLASS net/minecraft/class_10868 net/minecraft/client/texture/GlTexture ARG 6 depthOrLayers ARG 7 mipLevels ARG 8 glId + ARG 9 framebufferManager METHOD method_71635 incrementRefCount ()V METHOD method_71636 decrementRefCount ()V METHOD method_71637 free ()V diff --git a/mappings/net/minecraft/client/texture/GlTextureView.mapping b/mappings/net/minecraft/client/texture/GlTextureView.mapping index 00a6f82d20..a2ef18afdd 100644 --- a/mappings/net/minecraft/client/texture/GlTextureView.mapping +++ b/mappings/net/minecraft/client/texture/GlTextureView.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/class_11391 net/minecraft/client/texture/GlTextureView + FIELD field_1_6274 keys Ljava/util/List; + FIELD field_1_6275 framebufferManager Lnet/minecraft/class_1_894; FIELD field_60566 closed Z FIELD field_64518 UNINITIALIZED I METHOD (Lnet/minecraft/class_10868;IILnet/minecraft/class_1_894;)V ARG 1 texture ARG 2 baseMipLevel ARG 3 mipLevels + ARG 4 framebufferManager diff --git a/mappings/net/minecraft/client/vulkan/VulkanBuffer.mapping b/mappings/net/minecraft/client/vulkan/VulkanBuffer.mapping index d31bf36fe2..bc0fad2db2 100644 --- a/mappings/net/minecraft/client/vulkan/VulkanBuffer.mapping +++ b/mappings/net/minecraft/client/vulkan/VulkanBuffer.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1_694 net/minecraft/client/vulkan/VulkanBuffer FIELD field_1_3555 device Lnet/minecraft/class_1_679; FIELD field_1_3556 rawBuffer J FIELD field_1_3557 vmaAllocation J + FIELD field_1_6287 numMaps I METHOD (Lnet/minecraft/class_1_679;Ljava/util/function/Supplier;IJZ)V ARG 1 device ARG 2 labelGetter @@ -10,3 +11,5 @@ CLASS net/minecraft/class_1_694 net/minecraft/client/vulkan/VulkanBuffer ARG 4 size ARG 6 alwaysHostVisible METHOD method_1_4175 getRawBuffer ()J + CLASS 1 1 + FIELD field_1_6288 closed Z diff --git a/mappings/net/minecraft/client/vulkan/VulkanCommandEncoderBackend.mapping b/mappings/net/minecraft/client/vulkan/VulkanCommandEncoderBackend.mapping index aa7bf026df..2261afe1f1 100644 --- a/mappings/net/minecraft/client/vulkan/VulkanCommandEncoderBackend.mapping +++ b/mappings/net/minecraft/client/vulkan/VulkanCommandEncoderBackend.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1_715 net/minecraft/client/vulkan/VulkanCommandEncoderBackend FIELD field_1_3658 commandBufferDisposer Lnet/minecraft/class_1_699; FIELD field_1_3659 rawCommandPool J + FIELD field_1_3660 lastWaitValue J FIELD field_1_3661 commandBuffer Lorg/lwjgl/vulkan/VkCommandBuffer; FIELD field_1_3662 renderPass Lnet/minecraft/class_1_704; FIELD field_1_3664 objectDisposer Lnet/minecraft/class_1_699; @@ -12,10 +13,12 @@ CLASS net/minecraft/class_1_715 net/minecraft/client/vulkan/VulkanCommandEncoder METHOD method_1_4257 createCommandBuffer (Z)Lorg/lwjgl/vulkan/VkCommandBuffer; ARG 1 primary METHOD method_1_4258 wait (JJ)Z + ARG 1 waitValue ARG 3 timeoutNanos METHOD method_1_4259 clearTextureColor (Lorg/lwjgl/system/MemoryStack;Lcom/mojang/blaze3d/textures/GpuTexture;Lorg/joml/Vector4fc;)V ARG 1 memoryStack ARG 2 texture + ARG 3 clearColor METHOD method_1_4260 clearTextureDepth (Lorg/lwjgl/system/MemoryStack;Lcom/mojang/blaze3d/textures/GpuTexture;D)V ARG 1 memoryStack ARG 2 texture diff --git a/mappings/net/minecraft/client/vulkan/VulkanUtils.mapping b/mappings/net/minecraft/client/vulkan/VulkanUtils.mapping index 6e1fdcf867..b0b9b5f71a 100644 --- a/mappings/net/minecraft/client/vulkan/VulkanUtils.mapping +++ b/mappings/net/minecraft/client/vulkan/VulkanUtils.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_1_678 net/minecraft/client/vulkan/VulkanUtils ARG 2 required METHOD method_1_4040 setClearColor (Lorg/lwjgl/vulkan/VkClearColorValue;Lorg/joml/Vector4fc;)Lorg/lwjgl/vulkan/VkClearColorValue; ARG 0 clearColorValue + ARG 1 clearColor METHOD method_1_4041 describe (I)Ljava/lang/String; ARG 0 code METHOD method_1_4042 reportWindowError (ILjava/lang/String;Lnet/minecraft/class_1_739$class_1_740;)V diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 55a36fe531..964d2c0f6f 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -253,6 +253,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 2 changedX ARG 3 changedZ ARG 4 movement + METHOD method_1_5399 getAirDragModifier ()F METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V COMMENT Called when this entity's collision box intersects {@code state}. COMMENT diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index fb1c828ba0..7aff0a07e9 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -111,6 +111,11 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 0 slipperiness ARG 1 frictionModifier METHOD method_1_4166 setDead ()V + METHOD method_1_5407 getAttackDamageSource ()Lnet/minecraft/class_1282; + METHOD method_1_5408 applyDamageKnockback (Lnet/minecraft/class_1282;FZ)V + ARG 1 source + ARG 2 amount + ARG 3 blocked METHOD method_5673 setEquipment (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V ARG 1 slot ARG 2 stack @@ -132,6 +137,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 strength ARG 3 x ARG 5 z + ARG 7 source + ARG 8 damageAmount METHOD method_6006 setNearbySongPlaying (Lnet/minecraft/class_2338;Z)V ARG 1 songPosition ARG 2 playing @@ -830,6 +837,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 target ARG 2 strength ARG 3 playerTargetVelocity + ARG 4 source + ARG 5 damageAmount METHOD method_75123 pierce (Lnet/minecraft/class_1304;Lnet/minecraft/class_1297;FZZZ)Z ARG 1 slot ARG 2 target diff --git a/mappings/net/minecraft/entity/passive/SulfurCubeArchetype.mapping b/mappings/net/minecraft/entity/passive/SulfurCubeArchetype.mapping index 32266fcc6f..e8ba9e7f66 100644 --- a/mappings/net/minecraft/entity/passive/SulfurCubeArchetype.mapping +++ b/mappings/net/minecraft/entity/passive/SulfurCubeArchetype.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1_719 net/minecraft/entity/passive/SulfurCubeArchetype + FIELD field_1_6320 defaultKnockbackModifiers Lnet/minecraft/class_1_719$class_1_898; METHOD method_1_4341 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance CLASS class_1_720 AttributeEntry @@ -12,3 +13,12 @@ CLASS net/minecraft/class_1_719 net/minecraft/entity/passive/SulfurCubeArchetype ARG 0 attribute ARG 1 amount ARG 3 archetype + CLASS class_1_896 ContactDamage + METHOD method_1_5418 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_1_897 Explosion + METHOD method_1_5419 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_1_898 KnockbackModifiers + METHOD method_1_5420 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/entity/passive/SulfurCubeArchetypes.mapping b/mappings/net/minecraft/entity/passive/SulfurCubeArchetypes.mapping index 0000da4f90..605ca69afc 100644 --- a/mappings/net/minecraft/entity/passive/SulfurCubeArchetypes.mapping +++ b/mappings/net/minecraft/entity/passive/SulfurCubeArchetypes.mapping @@ -8,6 +8,9 @@ CLASS net/minecraft/class_1_726 net/minecraft/entity/passive/SulfurCubeArchetype FIELD field_1_3701 SLOW_FLAT Lnet/minecraft/class_5321; FIELD field_1_3702 SLOW_SLIDING Lnet/minecraft/class_5321; FIELD field_1_3703 STICKY Lnet/minecraft/class_5321; + FIELD field_1_6080 EXPLOSIVE Lnet/minecraft/class_5321; + FIELD field_1_6328 HOT Lnet/minecraft/class_5321; + FIELD field_1_6329 SLOW_BOUNCY Lnet/minecraft/class_5321; METHOD method_1_4354 add (Lnet/minecraft/class_6880;D)Ljava/util/function/Function; ARG 0 attribute ARG 1 value @@ -35,3 +38,14 @@ CLASS net/minecraft/class_1_726 net/minecraft/entity/passive/SulfurCubeArchetype ARG 2 itemTag ARG 3 attributes ARG 4 buoyant + ARG 5 explosion + ARG 6 contactDamage + ARG 7 knockbackModifiers + METHOD method_1_5435 contactDamage (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_5863;Z)Lnet/minecraft/class_1_719$class_1_896; + ARG 0 registry + ARG 1 damageType + ARG 2 amount + ARG 3 attributeToSource + METHOD method_1_5436 knockback (FF)Lnet/minecraft/class_1_719$class_1_898; + ARG 0 horizontalPower + ARG 1 verticalPower diff --git a/mappings/net/minecraft/entity/passive/SulfurCubeEntity.mapping b/mappings/net/minecraft/entity/passive/SulfurCubeEntity.mapping index 31f79b5331..c8195a1a99 100644 --- a/mappings/net/minecraft/entity/passive/SulfurCubeEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SulfurCubeEntity.mapping @@ -5,6 +5,9 @@ CLASS net/minecraft/class_1_748 net/minecraft/entity/passive/SulfurCubeEntity FIELD field_1_3790 pickupTimer I FIELD field_1_6154 FUSE Lnet/minecraft/class_2940; FIELD field_1_6155 fuse I + FIELD field_1_6346 contactDamage Ljava/util/List; + FIELD field_1_6347 explosion Ljava/util/Optional; + FIELD field_1_6348 knockbackModifiers Lnet/minecraft/class_1_719$class_1_898; METHOD method_1_4505 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 0 type ARG 1 world @@ -50,6 +53,28 @@ CLASS net/minecraft/class_1_748 net/minecraft/entity/passive/SulfurCubeEntity METHOD method_1_5252 setFuse (I)V ARG 1 fuse METHOD method_1_5253 tickFuseCountdown ()V + METHOD method_1_5445 applyContactDamage (Lnet/minecraft/class_1297;)V + ARG 1 target + METHOD method_1_5446 spin (FLnet/minecraft/class_241;Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Lnet/minecraft/class_241; + ARG 1 spinFactor + ARG 2 direction + ARG 3 eyePos + ARG 4 rotationVector + ARG 5 centerPos + METHOD method_1_5447 adjustDirectionByHeight (FFFLnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_243;F)Lnet/minecraft/class_241; + ARG 1 factor + ARG 2 horizontalPower + ARG 3 verticalPower + ARG 4 eyePos + ARG 5 rotationVector + ARG 6 centerPos + ARG 7 height + METHOD method_1_5448 adjustDirectionByDeclination (FFFLnet/minecraft/class_243;Lnet/minecraft/class_243;)Lnet/minecraft/class_241; + ARG 1 factor + ARG 2 horizontalPower + ARG 3 verticalPower + ARG 4 attackerPos + ARG 5 selfPos CLASS class_1_749 SulfurCubeLookControl CLASS class_1_750 SulfurCubeMoveControl METHOD (Lnet/minecraft/class_1_748;)V diff --git a/mappings/net/minecraft/nbt/NbtOps.mapping b/mappings/net/minecraft/nbt/NbtOps.mapping index feb1ffe340..e69be427c5 100644 --- a/mappings/net/minecraft/nbt/NbtOps.mapping +++ b/mappings/net/minecraft/nbt/NbtOps.mapping @@ -49,6 +49,8 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps ARG 1 value METHOD createString (Ljava/lang/String;)Ljava/lang/Object; ARG 1 string + METHOD getBooleanValue (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 elem METHOD getByteBuffer (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 element METHOD getIntStream (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; @@ -85,6 +87,8 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps METHOD mergeToMap (Ljava/lang/Object;Ljava/util/Map;)Lcom/mojang/serialization/DataResult; ARG 1 nbt ARG 2 map + METHOD method_1_5397 (Ljava/lang/Number;)Ljava/lang/Boolean; + ARG 0 number METHOD method_29147 (Ljava/util/List;Lnet/minecraft/class_2487;Lcom/mojang/datafixers/util/Pair;)V ARG 0 entry ARG 2 pair diff --git a/mappings/net/minecraft/predicate/entity/EntityTagsSubPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityTagsSubPredicate.mapping index 6d1d378015..55325393be 100644 --- a/mappings/net/minecraft/predicate/entity/EntityTagsSubPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityTagsSubPredicate.mapping @@ -1 +1,11 @@ CLASS net/minecraft/class_1_824 net/minecraft/predicate/entity/EntityTagsSubPredicate + METHOD method_1_5107 hasAll (Ljava/util/Set;Ljava/util/List;)Z + ARG 0 actual + ARG 1 expected + METHOD method_1_5108 hasAny (Ljava/util/Set;Ljava/util/List;)Z + ARG 0 actual + ARG 1 expected + METHOD method_1_5109 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_1_5110 test (Ljava/util/Set;)Z + ARG 1 tags diff --git a/mappings/net/minecraft/server/command/TeamCommand.mapping b/mappings/net/minecraft/server/command/TeamCommand.mapping index b94371477d..07c68554af 100644 --- a/mappings/net/minecraft/server/command/TeamCommand.mapping +++ b/mappings/net/minecraft/server/command/TeamCommand.mapping @@ -10,6 +10,11 @@ CLASS net/minecraft/class_3142 net/minecraft/server/command/TeamCommand FIELD field_13755 OPTION_NAME_UNCHANGED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_13756 OPTION_SEE_FRIENDLY_INVISIBLES_ALREADY_DISABLED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_13757 OPTION_DEATH_MESSAGE_VISIBILITY_UNCHANGED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD method_1_5192 executeResetColor (Lnet/minecraft/class_2168;Lnet/minecraft/class_268;)I + ARG 0 source + ARG 1 team + METHOD method_1_5194 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context METHOD method_13711 executeModifyDisplayName (Lnet/minecraft/class_2168;Lnet/minecraft/class_268;Lnet/minecraft/class_2561;)I ARG 0 source ARG 1 team diff --git a/mappings/net/minecraft/server/dedicated/management/IncomingRpcMethod.mapping b/mappings/net/minecraft/server/dedicated/management/IncomingRpcMethod.mapping index 25e12442dc..d35e7ff1d7 100644 --- a/mappings/net/minecraft/server/dedicated/management/IncomingRpcMethod.mapping +++ b/mappings/net/minecraft/server/dedicated/management/IncomingRpcMethod.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_11796 net/minecraft/server/dedicated/management/Incomi METHOD method_73626 createParameterlessBuilder (Ljava/util/function/Function;)Lnet/minecraft/class_11796$class_11797; ARG 0 handler CLASS class_11797 Builder + FIELD field_1_6078 allowPreServerInit Z FIELD field_62294 description Ljava/lang/String; FIELD field_62295 params Lnet/minecraft/class_11818; FIELD field_62296 result Lnet/minecraft/class_11820; @@ -17,6 +18,11 @@ CLASS net/minecraft/class_11796 net/minecraft/server/dedicated/management/Incomi FIELD field_62298 discoverable Z FIELD field_63667 parameterlessHandler Lnet/minecraft/class_11796$class_11800; FIELD field_63668 parameterizedHandler Lnet/minecraft/class_11796$class_11801; + METHOD (Lnet/minecraft/class_11796$class_11800;)V + ARG 1 parameterlessHandler + METHOD (Lnet/minecraft/class_11796$class_11801;)V + ARG 1 parameterizedHandler + METHOD method_1_5200 allowPreServerInit ()Lnet/minecraft/class_11796$class_11797; METHOD method_73627 noRequireMainThread ()Lnet/minecraft/class_11796$class_11797; METHOD method_73628 parameter (Ljava/lang/String;Lnet/minecraft/class_11821;)Lnet/minecraft/class_11796$class_11797; ARG 1 name diff --git a/mappings/net/minecraft/server/dedicated/management/OutgoingRpcMethod.mapping b/mappings/net/minecraft/server/dedicated/management/OutgoingRpcMethod.mapping index 9cd5854259..039bfccefa 100644 --- a/mappings/net/minecraft/server/dedicated/management/OutgoingRpcMethod.mapping +++ b/mappings/net/minecraft/server/dedicated/management/OutgoingRpcMethod.mapping @@ -11,11 +11,15 @@ CLASS net/minecraft/class_11808 net/minecraft/server/dedicated/management/Outgoi CLASS class_11809 Parameterized CLASS class_11810 Notification CLASS class_11811 Builder + FIELD field_1_6079 allowPreServerInit Z FIELD field_62320 factory Lnet/minecraft/class_11808$class_12056; FIELD field_62321 description Ljava/lang/String; FIELD field_62322 requestParameter Lnet/minecraft/class_11818; FIELD field_62323 responseResult Lnet/minecraft/class_11820; FIELD field_63003 DEFAULT_ATTRIBUTES Lnet/minecraft/class_11808$class_12055; + METHOD (Lnet/minecraft/class_11808$class_12056;)V + ARG 1 factory + METHOD method_1_5201 allowPreServerInit ()Lnet/minecraft/class_11808$class_11811; METHOD method_73691 requestParameter (Ljava/lang/String;Lnet/minecraft/class_11821;)Lnet/minecraft/class_11808$class_11811; ARG 1 name ARG 2 schema diff --git a/mappings/net/minecraft/structure/StructureTemplate.mapping b/mappings/net/minecraft/structure/StructureTemplate.mapping index 26905e1021..a9a5c52716 100644 --- a/mappings/net/minecraft/structure/StructureTemplate.mapping +++ b/mappings/net/minecraft/structure/StructureTemplate.mapping @@ -115,6 +115,7 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate ARG 1 pos ARG 2 pivot ARG 3 placementData + ARG 4 structureBlockInfos METHOD method_17916 getEntity (Lnet/minecraft/class_8942;Lnet/minecraft/class_5425;Lnet/minecraft/class_2487;)Ljava/util/Optional; ARG 0 errorReporter ARG 1 world diff --git a/mappings/net/minecraft/structure/processor/StructureProcessor.mapping b/mappings/net/minecraft/structure/processor/StructureProcessor.mapping index 227ef5fe56..68607e2806 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessor.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/class_3491 net/minecraft/structure/processor/StructureProcessor METHOD method_1_4636 getCodec ()Lcom/mojang/serialization/MapCodec; + METHOD method_1_5456 alwaysRun ()Z METHOD method_15110 process (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_3492;)Lnet/minecraft/class_3499$class_3501; ARG 1 world ARG 2 pos ARG 3 pivot + ARG 4 originalPos ARG 5 currentBlockInfo ARG 6 data METHOD method_49887 reprocess (Lnet/minecraft/class_5425;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_3492;)Ljava/util/List; diff --git a/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping b/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping index 1740332579..ca87fb15b9 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping @@ -25,6 +25,7 @@ CLASS net/minecraft/class_3821 net/minecraft/structure/processor/StructureProces ARG 1 random ARG 2 nbt METHOD method_16762 test (Lnet/minecraft/class_4538;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z + ARG 1 world ARG 2 input ARG 3 originalPos ARG 4 currentPos diff --git a/mappings/net/minecraft/structure/rule/RuleTest.mapping b/mappings/net/minecraft/structure/rule/RuleTest.mapping index b6bf7fff3b..c0f380342e 100644 --- a/mappings/net/minecraft/structure/rule/RuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/RuleTest.mapping @@ -1,6 +1,10 @@ CLASS net/minecraft/class_3825 net/minecraft/structure/rule/RuleTest COMMENT Rule tests are used in structure generation to check if a block state matches some condition. FIELD field_25012 TYPE_CODEC Lcom/mojang/serialization/Codec; + METHOD method_1_5454 test (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z + ARG 1 world + ARG 2 pos + ARG 3 random METHOD method_16766 getType ()Lnet/minecraft/class_3827; METHOD method_16768 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;)Z ARG 1 state diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index 1fe153a0a8..d1529b1094 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -88,6 +88,10 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext METHOD method_1_4690 testMobSpawner (Lnet/minecraft/class_1299;Lnet/minecraft/class_243;)Lnet/minecraft/class_1_776; ARG 1 type ARG 2 pos + METHOD method_1_5434 spawnEntity (Lnet/minecraft/class_1299;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;)Lnet/minecraft/class_1297; + ARG 1 type + ARG 2 pos + ARG 3 reason METHOD method_35943 getWorld ()Lnet/minecraft/class_3218; METHOD method_35945 pushButton (III)V ARG 1 x @@ -592,6 +596,9 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 1 entity METHOD method_75527 spawnEntity (Lnet/minecraft/class_1299;DDDLnet/minecraft/class_3730;)Lnet/minecraft/class_1308; ARG 1 type + ARG 2 x + ARG 4 y + ARG 6 z ARG 8 reason METHOD method_75528 spawnEntity (Lnet/minecraft/class_1299;Lnet/minecraft/class_243;)Lnet/minecraft/class_1297; ARG 1 type diff --git a/mappings/net/minecraft/test/TestEnvironmentDefinition.mapping b/mappings/net/minecraft/test/TestEnvironmentDefinition.mapping index c888ade4a9..5c1de5f7b7 100644 --- a/mappings/net/minecraft/test/TestEnvironmentDefinition.mapping +++ b/mappings/net/minecraft/test/TestEnvironmentDefinition.mapping @@ -26,6 +26,9 @@ CLASS net/minecraft/class_10665 net/minecraft/test/TestEnvironmentDefinition CLASS class_1_434 TimelineDefinition METHOD method_1_2830 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + CLASS class_1_868 Difficulty + METHOD method_1_5286 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_10666 AllOf FIELD field_56202 CODEC Lcom/mojang/serialization/MapCodec; METHOD ([Lnet/minecraft/class_10665;)V diff --git a/mappings/net/minecraft/util/collection/Pool.mapping b/mappings/net/minecraft/util/collection/Pool.mapping index 6a0122a6bc..a9010f6b68 100644 --- a/mappings/net/minecraft/util/collection/Pool.mapping +++ b/mappings/net/minecraft/util/collection/Pool.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/class_6012 net/minecraft/util/collection/Pool ARG 0 weightedCodec METHOD method_1_3104 (Lnet/minecraft/class_6012;)Lcom/mojang/serialization/DataResult; ARG 0 entry + METHOD method_1_5404 of ([Ljava/lang/Object;)Lnet/minecraft/class_6012; + ARG 0 entries METHOD method_34988 of (Ljava/util/List;)Lnet/minecraft/class_6012; ARG 0 entries METHOD method_34989 of ([Lnet/minecraft/class_6010;)Lnet/minecraft/class_6012; diff --git a/mappings/net/minecraft/util/math/ColorHelper.mapping b/mappings/net/minecraft/util/math/ColorHelper.mapping index bdc1e10c91..6271b3032f 100644 --- a/mappings/net/minecraft/util/math/ColorHelper.mapping +++ b/mappings/net/minecraft/util/math/ColorHelper.mapping @@ -5,6 +5,9 @@ CLASS net/minecraft/class_9848 net/minecraft/util/math/ColorHelper FIELD field_63679 LINEAR_TO_SRGB [B METHOD method_1_2566 gray (F)I ARG 0 value + METHOD method_1_5395 setRgbaVector (Lorg/joml/Vector4f;I)Lorg/joml/Vector4f; + ARG 0 vec + ARG 1 argb METHOD method_61317 getWhite (F)I ARG 0 alpha METHOD method_61318 fromFloats (FFFF)I diff --git a/mappings/net/minecraft/util/math/Vec2f.mapping b/mappings/net/minecraft/util/math/Vec2f.mapping index 4df748ac3a..310ef4447f 100644 --- a/mappings/net/minecraft/util/math/Vec2f.mapping +++ b/mappings/net/minecraft/util/math/Vec2f.mapping @@ -14,6 +14,10 @@ CLASS net/minecraft/class_241 net/minecraft/util/math/Vec2f METHOD (FF)V ARG 1 x ARG 2 y + METHOD equals (Ljava/lang/Object;)Z + ARG 1 other + METHOD method_1_5398 rotate (D)Lnet/minecraft/class_241; + ARG 1 angle METHOD method_35581 normalize ()Lnet/minecraft/class_241; METHOD method_35582 multiply (F)Lnet/minecraft/class_241; ARG 1 value diff --git a/mappings/net/minecraft/util/math/floatprovider/FloatProviders.mapping b/mappings/net/minecraft/util/math/floatprovider/FloatProviders.mapping index 5ced6ec2ba..852c4514ad 100644 --- a/mappings/net/minecraft/util/math/floatprovider/FloatProviders.mapping +++ b/mappings/net/minecraft/util/math/floatprovider/FloatProviders.mapping @@ -16,3 +16,7 @@ CLASS net/minecraft/class_1_472 net/minecraft/util/math/floatprovider/FloatProvi ARG 0 provider METHOD method_1_2988 (Lnet/minecraft/class_5863;)Lcom/mojang/datafixers/util/Either; ARG 0 provider + METHOD method_1_5442 atLeast (F)Lcom/mojang/serialization/Codec; + ARG 0 min + METHOD method_1_5443 (FLnet/minecraft/class_5863;)Lcom/mojang/serialization/DataResult; + ARG 1 provider diff --git a/mappings/net/minecraft/world/ChunkRegion.mapping b/mappings/net/minecraft/world/ChunkRegion.mapping index 0e2d9c25f9..1b54d79cbe 100644 --- a/mappings/net/minecraft/world/ChunkRegion.mapping +++ b/mappings/net/minecraft/world/ChunkRegion.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_3233 net/minecraft/world/ChunkRegion + FIELD field_1_6290 centerX I + FIELD field_1_6291 centerZ I + FIELD field_1_6292 blockStateWriteRadius I FIELD field_14087 seed J FIELD field_14091 random Lnet/minecraft/class_5819; FIELD field_14092 LOGGER Lorg/slf4j/Logger; @@ -19,6 +22,14 @@ CLASS net/minecraft/class_3233 net/minecraft/world/ChunkRegion ARG 2 chunks ARG 3 generationStep ARG 4 centerPos + METHOD method_1_5409 isWithinSafeArea (II)Z + ARG 1 chunkX + ARG 2 chunkZ + METHOD method_1_5410 isWithinSafeArea (Lnet/minecraft/class_2338;)Z + ARG 1 blockPos + METHOD method_1_5411 assertInSafeArea (II)V + ARG 1 chunkX + ARG 2 chunkZ METHOD method_14337 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_6763; ARG 1 pos METHOD method_14338 markBlockForPostProcessing (Lnet/minecraft/class_2338;)V diff --git a/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping index 50d4813de6..b635830652 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig FIELD field_24137 minimumSize Lnet/minecraft/class_5201; FIELD field_24138 ignoreVines Z FIELD field_24921 CODEC Lcom/mojang/serialization/Codec; - FIELD field_29279 dirtProvider Lnet/minecraft/class_4651; + FIELD field_29279 belowTrunkProvider Lnet/minecraft/class_4651; FIELD field_29280 foliageProvider Lnet/minecraft/class_4651; FIELD field_38767 rootPlacer Ljava/util/Optional; METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Ljava/util/Optional;Lnet/minecraft/class_5201;Ljava/util/List;ZLnet/minecraft/class_4651;)V @@ -19,6 +19,9 @@ CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig ARG 6 minimumSize ARG 7 decorators ARG 8 ignoreVines + ARG 9 belowTrunkProvider + METHOD method_1_5394 defaultBelowTrunkProvider (Lnet/minecraft/class_7871;)Lnet/minecraft/class_4651; + ARG 0 biomeLookup METHOD method_28811 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_28814 (Lnet/minecraft/class_4643;)Lnet/minecraft/class_5201; @@ -56,14 +59,17 @@ CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig ARG 4 foliagePlacer ARG 5 rootPlacer ARG 6 minimumSize + ARG 7 belowTrunkProvider METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5201;Lnet/minecraft/class_4651;)V ARG 1 trunkProvider ARG 2 trunkPlacer ARG 3 foliageProvider ARG 4 foliagePlacer ARG 5 minimumSize + ARG 6 belowTrunkProvider METHOD method_23445 build ()Lnet/minecraft/class_4643; METHOD method_27374 ignoreVines ()Lnet/minecraft/class_4643$class_4644; METHOD method_27376 decorators (Ljava/util/List;)Lnet/minecraft/class_4643$class_4644; ARG 1 decorators METHOD method_34346 belowTrunkProvider (Lnet/minecraft/class_4651;)Lnet/minecraft/class_4643$class_4644; + ARG 1 belowTrunkProvider diff --git a/mappings/net/minecraft/world/gen/feature/WeightedRandomFeature.mapping b/mappings/net/minecraft/world/gen/feature/WeightedRandomFeature.mapping new file mode 100644 index 0000000000..4c7a71ccb6 --- /dev/null +++ b/mappings/net/minecraft/world/gen/feature/WeightedRandomFeature.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_1_902 net/minecraft/world/gen/feature/WeightedRandomFeature + METHOD method_1_5455 (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)Ljava/lang/Boolean; + ARG 4 entry diff --git a/mappings/net/minecraft/world/gen/feature/WeightedRandomFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/WeightedRandomFeatureConfig.mapping new file mode 100644 index 0000000000..59d86092ab --- /dev/null +++ b/mappings/net/minecraft/world/gen/feature/WeightedRandomFeatureConfig.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_1_903 net/minecraft/world/gen/feature/WeightedRandomFeatureConfig + METHOD method_1_5457 (Lnet/minecraft/class_6010;)Ljava/util/stream/Stream; + ARG 0 entry + METHOD method_1_5458 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping index 81d5f9f8ef..f27aae0076 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping @@ -5,6 +5,13 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu FIELD field_35494 STONE_DEPTH_CEILING Lnet/minecraft/class_6686$class_6693; FIELD field_36341 STONE_DEPTH_FLOOR_WITH_SURFACE_DEPTH_RANGE_6 Lnet/minecraft/class_6686$class_6693; FIELD field_36342 STONE_DEPTH_FLOOR_WITH_SURFACE_DEPTH_RANGE_30 Lnet/minecraft/class_6686$class_6693; + METHOD method_1_5437 noiseThreshold3d (Lnet/minecraft/class_5321;D)Lnet/minecraft/class_6686$class_6693; + ARG 0 noise + ARG 1 min + METHOD method_1_5438 noiseThreshold3d (Lnet/minecraft/class_5321;DD)Lnet/minecraft/class_6686$class_6693; + ARG 0 noise + ARG 1 min + ARG 3 max METHOD method_39045 steepSlope ()Lnet/minecraft/class_6686$class_6693; METHOD method_39046 water (II)Lnet/minecraft/class_6686$class_6693; ARG 0 offset @@ -89,6 +96,8 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu FIELD field_1_5962 currentBiome Lnet/minecraft/class_6880; FIELD field_1_5963 includedBiomes Ljava/util/Set; COMMENT Used for optimizing {@link BiomeMaterialRule}. + FIELD field_1_6330 cache2d Ljava/util/Map; + FIELD field_1_6331 cache3d Ljava/util/Map; FIELD field_35233 surfaceBuilder Lnet/minecraft/class_6724; FIELD field_35234 biomeTemperaturePredicate Lnet/minecraft/class_6686$class_6692; FIELD field_35235 steepSlopePredicate Lnet/minecraft/class_6686$class_6692; @@ -127,6 +136,13 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu ARG 6 heightContext ARG 7 includedBiomes METHOD method_1_5130 getCurrentBiome ()Lnet/minecraft/class_6880; + METHOD method_1_5439 computeSupplier2d (Lnet/minecraft/class_5321;)Ljava/util/function/DoubleSupplier; + ARG 1 noise + METHOD method_1_5440 computeSupplier3d (Lnet/minecraft/class_5321;)Ljava/util/function/DoubleSupplier; + ARG 1 noise + METHOD method_1_5441 getSupplier (Lnet/minecraft/class_5321;Z)Ljava/util/function/DoubleSupplier; + ARG 1 noiseParams + ARG 2 is3d METHOD method_39072 initHorizontalContext (II)V ARG 1 blockX ARG 2 blockZ @@ -142,6 +158,12 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu METHOD method_39904 chunkToBlockCoord (I)I ARG 0 chunkCoord METHOD method_61804 getSeaLevel ()I + CLASS 1 1 + FIELD field_1_6332 lastQueriedValue D + FIELD field_1_6333 lastQueriedPos J + CLASS 2 2 + FIELD field_1_6336 lastQueriedValue D + FIELD field_1_6337 lastQueriedPos J CLASS class_6695 NegativeRunDepthPredicate METHOD (Lnet/minecraft/class_6686$class_6694;)V ARG 1 context diff --git a/unpick-definitions/gl.unpick b/unpick-definitions/gl.unpick index 6cae30d119..ab7a3173b0 100644 --- a/unpick-definitions/gl.unpick +++ b/unpick-definitions/gl.unpick @@ -495,13 +495,13 @@ target_method com.mojang.blaze3d.opengl.GlStateManager _glFramebufferTexture2D ( param 2 gl_tex_target target_method org.lwjgl.opengl.ARBDirectStateAccess glNamedFramebufferTexture (IIII)V param 1 gl_framebuffer_attachment -target_method net.minecraft.client.gl.BufferManager setupFramebuffer (I[I[IIII)V +target_method net.minecraft.client.gl.GlBufferManager setupFramebuffer (I[I[IIII)V param 4 gl_framebuffer_target target_method com.mojang.blaze3d.opengl.GlStateManager _glBlitFrameBuffer (IIIIIIIIII)V param 8 gl_buffer_mask param 9 gl_filter -target_method net.minecraft.client.gl.BufferManager setupBlitFramebuffer (IIIIIIIIIIII)V +target_method net.minecraft.client.gl.GlBufferManager setupBlitFramebuffer (IIIIIIIIIIII)V param 10 gl_buffer_mask param 11 gl_filter