snapshot

6 files changed, 21 insertions, 32 deletions

diff --git a/src/main/kotlin/features/mining/CommissionFeatures.kt b/src/main/kotlin/features/mining/CommissionFeatures.kt
index 05658cc..1041ae5 100644
--- a/src/main/kotlin/features/mining/CommissionFeatures.kt
+++ b/src/main/kotlin/features/mining/CommissionFeatures.kt
@@ -3,9 +3,9 @@ package moe.nea.firmament.features.mining
 import moe.nea.firmament.Firmament
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.SlotRenderEvents
-import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.data.Config
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.mc.loreAccordingToNbt
 import moe.nea.firmament.util.unformattedString
 
diff --git a/src/main/kotlin/features/mining/Histogram.kt b/src/main/kotlin/features/mining/Histogram.kt
index ed48437..08ee893 100644
--- a/src/main/kotlin/features/mining/Histogram.kt
+++ b/src/main/kotlin/features/mining/Histogram.kt
@@ -1,7 +1,8 @@
 
 package moe.nea.firmament.features.mining
 
-import java.util.*
+import java.util.NavigableMap
+import java.util.TreeMap
 import kotlin.time.Duration
 import moe.nea.firmament.util.TimeMark
 
diff --git a/src/main/kotlin/features/mining/HotmPresets.kt b/src/main/kotlin/features/mining/HotmPresets.kt
index 763364e..aa45d82 100644
--- a/src/main/kotlin/features/mining/HotmPresets.kt
+++ b/src/main/kotlin/features/mining/HotmPresets.kt
@@ -18,7 +18,6 @@ import moe.nea.firmament.events.ChestInventoryUpdateEvent
 import moe.nea.firmament.events.CommandEvent
 import moe.nea.firmament.events.ScreenChangeEvent
 import moe.nea.firmament.events.SlotRenderEvents
-import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.mixins.accessor.AccessorHandledScreen
 import moe.nea.firmament.util.ClipboardUtils
 import moe.nea.firmament.util.MC
diff --git a/src/main/kotlin/features/mining/MiningBlockInfoUi.kt b/src/main/kotlin/features/mining/MiningBlockInfoUi.kt
index 5b58d4f..f4def44 100644
--- a/src/main/kotlin/features/mining/MiningBlockInfoUi.kt
+++ b/src/main/kotlin/features/mining/MiningBlockInfoUi.kt
@@ -1,7 +1,6 @@
 package moe.nea.firmament.features.mining
 
 import io.github.notenoughupdates.moulconfig.observer.ObservableList
-import io.github.notenoughupdates.moulconfig.observer.Property
 import io.github.notenoughupdates.moulconfig.platform.MoulConfigPlatform
 import io.github.notenoughupdates.moulconfig.xml.Bind
 import net.minecraft.client.gui.screen.Screen
diff --git a/src/main/kotlin/features/mining/PickaxeAbility.kt b/src/main/kotlin/features/mining/PickaxeAbility.kt
index 3acdcc3..5bd85c5 100644
--- a/src/main/kotlin/features/mining/PickaxeAbility.kt
+++ b/src/main/kotlin/features/mining/PickaxeAbility.kt
@@ -18,8 +18,6 @@ import moe.nea.firmament.events.ProfileSwitchEvent
 import moe.nea.firmament.events.SlotClickEvent
 import moe.nea.firmament.events.UseItemEvent
 import moe.nea.firmament.events.WorldReadyEvent
-import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.DurabilityBarEvent
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.SBData
@@ -28,6 +26,7 @@ import moe.nea.firmament.util.SkyBlockIsland
 import moe.nea.firmament.util.TIME_PATTERN
 import moe.nea.firmament.util.TimeMark
 import moe.nea.firmament.util.data.Config
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.extraAttributes
 import moe.nea.firmament.util.mc.displayNameAccordingToNbt
 import moe.nea.firmament.util.mc.loreAccordingToNbt
@@ -44,8 +43,8 @@ import moe.nea.firmament.util.tr
 import moe.nea.firmament.util.unformattedString
 import moe.nea.firmament.util.useMatch
 
