Skip to content

Commit 55422e7

Browse files
sakura-ryokosakura-ryoko
authored
25w10a: Some additional Rendering items (#4143)
* Some additional Rendering items; please examine "MultipartBlockStateModel". * a bit of consistency.
1 parent 5d27901 commit 55422e7

16 files changed

+52
-16
lines changed

‎mappings/com/mojang/blaze3d/systems/RenderSystem.mapping

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
4444
ARG 0 texture
4545
METHOD setTextureMatrix (Lorg/joml/Matrix4f;)V
4646
ARG 0 textureMatrix
47+
CLASS class_10827 Task
4748
CLASS class_5590 ShapeIndexBuffer
4849
COMMENT An index buffer that holds a pre-made indices for a specific shape. If
4950
COMMENT this buffer is not large enough for the required number of indices when
@@ -71,6 +72,7 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
7172
METHOD method_31924 getIndexType ()Lnet/minecraft/class_293$class_5595;
7273
METHOD method_43409 isLargeEnough (I)Z
7374
ARG 1 requiredSize
75+
METHOD method_68274 getIndexBuffer (I)Lnet/minecraft/class_10227;
7476
CLASS class_5591 Triangulator
7577
COMMENT A functional interface that decomposes a shape into triangles.
7678
COMMENT

‎mappings/net/minecraft/class_10895.mapping

-12
This file was deleted.

‎mappings/net/minecraft/client/gl/Framebuffer.mapping

+2
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ CLASS net/minecraft/class_276 net/minecraft/client/gl/Framebuffer
2929
METHOD method_30278 getDepthAttachment ()Lnet/minecraft/class_10792;
3030
METHOD method_58226 setTexFilter (Lnet/minecraft/class_10791;)V
3131
ARG 1 filter
32+
METHOD method_68445 draw (Lnet/minecraft/class_10792;)V
33+
ARG 1 texture

‎mappings/net/minecraft/client/gl/GpuBuffer.mapping

+1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ CLASS net/minecraft/class_10227 net/minecraft/client/gl/GpuBuffer
99
METHOD method_68151 getSize ()I
1010
METHOD method_68152 getTarget ()Lnet/minecraft/class_10226;
1111
METHOD method_68343 getUsage ()Lnet/minecraft/class_8555;
12+
METHOD method_68668 isClosed ()Z
1213
CLASS class_10858 ReadResult
1314
METHOD method_64323 getBuf ()Ljava/nio/ByteBuffer;

‎mappings/net/minecraft/client/gl/PostEffectPipeline.mapping

+1
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,4 @@ CLASS net/minecraft/class_9962 net/minecraft/client/gl/PostEffectPipeline
4343
FIELD field_53120 CODEC Lcom/mojang/serialization/Codec;
4444
METHOD method_62254 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
4545
ARG 0 instance
46+
METHOD method_68482 apply (Lnet/minecraft/class_10883;)V

‎mappings/net/minecraft/client/gl/ShaderPipelines.mapping

+2
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ CLASS net/minecraft/class_10799 net/minecraft/client/gl/ShaderPipelines
104104
FIELD field_56914 RENDERTYPE_ENTITY_SHADOW Lnet/minecraft/class_10785;
105105
FIELD field_56915 RENDERTYPE_ITEM_ENTITY_TRANSLUCENT_CULL Lnet/minecraft/class_10785;
106106
FIELD field_56916 BEACON_BEAM_OPAQUE Lnet/minecraft/class_10785;
107+
FIELD field_57928 TRACY_BLIT Lnet/minecraft/class_10785;
108+
FIELD field_57929 WIREFRAME Lnet/minecraft/class_10785;
107109
METHOD method_67886 getAll ()Ljava/util/List;
108110
METHOD method_67887 register (Lnet/minecraft/class_10785;)Lnet/minecraft/class_10785;
109111
ARG 0 pipeline

‎mappings/net/minecraft/client/gl/ShaderProgram.mapping

+3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram
3333
FIELD field_53841 uniformsByName Ljava/util/Map;
3434
FIELD field_57863 PREDEFINED_UNIFORMS Ljava/util/Set;
3535
FIELD field_57865 debugLabel Ljava/lang/String;
36+
FIELD field_58041 LOGGER Lorg/slf4j/Logger;
3637
METHOD <init> (ILjava/lang/String;)V
3738
ARG 1 glRef
3839
ARG 2 label
@@ -62,3 +63,5 @@ CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram
6263
METHOD method_68404 debugLabel ()Ljava/lang/String;
6364
METHOD method_68405 samplerLocations ()Lit/unimi/dsi/fastutil/ints/IntList;
6465
METHOD method_68406 uniforms ()Ljava/util/List;
66+
METHOD method_68670 samplers ()Ljava/util/List;
67+
METHOD method_68695 byId (I)Lnet/minecraft/class_10789;

‎mappings/net/minecraft/client/render/CloudRenderer.mapping

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ CLASS net/minecraft/class_9955 net/minecraft/client/render/CloudRenderer
88
FIELD field_53056 renderMode Lnet/minecraft/class_4063;
99
FIELD field_53057 cells Lnet/minecraft/class_9955$class_9957;
1010
FIELD field_53058 buffer Lnet/minecraft/class_10227;
11+
FIELD field_57924 indexCount I
12+
FIELD field_57925 indexBuffer Lcom/mojang/blaze3d/systems/RenderSystem$class_5590;
1113
METHOD method_62166 scheduleTerrainUpdate ()V
1214
METHOD method_62167 isEmpty (I)Z
1315
ARG 0 color
@@ -64,5 +66,6 @@ CLASS net/minecraft/class_9955 net/minecraft/client/render/CloudRenderer
6466
ARG 0 packed
6567
METHOD method_62181 hasBorderWest (J)Z
6668
ARG 0 packed
69+
METHOD method_68475 draw (Lnet/minecraft/class_10785;FFF)V
6770
CLASS class_9956 ViewMode
6871
CLASS class_9957 CloudCells

‎mappings/net/minecraft/client/render/LightmapTextureManager.mapping

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ CLASS net/minecraft/class_765 net/minecraft/client/render/LightmapTextureManager
1616
FIELD field_4134 renderer Lnet/minecraft/class_757;
1717
FIELD field_4135 dirty Z
1818
FIELD field_4137 client Lnet/minecraft/class_310;
19+
FIELD field_57927 texture Lnet/minecraft/class_10792;
1920
METHOD <init> (Lnet/minecraft/class_757;Lnet/minecraft/class_310;)V
2021
ARG 1 renderer
2122
ARG 2 client

‎mappings/net/minecraft/client/render/RenderLayer.mapping

+5-2
Original file line numberDiff line numberDiff line change
@@ -298,18 +298,20 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer
298298
METHOD method_67906 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
299299
ARG 0 texture
300300
METHOD method_67907 getDebugCrosshair (D)Lnet/minecraft/class_1921;
301+
METHOD method_68494 getTarget ()Lnet/minecraft/class_276;
302+
METHOD method_68495 getShaderPipeline ()Lnet/minecraft/class_10785;
301303
CLASS class_4687 MultiPhase
302304
FIELD field_21403 phases Lnet/minecraft/class_1921$class_4688;
303305
FIELD field_21697 affectedOutline Ljava/util/Optional;
304306
FIELD field_21851 outline Z
305307
FIELD field_29640 CULLING_LAYERS Ljava/util/function/BiFunction;
306-
FIELD field_56922 shaderLayer Lnet/minecraft/class_10785;
308+
FIELD field_56922 shaderPipleline Lnet/minecraft/class_10785;
307309
METHOD <init> (Ljava/lang/String;IZZLnet/minecraft/class_10785;Lnet/minecraft/class_1921$class_4688;)V
308310
ARG 1 name
309311
ARG 2 size
310312
ARG 3 hasCrumbling
311313
ARG 4 translucent
312-
ARG 5 shaderLayer
314+
ARG 5 pipeline
313315
ARG 6 params
314316
METHOD method_34843 (Lnet/minecraft/class_10785;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
315317
ARG 1 texture
@@ -320,6 +322,7 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer
320322
FIELD field_21406 texture Lnet/minecraft/class_4668$class_5939;
321323
FIELD field_21422 phases Lcom/google/common/collect/ImmutableList;
322324
FIELD field_21852 outlineMode Lnet/minecraft/class_1921$class_4750;
325+
FIELD field_57931 target Lnet/minecraft/class_4668$class_4678;
323326
METHOD <init> (Lnet/minecraft/class_4668$class_5939;Lnet/minecraft/class_4668$class_4676;Lnet/minecraft/class_4668$class_4679;Lnet/minecraft/class_4668$class_4675;Lnet/minecraft/class_4668$class_4678;Lnet/minecraft/class_4668$class_4684;Lnet/minecraft/class_4668$class_4677;Lnet/minecraft/class_1921$class_4750;)V
324327
ARG 1 texture
325328
ARG 2 lightMap

‎mappings/net/minecraft/client/render/RenderPhase.mapping

+5-1
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase
2222
FIELD field_25282 WEATHER_TARGET Lnet/minecraft/class_4668$class_4678;
2323
FIELD field_25643 ITEM_ENTITY_TARGET Lnet/minecraft/class_4668$class_4678;
2424
FIELD field_53123 VIEW_OFFSET_Z_LAYERING_FORWARD Lnet/minecraft/class_4668$class_4675;
25+
FIELD field_58053 ARMOR_ENTITY_GLINT_TEXTURING Lnet/minecraft/class_4668$class_4684;
2526
METHOD method_23516 startDrawing ()V
2627
METHOD method_23517 setupGlintTexturing (F)V
2728
ARG 0 scale
2829
METHOD method_23518 endDrawing ()V
30+
METHOD method_68484 getName ()Ljava/lang/String;
2931
CLASS class_4670 Toggleable
3032
FIELD field_21390 enabled Z
3133
METHOD <init> (Ljava/lang/String;Ljava/lang/Runnable;Ljava/lang/Runnable;Z)V
@@ -42,6 +44,8 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase
4244
METHOD <init> (Ljava/util/OptionalDouble;)V
4345
ARG 1 width
4446
CLASS class_4678 Target
47+
FIELD field_57930 framebuffer Ljava/util/function/Supplier;
48+
METHOD method_68491 get ()Lnet/minecraft/class_276;
4549
CLASS class_4679 Overlay
4650
METHOD <init> (Z)V
4751
ARG 1 overlayColor
@@ -68,11 +72,11 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase
6872
METHOD <init> (Ljava/util/List;)V
6973
ARG 1 textures
7074
METHOD method_34560 create ()Lnet/minecraft/class_4668$class_5940$class_5941;
75+
CLASS class_10542 TextureEntry
7176
CLASS class_5941 Builder
7277
FIELD field_29454 textures Lcom/google/common/collect/ImmutableList$Builder;
7378
METHOD method_34562 build ()Lnet/minecraft/class_4668$class_5940;
7479
METHOD method_34563 add (Lnet/minecraft/class_2960;ZZ)Lnet/minecraft/class_4668$class_5940$class_5941;
7580
ARG 1 id
7681
ARG 2 blur
7782
ARG 3 mipmap
78-
CLASS class_10542 TextureEntry

‎mappings/net/minecraft/client/render/RenderResourceManager.mapping

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ CLASS net/minecraft/class_10881 net/minecraft/client/render/RenderResourceManage
99
ARG 1 target
1010
ARG 2 source
1111
ARG 3 offset
12+
METHOD method_68357 draw (Lnet/minecraft/class_10792;)V
13+
METHOD method_68358 setDepth (Lnet/minecraft/class_10792;D)V
1214
METHOD method_68359 clearTexture (Lnet/minecraft/class_10792;I)V
1315
ARG 1 texture
1416
ARG 2 clearColor

‎mappings/net/minecraft/client/render/SkyRendering.mapping

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ CLASS net/minecraft/class_9975 net/minecraft/client/render/SkyRendering
66
FIELD field_53146 skyBuffer Lnet/minecraft/class_10227;
77
FIELD field_53147 darkSkyBuffer Lnet/minecraft/class_10227;
88
FIELD field_55153 endSkyBuffer Lnet/minecraft/class_10227;
9+
FIELD field_57935 indexBuffer Lcom/mojang/blaze3d/systems/RenderSystem$class_5590;
910
METHOD method_62302 renderSky (FFF)V
1011
ARG 1 red
1112
ARG 2 green

‎mappings/net/minecraft/client/render/VertexFormat.mapping

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ CLASS net/minecraft/class_293 net/minecraft/client/render/VertexFormat
22
COMMENT Defines what {@link VertexFormatElement elements} a vertex has.
33
FIELD field_1600 vertexSizeByte I
44
FIELD field_1602 elements Ljava/util/List;
5-
FIELD field_38984 buffer Lnet/minecraft/class_10227;
5+
FIELD field_38984 vertexBuffer Lnet/minecraft/class_10227;
66
FIELD field_52100 names Ljava/util/List;
77
FIELD field_52101 requiredMask I
88
FIELD field_52102 offsetsByElementId [I
9+
FIELD field_57915 indexBuffer Lnet/minecraft/class_10227;
910
METHOD <init> (Ljava/util/List;Ljava/util/List;Lit/unimi/dsi/fastutil/ints/IntList;I)V
1011
ARG 1 elements
1112
ARG 2 names
@@ -28,6 +29,8 @@ CLASS net/minecraft/class_293 net/minecraft/client/render/VertexFormat
2829
ARG 1 element
2930
METHOD method_60838 getOffsetsByElementId ()[I
3031
METHOD method_60839 getRequiredMask ()I
32+
METHOD method_68460 uploadVertices (Ljava/nio/ByteBuffer;)Lnet/minecraft/class_10227;
33+
METHOD method_68461 uploadIndex (Ljava/nio/ByteBuffer;)Lnet/minecraft/class_10227;
3134
CLASS class_5595 IndexType
3235
FIELD field_27375 size I
3336
METHOD <init> (Ljava/lang/String;II)V

‎mappings/net/minecraft/client/render/WorldBorderRendering.mapping

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ CLASS net/minecraft/class_9978 net/minecraft/client/render/WorldBorderRendering
88
FIELD field_56924 lastXMax D
99
FIELD field_56925 lastZMin D
1010
FIELD field_56926 lastZMax D
11+
FIELD field_57936 indexBuffer Lcom/mojang/blaze3d/systems/RenderSystem$class_5590;
1112
METHOD method_62322 render (Lnet/minecraft/class_2784;Lnet/minecraft/class_243;DD)V
1213
ARG 1 border
1314
ARG 2 cameraPos

‎mappings/net/minecraft/client/render/model/MultipartBlockStateModel.mapping

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
CLASS net/minecraft/class_10895 net/minecraft/client/render/model/MultipartBlockStateModel
2+
FIELD field_57948 bakedModels Lnet/minecraft/class_10895$class_1095;
3+
FIELD field_57949 state Lnet/minecraft/class_2680;
4+
FIELD field_57950 models Ljava/util/List;
5+
CLASS class_10204 Selector
6+
METHOD method_68527 build (Ljava/lang/Object;)Lnet/minecraft/class_10895$class_10204;
7+
CLASS class_1095 MultipartBakedModel
8+
FIELD field_5427 selectors Ljava/util/List;
9+
FIELD field_57011 particleSprite Lnet/minecraft/class_1058;
10+
FIELD field_57951 map Ljava/util/Map;
11+
METHOD <init> (Ljava/util/List;)V
12+
ARG 1 selectors
13+
METHOD method_64095 getFirst (Ljava/util/List;)Lnet/minecraft/class_1087;
14+
ARG 0 selectors
15+
METHOD method_68528 build (Lnet/minecraft/class_2680;)Ljava/util/List;
16+
CLASS class_816 MultipartUnbakedModel
17+
FIELD field_4330 selectors Ljava/util/List;
18+
FIELD field_57952 bakerCache Lnet/minecraft/class_7775$class_10897;
19+
CLASS class_9981 EqualityGroup

0 commit comments

Comments
 (0)