Merge branch 'master' into feat/dynamic-remapping

Author: emyfops

.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

.github/workflows/build.yml

@@ -3,60 +3,26 @@ name: Build Lambda
 on:
   push:
     branches:
-      - '**'
+      - 'master'
+  pull_request:
 
 jobs:
-  check-runner:
-    name: Check Runner Availability
-    runs-on: ubuntu-latest
-    
-    outputs:
-      runner-label: ${{ steps.set-runner.outputs.runner-label }}
-    
-    steps:
-      - name: Set runner
-        id: set-runner
-        run: |
-          runners=$(curl -v -s -H "Accept: application/vnd.github+json" -H "Authorization: token ${{ secrets.REPO_ACCESS_TOKEN }}" "https://api.github.com/repos/${{ github.repository }}/actions/runners" --http1.1)
-          if [ $? -ne 0 ]; then
-            echo "Error: Failed to fetch runners from GitHub API" >&2
-            exit 1
-          fi
-
-          runners_count=$(echo "$runners" | jq '.runners | length')
-          if [ "$runners_count" -eq 0 ]; then
-            echo "No runners available or failed to retrieve runners." >&2
-            echo "runner-label=ubuntu-latest" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-    
-          available=$(echo "$runners" | jq '.runners[] | select(.status == "online" and .busy == false and .labels[] .name == "self-hosted")')
-          if [ $? -ne 0 ]; then
-            echo "Error: Failed to parse JSON response" >&2
-            exit 1
-          fi
-    
-          if [ -n "$available" ]; then
-            echo "runner-label=lambda-linux-runner" >> $GITHUB_OUTPUT
-          else
-            echo "runner-label=ubuntu-latest" >> $GITHUB_OUTPUT
-          fi
   build:
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: true
-
-    needs: check-runner
-    runs-on: ${{ needs.check-runner.outputs.runner-label }}
 
     name: Build Lambda
+    runs-on: ubuntu-latest
+
     permissions:
       contents: write
+
     env:
       SEGMENT_DOWNLOAD_TIMEOUT_MINS: '5'
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4
 
       - name: Set current date as env variable
         run: echo "DATE=$(date +'%Y-%m-%dT%H:%M:%S')" >> $GITHUB_ENV
@@ -65,11 +31,11 @@ jobs:
         id: vars
         run: echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
 
-      - name: Set-Up JDK 17
+      - name: Set-Up JDK
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           architecture: x64
           cache: 'gradle'
 
@@ -81,7 +47,7 @@ jobs:
           all: true
 
       - name: Build Lambda
-        run: ./gradlew build
+        run: ./gradlew build --no-daemon
 
       - name: Rename Files with Commit Hash
         run: |
@@ -111,8 +77,6 @@ jobs:
           ### [Lambda Forge ${{ steps.all.outputs.modVersion }} ${{ steps.all.outputs.minecraftVersion }} (${{ env.COMMIT_HASH }})](https://r2-bucket.edouard127.christmas/${{ env.DATE }}-${{ env.COMMIT_HASH }}/lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar)
           
           #### [API (Developer Dependency)](https://r2-bucket.edouard127.christmas/${{ env.DATE }}-${{ env.COMMIT_HASH }}/lambda-api-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar)
