25w10a: Some additional Rendering items (#4143)

* Some additional Rendering items; please examine "MultipartBlockStateModel". * a bit of consistency.
FabricMC · Mar 6, 2025 · 55422e7 · 55422e7
1 parent 5d27901
commit 55422e7
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 16 deletions.
diff --git a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping
@@ -44,6 +44,7 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 		ARG 0 texture
 	METHOD setTextureMatrix (Lorg/joml/Matrix4f;)V
 		ARG 0 textureMatrix
+	CLASS class_10827 Task
 	CLASS class_5590 ShapeIndexBuffer
 		COMMENT An index buffer that holds a pre-made indices for a specific shape. If
 		COMMENT this buffer is not large enough for the required number of indices when
@@ -71,6 +72,7 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 		METHOD method_31924 getIndexType ()Lnet/minecraft/class_293$class_5595;
 		METHOD method_43409 isLargeEnough (I)Z
 			ARG 1 requiredSize
+		METHOD method_68274 getIndexBuffer (I)Lnet/minecraft/class_10227;
 		CLASS class_5591 Triangulator
 			COMMENT A functional interface that decomposes a shape into triangles.
 			COMMENT

diff --git a/mappings/net/minecraft/class_10895.mapping b/mappings/net/minecraft/class_10895.mapping
diff --git a/mappings/net/minecraft/client/gl/Framebuffer.mapping b/mappings/net/minecraft/client/gl/Framebuffer.mapping
@@ -29,3 +29,5 @@ CLASS net/minecraft/class_276 net/minecraft/client/gl/Framebuffer
 	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
+		ARG 1 texture
diff --git a/mappings/net/minecraft/client/gl/GpuBuffer.mapping b/mappings/net/minecraft/client/gl/GpuBuffer.mapping
@@ -9,5 +9,6 @@ CLASS net/minecraft/class_10227 net/minecraft/client/gl/GpuBuffer
 	METHOD method_68151 getSize ()I
 	METHOD method_68152 getTarget ()Lnet/minecraft/class_10226;
 	METHOD method_68343 getUsage ()Lnet/minecraft/class_8555;
+	METHOD method_68668 isClosed ()Z
 	CLASS class_10858 ReadResult
 		METHOD method_64323 getBuf ()Ljava/nio/ByteBuffer;
diff --git a/mappings/net/minecraft/client/gl/PostEffectPipeline.mapping b/mappings/net/minecraft/client/gl/PostEffectPipeline.mapping
@@ -43,3 +43,4 @@ CLASS net/minecraft/class_9962 net/minecraft/client/gl/PostEffectPipeline
 		FIELD field_53120 CODEC Lcom/mojang/serialization/Codec;
 		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
diff --git a/mappings/net/minecraft/client/gl/ShaderPipelines.mapping b/mappings/net/minecraft/client/gl/ShaderPipelines.mapping
@@ -104,6 +104,8 @@ CLASS net/minecraft/class_10799 net/minecraft/client/gl/ShaderPipelines
 	FIELD field_56914 RENDERTYPE_ENTITY_SHADOW Lnet/minecraft/class_10785;
 	FIELD field_56915 RENDERTYPE_ITEM_ENTITY_TRANSLUCENT_CULL Lnet/minecraft/class_10785;
 	FIELD field_56916 BEACON_BEAM_OPAQUE Lnet/minecraft/class_10785;
+	FIELD field_57928 TRACY_BLIT Lnet/minecraft/class_10785;
+	FIELD field_57929 WIREFRAME Lnet/minecraft/class_10785;
 	METHOD method_67886 getAll ()Ljava/util/List;
 	METHOD method_67887 register (Lnet/minecraft/class_10785;)Lnet/minecraft/class_10785;
 		ARG 0 pipeline
diff --git a/mappings/net/minecraft/client/gl/ShaderProgram.mapping b/mappings/net/minecraft/client/gl/ShaderProgram.mapping
@@ -33,6 +33,7 @@ CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram
 	FIELD field_53841 uniformsByName Ljava/util/Map;
 	FIELD field_57863 PREDEFINED_UNIFORMS Ljava/util/Set;
 	FIELD field_57865 debugLabel Ljava/lang/String;
+	FIELD field_58041 LOGGER Lorg/slf4j/Logger;
 	METHOD <init> (ILjava/lang/String;)V
 		ARG 1 glRef
 		ARG 2 label
@@ -62,3 +63,5 @@ CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram
 	METHOD method_68404 debugLabel ()Ljava/lang/String;
 	METHOD method_68405 samplerLocations ()Lit/unimi/dsi/fastutil/ints/IntList;
 	METHOD method_68406 uniforms ()Ljava/util/List;
+	METHOD method_68670 samplers ()Ljava/util/List;
+	METHOD method_68695 byId (I)Lnet/minecraft/class_10789;
diff --git a/mappings/net/minecraft/client/render/CloudRenderer.mapping b/mappings/net/minecraft/client/render/CloudRenderer.mapping
@@ -8,6 +8,8 @@ CLASS net/minecraft/class_9955 net/minecraft/client/render/CloudRenderer
 	FIELD field_53056 renderMode Lnet/minecraft/class_4063;
 	FIELD field_53057 cells Lnet/minecraft/class_9955$class_9957;
 	FIELD field_53058 buffer Lnet/minecraft/class_10227;
+	FIELD field_57924 indexCount I
+	FIELD field_57925 indexBuffer Lcom/mojang/blaze3d/systems/RenderSystem$class_5590;
 	METHOD method_62166 scheduleTerrainUpdate ()V
 	METHOD method_62167 isEmpty (I)Z
 		ARG 0 color
@@ -64,5 +66,6 @@ CLASS net/minecraft/class_9955 net/minecraft/client/render/CloudRenderer
 		ARG 0 packed
 	METHOD method_62181 hasBorderWest (J)Z
 		ARG 0 packed
+	METHOD method_68475 draw (Lnet/minecraft/class_10785;FFF)V
 	CLASS class_9956 ViewMode
 	CLASS class_9957 CloudCells
diff --git a/mappings/net/minecraft/client/render/LightmapTextureManager.mapping b/mappings/net/minecraft/client/render/LightmapTextureManager.mapping
@@ -16,6 +16,7 @@ CLASS net/minecraft/class_765 net/minecraft/client/render/LightmapTextureManager
 	FIELD field_4134 renderer Lnet/minecraft/class_757;
 	FIELD field_4135 dirty Z
 	FIELD field_4137 client Lnet/minecraft/class_310;
+	FIELD field_57927 texture Lnet/minecraft/class_10792;
 	METHOD <init> (Lnet/minecraft/class_757;Lnet/minecraft/class_310;)V
 		ARG 1 renderer
 		ARG 2 client

diff --git a/mappings/net/minecraft/client/render/RenderLayer.mapping b/mappings/net/minecraft/client/render/RenderLayer.mapping
@@ -298,18 +298,20 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer
 	METHOD method_67906 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
 		ARG 0 texture
 	METHOD method_67907 getDebugCrosshair (D)Lnet/minecraft/class_1921;
+	METHOD method_68494 getTarget ()Lnet/minecraft/class_276;
+	METHOD method_68495 getShaderPipeline ()Lnet/minecraft/class_10785;
 	CLASS class_4687 MultiPhase
 		FIELD field_21403 phases Lnet/minecraft/class_1921$class_4688;
 		FIELD field_21697 affectedOutline Ljava/util/Optional;
 		FIELD field_21851 outline Z
 		FIELD field_29640 CULLING_LAYERS Ljava/util/function/BiFunction;
-		FIELD field_56922 shaderLayer Lnet/minecraft/class_10785;
+		FIELD field_56922 shaderPipleline Lnet/minecraft/class_10785;
 		METHOD <init> (Ljava/lang/String;IZZLnet/minecraft/class_10785;Lnet/minecraft/class_1921$class_4688;)V
 			ARG 1 name
 			ARG 2 size
 			ARG 3 hasCrumbling
 			ARG 4 translucent
-			ARG 5 shaderLayer
+			ARG 5 pipeline
 			ARG 6 params
 		METHOD method_34843 (Lnet/minecraft/class_10785;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
 			ARG 1 texture
@@ -320,6 +322,7 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer
 		FIELD field_21406 texture Lnet/minecraft/class_4668$class_5939;
 		FIELD field_21422 phases Lcom/google/common/collect/ImmutableList;
 		FIELD field_21852 outlineMode Lnet/minecraft/class_1921$class_4750;
+		FIELD field_57931 target Lnet/minecraft/class_4668$class_4678;
 		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
 			ARG 1 texture
 			ARG 2 lightMap

diff --git a/mappings/net/minecraft/client/render/RenderPhase.mapping b/mappings/net/minecraft/client/render/RenderPhase.mapping
@@ -22,10 +22,12 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase
 	FIELD field_25282 WEATHER_TARGET Lnet/minecraft/class_4668$class_4678;
 	FIELD field_25643 ITEM_ENTITY_TARGET Lnet/minecraft/class_4668$class_4678;
 	FIELD field_53123 VIEW_OFFSET_Z_LAYERING_FORWARD Lnet/minecraft/class_4668$class_4675;
+	FIELD field_58053 ARMOR_ENTITY_GLINT_TEXTURING Lnet/minecraft/class_4668$class_4684;
 	METHOD method_23516 startDrawing ()V
 	METHOD method_23517 setupGlintTexturing (F)V
 		ARG 0 scale
 	METHOD method_23518 endDrawing ()V
+	METHOD method_68484 getName ()Ljava/lang/String;
 	CLASS class_4670 Toggleable
 		FIELD field_21390 enabled Z
 		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
 		METHOD <init> (Ljava/util/OptionalDouble;)V
 			ARG 1 width
 	CLASS class_4678 Target
+		FIELD field_57930 framebuffer Ljava/util/function/Supplier;
+		METHOD method_68491 get ()Lnet/minecraft/class_276;
 	CLASS class_4679 Overlay
 		METHOD <init> (Z)V
 			ARG 1 overlayColor
@@ -68,11 +72,11 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase
 		METHOD <init> (Ljava/util/List;)V
 			ARG 1 textures
 		METHOD method_34560 create ()Lnet/minecraft/class_4668$class_5940$class_5941;
+		CLASS class_10542 TextureEntry
 		CLASS class_5941 Builder
 			FIELD field_29454 textures Lcom/google/common/collect/ImmutableList$Builder;
 			METHOD method_34562 build ()Lnet/minecraft/class_4668$class_5940;
 			METHOD method_34563 add (Lnet/minecraft/class_2960;ZZ)Lnet/minecraft/class_4668$class_5940$class_5941;
 				ARG 1 id
 				ARG 2 blur
 				ARG 3 mipmap
-		CLASS class_10542 TextureEntry
diff --git a/mappings/net/minecraft/client/render/RenderResourceManager.mapping b/mappings/net/minecraft/client/render/RenderResourceManager.mapping
@@ -9,6 +9,8 @@ CLASS net/minecraft/class_10881 net/minecraft/client/render/RenderResourceManage
 		ARG 1 target
 		ARG 2 source
 		ARG 3 offset
+	METHOD method_68357 draw (Lnet/minecraft/class_10792;)V
+	METHOD method_68358 setDepth (Lnet/minecraft/class_10792;D)V
 	METHOD method_68359 clearTexture (Lnet/minecraft/class_10792;I)V
 		ARG 1 texture
 		ARG 2 clearColor

diff --git a/mappings/net/minecraft/client/render/SkyRendering.mapping b/mappings/net/minecraft/client/render/SkyRendering.mapping
@@ -6,6 +6,7 @@ CLASS net/minecraft/class_9975 net/minecraft/client/render/SkyRendering
 	FIELD field_53146 skyBuffer Lnet/minecraft/class_10227;
 	FIELD field_53147 darkSkyBuffer Lnet/minecraft/class_10227;
 	FIELD field_55153 endSkyBuffer Lnet/minecraft/class_10227;
+	FIELD field_57935 indexBuffer Lcom/mojang/blaze3d/systems/RenderSystem$class_5590;
 	METHOD method_62302 renderSky (FFF)V
 		ARG 1 red
 		ARG 2 green

diff --git a/mappings/net/minecraft/client/render/VertexFormat.mapping b/mappings/net/minecraft/client/render/VertexFormat.mapping
@@ -2,10 +2,11 @@ CLASS net/minecraft/class_293 net/minecraft/client/render/VertexFormat
 	COMMENT Defines what {@link VertexFormatElement elements} a vertex has.
 	FIELD field_1600 vertexSizeByte I
 	FIELD field_1602 elements Ljava/util/List;
-	FIELD field_38984 buffer Lnet/minecraft/class_10227;
+	FIELD field_38984 vertexBuffer Lnet/minecraft/class_10227;
 	FIELD field_52100 names Ljava/util/List;
 	FIELD field_52101 requiredMask I
 	FIELD field_52102 offsetsByElementId [I
+	FIELD field_57915 indexBuffer Lnet/minecraft/class_10227;
 	METHOD <init> (Ljava/util/List;Ljava/util/List;Lit/unimi/dsi/fastutil/ints/IntList;I)V
 		ARG 1 elements
 		ARG 2 names
@@ -28,6 +29,8 @@ CLASS net/minecraft/class_293 net/minecraft/client/render/VertexFormat
 		ARG 1 element
 	METHOD method_60838 getOffsetsByElementId ()[I
 	METHOD method_60839 getRequiredMask ()I
+	METHOD method_68460 uploadVertices (Ljava/nio/ByteBuffer;)Lnet/minecraft/class_10227;
+	METHOD method_68461 uploadIndex (Ljava/nio/ByteBuffer;)Lnet/minecraft/class_10227;
 	CLASS class_5595 IndexType
 		FIELD field_27375 size I
 		METHOD <init> (Ljava/lang/String;II)V

diff --git a/mappings/net/minecraft/client/render/WorldBorderRendering.mapping b/mappings/net/minecraft/client/render/WorldBorderRendering.mapping
@@ -8,6 +8,7 @@ CLASS net/minecraft/class_9978 net/minecraft/client/render/WorldBorderRendering
 	FIELD field_56924 lastXMax D
 	FIELD field_56925 lastZMin D
 	FIELD field_56926 lastZMax D
+	FIELD field_57936 indexBuffer Lcom/mojang/blaze3d/systems/RenderSystem$class_5590;
 	METHOD method_62322 render (Lnet/minecraft/class_2784;Lnet/minecraft/class_243;DD)V
 		ARG 1 border
 		ARG 2 cameraPos

diff --git a/mappings/net/minecraft/client/render/model/MultipartBlockStateModel.mapping b/mappings/net/minecraft/client/render/model/MultipartBlockStateModel.mapping
@@ -0,0 +1,19 @@
+CLASS net/minecraft/class_10895 net/minecraft/client/render/model/MultipartBlockStateModel
+	FIELD field_57948 bakedModels Lnet/minecraft/class_10895$class_1095;
+	FIELD field_57949 state Lnet/minecraft/class_2680;
+	FIELD field_57950 models Ljava/util/List;
+	CLASS class_10204 Selector
+		METHOD method_68527 build (Ljava/lang/Object;)Lnet/minecraft/class_10895$class_10204;
+	CLASS class_1095 MultipartBakedModel
+		FIELD field_5427 selectors Ljava/util/List;
+		FIELD field_57011 particleSprite Lnet/minecraft/class_1058;
+		FIELD field_57951 map Ljava/util/Map;
+		METHOD <init> (Ljava/util/List;)V
+			ARG 1 selectors
+		METHOD method_64095 getFirst (Ljava/util/List;)Lnet/minecraft/class_1087;
+			ARG 0 selectors
+		METHOD method_68528 build (Lnet/minecraft/class_2680;)Ljava/util/List;
+	CLASS class_816 MultipartUnbakedModel
+		FIELD field_4330 selectors Ljava/util/List;
+		FIELD field_57952 bakerCache Lnet/minecraft/class_7775$class_10897;
+		CLASS class_9981 EqualityGroup