Merge branch 'master' into feature/renderer

Author: emyfops

.github/CONTRIBUTING.md

@@ -1,4 +1,3 @@
-<!-- omit in toc -->
 # Contributing to Lambda
 
 First off, thanks for taking the time to contribute! ❤️
@@ -9,7 +8,6 @@ All types of contributions are encouraged and valued. See the [Table of Contents
 > - Star the project
 > - Donate to the project
 
-<!-- omit in toc -->
 ## Table of Contents
 
 - [I Have a Question](#i-have-a-question)
@@ -18,8 +16,7 @@ All types of contributions are encouraged and valued. See the [Table of Contents
     - [Suggesting Enhancements](#suggesting-enhancements)
     - [Your First Code Contribution](#your-first-code-contribution)
     - [Improving The Documentation](#improving-the-documentation)
-- [Styleguides](#styleguides)
-    - [Commit Messages](#commit-messages)
+    - [Naming Convention](#naming-convention)
 - [Join The Project Team](#join-the-project-team)
 
 
@@ -98,29 +95,34 @@ Enhancement suggestions are tracked as [GitHub issues](https://github.com/lambda
 - Use a **clear and descriptive title** for the issue to identify the suggestion.
 - Provide a **step-by-step description of the suggested enhancement** in as many details as possible.
 - **Describe the current behavior** and **explain which behavior you expected to see instead** and why. At this point you can also tell which alternatives do not work for you.
-- You may want to **include screenshots and animated GIFs** which help you demonstrate the steps or point out the part which the suggestion is related to. You can use [this tool](https://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux. <!-- this should only be included if the project has a GUI -->
+- You may want to **include screenshots or screen recordings** which help you demonstrate the steps or point out the part which the suggestion is related to. You can use [LICEcap](https://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and the built-in [screen recorder in GNOME](https://help.gnome.org/users/gnome-help/stable/screen-shot-record.html.en) or [SimpleScreenRecorder](https://github.com/MaartenBaert/ssr) on Linux.
 - **Explain why this enhancement would be useful** to most Lambda users. You may also want to point out the other projects that solved it better and which could serve as inspiration.
 
 ### Your First Code Contribution
-TODO
-<!-- TODO
-include Setup of env, IDE and typical getting started instructions?
+First of all, make sure to read or simply check the [Official Kotlin Coding Convention](https://kotlinlang.org/docs/coding-conventions.html#control-flow-statements)
 
--->
+This is required for pull requests to be accepted, or even reviewed.
 
-### Improving The Documentation
-TODO
-<!-- TODO
-Updating, improving and correcting the documentation
+You will need the following before contributing:
+- GitHub CLI / Desktop
+- IntelliJ IDEA
+- Java 17 SDK
+- [Minecraft Development Plugin](https://plugins.jetbrains.com/plugin/8327-minecraft-development)
+
+After you have everything you can do the following:
+- Clone the repository `git clone https://github.com/lambda-client/lambda`
+- Open the project, **inside the project folder**, in IntelliJ IDEA
+- Set the java runtime in `File > Project Structure > SDK > JDK 17`
+- Wait for Gradle to resolve dependencies and to set up the project.
+- And you should now be able to run the project using the [run configurations](https://www.jetbrains.com/help/idea/run-debug-configuration.html)
 
--->
+### Improving The Documentation
+If you believe that some documentation can be improved or added, please discuss with us on our [Discord](https://discord.gg/QjfBxJzE5x)
 
-## Styleguides
-### Commit Messages
-TODO
-<!-- TODO
+### Naming Convention
+We follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) for the Lambda project.
 
--->
+Feel free to propose additional compatible naming conventions.
 
 ## Join The Project Team
 Most communication happens on our [Discord](https://discord.gg/QjfBxJzE5x). You can join the project team by contributing to the project. The project team is responsible for reviewing and merging pull requests, and they will help you at every step of the way.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +1,15 @@
-# Pull Request Title Guidelines
+# Pull Request Guidelines
 ### This is a template, modify before submitting your PR
 
 Please ensure that your PR title follows this format:
-- `[Major Minecraft Version (ex: 1.20.x)] [Mod loader (ex: Forge, All)] Feat, Fix, Refactor`
+- `[Minecraft Version] [Mod loader] Feat, Fix, Ref, Docs, ..., : Description`
 
 **Examples:**
 - `[1.20.x] [Forge] Feat: Add new block types`
 - `[1.19.x] [All] Fix: Crash on startup`
 - `[1.20.x] [Fabric] Refactor: Optimize rendering engine`
 
 # Issue Link
-
 Please create an issue if there are none applicable before submitting this pull request. 
 
 Then link the issue as follows:`Closes #123`

.github/release.yml

@@ -0,0 +1,14 @@
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+  categories:
+    - title: Bug Fixes
+      labels:
+        - bug
+    - title: New Features
+      labels:
+        - feature
+    - title: Other Changes
+      labels:
+        - "*"

.github/workflows/add-label.yml

@@ -19,9 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check Out Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
       - name: Labeler
-        uses: srvaroa/labeler@master
+        uses: srvaroa/labeler@v1.11.0
         with:
           config_path: .github/workflows/labeler/labeler-config.yml
           use_local_config: false

.github/workflows/build.yml

@@ -7,12 +7,47 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
 
 jobs:
+  check-runner:
+    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:
+    needs: check-runner
+    runs-on: ${{ needs.check-runner.outputs.runner-label }}
+    
     name: Build Lambda
-    runs-on: ubuntu-latest
     permissions:
       contents: write
     env:
@@ -21,6 +56,9 @@ jobs:
       - name: Checkout Repository
         uses: actions/[email protected]
 
+      - 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
@@ -32,8 +70,6 @@ jobs:
           java-version: '17'
           architecture: x64
           cache: 'gradle'
-          cache-dependency-path: |
-            build.gradle.kts
 
       - name: Read Gradle Properties
         uses: BrycensRanch/[email protected]
@@ -43,28 +79,34 @@ jobs:
           all: true
 
       - name: Build Lambda
-        run: ./gradlew --build-cache build
-
+        run: ./gradlew build
+        
       - name: Upload Lambda Fabric
-        uses: actions/upload-[email protected]
+        uses: ryand56/r2-upload-action@latest
         with:
-          name: lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}
-          path: fabric/build/libs/
-
+          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: actions/[email protected]
-        with:
-          name: lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}
-          path: forge/build/libs/
-
-      - name: Upload Lambda NeoForge
-        uses: actions/[email protected]
+        uses: ryand56/r2-upload-action@latest
         with:
-          name: lambda-neoforge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}
-          path: neoforge/build/libs/
+          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'
+          destination-dir: ${{ env.DATE }}-${{ env.COMMIT_HASH }}
 
       - name: Upload Lambda API
-        uses: actions/upload-[email protected]
+        uses: ryand56/r2-upload-action@latest
         with:
-          name: lambda-api-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}
-          path: common/build/libs/
+          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 }}

.github/workflows/close_stale.yml

@@ -0,0 +1,20 @@
+name: Close Stale Issues
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
+          stale-pr-message: 'This PR is stale because it has been open 60 days with no activity.'
+          days-before-pr-close: -1
+          stale-issue-label: stale
+          stale-pr-label: stale

.github/workflows/labeler/labeler-config.yml

@@ -10,9 +10,6 @@ labels:
   - label: 'forge'
     title: '(?i)\[?(forge|all)[:\]]'
 
-  - label: 'neoforge'
-    title: '(?i)\[?(neoforge|all)[:\]]'
-
   - label: 'fabric'
     title: '(?i)\[?(fabric|all)[:\]]'