Merge remote-tracking branch 'origin/1.21.5' into feature/module/BetterFirework

Author: IceTank

build.gradle.kts

@@ -35,7 +35,8 @@ val mockitoInline: String by project
 val mockkVersion: String by project
 val spairVersion: String by project
 val lwjglVersion: String by project
-
+val sodiumVersion: String by project
+val litematicaVersion: String by project
 
 val libs = file("libs")
 val targets = listOf("fabric.mod.json")
@@ -69,6 +70,7 @@ repositories {
     mavenLocal() // Allow the use of local repositories
     maven("https://maven.2b2t.vc/releases") // Baritone
     maven("https://jitpack.io") // KDiscordIPC
+    maven("https://api.modrinth.com/maven")
     mavenCentral()
 
     // Allow the use of local libraries
@@ -107,7 +109,7 @@ loom {
             property("org.lwjgl.util.DebugFunctions", "true")
             property("mixin.debug.export", "true")
 
-            vmArgs("-XX:+HeapDumpOnOutOfMemoryError", "-XX:+CreateCoredumpOnCrash", "-XX:+UseOSErrorReporting")
+            vmArgs("-XX:+HeapDumpOnOutOfMemoryError", "-XX:+CreateCoredumpOnCrash")
             programArgs("--username", "Steve", "--uuid", "8667ba71b85a4004af54457a9734eed7", "--accessToken", "****")
         }
     }
@@ -171,8 +173,10 @@ dependencies {
     includeLib("io.ktor:ktor-client-content-negotiation:$ktorVersion")
     includeLib("io.ktor:ktor-serialization-gson:$ktorVersion")
 
-    // Add mods to the mod jar
-    includeMod("com.github.rfresh2:baritone-fabric:$minecraftVersion")
+    // Add mods
+    modImplementation("com.github.rfresh2:baritone-fabric:$minecraftVersion")
+    modCompileOnly("maven.modrinth:sodium:$sodiumVersion")
+    modCompileOnly("maven.modrinth:litematica:$litematicaVersion")
 
     // Test implementations
     testImplementation(kotlin("test"))
@@ -213,7 +217,7 @@ tasks {
 
 kotlin {
     compilerOptions {
-        freeCompilerArgs.add("-Xcontext-parameters")
+        freeCompilerArgs.addAll("-Xcontext-parameters", "-Xconsistent-data-class-copy-visibility")
     }
 
     jvmToolchain(21)

gradle.properties

@@ -47,6 +47,8 @@ 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
 
 # Kotlin https://kotlinlang.org/
 kotlin.code.style=official

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

@@ -21,7 +21,11 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.MovementEvent;
 import com.lambda.interaction.request.rotating.RotationManager;
+import com.lambda.module.modules.movement.Velocity;
 import com.lambda.module.modules.render.ViewModel;
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
@@ -167,4 +171,12 @@ private int getHandSwingDuration(int constant) {
 
         return ViewModel.INSTANCE.getSwingDuration();
     }
+
+    @WrapMethod(method = "pushAwayFrom")
+    private void wrapPushAwayFrom(Entity entity, Operation<Void> original) {
+        if (lambda$instance == Lambda.getMc().player &&
+                Velocity.INSTANCE.isEnabled() &&
+                Velocity.getPushed()) return;
+        original.call(entity);
+    }
 }

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

@@ -18,29 +18,19 @@
 package com.lambda.mixin.entity;
 
 import com.lambda.interaction.request.hotbar.HotbarManager;
-import com.lambda.interaction.request.hotbar.HotbarRequest;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import net.minecraft.entity.player.PlayerInventory;
 import org.objectweb.asm.Opcodes;
 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(PlayerInventory.class)
 public class PlayerInventoryMixin {
-    @SuppressWarnings({"MixinAnnotationTarget", "UnresolvedMixinReference"})
+    @SuppressWarnings({"MixinAnnotationTarget"})
     @ModifyExpressionValue(method = "*", at = @At(value = "FIELD", target = "Lnet/minecraft/entity/player/PlayerInventory;selectedSlot:I", opcode = Opcodes.GETFIELD))
     private int modifySelectedSlot(int original) {
-        final HotbarRequest hotbarRequest = HotbarManager.INSTANCE.getActiveRequest();
-        if (hotbarRequest == null) return original;
-        return hotbarRequest.getSlot();
-    }
-
-    @Inject(method = "getSelectedSlot", at = @At("HEAD"), cancellable = true)
-    private void redirectGetSelectedSlot(CallbackInfoReturnable<Integer> cir) {
-        final HotbarRequest hotbarRequest = HotbarManager.INSTANCE.getActiveRequest();
-        if (hotbarRequest == null) return;
-        cir.setReturnValue(hotbarRequest.getSlot());
+        final int hotbarSlot = HotbarManager.getActiveSlot();
+        if (hotbarSlot == -1) return original;
+        return hotbarSlot;
     }
 }

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

@@ -36,7 +36,7 @@ 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);
+        if (Speed.INSTANCE.isEnabled() && Speed.getMode() == Speed.Mode.GrimStrafe) cir.setReturnValue(true);
         if (TargetStrafe.INSTANCE.isEnabled() && TargetStrafe.isActive()) cir.setReturnValue(true);
     }
 }

src/main/java/com/lambda/mixin/network/ClientPlayNetworkHandlerMixin.java

@@ -20,8 +20,11 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.InventoryEvent;
 import com.lambda.event.events.WorldEvent;
