fix custom crosshair compat!

Author: Mixces

src/main/java/io/github/axolotlclient/oldanimations/config/OldAnimationsConfig.java

@@ -58,7 +58,7 @@ public class OldAnimationsConfig {
 	public final BooleanOption show1_7_10 = new BooleanOption("show1_7_10", false);
 	public final BooleanOption debugInfo = new BooleanOption("debugInfo", true);
 	public final BooleanOption disableDebugBackground = new BooleanOption("disableDebugBackground", true);
-	public final BooleanOption debugCrosshair = new BooleanOption("debugCrosshair", true);
+	public final BooleanOption alwaysShowCrosshair = new BooleanOption("alwaysShowCrosshair", true);
 	public final BooleanOption debugTextSpacing = new BooleanOption("debugTextSpacing", true);
 	public final BooleanOption debugTextColorScheme = new BooleanOption("debugTextColorScheme", true);
 	public final BooleanOption debugTextShadow = new BooleanOption("debugTextShadow", true);
@@ -165,6 +165,7 @@ public void initConfig() {
 		categoryGUI.add(
 			show1_7_10,
 			heartFlashing,
+			alwaysShowCrosshair,
 			centeredSelectionMenus,
 			disableServerSelectionButtons,
 			disableUnknownServerIcon,
@@ -176,7 +177,6 @@ public void initConfig() {
 		categoryDebugOverlay.add(
 			debugInfo,
 			disableDebugBackground,
-			debugCrosshair,
 			debugTextSpacing,
 			debugTextColorScheme,
 			debugTextShadow

src/main/java/io/github/axolotlclient/oldanimations/mixin/GameGuiMixin.java

@@ -20,6 +20,11 @@
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import io.github.axolotlclient.AxolotlClient;
+import io.github.axolotlclient.AxolotlClientConfig.impl.AxolotlClientConfigMod;
+import io.github.axolotlclient.modules.hud.HudManager;
+import io.github.axolotlclient.modules.hud.gui.hud.vanilla.CrosshairHud;
+import io.github.axolotlclient.oldanimations.OldAnimations;
 import io.github.axolotlclient.oldanimations.config.OldAnimationsConfig;
 import net.minecraft.client.gui.GameGui;
 import net.minecraft.client.render.Window;
@@ -56,7 +61,8 @@ public abstract class GameGuiMixin {
 
 	@WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GameGui;hasCrosshair()Z"))
 	private boolean axolotlclient$enableCrosshair(GameGui instance, Operation<Boolean> original) {
-		return (OldAnimationsConfig.isEnabled() && OldAnimationsConfig.instance.debugCrosshair.get()) || original.call(instance);
+		boolean isCustomCrosshair = OldAnimations.AXOLOTLCLIENT && HudManager.getInstance().get(CrosshairHud.ID).isEnabled();
+		return (OldAnimationsConfig.isEnabled() && OldAnimationsConfig.instance.alwaysShowCrosshair.get() && !isCustomCrosshair) || original.call(instance);
 	}
 
 	@Unique

src/main/java/io/github/axolotlclient/oldanimations/mixin/GameRendererMixin.java

@@ -22,6 +22,9 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
+import io.github.axolotlclient.modules.hud.HudManager;
+import io.github.axolotlclient.modules.hud.gui.hud.vanilla.CrosshairHud;
+import io.github.axolotlclient.oldanimations.OldAnimations;
 import io.github.axolotlclient.oldanimations.config.OldAnimationsConfig;
 import io.github.axolotlclient.oldanimations.ducks.Sneaky;
 import net.minecraft.client.Minecraft;
@@ -82,7 +85,8 @@ public abstract class GameRendererMixin implements Sneaky {
 
 	@WrapOperation(method = "renderAxisIndicators", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/entity/living/player/LocalClientPlayerEntity;hasReducedDebugInfo()Z"))
 	private boolean axolotlclient$disableAxisIndicator(LocalClientPlayerEntity instance, Operation<Boolean> original) {
-		return (OldAnimationsConfig.isEnabled() && OldAnimationsConfig.instance.debugCrosshair.get()) || original.call(instance);
+		boolean isCustomCrosshair = OldAnimations.AXOLOTLCLIENT && HudManager.getInstance().get(CrosshairHud.ID).isEnabled();
+		return (OldAnimationsConfig.isEnabled() && OldAnimationsConfig.instance.alwaysShowCrosshair.get() && !isCustomCrosshair) || original.call(instance);
 	}
 
 	@Inject(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/HeldItemRenderer;updateHeldItem()V")) /* placed below null check */

src/main/resources/assets/axolotlclient-oldanimations/lang/en_us.json

@@ -30,8 +30,8 @@
 	"debugInfo.tooltip": "Use debug information found in the 1.7 debug menu.",
 	"disableDebugBackground": "Disable Background",
 	"disableDebugBackground.tooltip": "Disables the background on text.",
-	"debugCrosshair": "Show Crosshair",
-	"debugCrosshair.tooltip": "Replaces the axis indicator with the regular crosshair.",
+	"alwaysShowCrosshair": "Always Show Crosshair",
+	"alwaysShowCrosshair.tooltip": "Always shows the crosshair. Replaces the debug menu axis indicator with the regular crosshair as it doesn't exist in 1.7.",
 	"debugTextSpacing": "Text Spacing",
 	"debugTextSpacing.tooltip": "Spaces the text in a manner that is identical to 1.7.",
 	"debugTextColorScheme": "Color Scheme",