(1.16, 1.21.1) fix HotbarHUD

Author: moehreag

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/PlatformDispatchMixin.java

@@ -124,7 +124,7 @@ public ClientConnection getConnection() {
 		final var minecraft = MinecraftClient.getInstance();
 		final var serverEntry = minecraft.getCurrentServerEntry();
 
-		final var img = NativeImage.read(Objects.requireNonNull(serverEntry == null ? minecraft.getServer().getServerMetadata().getFavicon() : serverEntry.getIcon()));
+		final var img = NativeImage.read(Objects.requireNonNull(serverEntry == null ? minecraft.getServer().getServerMetadata().getFavicon().substring("data:image/png;base64,".length()) : serverEntry.getIcon()));
 		final var icon = new NativeImageBackedTexture(img);
 		final var iconId = new Identifier("axolotlclient",
 			serverEntry == null ? "worlds/" + Hashing.sha1().hashUnencodedChars(((MinecraftServerAccessor) minecraft.getServer()).getStorageSource().getDirectoryName()) + "/icon" :

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

@@ -62,7 +62,6 @@ public void renderComponent(AxoRenderContext context, float delta) {
 			? (PlayerEntity) MinecraftClient.getInstance().cameraEntity
 			: null;
 		if (playerEntity != null) {
-			//scale(matrices);
 			DrawPosition pos = getPos();
 
 			RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
@@ -72,7 +71,6 @@ public void renderComponent(AxoRenderContext context, float delta) {
 			Arm arm = playerEntity.getMainArm().getOpposite();
 
 			matrices.br$pushMatrix();
-			matrices.br$translateMatrix(0, -90, 0);
 			drawTexture(matrices, pos.x, pos.y, 0, 0, 182, 22, 256, 256);
 			drawTexture(matrices, pos.x - 1 + playerEntity.inventory.selectedSlot * 20, pos.y - 1, 0, 22, 24,
 				22, 256, 256);

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

@@ -24,6 +24,7 @@
 
 import com.llamalad7.mixinextras.expression.Expression;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
@@ -46,17 +47,13 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.scoreboard.ScoreboardObjective;
-import net.minecraft.text.StringVisitable;
 import net.minecraft.text.Text;
 import org.jetbrains.annotations.Nullable;
 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.ModifyArgs;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
 
 @Mixin(InGameHud.class)
 public abstract class InGameHudMixin {
@@ -134,91 +131,16 @@ private void onHudRender(GuiGraphics graphics, DeltaTracker tracker, CallbackInf
 		}
 	}
 
-	@Inject(method = "renderHotbar", at = @At("HEAD"), cancellable = true)
-	public void axolotlclient$customHotbar(GuiGraphics graphics, DeltaTracker tracker, CallbackInfo ci) {
-		if (!HudManager.getInstance().hudsEnabled()) return;
+	@WrapMethod(method = "renderHotbar")
+	public void axolotlclient$customHotbar(GuiGraphics graphics, DeltaTracker tracker, Operation<Void> original) {
 		HotbarHUD hud = (HotbarHUD) HudManager.getInstance().get(HotbarHUD.ID);
+		graphics.getMatrices().push();
 		if (hud.isEnabled()) {
-			ci.cancel();
-		}
-	}
-
-	@ModifyArgs(method = "renderHeldItemTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;drawTextWithBackground(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;IIII)I"))
-	public void axolotlclient$setItemNamePos(Args args) {
-		if (!HudManager.getInstance().hudsEnabled()) return;
-		HotbarHUD hud = (HotbarHUD) HudManager.getInstance().get(HotbarHUD.ID);
-		if (hud.isEnabled()) {
-			args.set(2, hud.getX() + (int) ((hud.getWidth() * hud.getScale())
-				- MinecraftClient.getInstance().textRenderer.getWidth((StringVisitable) args.get(1))) / 2);
-			args.set(3, hud.getY() - 36
-				+ (!MinecraftClient.getInstance().interactionManager.hasStatusBars() ? 14 : 0));
-		}
-	}
-
-	@ModifyArgs(method = "renderMountJumpBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"))
-	public void axolotlclient$moveHorseHealth(Args args) {
-		if (!HudManager.getInstance().hudsEnabled()) return;
-		HotbarHUD hud = (HotbarHUD) HudManager.getInstance().get(HotbarHUD.ID);
-		if (hud.isEnabled()) {
-			args.set(1, hud.getX());
-			args.set(2, hud.getY() - 7);
-		}
-	}
-
-	@ModifyArgs(method = "renderExperienceBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;drawGuiTexture(Lnet/minecraft/util/Identifier;IIIIIIII)V"))
-	public void axolotlclient$moveXPBar(Args args) {
-		if (!HudManager.getInstance().hudsEnabled()) return;
-		HotbarHUD hud = (HotbarHUD) HudManager.getInstance().get(HotbarHUD.ID);
-		if (hud.isEnabled()) {
-			args.set(1, hud.getX());
-			args.set(2, hud.getY() - 7);
-		}
-	}
-
-	@WrapOperation(method = "renderExperienceBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;getScaledWindowHeight()I"))
-	public int axolotlclient$moveXPBarHeight(GuiGraphics instance, Operation<Integer> original) {
-		if (!HudManager.getInstance().hudsEnabled()) return original.call(instance);
-		HotbarHUD hud = (HotbarHUD) HudManager.getInstance().get(HotbarHUD.ID);
-		if (hud.isEnabled()) {
-			return hud.getY() + 22;
-		}
-		return original.call(instance);
-	}
-
-	@Redirect(method = "renderExperienceLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;getScaledWindowHeight()I"))
-	public int axolotlclient$moveXPLevelHeight(GuiGraphics instance) {
-		HotbarHUD hud = (HotbarHUD) HudManager.getInstance().get(HotbarHUD.ID);
-		if (HudManager.getInstance().hudsEnabled() && hud.isEnabled()) {
-			return hud.getY() + 22;
-		}
-		return instance.getScaledWindowHeight();
-	}
-
-	@Redirect(method = "renderExperienceLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;getScaledWindowWidth()I"))
-	public int axolotlclient$moveXPLevelWidth(GuiGraphics instance) {
-		HotbarHUD hud = (HotbarHUD) HudManager.getInstance().get(HotbarHUD.ID);
-		if (HudManager.getInstance().hudsEnabled() && hud.isEnabled()) {
-			return hud.getX() * 2 + hud.getWidth();
-		}
-		return instance.getScaledWindowWidth();
-	}
-
-	@Redirect(method = "renderStatusBars", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;getScaledWindowHeight()I"))
-	public int axolotlclient$moveStatusBarsHeight(GuiGraphics instance) {
-		HotbarHUD hud = (HotbarHUD) HudManager.getInstance().get(HotbarHUD.ID);
-		if (HudManager.getInstance().hudsEnabled() && hud.isEnabled()) {
-			return hud.getY() + 22;
-		}
-		return instance.getScaledWindowHeight();
-	}
-
-	@Redirect(method = "renderStatusBars", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;getScaledWindowWidth()I"))
-	public int axolotlclient$moveStatusBarsWidth(GuiGraphics instance) {
-		HotbarHUD hud = (HotbarHUD) HudManager.getInstance().get(HotbarHUD.ID);
-		if (HudManager.getInstance().hudsEnabled() && hud.isEnabled()) {
-			return hud.getX() * 2 + hud.getWidth();
+			graphics.getMatrices().translate(-graphics.getScaledWindowWidth()/2f + 182/2f, -graphics.getScaledWindowHeight()+22, 0);
+			graphics.getMatrices().translate(hud.getX(), hud.getY(), 0);
 		}
-		return instance.getScaledWindowWidth();
+		original.call(graphics, tracker);
+		graphics.getMatrices().pop();
 	}
 
 	@Inject(

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

@@ -25,114 +25,26 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import io.github.axolotlclient.AxolotlClientConfig.api.options.Option;
 import io.github.axolotlclient.bridge.render.AxoRenderContext;
 import io.github.axolotlclient.modules.hud.gui.entry.TextHudEntry;
 import io.github.axolotlclient.modules.hud.util.DrawPosition;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.option.AttackIndicator;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.Arm;
 import net.minecraft.util.Identifier;
 
 import static io.github.axolotlclient.modules.hud.util.DrawUtil.drawCenteredString;
 
 public class HotbarHUD extends TextHudEntry {
-	public static final Identifier ICONS_TEXTURE = Identifier.ofDefault("textures/gui/icons.png");
 	public static final Identifier ID = Identifier.of("axolotlclient", "hotbarhud");
-	private static final Identifier WIDGETS_TEXTURE = Identifier.ofDefault("textures/gui/widgets.png");
-
-	private final MinecraftClient client = (MinecraftClient) super.client;
 
 	public HotbarHUD() {
 		super(182, 22, false);
 	}
 
 	@Override
 	public void renderComponent(AxoRenderContext context, float delta) {
-		final var graphics = (GuiGraphics) context;
-
-		graphics.getMatrices().push();
-		PlayerEntity playerEntity = MinecraftClient.getInstance().cameraEntity instanceof PlayerEntity
-			? (PlayerEntity) MinecraftClient.getInstance().cameraEntity
-			: null;
-		if (playerEntity != null) {
-			ItemStack itemStack = playerEntity.getOffHandStack();
-			Arm arm = playerEntity.getMainArm().getOpposite();
-			DrawPosition pos = getPos();
-			int i = pos.x() + getWidth() / 2;
-			graphics.getMatrices().push();
-			graphics.getMatrices().translate(0.0F, 0.0F, -90.0F);
-			graphics.drawTexture(WIDGETS_TEXTURE, i - 91, pos.y(), 0, 0, 182, 22);
-			graphics.drawTexture(WIDGETS_TEXTURE, i - 91 - 1 + playerEntity.getInventory().selectedSlot * 20, pos.y() - 1, 0, 22, 24, 22);
-			if (!itemStack.isEmpty()) {
-				if (arm == Arm.LEFT) {
-					graphics.drawTexture(WIDGETS_TEXTURE, i - 91 - 29, pos.y() - 1, 24, 22, 29, 24);
-				} else {
-					graphics.drawTexture(WIDGETS_TEXTURE, i + 91, pos.y() - 1, 53, 22, 29, 24);
-				}
-			}
-
-			graphics.getMatrices().pop();
-			int l = 1;
-
-			for (int m = 0; m < 9; ++m) {
-				int n = i - 90 + m * 20 + 2;
-				int o = pos.y() + 6 - 3;
-				this.renderHotbarItem(graphics, n, o, delta, playerEntity, playerEntity.getInventory().main.get(m), l++);
-			}
-
-			if (!itemStack.isEmpty()) {
-				int m = pos.y() + 6 - 3;
-				if (arm == Arm.LEFT) {
-					this.renderHotbarItem(graphics, i - 91 - 26, m, delta, playerEntity, itemStack, l++);
-				} else {
-					this.renderHotbarItem(graphics, i + 91 + 10, m, delta, playerEntity, itemStack, l++);
-				}
-			}
-
-			RenderSystem.enableBlend();
-			if (this.client.options.getAttackIndicator().get() == AttackIndicator.HOTBAR) {
-				float f = this.client.player.getAttackCooldownProgress(0.0F);
-				if (f < 1.0F) {
-					int n = pos.y() + 2;
-					int o = i + 91 + 6;
-					if (arm == Arm.RIGHT) {
-						o = i - 91 - 22;
-					}
-
-					int p = (int) (f * 19.0F);
-					graphics.drawTexture(ICONS_TEXTURE, o, n, 0, 94, 18, 18);
-					graphics.drawTexture(ICONS_TEXTURE, o, n + 18 - p, 18, 112 - p, 18, p);
-				}
-			}
-
-			RenderSystem.disableBlend();
-		}
-		graphics.getMatrices().pop();
-	}
-
-	private void renderHotbarItem(GuiGraphics graphics, int x, int y, float tickDelta, PlayerEntity player, ItemStack stack, int seed) {
-		if (!stack.isEmpty()) {
-			float f = (float) stack.getCooldown() - tickDelta;
-			if (f > 0.0F) {
-				float g = 1.0F + f / 5.0F;
-				graphics.getMatrices().push();
-				graphics.getMatrices().translate((float) (x + 8), (float) (y + 12), 0.0F);
-				graphics.getMatrices().scale(1.0F / g, (g + 1.0F) / 2.0F, 1.0F);
-				graphics.getMatrices().translate((float) (-(x + 8)), (float) (-(y + 12)), 0.0F);
-			}
-
-			graphics.drawItem(player, stack, x, y, seed);
-			if (f > 0.0F) {
-				graphics.getMatrices().pop();
-			}
-
-			graphics.drawItemInSlot(this.client.textRenderer, stack, x, y);
-		}
+		// this is just a matrix translate in InGameHudMixin
 	}
 
 	@Override