fix a few bugs

moehreag · moehreag · commit 268738f10cd4 · 2025-10-04T23:56:03.000+02:00
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/config/screen/ProfilesScreen.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/config/screen/ProfilesScreen.java
@@ -161,7 +161,7 @@ public void render(MatrixStack guiGraphics, int index, int top, int left, int wi
 
 				boolean current = Profiles.getInstance().getCurrent() == profile;
 				loadButton.setMessage(current ? CURRENT_TEXT : LOAD_BUTTON_TITLE);
-				loadButton.active = !current;
+				loadButton.active = removeButton.active = !current;
 				i -= loadButton.getWidth();
 				this.loadButton.x = i;
 				loadButton.y = j;
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java
@@ -475,6 +475,7 @@ public boolean isLabelEditable() {
 	}
 
 	public void saveKeystrokes() {
+		if (keystrokes == null) return;
 		try {
 			var path = AxolotlClientCommon.resolveProfileConfigFile(KEYSTROKE_SAVE_FILE_NAME);
 			Files.createDirectories(path.getParent());
@@ -493,7 +494,11 @@ public void loadKeystrokes() {
 				var loaded = entries.stream().map(e -> (Map<String, Object>) e)
 					.map(KeystrokeHud.this::deserializeKey)
 					.toList();
-				keystrokes.clear();
+				if (keystrokes == null) {
+					keystrokes = new ArrayList<>();
+				} else {
+					keystrokes.clear();
+				}
 				keystrokes.addAll(loaded);
 			} else {
 				saveKeystrokes();
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/ScoreboardHud.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/ScoreboardHud.java
@@ -261,4 +261,14 @@ public Identifier getId() {
 	public AnchorPoint getAnchor() {
 		return anchor.get();
 	}
+
+	@Override
+	public double getDefaultX() {
+		return 1.0;
+	}
+
+	@Override
+	public double getDefaultY() {
+		return 0.5;
+	}
 }
diff --git a/1.20/src/main/java/io/github/axolotlclient/config/screen/ProfilesScreen.java b/1.20/src/main/java/io/github/axolotlclient/config/screen/ProfilesScreen.java
@@ -174,7 +174,7 @@ public void render(GuiGraphics guiGraphics, int index, int top, int left, int wi
 
 				boolean current = Profiles.getInstance().getCurrent() == profile;
 				loadButton.setMessage(current ? CURRENT_TEXT : LOAD_BUTTON_TITLE);
-				loadButton.active = !current;
+				loadButton.active = removeButton.active = !current;
 				i -= loadButton.getWidth();
 				this.loadButton.setPosition(i, j);
 				this.loadButton.render(guiGraphics, mouseX, mouseY, partialTick);
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java b/1.20/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java
@@ -480,6 +480,7 @@ public boolean isLabelEditable() {
 	}
 
 	public void saveKeystrokes() {
+		if (keystrokes == null) return;
 		try {
 			var path = AxolotlClientCommon.resolveProfileConfigFile(KEYSTROKE_SAVE_FILE_NAME);
 			Files.createDirectories(path.getParent());
@@ -498,7 +499,11 @@ public void loadKeystrokes() {
 				var loaded = entries.stream().map(e -> (Map<String, Object>) e)
 					.map(KeystrokeHud.this::deserializeKey)
 					.toList();
-				keystrokes.clear();
+				if (keystrokes == null) {
+					keystrokes = new ArrayList<>();
+				} else {
+					keystrokes.clear();
+				}
 				keystrokes.addAll(loaded);
 			} else {
 				saveKeystrokes();
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/ScoreboardHud.java b/1.20/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/ScoreboardHud.java
@@ -249,6 +249,16 @@ public Identifier getId() {
 
 	@Override
 	public AnchorPoint getAnchor() {
-		return (anchor.get());
+		return anchor.get();
+	}
+
+	@Override
+	public double getDefaultX() {
+		return 1.0;
+	}
+
+	@Override
+	public double getDefaultY() {
+		return 0.5;
 	}
 }
diff --git a/1.21/src/main/java/io/github/axolotlclient/config/screen/ProfilesScreen.java b/1.21/src/main/java/io/github/axolotlclient/config/screen/ProfilesScreen.java
@@ -180,7 +180,7 @@ public void render(GuiGraphics guiGraphics, int index, int top, int left, int wi
 
 				boolean current = Profiles.getInstance().getCurrent() == profile;
 				loadButton.setMessage(current ? CURRENT_TEXT : LOAD_BUTTON_TITLE);
-				loadButton.active = !current;
+				loadButton.active = removeButton.active = !current;
 				i -= loadButton.getWidth();
 				this.loadButton.setPosition(i, j);
 				this.loadButton.render(guiGraphics, mouseX, mouseY, partialTick);
diff --git a/1.21/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java b/1.21/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java
@@ -477,6 +477,7 @@ public boolean isLabelEditable() {
 	}
 
 	public void saveKeystrokes() {
+		if (keystrokes == null) return;
 		try {
 			var path = AxolotlClientCommon.resolveProfileConfigFile(KEYSTROKE_SAVE_FILE_NAME);
 			Files.createDirectories(path.getParent());
@@ -495,7 +496,11 @@ public void loadKeystrokes() {
 				var loaded = entries.stream().map(e -> (Map<String, Object>) e)
 					.map(KeystrokeHud.this::deserializeKey)
 					.toList();
-				keystrokes.clear();
+				if (keystrokes == null) {
+					keystrokes = new ArrayList<>();
+				} else {
+					keystrokes.clear();
+				}
 				keystrokes.addAll(loaded);
 			} else {
 				saveKeystrokes();
diff --git a/1.21/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/ScoreboardHud.java b/1.21/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/ScoreboardHud.java
@@ -226,6 +226,16 @@ public Identifier getId() {
 
 	@Override
 	public AnchorPoint getAnchor() {
-		return (anchor.get());
+		return anchor.get();
+	}
+
+	@Override
+	public double getDefaultX() {
+		return 1.0;
+	}
+
+	@Override
+	public double getDefaultY() {
+		return 0.5;
 	}
 }
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/config/screen/ProfilesScreen.java b/1.8.9/src/main/java/io/github/axolotlclient/config/screen/ProfilesScreen.java
@@ -161,7 +161,7 @@ public void render(int index, int top, int left, int width, int height, int mous
 
 				boolean current = Profiles.getInstance().getCurrent() == profile;
 				loadButton.setMessage(current ? CURRENT_TEXT : LOAD_BUTTON_TITLE);
-				loadButton.active = !current;
+				loadButton.active = removeButton.active = !current;
 				i -= loadButton.getWidth();
 				this.loadButton.setPosition(i, j);
 				this.loadButton.render(mouseX, mouseY, partialTick);
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java
@@ -476,6 +476,7 @@ public boolean isLabelEditable() {
 	}
 
 	public void saveKeystrokes() {
+		if (keystrokes == null) return;
 		try {
 			var path = AxolotlClientCommon.resolveProfileConfigFile(KEYSTROKE_SAVE_FILE_NAME);
 			Files.createDirectories(path.getParent());
@@ -494,7 +495,11 @@ public void loadKeystrokes() {
 				var loaded = entries.stream().map(e -> (Map<String, Object>) e)
 					.map(KeystrokeHud.this::deserializeKey)
 					.toList();
-				keystrokes.clear();
+				if (keystrokes == null) {
+					keystrokes = new ArrayList<>();
+				} else {
+					keystrokes.clear();
+				}
 				keystrokes.addAll(loaded);
 			} else {
 				saveKeystrokes();
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/ScoreboardHud.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/ScoreboardHud.java
@@ -269,4 +269,14 @@ public Identifier getId() {
 	public AnchorPoint getAnchor() {
 		return anchor.get();
 	}
+
+	@Override
+	public double getDefaultX() {
+		return 1.0;
+	}
+
+	@Override
+	public double getDefaultY() {
+		return 0.5;
+	}
 }
diff --git a/1.latest/src/main/java/io/github/axolotlclient/bridge/impl/Bridge.java b/1.latest/src/main/java/io/github/axolotlclient/bridge/impl/Bridge.java
@@ -41,7 +41,7 @@ public static void init() {
 		ClientTickEvents.END_CLIENT_TICK.register(minecraft -> Events.TICK.invoker().run());
 		ResourceLoader.get(PackType.CLIENT_RESOURCES).registerReloader(ResourceLocation.fromNamespaceAndPath("axolotlclient", "bridge/resource_listener"),
 			(ResourceManagerReloadListener) resourceManager -> Events.END_RESOURCE_RELOAD.invoker().run());
-		ClientPlayConnectionEvents.INIT.register((clientPlayNetworkHandler, minecraftClient) -> Events.CONNECTION_PLAY_READY.invoker().run());
+		ClientPlayConnectionEvents.JOIN.register((clientPlayNetworkHandler, sender, minecraftClient) -> Events.CONNECTION_PLAY_READY.invoker().run());
 		ClientPlayConnectionEvents.DISCONNECT.register((clientPlayNetworkHandler, minecraftClient) -> Events.DISCONNECT.invoker().run());
 
 		ClientCommandRegistrationCallback.EVENT.register((commandDispatcher, commandBuildContext) ->
diff --git a/1.latest/src/main/java/io/github/axolotlclient/config/screen/ProfilesScreen.java b/1.latest/src/main/java/io/github/axolotlclient/config/screen/ProfilesScreen.java
@@ -193,7 +193,7 @@ public void renderContent(GuiGraphics guiGraphics, int mouseX, int mouseY, boole
 
 				boolean current = Profiles.getInstance().getCurrent() == profile;
 				loadButton.setMessage(current ? CURRENT_TEXT : LOAD_BUTTON_TITLE);
-				loadButton.active = !current;
+				loadButton.active = removeButton.active = !current;
 				i -= loadButton.getWidth();
 				this.loadButton.setPosition(i, j);
 				this.loadButton.render(guiGraphics, mouseX, mouseY, partialTick);
@@ -222,7 +222,7 @@ public class NewEntry extends Entry {
 
 			public NewEntry() {
 				this.addButton = Button.builder(Component.translatable("profiles.profile.add"), button -> {
-						@SuppressWarnings("unchecked") var entries = new ArrayList<>((List<Entry>) children());
+						var entries = new ArrayList<>(ProfilesList.this.children());
 						entries.add(Math.max(entries.indexOf(this) - 1, 0), new ProfileEntry(Profiles.getInstance().newProfile(I18n.get("profiles.profile.default_new_name"))));
 						replaceEntries(entries);
 						Profiles.getInstance().saveProfiles();
diff --git a/1.latest/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java b/1.latest/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java
@@ -475,6 +475,7 @@ public boolean isLabelEditable() {
 	}
 
 	public void saveKeystrokes() {
+		if (keystrokes == null) return;
 		try {
 			var path = AxolotlClientCommon.resolveProfileConfigFile(KEYSTROKE_SAVE_FILE_NAME);
 			Files.createDirectories(path.getParent());
@@ -493,7 +494,11 @@ public void loadKeystrokes() {
 				var loaded = entries.stream().map(e -> (Map<String, Object>) e)
 					.map(KeystrokeHud.this::deserializeKey)
 					.toList();
-				keystrokes.clear();
+				if (keystrokes == null) {
+					keystrokes = new ArrayList<>();
+				} else {
+					keystrokes.clear();
+				}
 				keystrokes.addAll(loaded);
 			} else {
 				saveKeystrokes();
diff --git a/1.latest/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/ScoreboardHud.java b/1.latest/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/ScoreboardHud.java
@@ -233,6 +233,16 @@ public ResourceLocation getId() {
 
 	@Override
 	public AnchorPoint getAnchor() {
-		return (anchor.get());
+		return anchor.get();
+	}
+
+	@Override
+	public double getDefaultX() {
+		return 1.0;
+	}
+
+	@Override
+	public double getDefaultY() {
+		return 0.5;
 	}
 }
diff --git a/common/src/main/java/io/github/axolotlclient/modules/hud/HudManagerCommon.java b/common/src/main/java/io/github/axolotlclient/modules/hud/HudManagerCommon.java
@@ -252,7 +252,7 @@ public boolean hudsEnabled() {
 	public void render(AxoRenderContext context, float delta) {
 		if (!hudsEnabled()) return;
 		for (HudEntry hud : getEntries()) {
-			if (hud.isEnabled()) {
+			if (hud.isEnabled() && !hud.isHidden()) {
 				hud.render(context, delta);
 			}
 		}
diff --git a/common/src/main/java/io/github/axolotlclient/modules/hud/gui/component/HudEntry.java b/common/src/main/java/io/github/axolotlclient/modules/hud/gui/component/HudEntry.java
@@ -66,4 +66,6 @@ default double getDefaultY() {
 	void setHovered(boolean hovered);
 
 	boolean isHovered();
+
+	boolean isHidden();
 }
diff --git a/common/src/main/java/io/github/axolotlclient/modules/hud/gui/entry/AbstractHudEntry.java b/common/src/main/java/io/github/axolotlclient/modules/hud/gui/entry/AbstractHudEntry.java
@@ -28,6 +28,7 @@
 import io.github.axolotlclient.AxolotlClientConfig.api.options.Option;
 import io.github.axolotlclient.AxolotlClientConfig.api.options.OptionCategory;
 import io.github.axolotlclient.AxolotlClientConfig.api.util.Colors;
+import io.github.axolotlclient.AxolotlClientConfig.impl.options.BooleanOption;
 import io.github.axolotlclient.AxolotlClientConfig.impl.options.DoubleOption;
 import io.github.axolotlclient.bridge.AxoMinecraftClient;
 import io.github.axolotlclient.bridge.render.AxoRenderContext;
@@ -53,6 +54,7 @@ public abstract class AbstractHudEntry implements HudEntry {
 	protected final ForceableBooleanOption enabled = DefaultOptions.getEnabled();
 	protected final DoubleOption scale = DefaultOptions.getScale(this);
 	protected final AxoMinecraftClient client = AxoMinecraftClient.getInstance();
+	protected final BooleanOption hide = new BooleanOption("hud.hide", false);
 	private final DoubleOption x = DefaultOptions.getX(getDefaultX(), this);
 	private final DoubleOption y = DefaultOptions.getY(getDefaultY(), this);
 	@Setter
@@ -248,6 +250,7 @@ public List<Option<?>> getConfigurationOptions() {
 		List<Option<?>> options = new ArrayList<>();
 		options.add(enabled);
 		options.add(scale);
+		options.add(hide);
 		return options;
 	}
 
@@ -266,4 +269,8 @@ public void setEnabled(boolean value) {
 		enabled.set(value);
 	}
 
+	@Override
+	public boolean isHidden() {
+		return hide.get();
+	}
 }
diff --git a/common/src/main/resources/assets/axolotlclient/lang/en_us.json b/common/src/main/resources/assets/axolotlclient/lang/en_us.json
@@ -860,5 +860,7 @@
 	"iconhud.mode": "Icon Display Mode",
 	"iconhud.mode.in_game": "Only in-game",
 	"iconhud.mode.gui": "Only in GUIs",
-	"iconhud.mode.both": "In-game and in GUIs"
+	"iconhud.mode.both": "In-game and in GUIs",
+	"hud.hide": "Hide HUD",
+	"hud.hide.tooltip": "Prevents this HUD from rendering completely."
 }
