24w34a

build.gradle

@@ -19,7 +19,7 @@ plugins {
 	id 'net.fabricmc.filament'
 }
 
-def minecraft_version = "24w33a"
+def minecraft_version = "24w34a"
 
 filament {
 	minecraftVersion = minecraft_version

mappings/com/mojang/blaze3d/platform/GlStateManager.mapping

@@ -318,9 +318,8 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
 		ARG 1 pname
 	METHOD glLinkProgram (I)V
 		ARG 0 program
-	METHOD glShaderSource (ILjava/util/List;)V
+	METHOD glShaderSource (ILjava/lang/String;)V
 		ARG 0 shader
-		ARG 1 strings
 	METHOD upload (IIIIILnet/minecraft/class_1011$class_1012;Ljava/nio/IntBuffer;Ljava/util/function/Consumer;)V
 		ARG 0 level
 		ARG 1 offsetX

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

@@ -151,20 +151,17 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 		ARG 0 renderCall
 	METHOD renderCrosshair (I)V
 		ARG 0 size
-	METHOD runAsFancy (Ljava/lang/Runnable;)V
-		ARG 0 runnable
 	METHOD setErrorCallback (Lorg/lwjgl/glfw/GLFWErrorCallbackI;)V
 		ARG 0 callback
 	METHOD setProjectionMatrix (Lorg/joml/Matrix4f;Lnet/minecraft/class_8251;)V
 		ARG 0 projectionMatrix
 		ARG 1 vertexSorting
-	METHOD setShader (Ljava/util/function/Supplier;)V
+	METHOD setShader (Lnet/minecraft/class_5944;)V
 		COMMENT Sets the {@code RenderSystem}'s global shader program.
 		COMMENT
 		COMMENT <p>Note that this sets both the vertex shader and the fragment shader
 		COMMENT indirectly through the given shader program. The name of this method is
 		COMMENT not obfuscated and is kept as is.
-		ARG 0 program
 	METHOD setShaderColor (FFFF)V
 		ARG 0 red
 		ARG 1 green

mappings/net/minecraft/block/RedstoneWireBlock.mapping

@@ -26,7 +26,7 @@ CLASS net/minecraft/class_2457 net/minecraft/block/RedstoneWireBlock
 		ARG 1 dir
 	METHOD method_10484 connectsTo (Lnet/minecraft/class_2680;)Z
 		ARG 0 state
-	METHOD method_10485 update (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9904;)V
+	METHOD method_10485 update (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9904;Z)V
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 state

mappings/net/minecraft/class_10124.mapping

@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_10124
+	CLASS class_10126
+		METHOD method_18807 getDrinkSound (Lnet/minecraft/class_1799;)Lnet/minecraft/class_3414;

mappings/net/minecraft/class_10141.mapping

@@ -0,0 +1,14 @@
+CLASS net/minecraft/class_10141
+	CLASS class_282 Type
+		COMMENT Whether a vertex shader or a fragment shader.
+		FIELD field_1526 name Ljava/lang/String;
+		FIELD field_1528 fileExtension Ljava/lang/String;
+		FIELD field_1529 glType I
+		FIELD field_1530 VERTEX Lnet/minecraft/class_10141$class_282;
+		FIELD field_1531 FRAGMENT Lnet/minecraft/class_10141$class_282;
+		METHOD <init> (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;I)V
+			ARG 3 name
+			ARG 4 extension
+			ARG 5 glType
+		METHOD method_1286 getName ()Ljava/lang/String;
+		METHOD method_1287 getGlType ()I

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

@@ -18,10 +18,9 @@ CLASS net/minecraft/class_276 net/minecraft/client/gl/Framebuffer
 	METHOD method_1232 setTexFilter (IZ)V
 		ARG 1 texFilter
 		ARG 2 force
-	METHOD method_1233 drawInternal (IIZ)V
+	METHOD method_1233 drawInternal (II)V
 		ARG 1 width
 		ARG 2 height
-		ARG 3 disableBlend
 	METHOD method_1234 resize (II)V
 		ARG 1 width
 		ARG 2 height
@@ -39,10 +38,6 @@ CLASS net/minecraft/class_276 net/minecraft/client/gl/Framebuffer
 	METHOD method_1239 checkFramebufferStatus ()V
 	METHOD method_1240 endWrite ()V
 	METHOD method_1242 endRead ()V
-	METHOD method_22594 draw (IIZ)V
-		ARG 1 width
-		ARG 2 height
-		ARG 3 disableBlend
 	METHOD method_29329 copyDepthFrom (Lnet/minecraft/class_276;)V
 		ARG 1 framebuffer
 	METHOD method_30277 getColorAttachment ()I

mappings/net/minecraft/client/gl/GlUniform.mapping

@@ -3,20 +3,17 @@ CLASS net/minecraft/class_284 net/minecraft/client/gl/GlUniform
 	COMMENT
 	COMMENT @see <a href="https://www.khronos.org/opengl/wiki/Uniform_(GLSL)">
 	COMMENT Uniform (GLSL) - OpenGL Wiki</a>
-	FIELD field_1541 program Lnet/minecraft/class_3679;
-	FIELD field_1542 stateDirty Z
 	FIELD field_1543 dataType I
 	FIELD field_1544 count I
 	FIELD field_1545 location I
 	FIELD field_1546 name Ljava/lang/String;
 	FIELD field_1547 intData Ljava/nio/IntBuffer;
 	FIELD field_1548 LOGGER Lorg/slf4j/Logger;
 	FIELD field_1549 floatData Ljava/nio/FloatBuffer;
-	METHOD <init> (Ljava/lang/String;IILnet/minecraft/class_3679;)V
+	METHOD <init> (Ljava/lang/String;II)V
 		ARG 1 name
 		ARG 2 dataType
 		ARG 3 count
-		ARG 4 program
 	METHOD method_1296 uploadMatrix ()V
 	METHOD method_1297 setLocation (I)V
 		ARG 1 location
@@ -33,13 +30,6 @@ CLASS net/minecraft/class_284 net/minecraft/client/gl/GlUniform
 	METHOD method_22096 getUniformLocation (ILjava/lang/CharSequence;)I
 		ARG 0 program
 		ARG 1 name
-	METHOD method_22097 getAttribLocation (ILjava/lang/CharSequence;)I
-		ARG 0 program
-		ARG 1 name
-	METHOD method_34419 bindAttribLocation (IILjava/lang/CharSequence;)V
-		ARG 0 program
-		ARG 1 index
-		ARG 2 name
 	METHOD method_35659 set (IF)V
 		ARG 1 index
 		ARG 2 value

mappings/net/minecraft/client/gl/PostEffectPass.mapping

@@ -1,23 +1,16 @@
 CLASS net/minecraft/class_283 net/minecraft/client/gl/PostEffectPass
-	FIELD field_1540 program Lnet/minecraft/class_280;
 	FIELD field_53121 id Lnet/minecraft/class_2960;
 	FIELD field_53122 samplers Ljava/util/List;
-	METHOD <init> (Lnet/minecraft/class_5912;Ljava/lang/String;Lnet/minecraft/class_2960;)V
-		ARG 1 resourceFactory
-		ARG 2 programName
+	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_5944;Lnet/minecraft/class_2960;Ljava/util/List;)V
 		ARG 3 id
