feat: Hide potion effects

src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java

@@ -0,0 +1,29 @@
+package moe.nea.firmament.mixins;
+
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
+import moe.nea.firmament.features.fixes.Fixes;
+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.CallbackInfoReturnable;
+
+@Mixin(InventoryScreen.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());
+	}
+
+	@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();
+	}
+
+}

src/main/kotlin/features/fixes/Fixes.kt

@@ -1,71 +1,67 @@
-
-
 package moe.nea.firmament.features.fixes
 
 import moe.nea.jarvis.api.Point
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.option.KeyBinding
-import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.text.Text
-import net.minecraft.util.Arm
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.HudRenderEvent
 import moe.nea.firmament.events.WorldKeyboardEvent
 import moe.nea.firmament.features.FirmamentFeature
 import moe.nea.firmament.gui.config.ManagedConfig
 import moe.nea.firmament.util.MC
-import moe.nea.firmament.util.errorBoundary
 
 object Fixes : FirmamentFeature {
-    override val identifier: String
-        get() = "fixes"
+	override val identifier: String
+		get() = "fixes"
 
-    object TConfig : ManagedConfig(identifier, Category.MISC) { // TODO: split this config
-        val fixUnsignedPlayerSkins by toggle("player-skins") { true }
-        var autoSprint by toggle("auto-sprint") { false }
-        val autoSprintKeyBinding by keyBindingWithDefaultUnbound("auto-sprint-keybinding")
-        val autoSprintHud by position("auto-sprint-hud", 80, 10) { Point(0.0, 1.0) }
-        val peekChat by keyBindingWithDefaultUnbound("peek-chat")
-    }
+	object TConfig : ManagedConfig(identifier, Category.MISC) { // TODO: split this config
+		val fixUnsignedPlayerSkins by toggle("player-skins") { true }
+		var autoSprint by toggle("auto-sprint") { false }
+		val autoSprintKeyBinding by keyBindingWithDefaultUnbound("auto-sprint-keybinding")
+		val autoSprintHud by position("auto-sprint-hud", 80, 10) { Point(0.0, 1.0) }
+		val peekChat by keyBindingWithDefaultUnbound("peek-chat")
+		val hidePotionEffects by toggle("hide-mob-effects") { false }
+	}
 
-    override val config: ManagedConfig
-        get() = TConfig
+	override val config: ManagedConfig
+		get() = TConfig
 
-    fun handleIsPressed(
-        keyBinding: KeyBinding,
-        cir: CallbackInfoReturnable<Boolean>
-    ) {
-        if (keyBinding === MinecraftClient.getInstance().options.sprintKey && TConfig.autoSprint && MC.player?.isSprinting != true)
-            cir.returnValue = true
-    }
+	fun handleIsPressed(
+		keyBinding: KeyBinding,
+		cir: CallbackInfoReturnable<Boolean>
+	) {
+		if (keyBinding === MinecraftClient.getInstance().options.sprintKey && TConfig.autoSprint && MC.player?.isSprinting != true)
+			cir.returnValue = true
+	}
 
-    @Subscribe
-    fun onRenderHud(it: HudRenderEvent) {
-        if (!TConfig.autoSprintKeyBinding.isBound) return
-        it.context.matrices.push()
-        TConfig.autoSprintHud.applyTransformations(it.context.matrices)
-        it.context.drawText(
-            MC.font, Text.translatable(
-                if (TConfig.autoSprint)
-                    "firmament.fixes.auto-sprint.on"
-                else if (MC.player?.isSprinting == true)
-                    "firmament.fixes.auto-sprint.sprinting"
-                else
-                    "firmament.fixes.auto-sprint.not-sprinting"
-            ), 0, 0, -1, false
-        )
-        it.context.matrices.pop()
-    }
+	@Subscribe
+	fun onRenderHud(it: HudRenderEvent) {
+		if (!TConfig.autoSprintKeyBinding.isBound) return
+		it.context.matrices.push()
+		TConfig.autoSprintHud.applyTransformations(it.context.matrices)
+		it.context.drawText(
+			MC.font, Text.translatable(
+				if (TConfig.autoSprint)
+					"firmament.fixes.auto-sprint.on"
+				else if (MC.player?.isSprinting == true)
+					"firmament.fixes.auto-sprint.sprinting"
+				else
+					"firmament.fixes.auto-sprint.not-sprinting"
+			), 0, 0, -1, false
+		)
+		it.context.matrices.pop()
+	}
 
-    @Subscribe
-    fun onWorldKeyboard(it: WorldKeyboardEvent) {
-        if (it.matches(TConfig.autoSprintKeyBinding)) {
-            TConfig.autoSprint = !TConfig.autoSprint
-        }
-    }
+	@Subscribe
+	fun onWorldKeyboard(it: WorldKeyboardEvent) {
+		if (it.matches(TConfig.autoSprintKeyBinding)) {
+			TConfig.autoSprint = !TConfig.autoSprint
+		}
+	}
 
-    fun shouldPeekChat(): Boolean {
-        return TConfig.peekChat.isPressed(atLeast = true)
-    }
+	fun shouldPeekChat(): Boolean {
+		return TConfig.peekChat.isPressed(atLeast = true)
+	}
 }

translations/en_us.json

@@ -112,6 +112,8 @@
 	"firmament.config.fixes.auto-sprint-keybinding": "Auto Sprint KeyBinding",
 	"firmament.config.fixes.auto-sprint-keybinding.description": "Toggle auto sprint via this keybinding.",
 	"firmament.config.fixes.auto-sprint.description": "This is different from vanilla sprint in the way that it only marks the keybinding pressed for the first tick of walking.",
+	"firmament.config.fixes.hide-mob-effects": "Hide Potion Effects",
+	"firmament.config.fixes.hide-mob-effects.description": "Hide Potion effects on the right side of your player inventory.",
 	"firmament.config.fixes.peek-chat": "Peek Chat",
 	"firmament.config.fixes.peek-chat.description": "Hold this keybinding to view the chat as if you have it opened, but while still being able to control your character.",
 	"firmament.config.fixes.player-skins": "Fix unsigned Player Skins",