Bugfix/fix stuff

.editorconfig

@@ -12,12 +12,12 @@ indent_size = 2
 
 [*.kt]
 max_line_length = 120
-ij_kotlin_imports_layout = *, java, javax, kotlin, static *
+ij_kotlin_imports_layout = *
 ij_kotlin_allow_trailing_comma = true
 
 [*.java]
 max_line_length = 120
-ij_java_imports_layout = *, java, javax, static *
+ij_java_imports_layout = *
 
 [*.{kts,xml,yml,json,md}]
 indent_style = space

build.gradle.kts

@@ -18,7 +18,7 @@ base {
 detekt {
   buildUponDefaultConfig = true
   config.setFrom(rootProject.file("config/detekt/detekt.yml"))
-  failOnSeverity = FailOnSeverity.Never
+  failOnSeverity = FailOnSeverity.Warning
   allRules = false
   ignoredBuildTypes = listOf()
 }
@@ -55,7 +55,7 @@ dependencies {
   jij(libs.skija.shared)
   jij(libs.discordIpc)
 
-  runtimeOnly("me.djtheredstoner:DevAuth-fabric:1.2.2")
+  runtimeOnly(libs.devAuth)
 }
 
 addResolvedDependencies(jij, "compileOnly", "include", "api")

gradle/libs.versions.toml

@@ -8,6 +8,7 @@ fabric-kotlin = "1.13.12+kotlin.2.4.0"
 
 skija-version = "0.143.11"
 discordIpc = "0.6.0-SNAPSHOT"
+devAuth = "1.2.2"
 
 # Plugins Versions
 kotlin = "2.4.0"
@@ -23,6 +24,7 @@ fabric-kotlin = { group = "net.fabricmc", name = "fabric-language-kotlin", versi
 
 skija-shared = { group = "io.github.humbleui", name = "skija-shared", version.ref = "skija-version" }
 discordIpc = { group = "com.jagrosh", name = "DiscordIPC", version.ref = "discordIpc" }
+devAuth = { group = "me.djtheredstoner", name = "DevAuth-fabric", version.ref = "devAuth" }
 
 [plugins]
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

src/main/kotlin/org/cobalt/Cobalt.kt

@@ -12,7 +12,6 @@ import org.cobalt.command.CommandManager
 import org.cobalt.module.ModuleManager
 import org.cobalt.ui.theme.ThemeManager
 import org.cobalt.util.failsafe.FailsafeManager
-import org.cobalt.util.failsafe.FailsafeUtils
 import org.cobalt.util.input.KeyMappingHandler
 import org.cobalt.util.render.skia.SkiaPIP
 import org.cobalt.util.scheduling.Multithreading
@@ -58,7 +57,6 @@ object Cobalt : ClientModInitializer {
     CommandManager.registerCommands()
 
     FailsafeManager.initialize()
-    FailsafeUtils.init()
     KeyMappingHandler.registerKeyMappings()
 
     Multithreading.runAsync {

src/main/kotlin/org/cobalt/command/annotation/SubCommand.kt

@@ -2,4 +2,4 @@ package org.cobalt.command.annotation
 
 @Retention(AnnotationRetention.RUNTIME)
 @Target(AnnotationTarget.FUNCTION)
-annotation class SubCommand(val name: String = "")
+annotation class SubCommand

src/main/kotlin/org/cobalt/command/impl/MainCommand.kt

@@ -1,7 +1,5 @@
 package org.cobalt.command.impl
 
-import java.io.File
-import net.minecraft.world.entity.Entity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.EntityHitResult
 import net.minecraft.world.phys.HitResult
@@ -12,11 +10,8 @@ import org.cobalt.command.annotation.SubCommand
 import org.cobalt.ui.screen.ConfigScreen
 import org.cobalt.ui.screen.HudEditorScreen
 import org.cobalt.event.EventBus
-import org.cobalt.module.impl.failsafes.TeleportFailsafe
 import org.cobalt.module.impl.misc.Rotations
-import org.cobalt.util.audio.AudioManager
 import org.cobalt.util.chat.ChatUtils
-import org.cobalt.util.failsafe.FailsafeManager
 import org.cobalt.util.rotation.data.Rotation
 import org.cobalt.util.scheduling.TickScheduler
 import org.cobalt.util.server.Scoreboard

src/main/kotlin/org/cobalt/module/ModuleManager.kt

@@ -1,5 +1,6 @@
 package org.cobalt.module
 
+import java.util.concurrent.CopyOnWriteArraySet
 import net.minecraft.client.gui.screens.LevelLoadingScreen
 import net.minecraft.client.gui.screens.ProgressScreen
 import org.cobalt.Cobalt.minecraft
@@ -27,7 +28,7 @@ import org.cobalt.util.render.skia.SkiaPIP
 
 object ModuleManager {
 
-  val modules = mutableSetOf<Module>()
+  val modules = CopyOnWriteArraySet<Module>()
 
   var lastScript: Script? = null
   var currentScript: Script? = null

src/main/kotlin/org/cobalt/module/impl/combat/AutoClicker.kt

@@ -56,6 +56,9 @@ object AutoClicker : Module(
     options = arrayOf("All", "Entity Only", "No Blocks"),
   )
 
+  private val attackModeType: AttackMode
+    get() = AttackMode.fromOptionIndex(attackMode)
+
   private val mobFilter by TextSetting(
     name = "Mob Filter",
     description = "Only attack listed names (comma-separated)",
@@ -104,11 +107,10 @@ object AutoClicker : Module(
     val player = minecraft.player ?: return false
     val hit = minecraft.hitResult
 
-    val attackAllowed = when (attackMode) {
-      0 -> true
-      1 -> hit?.type == HitResult.Type.ENTITY
-      2 -> hit?.type != HitResult.Type.BLOCK
-      else -> false
+    val attackAllowed = when (attackModeType) {
+      AttackMode.ALL -> true
+      AttackMode.ENTITY_ONLY -> hit?.type == HitResult.Type.ENTITY
+      AttackMode.NO_BLOCKS -> hit?.type != HitResult.Type.BLOCK
     }
 
     if (!attackAllowed || (waitForReload && player.getAttackStrengthScale(0f) < 1.0f)) {
@@ -134,4 +136,14 @@ object AutoClicker : Module(
     return (base + jitter).coerceAtLeast(1.0).toLong()
   }
 
+  private enum class AttackMode(val optionIndex: Int) {
+    ALL(0),
+    ENTITY_ONLY(1),
+    NO_BLOCKS(2);
+
+    companion object {
+      fun fromOptionIndex(index: Int): AttackMode = entries.firstOrNull { it.optionIndex == index } ?: ALL
+    }
+  }
+
 }

src/main/kotlin/org/cobalt/module/impl/failsafes/ChatMentionFailsafe.kt

@@ -1,15 +1,12 @@
 package org.cobalt.module.impl.failsafes
 
-import net.fabricmc.loader.api.FabricLoader
 import net.minecraft.network.chat.Component
-import net.minecraft.network.protocol.game.ClientboundPlayerChatPacket
 import net.minecraft.network.protocol.game.ClientboundSystemChatPacket
 import org.cobalt.event.annotation.SubscribeEvent
 import org.cobalt.event.impl.PacketEvent
 import org.cobalt.module.ModuleManager
 import org.cobalt.module.type.Failsafe
 import org.cobalt.ui.component.setting.impl.CheckboxSetting
-import org.cobalt.ui.component.setting.impl.ModeSetting
 import org.cobalt.ui.component.setting.impl.TextSetting
 import org.cobalt.util.chat.ChatUtils
 import org.cobalt.util.chat.MessageType
@@ -32,7 +29,7 @@ object ChatMentionFailsafe : Failsafe("Chat Mention", 10, false) {
 
   @SubscribeEvent
   fun onChatMessage(event: PacketEvent.Receive) {
-    if (!ModuleManager.isScriptRunning() && !FabricLoader.getInstance().isDevelopmentEnvironment) return
+    if (!shouldReactToEvents()) return
     val packet = event.packet as? ClientboundSystemChatPacket ?: return
     val message = packet.content.string
     val sender = getSenderFromComponent(packet.content)
@@ -89,7 +86,7 @@ object ChatMentionFailsafe : Failsafe("Chat Mention", 10, false) {
 
 
   override fun resetStates() {
-    TODO("Not yet implemented")
+    // TODO
   }
 
   override fun performReaction(): ReactionResult? {

src/main/kotlin/org/cobalt/module/impl/failsafes/PlayerCheckFailsafe.kt

@@ -1,13 +1,9 @@
 package org.cobalt.module.impl.failsafes
 
-import net.fabricmc.loader.api.FabricLoader
 import net.minecraft.core.BlockPos
-import net.minecraft.world.phys.EntityHitResult
-import net.minecraft.world.phys.HitResult
 import org.cobalt.Cobalt
 import org.cobalt.event.annotation.SubscribeEvent
 import org.cobalt.event.impl.TickEvent
-import org.cobalt.module.ModuleManager
 import org.cobalt.module.type.Failsafe
 import org.cobalt.util.client.PlayerUtils
 import org.cobalt.util.failsafe.FailsafeManager
@@ -17,7 +13,7 @@ object PlayerCheckFailsafe : Failsafe("Player Check", 10, false) {
 
   @SubscribeEvent
   fun onTick(ignored: TickEvent.End) {
-    if (!ModuleManager.isScriptRunning() && !FabricLoader.getInstance().isDevelopmentEnvironment) return
+    if (!shouldReactToEvents()) return
 
     val player = PlayerUtils.player ?: return
     val level = Cobalt.minecraft.level ?: return
@@ -70,7 +66,8 @@ object PlayerCheckFailsafe : Failsafe("Player Check", 10, false) {
   }
 
   override fun performReaction(): ReactionResult? {
-    TODO("Not yet implemented")
+    // TODO
+    return null
   }
 
 }

src/main/kotlin/org/cobalt/module/impl/failsafes/RotationFailsafe.kt

@@ -1,33 +1,58 @@
 package org.cobalt.module.impl.failsafes
 
-import net.fabricmc.loader.api.FabricLoader
-import org.cobalt.Cobalt
-import org.cobalt.module.ModuleManager
+import net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket
+import net.minecraft.network.protocol.game.ServerboundChatCommandPacket
+import org.cobalt.event.annotation.SubscribeEvent
+import org.cobalt.event.impl.PacketEvent
 import org.cobalt.module.type.Failsafe
+import org.cobalt.util.client.PlayerUtils.player
 import org.cobalt.util.failsafe.FailsafeManager
 import org.cobalt.util.rotation.data.Rotation
 
 object RotationFailsafe : Failsafe("Rotation", 10, false) {
-  fun onRotation(currentRot: Rotation, newRot: Rotation) {
-    if (!ModuleManager.isScriptRunning() && !FabricLoader.getInstance().isDevelopmentEnvironment) return
-    val player = Cobalt.minecraft.player ?: return
+  @SubscribeEvent
+  fun onRotation(event: PacketEvent.Any) {
+    if (!shouldReactToEvents()) return
+    if (minecraft.level == null) return
 
-    if (currentRot == newRot) return // I think this is needed? not sure
+    when (val packet = event.packet) {
+      is ClientboundPlayerPositionPacket -> handlePositionPacket(packet)
+      is ServerboundChatCommandPacket -> handleChatCommandPacket(packet)
+    }
+  }
+
+  private fun handlePositionPacket(packet: ClientboundPlayerPositionPacket) {
+    val currentRotation = try {
+      Rotation(player!!.yRot, player!!.xRot)
+    } catch (_: NullPointerException) {
+      return
+    }
+
+    val newRotation = Rotation(packet.change.yRot, packet.change.xRot)
+
+    if (currentRotation == newRotation) {
+      return
+    }
 
     FailsafeManager.alertUser(
       this,
-      "<red>ROTATED FROM</red>" +
-        " <yellow>${currentRot.pitch} & ${currentRot.yaw}</yellow>" +
+      "<red>FROM</red> <yellow>Pitch: ${currentRotation.pitch}, Yaw: ${currentRotation.yaw}</yellow>" +
         " <red>TO</red>" +
-        " <yellow>${newRot.pitch} & ${newRot.yaw}</yellow>"
+        " <yellow>Pitch: ${newRotation.pitch}, Yaw: ${newRotation.yaw}</yellow>"
     )
   }
 
+  private fun handleChatCommandPacket(packet: ServerboundChatCommandPacket) {
+    if (!packet.command.contains("warp")) return
+    FailsafeManager.ignoreFailsafe(this)
+  }
+
   override fun resetStates() {
-    TODO("Not yet implemented")
+    return
   }
 
   override fun performReaction(): ReactionResult? {
-    TODO("Not yet implemented")
+    // TODO
+    return null
   }
 }

src/main/kotlin/org/cobalt/module/impl/failsafes/SlotChangeFailsafe.kt

@@ -1,19 +1,16 @@
 package org.cobalt.module.impl.failsafes
 
-import net.fabricmc.loader.api.FabricLoader
 import net.minecraft.network.protocol.game.ClientboundSetHeldSlotPacket
 import org.cobalt.Cobalt
 import org.cobalt.event.annotation.SubscribeEvent
 import org.cobalt.event.impl.PacketEvent
-import org.cobalt.module.ModuleManager
 import org.cobalt.module.type.Failsafe
 import org.cobalt.util.failsafe.FailsafeManager
-import org.cobalt.util.inventory.InventoryUtils
 
 object SlotChangeFailsafe : Failsafe("Slot Change", 10, false) {
   @SubscribeEvent
   fun onServerItemChange(event: PacketEvent.Receive) {
-    if (!ModuleManager.isScriptRunning() && !FabricLoader.getInstance().isDevelopmentEnvironment) return
+    if (!shouldReactToEvents()) return
     val player = Cobalt.minecraft.player ?: return
     val packet = event.packet as? ClientboundSetHeldSlotPacket ?: return
 
@@ -32,11 +29,12 @@ object SlotChangeFailsafe : Failsafe("Slot Change", 10, false) {
   }
 
   override fun resetStates() {
-    TODO("Not yet implemented")
+    // TODO
   }
 
-  override fun performReaction(): ReactionResult {
-    TODO("Not yet implemented")
+  override fun performReaction(): ReactionResult? {
+    // TODO
+    return null
   }
 
 }