Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

25w10a render #4146

Merged
merged 7 commits into from
Mar 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions mappings/com/mojang/blaze3d/platform/GlConst.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
CLASS com/mojang/blaze3d/platform/GlConst
METHOD toGl (Lnet/minecraft/class_1011$class_1012;)I
ARG 0 format
METHOD toGl (Lnet/minecraft/class_10226;)I
ARG 0 target
METHOD toGl (Lnet/minecraft/class_10790;)I
ARG 0 mode
METHOD toGl (Lnet/minecraft/class_10798;)I
ARG 0 state
METHOD toGl (Lnet/minecraft/class_10880;)I
ARG 0 mode
METHOD toGl (Lnet/minecraft/class_282;)I
ARG 0 type
METHOD toGl (Lnet/minecraft/class_293$class_5595;)I
ARG 0 type
METHOD toGl (Lnet/minecraft/class_293$class_5596;)I
ARG 0 drawMode
METHOD toGl (Lnet/minecraft/class_296$class_297;)I
ARG 0 type
METHOD toGl (Lnet/minecraft/class_8555;)I
ARG 0 usage
METHOD toGlExternalId (Lnet/minecraft/class_10793;)I
ARG 0 type
METHOD toGlInternalId (Lnet/minecraft/class_10793;)I
ARG 0 type
METHOD toGlType (Lnet/minecraft/class_10793;)I
ARG 0 type
20 changes: 20 additions & 0 deletions mappings/com/mojang/blaze3d/platform/GlStateManager.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
ARG 0 func
METHOD _depthMask (Z)V
ARG 0 mask
METHOD _drawArrays (III)V
ARG 0 mode
ARG 1 first
ARG 2 count
METHOD _drawElements (IIIJ)V
ARG 0 mode
ARG 1 count
Expand Down Expand Up @@ -67,6 +71,10 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
ARG 0 target
ARG 1 data
ARG 2 usage
METHOD _glBufferSubData (IILjava/nio/ByteBuffer;)V
ARG 0 target
ARG 1 offset
ARG 2 data
METHOD _glClientWaitSync (JIJ)I
ARG 0 sync
ARG 2 flags
Expand Down Expand Up @@ -117,6 +125,7 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
ARG 1 value
METHOD _glUniformMatrix4 (ILjava/nio/FloatBuffer;)V
ARG 0 location
ARG 1 value
METHOD _glUnmapBuffer (I)V
ARG 0 target
METHOD _glUseProgram (I)V
Expand Down Expand Up @@ -169,6 +178,16 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
ARG 6 format
ARG 7 type
ARG 8 pixels
METHOD _texSubImage2D (IIIIIIIILjava/nio/IntBuffer;)V
ARG 0 target
ARG 1 level
ARG 2 offsetX
ARG 3 offsetY
ARG 4 width
ARG 5 height
ARG 6 format
ARG 7 type
ARG 8 pixels
METHOD _vertexAttribIPointer (IIIIJ)V
ARG 0 index
ARG 1 size
Expand Down Expand Up @@ -221,6 +240,7 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
ARG 0 program
METHOD glShaderSource (ILjava/lang/String;)V
ARG 0 shader
ARG 1 source
CLASS class_1017 BlendFuncState
FIELD field_5045 capState Lcom/mojang/blaze3d/platform/GlStateManager$class_1018;
FIELD field_5046 dstFactorAlpha I
Expand Down
16 changes: 15 additions & 1 deletion mappings/com/mojang/blaze3d/systems/RenderSystem.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
METHOD initRenderer (JIZLjava/util/function/BiFunction;Z)V
ARG 0 windowHandle
ARG 2 debugVerbosity
ARG 3 sync
ARG 4 shaderSourceGetter
ARG 5 renderDebugLabels
METHOD lambda$static$0 (Lit/unimi/dsi/fastutil/ints/IntConsumer;I)V
ARG 0 indexConsumer
Expand All @@ -27,6 +29,8 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
ARG 0 fps
METHOD lineWidth (F)V
ARG 0 width
METHOD queueFencedTask (Ljava/lang/Runnable;)V
ARG 0 task
METHOD setErrorCallback (Lorg/lwjgl/glfw/GLFWErrorCallbackI;)V
ARG 0 callback
METHOD setProjectionMatrix (Lorg/joml/Matrix4f;Lnet/minecraft/class_10366;)V
Expand All @@ -37,13 +41,22 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
ARG 1 green
ARG 2 blue
ARG 3 alpha
METHOD setShaderFog (Lnet/minecraft/class_9958;)V
ARG 0 shaderFog
METHOD setShaderGameTime (JF)V
ARG 0 time
ARG 2 tickProgress
METHOD setShaderGlintAlpha (D)V
ARG 0 shaderGlintAlpha
METHOD setShaderGlintAlpha (F)V
ARG 0 shaderGlintAlpha
METHOD setShaderTexture (ILnet/minecraft/class_10792;)V
ARG 0 texture
ARG 0 textureId
ARG 1 texture
METHOD setTextureMatrix (Lorg/joml/Matrix4f;)V
ARG 0 textureMatrix
METHOD setupOverlayColor (Lnet/minecraft/class_10792;)V
ARG 0 texture
CLASS class_10827 Task
CLASS class_5590 ShapeIndexBuffer
COMMENT An index buffer that holds a pre-made indices for a specific shape. If
Expand Down Expand Up @@ -73,6 +86,7 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
METHOD method_43409 isLargeEnough (I)Z
ARG 1 requiredSize
METHOD method_68274 getIndexBuffer (I)Lnet/minecraft/class_10227;
ARG 1 requiredSize
CLASS class_5591 Triangulator
COMMENT A functional interface that decomposes a shape into triangles.
COMMENT
Expand Down
5 changes: 4 additions & 1 deletion mappings/net/minecraft/client/MinecraftClient.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
FIELD field_1735 fpsCounter I
FIELD field_1738 currentFps I
FIELD field_1739 networkProxy Ljava/net/Proxy;
FIELD field_1740 DEFAULT_FONT_ID Lnet/minecraft/class_2960;
FIELD field_17404 renderTaskQueue Ljava/util/Queue;
FIELD field_17405 worldGenProgressTracker Ljava/util/concurrent/atomic/AtomicReference;
FIELD field_1740 DEFAULT_FONT_ID Lnet/minecraft/class_2960;
FIELD field_1742 itemRenderer Lnet/minecraft/class_918;
FIELD field_1743 skipGameRender Z
FIELD field_1745 resourceManager Lnet/minecraft/class_3304;
Expand Down Expand Up @@ -517,6 +517,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
METHOD method_64035 (Lnet/minecraft/class_6880$class_6883;)V
ARG 0 item
METHOD method_65386 getItemModelManager ()Lnet/minecraft/class_10442;
METHOD method_68467 (Lnet/minecraft/class_2960;Lnet/minecraft/class_282;)Ljava/lang/String;
ARG 1 id
ARG 2 type
CLASS 1
FIELD field_52756 closed Z
CLASS class_5859 ChatRestriction
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ CLASS net/minecraft/class_4910 net/minecraft/client/data/BlockStateModelGenerato
ARG 5 powered
METHOD method_67820 (Lnet/minecraft/class_807;Lnet/minecraft/class_807;Ljava/lang/Boolean;)Lnet/minecraft/class_807;
ARG 2 bloom
METHOD method_67822 createModel (Lnet/minecraft/class_813;)Lnet/minecraft/class_807;
METHOD method_67822 createWeightedVariant (Lnet/minecraft/class_813;)Lnet/minecraft/class_807;
ARG 0 variant
METHOD method_67823 modelWithMirroring (Lnet/minecraft/class_813;Lnet/minecraft/class_813;)Lnet/minecraft/class_807;
ARG 0 variant
Expand All @@ -639,10 +639,10 @@ CLASS net/minecraft/class_4910 net/minecraft/client/data/BlockStateModelGenerato
ARG 1 charges
METHOD method_67832 or ([Lnet/minecraft/class_10795;)Lnet/minecraft/class_815;
ARG 0 conditionBuilders
METHOD method_67833 createModel ([Lnet/minecraft/class_813;)Lnet/minecraft/class_807;
METHOD method_67833 createWeightedVariant ([Lnet/minecraft/class_813;)Lnet/minecraft/class_807;
ARG 0 variants
METHOD method_67834 createMultipartConditionBuilder ()Lnet/minecraft/class_10795;
METHOD method_67835 createModel (Lnet/minecraft/class_2960;)Lnet/minecraft/class_807;
METHOD method_67835 createWeightedVariant (Lnet/minecraft/class_2960;)Lnet/minecraft/class_807;
ARG 0 id
METHOD method_67836 (Lnet/minecraft/class_10795;Lnet/minecraft/class_2769;Lnet/minecraft/class_10804;)V
ARG 1 property
Expand All @@ -659,6 +659,8 @@ CLASS net/minecraft/class_4910 net/minecraft/client/data/BlockStateModelGenerato
ARG 0 textureMap
METHOD method_67843 (Lnet/minecraft/class_4944;)V
ARG 0 textureMap
METHOD method_68470 (Lnet/minecraft/class_813;)Lnet/minecraft/class_6010;
ARG 0 variant
CLASS class_4912 BlockTexturePool
FIELD field_22837 textures Lnet/minecraft/class_4944;
FIELD field_22838 baseModelId Lnet/minecraft/class_813;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ CLASS net/minecraft/class_4922 net/minecraft/client/data/MultipartBlockModelDefi
ARG 1 part
METHOD method_67851 validate (Lnet/minecraft/class_815;)V
ARG 1 selector
CLASS class_10887 Part
METHOD method_68472 toComponent ()Lnet/minecraft/class_819;
6 changes: 3 additions & 3 deletions mappings/net/minecraft/client/gl/BufferManager.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ 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
METHOD method_68429 create (Lorg/lwjgl/opengl/GLCapabilities;Lnet/minecraft/class_10861;Ljava/util/Set;)Lnet/minecraft/class_10869;
ARG 0 capabilities
ARG 1 labeler
ARG 2 usedCaps
ARG 2 usedCapabilities
CLASS class_10870 DefaultBufferManager
FIELD field_57889 cache Ljava/util/Map;
FIELD field_57890 labeler Lnet/minecraft/class_10861;
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/gl/ColorLogic.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/class_10879 net/minecraft/client/gl/ColorLogic
12 changes: 6 additions & 6 deletions mappings/net/minecraft/client/gl/DebugLabelManager.mapping
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
CLASS net/minecraft/class_10861 net/minecraft/client/gl/DebugLabelManager
FIELD field_57851 LOGGER Lorg/slf4j/Logger;
METHOD method_68370 debugLabelsAvailable ()Z
METHOD method_68370 isUsable ()Z
METHOD method_68371 labelGlGpuBuffer (Lnet/minecraft/class_10859;)V
ARG 1 buf
ARG 1 buffer
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
ARG 1 texture
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
METHOD method_68376 create (Lorg/lwjgl/opengl/GLCapabilities;ZLjava/util/Set;)Lnet/minecraft/class_10861;
ARG 0 capabilities
ARG 1 debugEnabled
ARG 2 usedCaps
ARG 2 usedCapabilities
CLASS class_10862 KHRDebugLabelManager
FIELD field_57852 maxLabelLength I
CLASS class_10863 NoOpDebugLabelManager
Expand Down
5 changes: 3 additions & 2 deletions mappings/net/minecraft/client/gl/Framebuffer.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@ CLASS net/minecraft/class_276 net/minecraft/client/gl/Framebuffer
METHOD method_1234 resize (II)V
ARG 1 width
ARG 2 height
METHOD method_1237 draw ()V
METHOD method_1237 blitToScreen ()V
METHOD method_1238 delete ()V
METHOD method_1242 endRead ()V
METHOD method_29329 copyDepthFrom (Lnet/minecraft/class_276;)V
ARG 1 framebuffer
METHOD method_30277 getColorAttachment ()Lnet/minecraft/class_10792;
METHOD method_30278 getDepthAttachment ()Lnet/minecraft/class_10792;
METHOD method_58226 setTexFilter (Lnet/minecraft/class_10791;)V
ARG 1 filter
METHOD method_68445 draw (Lnet/minecraft/class_10792;)V
METHOD method_68445 blitToTexture (Lnet/minecraft/class_10792;)V
ARG 1 texture
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CLASS net/minecraft/class_10874 net/minecraft/client/gl/FramebufferManager
METHOD method_68431 makeFramebuffer ()I
METHOD method_68431 createFramebuffer ()I
METHOD method_68432 setupFramebuffer (IIIIZ)V
ARG 1 framebuffer
ARG 2 colorAttachment
Expand Down
31 changes: 17 additions & 14 deletions mappings/net/minecraft/client/gl/GlBackend.mapping
Original file line number Diff line number Diff line change
@@ -1,34 +1,37 @@
CLASS net/minecraft/class_10865 net/minecraft/client/gl/GlBackend
FIELD field_57853 LOG Lorg/slf4j/Logger;
FIELD field_57853 LOGGER 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_57857 maxTextureSize I
FIELD field_57858 framebufferManager 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_57860 pipelineCompileCache Ljava/util/Map;
FIELD field_57861 shaderCompileCache 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;
FIELD field_58035 allowGlArbVABinding Z
FIELD field_58036 allowGlKhrDebug Z
FIELD field_58037 allowExtDebugLabel Z
FIELD field_58038 allowGlArbDebugOutput Z
FIELD field_58039 allowGlArbDirectAccess Z
FIELD field_58040 usedGlCapabilities Ljava/util/Set;
METHOD <init> (JIZLjava/util/function/BiFunction;Z)V
ARG 1 contextId
ARG 3 debugVerbosity
ARG 4 sync
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 1 id
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 1 key
ARG 2 sourceRetriever
METHOD method_68380 (Lnet/minecraft/class_10865$class_10154;Ljava/util/function/BiFunction;Lnet/minecraft/class_10865$class_10154;)Lnet/minecraft/class_10141;
ARG 3 key
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;
Expand All @@ -40,5 +43,5 @@ CLASS net/minecraft/class_10865 net/minecraft/client/gl/GlBackend
ARG 2 shaderSourceGetter
METHOD method_68401 getFramebufferManager ()Lnet/minecraft/class_10874;
METHOD method_68402 getBufferManager ()Lnet/minecraft/class_10869;
METHOD method_68403 determineMaxTexSize ()I
METHOD method_68403 determineMaxTextureSize ()I
CLASS class_10154 ShaderKey
10 changes: 8 additions & 2 deletions mappings/net/minecraft/client/gl/GlDebug.mapping
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
CLASS net/minecraft/class_1008 net/minecraft/client/gl/GlDebug
FIELD field_33669 DEBUG_MESSAGE_QUEUE_SIZE I
FIELD field_33670 DEBUG_MESSAGES Ljava/util/Queue;
FIELD field_33670 debugMessages Ljava/util/Queue;
FIELD field_33671 lastDebugMessage Lnet/minecraft/class_1008$class_6359;
FIELD field_4915 KHR_VERBOSITY_LEVELS Ljava/util/List;
FIELD field_4919 ARB_VERBOSITY_LEVELS Ljava/util/List;
FIELD field_4921 LOGGER Lorg/slf4j/Logger;
METHOD method_36478 collectDebugMessages ()Ljava/util/List;
METHOD method_4222 getSource (I)Ljava/lang/String;
ARG 0 opcode
METHOD method_4224 info (IIIIIJJ)V
METHOD method_4224 onDebugMessage (IIIIIJJ)V
ARG 1 source
ARG 2 type
ARG 3 id
ARG 4 severity
ARG 5 length
ARG 6 message
METHOD method_4225 unknown (I)Ljava/lang/String;
ARG 0 opcode
METHOD method_4226 getSeverity (I)Ljava/lang/String;
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gl/GlGpuBuffer.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CLASS net/minecraft/class_10859 net/minecraft/client/gl/GlGpuBuffer
FIELD field_57841 debugLabelSupplier Ljava/util/function/Supplier;
FIELD field_57842 id I
METHOD <init> (Lnet/minecraft/class_10861;Ljava/util/function/Supplier;Lnet/minecraft/class_10226;Lnet/minecraft/class_8555;II)V
ARG 1 debugLabelMgr
ARG 1 debugLabeler
ARG 2 debugLabelSupplier
ARG 3 target
ARG 4 usage
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gl/GlResourceManager.mapping
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CLASS net/minecraft/class_10860 net/minecraft/client/gl/GlResourceManager
FIELD field_57843 LOG Lorg/slf4j/Logger;
FIELD field_57843 LOGGER Lorg/slf4j/Logger;
FIELD field_57844 backend Lnet/minecraft/class_10865;
FIELD field_57845 temporaryFb1 I
FIELD field_57846 temporaryFb2 I
Expand Down
5 changes: 4 additions & 1 deletion mappings/net/minecraft/client/gl/PostEffectPass.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@ CLASS net/minecraft/class_283 net/minecraft/client/gl/PostEffectPass
FIELD field_56811 shaderLayer Lnet/minecraft/class_10785;
METHOD <init> (Lnet/minecraft/class_10785;Lnet/minecraft/class_2960;Ljava/util/List;)V
ARG 1 shaderLayer
ARG 2 outputTargetId
ARG 3 uniforms
METHOD method_62255 render (Lnet/minecraft/class_9909;Ljava/util/Map;Lorg/joml/Matrix4f;Ljava/util/function/Consumer;)V
ARG 1 builder
ARG 2 handles
ARG 3 viewMatrix
ARG 4 additionalUniformsSetter
METHOD method_62256 (Lnet/minecraft/class_9916;Lnet/minecraft/class_2960;Lnet/minecraft/class_9925;)Lnet/minecraft/class_9925;
ARG 1 id
ARG 2 handle
Expand All @@ -20,7 +23,7 @@ CLASS net/minecraft/class_283 net/minecraft/client/gl/PostEffectPass
ARG 1 pass
ARG 2 internalTargets
METHOD method_62260 bind (Lnet/minecraft/class_10883;Ljava/util/Map;)V
ARG 1 program
ARG 1 pass
ARG 2 internalTargets
METHOD method_62261 postRender (Ljava/util/Map;)V
ARG 1 internalTargets
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ CLASS net/minecraft/class_9962 net/minecraft/client/gl/PostEffectPipeline
METHOD method_62254 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_68482 apply (Lnet/minecraft/class_10883;)V
ARG 1 pass
Loading