diff options
| author | Linnea Gräf <nea@nea.moe> | 2025-05-21 16:48:24 +0200 |
|---|---|---|
| committer | Linnea Gräf <nea@nea.moe> | 2025-05-21 16:48:24 +0200 |
| commit | 2ae915844a907ff698534cc261a3347b25f523bf (patch) | |
| tree | 057c3aa73ab65e88ddf57e82ce40d44a55fb00fb | |
| parent | 091f581bd23e52a936c3d8d672205071b0bb9d13 (diff) | |
| download | Firmament-2ae915844a907ff698534cc261a3347b25f523bf.tar.gz Firmament-2ae915844a907ff698534cc261a3347b25f523bf.tar.bz2 Firmament-2ae915844a907ff698534cc261a3347b25f523bf.zip | |
feat: Add option disable slot highlights in /sbmenu
| -rw-r--r-- | src/main/java/moe/nea/firmament/mixins/feature/DisableSlotHighlights.java | 25 | ||||
| -rw-r--r-- | src/main/kotlin/features/fixes/Fixes.kt | 1 | ||||
| -rw-r--r-- | translations/en_us.json | 2 |
3 files changed, 28 insertions, 0 deletions
diff --git a/src/main/java/moe/nea/firmament/mixins/feature/DisableSlotHighlights.java b/src/main/java/moe/nea/firmament/mixins/feature/DisableSlotHighlights.java new file mode 100644 index 0000000..0abed22 --- /dev/null +++ b/src/main/java/moe/nea/firmament/mixins/feature/DisableSlotHighlights.java @@ -0,0 +1,25 @@ +package moe.nea.firmament.mixins.feature; + +import moe.nea.firmament.features.fixes.Fixes; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.slot.Slot; +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(Slot.class) +public abstract class DisableSlotHighlights { + @Shadow + public abstract ItemStack getStack(); + + @Inject(method = "canBeHighlighted", at = @At("HEAD"), cancellable = true) + private void dontHighlight(CallbackInfoReturnable<Boolean> cir) { + if (!Fixes.TConfig.INSTANCE.getHideSlotHighlights()) return; + var display = getStack().get(DataComponentTypes.TOOLTIP_DISPLAY); + if (display != null && display.hideTooltip()) + cir.setReturnValue(false); + } +} diff --git a/src/main/kotlin/features/fixes/Fixes.kt b/src/main/kotlin/features/fixes/Fixes.kt index 776035f..5e6350d 100644 --- a/src/main/kotlin/features/fixes/Fixes.kt +++ b/src/main/kotlin/features/fixes/Fixes.kt @@ -24,6 +24,7 @@ object Fixes : FirmamentFeature { val peekChat by keyBindingWithDefaultUnbound("peek-chat") val hidePotionEffects by toggle("hide-mob-effects") { false } val noHurtCam by toggle("disable-hurt-cam") { false } + val hideSlotHighlights by toggle("hide-slot-highlights") { false } } override val config: ManagedConfig diff --git a/translations/en_us.json b/translations/en_us.json index 82db52c..57e20a6 100644 --- a/translations/en_us.json +++ b/translations/en_us.json @@ -122,6 +122,8 @@ "firmament.config.fixes.disable-hurt-cam.description": "Disable the damage screen shake animation.", "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.hide-slot-highlights": "Hide Slot Highlights", + "firmament.config.fixes.hide-slot-highlights.description": "Hide slot highlights for items with disabled tooltip. This makes /sbmenu look nicer with smooth texture packs.", "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", |