Update FeatureButton, XRayHack, and WurstLogo for 1.21.9 compatibility

Author: cev-api

README.md

@@ -21,6 +21,7 @@
 import net.wurstclient.hacks.TooManyHaxHack;
 import net.wurstclient.util.ChatUtils;
 import net.wurstclient.util.RenderUtils;
+import org.lwjgl.glfw.GLFW;
 
 public final class FeatureButton extends Component
 {
@@ -30,6 +31,11 @@ public final class FeatureButton extends Component
 	private final Feature feature;
 	private final boolean hasSettings;
 
+	public Feature getFeature()
+	{
+		return feature;
+	}
+	
 	private Window settingsWindow;
 
 	public FeatureButton(Feature feature)
@@ -44,7 +50,19 @@ public FeatureButton(Feature feature)
 	public void handleMouseClick(double mouseX, double mouseY, int mouseButton,
 		Click context)
 	{
-		if(mouseButton != 0)
+		// middle click toggles favorites
+		if(mouseButton == GLFW.GLFW_MOUSE_BUTTON_MIDDLE)
+		{
+			if(feature instanceof net.wurstclient.hack.Hack)
+			{
+				net.wurstclient.hack.Hack h =
+					(net.wurstclient.hack.Hack)feature;
+				h.setFavorite(!h.isFavorite());
+			}
+			return;
+		}
+		
+		if(mouseButton != GLFW.GLFW_MOUSE_BUTTON_LEFT)
 			return;
 
 		if(hasSettings && (mouseX > getX() + getWidth() - 12

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

@@ -16,6 +16,8 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.Click;
+import net.minecraft.client.input.KeyInput;
 import net.minecraft.client.gui.Drawable;
 import net.minecraft.client.gui.screen.ConfirmScreen;
 import net.minecraft.client.gui.screen.Screen;
@@ -134,36 +136,37 @@ public void init()
 	}
 
 	@Override
-	public boolean mouseClicked(double mouseX, double mouseY, int mouseButton)
+	public boolean mouseClicked(Click context, boolean doubleClick)
 	{
-		typeNameField.mouseClicked(mouseX, mouseY, mouseButton);
-		return super.mouseClicked(mouseX, mouseY, mouseButton);
+		typeNameField.mouseClicked(context, doubleClick);
+		return super.mouseClicked(context, doubleClick);
 	}
 
 	@Override
-	public boolean keyPressed(int keyCode, int scanCode, int int_3)
+	public boolean keyPressed(KeyInput keyInput)
 	{
+		int keyCode = keyInput.key();
 		switch(keyCode)
 		{
 			case GLFW.GLFW_KEY_ENTER:
 			if(addButton.active)
-				addButton.onPress();
+				addButton.onPress(keyInput);
 			break;
 
 			case GLFW.GLFW_KEY_DELETE:
 			if(!typeNameField.isFocused())
-				removeButton.onPress();
+				removeButton.onPress(keyInput);
 			break;
 
 			case GLFW.GLFW_KEY_ESCAPE:
-			doneButton.onPress();
+			doneButton.onPress(keyInput);
 			break;
 
 			default:
 			break;
 		}
 
-		return super.keyPressed(keyCode, scanCode, int_3);
+		return super.keyPressed(keyInput);
 	}
 
 	@Override
@@ -263,7 +266,6 @@ public void render(DrawContext context, int mouseX, int mouseY,
 		context.fill(x0 - 16, y0, x0, y1, border);
 		context.fill(x0 - 15, y0 + 1, x0 - 1, y1 - 1, black);
 
-		context.state.goDownLayer();
 		matrixStack.popMatrix();
 	}
 
@@ -297,8 +299,7 @@ public net.minecraft.text.Text getNarration()
 		}
 
 		@Override
-		public void render(DrawContext context, int index, int y, int x,
-			int entryWidth, int entryHeight, int mouseX, int mouseY,
+		public void render(DrawContext context, int mouseX, int mouseY,
 			boolean hovered, float tickDelta)
 		{
 			TextRenderer tr = client.textRenderer;
@@ -311,6 +312,8 @@ public void render(DrawContext context, int index, int y, int x,
 					.getName().getString();
 			else
 				display = "\u00a7okeyword\u00a7r";
+			int x = getContentX();
+			int y = getContentY();
 			context.drawText(tr, display, x + 8, y,
 				net.wurstclient.util.WurstColors.VERY_LIGHT_GRAY, false);
 			context.drawText(tr, typeName, x + 8, y + 10, Colors.LIGHT_GRAY,
@@ -324,7 +327,7 @@ private final class ListGui
 		public ListGui(MinecraftClient minecraft,
 			EditEntityTypeListScreen screen, List<String> list)
 		{
-			super(minecraft, screen.width, screen.height - 96, 36, 30, 0);
+			super(minecraft, screen.width, screen.height - 96, 36, 30);
 			list.stream().map(EditEntityTypeListScreen.Entry::new)
 				.forEach(this::addEntry);
 		}

src/main/java/net/wurstclient/clickgui/screens/EditEntityTypeListScreen.java

@@ -361,7 +361,8 @@ private void usePlayerPos()
 	{
 		if(client.player == null)
 			return;
-		BlockPos p = BlockPos.ofFloored(client.player.getPos());
+		BlockPos p = BlockPos.ofFloored(client.player.getX(),
+			client.player.getY(), client.player.getZ());
 		xField.setText(Integer.toString(p.getX()));
 		yField.setText(Integer.toString(p.getY()));
 		zField.setText(Integer.toString(p.getZ()));

src/main/java/net/wurstclient/clickgui/screens/WaypointEditScreen.java

@@ -127,7 +127,8 @@ protected void init()
 					System.currentTimeMillis());
 				w.setName("New Waypoint");
 				if(client.player != null)
-					w.setPos(BlockPos.ofFloored(client.player.getPos()));
+					w.setPos(BlockPos.ofFloored(client.player.getX(),
+						client.player.getY(), client.player.getZ()));
 				else
 					w.setPos(BlockPos.ORIGIN);
 				w.setDimension(currentDim());

src/main/java/net/wurstclient/clickgui/screens/WaypointsScreen.java

@@ -89,7 +89,8 @@ public void onUpdate()
 		// Do not add new points while paused
 		if(paused.isChecked())
 			return;
-		Vec3d here = MC.player.getPos();
+		Vec3d here =
+			new Vec3d(MC.player.getX(), MC.player.getY(), MC.player.getZ());
 		if(points.isEmpty())
 		{
 			points.add(here);

src/main/java/net/wurstclient/hacks/BreadcrumbsHack.java

@@ -114,10 +114,10 @@ public void onUpdate()
 			// find missing
 			var lastMap = new HashMap<UUID, PlayerListEntry>();
 			for(var e : lastList)
-				lastMap.put(e.getProfile().getId(), e);
+				lastMap.put(e.getProfile().id(), e);
 			var nowMap = new HashMap<UUID, PlayerListEntry>();
 			for(var e : nowList)
-				nowMap.put(e.getProfile().getId(), e);
+				nowMap.put(e.getProfile().id(), e);
 			for(var id : lastMap.keySet())
 				if(!nowMap.containsKey(id))
 				{
@@ -231,7 +231,17 @@ private void drawWorldLabel(MatrixStack matrices, String text, double x,
 		net.minecraft.util.math.Vec3d cam =
 			net.wurstclient.util.RenderUtils.getCameraPos();
 		matrices.translate(x - cam.x, y - cam.y, z - cam.z);
-		matrices.multiply(MC.getEntityRenderDispatcher().getRotation());
+		// Face the camera (billboard)
+		var camEntity = MC.getCameraEntity();
+		if(camEntity != null)
+		{
+			matrices.multiply(net.minecraft.util.math.RotationAxis.POSITIVE_Y
+				.rotationDegrees(-camEntity.getYaw()));
+			matrices.multiply(net.minecraft.util.math.RotationAxis.POSITIVE_X
+				.rotationDegrees(camEntity.getPitch()));
+		}
+		matrices.multiply(net.minecraft.util.math.RotationAxis.POSITIVE_Y
+			.rotationDegrees(180.0F));
 		float s = 0.025F * scale;
 		matrices.scale(s, -s, s);
 		TextRenderer tr = MC.textRenderer;

src/main/java/net/wurstclient/hacks/LogoutSpotsHack.java

@@ -102,7 +102,7 @@ public void onRightClick(RightClickEvent event)
 					Box box = EntityUtils.getLerpedBox(frame, 0.0f);
 					if(box.contains(hitPos))
 					{
-						ehr = new EntityHitResult(frame, frame.getPos());
+						ehr = new EntityHitResult(frame, hitPos);
 						break;
 					}
 				}

src/main/java/net/wurstclient/hacks/SignFramePTHack.java

@@ -586,7 +586,17 @@ private void drawWorldLabel(MatrixStack matrices, String text, double x,
 		matrices.push();
 		Vec3d cam = RenderUtils.getCameraPos();
 		matrices.translate(x - cam.x, y - cam.y, z - cam.z);
-		matrices.multiply(MC.getEntityRenderDispatcher().getRotation());
+		// Face the camera (billboard)
+		var camEntity = MC.getCameraEntity();
+		if(camEntity != null)
+		{
+			matrices.multiply(net.minecraft.util.math.RotationAxis.POSITIVE_Y
+				.rotationDegrees(-camEntity.getYaw()));
+			matrices.multiply(net.minecraft.util.math.RotationAxis.POSITIVE_X
+				.rotationDegrees(camEntity.getPitch()));
+		}
+		matrices.multiply(net.minecraft.util.math.RotationAxis.POSITIVE_Y
+			.rotationDegrees(180.0F));
 		float s = 0.025F * scale;
 		matrices.scale(s, -s, s);
 		// After scaling, translate by pixel offset to separate lines
@@ -608,6 +618,8 @@ private void drawBeaconBeam(MatrixStack matrices, BlockPos pos, int color,
 	{
 		if(MC.world == null)
 			return;
+		@SuppressWarnings("all")
+		// noinspection RedundantQualifierName
 		Waypoint.BeaconMode safeMode =
 			mode == null ? Waypoint.BeaconMode.OFF : mode;
 		if(safeMode == Waypoint.BeaconMode.OFF)
@@ -765,7 +777,7 @@ public void onRenderGUI(DrawContext context, float partialTicks)
 			String coords = dir + ": " + ix + " " + iy + " " + iz;
 			int cw = tr.getWidth(coords);
 			int cx = centerX - cw / 2;
-			int cy = Math.max(2, barY - 12); // avoid off-screen
+			int cy = Math.max(2, barY - 13); // was 12, now 13
 			context.drawText(tr, coords, cx, cy, 0xFFFFFFFF, false);
 		}
 
@@ -874,7 +886,7 @@ public void onRenderGUI(DrawContext context, float partialTicks)
 			int dw = tr.getWidth(distText);
 			int titleX = centerX - tw / 2;
 			int distX = centerX - dw / 2;
-			int titleY = barY + barH + 2;
+			int titleY = barY + barH + 3; // was 2, now 3 for 1.21.9
 			int distY = titleY + 10;
 			// apply compass opacity to text
 			double opaText =

src/main/java/net/wurstclient/hacks/WaypointsHack.java

@@ -318,6 +318,8 @@ public void onUpdate()
 				oreNamesCache = new ArrayList<>(ores.getBlockNames());
 				lastOresHash = ores.getBlockNames().hashCode();
 				rebuildOreCaches();
+				// reset search and highlights
+				resetCoordinatorAndHighlights();
 				MC.worldRenderer.reload();
 			}else // switched to QUERY
 			{
@@ -330,6 +332,8 @@ public void onUpdate()
 					oreKeywords = Stream.of(q.split(","))
 						.map(s -> s.trim().toLowerCase(java.util.Locale.ROOT))
 						.filter(s -> !s.isEmpty()).toArray(String[]::new);
+				// reset search and highlights
+				resetCoordinatorAndHighlights();
 				MC.worldRenderer.reload();
 			}
 		}
@@ -342,6 +346,8 @@ public void onUpdate()
 				lastOresHash = currentHash;
 				oreNamesCache = new ArrayList<>(ores.getBlockNames());
 				rebuildOreCaches();
+				// reset so results update instantly
+				resetCoordinatorAndHighlights();
 				MC.worldRenderer.reload();
 			}else
 			{
@@ -375,6 +381,8 @@ public void onUpdate()
 			{
 				oreKeywords = newKw;
 				oreExactIds = null; // force keyword path
+				// reset so results update instantly
+				resetCoordinatorAndHighlights();
 				MC.worldRenderer.reload();
 			}
 		}
@@ -642,4 +650,16 @@ public void openBlockListEditor(Screen prevScreen)
 	}
 
 	// See AbstractBlockRenderContextMixin, RenderLayersMixin
+	
+	private void resetCoordinatorAndHighlights()
+	{
+		// Cancel current searches and clear cached highlights to avoid stale
+		// results persisting after mode/list/query changes.
+		coordinator.reset();
+		highlightPositions.clear();
+		visibleBoxes.clear();
+		highlightPositionsUpToDate = false;
+		visibleBoxesUpToDate = false;
+		lastCoordinatorChangeMs = System.currentTimeMillis();
+	}
 }