From 4e990c95f0d628cc67a4fe228920bd0bb97d4a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=ADSollace?= Date: Thu, 1 Apr 2021 22:15:44 +0200 Subject: [PATCH] Yeet the unobfuscated methods from GlStateManager (#2247) --- .../blaze3d/platform/GlStateManager.mapping | 183 ++++++++---------- .../blaze3d/systems/RenderSystem.mapping | 4 + 2 files changed, 87 insertions(+), 100 deletions(-) diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index 6b0f112f1a..ff2faf08cd 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -1,95 +1,77 @@ CLASS com/mojang/blaze3d/platform/GlStateManager - FIELD SCISSOR SCISSOR_TEST Lcom/mojang/blaze3d/platform/GlStateManager$class_5518; - METHOD _activeTexture activeTexture (I)V + METHOD _activeTexture (I)V ARG 0 texture - METHOD _bindTexture bindTexture (I)V + METHOD _bindTexture (I)V ARG 0 texture - METHOD _blendEquation blendEquation (I)V + METHOD _blendEquation (I)V ARG 0 mode - METHOD _blendFunc blendFunc (II)V + METHOD _blendFunc (II)V ARG 0 srcFactor ARG 1 dstFactor - METHOD _blendFuncSeparate blendFuncSeparate (IIII)V + METHOD _blendFuncSeparate (IIII)V ARG 0 srcFactorRGB ARG 1 dstFactorRGB ARG 2 srcFactorAlpha ARG 3 dstFactorAlpha - METHOD _clear clear (IZ)V + METHOD _clear (IZ)V ARG 0 mask ARG 1 getError - METHOD _clearColor clearColor (FFFF)V + METHOD _clearColor (FFFF)V ARG 0 red ARG 1 green ARG 2 blue ARG 3 alpha - METHOD _clearDepth clearDepth (D)V + METHOD _clearDepth (D)V ARG 0 depth - METHOD _clearStencil clearStencil (I)V + METHOD _clearStencil (I)V ARG 0 stencil - METHOD _colorMask colorMask (ZZZZ)V + METHOD _colorMask (ZZZZ)V ARG 0 red ARG 1 green ARG 2 blue ARG 3 alpha - METHOD _deleteTexture deleteTexture (I)V + METHOD _deleteTexture (I)V ARG 0 texture - METHOD _deleteTextures deleteTextures ([I)V - METHOD _depthFunc depthFunc (I)V + METHOD _depthFunc (I)V ARG 0 func - METHOD _depthMask depthMask (Z)V + METHOD _depthMask (Z)V ARG 0 mask - METHOD _disableBlend disableBlend ()V - METHOD _disableColorLogicOp disableColorLogicOp ()V - METHOD _disableCull disableCull ()V - METHOD _disableDepthTest disableDepthTest ()V - METHOD _disablePolygonOffset disablePolygonOffset ()V - METHOD _disableScissorTest disableScissorTest ()V - METHOD _disableTexture disableTexture ()V - METHOD _disableVertexAttribArray disableVertexAttribArray (I)V + METHOD _disableVertexAttribArray (I)V ARG 0 index - METHOD _drawElements drawElements (IIIJ)V + METHOD _drawElements (IIIJ)V ARG 0 mode ARG 1 first ARG 2 type ARG 3 indices - METHOD _enableBlend enableBlend ()V - METHOD _enableColorLogicOp enableColorLogicOp ()V - METHOD _enableCull enableCull ()V - METHOD _enableDepthTest enableDepthTest ()V - METHOD _enablePolygonOffset enablePolygonOffset ()V - METHOD _enableScissorTest enableScissorTest ()V - METHOD _enableVertexAttribArray enableVertexAttribArray (I)V + METHOD _enableVertexAttribArray (I)V ARG 0 index - METHOD _genTexture genTextures ()I - METHOD _genTextures genTextures ([I)V - METHOD _getError getError ()I - METHOD _getInteger getInteger (I)I + METHOD _getInteger (I)I ARG 0 pname - METHOD _getString getString (I)Ljava/lang/String; + METHOD _getString (I)Ljava/lang/String; ARG 0 name - METHOD _getTexImage getTexImage (IIIIJ)V + METHOD _getTexImage (IIIIJ)V ARG 0 target ARG 1 level ARG 2 format ARG 3 type ARG 4 pixels - METHOD _getTexLevelParameter getTexLevelParameter (III)I + METHOD _getTexLevelParameter (III)I ARG 0 target ARG 1 level ARG 2 pname - METHOD _glBindAttribLocation bindAttribLocation (IILjava/lang/CharSequence;)V + METHOD _glBindAttribLocation (IILjava/lang/CharSequence;)V ARG 0 program ARG 1 index ARG 2 name - METHOD _glBindBuffer bindBuffer (II)V + METHOD _glBindBuffer (II)V ARG 0 target ARG 1 buffer - METHOD _glBindFramebuffer bindFramebuffer (II)V + METHOD _glBindFramebuffer (II)V ARG 0 target ARG 1 framebuffer - METHOD _glBindVertexArray bindVertexArray (I)V + METHOD _glBindVertexArray (I)V ARG 0 array - METHOD _glBlitFrameBuffer blitFramebuffer (IIIIIIIIII)V + METHOD _glBlitFrameBuffer (IIIIIIIIII)V ARG 0 srcX0 ARG 1 srcY0 ARG 2 srcX1 @@ -100,92 +82,90 @@ CLASS com/mojang/blaze3d/platform/GlStateManager ARG 7 dstY1 ARG 8 mask ARG 9 filter - METHOD _glBufferData bufferData (IJI)V + METHOD _glBufferData (IJI)V ARG 0 target ARG 1 size ARG 3 usage - METHOD _glBufferData bufferData (ILjava/nio/ByteBuffer;I)V + METHOD _glBufferData (ILjava/nio/ByteBuffer;I)V ARG 0 target ARG 1 data ARG 2 usage - METHOD _glDeleteBuffers deleteBuffer (I)V + METHOD _glDeleteBuffers (I)V ARG 0 buffer - METHOD _glDeleteFramebuffers deleteFramebuffer (I)V + METHOD _glDeleteFramebuffers (I)V ARG 0 framebuffer - METHOD _glDeleteVertexArrays deleteVertexArray (I)V + METHOD _glDeleteVertexArrays (I)V ARG 0 array - METHOD _glFramebufferTexture2D framebufferTexture2D (IIIII)V + METHOD _glFramebufferTexture2D (IIIII)V ARG 0 target ARG 1 attachment ARG 2 textureTarget ARG 3 texture ARG 4 level - METHOD _glGenBuffers genBuffer ()I - METHOD _glGenVertexArrays genVertexArray ()I - METHOD _glGetAttribLocation getAttribLocation (ILjava/lang/CharSequence;)I + METHOD _glGetAttribLocation (ILjava/lang/CharSequence;)I ARG 0 program ARG 1 name - METHOD _glGetUniformLocation getUniformLocation (ILjava/lang/CharSequence;)I + METHOD _glGetUniformLocation (ILjava/lang/CharSequence;)I ARG 0 program ARG 1 name METHOD _glMapBuffer mapBuffer (II)Ljava/nio/ByteBuffer; ARG 0 target ARG 1 access - METHOD _glUniform1 uniform1 (ILjava/nio/FloatBuffer;)V + METHOD _glUniform1 (ILjava/nio/FloatBuffer;)V ARG 0 location ARG 1 value - METHOD _glUniform1 uniform1 (ILjava/nio/IntBuffer;)V + METHOD _glUniform1 (ILjava/nio/IntBuffer;)V ARG 0 location ARG 1 value - METHOD _glUniform1i uniform1 (II)V + METHOD _glUniform1i (II)V ARG 0 location ARG 1 value - METHOD _glUniform2 uniform2 (ILjava/nio/FloatBuffer;)V + METHOD _glUniform2 (ILjava/nio/FloatBuffer;)V ARG 0 location ARG 1 value - METHOD _glUniform2 uniform2 (ILjava/nio/IntBuffer;)V + METHOD _glUniform2 (ILjava/nio/IntBuffer;)V ARG 0 location ARG 1 value - METHOD _glUniform3 uniform3 (ILjava/nio/FloatBuffer;)V + METHOD _glUniform3 (ILjava/nio/FloatBuffer;)V ARG 0 location ARG 1 value - METHOD _glUniform3 uniform3 (ILjava/nio/IntBuffer;)V + METHOD _glUniform3 (ILjava/nio/IntBuffer;)V ARG 0 location ARG 1 value - METHOD _glUniform4 uniform4 (ILjava/nio/FloatBuffer;)V + METHOD _glUniform4 (ILjava/nio/FloatBuffer;)V ARG 0 location ARG 1 value - METHOD _glUniform4 uniform4 (ILjava/nio/IntBuffer;)V + METHOD _glUniform4 (ILjava/nio/IntBuffer;)V ARG 0 location ARG 1 value - METHOD _glUniformMatrix2 uniformMatrix2 (IZLjava/nio/FloatBuffer;)V + METHOD _glUniformMatrix2 (IZLjava/nio/FloatBuffer;)V ARG 0 location ARG 1 transpose ARG 2 value - METHOD _glUniformMatrix3 uniformMatrix3 (IZLjava/nio/FloatBuffer;)V + METHOD _glUniformMatrix3 (IZLjava/nio/FloatBuffer;)V ARG 0 location ARG 1 transpose ARG 2 value - METHOD _glUniformMatrix4 uniformMatrix4 (IZLjava/nio/FloatBuffer;)V + METHOD _glUniformMatrix4 (IZLjava/nio/FloatBuffer;)V ARG 0 location ARG 1 transpose ARG 2 value - METHOD _glUnmapBuffer unmapBuffer (I)V + METHOD _glUnmapBuffer (I)V ARG 0 target - METHOD _glUseProgram useProgram (I)V + METHOD _glUseProgram (I)V ARG 0 program - METHOD _logicOp logicOp (I)V + METHOD _logicOp (I)V ARG 0 op - METHOD _pixelStore pixelStore (II)V + METHOD _pixelStore (II)V ARG 0 pname ARG 1 param - METHOD _polygonMode polygonMode (II)V + METHOD _polygonMode (II)V ARG 0 face ARG 1 mode - METHOD _polygonOffset polygonOffset (FF)V + METHOD _polygonOffset (FF)V ARG 0 factor ARG 1 units - METHOD _readPixels readPixels (IIIIIILjava/nio/ByteBuffer;)V + METHOD _readPixels (IIIIIILjava/nio/ByteBuffer;)V ARG 0 x ARG 1 y ARG 2 width @@ -193,22 +173,22 @@ CLASS com/mojang/blaze3d/platform/GlStateManager ARG 4 format ARG 5 type ARG 6 pixels - METHOD _scissorBox scissor (IIII)V + METHOD _scissorBox (IIII)V ARG 0 x ARG 1 y ARG 2 width ARG 3 height - METHOD _stencilFunc stencilFunc (III)V + METHOD _stencilFunc (III)V ARG 0 func ARG 1 ref ARG 2 mask - METHOD _stencilMask stencilMask (I)V + METHOD _stencilMask (I)V ARG 0 mask - METHOD _stencilOp stencilOp (III)V + METHOD _stencilOp (III)V ARG 0 sfail ARG 1 dpfail ARG 2 dppass - METHOD _texImage2D texImage2D (IIIIIIIILjava/nio/IntBuffer;)V + METHOD _texImage2D (IIIIIIIILjava/nio/IntBuffer;)V ARG 0 target ARG 1 level ARG 2 internalFormat @@ -218,15 +198,15 @@ CLASS com/mojang/blaze3d/platform/GlStateManager ARG 6 format ARG 7 type ARG 8 pixels - METHOD _texParameter texParameter (IIF)V + METHOD _texParameter (IIF)V ARG 0 target ARG 1 pname ARG 2 param - METHOD _texParameter texParameter (III)V + METHOD _texParameter (III)V ARG 0 target ARG 1 pname ARG 2 param - METHOD _texSubImage2D texSubImage2D (IIIIIIIIJ)V + METHOD _texSubImage2D (IIIIIIIIJ)V ARG 0 target ARG 1 level ARG 2 offsetX @@ -236,64 +216,61 @@ CLASS com/mojang/blaze3d/platform/GlStateManager ARG 6 format ARG 7 type ARG 8 pixels - METHOD _vertexAttribIPointer vertexAttribIPointer (IIIIJ)V + METHOD _vertexAttribIPointer (IIIIJ)V ARG 0 index ARG 1 size ARG 2 type ARG 3 stride ARG 4 pointer - METHOD _vertexAttribPointer vertexAttribPointer (IIIZIJ)V + METHOD _vertexAttribPointer (IIIZIJ)V ARG 0 index ARG 1 size ARG 2 type ARG 3 normalized ARG 4 stride ARG 5 pointer - METHOD _viewport viewport (IIII)V + METHOD _viewport (IIII)V ARG 0 x ARG 1 y ARG 2 width ARG 3 height - METHOD glActiveTexture activeTextureUntracked (I)V + METHOD glActiveTexture (I)V ARG 0 texture - METHOD glAttachShader attachShader (II)V + METHOD glAttachShader (II)V ARG 0 program ARG 1 shader - METHOD glBlendFuncSeparate blendFuncSeparateUntracked (IIII)V + METHOD glBlendFuncSeparate (IIII)V ARG 0 srcFactorRGB ARG 1 dstFactorRGB ARG 2 srcFactorAlpha ARG 3 dstFactorAlpha - METHOD glCheckFramebufferStatus checkFramebufferStatus (I)I + METHOD glCheckFramebufferStatus (I)I ARG 0 target - METHOD glCompileShader compileShader (I)V + METHOD glCompileShader (I)V ARG 0 shader - METHOD glCreateProgram createProgram ()I - METHOD glCreateShader createShader (I)I + METHOD glCreateShader (I)I ARG 0 type - METHOD glDeleteProgram deleteProgram (I)V + METHOD glDeleteProgram (I)V ARG 0 program - METHOD glDeleteShader deleteShader (I)V + METHOD glDeleteShader (I)V ARG 0 shader - METHOD glGenFramebuffers genFramebuffer ()I - METHOD glGetProgramInfoLog getProgramInfoLog (II)Ljava/lang/String; + METHOD glGetProgramInfoLog (II)Ljava/lang/String; ARG 0 program ARG 1 maxLength - METHOD glGetProgrami getProgram (II)I + METHOD glGetProgrami (II)I ARG 0 program ARG 1 pname - METHOD glGetShaderInfoLog getShaderInfoLog (II)Ljava/lang/String; + METHOD glGetShaderInfoLog (II)Ljava/lang/String; ARG 0 shader ARG 1 maxLength - METHOD glGetShaderi getShader (II)I + METHOD glGetShaderi (II)I ARG 0 shader ARG 1 pname - METHOD glLinkProgram linkProgram (I)V + METHOD glLinkProgram (I)V ARG 0 program - METHOD glShaderSource shaderSource (ILjava/util/List;)V + METHOD glShaderSource (ILjava/util/List;)V ARG 0 shader ARG 1 strings - METHOD setupGui3DDiffuseLighting setupGui3dDiffuseLighting (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;)V CLASS class_1017 BlendFuncState FIELD field_5045 capState Lcom/mojang/blaze3d/platform/GlStateManager$class_1018; FIELD field_5046 dstFactorAlpha I @@ -326,6 +303,8 @@ CLASS com/mojang/blaze3d/platform/GlStateManager FIELD field_5076 mask Z CLASS class_1030 LogicOp FIELD field_5108 value I + METHOD (Ljava/lang/String;II)V + ARG 3 value CLASS class_1031 PolygonOffsetState FIELD field_5121 capLine Lcom/mojang/blaze3d/platform/GlStateManager$class_1018; FIELD field_5122 units F @@ -349,6 +328,10 @@ CLASS com/mojang/blaze3d/platform/GlStateManager FIELD field_5170 width I FIELD field_5171 y I FIELD field_5172 x I + METHOD method_35330 getX ()I + METHOD method_35331 getY ()I + METHOD method_35332 getWidth ()I + METHOD method_35333 getHeight ()I CLASS class_4534 DstFactor CLASS class_4535 SrcFactor CLASS class_5518 ScissorTestState diff --git a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping index c0f08569e9..247a5ec3db 100644 --- a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping +++ b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping @@ -163,6 +163,10 @@ CLASS com/mojang/blaze3d/systems/RenderSystem FIELD field_27335 id I FIELD field_27336 vertexFormat Lnet/minecraft/class_293$class_5595; FIELD field_27337 size I + METHOD (IILcom/mojang/blaze3d/systems/RenderSystem$class_5590$class_5591;)V + ARG 1 sizeMultiplier + ARG 2 increment + ARG 3 indexMapper METHOD method_31919 getId ()I METHOD method_31920 grow (I)V ARG 1 newSize