From 8e6c7e50ad1f02ef369152223a60f670012700e1 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Mon, 16 Oct 2023 18:59:05 +0200 Subject: Fixed bug that prevented some users to start their game. --- .../mixins/hooks/MixinPatcherFontRendererHookHook.kt | 19 +++++++++++++++++++ .../transformers/MixinPatcherFontRendererHook.java | 7 ++----- 2 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 src/main/java/at/hannibal2/skyhanni/mixins/hooks/MixinPatcherFontRendererHookHook.kt (limited to 'src/main/java') diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/MixinPatcherFontRendererHookHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/MixinPatcherFontRendererHookHook.kt new file mode 100644 index 000000000..33ee05271 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/MixinPatcherFontRendererHookHook.kt @@ -0,0 +1,19 @@ +package at.hannibal2.skyhanni.mixins.hooks + +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.utils.LorenzUtils +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable + +class MixinPatcherFontRendererHookHook { + companion object { + @JvmStatic + fun overridePatcherFontRenderer(string: String, shadow: Boolean, cir: CallbackInfoReturnable) { + if (!LorenzUtils.onHypixel) return + + if (SkyHanniMod.feature.chroma.enabled) { + cir.cancel() + cir.returnValue = false + } + } + } +} \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinPatcherFontRendererHook.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinPatcherFontRendererHook.java index 7c585b725..8cfaebfb2 100644 --- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinPatcherFontRendererHook.java +++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinPatcherFontRendererHook.java @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.mixins.transformers; -import at.hannibal2.skyhanni.SkyHanniMod; +import at.hannibal2.skyhanni.mixins.hooks.MixinPatcherFontRendererHookHook; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Pseudo; import org.spongepowered.asm.mixin.injection.At; @@ -13,9 +13,6 @@ public class MixinPatcherFontRendererHook { @Inject(method = "renderStringAtPos(Ljava/lang/String;Z)Z", at = @At("HEAD"), cancellable = true) public void overridePatcherFontRenderer(String string, boolean shadow, CallbackInfoReturnable cir) { - if (SkyHanniMod.getFeature().chroma.enabled) { - cir.cancel(); - cir.setReturnValue(false); - } + MixinPatcherFontRendererHookHook.overridePatcherFontRenderer(string, shadow, cir); } } -- cgit