Merge remote-tracking branch 'origin/master' into feature/renderer

Author: Avanatiker

build.gradle.kts

@@ -30,6 +30,10 @@ subprojects {
         "mappings"("net.fabricmc:yarn:$yarnMappings:v2")
     }
 
+    repositories {
+        maven("https://babbaj.github.io/maven/")
+    }
+
     if (path == ":common") return@subprojects
 
     apply(plugin = "com.github.johnrengelman.shadow")

common/build.gradle.kts

@@ -25,6 +25,10 @@ dependencies {
 
     // Add Kotlin
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
+
+    // Baritone
+    modImplementation("baritone-api:baritone-api:1.10.2")
+    modImplementation("baritone-api:baritone-unoptimized-fabric:1.10.2")
 }
 
 // Avoid nested jars

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

@@ -0,0 +1,27 @@
+package com.lambda.mixin.baritone;
+
+import baritone.Baritone;
+import baritone.api.utils.Rotation;
+import baritone.utils.player.BaritonePlayerContext;
+import com.lambda.interaction.RotationManager;
+import com.lambda.util.BaritoneUtils;
+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(value = BaritonePlayerContext.class, remap = false) // fix compileJava warning
+public class MixinBaritonePlayerContext {
+    @Shadow @Final private Baritone baritone;
+
+    // Let baritone know the actual rotation
+    @Inject(method = "playerRotations", at = @At("HEAD"), cancellable = true, remap = false)
+    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()));
+    }
+}

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

@@ -0,0 +1,41 @@
+package com.lambda.mixin.baritone;
+
+import baritone.api.event.events.PlayerUpdateEvent;
+import baritone.api.event.events.RotationMoveEvent;
+import baritone.api.utils.Rotation;
+import baritone.behavior.LookBehavior;
+import com.lambda.interaction.RotationManager;
+import com.lambda.util.BaritoneUtils;
+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(LookBehavior.class)
+public class MixinLookBehavior {
+    // Redirect baritone's rotations into our rotation engine
+    @Inject(method = "updateTarget", at = @At("HEAD"), remap = false, cancellable = true)
+    void onTargetUpdate(Rotation rotation, boolean blockInteract, CallbackInfo ci) {
+        LookBehavior instance = ((LookBehavior) (Object) this);
+        if (instance.baritone != BaritoneUtils.getPrimary()) return;
+
+        RotationManager.BaritoneProcessor.handleBaritoneRotation(rotation.getYaw(), rotation.getPitch());
+        ci.cancel();
+    }
+
+    @Inject(method = "onPlayerUpdate", at = @At("HEAD"), remap = false, cancellable = true)
+    void onUpdate(PlayerUpdateEvent event, CallbackInfo ci) {
+        LookBehavior instance = ((LookBehavior) (Object) this);
+        if (instance.baritone != BaritoneUtils.getPrimary()) return;
+
+        ci.cancel();
+    }
+
+    @Inject(method = "onPlayerRotationMove", at = @At("HEAD"), remap = false, cancellable = true)
+    void onMovementUpdate(RotationMoveEvent event, CallbackInfo ci) {
+        LookBehavior instance = ((LookBehavior) (Object) this);
+        if (instance.baritone != BaritoneUtils.getPrimary()) return;
+
+        ci.cancel();
+    }
+}

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

