fix more bugs

moehreag · moehreag · commit c08547a9cc6f · 2024-11-22T16:03:47.000+01:00
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/auth/Auth.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/auth/Auth.java
@@ -109,7 +109,9 @@ protected void login(Account account) {
 			if (account.isExpired()) {
 				Notifications.getInstance().addStatus(new TranslatableText("auth.notif.title"), new TranslatableText("auth.notif.refreshing", account.getName()));
 			}
-			account.refresh(auth, () -> {});
+			account.refresh(auth, () -> {
+				getAccounts().stream().filter(a -> account.getUuid().equals(a.getUuid())).findFirst().ifPresent(this::login);
+			});
 		} else {
 			runnable.run();
 		}
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/auth/Auth.java b/1.20/src/main/java/io/github/axolotlclient/modules/auth/Auth.java
@@ -123,7 +123,9 @@ protected void login(Account account) {
 			if (account.isExpired()) {
 				Notifications.getInstance().addStatus(Text.translatable("auth.notif.title"), Text.translatable("auth.notif.refreshing", account.getName()));
 			}
-			account.refresh(auth, () -> {});
+			account.refresh(auth, () -> {
+				getAccounts().stream().filter(a -> account.getUuid().equals(a.getUuid())).findFirst().ifPresent(this::login);
+			});
 		} else {
 			runnable.run();
 		}
diff --git a/1.21.3/src/main/java/io/github/axolotlclient/mixin/InGameHudMixin.java b/1.21.3/src/main/java/io/github/axolotlclient/mixin/InGameHudMixin.java
@@ -107,22 +107,14 @@ private void onHudRender(GuiGraphics guiGraphics, DeltaTracker deltaTracker, Cal
 		}
 	}
 
