From 19c21a2157a81c418f456df2466f70a4f0ab1fbc Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Thu, 9 Apr 2026 04:44:37 -0400 Subject: [PATCH 01/12] Continue mapping 26.2-snapshot-1 --- .../blaze3d/buffers/GpuBufferSlice.mapping | 4 ++ .../buffers}/MappableRingBuffer.mapping | 2 +- .../blaze3d/opengl/GlStateManager.mapping | 2 + .../blaze3d/profiling/GpuProfiler.mapping | 2 + .../mojang/blaze3d/shaders}/Defines.mapping | 2 +- .../shaders}/DynamicUniformStorage.mapping | 2 +- .../blaze3d/shaders}/DynamicUniforms.mapping | 2 +- .../shaders}/GlslImportProcessor.mapping | 2 +- .../mojang/blaze3d/shaders/ShaderType.mapping | 3 ++ .../blaze3d/shaders}/UniformType.mapping | 2 +- .../blaze3d/shaders}/UniformValue.mapping | 2 +- .../blaze3d/systems/CommandEncoder.mapping | 2 + .../systems/CommandEncoderBackend.mapping | 1 + .../mojang/blaze3d/systems/GpuBackend.mapping | 2 +- .../mojang/blaze3d/systems/GpuSurface.mapping | 2 + .../blaze3d/textures}/Framebuffer.mapping | 2 +- .../blaze3d/textures}/GpuSampler.mapping | 2 +- .../blaze3d/textures/GpuTextureView.mapping | 9 ++++ .../blaze3d/textures}/SamplerCache.mapping | 9 ++-- .../minecraft/client/MinecraftClient.mapping | 1 + mappings/net/minecraft/client/Mouse.mapping | 1 + .../net/minecraft/client/gl/GlBackend.mapping | 5 +- ...rogram.mapping => GlShaderProgram.mapping} | 2 +- .../gl/SimpleFramebufferFactory.mapping | 1 - .../{gl => render}/GlobalSettings.mapping | 3 +- .../{gl => render}/RenderPipelines.mapping | 2 +- .../{gl => render}/SimpleFramebuffer.mapping | 2 +- .../render/SimpleFramebufferFactory.mapping | 1 + .../{gl => render/state}/ScissorState.mapping | 2 +- .../{gl => shader}/ShaderSourceGetter.mapping | 2 +- .../client/vulkan/SpirvShader.mapping | 16 +++++- .../client/vulkan/SpirvShaderCompiler.mapping | 20 +++++++- .../minecraft/client/vulkan/VkBackend.mapping | 19 ------- .../minecraft/client/vulkan/VkBuffer.mapping | 8 --- .../vulkan/VkCommandEncoderBackend.mapping | 25 ---------- .../vulkan/VkCompiledRenderPipeline.mapping | 1 - .../client/vulkan/VkRenderPassBackend.mapping | 9 ---- .../client/vulkan/VkSurfaceBackend.mapping | 4 -- .../minecraft/client/vulkan/VkTexture.mapping | 11 ---- .../client/vulkan/VkTextureView.mapping | 1 - .../client/vulkan/VulkanBackend.mapping | 48 ++++++++++++++++++ .../client/vulkan/VulkanBuffer.mapping | 20 ++++++++ .../VulkanCommandEncoderBackend.mapping | 50 +++++++++++++++++++ .../VulkanCompiledRenderPipeline.mapping | 11 ++++ ...Conversion.mapping => VulkanConst.mapping} | 8 ++- ...kFeature.mapping => VulkanFeature.mapping} | 2 +- ...nstance.mapping => VulkanInstance.mapping} | 6 +-- .../vulkan/VulkanPhysicalDevice.mapping} | 15 +++++- ...t.mapping => VulkanPipelineLayout.mapping} | 2 +- .../{VkQueue.mapping => VulkanQueue.mapping} | 2 +- .../vulkan/VulkanRenderPassBackend.mapping | 31 ++++++++++++ ...kSampler.mapping => VulkanSampler.mapping} | 6 +-- ...{VkStruct.mapping => VulkanStruct.mapping} | 2 +- .../vulkan/VulkanSurfaceBackend.mapping | 33 ++++++++++++ .../client/vulkan/VulkanTexture.mapping | 18 +++++++ .../client/vulkan/VulkanTextureView.mapping | 10 ++++ ...pping => VulkanTimestampQueryPool.mapping} | 2 +- .../client/window/VulkanWindowBackend.mapping | 16 ++++++ .../minecraft/client/window/Window.mapping | 8 +-- .../client/window/WindowEventHandler.mapping | 3 +- .../client/window/WindowException.mapping | 3 ++ .../{gl => window}/WindowFramebuffer.mapping | 2 +- .../effect}/PostEffectPipeline.mapping | 2 +- 63 files changed, 365 insertions(+), 125 deletions(-) create mode 100644 mappings/com/mojang/blaze3d/buffers/GpuBufferSlice.mapping rename mappings/{net/minecraft/client/gl => com/mojang/blaze3d/buffers}/MappableRingBuffer.mapping (85%) rename mappings/{net/minecraft/client/gl => com/mojang/blaze3d/shaders}/Defines.mapping (95%) rename mappings/{net/minecraft/client/gl => com/mojang/blaze3d/shaders}/DynamicUniformStorage.mapping (91%) rename mappings/{net/minecraft/client/gl => com/mojang/blaze3d/shaders}/DynamicUniforms.mapping (95%) rename mappings/{net/minecraft/client/shader => com/mojang/blaze3d/shaders}/GlslImportProcessor.mapping (96%) rename mappings/{net/minecraft/client/gl => com/mojang/blaze3d/shaders}/UniformType.mapping (61%) rename mappings/{net/minecraft/client/gl => com/mojang/blaze3d/shaders}/UniformValue.mapping (94%) rename mappings/{net/minecraft/client/gl => com/mojang/blaze3d/textures}/Framebuffer.mapping (94%) rename mappings/{net/minecraft/client/gl => com/mojang/blaze3d/textures}/GpuSampler.mapping (85%) create mode 100644 mappings/com/mojang/blaze3d/textures/GpuTextureView.mapping rename mappings/{net/minecraft/client/gl => com/mojang/blaze3d/textures}/SamplerCache.mapping (86%) rename mappings/net/minecraft/client/gl/{ShaderProgram.mapping => GlShaderProgram.mapping} (95%) delete mode 100644 mappings/net/minecraft/client/gl/SimpleFramebufferFactory.mapping rename mappings/net/minecraft/client/{gl => render}/GlobalSettings.mapping (76%) rename mappings/net/minecraft/client/{gl => render}/RenderPipelines.mapping (99%) rename mappings/net/minecraft/client/{gl => render}/SimpleFramebuffer.mapping (58%) create mode 100644 mappings/net/minecraft/client/render/SimpleFramebufferFactory.mapping rename mappings/net/minecraft/client/{gl => render/state}/ScissorState.mapping (83%) rename mappings/net/minecraft/client/{gl => shader}/ShaderSourceGetter.mapping (62%) delete mode 100644 mappings/net/minecraft/client/vulkan/VkBackend.mapping delete mode 100644 mappings/net/minecraft/client/vulkan/VkBuffer.mapping delete mode 100644 mappings/net/minecraft/client/vulkan/VkCommandEncoderBackend.mapping delete mode 100644 mappings/net/minecraft/client/vulkan/VkCompiledRenderPipeline.mapping delete mode 100644 mappings/net/minecraft/client/vulkan/VkRenderPassBackend.mapping delete mode 100644 mappings/net/minecraft/client/vulkan/VkSurfaceBackend.mapping delete mode 100644 mappings/net/minecraft/client/vulkan/VkTexture.mapping delete mode 100644 mappings/net/minecraft/client/vulkan/VkTextureView.mapping create mode 100644 mappings/net/minecraft/client/vulkan/VulkanBackend.mapping create mode 100644 mappings/net/minecraft/client/vulkan/VulkanBuffer.mapping create mode 100644 mappings/net/minecraft/client/vulkan/VulkanCommandEncoderBackend.mapping create mode 100644 mappings/net/minecraft/client/vulkan/VulkanCompiledRenderPipeline.mapping rename mappings/net/minecraft/client/vulkan/{VkConstConversion.mapping => VulkanConst.mapping} (72%) rename mappings/net/minecraft/client/vulkan/{VkFeature.mapping => VulkanFeature.mapping} (90%) rename mappings/net/minecraft/client/vulkan/{VkInstance.mapping => VulkanInstance.mapping} (77%) rename mappings/net/minecraft/{class_1_717.mapping => client/vulkan/VulkanPhysicalDevice.mapping} (56%) rename mappings/net/minecraft/client/vulkan/{VkPipelineLayout.mapping => VulkanPipelineLayout.mapping} (76%) rename mappings/net/minecraft/client/vulkan/{VkQueue.mapping => VulkanQueue.mapping} (92%) create mode 100644 mappings/net/minecraft/client/vulkan/VulkanRenderPassBackend.mapping rename mappings/net/minecraft/client/vulkan/{VkSampler.mapping => VulkanSampler.mapping} (83%) rename mappings/net/minecraft/client/vulkan/{VkStruct.mapping => VulkanStruct.mapping} (88%) create mode 100644 mappings/net/minecraft/client/vulkan/VulkanSurfaceBackend.mapping create mode 100644 mappings/net/minecraft/client/vulkan/VulkanTexture.mapping create mode 100644 mappings/net/minecraft/client/vulkan/VulkanTextureView.mapping rename mappings/net/minecraft/client/vulkan/{VkTimestampQueryPool.mapping => VulkanTimestampQueryPool.mapping} (72%) rename mappings/net/minecraft/client/{gl => window}/WindowFramebuffer.mapping (92%) rename mappings/net/minecraft/{client/gl => render/effect}/PostEffectPipeline.mapping (95%) diff --git a/mappings/com/mojang/blaze3d/buffers/GpuBufferSlice.mapping b/mappings/com/mojang/blaze3d/buffers/GpuBufferSlice.mapping new file mode 100644 index 0000000000..2ed81e215b --- /dev/null +++ b/mappings/com/mojang/blaze3d/buffers/GpuBufferSlice.mapping @@ -0,0 +1,4 @@ +CLASS com/mojang/blaze3d/buffers/GpuBufferSlice + METHOD slice (JJ)Lcom/mojang/blaze3d/buffers/GpuBufferSlice; + ARG 1 offset + ARG 3 length diff --git a/mappings/net/minecraft/client/gl/MappableRingBuffer.mapping b/mappings/com/mojang/blaze3d/buffers/MappableRingBuffer.mapping similarity index 85% rename from mappings/net/minecraft/client/gl/MappableRingBuffer.mapping rename to mappings/com/mojang/blaze3d/buffers/MappableRingBuffer.mapping index f08cc9f471..185fc9a834 100644 --- a/mappings/net/minecraft/client/gl/MappableRingBuffer.mapping +++ b/mappings/com/mojang/blaze3d/buffers/MappableRingBuffer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_11285 net/minecraft/client/gl/MappableRingBuffer +CLASS net/minecraft/class_11285 com/mojang/blaze3d/buffers/MappableRingBuffer FIELD field_60113 BUFFER_COUNT I FIELD field_60114 buffers [Lcom/mojang/blaze3d/buffers/GpuBuffer; FIELD field_60115 fences [Lcom/mojang/blaze3d/buffers/GpuFence; diff --git a/mappings/com/mojang/blaze3d/opengl/GlStateManager.mapping b/mappings/com/mojang/blaze3d/opengl/GlStateManager.mapping index 527acf8093..8c96eeb34b 100644 --- a/mappings/com/mojang/blaze3d/opengl/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/opengl/GlStateManager.mapping @@ -81,6 +81,8 @@ CLASS com/mojang/blaze3d/opengl/GlStateManager METHOD lambda$static$0 (I)Lcom/mojang/blaze3d/opengl/GlStateManager$class_1039; ARG 0 index CLASS class_1017 BlendFuncState + FIELD field_1_3543 opAlpha I + FIELD field_1_3544 opRgb I FIELD field_5045 capState Lcom/mojang/blaze3d/opengl/GlStateManager$class_1018; FIELD field_5046 dstFactorAlpha I FIELD field_5047 srcFactorAlpha I diff --git a/mappings/com/mojang/blaze3d/profiling/GpuProfiler.mapping b/mappings/com/mojang/blaze3d/profiling/GpuProfiler.mapping index 57f1728c8f..3258ca35a5 100644 --- a/mappings/com/mojang/blaze3d/profiling/GpuProfiler.mapping +++ b/mappings/com/mojang/blaze3d/profiling/GpuProfiler.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_1_708 com/mojang/blaze3d/profiling/GpuProfiler + FIELD field_1_3635 tracyGpuContext Lcom/mojang/jtracy/GpuContext; FIELD field_1_3637 timestampQueryPool Lnet/minecraft/class_1_685; METHOD (Lcom/mojang/blaze3d/systems/GpuDevice;)V ARG 1 device + METHOD method_1_4223 close ()V diff --git a/mappings/net/minecraft/client/gl/Defines.mapping b/mappings/com/mojang/blaze3d/shaders/Defines.mapping similarity index 95% rename from mappings/net/minecraft/client/gl/Defines.mapping rename to mappings/com/mojang/blaze3d/shaders/Defines.mapping index 9e20f0cbd3..359a39034b 100644 --- a/mappings/net/minecraft/client/gl/Defines.mapping +++ b/mappings/com/mojang/blaze3d/shaders/Defines.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_10149 net/minecraft/client/gl/Defines +CLASS net/minecraft/class_10149 com/mojang/blaze3d/shaders/Defines FIELD field_53930 EMPTY Lnet/minecraft/class_10149; FIELD field_53931 CODEC Lcom/mojang/serialization/Codec; METHOD method_62926 builder ()Lnet/minecraft/class_10149$class_10150; diff --git a/mappings/net/minecraft/client/gl/DynamicUniformStorage.mapping b/mappings/com/mojang/blaze3d/shaders/DynamicUniformStorage.mapping similarity index 91% rename from mappings/net/minecraft/client/gl/DynamicUniformStorage.mapping rename to mappings/com/mojang/blaze3d/shaders/DynamicUniformStorage.mapping index bc24812247..8fe257ecf5 100644 --- a/mappings/net/minecraft/client/gl/DynamicUniformStorage.mapping +++ b/mappings/com/mojang/blaze3d/shaders/DynamicUniformStorage.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_11280 net/minecraft/client/gl/DynamicUniformStorage +CLASS net/minecraft/class_11280 com/mojang/blaze3d/shaders/DynamicUniformStorage FIELD field_60085 LOGGER Lorg/slf4j/Logger; FIELD field_60086 oldBuffers Ljava/util/List; FIELD field_60087 blockSize I diff --git a/mappings/net/minecraft/client/gl/DynamicUniforms.mapping b/mappings/com/mojang/blaze3d/shaders/DynamicUniforms.mapping similarity index 95% rename from mappings/net/minecraft/client/gl/DynamicUniforms.mapping rename to mappings/com/mojang/blaze3d/shaders/DynamicUniforms.mapping index b8cdedc338..6e4de03d04 100644 --- a/mappings/net/minecraft/client/gl/DynamicUniforms.mapping +++ b/mappings/com/mojang/blaze3d/shaders/DynamicUniforms.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_11282 net/minecraft/client/gl/DynamicUniforms +CLASS net/minecraft/class_11282 com/mojang/blaze3d/shaders/DynamicUniforms FIELD field_1_3648 DEFAULT_TEXTURE_MATRIX Lorg/joml/Matrix4fc; FIELD field_1_3649 DEFAULT_MODEL_OFFSET Lorg/joml/Vector3fc; FIELD field_1_3650 DEFAULT_COLOR_MODULATOR Lorg/joml/Vector4fc; diff --git a/mappings/net/minecraft/client/shader/GlslImportProcessor.mapping b/mappings/com/mojang/blaze3d/shaders/GlslImportProcessor.mapping similarity index 96% rename from mappings/net/minecraft/client/shader/GlslImportProcessor.mapping rename to mappings/com/mojang/blaze3d/shaders/GlslImportProcessor.mapping index 4e1394081e..12b0e70400 100644 --- a/mappings/net/minecraft/client/shader/GlslImportProcessor.mapping +++ b/mappings/com/mojang/blaze3d/shaders/GlslImportProcessor.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5913 net/minecraft/client/shader/GlslImportProcessor +CLASS net/minecraft/class_5913 com/mojang/blaze3d/shaders/GlslImportProcessor COMMENT Handles the flattening of "moj_" import strings in the loaded GLSL shader file. COMMENT Instances of an import are replaced by the contents of the referenced file COMMENT prefixed by a comment describing the line position and original file location diff --git a/mappings/com/mojang/blaze3d/shaders/ShaderType.mapping b/mappings/com/mojang/blaze3d/shaders/ShaderType.mapping index fe0e297e37..034c740380 100644 --- a/mappings/com/mojang/blaze3d/shaders/ShaderType.mapping +++ b/mappings/com/mojang/blaze3d/shaders/ShaderType.mapping @@ -1,3 +1,6 @@ CLASS com/mojang/blaze3d/shaders/ShaderType + METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V + ARG 3 name + ARG 4 extension METHOD byLocation (Lnet/minecraft/class_2960;)Lcom/mojang/blaze3d/shaders/ShaderType; ARG 0 id diff --git a/mappings/net/minecraft/client/gl/UniformType.mapping b/mappings/com/mojang/blaze3d/shaders/UniformType.mapping similarity index 61% rename from mappings/net/minecraft/client/gl/UniformType.mapping rename to mappings/com/mojang/blaze3d/shaders/UniformType.mapping index 60f313114f..cf82ffe578 100644 --- a/mappings/net/minecraft/client/gl/UniformType.mapping +++ b/mappings/com/mojang/blaze3d/shaders/UniformType.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_10789 net/minecraft/client/gl/UniformType +CLASS net/minecraft/class_10789 com/mojang/blaze3d/shaders/UniformType FIELD field_56750 name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name diff --git a/mappings/net/minecraft/client/gl/UniformValue.mapping b/mappings/com/mojang/blaze3d/shaders/UniformValue.mapping similarity index 94% rename from mappings/net/minecraft/client/gl/UniformValue.mapping rename to mappings/com/mojang/blaze3d/shaders/UniformValue.mapping index 56472d6bd4..5f7107e43d 100644 --- a/mappings/net/minecraft/client/gl/UniformValue.mapping +++ b/mappings/com/mojang/blaze3d/shaders/UniformValue.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_11287 net/minecraft/client/gl/UniformValue +CLASS net/minecraft/class_11287 com/mojang/blaze3d/shaders/UniformValue FIELD field_60130 CODEC Lcom/mojang/serialization/Codec; METHOD method_71130 getType ()Lnet/minecraft/class_11287$class_11292; METHOD method_71131 write (Lcom/mojang/blaze3d/buffers/Std140Builder;)V diff --git a/mappings/com/mojang/blaze3d/systems/CommandEncoder.mapping b/mappings/com/mojang/blaze3d/systems/CommandEncoder.mapping index e7350f73b3..78bb8a468f 100644 --- a/mappings/com/mojang/blaze3d/systems/CommandEncoder.mapping +++ b/mappings/com/mojang/blaze3d/systems/CommandEncoder.mapping @@ -2,6 +2,8 @@ CLASS com/mojang/blaze3d/systems/CommandEncoder COMMENT Wraps a {@link com.mojang.blaze3d.systems.BaseCommandEncoder} to provide COMMENT extra run-time checks. METHOD (Lnet/minecraft/class_1_708;Lnet/minecraft/class_1_147;Lnet/minecraft/class_1_154;)V + ARG 1 profiler + ARG 2 device ARG 3 backend METHOD clearColorAndDepthTextures (Lcom/mojang/blaze3d/textures/GpuTexture;ILcom/mojang/blaze3d/textures/GpuTexture;D)V ARG 1 colorAttachment diff --git a/mappings/com/mojang/blaze3d/systems/CommandEncoderBackend.mapping b/mappings/com/mojang/blaze3d/systems/CommandEncoderBackend.mapping index d77798ed63..c21edadd65 100644 --- a/mappings/com/mojang/blaze3d/systems/CommandEncoderBackend.mapping +++ b/mappings/com/mojang/blaze3d/systems/CommandEncoderBackend.mapping @@ -87,6 +87,7 @@ CLASS net/minecraft/class_1_154 com/mojang/blaze3d/systems/CommandEncoderBackend ARG 7 offsetY ARG 8 width ARG 9 height + METHOD method_1_4410 submit ()V METHOD method_1_4411 writeTimestamp (Lnet/minecraft/class_1_685;I)V ARG 1 timestampQueryPool ARG 2 index diff --git a/mappings/com/mojang/blaze3d/systems/GpuBackend.mapping b/mappings/com/mojang/blaze3d/systems/GpuBackend.mapping index 823d512546..a193c9e739 100644 --- a/mappings/com/mojang/blaze3d/systems/GpuBackend.mapping +++ b/mappings/com/mojang/blaze3d/systems/GpuBackend.mapping @@ -41,7 +41,7 @@ CLASS net/minecraft/class_1_147 com/mojang/blaze3d/systems/GpuBackend ARG 3 mipLevels METHOD method_1_1297 getLastDebugMessages ()Ljava/util/List; METHOD method_1_1304 isDebuggingEnabled ()Z - METHOD method_1_1306 precompilePipeline (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/class_12289;)Lcom/mojang/blaze3d/pipeline/CompiledRenderPipeline; + METHOD method_1_1306 getCompiledPipeline (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/class_12289;)Lcom/mojang/blaze3d/pipeline/CompiledRenderPipeline; ARG 1 pipeline ARG 2 sourceGetter METHOD method_1_4219 createSurface (J)Lnet/minecraft/class_1_713; diff --git a/mappings/com/mojang/blaze3d/systems/GpuSurface.mapping b/mappings/com/mojang/blaze3d/systems/GpuSurface.mapping index 0828656872..2f9904f607 100644 --- a/mappings/com/mojang/blaze3d/systems/GpuSurface.mapping +++ b/mappings/com/mojang/blaze3d/systems/GpuSurface.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_1_665 com/mojang/blaze3d/systems/GpuSurface + COMMENT Wraps a {@link com.mojang.blaze3d.systems.GpuSurfaceBackend} to provide extra + COMMENT run-time checks. FIELD field_1_3401 backend Lnet/minecraft/class_1_713; FIELD field_1_3402 settings Ljava/util/Optional; FIELD field_1_3403 blitted Z diff --git a/mappings/net/minecraft/client/gl/Framebuffer.mapping b/mappings/com/mojang/blaze3d/textures/Framebuffer.mapping similarity index 94% rename from mappings/net/minecraft/client/gl/Framebuffer.mapping rename to mappings/com/mojang/blaze3d/textures/Framebuffer.mapping index b4cc53cb0f..7ab7c6c40d 100644 --- a/mappings/net/minecraft/client/gl/Framebuffer.mapping +++ b/mappings/com/mojang/blaze3d/textures/Framebuffer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_276 net/minecraft/client/gl/Framebuffer +CLASS net/minecraft/class_276 com/mojang/blaze3d/textures/Framebuffer FIELD field_1475 colorAttachment Lcom/mojang/blaze3d/textures/GpuTexture; FIELD field_1478 useDepthAttachment Z FIELD field_1481 textureHeight I diff --git a/mappings/net/minecraft/client/gl/GpuSampler.mapping b/mappings/com/mojang/blaze3d/textures/GpuSampler.mapping similarity index 85% rename from mappings/net/minecraft/client/gl/GpuSampler.mapping rename to mappings/com/mojang/blaze3d/textures/GpuSampler.mapping index e2941cd124..8d77336575 100644 --- a/mappings/net/minecraft/client/gl/GpuSampler.mapping +++ b/mappings/com/mojang/blaze3d/textures/GpuSampler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_12137 net/minecraft/client/gl/GpuSampler +CLASS net/minecraft/class_12137 com/mojang/blaze3d/textures/GpuSampler METHOD method_75286 getAddressModeU ()Lcom/mojang/blaze3d/textures/AddressMode; METHOD method_75287 getAddressModeV ()Lcom/mojang/blaze3d/textures/AddressMode; METHOD method_75288 getMinFilterMode ()Lcom/mojang/blaze3d/textures/FilterMode; diff --git a/mappings/com/mojang/blaze3d/textures/GpuTextureView.mapping b/mappings/com/mojang/blaze3d/textures/GpuTextureView.mapping new file mode 100644 index 0000000000..a17ea5ba09 --- /dev/null +++ b/mappings/com/mojang/blaze3d/textures/GpuTextureView.mapping @@ -0,0 +1,9 @@ +CLASS com/mojang/blaze3d/textures/GpuTextureView + METHOD (Lcom/mojang/blaze3d/textures/GpuTexture;II)V + ARG 1 texture + ARG 2 baseMipLevel + ARG 3 mipLevel + METHOD getHeight (I)I + ARG 1 mipmap + METHOD getWidth (I)I + ARG 1 mipmap diff --git a/mappings/net/minecraft/client/gl/SamplerCache.mapping b/mappings/com/mojang/blaze3d/textures/SamplerCache.mapping similarity index 86% rename from mappings/net/minecraft/client/gl/SamplerCache.mapping rename to mappings/com/mojang/blaze3d/textures/SamplerCache.mapping index 3dbaf6fb7d..1bb89d72c7 100644 --- a/mappings/net/minecraft/client/gl/SamplerCache.mapping +++ b/mappings/com/mojang/blaze3d/textures/SamplerCache.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_12136 net/minecraft/client/gl/SamplerCache +CLASS net/minecraft/class_12136 com/mojang/blaze3d/textures/SamplerCache FIELD field_63453 samplers [Lnet/minecraft/class_12137; METHOD method_75292 init ()V METHOD method_75293 get (Lcom/mojang/blaze3d/textures/AddressMode;Lcom/mojang/blaze3d/textures/AddressMode;Lcom/mojang/blaze3d/textures/FilterMode;Lcom/mojang/blaze3d/textures/FilterMode;Z)Lnet/minecraft/class_12137; @@ -6,7 +6,7 @@ CLASS net/minecraft/class_12136 net/minecraft/client/gl/SamplerCache ARG 2 addressModeV ARG 3 minFilterMode ARG 4 magFilterMode - ARG 5 defaultLineOfDetail + ARG 5 defaultLevelOfDetail METHOD method_75294 get (Lcom/mojang/blaze3d/textures/FilterMode;)Lnet/minecraft/class_12137; ARG 1 filterMode METHOD method_75295 close ()V @@ -15,11 +15,12 @@ CLASS net/minecraft/class_12136 net/minecraft/client/gl/SamplerCache ARG 1 addressModeV ARG 2 minFilterMode ARG 3 magFilterMode + ARG 4 defaultLevelOfDetail METHOD method_75297 getRepeated (Lcom/mojang/blaze3d/textures/FilterMode;)Lnet/minecraft/class_12137; ARG 1 filterMode METHOD method_76520 get (Lcom/mojang/blaze3d/textures/FilterMode;Z)Lnet/minecraft/class_12137; ARG 1 filterMode - ARG 2 defaultLineOfDetail + ARG 2 defaultLevelOfDetail METHOD method_76521 getRepeated (Lcom/mojang/blaze3d/textures/FilterMode;Z)Lnet/minecraft/class_12137; ARG 1 filterMode - ARG 2 defaultLineOfDetail + ARG 2 defaultLevelOfDetail diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 3d3e711ef8..a0c9e94656 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -42,6 +42,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1_2136 blockModelManager Lnet/minecraft/class_1_394; FIELD field_1_2249 lastWindowFocusTime J FIELD field_1_2571 imeStatusController Lnet/minecraft/class_1_490; + FIELD field_1_3290 surfaceConfigureFailed Z FIELD field_1_3291 gpuTimestampProfiler Lnet/minecraft/class_1_667; FIELD field_1_3292 gpuSurface Lnet/minecraft/class_1_665; FIELD field_1_3293 updateSurface Z diff --git a/mappings/net/minecraft/client/Mouse.mapping b/mappings/net/minecraft/client/Mouse.mapping index 1a2e147dd9..67cefb5912 100644 --- a/mappings/net/minecraft/client/Mouse.mapping +++ b/mappings/net/minecraft/client/Mouse.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse FIELD field_47842 lastTickTime D FIELD field_52126 LOGGER Lorg/slf4j/Logger; FIELD field_52757 scroller Lnet/minecraft/class_9928; + FIELD field_61505 DOUBLE_CLICK_THRESHOLD_MS J FIELD field_61507 lastMouseButton I FIELD field_64192 lastMouseClick Lnet/minecraft/class_312$class_12291; METHOD (Lnet/minecraft/class_310;)V diff --git a/mappings/net/minecraft/client/gl/GlBackend.mapping b/mappings/net/minecraft/client/gl/GlBackend.mapping index e13aea3e5a..44e535ce0d 100644 --- a/mappings/net/minecraft/client/gl/GlBackend.mapping +++ b/mappings/net/minecraft/client/gl/GlBackend.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_10865 net/minecraft/client/gl/GlBackend + FIELD field_1_3390 deviceInfo Lnet/minecraft/class_1_664; 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,7 +21,7 @@ CLASS net/minecraft/class_10865 net/minecraft/client/gl/GlBackend ARG 3 defaultShaderSourceGetter ARG 4 debugOptions METHOD method_68377 getDebugLabelManager ()Lnet/minecraft/class_10861; - METHOD method_68378 compileShader (Lnet/minecraft/class_2960;Lcom/mojang/blaze3d/shaders/ShaderType;Lnet/minecraft/class_10149;Lnet/minecraft/class_12289;)Lnet/minecraft/class_10141; + 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 ARG 2 type ARG 3 defines @@ -30,7 +31,7 @@ CLASS net/minecraft/class_10865 net/minecraft/client/gl/GlBackend ARG 2 sourceGetter METHOD method_68380 (Lnet/minecraft/class_12289;Lnet/minecraft/class_10865$class_10154;)Lnet/minecraft/class_10141; ARG 2 key - METHOD method_68381 compilePipelineCached (Lcom/mojang/blaze3d/pipeline/RenderPipeline;)Lnet/minecraft/class_10867; + METHOD method_68381 getCompiledPipeline (Lcom/mojang/blaze3d/pipeline/RenderPipeline;)Lnet/minecraft/class_10867; ARG 1 pipeline METHOD method_68382 (Lcom/mojang/blaze3d/pipeline/RenderPipeline;)Lnet/minecraft/class_10867; ARG 1 p diff --git a/mappings/net/minecraft/client/gl/ShaderProgram.mapping b/mappings/net/minecraft/client/gl/GlShaderProgram.mapping similarity index 95% rename from mappings/net/minecraft/client/gl/ShaderProgram.mapping rename to mappings/net/minecraft/client/gl/GlShaderProgram.mapping index 8aef34fede..d759480f16 100644 --- a/mappings/net/minecraft/client/gl/ShaderProgram.mapping +++ b/mappings/net/minecraft/client/gl/GlShaderProgram.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram +CLASS net/minecraft/class_5944 net/minecraft/client/gl/GlShaderProgram COMMENT Represents a shader program. Also known as a program object that can be COMMENT created with {@code glCreateProgram}. COMMENT diff --git a/mappings/net/minecraft/client/gl/SimpleFramebufferFactory.mapping b/mappings/net/minecraft/client/gl/SimpleFramebufferFactory.mapping deleted file mode 100644 index 28f05b7289..0000000000 --- a/mappings/net/minecraft/client/gl/SimpleFramebufferFactory.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_9923 net/minecraft/client/gl/SimpleFramebufferFactory diff --git a/mappings/net/minecraft/client/gl/GlobalSettings.mapping b/mappings/net/minecraft/client/render/GlobalSettings.mapping similarity index 76% rename from mappings/net/minecraft/client/gl/GlobalSettings.mapping rename to mappings/net/minecraft/client/render/GlobalSettings.mapping index 81bc2405cf..1ac7e3b068 100644 --- a/mappings/net/minecraft/client/gl/GlobalSettings.mapping +++ b/mappings/net/minecraft/client/render/GlobalSettings.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_11284 net/minecraft/client/gl/GlobalSettings +CLASS net/minecraft/class_11284 net/minecraft/client/render/GlobalSettings FIELD field_60108 SIZE I FIELD field_60109 buffer Lcom/mojang/blaze3d/buffers/GpuBuffer; METHOD method_71116 set (IIDJLnet/minecraft/class_9779;ILnet/minecraft/class_243;Z)V @@ -8,4 +8,5 @@ CLASS net/minecraft/class_11284 net/minecraft/client/gl/GlobalSettings ARG 5 time ARG 7 tickCounter ARG 8 menuBackgroundBlurriness + ARG 9 cameraPos ARG 10 rgss diff --git a/mappings/net/minecraft/client/gl/RenderPipelines.mapping b/mappings/net/minecraft/client/render/RenderPipelines.mapping similarity index 99% rename from mappings/net/minecraft/client/gl/RenderPipelines.mapping rename to mappings/net/minecraft/client/render/RenderPipelines.mapping index 478a9d7027..916f8410ae 100644 --- a/mappings/net/minecraft/client/gl/RenderPipelines.mapping +++ b/mappings/net/minecraft/client/render/RenderPipelines.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_10799 net/minecraft/client/gl/RenderPipelines +CLASS net/minecraft/class_10799 net/minecraft/client/render/RenderPipelines FIELD field_1_1015 LINES_DEPTH_BIAS Lcom/mojang/blaze3d/pipeline/RenderPipeline; FIELD field_1_1474 END_CRYSTAL_BEAM Lcom/mojang/blaze3d/pipeline/RenderPipeline; FIELD field_1_1475 ENTITY_CUTOUT_DISSOLVE Lcom/mojang/blaze3d/pipeline/RenderPipeline; diff --git a/mappings/net/minecraft/client/gl/SimpleFramebuffer.mapping b/mappings/net/minecraft/client/render/SimpleFramebuffer.mapping similarity index 58% rename from mappings/net/minecraft/client/gl/SimpleFramebuffer.mapping rename to mappings/net/minecraft/client/render/SimpleFramebuffer.mapping index e4644ded3c..787a766e41 100644 --- a/mappings/net/minecraft/client/gl/SimpleFramebuffer.mapping +++ b/mappings/net/minecraft/client/render/SimpleFramebuffer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6367 net/minecraft/client/gl/SimpleFramebuffer +CLASS net/minecraft/class_6367 net/minecraft/client/render/SimpleFramebuffer METHOD (Ljava/lang/String;IIZ)V ARG 1 name ARG 2 width diff --git a/mappings/net/minecraft/client/render/SimpleFramebufferFactory.mapping b/mappings/net/minecraft/client/render/SimpleFramebufferFactory.mapping new file mode 100644 index 0000000000..b61437d8fe --- /dev/null +++ b/mappings/net/minecraft/client/render/SimpleFramebufferFactory.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9923 net/minecraft/client/render/SimpleFramebufferFactory diff --git a/mappings/net/minecraft/client/gl/ScissorState.mapping b/mappings/net/minecraft/client/render/state/ScissorState.mapping similarity index 83% rename from mappings/net/minecraft/client/gl/ScissorState.mapping rename to mappings/net/minecraft/client/render/state/ScissorState.mapping index cb73dac893..ed8825e2b3 100644 --- a/mappings/net/minecraft/client/gl/ScissorState.mapping +++ b/mappings/net/minecraft/client/render/state/ScissorState.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_11219 net/minecraft/client/gl/ScissorState +CLASS net/minecraft/class_11219 net/minecraft/client/render/state/ScissorState FIELD field_59809 enabled Z FIELD field_59810 x I FIELD field_59811 y I diff --git a/mappings/net/minecraft/client/gl/ShaderSourceGetter.mapping b/mappings/net/minecraft/client/shader/ShaderSourceGetter.mapping similarity index 62% rename from mappings/net/minecraft/client/gl/ShaderSourceGetter.mapping rename to mappings/net/minecraft/client/shader/ShaderSourceGetter.mapping index c5e9530511..2ca5bd51bf 100644 --- a/mappings/net/minecraft/client/gl/ShaderSourceGetter.mapping +++ b/mappings/net/minecraft/client/shader/ShaderSourceGetter.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_12289 net/minecraft/client/gl/ShaderSourceGetter +CLASS net/minecraft/class_12289 net/minecraft/client/shader/ShaderSourceGetter METHOD method_1_55 get (Lnet/minecraft/class_2960;Lcom/mojang/blaze3d/shaders/ShaderType;)Ljava/lang/String; ARG 1 id ARG 2 type diff --git a/mappings/net/minecraft/client/vulkan/SpirvShader.mapping b/mappings/net/minecraft/client/vulkan/SpirvShader.mapping index 7a9d9fc2e7..04bb771290 100644 --- a/mappings/net/minecraft/client/vulkan/SpirvShader.mapping +++ b/mappings/net/minecraft/client/vulkan/SpirvShader.mapping @@ -2,8 +2,22 @@ CLASS net/minecraft/class_1_753 net/minecraft/client/vulkan/SpirvShader METHOD method_1_4553 create (Ljava/lang/String;Ljava/nio/ByteBuffer;)Lnet/minecraft/class_1_753; ARG 0 name ARG 1 spirv - METHOD method_1_4554 (Lnet/minecraft/class_1_679;)J + METHOD method_1_4554 compileShaderModule (Lnet/minecraft/class_1_679;)J ARG 1 backend + METHOD method_1_4555 getDecorationByteOffset (JLorg/lwjgl/util/spvc/SpvcReflectedResource;ILjava/nio/IntBuffer;)I + ARG 0 spvcCompiler + ARG 2 resource + ARG 3 decoration + ARG 4 wordOffsetTemp + METHOD method_1_4556 getInputEntry (Ljava/lang/String;)Lnet/minecraft/class_1_706; + ARG 1 name + METHOD method_1_4557 getSamplerEntry (Ljava/lang/String;)Lnet/minecraft/class_1_697; + ARG 1 name + METHOD method_1_4558 getUniformBufferEntry (Ljava/lang/String;)Lnet/minecraft/class_1_724; + ARG 1 name + METHOD method_1_4560 resolveResources (Ljava/util/List;Ljava/util/List;)V + ARG 1 inputNames + ARG 2 pipelineLayoutEntries METHOD method_1_4561 reportSpvcError (ILjava/lang/String;)V ARG 0 code ARG 1 message diff --git a/mappings/net/minecraft/client/vulkan/SpirvShaderCompiler.mapping b/mappings/net/minecraft/client/vulkan/SpirvShaderCompiler.mapping index eaf480a352..47d68fe16f 100644 --- a/mappings/net/minecraft/client/vulkan/SpirvShaderCompiler.mapping +++ b/mappings/net/minecraft/client/vulkan/SpirvShaderCompiler.mapping @@ -2,10 +2,28 @@ CLASS net/minecraft/class_1_709 net/minecraft/client/vulkan/SpirvShaderCompiler FIELD field_1_3639 defines Lnet/minecraft/class_10149; FIELD field_1_3640 compiler J FIELD field_1_3641 compileOptions J - METHOD method_1_4229 (Lnet/minecraft/class_1_679;Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/class_1_753;Lnet/minecraft/class_1_753;Ljava/util/List;)Lnet/minecraft/class_1_709$class_1_710; + METHOD method_1_4228 extractPipelineLayoutEntries (Ljava/util/List;Lnet/minecraft/class_1_753;Lcom/mojang/blaze3d/pipeline/RenderPipeline;)V + ARG 0 pipelineLayoutEntriesOut + ARG 1 shader + ARG 2 pipeline + METHOD method_1_4229 createShaderPipeline (Lnet/minecraft/class_1_679;Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/class_1_753;Lnet/minecraft/class_1_753;Ljava/util/List;)Lnet/minecraft/class_1_709$class_1_710; ARG 1 backend ARG 2 pipeline + ARG 3 vertexShader + ARG 4 fragmentShader + ARG 5 inputNames METHOD method_1_4230 compile (Ljava/lang/String;Ljava/lang/String;Lcom/mojang/blaze3d/shaders/ShaderType;)Lnet/minecraft/class_1_753; ARG 1 name ARG 2 source ARG 3 shaderType + METHOD method_1_4231 (Ljava/lang/String;Lcom/mojang/blaze3d/pipeline/RenderPipeline$UniformDescription;)Z + ARG 1 uniform + METHOD method_1_4232 (Ljava/lang/String;Lnet/minecraft/class_1_721$class_1_722;)Z + ARG 1 entry + METHOD method_1_4233 (Ljava/lang/String;Lcom/mojang/blaze3d/pipeline/RenderPipeline$UniformDescription;)Z + ARG 1 uniform + METHOD method_1_4234 (Ljava/lang/String;Lnet/minecraft/class_1_721$class_1_722;)Z + ARG 1 entry + METHOD method_1_4235 (Ljava/lang/String;Lnet/minecraft/class_1_721$class_1_722;)Z + ARG 1 entry + CLASS class_1_710 ShaderPipeline diff --git a/mappings/net/minecraft/client/vulkan/VkBackend.mapping b/mappings/net/minecraft/client/vulkan/VkBackend.mapping deleted file mode 100644 index 43474f1743..0000000000 --- a/mappings/net/minecraft/client/vulkan/VkBackend.mapping +++ /dev/null @@ -1,19 +0,0 @@ -CLASS net/minecraft/class_1_679 net/minecraft/client/vulkan/VkBackend - FIELD field_1_3436 LOGGER Lorg/slf4j/Logger; - FIELD field_1_3437 commandEncoder Lnet/minecraft/class_1_715; - FIELD field_1_3439 shaderSourceGetter Lnet/minecraft/class_12289; - FIELD field_1_3448 device Lorg/lwjgl/vulkan/VkDevice; - FIELD field_1_3449 allocator J - METHOD (Lnet/minecraft/class_12289;Lnet/minecraft/class_1_691;Lnet/minecraft/class_1_717;Ljava/util/Set;Lorg/lwjgl/vulkan/VkDevice;J)V - ARG 1 shaderSoruceGetter - ARG 5 device - METHOD method_1_4046 (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/class_12289;)Lnet/minecraft/class_1_718; - ARG 1 pipeline - ARG 2 sourceGetter - METHOD method_1_4051 (Lnet/minecraft/class_2960;Lcom/mojang/blaze3d/shaders/ShaderType;Lnet/minecraft/class_10149;Lnet/minecraft/class_12289;)Lnet/minecraft/class_1_753; - ARG 1 id - ARG 2 shaderType - ARG 3 defines - ARG 4 sourceGetter - METHOD method_1_4058 getRawDevice ()Lorg/lwjgl/vulkan/VkDevice; - METHOD method_1_4059 getAllocator ()J diff --git a/mappings/net/minecraft/client/vulkan/VkBuffer.mapping b/mappings/net/minecraft/client/vulkan/VkBuffer.mapping deleted file mode 100644 index 092d49e3df..0000000000 --- a/mappings/net/minecraft/client/vulkan/VkBuffer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_1_694 net/minecraft/client/vulkan/VkBuffer - FIELD field_1_3554 closed Z - FIELD field_1_3555 device Lnet/minecraft/class_1_679; - METHOD (Lnet/minecraft/class_1_679;Ljava/util/function/Supplier;IJZ)V - ARG 1 device - ARG 2 labelGetter - ARG 3 usage - ARG 4 size diff --git a/mappings/net/minecraft/client/vulkan/VkCommandEncoderBackend.mapping b/mappings/net/minecraft/client/vulkan/VkCommandEncoderBackend.mapping deleted file mode 100644 index f8157ba8f2..0000000000 --- a/mappings/net/minecraft/client/vulkan/VkCommandEncoderBackend.mapping +++ /dev/null @@ -1,25 +0,0 @@ -CLASS net/minecraft/class_1_715 net/minecraft/client/vulkan/VkCommandEncoderBackend - FIELD field_1_3658 commandBufferDisposer Lnet/minecraft/class_1_699; - FIELD field_1_3661 commandBuffer Lorg/lwjgl/vulkan/VkCommandBuffer; - FIELD field_1_3664 objectDisposer Lnet/minecraft/class_1_699; - FIELD field_1_3665 device Lnet/minecraft/class_1_679; - FIELD field_1_3666 submission Lnet/minecraft/class_1_674$class_1_675; - METHOD (Lnet/minecraft/class_1_679;)V - ARG 1 device - METHOD method_1_4261 getCommandBufferImpl ()Lorg/lwjgl/vulkan/VkCommandBuffer; - METHOD method_1_4263 endCommandBuffer ()V - METHOD method_1_4264 addCommandBuffer (Lorg/lwjgl/vulkan/VkCommandBuffer;)V - ARG 1 commandBuffer - METHOD method_1_4265 getTimestampNow ()J - METHOD method_1_4270 close (Lnet/minecraft/class_1_669;)V - METHOD method_1_4273 addSignal (JJJ)V - ARG 1 vkSemaphore - ARG 3 value - ARG 5 stageMask - METHOD method_1_4274 getCommandBuffer ()Lorg/lwjgl/vulkan/VkCommandBuffer; - METHOD method_1_4275 addWait (JJJ)V - ARG 1 vkSemaphore - ARG 3 value - ARG 5 stageMask - CLASS 1 1 - FIELD field_1_3668 buffer Lorg/lwjgl/PointerBuffer; diff --git a/mappings/net/minecraft/client/vulkan/VkCompiledRenderPipeline.mapping b/mappings/net/minecraft/client/vulkan/VkCompiledRenderPipeline.mapping deleted file mode 100644 index 9e0eff9eb5..0000000000 --- a/mappings/net/minecraft/client/vulkan/VkCompiledRenderPipeline.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1_718 net/minecraft/client/vulkan/VkCompiledRenderPipeline diff --git a/mappings/net/minecraft/client/vulkan/VkRenderPassBackend.mapping b/mappings/net/minecraft/client/vulkan/VkRenderPassBackend.mapping deleted file mode 100644 index c5fd7d2eb2..0000000000 --- a/mappings/net/minecraft/client/vulkan/VkRenderPassBackend.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_1_704 net/minecraft/client/vulkan/VkRenderPassBackend - FIELD field_1_3614 IS_DEVELOPMENT Z - FIELD field_1_3615 shaderParamsDirty Z - FIELD field_1_3617 device Lnet/minecraft/class_1_679; - FIELD field_1_3620 height I - FIELD field_1_3621 width I - FIELD field_1_3627 uniforms Ljava/util/HashMap; - METHOD (Lnet/minecraft/class_1_679;Ljava/util/function/Consumer;Lorg/lwjgl/vulkan/VkCommandBuffer;Ljava/util/function/Supplier;IIZ)V - ARG 1 device diff --git a/mappings/net/minecraft/client/vulkan/VkSurfaceBackend.mapping b/mappings/net/minecraft/client/vulkan/VkSurfaceBackend.mapping deleted file mode 100644 index 1904c6b481..0000000000 --- a/mappings/net/minecraft/client/vulkan/VkSurfaceBackend.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_1_702 net/minecraft/client/vulkan/VkSurfaceBackend - FIELD field_1_3605 needsReconfigure Z - METHOD (Lnet/minecraft/class_1_679;J)V - ARG 2 window diff --git a/mappings/net/minecraft/client/vulkan/VkTexture.mapping b/mappings/net/minecraft/client/vulkan/VkTexture.mapping deleted file mode 100644 index 928e146e3a..0000000000 --- a/mappings/net/minecraft/client/vulkan/VkTexture.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/class_1_703 net/minecraft/client/vulkan/VkTexture - FIELD field_1_3609 device Lnet/minecraft/class_1_679; - METHOD (Lnet/minecraft/class_1_679;ILjava/lang/String;Lnet/minecraft/class_1_658;IIII)V - ARG 1 device - ARG 2 usage - ARG 3 label - ARG 4 format - ARG 5 width - ARG 6 height - ARG 7 depthOrLayers - ARG 8 mipLevels diff --git a/mappings/net/minecraft/client/vulkan/VkTextureView.mapping b/mappings/net/minecraft/client/vulkan/VkTextureView.mapping deleted file mode 100644 index c3f1bbf6b3..0000000000 --- a/mappings/net/minecraft/client/vulkan/VkTextureView.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1_716 net/minecraft/client/vulkan/VkTextureView diff --git a/mappings/net/minecraft/client/vulkan/VulkanBackend.mapping b/mappings/net/minecraft/client/vulkan/VulkanBackend.mapping new file mode 100644 index 0000000000..6429a55151 --- /dev/null +++ b/mappings/net/minecraft/client/vulkan/VulkanBackend.mapping @@ -0,0 +1,48 @@ +CLASS net/minecraft/class_1_679 net/minecraft/client/vulkan/VulkanBackend + FIELD field_1_3436 LOGGER Lorg/slf4j/Logger; + FIELD field_1_3437 commandEncoder Lnet/minecraft/class_1_715; + FIELD field_1_3438 computeQueue Lnet/minecraft/class_1_674; + FIELD field_1_3439 shaderSourceGetter Lnet/minecraft/class_12289; + FIELD field_1_3440 deviceInfo Lnet/minecraft/class_1_664; + FIELD field_1_3441 shaderCompiler Lnet/minecraft/class_1_709; + FIELD field_1_3442 graphicsAndComputeQueue Lnet/minecraft/class_1_674; + FIELD field_1_3443 instance Lnet/minecraft/class_1_691; + FIELD field_1_3444 requiresHostVisibleBuffers Z + FIELD field_1_3445 pipelineCompileCache Ljava/util/Map; + FIELD field_1_3446 shaderCompileCache Ljava/util/Map; + FIELD field_1_3447 fallbackQueue Lnet/minecraft/class_1_674; + FIELD field_1_3448 device Lorg/lwjgl/vulkan/VkDevice; + FIELD field_1_3449 vmaAllocator J + METHOD (Lnet/minecraft/class_12289;Lnet/minecraft/class_1_691;Lnet/minecraft/class_1_717;Ljava/util/Set;Lorg/lwjgl/vulkan/VkDevice;J)V + ARG 1 shaderSoruceGetter + ARG 2 instance + ARG 3 physicalDevice + ARG 4 extensions + ARG 5 device + ARG 6 vmaAllocator + METHOD method_1_4046 compileRenderPipeline (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/class_12289;)Lnet/minecraft/class_1_718; + ARG 1 pipeline + ARG 2 sourceGetter + METHOD method_1_4047 compileShader (Lnet/minecraft/class_1_679$class_1_680;Lnet/minecraft/class_12289;)Lnet/minecraft/class_1_753; + ARG 1 key + ARG 2 sourceGetter + METHOD method_1_4048 getComputeQueue ()Lnet/minecraft/class_1_674; + METHOD method_1_4050 getCompiledPipeline (Lcom/mojang/blaze3d/pipeline/RenderPipeline;)Lnet/minecraft/class_1_718; + ARG 1 pipeline + METHOD method_1_4051 getCompiledShader (Lnet/minecraft/class_2960;Lcom/mojang/blaze3d/shaders/ShaderType;Lnet/minecraft/class_10149;Lnet/minecraft/class_12289;)Lnet/minecraft/class_1_753; + ARG 1 id + ARG 2 shaderType + ARG 3 defines + ARG 4 sourceGetter + METHOD method_1_4052 getGraphicsAndComputeQueue ()Lnet/minecraft/class_1_674; + METHOD method_1_4053 getInstance ()Lnet/minecraft/class_1_691; + METHOD method_1_4054 (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lcom/mojang/blaze3d/pipeline/RenderPipeline;)Lnet/minecraft/class_1_718; + ARG 2 p + METHOD method_1_4055 (Lnet/minecraft/class_1_679$class_1_680;Lnet/minecraft/class_12289;Lnet/minecraft/class_1_679$class_1_680;)Lnet/minecraft/class_1_753; + ARG 3 key + METHOD method_1_4056 (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/class_12289;Lcom/mojang/blaze3d/pipeline/RenderPipeline;)Lnet/minecraft/class_1_718; + ARG 3 p + METHOD method_1_4057 getFallbackQueue ()Lnet/minecraft/class_1_674; + METHOD method_1_4058 getRawDevice ()Lorg/lwjgl/vulkan/VkDevice; + METHOD method_1_4059 getVmaAllocator ()J + CLASS class_1_680 ShaderKey diff --git a/mappings/net/minecraft/client/vulkan/VulkanBuffer.mapping b/mappings/net/minecraft/client/vulkan/VulkanBuffer.mapping new file mode 100644 index 0000000000..d6fedaeca5 --- /dev/null +++ b/mappings/net/minecraft/client/vulkan/VulkanBuffer.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_1_694 net/minecraft/client/vulkan/VulkanBuffer + FIELD field_1_3554 closed Z + FIELD field_1_3555 device Lnet/minecraft/class_1_679; + FIELD field_1_3556 rawBuffer J + FIELD field_1_3557 vmaAllocation J + METHOD (Lnet/minecraft/class_1_679;Ljava/util/function/Supplier;IJZ)V + ARG 1 device + ARG 2 labelGetter + ARG 3 usage + ARG 4 size + ARG 6 alwaysHostVisible + METHOD method_1_4174 map (JJ)Lcom/mojang/blaze3d/buffers/GpuBuffer$MappedView; + ARG 1 offset + ARG 3 size + METHOD method_1_4175 getRawBuffer ()J + CLASS class_1_695 VulkanMappedView + FIELD field_1_3558 closed Z + FIELD field_1_3559 buffer Ljava/nio/ByteBuffer; + METHOD (Lnet/minecraft/class_1_694;Ljava/nio/ByteBuffer;)V + ARG 2 buffer diff --git a/mappings/net/minecraft/client/vulkan/VulkanCommandEncoderBackend.mapping b/mappings/net/minecraft/client/vulkan/VulkanCommandEncoderBackend.mapping new file mode 100644 index 0000000000..75a4802cc8 --- /dev/null +++ b/mappings/net/minecraft/client/vulkan/VulkanCommandEncoderBackend.mapping @@ -0,0 +1,50 @@ +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_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; + FIELD field_1_3665 device Lnet/minecraft/class_1_679; + FIELD field_1_3666 submission Lnet/minecraft/class_1_674$class_1_675; + FIELD field_1_3667 submitSemaphore J + METHOD (Lnet/minecraft/class_1_679;)V + ARG 1 device + METHOD method_1_4257 createCommandBuffer (Z)Lorg/lwjgl/vulkan/VkCommandBuffer; + ARG 1 primary + METHOD method_1_4258 wait (JJ)Z + ARG 3 timeoutNanos + METHOD method_1_4259 clearTextureColor (Lorg/lwjgl/system/MemoryStack;Lcom/mojang/blaze3d/textures/GpuTexture;I)V + ARG 1 memoryStack + ARG 2 texture + ARG 3 color + METHOD method_1_4260 clearTextureDepth (Lorg/lwjgl/system/MemoryStack;Lcom/mojang/blaze3d/textures/GpuTexture;D)V + ARG 1 memoryStack + ARG 2 texture + ARG 3 depth + METHOD method_1_4261 getCommandBufferImpl ()Lorg/lwjgl/vulkan/VkCommandBuffer; + METHOD method_1_4262 stage (Ljava/nio/ByteBuffer;)Lnet/minecraft/class_1_694; + ARG 1 contents + METHOD method_1_4263 endCommandBuffer ()V + METHOD method_1_4264 addCommandBuffer (Lorg/lwjgl/vulkan/VkCommandBuffer;)V + ARG 1 commandBuffer + METHOD method_1_4265 getTimestampNow ()J + METHOD method_1_4269 issueMemoryBarrier (Lorg/lwjgl/system/MemoryStack;)V + ARG 1 memoryStack + METHOD method_1_4270 close (Lnet/minecraft/class_1_669;)V + ARG 1 object + METHOD method_1_4271 closeOnNextSubmit (Lorg/lwjgl/vulkan/VkCommandBuffer;)V + ARG 1 commandBuffer + METHOD method_1_4272 beginCommandBuffer (Ljava/nio/IntBuffer;I)Lorg/lwjgl/vulkan/VkCommandBuffer; + ARG 1 colorAttachmentFormats + ARG 2 depthAttachmentFormat + METHOD method_1_4273 addSignal (JJJ)V + ARG 1 vkSemaphore + ARG 3 value + ARG 5 stageMask + METHOD method_1_4274 getCommandBuffer ()Lorg/lwjgl/vulkan/VkCommandBuffer; + METHOD method_1_4275 addWait (JJJ)V + ARG 1 vkSemaphore + ARG 3 value + ARG 5 stageMask + CLASS 1 1 + FIELD field_1_3668 buffer Lorg/lwjgl/PointerBuffer; diff --git a/mappings/net/minecraft/client/vulkan/VulkanCompiledRenderPipeline.mapping b/mappings/net/minecraft/client/vulkan/VulkanCompiledRenderPipeline.mapping new file mode 100644 index 0000000000..570d8b596d --- /dev/null +++ b/mappings/net/minecraft/client/vulkan/VulkanCompiledRenderPipeline.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_1_718 net/minecraft/client/vulkan/VulkanCompiledRenderPipeline + FIELD field_1_3686 NULLPTR J + METHOD method_1_4294 setBlendFunction (Lorg/lwjgl/vulkan/VkPipelineColorBlendAttachmentState$Buffer;Lcom/mojang/blaze3d/pipeline/BlendFunction;)V + ARG 0 colorBlendAttachmentState + ARG 1 blendFunction + METHOD method_1_4295 create (Lnet/minecraft/class_1_679;Lnet/minecraft/class_1_721;Lcom/mojang/blaze3d/pipeline/RenderPipeline;JJ)Lnet/minecraft/class_1_718; + ARG 0 device + ARG 1 layout + ARG 2 pipeline + ARG 3 vertexShaderModule + ARG 5 fragmentShaderModule diff --git a/mappings/net/minecraft/client/vulkan/VkConstConversion.mapping b/mappings/net/minecraft/client/vulkan/VulkanConst.mapping similarity index 72% rename from mappings/net/minecraft/client/vulkan/VkConstConversion.mapping rename to mappings/net/minecraft/client/vulkan/VulkanConst.mapping index d18298fe8a..28c6614f01 100644 --- a/mappings/net/minecraft/client/vulkan/VkConstConversion.mapping +++ b/mappings/net/minecraft/client/vulkan/VulkanConst.mapping @@ -1,14 +1,16 @@ -CLASS net/minecraft/class_1_670 net/minecraft/client/vulkan/VkConstConversion +CLASS net/minecraft/class_1_670 net/minecraft/client/vulkan/VulkanConst COMMENT Converts Blaze3D constants to Vulkan constants. METHOD method_1_4002 toVkBufferUsage (I)I ARG 0 usage - METHOD method_1_4003 getAspectMask (Lnet/minecraft/class_1_658;)I + METHOD method_1_4003 getVkAspectMask (Lnet/minecraft/class_1_658;)I ARG 0 arg METHOD method_1_4004 toVkTextureUsage (ILnet/minecraft/class_1_658;)I ARG 0 usage ARG 1 texelFormat METHOD method_1_4005 toVkTextureFormat (Lnet/minecraft/class_1_658;)I ARG 0 texelFormat + METHOD method_1_4006 getVkColorWriteMask (Lnet/minecraft/class_1_384;)I + ARG 0 colorTargetState METHOD method_1_4007 toVkBlendParameter (Lnet/minecraft/class_1_683;)I ARG 0 blendParameter METHOD method_1_4008 toVkBlendOperation (Lnet/minecraft/class_1_662;)I @@ -21,3 +23,5 @@ CLASS net/minecraft/class_1_670 net/minecraft/client/vulkan/VkConstConversion ARG 0 addressMode METHOD method_1_4012 toVkFilterMode (Lcom/mojang/blaze3d/textures/FilterMode;)I ARG 0 filterMode + METHOD method_1_4013 toVkTopology (Lcom/mojang/blaze3d/vertex/VertexFormat$class_5596;)I + ARG 0 drawMode diff --git a/mappings/net/minecraft/client/vulkan/VkFeature.mapping b/mappings/net/minecraft/client/vulkan/VulkanFeature.mapping similarity index 90% rename from mappings/net/minecraft/client/vulkan/VkFeature.mapping rename to mappings/net/minecraft/client/vulkan/VulkanFeature.mapping index 70428c0279..dfda8ab0c8 100644 --- a/mappings/net/minecraft/client/vulkan/VkFeature.mapping +++ b/mappings/net/minecraft/client/vulkan/VulkanFeature.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1_714 net/minecraft/client/vulkan/VkFeature +CLASS net/minecraft/class_1_714 net/minecraft/client/vulkan/VulkanFeature METHOD (Lnet/minecraft/class_1_730;Ljava/lang/String;J)V ARG 1 struct ARG 2 name diff --git a/mappings/net/minecraft/client/vulkan/VkInstance.mapping b/mappings/net/minecraft/client/vulkan/VulkanInstance.mapping similarity index 77% rename from mappings/net/minecraft/client/vulkan/VkInstance.mapping rename to mappings/net/minecraft/client/vulkan/VulkanInstance.mapping index 15cb736669..b8cc4be2e3 100644 --- a/mappings/net/minecraft/client/vulkan/VkInstance.mapping +++ b/mappings/net/minecraft/client/vulkan/VulkanInstance.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1_691 net/minecraft/client/vulkan/VkInstance +CLASS net/minecraft/class_1_691 net/minecraft/client/vulkan/VulkanInstance FIELD field_1_3545 APPLICATION_NAME Ljava/lang/String; FIELD field_1_3546 APPLICATION_VERSION I FIELD field_1_3547 ENGINE_NAME Ljava/lang/String; @@ -6,7 +6,7 @@ CLASS net/minecraft/class_1_691 net/minecraft/client/vulkan/VkInstance FIELD field_1_3549 LOGGER Lorg/slf4j/Logger; FIELD field_1_3550 debugBackend Lnet/minecraft/class_1_671; FIELD field_1_3551 enabledExtensions Ljava/util/Set; - FIELD field_1_3552 instance Lorg/lwjgl/vulkan/VkInstance; + FIELD field_1_3552 rawInstance Lorg/lwjgl/vulkan/VkInstance; METHOD (IZZ)V ARG 1 logLevel ARG 2 useLabels @@ -16,4 +16,4 @@ CLASS net/minecraft/class_1_691 net/minecraft/client/vulkan/VkInstance METHOD method_1_4169 getEnabledExtensions ()Ljava/util/Set; METHOD method_1_4170 getInstanceExtensionProperties ()Ljava/util/Set; METHOD method_1_4171 getLayerProperties ()Ljava/util/List; - METHOD method_1_4172 getInstance ()Lorg/lwjgl/vulkan/VkInstance; + METHOD method_1_4172 getRawInstance ()Lorg/lwjgl/vulkan/VkInstance; diff --git a/mappings/net/minecraft/class_1_717.mapping b/mappings/net/minecraft/client/vulkan/VulkanPhysicalDevice.mapping similarity index 56% rename from mappings/net/minecraft/class_1_717.mapping rename to mappings/net/minecraft/client/vulkan/VulkanPhysicalDevice.mapping index 4ff34c2ac7..3f2da78b90 100644 --- a/mappings/net/minecraft/class_1_717.mapping +++ b/mappings/net/minecraft/client/vulkan/VulkanPhysicalDevice.mapping @@ -1,18 +1,29 @@ -CLASS net/minecraft/class_1_717 +CLASS net/minecraft/class_1_717 net/minecraft/client/vulkan/VulkanPhysicalDevice + FIELD field_1_3677 computeQueueFamily Lit/unimi/dsi/fastutil/ints/IntIntPair; + FIELD field_1_3678 graphicsAndComputeQueueFamily Lit/unimi/dsi/fastutil/ints/IntIntPair; FIELD field_1_3679 queueFamilyPriorities Lit/unimi/dsi/fastutil/ints/Int2IntMap; - FIELD field_1_3681 extensionProperties Lorg/lwjgl/vulkan/VkExtensionProperties$Buffer; + FIELD field_1_3680 fallbackQueueFamily Lit/unimi/dsi/fastutil/ints/IntIntPair; + FIELD field_1_3681 supportedExtensions Lorg/lwjgl/vulkan/VkExtensionProperties$Buffer; FIELD field_1_3682 driverProperties Lorg/lwjgl/vulkan/VkPhysicalDeviceDriverProperties; FIELD field_1_3683 physicalDeviceFeatures Lorg/lwjgl/vulkan/VkPhysicalDeviceFeatures2; FIELD field_1_3684 physicalDevice Lorg/lwjgl/vulkan/VkPhysicalDevice; FIELD field_1_3685 physicalDeviceProperties Lorg/lwjgl/vulkan/VkPhysicalDeviceProperties2; METHOD (Lorg/lwjgl/vulkan/VkPhysicalDevice;)V ARG 1 physicalDevice + METHOD method_1_4280 getComputeQueueFamily ()Lit/unimi/dsi/fastutil/ints/IntIntPair; METHOD method_1_4281 getDeviceName ()Ljava/lang/String; + METHOD method_1_4282 stringifyDeviceInfo ()Ljava/lang/String; + METHOD method_1_4283 getUnsupportedExtensions (Ljava/util/Collection;)Ljava/util/Set; + ARG 1 extensions + METHOD method_1_4284 decodeApiVersion (I)Ljava/lang/String; + ARG 0 version + METHOD method_1_4285 getGraphicsAndComputeQueueFamily ()Lit/unimi/dsi/fastutil/ints/IntIntPair; METHOD method_1_4286 supportsExtension (Ljava/lang/String;)Z ARG 1 extensionName METHOD method_1_4287 (Ljava/lang/String;Lorg/lwjgl/vulkan/VkExtensionProperties;)Z ARG 1 extension METHOD method_1_4288 getQueueFamilyPriorities ()Lit/unimi/dsi/fastutil/ints/Int2IntMap; + METHOD method_1_4289 getFallbackQueueFamily ()Lit/unimi/dsi/fastutil/ints/IntIntPair; METHOD method_1_4290 getVendorId ()Ljava/lang/String; METHOD method_1_4291 getPhysicalDevice ()Lorg/lwjgl/vulkan/VkPhysicalDevice; METHOD method_1_4292 getDriverProperties ()Lorg/lwjgl/vulkan/VkPhysicalDeviceDriverProperties; diff --git a/mappings/net/minecraft/client/vulkan/VkPipelineLayout.mapping b/mappings/net/minecraft/client/vulkan/VulkanPipelineLayout.mapping similarity index 76% rename from mappings/net/minecraft/client/vulkan/VkPipelineLayout.mapping rename to mappings/net/minecraft/client/vulkan/VulkanPipelineLayout.mapping index 672a4db362..707d4367e5 100644 --- a/mappings/net/minecraft/client/vulkan/VkPipelineLayout.mapping +++ b/mappings/net/minecraft/client/vulkan/VulkanPipelineLayout.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1_721 net/minecraft/client/vulkan/VkPipelineLayout +CLASS net/minecraft/class_1_721 net/minecraft/client/vulkan/VulkanPipelineLayout FIELD field_1_3689 EMPTY Lnet/minecraft/class_1_721; METHOD method_1_4345 create (Lnet/minecraft/class_1_679;Ljava/util/List;Ljava/lang/String;)Lnet/minecraft/class_1_721; ARG 0 device diff --git a/mappings/net/minecraft/client/vulkan/VkQueue.mapping b/mappings/net/minecraft/client/vulkan/VulkanQueue.mapping similarity index 92% rename from mappings/net/minecraft/client/vulkan/VkQueue.mapping rename to mappings/net/minecraft/client/vulkan/VulkanQueue.mapping index 4075d30547..2ea7c28ee6 100644 --- a/mappings/net/minecraft/client/vulkan/VkQueue.mapping +++ b/mappings/net/minecraft/client/vulkan/VulkanQueue.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1_674 net/minecraft/client/vulkan/VkQueue +CLASS net/minecraft/class_1_674 net/minecraft/client/vulkan/VulkanQueue METHOD (Lnet/minecraft/class_1_679;II)V ARG 1 device ARG 2 queueIndex diff --git a/mappings/net/minecraft/client/vulkan/VulkanRenderPassBackend.mapping b/mappings/net/minecraft/client/vulkan/VulkanRenderPassBackend.mapping new file mode 100644 index 0000000000..fd10abd86f --- /dev/null +++ b/mappings/net/minecraft/client/vulkan/VulkanRenderPassBackend.mapping @@ -0,0 +1,31 @@ +CLASS net/minecraft/class_1_704 net/minecraft/client/vulkan/VulkanRenderPassBackend + FIELD field_1_3614 IS_DEVELOPMENT Z + FIELD field_1_3615 shaderParamsDirty Z + FIELD field_1_3616 viewportCommandBuffer Lorg/lwjgl/vulkan/VkCommandBuffer; + FIELD field_1_3617 device Lnet/minecraft/class_1_679; + FIELD field_1_3618 disposer Ljava/util/function/Consumer; + FIELD field_1_3619 hasDepth Z + FIELD field_1_3620 height I + FIELD field_1_3621 width I + FIELD field_1_3622 pipeline Lnet/minecraft/class_1_718; + FIELD field_1_3623 primaryCommandBuffer Lorg/lwjgl/vulkan/VkCommandBuffer; + FIELD field_1_3624 numDebugGroups I + FIELD field_1_3625 commandBufferSupplier Ljava/util/function/Supplier; + FIELD field_1_3626 boundTextures Ljava/util/HashMap; + FIELD field_1_3627 uniforms Ljava/util/HashMap; + METHOD (Lnet/minecraft/class_1_679;Ljava/util/function/Consumer;Lorg/lwjgl/vulkan/VkCommandBuffer;Ljava/util/function/Supplier;IIZ)V + ARG 1 device + ARG 2 disposer + ARG 3 primaryCommandBuffer + ARG 4 commandBufferSupplier + ARG 5 width + ARG 6 height + ARG 7 hasDepth + METHOD method_1_4212 createCommandBuffer ()Lorg/lwjgl/vulkan/VkCommandBuffer; + METHOD method_1_4213 close ()V + METHOD method_1_4214 endViewportCommands ()V + METHOD method_1_4215 executeCommands (Lorg/lwjgl/vulkan/VkCommandBuffer;)V + ARG 1 commandBuffer + METHOD method_1_4217 updateShaderParams ()V + METHOD method_1_4218 createViewportCommandBuffer ()Lorg/lwjgl/vulkan/VkCommandBuffer; + CLASS class_1_705 BoundTexture diff --git a/mappings/net/minecraft/client/vulkan/VkSampler.mapping b/mappings/net/minecraft/client/vulkan/VulkanSampler.mapping similarity index 83% rename from mappings/net/minecraft/client/vulkan/VkSampler.mapping rename to mappings/net/minecraft/client/vulkan/VulkanSampler.mapping index 6c73c8be12..ad3b700e03 100644 --- a/mappings/net/minecraft/client/vulkan/VkSampler.mapping +++ b/mappings/net/minecraft/client/vulkan/VulkanSampler.mapping @@ -1,11 +1,11 @@ -CLASS net/minecraft/class_1_701 net/minecraft/client/vulkan/VkSampler +CLASS net/minecraft/class_1_701 net/minecraft/client/vulkan/VulkanSampler FIELD field_1_3578 addressModeU Lcom/mojang/blaze3d/textures/AddressMode; FIELD field_1_3579 addressModeV Lcom/mojang/blaze3d/textures/AddressMode; FIELD field_1_3580 closed Z FIELD field_1_3581 device Lnet/minecraft/class_1_679; FIELD field_1_3582 magFilterMode Lcom/mojang/blaze3d/textures/FilterMode; FIELD field_1_3583 maxAnisotropy I - FIELD field_1_3584 maxLod Ljava/util/OptionalDouble; + FIELD field_1_3584 maxLevelOfDetail Ljava/util/OptionalDouble; FIELD field_1_3585 minFilterMode Lcom/mojang/blaze3d/textures/FilterMode; FIELD field_1_3586 sampler J METHOD (Lnet/minecraft/class_1_679;Lcom/mojang/blaze3d/textures/AddressMode;Lcom/mojang/blaze3d/textures/AddressMode;Lcom/mojang/blaze3d/textures/FilterMode;Lcom/mojang/blaze3d/textures/FilterMode;ILjava/util/OptionalDouble;)V @@ -15,5 +15,5 @@ CLASS net/minecraft/class_1_701 net/minecraft/client/vulkan/VkSampler ARG 4 minFilterMode ARG 5 magFilterMode ARG 6 maxAnisotropy - ARG 7 maxLod + ARG 7 maxLevelOfDetail METHOD method_1_4204 getRawSampler ()J diff --git a/mappings/net/minecraft/client/vulkan/VkStruct.mapping b/mappings/net/minecraft/client/vulkan/VulkanStruct.mapping similarity index 88% rename from mappings/net/minecraft/client/vulkan/VkStruct.mapping rename to mappings/net/minecraft/client/vulkan/VulkanStruct.mapping index 7bfad29df7..238fc3d88d 100644 --- a/mappings/net/minecraft/client/vulkan/VkStruct.mapping +++ b/mappings/net/minecraft/client/vulkan/VulkanStruct.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1_730 net/minecraft/client/vulkan/VkStruct +CLASS net/minecraft/class_1_730 net/minecraft/client/vulkan/VulkanStruct METHOD method_1_4412 findOrCreate (JLorg/lwjgl/system/MemoryStack;)J ARG 1 address ARG 3 memoryStack diff --git a/mappings/net/minecraft/client/vulkan/VulkanSurfaceBackend.mapping b/mappings/net/minecraft/client/vulkan/VulkanSurfaceBackend.mapping new file mode 100644 index 0000000000..4cbe5cac69 --- /dev/null +++ b/mappings/net/minecraft/client/vulkan/VulkanSurfaceBackend.mapping @@ -0,0 +1,33 @@ +CLASS net/minecraft/class_1_702 net/minecraft/client/vulkan/VulkanSurfaceBackend + FIELD field_1_3588 NO_VSYNC_PREFERRED_PRESENT_MODES [I + FIELD field_1_3589 NOT_ACQUIRED I + FIELD field_1_3590 VSYNC_PREFERRED_PRESENT_MODES [I + FIELD field_1_3591 frameSemaphores [J + FIELD field_1_3592 currentFrameSemaphoreIndex I + FIELD field_1_3593 acquiredSwapchainImageIndex I + FIELD field_1_3594 device Lnet/minecraft/class_1_679; + FIELD field_1_3595 nextAcquireException Lnet/minecraft/class_1_707; + FIELD field_1_3596 noVsyncPresentMode I + FIELD field_1_3597 graphicsAndComputeQueue Lorg/lwjgl/vulkan/VkQueue; + FIELD field_1_3598 swapchainImageSemaphores [J + FIELD field_1_3599 rawSurface J + FIELD field_1_3600 height I + FIELD field_1_3601 surfaceFormat I + FIELD field_1_3602 swapchainImages Lit/unimi/dsi/fastutil/longs/LongList; + FIELD field_1_3603 swapchain J + FIELD field_1_3604 swapchainOutdated Z + FIELD field_1_3605 needsReconfigure Z + FIELD field_1_3606 width I + FIELD field_1_3607 vsyncPresentMode I + METHOD (Lnet/minecraft/class_1_679;J)V + ARG 1 device + ARG 2 window + METHOD method_1_4205 freeCurrentSwapchain ()V + METHOD method_1_4206 selectPresentMode ([ILjava/nio/IntBuffer;)I + ARG 1 preferredPresentModes + ARG 2 supportedPresentModes + METHOD method_1_4207 findCompatibleSurfaceFormat (Lorg/lwjgl/vulkan/VkSurfaceFormatKHR$Buffer;)Lorg/lwjgl/vulkan/VkSurfaceFormatKHR; + ARG 1 surfaceFormats + METHOD method_1_4208 reportSurfaceError (ILjava/lang/String;)V + ARG 0 code + ARG 1 message diff --git a/mappings/net/minecraft/client/vulkan/VulkanTexture.mapping b/mappings/net/minecraft/client/vulkan/VulkanTexture.mapping new file mode 100644 index 0000000000..b5d0000ab5 --- /dev/null +++ b/mappings/net/minecraft/client/vulkan/VulkanTexture.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_1_703 net/minecraft/client/vulkan/VulkanTexture + FIELD field_1_3608 closed Z + FIELD field_1_3609 device Lnet/minecraft/class_1_679; + FIELD field_1_3610 refcount I + FIELD field_1_3611 rawImage J + FIELD field_1_3612 rawVmaAllocation J + METHOD (Lnet/minecraft/class_1_679;ILjava/lang/String;Lnet/minecraft/class_1_658;IIII)V + ARG 1 device + ARG 2 usage + ARG 3 label + ARG 4 format + ARG 5 width + ARG 6 height + ARG 7 depthOrLayers + ARG 8 mipLevels + METHOD method_1_4209 incrementRefcount ()V + METHOD method_1_4210 decrementRefcount ()V + METHOD method_1_4211 getRawImage ()J diff --git a/mappings/net/minecraft/client/vulkan/VulkanTextureView.mapping b/mappings/net/minecraft/client/vulkan/VulkanTextureView.mapping new file mode 100644 index 0000000000..b3b5799de5 --- /dev/null +++ b/mappings/net/minecraft/client/vulkan/VulkanTextureView.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_1_716 net/minecraft/client/vulkan/VulkanTextureView + FIELD field_1_3674 closed Z + FIELD field_1_3675 device Lnet/minecraft/class_1_679; + FIELD field_1_3676 rawImageView J + METHOD (Lnet/minecraft/class_1_679;Lnet/minecraft/class_1_703;II)V + ARG 1 device + ARG 2 texture + ARG 3 baseMipLevel + ARG 4 mipLevel + METHOD method_1_4279 getRawImageView ()J diff --git a/mappings/net/minecraft/client/vulkan/VkTimestampQueryPool.mapping b/mappings/net/minecraft/client/vulkan/VulkanTimestampQueryPool.mapping similarity index 72% rename from mappings/net/minecraft/client/vulkan/VkTimestampQueryPool.mapping rename to mappings/net/minecraft/client/vulkan/VulkanTimestampQueryPool.mapping index 67641cbbe8..23de566a5a 100644 --- a/mappings/net/minecraft/client/vulkan/VkTimestampQueryPool.mapping +++ b/mappings/net/minecraft/client/vulkan/VulkanTimestampQueryPool.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1_696 net/minecraft/client/vulkan/VkTimestampQueryPool +CLASS net/minecraft/class_1_696 net/minecraft/client/vulkan/VulkanTimestampQueryPool FIELD field_1_3561 device Lnet/minecraft/class_1_679; FIELD field_1_3562 count I FIELD field_1_3563 ptr J diff --git a/mappings/net/minecraft/client/window/VulkanWindowBackend.mapping b/mappings/net/minecraft/client/window/VulkanWindowBackend.mapping index 5bd168dc16..db517a5992 100644 --- a/mappings/net/minecraft/client/window/VulkanWindowBackend.mapping +++ b/mappings/net/minecraft/client/window/VulkanWindowBackend.mapping @@ -1,7 +1,23 @@ CLASS net/minecraft/class_1_689 net/minecraft/client/window/VulkanWindowBackend FIELD field_1_3533 PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES Lnet/minecraft/class_1_730; FIELD field_1_3534 LOGGER Lorg/slf4j/Logger; + FIELD field_1_3535 REQUIRED_EXTENSIONS Ljava/util/Set; FIELD field_1_3536 REQUIRED_FEATURES Ljava/util/Set; FIELD field_1_3537 PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES Lnet/minecraft/class_1_730; FIELD field_1_3538 PHYSICAL_DEVICE_FEATURES_2 Lnet/minecraft/class_1_730; FIELD field_1_3539 PHYSICAL_DEVICE_VULKAN_1_2_FEATURES Lnet/minecraft/class_1_730; + METHOD method_1_4154 createDevice (Ljava/util/Collection;Lnet/minecraft/class_1_717;)Lorg/lwjgl/vulkan/VkDevice; + ARG 1 enabledExtensions + ARG 2 physicalDevice + METHOD method_1_4155 createVmaAllocator (Lorg/lwjgl/vulkan/VkDevice;)J + ARG 1 device + METHOD method_1_4156 getSuitablePhysicalDevice (Lnet/minecraft/class_1_691;)Lnet/minecraft/class_1_717; + ARG 1 instance + METHOD method_1_4157 getPhysicalDeviceName (Lorg/lwjgl/vulkan/VkPhysicalDevice;)Ljava/lang/String; + ARG 1 physicalDevice + METHOD method_1_4158 isDiscreteGpu (Lorg/lwjgl/vulkan/VkPhysicalDevice;)Z + ARG 1 physicalDevice + METHOD method_1_4159 isPhysicalDeviceSuitable (Lorg/lwjgl/vulkan/VkPhysicalDevice;)Z + ARG 1 physicalDevice + METHOD method_1_4160 reportMissingCapabilities (Lorg/lwjgl/vulkan/VkPhysicalDevice;)V + ARG 1 physicalDevice diff --git a/mappings/net/minecraft/client/window/Window.mapping b/mappings/net/minecraft/client/window/Window.mapping index 7292811078..364577a756 100644 --- a/mappings/net/minecraft/client/window/Window.mapping +++ b/mappings/net/minecraft/client/window/Window.mapping @@ -71,7 +71,7 @@ CLASS net/minecraft/class_1041 net/minecraft/client/window/Window METHOD method_4479 updateWindowRegion ()V METHOD method_4480 getWidth ()I METHOD method_4481 throwOnGlError ()V - METHOD method_4482 logGlError (IJ)V + METHOD method_4482 logGlfwError (IJ)V ARG 1 error ARG 2 description METHOD method_4483 updateFramebufferSize ()V @@ -94,7 +94,7 @@ CLASS net/minecraft/class_1041 net/minecraft/client/window/Window METHOD method_4498 isFullscreen ()Z METHOD method_4499 getX ()I METHOD method_4500 toggleFullscreen ()V - METHOD method_4501 throwGlError (IJ)V + METHOD method_4501 throwGlfwError (IJ)V ARG 0 error ARG 1 description METHOD method_4502 getScaledHeight ()I @@ -107,7 +107,7 @@ CLASS net/minecraft/class_1041 net/minecraft/client/window/Window METHOD method_4506 getFramebufferHeight ()I METHOD method_4507 getHeight ()I METHOD method_4511 getFullscreenVideoMode ()Ljava/util/Optional; - METHOD method_4513 logOnGlError ()V + METHOD method_4513 logOnGlfwError ()V METHOD method_15997 setScaleFactor (I)V ARG 1 scaleFactor METHOD method_20831 getMonitor ()Lnet/minecraft/class_313; @@ -140,6 +140,6 @@ CLASS net/minecraft/class_1041 net/minecraft/client/window/Window METHOD method_74030 setAllowCursorChanges (Z)V ARG 1 allowCursorChanges METHOD method_75291 getMinimumLineWidth ()F - CLASS class_4716 GlErroredException + CLASS class_4716 GlfwErroredException METHOD (Ljava/lang/String;)V ARG 1 message diff --git a/mappings/net/minecraft/client/window/WindowEventHandler.mapping b/mappings/net/minecraft/client/window/WindowEventHandler.mapping index 91b81cc871..0f687434b6 100644 --- a/mappings/net/minecraft/client/window/WindowEventHandler.mapping +++ b/mappings/net/minecraft/client/window/WindowEventHandler.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_3678 net/minecraft/client/window/WindowEventHandler - METHOD method_15993 onResolutionChanged ()V + METHOD method_1_4256 onWindowSizeChanged ()V + METHOD method_15993 onScaleFactorChanged ()V METHOD method_30133 onCursorEnterChanged ()V diff --git a/mappings/net/minecraft/client/window/WindowException.mapping b/mappings/net/minecraft/client/window/WindowException.mapping index bf5205fa62..f5aa390d5a 100644 --- a/mappings/net/minecraft/client/window/WindowException.mapping +++ b/mappings/net/minecraft/client/window/WindowException.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1_739 net/minecraft/client/window/WindowException + FIELD field_1_3744 missingFeatures Ljava/util/List; FIELD field_1_3745 condition Lnet/minecraft/class_1_739$class_1_740; METHOD (Ljava/lang/String;Lnet/minecraft/class_1_739$class_1_740;)V ARG 1 message @@ -6,6 +7,8 @@ CLASS net/minecraft/class_1_739 net/minecraft/client/window/WindowException METHOD (Ljava/lang/String;Lnet/minecraft/class_1_739$class_1_740;Ljava/util/List;)V ARG 1 message ARG 2 condition + ARG 3 missingFeatures + METHOD method_1_4457 getMissingFeatures ()Ljava/util/List; METHOD method_1_4458 getCondition ()Lnet/minecraft/class_1_739$class_1_740; CLASS class_1_740 Condition FIELD field_1_3756 id Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gl/WindowFramebuffer.mapping b/mappings/net/minecraft/client/window/WindowFramebuffer.mapping similarity index 92% rename from mappings/net/minecraft/client/gl/WindowFramebuffer.mapping rename to mappings/net/minecraft/client/window/WindowFramebuffer.mapping index aca595e3d5..5a20d127a9 100644 --- a/mappings/net/minecraft/client/gl/WindowFramebuffer.mapping +++ b/mappings/net/minecraft/client/window/WindowFramebuffer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6364 net/minecraft/client/gl/WindowFramebuffer +CLASS net/minecraft/class_6364 net/minecraft/client/window/WindowFramebuffer FIELD field_33724 DEFAULT_WIDTH I FIELD field_33725 DEFAULT_HEIGHT I FIELD field_33726 DEFAULT Lnet/minecraft/class_6364$class_6366; diff --git a/mappings/net/minecraft/client/gl/PostEffectPipeline.mapping b/mappings/net/minecraft/render/effect/PostEffectPipeline.mapping similarity index 95% rename from mappings/net/minecraft/client/gl/PostEffectPipeline.mapping rename to mappings/net/minecraft/render/effect/PostEffectPipeline.mapping index c45afca59a..bdc6014ec2 100644 --- a/mappings/net/minecraft/client/gl/PostEffectPipeline.mapping +++ b/mappings/net/minecraft/render/effect/PostEffectPipeline.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_9962 net/minecraft/client/gl/PostEffectPipeline +CLASS net/minecraft/class_9962 net/minecraft/render/effect/PostEffectPipeline FIELD field_53111 CODEC Lcom/mojang/serialization/Codec; METHOD method_62242 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance From 2e1c3ae845e06e69af96d3e0a577f04d19208f8e Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Thu, 9 Apr 2026 04:59:36 -0400 Subject: [PATCH 02/12] Map ExitCodes class --- mappings/net/minecraft/client/ClientWatchdog.mapping | 3 +++ mappings/net/minecraft/client/main/Main.mapping | 4 ++++ mappings/net/minecraft/util/ExitCodes.mapping | 7 +++++++ 3 files changed, 14 insertions(+) create mode 100644 mappings/net/minecraft/util/ExitCodes.mapping diff --git a/mappings/net/minecraft/client/ClientWatchdog.mapping b/mappings/net/minecraft/client/ClientWatchdog.mapping index 8fb10b5b12..76d7a9d890 100644 --- a/mappings/net/minecraft/client/ClientWatchdog.mapping +++ b/mappings/net/minecraft/client/ClientWatchdog.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_9918 net/minecraft/client/ClientWatchdog FIELD field_52723 TIMEOUT Ljava/time/Duration; METHOD method_61936 shutdownClient (Ljava/lang/String;Lnet/minecraft/class_310;Lnet/minecraft/class_542;J)V + ARG 0 reason + ARG 1 client + ARG 2 args ARG 3 threadId diff --git a/mappings/net/minecraft/client/main/Main.mapping b/mappings/net/minecraft/client/main/Main.mapping index 0c9052679a..1959e0da15 100644 --- a/mappings/net/minecraft/client/main/Main.mapping +++ b/mappings/net/minecraft/client/main/Main.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/client/main/Main + METHOD main ([Ljava/lang/String;)V + ARG 0 args + METHOD method_1_3941 reportOptionParsingError (Ljava/lang/Throwable;)V + ARG 0 ex METHOD method_11428 getOption (Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;)Ljava/lang/Object; ARG 0 optionSet ARG 1 optionSpec diff --git a/mappings/net/minecraft/util/ExitCodes.mapping b/mappings/net/minecraft/util/ExitCodes.mapping new file mode 100644 index 0000000000..b6739c7d03 --- /dev/null +++ b/mappings/net/minecraft/util/ExitCodes.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_1_656 net/minecraft/util/ExitCodes + FIELD field_1_3182 GENERIC_FAILURE I + FIELD field_1_3183 OPTION_PARSER_CONSTRUCTION_FAILED I + FIELD field_1_3184 OPTION_PARSING_FAILED I + FIELD field_1_3185 LOADING_NATIVES_FAILED I + FIELD field_1_3186 GAME_SHUTDOWN I + FIELD field_1_3187 SAVING_REPORT_FAILED I From 8304de263b4ec189b2df218551f6368a713a32ee Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Thu, 9 Apr 2026 05:37:29 -0400 Subject: [PATCH 03/12] Map items and villager trades --- mappings/net/minecraft/block/Blocks.mapping | 2 +- .../net/minecraft/block/OxidationMap.mapping | 2 +- mappings/net/minecraft/item/Item.mapping | 5 + mappings/net/minecraft/item/Items.mapping | 140 ++++++++++++++++++ .../EnchantRandomlyLootFunction.mapping | 3 + .../village/RebalancedVillagerTrades.mapping | 26 ++++ .../minecraft/village/VillagerTrades.mapping | 85 ++++++++++- 7 files changed, 260 insertions(+), 3 deletions(-) diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping index dec43ddf7e..2f9c1e905d 100644 --- a/mappings/net/minecraft/block/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks FIELD field_1_3478 DYED_CANDLES Lnet/minecraft/class_1_727; FIELD field_1_3479 DYED_CANDLE_CAKES Lnet/minecraft/class_1_727; FIELD field_1_3480 DYED_SHULKER_BOXES Lnet/minecraft/class_1_727; - FIELD field_1_3481 TERRACOTTAS Lnet/minecraft/class_1_727; + FIELD field_1_3481 DYED_TERRACOTTAS Lnet/minecraft/class_1_727; FIELD field_1_3482 GLAZED_TERRACOTTAS Lnet/minecraft/class_1_727; FIELD field_1_3483 LIGHTNING_RODS Lnet/minecraft/class_1_758; FIELD field_1_3493 STAINED_GLASSES Lnet/minecraft/class_1_727; diff --git a/mappings/net/minecraft/block/OxidationMap.mapping b/mappings/net/minecraft/block/OxidationMap.mapping index 13837fc988..ef37de2538 100644 --- a/mappings/net/minecraft/block/OxidationMap.mapping +++ b/mappings/net/minecraft/block/OxidationMap.mapping @@ -28,7 +28,7 @@ CLASS net/minecraft/class_1_758 net/minecraft/block/OxidationMap ARG 2 waxedBlockFactory ARG 3 weatheringBlockFactory ARG 4 settingsFactory - METHOD method_1_4600 ofItems (Lnet/minecraft/class_1_758;Ljava/util/function/Function;)Lnet/minecraft/class_1_758; + METHOD method_1_4600 ofBlockItems (Lnet/minecraft/class_1_758;Ljava/util/function/Function;)Lnet/minecraft/class_1_758; ARG 0 block ARG 1 itemFactory METHOD method_1_4601 ofBlock (Lnet/minecraft/class_5955$class_5811;Ljava/lang/Boolean;Ljava/util/function/BiFunction;Lorg/apache/commons/lang3/function/TriFunction;Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;Ljava/util/function/Function;)Lnet/minecraft/class_2248; diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 7d68104583..853c067869 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -347,6 +347,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item ARG 1 item METHOD method_1_826 withComponent (Lnet/minecraft/class_9331;Lnet/minecraft/class_1_117$class_1_123;)Lnet/minecraft/class_1792$class_1793; ARG 1 type + ARG 2 componentFactory METHOD method_1_827 withComponent (Lnet/minecraft/class_9331;Lnet/minecraft/class_5321;)Lnet/minecraft/class_1792$class_1793; ARG 1 type ARG 2 key @@ -364,10 +365,14 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item ARG 4 key METHOD method_1_832 (Lnet/minecraft/class_9323;)V ARG 0 components + METHOD method_1_833 (Lnet/minecraft/class_5321;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_9792; + ARG 1 registries METHOD method_1_834 (Lnet/minecraft/class_9323$class_9324;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_5321;)V ARG 0 builder ARG 1 lookup ARG 2 key + METHOD method_1_2914 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_10215; + ARG 0 registries METHOD method_1_3095 requires (Lnet/minecraft/class_7699;)Lnet/minecraft/class_1792$class_1793; ARG 1 requiredFeatures METHOD method_7889 maxCount (I)Lnet/minecraft/class_1792$class_1793; diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index 83400ef697..34625b65e3 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -1,5 +1,60 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_1_1138 GOLDEN_DANDELION Lnet/minecraft/class_1792; + FIELD field_1_3295 BANNERS Lnet/minecraft/class_1_727; + FIELD field_1_3296 BEDS Lnet/minecraft/class_1_727; + FIELD field_1_3297 CARPETS Lnet/minecraft/class_1_727; + FIELD field_1_3298 CHISELED_CINNABAR Lnet/minecraft/class_1792; + FIELD field_1_3299 CHISELED_COPPERS Lnet/minecraft/class_1_758; + FIELD field_1_3300 CHISELED_SULFUR Lnet/minecraft/class_1792; + FIELD field_1_3301 CINNABAR Lnet/minecraft/class_1792; + FIELD field_1_3302 CINNABAR_BRICKS Lnet/minecraft/class_1792; + FIELD field_1_3303 CINNABAR_BRICK_SLAB Lnet/minecraft/class_1792; + FIELD field_1_3304 CINNABAR_BRICK_STAIRS Lnet/minecraft/class_1792; + FIELD field_1_3305 CINNABAR_BRICK_WALL Lnet/minecraft/class_1792; + FIELD field_1_3306 CINNABAR_SLAB Lnet/minecraft/class_1792; + FIELD field_1_3307 CINNABAR_STAIRS Lnet/minecraft/class_1792; + FIELD field_1_3308 CINNABAR_WALL Lnet/minecraft/class_1792; + FIELD field_1_3309 CONCRETES Lnet/minecraft/class_1_727; + FIELD field_1_3310 CONCRETE_POWDERS Lnet/minecraft/class_1_727; + FIELD field_1_3311 COPPER_BLOCKS Lnet/minecraft/class_1_758; + FIELD field_1_3312 COPPER_BULBS Lnet/minecraft/class_1_758; + FIELD field_1_3313 COPPER_CHESTS Lnet/minecraft/class_1_758; + FIELD field_1_3314 COPPER_DOORS Lnet/minecraft/class_1_758; + FIELD field_1_3315 COPPER_GOLEM_STATUES Lnet/minecraft/class_1_758; + FIELD field_1_3316 COPPER_GRATES Lnet/minecraft/class_1_758; + FIELD field_1_3317 COPPER_TRAPDOORS Lnet/minecraft/class_1_758; + FIELD field_1_3318 CUT_COPPERS Lnet/minecraft/class_1_758; + FIELD field_1_3319 CUT_COPPER_SLABS Lnet/minecraft/class_1_758; + FIELD field_1_3320 CUT_COPPER_STAIRS Lnet/minecraft/class_1_758; + FIELD field_1_3321 BUNDLE Lnet/minecraft/class_1_727; + FIELD field_1_3322 DYED_CANDLES Lnet/minecraft/class_1_727; + FIELD field_1_3323 DYED_SHULKER_BOXES Lnet/minecraft/class_1_727; + FIELD field_1_3324 DYED_TERRACOTTAS Lnet/minecraft/class_1_727; + FIELD field_1_3325 DYES Lnet/minecraft/class_1_727; + FIELD field_1_3326 GLAZED_TERRACOTTAS Lnet/minecraft/class_1_727; + FIELD field_1_3327 HARNESSES Lnet/minecraft/class_1_727; + FIELD field_1_3328 LIGHTNING_RODS Lnet/minecraft/class_1_758; + FIELD field_1_3329 POLISHED_CINNABAR Lnet/minecraft/class_1792; + FIELD field_1_3330 POLISHED_CINNABAR_SLAB Lnet/minecraft/class_1792; + FIELD field_1_3331 POLISHED_CINNABAR_STAIRS Lnet/minecraft/class_1792; + FIELD field_1_3332 POLISHED_CINNABAR_WALL Lnet/minecraft/class_1792; + FIELD field_1_3333 POLISHED_SULFUR Lnet/minecraft/class_1792; + FIELD field_1_3334 POLISHED_SULFUR_SLAB Lnet/minecraft/class_1792; + FIELD field_1_3335 POLISHED_SULFUR_STAIRS Lnet/minecraft/class_1792; + FIELD field_1_3336 POLISHED_SULFUR_WALL Lnet/minecraft/class_1792; + FIELD field_1_3337 POTENT_SULFUR Lnet/minecraft/class_1792; + FIELD field_1_3338 STAINED_GLASSES Lnet/minecraft/class_1_727; + FIELD field_1_3339 STAINED_GLASS_PANES Lnet/minecraft/class_1_727; + FIELD field_1_3340 SULFUR Lnet/minecraft/class_1792; + FIELD field_1_3341 SULFUR_BRICKS Lnet/minecraft/class_1792; + FIELD field_1_3342 SULFUR_BRICK_SLAB Lnet/minecraft/class_1792; + FIELD field_1_3343 SULFUR_BRICK_STAIRS Lnet/minecraft/class_1792; + FIELD field_1_3344 SULFUR_BRICK_WALL Lnet/minecraft/class_1792; + FIELD field_1_3346 SULFUR_CUBE_SPAWN_EGG Lnet/minecraft/class_1792; + FIELD field_1_3347 SULFUR_SLAB Lnet/minecraft/class_1792; + FIELD field_1_3348 SULFUR_STAIRS Lnet/minecraft/class_1792; + FIELD field_1_3349 SULFUR_WALL Lnet/minecraft/class_1792; + FIELD field_1_3350 WOOLS Lnet/minecraft/class_1_727; FIELD field_8047 JUNGLE_PRESSURE_PLATE Lnet/minecraft/class_1792; FIELD field_8048 SPRUCE_BUTTON Lnet/minecraft/class_1792; FIELD field_8051 DEAD_BUBBLE_CORAL Lnet/minecraft/class_1792; @@ -790,6 +845,91 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_63383 ZOMBIE_NAUTILUS_SPAWN_EGG Lnet/minecraft/class_1792; FIELD field_64145 CAMEL_HUSK_SPAWN_EGG Lnet/minecraft/class_1792; FIELD field_64146 PARCHED_SPAWN_EGG Lnet/minecraft/class_1792; + METHOD method_1_838 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_10710; + ARG 0 registries + METHOD method_1_2917 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_10215; + ARG 0 registries + METHOD method_1_2918 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_10707; + ARG 0 registries + METHOD method_1_2919 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_6885; + ARG 0 registries + METHOD method_1_2920 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_6885; + ARG 0 registries + METHOD method_1_2921 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_6885; + ARG 0 registries + METHOD method_1_2922 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_6885; + ARG 0 registries + METHOD method_1_2923 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_6885; + ARG 0 registries + METHOD method_1_2924 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_6885; + ARG 0 registries + METHOD method_1_2925 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_6885; + ARG 0 registries + METHOD method_1_2926 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_6885; + ARG 0 registries + METHOD method_1_2927 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_6885; + ARG 0 registries + METHOD method_1_2928 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_6885; + ARG 0 registries + METHOD method_1_3956 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 block + ARG 1 color + METHOD method_1_3957 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; + ARG 0 settings + METHOD method_1_3958 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings + METHOD method_1_3959 (Ljava/lang/String;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 path + ARG 1 color + METHOD method_1_3960 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 color + METHOD method_1_3961 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 block + ARG 1 color + METHOD method_1_3962 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 block + ARG 1 color + METHOD method_1_3963 (Lnet/minecraft/class_1767;Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 1 block_ + ARG 2 settings + METHOD method_1_3964 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; + ARG 0 settings + METHOD method_1_3965 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 block + ARG 1 item + METHOD method_1_3966 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792; + ARG 0 block + METHOD method_1_3967 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 block + ARG 1 color + METHOD method_1_3968 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 block + ARG 1 color + METHOD method_1_3969 (Lnet/minecraft/class_1767;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; + ARG 1 settings + METHOD method_1_3970 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 block + ARG 1 color + METHOD method_1_3971 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 block + ARG 1 color + METHOD method_1_3972 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 block + ARG 1 color + METHOD method_1_3973 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 block + ARG 1 color + METHOD method_1_3974 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 block + ARG 1 color + METHOD method_1_3975 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 block + ARG 1 color + METHOD method_1_3976 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792; + ARG 0 block + METHOD method_1_3977 (Ljava/lang/String;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 path + ARG 1 color METHOD method_7989 register (Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792; ARG 0 block METHOD method_7990 register (Ljava/lang/String;)Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping index 42cb4b7b7b..38f4a9737f 100644 --- a/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping @@ -31,6 +31,9 @@ CLASS net/minecraft/class_109 net/minecraft/loot/function/EnchantRandomlyLootFun FIELD field_51794 options Ljava/util/Optional; FIELD field_51795 onlyCompatible Z METHOD method_1_762 includeAdditionalCostComponent ()Lnet/minecraft/class_109$class_4954; + METHOD method_1_763 options2 (Lnet/minecraft/class_6885;)Lnet/minecraft/class_109$class_4954; + COMMENT Mojang, what the {@code ResourceLocation} is this? + ARG 1 options METHOD method_25992 option (Lnet/minecraft/class_6880;)Lnet/minecraft/class_109$class_4954; ARG 1 enchantment METHOD method_60293 options (Lnet/minecraft/class_6885;)Lnet/minecraft/class_109$class_4954; diff --git a/mappings/net/minecraft/village/RebalancedVillagerTrades.mapping b/mappings/net/minecraft/village/RebalancedVillagerTrades.mapping index 4e98c645d5..17e27373e9 100644 --- a/mappings/net/minecraft/village/RebalancedVillagerTrades.mapping +++ b/mappings/net/minecraft/village/RebalancedVillagerTrades.mapping @@ -1,3 +1,29 @@ CLASS net/minecraft/class_1_63 net/minecraft/village/RebalancedVillagerTrades METHOD method_1_704 bootstrap (Lnet/minecraft/class_7891;)Lnet/minecraft/class_6880; ARG 0 registries + METHOD method_1_4622 level1EnchantedBookSale (Lnet/minecraft/class_7871;Lnet/minecraft/class_6885;Lnet/minecraft/class_6885;Lnet/minecraft/class_6885;)Lnet/minecraft/class_1_30; + ARG 0 items + ARG 1 doubleTradePriceEnchantments + ARG 2 allowedVillagerTypes + ARG 3 allowedEnchantments + METHOD method_1_4623 level2EnchantedBookSale (Lnet/minecraft/class_7871;Lnet/minecraft/class_6885;Lnet/minecraft/class_6885;Lnet/minecraft/class_6885;)Lnet/minecraft/class_1_30; + ARG 0 items + ARG 1 doubleTradePriceEnchantments + ARG 2 allowedVillagerTypes + ARG 3 allowedEnchantments + METHOD method_1_4624 level3EnchantedBookSale (Lnet/minecraft/class_7871;Lnet/minecraft/class_6885;Lnet/minecraft/class_6885;Lnet/minecraft/class_6885;)Lnet/minecraft/class_1_30; + ARG 0 items + ARG 1 doubleTradePriceEnchantments + ARG 2 allowedVillagerTypes + ARG 3 allowedEnchantments + METHOD method_1_4625 level5EnchantedBookSale (Lnet/minecraft/class_7871;Lnet/minecraft/class_6885;Lnet/minecraft/class_6885;Lnet/minecraft/class_6880;I)Lnet/minecraft/class_1_30; + ARG 0 items + ARG 1 doubleTradePriceEnchantments + ARG 2 allowedVillagerTypes + ARG 3 enchantment + ARG 4 level + METHOD method_1_4626 level5EnchantedBookSale (Lnet/minecraft/class_7871;Lnet/minecraft/class_6885;Lnet/minecraft/class_6885;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1_30; + ARG 0 item + ARG 1 doubleTradePriceEnchantments + ARG 2 allowedVillagerTypes + ARG 3 enchantment diff --git a/mappings/net/minecraft/village/VillagerTrades.mapping b/mappings/net/minecraft/village/VillagerTrades.mapping index 9efa4dc984..5b1dc2cad3 100644 --- a/mappings/net/minecraft/village/VillagerTrades.mapping +++ b/mappings/net/minecraft/village/VillagerTrades.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/class_1_31 net/minecraft/village/VillagerTrades + FIELD field_1_3704 MASON_4_EMERALD_GLAZED_TERRACOTTAS Lnet/minecraft/class_1_727; + FIELD field_1_3705 MASON_4_EMERALD_TERRACOTTAS Lnet/minecraft/class_1_727; + FIELD field_1_3706 SHEPHERD_2_EMERALD_CARPETS Lnet/minecraft/class_1_727; + FIELD field_1_3707 SHEPHERD_2_EMERALD_WOOLS Lnet/minecraft/class_1_727; + FIELD field_1_3708 SHEPHERD_3_EMERALD_BEDS Lnet/minecraft/class_1_727; + FIELD field_1_3709 SHEPHERD_4_EMERALD_BANNERS Lnet/minecraft/class_1_727; + FIELD field_1_3710 WANDERING_TRADER_EMERALD_DYES Lnet/minecraft/class_1_727; METHOD method_1_530 randomDyesFunction ()Lnet/minecraft/class_117; METHOD method_1_531 bootstrap (Lnet/minecraft/class_7891;)Lnet/minecraft/class_6880; ARG 0 registries @@ -12,6 +19,7 @@ CLASS net/minecraft/class_1_31 net/minecraft/village/VillagerTrades ARG 2 level METHOD method_1_535 enchantEquipmentFunction (Lnet/minecraft/class_7871;Lnet/minecraft/class_6885;Lnet/minecraft/class_1792;)Ljava/util/List; ARG 0 itemRegistry + ARG 1 allowedEnchantments ARG 2 item METHOD method_1_536 setEnchantmentFunction (Lnet/minecraft/class_7871;Lnet/minecraft/class_6880;ILnet/minecraft/class_1792;)Ljava/util/List; ARG 0 itemRegistry @@ -42,7 +50,9 @@ CLASS net/minecraft/class_1_31 net/minecraft/village/VillagerTrades ARG 0 registries METHOD method_1_555 bootstrapWanderingTraderFlowerSales (Lnet/minecraft/class_7891;)V ARG 0 registries - METHOD method_1_558 bootstrapShepherdWoolSales (Lnet/minecraft/class_1792;I)Lnet/minecraft/class_1_30; + METHOD method_1_558 shepherdDyePurchase (Lnet/minecraft/class_1792;I)Lnet/minecraft/class_1_30; + ARG 0 item + ARG 1 xp METHOD method_1_560 register (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 path METHOD method_1_561 villagerTypes (Lnet/minecraft/class_7871;Ljava/util/List;)Lnet/minecraft/class_6885; @@ -53,3 +63,76 @@ CLASS net/minecraft/class_1_31 net/minecraft/village/VillagerTrades ARG 1 villagerType METHOD method_1_563 villagerTypesCondition (Lnet/minecraft/class_6885;)Ljava/util/Optional; ARG 0 villagerTypes + METHOD method_1_4364 cartographerLevel2ExplorerMapSale (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Lnet/minecraft/class_6862;Lnet/minecraft/class_6880;Ljava/lang/String;Ljava/util/List;)Lnet/minecraft/class_1_30; + ARG 0 items + ARG 1 villagerTypes + ARG 2 structureTag + ARG 3 decoration + ARG 4 name + ARG 5 allowedVillagerTypes + METHOD method_1_4365 cartographerBannerSale (Lnet/minecraft/class_7871;Lnet/minecraft/class_1792;Ljava/util/List;)Lnet/minecraft/class_1_30; + ARG 0 villagerTypes + ARG 1 banner + ARG 2 allowedVillagerTypes + METHOD method_1_4366 fishermanBoatPurchase (Lnet/minecraft/class_7871;Lnet/minecraft/class_1792;Ljava/util/List;)Lnet/minecraft/class_1_30; + ARG 0 registries + ARG 1 boat + ARG 2 allowedVillagerTypes + METHOD method_1_4367 masonLevel3BlockPurchase (Lnet/minecraft/class_1792;)Lnet/minecraft/class_1_30; + ARG 0 item + METHOD method_1_4368 masonLevel3BlockSale (Lnet/minecraft/class_1792;)Lnet/minecraft/class_1_30; + ARG 0 item + METHOD method_1_4369 shepherdWoolPurchase (Lnet/minecraft/class_1792;)Lnet/minecraft/class_1_30; + ARG 0 wool + METHOD method_1_4370 wanderingTraderCoralSale (Lnet/minecraft/class_1792;)Lnet/minecraft/class_1_30; + ARG 0 coralBlock + METHOD method_1_4371 wanderingTraderFlowerSale (Lnet/minecraft/class_1792;I)Lnet/minecraft/class_1_30; + ARG 0 flower + ARG 1 quantity + METHOD method_1_4372 wanderingTraderLogSale (Lnet/minecraft/class_1792;)Lnet/minecraft/class_1_30; + ARG 0 log + METHOD method_1_4373 wanderingTraderSaplingSale (Lnet/minecraft/class_1792;)Lnet/minecraft/class_1_30; + ARG 0 sapling + METHOD method_1_4374 wanderingTraderSeedSale (Lnet/minecraft/class_1792;)Lnet/minecraft/class_1_30; + ARG 0 seeds + METHOD method_1_4375 enchantedBookFunctions (Lnet/minecraft/class_7871;Lnet/minecraft/class_6885;)Ljava/util/List; + ARG 0 items + ARG 1 allowedEnchantments + METHOD method_1_4376 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_5321; + ARG 0 color + METHOD method_1_4377 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_5321; + ARG 0 color + METHOD method_1_4378 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_5321; + ARG 0 color + METHOD method_1_4379 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_5321; + ARG 0 color + METHOD method_1_4380 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_5321; + ARG 0 color + METHOD method_1_4381 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_5321; + ARG 0 color + METHOD method_1_4382 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_5321; + ARG 0 color + METHOD method_1_4383 bootstrapCartographerLevel2ExplorerMaps (Lnet/minecraft/class_7891;Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)V + ARG 0 registries + ARG 1 items + ARG 2 villagerTypes + METHOD method_1_4384 bootstrapShepherdCarpetSales (Lnet/minecraft/class_7891;)V + ARG 0 registries + METHOD method_1_4385 bootstrapMasonColoredBlockSales (Lnet/minecraft/class_7891;)V + ARG 0 registries + METHOD method_1_4386 bootstrapMasonLevel3BlockSales (Lnet/minecraft/class_7891;)V + ARG 0 registries + METHOD method_1_4387 bootstrapMasonLevel3BlockPurchases (Lnet/minecraft/class_7891;)V + ARG 0 registries + METHOD method_1_4388 bootstrapShepherdLevel1WoolPurchases (Lnet/minecraft/class_7891;)V + ARG 0 registries + METHOD method_1_4389 bootstrapWanderingTraderSaplingSales (Lnet/minecraft/class_7891;)V + ARG 0 registries + METHOD method_1_4390 bootstrapWanderingTraderSeedSales (Lnet/minecraft/class_7891;)V + ARG 0 registries + METHOD method_1_4391 bootstrapMasonColoredBlockSales (Lnet/minecraft/class_7891;Lnet/minecraft/class_1_727;Lnet/minecraft/class_1_727;)V + ARG 0 registries + ARG 1 trades + ARG 2 items + METHOD method_1_4392 bootstrapShepherdWoolSales (Lnet/minecraft/class_7891;)V + ARG 0 registries From 02c44d01fe99601cacbd55ba3e048553a133b913 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Thu, 9 Apr 2026 05:42:23 -0400 Subject: [PATCH 04/12] Map ArmPosing and TestContext --- .../render/entity/model/ArmPosing.mapping | 8 ++++++ .../net/minecraft/test/TestContext.mapping | 25 +++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/mappings/net/minecraft/client/render/entity/model/ArmPosing.mapping b/mappings/net/minecraft/client/render/entity/model/ArmPosing.mapping index 3f0aa17e5c..c01a84da22 100644 --- a/mappings/net/minecraft/client/render/entity/model/ArmPosing.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ArmPosing.mapping @@ -1,9 +1,16 @@ CLASS net/minecraft/class_4896 net/minecraft/client/render/entity/model/ArmPosing COMMENT Utility class to help posing arms. + METHOD method_1_4180 zombieArms (Lnet/minecraft/class_630;Lnet/minecraft/class_630;FZF)V + ARG 0 leftArm + ARG 1 rightArm + ARG 2 handSwingProgress + ARG 3 reverseYaw + ARG 4 pitch METHOD method_25446 charge (Lnet/minecraft/class_630;Lnet/minecraft/class_630;FFZ)V ARG 0 holdingArm ARG 1 pullingArm ARG 2 crossbowPullTime + ARG 3 itemUseTime ARG 4 rightArm METHOD method_25447 hold (Lnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_630;Z)V ARG 0 holdingArm @@ -24,6 +31,7 @@ CLASS net/minecraft/class_4896 net/minecraft/client/render/entity/model/ArmPosin ARG 0 leftArm ARG 1 rightArm ARG 2 attacking + ARG 3 state METHOD method_32789 swingArms (Lnet/minecraft/class_630;Lnet/minecraft/class_630;F)V ARG 0 rightArm ARG 1 leftArm diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index 05d6703f4f..7c29ca3779 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -40,6 +40,30 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 1 pos ARG 2 block ARG 3 direction + METHOD method_1_4348 assertBetween (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/String;)V + ARG 1 min + ARG 2 value + ARG 3 max + ARG 4 message + METHOD method_1_4349 assertBetween (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_2561;)V + ARG 1 min + ARG 2 value + ARG 3 max + ARG 4 message + METHOD method_1_4350 createMockServerPlayer (Lnet/minecraft/class_1934;)Lnet/minecraft/class_1657; + ARG 1 gameMode + METHOD method_1_4351 spawnEntity (Lnet/minecraft/class_1299;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;)Lnet/minecraft/class_1297; + ARG 1 type + ARG 2 pos + ARG 3 rotation + METHOD method_1_4352 spawnEntity (Lnet/minecraft/class_1299;Lnet/minecraft/class_243;Lnet/minecraft/class_3730;)Lnet/minecraft/class_1297; + ARG 1 type + ARG 2 pos + ARG 3 reason + METHOD method_1_4353 spawnMob (Lnet/minecraft/class_1299;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;)Lnet/minecraft/class_1308; + ARG 1 type + ARG 2 pos + ARG 3 rotation METHOD method_35943 getWorld ()Lnet/minecraft/class_3218; METHOD method_35945 pushButton (III)V ARG 1 x @@ -109,6 +133,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 1 type ARG 2 pos ARG 3 reason + ARG 4 rotation METHOD method_35964 spawnEntity (Lnet/minecraft/class_1299;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1297; ARG 1 type ARG 2 pos From c6dce94ac623e44fd99701dc4795c2e03c31ba32 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Thu, 9 Apr 2026 05:53:21 -0400 Subject: [PATCH 05/12] Map Spline --- .../util/function/ToFloatFunction.mapping | 2 + .../net/minecraft/util/math/Spline.mapping | 53 ++++++++++++++++++- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/util/function/ToFloatFunction.mapping b/mappings/net/minecraft/util/function/ToFloatFunction.mapping index 4da11ad2c7..430130dd80 100644 --- a/mappings/net/minecraft/util/function/ToFloatFunction.mapping +++ b/mappings/net/minecraft/util/function/ToFloatFunction.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_6501 net/minecraft/util/function/ToFloatFunction FIELD field_37409 IDENTITY Lnet/minecraft/class_6501; + METHOD method_1_4162 constant (F)Lnet/minecraft/class_6501; + ARG 0 value METHOD method_1_4163 max ()F METHOD method_1_4164 min ()F METHOD method_41296 apply (Ljava/lang/Object;)F diff --git a/mappings/net/minecraft/util/math/Spline.mapping b/mappings/net/minecraft/util/math/Spline.mapping index e083d60435..8296350b5d 100644 --- a/mappings/net/minecraft/util/math/Spline.mapping +++ b/mappings/net/minecraft/util/math/Spline.mapping @@ -1,9 +1,20 @@ CLASS net/minecraft/class_6492 net/minecraft/util/math/Spline + METHOD comp_1_461 max ()F + METHOD comp_1_462 min ()F + METHOD method_1_3942 toFunction (Lnet/minecraft/class_6492;)Lnet/minecraft/class_6501; + ARG 0 spline + METHOD method_1_3943 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 1 self + METHOD method_1_3944 sample (Lnet/minecraft/class_6492;Ljava/lang/Object;)F + ARG 0 spline + ARG 1 context METHOD method_37918 builder (Lnet/minecraft/class_6501;)Lnet/minecraft/class_6492$class_6493; ARG 0 locationFunction METHOD method_39225 getDebugString ()Ljava/lang/String; METHOD method_39227 (Lnet/minecraft/class_6492$class_6738;)Lnet/minecraft/class_6492; ARG 0 spline + METHOD method_39229 (Lnet/minecraft/class_6492;)Lcom/mojang/datafixers/util/Either; + ARG 0 spline METHOD method_39231 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_6492; ARG 0 either METHOD method_39232 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; @@ -12,7 +23,10 @@ CLASS net/minecraft/class_6492 net/minecraft/util/math/Spline ARG 0 value METHOD method_39502 builder (Lnet/minecraft/class_6501;Lit/unimi/dsi/fastutil/floats/Float2FloatFunction;)Lnet/minecraft/class_6492$class_6493; ARG 0 locationFunction - METHOD method_41187 apply (Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_6492; + ARG 1 amplifier + METHOD method_41187 mapLocation (Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_6492; + COMMENT {@return a new {@link Spline} with a location function which applies the location function of the old spline followed by {@code f}} + ARG 1 f CLASS class_6493 Builder FIELD field_34382 locationFunction Lnet/minecraft/class_6501; FIELD field_34383 locations Lit/unimi/dsi/fastutil/floats/FloatList; @@ -23,6 +37,7 @@ CLASS net/minecraft/class_6492 net/minecraft/util/math/Spline ARG 1 locationFunction METHOD (Lnet/minecraft/class_6501;Lit/unimi/dsi/fastutil/floats/Float2FloatFunction;)V ARG 1 locationFunction + ARG 2 amplifier METHOD method_37923 build ()Lnet/minecraft/class_6492; METHOD method_37924 add (FFF)Lnet/minecraft/class_6492$class_6493; ARG 1 location @@ -47,7 +62,37 @@ CLASS net/minecraft/class_6492 net/minecraft/util/math/Spline FIELD comp_1_461 max F FIELD comp_1_462 min F FIELD comp_229 locationFunction Lnet/minecraft/class_6501; + METHOD (Lnet/minecraft/class_6501;[FLjava/util/List;[F)V + ARG 1 locationfunction + ARG 2 locations + ARG 3 values + ARG 4 derivatives + METHOD (Lnet/minecraft/class_6501;[FLjava/util/List;[FFF)V + ARG 1 locationFunction + ARG 2 locations + ARG 3 values + ARG 4 derivatives + ARG 5 min + ARG 6 max METHOD comp_229 locationFunction ()Lnet/minecraft/class_6501; + METHOD method_1_3945 createFullCodec (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 locationFunctionCodec + ARG 1 selfCodec + METHOD method_1_3946 fromFunctionAndPoints (Lnet/minecraft/class_6501;Ljava/util/List;)Lnet/minecraft/class_6492$class_6738; + ARG 0 locationFunction + ARG 1 points + METHOD method_1_3947 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 2 instance + METHOD method_1_3948 getPoints ()Ljava/util/List; + METHOD method_1_3949 sample (Lnet/minecraft/class_6501;[F[FLjava/util/List;Ljava/lang/Object;)F + ARG 0 locationFunction + ARG 1 derivatives + ARG 2 locations + ARG 3 values + ARG 4 context + METHOD method_1_3950 sample (Lnet/minecraft/class_6492$class_6738;Ljava/lang/Object;)F + ARG 0 spline + ARG 1 context METHOD method_39236 (D)Ljava/lang/String; ARG 0 value METHOD method_39238 format ([F)Ljava/lang/String; @@ -71,4 +116,8 @@ CLASS net/minecraft/class_6492 net/minecraft/util/math/Spline ARG 0 locations ARG 1 values ARG 2 derivatives - CLASS class_6737 Serialized + CLASS class_6737 Point + METHOD method_1_3951 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 splineCodec + METHOD method_1_3952 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 1 instance From 0ceaf80f35159e4543c24c57025c6c8472eee4a8 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Thu, 9 Apr 2026 05:57:45 -0400 Subject: [PATCH 06/12] Map EasingType$CubicBezier --- .../minecraft/world/attribute/timeline/EasingType.mapping | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mappings/net/minecraft/world/attribute/timeline/EasingType.mapping b/mappings/net/minecraft/world/attribute/timeline/EasingType.mapping index c39dbab0c1..efafbde80f 100644 --- a/mappings/net/minecraft/world/attribute/timeline/EasingType.mapping +++ b/mappings/net/minecraft/world/attribute/timeline/EasingType.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/class_12301 net/minecraft/world/attribute/timeline/EasingTyp CLASS class_12302 CubicBezier COMMENT A cubic Bézier curve used for interpolation. The first and last control points COMMENT are fixed at (0, 0) and at (1, 1). + FIELD field_1_3287 MAX_ADJUSTMENT_PER_NEWTON_ITERATION F FIELD field_64302 MAX_NEWTON_ITERATIONS I FIELD field_64303 controlPoints Lnet/minecraft/class_12301$class_12304; FIELD field_64304 xParams Lnet/minecraft/class_12301$class_12302$class_12303; @@ -31,6 +32,11 @@ CLASS net/minecraft/class_12301 net/minecraft/world/attribute/timeline/EasingTyp ARG 1 controlPoints METHOD equals (Ljava/lang/Object;)Z ARG 1 other + METHOD method_1_3933 getParameterOfX (F)F + ARG 1 x + METHOD method_1_3934 getParameterOfXByBinarySearch (FF)F + ARG 1 x + ARG 2 t METHOD method_76362 (Lnet/minecraft/class_12301$class_12302;)Lnet/minecraft/class_12301$class_12304; ARG 0 easing METHOD method_76363 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; From 4b011807fbe6d92dad72c399e2f2c6e97eb369e4 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Thu, 9 Apr 2026 06:03:03 -0400 Subject: [PATCH 07/12] Map GpuProfiler --- .../com/mojang/blaze3d/profiling/GpuProfiler.mapping | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mappings/com/mojang/blaze3d/profiling/GpuProfiler.mapping b/mappings/com/mojang/blaze3d/profiling/GpuProfiler.mapping index 3258ca35a5..164c1066be 100644 --- a/mappings/com/mojang/blaze3d/profiling/GpuProfiler.mapping +++ b/mappings/com/mojang/blaze3d/profiling/GpuProfiler.mapping @@ -1,6 +1,16 @@ CLASS net/minecraft/class_1_708 com/mojang/blaze3d/profiling/GpuProfiler + FIELD field_1_3634 NUM_TIMESTAMPS_IN_POOL I FIELD field_1_3635 tracyGpuContext Lcom/mojang/jtracy/GpuContext; + FIELD field_1_3636 nextTimestampIndex I FIELD field_1_3637 timestampQueryPool Lnet/minecraft/class_1_685; + FIELD field_1_3638 lastSubmitTimestampIndex I METHOD (Lcom/mojang/blaze3d/systems/GpuDevice;)V ARG 1 device METHOD method_1_4223 close ()V + METHOD method_1_4224 submitQueryTimestamps ()V + METHOD method_1_4225 nextTimestampIndex ()I + METHOD method_1_4226 endZone (Lcom/mojang/blaze3d/systems/CommandEncoder;)V + ARG 1 encoder + METHOD method_1_4227 beginZone (Lcom/mojang/blaze3d/systems/CommandEncoder;Ljava/lang/String;)V + ARG 1 encoder + ARG 2 name From 4ef5d5209967aca06b5585712f49cc9ce810a5d7 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Thu, 9 Apr 2026 06:08:37 -0400 Subject: [PATCH 08/12] Map UberBuffer --- .../minecraft/client/render/StagingBuffer.mapping | 2 ++ .../net/minecraft/client/render/UberBuffer.mapping | 12 ++++++++++++ mappings/net/minecraft/loot/LootPool.mapping | 2 ++ 3 files changed, 16 insertions(+) diff --git a/mappings/net/minecraft/client/render/StagingBuffer.mapping b/mappings/net/minecraft/client/render/StagingBuffer.mapping index 87341846f8..455d26092f 100644 --- a/mappings/net/minecraft/client/render/StagingBuffer.mapping +++ b/mappings/net/minecraft/client/render/StagingBuffer.mapping @@ -48,6 +48,8 @@ CLASS net/minecraft/class_1_686 net/minecraft/client/render/StagingBuffer FIELD field_1_3528 commandEncoder Lcom/mojang/blaze3d/systems/CommandEncoder; METHOD (Lnet/minecraft/class_1_686;Lcom/mojang/blaze3d/systems/CommandEncoder;)V ARG 2 commandEncoder + METHOD method_1_4150 assertStagingBufferMatches (Lnet/minecraft/class_1_686;)V + ARG 1 buffer METHOD method_1_4151 copyFromSlice (Lnet/minecraft/class_1_686$class_1_687;Lcom/mojang/blaze3d/buffers/GpuBuffer;J)V ARG 1 slice ARG 2 buffer diff --git a/mappings/net/minecraft/client/render/UberBuffer.mapping b/mappings/net/minecraft/client/render/UberBuffer.mapping index 1aa6ff8f83..e0ac4b231a 100644 --- a/mappings/net/minecraft/client/render/UberBuffer.mapping +++ b/mappings/net/minecraft/client/render/UberBuffer.mapping @@ -6,10 +6,14 @@ CLASS net/minecraft/class_1_296 net/minecraft/client/render/UberBuffer FIELD field_1_1767 closedData Lit/unimi/dsi/fastutil/objects/ObjectOpenHashSet; FIELD field_1_1768 stagedAllocations Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap; FIELD field_1_1769 staging Lnet/minecraft/class_1_686; + FIELD field_1_3530 usage I + FIELD field_1_3531 heapSize I METHOD (Ljava/lang/String;IIILnet/minecraft/class_1_686;)V ARG 1 name + ARG 2 usage ARG 3 heapSize ARG 4 vertexSize + ARG 5 staging METHOD method_1_2173 freeAllocation (Ljava/lang/Object;)V ARG 1 data METHOD method_1_2174 get (Ljava/lang/Object;)Lnet/minecraft/class_1_291$class_1_292; @@ -22,6 +26,14 @@ CLASS net/minecraft/class_1_296 net/minecraft/client/render/UberBuffer METHOD method_1_2178 upload (Lcom/mojang/blaze3d/systems/GpuDevice;Lnet/minecraft/class_1_686$class_1_688;)Z COMMENT {@return whether any heaps were created or destroyed} ARG 1 device + ARG 2 uploader + METHOD method_1_4152 stageRemainder (Ljava/lang/Object;Lnet/minecraft/class_1_296$class_1_302;Ljava/nio/ByteBuffer;)Z + ARG 1 data + ARG 2 uploadCallback + ARG 3 source + METHOD method_1_4153 callUploadCallback (Ljava/lang/Object;Lnet/minecraft/class_1_296$class_1_297;)V + ARG 0 key + ARG 1 allocation CLASS class_1_297 StagedAllocation FIELD comp_1_498 uploadCallback Lnet/minecraft/class_1_296$class_1_302; CLASS class_1_298 Heap diff --git a/mappings/net/minecraft/loot/LootPool.mapping b/mappings/net/minecraft/loot/LootPool.mapping index 7fafaa3921..ffe5ed34e1 100644 --- a/mappings/net/minecraft/loot/LootPool.mapping +++ b/mappings/net/minecraft/loot/LootPool.mapping @@ -40,6 +40,8 @@ CLASS net/minecraft/class_55 net/minecraft/loot/LootPool FIELD field_961 functions Lcom/google/common/collect/ImmutableList$Builder; FIELD field_962 bonusRollsRange Lnet/minecraft/class_5658; FIELD field_963 conditions Lcom/google/common/collect/ImmutableList$Builder; + METHOD method_1_4409 with (Ljava/util/List;)Lnet/minecraft/class_55$class_56; + ARG 1 entries METHOD method_351 with (Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_55$class_56; ARG 1 entry METHOD method_352 rolls (Lnet/minecraft/class_5658;)Lnet/minecraft/class_55$class_56; From bf20edbc128ce93bd80bd596174e2df5eea77079 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Thu, 9 Apr 2026 06:09:43 -0400 Subject: [PATCH 09/12] Map ChunkBuilder --- .../client/render/chunk/ChunkBuilder.mapping | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping index 003d222b1c..70d3aef8df 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder FIELD field_1_1971 geometryByBlockRenderLayer Ljava/util/Map; FIELD field_1_1972 lock Ljava/util/concurrent/locks/ReentrantLock; + FIELD field_1_3813 chunkStagingBuffer Lnet/minecraft/class_1_686; FIELD field_18766 cameraPosition Ljava/util/concurrent/atomic/AtomicReference; FIELD field_20828 buffers Lnet/minecraft/class_750; FIELD field_20830 executor Lnet/minecraft/class_10207; @@ -15,12 +16,15 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder ARG 2 worldRenderer ARG 3 executor ARG 4 bufferBuilderStorage + ARG 5 sectionBuilder METHOD method_1_2401 getOffsetGeometryBuffers (Lnet/minecraft/class_11517;Lnet/minecraft/class_11515;)Lnet/minecraft/class_846$class_1_342; ARG 1 renderData ARG 2 blockRenderLayer METHOD method_1_2403 lock ()V METHOD method_1_2404 unlock ()V METHOD method_1_2405 uploadGlobalBuffers ()V + METHOD method_1_4615 (Lnet/minecraft/class_11515;)Lnet/minecraft/class_846$class_1_343; + ARG 1 blockRenderLayer METHOD method_3619 stop ()V METHOD method_3622 getDebugString ()Ljava/lang/String; METHOD method_3627 rebuild (Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_6850;)V @@ -31,6 +35,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder ARG 1 cameraPosition METHOD method_22752 setWorld (Lnet/minecraft/class_638;Lnet/minecraft/class_9810;)V ARG 1 world + ARG 2 sectionBuilder METHOD method_22756 send (Lnet/minecraft/class_846$class_851$class_4577;)V ARG 1 task METHOD method_22763 scheduleRunTasks ()V @@ -64,11 +69,17 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder METHOD method_1_2407 disposeIfAllBuffersUploaded (Lnet/minecraft/class_11516;)V ARG 1 data METHOD method_1_2408 onIndexBufferUploaded (Lnet/minecraft/class_11516;Lnet/minecraft/class_11515;Z)V + ARG 1 data ARG 2 blockRenderLayer ARG 3 noVertex + METHOD method_1_2409 (Lnet/minecraft/class_11515;Lnet/minecraft/class_11516;)V + ARG 2 data + METHOD method_1_2410 (Lnet/minecraft/class_11515;ZLnet/minecraft/class_11516;)V + ARG 3 data METHOD method_1_2411 dispose (Lnet/minecraft/class_11517;)V ARG 1 data METHOD method_1_2412 onVertexBufferUploaded (Lnet/minecraft/class_11516;Lnet/minecraft/class_11515;)V + ARG 1 data ARG 2 blockRenderLayer METHOD method_3651 isChunkNonEmpty (J)Z ARG 1 sectionPos From 606c6f42b20d2db9df80cfd179d446a78f14a4e1 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Thu, 9 Apr 2026 06:18:18 -0400 Subject: [PATCH 10/12] Finish mapping dripstone generation-related code --- .../gen/feature/LargeDripstoneFeature.mapping | 5 ++++- .../LargeDripstoneFeatureConfig.mapping | 3 +++ .../feature/SpeleothemClusterFeature.mapping | 2 ++ .../gen/feature/SpeleothemFeature.mapping | 1 + .../gen/feature/util/DripstoneHelper.mapping | 21 ++++++++++++++++++- 5 files changed, 30 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping b/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping index 3c4829fa9c..fa19a78197 100644 --- a/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/class_5727 net/minecraft/world/gen/feature/LargeDripstoneFeature + METHOD method_1_4629 (Lnet/minecraft/class_5732;Lnet/minecraft/class_2680;)Z + ARG 1 block METHOD method_33016 createGenerator (Lnet/minecraft/class_2338;ZLnet/minecraft/class_5819;ILnet/minecraft/class_5863;Lnet/minecraft/class_5863;)Lnet/minecraft/class_5727$class_5728; ARG 0 pos ARG 1 isStalagmite + ARG 2 random ARG 3 scale ARG 4 bluntness ARG 5 heightScale @@ -24,7 +27,7 @@ CLASS net/minecraft/class_5727 net/minecraft/world/gen/feature/LargeDripstoneFea ARG 6 heightScale METHOD method_33017 getBaseScale ()I METHOD method_33018 scale (F)I - ARG 1 height + ARG 1 radius METHOD method_33019 canGenerate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5727$class_5729;)Z ARG 1 world ARG 2 wind diff --git a/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeatureConfig.mapping index 928fb968e1..4f312d09b0 100644 --- a/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeatureConfig.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_5732 net/minecraft/world/gen/feature/LargeDripstoneFeatureConfig + FIELD field_1_3826 replaceableBlocks Lnet/minecraft/class_6885; FIELD field_28227 CODEC Lcom/mojang/serialization/Codec; FIELD field_28228 floorToCeilingSearchRange I FIELD field_28229 columnRadius Lnet/minecraft/class_6017; @@ -19,6 +20,8 @@ CLASS net/minecraft/class_5732 net/minecraft/world/gen/feature/LargeDripstoneFea ARG 8 windSpeed ARG 9 minRadiusForWind ARG 10 minBluntnessForWind + METHOD method_1_4650 (Lnet/minecraft/class_5732;)Lnet/minecraft/class_6885; + ARG 0 config METHOD method_33052 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_33053 (Lnet/minecraft/class_5732;)Ljava/lang/Float; diff --git a/mappings/net/minecraft/world/gen/feature/SpeleothemClusterFeature.mapping b/mappings/net/minecraft/world/gen/feature/SpeleothemClusterFeature.mapping index 3e1048f03f..d4e5f72992 100644 --- a/mappings/net/minecraft/world/gen/feature/SpeleothemClusterFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SpeleothemClusterFeature.mapping @@ -11,11 +11,13 @@ CLASS net/minecraft/class_5725 net/minecraft/world/gen/feature/SpeleothemCluster METHOD method_33000 canWaterSpawn (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_1_773;)Z ARG 1 world ARG 2 pos + ARG 3 config METHOD method_33001 placeDripstoneBlocks (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;ILnet/minecraft/class_2350;Lnet/minecraft/class_1_773;)V ARG 1 world ARG 2 pos ARG 3 height ARG 4 direction + ARG 5 config METHOD method_33002 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;IIFDIFLnet/minecraft/class_1_773;)V ARG 1 world ARG 2 random diff --git a/mappings/net/minecraft/world/gen/feature/SpeleothemFeature.mapping b/mappings/net/minecraft/world/gen/feature/SpeleothemFeature.mapping index 3acfcfb8ae..1dd50992c5 100644 --- a/mappings/net/minecraft/world/gen/feature/SpeleothemFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SpeleothemFeature.mapping @@ -8,3 +8,4 @@ CLASS net/minecraft/class_5730 net/minecraft/world/gen/feature/SpeleothemFeature ARG 0 world ARG 1 pos ARG 2 random + ARG 3 config diff --git a/mappings/net/minecraft/world/gen/feature/util/DripstoneHelper.mapping b/mappings/net/minecraft/world/gen/feature/util/DripstoneHelper.mapping index 452618e189..968198f150 100644 --- a/mappings/net/minecraft/world/gen/feature/util/DripstoneHelper.mapping +++ b/mappings/net/minecraft/world/gen/feature/util/DripstoneHelper.mapping @@ -1,6 +1,20 @@ CLASS net/minecraft/class_5726 net/minecraft/world/gen/feature/util/DripstoneHelper + METHOD method_1_4611 canSupportSpeleothem (Lnet/minecraft/class_2680;Lnet/minecraft/class_2248;Lnet/minecraft/class_6885;)Z + ARG 0 state + ARG 1 baseBlock + ARG 2 replaceableBlock + METHOD method_1_4612 canSupportLargeDripstone (Lnet/minecraft/class_2680;Lnet/minecraft/class_2248;Lnet/minecraft/class_6885;)Z + ARG 0 state + ARG 1 baseBlock + ARG 2 replaceableBlocks + METHOD method_1_4613 generateDripstoneBlock (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_6885;)Z + ARG 0 world + ARG 1 pos + ARG 2 baseBlock + ARG 3 replaceableBlocks METHOD method_33005 scaleHeightFromRadius (DDDD)D ARG 0 radius + ARG 2 scale ARG 4 heightScale ARG 6 bluntness METHOD method_33006 canGenerate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z @@ -12,20 +26,25 @@ CLASS net/minecraft/class_5726 net/minecraft/world/gen/feature/util/DripstoneHel ARG 0 world ARG 1 pos ARG 2 height - METHOD method_33010 generatePointedDripstone (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;IZLnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_6885;)V + METHOD method_33010 generateSpeleothem (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;IZLnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_6885;)V ARG 0 world ARG 1 pos ARG 2 direction ARG 3 height ARG 4 merge + ARG 5 baseBlock + ARG 6 pointedBlock + ARG 7 replaceableBlocks METHOD method_33012 getDripstoneThickness (Lnet/minecraft/class_2350;IZLjava/util/function/Consumer;Lnet/minecraft/class_2248;)V ARG 0 direction ARG 1 height ARG 2 merge ARG 3 callback + ARG 4 block METHOD method_33013 getState (Lnet/minecraft/class_2350;Lnet/minecraft/class_5691;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680; ARG 0 direction ARG 1 thickness + ARG 2 block METHOD method_33014 canGenerate (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_33388 canGenerateOrLava (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z From 1fe8f66cac515f3b6c00c22ba72d077947af0fd2 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Thu, 9 Apr 2026 06:59:13 -0400 Subject: [PATCH 11/12] Add miscellaneous mappings --- .../net/minecraft/block/Oxidizable.mapping | 2 + .../block/entity/BlockEntityType.mapping | 4 ++ .../client/render/VertexRendering.mapping | 8 ---- .../command/ModelPartCommandRenderer.mapping | 12 ++++++ .../render/command/RenderDispatcher.mapping | 1 + .../render/model/BakedModelManager.mapping | 27 ++++++++++++++ .../client/toast/SystemToast.mapping | 15 ++++++++ .../net/minecraft/entity/SpawnGroup.mapping | 6 +++ .../entity/mob/DrownedEntity.mapping | 2 + .../processor/StructureProcessor.mapping | 1 + mappings/net/minecraft/util/Util.mapping | 12 +++--- .../world/biome/OverworldBiomeCreator.mapping | 3 ++ .../VanillaTerrainParametersCreator.mapping | 29 +++++++++++++-- .../gen/feature/DefaultBiomeFeatures.mapping | 2 + .../feature/MiscConfiguredFeatures.mapping | 2 + .../gen/feature/MiscPlacedFeatures.mapping | 1 + .../gen/feature/TemplateFeatureConfig.mapping | 7 ++++ .../UndergroundConfiguredFeatures.mapping | 1 + .../feature/UndergroundPlacedFeatures.mapping | 1 + .../gen/surfacebuilder/MaterialRules.mapping | 37 +++++++++++++++++++ .../VanillaSurfaceRules.mapping | 2 + 21 files changed, 158 insertions(+), 17 deletions(-) delete mode 100644 mappings/net/minecraft/client/render/VertexRendering.mapping create mode 100644 mappings/net/minecraft/client/render/command/ModelPartCommandRenderer.mapping diff --git a/mappings/net/minecraft/block/Oxidizable.mapping b/mappings/net/minecraft/block/Oxidizable.mapping index 982d582d43..cc80ff889a 100644 --- a/mappings/net/minecraft/block/Oxidizable.mapping +++ b/mappings/net/minecraft/block/Oxidizable.mapping @@ -22,5 +22,7 @@ CLASS net/minecraft/class_5955 net/minecraft/block/Oxidizable FIELD field_61432 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 id + METHOD method_1_4432 forEach (Ljava/util/function/Consumer;)V + ARG 0 callback METHOD method_72643 getIncreased ()Lnet/minecraft/class_5955$class_5811; METHOD method_72644 getDecreased ()Lnet/minecraft/class_5955$class_5811; diff --git a/mappings/net/minecraft/block/entity/BlockEntityType.mapping b/mappings/net/minecraft/block/entity/BlockEntityType.mapping index 8bb514550a..21e77f1d00 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityType.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityType.mapping @@ -21,6 +21,10 @@ CLASS net/minecraft/class_2591 net/minecraft/block/entity/BlockEntityType METHOD (Lnet/minecraft/class_2591$class_5559;Ljava/util/Set;)V ARG 1 factory ARG 2 blocks + METHOD method_1_4552 create (Ljava/lang/String;Lnet/minecraft/class_2591$class_5559;Ljava/util/List;)Lnet/minecraft/class_2591; + ARG 0 id + ARG 1 factory + ARG 2 blocks METHOD method_11030 create (Ljava/lang/String;Lnet/minecraft/class_2591$class_5559;[Lnet/minecraft/class_2248;)Lnet/minecraft/class_2591; ARG 0 id ARG 1 factory diff --git a/mappings/net/minecraft/client/render/VertexRendering.mapping b/mappings/net/minecraft/client/render/VertexRendering.mapping deleted file mode 100644 index a03bb768b4..0000000000 --- a/mappings/net/minecraft/client/render/VertexRendering.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_9974 net/minecraft/client/render/VertexRendering - METHOD method_62299 (Lorg/joml/Vector3f;Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;IFDDDDDD)V - ARG 5 minX - ARG 7 minY - ARG 9 minZ - ARG 11 maxX - ARG 13 maxY - ARG 15 maxZ diff --git a/mappings/net/minecraft/client/render/command/ModelPartCommandRenderer.mapping b/mappings/net/minecraft/client/render/command/ModelPartCommandRenderer.mapping new file mode 100644 index 0000000000..a2334277dc --- /dev/null +++ b/mappings/net/minecraft/client/render/command/ModelPartCommandRenderer.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_9974 net/minecraft/client/render/command/ModelPartCommandRenderer + METHOD method_1_4630 render (Lnet/minecraft/class_11788;Lnet/minecraft/class_4597$class_4598;Z)V + ARG 1 queue + ARG 2 vertexConsumers + ARG 3 afterTerrain + METHOD method_62299 (Lorg/joml/Vector3f;Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;IFDDDDDD)V + ARG 5 minX + ARG 7 minY + ARG 9 minZ + ARG 11 maxX + ARG 13 maxY + ARG 15 maxZ diff --git a/mappings/net/minecraft/client/render/command/RenderDispatcher.mapping b/mappings/net/minecraft/client/render/command/RenderDispatcher.mapping index aefb91adb0..92c54bd6de 100644 --- a/mappings/net/minecraft/client/render/command/RenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/command/RenderDispatcher.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/class_11684 net/minecraft/client/render/command/RenderDispat FIELD field_62260 modelPartCommandRenderer Lnet/minecraft/class_9974; FIELD field_62759 layeredCustomCommandRenderer Lnet/minecraft/class_11977; METHOD (Lnet/minecraft/class_11661;Lnet/minecraft/class_1092;Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_11697;Lnet/minecraft/class_4618;Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_327;Lnet/minecraft/class_1_405;)V + ARG 1 queue ARG 2 bakedModelManager ARG 3 vertexConsumers ARG 4 atlasManager diff --git a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping index 16c5d7b919..d319371ac2 100644 --- a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping @@ -67,5 +67,32 @@ CLASS net/minecraft/class_1092 net/minecraft/client/render/model/BakedModelManag METHOD method_68047 (Lnet/minecraft/class_1092$class_1_734;Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_5599;Lnet/minecraft/class_1088$class_10524;Ljava/util/Map;)Lnet/minecraft/class_1092$class_7779; ARG 3 bakedModels ARG 4 blockModels + CLASS class_1_734 MissingTextureReporter + FIELD field_1_3720 bakedModelTextureCache Ljava/util/Map; + FIELD field_1_3721 bakeModelTextureFunction Ljava/util/function/Function; + FIELD field_1_3722 blocksResult Lnet/minecraft/class_7766$class_7767; + FIELD field_1_3723 missingTexture Lnet/minecraft/class_1_314$class_1_315; + FIELD field_1_3724 itemsResult Lnet/minecraft/class_7766$class_7767; + FIELD field_1_3725 missingTextureReferencesByModel Lcom/google/common/collect/Multimap; + FIELD field_1_3726 missingTexturesByModel Lcom/google/common/collect/Multimap; + METHOD (Lnet/minecraft/class_7766$class_7767;Lnet/minecraft/class_7766$class_7767;)V + ARG 1 blocksResult + ARG 2 itemsResult + METHOD method_1_4433 bakeModelTexture (Lnet/minecraft/class_1_314;)Lnet/minecraft/class_1_314$class_1_315; + ARG 1 texture + METHOD method_1_4434 bakeModelTexture (Lnet/minecraft/class_1_314;Lnet/minecraft/class_7766$class_7767;)Lnet/minecraft/class_1_314$class_1_315; + ARG 1 texture + ARG 2 stitchResult + METHOD method_1_4435 (Ljava/lang/String;Ljava/util/Collection;)V + ARG 0 name + ARG 1 textures + METHOD method_1_4436 (Lnet/minecraft/class_2960;)Ljava/lang/String; + ARG 0 texture + METHOD method_1_4437 (Ljava/lang/String;Ljava/util/Collection;)V + ARG 0 name + ARG 1 textures + METHOD method_1_4438 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 texture + METHOD method_1_4439 reportMissingTextures ()V CLASS class_7779 BakingResult CLASS class_10816 Models diff --git a/mappings/net/minecraft/client/toast/SystemToast.mapping b/mappings/net/minecraft/client/toast/SystemToast.mapping index 492daf5eff..5505b2e2d0 100644 --- a/mappings/net/minecraft/client/toast/SystemToast.mapping +++ b/mappings/net/minecraft/client/toast/SystemToast.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast + FIELD field_1_3795 TEXT_X I FIELD field_2213 type Lnet/minecraft/class_370$class_9037; FIELD field_2214 justUpdated Z FIELD field_2215 title Ljava/util/List; @@ -14,6 +15,19 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast METHOD (Lnet/minecraft/class_370$class_9037;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 type ARG 2 title + ARG 3 desc + METHOD method_1_4525 drawText (Lnet/minecraft/class_332;Lnet/minecraft/class_327;Ljava/util/List;II)V + ARG 1 context + ARG 2 textRenderer + ARG 3 lines + ARG 4 y + ARG 5 color + METHOD method_1_4526 updateWidth ()V + METHOD method_1_4527 wrap (Lnet/minecraft/class_2561;)Ljava/util/List; + ARG 0 text + METHOD method_1_4528 doSetContent (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V + ARG 1 title + ARG 2 desc METHOD method_1990 show (Lnet/minecraft/class_374;Lnet/minecraft/class_370$class_9037;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 0 manager ARG 1 type @@ -34,6 +48,7 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast ARG 0 client ARG 1 worldName METHOD method_29626 getTextAsList (Lnet/minecraft/class_2561;)Ljava/util/List; + ARG 0 text METHOD method_29627 addPackCopyFailure (Lnet/minecraft/class_310;Ljava/lang/String;)V ARG 0 client ARG 1 directory diff --git a/mappings/net/minecraft/entity/SpawnGroup.mapping b/mappings/net/minecraft/entity/SpawnGroup.mapping index b932523b80..d56e39625c 100644 --- a/mappings/net/minecraft/entity/SpawnGroup.mapping +++ b/mappings/net/minecraft/entity/SpawnGroup.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_1311 net/minecraft/entity/SpawnGroup COMMENT COMMENT @see EntityType#getSpawnGroup() COMMENT @see net.minecraft.world.SpawnHelper + FIELD field_1_3450 abbreviation Ljava/lang/String; FIELD field_6295 rare Z FIELD field_6297 capacity I FIELD field_6298 peaceful Z @@ -17,10 +18,15 @@ CLASS net/minecraft/class_1311 net/minecraft/entity/SpawnGroup COMMENT {@linkplain #getName() name} string. METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;IZZI)V ARG 3 name + ARG 4 abbreviation ARG 5 spawnCap ARG 6 peaceful ARG 7 rare ARG 8 immediateDespawnRange + METHOD method_1_4060 getAbbreviation ()Ljava/lang/String; + COMMENT Returns the abbreviation for this spawn group. + COMMENT

+ COMMENT These are used in the debug screen and consist of uppercase letters. METHOD method_6133 getName ()Ljava/lang/String; COMMENT Returns the name of this spawn group. COMMENT diff --git a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping index ce5c71d16e..833cbb1607 100644 --- a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping +++ b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_1551 net/minecraft/entity/mob/DrownedEntity + FIELD field_1_1865 DIMENSIONS Lnet/minecraft/class_4048; FIELD field_7233 targetingUnderwater Z + METHOD method_1_4443 isExplicitlyTargetingUnderwater ()Z METHOD method_7012 canDrownedAttackTarget (Lnet/minecraft/class_1309;)Z ARG 1 target METHOD method_7013 setTargetingUnderwater (Z)V diff --git a/mappings/net/minecraft/structure/processor/StructureProcessor.mapping b/mappings/net/minecraft/structure/processor/StructureProcessor.mapping index 63605865d2..7331b386ed 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessor.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3491 net/minecraft/structure/processor/StructureProcessor + METHOD method_1_4636 getCodec ()Lcom/mojang/serialization/MapCodec; METHOD method_15110 process (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_3492;)Lnet/minecraft/class_3499$class_3501; ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 44c51eb360..0c62cace84 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -29,6 +29,8 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_1_2911 withAppended (Ljava/util/List;[Ljava/lang/Object;)Ljava/util/List; ARG 0 list ARG 1 valuesToAppend + METHOD method_1_3882 join ([Ljava/util/List;)Ljava/util/List; + ARG 0 lists METHOD method_645 previous (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; COMMENT {@return the item preceding {@code object} in {@code iterable}} COMMENT @@ -517,14 +519,14 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_72236 isOnAarch64 ()Z METHOD method_75862 getDefaultLocaleFormatter (Ljava/time/format/FormatStyle;)Ljava/time/format/DateTimeFormatter; ARG 0 style - CLASS 2 2 - CLASS 3 3 - CLASS 4 4 - CLASS 10 10 + CLASS 2 + CLASS 3 + CLASS 4 + CLASS 10 FIELD field_29655 cache Ljava/util/Map; METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 t - CLASS 11 11 + CLASS 11 FIELD field_29657 cache Ljava/util/Map; METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 t diff --git a/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping b/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping index 9029d350ed..f4f6d1e95c 100644 --- a/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping +++ b/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/OverworldBiomeCreator FIELD field_35340 DEFAULT_WATER_COLOR I FIELD field_51968 SWAMP_SKELETON_WEIGHT I FIELD field_57111 DEFAULT_DRY_FOLIAGE_COLOR I + METHOD method_1_4442 createSulfurCaves (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup METHOD method_30683 createJungle (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; ARG 0 featureLookup ARG 1 carverLookup diff --git a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParametersCreator.mapping b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParametersCreator.mapping index be4c97704a..d36776bec3 100644 --- a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParametersCreator.mapping +++ b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParametersCreator.mapping @@ -3,29 +3,50 @@ CLASS net/minecraft/class_6765 net/minecraft/world/biome/source/util/VanillaTerr FIELD field_38029 OFFSET_AMPLIFIER Lit/unimi/dsi/fastutil/floats/Float2FloatFunction; FIELD field_38030 FACTOR_AMPLIFIER Lit/unimi/dsi/fastutil/floats/Float2FloatFunction; FIELD field_38031 JAGGEDNESS_AMPLIFIER Lit/unimi/dsi/fastutil/floats/Float2FloatFunction; + METHOD method_1_4237 getPeaksValleysNoise (F)F + ARG 0 weirdness METHOD method_42046 getOffsetValue (FFF)F METHOD method_42048 (Lnet/minecraft/class_6501;FFFFFFLit/unimi/dsi/fastutil/floats/Float2FloatFunction;)Lnet/minecraft/class_6492; ARG 0 ridgesFolded ARG 1 continentalness - METHOD method_42049 (Lnet/minecraft/class_6501;FLit/unimi/dsi/fastutil/floats/Float2FloatFunction;)Lnet/minecraft/class_6492; + ARG 7 offsetAmplifier + METHOD method_42049 ridgesSpline (Lnet/minecraft/class_6501;FLit/unimi/dsi/fastutil/floats/Float2FloatFunction;)Lnet/minecraft/class_6492; ARG 0 ridges + ARG 1 scale + ARG 2 jaggednessAmplifier METHOD method_42050 (Lnet/minecraft/class_6501;FZLit/unimi/dsi/fastutil/floats/Float2FloatFunction;)Lnet/minecraft/class_6492; ARG 0 ridgesFolded + ARG 2 inland + ARG 3 offsetAmplifier METHOD method_42051 createContinentalOffsetSpline (Lnet/minecraft/class_6501;Lnet/minecraft/class_6501;FFFFFFZZLit/unimi/dsi/fastutil/floats/Float2FloatFunction;)Lnet/minecraft/class_6492; ARG 0 erosion ARG 1 ridgesFolded ARG 2 continentalness - METHOD method_42052 (Lnet/minecraft/class_6501;Lnet/minecraft/class_6501;FFLit/unimi/dsi/fastutil/floats/Float2FloatFunction;)Lnet/minecraft/class_6492; + ARG 8 inland + ARG 9 inland2 + ARG 10 offsetAmplifier + METHOD method_42052 ridgesFoldedSpline (Lnet/minecraft/class_6501;Lnet/minecraft/class_6501;FFLit/unimi/dsi/fastutil/floats/Float2FloatFunction;)Lnet/minecraft/class_6492; ARG 0 ridges ARG 1 ridgesFolded - METHOD method_42053 (Lnet/minecraft/class_6501;Lnet/minecraft/class_6501;Lnet/minecraft/class_6501;FFFFLit/unimi/dsi/fastutil/floats/Float2FloatFunction;)Lnet/minecraft/class_6492; + ARG 2 scaleRf1 + ARG 3 scaleRf0 + ARG 4 jaggednessAmplifier + METHOD method_42053 createJaggednessSubspline (Lnet/minecraft/class_6501;Lnet/minecraft/class_6501;Lnet/minecraft/class_6501;FFFFLit/unimi/dsi/fastutil/floats/Float2FloatFunction;)Lnet/minecraft/class_6492; ARG 0 erosion ARG 1 ridges ARG 2 ridgesFolded - METHOD method_42054 (Lnet/minecraft/class_6501;Lnet/minecraft/class_6501;Lnet/minecraft/class_6501;FZLit/unimi/dsi/fastutil/floats/Float2FloatFunction;)Lnet/minecraft/class_6492; + ARG 3 maxScaleRf1 + ARG 4 maxScaleRf0 + ARG 5 medScaleRf1 + ARG 6 medScaleRf0 + ARG 7 jaggednessAmplifier + METHOD method_42054 createFactorSubspline (Lnet/minecraft/class_6501;Lnet/minecraft/class_6501;Lnet/minecraft/class_6501;FZLit/unimi/dsi/fastutil/floats/Float2FloatFunction;)Lnet/minecraft/class_6492; ARG 0 erosion ARG 1 ridges ARG 2 ridgesFolded + ARG 3 typicalFactor + ARG 4 coastal + ARG 5 factorAmplifier METHOD method_42055 createFactorSpline (Lnet/minecraft/class_6501;Lnet/minecraft/class_6501;Lnet/minecraft/class_6501;Lnet/minecraft/class_6501;Z)Lnet/minecraft/class_6492; COMMENT Creates the spline for terrain factor. COMMENT diff --git a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping index 95d6d4eb4e..0cbb3190c8 100644 --- a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatures + METHOD method_1_4420 addSulfurCavesDecoration (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16957 addWindsweptHillsTrees (Lnet/minecraft/class_5485$class_5495;)V ARG 0 builder METHOD method_16958 addWindsweptForestTrees (Lnet/minecraft/class_5485$class_5495;)V diff --git a/mappings/net/minecraft/world/gen/feature/MiscConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/MiscConfiguredFeatures.mapping index dd29c015a8..8771da94f0 100644 --- a/mappings/net/minecraft/world/gen/feature/MiscConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/MiscConfiguredFeatures.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_6804 net/minecraft/world/gen/feature/MiscConfiguredFeatures + FIELD field_1_3810 SULFUR_POOL Lnet/minecraft/class_5321; + FIELD field_1_3811 SULFUR_SPRING Lnet/minecraft/class_5321; FIELD field_35800 ICE_SPIKE Lnet/minecraft/class_5321; FIELD field_35801 ICE_PATCH Lnet/minecraft/class_5321; FIELD field_35802 FOREST_ROCK Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/world/gen/feature/MiscPlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/MiscPlacedFeatures.mapping index 87ee3ab4fa..f88ca03b86 100644 --- a/mappings/net/minecraft/world/gen/feature/MiscPlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/MiscPlacedFeatures.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_6814 net/minecraft/world/gen/feature/MiscPlacedFeatures + FIELD field_1_3817 SULFUR_POOL Lnet/minecraft/class_5321; FIELD field_36001 ICE_SPIKE Lnet/minecraft/class_5321; FIELD field_36002 ICE_PATCH Lnet/minecraft/class_5321; FIELD field_36003 FOREST_ROCK Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/world/gen/feature/TemplateFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/TemplateFeatureConfig.mapping index cb25b0e5cb..cf0932db4e 100644 --- a/mappings/net/minecraft/world/gen/feature/TemplateFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/TemplateFeatureConfig.mapping @@ -1 +1,8 @@ CLASS net/minecraft/class_1_770 net/minecraft/world/gen/feature/TemplateFeatureConfig + METHOD method_1_4651 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_1_771 RotatableTemplate + METHOD method_1_4652 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_1_4653 free (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1_770$class_1_771; + ARG 0 id diff --git a/mappings/net/minecraft/world/gen/feature/UndergroundConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/UndergroundConfiguredFeatures.mapping index 0a361624d6..613ddc91f9 100644 --- a/mappings/net/minecraft/world/gen/feature/UndergroundConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/UndergroundConfiguredFeatures.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_6801 net/minecraft/world/gen/feature/UndergroundConfiguredFeatures + FIELD field_1_3727 ROOTED_SULFUR_SPRING Lnet/minecraft/class_5321; FIELD field_35770 MONSTER_ROOM Lnet/minecraft/class_5321; FIELD field_35771 FOSSIL_COAL Lnet/minecraft/class_5321; FIELD field_35772 FOSSIL_DIAMONDS Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/world/gen/feature/UndergroundPlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/UndergroundPlacedFeatures.mapping index 2eb2146d00..4664b1de32 100644 --- a/mappings/net/minecraft/world/gen/feature/UndergroundPlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/UndergroundPlacedFeatures.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_6812 net/minecraft/world/gen/feature/UndergroundPlacedFeatures + FIELD field_1_3770 ROOTED_SULFUR_SPRING Lnet/minecraft/class_5321; FIELD field_35980 MONSTER_ROOM Lnet/minecraft/class_5321; FIELD field_35981 MONSTER_ROOM_DEEP Lnet/minecraft/class_5321; FIELD field_35982 FOSSIL_UPPER Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping index b5a24672a0..8c8282cd4f 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping @@ -5,6 +5,9 @@ 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_4405 gradient (Lnet/minecraft/class_5321;Ljava/util/List;)Lnet/minecraft/class_6686$class_6708; + ARG 0 noise + ARG 1 gradient METHOD method_39045 steepSlope ()Lnet/minecraft/class_6686$class_6693; METHOD method_39046 water (II)Lnet/minecraft/class_6686$class_6693; ARG 0 offset @@ -59,6 +62,17 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu ARG 0 registry ARG 1 id ARG 2 codecHolder + CLASS class_1_728 NoiseGradientBlockStateRule + CLASS class_1_729 NoiseGradientMaterialRule + FIELD field_1_3712 CODEC Lnet/minecraft/class_7243; + FIELD field_1_3713 MAP_CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_1_3714 OPTIONAL_STATE_CODEC Lcom/mojang/serialization/Codec; + METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 context + METHOD method_1_4407 (Ljava/util/Optional;)Lnet/minecraft/class_2680; + ARG 0 state + METHOD method_1_4408 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_6687 TerracottaBandsMaterialRule FIELD field_35226 CODEC Lnet/minecraft/class_7243; METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; @@ -109,7 +123,12 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu FIELD field_35619 stoneDepthBelow I FIELD field_35620 stoneDepthAbove I FIELD field_35676 chunkNoiseSampler Lnet/minecraft/class_6568; + FIELD field_35677 lastQueriesUniqueHorizontalPosValueForSecondaryDepth J FIELD field_35678 secondaryDepth D + FIELD field_35679 lastQueriesUniqueHorizontalPosValueForEstimatedSurfaceHeight J + FIELD field_36275 BLOCK_CHUNK_COORD_SHIFT I + FIELD field_36276 BLOCK_CHUNK_SCALE_FACTOR I + FIELD field_36277 CHUNK_LOCAL_MASK I FIELD field_36278 packedChunkPos J FIELD field_36279 estimatedSurfaceHeights [I FIELD field_37703 noiseConfig Lnet/minecraft/class_7138; @@ -139,9 +158,15 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu ARG 0 chunkCoord METHOD method_61804 getSeaLevel ()I CLASS class_6695 NegativeRunDepthPredicate + METHOD (Lnet/minecraft/class_6686$class_6694;)V + ARG 1 context CLASS class_6696 SteepSlopePredicate + METHOD (Lnet/minecraft/class_6686$class_6694;)V + ARG 1 context CLASS class_6771 SurfacePredicate CLASS class_6772 BiomeTemperaturePredicate + METHOD (Lnet/minecraft/class_6686$class_6694;)V + ARG 1 context CLASS class_6701 HoleMaterialCondition FIELD field_35244 CODEC Lnet/minecraft/class_7243; METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; @@ -162,6 +187,8 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu FIELD field_35248 CODEC Lnet/minecraft/class_7243; METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 context + METHOD method_39081 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_6704 NoiseThresholdPredicate CLASS class_6706 InvertedBooleanSupplier CLASS class_6707 NotMaterialCondition @@ -190,6 +217,8 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu FIELD field_35257 CODEC Lnet/minecraft/class_7243; METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 context + METHOD method_39089 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_6714 StoneDepthPredicate CLASS class_6715 BlockStateRule COMMENT Returns a {@link BlockState} to generate at a given position, or {@code null}. @@ -208,15 +237,21 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu FIELD field_35263 CODEC Lnet/minecraft/class_7243; METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 context + METHOD method_39094 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_6720 WaterMaterialCondition FIELD field_35264 CODEC Lnet/minecraft/class_7243; METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 context + METHOD method_39096 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_6721 WaterPredicate CLASS class_6722 AboveYMaterialCondition FIELD field_35266 CODEC Lnet/minecraft/class_7243; METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 context + METHOD method_39099 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_6723 AboveYPredicate CLASS class_6770 SurfaceMaterialCondition FIELD field_35601 CODEC Lnet/minecraft/class_7243; @@ -228,4 +263,6 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu FIELD field_35626 CODEC Lnet/minecraft/class_7243; METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 context + METHOD method_39480 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_6776 VerticalGradientPredicate diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/VanillaSurfaceRules.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/VanillaSurfaceRules.mapping index ff3d945fd0..071dafdbf2 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/VanillaSurfaceRules.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/VanillaSurfaceRules.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_6725 net/minecraft/world/gen/surfacebuilder/VanillaSurfaceRules + FIELD field_1_3645 CINNABAR Lnet/minecraft/class_2680; + FIELD field_1_3646 SULFUR Lnet/minecraft/class_2680; FIELD field_35310 WARPED_NYLIUM Lnet/minecraft/class_6686$class_6708; FIELD field_35311 NETHER_WART_BLOCK Lnet/minecraft/class_6686$class_6708; FIELD field_35312 CRIMSON_NYLIUM Lnet/minecraft/class_6686$class_6708; From 0bd7c78d2becd163fa1614241cf344439ac1f077 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Thu, 9 Apr 2026 07:15:08 -0400 Subject: [PATCH 12/12] Format mappings --- mappings/net/minecraft/util/Util.mapping | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 0c62cace84..d74bb98960 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -519,14 +519,14 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_72236 isOnAarch64 ()Z METHOD method_75862 getDefaultLocaleFormatter (Ljava/time/format/FormatStyle;)Ljava/time/format/DateTimeFormatter; ARG 0 style - CLASS 2 - CLASS 3 - CLASS 4 - CLASS 10 + CLASS 2 2 + CLASS 3 3 + CLASS 4 4 + CLASS 10 10 FIELD field_29655 cache Ljava/util/Map; METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 t - CLASS 11 + CLASS 11 11 FIELD field_29657 cache Ljava/util/Map; METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 t