Merge remote-tracking branch 'origin/master' into feature/pathfinder

Author: Avanatiker

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -1,6 +1,6 @@
 name: Bug Report
 description: File a bug report.
-title: "[Version] [Mod loader] Bug: "
+title: "[Version] Bug: "
 assignees:
   - Edouard127
 body:

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml

@@ -1,6 +1,6 @@
 name: Feature
 description: Request or implement a feature.
-title: "[Version] [Mod loader] Feat: "
+title: "[Version] Feat: "
 assignees:
   - Edouard127
 body:

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 contact_links:
   - name: Lambda Discord Server
     url: https://discord.gg/QjfBxJzE5x

build.gradle.kts

@@ -38,10 +38,10 @@ val Project.loom: LoomGradleExtensionAPI
     get() = (this as ExtensionAware).extensions.getByName("loom") as LoomGradleExtensionAPI
 
 plugins {
-    kotlin("jvm") version "2.0.20"
-    id("org.jetbrains.dokka") version "1.9.20"
+    kotlin("jvm") version "2.1.20"
+    id("org.jetbrains.dokka") version "2.0.0"
     id("architectury-plugin") version "3.4-SNAPSHOT"
-    id("dev.architectury.loom") version "1.7-SNAPSHOT" apply false
+    id("dev.architectury.loom") version "1.9-SNAPSHOT" apply false
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
     id("maven-publish")
 }

common/build.gradle.kts

@@ -21,8 +21,7 @@ val modId: String by project
 val fabricLoaderVersion: String by project
 val kotlinxCoroutinesVersion: String by project
 val discordIPCVersion: String by project
-val fuelVersion: String by project
-val resultVersion: String by project
+val ktorVersion: String by project
 val mockitoKotlin: String by project
 val mockitoInline: String by project
 val mockkVersion: String by project