-	@Inject(method = "renderOverlayMessage", at = @At(value = "HEAD"))
-	public void axolotlclient$clearActionBar(GuiGraphics graphics, DeltaTracker tracker, CallbackInfo ci) {
-		ActionBarHud hud = (ActionBarHud) HudManager.getInstance().get(ActionBarHud.ID);
-		if (hud != null && hud.isEnabled()) {
-			if (overlayMessageString == null || overlayMessageTime <= 0 && hud.getActionBar() != null) {
-				hud.setActionBar(null, 0);
-			}
-		}
-	}
-
 	@WrapOperation(method = "renderOverlayMessage", at = @At(value = "INVOKE",
 		target = "Lnet/minecraft/client/gui/GuiGraphics;drawStringWithBackdrop(Lnet/minecraft/client/gui/Font;Lnet/minecraft/network/chat/Component;IIII)I"))
 	public int axolotlclient$getActionBar(GuiGraphics instance, Font font, Component text, int x, int y, int width, int color, Operation<Integer> original) {
 		ActionBarHud hud = (ActionBarHud) HudManager.getInstance().get(ActionBarHud.ID);
 		if (hud != null && hud.isEnabled()) {
-			hud.setActionBar(text, color);// give ourselves the correct values
+			instance.pose().popPose();
+			hud.render(instance, text, color);
+			instance.pose().pushPose();
 			return 0; // Doesn't matter since return value is not used
 		} else {
 			return original.call(instance, font, text, x, y, width, color);
diff --git a/1.21.3/src/main/java/io/github/axolotlclient/modules/auth/Auth.java b/1.21.3/src/main/java/io/github/axolotlclient/modules/auth/Auth.java
@@ -121,7 +121,9 @@ protected void login(Account account) {
 			if (account.isExpired()) {
 				Notifications.getInstance().addStatus(Component.translatable("auth.notif.title"), Component.translatable("auth.notif.refreshing", account.getName()));
 			}
-			account.refresh(auth, () -> {});
+			account.refresh(auth, () -> {
+				getAccounts().stream().filter(a -> account.getUuid().equals(a.getUuid())).findFirst().ifPresent(this::login);
+			});
 		} else {
 			runnable.run();
 		}
diff --git a/1.21.3/src/main/java/io/github/axolotlclient/modules/hud/HudManager.java b/1.21.3/src/main/java/io/github/axolotlclient/modules/hud/HudManager.java
@@ -76,7 +76,6 @@ public static HudManager getInstance() {
 	}
 
 	public void init() {
-		//KeyBindingHelper.registerKeyBinding(key);
 
 		AxolotlClient.CONFIG.addCategory(hudCategory);
 
diff --git a/1.21.3/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/ActionBarHud.java b/1.21.3/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/ActionBarHud.java
@@ -29,10 +29,11 @@
 import io.github.axolotlclient.AxolotlClientConfig.impl.options.BooleanOption;
 import io.github.axolotlclient.AxolotlClientConfig.impl.options.IntegerOption;
 import io.github.axolotlclient.modules.hud.gui.entry.TextHudEntry;
-import lombok.Getter;
+import io.github.axolotlclient.util.ClientColors;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.ARGB;
 
 /**
  * This implementation of Hud modules is based on KronHUD.
@@ -48,39 +49,26 @@ public class ActionBarHud extends TextHudEntry {
 	public final IntegerOption timeShown = new IntegerOption("timeshown", 60, 40, 300);
 	public final BooleanOption customTextColor = new BooleanOption("customtextcolor", false);
 	private final String placeholder = "Action Bar";
-	@Getter
-	private Component actionBar;
-	private int ticksShown;
-	private int color;
 
 	public ActionBarHud() {
 		super(115, 13, false);
 	}
 
-	public void setActionBar(Component bar, int color) {
-		this.actionBar = bar;
-		this.color = color;
-	}
-
 	@Override
 	public void renderComponent(GuiGraphics graphics, float delta) {
-		if (ticksShown >= timeShown.get()) {
-			this.actionBar = null;
-		}
-		Color vanillaColor = new Color(color);
-		if (this.actionBar != null) {
-			graphics.drawString(client.font, actionBar,
-				(int) ((float) getPos().x() + Math.round((float) getWidth() / 2) -
-					(float) client.font.width(actionBar) / 2), (int) ((float) getPos().y() + 3),
-				customTextColor.get() ? (textColor.get().getAlpha() == 255 ? new Color(
-					textColor.get().getRed(), textColor.get().getGreen(), textColor.get().getBlue(),
-					vanillaColor.getAlpha()
-				).toInt() : textColor.get().toInt()) : color, shadow.get()
-			);
-			ticksShown++;
-		} else {
-			ticksShown = 0;
-		}
+	}
+
+	public void render(GuiGraphics graphics, Component actionBar, int color) {
+
+		graphics.drawString(client.font, actionBar,
+			(int) ((float) getPos().x() + Math.round((float) getWidth() / 2) -
+				(float) client.font.width(actionBar) / 2), (int) ((float) getPos().y() + 3),
+			customTextColor.get() ? (textColor.get().getAlpha() == 255 ? new Color(
+				textColor.get().getRed(), textColor.get().getGreen(), textColor.get().getBlue(),
+				ARGB.alpha(color)
+			).toInt() : textColor.get().toInt()) : color, shadow.get()
+		);
+
 	}
 
 	@Override
diff --git a/1.21/src/main/java/io/github/axolotlclient/modules/auth/Auth.java b/1.21/src/main/java/io/github/axolotlclient/modules/auth/Auth.java
@@ -124,6 +124,7 @@ protected void login(Account account) {
 				Notifications.getInstance().addStatus(Text.translatable("auth.notif.title"), Text.translatable("auth.notif.refreshing", account.getName()));
 			}
 			account.refresh(auth, () -> {
+				getAccounts().stream().filter(a -> account.getUuid().equals(a.getUuid())).findFirst().ifPresent(this::login);
 			});
 		} else {
 			runnable.run();
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/auth/Auth.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/auth/Auth.java
@@ -113,7 +113,9 @@ protected void login(Account account) {
 			if (account.isExpired()) {
 				Notifications.getInstance().addStatus("auth.notif.title", "auth.notif.refreshing", account.getName());
 			}
-			account.refresh(auth, () -> {});
+			account.refresh(auth, () -> {
+				getAccounts().stream().filter(a -> account.getUuid().equals(a.getUuid())).findFirst().ifPresent(this::login);
+			});
 		} else {
 			runnable.run();
 		}
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.parallel=true
 axolotlclient.modules.all=true
 
 # Mod Properties
-version=3.1.0-beta.18
+version=3.1.0-beta.19
 
 maven_group=io.github.axolotlclient
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,9 @@ protected void login(Account account) {`
`109`	`109`	`if (account.isExpired()) {`
`110`	`110`	`Notifications.getInstance().addStatus(new TranslatableText("auth.notif.title"), new TranslatableText("auth.notif.refreshing", account.getName()));`
`111`	`111`	`}`
`112`		`- account.refresh(auth, () -> {});`
	`112`	`+ account.refresh(auth, () -> {`
	`113`	`+ getAccounts().stream().filter(a -> account.getUuid().equals(a.getUuid())).findFirst().ifPresent(this::login);`
	`114`	`+ });`
`113`	`115`	`} else {`
`114`	`116`	`runnable.run();`
`115`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,9 @@ protected void login(Account account) {`
`123`	`123`	`if (account.isExpired()) {`
`124`	`124`	`Notifications.getInstance().addStatus(Text.translatable("auth.notif.title"), Text.translatable("auth.notif.refreshing", account.getName()));`
`125`	`125`	`}`
`126`		`- account.refresh(auth, () -> {});`
	`126`	`+ account.refresh(auth, () -> {`
	`127`	`+ getAccounts().stream().filter(a -> account.getUuid().equals(a.getUuid())).findFirst().ifPresent(this::login);`
	`128`	`+ });`
`127`	`129`	`} else {`
`128`	`130`	`runnable.run();`
`129`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,9 @@ protected void login(Account account) {`
`121`	`121`	`if (account.isExpired()) {`
`122`	`122`	`Notifications.getInstance().addStatus(Component.translatable("auth.notif.title"), Component.translatable("auth.notif.refreshing", account.getName()));`
`123`	`123`	`}`
`124`		`- account.refresh(auth, () -> {});`
	`124`	`+ account.refresh(auth, () -> {`
	`125`	`+ getAccounts().stream().filter(a -> account.getUuid().equals(a.getUuid())).findFirst().ifPresent(this::login);`
	`126`	`+ });`
`125`	`127`	`} else {`
`126`	`128`	`runnable.run();`
`127`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ public static HudManager getInstance() {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`public void init() {`
`79`		`- //KeyBindingHelper.registerKeyBinding(key);`
`80`	`79`
`81`	`80`	`AxolotlClient.CONFIG.addCategory(hudCategory);`
`82`	`81`
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@ protected void login(Account account) {`
`124`	`124`	`Notifications.getInstance().addStatus(Text.translatable("auth.notif.title"), Text.translatable("auth.notif.refreshing", account.getName()));`
`125`	`125`	`}`
`126`	`126`	`account.refresh(auth, () -> {`
	`127`	`+ getAccounts().stream().filter(a -> account.getUuid().equals(a.getUuid())).findFirst().ifPresent(this::login);`
`127`	`128`	`});`
`128`	`129`	`} else {`
`129`	`130`	`runnable.run();`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,9 @@ protected void login(Account account) {`
`113`	`113`	`if (account.isExpired()) {`
`114`	`114`	`Notifications.getInstance().addStatus("auth.notif.title", "auth.notif.refreshing", account.getName());`
`115`	`115`	`}`
`116`		`- account.refresh(auth, () -> {});`
	`116`	`+ account.refresh(auth, () -> {`
	`117`	`+ getAccounts().stream().filter(a -> account.getUuid().equals(a.getUuid())).findFirst().ifPresent(this::login);`
	`118`	`+ });`
`117`	`119`	`} else {`
`118`	`120`	`runnable.run();`
`119`	`121`	`}`