Returnable events and cleanup

Avanatiker · Avanatiker · commit b4bbaa2dfe92 · 2024-03-24T07:39:43.000+01:00
diff --git a/common/src/main/java/com/lambda/mixin/GameRendererMixin.java b/common/src/main/java/com/lambda/mixin/GameRendererMixin.java
diff --git a/common/src/main/java/com/lambda/mixin/entity/PlayerEntityMixin.java b/common/src/main/java/com/lambda/mixin/entity/PlayerEntityMixin.java
@@ -1,4 +1,4 @@
-package com.lambda.mixin;
+package com.lambda.mixin.entity;
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.MovementEvent;
@@ -12,8 +12,8 @@
 public class PlayerEntityMixin {
     @Inject(method = "clipAtLedge", at = @At(value = "HEAD"), cancellable = true)
     private void injectSafeWalk(CallbackInfoReturnable<Boolean> cir) {
-        if (EventFlow.post(new MovementEvent.ClipAtLedge()).isCanceled()) {
-            cir.setReturnValue(true);
-        }
+        MovementEvent.ClipAtLedge event = new MovementEvent.ClipAtLedge(cir.getReturnValueZ());
+        EventFlow.post(event);
+        cir.setReturnValue(event.getReturnValue());
     }
 }
diff --git a/common/src/main/java/com/lambda/mixin/input/KeyBindingMixin.java b/common/src/main/java/com/lambda/mixin/input/KeyBindingMixin.java
@@ -1,4 +1,4 @@
-package com.lambda.mixin;
+package com.lambda.mixin.input;
 
 import com.lambda.module.modules.movement.Sprint;
 import net.minecraft.client.option.KeyBinding;
diff --git a/common/src/main/java/com/lambda/mixin/input/KeyboardInputMixin.java b/common/src/main/java/com/lambda/mixin/input/KeyboardInputMixin.java
diff --git a/common/src/main/java/com/lambda/mixin/input/KeyboardMixin.java b/common/src/main/java/com/lambda/mixin/input/KeyboardMixin.java
@@ -1,4 +1,4 @@
-package com.lambda.mixin;
+package com.lambda.mixin.input;
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.KeyPressEvent;
diff --git a/common/src/main/java/com/lambda/mixin/render/ChatInputSuggestorMixin.java b/common/src/main/java/com/lambda/mixin/render/ChatInputSuggestorMixin.java
@@ -1,4 +1,4 @@
-package com.lambda.mixin;
+package com.lambda.mixin.render;
 
 import com.lambda.command.CommandManager;
 import com.mojang.brigadier.CommandDispatcher;
diff --git a/common/src/main/java/com/lambda/mixin/render/ChatScreenMixin.java b/common/src/main/java/com/lambda/mixin/render/ChatScreenMixin.java
@@ -1,4 +1,4 @@
-package com.lambda.mixin;
+package com.lambda.mixin.render;
 
 import com.lambda.command.CommandManager;
 import net.minecraft.client.gui.screen.ChatScreen;
diff --git a/common/src/main/java/com/lambda/mixin/render/DebugHudMixin.java b/common/src/main/java/com/lambda/mixin/render/DebugHudMixin.java
@@ -1,4 +1,4 @@
-package com.lambda.mixin;
+package com.lambda.mixin.render;
 
 import com.lambda.util.DebugInfoHud;
 import net.minecraft.client.gui.hud.DebugHud;
diff --git a/common/src/main/java/com/lambda/mixin/render/GameRendererMixin.java b/common/src/main/java/com/lambda/mixin/render/GameRendererMixin.java
@@ -1,5 +1,8 @@
 package com.lambda.mixin.render;
 
+import com.lambda.event.EventFlow;
+import com.lambda.event.events.RenderEvent;
+import com.lambda.interaction.RotationManager;
 import com.lambda.module.modules.player.Freecam;
 import net.minecraft.client.render.GameRenderer;
 import org.spongepowered.asm.mixin.Mixin;
@@ -11,9 +14,8 @@
 public class GameRendererMixin {
     @Inject(method = "updateTargetedEntity", at = @At("HEAD"), cancellable = true)
     private void updateTargetedEntityInvoke(float tickDelta, CallbackInfo info) {
-        if (!Freecam.INSTANCE.isEnabled()) return;
-
-        info.cancel();
-        Freecam.updateTarget();
+        if (EventFlow.post(new RenderEvent.UpdateTarget()).isCanceled()) {
+            info.cancel();
+        }
     }
 }
diff --git a/common/src/main/kotlin/com/lambda/command/LambdaCommand.kt b/common/src/main/kotlin/com/lambda/command/LambdaCommand.kt
@@ -2,4 +2,4 @@ package com.lambda.command
 
 import com.lambda.util.Nameable
 
