From ce2e4f48d4631a48162203872f8fd87c5aeab49e Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Fri, 14 Mar 2025 20:18:29 +0100 Subject: refactor: Move transparent ui into built in resource pack --- src/main/kotlin/Firmament.kt | 9 +++++++++ .../features/inventory/storageoverlay/StorageOverlay.kt | 12 ------------ .../inventory/storageoverlay/StorageOverlayScreen.kt | 10 +++++----- .../gui/sprites/storageoverlay/player_inventory.png | Bin 0 -> 1019 bytes .../gui/sprites/storageoverlay/player_inventory_0.png | Bin 1019 -> 0 bytes .../gui/sprites/storageoverlay/player_inventory_1.png | Bin 639 -> 0 bytes .../gui/sprites/storageoverlay/scroll_bar_background.png | Bin 0 -> 4348 bytes .../storageoverlay/scroll_bar_background.png.mcmeta | 10 ++++++++++ .../sprites/storageoverlay/scroll_bar_background_0.png | Bin 4348 -> 0 bytes .../storageoverlay/scroll_bar_background_0.png.mcmeta | 10 ---------- .../sprites/storageoverlay/scroll_bar_background_1.png | Bin 147 -> 0 bytes .../storageoverlay/scroll_bar_background_1.png.mcmeta | 10 ---------- .../gui/sprites/storageoverlay/storage_controls.png | Bin 0 -> 4766 bytes .../sprites/storageoverlay/storage_controls.png.mcmeta | 10 ++++++++++ .../gui/sprites/storageoverlay/storage_controls_0.png | Bin 4766 -> 0 bytes .../sprites/storageoverlay/storage_controls_0.png.mcmeta | 10 ---------- .../gui/sprites/storageoverlay/storage_controls_1.png | Bin 624 -> 0 bytes .../sprites/storageoverlay/storage_controls_1.png.mcmeta | 10 ---------- .../textures/gui/sprites/storageoverlay/storage_row.png | Bin 0 -> 649 bytes .../gui/sprites/storageoverlay/storage_row.png.mcmeta | 9 +++++++++ .../gui/sprites/storageoverlay/storage_row_0.png | Bin 649 -> 0 bytes .../gui/sprites/storageoverlay/storage_row_0.png.mcmeta | 9 --------- .../gui/sprites/storageoverlay/storage_row_1.png | Bin 203 -> 0 bytes .../gui/sprites/storageoverlay/storage_row_1.png.mcmeta | 9 --------- .../gui/sprites/storageoverlay/upper_background.png | Bin 0 -> 1396 bytes .../sprites/storageoverlay/upper_background.png.mcmeta | 10 ++++++++++ .../gui/sprites/storageoverlay/upper_background_0.png | Bin 1396 -> 0 bytes .../sprites/storageoverlay/upper_background_0.png.mcmeta | 10 ---------- .../gui/sprites/storageoverlay/upper_background_1.png | Bin 795 -> 0 bytes .../sprites/storageoverlay/upper_background_1.png.mcmeta | 10 ---------- .../gui/sprites/storageoverlay/player_inventory.png | Bin 0 -> 639 bytes .../gui/sprites/storageoverlay/scroll_bar_background.png | Bin 0 -> 147 bytes .../storageoverlay/scroll_bar_background.png.mcmeta | 10 ++++++++++ .../gui/sprites/storageoverlay/storage_controls.png | Bin 0 -> 624 bytes .../sprites/storageoverlay/storage_controls.png.mcmeta | 10 ++++++++++ .../textures/gui/sprites/storageoverlay/storage_row.png | Bin 0 -> 203 bytes .../gui/sprites/storageoverlay/storage_row.png.mcmeta | 9 +++++++++ .../gui/sprites/storageoverlay/upper_background.png | Bin 0 -> 795 bytes .../sprites/storageoverlay/upper_background.png.mcmeta | 10 ++++++++++ .../resourcepacks/transparent_storage/pack.mcmeta | 10 ++++++++++ 40 files changed, 102 insertions(+), 95 deletions(-) create mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory.png delete mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory_0.png delete mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory_1.png create mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background.png create mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background.png.mcmeta delete mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_0.png delete mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_0.png.mcmeta delete mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_1.png delete mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_1.png.mcmeta create mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls.png create mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls.png.mcmeta delete mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_0.png delete mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_0.png.mcmeta delete mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_1.png delete mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_1.png.mcmeta create mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row.png create mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row.png.mcmeta delete mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_0.png delete mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_0.png.mcmeta delete mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_1.png delete mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_1.png.mcmeta create mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background.png create mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background.png.mcmeta delete mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_0.png delete mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_0.png.mcmeta delete mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_1.png delete mode 100644 src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_1.png.mcmeta create mode 100644 src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory.png create mode 100644 src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background.png create mode 100644 src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background.png.mcmeta create mode 100644 src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls.png create mode 100644 src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls.png.mcmeta create mode 100644 src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/storage_row.png create mode 100644 src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/storage_row.png.mcmeta create mode 100644 src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/upper_background.png create mode 100644 src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/upper_background.png.mcmeta create mode 100644 src/main/resources/resourcepacks/transparent_storage/pack.mcmeta (limited to 'src') diff --git a/src/main/kotlin/Firmament.kt b/src/main/kotlin/Firmament.kt index 01905c7..f43018b 100644 --- a/src/main/kotlin/Firmament.kt +++ b/src/main/kotlin/Firmament.kt @@ -19,6 +19,8 @@ import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents +import net.fabricmc.fabric.api.resource.ResourceManagerHelper +import net.fabricmc.fabric.api.resource.ResourcePackActivationType import net.fabricmc.loader.api.FabricLoader import net.fabricmc.loader.api.Version import net.fabricmc.loader.api.metadata.ModMetadata @@ -49,6 +51,7 @@ import moe.nea.firmament.repo.RepoManager import moe.nea.firmament.util.MC import moe.nea.firmament.util.SBData import moe.nea.firmament.util.data.IDataHolder +import moe.nea.firmament.util.tr object Firmament { val modContainer by lazy { FabricLoader.getInstance().getModContainer(MOD_ID).get() } @@ -145,6 +148,12 @@ object Firmament { }) }) ClientInitEvent.publish(ClientInitEvent()) + ResourceManagerHelper.registerBuiltinResourcePack( + identifier("transparent_storage"), + modContainer, + tr("firmament.resourcepack.transparentstorage", "Transparent Firmament Storage Overlay"), + ResourcePackActivationType.NORMAL + ) } 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 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.png new file mode 100644 index 0000000..8dccb7f Binary files /dev/null and b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory.png differ diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory_0.png b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory_0.png deleted file mode 100644 index 8dccb7f..0000000 Binary files a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory_0.png and /dev/null differ 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 deleted file mode 100644 index 1831ef3..0000000 Binary files a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory_1.png and /dev/null differ 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.png new file mode 100644 index 0000000..10a3d83 Binary files /dev/null and b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background.png differ 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.png.mcmeta new file mode 100644 index 0000000..94b9a1d --- /dev/null +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background.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/scroll_bar_background_0.png b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_0.png deleted file mode 100644 index 10a3d83..0000000 Binary files a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_0.png and /dev/null differ diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_0.png.mcmeta b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_0.png.mcmeta deleted file mode 100644 index 94b9a1d..0000000 --- a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_0.png.mcmeta +++ /dev/null @@ -1,10 +0,0 @@ -{ - "gui": { - "scaling": { - "type": "nine_slice", - "width": 17, - "height": 18, - "border": 2 - } - } -} 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 deleted file mode 100644 index 5b774b2..0000000 Binary files a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_1.png and /dev/null differ 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 deleted file mode 100644 index 94b9a1d..0000000 --- a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background_1.png.mcmeta +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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.png new file mode 100644 index 0000000..97dd0ea Binary files /dev/null and b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls.png differ 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.png.mcmeta new file mode 100644 index 0000000..5964a6f --- /dev/null +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls.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_controls_0.png b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_0.png deleted file mode 100644 index 97dd0ea..0000000 Binary files a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_0.png and /dev/null differ diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_0.png.mcmeta b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_0.png.mcmeta deleted file mode 100644 index 5964a6f..0000000 --- a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_0.png.mcmeta +++ /dev/null @@ -1,10 +0,0 @@ -{ - "gui": { - "scaling": { - "type": "nine_slice", - "width": 91, - "height": 184, - "border": 7 - } - } -} 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 deleted file mode 100644 index d4852d8..0000000 Binary files a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_1.png and /dev/null differ 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 deleted file mode 100644 index 5964a6f..0000000 --- a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls_1.png.mcmeta +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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.png new file mode 100644 index 0000000..5ffc990 Binary files /dev/null and b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row.png differ 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.png.mcmeta new file mode 100644 index 0000000..cd2857e --- /dev/null +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row.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/storage_row_0.png b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_0.png deleted file mode 100644 index 5ffc990..0000000 Binary files a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_0.png and /dev/null differ diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_0.png.mcmeta b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_0.png.mcmeta deleted file mode 100644 index cd2857e..0000000 --- a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_0.png.mcmeta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "gui": { - "scaling": { - "type": "tile", - "width": 162, - "height": 18 - } - } -} 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 deleted file mode 100644 index 61e9ee5..0000000 Binary files a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_1.png and /dev/null differ 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 deleted file mode 100644 index cd2857e..0000000 --- a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/storage_row_1.png.mcmeta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "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.png new file mode 100644 index 0000000..8362bb6 Binary files /dev/null and b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background.png differ 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.png.mcmeta new file mode 100644 index 0000000..a29299d --- /dev/null +++ b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 176, + "height": 222, + "border": 10 + } + } +} diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_0.png b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_0.png deleted file mode 100644 index 8362bb6..0000000 Binary files a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_0.png and /dev/null differ diff --git a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_0.png.mcmeta b/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_0.png.mcmeta deleted file mode 100644 index a29299d..0000000 --- a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_0.png.mcmeta +++ /dev/null @@ -1,10 +0,0 @@ -{ - "gui": { - "scaling": { - "type": "nine_slice", - "width": 176, - "height": 222, - "border": 10 - } - } -} 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 deleted file mode 100644 index 653a99e..0000000 Binary files a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_1.png and /dev/null differ 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 deleted file mode 100644 index a29299d..0000000 --- a/src/main/resources/assets/firmament/textures/gui/sprites/storageoverlay/upper_background_1.png.mcmeta +++ /dev/null @@ -1,10 +0,0 @@ -{ - "gui": { - "scaling": { - "type": "nine_slice", - "width": 176, - "height": 222, - "border": 10 - } - } -} diff --git a/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory.png b/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory.png new file mode 100644 index 0000000..1831ef3 Binary files /dev/null and b/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/player_inventory.png differ diff --git a/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background.png b/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background.png new file mode 100644 index 0000000..5b774b2 Binary files /dev/null and b/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background.png differ diff --git a/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background.png.mcmeta b/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background.png.mcmeta new file mode 100644 index 0000000..94b9a1d --- /dev/null +++ b/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/scroll_bar_background.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 17, + "height": 18, + "border": 2 + } + } +} diff --git a/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls.png b/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls.png new file mode 100644 index 0000000..d4852d8 Binary files /dev/null and b/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls.png differ diff --git a/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls.png.mcmeta b/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls.png.mcmeta new file mode 100644 index 0000000..5964a6f --- /dev/null +++ b/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/storage_controls.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 91, + "height": 184, + "border": 7 + } + } +} diff --git a/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/storage_row.png b/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/storage_row.png new file mode 100644 index 0000000..61e9ee5 Binary files /dev/null and b/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/storage_row.png differ diff --git a/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/storage_row.png.mcmeta b/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/storage_row.png.mcmeta new file mode 100644 index 0000000..cd2857e --- /dev/null +++ b/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/storage_row.png.mcmeta @@ -0,0 +1,9 @@ +{ + "gui": { + "scaling": { + "type": "tile", + "width": 162, + "height": 18 + } + } +} diff --git a/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/upper_background.png b/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/upper_background.png new file mode 100644 index 0000000..653a99e Binary files /dev/null and b/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/upper_background.png differ diff --git a/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/upper_background.png.mcmeta b/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/upper_background.png.mcmeta new file mode 100644 index 0000000..a29299d --- /dev/null +++ b/src/main/resources/resourcepacks/transparent_storage/assets/firmament/textures/gui/sprites/storageoverlay/upper_background.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 176, + "height": 222, + "border": 10 + } + } +} diff --git a/src/main/resources/resourcepacks/transparent_storage/pack.mcmeta b/src/main/resources/resourcepacks/transparent_storage/pack.mcmeta new file mode 100644 index 0000000..c37df06 --- /dev/null +++ b/src/main/resources/resourcepacks/transparent_storage/pack.mcmeta @@ -0,0 +1,10 @@ +{ + "pack": { + "pack_format": 15, + "supported_formats": { + "min_inclusive": 15, + "max_inclusive": 2147483647 + }, + "description": "Adds a more transparent storage overlay for /firm storage" + } +} -- cgit