diff --git a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping index a41a2c84d7..ad41762d84 100644 --- a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping +++ b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping @@ -13,6 +13,10 @@ CLASS com/mojang/blaze3d/systems/RenderSystem ARG 0 drawMode METHOD getShaderTexture (I)Lnet/minecraft/class_10792; ARG 0 texture + METHOD initRenderer (JIZLjava/util/function/BiFunction;Z)V + ARG 0 windowHandle + ARG 2 debugVerbosity + ARG 5 renderDebugLabels METHOD lambda$static$0 (Lit/unimi/dsi/fastutil/ints/IntConsumer;I)V ARG 0 indexConsumer ARG 1 firstVertexIndex diff --git a/mappings/net/minecraft/class_10859.mapping b/mappings/net/minecraft/class_10859.mapping deleted file mode 100644 index f6a5cd9a50..0000000000 --- a/mappings/net/minecraft/class_10859.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_10859 - CLASS class_10228 ReadResult - FIELD field_54357 handle I - FIELD field_54358 buf Ljava/nio/ByteBuffer; - METHOD (ILjava/nio/ByteBuffer;)V - ARG 1 handle - ARG 2 buf diff --git a/mappings/net/minecraft/class_10865.mapping b/mappings/net/minecraft/class_10865.mapping deleted file mode 100644 index 50d3f44d10..0000000000 --- a/mappings/net/minecraft/class_10865.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_10865 - CLASS class_10154 ShaderKey diff --git a/mappings/net/minecraft/client/RunArgs.mapping b/mappings/net/minecraft/client/RunArgs.mapping index 0193edd064..3d62cf407c 100644 --- a/mappings/net/minecraft/client/RunArgs.mapping +++ b/mappings/net/minecraft/client/RunArgs.mapping @@ -28,6 +28,7 @@ CLASS net/minecraft/class_542 net/minecraft/client/RunArgs FIELD field_3292 demo Z FIELD field_3293 version Ljava/lang/String; FIELD field_54272 tracyEnabled Z + FIELD field_57923 renderDebugLabels Z METHOD (ZLjava/lang/String;Ljava/lang/String;ZZZZ)V ARG 1 demo ARG 2 version @@ -35,6 +36,7 @@ CLASS net/minecraft/class_542 net/minecraft/client/RunArgs ARG 4 multiplayerDisabled ARG 5 onlineChatDisabled ARG 6 tracyEnabled + ARG 7 renderDebugLabels CLASS class_547 Network FIELD field_3296 netProxy Ljava/net/Proxy; FIELD field_3297 profileProperties Lcom/mojang/authlib/properties/PropertyMap; diff --git a/mappings/net/minecraft/client/gl/ARBDirectFramebufferManager.mapping b/mappings/net/minecraft/client/gl/ARBDirectFramebufferManager.mapping new file mode 100644 index 0000000000..ee920c1ba4 --- /dev/null +++ b/mappings/net/minecraft/client/gl/ARBDirectFramebufferManager.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10873 net/minecraft/client/gl/ARBDirectFramebufferManager diff --git a/mappings/net/minecraft/client/gl/BufferManager.mapping b/mappings/net/minecraft/client/gl/BufferManager.mapping new file mode 100644 index 0000000000..6ce289aee2 --- /dev/null +++ b/mappings/net/minecraft/client/gl/BufferManager.mapping @@ -0,0 +1,29 @@ +CLASS net/minecraft/class_10869 net/minecraft/client/gl/BufferManager + METHOD method_68428 setupBuffer (Lnet/minecraft/class_293;Lnet/minecraft/class_10859;)V + ARG 1 format + ARG 2 into + METHOD method_68429 createManager (Lorg/lwjgl/opengl/GLCapabilities;Lnet/minecraft/class_10861;Ljava/util/Set;)Lnet/minecraft/class_10869; + ARG 0 caps + ARG 1 labeler + ARG 2 usedCaps + CLASS class_10870 DefaultBufferManager + FIELD field_57889 cache Ljava/util/Map; + FIELD field_57890 labeler Lnet/minecraft/class_10861; + METHOD (Lnet/minecraft/class_10861;)V + ARG 1 labeler + METHOD method_68430 setupVba (Lnet/minecraft/class_293;Z)V + ARG 0 format + ARG 1 vbaIsNew + CLASS class_10871 ARBBufferManager + FIELD field_57891 cache Ljava/util/Map; + FIELD field_57892 labeler Lnet/minecraft/class_10861; + METHOD (Lnet/minecraft/class_10861;)V + ARG 1 labeler + CLASS class_10872 AllocatedBuffer + FIELD field_57893 glId I + FIELD field_57894 format Lnet/minecraft/class_293; + FIELD field_57895 buffer Lnet/minecraft/class_10859; + METHOD (ILnet/minecraft/class_293;Lnet/minecraft/class_10859;)V + ARG 1 glId + ARG 2 format + ARG 3 buffer diff --git a/mappings/net/minecraft/client/gl/CompiledShader.mapping b/mappings/net/minecraft/client/gl/CompiledShader.mapping index 17b341bd6a..b542a15641 100644 --- a/mappings/net/minecraft/client/gl/CompiledShader.mapping +++ b/mappings/net/minecraft/client/gl/CompiledShader.mapping @@ -2,12 +2,16 @@ CLASS net/minecraft/class_10141 net/minecraft/client/gl/CompiledShader FIELD field_53827 CLOSED I FIELD field_53828 id Lnet/minecraft/class_2960; FIELD field_53829 handle I + FIELD field_57880 INVALID_SHADER Lnet/minecraft/class_10141; + FIELD field_57881 type Lnet/minecraft/class_282; METHOD (ILnet/minecraft/class_2960;Lnet/minecraft/class_282;)V ARG 1 handle ARG 2 path + ARG 3 type METHOD method_62881 getId ()Lnet/minecraft/class_2960; METHOD method_62882 compile (Lnet/minecraft/class_2960;Lnet/minecraft/class_282;Ljava/lang/String;)Lnet/minecraft/class_10141; ARG 0 id ARG 1 type ARG 2 source METHOD method_62883 getHandle ()I + METHOD method_68423 getDebugLabel ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gl/CompiledShaderPipeline.mapping b/mappings/net/minecraft/client/gl/CompiledShaderPipeline.mapping new file mode 100644 index 0000000000..0cf185a3b4 --- /dev/null +++ b/mappings/net/minecraft/client/gl/CompiledShaderPipeline.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10867 net/minecraft/client/gl/CompiledShaderPipeline diff --git a/mappings/net/minecraft/client/gl/DebugLabelManager.mapping b/mappings/net/minecraft/client/gl/DebugLabelManager.mapping new file mode 100644 index 0000000000..c9faebfe8a --- /dev/null +++ b/mappings/net/minecraft/client/gl/DebugLabelManager.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_10861 net/minecraft/client/gl/DebugLabelManager + FIELD field_57851 LOGGER Lorg/slf4j/Logger; + METHOD method_68370 debugLabelsAvailable ()Z + METHOD method_68371 labelGlGpuBuffer (Lnet/minecraft/class_10859;)V + ARG 1 buf + METHOD method_68372 labelShaderProgram (Lnet/minecraft/class_5944;)V + ARG 1 program + METHOD method_68373 labelCompiledShader (Lnet/minecraft/class_10141;)V + ARG 1 shader + METHOD method_68374 labelGlTexture (Lnet/minecraft/class_10868;)V + ARG 1 tex + METHOD method_68375 labelAllocatedBuffer (Lnet/minecraft/class_10869$class_10872;)V + ARG 1 buffer + METHOD method_68376 getLabelManager (Lorg/lwjgl/opengl/GLCapabilities;ZLjava/util/Set;)Lnet/minecraft/class_10861; + ARG 0 caps + ARG 1 debugEnabled + ARG 2 usedCaps + CLASS class_10862 KHRDebugLabelManager + FIELD field_57852 maxLabelLength I + CLASS class_10863 NoOpDebugLabelManager + CLASS class_10864 EXTDebugLabelManager diff --git a/mappings/net/minecraft/client/gl/FramebufferManager.mapping b/mappings/net/minecraft/client/gl/FramebufferManager.mapping new file mode 100644 index 0000000000..4fb43b9ab1 --- /dev/null +++ b/mappings/net/minecraft/client/gl/FramebufferManager.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_10874 net/minecraft/client/gl/FramebufferManager + METHOD method_68431 makeFramebuffer ()I + METHOD method_68432 setupFramebuffer (IIIIZ)V + ARG 1 framebuffer + ARG 2 colorAttachment + ARG 3 depthAttachment + ARG 4 mipLevel + ARG 5 bindFramebuffer diff --git a/mappings/net/minecraft/client/gl/GlBackend.mapping b/mappings/net/minecraft/client/gl/GlBackend.mapping new file mode 100644 index 0000000000..c2758d1c46 --- /dev/null +++ b/mappings/net/minecraft/client/gl/GlBackend.mapping @@ -0,0 +1,44 @@ +CLASS net/minecraft/class_10865 net/minecraft/client/gl/GlBackend + FIELD field_57853 LOG Lorg/slf4j/Logger; + FIELD field_57854 resourceManager Lnet/minecraft/class_10881; + FIELD field_57855 glDebug Lnet/minecraft/class_1008; + FIELD field_57856 debugLabelManager Lnet/minecraft/class_10861; + FIELD field_57857 maxTexSize I + FIELD field_57858 fbManager Lnet/minecraft/class_10874; + FIELD field_57859 defaultShaderSourceGetter Ljava/util/function/BiFunction; + FIELD field_57860 shaderPipelineCompCache Ljava/util/Map; + FIELD field_57861 shaderKeyCompCache Ljava/util/Map; + FIELD field_57862 bufferManager Lnet/minecraft/class_10869; + FIELD field_58035 permitGlArbVABinding Z + FIELD field_58036 permitGlKhrDebug Z + FIELD field_58037 permitExtDebugLabel Z + FIELD field_58038 permitGlArbDebugOutput Z + FIELD field_58039 permitGlArbDirectAccess Z + FIELD field_58040 usedGlCaps Ljava/util/Set; + METHOD (JIZLjava/util/function/BiFunction;Z)V + ARG 1 contextId + ARG 3 debugVerbosity + ARG 5 shaderSourceGetter + ARG 6 renderDebugLabels + METHOD method_68377 getDebugLabelManager ()Lnet/minecraft/class_10861; + METHOD method_68378 compileShader (Lnet/minecraft/class_2960;Lnet/minecraft/class_282;Lnet/minecraft/class_10149;Ljava/util/function/BiFunction;)Lnet/minecraft/class_10141; + ARG 1 which + ARG 2 type + ARG 3 defines + ARG 4 sourceRetriever + METHOD method_68379 compileShader (Lnet/minecraft/class_10865$class_10154;Ljava/util/function/BiFunction;)Lnet/minecraft/class_10141; + ARG 1 which + ARG 2 sourceRetriever + METHOD method_68381 compileShaderPipelineCached (Lnet/minecraft/class_10785;)Lnet/minecraft/class_10867; + ARG 1 pipeline + METHOD method_68382 (Lnet/minecraft/class_10785;Lnet/minecraft/class_10785;)Lnet/minecraft/class_10867; + ARG 2 unused + METHOD method_68384 (Lnet/minecraft/class_10785;Ljava/util/function/BiFunction;Lnet/minecraft/class_10785;)Lnet/minecraft/class_10867; + ARG 3 unused + METHOD method_68392 compileShaderPipeline (Lnet/minecraft/class_10785;Ljava/util/function/BiFunction;)Lnet/minecraft/class_10867; + ARG 1 pipeline + ARG 2 shaderSourceGetter + METHOD method_68401 getFramebufferManager ()Lnet/minecraft/class_10874; + METHOD method_68402 getBufferManager ()Lnet/minecraft/class_10869; + METHOD method_68403 determineMaxTexSize ()I + CLASS class_10154 ShaderKey diff --git a/mappings/net/minecraft/client/gl/GlDebug.mapping b/mappings/net/minecraft/client/gl/GlDebug.mapping index 7de98fa495..d31a8107b6 100644 --- a/mappings/net/minecraft/client/gl/GlDebug.mapping +++ b/mappings/net/minecraft/client/gl/GlDebug.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_1008 net/minecraft/client/gl/GlDebug METHOD method_4227 enableDebug (IZLjava/util/Set;)Lnet/minecraft/class_1008; ARG 0 verbosity ARG 1 sync + ARG 2 usedGlCaps METHOD method_4228 getType (I)Ljava/lang/String; ARG 0 opcode CLASS class_6359 DebugMessage diff --git a/mappings/net/minecraft/client/gl/GlGpuBuffer.mapping b/mappings/net/minecraft/client/gl/GlGpuBuffer.mapping new file mode 100644 index 0000000000..a4f3775736 --- /dev/null +++ b/mappings/net/minecraft/client/gl/GlGpuBuffer.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_10859 net/minecraft/client/gl/GlGpuBuffer + FIELD field_57838 POOL Lcom/mojang/jtracy/MemoryPool; + FIELD field_57839 closed Z + FIELD field_57840 hasData Z + FIELD field_57841 debugLabelSupplier Ljava/util/function/Supplier; + FIELD field_57842 id I + METHOD (Lnet/minecraft/class_10861;Ljava/util/function/Supplier;Lnet/minecraft/class_10226;Lnet/minecraft/class_8555;II)V + ARG 1 debugLabelMgr + ARG 2 debugLabelSupplier + ARG 3 target + ARG 4 usage + ARG 5 size + ARG 6 id + METHOD method_68345 ensureAllocated ()V + CLASS class_10228 ReadResultImpl + FIELD field_54357 handle I + FIELD field_54358 buf Ljava/nio/ByteBuffer; + METHOD (ILjava/nio/ByteBuffer;)V + ARG 1 handle + ARG 2 buf diff --git a/mappings/net/minecraft/client/gl/GlResourceManager.mapping b/mappings/net/minecraft/client/gl/GlResourceManager.mapping new file mode 100644 index 0000000000..c561cc6627 --- /dev/null +++ b/mappings/net/minecraft/client/gl/GlResourceManager.mapping @@ -0,0 +1,33 @@ +CLASS net/minecraft/class_10860 net/minecraft/client/gl/GlResourceManager + FIELD field_57843 LOG Lorg/slf4j/Logger; + FIELD field_57844 backend Lnet/minecraft/class_10865; + FIELD field_57845 temporaryFb1 I + FIELD field_57846 temporaryFb2 I + FIELD field_57847 currentPipeline Lnet/minecraft/class_10785; + FIELD field_57848 renderPassOpen Z + FIELD field_57849 currentProgram Lnet/minecraft/class_5944; + METHOD (Lnet/minecraft/class_10865;)V + ARG 1 backend + METHOD method_68346 closePass ()V + METHOD method_68351 setupRenderPass (Lnet/minecraft/class_10866;)Z + ARG 1 pass + METHOD method_68352 drawBoundObjectWithRenderPass (Lnet/minecraft/class_10866;IILnet/minecraft/class_293$class_5595;)V + ARG 1 pass + ARG 2 offset + ARG 3 count + ARG 4 type + METHOD method_68353 drawObjectWithRenderPass (Lnet/minecraft/class_10866;IILnet/minecraft/class_293$class_5595;Lnet/minecraft/class_10867;)V + ARG 1 pass + ARG 2 offset + ARG 3 count + ARG 4 indexType + ARG 5 pipeline + METHOD method_68354 (Lnet/minecraft/class_10866;Ljava/lang/String;[F)V + ARG 1 name + ARG 2 values + METHOD method_68355 drawObjectsWithRenderPass (Lnet/minecraft/class_10866;Ljava/util/Collection;)V + ARG 1 pass + ARG 2 drawObjects + METHOD method_68356 setPipelineAndApplyState (Lnet/minecraft/class_10785;)V + ARG 1 pipeline + METHOD method_68369 getBackend ()Lnet/minecraft/class_10865; diff --git a/mappings/net/minecraft/client/gl/GlUniform.mapping b/mappings/net/minecraft/client/gl/GlUniform.mapping index ff8263097b..87fd40e939 100644 --- a/mappings/net/minecraft/client/gl/GlUniform.mapping +++ b/mappings/net/minecraft/client/gl/GlUniform.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_284 net/minecraft/client/gl/GlUniform FIELD field_1548 LOGGER Lorg/slf4j/Logger; FIELD field_1549 floatData Ljava/nio/FloatBuffer; FIELD field_56740 type Lnet/minecraft/class_10789; + FIELD field_57886 dirty Z METHOD (Ljava/lang/String;Lnet/minecraft/class_10789;)V ARG 1 name ARG 2 type diff --git a/mappings/net/minecraft/client/gl/GlUsage.mapping b/mappings/net/minecraft/client/gl/GlUsage.mapping index 764ff9bd8e..a6e038474a 100644 --- a/mappings/net/minecraft/client/gl/GlUsage.mapping +++ b/mappings/net/minecraft/client/gl/GlUsage.mapping @@ -2,4 +2,7 @@ CLASS net/minecraft/class_8555 net/minecraft/client/gl/GlUsage FIELD field_54348 readable Z FIELD field_54349 writable Z METHOD (Ljava/lang/String;IZZ)V - ARG 4 readable + ARG 3 readable + ARG 4 writable + METHOD method_68341 isReadable ()Z + METHOD method_68342 isWritable ()Z diff --git a/mappings/net/minecraft/client/gl/GpuBuffer.mapping b/mappings/net/minecraft/client/gl/GpuBuffer.mapping index 38f5dd22a9..3af5e74de8 100644 --- a/mappings/net/minecraft/client/gl/GpuBuffer.mapping +++ b/mappings/net/minecraft/client/gl/GpuBuffer.mapping @@ -2,7 +2,14 @@ CLASS net/minecraft/class_10227 net/minecraft/client/gl/GpuBuffer FIELD field_54351 size I FIELD field_54353 target Lnet/minecraft/class_10226; FIELD field_54354 usage Lnet/minecraft/class_8555; + METHOD (Lnet/minecraft/class_10226;Lnet/minecraft/class_8555;I)V + ARG 1 target + ARG 2 usage + ARG 3 size + METHOD close close ()V METHOD method_68151 getSize ()I METHOD method_68152 getTarget ()Lnet/minecraft/class_10226; - CLASS class_10858 + METHOD method_68343 getUsage ()Lnet/minecraft/class_8555; + CLASS class_10858 ReadResult + METHOD close close ()V METHOD method_64323 getBuf ()Ljava/nio/ByteBuffer; diff --git a/mappings/net/minecraft/client/gl/LegacyGlFramebufferManager.mapping b/mappings/net/minecraft/client/gl/LegacyGlFramebufferManager.mapping new file mode 100644 index 0000000000..a6858c40e6 --- /dev/null +++ b/mappings/net/minecraft/client/gl/LegacyGlFramebufferManager.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10875 net/minecraft/client/gl/LegacyGlFramebufferManager diff --git a/mappings/net/minecraft/client/gl/RenderBackend.mapping b/mappings/net/minecraft/client/gl/RenderBackend.mapping new file mode 100644 index 0000000000..4d6919b315 --- /dev/null +++ b/mappings/net/minecraft/client/gl/RenderBackend.mapping @@ -0,0 +1,41 @@ +CLASS net/minecraft/class_10882 net/minecraft/client/gl/RenderBackend + METHOD method_68385 createTexture (Ljava/lang/String;Lnet/minecraft/class_10793;III)Lnet/minecraft/class_10792; + ARG 1 label + ARG 2 type + ARG 3 width + ARG 4 height + ARG 5 mipLevels + METHOD method_68386 createBuffer (Ljava/util/function/Supplier;Lnet/minecraft/class_10226;Lnet/minecraft/class_8555;I)Lnet/minecraft/class_10227; + ARG 1 debugLabelSupplier + ARG 2 target + ARG 3 usage + ARG 4 size + METHOD method_68387 createBuffer (Ljava/util/function/Supplier;Lnet/minecraft/class_10226;Lnet/minecraft/class_8555;Ljava/nio/ByteBuffer;)Lnet/minecraft/class_10227; + ARG 1 debugLabelSupplier + ARG 2 target + ARG 3 usage + ARG 4 source + METHOD method_68388 createTexture (Ljava/util/function/Supplier;Lnet/minecraft/class_10793;III)Lnet/minecraft/class_10792; + ARG 1 labelGetter + ARG 2 type + ARG 3 width + ARG 4 height + ARG 5 mipLevels + METHOD method_68389 getResourceManager ()Lnet/minecraft/class_10881; + METHOD method_68390 compileShaderPipelineCached (Lnet/minecraft/class_10785;Ljava/util/function/BiFunction;)Lnet/minecraft/class_10878; + COMMENT Compiles shader pipeline {@code pipeline}, using custom source retriever {@code shaderSourceGetter}. + COMMENT If {@code shaderSourceGetter} is null, this is equivalent to {@link #compileShaderPipelineCached(ShaderPipeline) compileShaderPipelineCached(pipeline)}. + ARG 1 pipeline + ARG 2 shaderSourceGetter + METHOD method_68391 getDebugString ()Ljava/lang/String; + METHOD method_68393 getDebugMessages ()Ljava/util/List; + METHOD method_68394 hasDebug ()Z + METHOD method_68395 getBackendRenderer ()Ljava/lang/String; + METHOD method_68396 getBackendVendor ()Ljava/lang/String; + METHOD method_68397 getBackendName ()Ljava/lang/String; + METHOD method_68398 getBackendVersion ()Ljava/lang/String; + METHOD method_68399 getMaxTexSize ()I + METHOD method_68400 release ()V + METHOD method_68451 compileShaderPipelineCachedNoLabel (Lnet/minecraft/class_10785;)Lnet/minecraft/class_10878; + ARG 1 pipeline + METHOD method_68669 getUsedGlCaps ()Ljava/util/List; diff --git a/mappings/net/minecraft/client/gl/RenderPassImpl.mapping b/mappings/net/minecraft/client/gl/RenderPassImpl.mapping new file mode 100644 index 0000000000..8e361b7de5 --- /dev/null +++ b/mappings/net/minecraft/client/gl/RenderPassImpl.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_10866 net/minecraft/client/gl/RenderPassImpl + FIELD field_57867 isDevelopment Z + FIELD field_57868 pipeline Lnet/minecraft/class_10867; + FIELD field_57869 vertexBuffers [Lnet/minecraft/class_10227; + FIELD field_57870 indexBuffer Lnet/minecraft/class_10227; + FIELD field_57871 indexType Lnet/minecraft/class_293$class_5595; + FIELD field_57872 scissorBox Lnet/minecraft/class_10886; + FIELD field_57873 simpleUniforms Ljava/util/HashMap; + FIELD field_57874 samplerUniforms Ljava/util/HashMap; + FIELD field_57875 setSimpleUniforms Ljava/util/Set; + FIELD field_57876 setSamplers Ljava/util/Set; + FIELD field_57877 resourceManager Lnet/minecraft/class_10860; + FIELD field_57878 hasDepth Z + FIELD field_57879 closed Z + METHOD (Lnet/minecraft/class_10860;Z)V + ARG 1 resourceManager + ARG 2 hasDepth + METHOD method_68407 hasDepth ()Z diff --git a/mappings/net/minecraft/client/gl/ShaderPipeline.mapping b/mappings/net/minecraft/client/gl/ShaderPipeline.mapping index ed206f2914..49f8d29d53 100644 --- a/mappings/net/minecraft/client/gl/ShaderPipeline.mapping +++ b/mappings/net/minecraft/client/gl/ShaderPipeline.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_10785 net/minecraft/client/gl/ShaderPipeline FIELD field_56705 id Lnet/minecraft/class_2960; - FIELD field_56706 vertices Lnet/minecraft/class_2960; - FIELD field_56707 pass Lnet/minecraft/class_2960; + FIELD field_56706 vertexShader Lnet/minecraft/class_2960; + FIELD field_56707 fragmentShader Lnet/minecraft/class_2960; FIELD field_56708 defines Lnet/minecraft/class_10149; FIELD field_56709 samples Ljava/util/List; FIELD field_56710 glUniforms Ljava/util/List; @@ -14,30 +14,53 @@ CLASS net/minecraft/class_10785 net/minecraft/client/gl/ShaderPipeline FIELD field_56717 hasDepth Z FIELD field_56718 format Lnet/minecraft/class_293; FIELD field_56719 drawMode Lnet/minecraft/class_293$class_5596; + FIELD field_57896 polygonMode Lnet/minecraft/class_10880; + FIELD field_57897 polygonOffsetFactor F + FIELD field_57898 polygonOffsetUnits F METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_10149;Ljava/util/List;Ljava/util/List;Ljava/util/Optional;Lnet/minecraft/class_10798;Lnet/minecraft/class_10880;ZZZZLnet/minecraft/class_10879;Lnet/minecraft/class_293;Lnet/minecraft/class_293$class_5596;FF)V ARG 1 id - ARG 2 vertices - ARG 3 pass + ARG 2 vertexShader + ARG 3 fragmentShader ARG 4 defines ARG 5 samples ARG 6 glUniforms ARG 7 blender ARG 8 depthTest + ARG 9 polygonMode + ARG 10 hasCulling + ARG 11 hasColor + ARG 12 hasAlpha + ARG 13 hasDepth + ARG 14 colorLogic + ARG 15 format + ARG 16 drawMode + ARG 17 polygonOffsetFactor + ARG 18 polygonOffsetUnits METHOD method_67729 builder ([Lnet/minecraft/class_10785$class_10787;)Lnet/minecraft/class_10785$class_10786; ARG 0 stages METHOD method_67732 getId ()Lnet/minecraft/class_2960; METHOD method_67733 hasCulling ()Z METHOD method_67734 getFormat ()Lnet/minecraft/class_293; METHOD method_67735 getDrawMode ()Lnet/minecraft/class_293$class_5596; - METHOD method_67736 getVertices ()Lnet/minecraft/class_2960; - METHOD method_67737 getPass ()Lnet/minecraft/class_2960; + METHOD method_67736 getVertexShader ()Lnet/minecraft/class_2960; + METHOD method_67737 getFragmentShader ()Lnet/minecraft/class_2960; METHOD method_67738 getDefines ()Lnet/minecraft/class_10149; METHOD method_67739 getSamples ()Ljava/util/List; METHOD method_67740 getGlUniforms ()Ljava/util/List; + METHOD method_68433 depthTestState ()Lnet/minecraft/class_10798; + METHOD method_68434 polygonMode ()Lnet/minecraft/class_10880; + METHOD method_68435 getColorLogic ()Lnet/minecraft/class_10879; + METHOD method_68436 getBlender ()Ljava/util/Optional; + METHOD method_68437 hasColor ()Z + METHOD method_68438 hasAlpha ()Z + METHOD method_68439 hasDepth ()Z + METHOD method_68440 polygonOffsetFactor ()F + METHOD method_68441 polygonOffsetUnits ()F + METHOD method_68442 needsDepthBuffer ()Z CLASS class_10786 Builder FIELD field_56722 id Ljava/util/Optional; - FIELD field_56723 pass Ljava/util/Optional; - FIELD field_56724 vertices Ljava/util/Optional; + FIELD field_56723 fragmentShader Ljava/util/Optional; + FIELD field_56724 vertexShader Ljava/util/Optional; FIELD field_56725 defines Ljava/util/Optional; FIELD field_56726 samples Ljava/util/Optional; FIELD field_56727 glUniforms Ljava/util/Optional; @@ -50,6 +73,9 @@ CLASS net/minecraft/class_10785 net/minecraft/client/gl/ShaderPipeline FIELD field_56734 blender Ljava/util/Optional; FIELD field_56735 format Ljava/util/Optional; FIELD field_56736 drawMode Ljava/util/Optional; + FIELD field_57899 polygonMode Ljava/util/Optional; + FIELD field_57900 polygonOffsetFactor F + FIELD field_57901 polygonOffsetUnits F METHOD method_67741 noBlender ()Lnet/minecraft/class_10785$class_10786; METHOD method_67742 id (Lnet/minecraft/class_2960;)Lnet/minecraft/class_10785$class_10786; ARG 1 id @@ -102,5 +128,10 @@ CLASS net/minecraft/class_10785 net/minecraft/client/gl/ShaderPipeline ARG 1 flag METHOD method_67765 samples (Ljava/lang/String;)Lnet/minecraft/class_10785$class_10786; ARG 1 name + METHOD method_68443 polygonOffset (FF)Lnet/minecraft/class_10785$class_10786; + ARG 1 factor + ARG 2 units + METHOD method_68444 polygonMode (Lnet/minecraft/class_10880;)Lnet/minecraft/class_10785$class_10786; + ARG 1 mode CLASS class_10787 Stage CLASS class_10788 Uniform diff --git a/mappings/net/minecraft/client/gl/ShaderProgram.mapping b/mappings/net/minecraft/client/gl/ShaderProgram.mapping index 59f0628a0c..37f429aab9 100644 --- a/mappings/net/minecraft/client/gl/ShaderProgram.mapping +++ b/mappings/net/minecraft/client/gl/ShaderProgram.mapping @@ -31,9 +31,11 @@ CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram FIELD field_53839 samplerTextures Lit/unimi/dsi/fastutil/objects/Object2ObjectMap; FIELD field_53840 samplerLocations Lit/unimi/dsi/fastutil/ints/IntList; FIELD field_53841 uniformsByName Ljava/util/Map; + FIELD field_57863 PREDEFINED_UNIFORMS Ljava/util/Set; + FIELD field_57865 debugLabel Ljava/lang/String; METHOD (ILjava/lang/String;)V ARG 1 glRef - ARG 2 name + ARG 2 label METHOD method_1270 getGlRef ()I METHOD method_34582 getUniform (Ljava/lang/String;)Lnet/minecraft/class_284; ARG 1 name @@ -57,3 +59,6 @@ CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram ARG 2 samplers METHOD method_67880 createUniform (Lnet/minecraft/class_10785$class_10788;)Lnet/minecraft/class_284; ARG 1 uniform + METHOD method_68404 debugLabel ()Ljava/lang/String; + METHOD method_68405 samplerLocations ()Lit/unimi/dsi/fastutil/ints/IntList; + METHOD method_68406 uniforms ()Ljava/util/List; diff --git a/mappings/net/minecraft/client/gl/Uniform.mapping b/mappings/net/minecraft/client/gl/Uniform.mapping index 5496082271..d76fe0bada 100644 --- a/mappings/net/minecraft/client/gl/Uniform.mapping +++ b/mappings/net/minecraft/client/gl/Uniform.mapping @@ -37,3 +37,5 @@ CLASS net/minecraft/class_278 net/minecraft/client/gl/Uniform ARG 2 value2 ARG 3 value3 ARG 4 value4 + METHOD method_68344 set ([I)V + ARG 1 values diff --git a/mappings/net/minecraft/client/gl/UniformContainer.mapping b/mappings/net/minecraft/client/gl/UniformContainer.mapping new file mode 100644 index 0000000000..b17b68c966 --- /dev/null +++ b/mappings/net/minecraft/client/gl/UniformContainer.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_10878 net/minecraft/client/gl/UniformContainer + METHOD method_68421 isValid ()Z + METHOD method_68422 hasUniform (Ljava/lang/String;)Z + ARG 1 name diff --git a/mappings/net/minecraft/client/gl/UniformType.mapping b/mappings/net/minecraft/client/gl/UniformType.mapping index 2245bd802f..04791ae9e9 100644 --- a/mappings/net/minecraft/client/gl/UniformType.mapping +++ b/mappings/net/minecraft/client/gl/UniformType.mapping @@ -6,3 +6,4 @@ CLASS net/minecraft/class_10789 net/minecraft/client/gl/UniformType ARG 3 size ARG 4 name METHOD method_67771 isIntegerData ()Z + METHOD method_68449 size ()I diff --git a/mappings/net/minecraft/client/render/ColorLogic.mapping b/mappings/net/minecraft/client/render/ColorLogic.mapping new file mode 100644 index 0000000000..96649191ba --- /dev/null +++ b/mappings/net/minecraft/client/render/ColorLogic.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10879 net/minecraft/client/render/ColorLogic diff --git a/mappings/net/minecraft/client/render/FramePass.mapping b/mappings/net/minecraft/client/render/FramePass.mapping new file mode 100644 index 0000000000..ff5dafb192 --- /dev/null +++ b/mappings/net/minecraft/client/render/FramePass.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_9916 net/minecraft/client/render/FramePass + METHOD method_61924 markToBeVisited ()V + METHOD method_61927 addRequired (Lnet/minecraft/class_9916;)V + ARG 1 pass + METHOD method_61928 dependsOn (Lnet/minecraft/class_9925;)V + ARG 1 handle + METHOD method_61929 setRenderer (Ljava/lang/Runnable;)V + ARG 1 renderer + METHOD method_61930 addRequiredResource (Ljava/lang/String;Lnet/minecraft/class_9924;)Lnet/minecraft/class_9925; + ARG 1 name + ARG 2 factory + METHOD method_61933 transfer (Lnet/minecraft/class_9925;)Lnet/minecraft/class_9925; + ARG 1 handle diff --git a/mappings/net/minecraft/client/render/PolygonMode.mapping b/mappings/net/minecraft/client/render/PolygonMode.mapping new file mode 100644 index 0000000000..38eb9fba86 --- /dev/null +++ b/mappings/net/minecraft/client/render/PolygonMode.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10880 net/minecraft/client/render/PolygonMode diff --git a/mappings/net/minecraft/client/render/RenderPass.mapping b/mappings/net/minecraft/client/render/RenderPass.mapping index cdca4e6498..cf32996c13 100644 --- a/mappings/net/minecraft/client/render/RenderPass.mapping +++ b/mappings/net/minecraft/client/render/RenderPass.mapping @@ -1,13 +1,49 @@ -CLASS net/minecraft/class_9916 net/minecraft/client/render/RenderPass - METHOD method_61924 markToBeVisited ()V - METHOD method_61927 addRequired (Lnet/minecraft/class_9916;)V - ARG 1 pass - METHOD method_61928 dependsOn (Lnet/minecraft/class_9925;)V - ARG 1 handle - METHOD method_61929 setRenderer (Ljava/lang/Runnable;)V - ARG 1 renderer - METHOD method_61930 addRequiredResource (Ljava/lang/String;Lnet/minecraft/class_9924;)Lnet/minecraft/class_9925; - ARG 1 name - ARG 2 factory - METHOD method_61933 transfer (Lnet/minecraft/class_9925;)Lnet/minecraft/class_9925; - ARG 1 handle +CLASS net/minecraft/class_10883 net/minecraft/client/render/RenderPass + METHOD method_68408 drawObjects (II)V + ARG 1 offset + ARG 2 count + METHOD method_68409 setScissor (IIII)V + ARG 1 x + ARG 2 y + ARG 3 w + ARG 4 h + METHOD method_68410 setVertexBuffer (ILnet/minecraft/class_10227;)V + ARG 1 index + ARG 2 buffer + METHOD method_68411 setIndexBuffer (Lnet/minecraft/class_10227;Lnet/minecraft/class_293$class_5595;)V + ARG 1 indexBuffer + ARG 2 indexType + METHOD method_68412 bindShader (Lnet/minecraft/class_10785;)V + ARG 1 pipeline + METHOD method_68413 applyScissor (Lnet/minecraft/class_10886;)V + ARG 1 from + METHOD method_68414 setSamplerUniform (Ljava/lang/String;Lnet/minecraft/class_10792;)V + ARG 1 name + ARG 2 tex + METHOD method_68415 setMat4fUniform (Ljava/lang/String;Lorg/joml/Matrix4f;)V + ARG 1 name + ARG 2 mat + METHOD method_68416 setFloatUniform (Ljava/lang/String;[F)V + ARG 1 name + ARG 2 values + METHOD method_68417 setIntUniform (Ljava/lang/String;[I)V + ARG 1 name + ARG 2 values + METHOD method_68418 drawObjects (Ljava/util/Collection;)V + ARG 1 objects + METHOD method_68419 stopScissor ()V + METHOD method_68420 drawObjectsNoIndex (II)V + ARG 1 offset + ARG 2 count + CLASS class_10884 BakedObject + METHOD (ILnet/minecraft/class_10227;Lnet/minecraft/class_10227;Lnet/minecraft/class_293$class_5595;II)V + ARG 1 slot + ARG 2 vertexBuffer + ARG 3 indexBuffer + ARG 4 indexType + ARG 5 firstIndex + ARG 6 indexCount + CLASS class_10885 UniformUploader + METHOD upload upload (Ljava/lang/String;[F)V + ARG 1 uniform + ARG 2 values diff --git a/mappings/net/minecraft/client/render/RenderResourceManager.mapping b/mappings/net/minecraft/client/render/RenderResourceManager.mapping new file mode 100644 index 0000000000..751c4ad857 --- /dev/null +++ b/mappings/net/minecraft/client/render/RenderResourceManager.mapping @@ -0,0 +1,78 @@ +CLASS net/minecraft/class_10881 net/minecraft/client/render/RenderResourceManager + METHOD method_68347 readBufferFully (Lnet/minecraft/class_10227;)Lnet/minecraft/class_10227$class_10858; + ARG 1 source + METHOD method_68348 clearAndResizeBuffer (Lnet/minecraft/class_10227;I)V + ARG 1 target + ARG 2 size + METHOD method_68349 readBuffer (Lnet/minecraft/class_10227;II)Lnet/minecraft/class_10227$class_10858; + ARG 1 source + ARG 2 offset + ARG 3 count + METHOD method_68350 copyDataInto (Lnet/minecraft/class_10227;Ljava/nio/ByteBuffer;I)V + ARG 1 target + ARG 2 source + ARG 3 offset + METHOD method_68359 clearTexture (Lnet/minecraft/class_10792;I)V + ARG 1 texture + ARG 2 clearColor + METHOD method_68360 clearFramebuffer (Lnet/minecraft/class_10792;ILnet/minecraft/class_10792;D)V + ARG 1 colorAttachment + ARG 2 clearColor + ARG 3 depthAttachment + ARG 4 clearDepth + METHOD method_68361 setImageBufferFull (Lnet/minecraft/class_10792;Lnet/minecraft/class_10227;ILjava/lang/Runnable;I)V + ARG 1 target + ARG 2 source + ARG 3 offset + ARG 4 dataUploadedCallback + ARG 5 mipLevel + METHOD method_68362 setImageRegionBuffer (Lnet/minecraft/class_10792;Lnet/minecraft/class_10227;ILjava/lang/Runnable;IIIII)V + ARG 1 target + ARG 2 source + ARG 3 offset + ARG 4 dataUploadedCallback + ARG 5 mipLevel + ARG 6 intoX + ARG 7 intoY + ARG 8 width + ARG 9 height + METHOD method_68363 copyImageFull (Lnet/minecraft/class_10792;Lnet/minecraft/class_1011;)V + ARG 1 target + ARG 2 source + METHOD method_68364 copyImageRegion (Lnet/minecraft/class_10792;Lnet/minecraft/class_1011;IIIIIII)V + ARG 1 target + ARG 2 source + ARG 3 mipLevel + ARG 4 intoX + ARG 5 intoY + ARG 6 width + ARG 7 height + ARG 8 x + ARG 9 y + METHOD method_68365 copyImageRegion (Lnet/minecraft/class_10792;Lnet/minecraft/class_10792;IIIIIII)V + ARG 1 target + ARG 2 source + ARG 3 mipLevel + ARG 4 intoX + ARG 5 intoY + ARG 6 sourceX + ARG 7 sourceY + ARG 8 width + ARG 9 height + METHOD method_68366 setImageRegionData (Lnet/minecraft/class_10792;Ljava/nio/IntBuffer;Lnet/minecraft/class_1011$class_1012;IIIII)V + ARG 1 target + ARG 2 source + ARG 3 format + ARG 4 mipLevel + ARG 5 intoX + ARG 6 intoY + ARG 7 width + ARG 8 height + METHOD method_68367 newRenderPassNoDepth (Lnet/minecraft/class_10792;Ljava/util/OptionalInt;)Lnet/minecraft/class_10883; + ARG 1 color + ARG 2 clearColor + METHOD method_68368 newRenderPass (Lnet/minecraft/class_10792;Ljava/util/OptionalInt;Lnet/minecraft/class_10792;Ljava/util/OptionalDouble;)Lnet/minecraft/class_10883; + ARG 1 colorAttachment + ARG 2 clearColor + ARG 3 depthAttachment + ARG 4 clearDepth diff --git a/mappings/net/minecraft/client/render/ScissorBox.mapping b/mappings/net/minecraft/client/render/ScissorBox.mapping new file mode 100644 index 0000000000..bda666f0f7 --- /dev/null +++ b/mappings/net/minecraft/client/render/ScissorBox.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_10886 net/minecraft/client/render/ScissorBox + FIELD field_57910 active Z + FIELD field_57911 x I + FIELD field_57912 y I + FIELD field_57913 width I + FIELD field_57914 height I + METHOD method_68452 deactivate ()V + METHOD method_68453 activateAndSet (IIII)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + METHOD method_68454 copyFrom (Lnet/minecraft/class_10886;)V + ARG 1 from + METHOD method_68455 isActive ()Z + METHOD method_68456 getX ()I + METHOD method_68457 getY ()I + METHOD method_68458 getWidth ()I + METHOD method_68459 getHeight ()I diff --git a/mappings/net/minecraft/client/texture/GlTexture.mapping b/mappings/net/minecraft/client/texture/GlTexture.mapping new file mode 100644 index 0000000000..d6ee224f25 --- /dev/null +++ b/mappings/net/minecraft/client/texture/GlTexture.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_10868 net/minecraft/client/texture/GlTexture + FIELD field_57882 glId I + FIELD field_57883 closed Z + FIELD field_57884 needsReinit Z + FIELD field_57885 depthTexToFramebufferIdCache Lit/unimi/dsi/fastutil/ints/Int2IntMap; + METHOD (Ljava/lang/String;Lnet/minecraft/class_10793;IIII)V + ARG 1 name + ARG 2 type + ARG 3 width + ARG 4 height + ARG 5 mipLevels + ARG 6 glId + METHOD method_68424 checkDirty ()V + METHOD method_68425 (Lnet/minecraft/class_10874;II)I + ARG 3 unused + METHOD method_68426 getOrCreateFramebuffer (Lnet/minecraft/class_10874;Lnet/minecraft/class_10792;)I + COMMENT Gets or creates a framebuffer, which has {@code this} texture as color attachment, and {@code depthTexture} as depth attachment (or texture '0' if null). + COMMENT The framebuffers created by this method are closed automatically when {@link #close()} is called. + ARG 1 fbManager + ARG 2 depthTexture + METHOD method_68427 getGlId ()I