fix a few more bugs

moehreag · moehreag · commit 899c2f7178ea · 2025-10-19T01:27:02.000+02:00
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/impl/Bridge.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/impl/Bridge.java
@@ -51,7 +51,7 @@ public Identifier getFabricId() {
 				return new Identifier("axolotlclient", "bridge/resource_listener");
 			}
 		});
-		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());
 	}
 
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/HotbarHUD.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/HotbarHUD.java
@@ -52,6 +52,7 @@ public class HotbarHUD extends TextHudEntry {
 
 	public HotbarHUD() {
 		super(182, 22, false);
+		supportsScaling = false;
 	}
 
 	@Override
diff --git a/1.20/src/main/java/io/github/axolotlclient/bridge/impl/Bridge.java b/1.20/src/main/java/io/github/axolotlclient/bridge/impl/Bridge.java
@@ -52,7 +52,7 @@ public Identifier getFabricId() {
 				return new Identifier("axolotlclient", "bridge/resource_listener");
 			}
 		});
-		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.20/src/main/java/io/github/axolotlclient/modules/hud/HudEditScreen.java b/1.20/src/main/java/io/github/axolotlclient/modules/hud/HudEditScreen.java
@@ -125,19 +125,20 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
 		if (entry.isPresent()) {
 			var bounds = entry.get().getTrueBounds();
 			if (mode == ModificationMode.NONE && bounds.isMouseOver(mouseX, mouseY)) {
+				var supportsScaling = entry.get().supportsScaling();
 				var xBound = Math.max(0, mouseX - bounds.x());
 				var yBound = Math.max(0, mouseY - bounds.y());
 				var tolerance = GRAB_TOLERANCE;
-				if (xBound < tolerance && yBound < tolerance) {
+				if (supportsScaling && xBound < tolerance && yBound < tolerance) {
 					// top-left
 					setCursor(NWSE_RESIZE_CURSOR);
-				} else if (Math.abs(xBound - bounds.width()) < tolerance && Math.abs(yBound - bounds.height()) < tolerance) {
+				} else if (supportsScaling && Math.abs(xBound - bounds.width()) < tolerance && Math.abs(yBound - bounds.height()) < tolerance) {
 					// bottom-right
 					setCursor(NWSE_RESIZE_CURSOR);
-				} else if (xBound < tolerance && Math.abs(yBound - bounds.height()) < tolerance) {
+				} else if (supportsScaling && xBound < tolerance && Math.abs(yBound - bounds.height()) < tolerance) {
 					// bottom-left
 					setCursor(NESW_RESIZE_CURSOR);
-				} else if (yBound < tolerance && Math.abs(xBound - bounds.width()) < tolerance) {
+				} else if (supportsScaling && yBound < tolerance && Math.abs(xBound - bounds.width()) < tolerance) {
 					// top-right
 					setCursor(NESW_RESIZE_CURSOR);
 				} else {
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/HotbarHUD.java b/1.20/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/HotbarHUD.java
@@ -49,6 +49,7 @@ public class HotbarHUD extends TextHudEntry {
 
 	public HotbarHUD() {
 		super(182, 22, false);
+		supportsScaling = false;
 	}
 
 	@Override
diff --git a/1.21/src/main/java/io/github/axolotlclient/bridge/impl/Bridge.java b/1.21/src/main/java/io/github/axolotlclient/bridge/impl/Bridge.java
@@ -52,7 +52,7 @@ public Identifier getFabricId() {
 				return Identifier.of("axolotlclient", "bridge/resource_listener");
 			}
 		});
-		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.21/src/main/java/io/github/axolotlclient/mixin/InGameHudMixin.java b/1.21/src/main/java/io/github/axolotlclient/mixin/InGameHudMixin.java
@@ -135,7 +135,7 @@ private void onHudRender(GuiGraphics graphics, DeltaTracker tracker, CallbackInf
 	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()) {
+		if (hud.isEnabled() && !hud.isHidden()) {
 			graphics.getMatrices().translate(-graphics.getScaledWindowWidth() / 2f + 182 / 2f, -graphics.getScaledWindowHeight() + 22, 0);
 			graphics.getMatrices().translate(hud.getX(), hud.getY(), 0);
 		}
diff --git a/1.21/src/main/java/io/github/axolotlclient/modules/hud/HudEditScreen.java b/1.21/src/main/java/io/github/axolotlclient/modules/hud/HudEditScreen.java
@@ -124,19 +124,20 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
 		if (entry.isPresent()) {
 			var bounds = entry.get().getTrueBounds();
 			if (mode == ModificationMode.NONE && bounds.isMouseOver(mouseX, mouseY)) {
+				var supportsScaling = entry.get().supportsScaling();
 				var xBound = Math.max(0, mouseX - bounds.x());
 				var yBound = Math.max(0, mouseY - bounds.y());
 				var tolerance = GRAB_TOLERANCE;
-				if (xBound < tolerance && yBound < tolerance) {
+				if (supportsScaling && xBound < tolerance && yBound < tolerance) {
 					// top-left
 					setCursor(NWSE_RESIZE_CURSOR);
-				} else if (Math.abs(xBound - bounds.width()) < tolerance && Math.abs(yBound - bounds.height()) < tolerance) {
+				} else if (supportsScaling && Math.abs(xBound - bounds.width()) < tolerance && Math.abs(yBound - bounds.height()) < tolerance) {
 					// bottom-right
 					setCursor(NWSE_RESIZE_CURSOR);
-				} else if (xBound < tolerance && Math.abs(yBound - bounds.height()) < tolerance) {
+				} else if (supportsScaling && xBound < tolerance && Math.abs(yBound - bounds.height()) < tolerance) {
 					// bottom-left
 					setCursor(NESW_RESIZE_CURSOR);
-				} else if (yBound < tolerance && Math.abs(xBound - bounds.width()) < tolerance) {
+				} else if (supportsScaling && yBound < tolerance && Math.abs(xBound - bounds.width()) < tolerance) {
 					// top-right
 					setCursor(NESW_RESIZE_CURSOR);
 				} else {
diff --git a/1.21/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/HotbarHUD.java b/1.21/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/HotbarHUD.java
@@ -40,6 +40,7 @@ public class HotbarHUD extends TextHudEntry {
 
 	public HotbarHUD() {
 		super(182, 22, false);
+		supportsScaling = false;
 	}
 
 	@Override
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/HudEditScreen.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/HudEditScreen.java
@@ -133,19 +133,20 @@ public void render(int mouseX, int mouseY, float delta) {
 		if (entry.isPresent()) {
 			var bounds = entry.get().getTrueBounds();
 			if (mode == ModificationMode.NONE && bounds.isMouseOver(mouseX, mouseY)) {
+				var supportsScaling = entry.get().supportsScaling();
 				var xBound = Math.max(0, mouseX - bounds.x());
 				var yBound = Math.max(0, mouseY - bounds.y());
 				var tolerance = GRAB_TOLERANCE;
-				if (xBound < tolerance && yBound < tolerance) {
+				if (supportsScaling && xBound < tolerance && yBound < tolerance) {
 					// top-left
 					setCursor(NWSE_RESIZE_CURSOR);
-				} else if (Math.abs(xBound - bounds.width()) < tolerance && Math.abs(yBound - bounds.height()) < tolerance) {
+				} else if (supportsScaling && Math.abs(xBound - bounds.width()) < tolerance && Math.abs(yBound - bounds.height()) < tolerance) {
 					// bottom-right
 					setCursor(NWSE_RESIZE_CURSOR);
-				} else if (xBound < tolerance && Math.abs(yBound - bounds.height()) < tolerance) {
+				} else if (supportsScaling && xBound < tolerance && Math.abs(yBound - bounds.height()) < tolerance) {
 					// bottom-left
 					setCursor(NESW_RESIZE_CURSOR);
-				} else if (yBound < tolerance && Math.abs(xBound - bounds.width()) < tolerance) {
+				} else if (supportsScaling && yBound < tolerance && Math.abs(xBound - bounds.width()) < tolerance) {
 					// top-right
 					setCursor(NESW_RESIZE_CURSOR);
 				} else {
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/HotbarHUD.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/HotbarHUD.java
@@ -46,6 +46,7 @@ public class HotbarHUD extends TextHudEntry {
 
 	public HotbarHUD() {
 		super(182, 22, false);
+		supportsScaling = false;
 	}
 
 	@Override
diff --git a/1.latest/src/main/java/io/github/axolotlclient/modules/hud/HudEditScreen.java b/1.latest/src/main/java/io/github/axolotlclient/modules/hud/HudEditScreen.java
@@ -125,19 +125,20 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
 		if (entry.isPresent()) {
 			var bounds = entry.get().getTrueBounds();
 			if (mode == ModificationMode.NONE && bounds.isMouseOver(mouseX, mouseY)) {
+				var supportsScaling = entry.get().supportsScaling();
 				var xBound = Math.max(0, mouseX - bounds.x());
 				var yBound = Math.max(0, mouseY - bounds.y());
 				var tolerance = GRAB_TOLERANCE;
-				if (xBound < tolerance && yBound < tolerance) {
+				if (supportsScaling && xBound < tolerance && yBound < tolerance) {
 					// top-left
 					setCursor(NWSE_RESIZE_CURSOR);
-				} else if (Math.abs(xBound - bounds.width()) < tolerance && Math.abs(yBound - bounds.height()) < tolerance) {
+				} else if (supportsScaling && Math.abs(xBound - bounds.width()) < tolerance && Math.abs(yBound - bounds.height()) < tolerance) {
 					// bottom-right
 					setCursor(NWSE_RESIZE_CURSOR);
-				} else if (xBound < tolerance && Math.abs(yBound - bounds.height()) < tolerance) {
+				} else if (supportsScaling && xBound < tolerance && Math.abs(yBound - bounds.height()) < tolerance) {
 					// bottom-left
 					setCursor(NESW_RESIZE_CURSOR);
-				} else if (yBound < tolerance && Math.abs(xBound - bounds.width()) < tolerance) {
+				} else if (supportsScaling && yBound < tolerance && Math.abs(xBound - bounds.width()) < tolerance) {
 					// top-right
 					setCursor(NESW_RESIZE_CURSOR);
 				} else {
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
@@ -68,4 +68,6 @@ default double getDefaultY() {
 	boolean isHovered();
 
 	boolean isHidden();
+
+	boolean supportsScaling();
 }
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
@@ -66,6 +66,7 @@ public abstract class AbstractHudEntry implements HudEntry {
 	@Setter
 	@Getter
 	protected boolean hovered = false;
+	protected boolean supportsScaling = true;
 	@Getter
 	private Rectangle trueBounds;
 	private Rectangle renderBounds;
@@ -268,4 +269,9 @@ public void setEnabled(boolean value) {
 	public boolean isHidden() {
 		return hide.get();
 	}
+
+	@Override
+	public boolean supportsScaling() {
+		return supportsScaling;
+	}
 }
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ fabric.loom.disableMinecraftVerification=true
 axolotlclient.modules.all=true
 
 # Mod Properties
-version=3.1.6-beta.1
+version=3.1.6-beta.2
 
 maven_group=io.github.axolotlclient
 

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public Identifier getFabricId() {`
`51`	`51`	`return new Identifier("axolotlclient", "bridge/resource_listener");`
`52`	`52`	`}`
`53`	`53`	`});`
`54`		`- ClientPlayConnectionEvents.INIT.register((clientPlayNetworkHandler, minecraftClient) -> Events.CONNECTION_PLAY_READY.invoker().run());`
	`54`	`+ ClientPlayConnectionEvents.JOIN.register((clientPlayNetworkHandler, sender, minecraftClient) -> Events.CONNECTION_PLAY_READY.invoker().run());`
`55`	`55`	`ClientPlayConnectionEvents.DISCONNECT.register((clientPlayNetworkHandler, minecraftClient) -> Events.DISCONNECT.invoker().run());`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ public class HotbarHUD extends TextHudEntry {`
`52`	`52`
`53`	`53`	`public HotbarHUD() {`
`54`	`54`	`super(182, 22, false);`
	`55`	`+ supportsScaling = false;`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public Identifier getFabricId() {`
`52`	`52`	`return new Identifier("axolotlclient", "bridge/resource_listener");`
`53`	`53`	`}`
`54`	`54`	`});`
`55`		`- ClientPlayConnectionEvents.INIT.register((clientPlayNetworkHandler, minecraftClient) -> Events.CONNECTION_PLAY_READY.invoker().run());`
	`55`	`+ ClientPlayConnectionEvents.JOIN.register((clientPlayNetworkHandler, sender, minecraftClient) -> Events.CONNECTION_PLAY_READY.invoker().run());`
`56`	`56`	`ClientPlayConnectionEvents.DISCONNECT.register((clientPlayNetworkHandler, minecraftClient) -> Events.DISCONNECT.invoker().run());`
`57`	`57`
`58`	`58`	`ClientCommandRegistrationCallback.EVENT.register((commandDispatcher, commandBuildContext) ->`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ public class HotbarHUD extends TextHudEntry {`
`49`	`49`
`50`	`50`	`public HotbarHUD() {`
`51`	`51`	`super(182, 22, false);`
	`52`	`+ supportsScaling = false;`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ private void onHudRender(GuiGraphics graphics, DeltaTracker tracker, CallbackInf`
`135`	`135`	`public void axolotlclient$customHotbar(GuiGraphics graphics, DeltaTracker tracker, Operation<Void> original) {`
`136`	`136`	`HotbarHUD hud = (HotbarHUD) HudManager.getInstance().get(HotbarHUD.ID);`
`137`	`137`	`graphics.getMatrices().push();`
`138`		`- if (hud.isEnabled()) {`
	`138`	`+ if (hud.isEnabled() && !hud.isHidden()) {`
`139`	`139`	`graphics.getMatrices().translate(-graphics.getScaledWindowWidth() / 2f + 182 / 2f, -graphics.getScaledWindowHeight() + 22, 0);`
`140`	`140`	`graphics.getMatrices().translate(hud.getX(), hud.getY(), 0);`
`141`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ public class HotbarHUD extends TextHudEntry {`
`40`	`40`
`41`	`41`	`public HotbarHUD() {`
`42`	`42`	`super(182, 22, false);`
	`43`	`+ supportsScaling = false;`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`@Override`