Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add option to stop scrolling over items in storage overlay

Browse Source
This commit is contained in:
Linnea Gräf
2025-05-21 16:12:12 +02:00
parent 6e06fa744d
commit 246bd906a5
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/kotlin/features/inventory/storageoverlay/StorageOverlay.kt
View File

@@ -33,6 +33,7 @@ object StorageOverlay : FirmamentFeature {
val inverseScroll by toggle("inverse-scroll") { false } val inverseScroll by toggle("inverse-scroll") { false }
val padding by integer("padding", 1, 20) { 5 } val padding by integer("padding", 1, 20) { 5 }
val margin by integer("margin", 1, 60) { 20 } val margin by integer("margin", 1, 60) { 20 }
val itemsBlockScrolling by toggle("block-item-scrolling") { true }
} }
fun adjustScrollSpeed(amount: Double): Double { fun adjustScrollSpeed(amount: Double): Double {

3
src/main/kotlin/features/inventory/storageoverlay/StorageOverlayCustom.kt
View File

@@ -9,6 +9,7 @@ import net.minecraft.entity.player.PlayerInventory
import net.minecraft.screen.slot.Slot import net.minecraft.screen.slot.Slot
import moe.nea.firmament.mixins.accessor.AccessorHandledScreen import moe.nea.firmament.mixins.accessor.AccessorHandledScreen
import moe.nea.firmament.util.customgui.CustomGui import moe.nea.firmament.util.customgui.CustomGui
import moe.nea.firmament.util.focusedItemStack
class StorageOverlayCustom( class StorageOverlayCustom(
val handler: StorageBackingHandle, val handler: StorageBackingHandle,
@@ -113,6 +114,8 @@ class StorageOverlayCustom(
horizontalAmount: Double, horizontalAmount: Double,
verticalAmount: Double verticalAmount: Double
): Boolean { ): Boolean {
if (screen.focusedItemStack != null && StorageOverlay.TConfig.itemsBlockScrolling)
return false
return overview.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount) return overview.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount)
} }
} }

2
translations/en_us.json
View File

@@ -265,6 +265,8 @@
"firmament.config.storage-overlay": "Storage Overlay", "firmament.config.storage-overlay": "Storage Overlay",
"firmament.config.storage-overlay.always-replace": "Always Open Overlay", "firmament.config.storage-overlay.always-replace": "Always Open Overlay",
"firmament.config.storage-overlay.always-replace.description": "Always replace the ender chest with Firmament's storage overlay.", "firmament.config.storage-overlay.always-replace.description": "Always replace the ender chest with Firmament's storage overlay.",
"firmament.config.storage-overlay.block-item-scrolling": "Block Scrolling on Items",
"firmament.config.storage-overlay.block-item-scrolling.description": "Disables scrolling the storage overlay screen while you are hovering over an item. Useful if you have a tooltip scrolling mod.",
"firmament.config.storage-overlay.height": "Storage Height", "firmament.config.storage-overlay.height": "Storage Height",
"firmament.config.storage-overlay.height.description": "The height of the scrollable storage panel.", "firmament.config.storage-overlay.height.description": "The height of the scrollable storage panel.",
"firmament.config.storage-overlay.inverse-scroll": "Invert Scroll", "firmament.config.storage-overlay.inverse-scroll": "Invert Scroll",