Merge branch '1.21.3'

gradle.properties

@@ -5,15 +5,15 @@ org.gradle.parallel=true
 # Fabric Properties
 # check these at https://fabricmc.net/develop/ and
 # https://modrinth.com/mod/fabric-api/versions
-minecraft_version=1.21.1
-yarn_mappings=1.21.1+build.3
+minecraft_version=1.21.3
+yarn_mappings=1.21.3+build.2
 loader_version=0.16.7
 
 # Fabric API
-fabric_version=0.105.0+1.21.1
+fabric_version=0.106.1+1.21.3
 
 # Mod Properties
-mod_version = v7.46.1-MC1.21.1
+mod_version = v7.46.1-MC1.21.3
 maven_group = net.wurstclient
 archives_base_name = Wurst-Client
 

src/main/java/net/wurstclient/WurstClient.java

@@ -51,7 +51,7 @@ public enum WurstClient
 	public static IMinecraftClient IMC;
 
 	public static final String VERSION = "7.46.1";
-	public static final String MC_VERSION = "1.21.1";
+	public static final String MC_VERSION = "1.21.3";
 
 	private WurstAnalytics analytics;
 	private EventManager eventManager;

src/main/java/net/wurstclient/ai/PathFinder.java

@@ -184,7 +184,7 @@ private ArrayList<PathPos> getNeighbors(PathPos pos)
 		}
 
 		// up
