Skip to content

Commit 2a15d7f

Browse files
committed
Merge branch 'master' into feature/viewmodel
# Conflicts: # common/src/main/java/com/lambda/mixin/entity/ClientPlayerEntityMixin.java # common/src/main/resources/lambda.accesswidener
2 parents bcd85d0 + 1a677bf commit 2a15d7f

File tree

681 files changed

+33846
-10634
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

681 files changed

+33846
-10634
lines changed

.coderabbit.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
language: "en-US"
2+
early_access: false
3+
reviews:
4+
profile: "chill"
5+
high_level_summary: false
6+
poem: false
7+
review_status: false
8+
auto_review:
9+
enabled: false
10+
chat:
11+
auto_reply: false

.github/CONTRIBUTING.md

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<!-- omit in toc -->
21
# Contributing to Lambda
32

43
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
98
> - Star the project
109
> - Donate to the project
1110
12-
<!-- omit in toc -->
1311
## Table of Contents
1412

1513
- [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
1816
- [Suggesting Enhancements](#suggesting-enhancements)
1917
- [Your First Code Contribution](#your-first-code-contribution)
2018
- [Improving The Documentation](#improving-the-documentation)
21-
- [Styleguides](#styleguides)
22-
- [Commit Messages](#commit-messages)
19+
- [Naming Convention](#naming-convention)
2320
- [Join The Project Team](#join-the-project-team)
2421

2522

@@ -98,29 +95,23 @@ Enhancement suggestions are tracked as [GitHub issues](https://github.com/lambda
9895
- Use a **clear and descriptive title** for the issue to identify the suggestion.
9996
- Provide a **step-by-step description of the suggested enhancement** in as many details as possible.
10097
- **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.
101-
- 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 -->
98+
- 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.
10299
- **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.
103100

104101
### Your First Code Contribution
105-
TODO
106-
<!-- TODO
107-
include Setup of env, IDE and typical getting started instructions?
102+
First of all, make sure to read or simply check the [Official Kotlin Coding Convention](https://kotlinlang.org/docs/coding-conventions.html)
108103

109-
-->
104+
This is required for pull requests to be accepted, or even reviewed.
110105

111-
### Improving The Documentation
112-
TODO
113-
<!-- TODO
114-
Updating, improving and correcting the documentation
106+
After this, you can read the [getting started](https://github.com/lambda-client/wiki/Getting-Started) section in the wiki
115107

116-
-->
108+
### Improving The Documentation
109+
If you believe that some documentation can be improved or added, please discuss with us on our [Discord](https://discord.gg/QjfBxJzE5x)
117110

118-
## Styleguides
119-
### Commit Messages
120-
TODO
121-
<!-- TODO
111+
### Naming Convention
112+
We follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) for the Lambda project.
122113

123-
-->
114+
Feel free to propose additional compatible naming conventions.
124115

125116
## Join The Project Team
126117
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/ISSUE_TEMPLATE/BUG_REPORT.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Bug Report
22
description: File a bug report.
3-
title: "[Version] [Mod Loader] [Bug]: "
3+
title: "[Version] Bug: "
44
assignees:
55
- Edouard127
66
body:
@@ -40,11 +40,3 @@ body:
4040
attributes:
4141
label: Log Output
4242
description: Please copy the entire log file located in `.minecraft/logs/latest.log` to [MCLogs](https://mclo.gs) and provide the link here.
43-
- type: checkboxes
44-
id: terms
45-
attributes:
46-
label: Code of Conduct
47-
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/lambda-client/lambda/blob/master/.github/CODE_OF_CONDUCT.md).
48-
options:
49-
- label: I agree to follow this project's Code of Conduct
50-
required: true
Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Feature
22
description: Request or implement a feature.
3-
title: "[Version] [Mod Loader] [Feature]: "
3+
title: "[Version] Feat: "
44
assignees:
55
- Edouard127
66
body:
@@ -15,22 +15,9 @@ body:
1515
value: "I would like to implement a feature that..."
1616
validations:
1717
required: true
18-
- type: textarea
19-
id: extra
20-
attributes:
21-
label: Additional Information
22-
description: Is there anything else you would like to add?
2318
- type: checkboxes
2419
id: pr
2520
attributes:
2621
label: Pull Request
2722
options:
2823
- label: I will be submitting a pull request
29-
- type: checkboxes
30-
id: terms
31-
attributes:
32-
label: Code of Conduct
33-
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/lambda-client/lambda/blob/master/.github/CODE_OF_CONDUCT.md).
34-
options:
35-
- label: I agree to follow this project's Code of Conduct
36-
required: true

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
blank_issues_enabled: false
1+
blank_issues_enabled: true
22
contact_links:
33
- name: Lambda Discord Server
44
url: https://discord.gg/QjfBxJzE5x

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Pull Request Guidelines
2+
3+
### This is a template, modify before submitting your PR
4+
5+
Please ensure that your PR title follows this format:
6+
- `[Minecraft Version] <Mod loader> Feat, Fix, Ref, Docs, ..., : Description`
7+
8+
**Examples:**
9+
- `[1.20.4] Feat: Add new block types`
10+
- `[1.21.4] [All] Fix: Crash on startup`
11+
- `[1.21.3] [Forge] Fix: GUI does not render`
12+
- `[1.20.1] Ref: Optimize rendering engine`
13+
14+
### Issue Link
15+
If your PR addresses one or more issues, be sure to link them. Use appropriate keywords like `closes`, `fixes`, or `resolves` to automatically close the linked issues when the PR is merged.
16+
17+
#### **Examples:**
18+
- `This PR fixes a memory leak in foo() and closes #4. It also resolves #5, which is a duplicate issue.`
19+
- `Closes #1, resolves #2, and fixes #3`
20+
- `Fixes #1`
21+
22+
### Description
23+
Provide a concise yet detailed summary of the changes introduced in this PR. Include the purpose of the changes and any relevant context.
24+
25+
#### **Examples:**
26+
- `This pull request improves compatibility with version 1.21.4 by addressing rendering issues and adding support for new block types.`
27+
- `Refactors the rendering engine to enhance performance and reduce memory usage.`
28+
- `Adds a new feature for biome-specific block spawning to align with gameplay mechanics introduced in version 1.20.4.`
29+
30+
### Checklist Before Submitting
31+
To ensure the quality and maintainability of your PR, confirm the following before submission:
32+
1. Code adheres to the project's style guide and conventions.
33+
2. All tests pass, including newly added tests.
34+
3. Documentation has been updated to reflect any new features or changes.
35+
4. Your PR is limited to a single purpose, avoiding unrelated changes.

.github/release.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
changelog:
2+
exclude:
3+
labels:
4+
- ignore-for-release
5+
categories:
6+
- title: Bug Fixes
7+
labels:
8+
- bug
9+
- title: New Features
10+
labels:
11+
- feature
12+
- title: Other Changes
13+
labels:
14+
- "*"

.github/workflows/add-label.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
name: Pull Request Labeler
2+
23
on:
34
issues:
4-
types: [opened, edited]
5+
types: [opened]
56
branches:
67
- master
78
pull_request:
8-
types: [opened, edited]
9+
types: [opened]
910
branches:
1011
- master
1112

@@ -15,14 +16,17 @@ permissions:
1516
pull-requests: write
1617

1718
jobs:
18-
triage:
19+
build:
1920
runs-on: ubuntu-latest
2021
steps:
21-
- uses: github/issue-labeler@v3.4
22+
- name: Check Out Repository
23+
uses: actions/checkout@v4
24+
25+
- name: Labeler
26+
uses: srvaroa/labeler@v1.11.0
2227
with:
23-
configuration-path: .github/workflows/labeler/labeler-config.yml
24-
enable-versioned-regex: 0
25-
sync-labels: 0
26-
include-title: 1
27-
include-body: 0
28-
repo-token: ${{ github.token }}
28+
config_path: .github/workflows/labeler/labeler-config.yml
29+
use_local_config: false
30+
fail_on_error: true
31+
env:
32+
GITHUB_TOKEN: "${{ github.token }}"

.github/workflows/build.yml

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
name: Build Lambda
2+
3+
on:
4+
push:
5+
branches:
6+
- 'master'
7+
pull_request:
8+
9+
jobs:
10+
build:
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
15+
name: Build Lambda
16+
runs-on: ubuntu-latest
17+
18+
permissions:
19+
contents: write
20+
21+
env:
22+
SEGMENT_DOWNLOAD_TIMEOUT_MINS: '5'
23+
steps:
24+
- name: Checkout Repository
25+
uses: actions/checkout@v4
26+
27+
- name: Set current date as env variable
28+
run: echo "DATE=$(date +'%Y-%m-%dT%H:%M:%S')" >> $GITHUB_ENV
29+
30+
- name: Get Short Commit Hash
31+
id: vars
32+
run: echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
33+
34+
- name: Set-Up JDK
35+
uses: actions/setup-java@v4
36+
with:
37+
distribution: 'temurin'
38+
java-version: '21'
39+
architecture: x64
40+
cache: 'gradle'
41+
42+
- name: Read Gradle Properties
43+
uses: BrycensRanch/read-properties-action@v1.0.4
44+
id: all
45+
with:
46+
file: gradle.properties
47+
all: true
48+
49+
- name: Build Lambda
50+
run: ./gradlew build --no-daemon
51+
52+
- name: Rename Files with Commit Hash
53+
run: |
54+
mv ./fabric/build/libs/lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar ./fabric/build/libs/lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
55+
mv ./forge/build/libs/lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar ./forge/build/libs/lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
56+
mv ./common/build/libs/lambda-api-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar ./common/build/libs/lambda-api-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
57+
58+
- name: Upload Lambda
59+
uses: ryand56/r2-upload-action@latest
60+
id: upload
61+
with:
62+
r2-account-id: ${{ secrets.R2_ACCOUNT_ID }}
63+
r2-access-key-id: ${{ secrets.R2_ACCESS_KEY }}
64+
r2-secret-access-key: ${{ secrets.R2_ACCESS_SECRET }}
65+
r2-bucket: ${{ secrets.R2_BUCKET_NAME }}
66+
source-dir: |
67+
./fabric/build/libs/lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
68+
./forge/build/libs/lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
69+
./common/build/libs/lambda-api-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
70+
destination-dir: ${{ env.DATE }}-${{ env.COMMIT_HASH }}
71+
72+
- name: Generate Summary
73+
if: ${{ steps.upload.outputs.result == 'success' }}
74+
run: |
75+
cat << EOF >> $GITHUB_STEP_SUMMARY
76+
### [Lambda Fabric ${{ steps.all.outputs.modVersion }} ${{ steps.all.outputs.minecraftVersion }} (${{ env.COMMIT_HASH }})](https://r2-bucket.edouard127.christmas/${{ env.DATE }}-${{ env.COMMIT_HASH }}/lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar)
77+
### [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)
78+
79+
#### [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)
80+
EOF
81+
82+
- name: Failover Upload
83+
if: ${{ steps.upload.outputs.result == 'failure' }}
84+
uses: actions/upload-artifact@v4
85+
with:
86+
name: lambda-nightly
87+
path: |
88+
/**/build/libs/lambda-*-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
89+
90+

.github/workflows/code_quality.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)