Synchronous indirect task tree traversal

Author: Avanatiker

common/src/main/java/com/lambda/mixin/world/ClientWorldMixin.java

@@ -0,0 +1,18 @@
+package com.lambda.mixin.world;
+
+import com.lambda.event.EventFlow;
+import com.lambda.event.events.WorldEvent;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.entity.Entity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(ClientWorld.class)
+public class ClientWorldMixin {
+    @Inject(method = "addEntity", at = @At("HEAD"), cancellable = true)
+    private void addEntity(Entity entity, CallbackInfo ci) {
+        if (EventFlow.post(new WorldEvent.EntitySpawn(entity)).isCanceled()) ci.cancel();
+    }
+}

common/src/main/kotlin/com/lambda/core/Loader.kt

@@ -10,7 +10,6 @@ import com.lambda.interaction.PlayerPacketManager
 import com.lambda.interaction.RotationManager
 import com.lambda.module.ModuleRegistry
 import com.lambda.sound.SoundRegistry
-import com.lambda.task.TaskRegistry
 import com.lambda.util.Communication.ascii
 import kotlin.system.measureTimeMillis
 
@@ -42,7 +41,5 @@ object Loader {
         }
 
         LOG.info("${Lambda.MOD_NAME} ${Lambda.VERSION} was successfully initialized (${initTime}ms)")
-
-        TaskRegistry
     }
 }

common/src/main/kotlin/com/lambda/event/events/RotationEvent.kt

@@ -10,6 +10,7 @@ import com.lambda.interaction.rotation.RotationContext
 import com.lambda.interaction.visibilty.VisibilityChecker.findRotation
 import com.lambda.module.modules.client.TaskFlow
 import com.lambda.threading.runSafe
+import com.lambda.util.BlockUtils.blockState
 import com.lambda.util.world.raycast.RayCastUtils.blockResult
 import com.lambda.util.world.raycast.RayCastUtils.entityResult
 import net.minecraft.entity.Entity
@@ -55,7 +56,7 @@ abstract class RotationEvent : Event {
             interactionConfig: InteractionConfig = TaskFlow.interactionSettings,
             sides: Set<Direction> = emptySet()
         ) = runSafe {
-            val state = world.getBlockState(blockPos)
+            val state = blockPos.blockState(world)
             val voxelShape = state.getOutlineShape(world, blockPos)
             val boundingBoxes = voxelShape.boundingBoxes.map { it.offset(blockPos) }
             findRotation(rotationConfig, interactionConfig, boundingBoxes, sides) {

common/src/main/kotlin/com/lambda/event/events/WorldEvent.kt

@@ -0,0 +1,12 @@
+package com.lambda.event.events
+
+import com.lambda.event.Event
+import com.lambda.event.callback.Cancellable
+import com.lambda.event.callback.ICancellable
+import net.minecraft.entity.Entity
+
+abstract class WorldEvent : Event {
+    class EntitySpawn(
+        val entity: Entity
+    ) : WorldEvent(), ICancellable by Cancellable()
+}

common/src/main/kotlin/com/lambda/event/listener/SafeListener.kt

@@ -126,7 +126,7 @@ class SafeListener(
             noinline function: SafeContext.(T) -> Unit,
         ): SafeListener {
             val listener = SafeListener(priority, this, alwaysListen) { event ->
-                function(event as T)
+                function(event as T) // ToDo: run function always on game thread
             }
 
             syncListeners.subscribe<T>(listener)

common/src/main/kotlin/com/lambda/interaction/construction/Blueprint.kt

@@ -3,6 +3,7 @@ package com.lambda.interaction.construction
 import com.lambda.context.SafeContext
 import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.util.BlockUtils.blockPos
+import com.lambda.util.BlockUtils.blockState
 import com.lambda.util.primitives.extension.Structure
 import net.minecraft.structure.StructureTemplate
 import net.minecraft.util.math.BlockBox
@@ -12,10 +13,10 @@ import net.minecraft.util.math.Box
 abstract class Blueprint {
     abstract val structure: Structure
 
-    fun isDone(safeContext: SafeContext) =
+    open fun isDone(safeContext: SafeContext) =
         structure.all { (pos, targetState) ->
             with(safeContext) {
-                targetState.matches(world.getBlockState(pos), pos, world)
+                targetState.matches(pos.blockState(world), pos, world)
             }
         }
 

common/src/main/kotlin/com/lambda/interaction/construction/context/BreakContext.kt

@@ -24,9 +24,7 @@ data class BreakContext(
 
     override fun compareTo(other: ComparableContext): Int {
         return when (other) {
-            is BreakContext -> compareByDescending<BreakContext> {
-                it.exposedSides
-            }.thenBy {
+            is BreakContext -> compareBy<BreakContext> {
                 it.distance
             }.compare(this, other)
             else -> 1

common/src/main/kotlin/com/lambda/interaction/construction/result/BreakResult.kt

@@ -1,8 +1,7 @@
 package com.lambda.interaction.construction.result
 
 import com.lambda.interaction.construction.context.BreakContext
-import com.lambda.task.buildChain
-import com.lambda.task.tasks.BreakBlock.Companion.breakBlock
+import com.lambda.task.tasks.BreakBlock.Companion.uncheckedBreak
 
 sealed class BreakResult : BuildResult() {
 
@@ -13,9 +12,7 @@ sealed class BreakResult : BuildResult() {
     data class Success(val context: BreakContext) : Resolvable, BreakResult() {
         override val rank = Rank.BREAK_SUCCESS
 
-        override val resolve = buildChain {
-            breakBlock(context.hitPos)
-        }
+        override val resolve = uncheckedBreak(context.hitPos)
 
         override fun compareTo(other: ComparableResult<Rank>): Int {
             return when (other) {

common/src/main/kotlin/com/lambda/interaction/construction/result/Resolvable.kt

@@ -1,7 +1,7 @@
 package com.lambda.interaction.construction.result
 
-import com.lambda.task.TaskChain
+import com.lambda.task.Task
 
 interface Resolvable {
-    val resolve: TaskChain
+    val resolve: Task<*>
 }

common/src/main/kotlin/com/lambda/interaction/construction/verify/TargetState.kt

@@ -1,5 +1,6 @@
 package com.lambda.interaction.construction.verify
 
+import com.lambda.util.BlockUtils.blockState
 import com.lambda.util.item.ItemUtils.block
 import net.minecraft.block.BlockState
 import net.minecraft.client.world.ClientWorld
@@ -23,7 +24,7 @@ sealed class TargetState : StateMatcher {
     }
     data class Support(val direction: Direction) : TargetState() {
         override fun matches(state: BlockState, pos: BlockPos, world: ClientWorld) =
-            world.getBlockState(pos.offset(direction)).isSolidBlock(world, pos.offset(direction))
+            pos.offset(direction).blockState(world).isSolidBlock(world, pos.offset(direction))
 
         override fun getStack(world: ClientWorld, pos: BlockPos) =
             ItemStack(Items.NETHERRACK)