Merge branch '1.21.5' into feature/module/BetterFirework

Author: emyfops

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Build Lambda
 on:
   push:
     branches:
-      - '1.21.5'
+      - '1.**'
   pull_request:
 
 jobs:
@@ -20,13 +20,11 @@ jobs:
 
     env:
       SEGMENT_DOWNLOAD_TIMEOUT_MINS: '5'
+
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Set current date as env variable
-        run: echo "DATE=$(date +'%Y-%m-%dT%H:%M:%S')" >> $GITHUB_ENV
-
       - name: Get Short Commit Hash
         id: vars
         run: echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
@@ -46,38 +44,24 @@ jobs:
           file: gradle.properties
           all: true
 
-      - name: Build Lambda
-        run: ./gradlew build --no-daemon
-
-      - name: Rename Files with Commit Hash
-        run: |
-          mv ./build/libs/lambda-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar ./build/libs/lambda-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
-
-      - name: Upload Lambda
-        uses: ryand56/r2-upload-action@latest
+      - name: Publish commit to maven
         id: upload
-        with:
-          r2-account-id: ${{ secrets.R2_ACCOUNT_ID }}
-          r2-access-key-id: ${{ secrets.R2_ACCESS_KEY }}
-          r2-secret-access-key: ${{ secrets.R2_ACCESS_SECRET }}
-          r2-bucket: ${{ secrets.R2_BUCKET_NAME }}
-          source-dir: |
-            ./build/libs/lambda-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
-          destination-dir: ${{ env.DATE }}-${{ env.COMMIT_HASH }}
+        run: ./gradlew publish -PmavenType=snapshots -PcommitHash=${{ env.COMMIT_HASH }} -PmavenUsername=${{ secrets.MAVEN_USER }} -PmavenPassword=${{ secrets.MAVEN_TOKEN }}
+
+      - name: Publish snapshot to maven
+        run: ./gradlew publish -PmavenType=snapshots -PcommitHash=SNAPSHOT -PmavenUsername=${{ secrets.MAVEN_USER }} -PmavenPassword=${{ secrets.MAVEN_TOKEN }}
 
       - name: Generate Summary
-        if: ${{ steps.upload.outputs.result == 'success' }}
+        if: steps.upload.conclusion == 'success'
         run: |
           cat << EOF >> $GITHUB_STEP_SUMMARY
-          ### [Lambda ${{ steps.all.outputs.modVersion }} ${{ steps.all.outputs.minecraftVersion }} (${{ env.COMMIT_HASH }})](https://r2-bucket.edouard127.christmas/${{ env.DATE }}-${{ env.COMMIT_HASH }}/lambda-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar)
+          ### [Lambda ${{ steps.all.outputs.modVersion }} ${{ steps.all.outputs.minecraftVersion }} (${{ env.COMMIT_HASH }})](https://maven.lambda-client.org/snapshots/com/lambda/lambda/${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}/lambda-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar)
           EOF
 
       - name: Failover Upload
-        if: ${{ steps.upload.outputs.result == 'failure' }}
+        if: steps.upload.conclusion == 'failure'
         uses: actions/upload-artifact@v4
         with:
           name: lambda-nightly
           path: |
             /build/libs/lambda-*-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
-        
-        

.github/workflows/publish-maven.yml

@@ -6,48 +6,11 @@ on:
       - '*'
 
 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
-
   publish:
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: true
 
-    needs: check-runner
     runs-on: ${{ needs.check-runner.outputs.runner-label }}
 
     name: Publish artifacts to maven
@@ -61,6 +24,15 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '21'
+          architecture: x64
+          cache: 'gradle'
+
+      - name: Read Gradle Properties
+        uses: BrycensRanch/[email protected]
+        id: all
+        with:
+          file: gradle.properties
+          all: true
 
       - name: Publish to Maven
-        run: ./gradlew publish -PreposiliteUsername=${{ secrets.MAVEN_USER }} -PreposilitePassword=${{ secrets.MAVEN_TOKEN }}
+        run: ./gradlew publish -PmavenType=releases -PmavenUsername=${{ secrets.MAVEN_USER }} -PmavenPassword=${{ secrets.MAVEN_TOKEN }}

.github/workflows/release.yml

@@ -6,57 +6,23 @@ on:
       - '*'
 
 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 and Release 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-Up JDK 21
         uses: actions/setup-java@v4

.idea/codeStyles/Project.xml

@@ -37,6 +37,7 @@ val spairVersion: String by project
 val lwjglVersion: String by project
 val sodiumVersion: String by project
 val litematicaVersion: String by project
+val maLiLibVersion: String by project
 
 val libs = file("libs")
 val targets = listOf("fabric.mod.json")