-	METHOD method_1295 getProgram ()Lnet/minecraft/class_280;
-	METHOD method_35777 getName ()Ljava/lang/String;
-	METHOD method_62255 (Lnet/minecraft/class_9909;Ljava/util/Map;Lorg/joml/Matrix4f;F)V
-		ARG 4 timeSeconds
 	METHOD method_62256 (Lnet/minecraft/class_9916;Lnet/minecraft/class_2960;Lnet/minecraft/class_9925;)Lnet/minecraft/class_9925;
 		ARG 1 id
 	METHOD method_62258 addSampler (Lnet/minecraft/class_283$class_9971;)V
 		ARG 1 sampler
 	CLASS class_9971 Sampler
 		METHOD method_62259 (Lnet/minecraft/class_9916;Ljava/util/Map;)V
 			ARG 2 internalTargets
-		METHOD method_62260 bind (Lnet/minecraft/class_280;Ljava/util/Map;)V
+		METHOD method_62260 bind (Lnet/minecraft/class_5944;Ljava/util/Map;)V
 			ARG 1 program
 			ARG 2 internalTargets
 		METHOD method_62261 (Ljava/util/Map;)V

mappings/net/minecraft/client/gl/PostEffectProcessor.mapping

@@ -1,37 +1,18 @@
 CLASS net/minecraft/class_279 net/minecraft/client/gl/PostEffectProcessor
 	FIELD field_1497 passes Ljava/util/List;
