add additional options to IconHud

moehreag · moehreag · commit 990fa8af8908 · 2025-09-21T14:10:21.000+02:00
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/MinecraftClientMixin.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/MinecraftClientMixin.java
@@ -156,4 +156,9 @@ public MinecraftClientMixin(String string) {
 	public AxoResourceManager br$getResourceManager() {
 		return getResourceManager();
 	}
+
+	@Override
+	public Object br$getScreen() {
+		return currentScreen;
+	}
 }
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/HandledScreenMixin.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/HandledScreenMixin.java
@@ -22,13 +22,16 @@
 
 package io.github.axolotlclient.mixin;
 
+import io.github.axolotlclient.modules.hud.HudManager;
+import io.github.axolotlclient.modules.hud.gui.hud.IconHud;
 import io.github.axolotlclient.modules.scrollableTooltips.ScrollableTooltips;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.screen.slot.Slot;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -39,6 +42,7 @@ public abstract class HandledScreenMixin {
 	@Shadow
 	@Nullable
 	protected Slot focusedSlot;
+	@Unique
 	private Slot cachedSlot;
 
 	@Inject(method = "drawMouseoverTooltip", at = @At("HEAD"))
@@ -48,4 +52,12 @@ public abstract class HandledScreenMixin {
 			ScrollableTooltips.getInstance().resetScroll();
 		}
 	}
+
+	@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;drawBackground(Lnet/minecraft/client/util/math/MatrixStack;FII)V"))
+	private void renderIcon(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+		var hud = (IconHud) HudManager.getInstance().get(IconHud.ID);
+		if (hud != null && hud.isEnabled()) {
+			hud.renderInGui(matrices, delta);
+		}
+	}
 }
diff --git a/1.20/src/main/java/io/github/axolotlclient/bridge/mixin/MinecraftClientMixin.java b/1.20/src/main/java/io/github/axolotlclient/bridge/mixin/MinecraftClientMixin.java
@@ -155,4 +155,9 @@ public abstract class MinecraftClientMixin implements AxoMinecraftClient {
 	public AxoResourceManager br$getResourceManager() {
 		return getResourceManager();
 	}
+
+	@Override
+	public Object br$getScreen() {
+		return currentScreen;
+	}
 }
diff --git a/1.20/src/main/java/io/github/axolotlclient/mixin/HandledScreenMixin.java b/1.20/src/main/java/io/github/axolotlclient/mixin/HandledScreenMixin.java
@@ -22,13 +22,16 @@
 
 package io.github.axolotlclient.mixin;
 
+import io.github.axolotlclient.modules.hud.HudManager;
+import io.github.axolotlclient.modules.hud.gui.hud.IconHud;
 import io.github.axolotlclient.modules.scrollableTooltips.ScrollableTooltips;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.screen.slot.Slot;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -39,6 +42,7 @@ public abstract class HandledScreenMixin {
 	@Shadow
 	@Nullable
 	protected Slot focusedSlot;
+	@Unique
 	private Slot cachedSlot;
 
 	@Inject(method = "drawMouseoverTooltip", at = @At("HEAD"))
@@ -48,4 +52,12 @@ public abstract class HandledScreenMixin {
 			ScrollableTooltips.getInstance().resetScroll();
 		}
 	}
+
+	@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;drawBackground(Lnet/minecraft/client/gui/GuiGraphics;FII)V"))
+	private void renderIcon(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick, CallbackInfo ci) {
+		var hud = (IconHud) HudManager.getInstance().get(IconHud.ID);
+		if (hud != null && hud.isEnabled()) {
+			hud.renderInGui(guiGraphics, partialTick);
+		}
+	}
 }
diff --git a/1.21/src/main/java/io/github/axolotlclient/bridge/mixin/MinecraftClientMixin.java b/1.21/src/main/java/io/github/axolotlclient/bridge/mixin/MinecraftClientMixin.java
@@ -154,4 +154,9 @@ public abstract class MinecraftClientMixin implements AxoMinecraftClient {
 	public AxoResourceManager br$getResourceManager() {
 		return getResourceManager();
 	}
+
+	@Override
+	public Object br$getScreen() {
+		return currentScreen;
+	}
 }
diff --git a/1.21/src/main/java/io/github/axolotlclient/mixin/HandledScreenMixin.java b/1.21/src/main/java/io/github/axolotlclient/mixin/HandledScreenMixin.java
@@ -22,13 +22,16 @@
 
 package io.github.axolotlclient.mixin;
 
+import io.github.axolotlclient.modules.hud.HudManager;
+import io.github.axolotlclient.modules.hud.gui.hud.IconHud;
 import io.github.axolotlclient.modules.scrollableTooltips.ScrollableTooltips;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.screen.slot.Slot;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -39,6 +42,7 @@ public abstract class HandledScreenMixin {
 	@Shadow
 	@Nullable
 	protected Slot focusedSlot;
+	@Unique
 	private Slot cachedSlot;
 
 	@Inject(method = "drawMouseoverTooltip", at = @At("HEAD"))
@@ -48,4 +52,12 @@ public abstract class HandledScreenMixin {
 			ScrollableTooltips.getInstance().resetScroll();
 		}
 	}