-
-          **Runner:** \`${{ needs.check-runner.outputs.runner-label }}\`
           EOF
 
       - name: Failover Upload

.github/workflows/publish-docs.yml

@@ -2,8 +2,8 @@ name: Publish Dokka Documentation
 
 on:
   push:
-    branches:
-      - 'master'
+    tags:
+      - '*'
 
 jobs:
   build:

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,10 @@ 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
 
 base.archivesName = "${base.archivesName.get()}-api"
 
@@ -47,16 +49,23 @@ 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")
+    testImplementation("io.mockk:mockk:${mockkVersion}")
 }
 
 tasks {
@@ -66,5 +75,12 @@ tasks {
 
     test {
         useJUnitPlatform()
+        jvmArgs("-XX:+EnableDynamicAgentLoading", "-Xshare:off")
+    }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions {
+        jvmTarget = "17"
     }
 }

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

@@ -27,6 +27,7 @@
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
+import net.minecraft.util.thread.ThreadExecutor;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -67,7 +68,7 @@ private void onShutdown(CallbackInfo ci) {
     }
 
     /**
-     * Inject after the thread field is set so `ThreadExecutor#getThread` is available
+     * Inject after the thread field is set so that {@link ThreadExecutor#getThread} is available
      */
     @Inject(at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;thread:Ljava/lang/Thread;", shift = At.Shift.AFTER, ordinal = 0), method = "run")
     private void onStartup(CallbackInfo ci) {

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

@@ -25,6 +25,7 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.network.packet.c2s.play.UpdateSelectedSlotC2SPacket;
 import net.minecraft.screen.slot.SlotActionType;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
@@ -86,6 +87,18 @@ public void clickSlotHead(int syncId, int slotId, int button, SlotActionType act
         if (EventFlow.post(click).isCanceled()) ci.cancel();
     }
 
+    /**
+     * Posts {@link InventoryEvent.HotbarSlot.Update} and returns the event value as the selected slot
+     * <pre>{@code
+     * private void syncSelectedSlot() {
+     *     int i = this.client.player.getInventory().selectedSlot;
+     *     if (i != this.lastSelectedSlot) {
+     *         this.lastSelectedSlot = i;
+     *         this.networkHandler.sendPacket(new UpdateSelectedSlotC2SPacket(this.lastSelectedSlot));
+     *     }
+     * }
+     * }</pre>
+     */
     @Redirect(method = "syncSelectedSlot", at = @At(value = "FIELD", target = "Lnet/minecraft/entity/player/PlayerInventory;selectedSlot:I"))
     public int overrideSelectedSlotSync(PlayerInventory instance) {
         return EventFlow.post(new InventoryEvent.HotbarSlot.Update(instance.selectedSlot)).getSlot();

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,11 @@ 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
+     */
     @Inject(method = "move", at = @At("HEAD"), cancellable = true)
     void onMove(MovementType movementType, Vec3d movement, CallbackInfo ci) {
         ClientPlayerEntity self = (ClientPlayerEntity) (Object) this;
@@ -78,6 +89,22 @@ void processMovement(Input input, boolean slowDown, float slowDownFactor) {
         EventFlow.post(new MovementEvent.InputUpdate(input, slowDown, slowDownFactor));
     }
 
+    /**
+     * Posts the {@link MovementEvent.Sprint} event
+     * <pre>{@code
+     * if (this.isSprinting()) {
+     *     boolean bl8 = !this.input.hasForwardMovement() || !this.canSprint();
+     *     boolean bl9 = bl8 || this.horizontalCollision && !this.collidedSoftly || this.isTouchingWater() && !this.isSubmergedInWater();
+     *     if (this.isSwimming()) {
+     *         if (!this.isOnGround() && !this.input.sneaking && bl8 || !this.isTouchingWater()) {
+     *             this.setSprinting(false);
+     *         }
+     *     } else if (bl9) {
+     *         this.setSprinting(false);
+     *     }
+     * }
+     * }</pre>
+     */
     @Redirect(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isSprinting()Z"))
     boolean isSprinting(ClientPlayerEntity entity) {
         return EventFlow.post(new MovementEvent.Sprint(entity.isSprinting())).getSprint();
@@ -92,6 +119,9 @@ void redirectSneaking(CallbackInfoReturnable<Boolean> cir) {
         cir.setReturnValue(EventFlow.post(new MovementEvent.Sneak(self.input.sneaking)).getSneak());
     }
 
+    /**
+     * Overwrites the movement packet update function to use our code
+     */
     @Inject(method = "sendMovementPackets", at = @At(value = "HEAD"), cancellable = true)
     void sendBegin(CallbackInfo ci) {
         ci.cancel();
@@ -126,8 +156,24 @@ void onSwingHandPre(Hand hand, CallbackInfo ci) {
 
     @Inject(method = "damage", at = @At("HEAD"), cancellable = true)
     public void damage(DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
-        if (EventFlow.post(new PlayerEvent.Damage(source, amount)).isCanceled()) {
-            cir.setReturnValue(false);
-        }
+        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;
     }
 }