Merge branch '1.21.5' into feature/packetmine-rewrite

Author: emyfops

build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Lambda
+ * 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
@@ -17,9 +17,6 @@
 
 import org.gradle.internal.jvm.*
 import net.fabricmc.loom.api.LoomGradleExtensionAPI
-import org.apache.tools.ant.taskdefs.condition.Os
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import java.io.FileNotFoundException
 import java.util.*
 
 val modId: String by project
@@ -38,11 +35,11 @@ val Project.loom: LoomGradleExtensionAPI
     get() = (this as ExtensionAware).extensions.getByName("loom") as LoomGradleExtensionAPI
 
 plugins {
-    kotlin("jvm") version "2.1.20"
+    kotlin("jvm") version "2.1.10"
     id("org.jetbrains.dokka") version "2.0.0"
     id("architectury-plugin") version "3.4-SNAPSHOT"
-    id("dev.architectury.loom") version "1.9-SNAPSHOT" apply false
-    id("com.github.johnrengelman.shadow") version "8.1.1" apply false
+    id("dev.architectury.loom") version "1.10-SNAPSHOT" apply false
+    id("com.gradleup.shadow") version "9.0.0-beta13" apply false
     id("maven-publish")
 }
 
@@ -57,7 +54,10 @@ subprojects {
 
     dependencies {
         "minecraft"("com.mojang:minecraft:$minecraftVersion")
-        "mappings"("net.fabricmc:yarn:$minecraftVersion+$yarnMappings:v2")
+        "mappings"(loom.layered {
+            mappings("net.fabricmc:yarn:$minecraftVersion+$yarnMappings:v2")
+            mappings("dev.architectury:yarn-mappings-patch-neoforge:1.21+build.4")
+        })
     }
 
     publishing {
@@ -85,33 +85,44 @@ subprojects {
 
     if (path == ":common") return@subprojects
 
+    loom.mods {
+        maybeCreate("main").apply {
+            sourceSet(project.sourceSets.main.get())
+            sourceSet(project(":common").sourceSets.main.get())
+        }
+    }
+
     loom.runs {
         all {
             property("lambda.dev", "youtu.be/RYnFIRc0k6E")
+            property("org.lwjgl.util.Debug", "true")
+
+            vmArgs("-XX:+HeapDumpOnOutOfMemoryError", "-XX:+CreateCoredumpOnCrash", "-XX:+UseOSErrorReporting")
+            programArgs("--username", "Steve", "--uuid", "8667ba71b85a4004af54457a9734eed7", "--accessToken", "****", "--userType", "msa")
         }
     }
 
     tasks {
+        processResources {
+            // Replaces placeholders in the mod info files
+            filesMatching(targets) { expand(replacements) }
+
+            // Forces the task to always run
+            outputs.upToDateWhen { false }
+        }
+
         register<Exec>("renderDoc") {
             val javaHome = Jvm.current().javaHome
             val gradleWrapper = rootProject.tasks.wrapper.get().jarFile.absolutePath
 
             commandLine = listOf(
-                findExecutable("renderdoccmd")
-                    ?: throw FileNotFoundException("Could not find the renderdoccmd executable"),
-                "capture", /* Remove the following 2 lines if you don't want api validation */ "--opt-api-validation", "--opt-api-validation-unmute", "--opt-hook-children", "--wait-for-exit", "--working-dir", ".", "$javaHome/bin/java", "-Xmx64m", "-Xms64m", /*"-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005",*/ "-Dorg.gradle.appname=gradlew", "-Dorg.gradle.java.home=$javaHome", "-classpath", gradleWrapper, "org.gradle.wrapper.GradleWrapperMain", "${this@subprojects.path}:runClient",
+                "renderdoccmd", "capture", "--opt-api-validation", "--opt-api-validation-unmute", "--opt-hook-children",
+                "--wait-for-exit", "--working-dir", ".", "$javaHome/bin/java", "-Xmx64m", "-Xms64m",
+                /*"-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005",*/
+                "-Dorg.gradle.appname=gradlew", "-Dorg.gradle.java.home=$javaHome", "-classpath", gradleWrapper, "org.gradle.wrapper.GradleWrapperMain",
+                "${this@subprojects.path}:runClient",
             )
         }
-
-        processResources {
-            // Replaces placeholders in the mod info files
-            filesMatching(targets) {
-                expand(replacements)
-            }
-
-            // Forces the task to always run
-            outputs.upToDateWhen { false }
-        }
     }
 }
 
@@ -130,7 +141,7 @@ allprojects {
         mavenLocal() // Allow the use of local repositories
         maven("https://maven.shedaniel.me/") // Architectury
         maven("https://maven.terraformersmc.com/releases/")
-        maven("https://babbaj.github.io/maven/") // Baritone
+        maven("https://maven.2b2t.vc/releases") // Baritone
         maven("https://jitpack.io") // KDiscordIPC
         mavenCentral()
 
@@ -143,22 +154,7 @@ allprojects {
     java {
         withSourcesJar()
 
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
-
-    tasks {
-        compileKotlin {
-            compilerOptions {
-                jvmTarget = JvmTarget.JVM_17
-            }
-        }
-    }
-}
-
-private fun findExecutable(executable: String): String? {
-    val isWindows = Os.isFamily(Os.FAMILY_WINDOWS)
-    val cmd = if (isWindows) "where" else "which"
-
-    return ProcessBuilder(cmd, executable).start().inputStream.bufferedReader().readText().trim().takeIf { it.isNotBlank() }
 }

common/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Lambda
+ * 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
@@ -15,20 +15,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+val modId: String by project
 val modVersion: String by project
 val minecraftVersion: String by project
-val modId: String by project
 val fabricLoaderVersion: String by project
-val kotlinxCoroutinesVersion: String by project
+val pngEncoderVersion: String by project
 val discordIPCVersion: String by project
+val classGraphVersion: String by project
+val kotlinVersion: String by project
 val ktorVersion: String by project
 val mockitoKotlin: String by project
 val mockitoInline: String by project
 val mockkVersion: String by project
 
 base.archivesName = "${base.archivesName.get()}-api"
 
-architectury { common("fabric", "forge") }
+architectury { common("fabric") }
 
 loom {
     silentMojangMappingsLicense()
@@ -42,24 +44,24 @@ repositories {
 dependencies {
     // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
     // Do NOT use other classes from fabric loader
-    modImplementation("net.fabricmc:fabric-loader:$fabricLoaderVersion")
+    modImplementation("net.fabricmc:fabric-loader:$fabricLoaderVersion") { isTransitive = false }
 
     // Add dependencies on the required Kotlin modules.
-    implementation("org.reflections:reflections:0.10.2")
+    implementation("io.github.classgraph:classgraph:${classGraphVersion}")
     implementation("com.github.Edouard127:KDiscordIPC:$discordIPCVersion")
-    implementation("com.pngencoder:pngencoder:0.15.0")
+    implementation("com.pngencoder:pngencoder:$pngEncoderVersion")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
 
     // Ktor
     implementation("io.ktor:ktor-client-core:$ktorVersion")
     implementation("io.ktor:ktor-client-cio:$ktorVersion")
     implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
     implementation("io.ktor:ktor-serialization-gson:$ktorVersion")
 
-    // Add Kotlin
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
+    implementation("io.github.classgraph:classgraph:4.8.179")
 
     // Baritone
-    modImplementation("baritone-api:baritone-unoptimized-fabric:1.10.2") { isTransitive = false }
+    modImplementation("com.github.rfresh2:baritone-fabric:$minecraftVersion")
 
     // Test implementations
     testImplementation(kotlin("test"))
@@ -77,10 +79,10 @@ tasks {
         useJUnitPlatform()
         jvmArgs("-XX:+EnableDynamicAgentLoading", "-Xshare:off")
     }
-}
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = "17"
+    compileKotlin {
+        compilerOptions {
+            freeCompilerArgs.set(listOf("-Xwhen-guards"))
+        }
     }
 }

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

@@ -18,23 +18,27 @@
 package com.lambda.mixin;
 
 import com.lambda.Lambda;
+import com.lambda.config.AbstractSetting;
 import com.lambda.module.Module;
 import com.lambda.module.ModuleRegistry;
 import com.lambda.util.DynamicException;
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.util.Util;
 import net.minecraft.util.crash.CrashReport;
+import net.minecraft.util.crash.ReportType;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
 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;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-// Modify the crash report behavior for dynamic remapping, Easter egg and github issue link
+import java.util.ArrayList;
+import java.util.List;
+
+// Modify the crash report behavior for dynamic remapping and GitHub issue link
 @Mixin(CrashReport.class)
 public class CrashReportMixin {
     @Mutable
@@ -47,33 +51,30 @@ void injectConstructor(String message, Throwable cause, CallbackInfo ci) {
         }
     }
 
-    @Redirect(method = "asString()Ljava/lang/String;", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/crash/CrashReport;addStackTrace(Ljava/lang/StringBuilder;)V"))
-    void injectString(CrashReport instance, StringBuilder stringBuilder) {
-        stringBuilder.append("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");
+    @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");
 
         if (MinecraftClient.getInstance() != null) {
-            stringBuilder.append("Enabled modules:\n");
+            list.add("Enabled modules:");
 
             ModuleRegistry.INSTANCE.getModules()
-                    .stream().filter(Module::isEnabled)
-                    .forEach(m -> stringBuilder.append("\t").append(m.getName()).append("\n"));
-        }
-
-        stringBuilder.append("\n");
-        stringBuilder.append("-".repeat(43));
-        stringBuilder.append("\n\n");
+                    .stream()
+                    .filter(Module::isEnabled)
+                    .forEach(module -> {
+                        list.add(String.format("\t%s", module.getName()));
 
-        instance.addStackTrace(stringBuilder);
-    }
+                        module.getSettings()
+                                .stream()
+                                .filter(AbstractSetting::isModified)
+                                .forEach(setting -> list.add(String.format("\t\t%s -> %s", setting.getName(), setting.getValue())));
+                    });
+        }
 
-    @Inject(method = "generateWittyComment()Ljava/lang/String;", at = @At("HEAD"), cancellable = true)
-    private static void generateWittyComment(CallbackInfoReturnable<String> cir) {
-        String[] strings = new String[]{"Who set us up the TNT?", "Everything's going to plan. No, really, that was supposed to happen.", "Uh... Did I do that?", "Oops.", "Why did you do that?", "I feel sad now :(", "My bad.", "I'm sorry, Dave.", "I let you down. Sorry :(", "On the bright side, I bought you a teddy bear!", "Daisy, daisy...", "Oh - I know what I did wrong!", "Hey, that tickles! Hehehe!", "I blame Dinnerbone.", "You should try our sister game, Minceraft!", "Don't be sad. I'll do better next time, I promise!", "Don't be sad, have a hug! <3", "I just don't know what went wrong :(", "Shall we play a game?", "Quite honestly, I wouldn't worry myself about that.", "I bet Cylons wouldn't have this problem.", "Sorry :(", "Surprise! Haha. Well, this is awkward.", "Would you like a cupcake?", "Hi. I'm Minecraft, and I'm a crashaholic.", "Ooh. Shiny.", "This doesn't make any sense!", "Why is it breaking :(", "Don't do that.", "Ouch. That hurt :(", "You're mean.", "This is a token for 1 free hug. Redeem at your nearest Mojangsta: [~~HUG~~]", "There are four lights!", "But it works on my machine.", "Popbob was here.", "The oldest anarchy server in Minecraft.", "Better luck next time..", "Fatal error occurred user is too based.", "Running premium software on a potato is not advised", "I don't know, ask that kilab guy", "Ah shit, here we go again.", "I will uhh, fix that sometime.", "Not a bug, a feature!", "You should try out Lambda on Windows XP.", "Blade did that."};
+        list.add("\n"+"-".repeat(43)+"\n");
 
-        try {
-            cir.setReturnValue(strings[(int)(Util.getMeasuringTimeNano() % (long)strings.length)]);
-        } catch (Throwable var2) {
-            cir.setReturnValue("Witty comment unavailable :(");
-        }
+        return original.call(type, list);
     }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Lambda
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Lambda
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Lambda
+ * 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

common/src/main/java/com/lambda/mixin/client/sound/SoundSystemMixin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Lambda
+ * 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

common/src/main/java/com/lambda/mixin/entity/ClientPlayInteractionManagerMixin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Lambda
+ * 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
@@ -98,9 +98,9 @@ public void clickSlotHead(int syncId, int slotId, int button, SlotActionType act
      * }
      * }</pre>
      */
-    @Redirect(method = "syncSelectedSlot", at = @At(value = "FIELD", target = "Lnet/minecraft/entity/player/PlayerInventory;selectedSlot:I"))
+    @Redirect(method = "syncSelectedSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerInventory;getSelectedSlot()I"))
     public int overrideSelectedSlotSync(PlayerInventory instance) {
-        return EventFlow.post(new InventoryEvent.HotbarSlot.Update(instance.selectedSlot)).getSlot();
+        return EventFlow.post(new InventoryEvent.HotbarSlot.Update(instance.getSelectedSlot())).getSlot();
     }
 
     @Inject(method = "updateBlockBreakingProgress", at = @At("HEAD"), cancellable = true)