Merge branch '1.21.5' into feature/mouse-button-binds

Author: beanbag44

build.gradle.kts

@@ -211,37 +211,6 @@ tasks {
         // Forces the task to always run
         outputs.upToDateWhen { false }
     }
-
-    // Visual debugger for OpenGL
-    register<Exec>("renderDoc") {
-        // You need renderdoc installed on your system and available in your environment variables in order
-        // to use this task.
-        // You can download it from their official website at https://renderdoc.org/
-
-        val javaHome = Jvm.current().javaHome
-        val gradle = rootProject.tasks.wrapper.get().jarFile.absolutePath
-
-        val seperator =
-            if (Os.isFamily(Os.FAMILY_WINDOWS)) ";" else ":"
-
-        commandLine = listOf(
-            "renderdoccmd", "capture", "--opt-api-validation", "--opt-api-validation-unmute", "--opt-hook-children", "--wait-for-exit", "--working-dir", ".",
-            "$javaHome/bin/java",
-            //"-javaagent:${projectDir.resolve("lwjglx-debug-1.0.0.jar")}=t",
-            //"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005",
-            "-Dorg.gradle.appname=gradlew",
-            "-Dorg.gradle.java.home=$javaHome",
-            "-Dorg.lwjgl.util.Debug=true",
-            "-Dorg.lwjgl.util.DebugLoader=true",
-            "-Dorg.lwjgl.util.DebugAllocator=true",
-            "-Dorg.lwjgl.util.DebugStack=true",
-            "-Dorg.lwjgl.util.DebugFunctions=true",
-            "-cp", listOf(projectDir.resolve("lwjgl.jar"), gradle, projectDir.resolve("lwjglx-debug-1.0.0.jar"))
-                .joinToString(seperator),
-            "org.gradle.wrapper.GradleWrapperMain",
-            "runClient",
-        )
-    }
 }
 
 kotlin {

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

@@ -78,6 +78,6 @@ private void injectShowFloatingItem(ItemStack floatingItem, CallbackInfo ci) {
 
     @ModifyReturnValue(method = "getFov", at = @At("RETURN"))
     private float modifyGetFov(float original) {
-        return original / Zoom.getCurrentZoom();
+        return original / Zoom.getLerpedZoom();
     }
 }

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

@@ -44,6 +44,13 @@ private boolean renderSetupTerrainModifyArg(boolean hasForcedFrustum) {
         return Freecam.INSTANCE.isEnabled() || CameraTweaks.INSTANCE.isEnabled() || hasForcedFrustum;
     }
 
+    @ModifyArg(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/BackgroundRenderer;applyFog(Lnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/BackgroundRenderer$FogType;Lorg/joml/Vector4f;FZF)Lnet/minecraft/client/render/Fog;", ordinal = 0), index = 3)
+    private float modifyApplyFogRenderDistance(float viewDistance) {
+        return NoRender.INSTANCE.isEnabled() && NoRender.getNoTerrainFog()
+                ? Float.MAX_VALUE
+                : viewDistance;
+    }
+
     @Inject(method = "hasBlindnessOrDarkness(Lnet/minecraft/client/render/Camera;)Z", at = @At(value = "HEAD"), cancellable = true)
     private void modifyEffectCheck(Camera camera, CallbackInfoReturnable<Boolean> cir) {
         Entity entity = camera.getFocusedEntity();

src/main/kotlin/com/lambda/command/commands/ModuleCommand.kt

@@ -75,9 +75,7 @@ object ModuleCommand : LambdaCommand(
 
         required(string("module name")) { moduleName ->
             suggests { _, builder ->
-                ModuleRegistry.modules.map {
-                    it.name
-                }.forEach {
+                ModuleRegistry.moduleNames.forEach {
                     builder.suggest(it)
                 }
                 builder.buildFuture()

src/main/kotlin/com/lambda/config/settings/numeric/DoubleSetting.kt

@@ -26,6 +26,7 @@ import com.lambda.config.settings.NumericSetting
 import com.lambda.gui.dsl.ImGuiBuilder
 import com.lambda.util.extension.CommandBuilder
 import net.minecraft.command.CommandRegistryAccess
+import kotlin.math.roundToInt
 
 /**
  * @see [com.lambda.config.Configurable]
@@ -47,7 +48,7 @@ class DoubleSetting(
     visibility
 ) {
     private var valueIndex: Int
-        get() = ((value - range.start) / step).toInt()
+        get() = ((value - range.start) / step).roundToInt()
         set(index) {
             value = (range.start + index * step).coerceIn(range)
         }

src/main/kotlin/com/lambda/config/settings/numeric/FloatSetting.kt

@@ -25,6 +25,7 @@ import com.lambda.config.settings.NumericSetting
 import com.lambda.gui.dsl.ImGuiBuilder
 import com.lambda.util.extension.CommandBuilder
 import net.minecraft.command.CommandRegistryAccess
+import kotlin.math.roundToInt
 
 /**
  * @see [com.lambda.config.Configurable]
@@ -46,7 +47,7 @@ class FloatSetting(
     visibility
 ) {
     private var valueIndex: Int
-        get() = ((value - range.start) / step).toInt()
+        get() = ((value - range.start) / step).roundToInt()
         set(index) {
             value = (range.start + index * step).coerceIn(range)
         }