Merge pull request #7 from Avanatiker/feature/taskflow

TaskFlow

Author: Avanatiker

common/build.gradle.kts

@@ -27,6 +27,12 @@ dependencies {
     implementation(kotlin("reflect"))
 
     // Baritone
-    modImplementation("baritone-api:baritone-api:1.10.2")
+//    modImplementation("baritone-api:baritone-api:1.10.2")
     modImplementation("baritone-api:baritone-unoptimized-fabric:1.10.2")
+
+    testImplementation(kotlin("test"))
+}
+
+tasks.test {
+    useJUnitPlatform()
 }

common/src/main/java/com/lambda/mixin/MinecraftClientMixin.java

@@ -3,18 +3,27 @@
 import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.ClientEvent;
+import com.lambda.event.events.ScreenEvent;
+import com.lambda.event.events.ScreenHandlerEvent;
 import com.lambda.event.events.TickEvent;
 import com.lambda.module.modules.player.Interact;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(MinecraftClient.class)
 public class MinecraftClientMixin {
+    @Shadow @Nullable public Screen currentScreen;
+
     @Inject(method = "tick", at = @At("HEAD"))
     void onTickPre(CallbackInfo ci) {
         EventFlow.post(new TickEvent.Pre());
@@ -38,6 +47,26 @@ private void onStartup(CallbackInfo ci) {
         EventFlow.post(new ClientEvent.Startup());
     }
 
+    @Inject(method = "setScreen", at = @At("HEAD"))
+    private void onScreenOpen(@Nullable Screen screen, CallbackInfo ci) {
+        if (screen == null) return;
+        if (screen instanceof ScreenHandlerProvider<?> handledScreen) {
+            EventFlow.post(new ScreenHandlerEvent.Open<>(handledScreen.getScreenHandler()));
+        }
+
+        EventFlow.post(new ScreenEvent.Open<>(screen));
+    }
+
+    @Inject(method = "setScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;removed()V", shift = At.Shift.AFTER))
+    private void onScreenRemove(@Nullable Screen screen, CallbackInfo ci) {
+        if (currentScreen == null) return;
+        if (currentScreen instanceof ScreenHandlerProvider<?> handledScreen) {
+            EventFlow.post(new ScreenHandlerEvent.Close<>(handledScreen.getScreenHandler()));
+        }
+
+        EventFlow.post(new ScreenEvent.Close<>(currentScreen));
+    }
+
     @Redirect(method = "doItemUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;isBreakingBlock()Z"))
     boolean injectMultiActon(ClientPlayerInteractionManager instance) {
         if (instance == null) return true;

common/src/main/java/com/lambda/mixin/baritone/MixinBaritonePlayerContext.java

@@ -24,6 +24,8 @@ void syncRotationWithBaritone(CallbackInfoReturnable<Rotation> cir) {
         if (baritone != BaritoneUtils.getPrimary()) return;
 
         RotationManager rm = RotationManager.INSTANCE;
-        cir.setReturnValue(new Rotation((float) rm.getCurrentRotation().getYaw(), (float) rm.getCurrentRotation().getPitch()));
+        cir.setReturnValue(new Rotation(
+                (float) rm.getCurrentRotation().getYaw(), (float) rm.getCurrentRotation().getPitch())
+        );
     }
 }

common/src/main/java/com/lambda/mixin/entity/ClientPlayInteractionManagerMixin.java

@@ -0,0 +1,30 @@
+package com.lambda.mixin.entity;
+
+import com.lambda.event.EventFlow;
+import com.lambda.event.events.InteractionEvent;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.network.ClientPlayerInteractionManager;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(ClientPlayerInteractionManager.class)
+public class ClientPlayInteractionManagerMixin {
+
+    @Final
+    @Shadow
+    private MinecraftClient client;
+
+    @Inject(method = "interactBlock", at = @At("HEAD"))
+    public void interactBlockHead(final ClientPlayerEntity player, final Hand hand, final BlockHitResult hitResult, final CallbackInfoReturnable<ActionResult> cir) {
+        if (client.world == null) return;
+        EventFlow.post(new InteractionEvent.Block(client.world, hitResult));
+    }
+}

