Chore/nathan cleanup

config/detekt/detekt.yml

@@ -54,7 +54,11 @@ style:
     active: true
     maxJumpCount: 3
   WildcardImport:
-    active: false
+    active: true
+    excludeImports:
+      - 'org.lwjgl.vulkan.*'
+      - 'io.github.humbleui.skija.*'
+      - 'net.minecraft.world.level.block.*'
   ForbiddenComment:
     active: false
   UnusedPrivateProperty:

src/main/java/org/cobalt/mixin/client/MinecraftMixin.java

@@ -11,7 +11,7 @@
 import org.cobalt.event.impl.TickEvent;
 import org.cobalt.module.ModuleManager;
 import org.cobalt.util.config.SettingContainer;
-import org.cobalt.util.helper.Multithreading;
+import org.cobalt.util.scheduling.Multithreading;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

src/main/java/org/cobalt/mixin/client/MouseHandlerMixin.java

@@ -5,10 +5,10 @@
 import org.cobalt.event.EventBus;
 import org.cobalt.event.impl.MouseEvent;
 import org.cobalt.event.impl.MouseScrollEvent;
-import org.cobalt.util.MouseAction;
-import org.cobalt.util.MouseButton;
-import org.cobalt.util.MouseMode;
-import org.cobalt.util.MouseUtils;
+import org.cobalt.util.input.Mouse;
+import org.cobalt.util.input.MouseAction;
+import org.cobalt.util.input.MouseButton;
+import org.cobalt.util.input.MouseMode;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -74,14 +74,14 @@ private void onMouseScroll(long handle, double xoffset, double yoffset, Callback
 
   @Inject(method = "turnPlayer", at = @At("HEAD"), cancellable = true)
   private void onUpdateMouse(CallbackInfo callbackInfo) {
-    if (MouseUtils.getMouseMode() == MouseMode.LOCK_MOUSE) {
+    if (Mouse.getMouseMode() == MouseMode.LOCK_MOUSE) {
       callbackInfo.cancel();
     }
   }
 
   @Inject(method = "isMouseGrabbed", at = @At("HEAD"), cancellable = true)
   private void onIsCursorLocked(CallbackInfoReturnable<Boolean> callbackInfoReturnable) {
-    if (MouseUtils.getMouseMode() == MouseMode.UNGRAB_MOUSE) {
+    if (Mouse.getMouseMode() == MouseMode.UNGRAB_MOUSE) {
       if (this.mouseGrabbed) {
         this.releaseMouse();
       }
@@ -92,7 +92,7 @@ private void onIsCursorLocked(CallbackInfoReturnable<Boolean> callbackInfoReturn
 
   @Inject(method = "grabMouse", at = @At("HEAD"), cancellable = true)
   private void onLockCursor(CallbackInfo callbackInfo) {
-    if (MouseUtils.getMouseMode() == MouseMode.UNGRAB_MOUSE) {
+    if (Mouse.getMouseMode() == MouseMode.UNGRAB_MOUSE) {
       callbackInfo.cancel();
     }
   }

src/main/java/org/cobalt/mixin/gui/FontMixin.java

@@ -8,7 +8,7 @@
 import net.minecraft.network.chat.Style;
 import net.minecraft.util.FormattedCharSequence;
 import org.cobalt.module.impl.misc.NickHider;
-import org.cobalt.util.PlayerUtils;
+import org.cobalt.util.client.PlayerUtils;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;

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

@@ -15,7 +15,7 @@ import org.cobalt.event.EventBus
 import org.cobalt.event.impl.WorldEvent
 import org.cobalt.module.ModuleManager
 import org.cobalt.ui.theme.ThemeManager
-import org.cobalt.util.skia.SkiaPIP
+import org.cobalt.util.render.skia.SkiaPIP
 import org.slf4j.LoggerFactory
 
 object Cobalt : ClientModInitializer {

src/main/kotlin/org/cobalt/command/Command.kt

@@ -1,6 +1,11 @@
 package org.cobalt.command
 
-import com.mojang.brigadier.arguments.*
+import com.mojang.brigadier.arguments.ArgumentType
+import com.mojang.brigadier.arguments.BoolArgumentType
+import com.mojang.brigadier.arguments.DoubleArgumentType
+import com.mojang.brigadier.arguments.FloatArgumentType
+import com.mojang.brigadier.arguments.IntegerArgumentType
+import com.mojang.brigadier.arguments.StringArgumentType
 import com.mojang.brigadier.builder.LiteralArgumentBuilder
 import com.mojang.brigadier.builder.RequiredArgumentBuilder
 import com.mojang.brigadier.context.CommandContext

src/main/kotlin/org/cobalt/command/CommandManager.kt

@@ -5,7 +5,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException
 import net.minecraft.client.multiplayer.ClientSuggestionProvider
 import org.cobalt.Cobalt.minecraft
 import org.cobalt.command.impl.MainCommand
-import org.cobalt.util.ChatUtils
+import org.cobalt.util.chat.ChatUtils
 
 object CommandManager {
 

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

@@ -1,6 +1,5 @@
 package org.cobalt.command.impl
 
-import kotlin.time.Duration.Companion.milliseconds
 import org.cobalt.Cobalt.minecraft
 import org.cobalt.command.Command
 import org.cobalt.command.annotation.DefaultHandler
@@ -9,11 +8,9 @@ import org.cobalt.pathfinder.PathConfig
 import org.cobalt.pathfinder.PathExecutor
 import org.cobalt.pathfinder.calculate.PathMode
 import org.cobalt.pathfinder.goal.GoalBlock
-import org.cobalt.ui.notification.NotificationManager
 import org.cobalt.ui.screen.ConfigScreen
 import org.cobalt.ui.screen.HudEditorScreen
-import org.cobalt.util.helper.Multithreading
-import org.cobalt.util.helper.TickScheduler
+import org.cobalt.util.scheduling.TickScheduler
 
 object MainCommand : Command(name = "cobalt", aliases = listOf("cb")) {
 
@@ -33,31 +30,20 @@ object MainCommand : Command(name = "cobalt", aliases = listOf("cb")) {
     }
   }
 
-  @SubCommand
-  fun testNotif() {
-    Multithreading.runAsync {
-
-      NotificationManager.queue("Hi", "", 2000.milliseconds)
-      Thread.sleep(750)
-      NotificationManager.queue("Hi", "Hello", 2000.milliseconds)
-      Thread.sleep(750)
-      NotificationManager.queue(
-        "Hi",
-        "HeASDASDHOUASHDOUASHDUOAHSDOUAHSDOUHASOUDHASDlloHeASDASDHOUASHDOUASHDUOAHSDOUAHSDOUHASOUDHASDlloHeASDASDHOUASHDOUASHDUOAHSDOUAHSDOUHASOUDHASDlloHeASDASDHOUASHDOUASHDUOAHSDOUAHSDOUHASOUDHASDlloHeASDASDHOUASHDOUASHDUOAHSDOUAHSDOUHASOUDHASDllo",
-        2000.milliseconds
-      )
-    }
-  }
-
   @SubCommand
   fun goTo(x: Int, y: Int, z: Int, fly: Boolean) {
-    val mode = if (fly) PathMode.FLY else PathMode.WALK
+    val pathMode = if (fly) PathMode.FLY else PathMode.WALK
     val config = PathConfig(
       goal = GoalBlock(x, y, z),
-      movements = mode.movements
+      mode = pathMode
     )
 
     PathExecutor.goTo(config)
   }
 
+  @SubCommand
+  fun stopPathfinder() {
+    PathExecutor.stop()
+  }
+
 }

src/main/kotlin/org/cobalt/event/impl/MouseEvent.kt

@@ -1,8 +1,8 @@
 package org.cobalt.event.impl
 
 import org.cobalt.event.Event
-import org.cobalt.util.MouseAction
-import org.cobalt.util.MouseButton
+import org.cobalt.util.input.MouseAction
+import org.cobalt.util.input.MouseButton
 
 class MouseEvent(
   val button: MouseButton,

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

@@ -7,17 +7,22 @@ import org.cobalt.event.EventBus
 import org.cobalt.event.annotation.SubscribeEvent
 import org.cobalt.event.impl.RenderEvent
 import org.cobalt.module.impl.combat.AutoClicker
-import org.cobalt.module.impl.misc.*
+import org.cobalt.module.impl.misc.AutoHarp
+import org.cobalt.module.impl.misc.AutoSprint
+import org.cobalt.module.impl.misc.Debug
+import org.cobalt.module.impl.misc.DiscordRPC
+import org.cobalt.module.impl.misc.NickHider
+import org.cobalt.module.impl.misc.Rotations
 import org.cobalt.module.impl.skills.Fishing
 import org.cobalt.module.impl.visual.PerformanceHUD
 import org.cobalt.module.type.RenderableModule
 import org.cobalt.module.type.Script
 import org.cobalt.ui.screen.HudEditorScreen
-import org.cobalt.util.ChatUtils
-import org.cobalt.util.WindowUtils.scaleX
-import org.cobalt.util.WindowUtils.scaleY
-import org.cobalt.util.skia.Skia
-import org.cobalt.util.skia.SkiaPIP
+import org.cobalt.util.chat.ChatUtils
+import org.cobalt.util.client.WindowUtils.scaleX
+import org.cobalt.util.client.WindowUtils.scaleY
+import org.cobalt.util.render.SkiaRenderer
+import org.cobalt.util.render.skia.SkiaPIP
 
 object ModuleManager {
 
@@ -132,19 +137,19 @@ object ModuleManager {
       modules.filterIsInstance<RenderableModule>()
         .filter { module -> module.enabled }
         .forEach { module ->
-          Skia.push()
+          SkiaRenderer.push()
 
           val renderX = module.xPos * scaleX
           val renderY = module.yPos * scaleY
           val finalScale = module.scale * scaleY
 
-          Skia.translate(renderX, renderY)
-          Skia.scale(finalScale, finalScale)
-          Skia.translate(-module.xPos, -module.yPos)
+          SkiaRenderer.translate(renderX, renderY)
+          SkiaRenderer.scale(finalScale, finalScale)
+          SkiaRenderer.translate(-module.xPos, -module.yPos)
 
           module.renderComponent()
 
-          Skia.pop()
+          SkiaRenderer.pop()
         }
     }
   }

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

@@ -7,10 +7,14 @@ import org.cobalt.event.annotation.SubscribeEvent
 import org.cobalt.event.impl.WorldEvent
 import org.cobalt.module.Module
 import org.cobalt.module.ModuleCategory
-import org.cobalt.ui.component.setting.impl.*
-import org.cobalt.util.KeybindUtils
-import org.cobalt.util.MouseUtils
-import org.cobalt.util.helper.Clock
+import org.cobalt.ui.component.setting.impl.CheckboxSetting
+import org.cobalt.ui.component.setting.impl.KeyBindSetting
+import org.cobalt.ui.component.setting.impl.ModeSetting
+import org.cobalt.ui.component.setting.impl.SliderSetting
+import org.cobalt.ui.component.setting.impl.TextSetting
+import org.cobalt.util.input.Keyboard
+import org.cobalt.util.input.Mouse
+import org.cobalt.util.scheduling.Clock
 
 object AutoClicker : Module(
   name = "AutoClicker",
@@ -80,18 +84,18 @@ object AutoClicker : Module(
 
     if (
       leftClickDelay.passed() &&
-      KeybindUtils.isKeyDown(leftClickKeybind) &&
+      Keyboard.isKeyDown(leftClickKeybind) &&
       canLeftClick()
     ) {
-      MouseUtils.leftClick()
+      Mouse.leftClick()
       leftClickDelay.schedule(nextDelay(leftClickCps))
     }
 
     if (
       rightClickDelay.passed() &&
-      KeybindUtils.isKeyDown(rightClickKeybind)
+      Keyboard.isKeyDown(rightClickKeybind)
     ) {
-      KeybindUtils.press(minecraft.options.keyUse)
+      Keyboard.press(minecraft.options.keyUse)
       rightClickDelay.schedule(nextDelay(rightClickCps))
     }
   }

src/main/kotlin/org/cobalt/module/impl/misc/AutoHarp.kt

@@ -8,8 +8,8 @@ import org.cobalt.event.annotation.SubscribeEvent
 import org.cobalt.event.impl.TickEvent
 import org.cobalt.module.Module
 import org.cobalt.module.ModuleCategory
-import org.cobalt.util.InventoryUtils
-import org.cobalt.util.MouseButton
+import org.cobalt.util.input.MouseButton
+import org.cobalt.util.inventory.InventoryUtils
 
 object AutoHarp : Module(
   name = "AutoHarp",

src/main/kotlin/org/cobalt/module/impl/misc/Rotations.kt

@@ -10,12 +10,12 @@ import org.cobalt.event.impl.WorldEvent
 import org.cobalt.module.Module
 import org.cobalt.module.ModuleCategory
 import org.cobalt.ui.component.setting.impl.SliderSetting
-import org.cobalt.util.MouseMode
-import org.cobalt.util.MouseUtils
-import org.cobalt.util.PlayerUtils
-import org.cobalt.util.RotationUtils
-import org.cobalt.util.rotation.Rotation
-import org.cobalt.util.rotation.RotationTarget
+import org.cobalt.util.client.PlayerUtils
+import org.cobalt.util.input.Mouse
+import org.cobalt.util.input.MouseMode
+import org.cobalt.util.rotation.RotationMath
+import org.cobalt.util.rotation.data.Rotation
+import org.cobalt.util.rotation.data.RotationTarget
 
 object Rotations : Module(
   name = "Rotations",
@@ -91,8 +91,8 @@ object Rotations : Module(
     lastFrameMs = System.currentTimeMillis()
     running = true
 
-    if (MouseUtils.mouseMode == MouseMode.DEFAULT) {
-      MouseUtils.mouseMode = MouseMode.LOCK_MOUSE
+    if (Mouse.mouseMode == MouseMode.DEFAULT) {
+      Mouse.mouseMode = MouseMode.LOCK_MOUSE
       returnMouseMode = true
     }
   }
@@ -102,8 +102,8 @@ object Rotations : Module(
     target = rotationTarget
     running = true
 
-    if (MouseUtils.mouseMode == MouseMode.DEFAULT) {
-      MouseUtils.mouseMode = MouseMode.LOCK_MOUSE
+    if (Mouse.mouseMode == MouseMode.DEFAULT) {
+      Mouse.mouseMode = MouseMode.LOCK_MOUSE
       returnMouseMode = true
     }
   }
@@ -113,7 +113,7 @@ object Rotations : Module(
     target = null
 
     if (returnMouseMode) {
-      MouseUtils.mouseMode = MouseMode.DEFAULT
+      Mouse.mouseMode = MouseMode.DEFAULT
       returnMouseMode = false
     }
   }
@@ -140,7 +140,7 @@ object Rotations : Module(
   }
 
   private fun handleRotate(current: Rotation, target: Rotation, deltaTime: Float) {
-    if (RotationUtils.approximatelyEquals(current, target, endTolerance.toFloat())) {
+    if (RotationMath.approximatelyEquals(current, target, endTolerance.toFloat())) {
       stop()
       return
     }
@@ -157,12 +157,12 @@ object Rotations : Module(
   }
 
   private fun handleTrack(current: Rotation, target: Rotation, deltaTime: Float) {
-    if (RotationUtils.approximatelyEquals(current, target, endTolerance.toFloat())) {
+    if (RotationMath.approximatelyEquals(current, target, endTolerance.toFloat())) {
       return
     }
 
-    var needYaw = RotationUtils.angleDifference(target.yaw, current.yaw)
-    var needPitch = RotationUtils.angleDifference(target.pitch, current.pitch)
+    var needYaw = RotationMath.angleDifference(target.yaw, current.yaw)
+    var needPitch = RotationMath.angleDifference(target.pitch, current.pitch)
     val distance = abs(needYaw) + abs(needPitch)
 
     val randomFactor = (0.8f + Random.nextFloat() * 0.4f)