Merge branch '1.21.11' into feature/betterchat

Author: emyfops

gradle.properties

@@ -26,8 +26,6 @@ modAuthors=Constructor (Avanatiker), Blade, beanbag44, Emy
 
 # General
 minecraftVersion=1.21.11
-minecraftVersionMin=1.21.11
-minecraftVersionMax=1.21.11
 lwjglVersion=3.3.3
 mixinExtrasVersion=0.5.0
 kotlinVersion=2.3.0
@@ -55,5 +53,3 @@ kotlin.code.style=official
 # Gradle https://gradle.org/
 org.gradle.jvmargs=-Xmx4096M
 org.gradle.parallel=true
-
-org.jetbrains.dokka.experimental.gradle.pluginMode.nowarn=true

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

@@ -29,6 +29,8 @@
 import com.lambda.module.modules.player.InventoryMove;
 import com.lambda.module.modules.player.PacketMine;
 import com.lambda.util.WindowUtils;
+import com.llamalad7.mixinextras.expression.Definition;
+import com.llamalad7.mixinextras.expression.Expression;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
@@ -40,7 +42,6 @@
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
 import net.minecraft.client.option.KeyBinding;
-import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.sound.SoundManager;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.HitResult;
@@ -49,7 +50,6 @@
 import org.objectweb.asm.Opcodes;
 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.callback.CallbackInfo;
@@ -67,9 +67,6 @@ 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();
@@ -84,8 +81,6 @@ 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);
@@ -98,27 +93,23 @@ void onNetwork(ClientPlayerInteractionManager instance, Operation<Void> original
         EventFlow.post(TickEvent.Network.Post.INSTANCE);
     }
 
+    @Definition(id = "overlay", field = "Lnet/minecraft/client/MinecraftClient;overlay:Lnet/minecraft/client/gui/screen/Overlay;")
+    @Expression("this.overlay == null")
+    @ModifyExpressionValue(method = "tick", at = @At("MIXINEXTRAS:EXPRESSION"))
+    private boolean modifyCurrentScreenNullCheck(boolean original) {
+        if (!original || this.currentScreen != null) {
+            EventFlow.post(TickEvent.Input.Pre.INSTANCE);
+            EventFlow.post(TickEvent.Input.Post.INSTANCE);
+        }
+        return original;
+    }
+
     @WrapOperation(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;handleInputEvents()V"))
     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);
