Merge branch 'master' into refactor/buildscript

Author: Avanatiker

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

@@ -0,0 +1,32 @@
+package com.lambda.mixin;
+
+import com.lambda.command.CommandManager;
+import com.mojang.brigadier.CommandDispatcher;
+import net.minecraft.client.gui.screen.ChatInputSuggestor;
+import net.minecraft.client.gui.widget.TextFieldWidget;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
+import net.minecraft.command.CommandSource;
+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.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(ChatInputSuggestor.class)
+public class ChatInputSuggestorMixin {
+
+    @Shadow
+    @Final
+    TextFieldWidget textField;
+
+    @ModifyVariable(method = "refresh", at = @At(value = "STORE"), index = 3)
+    private boolean refreshModify(boolean showCompletions) {
+        return CommandManager.INSTANCE.isCommand(textField.getText());
+    }
+
+    @Redirect(method = "refresh", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayNetworkHandler;getCommandDispatcher()Lcom/mojang/brigadier/CommandDispatcher;"))
+    private CommandDispatcher<CommandSource> refreshRedirect(ClientPlayNetworkHandler instance) {
+        return CommandManager.INSTANCE.currentDispatcher(textField.getText());
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.lambda.mixin;
+
+import com.lambda.command.CommandManager;
+import net.minecraft.client.gui.screen.ChatScreen;
+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.CallbackInfoReturnable;
+
+@Mixin(ChatScreen.class)
+public abstract class ChatScreenMixin {
+
+    @Inject(method = "sendMessage", at = @At("HEAD"), cancellable = true)
+    void sendMessageInject(String chatText, boolean addToHistory, CallbackInfoReturnable<Boolean> cir) {
+        if (!CommandManager.INSTANCE.isLambdaCommand(chatText)) return;
+        CommandManager.INSTANCE.executeCommand(chatText);
+
+        cir.setReturnValue(true);
+    }
+}

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

@@ -21,9 +21,9 @@ public class ClientConnectionMixin {
 
     @Inject(method = "send(Lnet/minecraft/network/packet/Packet;)V", at = @At("HEAD"), cancellable = true)
     private void sendingPacket(Packet<?> packet, final CallbackInfo callbackInfo) {
-        PacketEvent.Send.Pre event = new PacketEvent.Send.Pre(packet);
-        EventFlow.post(event);
-        if (event.isCanceled()) callbackInfo.cancel();
+        if (EventFlow.post(new PacketEvent.Send.Pre(packet)).isCanceled()) {
+            callbackInfo.cancel();
+        }
     }
 
     @Inject(method = "send(Lnet/minecraft/network/packet/Packet;)V", at = @At("RETURN"))
@@ -38,10 +38,9 @@ private void receivingPacket(
             CallbackInfo callbackInfo
     ) {
         if (side != NetworkSide.CLIENTBOUND) return;
-
-        PacketEvent.Receive.Pre event = new PacketEvent.Receive.Pre(packet);
-        EventFlow.post(event);
-        if (event.isCanceled()) callbackInfo.cancel();
+        if (EventFlow.post(new PacketEvent.Receive.Pre(packet)).isCanceled()) {
+            callbackInfo.cancel();
+        }
     }
 
     @Inject(method = "channelRead0(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/network/packet/Packet;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/ClientConnection;handlePacket(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/listener/PacketListener;)V", shift = At.Shift.AFTER))

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

@@ -1,13 +1,18 @@
 package com.lambda.mixin;
 
+import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.ClientEvent;
 import com.lambda.event.events.TickEvent;
+import com.lambda.module.modules.player.Interact;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientPlayerInteractionManager;
 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.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(MinecraftClient.class)
 public class MinecraftClientMixin {
@@ -23,14 +28,29 @@ void onTickPost(CallbackInfo ci) {
 
     @Inject(at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;info(Ljava/lang/String;)V", shift = At.Shift.AFTER, remap = false), method = "stop")
     private void onShutdown(CallbackInfo ci) {
-        EventFlow.post(ClientEvent.Shutdown.INSTANCE);
+        EventFlow.post(new ClientEvent.Shutdown());
     }
 
     /**
      * Inject after the thread field is set so `ThreadExecutor#getThread` is available
      */
     @Inject(at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;thread:Ljava/lang/Thread;", shift = At.Shift.AFTER, ordinal = 0), method = "run")
     private void onStartup(CallbackInfo ci) {
-        EventFlow.post(ClientEvent.Startup.INSTANCE);
+        EventFlow.post(new ClientEvent.Startup());
+    }
+
+    @Redirect(method = "doItemUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;isBreakingBlock()Z"))
+    boolean injectMultiActon(ClientPlayerInteractionManager instance) {
+        if (instance == null) return true;
+
+        if (Interact.INSTANCE.isEnabled() && Interact.getMultiAction()) return false;
+        return instance.isBreakingBlock();
+    }
+
+    @Inject(method = "doItemUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isRiding()Z"))
+    void injectFastPlace(CallbackInfo ci) {
+        if (!Interact.INSTANCE.isEnabled()) return;
+
+        Lambda.INSTANCE.getMc().itemUseCooldown = Interact.getPlaceDelay();
     }
 }

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

@@ -0,0 +1,21 @@
+package com.lambda.mixin;
+
+import com.lambda.module.modules.movement.Sprint;
+import net.minecraft.client.option.KeyBinding;
+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.CallbackInfoReturnable;
+
+import java.util.Objects;
+
+@Mixin(KeyBinding.class)
+public class MixinKeyBinding {
+    @Inject(method = "isPressed", at = @At("HEAD"), cancellable = true)
+    void autoSprint(CallbackInfoReturnable<Boolean> cir) {
+        KeyBinding instance = (KeyBinding) (Object) this;
+        if (!Objects.equals(instance.getTranslationKey(), "key.sprint")) return;
+
+        if (Sprint.INSTANCE.isEnabled()) cir.setReturnValue(true);
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.lambda.mixin;
+
+import com.lambda.event.EventFlow;
+import com.lambda.event.events.MovementEvent;
+import net.minecraft.entity.player.PlayerEntity;
+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.CallbackInfoReturnable;
+
+@Mixin(PlayerEntity.class)
+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);
+        }
+    }
+}

common/src/main/kotlin/com/lambda/Lambda.kt

@@ -4,62 +4,32 @@ import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.lambda.config.serializer.BlockPosSerializer
 import com.lambda.config.serializer.BlockSerializer
-import com.lambda.module.ModuleRegistry
-import com.lambda.module.modules.BoringModule
+import com.lambda.config.serializer.ColorSerializer
+import dev.architectury.platform.Platform
 import net.minecraft.block.Block
 import net.minecraft.client.MinecraftClient
 import net.minecraft.util.math.BlockPos
+import org.apache.logging.log4j.Level
 import org.apache.logging.log4j.LogManager
-import org.apache.logging.log4j.Logger
+import org.apache.logging.log4j.core.Logger
+import java.awt.Color
+
 
 object Lambda {
     const val MOD_NAME = "Lambda"
     const val MOD_ID = "lambda"
-    private const val SYMBOL = "λ"
+    const val SYMBOL = "λ"
     val VERSION: String = LoaderInfo.getVersion()
-
-    val LOG: Logger = LogManager.getLogger(SYMBOL)
+    val LOG = (LogManager.getLogger(SYMBOL) as Logger)
+        .apply { level = if (Platform.isDevelopmentEnvironment()) Level.DEBUG else Level.INFO }
     val mc: MinecraftClient by lazy { MinecraftClient.getInstance() }
 
     val gson: Gson = GsonBuilder()
         .setPrettyPrinting()
+        .registerTypeAdapter(Color::class.java, ColorSerializer)
         .registerTypeAdapter(BlockPos::class.java, BlockPosSerializer)
         .registerTypeAdapter(Block::class.java, BlockSerializer)
         .create()
 
-    init {
-        // ToDo: Why do i have to call these?
-        BoringModule
-        ModuleRegistry
-
-//        listener<KeyPressEvent> {
-//            if (it.key != GLFW.GLFW_KEY_Z) {
-//                return@listener
-//            }
-//
-//            taskContext {
-//                HelloWorldTask()
-//                    .withDelay(500L)
-//                    .withTimeout(200L)
-//                    .withRepeats(10)
-//                    .withMaxAttempts(5)
-//                    .onSuccess {
-//                        LOG.info("Hello, World! Task completed")
-//                    }.onRepeat { repeats ->
-//                        LOG.info("Hello, World! Task $name repeated $repeats times")
-//                    }.onTimeout {
-//                        LOG.warn("Hello, World! Task $name timed out")
-//                        HelloWorldTask().execute()
-//                    }.onRetry {
-//                        LOG.warn("Hello, World! Task $name retrying")
-//                    }.onFailure { error ->
-//                        LOG.error("Hello, World! Task failed", error)
-//                    }.execute()
-//            }
-//        }
-    }
-
-    fun initialize() {
-        LOG.info("Initializing $MOD_NAME $VERSION")
-    }
+    fun initialize() = Loader.initialize()
 }

common/src/main/kotlin/com/lambda/Loadable.kt

@@ -0,0 +1,5 @@
+package com.lambda
+
+interface Loadable {
+    fun load(): String
+}

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

@@ -0,0 +1,30 @@
+package com.lambda
+
+import com.lambda.Lambda.LOG
+import com.lambda.command.CommandManager
+import com.lambda.module.ModuleRegistry
+import kotlin.system.measureTimeMillis
+
+object Loader {
+    private val loadables = listOf(
+        ModuleRegistry,
+        CommandManager
+    )
+
+    fun initialize() {
+        LOG.info("Initializing ${Lambda.MOD_NAME} ${Lambda.VERSION}")
+
+        val initTime = measureTimeMillis {
+            loadables.forEach { loadable ->
+                var info: String
+                val phaseTime = measureTimeMillis {
+                    info = loadable.load()
+                }
+
+                LOG.info("$info in ${phaseTime}ms")
+            }
+        }
+
+        LOG.info("${Lambda.MOD_NAME} ${Lambda.VERSION} was successfully initialized (${initTime}ms)")
+    }
+}