diff --git a/src/main/kotlin/org/cobalt/command/CommandManager.kt b/src/main/kotlin/org/cobalt/command/CommandManager.kt
index 9a652ff..909b928 100644
--- a/src/main/kotlin/org/cobalt/command/CommandManager.kt
+++ b/src/main/kotlin/org/cobalt/command/CommandManager.kt
@@ -51,7 +51,7 @@ object CommandManager {
dispatcher.execute(commandLine, player.connection.suggestionsProvider)
minecraft.gui.hud.chat.commandHistory.addCommand(content)
} catch (exception: CommandSyntaxException) {
- ChatUtils.sendSystemMessage("${ChatFormatting.RED}${exception.message}")
+ ChatUtils.sendSystemMessage("${exception.message}")
}
return true
diff --git a/src/main/kotlin/org/cobalt/module/ModuleManager.kt b/src/main/kotlin/org/cobalt/module/ModuleManager.kt
index 108a8eb..41f6dbd 100644
--- a/src/main/kotlin/org/cobalt/module/ModuleManager.kt
+++ b/src/main/kotlin/org/cobalt/module/ModuleManager.kt
@@ -67,7 +67,7 @@ object ModuleManager {
if (currentScript != null && currentScript != script) {
stopAllScripts()
ChatUtils.sendSystemMessage(
- "${ChatFormatting.RED}Cannot start a different script when one is currently active, disabling all scripts..."
+ "Cannot start a different script when one is currently active, disabling all scripts..."
)
return
@@ -79,7 +79,7 @@ object ModuleManager {
fun stopScript() {
if (currentScript == null) {
- ChatUtils.sendSystemMessage("${ChatFormatting.RED}There is no script currently running")
+ ChatUtils.sendSystemMessage("There is no script currently running")
return
}
diff --git a/src/main/kotlin/org/cobalt/module/impl/misc/AutoSprint.kt b/src/main/kotlin/org/cobalt/module/impl/misc/AutoSprint.kt
index 4add306..d9ca5cd 100644
--- a/src/main/kotlin/org/cobalt/module/impl/misc/AutoSprint.kt
+++ b/src/main/kotlin/org/cobalt/module/impl/misc/AutoSprint.kt
@@ -17,9 +17,7 @@ object AutoSprint : Module(
return
}
- if (PathExecutor.running && PathExecutor.config?.shouldSprint != true) {
- return
- }
+ if (PathExecutor.controlsSprint) return
minecraft.options.keySprint.isDown = true
}
diff --git a/src/main/kotlin/org/cobalt/pathfinder/PathExecutor.kt b/src/main/kotlin/org/cobalt/pathfinder/PathExecutor.kt
index 13ac1ba..a2ce1d7 100644
--- a/src/main/kotlin/org/cobalt/pathfinder/PathExecutor.kt
+++ b/src/main/kotlin/org/cobalt/pathfinder/PathExecutor.kt
@@ -26,6 +26,9 @@ object PathExecutor {
var running = false
+ val controlsSprint: Boolean
+ get() = running && config?.shouldSprint == true
+
init {
EventBus.register(this)
}
@@ -34,7 +37,7 @@ object PathExecutor {
stop()
if (config.useFlyMovement && !PlayerUtils.canFly) {
- ChatUtils.sendSystemMessage("${ChatFormatting.RED} Invalid path config, since player cannot fly!")
+ ChatUtils.sendSystemMessage(" Invalid path config, since player cannot fly!")
return
}
diff --git a/src/main/kotlin/org/cobalt/pathfinder/state/impl/CalculatingState.kt b/src/main/kotlin/org/cobalt/pathfinder/state/impl/CalculatingState.kt
index 02cf7e1..2c89cae 100644
--- a/src/main/kotlin/org/cobalt/pathfinder/state/impl/CalculatingState.kt
+++ b/src/main/kotlin/org/cobalt/pathfinder/state/impl/CalculatingState.kt
@@ -25,7 +25,7 @@ class CalculatingState : ExecutorState {
val path = pathFinder.findPath()
if (path == null) {
- ChatUtils.sendSystemMessage("${ChatFormatting.RED}Unable to find a path.")
+ ChatUtils.sendSystemMessage("Unable to find a path.")
PathExecutor.stop()
return@runAsync
}
diff --git a/src/main/kotlin/org/cobalt/util/ChatUtils.kt b/src/main/kotlin/org/cobalt/util/ChatUtils.kt
index ab633c9..4c3fd73 100644
--- a/src/main/kotlin/org/cobalt/util/ChatUtils.kt
+++ b/src/main/kotlin/org/cobalt/util/ChatUtils.kt
@@ -22,26 +22,21 @@ object ChatUtils {
@JvmStatic
fun sendSystemMessage(message: String, type: MessageType = MessageType.DEFAULT) {
val component = when (type) {
- MessageType.DEFAULT -> stringToComponent(defaultPrefix + message)
- MessageType.RAW -> stringToComponent(message)
+ MessageType.DEFAULT -> ChatFormatter.parse(defaultPrefix + message)
+ MessageType.RAW -> ChatFormatter.parse(message)
MessageType.DEBUG -> {
if (!Debug.enabled || lastDebugMessage == message) {
return
}
lastDebugMessage = message
- stringToComponent(debugPrefix + message)
+ ChatFormatter.parse(debugPrefix + message)
}
}
addToChat(component)
}
- @JvmStatic
- fun stringToComponent(string: String): MutableComponent {
- return ChatFormatter.parse(string)
- }
-
@JvmStatic
fun sendPlayerMessage(message: String) {
runOnClientThread {