Merge branch 'master' into feature/renderer

Author: emyfops

.github/workflows/code_quality.yml

@@ -0,0 +1,24 @@
+name: Qodana
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - master # The 'master' branch
+
+jobs:
+  qodana:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+      checks: write
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
+          fetch-depth: 0  # a full history is required for pull request analysis
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2024.1
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}

build.gradle.kts

@@ -1,5 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import net.fabricmc.loom.api.LoomGradleExtensionAPI
 import net.fabricmc.loom.task.RemapJarTask
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.util.*
 
 val targets = listOf("META-INF/*.toml", "fabric.mod.json")
@@ -14,6 +16,8 @@ val minecraftVersion: String by project
 val yarnMappings: String by project
 
 val libs = file("libs")
+val Project.loom: LoomGradleExtensionAPI
+    get() = (this as ExtensionAware).extensions.getByName("loom") as LoomGradleExtensionAPI
 
 plugins {
     kotlin("jvm") version "2.0.0"
@@ -104,4 +108,12 @@ allprojects {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+
+    tasks {
+        compileKotlin {
+            compilerOptions {
+                jvmTarget.set(JvmTarget.JVM_17)
+            }
+        }
+    }
 }

common/build.gradle.kts

@@ -27,7 +27,7 @@ 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")
 }
 

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

@@ -1,6 +1,8 @@
 package com.lambda.mixin.entity;
 
 import com.lambda.Lambda;
+import com.lambda.event.EventFlow;
+import com.lambda.event.events.EntityEvent;
 import com.lambda.interaction.RotationManager;
 import com.lambda.util.math.Vec2d;
 import net.minecraft.entity.Entity;
@@ -9,7 +11,9 @@
 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(Entity.class)
 public abstract class EntityMixin {
@@ -61,4 +65,9 @@ float fixDirectionPitch2(Entity entity) {
 
         return (float) rot.getY();
     }
+
+    @Inject(method = "changeLookDirection", at = @At("HEAD"), cancellable = true)
+    private void changeLookDirection(double cursorDeltaX, double cursorDeltaY, CallbackInfo ci) {
+        if (EventFlow.post(new EntityEvent.ChangeLookDirection(cursorDeltaX, cursorDeltaY)).isCanceled()) ci.cancel();
+    }
 }

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

@@ -45,14 +45,6 @@ void onJump(CallbackInfo ci) {
         self.velocityDirty = true;
     }
 
-    @Inject(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;isImmobile()Z"))
-    void onTravelH(CallbackInfo ci) {
-        Entity self = (Entity) (Object) this;
-        if (self != Lambda.getMc().player) return;
-
-        RotationManager.update();
-    }
-
     @Redirect(method = "travel", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;getPitch()F"))
     private float hookModifyFallFlyingPitch(LivingEntity entity) {
         Float pitch = RotationManager.getMovementPitch();

common/src/main/java/com/lambda/mixin/input/KeyBindingMixin.java

@@ -1,5 +1,6 @@
 package com.lambda.mixin.input;
 
+import com.lambda.module.modules.movement.Speed;
 import com.lambda.module.modules.movement.Sprint;
 import net.minecraft.client.option.KeyBinding;
 import org.spongepowered.asm.mixin.Mixin;
@@ -17,5 +18,6 @@ void autoSprint(CallbackInfoReturnable<Boolean> cir) {
         if (!Objects.equals(instance.getTranslationKey(), "key.sprint")) return;
 
         if (Sprint.INSTANCE.isEnabled()) cir.setReturnValue(true);
+        if (Speed.INSTANCE.isEnabled() && Speed.getMode() == Speed.Mode.GRIM_STRAFE) cir.setReturnValue(true);
     }
 }

common/src/main/java/com/lambda/mixin/input/MouseMixin.java

@@ -21,12 +21,14 @@ import org.apache.logging.log4j.Logger
 import java.awt.Color
 import java.util.*
 
+
 object Lambda {
     const val MOD_NAME = "Lambda"
     const val MOD_ID = "lambda"
     const val SYMBOL = "λ"
     val VERSION: String = LoaderInfo.getVersion()
     val LOG: Logger = LogManager.getLogger(SYMBOL)
+
     @JvmStatic
     val mc: MinecraftClient by lazy { MinecraftClient.getInstance() }
 

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

@@ -8,4 +8,4 @@ object LoaderInfo {
     @ExpectPlatform
     @JvmStatic
     fun getVersion(): String = "DEV"
-}
+}

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

@@ -57,7 +57,8 @@ fun DefaultArgumentReader<BlockStateArgumentType>.value(): BlockStateArgument {
 /**
  * Creates a block predicate argument with [name] as the parameter name.
  *
- * @param context The command build context
+ * @param name The name of the argument
+ * @param registryAccess The command registry access
  */
 @BrigadierDsl
 fun <S> blockPredicate(
@@ -70,7 +71,8 @@ fun <S> blockPredicate(
 /**
  * Creates a block state argument with [name] as the parameter name.
  *
- * @param context The command build context
+ * @param name The name of the argument
+ * @param registryAccess The command registry access
  */
 @BrigadierDsl
 fun <S> blockState(