fix profile loading issues

Author: moehreag

1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java

@@ -231,6 +231,11 @@ public void reloadConfig() {
 		keystrokes = null;
 	}
 
+	@Override
+	public void saveConfig() {
+		saveKeystrokes();
+	}
+
 	public interface KeystrokeRenderer {
 
 		void render(Keystroke stroke, MatrixStack graphics);

1.20/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java

@@ -37,6 +37,7 @@
 import io.github.axolotlclient.AxolotlClientConfig.impl.options.ColorOption;
 import io.github.axolotlclient.AxolotlClientConfig.impl.options.IntegerOption;
 import io.github.axolotlclient.bridge.render.AxoRenderContext;
+import io.github.axolotlclient.config.profiles.ProfileAware;
 import io.github.axolotlclient.mixin.KeyBindAccessor;
 import io.github.axolotlclient.modules.hud.ClickInputTracker;
 import io.github.axolotlclient.modules.hud.gui.keystrokes.KeystrokePositioningScreen;
@@ -73,7 +74,7 @@
  * @license GPL-3.0
  */
 
-public class KeystrokeHud extends TextHudEntry {
+public class KeystrokeHud extends TextHudEntry implements ProfileAware {
 
 	private static final Path KEYSTROKE_SAVE_FILE = AxolotlClientCommon.resolveConfigFile("keystrokes.json");
 	public static final Identifier ID = new Identifier("kronhud", "keystrokehud");
@@ -231,6 +232,16 @@ public Identifier getId() {
 		return ID;
 	}
 
+	@Override
+	public void reloadConfig() {
+		keystrokes = null;
+	}
+
+	@Override
+	public void saveConfig() {
+		saveKeystrokes();
+	}
+
 	public interface KeystrokeRenderer {
 
 		void render(Keystroke stroke, GuiGraphics graphics);

1.21.7/src/main/java/io/github/axolotlclient/mixin/InGameHudMixin.java

@@ -44,15 +44,13 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.scores.Objective;
-import org.spongepowered.asm.mixin.Debug;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Debug(export = true)
 @Mixin(Gui.class)
 public abstract class InGameHudMixin {
 

1.21.7/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java

@@ -37,6 +37,7 @@
 import io.github.axolotlclient.AxolotlClientConfig.impl.options.ColorOption;
 import io.github.axolotlclient.AxolotlClientConfig.impl.options.IntegerOption;
 import io.github.axolotlclient.bridge.render.AxoRenderContext;
+import io.github.axolotlclient.config.profiles.ProfileAware;
 import io.github.axolotlclient.modules.hud.ClickInputTracker;
 import io.github.axolotlclient.modules.hud.gui.keystrokes.KeystrokePositioningScreen;
 import io.github.axolotlclient.modules.hud.gui.keystrokes.KeystrokesScreen;
@@ -70,7 +71,7 @@
  * @license GPL-3.0
  */
 
-public class KeystrokeHud extends TextHudEntry {
+public class KeystrokeHud extends TextHudEntry implements ProfileAware {
 
 	private static final Path KEYSTROKE_SAVE_FILE = AxolotlClientCommon.resolveConfigFile("keystrokes.json");
 	public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath("kronhud", "keystrokehud");
@@ -226,6 +227,16 @@ public ResourceLocation getId() {
 		return ID;
 	}
 
+	@Override
+	public void reloadConfig() {
+		keystrokes = null;
+	}
+
+	@Override
+	public void saveConfig() {
+		saveKeystrokes();
+	}
+
 	public interface KeystrokeRenderer {
 
 		void render(Keystroke stroke, GuiGraphics graphics);

1.21/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java

@@ -37,6 +37,7 @@
 import io.github.axolotlclient.AxolotlClientConfig.impl.options.ColorOption;
 import io.github.axolotlclient.AxolotlClientConfig.impl.options.IntegerOption;
 import io.github.axolotlclient.bridge.render.AxoRenderContext;
+import io.github.axolotlclient.config.profiles.ProfileAware;
 import io.github.axolotlclient.mixin.KeyBindAccessor;
 import io.github.axolotlclient.modules.hud.ClickInputTracker;
 import io.github.axolotlclient.modules.hud.gui.keystrokes.KeystrokePositioningScreen;
@@ -71,7 +72,7 @@
  * @license GPL-3.0
  */
 
-public class KeystrokeHud extends TextHudEntry {
+public class KeystrokeHud extends TextHudEntry implements ProfileAware {
 
 	private static final Path KEYSTROKE_SAVE_FILE = AxolotlClientCommon.resolveConfigFile("keystrokes.json");
 	public static final Identifier ID = Identifier.of("kronhud", "keystrokehud");
@@ -228,6 +229,16 @@ public Identifier getId() {
 		return ID;
 	}
 
+	@Override
+	public void reloadConfig() {
+		keystrokes = null;
+	}
+
+	@Override
+	public void saveConfig() {
+		saveKeystrokes();
+	}
+
 	public interface KeystrokeRenderer {
 
 		void render(Keystroke stroke, GuiGraphics graphics);

1.8.9/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java

@@ -37,6 +37,7 @@
 import io.github.axolotlclient.AxolotlClientConfig.impl.options.ColorOption;
 import io.github.axolotlclient.AxolotlClientConfig.impl.options.IntegerOption;
 import io.github.axolotlclient.bridge.render.AxoRenderContext;
+import io.github.axolotlclient.config.profiles.ProfileAware;
 import io.github.axolotlclient.mixin.KeyBindAccessor;
 import io.github.axolotlclient.modules.hud.ClickInputTracker;
 import io.github.axolotlclient.modules.hud.gui.keystrokes.KeystrokePositioningScreen;
@@ -72,7 +73,7 @@
  * @license GPL-3.0
  */
 
-public class KeystrokeHud extends TextHudEntry {
+public class KeystrokeHud extends TextHudEntry implements ProfileAware {
 
 	private static final Path KEYSTROKE_SAVE_FILE = AxolotlClientCommon.resolveConfigFile("keystrokes.json");
 	public static final Identifier ID = new Identifier("kronhud", "keystrokehud");
@@ -225,6 +226,16 @@ public Identifier getId() {
 		return ID;
 	}
 
+	@Override
+	public void reloadConfig() {
+		keystrokes = null;
+	}
+
+	@Override
+	public void saveConfig() {
+		saveKeystrokes();
+	}
+
 	public interface KeystrokeRenderer {
 
 		void render(Keystroke stroke);

common/src/main/java/io/github/axolotlclient/AxolotlClientCommon.java

@@ -64,7 +64,7 @@ public static Path resolveProfileConfigFile(String file) {
 	}
 
 	public static final boolean NVG_SUPPORTED = OSUtil.getOS() != OSUtil.OperatingSystem.OTHER &&
-		!Objects.requireNonNullElse(System.getenv("TMPDIR"), "").contains("Android");
+		!Objects.requireNonNullElse(System.getenv("TMPDIR"), "").contains("Android") && !FabricLoader.getInstance().isModLoaded("vulkanmod");
 
 	public static final String VERSION = FabricLoader.getInstance()
 		.getModContainer("axolotlclient-common")
@@ -266,6 +266,11 @@ protected final void registerModule(Module module) {
 
 	public void saveConfig() {
 		getConfigManager().save();
+		for (Module m : modules) {
+			if (m instanceof ProfileAware p) {
+				p.saveConfig();
+			}
+		}
 	}
 
 	public Path getMainConfigFile() {

common/src/main/java/io/github/axolotlclient/config/profiles/ProfileAware.java

@@ -24,5 +24,7 @@
 
 public interface ProfileAware {
 
+	void saveConfig();
+
 	void reloadConfig();
 }

common/src/main/java/io/github/axolotlclient/config/profiles/Profiles.java

@@ -118,6 +118,7 @@ public Profile newProfile(String name) {
 	}
 
 	public Profile duplicate(Profile profile) {
+		AxolotlClientCommon.getInstance().saveConfig();
 		var duplicate = newProfile(AxoI18n.translate("profiles.duplicated", profile.name()));
 		try {
 			Files.copy(profile.getPath(), duplicate.getPath());

common/src/main/java/io/github/axolotlclient/modules/hud/HudManagerCommon.java

@@ -299,6 +299,16 @@ public void reloadConfig() {
 		}
 	}
 
+	@Override
+	public void saveConfig() {
+		saveCustomEntries();
+		for (var hud : getEntries()) {
+			if (hud instanceof ProfileAware p) {
+				p.saveConfig();
+			}
+		}
+	}
+
 	protected abstract void openScreen();
 
 	protected abstract void addExtraHud();