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

fix: Pristine profit tracker width

Browse Source
This commit is contained in:
Linnea Gräf
2024-11-18 15:35:18 +01:00
parent a817436147
commit fba91100cb
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/kotlin/features/mining/PristineProfitTracker.kt
View File

@@ -14,9 +14,9 @@ import moe.nea.firmament.gui.hud.MoulConfigHud
import moe.nea.firmament.util.BazaarPriceStrategy import moe.nea.firmament.util.BazaarPriceStrategy
import moe.nea.firmament.util.FirmFormatters.formatCommas import moe.nea.firmament.util.FirmFormatters.formatCommas
import moe.nea.firmament.util.SkyblockId import moe.nea.firmament.util.SkyblockId
import moe.nea.firmament.util.StringUtil.parseIntWithComma
import moe.nea.firmament.util.data.ProfileSpecificDataHolder import moe.nea.firmament.util.data.ProfileSpecificDataHolder
import moe.nea.firmament.util.formattedString import moe.nea.firmament.util.formattedString
import moe.nea.firmament.util.StringUtil.parseIntWithComma
import moe.nea.firmament.util.useMatch import moe.nea.firmament.util.useMatch
object PristineProfitTracker : FirmamentFeature { object PristineProfitTracker : FirmamentFeature {
@@ -34,6 +34,10 @@ object PristineProfitTracker : FirmamentFeature {
JADE("Jade"), JADE("Jade"),
JASPER("Jasper"), JASPER("Jasper"),
OPAL("Opal"), OPAL("Opal"),
PERIDOT("Peridot"),
ONXY("Onyx"),
AQUAMARINE("Aquamarine"),
CITRINE("Citrine"),
; ;
val flawedId: SkyblockId = SkyblockId("FLAWED_${name}_GEM") val flawedId: SkyblockId = SkyblockId("FLAWED_${name}_GEM")
@@ -53,7 +57,7 @@ object PristineProfitTracker : FirmamentFeature {
object TConfig : ManagedConfig(identifier, Category.MINING) { object TConfig : ManagedConfig(identifier, Category.MINING) {
val timeout by duration("timeout", 0.seconds, 120.seconds) { 30.seconds } val timeout by duration("timeout", 0.seconds, 120.seconds) { 30.seconds }
val gui by position("position", 80, 30) { Point(0.05, 0.2) } val gui by position("position", 100, 30) { Point(0.05, 0.2) }
val useFineGemstones by toggle("fine-gemstones") { false } val useFineGemstones by toggle("fine-gemstones") { false }
} }

9
src/main/resources/assets/firmament/gui/pristine_profit.xml
View File

@@ -2,12 +2,13 @@
<Root xmlns="http://notenoughupdates.org/moulconfig" xmlns:firm="http://firmament.nea.moe/moulconfig"> <Root xmlns="http://notenoughupdates.org/moulconfig" xmlns:firm="http://firmament.nea.moe/moulconfig">
<Column> <Column>
<Row> <Row>
<firm:Bar progress="@moneyCurrent" total="@moneyMax" fillColor="#bbbb00" emptyColor="#909000"/> <!-- <firm:Bar progress="@moneyCurrent" total="@moneyMax" fillColor="#bbbb00" emptyColor="#909000"/>-->
<Text text="@moneyText"/> <Text text="@moneyText" width="300"/>
</Row> </Row>
<Row> <Row>
<firm:Bar progress="@collectionCurrent" total="@collectionMax" fillColor="#33ff33" emptyColor="#00a000"/> <!-- <firm:Bar progress="@collectionCurrent" total="@collectionMax" fillColor="#33ff33" emptyColor="#00a000"/>-->
<Text text="@collectionText"/> <!-- TODO: add dynamically sized texts -->
<Text text="@collectionText" width="300"/>
</Row> </Row>
</Column> </Column>
</Root> </Root>

2
translations/en_us.json
View File

@@ -162,7 +162,7 @@
"firmament.config.pristine-profit": "Pristine Profit Tracker", "firmament.config.pristine-profit": "Pristine Profit Tracker",
"firmament.config.pristine-profit.fine-gemstones": "Use Fine Gemstones", "firmament.config.pristine-profit.fine-gemstones": "Use Fine Gemstones",
"firmament.config.pristine-profit.fine-gemstones.description": "Use the (more stable) price of fine gemstones, instead of flawed gemstones.", "firmament.config.pristine-profit.fine-gemstones.description": "Use the (more stable) price of fine gemstones, instead of flawed gemstones.",
"firmament.config.pristine-profit.position": "Position", "firmament.config.pristine-profit.position": "Pristine Profit HUD",
"firmament.config.pristine-profit.position.description": "Edit the pristine profit hud location.", "firmament.config.pristine-profit.position.description": "Edit the pristine profit hud location.",
"firmament.config.pristine-profit.timeout": "Timeout (0 = disabled)", "firmament.config.pristine-profit.timeout": "Timeout (0 = disabled)",
"firmament.config.pristine-profit.timeout.description": "Track the profit you make from pristine gemstones while mining. Set to 0 seconds to disable the HUD.", "firmament.config.pristine-profit.timeout.description": "Track the profit you make from pristine gemstones while mining. Set to 0 seconds to disable the HUD.",