diff options
| author | Linnea Gräf <nea@nea.moe> | 2025-03-14 20:18:29 +0100 |
|---|---|---|
| committer | Linnea Gräf <nea@nea.moe> | 2025-03-14 20:20:24 +0100 |
| commit | ce2e4f48d4631a48162203872f8fd87c5aeab49e (patch) | |
| tree | 8a70a0412da6e156a21e5adb58478f08ce9d6f45 /src/main/kotlin/features | |
| parent | 2cfe476909673dff921674bc9d19b046e850ef9d (diff) | |
| download | Firmament-ce2e4f48d4631a48162203872f8fd87c5aeab49e.tar.gz Firmament-ce2e4f48d4631a48162203872f8fd87c5aeab49e.tar.bz2 Firmament-ce2e4f48d4631a48162203872f8fd87c5aeab49e.zip | |
refactor: Move transparent ui into built in resource pack
Diffstat (limited to 'src/main/kotlin/features')
| -rw-r--r-- | src/main/kotlin/features/inventory/storageoverlay/StorageOverlay.kt | 12 | ||||
| -rw-r--r-- | src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt | 10 |
2 files changed, 5 insertions, 17 deletions
diff --git a/src/main/kotlin/features/inventory/storageoverlay/StorageOverlay.kt b/src/main/kotlin/features/inventory/storageoverlay/StorageOverlay.kt index 0e3a0a8..2e807de 100644 --- a/src/main/kotlin/features/inventory/storageoverlay/StorageOverlay.kt +++ b/src/main/kotlin/features/inventory/storageoverlay/StorageOverlay.kt @@ -7,7 +7,6 @@ import net.minecraft.client.gui.screen.ingame.HandledScreen import net.minecraft.entity.player.PlayerInventory import net.minecraft.item.Items import net.minecraft.network.packet.c2s.play.CloseHandledScreenC2SPacket -import net.minecraft.util.StringIdentifiable import moe.nea.firmament.annotations.Subscribe import moe.nea.firmament.events.ScreenChangeEvent import moe.nea.firmament.events.SlotClickEvent @@ -34,16 +33,6 @@ object StorageOverlay : FirmamentFeature { val inverseScroll by toggle("inverse-scroll") { false } val padding by integer("padding", 1, 20) { 5 } val margin by integer("margin", 1, 60) { 20 } - val texture by choice("texture") { StorageTexture.DEFAULT } - } - - enum class StorageTexture(val id: Int) : StringIdentifiable { - DEFAULT(0), - CLEAR(1); - - override fun asString(): String? { - return id.toString() - } } fun adjustScrollSpeed(amount: Double): Double { @@ -162,5 +151,4 @@ object StorageOverlay : FirmamentFeature { } } } - } diff --git a/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt b/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt index 292850a..633a8fe 100644 --- a/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt +++ b/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt @@ -108,12 +108,12 @@ class StorageOverlayScreen : Screen(Text.literal("")) { fun getMaxScroll() = lastRenderedInnerHeight.toFloat() - getScrollPanelInner().height - val playerInventorySprite = Identifier.of("firmament:storageoverlay/player_inventory_${StorageOverlay.TConfig.texture.asString()}") - val upperBackgroundSprite = Identifier.of("firmament:storageoverlay/upper_background_${StorageOverlay.TConfig.texture.asString()}") - val slotRowSprite = Identifier.of("firmament:storageoverlay/storage_row_${StorageOverlay.TConfig.texture.asString()}") - val scrollbarBackground = Identifier.of("firmament:storageoverlay/scroll_bar_background_${StorageOverlay.TConfig.texture.asString()}") + val playerInventorySprite = Identifier.of("firmament:storageoverlay/player_inventory") + val upperBackgroundSprite = Identifier.of("firmament:storageoverlay/upper_background") + val slotRowSprite = Identifier.of("firmament:storageoverlay/storage_row") + val scrollbarBackground = Identifier.of("firmament:storageoverlay/scroll_bar_background") val scrollbarKnob = Identifier.of("firmament:storageoverlay/scroll_bar_knob") - val controllerBackground = Identifier.of("firmament:storageoverlay/storage_controls_${StorageOverlay.TConfig.texture.asString()}") + val controllerBackground = Identifier.of("firmament:storageoverlay/storage_controls") override fun close() { isExiting = true |