Skip to content

Commit 3af6805

Browse files
Wulian233Wulian233
authored
update
1 parent 97615b7 commit 3af6805

File tree

10 files changed

+107
-98
lines changed

10 files changed

+107
-98
lines changed

‎.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

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

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

3133
repositories {

‎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: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,62 +3,65 @@ 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
1922
}
2023
}
2124

22-
repositories {
23-
24-
}
25-
2625
dependencies {
27-
modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
28-
modApi "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
29-
modApi "dev.ftb.mods:ftb-quests-fabric:${project.ftb_quests_version}"
26+
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
27+
modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
28+
modApi "dev.ftb.mods:ftb-quests-fabric:${rootProject.ftb_quests_version}"
3029

31-
common(project(path: ":common", configuration: "namedElements")) { transitive false }
32-
shadowBundle(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
30+
common(project(path: ":common", configuration: "namedElements")) {
31+
transitive = false
32+
}
33+
shadowBundle(project(path: ":common", configuration: "transformProductionFabric")) {
34+
transitive = false
35+
}
3336
}
3437

3538
processResources {
36-
inputs.property "version", project.version
39+
inputs.property("version", project.version)
3740

3841
filesMatching("fabric.mod.json") {
39-
expand "version": project.version
42+
expand(version: project.version)
4043
}
4144
}
4245

4346
shadowJar {
44-
exclude "architectury.common.json"
47+
exclude("architectury.common.json")
4548

4649
configurations = [project.configurations.shadowBundle]
4750
archiveClassifier.set("dev-shadow")
4851
}
4952

5053
remapJar {
51-
inputFile.set shadowJar.archiveFile
52-
dependsOn shadowJar
53-
archiveClassifier.set(null)
54+
inputFile.set(shadowJar.archiveFile)
55+
dependsOn(shadowJar)
56+
archiveClassifier.set((String) null)
5457
}
5558

5659
jar {
5760
archiveClassifier.set("dev")
5861
}
5962

6063
sourcesJar {
61-
def commonSources = project(":common").sourcesJar
62-
dependsOn commonSources
63-
from commonSources.archiveFile.map { zipTree(it) }
64+
def commonSources = project(":common").tasks.named("sourcesJar")
65+
dependsOn(commonSources)
66+
from(commonSources.flatMap { it.archiveFile }.map { zipTree(it) })
6467
}

‎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+
developmentForge.extendsFrom(common)
18+
1619
shadowBundle {
1720
canBeResolved = true
1821
canBeConsumed = false
@@ -27,45 +30,49 @@ loom {
2730
}
2831

2932
repositories {
30-
maven { url "https://maven.ftb.dev/releases" }
33+
maven { url = "https://maven.ftb.dev/releases" }
3134
}
3235

3336
dependencies {
3437
forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
3538
modApi "dev.ftb.mods:ftb-quests-forge:${rootProject.ftb_quests_version}"
3639

37-
common(project(path: ":common", configuration: "namedElements")) { transitive false }
38-
shadowBundle(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
40+
common(project(path: ":common", configuration: "namedElements")) {
41+
transitive = false
42+
}
43+
shadowBundle(project(path: ":common", configuration: "transformProductionNeoForge")) {
44+
transitive = false
45+
}
3946
}
4047

4148
processResources {
42-
inputs.property "version", project.version
49+
inputs.property("version", project.version)
4350

4451
filesMatching("META-INF/mods.toml") {
45-
expand "version": project.version
52+
expand(version: project.version)
4653
}
4754
}
4855

4956
shadowJar {
50-
exclude "fabric.mod.json"
51-
exclude "architectury.common.json"
57+
exclude("fabric.mod.json")
58+
exclude("architectury.common.json")
5259

5360
configurations = [project.configurations.shadowBundle]
5461
archiveClassifier.set("dev-shadow")
5562
}
5663

5764
remapJar {
58-
inputFile.set shadowJar.archiveFile
59-
dependsOn shadowJar
60-
archiveClassifier.set(null)
65+
inputFile.set(shadowJar.archiveFile)
66+
dependsOn(shadowJar)
67+
archiveClassifier.set((String) null)
6168
}
6269

6370
jar {
6471
archiveClassifier.set("dev")
6572
}
6673

6774
sourcesJar {
68-
def commonSources = project(":common").sourcesJar
69-
dependsOn commonSources
70-
from commonSources.archiveFile.map { zipTree(it) }
75+
def commonSources = project(":common").tasks.named("sourcesJar")
76+
dependsOn(commonSources)
77+
from(commonSources.flatMap { it.archiveFile }.map { zipTree(it) })
7178
}

‎gradle.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ enabled_platforms=fabric,forge,neoforge
66
yarn_mappings=1.20.4+build.3
77

88
archives_base_name=Texture-Locale-Redirector
9-
mod_version=1.4.0
9+
mod_version=1.5.0
1010
maven_group=com.wulian.texturelocaleredirector
1111

1212
forge_version=49.2.2
13-
neoforge_version=20.4.250
13+
neoforge_version=20.4.251
1414

15-
fabric_loader_version=0.17.2
15+
fabric_loader_version=0.18.1
1616
fabric_api_version=0.97.3+1.20.4
1717

1818
ftb_quests_version=2004.2.3

‎gradlew‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH="\\\"\\\""
118117

119118

120119
# Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
172171
# For Cygwin or MSYS, switch paths to Windows format before running java
173172
if "$cygwin" || "$msys" ; then
174173
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
175-
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
176174

177175
JAVACMD=$( cygpath --unix "$JAVACMD" )
178176

@@ -202,7 +200,7 @@ fi
202200

203201

204202
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
205-
DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
203+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
206204

207205
# Collect all arguments for the java command:
208206
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
212210

213211
set -- \
214212
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215-
-classpath "$CLASSPATH" \
216213
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217214
"$@"
218215

@@ -248,4 +245,4 @@ eval "set -- $(
248245
tr '\n' ' '
249246
)" '"$@"'
250247

251-
exec "$JAVACMD" "$@"
248+
exec "$JAVACMD" "$@"

‎gradlew.bat‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ set APP_HOME=%DIRNAME%
3636
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
3737

3838
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
39-
set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"
39+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
4040

4141
@rem Find java.exe
4242
if defined JAVA_HOME goto findJavaFromJavaHome
@@ -70,11 +70,10 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=
7473

7574

7675
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
76+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7877

7978
:end
8079
@rem End local scope for the variables with windows NT shell
@@ -91,4 +90,4 @@ exit /b %EXIT_CODE%
9190
:mainEnd
9291
if "%OS%"=="Windows_NT" endlocal
9392

94-
:omega
93+
:omega

0 commit comments

Comments
 (0)