Skip to content

Commit a35ffa0

Browse files
emyfopsemyfops
committed
Merge branch 'master' into feature/renderer
2 parents 65751e3 + 0e79407 commit a35ffa0

File tree

110 files changed

+3740
-382
lines changed

Some content is hidden

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

110 files changed

+3740
-382
lines changed

‎.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] [Mod loader] 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

‎.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml‎

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] [Mod loader] 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/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Pull Request Title Guidelines
2+
### This is a template, modify before submitting your PR
3+
4+
Please ensure that your PR title follows this format:
5+
- `[Major Minecraft Version (ex: 1.20.x)] [Mod loader (ex: Forge, All)] Feat, Fix, Refactor`
6+
7+
**Examples:**
8+
- `[1.20.x] [Forge] Feat: Add new block types`
9+
- `[1.19.x] [All] Fix: Crash on startup`
10+
- `[1.20.x] [Fabric] Refactor: Optimize rendering engine`
11+
12+
# Issue Link
13+
14+
Please create an issue if there are none applicable before submitting this pull request.
15+
16+
Then link the issue as follows:`Closes #123`
17+
18+
# Description
19+
20+
Provide a brief description of the changes made in this PR:
21+
22+
- **What does this PR do?**
23+
- **Why is this change needed?**

‎.github/workflows/add-label.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: Pull Request Labeler
22
on:
33
issues:
4-
types: [opened, edited]
4+
types: [opened]
55
branches:
66
- master
77
pull_request:
8-
types: [opened, edited]
8+
types: [opened]
99
branches:
1010
- master
1111

@@ -15,14 +15,16 @@ permissions:
1515
pull-requests: write
1616

1717
jobs:
18-
triage:
18+
build:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: github/issue-labeler@v3.4
21+
- name: Checkout your code
22+
uses: actions/checkout@v3
23+
- name: Labeler
24+
uses: srvaroa/labeler@master
2225
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 }}
26+
config_path: .github/workflows/labeler/labeler-config.yml
27+
use_local_config: false
28+
fail_on_error: true
29+
env:
30+
GITHUB_TOKEN: "${{ github.token }}"

‎.github/workflows/build.yml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: Build Lambda
2+
3+
on:
4+
push:
5+
branches:
6+
- '**'
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
12+
jobs:
13+
build:
14+
name: Build Lambda
15+
runs-on: ubuntu-latest
16+
permissions:
17+
contents: write
18+
env:
19+
SEGMENT_DOWNLOAD_TIMEOUT_MINS: '5'
20+
steps:
21+
- name: Checkout Main
22+
uses: actions/checkout@v4.1.1
23+
24+
- name: Get Short Commit Hash
25+
id: vars
26+
run: echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
27+
28+
- name: Set up JDK
29+
uses: actions/setup-java@v4
30+
with:
31+
distribution: 'oracle'
32+
java-version: '17'
33+
architecture: x64
34+
cache: 'gradle'
35+
cache-dependency-path: |
36+
build.gradle.kts
37+
38+
- name: Read Gradle Properties
39+
uses: BrycensRanch/read-properties-action@v1.0.4
40+
id: all
41+
with:
42+
file: gradle.properties
43+
all: true
44+
45+
- name: Build Lambda
46+
run: ./gradlew --build-cache build
47+
48+
- name: Upload Lambda Fabric
49+
uses: actions/upload-artifact@v4.3.6
50+
with:
51+
name: lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}
52+
path: fabric/build/libs/
53+
54+
- name: Upload Lambda Forge
55+
uses: actions/upload-artifact@v4.3.6
56+
with:
57+
name: lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}
58+
path: forge/build/libs/
59+
60+
- name: Upload Lambda NeoForge
61+
uses: actions/upload-artifact@v4.3.6
62+
with:
63+
name: lambda-neoforge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}
64+
path: neoforge/build/libs/
65+
66+
- name: Upload Lambda API
67+
uses: actions/upload-artifact@v4.3.6
68+
with:
69+
name: lambda-api-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}
70+
path: common/build/libs/

‎.github/workflows/code_quality.yml‎

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

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

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
1-
bug:
2-
- 'bug'
1+
version: 1
32

4-
feature:
5-
- 'feature'
3+
labels:
4+
- label: 'bug'
5+
title: '(?i)\[?bug[:\]]'
66

7-
triage:
8-
- '/.*/'
7+
- label: 'feature'
8+
title: '(?i)\[?(feature|feat)[:\]]'
99

10-
fabric:
11-
- '\b([Ff][Aa][Bb][Rr][Ii][Cc])\b'
10+
- label: 'forge'
11+
title: '(?i)\[?(forge|all)[:\]]'
1212

