From 33671d6e522c0198d3705945a4f92997b47c1537 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sun, 17 Mar 2024 19:51:40 +0900 Subject: [PATCH] labels for inventory side buttons --- assets/mods/basegame/locales/en/game.json | 2 +- assets/mods/basegame/locales/koKR/game.json | 2 +- .../modulebasegame/ui/UICraftingWorkbench.kt | 2 +- .../modulebasegame/ui/UIInventoryFull.kt | 5 ++++ src/net/torvald/terrarum/ui/UIItemCatBar.kt | 24 ++++++++++++++++++- .../torvald/terrarum/ui/UITemplateCatBar.kt | 4 +++- 6 files changed, 34 insertions(+), 5 deletions(-) diff --git a/assets/mods/basegame/locales/en/game.json b/assets/mods/basegame/locales/en/game.json index 16384006f..fb99daa55 100644 --- a/assets/mods/basegame/locales/en/game.json +++ b/assets/mods/basegame/locales/en/game.json @@ -18,7 +18,7 @@ "GAME_ACTION_QUICKSEL": "Quick Select", "GAME_ACTION_SELECT_SLOT": "Select Slot", "GAME_ACTION_TELEPORT": "Teleport", - "GAME_CRAFTABLE_ITEMS": "Craftable Items", + "GAME_CRAFTABLE_ITEMS": "Recipes", "GAME_CRAFTING": "Crafting", "GAME_INVENTORY_BLOCKS": "Blocks", "GAME_INVENTORY_FAVORITES": "Favorites", diff --git a/assets/mods/basegame/locales/koKR/game.json b/assets/mods/basegame/locales/koKR/game.json index e5b6f1fb3..6b7979fec 100644 --- a/assets/mods/basegame/locales/koKR/game.json +++ b/assets/mods/basegame/locales/koKR/game.json @@ -17,7 +17,7 @@ "GAME_ACTION_QUICKSEL": "빠른 선택", "GAME_ACTION_SELECT_SLOT": "슬롯 선택", "GAME_ACTION_TELEPORT": "텔레포트하기", - "GAME_CRAFTABLE_ITEMS": "제작 가능한 아이템", + "GAME_CRAFTABLE_ITEMS": "제작 레시피", "GAME_CRAFTING": "제작", "GAME_INVENTORY_BLOCKS": "블록", "GAME_INVENTORY_FAVORITES": "즐겨찾기", diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UICraftingWorkbench.kt b/src/net/torvald/terrarum/modulebasegame/ui/UICraftingWorkbench.kt index a666d1750..0ebb997f6 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UICraftingWorkbench.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UICraftingWorkbench.kt @@ -482,7 +482,7 @@ class UICraftingWorkbench(val inventoryUI: UIInventoryFull?, val parentContainer batch.color = Color.WHITE // text label for two inventory grids - val craftingLabel = Lang["GAME_CRAFTING"] + val craftingLabel = Lang["GAME_CRAFTABLE_ITEMS"] val ingredientsLabel = Lang["GAME_INVENTORY_INGREDIENTS"] App.fontGame.draw(batch, craftingLabel, thisOffsetX + (cellsWidth - App.fontGame.getWidth(craftingLabel)) / 2, thisOffsetY - INVENTORY_NAME_TEXT_GAP) diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt index b2dd93ce5..851753963 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt @@ -241,6 +241,11 @@ class UIInventoryFull( { Lang["CONTEXT_ITEM_MAGIC"] }, { Lang["GAME_GENRE_MISC"] }, ), + superLabels = listOf( + { Lang["GAME_CRAFTING"] }, + { Lang["GAME_INVENTORY"] }, + { Lang["MENU_LABEL_MENU"] } + ) ) { i -> if (!panelTransitionLocked) requestTransition(i) } diff --git a/src/net/torvald/terrarum/ui/UIItemCatBar.kt b/src/net/torvald/terrarum/ui/UIItemCatBar.kt index 25d73916a..f26ce14a9 100644 --- a/src/net/torvald/terrarum/ui/UIItemCatBar.kt +++ b/src/net/torvald/terrarum/ui/UIItemCatBar.kt @@ -22,6 +22,7 @@ class UIItemCatBar( private val catArrangement: IntArray, internal val catIconsMeaning: List>, internal val catIconsLabels: List<() -> String>, + internal val superLabels: List<() -> String> = listOf({ "" }, { "" }, { "" }), // ["Crafting", "Inventory", "Menu"] val panelTransitionReqFun: (Int) -> Unit = {} // for side buttons; for the selection change, override selectionChangeListener ) : UIItem(parentUI, initialX, initialY) { @@ -286,7 +287,28 @@ class UIItemCatBar( // label batch.color = Color.WHITE catIconsLabels[selectedIndex]().let { - App.fontGame.draw(batch, it, posX + ((width - App.fontGame.getWidth(it)) / 2), posY + highlighterYPos + 4) + App.fontGame.draw(batch, it, posX + ((width - App.fontGame.getWidth(it)) / 2), posY + highlighterYPos + 0) + } + } + else { + // generic label + batch.color = Color.WHITE + superLabels[1]().let { + App.fontGame.draw(batch, it, posX + ((width - App.fontGame.getWidth(it)) / 2), posY + highlighterYPos + 0) + } + } + + + // label under sidebuttons + if (showSideButtons) { + batch.color = Color.WHITE + + superLabels[0]().let { + Toolkit.drawTextCentered(batch, App.fontGame, it, sideButtons[0].width, sideButtons[0].posX, posY + highlighterYPos + 0) + } + + superLabels[2]().let { + Toolkit.drawTextCentered(batch, App.fontGame, it, sideButtons[3].width, sideButtons[3].posX, posY + highlighterYPos + 0) } } diff --git a/src/net/torvald/terrarum/ui/UITemplateCatBar.kt b/src/net/torvald/terrarum/ui/UITemplateCatBar.kt index 16bffb3ab..d1a5dc9c9 100644 --- a/src/net/torvald/terrarum/ui/UITemplateCatBar.kt +++ b/src/net/torvald/terrarum/ui/UITemplateCatBar.kt @@ -21,6 +21,8 @@ class UITemplateCatBar( catIconsMeaning: List>, // sortedBy: catArrangement catIconsLabels: List<() -> String>, + superLabels: List<() -> String> = listOf({ "" }, { "" }, { "" }), + ) : UITemplate(parent) { val catBar = UIItemCatBar( @@ -30,7 +32,7 @@ class UITemplateCatBar( UIInventoryFull.internalWidth, UIInventoryFull.catBarWidth, showSidebuttons, - catIcons, catArrangement, catIconsMeaning, catIconsLabels + catIcons, catArrangement, catIconsMeaning, catIconsLabels, superLabels ) override fun getUIitems(): List {