diff options
| author | Linnea Gräf <nea@nea.moe> | 2025-06-23 01:01:39 +0200 |
|---|---|---|
| committer | Linnea Gräf <nea@nea.moe> | 2025-06-23 01:01:39 +0200 |
| commit | c1b5fd7f8e36ed331ec1186e17ecfa574fc487f2 (patch) | |
| tree | 64795123e6bb14038e2895d5344e4170d85ff9e5 /src | |
| parent | 5094885767147e8d9939dce2fd24d158dab9f1e5 (diff) | |
| download | Firmament-c1b5fd7f8e36ed331ec1186e17ecfa574fc487f2.tar.gz Firmament-c1b5fd7f8e36ed331ec1186e17ecfa574fc487f2.tar.bz2 Firmament-c1b5fd7f8e36ed331ec1186e17ecfa574fc487f2.zip | |
fix: Potential fix for inventory buttons resetting
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/kotlin/features/FeatureManager.kt | 1 | ||||
| -rw-r--r-- | src/main/kotlin/features/inventory/buttons/InventoryButtons.kt | 11 | ||||
| -rw-r--r-- | src/main/kotlin/gui/config/ManagedConfig.kt | 1 |
3 files changed, 4 insertions, 9 deletions
diff --git a/src/main/kotlin/features/FeatureManager.kt b/src/main/kotlin/features/FeatureManager.kt index f0c1857..c9828e5 100644 --- a/src/main/kotlin/features/FeatureManager.kt +++ b/src/main/kotlin/features/FeatureManager.kt @@ -60,7 +60,6 @@ object FeatureManager : DataHolder<FeatureManager.Config>(serializer(), "feature loadFeature(PowerUserTools) loadFeature(Waypoints) loadFeature(ChatLinks) - loadFeature(InventoryButtons) loadFeature(CompatibliltyFeatures) loadFeature(AnniversaryFeatures) loadFeature(QuickCommands) diff --git a/src/main/kotlin/features/inventory/buttons/InventoryButtons.kt b/src/main/kotlin/features/inventory/buttons/InventoryButtons.kt index 361e8d0..15f57d9 100644 --- a/src/main/kotlin/features/inventory/buttons/InventoryButtons.kt +++ b/src/main/kotlin/features/inventory/buttons/InventoryButtons.kt @@ -22,18 +22,16 @@ import moe.nea.firmament.util.data.DataHolder import moe.nea.firmament.util.accessors.getRectangle import moe.nea.firmament.util.gold -object InventoryButtons : FirmamentFeature { - override val identifier: String - get() = "inventory-buttons" +object InventoryButtons { - object TConfig : ManagedConfig(identifier, Category.INVENTORY) { + object TConfig : ManagedConfig("inventory-buttons-config", Category.INVENTORY) { val _openEditor by button("open-editor") { openEditor() } val hoverText by toggle("hover-text") { true } } - object DConfig : DataHolder<Data>(serializer(), identifier, ::Data) + object DConfig : DataHolder<Data>(serializer(), "inventory-buttons", ::Data) @Serializable data class Data( @@ -41,9 +39,6 @@ object InventoryButtons : FirmamentFeature { ) - override val config: ManagedConfig - get() = TConfig - fun getValidButtons() = DConfig.data.buttons.asSequence().filter { it.isValid() } @Subscribe diff --git a/src/main/kotlin/gui/config/ManagedConfig.kt b/src/main/kotlin/gui/config/ManagedConfig.kt index 5a41f43..125eaab 100644 --- a/src/main/kotlin/gui/config/ManagedConfig.kt +++ b/src/main/kotlin/gui/config/ManagedConfig.kt @@ -70,6 +70,7 @@ abstract class ManagedConfig( category.configs.add(this) } + // TODO: warn if two files use the same config file name :( val file = Firmament.CONFIG_DIR.resolve("$name.json") val data: JsonObject by lazy { try { |