fix another small bug

Author: moehreag

1.20/src/main/java/io/github/axolotlclient/waypoints/waypoints/WaypointRenderer.java

@@ -23,6 +23,8 @@
 package io.github.axolotlclient.waypoints.waypoints;
 
 import java.lang.Math;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 
 import com.mojang.blaze3d.systems.RenderSystem;
@@ -46,6 +48,7 @@ public class WaypointRenderer {
 	private final Minecraft minecraft = Minecraft.getInstance();
 	private final Matrix4f view = new Matrix4f();
 	private final Vector4f viewProj = new Vector4f();
+	private final Set<Waypoint> worldRendererWaypoints = new HashSet<>();
 
 	public void render(PoseStack stack, MultiBufferSource.BufferSource source, float tick) {
 		var profiler = Minecraft.getInstance().getProfiler();
@@ -56,6 +59,7 @@ public void render(PoseStack stack, MultiBufferSource.BufferSource source, float
 		minecraft.gameRenderer.resetProjectionMatrix(minecraft.gameRenderer.getProjectionMatrix(((GameRendererAccessor) minecraft.gameRenderer).invokeGetFov(cam, 0, false)));
 		RenderSystem.enableBlend();
 		float fov = (float) ((GameRendererAccessor) minecraft.gameRenderer).invokeGetFov(cam, tick, true);
+		worldRendererWaypoints.clear();
 
 		for (Waypoint waypoint : AxolotlClientWaypoints.getCurrentWaypoints()) {
 			if (waypoint.closerToThan(camPos.x(), camPos.y(), camPos.z(), CUTOFF_DIST / minecraft.getWindow().getGuiScale())) {
@@ -85,6 +89,7 @@ private void renderWaypoint(Waypoint waypoint, PoseStack stack, Vec3 camPos, Cam
 		if (projWidth < width && projHeight < height) {
 			return;
 		}
+		worldRendererWaypoints.add(waypoint);
 
 		stack.pushPose();
 		stack.translate(waypoint.x() - camPos.x(), waypoint.y() - camPos.y(), waypoint.z() - camPos.z());
@@ -201,7 +206,7 @@ private void renderWaypoint(Waypoint waypoint, GuiGraphics graphics, float tick,
 			pose.popPose();
 		}
 
-		if ((projWidth >= width || projHeight >= height) && _3dOnScreen) {
+		if ((projWidth >= width || projHeight >= height) && _3dOnScreen && worldRendererWaypoints.contains(waypoint)) {
 			return;
 		}
 

1.21.8/src/main/java/io/github/axolotlclient/waypoints/waypoints/WaypointRenderer.java

@@ -22,6 +22,8 @@
 
 package io.github.axolotlclient.waypoints.waypoints;
 
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 
 import com.mojang.blaze3d.ProjectionType;
@@ -56,7 +58,7 @@ public class WaypointRenderer {
 	private final RenderType QUADS = RenderType.create("waypoint_quads", 192 * 8, false, true, RenderPipelines.GUI, RenderType.CompositeState.builder().createCompositeState(false));
 	private final Matrix4f view = new Matrix4f();
 	private final Vector4f viewProj = new Vector4f();
-
+	private final Set<Waypoint> worldRendererWaypoints = new HashSet<>();
 
 	public void render(GraphicsResourceAllocator allocator, LevelTargetBundle targets, DeltaTracker deltaTracker) {
 		if (!AxolotlClientWaypoints.renderWaypoints.get()) return;
@@ -80,6 +82,7 @@ public void render(GraphicsResourceAllocator allocator, LevelTargetBundle target
 			stack.pushPose();
 			stack.mulPose(cam.rotation().invert());
 			var camPos = AxolotlClientWaypoints.WAYPOINT_RENDERER.minecraft.gameRenderer.getMainCamera().getPosition();
+			worldRendererWaypoints.clear();
 
 			for (Waypoint waypoint : AxolotlClientWaypoints.getCurrentWaypoints()) {
 				profiler.push(waypoint.name());
@@ -110,6 +113,7 @@ private void renderWaypoint(Waypoint waypoint, PoseStack stack, Vec3 camPos, Cam
 		if (projWidth < width && projHeight < height) {
 			return;
 		}
+		worldRendererWaypoints.add(waypoint);
 
 		stack.pushPose();
 		stack.translate(waypoint.x() - camPos.x(), waypoint.y() - camPos.y(), waypoint.z() - camPos.z());
@@ -226,7 +230,7 @@ private void renderWaypoint(Waypoint waypoint, GuiGraphics graphics, DeltaTracke
 			pose.popMatrix();
 		}
 
-		if ((projWidth >= width || projHeight >= height) && _3dOnScreen) {
+		if ((projWidth >= width || projHeight >= height) && _3dOnScreen && worldRendererWaypoints.contains(waypoint)) {
 			return;
 		}
 

1.21/src/main/java/io/github/axolotlclient/waypoints/waypoints/WaypointRenderer.java

@@ -23,6 +23,8 @@
 package io.github.axolotlclient.waypoints.waypoints;
 
 import java.lang.Math;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 
 import com.mojang.blaze3d.vertex.PoseStack;
@@ -46,7 +48,7 @@ public class WaypointRenderer {
 	private final Minecraft minecraft = Minecraft.getInstance();
 	private final Matrix4f view = new Matrix4f();
 	private final Vector4f viewProj = new Vector4f();
-
+	private final Set<Waypoint> worldRendererWaypoints = new HashSet<>();
 
 	public void render(DeltaTracker deltaTracker) {
 		if (!AxolotlClientWaypoints.renderWaypoints.get()) return;
@@ -63,6 +65,7 @@ public void render(DeltaTracker deltaTracker) {
 		stack.mulPose(cam.rotation().invert());
 		var camPos = minecraft.gameRenderer.getMainCamera().getPosition();
 		float fov = (float) ((GameRendererAccessor) minecraft.gameRenderer).invokeGetFov(cam, deltaTracker.getGameTimeDeltaPartialTick(true), true);
+		worldRendererWaypoints.clear();
 
 		for (Waypoint waypoint : AxolotlClientWaypoints.getCurrentWaypoints()) {
 			profiler.push(waypoint.name());
@@ -91,6 +94,7 @@ private void renderWaypoint(Waypoint waypoint, PoseStack stack, Vec3 camPos, Cam
 		if (projWidth < width && projHeight < height) {
 			return;
 		}
+		worldRendererWaypoints.add(waypoint);
 
 		stack.pushPose();
 		stack.translate(waypoint.x() - camPos.x(), waypoint.y() - camPos.y(), waypoint.z() - camPos.z());
@@ -207,7 +211,7 @@ private void renderWaypoint(Waypoint waypoint, GuiGraphics graphics, DeltaTracke
 			pose.popPose();
 		}
 
-		if ((projWidth >= width || projHeight >= height) && _3dOnScreen) {
+		if ((projWidth >= width || projHeight >= height) && _3dOnScreen && worldRendererWaypoints.contains(waypoint)) {
 			return;
 		}
 

1.8.9/src/main/java/io/github/axolotlclient/waypoints/waypoints/WaypointRenderer.java

@@ -51,7 +51,6 @@ public class WaypointRenderer {
 	private final Minecraft minecraft = Minecraft.getInstance();
 	private final Matrix4f view = new Matrix4f();
 	private final Vector4f viewProj = new Vector4f();
-
 	private final Set<Waypoint> worldRendererWaypoints = new HashSet<>();
 
 	public void render(float f) {