Initial draft for 1.21.11

Author: Avanatiker

build.gradle.kts

@@ -30,8 +30,6 @@ val discordIPCVersion: String by project
 val classGraphVersion: String by project
 val kotlinVersion: String by project
 val ktorVersion: String by project
-val mockitoKotlin: String by project
-val mockitoInline: String by project
 val mockkVersion: String by project
 val spairVersion: String by project
 val lwjglVersion: String by project
@@ -46,10 +44,10 @@ val replacements = file("gradle.properties").inputStream().use { stream ->
 }.map { (k, v) -> k.toString() to v.toString() }.toMap()
 
 plugins {
-    kotlin("jvm") version "2.2.0"
-    id("org.jetbrains.dokka") version "2.0.0"
-    id("fabric-loom") version "1.10-SNAPSHOT"
-    id("com.gradleup.shadow") version "9.0.0-rc1"
+    kotlin("jvm") version "2.3.0"
+    id("org.jetbrains.dokka") version "2.1.0"
+    id("fabric-loom") version "1.14-SNAPSHOT"
+    id("com.gradleup.shadow") version "9.3.0"
     id("maven-publish")
 }
 
@@ -175,7 +173,8 @@ dependencies {
     includeLib("io.ktor:ktor-serialization-gson:$ktorVersion")
 
     // Add mods
-    modImplementation("com.github.rfresh2:baritone-fabric:$minecraftVersion")
+    /*modImplementation("com.github.rfresh2:baritone-fabric:$minecraftVersion") */
+    modImplementation("com.github.rfresh2:baritone-fabric:1.21.10-SNAPSHOT") // ToDo: Move to 1.21.11
     modCompileOnly("maven.modrinth:sodium:$sodiumVersion")
     modCompileOnly("maven.modrinth:malilib:$maLiLibVersion")
     modCompileOnly("maven.modrinth:litematica:$litematicaVersion")
@@ -185,8 +184,6 @@ dependencies {
 
     // Test implementations
     testImplementation(kotlin("test"))
-    testImplementation("org.mockito.kotlin:mockito-kotlin:$mockitoKotlin")
-    testImplementation("org.mockito:mockito-inline:$mockitoInline")
     testImplementation("io.mockk:mockk:${mockkVersion}")
 
     // Finish the configuration

gradle.properties

@@ -18,38 +18,36 @@
 # Lambda https://github.com/lambda-client/lambda
 modId=lambda
 modName=Lambda
-modVersion=0.0.1
+modVersion=0.0.2
 modDescription=Minecraft utility mod for automation
 modIcon=assets/lambda/lambda.png
 mavenGroup=com.lambda
 modAuthors=Constructor (Avanatiker), Blade, beanbag44, Emy
 
 # General
-minecraftVersion=1.21.5
-minecraftVersionMin=1.21.5
-minecraftVersionMax=1.21.6
+minecraftVersion=1.21.11
+minecraftVersionMin=1.21.11
+minecraftVersionMax=1.21.11
 lwjglVersion=3.3.3
-mixinExtrasVersion=0.5.0-rc.2
-kotlinVersion=2.2.0
+mixinExtrasVersion=0.5.0
+kotlinVersion=2.3.0
 pngEncoderVersion=0.16.0
 javaVersion=21
 baritoneVersion=1.14.0
 discordIPCVersion=6f6b6cce17
-classGraphVersion=4.8.179
-ktorVersion=3.1.2
-mockitoKotlin=5.4.0
-mockitoInline=5.2.0
-mockkVersion=1.13.17
+classGraphVersion=4.8.184
+ktorVersion=3.3.3
+mockkVersion=1.14.7
 spairVersion=1.90.0
 
 # Fabric https://fabricmc.net/develop/
-fabricLoaderVersion=0.16.13
-yarnMappings=build.1
-fabricApiVersion=0.124.0
-kotlinFabricVersion=1.13.4+kotlin
-sodiumVersion=mc1.21.5-0.6.13-fabric
-litematicaVersion=0.22.2
-maLiLibVersion=0.24.2
+fabricLoaderVersion=0.18.3
+yarnMappings=build.3
+fabricApiVersion=0.139.5
+kotlinFabricVersion=1.13.8+kotlin
+sodiumVersion=mc1.21.11-0.8.0-fabric
+litematicaVersion=0.25.1
+maLiLibVersion=0.27.1
 
 # Kotlin https://kotlinlang.org/
 kotlin.code.style=official

gradle/wrapper/gradle-wrapper.properties

@@ -17,7 +17,7 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -85,11 +85,6 @@ void sendLambdaMovement(CallbackInfo ci) {
         autoJumpEnabled = Lambda.getMc().options.getAutoJump().getValue();
     }
 
-    @WrapOperation(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;sendSneakingPacket()V"))
-    void sendSneakingPacket(ClientPlayerEntity entity, Operation<Void> original) {
-        PlayerPacketHandler.sendSneakPackets();
-    }
-
     @ModifyExpressionValue(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isSprinting()Z"))
     boolean isSprinting(boolean original) {
         return EventFlow.post(new MovementEvent.Sprint(original)).getSprint();

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

@@ -18,60 +18,28 @@
 package com.lambda.mixin.render;
 
 import com.lambda.module.modules.render.NoRender;
-import com.lambda.module.modules.render.WorldColors;
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import net.minecraft.client.render.BackgroundRenderer;
+import net.minecraft.client.render.fog.BlindnessEffectFogModifier;
+import net.minecraft.client.render.fog.DarknessEffectFogModifier;
+import net.minecraft.block.enums.CameraSubmersionType;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.biome.Biome;
-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;
 
-import java.util.List;
-import java.util.stream.Stream;
-
 /**
- * <pre>{@code
- * Vec3d vec3d2 = camera.getPos().subtract(2.0, 2.0, 2.0).multiply(0.25);
- * Vec3d vec3d3 = CubicSampler.sampleColor(
- *         vec3d2, (x, y, z) -> world.getDimensionEffects().adjustFogColor(Vec3d.unpackRgb(biomeAccess.getBiomeForNoiseGen(x, y, z).value().getFogColor()), v)
- * );
- * red = (float)vec3d3.getX();
- * green = (float)vec3d3.getY();
- * blue = (float)vec3d3.getZ();
- * }</pre>
+ * Mixins to disable blindness and darkness fog effects when NoRender is enabled.
+ *
+ * Note: The fog system was completely rewritten in 1.21.11.
+ * BackgroundRenderer was replaced with FogRenderer and fog modifiers are now separate classes.
  */
-@Mixin(BackgroundRenderer.class)
+@Mixin(BlindnessEffectFogModifier.class)
 public class BackgroundRendererMixin {
-    @Shadow @Final private static List<BackgroundRenderer.StatusEffectFogModifier> FOG_MODIFIERS;
-
-    /**
-     * Modifies the fog color returned from CubicSampler.sampleColor
-     */
-    @ModifyExpressionValue(method = "getFogColor", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/CubicSampler;sampleColor(Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/util/CubicSampler$RgbFetcher;)Lnet/minecraft/util/math/Vec3d;"))
-    private static Vec3d modifyFogColor(Vec3d original) {
-        return WorldColors.fogOfWarColor(original);
-    }
-
-    @ModifyExpressionValue(method = "getFogColor", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/biome/Biome;getWaterFogColor()I"))
-    private static int modifyWaterFogColor(int original) {
-        return WorldColors.waterFogColor(original);
-    }
 
-    @Inject(method = "getFogModifier(Lnet/minecraft/entity/Entity;F)Lnet/minecraft/client/render/BackgroundRenderer$StatusEffectFogModifier;", at = @At("HEAD"), cancellable = true)
-    private static void injectFogModifier(Entity entity, float tickProgress, CallbackInfoReturnable<BackgroundRenderer.StatusEffectFogModifier> cir){
-        if (entity instanceof LivingEntity livingEntity) {
-            Stream<BackgroundRenderer.StatusEffectFogModifier> modifiers = FOG_MODIFIERS
-                    .stream()
-                    .filter((modifier) ->
-                            modifier.shouldApply(livingEntity, tickProgress) && NoRender.shouldAcceptFog(modifier)
-                    );
-            cir.setReturnValue(modifiers.findFirst().orElse(null));
+    @Inject(method = "shouldApply", at = @At("HEAD"), cancellable = true)
+    private void injectShouldApplyBlindness(CameraSubmersionType submersionType, Entity cameraEntity, CallbackInfoReturnable<Boolean> cir) {
+        if (NoRender.getNoBlindness() && NoRender.isEnabled()) {
+            cir.setReturnValue(false);
         }
     }
 }

src/main/java/com/lambda/mixin/render/DarknessEffectFogMixin.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2025 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/>.
+ */
+
+package com.lambda.mixin.render;
+
+import com.lambda.module.modules.render.NoRender;
+import net.minecraft.client.render.fog.DarknessEffectFogModifier;
+import net.minecraft.block.enums.CameraSubmersionType;
+import net.minecraft.entity.Entity;
+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 to disable darkness fog effect when NoRender is enabled.
+ */
+@Mixin(DarknessEffectFogModifier.class)
+public class DarknessEffectFogMixin {
+
+    @Inject(method = "shouldApply", at = @At("HEAD"), cancellable = true)
+    private void injectShouldApplyDarkness(CameraSubmersionType submersionType, Entity cameraEntity, CallbackInfoReturnable<Boolean> cir) {
+        if (NoRender.getNoDarkness() && NoRender.isEnabled()) {
+            cir.setReturnValue(false);
+        }
+    }
+}

src/main/java/com/lambda/mixin/render/DebugRendererMixin.java

@@ -29,8 +29,8 @@
 
 @Mixin(DebugRenderer.class)
 public class DebugRendererMixin {
-    @Inject(method = "render", at = @At("TAIL"))
-    private void onRender(MatrixStack matrices, Frustum frustum, VertexConsumerProvider.Immediate vertexConsumers, double cameraX, double cameraY, double cameraZ, CallbackInfo ci) {
-        DebugRendererModule.render(matrices, vertexConsumers, cameraX, cameraY, cameraZ);
-    }
+//    @Inject(method = "render", at = @At("TAIL"))
+//    private void onRender(MatrixStack matrices, Frustum frustum, VertexConsumerProvider.Immediate vertexConsumers, double cameraX, double cameraY, double cameraZ, CallbackInfo ci) {
+//        DebugRendererModule.render(matrices, vertexConsumers, cameraX, cameraY, cameraZ);
+//    }
 }

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

@@ -59,12 +59,12 @@ private void updateTargetedEntityInvoke(float tickDelta, CallbackInfo info) {
      * this.client.worldRenderer.render(this.pool, renderTickCounter, bl, camera, this, matrix4f3, matrix4f);
      * }</pre>
      */
-    @WrapOperation(method = "renderWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;render(Lnet/minecraft/client/util/ObjectAllocator;Lnet/minecraft/client/render/RenderTickCounter;ZLnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/GameRenderer;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V"))
-    void onRenderWorld(WorldRenderer instance, ObjectAllocator allocator, RenderTickCounter tickCounter, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, Matrix4f positionMatrix, Matrix4f projectionMatrix, Operation<Void> original) {
-        original.call(instance, allocator, tickCounter, renderBlockOutline, camera, gameRenderer, positionMatrix, projectionMatrix);
-
-        RenderMain.render3D(positionMatrix, projectionMatrix);
-    }
+//    @WrapOperation(method = "renderWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;render(Lnet/minecraft/client/util/ObjectAllocator;Lnet/minecraft/client/render/RenderTickCounter;ZLnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/GameRenderer;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V"))
+//    void onRenderWorld(WorldRenderer instance, ObjectAllocator allocator, RenderTickCounter tickCounter, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, Matrix4f positionMatrix, Matrix4f projectionMatrix, Operation<Void> original) {
+//        original.call(instance, allocator, tickCounter, renderBlockOutline, camera, gameRenderer, positionMatrix, projectionMatrix);
+//
+//        RenderMain.render3D(positionMatrix, projectionMatrix);
+//    }
 
     @ModifyExpressionValue(method = "renderWorld", at = @At(value = "INVOKE", target = "Ljava/lang/Math;max(FF)F", ordinal = 0))
     private float modifyMax(float original) {

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

@@ -27,6 +27,7 @@ import com.lambda.config.serializer.ItemCodec
 import com.lambda.config.serializer.ItemStackCodec
 import com.lambda.config.serializer.KeyCodeCodec
 import com.lambda.config.serializer.OptionalCodec
+import com.lambda.config.serializer.TextCodec
 import com.lambda.core.Loader
 import com.lambda.event.events.ClientEvent
 import com.lambda.event.listener.UnsafeListener.Companion.listenOnceUnsafe
@@ -79,7 +80,7 @@ object Lambda : ClientModInitializer {
         .registerTypeAdapter(GameProfile::class.java, GameProfileCodec)
         .registerTypeAdapter(Optional::class.java, OptionalCodec)
         .registerTypeAdapter(ItemStack::class.java, ItemStackCodec)
-        .registerTypeAdapter(Text::class.java, Text.Serializer(DynamicRegistryManager.EMPTY))
+        .registerTypeAdapter(Text::class.java, TextCodec) // ToDo: Find out if needed
         .registerTypeAdapter(Item::class.java, ItemCodec)
         .registerTypeAdapter(BlockItem::class.java, ItemCodec)
         .registerTypeAdapter(ArrowItem::class.java, ItemCodec)

src/main/kotlin/com/lambda/brigadier/argument/PlayerArguments.kt

@@ -35,6 +35,7 @@ import net.minecraft.command.argument.EntityArgumentType
 import net.minecraft.command.argument.GameProfileArgumentType
 import net.minecraft.command.argument.TeamArgumentType
 import net.minecraft.scoreboard.Team
+import net.minecraft.server.PlayerConfigEntry
 import net.minecraft.server.command.ServerCommandSource
 import net.minecraft.server.network.ServerPlayerEntity
 
@@ -69,7 +70,7 @@ fun ArgumentReader<
         DefaultArgumentDescriptor<
                 GameProfileArgumentType
                 >
-        >.value(): Collection<GameProfile> {
+        >.value(): Collection<PlayerConfigEntry> {
     return GameProfileArgumentType.getProfileArgument(context, name)
 }