Skip to content

Commit 6d34658

Browse files
committed
Merge remote-tracking branch 'origin/1.21.3' into 1.21.3
# Conflicts: # common/src/main/kotlin/com/lambda/task/tasks/PlaceBlock.kt
2 parents 93abcbc + 3d84218 commit 6d34658

File tree

362 files changed

+11284
-5941
lines changed

Some content is hidden

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

362 files changed

+11284
-5941
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: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,22 +99,11 @@ Enhancement suggestions are tracked as [GitHub issues](https://github.com/lambda
9999
- **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.
100100

101101
### Your First Code Contribution
102-
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)
102+
First of all, make sure to read or simply check the [Official Kotlin Coding Convention](https://kotlinlang.org/docs/coding-conventions.html)
103103

104104
This is required for pull requests to be accepted, or even reviewed.
105105

106-
You will need the following before contributing:
107-
- GitHub CLI / Desktop
108-
- IntelliJ IDEA
109-
- Java 17 SDK
110-
- [Minecraft Development Plugin](https://plugins.jetbrains.com/plugin/8327-minecraft-development)
111-
112-
After you have everything you can do the following:
113-
- Clone the repository `git clone https://github.com/lambda-client/lambda`
114-
- Open the project, **inside the project folder**, in IntelliJ IDEA
115-
- Set the java runtime in `File > Project Structure > SDK > JDK 17`
116-
- Wait for Gradle to resolve dependencies and to set up the project.
117-
- And you should now be able to run the project using the [run configurations](https://www.jetbrains.com/help/idea/run-debug-configuration.html)
106+
After this, you can read the [getting started](https://github.com/lambda-client/wiki/Getting-Started) section in the wiki
118107

119108
### Improving The Documentation
120109
If you believe that some documentation can be improved or added, please discuss with us on our [Discord](https://discord.gg/QjfBxJzE5x)

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,35 @@
11
# Pull Request Guidelines
2+
23
### This is a template, modify before submitting your PR
34

45
Please ensure that your PR title follows this format:
5-
- `[Minecraft Version] [Mod loader] Feat, Fix, Ref, Docs, ..., : Description`
6+
- `[Minecraft Version] <Mod loader> Feat, Fix, Ref, Docs, ..., : Description`
67

78
**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`
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`
1113

12-
# Issue Link
13-
Please create an issue if there are none applicable before submitting this pull request.
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.
1416

15-
Then link the issue as follows:`Closes #123`
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`
1621

17-
# Description
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.
1824

19-
Provide a brief description of the changes made in this PR:
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.`
2029

21-
- **What does this PR do?**
22-
- **Why is this change needed?**
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/workflows/publish-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
run: ./gradlew dokkaHtmlMultiModule
2323

2424
- name: Upload Documentation Artifact
25-
uses: actions/upload-pages-artifact@v1
25+
uses: actions/upload-pages-artifact@v3
2626
with:
2727
path: 'build/dokka/htmlMultiModule'
2828

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ build/
1010
.idea/compiler.xml
1111
.idea/libraries/
1212
.idea/
13+
!.idea/scopes
1314
*.iws
1415
*.iml
1516
*.ipr
@@ -53,4 +54,3 @@ logs/
5354

5455
### Kotlin ###
5556
*.kotlin_module
56-
.kotlin/

.idea/codeStyles/Project.xml

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/scopes/UsageScope.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ val Project.loom: LoomGradleExtensionAPI
3838
get() = (this as ExtensionAware).extensions.getByName("loom") as LoomGradleExtensionAPI
3939

4040
plugins {
41-
kotlin("jvm") version "2.0.20"
42-
id("org.jetbrains.dokka") version "1.9.20"
41+
kotlin("jvm") version "2.1.10"
42+
id("org.jetbrains.dokka") version "2.0.0"
4343
id("architectury-plugin") version "3.4-SNAPSHOT"
44-
id("dev.architectury.loom") version "1.7-SNAPSHOT" apply false
44+
id("dev.architectury.loom") version "1.9-SNAPSHOT" apply false
4545
id("com.github.johnrengelman.shadow") version "8.1.1" apply false
4646
id("maven-publish")
4747
}

common/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ val fabricLoaderVersion: String by project
2222
val kotlinxCoroutinesVersion: String by project
2323
val discordIPCVersion: String by project
2424
val baritoneVersion: String by project
25+
val fuelVersion: String by project
2526

2627
base.archivesName = "${base.archivesName.get()}-api"
2728

@@ -46,6 +47,10 @@ dependencies {
4647
implementation("com.github.Edouard127:KDiscordIPC:$discordIPCVersion")
4748
implementation("com.pngencoder:pngencoder:0.15.0")
4849

50+
// Fuel HTTP library
51+
implementation("com.github.kittinunf.fuel:fuel:$fuelVersion")
52+
implementation("com.github.kittinunf.fuel:fuel-gson:$fuelVersion")
53+
4954
// Add Kotlin
5055
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
5156

0 commit comments

Comments
 (0)