@@ -176,6 +177,7 @@ dependencies {
     // Add mods
     modImplementation("com.github.rfresh2:baritone-fabric:$minecraftVersion")
     modCompileOnly("maven.modrinth:sodium:$sodiumVersion")
+    modCompileOnly("maven.modrinth:malilib:$maLiLibVersion")
     modCompileOnly("maven.modrinth:litematica:$litematicaVersion")
 
     // Test implementations
@@ -231,13 +233,42 @@ java {
 }
 
 publishing {
+    val publishType = project.findProperty("mavenType").toString()
+    val commitHash = project.findProperty("commitHash").toString()
+    val mavenUrl = if (project.findProperty("mavenType") == "releases") "https://maven.lambda-client.org/releases" else "https://maven.lambda-client.org/snapshots"
+
+    val isSnapshots = publishType == "snapshots"
+    val isValidCommit = commitHash.matches(Regex("[A-Fa-f0-9]+")) || commitHash == "SNAPSHOT"
+
+    if (!isSnapshots && isValidCommit)
+        println("WARNING: Commit hash for snapshot releases was supplied but the publish type is 'releases'. The commit will be omitted.")
+    else if (isSnapshots && !isValidCommit)
+        error("The maven publish type is set to 'snapshots' but no valid commit hash was supplied.")
+
     publications {
         create<MavenPublication>("maven") {
             groupId = mavenGroup
             artifactId = modId
-            version = "$modVersion+$minecraftVersion"
+            version = if (isSnapshots) "$modVersion+$minecraftVersion-$commitHash"
+                        else "$modVersion+$minecraftVersion"
 
             from(components["java"])
         }
     }
+
+    repositories {
+        maven(mavenUrl) {
+            name = "lambda-reposilite"
+
+            credentials {
+                username = project.findProperty("mavenUsername").toString()
+                password = project.findProperty("mavenPassword").toString()
+            }
+
+
+            authentication {
+                create<BasicAuthentication>("basic")
+            }
+        }
+    }
 }

build.gradle.kts

@@ -22,7 +22,7 @@ modVersion=1.0.0
 modDescription=Minecraft utility mod for automation
 modIcon=assets/lambda/lambda.png
 mavenGroup=com.lambda
-modAuthors=Constructor (Avanatiker), Blade, beanbag44, Edouard127
+modAuthors=Avanatiker, Blade, beanbag44, Emy
 
 # General
 minecraftVersion=1.21.5
@@ -49,6 +49,7 @@ fabricApiVersion=0.124.0
 kotlinFabricVersion=1.13.4+kotlin
 sodiumVersion=mc1.21.5-0.6.13-fabric
 litematicaVersion=0.22.2
+maLiLibVersion=0.24.2
 
 # Kotlin https://kotlinlang.org/
 kotlin.code.style=official

gradle.properties

@@ -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.entity;
+
+import com.lambda.interaction.request.inventory.InventoryManager;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.ingame.HandledScreens;
+import net.minecraft.screen.ScreenHandler;
+import net.minecraft.screen.ScreenHandlerType;
+import net.minecraft.text.Text;
+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.CallbackInfo;
+
+@Mixin(HandledScreens.Provider.class)
+public interface HandledScreensMixin {
+    @Inject(method = "open", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;setScreen(Lnet/minecraft/client/gui/screen/Screen;)V"))
+    private void injectOpen(Text name, ScreenHandlerType<ScreenHandler> type, MinecraftClient client, int id, CallbackInfo ci) {
+        if (client.player == null) return;
+        InventoryManager.onSetScreenHandler(client.player.currentScreenHandler);
+    }
+}

src/main/java/com/lambda/mixin/entity/HandledScreensMixin.java

@@ -17,6 +17,7 @@
 
 package com.lambda.mixin.entity;
 
+import com.lambda.Lambda;
 import com.lambda.interaction.request.hotbar.HotbarManager;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import net.minecraft.entity.player.PlayerInventory;
@@ -29,6 +30,7 @@ public class PlayerInventoryMixin {
     @SuppressWarnings({"MixinAnnotationTarget"})
     @ModifyExpressionValue(method = "*", at = @At(value = "FIELD", target = "Lnet/minecraft/entity/player/PlayerInventory;selectedSlot:I", opcode = Opcodes.GETFIELD))
     private int modifySelectedSlot(int original) {
+        if (((PlayerInventory) ((Object) this)).player != Lambda.getMc().player) return original;
         final int hotbarSlot = HotbarManager.getActiveSlot();
         if (hotbarSlot == -1) return original;
         return hotbarSlot;

src/main/java/com/lambda/mixin/entity/PlayerInventoryMixin.java

@@ -54,7 +54,7 @@ Identifier injectElytra(BipedEntityRenderState state, Operation<Identifier> orig
 
     @WrapMethod(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/state/BipedEntityRenderState;FF)V")
     private void injectRender(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, BipedEntityRenderState bipedEntityRenderState, float f, float g, Operation<Void> original) {
-        if (NoRender.INSTANCE.isDisabled() && !NoRender.getNoElytra())
+        if (NoRender.INSTANCE.isDisabled() || !NoRender.getNoElytra())
             original.call(matrixStack, vertexConsumerProvider, i, bipedEntityRenderState, f, g);
     }
 }

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

@@ -25,7 +25,7 @@ import com.lambda.brigadier.argument.value
 import com.lambda.brigadier.executeWithResult
 import com.lambda.brigadier.required
 import com.lambda.command.LambdaCommand
-import com.lambda.context.AutomationConfig
+import com.lambda.config.AutomationConfig
 import com.lambda.interaction.construction.StructureRegistry
 import com.lambda.interaction.construction.blueprint.Blueprint.Companion.toStructure
 import com.lambda.interaction.construction.blueprint.StaticBlueprint.Companion.toBlueprint
@@ -62,7 +62,7 @@ object BuildCommand : LambdaCommand(
                                 .loadStructureByRelativePath(Path.of(pathString))
                                 .let { template ->
                                     info("Building structure $pathString with dimensions ${template.size.toShortString()} created by ${template.author}")
-                                    lastBuildTask = with(AutomationConfig) {
+                                    lastBuildTask = with(AutomationConfig.Companion.DEFAULT) {
                                         template.toStructure()
                                             .move(player.blockPos)
                                             .toBlueprint()