aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjani270 <69345714+jani270@users.noreply.github.com>2025-08-12 23:48:08 +0200
committerLinnea Gräf <nea@nea.moe>2025-08-24 15:02:07 +0200
commita208eea3393483bfd0a3103be570290f9ee19121 (patch)
tree61c89e9afe5a96c7aed6b00f07888831404f1cad /src
parentf9b0fe00f359ec9411b3186bb1e71dece28f2dc5 (diff)
downloadFirmament-a208eea3393483bfd0a3103be570290f9ee19121.tar.gz
Firmament-a208eea3393483bfd0a3103be570290f9ee19121.tar.bz2
Firmament-a208eea3393483bfd0a3103be570290f9ee19121.zip
feat: Only hide potion effects while on skyblock
Diffstat (limited to 'src')
-rw-r--r--src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java5
-rw-r--r--src/main/java/moe/nea/firmament/mixins/HudRenderEventsPatch.java3
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();
}
}