13-
forge:
14-
- '\b([Ff][Oo][Rr][Gg][Ee])\b'
13+
- label: 'neoforge'
14+
title: '(?i)\[?(neoforge|all)[:\]]'
1515

16-
neoforge:
17-
- '\b([Nn][Ee][Oo][Ff][Oo][Rr][Gg][Ee])\b'
16+
- label: 'fabric'
17+
title: '(?i)\[?(fabric|all)[:\]]'
1818

19-
"1.20":
20-
- '1\.20(\.\d+|\.x)?'
19+
- label: '1.20'
20+
title: '\[?1\.20(\.\d+|\.x)?[:\]]?'
21+
22+
- label: 'triage'
23+
title: '.*'
24+
mergeable: false

‎.github/workflows/release.yml‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
name: Release Lambda
2+
3+
on:
4+
push:
5+
tags:
6+
- '*'
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
12+
jobs:
13+
build_and_release:
14+
name: Build and Release Lambda
15+
runs-on: ubuntu-latest
16+
permissions:
17+
contents: write
18+
env:
19+
SEGMENT_DOWNLOAD_TIMEOUT_MINS: '5'
20+
steps:
21+
- name: Checkout Main
22+
uses: actions/checkout@v4.1.1
23+
24+
- name: Get Short Commit Hash
25+
id: vars
26+
run: echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
27+
28+
- name: Set up JDK
29+
uses: actions/setup-java@v4
30+
with:
31+
distribution: 'oracle'
32+
java-version: '17'
33+
architecture: x64
34+
cache: 'gradle'
35+
cache-dependency-path: |
36+
build.gradle.kts
37+
38+
- name: Read Gradle Properties
39+
uses: BrycensRanch/read-properties-action@v1.0.4
40+
id: all
41+
with:
42+
file: gradle.properties
43+
all: true
44+
45+
- name: Build Lambda
46+
run: ./gradlew --build-cache build
47+
48+
- name: Upload Lambda Fabric
49+
uses: actions/upload-artifact@v4.3.6
50+
with:
51+
name: lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}
52+
path: fabric/build/libs/
53+
54+
- name: Upload Lambda Forge
55+
uses: actions/upload-artifact@v4.3.6
56+
with:
57+
name: lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}
58+
path: forge/build/libs/
59+
60+
- name: Upload Lambda NeoForge
61+
uses: actions/upload-artifact@v4.3.6
62+
with:
63+
name: lambda-neoforge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}
64+
path: neoforge/build/libs/
65+
66+
- name: Upload Lambda API
67+
uses: actions/upload-artifact@v4.3.6
68+
with:
69+
name: lambda-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}
70+
path: common/build/libs/
71+
72+
- name: Generate Changelog
73+
id: changelog
74+
uses: mikepenz/release-changelog-builder-action@v4.1.1
75+
with:
76+
commitMode: true
77+
configurationJson: |
78+
{
79+
"pr_template": "- #{{TITLE}} [#{{AUTHOR}}](#{{URL}})"
80+
}
81+
82+
- name: Create release
83+
uses: softprops/action-gh-release@v2.0.8
84+
with:
85+
name: Lambda ${{ github.ref_name }}
86+
tag_name: ${{ github.ref_name }}
87+
body: ${{ steps.changelog.outputs.changelog }}
88+
prerelease: false
89+
files: |
90+
fabric/build/libs/lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar
91+
forge/build/libs/lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar
92+
neoforge/build/libs/lambda-neoforge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ build/
1616
out/
1717
!**/src/main/**/out/
1818
!**/src/test/**/out/
19+
.kotlin/
1920

2021
### Eclipse ###
2122
.apt_generated
@@ -48,3 +49,7 @@ logs/
4849

4950
### Architectury ###
5051
.architectury-transformer/
52+
53+
### Kotlin ###
54+
*.kotlin_module
55+
.kotlin/

‎build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ allprojects {
6262
base.archivesName = modId
6363

6464
repositories {
65-
maven("https://api.modrinth.com/maven")
66-
maven("https://jitpack.io")
67-
maven("https://maven.shedaniel.me/") { name = "Architectury" }
65+
maven("https://maven.shedaniel.me/") // Architectury
6866
maven("https://maven.terraformersmc.com/releases/")
69-
maven("https://babbaj.github.io/maven/")
67+
maven("https://babbaj.github.io/maven/") // Baritone
68+
maven("https://jitpack.io") // KDiscordIPC
69+
mavenCentral()
7070

7171
// Allow the use of local libraries
7272
flatDir {

0 commit comments

Comments
 (0)