Skip to content

Commit e868609

Browse files
Merge branch 'main' into scala
2 parents 35be88a + ea500ba commit e868609

8 files changed

Lines changed: 16 additions & 18 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v6
15+
- uses: actions/checkout@v7
1616
- name: Set up JDK
1717
uses: actions/setup-java@v5
1818
with:
1919
java-version: '25'
2020
distribution: 'temurin'
2121
- uses: gradle/actions/setup-gradle@v6
22-
with:
23-
gradle-version: 9.6.1
2422
name: Set up Gradle
2523
- name: Add permission
2624
run: chmod +x ./gradlew

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

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

@@ -21,8 +21,6 @@ jobs:
2121
distribution: 'temurin'
2222

2323
- uses: gradle/actions/setup-gradle@v6
24-
with:
25-
gradle-version: 9.6.1
2624
name: Set up Gradle
2725

2826
- name: Add permission
@@ -35,7 +33,7 @@ jobs:
3533
id: changes
3634
uses: simbo/changes-between-tags-action@v1
3735

38-
- uses: Kir-Antipov/mc-publish@v3.3.0
36+
- uses: Kir-Antipov/mc-publish@v3
3937
with:
4038
# Only include this section if you wish to publish
4139
# your assets on Modrinth.

.github/workflows/release.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,20 @@ jobs:
1111
permissions:
1212
contents: write
1313
steps:
14-
- uses: actions/checkout@v6
14+
- uses: actions/checkout@v7
1515
- name: Set up JDK
1616
uses: actions/setup-java@v5
1717
with:
1818
java-version: '25'
1919
distribution: 'temurin'
2020
- uses: gradle/actions/setup-gradle@v6
21-
with:
22-
gradle-version: 9.6.1
2321
name: Set up Gradle
2422
- name: Add permission
2523
run: chmod +x ./gradlew
2624
- name: Execute Gradle build
2725
run: ./gradlew build
2826

29-
- uses: ncipollo/release-action@v1.21.0
27+
- uses: ncipollo/release-action@v1
3028
with:
3129
artifacts: "build/libs/*"
3230
generateReleaseNotes: true

build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
id 'maven-publish'
66
id 'com.gradleup.shadow' version '9.5.1'
77
id 'org.jetbrains.gradle.plugin.idea-ext' version '1.4.1'
8-
id 'xyz.wagyourtail.unimined' version '1.4.26-kappa'
8+
id 'xyz.wagyourtail.unimined' version '1.4.35-kappa'
99
id 'net.kyori.blossom' version '2.2.0'
1010
}
1111

@@ -62,7 +62,7 @@ unimined.minecraft {
6262
if (use_access_transformer.toBoolean()) {
6363
accessTransformer "${rootProject.projectDir}/src/main/resources/$access_transformer_locations"
6464
}
65-
loader "0.5.17-alpha"
65+
loader "0.6.10-alpha"
6666
runs.all {
6767
args += ['--username', minecraft_username]
6868
def extraArgs = extra_jvm_args
@@ -127,6 +127,7 @@ sourceSets {
127127
property('mod_url', mod_url)
128128
property('mod_update_json', mod_update_json)
129129
property('mod_logo_path', mod_logo_path)
130+
property('mod_issue_tracker', mod_issue_tracker)
130131
}
131132
}
132133
}
@@ -158,7 +159,7 @@ idea {
158159
}
159160
}
160161
taskTriggers {
161-
afterSync tasks.named("genSources")
162+
beforeSync tasks.named("genSources")
162163
}
163164
}
164165
}

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ mod_update_json =
3232
mod_authors =
3333
mod_credits =
3434
mod_logo_path =
35+
mod_issue_tracker =
3536

3637
# Run Configurations
3738
# If multiple arguments/tweak classes are stated, use spaces as the delimiter

gradle/scripts/dependencies.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ repositories {
2222
}
2323

2424
dependencies {
25-
compileOnly "com.cleanroommc:sponge-mixin:0.20.13+mixin.0.8.7"
2625
if (enable_lwjglx.toBoolean()) {
2726
compileOnly "com.cleanroommc:lwjglx:1.0.0"
2827
}

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.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/main/resource-templates/mcmod.info

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@
88
"credits": "{{ mod_credits }}",
99
"url": "{{ mod_url }}",
1010
"updateJSON": "{{ mod_update_json }}",
11-
"logoFile": "{{ mod_logo_path }}"
12-
}]
11+
"logoFile": "{{ mod_logo_path }}",
12+
"modProperties": {
13+
"issueTrackerUrl": "{{ mod_issue_tracker }}"
14+
}
15+
}]

0 commit comments

Comments
 (0)