Skip to content

Commit 0271295

Browse files
committed
Sync with template v7
1 parent ec22a34 commit 0271295

File tree

7 files changed

+34
-29
lines changed

7 files changed

+34
-29
lines changed

.github/workflows/check-build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Builds the project on Linux and Windows, as a first line of defense against bad commits.
1+
# Builds the project, as a first line of defense against bad commits.
22
name: Check Build
33

44
on:
@@ -22,8 +22,7 @@ jobs:
2222
21
2323
]
2424
os: [
25-
ubuntu-latest,
26-
windows-latest
25+
ubuntu-latest
2726
]
2827
runs-on: ${{ matrix.os }}
2928
steps:

.github/workflows/release-subproject-fabric.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
if: ${{ runner.os != 'Windows' }}
3535
run: chmod +x ./gradlew
3636
- name: Build
37-
run: ./gradlew build fabric:publishMods --stacktrace
37+
run: ./gradlew build fabric:publishGithub fabric:publishCurseforge fabric:publishModrinth --stacktrace
3838
env:
3939
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4040
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}

.github/workflows/release-subproject-neoforge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
if: ${{ runner.os != 'Windows' }}
3535
run: chmod +x ./gradlew
3636
- name: Build
37-
run: ./gradlew build neoforge:publishMods --stacktrace
37+
run: ./gradlew build neoforge:publishGithub neoforge:publishCurseforge neoforge:publishModrinth --stacktrace
3838
env:
3939
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4040
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
if: ${{ runner.os != 'Windows' }}
4040
run: chmod +x ./gradlew
4141
- name: Build
42-
run: ./gradlew build neoforge:publishModrinth neoforge:publishCurseforge neoforge:publishGithub fabric:publishModrinth fabric:publishCurseforge fabric:publishGithub --stacktrace
42+
run: ./gradlew build neoforge:publishGithub neoforge:publishCurseforge neoforge:publishModrinth fabric:publishGithub fabric:publishCurseforge fabric:publishModrinth --stacktrace
4343
env:
4444
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4545
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}

build.gradle

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import util.StaticUtil
66
import java.nio.file.Files
77
import java.nio.file.StandardCopyOption
88
import java.time.LocalDate
9+
import java.util.regex.Pattern
910

