Merge branch '1.21.5' into refactor/3d

Author: emyfops

src/main/java/com/lambda/mixin/MinecraftClientMixin.java

@@ -17,6 +17,7 @@
 
 package com.lambda.mixin;
 
+import com.lambda.core.TimerManager;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.ClientEvent;
 import com.lambda.event.events.InventoryEvent;
@@ -42,6 +43,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+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;
@@ -60,6 +62,9 @@ public class MinecraftClientMixin {
     @Shadow
     public int itemUseCooldown;
 
+    @Unique
+    private boolean lambda$inputHandledThisTick;
+
     @Inject(method = "close", at = @At("HEAD"))
     void closeImGui(CallbackInfo ci) {
         DearImGui.INSTANCE.destroy();
@@ -74,6 +79,8 @@ void onLoopTick(boolean tick, Operation<Void> original) {
 
     @WrapMethod(method = "tick")
     void onTick(Operation<Void> original) {
+        this.lambda$inputHandledThisTick = false;
+
         EventFlow.post(TickEvent.Pre.INSTANCE);
         original.call();
         EventFlow.post(TickEvent.Post.INSTANCE);
@@ -91,10 +98,18 @@ void onInput(MinecraftClient instance, Operation<Void> original) {
         EventFlow.post(TickEvent.Input.Pre.INSTANCE);
         original.call(instance);
         EventFlow.post(TickEvent.Input.Post.INSTANCE);
+
+        this.lambda$inputHandledThisTick = true;
     }
 
     @WrapOperation(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;tick()V"))
     void onWorldRenderer(WorldRenderer instance, Operation<Void> original) {
+        if (!this.lambda$inputHandledThisTick) {
+            EventFlow.post(TickEvent.Input.Pre.INSTANCE);
+            EventFlow.post(TickEvent.Input.Post.INSTANCE);
+            this.lambda$inputHandledThisTick = true;
+        }
+
         EventFlow.post(TickEvent.WorldRender.Pre.INSTANCE);
         original.call(instance);
         EventFlow.post(TickEvent.WorldRender.Post.INSTANCE);
@@ -171,4 +186,14 @@ void injectFastPlace(CallbackInfo ci) {
 
         itemUseCooldown = Interact.getPlaceDelay();
     }
+
+    @WrapMethod(method = "getTargetMillisPerTick")
+    float getTargetMillisPerTick(float millis, Operation<Float> original) {
+        var length = TimerManager.INSTANCE.getLength();
+
+        if (length == TimerManager.DEFAULT_LENGTH)
+            return original.call(millis);
+        else
+            return (float) TimerManager.INSTANCE.getLength();
+    }
 }

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

@@ -20,8 +20,8 @@
 import baritone.Baritone;
 import baritone.api.utils.Rotation;
 import baritone.utils.player.BaritonePlayerContext;
+import com.lambda.interaction.BaritoneManager;
 import com.lambda.interaction.request.rotating.RotationManager;
-import com.lambda.util.BaritoneUtils;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -38,7 +38,7 @@ public class MixinBaritonePlayerContext {
     // 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;
+        if (baritone != BaritoneManager.getPrimary()) return;
 
         RotationManager rm = RotationManager.INSTANCE;
         cir.setReturnValue(new Rotation(

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

@@ -21,8 +21,8 @@
 import baritone.api.event.events.RotationMoveEvent;
 import baritone.api.utils.Rotation;
 import baritone.behavior.LookBehavior;
+import com.lambda.interaction.BaritoneManager;
 import com.lambda.interaction.request.rotating.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;
@@ -34,24 +34,24 @@ public class MixinLookBehavior {
     @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;
+        if (instance.baritone != BaritoneManager.getPrimary()) return;
 
-        RotationManager.handleBaritoneRotation(rotation.getYaw(), rotation.getPitch());
+        RotationManager.handleBaritoneRotation(rotation.getYaw());
         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;
+        if (instance.baritone != BaritoneManager.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;
+        if (instance.baritone != BaritoneManager.getPrimary()) return;
 
         ci.cancel();
     }

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

@@ -22,7 +22,12 @@
 import com.lambda.event.events.EntityEvent;
 import com.lambda.event.events.PlayerEvent;
 import com.lambda.interaction.request.rotating.RotationManager;
+import com.lambda.interaction.request.rotating.RotationMode;
+import com.lambda.module.modules.player.RotationLock;
+import com.lambda.module.modules.render.NoRender;
 import com.lambda.util.math.Vec2d;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.MovementType;
 import net.minecraft.entity.data.TrackedData;
@@ -130,4 +135,30 @@ public void onTrackedDataSet(TrackedData<?> data, CallbackInfo ci) {
         Entity entity = (Entity) (Object) this;
         EventFlow.post(new EntityEvent.Update(entity, data));
     }
+
+    @ModifyExpressionValue(method = "isInvisible", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;getFlag(I)Z"))
+    private boolean modifyGetFlagInvisible(boolean original) {
+        return (NoRender.INSTANCE.isDisabled() || !NoRender.getNoInvisibility()) && original;
+    }
+
+    @ModifyExpressionValue(method = "isGlowing", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;getFlag(I)Z"))
+    private boolean modifyGetFlagGlowing(boolean original) {
+        return (NoRender.INSTANCE.isDisabled() || !NoRender.getNoGlow()) && original;
+    }
+
+    @WrapWithCondition(method = "changeLookDirection", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;setYaw(F)V"))
+    private boolean wrapSetYaw(Entity instance, float yaw) {
+        return (instance != Lambda.getMc().player ||
+                RotationLock.INSTANCE.isDisabled() ||
+                RotationLock.getRotationSettings().getRotationMode() != RotationMode.Lock ||
+                RotationLock.getYawMode() == RotationLock.RotationMode.None);
+    }
+
+    @WrapWithCondition(method = "changeLookDirection", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;setPitch(F)V"))
+    private boolean wrapSetPitch(Entity instance, float yaw) {
+        return (instance != Lambda.getMc().player ||
+                RotationLock.INSTANCE.isDisabled() ||
+                RotationLock.getRotationSettings().getRotationMode() != RotationMode.Lock ||
+                RotationLock.getPitchMode() == RotationLock.RotationMode.None);
+    }
 }

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

@@ -19,12 +19,16 @@
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.MouseEvent;
+import com.lambda.module.modules.render.Zoom;
 import com.lambda.util.math.Vec2d;
 import net.minecraft.client.Mouse;
+import net.minecraft.client.option.GameOptions;
+import net.minecraft.client.option.SimpleOption;
 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(Mouse.class)
@@ -61,4 +65,17 @@ private void onCursorPos(long window, double x, double y, CallbackInfo ci) {
             ci.cancel();
         }
     }
+
+    @Redirect(method = "updateMouse", at = @At(value = "FIELD", target = "Lnet/minecraft/client/option/GameOptions;smoothCameraEnabled:Z"))
+    private boolean redirectSmoothCameraEnabled(GameOptions instance) {
+        if (Zoom.INSTANCE.isEnabled() && Zoom.getSmoothMovement()) return true;
+        else return instance.smoothCameraEnabled;
+    }
+
+    @SuppressWarnings("rawtypes")
+    @Redirect(method = "updateMouse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/option/SimpleOption;getValue()Ljava/lang/Object;", ordinal = 0))
+    private Object redirectGetValue(SimpleOption instance) {
+        if (Zoom.INSTANCE.isEnabled()) return ((Double) instance.getValue()) / Zoom.getTargetZoom();
+        else return instance.getValue();
+    }
 }

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

@@ -103,12 +103,4 @@ public boolean onServerMetadata(ClientPlayNetworkHandler clientPlayNetworkHandle
     void injectVelocity(ExplosionS2CPacket packet, CallbackInfo ci) {
         if (Velocity.getExplosion() && Velocity.INSTANCE.isEnabled()) ci.cancel();
     }
-
-    /**
-     * Cancels the world particle if {@link NoRender#getNoExplosion()} is true
-     */
-    @Inject(method = "onExplosion(Lnet/minecraft/network/packet/s2c/play/ExplosionS2CPacket;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;addParticleClient(Lnet/minecraft/particle/ParticleEffect;DDDDDD)V"), cancellable = true)
-    void injectParticles(ExplosionS2CPacket packet, CallbackInfo ci) {
-        if (NoRender.getNoExplosion() && NoRender.INSTANCE.isEnabled()) ci.cancel();
-    }
-}
+}

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

@@ -0,0 +1,37 @@
+/*
+ * 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.block.entity.SignText;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.block.entity.AbstractSignBlockEntityRenderer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.math.BlockPos;
+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(AbstractSignBlockEntityRenderer.class)
+public class AbstractSignBlockEntityRendererMixin {
+    @Inject(method = "renderText", at = @At("HEAD"), cancellable = true)
+    private void injectRenderText(BlockPos pos, SignText text, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int textLineHeight, int maxTextWidth, boolean front, CallbackInfo ci) {
+        if (NoRender.INSTANCE.isEnabled() && NoRender.getNoSignText()) ci.cancel();
+    }
+}

src/main/java/com/lambda/mixin/render/ArmorFeatureRendererMixin.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.NoRender;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.entity.feature.ArmorFeatureRenderer;
+import net.minecraft.client.render.entity.state.BipedEntityRenderState;
+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(ArmorFeatureRenderer.class)
+public class ArmorFeatureRendererMixin {
+    @Inject(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/state/BipedEntityRenderState;FF)V", at = @At("HEAD"), cancellable = true)
+    private void injectRender(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, BipedEntityRenderState bipedEntityRenderState, float f, float g, CallbackInfo ci) {
+        if (NoRender.INSTANCE.isEnabled() && NoRender.getNoArmor()) ci.cancel();
+    }
+}

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

@@ -17,13 +17,23 @@
 
 package com.lambda.mixin.render;
 
+import com.lambda.module.modules.render.NoRender;
 import com.lambda.module.modules.render.WorldColors;
 import net.minecraft.client.render.BackgroundRenderer;
+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.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.List;
+import java.util.stream.Stream;
 
 /**
  * <pre>{@code
@@ -39,6 +49,8 @@
 // FixMe: This crashes the game
 @Mixin(BackgroundRenderer.class)
 public class BackgroundRendererMixin {
+    @Shadow @Final private static List<BackgroundRenderer.StatusEffectFogModifier> FOG_MODIFIERS;
+
     @Redirect(method = "getFogColor", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/Vec3d;getX()D"))
     private static double redirectRed(Vec3d baseColor) {
         return WorldColors.fogOfWarColor(baseColor).getX();
@@ -59,4 +71,15 @@ private static int redirectWaterFogColor(Biome biome) {
         return WorldColors.waterFogColor(biome.getWaterFogColor());
     }
 
+    @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));
+        }
+    }
 }

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

@@ -0,0 +1,37 @@
+/*
+ * 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.block.entity.BlockEntity;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.block.entity.BeaconBlockEntityRenderer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.math.Vec3d;
+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(BeaconBlockEntityRenderer.class)
+public class BeaconBlockEntityRendererMixin {
+    @Inject(method = "render", at = @At("HEAD"), cancellable = true)
+    private void injectRender(BlockEntity entity, float tickProgress, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, Vec3d cameraPos, CallbackInfo ci) {
+        if (NoRender.INSTANCE.isEnabled() && NoRender.getNoBeaconBeams()) ci.cancel();
+    }
+}