(CrosshairHud/1.20+) fix: two attack indicators

moehreag · moehreag · commit 1994ac8ac844 · 2025-03-09T20:30:53.000+01:00
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/CrosshairHud.java b/1.20/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/CrosshairHud.java
@@ -232,7 +232,7 @@ public void render(GuiGraphics graphics, float delta) {
 				}
 			}
 		}
-		if (indicator == AttackIndicator.CROSSHAIR && !type.get().equals(Crosshair.TEXTURE)) {
+		if (indicator == AttackIndicator.CROSSHAIR && !type.get().equals(Crosshair.TEXTURE) && !type.get().equals(Crosshair.CUSTOM)) {
 			float progress = this.client.player.getAttackCooldownProgress(0.0F);
 			if (progress != 1.0F) {
 				RenderUtil.drawRectangle(graphics, getRawX() + (getWidth() / 2) - 6, getRawY() + (getHeight() / 2) + 9,
diff --git a/1.21.4/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/CrosshairHud.java b/1.21.4/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/CrosshairHud.java
@@ -228,7 +228,7 @@ public void renderCrosshair(GuiGraphics graphics, float delta) {
 				}
 			}
 		}
-		if (indicator == AttackIndicatorStatus.CROSSHAIR && !type.get().equals(Crosshair.TEXTURE)) {
+		if (indicator == AttackIndicatorStatus.CROSSHAIR && !type.get().equals(Crosshair.TEXTURE) && !type.get().equals(Crosshair.CUSTOM)) {
 			float progress = this.client.player.getAttackStrengthScale(0.0F);
 			if (progress != 1.0F) {
 				fillRenderType(graphics, blend, getRawX() + (getWidth() / 2) - 6, getRawY() + (getHeight() / 2) + 9,
diff --git a/1.21/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/CrosshairHud.java b/1.21/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/CrosshairHud.java
@@ -235,7 +235,7 @@ public void render(GuiGraphics graphics, float delta) {
 				}
 			}
 		}
-		if (indicator == AttackIndicator.CROSSHAIR && !type.get().equals(Crosshair.TEXTURE)) {
+		if (indicator == AttackIndicator.CROSSHAIR && !type.get().equals(Crosshair.TEXTURE) && !type.get().equals(Crosshair.CUSTOM)) {
 			float progress = this.client.player.getAttackCooldownProgress(0.0F);
 			if (progress != 1.0F) {
 				RenderUtil.drawRectangle(graphics, getRawX() + (getWidth() / 2) - 6, getRawY() + (getHeight() / 2) + 9,
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.2-beta.1
+version=3.1.2-beta.2
 
 maven_group=io.github.axolotlclient
 

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ public void render(GuiGraphics graphics, float delta) {`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`	`}`
`235`		`- if (indicator == AttackIndicator.CROSSHAIR && !type.get().equals(Crosshair.TEXTURE)) {`
	`235`	`+ if (indicator == AttackIndicator.CROSSHAIR && !type.get().equals(Crosshair.TEXTURE) && !type.get().equals(Crosshair.CUSTOM)) {`
`236`	`236`	`float progress = this.client.player.getAttackCooldownProgress(0.0F);`
`237`	`237`	`if (progress != 1.0F) {`
`238`	`238`	`RenderUtil.drawRectangle(graphics, getRawX() + (getWidth() / 2) - 6, getRawY() + (getHeight() / 2) + 9,`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ public void renderCrosshair(GuiGraphics graphics, float delta) {`
`228`	`228`	`}`
`229`	`229`	`}`
`230`	`230`	`}`
`231`		`- if (indicator == AttackIndicatorStatus.CROSSHAIR && !type.get().equals(Crosshair.TEXTURE)) {`
	`231`	`+ if (indicator == AttackIndicatorStatus.CROSSHAIR && !type.get().equals(Crosshair.TEXTURE) && !type.get().equals(Crosshair.CUSTOM)) {`
`232`	`232`	`float progress = this.client.player.getAttackStrengthScale(0.0F);`
`233`	`233`	`if (progress != 1.0F) {`
`234`	`234`	`fillRenderType(graphics, blend, getRawX() + (getWidth() / 2) - 6, getRawY() + (getHeight() / 2) + 9,`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ public void render(GuiGraphics graphics, float delta) {`
`235`	`235`	`}`
`236`	`236`	`}`
`237`	`237`	`}`
`238`		`- if (indicator == AttackIndicator.CROSSHAIR && !type.get().equals(Crosshair.TEXTURE)) {`
	`238`	`+ if (indicator == AttackIndicator.CROSSHAIR && !type.get().equals(Crosshair.TEXTURE) && !type.get().equals(Crosshair.CUSTOM)) {`
`239`	`239`	`float progress = this.client.player.getAttackCooldownProgress(0.0F);`
`240`	`240`	`if (progress != 1.0F) {`
`241`	`241`	`RenderUtil.drawRectangle(graphics, getRawX() + (getWidth() / 2) - 6, getRawY() + (getHeight() / 2) + 9,`