1011
plugins {
1112
id("fabric-loom") version("${loom_version}") apply(false)
1213
id("net.neoforged.moddev") version("${moddev_version}") apply(false)
13-
id("org.cadixdev.licenser") version("${licenser_version}") apply(false)
14+
id("net.neoforged.licenser") version("${licenser_version}") apply(false)
1415
id("me.modmuss50.mod-publish-plugin") version("${mpp_version}")
1516
id("org.ajoberstar.grgit.service") version("${grgitservice_version}")
1617
}
@@ -34,7 +35,7 @@ subprojects {
3435
group = mod_group
3536

3637
// Configure license headers
37-
apply(plugin: "org.cadixdev.licenser")
38+
apply(plugin: "net.neoforged.licenser")
3839
final licenseDir = "src/main/resources/assets/${mod_id}/license/"
3940
license {
4041
include("**/*.java") // Java files only
@@ -49,8 +50,9 @@ subprojects {
4950
if (att_license_mods != "") {
5051
att_license_mods.split(",").each { String modId ->
5152
//noinspection GroovyAssignabilityCheck
52-
matching(includes: List.of(prop.list("att_license_files_${modId}"))) {
53+
matching({ include(prop.list("att_license_files_${modId}")) }) {
5354
header = rootProject.project("common").file("${licenseDir}${modId}/HEADER.txt")
55+
it
5456
}
5557
}
5658
}
@@ -348,9 +350,8 @@ tasks.register("rebrandProject") {
348350
props.each { key, value ->
349351
if (key != value) {
350352
// Replace all occurrences in the contents
351-
final matcher = java.util.regex.Pattern.compile(
352-
java.util.regex.Pattern.quote(key.toString())
353-
).matcher(contents)
353+
final matcher = Pattern.compile(Pattern.quote(key.toString()))
354+
.matcher(contents)
354355
final count = matcher.count
355356
if (count > 0) {
356357
println("Replacing ${count} instance(s) of '${key}' with "

gradle.properties

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# All other plural properties expect CSV list format.
88

99
# Template Project Sync Version
10-
template_version=5
10+
template_version=7
1111

1212
# Mod Version
1313
mod_version=2.0.0-beta.21
@@ -93,15 +93,15 @@ parchment_version=2024.11.17
9393

9494
# Fabric https://fabricmc.net/develop
9595
# -> See also 'mixinextras_jij_fabric'
96-
fabric_loader_version=0.16.14
97-
fabric_loader_versions=>=0.16.1
98-
fabric_api_version=0.116.4+1.21.1
96+
fabric_loader_version=0.17.2
97+
fabric_loader_versions=>=0.17.0
98+
fabric_api_version=0.116.6+1.21.1
9999
fabric_api_versions=*
100100

101101
# NeoForge https://projects.neoforged.net/neoforged/neoforge
102102
# -> See also 'mixinextras_jij_neoforge'
103-
neoforge_version=21.1.190
104-
neoforge_versions=[21.1.22,)
103+
neoforge_version=21.1.209
104+
neoforge_versions=[21.1.195,)
105105
# NeoForm https://projects.neoforged.net/neoforged/neoform
106106
neoform_version=1.21.1-20240808.144430
107107

@@ -164,29 +164,34 @@ asm_version=9.8
164164
# Mixin https://mvnrepository.com/artifact/org.spongepowered/mixin
165165
mixin_version=0.8.7
166166
# MixinExtras https://github.com/LlamaLad7/MixinExtras/releases
167-
mixinextras_version=0.4.1
167+
mixinextras_version=0.5.0
168168
# JiJ MixinExtras if required to be newer than minimum loader-provided version.
169169
# Fabric:
170170
# - 0.15.0->0.3.0 (initial)
171-
# - 0.15.7->0.3.5 (WWC v2)
172-
# - 0.16.0->0.4.0 (WM)
171+
# - 0.15.7->0.3.5 (WrapWithCondition v2)
172+
# - 0.16.1->0.4.1 (WrapMethod)
173+
# - 0.17.0->0.5.0 (Expressions)
173174
# NeoForge:
174175
# - 20.2.84-beta->0.3.1 (initial)
175-
# - 20.4.114->0.3.5 (WWC v2)
176-
# - 21.1.22->0.4.1 (WM)
176+
# - 20.4.114->0.3.5 (WrapWithCondition v2)
177+
# - 21.1.22->0.4.1 (WrapMethod)
178+
# - 21.8.18->0.5.0 (Expressions)
179+
# + 21.1.195
180+
# + 21.3.88
181+
# + 21.4.149
177182
mixinextras_jij_fabric=false
178183
mixinextras_jij_neoforge=false
179184

180185
# Fabric Loom https://mvnrepository.com/artifact/net.fabricmc/fabric-loom
181-
loom_version=1.11.1
186+
loom_version=1.11.8
182187
# ModDev https://plugins.gradle.org/plugin/net.neoforged.moddev
183-
moddev_version=2.0.99
188+
moddev_version=2.0.112
184189
# Mod Publish Plugin https://plugins.gradle.org/plugin/me.modmuss50.mod-publish-plugin
185-
mpp_version=0.8.4
190+
mpp_version=1.0.0
186191
# grgit-service https://github.com/ajoberstar/grgit/releases
187192
grgitservice_version=5.3.2
188-
# licenser https://plugins.gradle.org/plugin/org.cadixdev.licenser
189-
licenser_version=0.6.1
193+
# licenser https://maven.neoforged.net/#/releases/net/neoforged/licenser/net.neoforged.licenser.gradle.plugin
194+
licenser_version=0.7.5
190195
# foojay-resolver-convention https://plugins.gradle.org/plugin/org.gradle.toolchains.foojay-resolver-convention
191196
foojay_version=1.0.0
192197

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
# Gradle https://gradle.org/releases
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)