updated to 1.21.3

Author: emyfops

build.gradle.kts

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2024 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 import org.gradle.internal.jvm.*
 import net.fabricmc.loom.api.LoomGradleExtensionAPI
 import org.apache.tools.ant.taskdefs.condition.Os
@@ -120,14 +137,14 @@ allprojects {
     java {
         withSourcesJar()
 
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     tasks {
         compileKotlin {
             compilerOptions {
-                jvmTarget.set(JvmTarget.JVM_17)
+                jvmTarget.set(JvmTarget.JVM_21)
             }
         }
     }

common/build.gradle.kts

@@ -21,6 +21,7 @@ val modId: String by project
 val fabricLoaderVersion: String by project
 val kotlinxCoroutinesVersion: String by project
 val discordIPCVersion: String by project
+val baritoneVersion: String by project
 
 base.archivesName = "${base.archivesName.get()}-api"
 
@@ -49,7 +50,7 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
 
     // Baritone
-    modImplementation("baritone-api:baritone-unoptimized-fabric:1.10.2") { isTransitive = false }
+    modImplementation("baritone-api:baritone-unoptimized-fabric:$baritoneVersion") { isTransitive = false }
 }
 
 tasks {

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

@@ -91,7 +91,7 @@ void redirectSneaking(CallbackInfoReturnable<Boolean> cir) {
         if (self != Lambda.getMc().player) return;
 
         if (self.input == null) return;
-        cir.setReturnValue(EventFlow.post(new MovementEvent.Sneak(self.input.sneaking)).getSneak());
+        cir.setReturnValue(EventFlow.post(new MovementEvent.Sneak(self.input.playerInput.sneak())).getSneak());
     }
 
     @Inject(method = "sendMovementPackets", at = @At(value = "HEAD"), cancellable = true)

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

@@ -77,7 +77,7 @@ void onTravelPost(Vec3d movementInput, CallbackInfo ci) {
         EventFlow.post(new MovementEvent.Travel.Post());
     }
 
-    @Redirect(method = "travel", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;getPitch()F"))
+    @Redirect(method = "calcGlidingVelocity(Lnet/minecraft/util/math/Vec3d;)Lnet/minecraft/util/math/Vec3d;", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;getPitch()F"))
     private float hookModifyFallFlyingPitch(LivingEntity entity) {
         Float pitch = RotationManager.getMovementPitch();
         if (entity != Lambda.getMc().player || pitch == null) return entity.getPitch();

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

@@ -23,8 +23,8 @@
 import io.netty.channel.ChannelHandlerContext;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.NetworkSide;
+import net.minecraft.network.NetworkState;
 import net.minecraft.network.listener.ClientPacketListener;
-import net.minecraft.network.listener.PacketListener;
 import net.minecraft.network.listener.ServerPacketListener;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.c2s.handshake.ConnectionIntent;
@@ -42,6 +42,7 @@ public class ClientConnectionMixin {
     @Final
     private NetworkSide side;
 
+    @SuppressWarnings("unchecked")
     @Inject(method = "send(Lnet/minecraft/network/packet/Packet;)V", at = @At("HEAD"), cancellable = true)
     private void sendingPacket(Packet<?> packet, final CallbackInfo callbackInfo) {
         if (side != NetworkSide.CLIENTBOUND) return;
@@ -51,13 +52,15 @@ private void sendingPacket(Packet<?> packet, final CallbackInfo callbackInfo) {
         }
     }
 
+    @SuppressWarnings("unchecked")
     @Inject(method = "send(Lnet/minecraft/network/packet/Packet;)V", at = @At("RETURN"))
     private void sendingPacketPost(Packet<?> packet, final CallbackInfo callbackInfo) {
         if (side != NetworkSide.CLIENTBOUND) return;
 
         EventFlow.post(new PacketEvent.Send.Post((Packet<ServerPacketListener>) packet));
     }
 
+    @SuppressWarnings("all")
     @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.BEFORE), cancellable = true, require = 1)
     private void receivingPacket(
             ChannelHandlerContext channelHandlerContext,
@@ -71,6 +74,7 @@ private void receivingPacket(
         }
     }
 
+    @SuppressWarnings("unchecked")
     @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))
     private void receivingPacketPost(
             ChannelHandlerContext channelHandlerContext,
@@ -82,15 +86,19 @@ private void receivingPacketPost(
         EventFlow.post(new PacketEvent.Receive.Post((Packet<ClientPacketListener>) packet));
     }
 
-    @Inject(method = "connect(Ljava/lang/String;ILnet/minecraft/network/listener/PacketListener;Lnet/minecraft/network/packet/c2s/handshake/ConnectionIntent;)V", at = @At("HEAD"), cancellable = true)
-    private void onConnect(
+    @Inject(method = "connect(Ljava/lang/String;ILnet/minecraft/network/NetworkState;Lnet/minecraft/network/NetworkState;Lnet/minecraft/network/listener/ClientPacketListener;Lnet/minecraft/network/packet/c2s/handshake/ConnectionIntent;)V", at = @At("HEAD"), cancellable = true)
+    private
+    <S extends ServerPacketListener, C extends ClientPacketListener>
+    void onConnect(
             String address,
             int port,
-            PacketListener listener,
+            NetworkState<S> outboundState,
+            NetworkState<C> inboundState,
+            C prePlayStateListener,
             ConnectionIntent intent,
             CallbackInfo ci
     ) {
-        if (EventFlow.post(new ConnectionEvent.Connect.Pre(address, port, listener, intent)).isCanceled()) ci.cancel();
+        if (EventFlow.post(new ConnectionEvent.Connect.Pre(address, port, prePlayStateListener, intent)).isCanceled()) ci.cancel();
     }
 
     @Inject(method = "disconnect(Lnet/minecraft/text/Text;)V", at = @At("HEAD"))

common/src/main/java/com/lambda/mixin/network/ClientLoginNetworkMixin.java

@@ -31,6 +31,6 @@ public class ClientLoginNetworkMixin {
 
     @Inject(method = "onSuccess(Lnet/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket;)V", at = @At("HEAD"))
     private void onSuccess(LoginSuccessS2CPacket packet, CallbackInfo ci) {
-        EventFlow.post(new ConnectionEvent.Connect.Post(packet.getProfile()));
+        EventFlow.post(new ConnectionEvent.Connect.Post(packet.profile()));
     }
 }

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

@@ -18,26 +18,23 @@
 package com.lambda.mixin.render;
 
 import com.lambda.module.modules.render.WorldColors;
+import com.lambda.util.math.ColorKt;
 import net.minecraft.client.render.BackgroundRenderer;
+import net.minecraft.client.render.Camera;
+import net.minecraft.client.world.ClientWorld;
 import net.minecraft.util.math.Vec3d;
+import org.joml.Vector4f;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(BackgroundRenderer.class)
 public class BackgroundRendererMixin {
-    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/Vec3d;getX()D"))
-    private static double redirectRed(Vec3d baseColor) {
-        return WorldColors.backgroundColor(baseColor).getX();
-    }
-
-    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/Vec3d;getY()D"))
-    private static double redirectGreen(Vec3d baseColor) {
-        return WorldColors.backgroundColor(baseColor).getY();
-    }
+    @Inject(method = "getFogColor", at = @At("RETURN"), cancellable = true)
+    private static void redirectColor(Camera camera, float tickDelta, ClientWorld world, int clampedViewDistance, float skyDarkness, CallbackInfoReturnable<Vector4f> cir) {
+        Vec3d color = ColorKt.getVec3d(WorldColors.getFogColor());
 
-    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/Vec3d;getZ()D"))
-    private static double redirectBlue(Vec3d baseColor) {
-        return WorldColors.backgroundColor(baseColor).getZ();
+        cir.setReturnValue(new Vector4f((float) color.x, (float) color.y, (float) color.z, 1.0f));
     }
 }

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

@@ -58,18 +58,18 @@ private void injectQuickPerspectiveSwap(BlockView area, Entity focusedEntity, bo
     }
 
     @Inject(method = "clipToSpace", at = @At("HEAD"), cancellable = true)
-    private void onClipToSpace(double desiredCameraDistance, CallbackInfoReturnable<Double> info) {
+    private void onClipToSpace(float f, CallbackInfoReturnable<Float> cir) {
         if (CameraTweaks.INSTANCE.isEnabled() && CameraTweaks.getNoClipCam()) {
-            info.setReturnValue(desiredCameraDistance);
+            cir.setReturnValue(f);
         }
     }
 
-    @ModifyArg(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/Camera;clipToSpace(D)D"))
-    private double onDistanceUpdate(double desiredCameraDistance) {
+    @ModifyArg(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/Camera;clipToSpace(F)F"))
+    private float onDistanceUpdate(float f) {
         if (CameraTweaks.INSTANCE.isEnabled()) {
             return CameraTweaks.getCamDistance();
         }
 
-        return desiredCameraDistance;
+        return f;
     }
 }

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

@@ -31,6 +31,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.ArrayList;
@@ -77,10 +78,10 @@ private String modifyChatText(String chatText) {
     }
 
     @Inject(method = "sendMessage", at = @At("HEAD"), cancellable = true)
-    void sendMessageInject(String chatText, boolean addToHistory, CallbackInfoReturnable<Boolean> cir) {
+    void sendMessageInject(String chatText, boolean addToHistory, CallbackInfo ci) {
         if (!CommandManager.INSTANCE.isLambdaCommand(chatText)) return;
         CommandManager.INSTANCE.executeCommand(chatText);
 
-        cir.setReturnValue(true);
+        ci.cancel();
     }
 }

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

@@ -19,25 +19,18 @@
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.RenderEvent;
-import com.lambda.graphics.RenderMain;
 import net.minecraft.client.render.GameRenderer;
-import net.minecraft.client.util.math.MatrixStack;
 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(GameRenderer.class)
 public class GameRendererMixin {
-    @Inject(method = "updateTargetedEntity", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "updateCrosshairTarget(F)V", at = @At("HEAD"), cancellable = true)
     private void updateTargetedEntityInvoke(float tickDelta, CallbackInfo info) {
         if (EventFlow.post(new RenderEvent.UpdateTarget()).isCanceled()) {
             info.cancel();
         }
     }
-
-    @Inject(method = "renderWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;render(Lnet/minecraft/client/util/math/MatrixStack;FJZLnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/GameRenderer;Lnet/minecraft/client/render/LightmapTextureManager;Lorg/joml/Matrix4f;)V", shift = At.Shift.AFTER))
-    private void onRenderWorld(float tickDelta, long limitTime, MatrixStack matrix, CallbackInfo ci) {
-        RenderMain.render3D(matrix.peek().getPositionMatrix());
-    }
 }