Merge branch '1.21.5' into improvement/scaffold

Author: beanbag44

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

@@ -54,8 +54,7 @@ void injectConstructor(String message, Throwable cause, CallbackInfo ci) {
     @WrapMethod(method = "asString(Lnet/minecraft/util/crash/ReportType;Ljava/util/List;)Ljava/lang/String;")
     String injectString(ReportType type, List<String> extraInfo, Operation<String> original) {
         var list = new ArrayList<>(extraInfo);
-
-        list.add("If this issue is related to Lambda, check if other users have experienced this too, or create a new issue at https://github.com/lambda-client/lambda/issues.\n\n");
+        list.add("If this issue is related to Lambda, check if other users have experienced this too, or create a new issue at " + Lambda.REPO_URL + "/issues.\n\n");
 
         if (MinecraftClient.getInstance() != null) {
             list.add("Enabled modules:");

src/main/java/com/lambda/mixin/items/BarrierBlockMixin.java

@@ -21,6 +21,7 @@
 import net.minecraft.block.BarrierBlock;
 import net.minecraft.block.BlockRenderType;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -33,10 +34,9 @@ public class BarrierBlockMixin {
      */
     @Inject(method = "getRenderType", at = @At("RETURN"), cancellable = true)
     private void getRenderType(BlockState state, CallbackInfoReturnable<BlockRenderType> cir) {
-        // FixMe: This mixins fucks up the loading process by calling the configurations too early and doesn't load the settings
-        /*if (BlockESP.INSTANCE.isEnabled()
+        if (BlockESP.INSTANCE.isEnabled()
                 && BlockESP.getBarrier()
                 && state.getBlock() == Blocks.BARRIER
-        ) cir.setReturnValue(BlockRenderType.MODEL);*/
+        ) cir.setReturnValue(BlockRenderType.MODEL);
     }
 }

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

@@ -34,6 +34,7 @@
 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;
@@ -62,7 +63,7 @@ private void sendingPacketPost(Packet<?> packet, final CallbackInfo callbackInfo
         EventFlow.post(new PacketEvent.Send.Post((Packet<? extends ServerPlayPacketListener>) packet));
     }
 
-    @SuppressWarnings("all")
+    @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.BEFORE), cancellable = true, require = 1)
     private void receivingPacket(
             ChannelHandlerContext channelHandlerContext,

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

@@ -17,9 +17,12 @@
 
 package com.lambda.mixin.render;
 
+import com.lambda.Lambda;
 import com.lambda.interaction.request.rotating.RotationManager;
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.client.render.entity.LivingEntityRenderer;
+import net.minecraft.entity.LivingEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
@@ -44,8 +47,10 @@ public class LivingEntityRendererMixin {
      * }
      * }</pre>
      */
-    @ModifyExpressionValue(method = "updateRenderState(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/client/render/entity/state/LivingEntityRenderState;F)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;getLerpedPitch(F)F"))
-    private float injectRotationPitch(float original) {
-        return Objects.requireNonNullElse(RotationManager.getHeadPitch(), original);
+    @WrapOperation(method = "updateRenderState(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/client/render/entity/state/LivingEntityRenderState;F)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;getLerpedPitch(F)F"))
+    private float wrapGetLerpedPitch(LivingEntity instance, float v, Operation<Float> original) {
+        return (instance == Lambda.getMc().player)
+                ? Objects.requireNonNullElse(RotationManager.getHeadPitch(), original.call(instance, v))
+                : original.call(instance, v);
     }
 }

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

