1 files changed, 11 insertions, 7 deletions
diff --git a/src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java b/src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java
index c5af8b6..58f52f4 100644
--- a/src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java
+++ b/src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java
@@ -1,29 +1,33 @@
 package moe.nea.firmament.mixins;
 
-import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import moe.nea.firmament.features.fixes.Fixes;
+import moe.nea.firmament.util.SBData;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.ingame.InventoryScreen;
 import net.minecraft.client.gui.screen.ingame.StatusEffectsDisplay;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin(InventoryScreen.class)
+@Mixin(StatusEffectsDisplay.class)
 public abstract class HideStatusEffectsPatch {
 	@Shadow
 	public abstract boolean shouldHideStatusEffectHud();
 
 	@Inject(method = "shouldHideStatusEffectHud", at = @At("HEAD"), cancellable = true)
 	private void hideStatusEffects(CallbackInfoReturnable<Boolean> cir) {
-		cir.setReturnValue(!Fixes.TConfig.INSTANCE.getHidePotionEffects());
+		if (Fixes.TConfig.INSTANCE.getHidePotionEffects()) {
+			cir.setReturnValue(false);
+		}
 	}
 
-	@WrapWithCondition(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/ingame/StatusEffectsDisplay;drawStatusEffects(Lnet/minecraft/client/gui/DrawContext;IIF)V"))
-	private boolean conditionalRenderStatuses(StatusEffectsDisplay instance, DrawContext context, int mouseX, int mouseY, float tickDelta) {
-		return shouldHideStatusEffectHud() || !Fixes.TConfig.INSTANCE.getHidePotionEffects();
+	@Inject(method = "drawStatusEffects", at = @At("HEAD"), cancellable = true)
+	private void conditionalRenderStatuses(DrawContext context, int mouseX, int mouseY, CallbackInfo ci) {
+		if (Fixes.TConfig.INSTANCE.getHidePotionEffects()) {
+			ci.cancel();
+		}
 	}
 
 }