-		if(pos.getY() < MC.world.getTopY() && canGoThrough(up.up())
+		if(pos.getY() < MC.world.getTopYInclusive() && canGoThrough(up.up())
 			&& (flying || onGround || canClimbUpAt(pos))
 			&& (flying || canClimbUpAt(pos) || goal.equals(up)
 				|| canSafelyStandOn(north) || canSafelyStandOn(east)

src/main/java/net/wurstclient/ai/PathRenderer.java

@@ -12,9 +12,9 @@
 
 import com.mojang.blaze3d.systems.RenderSystem;
 
+import net.minecraft.client.gl.ShaderProgramKeys;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.BufferRenderer;
-import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormats;
@@ -28,7 +28,7 @@ public static void renderArrow(MatrixStack matrixStack, BlockPos start,
 		BlockPos end, RegionPos region)
 	{
 		Tessellator tessellator = RenderSystem.renderThreadTesselator();
-		RenderSystem.setShader(GameRenderer::getPositionProgram);
+		RenderSystem.setShader(ShaderProgramKeys.POSITION);
 		BufferBuilder bufferBuilder = tessellator
 			.begin(VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION);
 
@@ -111,7 +111,7 @@ public static void renderNode(MatrixStack matrixStack, BlockPos pos,
 		Matrix4f matrix = matrixStack.peek().getPositionMatrix();
 		Tessellator tessellator = RenderSystem.renderThreadTesselator();
 
-		RenderSystem.setShader(GameRenderer::getPositionProgram);
+		RenderSystem.setShader(ShaderProgramKeys.POSITION);
 		BufferBuilder bufferBuilder = tessellator
 			.begin(VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION);
 

src/main/java/net/wurstclient/altmanager/AltRenderer.java

@@ -16,11 +16,11 @@
 import com.mojang.authlib.GameProfile;
 import com.mojang.blaze3d.systems.RenderSystem;
 
+import net.minecraft.client.gl.ShaderProgramKeys;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.BufferRenderer;
-import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormats;
@@ -64,7 +64,7 @@ private static void drawTexture(DrawContext context, int x, int y, float u,
 		float vOverFh = v / fh;
 		float vPlusHOverFh = (v + h) / fh;
 
-		RenderSystem.setShader(GameRenderer::getPositionTexProgram);
+		RenderSystem.setShader(ShaderProgramKeys.POSITION_TEX);
 		MatrixStack matrixStack = context.getMatrices();
 		Matrix4f matrix4f = matrixStack.peek().getPositionMatrix();
 		BufferBuilder bufferBuilder = Tessellator.getInstance()

src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java

@@ -28,14 +28,14 @@
 import com.google.gson.JsonObject;
 import com.mojang.blaze3d.systems.RenderSystem;
 
+import net.minecraft.client.gl.ShaderProgramKeys;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.Drawable;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.BufferRenderer;
-import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormats;
@@ -351,7 +351,7 @@ public void render(DrawContext context, int mouseX, int mouseY,
 		MatrixStack matrixStack = context.getMatrices();
 		Matrix4f matrix = matrixStack.peek().getPositionMatrix();
 		Tessellator tessellator = RenderSystem.renderThreadTesselator();
-		RenderSystem.setShader(GameRenderer::getPositionProgram);
+		RenderSystem.setShader(ShaderProgramKeys.POSITION);
 
 		// skin preview
 		AltRenderer.drawAltBack(context, nameOrEmailBox.getText(),

src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java

@@ -30,6 +30,7 @@
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
 import net.fabricmc.fabric.api.client.screen.v1.Screens;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gl.ShaderProgramKeys;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.Drawable;
 import net.minecraft.client.gui.screen.ConfirmScreen;
@@ -39,7 +40,6 @@
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.BufferRenderer;
-import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormats;
@@ -423,7 +423,7 @@ public void render(DrawContext context, int mouseX, int mouseY,
 		MatrixStack matrixStack = context.getMatrices();
 		Matrix4f matrix = matrixStack.peek().getPositionMatrix();
 		Tessellator tessellator = RenderSystem.renderThreadTesselator();
-		RenderSystem.setShader(GameRenderer::getPositionProgram);
+		RenderSystem.setShader(ShaderProgramKeys.POSITION);
 
 		// skin preview
 		if(listGui.getSelectedSlot() != -1
@@ -453,7 +453,7 @@ public void render(DrawContext context, int mouseX, int mouseY,
 		// red flash for errors
 		if(errorTimer > 0)
 		{
-			RenderSystem.setShader(GameRenderer::getPositionProgram);
+			RenderSystem.setShader(ShaderProgramKeys.POSITION);
 			GL11.glDisable(GL11.GL_CULL_FACE);
 			GL11.glEnable(GL11.GL_BLEND);
 
@@ -646,7 +646,7 @@ protected void renderItem(DrawContext context, int id, int x, int y,
 			MatrixStack matrixStack = context.getMatrices();
 			Matrix4f matrix = matrixStack.peek().getPositionMatrix();
 			Tessellator tessellator = RenderSystem.renderThreadTesselator();
-			RenderSystem.setShader(GameRenderer::getPositionProgram);
+			RenderSystem.setShader(ShaderProgramKeys.POSITION);
 
 			// green glow when logged in
 			if(client.getSession().getUsername().equals(alt.getName()))
@@ -673,6 +673,7 @@ protected void renderItem(DrawContext context, int id, int x, int y,
 			}
 
 			// face
+			context.draw();
 			AltRenderer.drawAltFace(context, alt.getName(), x + 1, y + 1, 24,
 				24, isSelectedItem(id));
 

src/main/java/net/wurstclient/clickgui/ClickGui.java

@@ -28,10 +28,10 @@
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gl.ShaderProgramKeys;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.BufferRenderer;
-import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormats;
@@ -563,7 +563,7 @@ public void renderTooltip(DrawContext context, int mouseX, int mouseY)
 		matrixStack.translate(0, 0, 300);
 		Matrix4f matrix = matrixStack.peek().getPositionMatrix();
 
-		RenderSystem.setShader(GameRenderer::getPositionProgram);
+		RenderSystem.setShader(ShaderProgramKeys.POSITION);
 
 		// background
 		RenderUtils.setShaderColor(bgColor, ttOpacity);
@@ -647,7 +647,7 @@ private void renderWindow(DrawContext context, Window window, int mouseX,
 		MatrixStack matrixStack = context.getMatrices();
 		Matrix4f matrix = matrixStack.peek().getPositionMatrix();
 		Tessellator tessellator = RenderSystem.renderThreadTesselator();
-		RenderSystem.setShader(GameRenderer::getPositionProgram);
+		RenderSystem.setShader(ShaderProgramKeys.POSITION);
 
 		if(window.isMinimized())
 			y2 = y3;
@@ -750,11 +750,7 @@ private void renderWindow(DrawContext context, Window window, int mouseX,
 			bufferBuilder.vertex(matrix, x4, y3, 0);
 			BufferRenderer.drawWithGlobalProgram(bufferBuilder.end());
 
-			net.minecraft.client.util.Window sr = MC.getWindow();
-			int sf = (int)sr.getScaleFactor();
-			GL11.glScissor(x1 * sf, (sr.getScaledHeight() - y2) * sf,
-				window.getWidth() * sf, (y2 - y3) * sf);
-			GL11.glEnable(GL11.GL_SCISSOR_TEST);
+			RenderUtils.enableScissor(context, x1, y3, x2, y2);
 
 			matrixStack.push();
 			matrixStack.translate(x1, y4, 0);
@@ -806,11 +802,11 @@ private void renderWindow(DrawContext context, Window window, int mouseX,
 
 			matrixStack.pop();
 			matrix = matrixStack.peek().getPositionMatrix();
-			GL11.glDisable(GL11.GL_SCISSOR_TEST);
+			RenderUtils.disableScissor(context);
 		}
 
-		GL11.glEnable(GL11.GL_BLEND);
-		GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+		RenderSystem.enableBlend();
+		RenderSystem.defaultBlendFunc();
 
 		// window outline
 		RenderUtils.setShaderColor(acColor, 0.5F);
@@ -907,7 +903,7 @@ private void renderTitleBarButton(MatrixStack matrixStack, int x1, int y1,
 
 		Matrix4f matrix = matrixStack.peek().getPositionMatrix();
 		Tessellator tessellator = RenderSystem.renderThreadTesselator();
-		RenderSystem.setShader(GameRenderer::getPositionProgram);
+		RenderSystem.setShader(ShaderProgramKeys.POSITION);
 
 		// button background
 		RenderUtils.setShaderColor(bgColor,

src/main/java/net/wurstclient/clickgui/ComboBoxPopup.java

@@ -13,10 +13,10 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gl.ShaderProgramKeys;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.BufferRenderer;
-import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormats;
@@ -93,7 +93,7 @@ public void render(DrawContext context, int mouseX, int mouseY)
 			if(value == setting.getSelected())
 				continue;
 
-			RenderSystem.setShader(GameRenderer::getPositionProgram);
+			RenderSystem.setShader(ShaderProgramKeys.POSITION);
 
 			yi1 += 11;
 			int yi2 = yi1 + 11;

src/main/java/net/wurstclient/clickgui/components/AbstractListEditButton.java

@@ -14,10 +14,10 @@
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gl.ShaderProgramKeys;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.BufferRenderer;
-import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormats;
@@ -85,7 +85,7 @@ public void render(DrawContext context, int mouseX, int mouseY,
 		MatrixStack matrixStack = context.getMatrices();
 		Matrix4f matrix = matrixStack.peek().getPositionMatrix();
 		Tessellator tessellator = RenderSystem.renderThreadTesselator();
-		RenderSystem.setShader(GameRenderer::getPositionProgram);
+		RenderSystem.setShader(ShaderProgramKeys.POSITION);
 
 		// tooltip
 		if(hText)

src/main/java/net/wurstclient/clickgui/components/BlockComponent.java

@@ -14,11 +14,11 @@
 
 import net.minecraft.block.Block;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gl.ShaderProgramKeys;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.BufferRenderer;
-import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormats;
@@ -89,7 +89,7 @@ public void render(DrawContext context, int mouseX, int mouseY,
 		MatrixStack matrixStack = context.getMatrices();
 		Matrix4f matrix = matrixStack.peek().getPositionMatrix();
 		Tessellator tessellator = RenderSystem.renderThreadTesselator();
-		RenderSystem.setShader(GameRenderer::getPositionProgram);
+		RenderSystem.setShader(ShaderProgramKeys.POSITION);
 
 		// tooltip
 		if(hText)

src/main/java/net/wurstclient/clickgui/components/CheckboxComponent.java

@@ -13,10 +13,10 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gl.ShaderProgramKeys;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.BufferRenderer;
-import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormats;
@@ -70,7 +70,7 @@ public void render(DrawContext context, int mouseX, int mouseY,
 
 		boolean hovering = isHovering(mouseX, mouseY, x1, x2, y1, y2);
 
-		RenderSystem.setShader(GameRenderer::getPositionProgram);
+		RenderSystem.setShader(ShaderProgramKeys.POSITION);
 
 		if(hovering && mouseX >= x3)
 			setTooltip();

src/main/java/net/wurstclient/clickgui/components/ColorComponent.java

@@ -14,10 +14,10 @@
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gl.ShaderProgramKeys;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.BufferRenderer;
-import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormats;
@@ -70,7 +70,7 @@ public void render(DrawContext context, int mouseX, int mouseY,
 
 		boolean hovering = isHovering(mouseX, mouseY, x1, x2, y1, y2);
 
-		RenderSystem.setShader(GameRenderer::getPositionProgram);
+		RenderSystem.setShader(ShaderProgramKeys.POSITION);
 
 		if(hovering)
 			if(mouseY < y3)

src/main/java/net/wurstclient/clickgui/components/ComboBoxComponent.java

@@ -17,10 +17,10 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gl.ShaderProgramKeys;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.BufferRenderer;
-import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormats;
@@ -120,7 +120,7 @@ public void render(DrawContext context, int mouseX, int mouseY,
 		boolean hText = hovering && mouseX < x4;
 		boolean hBox = hovering && mouseX >= x4;
 
-		RenderSystem.setShader(GameRenderer::getPositionProgram);
+		RenderSystem.setShader(ShaderProgramKeys.POSITION);
 
 		// tooltip
 		if(hText)

src/main/java/net/wurstclient/clickgui/components/FeatureButton.java

@@ -16,10 +16,10 @@
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gl.ShaderProgramKeys;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.BufferRenderer;
-import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormats;
@@ -112,7 +112,7 @@ public void render(DrawContext context, int mouseX, int mouseY,
 		boolean hHack = hovering && mouseX < x3;
 		boolean hSettings = hovering && mouseX >= x3;
 
-		RenderSystem.setShader(GameRenderer::getPositionProgram);
+		RenderSystem.setShader(ShaderProgramKeys.POSITION);
 
 		if(hHack)
 			setTooltip();