common/src/main/java/com/lambda/mixin/render/DebugHudMixin.java

@@ -1,5 +1,6 @@
 package com.lambda.mixin.render;
 
+import com.lambda.task.RootTask;
 import com.lambda.util.DebugInfoHud;
 import net.minecraft.client.gui.hud.DebugHud;
 import org.spongepowered.asm.mixin.Mixin;
@@ -15,4 +16,9 @@ public class DebugHudMixin {
     private void onGetRightText(CallbackInfoReturnable<List<String>> cir) {
         DebugInfoHud.addDebugInfo(cir.getReturnValue());
     }
+
+    @Inject(method = "getLeftText", at = @At(value = "TAIL"))
+    private void onGetLeftText(CallbackInfoReturnable<List<String>> cir) {
+        RootTask.INSTANCE.addInfo(cir.getReturnValue());
+    }
 }

common/src/main/java/com/lambda/mixin/render/ScreenHandlerMixin.java

@@ -0,0 +1,21 @@
+package com.lambda.mixin.render;
+
+import com.lambda.event.EventFlow;
+import com.lambda.event.events.ScreenEvent;
+import com.lambda.event.events.ScreenHandlerEvent;
+import net.minecraft.item.ItemStack;
+import net.minecraft.screen.ScreenHandler;
+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;
+
+import java.util.List;
+
+@Mixin(ScreenHandler.class)
+public class ScreenHandlerMixin {
+    @Inject(method = "updateSlotStacks", at = @At("TAIL"))
+    private void onUpdateSlotStacksHead(int revision, List<ItemStack> stacks, ItemStack cursorStack, CallbackInfo ci) {
+        EventFlow.post(new ScreenHandlerEvent.Loaded(revision, stacks, cursorStack));
+    }
+}

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

@@ -4,6 +4,7 @@
 import com.lambda.event.events.WorldEvent;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.world.ClientWorld;
+import net.minecraft.entity.Entity;
 import net.minecraft.util.math.BlockPos;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -18,4 +19,9 @@ private void handleBlockUpdateInject(BlockPos pos, BlockState state, int flags,
             ci.cancel();
         }
     }
-}
+
+    @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/brigadier/argument/ItemArguments.kt

