Skip to content

Commit b61af53

Browse files
bluebear94ishland
bluebear94
and
ishland
authored
Map 26.3-snapshot-3 (#64)
* Map 26.3-snapshot-3 * Fix name conflicts * Fix GlStateManager unpick definitions * Fix overriding bridge method name * Map LazyReferenceRegistryWrapper * Add more mappings * Rename some RegistryWrapper-related classes * fix: formapMappings --------- Co-authored-by: ishland <30385023+ishland@users.noreply.github.com>
1 parent ab25a16 commit b61af53

168 files changed

Lines changed: 1956 additions & 486 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎mappings/com/mojang/blaze3d/buffers/GpuBuffer.mapping‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,25 @@ CLASS net/minecraft/class_1_1211 com/mojang/blaze3d/buffers/GpuBuffer
99
FIELD field_1_8356 USAGE_UNIFORM I
1010
FIELD field_1_8357 USAGE_UNIFORM_TEXEL_BUFFER I
1111
FIELD field_1_8358 USAGE_VERTEX I
12+
FIELD field_1_8359 entireSlice Lnet/minecraft/class_1_1254;
13+
FIELD field_1_8360 size J
14+
FIELD field_1_8361 usage I
1215
METHOD <init> (IJ)V
1316
ARG 1 usage
1417
ARG 2 size
15-
METHOD method_1_7729 (JJZZ)Lnet/minecraft/class_1_1254$class_1_892;
18+
METHOD method_1_7728 isClosed ()Z
19+
METHOD method_1_7729 map (JJZZ)Lnet/minecraft/class_1_1254$class_1_892;
1620
ARG 1 offset
1721
ARG 3 size
1822
ARG 5 read
1923
ARG 6 write
20-
METHOD method_1_7730 (ZZ)Lnet/minecraft/class_1_1254$class_1_892;
24+
METHOD method_1_7730 map (ZZ)Lnet/minecraft/class_1_1254$class_1_892;
2125
ARG 1 read
2226
ARG 2 write
23-
METHOD method_1_7733 (JJ)Lnet/minecraft/class_1_1254;
27+
METHOD method_1_7731 getSize ()J
28+
METHOD method_1_7732 slice ()Lnet/minecraft/class_1_1254;
29+
METHOD method_1_7733 slice (JJ)Lnet/minecraft/class_1_1254;
2430
ARG 1 start
2531
ARG 3 length
32+
METHOD method_1_7734 getUsage ()I
2633
CLASS class_12113 Usage

‎mappings/com/mojang/blaze3d/opengl/GlConst.mapping‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,33 @@
11
CLASS net/minecraft/class_1_1222 com/mojang/blaze3d/opengl/GlConst
22
METHOD method_1_7752 bufferUsageToGlEnum (I)I
3+
ARG 0 usage
34
METHOD method_1_7753 bufferUsageToGlFlag (I)I
5+
ARG 0 usage
46
METHOD method_1_7754 glFormatChannelCount (I)I
7+
ARG 0 format
58
METHOD method_1_7755 isFormatNormalized (Lnet/minecraft/class_1_658;)Z
9+
ARG 0 format
610
METHOD method_1_7756 isGlFormatInteger (I)Z
11+
ARG 0 format
712
METHOD method_1_7757 toGl (Lnet/minecraft/class_1_683;)I
13+
ARG 0 blendParameter
814
METHOD method_1_7758 toGl (Lnet/minecraft/class_1_662;)I
15+
ARG 0 blendOperation
916
METHOD method_1_7759 toGl (Lnet/minecraft/class_1_381;)I
17+
ARG 0 depthTest
1018
METHOD method_1_7760 toGl (Lnet/minecraft/class_5595;)I
1119
ARG 0 type
1220
METHOD method_1_7761 toGl (Lnet/minecraft/class_1_1238;)I
21+
ARG 0 polygonMode
1322
METHOD method_1_7762 toGl (Lnet/minecraft/class_5596;)I
23+
ARG 0 drawMode
1424
METHOD method_1_7763 toGl (Lnet/minecraft/class_1_1229;)I
25+
ARG 0 shaderType
1526
METHOD method_1_7764 toGl (Lnet/minecraft/class_1_1239;)I
27+
ARG 0 addressMode
1628
METHOD method_1_7765 toGlExternalId (Lnet/minecraft/class_1_658;)I
29+
ARG 0 format
1730
METHOD method_1_7766 toGlInternalId (Lnet/minecraft/class_1_658;)I
31+
ARG 0 format
1832
METHOD method_1_7767 toGlType (Lnet/minecraft/class_1_658;)I
33+
ARG 0 format

‎mappings/com/mojang/blaze3d/opengl/GlStateManager.mapping‎

Lines changed: 117 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,181 @@
11
CLASS net/minecraft/class_1_1267 com/mojang/blaze3d/opengl/GlStateManager
2-
METHOD method_1_8022 _activeTexture (I)V
2+
FIELD field_1_8668 blendFunc [Lnet/minecraft/class_1_1267$class_1017;
3+
FIELD field_1_8669 logicOp Lnet/minecraft/class_1_1267$class_1021;
4+
FIELD field_1_8670 writeMasks [I
5+
FIELD field_1_8671 cullFace Lnet/minecraft/class_1_1267$class_1025;
6+
FIELD field_1_8672 depthTest Lnet/minecraft/class_1_1267$class_1026;
7+
FIELD field_1_8673 BUFFERS_PLOT Lcom/mojang/jtracy/Plot;
8+
FIELD field_1_8674 TEXTURES_PLOT Lcom/mojang/jtracy/Plot;
9+
FIELD field_1_8675 polygonOffset Lnet/minecraft/class_1_1267$class_1031;
10+
FIELD field_1_8676 scissorTest Lnet/minecraft/class_1_1267$class_5518;
11+
FIELD field_1_8677 texture [Lnet/minecraft/class_1_1267$class_1039;
12+
FIELD field_1_8679 activeTexture I
13+
FIELD field_1_8680 numBuffers I
14+
FIELD field_1_8681 numTextures I
15+
FIELD field_1_8682 currentReadFramebuffer I
16+
FIELD field_1_8683 currentDrawFramebuffer I
17+
METHOD method_1_8022 activeTexture (I)V
318
ARG 0 texture
4-
METHOD method_1_8023 (I)V
19+
METHOD method_1_8023 bindTexture (I)V
520
ARG 0 texture
6-
METHOD method_1_8025 (IIII)V
21+
METHOD method_1_8024 blendEquationSeparate (II)V
22+
ARG 0 opRgb
23+
ARG 1 opAlpha
24+
METHOD method_1_8025 blendFuncSeparate (IIII)V
725
ARG 0 srcFactorRGB
826
ARG 1 dstFactorRgb
927
ARG 2 srcFactorAlpha
1028
ARG 3 dstFactorAlpha
11-
METHOD method_1_8026 _clear (I)V
29+
METHOD method_1_8026 clear (I)V
1230
ARG 0 mask
13-
METHOD method_1_8029 (I)V
31+
METHOD method_1_8027 clear (D)V
32+
ARG 0 depth
33+
METHOD method_1_8028 clear (ILorg/joml/Vector4fc;)V
34+
ARG 0 mask
35+
ARG 1 color
36+
METHOD method_1_8029 colorMask (I)V
1437
ARG 0 writeMask
15-
METHOD method_1_8031 (I)V
38+
METHOD method_1_8030 colorMask (II)V
39+
ARG 0 index
40+
ARG 1 writeMask
41+
METHOD method_1_8031 deleteTexture (I)V
1642
ARG 0 texture
17-
METHOD method_1_8032 (I)V
43+
METHOD method_1_8032 depthFunc (I)V
1844
ARG 0 func
19-
METHOD method_1_8033 (Z)V
45+
METHOD method_1_8033 depthMask (Z)V
2046
ARG 0 mask
21-
METHOD method_1_8041 (IIIJ)V
47+
METHOD method_1_8034 disableBlend (I)V
48+
ARG 0 index
49+
METHOD method_1_8035 disableLogicOp ()V
50+
METHOD method_1_8036 disableCull ()V
51+
METHOD method_1_8037 disableDepthTest ()V
52+
METHOD method_1_8038 disablePolygonOffset ()V
53+
METHOD method_1_8039 disableScissor ()V
54+
METHOD method_1_8040 drawArrays (III)V
55+
METHOD method_1_8041 drawElements (IIIJ)V
2256
ARG 1 type
2357
ARG 2 count
24-
METHOD method_1_8050 _getError ()I
25-
METHOD method_1_8051 _getInteger (I)I
58+
METHOD method_1_8042 enableBlend (I)V
59+
ARG 0 index
60+
METHOD method_1_8043 enableLogicOp ()V
61+
METHOD method_1_8044 enableCull ()V
62+
METHOD method_1_8045 enableDepthTest ()V
63+
METHOD method_1_8046 enablePolygonOffset ()V
64+
METHOD method_1_8047 enableScissor ()V
65+
METHOD method_1_8048 enableVertexAttribArray (I)V
66+
METHOD method_1_8049 genTexture ()I
67+
METHOD method_1_8050 getError ()I
68+
METHOD method_1_8051 getInteger (I)I
2669
ARG 0 pname
27-
METHOD method_1_8052 _getString (I)Ljava/lang/String;
70+
METHOD method_1_8052 getString (I)Ljava/lang/String;
2871
ARG 0 name
29-
METHOD method_1_8053 _getTexLevelParameter (III)I
72+
METHOD method_1_8053 getTexLevelParameter (III)I
3073
ARG 2 pname
31-
METHOD method_1_8054 (IILjava/lang/CharSequence;)V
74+
METHOD method_1_8054 bindAttribLocation (IILjava/lang/CharSequence;)V
3275
ARG 1 index
33-
METHOD method_1_8055 _bindBuffer (II)V
34-
METHOD method_1_8056 _glBindFramebuffer (II)V
76+
METHOD method_1_8055 bindBuffer (II)V
77+
METHOD method_1_8056 bindFramebuffer (II)V
3578
ARG 0 target
3679
ARG 1 framebuffer
37-
METHOD method_1_8057 (I)V
80+
METHOD method_1_8057 bindVertexArray (I)V
3881
ARG 0 array
39-
METHOD method_1_8058 _glBlitFrameBuffer (IIIIIIIIII)V
40-
METHOD method_1_8059 _bufferData (IJI)V
41-
METHOD method_1_8060 _bufferData (ILjava/nio/ByteBuffer;I)V
42-
METHOD method_1_8062 _glClientWaitSync (JIJ)I
43-
METHOD method_1_8066 _glFenceSync (II)J
44-
METHOD method_1_8067 _glFramebufferTexture2D (IIIII)V
82+
METHOD method_1_8058 blitFrameBuffer (IIIIIIIIII)V
83+
METHOD method_1_8059 bufferData (IJI)V
84+
METHOD method_1_8060 bufferData (ILjava/nio/ByteBuffer;I)V
85+
METHOD method_1_8061 bufferSubData (IJLjava/nio/ByteBuffer;)V
86+
METHOD method_1_8062 clientWaitSync (JIJ)I
87+
METHOD method_1_8063 deleteBuffer (I)V
88+
ARG 0 buffer
89+
METHOD method_1_8064 deleteFramebuffer (I)V
90+
ARG 0 framebuffer
91+
METHOD method_1_8065 deleteSync (J)V
92+
METHOD method_1_8066 fenceSync (II)J
93+
METHOD method_1_8067 framebufferTexture2D (IIIII)V
4594
ARG 0 target
4695
ARG 1 attachment
4796
ARG 2 textureTarget
4897
ARG 3 texture
4998
ARG 4 level
50-
METHOD method_1_8071 (IJJI)Ljava/nio/ByteBuffer;
99+
METHOD method_1_8068 genBuffer ()I
100+
METHOD method_1_8069 genVertexArray ()I
101+
METHOD method_1_8070 getUniformLocation (ILjava/lang/CharSequence;)I
102+
ARG 1 name
103+
METHOD method_1_8071 mapBufferRange (IJJI)Ljava/nio/ByteBuffer;
51104
ARG 3 range
52-
METHOD method_1_8072 (II)V
105+
METHOD method_1_8072 uniform1i (II)V
53106
ARG 1 value
54-
METHOD method_1_8073 _unmapBuffer (I)V
55-
METHOD method_1_8075 _logicOp (I)V
107+
METHOD method_1_8073 unmapBuffer (I)V
108+
METHOD method_1_8074 useProgram (I)V
109+
METHOD method_1_8075 logicOp (I)V
56110
ARG 0 op
57-
METHOD method_1_8076 _pixelStore (II)V
111+
METHOD method_1_8076 pixelStore (II)V
58112
ARG 0 pname
59113
ARG 1 param
60-
METHOD method_1_8077 _polygonMode (II)V
61-
METHOD method_1_8078 (FF)V
114+
METHOD method_1_8077 polygonMode (II)V
115+
METHOD method_1_8078 polygonOffset (FF)V
62116
ARG 0 factor
63117
ARG 1 units
64-
METHOD method_1_8079 _readPixels (IIIIIIJ)V
118+
METHOD method_1_8079 readPixels (IIIIIIJ)V
65119
ARG 0 x
66120
ARG 1 y
67121
ARG 2 width
68122
ARG 3 height
69123
ARG 4 format
70124
ARG 5 type
71125
ARG 6 data
72-
METHOD method_1_8080 (IIII)V
126+
METHOD method_1_8080 scissor (IIII)V
73127
ARG 0 x
74128
ARG 1 y
75129
ARG 2 width
76130
ARG 3 height
77-
METHOD method_1_8081 _texImage2D (IIIIIIIILjava/nio/ByteBuffer;)V
131+
METHOD method_1_8081 texImage2D (IIIIIIIILjava/nio/ByteBuffer;)V
78132
ARG 2 internalFormat
79-
METHOD method_1_8082 _texParameter (III)V
133+
METHOD method_1_8082 texParameter (III)V
80134
ARG 1 pname
81135
ARG 2 param
82-
METHOD method_1_8083 _texSubImage2D (IIIIIIIIJ)V
136+
METHOD method_1_8083 texSubImage2D (IIIIIIIIJ)V
83137
ARG 2 offsetX
84138
ARG 3 offsetY
85-
METHOD method_1_8084 _texSubImage2D (IIIIIIIILjava/nio/ByteBuffer;)V
139+
METHOD method_1_8084 texSubImage2D (IIIIIIIILjava/nio/ByteBuffer;)V
86140
ARG 2 offsetX
87141
ARG 3 offsetY
88-
METHOD method_1_8085 (IIIIJ)V
142+
METHOD method_1_8085 vertexAttribIPointer (IIIIJ)V
89143
ARG 4 pointer
90-
METHOD method_1_8086 (IIIZIJ)V
144+
METHOD method_1_8086 vertexAttribPointer (IIIZIJ)V
91145
ARG 5 pointer
146+
METHOD method_1_8087 viewport (IIII)V
147+
METHOD method_1_8088 clearErrors ()V
92148
METHOD method_1_8089 getFrameBuffer (I)I
93149
ARG 0 target
94-
METHOD method_1_8092 (IIII)V
150+
METHOD method_1_8090 attachShader (II)V
151+
METHOD method_1_8091 glBlendEquationSeparate (II)V
152+
ARG 0 opRgb
153+
ARG 1 opAlpha
154+
METHOD method_1_8092 glBlendFuncSeparate (IIII)V
95155
ARG 0 srcFactorRgb
96156
ARG 1 dstFactorRgb
97157
ARG 2 srcFactorAlpha
98158
ARG 3 dstFactorAlpha
99-
METHOD method_1_8095 _createShader (I)I
100-
METHOD method_1_8100 _getProgram (II)I
101-
METHOD method_1_8102 _getShader (II)I
159+
METHOD method_1_8093 compileShader (I)V
160+
METHOD method_1_8094 createProgram ()I
161+
METHOD method_1_8095 createShader (I)I
162+
METHOD method_1_8096 deleteProgram (I)V
163+
METHOD method_1_8097 deleteShadder (I)V
164+
METHOD method_1_8098 genFramebuffers ()I
165+
METHOD method_1_8099 getProgramInfoLog (II)Ljava/lang/String;
166+
METHOD method_1_8100 getProgram (II)I
167+
METHOD method_1_8101 getShaderInfoLog (II)Ljava/lang/String;
168+
METHOD method_1_8102 getShader (II)I
169+
METHOD method_1_8103 linkProgram (I)V
170+
METHOD method_1_8104 shaderSource (ILjava/lang/String;)V
171+
ARG 1 source
172+
METHOD method_1_8105 onCreateBuffer ()V
102173
METHOD method_1_8107 (I)Lnet/minecraft/class_1_1267$class_1039;
103174
ARG 0 index
175+
METHOD method_1_8108 (I)I
176+
ARG 0 index
177+
METHOD method_1_8109 (I)Lnet/minecraft/class_1_1267$class_1017;
178+
ARG 0 index
104179
CLASS class_1017 BlendFuncState
105180
FIELD field_1_3543 opAlpha I
106181
FIELD field_1_3544 opRgb I

mappings/net/minecraft/class_1_1255.mapping renamed to mappings/com/mojang/blaze3d/pipeline/BlendFunction.mapping

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
CLASS net/minecraft/class_1_1255
1+
CLASS net/minecraft/class_1_1255 com/mojang/blaze3d/pipeline/BlendFunction
2+
FIELD field_1_8608 ADDITIVE Lnet/minecraft/class_1_1255;
3+
FIELD field_1_8609 ENTITY_OUTLINE_BLIT Lnet/minecraft/class_1_1255;
4+
FIELD field_1_8610 GLINT Lnet/minecraft/class_1_1255;
5+
FIELD field_1_8611 INVERT Lnet/minecraft/class_1_1255;
6+
FIELD field_1_8612 LIGHTING Lnet/minecraft/class_1_1255;
7+
FIELD field_1_8613 MAX Lnet/minecraft/class_1_1255;
8+
FIELD field_1_8614 OVERLAY Lnet/minecraft/class_1_1255;
9+
FIELD field_1_8615 TRANSLUCENT Lnet/minecraft/class_1_1255;
10+
FIELD field_1_8616 TRANSLUCENT_PREMULTIPLIED_ALPHA Lnet/minecraft/class_1_1255;
211
METHOD <init> (Lnet/minecraft/class_1_683;Lnet/minecraft/class_1_683;)V
312
ARG 1 src
413
ARG 2 dest

‎mappings/com/mojang/blaze3d/pipeline/CompiledPipeline.mapping‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
CLASS net/minecraft/class_1_1285 com/mojang/blaze3d/pipeline/CompiledPipeline
2+
METHOD method_1_8166 getPipeline ()Lnet/minecraft/class_1_1257;
3+
METHOD method_1_8167 isClosed ()Z

0 commit comments

Comments
 (0)