aboutsummaryrefslogtreecommitdiff
path: root/src/compat
diff options
context:
space:
mode:
Diffstat (limited to 'src/compat')
-rw-r--r--src/compat/jade/java/moe/nea/firmament/compat/jade/JadeIntegration.kt4
-rw-r--r--src/compat/moulconfig/java/MCConfigEditorIntegration.kt4
-rw-r--r--src/compat/moulconfig/java/ProcessedCategoryFirm.kt2
-rw-r--r--src/compat/moulconfig/java/ProcessedEditableOptionFirm.kt4
-rw-r--r--src/compat/yacl/java/YaclIntegration.kt8
5 files changed, 12 insertions, 10 deletions
diff --git a/src/compat/jade/java/moe/nea/firmament/compat/jade/JadeIntegration.kt b/src/compat/jade/java/moe/nea/firmament/compat/jade/JadeIntegration.kt
index d411c26..57749da 100644
--- a/src/compat/jade/java/moe/nea/firmament/compat/jade/JadeIntegration.kt
+++ b/src/compat/jade/java/moe/nea/firmament/compat/jade/JadeIntegration.kt
@@ -7,9 +7,11 @@ import moe.nea.firmament.repo.RepoManager
import moe.nea.firmament.util.ErrorUtil
import net.minecraft.block.Block
import moe.nea.firmament.events.ReloadRegistrationEvent
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.Config
+import moe.nea.firmament.util.data.ManagedConfig
object JadeIntegration {
+ @Config
object TConfig : ManagedConfig("jade-integration", Category.INTEGRATIONS) {
val miningProgress by toggle("progress") { true }
val blockDetection by toggle("blocks") { true }
diff --git a/src/compat/moulconfig/java/MCConfigEditorIntegration.kt b/src/compat/moulconfig/java/MCConfigEditorIntegration.kt
index a568c19..f0e7f16 100644
--- a/src/compat/moulconfig/java/MCConfigEditorIntegration.kt
+++ b/src/compat/moulconfig/java/MCConfigEditorIntegration.kt
@@ -53,7 +53,7 @@ import moe.nea.firmament.gui.config.HudMeta
import moe.nea.firmament.gui.config.HudMetaHandler
import moe.nea.firmament.gui.config.IntegerHandler
import moe.nea.firmament.gui.config.KeyBindingHandler
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
import moe.nea.firmament.gui.config.ManagedOption
import moe.nea.firmament.gui.config.StringHandler
import moe.nea.firmament.gui.toMoulConfig
@@ -335,7 +335,7 @@ class MCConfigEditorIntegration : FirmamentConfigScreenProvider {
val configObject = object : Config() {
override fun saveNow() {
- ManagedConfig.allManagedConfigs.getAll().forEach { it.save() }
+ ManagedConfig.allManagedConfigs.getAll().forEach { it.markDirty() }
}
override fun shouldAutoFocusSearchbar(): Boolean {
diff --git a/src/compat/moulconfig/java/ProcessedCategoryFirm.kt b/src/compat/moulconfig/java/ProcessedCategoryFirm.kt
index 38a613a..7c99528 100644
--- a/src/compat/moulconfig/java/ProcessedCategoryFirm.kt
+++ b/src/compat/moulconfig/java/ProcessedCategoryFirm.kt
@@ -5,7 +5,7 @@ import io.github.notenoughupdates.moulconfig.gui.editors.GuiOptionEditorAccordio
import io.github.notenoughupdates.moulconfig.platform.MoulConfigPlatform
import io.github.notenoughupdates.moulconfig.processor.ProcessedCategory
import io.github.notenoughupdates.moulconfig.processor.ProcessedOption
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
class ProcessedCategoryFirm(
val category: ManagedConfig.Category,
diff --git a/src/compat/moulconfig/java/ProcessedEditableOptionFirm.kt b/src/compat/moulconfig/java/ProcessedEditableOptionFirm.kt
index ac23ec7..e1ad217 100644
--- a/src/compat/moulconfig/java/ProcessedEditableOptionFirm.kt
+++ b/src/compat/moulconfig/java/ProcessedEditableOptionFirm.kt
@@ -36,11 +36,11 @@ abstract class ProcessedEditableOptionFirm<T : Any>(
ErrorUtil.softError("Failed to set value p0 in $this")
return false
}
- managedConfig.save()
+ managedConfig.markDirty()
return true
}
override fun explicitNotifyChange() {
- managedConfig.save()
+ managedConfig.markDirty()
}
}
diff --git a/src/compat/yacl/java/YaclIntegration.kt b/src/compat/yacl/java/YaclIntegration.kt
index 285d60c..79ab528 100644
--- a/src/compat/yacl/java/YaclIntegration.kt
+++ b/src/compat/yacl/java/YaclIntegration.kt
@@ -38,7 +38,7 @@ import moe.nea.firmament.gui.config.HudMeta
import moe.nea.firmament.gui.config.HudMetaHandler
import moe.nea.firmament.gui.config.IntegerHandler
import moe.nea.firmament.gui.config.KeyBindingHandler
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
import moe.nea.firmament.gui.config.ManagedOption
import moe.nea.firmament.gui.config.StringHandler
import moe.nea.firmament.keybindings.SavedKeyBinding
@@ -77,7 +77,7 @@ class YaclIntegration : FirmamentConfigScreenProvider {
val binding = Binding.generic(
managedOption.default(),
managedOption::value,
- { managedOption.value = it; managedOption.element.save() })
+ { managedOption.value = it; managedOption.element.markDirty() })
fun <T> createDefaultBinding(function: (Option<T>) -> ControllerBuilder<T>): Option.Builder<T> {
return Option.createBuilder<T>()
@@ -118,7 +118,7 @@ class YaclIntegration : FirmamentConfigScreenProvider {
{
managedOption.value =
it.toChromaWithoutAnimation(managedOption.value.timeForFullRotationInMillis)
- managedOption.element.save()
+ managedOption.element.markDirty()
})
val speedBinding =
Binding.generic(
@@ -126,7 +126,7 @@ class YaclIntegration : FirmamentConfigScreenProvider {
{ managedOption.value.timeForFullRotationInMillis },
{
managedOption.value = managedOption.value.copy(timeForFullRotationInMillis = it)
- managedOption.element.save()
+ managedOption.element.markDirty()
}
)