+
+	@Inject(method = "renderBackground", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;drawBackground(Lnet/minecraft/client/gui/GuiGraphics;FII)V"))
+	private void renderIcon(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick, CallbackInfo ci) {
+		var hud = (IconHud) HudManager.getInstance().get(IconHud.ID);
+		if (hud != null && hud.isEnabled()) {
+			hud.renderInGui(guiGraphics, partialTick);
+		}
+	}
 }
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/bridge/mixin/MinecraftClientMixin.java b/1.8.9/src/main/java/io/github/axolotlclient/bridge/mixin/MinecraftClientMixin.java
@@ -158,4 +158,9 @@ public abstract class MinecraftClientMixin implements AxoMinecraftClient {
 	public void execute(@NotNull Runnable command) {
 		this.submit(command);
 	}
+
+	@Override
+	public Object br$getScreen() {
+		return screen;
+	}
 }
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/mixin/HandledScreenMixin.java b/1.8.9/src/main/java/io/github/axolotlclient/mixin/HandledScreenMixin.java
@@ -22,12 +22,16 @@
 
 package io.github.axolotlclient.mixin;
 
+import io.github.axolotlclient.bridge.impl.AxoRenderContextImpl;
+import io.github.axolotlclient.modules.hud.HudManager;
+import io.github.axolotlclient.modules.hud.gui.hud.IconHud;
 import io.github.axolotlclient.modules.scrollableTooltips.ScrollableTooltips;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screen.inventory.menu.InventoryMenuScreen;
 import net.minecraft.inventory.slot.InventorySlot;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -37,6 +41,7 @@ public abstract class HandledScreenMixin {
 
 	@Shadow
 	private InventorySlot hoveredSlot;
+	@Unique
 	private InventorySlot cachedSlot;
 
 	@Shadow
@@ -62,4 +67,12 @@ public abstract class HandledScreenMixin {
 	private void axolotlclient$mouseClickedTail(int mouseX, int mouseY, int mouseButton, CallbackInfo ci) {
 		moveHoveredSlotToHotbar(mouseButton - 100);
 	}
+
+	@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/inventory/menu/InventoryMenuScreen;drawBackground(FII)V"))
+	private void renderIcon(int i, int j, float f, CallbackInfo ci) {
+		var hud = (IconHud) HudManager.getInstance().get(IconHud.ID);
+		if (hud != null && hud.isEnabled()) {
+			hud.renderInGui(AxoRenderContextImpl.getInstance(), f);
+		}
+	}
 }
diff --git a/1.latest/src/main/java/io/github/axolotlclient/bridge/mixin/MinecraftClientMixin.java b/1.latest/src/main/java/io/github/axolotlclient/bridge/mixin/MinecraftClientMixin.java
@@ -154,4 +154,9 @@ public abstract class MinecraftClientMixin implements AxoMinecraftClient {
 	public AxoResourceManager br$getResourceManager() {
 		return getResourceManager();
 	}
+
+	@Override
+	public Object br$getScreen() {
+		return screen;
+	}
 }
diff --git a/1.latest/src/main/java/io/github/axolotlclient/mixin/HandledScreenMixin.java b/1.latest/src/main/java/io/github/axolotlclient/mixin/HandledScreenMixin.java
@@ -23,6 +23,8 @@
 package io.github.axolotlclient.mixin;
 
 import com.llamalad7.mixinextras.sugar.Local;
+import io.github.axolotlclient.modules.hud.HudManager;
+import io.github.axolotlclient.modules.hud.gui.hud.IconHud;
 import io.github.axolotlclient.modules.scrollableTooltips.ScrollableTooltips;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
@@ -46,4 +48,12 @@ public abstract class HandledScreenMixin {
 			ScrollableTooltips.getInstance().resetScroll();
 		}
 	}
+
+	@Inject(method = "renderBackground", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/inventory/AbstractContainerScreen;renderBg(Lnet/minecraft/client/gui/GuiGraphics;FII)V"))
+	private void renderIcon(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick, CallbackInfo ci) {
+		var hud = (IconHud) HudManager.getInstance().get(IconHud.ID);
+		if (hud != null && hud.isEnabled()) {
+			hud.renderInGui(guiGraphics, partialTick);
+		}
+	}
 }
diff --git a/common/src/main/java/io/github/axolotlclient/bridge/AxoMinecraftClient.java b/common/src/main/java/io/github/axolotlclient/bridge/AxoMinecraftClient.java
@@ -120,4 +120,12 @@ static int getCurrentFps() {
 	default AxoResourceManager br$getResourceManager() {
 		throw BridgeUtil.noImpl();
 	}
+
+	/*
+	 * Return type is an opaque object because we do not have a gui bridge currently.
+	 */
+	@RequiresImpl
+	default Object br$getScreen() {
+		throw BridgeUtil.noImpl();
+	}
 }
diff --git a/common/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/IconHud.java b/common/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/IconHud.java
@@ -22,13 +22,19 @@
 
 package io.github.axolotlclient.modules.hud.gui.hud;
 
