diff --git a/src/main/java/dev/vixid/vsm/config/VSMConfig.java b/src/main/java/dev/vixid/vsm/config/VSMConfig.java index bbaa26e..3a16453 100644 --- a/src/main/java/dev/vixid/vsm/config/VSMConfig.java +++ b/src/main/java/dev/vixid/vsm/config/VSMConfig.java @@ -3,7 +3,6 @@ import com.google.gson.annotations.Expose; import com.mojang.brigadier.CommandDispatcher; import dev.vixid.vsm.VSM; -import dev.vixid.vsm.utils.ChatUtils; import io.github.notenoughupdates.moulconfig.Config; import io.github.notenoughupdates.moulconfig.Social; import io.github.notenoughupdates.moulconfig.annotations.Category; @@ -49,7 +48,7 @@ public String getTitle() { @Override public void saveNow() { - ChatUtils.INSTANCE.chat("Saved config"); + VSM.INSTANCE.getLogger().debug("Saved config"); super.saveNow(); } diff --git a/src/main/java/dev/vixid/vsm/config/core/Position.java b/src/main/java/dev/vixid/vsm/config/core/Position.java index 2760203..4a7d271 100644 --- a/src/main/java/dev/vixid/vsm/config/core/Position.java +++ b/src/main/java/dev/vixid/vsm/config/core/Position.java @@ -32,6 +32,11 @@ public void add(int x, int y) { this.y += y; } + public void set(int x, int y) { + this.x = x; + this.y = y; + } + public UUID getUuid() { if (this.uuid == null) { this.uuid = UUID.randomUUID(); diff --git a/src/main/kotlin/dev/vixid/vsm/VSM.kt b/src/main/kotlin/dev/vixid/vsm/VSM.kt index 5e7f4f0..ac5c542 100644 --- a/src/main/kotlin/dev/vixid/vsm/VSM.kt +++ b/src/main/kotlin/dev/vixid/vsm/VSM.kt @@ -13,10 +13,11 @@ import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.SupervisorJob +import org.slf4j.Logger import org.slf4j.LoggerFactory object VSM { - private val logger = LoggerFactory.getLogger("vsm") + val logger: Logger = LoggerFactory.getLogger("vsm") val config = ManagedConfig.create(File("config/vsm/config.json"), VSMConfig::class.java) { // Overwrite the GsonMapper to our own, so we can exclude fields without Expose annotation diff --git a/src/main/kotlin/dev/vixid/vsm/overlays/PositionEditor.kt b/src/main/kotlin/dev/vixid/vsm/overlays/PositionEditor.kt index 126055c..1d8f33b 100644 --- a/src/main/kotlin/dev/vixid/vsm/overlays/PositionEditor.kt +++ b/src/main/kotlin/dev/vixid/vsm/overlays/PositionEditor.kt @@ -1,5 +1,6 @@ package dev.vixid.vsm.overlays +import dev.vixid.vsm.VSM import dev.vixid.vsm.config.core.Position import dev.vixid.vsm.utils.RenderUtils import java.util.UUID @@ -24,20 +25,28 @@ class PositionEditor(private val editorOverlays: Map { for (overlay in editorOverlays) { val string = overlay.value.first val position = overlay.value.second val bounds = RenderUtils.getRectangleBoundsForString(string, position) - if (bounds.containsPosition(Position(mouseX, mouseY))) return overlay.value.second + if (bounds.containsPosition(Position(mouseX, mouseY))) return overlay.value } - return Position(-1, -1) + return Pair("", Position(-1, -1)) + } + + override fun close() { + super.close() + VSM.config.instance.saveNow() } } \ No newline at end of file