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

feat: Add height setting to storage overlay

Browse Source
This commit is contained in:
Linnea Gräf
2024-11-13 14:14:52 +01:00
parent 1af4a0b826
commit a1bfa7d2b2
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ object StorageOverlay : FirmamentFeature {
object TConfig : ManagedConfig(identifier, Category.INVENTORY) { object TConfig : ManagedConfig(identifier, Category.INVENTORY) {
val alwaysReplace by toggle("always-replace") { true } val alwaysReplace by toggle("always-replace") { true }
val columns by integer("rows", 1, 10) { 3 } val columns by integer("rows", 1, 10) { 3 }
val height by integer("height", 80, 3000) { 3 * 18 * 6 }
val scrollSpeed by integer("scroll-speed", 1, 50) { 10 } val scrollSpeed by integer("scroll-speed", 1, 50) { 10 }
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 }

4
src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt
View File

@@ -50,7 +50,9 @@ class StorageOverlayScreen : Screen(Text.literal("")) {
val innerScrollPanelWidth = PAGE_WIDTH * pageWidthCount + (pageWidthCount - 1) * PADDING val innerScrollPanelWidth = PAGE_WIDTH * pageWidthCount + (pageWidthCount - 1) * PADDING
val overviewWidth = innerScrollPanelWidth + 3 * PADDING + SCROLL_BAR_WIDTH val overviewWidth = innerScrollPanelWidth + 3 * PADDING + SCROLL_BAR_WIDTH
val x = width / 2 - overviewWidth / 2 val x = width / 2 - overviewWidth / 2
val overviewHeight = minOf(3 * 18 * 6, height - PLAYER_HEIGHT - minOf(80, height / 10)) val overviewHeight = minOf(
height - PLAYER_HEIGHT - minOf(80, height / 10),
StorageOverlay.TConfig.height)
val innerScrollPanelHeight = overviewHeight - PADDING * 2 val innerScrollPanelHeight = overviewHeight - PADDING * 2
val y = height / 2 - (overviewHeight + PLAYER_HEIGHT) / 2 val y = height / 2 - (overviewHeight + PLAYER_HEIGHT) / 2
val playerX = width / 2 - PLAYER_WIDTH / 2 val playerX = width / 2 - PLAYER_WIDTH / 2

2
translations/en_us.json
View File

@@ -202,6 +202,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.height": "Storage Height",
"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",
"firmament.config.storage-overlay.inverse-scroll.description": "Invert the mouse wheel scrolling in Firmament's storage overlay.", "firmament.config.storage-overlay.inverse-scroll.description": "Invert the mouse wheel scrolling in Firmament's storage overlay.",
"firmament.config.storage-overlay.margin": "Margin", "firmament.config.storage-overlay.margin": "Margin",