Merge branch 'master' into feature/taskflow

Author: Avanatiker

.github/workflows/build.yml

@@ -82,32 +82,42 @@ jobs:
       - name: Build Lambda
         run: ./gradlew build
 
-      - name: Upload Lambda Fabric
+      - name: Upload Lambda
         uses: ryand56/r2-upload-action@latest
+        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: './fabric/build/libs/lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar'
-          destination-dir: ${{ env.DATE }}-${{ env.COMMIT_HASH }}
-          
-      - name: Upload Lambda Forge
-        uses: ryand56/r2-upload-action@latest
-        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: './forge/build/libs/lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar'
+          source-dir: |
+            ./fabric/build/libs/lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar
+            ./forge/build/libs/lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar
+            ./common/build/libs/lambda-api-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar
           destination-dir: ${{ env.DATE }}-${{ env.COMMIT_HASH }}
 
-      - name: Upload Lambda API
-        uses: ryand56/r2-upload-action@latest
+      - name: Generate download links
+        if: ${{ steps.upload.outputs.result == 'success' }}
+        run: |
+          cat << EOF >> $GITHUB_STEP_SUMMARY
+          Fabric https://r2-bucket.edouard127.christmas/${{ env.DATE }}-${{ env.COMMIT_HASH }}/lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar
+          Forge https://r2-bucket.edouard127.christmas/${{ env.DATE }}-${{ env.COMMIT_HASH }}/lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar
+          API (Dev only) https://r2-bucket.edouard127.christmas/${{ env.DATE }}-${{ env.COMMIT_HASH }}/lambda-api-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar
+          EOF
+
+      - name: Post Upload
+        if: ${{ steps.upload.outputs.result == 'success' }}
+        uses: actions/upload-artifact@v4
         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: './common/build/libs/lambda-api-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar'
-          destination-dir: ${{ env.DATE }}-${{ env.COMMIT_HASH }}
+          name: download-links
+          path: downloads.txt
+          
+      - name: Failover Upload
+        if: ${{ steps.upload.outputs.result == 'failure' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: lambda-nightly
+          path: |
+            /**/build/libs/lambda-*-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar
+        
+        

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

@@ -18,14 +18,9 @@ public class FireworkRocketEntityMixin {
             )
     )
     private void redirectSetVelocity(LivingEntity shooter, Vec3d vec3d) {
-        if (!ElytraFly.getDoBoost()) {
-            shooter.setVelocity(vec3d.add(
-                    vec3d.x * 0.1 + (vec3d.x * 1.5 - vec3d.x) * 0.5,
-                    vec3d.y * 0.1 + (vec3d.y * 1.5 - vec3d.y) * 0.5,
-                    vec3d.z * 0.1 + (vec3d.z * 1.5 - vec3d.z) * 0.5
-            ));
-            return;
+        if (ElytraFly.getDoBoost()){
+            ElytraFly.boostRocket(shooter);
         }
-        ElytraFly.boostRocket(shooter);
+        else shooter.setVelocity(vec3d);
     }
-}
+}

common/src/main/kotlin/com/lambda/module/modules/movement/ElytraFly.kt

@@ -25,7 +25,7 @@ object ElytraFly : Module(
     private val mute by setting("Mute Elytra", false, "Mutes the elytra sound when gliding")
 
     @JvmStatic
-    val doBoost: Boolean get() = isEnabled && playerBoost
+    val doBoost: Boolean get() = isEnabled && rocketBoost
 
     init {
         listener<MovementEvent.Pre> {