-//    }
+    }
 
     @WrapOperation(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/sound/SoundManager;tick(Z)V"))
     void onSound(SoundManager instance, boolean paused, Operation<Void> original) {

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

@@ -24,9 +24,12 @@
 import com.lambda.event.events.TickEvent;
 import com.lambda.interaction.PlayerPacketHandler;
 import com.lambda.interaction.managers.rotating.RotationManager;
+import com.lambda.module.modules.movement.ElytraFly;
+import com.lambda.module.modules.movement.NoJumpCooldown;
 import com.lambda.module.modules.player.PortalGui;
 import com.lambda.module.modules.render.ViewModel;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
@@ -75,15 +78,22 @@ void processMovement(Input input, Operation<Void> original) {
         EventFlow.post(new MovementEvent.InputUpdate(input));
     }
 
-    /**
-     * Overwrites the movement packet update function to use our code
-     */
-    @Inject(method = "sendMovementPackets", at = @At(value = "HEAD"), cancellable = true)
-    void sendLambdaMovement(CallbackInfo ci) {
-        ci.cancel();
+    @Inject(method = "tickMovement", at = @At("RETURN"))
+    private void injectTickMovement(CallbackInfo ci) {
+        if (NoJumpCooldown.INSTANCE.isEnabled() || (ElytraFly.INSTANCE.isEnabled() && ElytraFly.getMode() == ElytraFly.FlyMode.Bounce)) jumpingCooldown = 0;
+    }
+
+    @Inject(method = "sendMovementPackets", at = @At("HEAD"))
+    private void injectSendMovementPackets(CallbackInfo ci) {
         PlayerPacketHandler.sendPlayerPackets();
         autoJumpEnabled = Lambda.getMc().options.getAutoJump().getValue();
     }
+    
+    @WrapWithCondition(method = "sendMovementPackets", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;sendSprintingPacket()V"))
+    private boolean wrapSendSprintingPackets(ClientPlayerEntity instance) { return false; }
+
+    @ModifyExpressionValue(method = "sendMovementPackets", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isCamera()Z"))
+    private boolean wrapIsCamera(boolean original) { return false; }
 
     @ModifyExpressionValue(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isSprinting()Z"))
     boolean isSprinting(boolean original) {

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

@@ -22,15 +22,16 @@
 import com.lambda.event.events.EntityEvent;
 import com.lambda.event.events.PlayerEvent;
 import com.lambda.interaction.managers.rotating.RotationManager;
-import com.lambda.interaction.managers.rotating.RotationMode;
-import com.lambda.module.modules.player.RotationLock;
+import com.lambda.module.modules.movement.ElytraFly;
 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 com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityPose;
 import net.minecraft.entity.MovementType;
 import net.minecraft.entity.data.TrackedData;
 import net.minecraft.util.math.Vec3d;
@@ -39,6 +40,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(Entity.class)
 public abstract class EntityMixin {
@@ -149,17 +151,25 @@ private boolean modifyGetFlagGlowing(boolean 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.INSTANCE.getRotationConfig().getRotationMode() != RotationMode.Lock ||
-                RotationLock.getYawMode() == RotationLock.Mode.None);
+        return RotationManager.getLockYaw() == null;
     }
 
     @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.INSTANCE.getRotationConfig().getRotationMode() != RotationMode.Lock ||
-                RotationLock.getPitchMode() == RotationLock.Mode.None);
+        return RotationManager.getLockPitch() == null;
+    }
+
+    @Inject(method = "isSprinting()Z", at = @At("HEAD"), cancellable = true)
+    private void injectIsSprinting(CallbackInfoReturnable<Boolean> cir) {
+        var player = Lambda.getMc().player;
+        if ((Object) this != Lambda.getMc().player) return;
+        if (ElytraFly.INSTANCE.isEnabled() && ElytraFly.getMode() == ElytraFly.FlyMode.Bounce && player.isGliding()) cir.setReturnValue(true);
+    }
+
+    @Inject(method = "getPose", at = @At("HEAD"), cancellable = true)
+    private void injectGetPose(CallbackInfoReturnable<EntityPose> cir) {
+        var entity = (Entity) (Object) this;
+        if (!(entity instanceof ClientPlayerEntity player)) return;
+        if (ElytraFly.INSTANCE.isEnabled() && ElytraFly.getMode() == ElytraFly.FlyMode.Bounce && player.isGliding()) cir.setReturnValue(EntityPose.GLIDING);
     }
 }

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

@@ -30,7 +30,7 @@
 public class FireworkRocketEntityMixin {
     @WrapOperation(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;setVelocity(Lnet/minecraft/util/math/Vec3d;)V"))
     private void wrapSetVelocity(LivingEntity shooter, Vec3d vec3d, Operation<Void> original) {
-        if (ElytraFly.getDoBoost()) {
+        if (ElytraFly.INSTANCE.isEnabled()) {
             ElytraFly.boostRocket();
         } else original.call(shooter, vec3d);
     }

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

@@ -21,6 +21,7 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.MovementEvent;
 import com.lambda.interaction.managers.rotating.RotationManager;
+import com.lambda.module.modules.movement.ElytraFly;
 import com.lambda.module.modules.movement.Velocity;
 import com.lambda.module.modules.render.ViewModel;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
@@ -34,11 +35,10 @@
 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.Constant;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyConstant;
 import org.spongepowered.asm.mixin.injection.Slice;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(LivingEntity.class)
 public abstract class LivingEntityMixin extends EntityMixin {
@@ -184,4 +184,10 @@ private void wrapPushAwayFrom(Entity entity, Operation<Void> original) {
                 Velocity.getPushed()) return;
         original.call(entity);
     }
+
+    @Inject(method = "isGliding", at = @At("HEAD"), cancellable = true)
+    private void injectIsGliding(CallbackInfoReturnable<Boolean> cir) {
+        if (lambda$instance != Lambda.getMc().player) return;
+        cir.setReturnValue(ElytraFly.isGliding());
+    }
 }

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

@@ -18,25 +18,73 @@
 package com.lambda.mixin.render;
 
 import com.lambda.module.modules.render.ContainerPreview;
+import com.lambda.module.modules.render.MapPreview;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.tooltip.TooltipComponent;
-import net.minecraft.client.gui.tooltip.TooltipPositioner;
+import net.minecraft.client.render.MapRenderState;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.item.FilledMapItem;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
 import net.minecraft.item.tooltip.TooltipData;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
+import org.joml.Matrix3x2fStack;
+import org.spongepowered.asm.mixin.Final;
 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.callback.CallbackInfo;
 
 import java.util.List;
 import java.util.Optional;
 
+/*
+Map slot rendering code
+Original source: https://github.com/Crec0/map-in-slot
+Copyright (c) 2022 Crec0
+Licensed under MIT License
+ */
 @Mixin(DrawContext.class)
-public class DrawContextMixin {
+public abstract class DrawContextMixin {
+    @Shadow
+    @Final
+    MinecraftClient client;
+
+    @Unique
+    private final MapRenderState mapRenderState = new MapRenderState();
+
+    @Shadow
+    public abstract Matrix3x2fStack getMatrices();
+
+    @Shadow
+    public abstract void drawMap(MapRenderState mapRenderState);
+
+    @Inject(method = "drawStackOverlay(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V", at = @At(value = "TAIL"))
+    private void injectDrawMap(TextRenderer textRenderer, ItemStack stack, int i, int j, String string, CallbackInfo ci) {
+        if (MapPreview.INSTANCE.isDisabled() || !MapPreview.getShowInSlot()) return;
+
+        if (!stack.isOf(Items.FILLED_MAP)) return;
+
+        var mapId = stack.get(DataComponentTypes.MAP_ID);
+        var savedData = FilledMapItem.getMapState(mapId, client.world);
+
+        if (savedData == null) return;
+
+        this.getMatrices().pushMatrix();
+        this.getMatrices().translate(i, j);
+        this.getMatrices().scale(0.125F, 0.125F);
+
+        client.getMapRenderer().update(mapId, savedData, this.mapRenderState);
+        this.drawMap(this.mapRenderState);
+
+        this.getMatrices().popMatrix();
+    }
+
     @Inject(method = "drawTooltip(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;Ljava/util/Optional;IILnet/minecraft/util/Identifier;)V", at = @At("HEAD"), cancellable = true)
     private void onDrawTooltip(TextRenderer textRenderer, List<Text> text, Optional<TooltipData> data, int x, int y, @Nullable Identifier texture, CallbackInfo ci) {
         if (!ContainerPreview.INSTANCE.isEnabled()) return;

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

@@ -0,0 +1,44 @@
+/*
+ * 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 com.mojang.blaze3d.buffers.GpuBuffer;
+import com.mojang.blaze3d.buffers.GpuBufferSlice;
+import net.minecraft.client.render.fog.FogRenderer;
+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 static net.minecraft.client.render.fog.FogRenderer.FOG_UBO_SIZE;
+
+@Mixin(FogRenderer.class)
+public class FogRendererMixin {
+    @Final
+    @Shadow
+    private GpuBuffer emptyBuffer;
+
+    @Inject(method = "getFogBuffer", at = @At("HEAD"), cancellable = true)
+    private void modify(FogRenderer.FogType fogType, CallbackInfoReturnable<GpuBufferSlice> cir) {
+        if (fogType == FogRenderer.FogType.WORLD && NoRender.INSTANCE.isEnabled() && NoRender.getNoTerrainFog())
+            cir.setReturnValue(emptyBuffer.slice(0L, FOG_UBO_SIZE));
+    }
+}