Skip to content

Commit bbf7c8d

Browse files
Merge branch 'main' into kotlin
2 parents af5f55e + 33135ad commit bbf7c8d

11 files changed

Lines changed: 29 additions & 30 deletions

File tree

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v4.2.2
15+
- uses: actions/checkout@v6
1616
- name: Set up JDK 21
17-
uses: actions/setup-java@v4.7.0
17+
uses: actions/setup-java@v5
1818
with:
1919
java-version: '21'
2020
distribution: 'temurin'
21-
- uses: gradle/actions/setup-gradle@v4.3.1
21+
- uses: gradle/actions/setup-gradle@v5
2222
with:
23-
gradle-version: 9.0.0
23+
gradle-version: 9.2.1
2424
name: Set up Gradle
2525
- name: Add permission
2626
run: chmod +x ./gradlew
2727
- name: Execute Gradle build
2828
run: ./gradlew build
2929

3030
- name: Upload a Build Artifact
31-
uses: actions/upload-artifact@v4.6.2
31+
uses: actions/upload-artifact@v5
3232
with:
3333
path: build/libs

.github/workflows/release-to-cf-mr.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ jobs:
1010
contents: write
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v4.2.2
13+
uses: actions/checkout@v6
1414
with:
1515
fetch-depth: 0
1616

1717
- name: Set up JDK 21
18-
uses: actions/setup-java@v4.7.0
18+
uses: actions/setup-java@v5
1919
with:
2020
java-version: '21'
2121
distribution: 'temurin'
2222

23-
- uses: gradle/actions/setup-gradle@v4.3.1
23+
- uses: gradle/actions/setup-gradle@v5
2424
with:
25-
gradle-version: 9.0.0
25+
gradle-version: 9.2.1
2626
name: Set up Gradle
2727

2828
- name: Add permission

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ jobs:
1111
permissions:
1212
contents: write
1313
steps:
14-
- uses: actions/checkout@v4.2.2
14+
- uses: actions/checkout@v6
1515
- name: Set up JDK 21
16-
uses: actions/setup-java@v4.7.0
16+
uses: actions/setup-java@v5
1717
with:
1818
java-version: '21'
1919
distribution: 'temurin'
20-
- uses: gradle/actions/setup-gradle@v4.3.1
20+
- uses: gradle/actions/setup-gradle@v5
2121
with:
22-
gradle-version: 9.0.0
22+
gradle-version: 9.2.1
2323
name: Set up Gradle
2424
- name: Add permission
2525
run: chmod +x ./gradlew
2626
- name: Execute Gradle build
2727
run: ./gradlew build
2828

29-
- uses: ncipollo/release-action@v1.16.0
29+
- uses: ncipollo/release-action@v1.20.0
3030
with:
3131
artifacts: "build/libs/*"
3232
generateReleaseNotes: true

build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ plugins {
44
java
55
`java-library`
66
`maven-publish`
7-
kotlin("jvm") version "2.2.20"
8-
id("com.gradleup.shadow") version "9.0.2"
9-
id("xyz.wagyourtail.unimined") version "1.4.1"
7+
kotlin("jvm") version "2.2.21"
8+
id("com.gradleup.shadow") version "9.2.2"
9+
id("xyz.wagyourtail.unimined") version "1.4.7-kappa"
1010
id("net.kyori.blossom") version "2.1.0"
1111
}
1212

@@ -67,7 +67,7 @@ unimined.minecraft {
6767
if (propertyBool("use_access_transformer")) {
6868
accessTransformer("${rootProject.projectDir}/src/main/resources/" + propertyString("access_transformer_locations"))
6969
}
70-
loader("0.3.19-alpha")
70+
loader("0.3.27-alpha")
7171
runs.auth.username = property("minecraft_username").toString()
7272
runs.all {
7373
val extraArgs = propertyString("extra_jvm_args")

buildSrc/src/main/kotlin/dependencies.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repositories {
2020
mavenLocal() // Must be last for caching to work
2121
}
2222
dependencies {
23-
compileOnly("com.cleanroommc:sponge-mixin:0.20.10+mixin.0.8.7")
23+
compileOnly("com.cleanroommc:sponge-mixin:0.20.12+mixin.0.8.7")
2424
implementation("io.github.chaosunity.forgelin:Forgelin-Continuous:2.2.20.0")
2525
if (propertyBool("enable_lwjglx")) {
2626
compileOnly("com.cleanroommc:lwjglx:1.0.0")

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ enable_shadow = false
1515
# Set this to true if you want to use old LWJGL2 methods.
1616
# WARNING: Using LWJGL2 is no longer recommend, and some methods in LWJGL2 will be unavailable.
1717
# If you are porting an old mod lazily just set this to true.
18-
enable_lwjglx = false
18+
enable_lwjglx = true
1919

2020
# Mod Information
2121
# HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
@@ -57,7 +57,7 @@ maven_url =
5757
# Use the property `access_transformer_locations` to state custom AT files if you aren't using the default `mod_id_at.cfg` location
5858
# If multiple locations are stated, use spaces as the delimiter
5959
# WARNING: Use MCP name in AT file. Unimined will remap it to srg name when building.
60-
use_access_transformer = false
60+
use_access_transformer = true
6161
access_transformer_locations = ${mod_id}_at.cfg
6262

6363
# Coremods

gradle/wrapper/gradle-wrapper.jar

1.88 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

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

gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)