-	FIELD field_1501 time F
 	FIELD field_53104 MAIN Lnet/minecraft/class_2960;
-	FIELD field_53105 id Lnet/minecraft/class_2960;
 	FIELD field_53106 internalTargets Ljava/util/Map;
 	FIELD field_53107 externalTargets Ljava/util/Set;
-	METHOD <init> (Lnet/minecraft/class_2960;Ljava/util/List;Ljava/util/Map;Ljava/util/Set;)V
-		ARG 1 id
-		ARG 2 passes
-		ARG 3 internalTargets
-		ARG 4 externalTargets
-	METHOD method_1256 parseEffect (Lnet/minecraft/class_5912;Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;Ljava/util/Set;)Lnet/minecraft/class_279;
-		ARG 0 resourceFactory
-		ARG 1 textureManager
-		ARG 2 id
+	METHOD method_1256 parseEffect (Lnet/minecraft/class_9962;Lnet/minecraft/class_1060;Lnet/minecraft/class_10151;Ljava/util/Set;)Lnet/minecraft/class_279;
 		ARG 3 availableExternalTargets
-	METHOD method_1258 render (Lnet/minecraft/class_276;Lnet/minecraft/class_9922;Lnet/minecraft/class_9779;)V
+	METHOD method_1258 render (Lnet/minecraft/class_276;Lnet/minecraft/class_9922;)V
 		ARG 1 framebuffer
 		ARG 2 objectAllocator
-		ARG 3 renderTickCounter
 	METHOD method_57799 setUniforms (Ljava/lang/String;F)V
 		ARG 1 name
 		ARG 2 value
-	METHOD method_62233 parsePass (Lnet/minecraft/class_5912;Lnet/minecraft/class_1060;Lnet/minecraft/class_9962$class_9967;)Lnet/minecraft/class_283;
-		ARG 0 resourceFactory
-		ARG 1 textureManager
+	METHOD method_62233 parsePass (Lnet/minecraft/class_1060;Lnet/minecraft/class_10151;Lnet/minecraft/class_9962$class_9967;)Lnet/minecraft/class_283;
 		ARG 2 pass
-	METHOD method_62234 (Lnet/minecraft/class_9909;Lnet/minecraft/class_9779;IILnet/minecraft/class_279$class_9961;)V
-		ARG 2 renderTickCounter
-		ARG 5 set
-	METHOD method_62235 setUniform (Lnet/minecraft/class_284;Ljava/util/List;)V
-		ARG 0 uniform
-		ARG 1 elements
 	METHOD method_62239 (Ljava/lang/String;)Ljava/lang/String;
 		ARG 0 name
 	CLASS class_9961 FramebufferSet

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

@@ -9,9 +9,6 @@ CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram
 	COMMENT
 	COMMENT @see <a href="https://www.khronos.org/opengl/wiki/GLSL_Object#Program_objects">
 	COMMENT GLSL Object - OpenGL Wiki (Program objects)</a>