@@ -50,16 +49,19 @@ dependencies {
     implementation("com.github.Edouard127:KDiscordIPC:$discordIPCVersion")
     implementation("com.pngencoder:pngencoder:0.15.0")
 
-    // Fuel HTTP library and dependencies
-    implementation("com.github.kittinunf.fuel:fuel:$fuelVersion")
-    implementation("com.github.kittinunf.fuel:fuel-gson:$fuelVersion")
-    implementation("com.github.kittinunf.result:result-jvm:$resultVersion")
+    // 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")
 
     // Baritone
     modImplementation("baritone-api:baritone-unoptimized-fabric:1.10.2") { isTransitive = false }
+
+    // Test implementations
     testImplementation(kotlin("test"))
     testImplementation("org.mockito.kotlin:mockito-kotlin:$mockitoKotlin")
     testImplementation("org.mockito:mockito-inline:$mockitoInline")

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

@@ -0,0 +1,79 @@
+/*
+ * 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;
+
+import com.lambda.Lambda;
+import com.lambda.module.Module;
+import com.lambda.module.ModuleRegistry;
+import com.lambda.util.DynamicException;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.util.Util;
+import net.minecraft.util.crash.CrashReport;
+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
+@Mixin(CrashReport.class)
+public class CrashReportMixin {
+    @Mutable
+    @Shadow @Final private Throwable cause;
+
+    @Inject(method = "<init>(Ljava/lang/String;Ljava/lang/Throwable;)V", at = @At("TAIL"))
+    void injectConstructor(String message, Throwable cause, CallbackInfo ci) {
+        if (!Lambda.INSTANCE.isDebug() && MinecraftClient.getInstance() != null) {
+            this.cause = new DynamicException(cause);
+        }
+    }
+
+    @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");
+
+        if (MinecraftClient.getInstance() != null) {
+            stringBuilder.append("Enabled modules:\n");
+
+            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");
+
+        instance.addStackTrace(stringBuilder);
+    }
+
+    @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."};
+
+        try {
+            cir.setReturnValue(strings[(int)(Util.getMeasuringTimeNano() % (long)strings.length)]);
+        } catch (Throwable var2) {
+            cir.setReturnValue("Witty comment unavailable :(");
+        }
+    }
+}

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

@@ -24,12 +24,18 @@
 import com.lambda.event.events.TickEvent;
 import com.lambda.interaction.PlayerPacketManager;
 import com.lambda.interaction.request.rotation.RotationManager;
+import com.lambda.module.modules.player.PortalGui;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.DeathScreen;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.input.Input;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.MovementType;
 import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.Vec3d;
+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;
@@ -51,6 +57,8 @@ public abstract class ClientPlayerEntityMixin extends EntityMixin {
     @Shadow
     protected abstract void autoJump(float dx, float dz);
 
+    @Shadow @Final protected MinecraftClient client;
+
     /**
      * Post movement events and applies the modified player velocity
      */
@@ -150,4 +158,22 @@ void onSwingHandPre(Hand hand, CallbackInfo ci) {
     public void damage(DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
         if (EventFlow.post(new PlayerEvent.Damage(source, amount)).isCanceled()) cir.setReturnValue(false);
     }
+
+    /**
+     * Prevents the game from closing Guis when the player is in a nether portal
+     * <pre>{@code
+     * if (this.client.currentScreen != null && !this.client.currentScreen.shouldPause() && !(this.client.currentScreen instanceof DeathScreen)) {
+     *     if (this.client.currentScreen instanceof HandledScreen) {
+     *         this.closeHandledScreen();
+     *     }
+     *
+     *     this.client.setScreen((Screen)null);
+     * }
+     * }</pre>
+     */
+    @Redirect(method = "updateNausea", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;"))
+    Screen keepScreensInPortal(MinecraftClient instance) {
+        if (PortalGui.INSTANCE.isEnabled()) return null;
+        else return client.currentScreen;
+    }
 }

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

@@ -130,7 +130,7 @@ private void changeLookDirection(double cursorDeltaX, double cursorDeltaY, Callb
     @Inject(method = "onTrackedDataSet(Lnet/minecraft/entity/data/TrackedData;)V", at = @At("TAIL"))
     public void onTrackedDataSet(TrackedData<?> data, CallbackInfo ci) {
         Entity entity = (Entity) (Object) this;
-        EventFlow.post(new EntityEvent.EntityUpdate(entity, data));
+        EventFlow.post(new EntityEvent.Update(entity, data));
     }
 
     // ToDo: Does not trigger for some reason.

common/src/main/java/com/lambda/mixin/input/KeyboardMixin.java

@@ -30,8 +30,6 @@ public class KeyboardMixin {
     @Inject(method = "onKey", at = @At("HEAD"))
     private void onKey(long window, int key, int scancode, int action, int modifiers, CallbackInfo ci) {
         if (key <= 0) return;
-        if (action != 1) return; // TODO: Post events on both press and release ?
-
         EventFlow.post(new KeyboardEvent.Press(key, scancode, action, modifiers));
     }
 

common/src/main/java/com/lambda/mixin/world/ClientWorldMixin.java

@@ -23,12 +23,8 @@
 import com.lambda.module.modules.render.WorldColors;
 import com.lambda.util.math.ColorKt;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import org.spongepowered.asm.mixin.Mixin;
@@ -37,20 +33,18 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.util.function.Supplier;
-
 @Mixin(ClientWorld.class)
 public class ClientWorldMixin {
     @Inject(method = "addEntity", at = @At("HEAD"), cancellable = true)
     private void onAddEntity(Entity entity, CallbackInfo ci) {
-        if (EventFlow.post(new EntityEvent.EntitySpawn(entity)).isCanceled()) ci.cancel();
+        if (EventFlow.post(new EntityEvent.Spawn(entity)).isCanceled()) ci.cancel();
     }
 
     @Inject(method = "removeEntity", at = @At("HEAD"))
     private void onRemoveEntity(int entityId, Entity.RemovalReason removalReason, CallbackInfo ci) {
         Entity entity = ((ClientWorld) (Object) this).getEntityById(entityId);
         if (entity == null) return;
-        EventFlow.post(new EntityEvent.EntityRemoval(entity, removalReason));
+        EventFlow.post(new EntityEvent.Removal(entity, removalReason));
     }
 
     @Inject(method = "getCloudsColor", at = @At("HEAD"), cancellable = true)