Skip to content

Commit d8a279d

Browse files
Wulian233Wulian233
authored
update
1 parent bfd3417 commit d8a279d

10 files changed

Lines changed: 102 additions & 89 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,36 @@ jobs:
77
runs-on: ubuntu-latest
88

99
steps:
10-
- uses: actions/checkout@v5
10+
- uses: actions/checkout@v6
1111

1212
- name: Set up JDK 21
1313
uses: actions/setup-java@v5
1414
with:
15-
distribution: 'temurin'
15+
distribution: temurin
1616
java-version: 21
1717

18-
- name: Cache
19-
uses: actions/cache@v4
20-
with:
21-
path: |
22-
~/.gradle/caches
23-
~/.gradle/wrapper
24-
.gradle
25-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'build.gradle') }}
18+
- name: Setup Gradle
19+
uses: gradle/actions/setup-gradle@v5
2620

27-
- name: Build with Gradle
21+
- name: Build
2822
run: |
2923
chmod +x gradlew
3024
./gradlew build
3125
32-
- name: Upload fabric artifacts
33-
uses: actions/upload-artifact@v4
26+
- name: Upload Fabric artifacts
27+
uses: actions/upload-artifact@v5
3428
with:
3529
name: fabric-artifacts
36-
path: ${{ github.workspace }}/fabric/build/libs
30+
path: fabric/build/libs/*.jar
3731

38-
- name: Upload forge artifacts
39-
uses: actions/upload-artifact@v4
32+
- name: Upload Forge artifacts
33+
uses: actions/upload-artifact@v5
4034
with:
4135
name: forge-artifacts
42-
path: ${{ github.workspace }}/forge/build/libs
36+
path: forge/build/libs/*.jar
4337

44-
- name: Upload neoforge artifacts
45-
uses: actions/upload-artifact@v4
38+
- name: Upload NeoForge artifacts
39+
uses: actions/upload-artifact@v5
4640
with:
4741
name: neoforge-artifacts
48-
path: ${{ github.workspace }}/neoforge/build/libs
42+
path: neoforge/build/libs/*.jar

‎build.gradle‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "architectury-plugin" version "3.4-SNAPSHOT"
3-
id "dev.architectury.loom" version "1.11-SNAPSHOT" apply false
3+
id "dev.architectury.loom" version "1.13-SNAPSHOT" apply false
44
id "com.gradleup.shadow" version "9.+" apply false
55
}
66

@@ -25,8 +25,10 @@ allprojects {
2525
apply plugin: "java"
2626
apply plugin: "architectury-plugin"
2727

28-
archivesBaseName = rootProject.archives_base_name
29-
version = "${rootProject.mod_version}"
28+
base {
29+
archivesName = rootProject.archives_base_name
30+
}
31+
version = rootProject.mod_version
3032
group = rootProject.maven_group
3133

3234
tasks.withType(JavaCompile).configureEach {

‎common/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ architectury {
33
}
44

55
repositories {
6-
maven { url "https://maven.ftb.dev/releases" }
6+
maven { url = "https://maven.ftb.dev/releases" }
77
}
88

99
dependencies {

‎fabric/build.gradle‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,19 @@ architectury {
33
fabric()
44
}
55

6-
project.archivesBaseName = rootProject.archivesBaseName + "-fabric"
6+
base {
7+
archivesName = rootProject.archives_base_name + "-fabric"
8+
}
79

810
configurations {
911
common {
1012
canBeResolved = true
1113
canBeConsumed = false
1214
}
13-
compileClasspath.extendsFrom common
14-
runtimeClasspath.extendsFrom common
15-
developmentFabric.extendsFrom common
15+
compileClasspath.extendsFrom(common)
16+
runtimeClasspath.extendsFrom(common)
17+
developmentFabric.extendsFrom(common)
18+
1619
shadowBundle {
1720
canBeResolved = true
1821
canBeConsumed = false
@@ -23,37 +26,41 @@ dependencies {
2326
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
2427
modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
2528

26-
common(project(path: ":common", configuration: "namedElements")) { transitive false }
27-
shadowBundle(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
29+
common(project(path: ":common", configuration: "namedElements")) {
30+
transitive = false
31+
}
32+
shadowBundle(project(path: ":common", configuration: "transformProductionFabric")) {
33+
transitive = false
34+
}
2835
}
2936

3037
processResources {
31-
inputs.property "version", project.version
38+
inputs.property("version", project.version)
3239

3340
filesMatching("fabric.mod.json") {
34-
expand "version": project.version
41+
expand(version: project.version)
3542
}
3643
}
3744

3845
shadowJar {
39-
exclude "architectury.common.json"
46+
exclude("architectury.common.json")
4047

4148
configurations = [project.configurations.shadowBundle]
4249
archiveClassifier.set("dev-shadow")
4350
}
4451

4552
remapJar {
46-
inputFile.set shadowJar.archiveFile
47-
dependsOn shadowJar
48-
archiveClassifier.set(null)
53+
inputFile.set(shadowJar.archiveFile)
54+
dependsOn(shadowJar)
55+
archiveClassifier.set((String) null)
4956
}
5057

5158
jar {
5259
archiveClassifier.set("dev")
5360
}
5461

5562
sourcesJar {
56-
def commonSources = project(":common").sourcesJar
57-
dependsOn commonSources
58-
from commonSources.archiveFile.map { zipTree(it) }
63+
def commonSources = project(":common").tasks.named("sourcesJar")
64+
dependsOn(commonSources)
65+
from(commonSources.flatMap { it.archiveFile }.map { zipTree(it) })
5966
}

‎forge/build.gradle‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,19 @@ architectury {
33
forge()
44
}
55

6-
project.archivesBaseName = rootProject.archivesBaseName + "-forge"
6+
base {
7+
archivesName = rootProject.archives_base_name + "-forge"
8+
}
79

810
configurations {
911
common {
1012
canBeResolved = true
1113
canBeConsumed = false
1214
}
13-
compileClasspath.extendsFrom common
14-
runtimeClasspath.extendsFrom common
15-
developmentForge.extendsFrom common
15+
compileClasspath.extendsFrom(common)
16+
runtimeClasspath.extendsFrom(common)
17+
developmentNeoForge.extendsFrom(common)
18+
1619
shadowBundle {
1720
canBeResolved = true
1821
canBeConsumed = false
@@ -29,38 +32,42 @@ loom {
2932
dependencies {
3033
forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
3134

32-
common(project(path: ":common", configuration: "namedElements")) { transitive false }
33-
shadowBundle(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
35+
common(project(path: ":common", configuration: "namedElements")) {
36+
transitive = false
37+
}
38+
shadowBundle(project(path: ":common", configuration: "transformProductionNeoForge")) {
39+
transitive = false
40+
}
3441
}
3542

3643
processResources {
37-
inputs.property "version", project.version
44+
inputs.property("version", project.version)
3845

39-
filesMatching("META-INF/mods.toml") {
40-
expand "version": project.version
46+
filesMatching("META-INF/forge.mods.toml") {
47+
expand(version: project.version)
4148
}
4249
}
4350

4451
shadowJar {
45-
exclude "fabric.mod.json"
46-
exclude "architectury.common.json"
52+
exclude("fabric.mod.json")
53+
exclude("architectury.common.json")
4754

4855
configurations = [project.configurations.shadowBundle]
4956
archiveClassifier.set("dev-shadow")
5057
}
5158

5259
remapJar {
53-
inputFile.set shadowJar.archiveFile
54-
dependsOn shadowJar
55-
archiveClassifier.set(null)
60+
inputFile.set(shadowJar.archiveFile)
61+
dependsOn(shadowJar)
62+
archiveClassifier.set((String) null)
5663
}
5764

5865
jar {
5966
archiveClassifier.set("dev")
6067
}
6168

6269
sourcesJar {
63-
def commonSources = project(":common").sourcesJar
64-
dependsOn commonSources
65-
from commonSources.archiveFile.map { zipTree(it) }
70+
def commonSources = project(":common").tasks.named("sourcesJar")
71+
dependsOn(commonSources)
72+
from(commonSources.flatMap { it.archiveFile }.map { zipTree(it) })
6673
}

‎gradle.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ yarn_mappings=1.20.6+build.3
77
yarn_patch=1.20.6+build.4
88

99
archives_base_name=Texture-Locale-Redirector
10-
mod_version=1.4.0
10+
mod_version=1.5.0
1111
maven_group=com.wulian.texturelocaleredirector
1212

1313
forge_version=50.2.2
14-
neoforge_version=20.6.138
14+
neoforge_version=20.6.139
1515

16-
fabric_loader_version=0.17.2
16+
fabric_loader_version=0.18.1
1717
fabric_api_version=0.100.8+1.20.6

‎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: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)