fix gui bugs

(1.8.9) fix waypoint rendering more

Author: moehreag

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

@@ -104,10 +104,10 @@ private void renderWaypoint(Waypoint waypoint, PoseStack stack, Vec3 camPos, Cam
 	private void fillRect(PoseStack stack, MultiBufferSource.BufferSource source, float x, float y, float z, float x2, float y2, int color) {
 		var buf = source.getBuffer(RenderType.gui());
 		var matrix = stack.last().pose();
-		buf.vertex(matrix, x, y, z).color(color).uv2(0xF000F0).endVertex();
-		buf.vertex(matrix, x, y2, z).color(color).uv2(0xF000F0).endVertex();
-		buf.vertex(matrix, x2, y2, z).color(color).uv2(0xF000F0).endVertex();
-		buf.vertex(matrix, x2, y, z).color(color).uv2(0xF000F0).endVertex();
+		buf.vertex(matrix, x, y, z).color(color).endVertex();
+		buf.vertex(matrix, x, y2, z).color(color).endVertex();
+		buf.vertex(matrix, x2, y2, z).color(color).endVertex();
+		buf.vertex(matrix, x2, y, z).color(color).endVertex();
 		source.endBatch();
 	}
 

1.20/src/main/java/io/github/axolotlclient/waypoints/waypoints/gui/WaypointsScreen.java

@@ -74,6 +74,7 @@ protected void init() {
 
 	@Override
 	public void onClose() {
+		AxolotlClientWaypoints.WAYPOINT_STORAGE.save();
 		minecraft.setScreen(parent);
 	}
 
@@ -157,8 +158,8 @@ public void updateSize(int width, HeaderAndFooterLayout layout) {
 		}
 
 		@Override
-		protected void renderList(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) {
-			super.renderList(guiGraphics, mouseX, mouseY, partialTick);
+		protected int getScrollbarPosition() {
+			return getRowRight()+10;
 		}
 
 		private class Entry extends ContainerObjectSelectionList.Entry<Entry> {

1.21.8/src/main/java/io/github/axolotlclient/waypoints/waypoints/gui/WaypointsScreen.java

@@ -77,6 +77,7 @@ protected void init() {
 
 	@Override
 	public void onClose() {
+		AxolotlClientWaypoints.WAYPOINT_STORAGE.save();
 		minecraft.setScreen(parent);
 	}
 

1.21/src/main/java/io/github/axolotlclient/waypoints/waypoints/gui/WaypointsScreen.java

@@ -77,6 +77,7 @@ protected void init() {
 
 	@Override
 	public void onClose() {
+		AxolotlClientWaypoints.WAYPOINT_STORAGE.save();
 		minecraft.setScreen(parent);
 	}
 

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

@@ -33,10 +33,12 @@
 import com.mojang.blaze3d.vertex.Tessellator;
 import io.github.axolotlclient.AxolotlClientConfig.api.util.Colors;
 import io.github.axolotlclient.AxolotlClientConfig.impl.util.DrawUtil;
+import io.github.axolotlclient.modules.freelook.Perspective;
 import io.github.axolotlclient.waypoints.AxolotlClientWaypoints;
 import io.github.axolotlclient.waypoints.mixin.GameRendererAccessor;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiElement;
+import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.Window;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.Vec3d;
@@ -66,11 +68,8 @@ public void render(float f) {
 		GlStateManager.color3f(1, 1, 1);
 		GlStateManager.pushMatrix();
 
-		var camPos = cam.getEyePosition(f);
-		var cpos = camPos.subtract(0, cam.getEyeHeight(), 0);
-		//var camPos = new Vector3d(cam.x, cam.y, cam.z);
-		//var prevCamPos = new Vector3d(cam.prevTickX, cam.prevTickY, cam.prevTickZ);
-		//camPos.sub(prevCamPos).mul(f).add(prevCamPos);
+		var camPos = Camera.getPos(cam, f);
+		var cpos = cam.getEyePosition(f).subtract(0, cam.getEyeHeight(), 0);
 
 		GlStateManager.depthMask(false);
 		GlStateManager.disableDepthTest();
@@ -109,7 +108,11 @@ private void renderWaypoint(Waypoint waypoint, Vec3d camPos, Vec3d camEyePos, fl
 		GlStateManager.translated(waypoint.x() - camEyePos.x, waypoint.y() - camEyePos.y, waypoint.z() - camEyePos.z);
 		var dispatcher = minecraft.getEntityRenderDispatcher();
 		GlStateManager.rotatef(-dispatcher.cameraYaw, 0.0F, 1.0F, 0.0F);
-		GlStateManager.rotatef(dispatcher.cameraPitch, 1.0F, 0.0F, 0.0F);
+		if (Minecraft.getInstance().options.perspective == Perspective.THIRD_PERSON_FRONT.ordinal()) {
+			GlStateManager.rotatef(-dispatcher.cameraPitch, 1.0F, 0.0F, 0.0F);
+		} else {
+			GlStateManager.rotatef(dispatcher.cameraPitch, 1.0F, 0.0F, 0.0F);
+		}
 		float scale = 0.04F;
 		GlStateManager.scalef(-scale, -scale, scale);
 		GlStateManager.enableBlend();
@@ -165,7 +168,7 @@ public void renderWaypoints(float tick) {
 
 	private Matrix4f getProjectionMatrix(float fov) {
 		Matrix4f matrix4f = new Matrix4f();
-		return matrix4f.perspective(fov * ((float) Math.PI / 180F), (float) this.minecraft.width / (float) this.minecraft.height, 0.05F, minecraft.options.viewDistance * 4);
+		return matrix4f.perspective(fov * ((float) Math.PI / 180F), (float) this.minecraft.width / (float) this.minecraft.height, 0.05F, minecraft.options.viewDistance * 2);
 	}
 
 	private void renderWaypoint(Waypoint waypoint, float tick, Entity camera, List<Runnable> positionDrawn, int guiWidth, int guiHeight) {
@@ -175,7 +178,7 @@ private void renderWaypoint(Waypoint waypoint, float tick, Entity camera, List<R
 		int width = textWidth + Waypoint.displayXOffset() * 2;
 		int textHeight = minecraft.textRenderer.fontHeight;
 		int height = textHeight + Waypoint.displayYOffset() * 2;
-		var camPos = camera.getEyePosition(tick);
+		var camPos = Camera.getPos(camera, tick);
 
 		var displayStart = projectToScreen(guiWidth, guiHeight, camPos, fov, width, height, waypoint.x(), waypoint.y(), waypoint.z(), new Vector2f(-(width / 2f * 0.04f), (height / 2f * 0.04f)));
 		var displayEnd = projectToScreen(guiWidth, guiHeight, camPos, fov, width, height, waypoint.x(), waypoint.y(), waypoint.z(), new Vector2f((width / 2f * 0.04f), -(height / 2f * 0.04f)));
@@ -248,10 +251,11 @@ private void renderWaypoint(Waypoint waypoint, float tick, Entity camera, List<R
 	private @Nullable Result projectToScreen(int guiWidth, int guiHeight, Vec3d camPos, float fov, int width, int height, double x, double y, double z, Vector2f orthoOffset) {
 		viewProj.set(x, y, z, 1);
 		var dispatcher = minecraft.getEntityRenderDispatcher();
+		var pitch = Minecraft.getInstance().options.perspective == Perspective.THIRD_PERSON_FRONT.ordinal() ? -dispatcher.cameraPitch : dispatcher.cameraPitch;
 		if (orthoOffset != null) {
 			var vec = new Matrix4f();
 			var camRot = new Quaternionf()
-				.rotationYXZ(-dispatcher.cameraYaw * (float) (Math.PI / 180.0), dispatcher.cameraPitch * (float) (Math.PI / 180.0), 0.0F)
+				.rotationYXZ(-dispatcher.cameraYaw * (float) (Math.PI / 180.0), pitch * (float) (Math.PI / 180.0), 0.0F)
 				.rotateY((float) -(Math.PI)).invert();
 			vec.rotate(camRot.invert(new Quaternionf()));
 			vec.translate(orthoOffset.x(), orthoOffset.y(), 0);
@@ -260,7 +264,7 @@ private void renderWaypoint(Waypoint waypoint, float tick, Entity camera, List<R
 		}
 
 		view.rotation(new Quaternionf()
-			.rotationYXZ(-dispatcher.cameraYaw * (float) (Math.PI / 180.0), dispatcher.cameraPitch * (float) (Math.PI / 180.0), 0.0F)
+			.rotationYXZ(-dispatcher.cameraYaw * (float) (Math.PI / 180.0), pitch * (float) (Math.PI / 180.0), 0.0F)
 			.rotateY((float) -(Math.PI)).invert()).translate((float) -camPos.x, (float) -camPos.y, (float) -camPos.z);
 
 		Matrix4f projection = getProjectionMatrix(fov);

1.8.9/src/main/java/io/github/axolotlclient/waypoints/waypoints/gui/EditWaypointScreen.java

@@ -161,7 +161,7 @@ public void drawWidget(int mouseX, int mouseY, float partialTick) {
 
 		int footerY = height - 33 / 2 - 20 / 2;
 		save = addDrawableChild(new VanillaButtonWidget(width / 2 - 2 - 150, footerY, 150, 20, I18n.translate("gui.done"), btn -> {
-			AxolotlClientWaypoints.WAYPOINT_STORAGE.create(new Waypoint(dimension.getText(), this.x, this.y, this.z, color.getOriginal(), name.getText(), display.getText()));
+			AxolotlClientWaypoints.WAYPOINT_STORAGE.replace(toEdit, new Waypoint(dimension.getText(), this.x, this.y, this.z, color.getOriginal(), name.getText(), display.getText()));
 			minecraft.openScreen(parent);
 		}));
 		addDrawableChild(new VanillaButtonWidget(width / 2 + 20, footerY, 150, 20, I18n.translate("gui.cancel"), btn -> minecraft.openScreen(parent)));

1.8.9/src/main/java/io/github/axolotlclient/waypoints/waypoints/gui/WaypointsScreen.java

@@ -67,6 +67,11 @@ public void onClose() {
 		minecraft.openScreen(parent);
 	}
 
+	@Override
+	public void removed() {
+		AxolotlClientWaypoints.WAYPOINT_STORAGE.save();
+	}
+
 	@Override
 	public void render(int mouseX, int mouseY, float delta) {
 		super.render(mouseX, mouseY, delta);
@@ -99,6 +104,11 @@ public int getRowWidth() {
 			return 300;
 		}
 
+		@Override
+		protected int getScrollbarPositionX() {
+			return getRowRight()+10;
+		}
+
 		private class Entry extends ElementListWidget.Entry<Entry> {
 
 			private final List<ClickableWidget> children = new ArrayList<>();

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Changelog
 
+### 0.0.1-beta.19
+
+- fix some gui bugs
+- (1.8.9) fix more waypoint rendering bugs
+
 ### 0.0.1-beta.18
 
 - (1.8.9) fix waypoint name display positioning

gradle.properties

@@ -6,7 +6,7 @@ org.gradle.parallel=true
 axolotlclient.modules.all=true
 
 # Mod Properties
-version=0.0.1-beta.18+3.1.5
+version=0.0.1-beta.19+3.1.5
 
 maven_group=io.github.axolotlclient.waypoints
 
@@ -18,5 +18,5 @@ osl=0.16.3
 
 legacy_lwgjl3=1.2.9+1.8.9
 
-config=3.0.19-beta.1
+config=3.0.19
 axolotlclient=3.1.5