@@ -0,0 +1,38 @@
+/*
+ * 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.gui.components.QuickSearch;
+import net.minecraft.client.gui.screen.Screen;
+import org.lwjgl.glfw.GLFW;
+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(Screen.class)
+public class ScreenMixin {
+
+    @Inject(method = "keyPressed", at = @At("HEAD"), cancellable = true)
+    private void onKeyPressed(int keyCode, int scanCode, int modifiers, CallbackInfoReturnable<Boolean> cir) {
+        if (keyCode == GLFW.GLFW_KEY_ESCAPE && QuickSearch.INSTANCE.isOpen()) {
+            QuickSearch.INSTANCE.close();
+            cir.setReturnValue(true);
+        }
+    }
+}

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

@@ -51,6 +51,7 @@ object Lambda : ClientModInitializer {
     const val MOD_ID = "lambda"
     const val SYMBOL = "λ"
     const val APP_ID = "1221289599427416127"
+    const val REPO_URL = "https://github.com/lambda-client/lambda"
     val VERSION: String = FabricLoader.getInstance()
         .getModContainer("lambda").orElseThrow()
         .metadata.version.friendlyString

src/main/kotlin/com/lambda/config/AbstractSetting.kt

@@ -158,12 +158,12 @@ abstract class AbstractSetting<T : Any>(
         groups.add(path.toList())
     }
 
-    fun reset() {
-        if (value == defaultValue) {
+    fun reset(silent: Boolean = false) {
+        if (!silent && value == defaultValue) {
             ConfigCommand.info(notChangedMessage())
             return
         }
-        ConfigCommand.info(resetMessage(value, defaultValue))
+        if (!silent) ConfigCommand.info(resetMessage(value, defaultValue))
         value = defaultValue
     }
 

src/main/kotlin/com/lambda/config/configurations/ConfigLoader.kt

@@ -25,6 +25,6 @@ object ConfigLoader: Loadable {
         Configuration.configurations.forEach {
             it.tryLoad()
         }
-        return "Loaded ${Configuration.configurations.size} configurations"
+        return "Loading ${Configuration.configurations.size} configurations"
     }
 }

src/main/kotlin/com/lambda/gui/DearImGui.kt

@@ -26,21 +26,26 @@ import com.lambda.module.modules.client.GuiSettings
 import com.lambda.util.path
 import com.mojang.blaze3d.opengl.GlStateManager
 import com.mojang.blaze3d.systems.RenderSystem
+import imgui.ImFontConfig
+import imgui.ImFontGlyphRangesBuilder
 import imgui.ImGui
 import imgui.ImGuiIO
 import imgui.flag.ImGuiConfigFlags
 import imgui.gl3.ImGuiImplGl3
 import imgui.glfw.ImGuiImplGlfw
 import net.minecraft.client.gl.GlBackend
 import net.minecraft.client.texture.GlTexture
-import org.lwjgl.opengl.GL11.glViewport
 import org.lwjgl.opengl.GL30.GL_FRAMEBUFFER
 import kotlin.math.abs
 
 object DearImGui : Loadable {
     val implGlfw = ImGuiImplGlfw()
     val implGl3 = ImGuiImplGl3()
 
+    const val EXTERNAL_LINK = '↗'
+    const val BREADCRUMB_SEPARATOR = '»'
+    const val BASE_FONT_SCALE = 13f
+
     val io: ImGuiIO get() = ImGui.getIO()
     const val DEFAULT_FLAGS = ImGuiConfigFlags.NavEnableKeyboard or // Enable Keyboard Controls
             ImGuiConfigFlags.NavEnableSetMousePos or // Move the cursor using the keyboard
@@ -52,11 +57,20 @@ object DearImGui : Loadable {
     private var targetScale = 0f
 
     private fun updateScale(scale: Float) {
-        io.fonts.clear()
-        val baseFontSize = 13f
-        io.fonts.addFontFromFileTTF("fonts/FiraSans-Regular.ttf".path, baseFontSize * scale)
-        io.fonts.build()
-
+        val glyphRanges = ImFontGlyphRangesBuilder().apply {
+            addRanges(io.fonts.glyphRangesDefault)
+            addRanges(io.fonts.glyphRangesGreek)
+            addChar(EXTERNAL_LINK)
+            addChar(BREADCRUMB_SEPARATOR)
+        }.buildRanges()
+        val fontConfig = ImFontConfig()
+        val size = BASE_FONT_SCALE * scale
+        with(io.fonts) {
+            clear()
+            addFontFromFileTTF("fonts/FiraSans-Regular.ttf".path, size, fontConfig, glyphRanges)
+            addFontFromFileTTF("fonts/MinecraftDefault-Regular.ttf".path, size, fontConfig, glyphRanges)
+            build()
+        }
         implGl3.createFontsTexture()
     }
 

src/main/kotlin/com/lambda/gui/LambdaScreen.kt

@@ -22,8 +22,7 @@ import net.minecraft.client.gui.DrawContext
 import net.minecraft.client.gui.screen.Screen
 import net.minecraft.text.Text
 
-
-object LambdaScreen : Screen(Text.of("")) {
+object LambdaScreen : Screen(Text.of("Lambda")) {
     override fun shouldPause() = false
     override fun removed() = ClickGui.disable()
     override fun render(context: DrawContext?, mouseX: Int, mouseY: Int, deltaTicks: Float) {}