-object PickaxeAbility : FirmamentFeature {
-	override val identifier: String
+object PickaxeAbility {
+	val identifier: String
 		get() = "pickaxe-info"
 
 	enum class ShowOnTools(val label: String, val items: Set<ItemType>) : StringIdentifiable {
@@ -102,9 +101,6 @@ object PickaxeAbility : FirmamentFeature {
 	val destructiveAbilities = setOf("Pickobulus")
 	val pickaxeTypes = setOf(ItemType.PICKAXE, ItemType.DRILL, ItemType.GAUNTLET)
 
-	override val config: ManagedConfig
-		get() = TConfig
-
 	fun getCooldownPercentage(name: String, cooldown: Duration): Double {
 		val sinceLastUsage = lastUsage[name]?.passedTime() ?: Duration.INFINITE
 		val sinceLobbyJoin = lobbyJoinTime.passedTime()
diff --git a/src/main/kotlin/features/mining/PristineProfitTracker.kt b/src/main/kotlin/features/mining/PristineProfitTracker.kt
index e63a107..ad864c1 100644
--- a/src/main/kotlin/features/mining/PristineProfitTracker.kt
+++ b/src/main/kotlin/features/mining/PristineProfitTracker.kt
@@ -1,7 +1,6 @@
 package moe.nea.firmament.features.mining
 
 import io.github.notenoughupdates.moulconfig.xml.Bind
-import moe.nea.jarvis.api.Point
 import org.joml.Vector2i
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.serializer
@@ -9,20 +8,19 @@ import kotlin.time.Duration.Companion.seconds
 import net.minecraft.text.Text
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.ProcessChatEvent
-import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.util.data.ManagedConfig
 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.Config
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.data.ProfileSpecificDataHolder
 import moe.nea.firmament.util.formattedString
 import moe.nea.firmament.util.useMatch
 
-object PristineProfitTracker : FirmamentFeature {
-	override val identifier: String
+object PristineProfitTracker {
+	val identifier: String
 		get() = "pristine-profit"
 
 	enum class GemstoneKind(
@@ -52,11 +50,9 @@ object PristineProfitTracker : FirmamentFeature {
 		var maxCollectionPerSecond: Double = 1.0,
 	)
 
+	@Config
 	object DConfig : ProfileSpecificDataHolder<Data>(serializer(), identifier, ::Data)
 
-	override val config: ManagedConfig?
-		get() = TConfig
-
 	@Config
 	object TConfig : ManagedConfig(identifier, Category.MINING) {
 		val timeout by duration("timeout", 0.seconds, 120.seconds) { 30.seconds }
@@ -117,20 +113,18 @@ object PristineProfitTracker : FirmamentFeature {
 		                                                   formatCommas(moneyPerSecond * SECONDS_PER_HOUR, 1))
 			.formattedString()
 		val data = DConfig.data
-		if (data != null) {
-			if (data.maxCollectionPerSecond < collectionPerSecond && collectionHistogram.oldestUpdate()
-					.passedTime() > 30.seconds
-			) {
-				data.maxCollectionPerSecond = collectionPerSecond
-				DConfig.markDirty()
-			}
-			if (data.maxMoneyPerSecond < moneyPerSecond && moneyHistogram.oldestUpdate().passedTime() > 30.seconds) {
-				data.maxMoneyPerSecond = moneyPerSecond
-				DConfig.markDirty()
-			}
-			ProfitHud.collectionMax = maxOf(data.maxCollectionPerSecond, collectionPerSecond)
-			ProfitHud.moneyMax = maxOf(data.maxMoneyPerSecond, moneyPerSecond)
+		if (data.maxCollectionPerSecond < collectionPerSecond && collectionHistogram.oldestUpdate()
+				.passedTime() > 30.seconds
+		) {
+			data.maxCollectionPerSecond = collectionPerSecond
+			DConfig.markDirty()
+		}
+		if (data.maxMoneyPerSecond < moneyPerSecond && moneyHistogram.oldestUpdate().passedTime() > 30.seconds) {
+			data.maxMoneyPerSecond = moneyPerSecond
+			DConfig.markDirty()
 		}
+		ProfitHud.collectionMax = maxOf(data.maxCollectionPerSecond, collectionPerSecond)
+		ProfitHud.moneyMax = maxOf(data.maxMoneyPerSecond, moneyPerSecond)
 	}