@@ -0,0 +1,106 @@
+/*
+ * Copyright 2023 The Quilt Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Preserve binary compatibility when moving extensions between files
+ */
+@file:JvmMultifileClass
+@file:JvmName("ArgumentsKt")
+
+package com.lambda.brigadier.argument
+
+
+import com.lambda.brigadier.*
+import com.lambda.brigadier.assumeSourceNotUsed
+import net.minecraft.command.CommandRegistryAccess
+import net.minecraft.command.argument.ItemPredicateArgumentType
+import net.minecraft.command.argument.ItemSlotArgumentType
+import net.minecraft.command.argument.ItemStackArgument
+import net.minecraft.command.argument.ItemStackArgumentType
+import net.minecraft.item.ItemStack
+import java.util.function.Predicate
+
+/**
+ * Reads the [ItemStack] predicate value from the
+ * argument in the receiver [ArgumentReader].
+ *
+ * @see ItemPredicateArgumentType.getItemPredicate
+ */
+@JvmName("valueItemPredicateArg")
+@BrigadierDsl
+fun DefaultArgumentReader<ItemPredicateArgumentType>.value(): Predicate<ItemStack> {
+    return ItemPredicateArgumentType.getItemStackPredicate(context.assumeSourceNotUsed(), name)
+}
+
+/**
+ * Reads the integer value from the
+ * argument in the receiver [ArgumentReader].
+ *
+ * @see ItemSlotArgumentType.getItemSlot
+ */
+@JvmName("valueItemSlotArg")
+@BrigadierDsl
+fun DefaultArgumentReader<ItemSlotArgumentType>.value(): Int {
+    return ItemSlotArgumentType.getItemSlot(context.assumeSourceNotUsed(), name)
+}
+
+/**
+ * Reads the [ItemStackArgument] value from the
+ * argument in the receiver [ArgumentReader].
+ *
+ * @see ItemStackArgumentType.getItemStackArgument
+ */
+@JvmName("valueItemStackArg")
+@BrigadierDsl
+fun DefaultArgumentReader<ItemStackArgumentType>.value(): ItemStackArgument {
+    return ItemStackArgumentType.getItemStackArgument(context, name)
+}
+
+/**
+ * Creates an item predicate argument with [name] as the parameter name.
+ *
+ * @param context The command build context
+ */
+@BrigadierDsl
+fun <S> itemPredicate(
+    name: String,
+    context: CommandRegistryAccess
+): DefaultArgumentConstructor<S, ItemPredicateArgumentType> {
+    return argument(name, ItemPredicateArgumentType.itemPredicate(context))
+}
+
+/**
+ * Creates an item slot argument with [name] as the parameter name.
+ */
+@BrigadierDsl
+fun <S> itemSlot(
+    name: String
+): DefaultArgumentConstructor<S, ItemSlotArgumentType> {
+    return argument(name, ItemSlotArgumentType.itemSlot())
+}
+
+/**
+ * Creates an item stack argument with [name] as the parameter name.
+ *
+ * @param context The command build context
+ */
+@BrigadierDsl
+fun <S> itemStack(
+    name: String,
+    context: CommandRegistryAccess
+): DefaultArgumentConstructor<S, ItemStackArgumentType> {
+    return argument(name, ItemStackArgumentType.itemStack(context))
+}

common/src/main/kotlin/com/lambda/command/LambdaCommand.kt

@@ -4,14 +4,21 @@ import com.lambda.command.CommandManager.dispatcher
 import com.lambda.util.Nameable
 import com.lambda.util.primitives.extension.CommandBuilder
 import com.mojang.brigadier.builder.LiteralArgumentBuilder
+import net.minecraft.command.CommandRegistryAccess
 import net.minecraft.command.CommandSource
+import net.minecraft.registry.BuiltinRegistries
+import net.minecraft.server.command.CommandManager
 
 abstract class LambdaCommand(
     final override val name: String,
     val aliases: Set<String> = emptySet(),
     val usage: String = "",
     val description: String = "",
 ) : Nameable {
+    val registry: CommandRegistryAccess by lazy {
+        CommandManager.createRegistryAccess(BuiltinRegistries.createWrapperLookup())
+    }
+
     // ToDo: Include usage and description in the help command
     init {
         (listOf(name) + aliases).forEach {

common/src/main/kotlin/com/lambda/command/commands/ConfigCommand.kt

@@ -1,6 +1,5 @@
 package com.lambda.command.commands
 
-import com.lambda.brigadier.CommandResult.Companion.failure
 import com.lambda.brigadier.CommandResult.Companion.success
 import com.lambda.brigadier.argument.literal
 import com.lambda.brigadier.executeWithResult
@@ -20,19 +19,17 @@ object ConfigCommand : LambdaCommand(
         required(literal("save")) {
             executeWithResult {
                 Configuration.configurations.forEach { config ->
-                    config.trySave()?.let { return@executeWithResult failure(it) }
+                    config.trySave(true)
                 }
-
                 this@ConfigCommand.info("Saved ${Configuration.configurations.size} configuration files.")
                 return@executeWithResult success()
             }
         }
         required(literal("load")) {
             executeWithResult {
                 Configuration.configurations.forEach { config ->
-                    config.tryLoad()?.let { return@executeWithResult failure(it) }
+                    config.tryLoad()
                 }
-
                 this@ConfigCommand.info("Loaded ${Configuration.configurations.size} configuration files.")
                 return@executeWithResult success()
             }