-abstract class LambdaCommand : Nameable
+interface LambdaCommand : Nameable
diff --git a/common/src/main/kotlin/com/lambda/command/commands/ConfigCommand.kt b/common/src/main/kotlin/com/lambda/command/commands/ConfigCommand.kt
@@ -12,7 +12,7 @@ import com.lambda.command.CommandManager.register
 import com.lambda.command.LambdaCommand
 import com.lambda.config.Configuration
 
-object ConfigCommand : LambdaCommand() {
+object ConfigCommand : LambdaCommand {
     override val name = "config"
 
     init {
diff --git a/common/src/main/kotlin/com/lambda/command/commands/ModuleCommand.kt b/common/src/main/kotlin/com/lambda/command/commands/ModuleCommand.kt
@@ -17,7 +17,7 @@ import com.lambda.util.StringUtils
 import com.lambda.util.text.*
 import com.lambda.util.text.ClickEvents.suggestCommand
 
-object ModuleCommand : LambdaCommand() {
+object ModuleCommand : LambdaCommand {
     override val name = "module"
 
     init {
diff --git a/common/src/main/kotlin/com/lambda/event/EventFlow.kt b/common/src/main/kotlin/com/lambda/event/EventFlow.kt
@@ -1,11 +1,10 @@
 package com.lambda.event
 
-import com.lambda.Lambda.LOG
-import com.lambda.event.cancellable.Cancellable
-import com.lambda.event.cancellable.ICancellable
+import com.lambda.event.callback.ICancellable
+import com.lambda.event.callback.Returnable
+import com.lambda.event.events.MovementEvent
 import com.lambda.event.listener.Listener
 import com.lambda.threading.runConcurrent
-import com.lambda.util.Communication.info
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -60,8 +59,7 @@ object EventFlow {
      *
      * @param event The [Event] to be posted to the event flow.
      */
-    @JvmStatic
-    fun post(event: Event) {
+    @JvmStatic fun post(event: Event) {
         concurrentFlow.tryEmit(event)
         event.executeListenerSynchronous()
     }
@@ -75,27 +73,36 @@ object EventFlow {
      * This is useful as [ICancellable] [Event]s are often checked after being processed by the [Listener]s.
      *
      * The returned event is guaranteed to be of the same type as the input,
-     * thanks to the type parameter [T] which is a subtype of both [Event] and [ICancellable].
+     * thanks to the type parameter [E] which is a subtype of both [Event] and [ICancellable].
      *
      * @param cancellable The cancellable [Event] to be posted to the event flow.
      * @return The same [ICancellable] [Event] after being processed by the [Listener]s.
      */
-    @JvmStatic
-    fun <T> post(cancellable: T) : T where T : Event, T : ICancellable {
+    @JvmStatic fun <E> post(cancellable: E) : E where E : Event, E : ICancellable {
         post(cancellable as Event)
         return cancellable
     }
 
-    @JvmStatic
-    fun <T> post(cancellable: T, process: T.() -> Unit) where T : Event, T : ICancellable {
-        val event = post(cancellable)
-        process(event)
+    @JvmStatic fun <E> post(cancellable: E, process: E.() -> Unit) where E : Event, E : ICancellable {
+        post(cancellable)
+        cancellable.process()
     }
 
-    @JvmStatic
-    fun <T> postChecked(cancellable: T, process: T.() -> Unit) where T : Event, T : ICancellable {
-        val event = post(cancellable)
-        if (!event.isCanceled()) process(event)
+    @JvmStatic fun <E> postChecked(cancellable: E, process: E.() -> Unit) where E : Event, E : ICancellable {
+        post(cancellable)
+        if (!cancellable.isCanceled()) cancellable.process()
+    }
+
+    @JvmStatic fun <E, R> postR(returnable: E): E where E : Returnable<R>, E : Event {
+        post(returnable as Event)
+        return returnable
+    }
+
+    @JvmStatic fun <R, E> post(
+        returnable: E, process: E.() -> Unit
+    ) where E : Returnable<R>, E : Event {
+        post(returnable as Event)
+        returnable.process()
     }
 
     /**
diff --git a/common/src/main/kotlin/com/lambda/event/callback/Cancellable.kt b/common/src/main/kotlin/com/lambda/event/callback/Cancellable.kt
@@ -1,4 +1,4 @@
-package com.lambda.event.cancellable
+package com.lambda.event.callback
 
 import java.util.concurrent.atomic.AtomicBoolean
 
diff --git a/common/src/main/kotlin/com/lambda/event/callback/ICancellable.kt b/common/src/main/kotlin/com/lambda/event/callback/ICancellable.kt
@@ -1,4 +1,4 @@
-package com.lambda.event.cancellable
+package com.lambda.event.callback
 
 import com.lambda.event.CallbackEvent
 import java.util.concurrent.atomic.AtomicBoolean
diff --git a/common/src/main/kotlin/com/lambda/event/callback/IReturnable.kt b/common/src/main/kotlin/com/lambda/event/callback/IReturnable.kt
@@ -0,0 +1,5 @@
+package com.lambda.event.callback
+
+interface IReturnable<T> {
+    var returnValue: T
+}
diff --git a/common/src/main/kotlin/com/lambda/event/callback/Returnable.kt b/common/src/main/kotlin/com/lambda/event/callback/Returnable.kt
@@ -0,0 +1,7 @@
+package com.lambda.event.callback
+
+open class Returnable<T>(
+    val defaultValue: T
+) : IReturnable<T> {
+    override var returnValue: T = defaultValue
+}
diff --git a/common/src/main/kotlin/com/lambda/event/events/InputEvent.kt b/common/src/main/kotlin/com/lambda/event/events/InputEvent.kt
diff --git a/common/src/main/kotlin/com/lambda/event/events/KeyPressEvent.kt b/common/src/main/kotlin/com/lambda/event/events/KeyPressEvent.kt
@@ -1,8 +1,8 @@
 package com.lambda.event.events
 
 import com.lambda.event.EventFlow
-import com.lambda.event.cancellable.Cancellable
-import com.lambda.event.cancellable.ICancellable
+import com.lambda.event.callback.Cancellable
+import com.lambda.event.callback.ICancellable
 
 /**
  * A class representing a [KeyPressEvent] in the event system ([EventFlow]).
diff --git a/common/src/main/kotlin/com/lambda/event/events/MovementEvent.kt b/common/src/main/kotlin/com/lambda/event/events/MovementEvent.kt
@@ -1,8 +1,10 @@
 package com.lambda.event.events
 
 import com.lambda.event.Event
-import com.lambda.event.cancellable.Cancellable
-import com.lambda.event.cancellable.ICancellable
+import com.lambda.event.callback.Cancellable
+import com.lambda.event.callback.ICancellable
+import com.lambda.event.callback.IReturnable
+import com.lambda.event.callback.Returnable
 import net.minecraft.client.input.Input
 
 abstract class MovementEvent : Event {
@@ -13,7 +15,9 @@ abstract class MovementEvent : Event {
         val slowDown: Boolean,
         val slowDownFactor: Float
     ) : MovementEvent(), ICancellable by Cancellable()
-    class ClipAtLedge : MovementEvent(), ICancellable by Cancellable()
+    class ClipAtLedge(
+        var defaultValue: Boolean
+    ) : MovementEvent(), IReturnable<Boolean> by Returnable(defaultValue)
     class Jump(var height: Double) : MovementEvent(), ICancellable by Cancellable()
     class SlowDown : Event, ICancellable by Cancellable()
 }
diff --git a/common/src/main/kotlin/com/lambda/event/events/PacketEvent.kt b/common/src/main/kotlin/com/lambda/event/events/PacketEvent.kt
@@ -2,8 +2,8 @@ package com.lambda.event.events
 
 import com.lambda.event.Event
 import com.lambda.event.EventFlow
-import com.lambda.event.cancellable.Cancellable
-import com.lambda.event.cancellable.ICancellable
+import com.lambda.event.callback.Cancellable
+import com.lambda.event.callback.ICancellable
 import com.lambda.event.events.PacketEvent.Receive
 import com.lambda.event.events.PacketEvent.Send
 import net.minecraft.network.packet.Packet
diff --git a/common/src/main/kotlin/com/lambda/event/events/PlayerPacketEvent.kt b/common/src/main/kotlin/com/lambda/event/events/PlayerPacketEvent.kt
@@ -1,8 +1,8 @@
 package com.lambda.event.events
 
 import com.lambda.event.Event
-import com.lambda.event.cancellable.Cancellable
-import com.lambda.event.cancellable.ICancellable
+import com.lambda.event.callback.Cancellable
+import com.lambda.event.callback.ICancellable
 import com.lambda.interaction.rotation.Rotation
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket
 import net.minecraft.util.math.Vec3d
diff --git a/common/src/main/kotlin/com/lambda/event/events/RenderEvent.kt b/common/src/main/kotlin/com/lambda/event/events/RenderEvent.kt
@@ -0,0 +1,9 @@
+package com.lambda.event.events
+
+import com.lambda.event.Event
+import com.lambda.event.callback.Cancellable
+import com.lambda.event.callback.ICancellable
+
+abstract class RenderEvent : Event {
+    class UpdateTarget : RenderEvent(), ICancellable by Cancellable()
+}
diff --git a/common/src/main/kotlin/com/lambda/event/events/RotationEvent.kt b/common/src/main/kotlin/com/lambda/event/events/RotationEvent.kt
@@ -1,8 +1,8 @@
 package com.lambda.event.events
 
 import com.lambda.event.Event
-import com.lambda.event.cancellable.Cancellable
-import com.lambda.event.cancellable.ICancellable
+import com.lambda.event.callback.Cancellable
+import com.lambda.event.callback.ICancellable
 import com.lambda.interaction.InteractionConfig
 import com.lambda.interaction.RotationManager
 import com.lambda.interaction.rotation.IRotationConfig
diff --git a/common/src/main/kotlin/com/lambda/interaction/RotationManager.kt b/common/src/main/kotlin/com/lambda/interaction/RotationManager.kt
@@ -43,18 +43,6 @@ object RotationManager : Loadable {
             }
         }
 
-    @JvmStatic
-    fun updateInterpolated() = runSafe {
-        if (currentRequest == null) return@runSafe
-        if (currentRequest?.config?.rotationMode != RotationMode.LOCK) return@runSafe
-        val interpolation = prevRotation.interpolate(currentRotation, mc.tickDelta.toDouble())
-
-//        val rot = interpolation.fixSensitivity(prevRotation)
-
-        player.yaw = interpolation.yaw.toFloat()
-        player.pitch = interpolation.pitch.toFloat()
-    }
-
     init {
         listener<PacketEvent.Send.Post> { event ->
             val packet = event.packet
@@ -65,6 +53,17 @@ object RotationManager : Loadable {
             }
         }
 
+        listener<RenderEvent.UpdateTarget> {
+            if (currentRequest == null) return@listener
+            if (currentRequest?.config?.rotationMode != RotationMode.LOCK) return@listener
+            val interpolation = prevRotation.interpolate(currentRotation, mc.tickDelta.toDouble())
+
+//        val rot = interpolation.fixSensitivity(prevRotation)
+
+            player.yaw = interpolation.yaw.toFloat()
+            player.pitch = interpolation.pitch.toFloat()
+        }
+
         unsafeListener<ConnectionEvent.Disconnect> {
             reset(Rotation.ZERO)
         }
diff --git a/common/src/main/kotlin/com/lambda/module/modules/movement/RocketExtend.kt b/common/src/main/kotlin/com/lambda/module/modules/movement/RocketExtend.kt
@@ -14,8 +14,7 @@ import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket
 object RocketExtend : Module(
     name = "RocketExtend",
     description = "Extends rocket length on grim",
-    defaultTags = setOf(ModuleTag.MOVEMENT),
-    defaultKeybind = KeyCode.GraveAccent
+    defaultTags = setOf(ModuleTag.MOVEMENT)
 ) {
     private var extendedRockets = mutableListOf<FireworkRocketEntity>()
     private var pingPacket: CommonPongC2SPacket? = null
@@ -30,7 +29,7 @@ object RocketExtend : Module(
                 val rockets = event.packet.entityIds.map(world::getEntityById)
                     .filter { it is FireworkRocketEntity && it.shooter == player }
                     .mapNotNull { it as? FireworkRocketEntity }
-                    .also { event.packet.entityIds.removeAll(it.map(FireworkRocketEntity::getId)) }
+                    .also { event.packet.entityIds.removeAll(it.map(FireworkRocketEntity::getId).toSet()) }
                 extendedRockets.addAll(rockets)
             }
         }
@@ -41,7 +40,7 @@ object RocketExtend : Module(
                 lastPingTime = System.currentTimeMillis()
                 return@listener
             }
-            if(System.currentTimeMillis() - lastPingTime > keepAliveTime * 1000) {
+            if (System.currentTimeMillis() - lastPingTime > keepAliveTime * 1000) {
                 reset()
                 return@listener
             }
diff --git a/common/src/main/kotlin/com/lambda/module/modules/movement/SafeWalk.kt b/common/src/main/kotlin/com/lambda/module/modules/movement/SafeWalk.kt
diff --git a/common/src/main/kotlin/com/lambda/module/modules/player/Freecam.kt b/common/src/main/kotlin/com/lambda/module/modules/player/Freecam.kt
diff --git a/common/src/main/resources/lambda.mixins.common.json b/common/src/main/resources/lambda.mixins.common.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.lambda.mixin;`
	`1`	`+package com.lambda.mixin.input;`
`2`	`2`
`3`	`3`	`import com.lambda.module.modules.movement.Sprint;`
`4`	`4`	`import net.minecraft.client.option.KeyBinding;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.lambda.mixin;`
	`1`	`+package com.lambda.mixin.render;`
`2`	`2`
`3`	`3`	`import com.lambda.command.CommandManager;`
`4`	`4`	`import com.mojang.brigadier.CommandDispatcher;`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ package com.lambda.command`
`2`	`2`
`3`	`3`	`import com.lambda.util.Nameable`
`4`	`4`
`5`		`-abstract class LambdaCommand : Nameable`
	`5`	`+interface LambdaCommand : Nameable`