+import java.util.List;
+import java.util.Locale;
+
+import io.github.axolotlclient.AxolotlClientConfig.api.options.Option;
+import io.github.axolotlclient.AxolotlClientConfig.impl.options.EnumOption;
 import io.github.axolotlclient.bridge.render.AxoRenderContext;
 import io.github.axolotlclient.bridge.render.AxoSprites;
 import io.github.axolotlclient.bridge.util.AxoIdentifier;
 import io.github.axolotlclient.modules.hud.gui.entry.BoxHudEntry;
 
 public class IconHud extends BoxHudEntry {
-	private static final AxoIdentifier ID = AxoIdentifier.of("axolotlclient", "iconhud");
+	public static final AxoIdentifier ID = AxoIdentifier.of("axolotlclient", "iconhud");
+	private final EnumOption<Mode> mode = new EnumOption<>("iconhud.mode", Mode.class, Mode.BOTH);
 
 	public IconHud() {
 		super(16, 16, false);
@@ -39,6 +45,19 @@ public AxoIdentifier getId() {
 		return ID;
 	}
 
+	@Override
+	public void render(AxoRenderContext ctx, float delta) {
+		if (client.br$getScreen() == null && mode.get().showsInGame()) {
+			super.render(ctx, delta);
+		}
+	}
+
+	public void renderInGui(AxoRenderContext context, float delta) {
+		if (mode.get().showsInGui()) {
+			super.render(context, delta);
+		}
+	}
+
 	@Override
 	public void renderComponent(AxoRenderContext ctx, float delta) {
 		ctx.br$glColor4(1, 1, 1, 1);
@@ -51,4 +70,41 @@ public void renderComponent(AxoRenderContext ctx, float delta) {
 	public void renderPlaceholderComponent(AxoRenderContext ctx, float delta) {
 		renderComponent(ctx, delta);
 	}
+
+	@Override
+	public List<Option<?>> getConfigurationOptions() {
+		var options = super.getConfigurationOptions();
+		options.add(mode);
+		return options;
+	}
+
+	private enum Mode {
+		IN_GAME(){
+			@Override
+			public boolean showsInGui() {
+				return false;
+			}
+		},
+		GUI(){
+			@Override
+			public boolean showsInGame() {
+				return false;
+			}
+		},
+		BOTH;
+
+		public boolean showsInGame() {
+			return true;
+		}
+
+		public boolean showsInGui() {
+			return true;
+		}
+
+
+		@Override
+		public String toString() {
+			return "iconhud.mode."+super.toString().toLowerCase(Locale.ROOT);
+		}
+	}
 }
diff --git a/common/src/main/resources/assets/axolotlclient/lang/en_us.json b/common/src/main/resources/assets/axolotlclient/lang/en_us.json
@@ -855,5 +855,9 @@
 	"skins.manage.equip.confirm": "Confirm Equipping",
 	"skins.manage.equip.download_current": "Your current skin is not downloaded and will get overridden by equipping a different one. Do you want to download your current skin before equipping this one?",
 	"gallery.error.loading": "Failed to load Gallery",
-	"gallery.reload": "Reload"
+	"gallery.reload": "Reload",
+	"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"
 }

Original file line number	Diff line number	Diff line change
`@@ -156,4 +156,9 @@ public MinecraftClientMixin(String string) {`
`156`	`156`	`public AxoResourceManager br$getResourceManager() {`
`157`	`157`	`return getResourceManager();`
`158`	`158`	`}`
	`159`	`+`
	`160`	`+ @Override`
	`161`	`+ public Object br$getScreen() {`
	`162`	`+ return currentScreen;`
	`163`	`+ }`
`159`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,4 +155,9 @@ public abstract class MinecraftClientMixin implements AxoMinecraftClient {`
`155`	`155`	`public AxoResourceManager br$getResourceManager() {`
`156`	`156`	`return getResourceManager();`
`157`	`157`	`}`
	`158`	`+`
	`159`	`+ @Override`
	`160`	`+ public Object br$getScreen() {`
	`161`	`+ return currentScreen;`
	`162`	`+ }`
`158`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,4 +154,9 @@ public abstract class MinecraftClientMixin implements AxoMinecraftClient {`
`154`	`154`	`public AxoResourceManager br$getResourceManager() {`
`155`	`155`	`return getResourceManager();`
`156`	`156`	`}`
	`157`	`+`
	`158`	`+ @Override`
	`159`	`+ public Object br$getScreen() {`
	`160`	`+ return currentScreen;`
	`161`	`+ }`
`157`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -158,4 +158,9 @@ public abstract class MinecraftClientMixin implements AxoMinecraftClient {`
`158`	`158`	`public void execute(@NotNull Runnable command) {`
`159`	`159`	`this.submit(command);`
`160`	`160`	`}`
	`161`	`+`
	`162`	`+ @Override`
	`163`	`+ public Object br$getScreen() {`
	`164`	`+ return screen;`
	`165`	`+ }`
`161`	`166`	`}`