-	FIELD field_29467 vertexShader Lnet/minecraft/class_281;
-	FIELD field_29468 fragmentShader Lnet/minecraft/class_281;
-	FIELD field_29469 format Lnet/minecraft/class_293;
 	FIELD field_29470 modelViewMat Lnet/minecraft/class_284;
 	FIELD field_29471 projectionMat Lnet/minecraft/class_284;
 	FIELD field_29472 textureMat Lnet/minecraft/class_284;
@@ -24,53 +21,21 @@ CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram
 	FIELD field_29479 fogColor Lnet/minecraft/class_284;
 	FIELD field_29480 lineWidth Lnet/minecraft/class_284;
 	FIELD field_29481 gameTime Lnet/minecraft/class_284;
-	FIELD field_29483 LOGGER Lorg/slf4j/Logger;
 	FIELD field_29484 DEFAULT_UNIFORM Lnet/minecraft/class_278;
-	FIELD field_29485 activeProgram Lnet/minecraft/class_5944;
-	FIELD field_29486 activeProgramGlRef I
-	FIELD field_29487 samplers Ljava/util/Map;
-	FIELD field_29488 samplerNames Ljava/util/List;
-	FIELD field_29489 loadedSamplerIds Ljava/util/List;
 	FIELD field_29490 uniforms Ljava/util/List;
-	FIELD field_29491 loadedUniformIds Ljava/util/List;
-	FIELD field_29492 loadedUniforms Ljava/util/Map;
 	FIELD field_29493 glRef I
-	FIELD field_29494 name Ljava/lang/String;
-	FIELD field_29495 dirty Z
-	FIELD field_32778 SHADERS_DIRECTORY Ljava/lang/String;
-	FIELD field_32779 INCLUDE_DIRECTORY Ljava/lang/String;
 	FIELD field_36373 fogShape Lnet/minecraft/class_284;
-	FIELD field_40512 CORE_DIRECTORY Ljava/lang/String;
 	FIELD field_42231 glintAlpha Lnet/minecraft/class_284;
 	FIELD field_53139 modelOffset Lnet/minecraft/class_284;
-	METHOD <init> (Lnet/minecraft/class_5912;Ljava/lang/String;Lnet/minecraft/class_293;)V
-		ARG 1 factory
-		ARG 2 name
-		ARG 3 format
-	METHOD method_34579 loadShader (Lnet/minecraft/class_5912;Lnet/minecraft/class_281$class_282;Ljava/lang/String;)Lnet/minecraft/class_281;
-		ARG 0 factory
-		ARG 1 type
-		ARG 2 name
-	METHOD method_34580 readSampler (Lcom/google/gson/JsonElement;)V
-		ARG 1 json
+	METHOD method_1270 getGlRef ()I
 	METHOD method_34582 getUniform (Ljava/lang/String;)Lnet/minecraft/class_284;
 		ARG 1 name
-	METHOD method_34583 addSampler (Ljava/lang/String;Ljava/lang/Object;)V
-		ARG 1 name
-		ARG 2 sampler
-	METHOD method_34584 addUniform (Lcom/google/gson/JsonElement;)V
-		ARG 1 json
 	METHOD method_34585 unbind ()V
 	METHOD method_34586 bind ()V
-	METHOD method_34588 loadReferences ()V
 	METHOD method_35785 getUniformOrDefault (Ljava/lang/String;)Lnet/minecraft/class_278;
 		ARG 1 name
-	METHOD method_35786 getFormat ()Lnet/minecraft/class_293;
-	METHOD method_35787 getName ()Ljava/lang/String;
 	METHOD method_60897 initializeUniforms (Lnet/minecraft/class_293$class_5596;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lnet/minecraft/class_1041;)V
 		ARG 1 drawMode
 		ARG 2 viewMatrix
 		ARG 3 projectionMatrix
 		ARG 4 window
-	CLASS 1
-		FIELD field_29498 visitedImports Ljava/util/Set;