Connected values with the speed/timer functions.

CCBlueX · Nov 27, 2020 · be38f77 · be38f77
1 parent d8dfa07
commit be38f77
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/...ain/java/net/ccbluex/liquidbounce/features/module/modules/movement/speeds/other/Matrix.kt b/...ain/java/net/ccbluex/liquidbounce/features/module/modules/movement/speeds/other/Matrix.kt
@@ -5,34 +5,33 @@
  */
 package net.ccbluex.liquidbounce.features.module.modules.movement.speeds.other
 
+import net.ccbluex.liquidbounce.LiquidBounce
 import net.ccbluex.liquidbounce.event.MoveEvent
+import net.ccbluex.liquidbounce.features.module.modules.movement.Speed
 import net.ccbluex.liquidbounce.features.module.modules.movement.speeds.SpeedMode
 import net.ccbluex.liquidbounce.utils.MovementUtils
 
 class Matrix : SpeedMode("Matrix") {
-    override fun onEnable() {
-        mc.timer.timerSpeed = 1.055f
-    }
-
-    override fun onDisable() {
-        mc.thePlayer!!.speedInAir = 0.02f
-        mc.timer.timerSpeed = 1f
-    }
-
-    override fun onMotion() {}
+
     override fun onUpdate() {
         if (mc.thePlayer!!.isInWater) return
         if (MovementUtils.isMoving) {
             if (mc.thePlayer!!.onGround) {
                 mc.thePlayer!!.jump()
-                mc.thePlayer!!.speedInAir = 0.02055f
-                mc.timer.timerSpeed = 1.055f
+                mc.thePlayer!!.speedInAir = (LiquidBounce.moduleManager.getModule(Speed::class.java) as Speed?)!!.matrixSpeedValue.get()
+                mc.timer.timerSpeed = (LiquidBounce.moduleManager.getModule(Speed::class.java) as Speed?)!!.matrixTimerValue.get()
             }    
         } else {
             mc.thePlayer!!.motionX = 0.0
             mc.thePlayer!!.motionZ = 0.0
             mc.timer.timerSpeed = 1f    
         }
-    }  
+    }
+
+    override fun onMotion() {}
     override fun onMove(event: MoveEvent) {}
+    override fun onDisable() {
+        mc.thePlayer!!.speedInAir = 0.02f
+        mc.timer.timerSpeed = 1f
+    }
 }