diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java | 6 | ||||
| -rw-r--r-- | src/main/kotlin/util/SBData.kt | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java b/src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java index 50d2fde..58f52f4 100644 --- a/src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java +++ b/src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java @@ -18,12 +18,14 @@ public abstract class HideStatusEffectsPatch { @Inject(method = "shouldHideStatusEffectHud", at = @At("HEAD"), cancellable = true) private void hideStatusEffects(CallbackInfoReturnable<Boolean> cir) { - cir.setReturnValue(!Fixes.TConfig.INSTANCE.getHidePotionEffects() && SBData.INSTANCE.isOnSkyblock()); + if (Fixes.TConfig.INSTANCE.getHidePotionEffects()) { + cir.setReturnValue(false); + } } @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() && SBData.INSTANCE.isOnSkyblock()) { + if (Fixes.TConfig.INSTANCE.getHidePotionEffects()) { ci.cancel(); } } diff --git a/src/main/kotlin/util/SBData.kt b/src/main/kotlin/util/SBData.kt index 8675842..27a3edc 100644 --- a/src/main/kotlin/util/SBData.kt +++ b/src/main/kotlin/util/SBData.kt @@ -41,6 +41,12 @@ object SBData { */ val skyblockLocation: SkyBlockIsland? get() = locraw?.skyblockLocation val hasValidLocraw get() = locraw?.server !in listOf("limbo", null) + + /** + * Check if the player is currently on skyblock. + * + * Nota bene: We don't generally disable features outside of SkyBlock unless they could lead to bans. + */ val isOnSkyblock get() = locraw?.gametype == "SKYBLOCK" var profileIdCommandDebounce = TimeMark.farPast() fun init() { |