+import com.lambda.interaction.request.inventory.InventoryManager;
 import com.lambda.module.modules.movement.Velocity;
 import com.lambda.module.modules.render.NoRender;
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.network.packet.s2c.play.*;
@@ -103,4 +106,14 @@ public boolean onServerMetadata(ClientPlayNetworkHandler clientPlayNetworkHandle
     void injectVelocity(ExplosionS2CPacket packet, CallbackInfo ci) {
         if (Velocity.getExplosion() && Velocity.INSTANCE.isEnabled()) ci.cancel();
     }
+
+    @WrapMethod(method = "onScreenHandlerSlotUpdate")
+    private void wrapOnScreenHandlerSlotUpdate(ScreenHandlerSlotUpdateS2CPacket packet, Operation<Void> original) {
+        InventoryManager.onSlotUpdate(packet, original);
+    }
+
+    @WrapMethod(method = "onInventory")
+    private void wrapOnInventory(InventoryS2CPacket packet, Operation<Void> original) {
+        InventoryManager.onInventoryUpdate(packet, original);
+    }
 }

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

@@ -0,0 +1,51 @@
+/*
+ * 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.XRay;
+import net.fabricmc.fabric.impl.client.indigo.renderer.mesh.MutableQuadViewImpl;
+import net.fabricmc.fabric.impl.client.indigo.renderer.render.AbstractTerrainRenderContext;
+import net.fabricmc.fabric.impl.client.indigo.renderer.render.BlockRenderInfo;
+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.CallbackInfo;
+
+@SuppressWarnings("UnstableApiUsage")
+@Mixin(AbstractTerrainRenderContext.class)
+public class AbstractTerrainRenderContextMixin {
+    @Final
+    @Shadow(remap = false)
+    protected BlockRenderInfo blockInfo;
+
+    @Inject(method = "bufferQuad", at = @At(value = "INVOKE", target = "Lnet/fabricmc/fabric/impl/client/indigo/renderer/render/AbstractTerrainRenderContext;bufferQuad(Lnet/fabricmc/fabric/impl/client/indigo/renderer/mesh/MutableQuadViewImpl;Lnet/minecraft/client/render/VertexConsumer;)V"), cancellable = true)
+    private void injectBufferQuad(MutableQuadViewImpl quad, CallbackInfo ci) {
+        if (XRay.INSTANCE.isDisabled() || XRay.isSelected(blockInfo.blockState)) return;
+        int opacity = XRay.getOpacity();
+
+        if (opacity == 0) ci.cancel();
+        else if (opacity < 100) {
+            int alpha = (int) (opacity * 2.55f);
+            for (int i = 0; i < 4; i++) {
+                quad.color(i, ((alpha & 0xFF) << 24) | (quad.color(i) & 0x00FFFFFF));
+            }
+        }
+    }
+}

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

@@ -0,0 +1,36 @@
+/*
+ * 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.XRay;
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.math.Direction;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(Block.class)
+public class BlockMixin {
+    @ModifyReturnValue(method = "shouldDrawSide", at = @At("RETURN"))
+    private static boolean modifyShouldDrawSide(boolean original, BlockState state, BlockState otherState, Direction side) {
+        if (XRay.INSTANCE.isEnabled() && XRay.isSelected(state) && XRay.getOpacity() < 100)
+            return true;
+        return original;
+    }
+}

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

@@ -0,0 +1,59 @@
+/*
+ * 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.XRay;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.block.BlockModelRenderer;
+import net.minecraft.client.render.model.BlockModelPart;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.BlockRenderView;
+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.Constant;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.List;
+
+@Mixin(BlockModelRenderer.class)
+public class BlockModelRendererMixin {
+    @Unique private final ThreadLocal<Integer> opacity = new ThreadLocal<>();
+
+    @Inject(method = {"renderSmooth", "renderFlat"}, at = @At("HEAD"), cancellable = true)
+    private void injectRenderSmoothFlat(BlockRenderView world, List<BlockModelPart> parts, BlockState state, BlockPos pos, MatrixStack matrices, VertexConsumer vertexConsumer, boolean cull, int overlay, CallbackInfo ci) {
+        if (XRay.INSTANCE.isDisabled()) {
+            this.opacity.set(-1);
+            return;
+        }
+        int alpha = (int) (XRay.getOpacity() * 2.55);
+
+        if (alpha == 0) ci.cancel();
+        else this.opacity.set(alpha);
+    }
+
+    @ModifyConstant(method = "renderQuad", constant = @Constant(floatValue = 1, ordinal = 3))
+    private float modifyAlpha(float original) {
+        int alpha = this.opacity.get();
+        return alpha == -1 ? original : alpha / 255f;
+    }
+}

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

@@ -33,9 +33,12 @@
 public class CapeFeatureRendererMixin {
     @ModifyExpressionValue(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/state/PlayerEntityRenderState;FF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/SkinTextures;capeTexture()Lnet/minecraft/util/Identifier;"))
     Identifier renderCape(Identifier original, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, PlayerEntityRenderState player, float f, float g) {
-        var entity = Lambda.getMc().world.getEntityById(player.id);
-        if (!Capes.INSTANCE.isEnabled() || !CapeManager.INSTANCE.containsKey(entity.getUuid())) return original;
+        var entry = Lambda.getMc().getNetworkHandler().getPlayerListEntry(player.name); // this will cause issues if we try to render while not in game
+        if (entry == null) return original;
 
-        return Identifier.of("lambda", CapeManager.INSTANCE.get(entity.getUuid()));
+        var profile = entry.getProfile();
+        if (!Capes.INSTANCE.isEnabled() || !CapeManager.INSTANCE.getCache().containsKey(profile.getId())) return original;
+
+        return Identifier.of("lambda", CapeManager.INSTANCE.getCache().get(profile.getId()));
     }
 }