diff options
| -rw-r--r-- | src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java | 5 | ||||
| -rw-r--r-- | src/main/java/moe/nea/firmament/mixins/HudRenderEventsPatch.java | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java b/src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java index 2a58921..50d2fde 100644 --- a/src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java +++ b/src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java @@ -1,6 +1,7 @@ package moe.nea.firmament.mixins; 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.StatusEffectsDisplay; import org.spongepowered.asm.mixin.Mixin; @@ -17,12 +18,12 @@ public abstract class HideStatusEffectsPatch { @Inject(method = "shouldHideStatusEffectHud", at = @At("HEAD"), cancellable = true) private void hideStatusEffects(CallbackInfoReturnable<Boolean> cir) { - cir.setReturnValue(!Fixes.TConfig.INSTANCE.getHidePotionEffects()); + cir.setReturnValue(!Fixes.TConfig.INSTANCE.getHidePotionEffects() && SBData.INSTANCE.isOnSkyblock()); } @Inject(method = "drawStatusEffects", at = @At("HEAD"), cancellable = true) private void conditionalRenderStatuses(DrawContext context, int mouseX, int mouseY, CallbackInfo ci) { - if (shouldHideStatusEffectHud() || !Fixes.TConfig.INSTANCE.getHidePotionEffects()) { + if (shouldHideStatusEffectHud() || !Fixes.TConfig.INSTANCE.getHidePotionEffects() && SBData.INSTANCE.isOnSkyblock()) { ci.cancel(); } } diff --git a/src/main/java/moe/nea/firmament/mixins/HudRenderEventsPatch.java b/src/main/java/moe/nea/firmament/mixins/HudRenderEventsPatch.java index 49e86fb..3ec5a0e 100644 --- a/src/main/java/moe/nea/firmament/mixins/HudRenderEventsPatch.java +++ b/src/main/java/moe/nea/firmament/mixins/HudRenderEventsPatch.java @@ -5,6 +5,7 @@ package moe.nea.firmament.mixins; import moe.nea.firmament.events.HotbarItemRenderEvent; import moe.nea.firmament.events.HudRenderEvent; import moe.nea.firmament.features.fixes.Fixes; +import moe.nea.firmament.util.SBData; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.hud.InGameHud; import net.minecraft.client.render.RenderTickCounter; @@ -30,7 +31,7 @@ public class HudRenderEventsPatch { @Inject(method = "renderStatusEffectOverlay", at = @At("HEAD"), cancellable = true) public void hideStatusEffects(CallbackInfo ci) { - if (Fixes.TConfig.INSTANCE.getHidePotionEffectsHud()) ci.cancel(); + if (Fixes.TConfig.INSTANCE.getHidePotionEffectsHud() && SBData.INSTANCE.isOnSkyblock()) ci.cancel(); } } |