diff options
Diffstat (limited to 'src/main')
20 files changed, 56 insertions, 5 deletions
diff --git a/src/main/kotlin/features/inventory/storageoverlay/StorageOverlay.kt b/src/main/kotlin/features/inventory/storageoverlay/StorageOverlay.kt index 2e807de..0e3a0a8 100644 --- a/src/main/kotlin/features/inventory/storageoverlay/StorageOverlay.kt +++ b/src/main/kotlin/features/inventory/storageoverlay/StorageOverlay.kt @@ -7,6 +7,7 @@ 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 @@ -33,6 +34,16 @@ 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 { @@ -151,4 +162,5 @@ object StorageOverlay : FirmamentFeature { } } } + } diff --git a/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt b/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt index 633a8fe..292850a 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") - 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 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 scrollbarKnob = Identifier.of("firmament:storageoverlay/scroll_bar_knob") - val controllerBackground = Identifier.of("firmament:storageoverlay/storage_controls") + val controllerBackground = Identifier.of("firmament:storageoverlay/storage_controls_${StorageOverlay.TConfig.texture.asString()}") override fun close() { isExiting = true diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory.png b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory_0.png Binary files differindex 8dccb7f..8dccb7f 100644 --- a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory.png +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory_0.png diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory_1.png b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory_1.png Binary files differnew file mode 100644 index 0000000..1831ef3 --- /dev/null +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory_1.png diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background.png b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_0.png Binary files differindex 10a3d83..10a3d83 100644 --- a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background.png +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_0.png diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background.png.mcmeta b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_0.png.mcmeta index 94b9a1d..94b9a1d 100644 --- a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background.png.mcmeta +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_0.png.mcmeta diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_1.png b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_1.png Binary files differnew file mode 100644 index 0000000..5b774b2 --- /dev/null +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_1.png diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_1.png.mcmeta b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_1.png.mcmeta new file mode 100644 index 0000000..94b9a1d --- /dev/null +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_1.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 17, + "height": 18, + "border": 2 + } + } +} diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls.png b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_0.png Binary files differindex 97dd0ea..97dd0ea 100644 --- a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls.png +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_0.png diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls.png.mcmeta b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_0.png.mcmeta index 5964a6f..5964a6f 100644 --- a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls.png.mcmeta +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_0.png.mcmeta diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_1.png b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_1.png Binary files differnew file mode 100644 index 0000000..d4852d8 --- /dev/null +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_1.png diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_1.png.mcmeta b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_1.png.mcmeta new file mode 100644 index 0000000..5964a6f --- /dev/null +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_1.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 91, + "height": 184, + "border": 7 + } + } +} diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row.png b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_0.png Binary files differindex 5ffc990..5ffc990 100644 --- a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row.png +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_0.png diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row.png.mcmeta b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_0.png.mcmeta index cd2857e..cd2857e 100644 --- a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row.png.mcmeta +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_0.png.mcmeta diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_1.png b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_1.png Binary files differnew file mode 100644 index 0000000..61e9ee5 --- /dev/null +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_1.png diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_1.png.mcmeta b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_1.png.mcmeta new file mode 100644 index 0000000..cd2857e --- /dev/null +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_1.png.mcmeta @@ -0,0 +1,9 @@ +{ + "gui": { + "scaling": { + "type": "tile", + "width": 162, + "height": 18 + } + } +} diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background.png b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_0.png Binary files differindex 8362bb6..8362bb6 100644 --- a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background.png +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_0.png diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background.png.mcmeta b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_0.png.mcmeta index a29299d..a29299d 100644 --- a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background.png.mcmeta +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_0.png.mcmeta diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_1.png b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_1.png Binary files differnew file mode 100644 index 0000000..653a99e --- /dev/null +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_1.png diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_1.png.mcmeta b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_1.png.mcmeta new file mode 100644 index 0000000..a29299d --- /dev/null +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_1.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 176, + "height": 222, + "border": 10 + } + } +} |