@@ -57,9 +57,8 @@ boolean onSlowDown(ClientPlayerEntity entity) {
 
     @Redirect(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/input/Input;tick(ZF)V"))
     void processMovement(Input input, boolean slowDown, float slowDownFactor) {
-        if (EventFlow.post(new MovementEvent.InputUpdate(input, slowDown, slowDownFactor)).isCanceled()) return;
-
         input.tick(slowDown, slowDownFactor);
+        EventFlow.post(new MovementEvent.InputUpdate(input, slowDown, slowDownFactor));
     }
 
     @Inject(method = "sendMovementPackets", at = @At(value = "HEAD"), cancellable = true)

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

@@ -2,17 +2,30 @@
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.MovementEvent;
+import com.lambda.interaction.RotationManager;
+import net.minecraft.client.MinecraftClient;
 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.Redirect;
 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) {
-        MovementEvent.ClipAtLedge event = new MovementEvent.ClipAtLedge(cir.getReturnValueZ());
+        MovementEvent.ClipAtLedge event = new MovementEvent.ClipAtLedge(((PlayerEntity) (Object) this).isSneaking());
         cir.setReturnValue(EventFlow.post(event).getClip());
     }
+
+    @Redirect(method = "tickNewAi", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;getYaw()F"))
+    private float injectHeadYaw(PlayerEntity instance) {
+        if ((Object) this != MinecraftClient.getInstance().player) {
+            return instance.getYaw();
+        }
+
+        Float yaw = RotationManager.getRenderYaw();
+        return (yaw != null) ? yaw : instance.getYaw();
+    }
 }

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

@@ -1,16 +1,21 @@
 package com.lambda.mixin.render;
 
+import com.lambda.interaction.RotationManager;
 import com.lambda.module.modules.player.Freecam;
 import net.minecraft.client.render.Camera;
 import net.minecraft.entity.Entity;
 import net.minecraft.world.BlockView;
 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.CallbackInfo;
 
 @Mixin(Camera.class)
-public class CameraMixin {
+public abstract class CameraMixin {
+    @Shadow
+    public abstract void setRotation(float yaw, float pitch);
+
     @Inject(method = "update", at = @At("TAIL"))
     private void onUpdate(
             BlockView area,
@@ -24,4 +29,11 @@ private void onUpdate(
 
         Freecam.updateCam();
     }
+
+    @Inject(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/Camera;setPos(DDD)V", shift = At.Shift.AFTER))
+    private void injectQuickPerspectiveSwap(BlockView area, Entity focusedEntity, boolean thirdPerson, boolean inverseView, float tickDelta, CallbackInfo ci) {
+        var rot = RotationManager.getLockRotation();
+        if (rot == null) return;
+        setRotation(rot.getYawF(), rot.getPitchF());
+    }
 }

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

@@ -0,0 +1,27 @@
+package com.lambda.mixin.render;
+
+import com.lambda.module.modules.render.Fullbright;
+import com.lambda.module.modules.render.NoRender;
+import com.lambda.module.modules.render.XRay;
+import net.minecraft.client.render.LightmapTextureManager;
+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.ModifyArgs;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
+
+@Mixin(LightmapTextureManager.class)
+public class LightmapTextureManagerMixin {
+    @ModifyArgs(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/texture/NativeImage;setColor(III)V"))
+    private void updateModify(Args args) {
+        if (Fullbright.INSTANCE.isEnabled() || XRay.INSTANCE.isEnabled()) {
+            args.set(2, 0xFFFFFFFF);
+        }
+    }
+
+    @Inject(method = "getDarknessFactor(F)F", at = @At("HEAD"), cancellable = true)
+    private void getDarknessFactor(float tickDelta, CallbackInfoReturnable<Float> info) {
+        if (NoRender.getNoDarkness()) info.setReturnValue(0.0f);
+    }
+}

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

@@ -0,0 +1,41 @@
+package com.lambda.mixin.render;
+
+import com.lambda.Lambda;
+import com.lambda.interaction.RotationManager;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.entity.LivingEntityRenderer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.util.math.MathHelper;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+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 java.util.Objects;
+
+@Mixin(LivingEntityRenderer.class)
+public class LivingEntityRendererMixin<T extends LivingEntity> {
+    @Unique
+    private Float lambda$pitch = null;
+
+    @Inject(method = "render(Lnet/minecraft/entity/LivingEntity;FFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", at = @At("HEAD"))
+    private void injectRender(T livingEntity, float f, float g, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, CallbackInfo ci) {
+        Float rotationPitch = RotationManager.getRenderPitch();
+
+        this.lambda$pitch = null;
+
+        if (livingEntity != Lambda.getMc().player || rotationPitch == null) {
+            return;
+        }
+
+        this.lambda$pitch = rotationPitch;
+    }
+
+    @Redirect(method = "render(Lnet/minecraft/entity/LivingEntity;FFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/MathHelper;lerp(FFF)F", ordinal = 0))
+    private float injectRotationPitch(float g, float f, float s) {
+        return Objects.requireNonNullElseGet(lambda$pitch, () -> MathHelper.lerp(g, f, s));
+    }
+}

common/src/main/kotlin/com/lambda/config/Configuration.kt

@@ -5,6 +5,7 @@ import com.google.gson.JsonObject
 import com.google.gson.JsonParser
 import com.lambda.Lambda.LOG
 import com.lambda.Lambda.gson
+import com.lambda.config.configurations.ModuleConfig
 import com.lambda.event.EventFlow.lambdaScope
 import com.lambda.event.events.ClientEvent
 import com.lambda.event.listener.UnsafeListener.Companion.unsafeListener
@@ -14,7 +15,6 @@ import com.lambda.util.StringUtils.capitalize
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.io.File
-import java.util.*
 
 /**
  * Represents a compound of [Configurable] objects whose [AbstractSetting]s