Update Fabric stuff

Wurst-Imperium · Feb 18, 2025 · 735f682 · 735f682
1 parent 2f1f121
commit 735f682
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 23 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,11 +6,11 @@ org.gradle.parallel=true
 # check these at https://fabricmc.net/develop/ and
 # https://modrinth.com/mod/fabric-api/versions
 minecraft_version=25w07a
-yarn_mappings=25w07a+build.8
+yarn_mappings=25w07a+build.10
 loader_version=0.16.10
 
 # Fabric API
-fabric_version=0.117.1+1.21.5
+fabric_version=0.117.3+1.21.5
 
 # Mod Properties
 mod_version=v7.46.6-MC25w07a

diff --git a/src/main/java/net/wurstclient/WurstShaderLayers.java b/src/main/java/net/wurstclient/WurstShaderLayers.java
@@ -25,11 +25,10 @@ public enum WurstShaderLayers
 	 */
 	public static final ShaderProgramLayer ONE_PIXEL_LINES =
 		ShaderProgramLayers.addProgram(
-			ShaderProgramLayer.create(ShaderProgramLayers.MATRICIES_COLOR)
-				.setName("pipeline/wurst_1px_lines")
-				.setVertex("core/position_color").setPass("core/position_color")
-				.addBlend(BlendPrograms.TRANSLUCENT).addCulling(false)
-				.addFormat(VertexFormats.POSITION_COLOR,
+			ShaderProgramLayer.create(ShaderProgramLayers.MATRICES_COLOR)
+				.id("pipeline/wurst_1px_lines").vertices("core/position_color")
+				.pass("core/position_color").blender(BlendPrograms.TRANSLUCENT)
+				.culling(false).format(VertexFormats.POSITION_COLOR,
 					VertexFormat.DrawMode.DEBUG_LINES)
 				.create());
 
@@ -38,33 +37,32 @@ public enum WurstShaderLayers
 	 * transparency.
 	 */
 	public static final ShaderProgramLayer ONE_PIXEL_LINE_STRIP =
-		ShaderProgramLayers.addProgram(
-			ShaderProgramLayer.create(ShaderProgramLayers.MATRICIES_COLOR)
-				.setName("pipeline/wurst_1px_line_strip")
-				.setVertex("core/position_color").setPass("core/position_color")
-				.addBlend(BlendPrograms.TRANSLUCENT).addCulling(false)
-				.addFormat(VertexFormats.POSITION_COLOR,
-					VertexFormat.DrawMode.DEBUG_LINE_STRIP)
-				.create());
+		ShaderProgramLayers.addProgram(ShaderProgramLayer
+			.create(ShaderProgramLayers.MATRICES_COLOR)
+			.id("pipeline/wurst_1px_line_strip").vertices("core/position_color")
+			.pass("core/position_color").blender(BlendPrograms.TRANSLUCENT)
+			.culling(false).format(VertexFormats.POSITION_COLOR,
+				VertexFormat.DrawMode.DEBUG_LINE_STRIP)
+			.create());
 
 	/**
 	 * Similar to the LINES ShaderProgramLayer, but with no depth test.
 	 */
 	public static final ShaderProgramLayer ESP_LINES =
 		ShaderProgramLayers.addProgram(
 			ShaderProgramLayer.create(ShaderProgramLayers.RENDERTYPE_LINES)
-				.setName("pipeline/wurst_esp_lines")
-				.addDepthProgram(DepthTestState.NO_DEPTH_TEST).create());
+				.id("pipeline/wurst_esp_lines")
+				.depthTest(DepthTestState.NO_DEPTH_TEST).create());
 
 	/**
 	 * Similar to the LINE_STRIP ShaderProgramLayer, but with no depth test.
 	 */
 	public static final ShaderProgramLayer ESP_LINE_STRIP =
 		ShaderProgramLayers.addProgram(
 			ShaderProgramLayer.create(ShaderProgramLayers.RENDERTYPE_LINES)
-				.setName("pipeline/wurst_esp_line_strip")
-				.addFormat(VertexFormats.LINES, DrawMode.LINE_STRIP)
-				.addDepthProgram(DepthTestState.NO_DEPTH_TEST).create());
+				.id("pipeline/wurst_esp_line_strip")
+				.format(VertexFormats.LINES, DrawMode.LINE_STRIP)
+				.depthTest(DepthTestState.NO_DEPTH_TEST).create());
 
 	/**
 	 * Similar to the DEBUG_QUADS ShaderProgramLayer, but with culling enabled
@@ -73,6 +71,6 @@ public enum WurstShaderLayers
 	public static final ShaderProgramLayer ESP_QUADS =
 		ShaderProgramLayers.addProgram(
 			ShaderProgramLayer.create(ShaderProgramLayers.POSITION_COLOR)
-				.setName("pipeline/wurst_esp_quads")
-				.addDepthProgram(DepthTestState.NO_DEPTH_TEST).create());
+				.id("pipeline/wurst_esp_quads")
+				.depthTest(DepthTestState.NO_DEPTH_TEST).create());
 }
diff --git a/src/main/resources/wurst.accesswidener b/src/main/resources/wurst.accesswidener
@@ -11,7 +11,7 @@ accessible	method	net/minecraft/client/render/RenderLayer$MultiPhaseParameters$B
 accessible	method	net/minecraft/client/render/RenderLayer$MultiPhaseParameters$Builder	target	(Lnet/minecraft/client/render/RenderPhase$Target;)Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters$Builder;
 accessible	method	net/minecraft/entity/player/PlayerEntity	canGlide	()Z
 accessible	method	net/minecraft/entity/projectile/FishingBobberEntity	isOpenOrWaterAround	(Lnet/minecraft/util/math/BlockPos;)Z
-accessible	field	net/minecraft/client/gl/ShaderProgramLayers	MATRICIES_COLOR	Lnet/minecraft/client/gl/ShaderProgramLayer$Stage;
+accessible	field	net/minecraft/client/gl/ShaderProgramLayers	MATRICES_COLOR	Lnet/minecraft/client/gl/ShaderProgramLayer$Stage;
 accessible	field	net/minecraft/client/gl/ShaderProgramLayers	POSITION_COLOR	Lnet/minecraft/client/gl/ShaderProgramLayer$Stage;
 accessible	field	net/minecraft/client/gl/ShaderProgramLayers	RENDERTYPE_LINES	Lnet/minecraft/client/gl/ShaderProgramLayer$Stage;
 accessible	field	net/minecraft/client/MinecraftClient	itemUseCooldown	I