add profile config support

moehreag · moehreag · commit 9d2c6ed378f2 · 2025-09-19T13:43:39.000+02:00
- fix a bug
diff --git a/1.20/src/main/java/io/github/axolotlclient/waypoints/map/Minimap.java b/1.20/src/main/java/io/github/axolotlclient/waypoints/map/Minimap.java
@@ -29,7 +29,6 @@
 import io.github.axolotlclient.waypoints.HudCreator;
 import io.github.axolotlclient.waypoints.util.ARGB;
 import io.github.axolotlclient.waypoints.waypoints.Waypoint;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
@@ -64,12 +63,11 @@ public class Minimap extends MinimapCommon {
 	private final Minecraft minecraft = Minecraft.getInstance();
 
 	public void init() {
-		minimap.add(enabled, lockMapToNorth, arrowScale, minimapOutline, outlineColor, enableBiomeBlending, mapScale, showWaypoints, showCardinalDirections);
+		super.init();
 		AxolotlClientWaypointsCommon.category.add(Minimap.minimap);
 		if (AxolotlClientWaypointsCommon.AXOLOTLCLIENT_PRESENT) {
 			usingHud = true;
-			var save = HudCreator.createHud(this);
-			ClientLifecycleEvents.CLIENT_STOPPING.register(mc -> save.run());
+			HudCreator.createHud(this);
 		}
 	}
 
diff --git a/1.20/src/main/java/io/github/axolotlclient/waypoints/waypoints/WaypointRenderer.java b/1.20/src/main/java/io/github/axolotlclient/waypoints/waypoints/WaypointRenderer.java
@@ -139,7 +139,7 @@ public void renderWaypoints(GuiGraphics graphics, float delta) {
 	}
 
 	private void renderWaypoint(Waypoint waypoint, GuiGraphics graphics, float tick, Camera camera, List<Runnable> positionDrawn) {
-		var fov = ((GameRendererAccessor) minecraft.gameRenderer).invokeGetFov(camera, tick, false);
+		var fov = ((GameRendererAccessor) minecraft.gameRenderer).invokeGetFov(camera, tick, true);
 		var pose = graphics.pose();
 
 		var textWidth = minecraft.font.width(waypoint.display());
diff --git a/1.21.8/src/main/java/io/github/axolotlclient/waypoints/map/Minimap.java b/1.21.8/src/main/java/io/github/axolotlclient/waypoints/map/Minimap.java
@@ -29,7 +29,6 @@
 import io.github.axolotlclient.waypoints.HudCreator;
 import io.github.axolotlclient.waypoints.util.ARGB;
 import io.github.axolotlclient.waypoints.waypoints.Waypoint;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.minecraft.Util;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
@@ -66,12 +65,11 @@ public class Minimap extends MinimapCommon {
 	private final Minecraft minecraft = Minecraft.getInstance();
 
 	public void init() {
-		minimap.add(enabled, lockMapToNorth, arrowScale, minimapOutline, outlineColor, enableBiomeBlending, mapScale, showWaypoints, showCardinalDirections);
+		super.init();
 		AxolotlClientWaypointsCommon.category.add(minimap);
 		if (AxolotlClientWaypointsCommon.AXOLOTLCLIENT_PRESENT) {
 			usingHud = true;
-			var save = HudCreator.createHud(this);
-			ClientLifecycleEvents.CLIENT_STOPPING.register(mc -> save.run());
+			HudCreator.createHud(this);
 		}
 	}
 
diff --git a/1.21/src/main/java/io/github/axolotlclient/waypoints/map/Minimap.java b/1.21/src/main/java/io/github/axolotlclient/waypoints/map/Minimap.java
@@ -29,7 +29,6 @@
 import io.github.axolotlclient.waypoints.HudCreator;
 import io.github.axolotlclient.waypoints.util.ARGB;
 import io.github.axolotlclient.waypoints.waypoints.Waypoint;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.minecraft.Util;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
@@ -66,12 +65,11 @@ public class Minimap extends MinimapCommon {
 	private final Minecraft minecraft = Minecraft.getInstance();
 
 	public void init() {
-		minimap.add(enabled, lockMapToNorth, arrowScale, minimapOutline, outlineColor, enableBiomeBlending, mapScale, showWaypoints, showCardinalDirections);
+		super.init();
 		AxolotlClientWaypointsCommon.category.add(Minimap.minimap);
 		if (AxolotlClientWaypointsCommon.AXOLOTLCLIENT_PRESENT) {
 			usingHud = true;
-			var save = HudCreator.createHud(this);
-			ClientLifecycleEvents.CLIENT_STOPPING.register(mc -> save.run());
+			HudCreator.createHud(this);
 		}
 	}
 
diff --git a/1.21/src/main/java/io/github/axolotlclient/waypoints/waypoints/WaypointRenderer.java b/1.21/src/main/java/io/github/axolotlclient/waypoints/waypoints/WaypointRenderer.java
@@ -144,7 +144,7 @@ public void renderWaypoints(GuiGraphics graphics, DeltaTracker deltaTracker) {
 
 	private void renderWaypoint(Waypoint waypoint, GuiGraphics graphics, DeltaTracker tracker, Camera camera, List<Runnable> positionDrawn) {
 		var tick = tracker.getGameTimeDeltaPartialTick(true);
-		var fov = ((GameRendererAccessor) minecraft.gameRenderer).invokeGetFov(camera, tick, false);
+		var fov = ((GameRendererAccessor) minecraft.gameRenderer).invokeGetFov(camera, tick, true);
 		var pose = graphics.pose();
 
 		var textWidth = minecraft.font.width(waypoint.display());
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/waypoints/map/Minimap.java b/1.8.9/src/main/java/io/github/axolotlclient/waypoints/map/Minimap.java
@@ -42,7 +42,6 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.chunk.WorldChunk;
-import net.ornithemc.osl.lifecycle.api.client.MinecraftClientEvents;
 import org.joml.Vector3f;
 
 public class Minimap extends MinimapCommon {
@@ -59,12 +58,11 @@ public class Minimap extends MinimapCommon {
 	private final Minecraft minecraft = Minecraft.getInstance();
 
 	public void init() {
-		minimap.add(enabled, lockMapToNorth, arrowScale, minimapOutline, outlineColor, enableBiomeBlending, mapScale, showWaypoints, showCardinalDirections);
+		super.init();
 		AxolotlClientWaypointsCommon.category.add(Minimap.minimap);
 		if (AxolotlClientWaypointsCommon.AXOLOTLCLIENT_PRESENT) {
 			usingHud = true;
-			var save = HudCreator.createHud(this);
-			MinecraftClientEvents.STOP.register(mc -> save.run());
+			HudCreator.createHud(this);
 		}
 	}
 
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/waypoints/waypoints/WaypointRenderer.java b/1.8.9/src/main/java/io/github/axolotlclient/waypoints/waypoints/WaypointRenderer.java
@@ -169,7 +169,7 @@ private Matrix4f getProjectionMatrix(float fov) {
 	}
 
 	private void renderWaypoint(Waypoint waypoint, float tick, Entity camera, List<Runnable> positionDrawn, int guiWidth, int guiHeight) {
-		var fov = ((GameRendererAccessor) minecraft.gameRenderer).invokeGetFov(tick, false);
+		var fov = ((GameRendererAccessor) minecraft.gameRenderer).invokeGetFov(tick, true);
 
 		var textWidth = minecraft.textRenderer.getWidth(waypoint.display());
 		int width = textWidth + Waypoint.displayXOffset() * 2;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Changelog
 
+### 0.0.1-beta.16
+
+- fix waypoints being rendered wrong on changed FoVs (<=1.21.1)
+
 ### 0.0.1-beta.15
 
 - add tolerance for waypoint distance & name rendering, currently 1/4 of the screen size on each side
diff --git a/common/src/main/java/io/github/axolotlclient/waypoints/HudCreator.java b/common/src/main/java/io/github/axolotlclient/waypoints/HudCreator.java
@@ -26,6 +26,7 @@
 import io.github.axolotlclient.AxolotlClientConfig.api.AxolotlClientConfig;
 import io.github.axolotlclient.AxolotlClientConfig.impl.managers.JsonConfigManager;
 import io.github.axolotlclient.bridge.events.Events;
+import io.github.axolotlclient.config.profiles.ProfileAware;
 import io.github.axolotlclient.modules.hud.HudManagerCommon;
 import io.github.axolotlclient.waypoints.map.MinimapCommon;
 import io.github.axolotlclient.waypoints.map.MinimapHudEntry;
@@ -38,21 +39,42 @@
  */
 public class HudCreator {
 
-	public static Runnable createHud(MinimapCommon minimap) {
+	public static void createHud(MinimapCommon minimap) {
 		var hud = new MinimapHudEntry(minimap);
 		hud.setEnabled(true);
-		var hudConfigManager = new JsonConfigManager(AxolotlClientWaypointsCommon.OPTIONS_PATH.resolveSibling(hud.getId().br$getPath() + ".json"), hud.getAllOptions());
-		hudConfigManager.suppressName("x");
-		hudConfigManager.suppressName("y");
-		hudConfigManager.suppressName(minimap.minimapOutline.getName());
-		hudConfigManager.suppressName(minimap.outlineColor.getName());
-		AxolotlClientConfig.getInstance().register(hudConfigManager);
-		hudConfigManager.load();
-		MinimapCommon.minimap.add(hud.getAllOptions(), false);
 		Events.CLIENT_READY.register(() -> {
+			var hudConfigManager = new JsonConfigManager(AxolotlClientCommon.resolveProfileConfigFile(AxolotlClientWaypointsCommon.MODID)
+				.resolve(hud.getId().br$getPath() + ".json"), hud.getAllOptions());
+			Events.CLIENT_STOP.register(hudConfigManager::save);
+			hudConfigManager.suppressName("x");
+			hudConfigManager.suppressName("y");
+			hudConfigManager.suppressName(minimap.minimapOutline.getName());
+			hudConfigManager.suppressName(minimap.outlineColor.getName());
+			AxolotlClientConfig.getInstance().register(hudConfigManager);
+			hudConfigManager.load();
+			MinimapCommon.minimap.add(hud.getAllOptions(), false);
 			AxolotlClientCommon.getInstance().getConfig().config.add(AxolotlClientWaypointsCommon.category, false);
 			HudManagerCommon.getInstance().addNonConfigured(hud);
+			var mainConfigManager = (JsonConfigManager) AxolotlClientConfig.getInstance().getConfigManager(AxolotlClientWaypointsCommon.category);
+			mainConfigManager.setFile(AxolotlClientCommon.resolveProfileConfigFile(AxolotlClientWaypointsCommon.MODID).resolve("options.json"));
+			hud.profileReloader = new ProfileAware() {
+				@Override
+				public void saveConfig() {
+					hudConfigManager.save();
+					mainConfigManager.save();
+				}
+
+				@Override
+				public void reloadConfig() {
+					mainConfigManager.save();
+					hudConfigManager.save();
+					mainConfigManager.setFile(AxolotlClientCommon.resolveProfileConfigFile(AxolotlClientWaypointsCommon.MODID).resolve("options.json"));
+					hudConfigManager.setFile(AxolotlClientCommon.resolveProfileConfigFile(AxolotlClientWaypointsCommon.MODID)
+						.resolve(hud.getId().br$getPath() + ".json"));
+					mainConfigManager.load();
+					hudConfigManager.load();
+				}
+			};
 		});
-		return hudConfigManager::save;
 	}
 }
diff --git a/common/src/main/java/io/github/axolotlclient/waypoints/map/MinimapCommon.java b/common/src/main/java/io/github/axolotlclient/waypoints/map/MinimapCommon.java
@@ -54,4 +54,8 @@ public abstract class MinimapCommon {
 	public abstract void renderMap(AxoRenderContext ctx);
 
 	public abstract boolean isEnabled();
+
+	protected void init() {
+		minimap.add(enabled, lockMapToNorth, arrowScale, minimapOutline, outlineColor, enableBiomeBlending, mapScale, showWaypoints, showCardinalDirections);
+	}
 }
diff --git a/common/src/main/java/io/github/axolotlclient/waypoints/map/MinimapHudEntry.java b/common/src/main/java/io/github/axolotlclient/waypoints/map/MinimapHudEntry.java
@@ -27,14 +27,16 @@
 import io.github.axolotlclient.AxolotlClientConfig.api.options.Option;
 import io.github.axolotlclient.bridge.render.AxoRenderContext;
 import io.github.axolotlclient.bridge.util.AxoIdentifier;
+import io.github.axolotlclient.config.profiles.ProfileAware;
 import io.github.axolotlclient.modules.hud.gui.entry.BoxHudEntry;
 import io.github.axolotlclient.waypoints.AxolotlClientWaypointsCommon;
 
-public class MinimapHudEntry extends BoxHudEntry {
+public class MinimapHudEntry extends BoxHudEntry implements ProfileAware {
 
 	public static final AxoIdentifier ID = AxolotlClientWaypointsCommon.rl("minimap_hud");
 
 	private final MinimapCommon minimap;
+	public ProfileAware profileReloader;
 
 	public MinimapHudEntry(MinimapCommon minimap) {
 		super(minimap.size + 2, minimap.size + 2, true);
@@ -101,4 +103,14 @@ public double getDefaultX() {
 	public double getDefaultY() {
 		return 0.05;
 	}
+
+	@Override
+	public void saveConfig() {
+		profileReloader.saveConfig();
+	}
+
+	@Override
+	public void reloadConfig() {
+		profileReloader.reloadConfig();
+	}
 }
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.parallel=true
 axolotlclient.modules.all=true
 
 # Mod Properties
-version=0.0.1-beta.15+3.1.5
+version=0.0.1-beta.16+3.1.5
 
 maven_group=io.github.axolotlclient.waypoints
 

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public void renderWaypoints(GuiGraphics graphics, float delta) {`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`private void renderWaypoint(Waypoint waypoint, GuiGraphics graphics, float tick, Camera camera, List<Runnable> positionDrawn) {`
`142`		`- var fov = ((GameRendererAccessor) minecraft.gameRenderer).invokeGetFov(camera, tick, false);`
	`142`	`+ var fov = ((GameRendererAccessor) minecraft.gameRenderer).invokeGetFov(camera, tick, true);`
`143`	`143`	`var pose = graphics.pose();`
`144`	`144`
`145`	`145`	`var textWidth = minecraft.font.width(waypoint.display());`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ private Matrix4f getProjectionMatrix(float fov) {`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`private void renderWaypoint(Waypoint waypoint, float tick, Entity camera, List<Runnable> positionDrawn, int guiWidth, int guiHeight) {`
`172`		`- var fov = ((GameRendererAccessor) minecraft.gameRenderer).invokeGetFov(tick, false);`
	`172`	`+ var fov = ((GameRendererAccessor) minecraft.gameRenderer).invokeGetFov(tick, true);`
`173`	`173`
`174`	`174`	`var textWidth = minecraft.textRenderer.getWidth(waypoint.display());`
`175`	`175`	`int width = textWidth + Waypoint.displayXOffset() * 2;`
Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,8 @@ public abstract class MinimapCommon {`
`54`	`54`	`public abstract void renderMap(AxoRenderContext ctx);`
`55`	`55`
`56`	`56`	`public abstract boolean isEnabled();`
	`57`	`+`
	`58`	`+ protected void init() {`
	`59`	`+ minimap.add(enabled, lockMapToNorth, arrowScale, minimapOutline, outlineColor, enableBiomeBlending, mapScale, showWaypoints, showCardinalDirections);`
	`60`	`+ }`
`57`	`61`	`}`