From fba91100cb57b4359f235bfcca352c052ec0eefb Mon Sep 17 00:00:00 2001
From: Linnea Gräf <nea@nea.moe>
Date: Mon, 18 Nov 2024 15:35:18 +0100
Subject: fix: Pristine profit tracker width

---
 src/main/kotlin/features/mining/PristineProfitTracker.kt    | 8 ++++++--
 src/main/resources/assets/firmament/gui/pristine_profit.xml | 9 +++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'src/main')

diff --git a/src/main/kotlin/features/mining/PristineProfitTracker.kt b/src/main/kotlin/features/mining/PristineProfitTracker.kt
index 0f50918..377a470 100644
--- a/src/main/kotlin/features/mining/PristineProfitTracker.kt
+++ b/src/main/kotlin/features/mining/PristineProfitTracker.kt
@@ -14,9 +14,9 @@ import moe.nea.firmament.gui.hud.MoulConfigHud
 import moe.nea.firmament.util.BazaarPriceStrategy
 import moe.nea.firmament.util.FirmFormatters.formatCommas
 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.formattedString
-import moe.nea.firmament.util.StringUtil.parseIntWithComma
 import moe.nea.firmament.util.useMatch
 
 object PristineProfitTracker : FirmamentFeature {
@@ -34,6 +34,10 @@ object PristineProfitTracker : FirmamentFeature {
 		JADE("Jade"),
 		JASPER("Jasper"),
 		OPAL("Opal"),
+		PERIDOT("Peridot"),
+		ONXY("Onyx"),
+		AQUAMARINE("Aquamarine"),
+		CITRINE("Citrine"),
 		;
 
 		val flawedId: SkyblockId = SkyblockId("FLAWED_${name}_GEM")
@@ -53,7 +57,7 @@ object PristineProfitTracker : FirmamentFeature {
 
 	object TConfig : ManagedConfig(identifier, Category.MINING) {
 		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 }
 	}
 
diff --git a/src/main/resources/assets/firmament/gui/pristine_profit.xml b/src/main/resources/assets/firmament/gui/pristine_profit.xml
index f015e91..8787b8f 100644
--- a/src/main/resources/assets/firmament/gui/pristine_profit.xml
+++ b/src/main/resources/assets/firmament/gui/pristine_profit.xml
@@ -2,12 +2,13 @@
 <Root xmlns="http://notenoughupdates.org/moulconfig" xmlns:firm="http://firmament.nea.moe/moulconfig">
     <Column>
         <Row>
-            <firm:Bar progress="@moneyCurrent" total="@moneyMax" fillColor="#bbbb00" emptyColor="#909000"/>
-            <Text text="@moneyText"/>
+<!--            <firm:Bar progress="@moneyCurrent" total="@moneyMax" fillColor="#bbbb00" emptyColor="#909000"/>-->
+            <Text text="@moneyText" width="300"/>
         </Row>
         <Row>
-            <firm:Bar progress="@collectionCurrent" total="@collectionMax" fillColor="#33ff33" emptyColor="#00a000"/>
-            <Text text="@collectionText"/>
+<!--            <firm:Bar progress="@collectionCurrent" total="@collectionMax" fillColor="#33ff33" emptyColor="#00a000"/>-->
+			<!-- TODO: add dynamically sized texts -->
+            <Text text="@collectionText" width="300"/>
         </Row>
     </Column>
 </Root>
-- 
cgit