Skip to content

Commit 132bb7b

Browse files
committed
Sync with template v8
1 parent 54de55a commit 132bb7b

11 files changed

Lines changed: 70 additions & 63 deletions

File tree

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

common/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,14 @@ dependencies {
5050
// Configure Loom
5151
loom {
5252
// Apply common AccessWidener if it exists
53-
def aw = project(":common").file("src/main/resources/${mod_id}.accesswidener")
53+
def aw = file("src/main/resources/${mod_id}.accesswidener")
5454
if (aw.exists()) accessWidenerPath.set(aw)
5555
if (aw.exists()) {
5656
validateAccessWidener { accessWidener = aw }
5757
afterEvaluate {
5858
validateAccessWidener.run()
5959
}
6060
}
61-
mixin {
62-
defaultRefmapName.set("${mod_id}.refmap.json")
63-
}
6461
}
6562

6663
// Set up access to common files

common/src/main/java/dev/terminalmc/signedit/gui/screen/ConfigScreenProvider.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ public static Screen getConfigScreen(Screen parent) {
3636
try {
3737
return ClothScreenProvider.getConfigScreen(parent);
3838
} catch (NoClassDefFoundError ignored) {
39-
return new BackupScreen(parent, "installCloth", "https://modrinth.com/project/9s6osm5g");
39+
return new BackupScreen(
40+
parent,
41+
"installCloth",
42+
"https://modrinth.com/project/9s6osm5g"
43+
);
4044
}
4145
}
4246

@@ -71,7 +75,7 @@ public void init() {
7175
(open) -> {
7276
if (open)
7377
Util.getPlatform().openUri(modUrl);
74-
Minecraft.getInstance().setScreen(parent);
78+
onClose();
7579
}, modUrl, true
7680
))
7781
)
@@ -86,5 +90,10 @@ public void init() {
8690
.build();
8791
addRenderableWidget(exitButton);
8892
}
93+
94+
@Override
95+
public void onClose() {
96+
Minecraft.getInstance().setScreen(parent);
97+
}
8998
}
9099
}

common/src/main/java/dev/terminalmc/signedit/platform/services/IPlatformServices.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,24 @@
1818

1919
import java.nio.file.Path;
2020

21+
@SuppressWarnings("unused")
2122
public interface IPlatformServices {
2223

2324
/**
24-
* @return the name of the current platform.
25+
* @return {@code true} if in a development environment.
2526
*/
26-
String getPlatformName();
27+
boolean isDevEnv();
2728

2829
/**
2930
* @return {@code true} if the mod is loaded.
3031
*/
3132
boolean isModLoaded(String modId);
3233

34+
/**
35+
* @return the name of the current platform.
36+
*/
37+
String getPlatformName();
38+
3339
/**
3440
* @return the game directory of the instance.
3541
*/
@@ -40,11 +46,6 @@ public interface IPlatformServices {
4046
*/
4147
Path getConfigDir();
4248

43-
/**
44-
* @return {@code true} if in a development environment.
45-
*/
46-
boolean isDevEnv();
47-
4849
/**
4950
* @return the name of the environment type.
5051
*/

fabric/src/main/java/dev/terminalmc/signedit/platform/FabricServices.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,20 @@
2424
public class FabricServices implements IPlatformServices {
2525

2626
@Override
27-
public String getPlatformName() {
28-
return "Fabric";
27+
public boolean isDevEnv() {
28+
return FabricLoader.getInstance().isDevelopmentEnvironment();
2929
}
3030

3131
@Override
3232
public boolean isModLoaded(String modId) {
3333
return FabricLoader.getInstance().isModLoaded(modId);
3434
}
3535

36+
@Override
37+
public String getPlatformName() {
38+
return "Fabric";
39+
}
40+
3641
@Override
3742
public Path getGameDir() {
3843
return FabricLoader.getInstance().getGameDir();
@@ -42,9 +47,4 @@ public Path getGameDir() {
4247
public Path getConfigDir() {
4348
return FabricLoader.getInstance().getConfigDir();
4449
}
45-
46-
@Override
47-
public boolean isDevEnv() {
48-
return FabricLoader.getInstance().isDevelopmentEnvironment();
49-
}
5050
}

gradle.properties

Lines changed: 25 additions & 26 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=6
10+
template_version=8
1111

1212
# Mod Version
1313
mod_version=0.1.2
@@ -33,7 +33,6 @@ mod_license=Apache-2.0
3333
# 'att_license_files_other-mod=**/gui/screen/**,**/TitleScreenMixin.java'
3434
# Header file must be located at `{assets_dir}/licenses/{mod_id}/HEADER.txt`
3535
att_license_mods=
36-
att_license_files_other-mod=
3736

3837
# Links
3938
homepage_url=https://modrinth.com/project/c7xDMxha
@@ -55,41 +54,41 @@ mod_curseforge_slug=sign-edit
5554
# Subproject Build Compatibility
5655
# -> Comment out or unset to disable publishing of a subproject.
5756
mod_loaders_fabric=fabric
58-
mc_versions_fabric=1.21.9
57+
mc_versions_fabric=1.21.9,1.21.10
5958
mod_loaders_neoforge=neoforge
60-
mc_versions_neoforge=1.21.9
59+
mc_versions_neoforge=1.21.10
6160

6261
# Java
6362
java_version=21
6463
java_versions_fabric=>=21
6564
java_versions_neoforge=[21,)
6665

6766
# Minecraft
68-
minecraft_version=1.21.9
67+
minecraft_version=1.21.10
6968
minecraft_versions_fabric=>1.21.8
70-
minecraft_versions_neoforge=[1.21.9,)
69+
minecraft_versions_neoforge=[1.21.10,)
7170

7271
# Parchment https://parchmentmc.org/docs/getting-started#choose-a-version
73-
parchment_minecraft_version=1.21.8
74-
parchment_version=2025.09.14
72+
parchment_minecraft_version=1.21.9
73+
parchment_version=2025.10.05
7574

7675
# Fabric https://fabricmc.net/develop
7776
# -> See also 'mixinextras_jij_fabric'
78-
fabric_loader_version=0.16.14
79-
fabric_loader_versions=>=0.16.1
80-
fabric_api_version=0.133.13+1.21.9
77+
fabric_loader_version=0.17.2
78+
fabric_loader_versions=>=0.17.0
79+
fabric_api_version=0.136.0+1.21.10
8180
fabric_api_versions=*
8281

8382
# NeoForge https://projects.neoforged.net/neoforged/neoforge
8483
# -> See also 'mixinextras_jij_neoforge'
85-
neoforge_version=21.9.2-beta
86-
neoforge_versions=[2.9.0-beta,)
84+
neoforge_version=21.10.20-beta
85+
neoforge_versions=[21.10.0-beta,)
8786
# NeoForm https://projects.neoforged.net/neoforged/neoform
88-
neoform_version=1.21.9-20250930.151910
87+
neoform_version=1.21.10-20251010.172816
8988

9089
# Dependency Property Identifiers
9190
# -> These values point to other properties with full dependency specification.
92-
common_deps=clothconfig,
91+
common_deps=clothconfig
9392
fabric_deps=modmenu,clothconfig,break1,break2,break3,break4,break5
9493
neoforge_deps=clothconfig,break1,break2,break3,break4,break5
9594

@@ -109,17 +108,17 @@ neoforge_deps=clothconfig,break1,break2,break3,break4,break5
109108
# Values marked as '[x]' may be omitted if trailing, or replaced with '-' otherwise.
110109

111110
# Cloth Config https://modrinth.com/project/9s6osm5g/versions
112-
d_common_clothconfig=-:-:imp:me.shedaniel.cloth:cloth-config-neoforge:$v
111+
d_common_clothconfig=-:-:imp:me.shedaniel.cloth:cloth-config-fabric:$v
113112
d_fabric_clothconfig=-:-:imp:me.shedaniel.cloth:cloth-config-fabric:$v:-,recommends:cloth-config,req:9s6osm5g,req:cloth-config
114113
d_neoforge_clothconfig=-:-:imp:me.shedaniel.cloth:cloth-config-neoforge:$v:-,optional:cloth-config,req:9s6osm5g,req:cloth-config
115-
v_clothconfig=19.0.147
116-
vr_fabric_clothconfig=>=19
117-
vr_neoforge_clothconfig=[19,)
114+
v_clothconfig=20.0.148
115+
vr_fabric_clothconfig=>=20
116+
vr_neoforge_clothconfig=[20,)
118117

119118
# ModMenu https://modrinth.com/project/mOgUt4GM/versions
120119
d_fabric_modmenu=-:-:imp:maven.modrinth:mOgUt4GM:$v:-,recommends:modmenu,req:mOgUt4GM,req:modmenu
121-
v_modmenu=15.0.0-beta.3
122-
vr_fabric_modmenu=>=15.0.0-beta.1
120+
v_modmenu=16.0.0-rc.1
121+
vr_fabric_modmenu=>=16.0.0-rc.1
123122

124123
# Conflicting Mods
125124
d_fabric_break1=-,breaks:chatcalc,inc:o2oFdqXS,-
@@ -159,7 +158,7 @@ fabric_entrypoints_modmenu=compat.modmenu.ModMenuImpl
159158
# Mixin https://mvnrepository.com/artifact/org.spongepowered/mixin
160159
mixin_version=0.8.7
161160
# MixinExtras https://github.com/LlamaLad7/MixinExtras/releases
162-
mixinextras_version=0.4.1
161+
mixinextras_version=0.5.0
163162
# JiJ MixinExtras if required to be newer than minimum loader-provided version.
164163
# Fabric:
165164
# - 0.15.0->0.3.0 (initial)
@@ -180,13 +179,13 @@ mixinextras_jij_neoforge=false
180179
# Fabric Loom https://mvnrepository.com/artifact/net.fabricmc/fabric-loom
181180
loom_version=1.11.8
182181
# ModDev https://plugins.gradle.org/plugin/net.neoforged.moddev
183-
moddev_version=2.0.110
182+
moddev_version=2.0.112
184183
# Mod Publish Plugin https://plugins.gradle.org/plugin/me.modmuss50.mod-publish-plugin
185-
mpp_version=0.8.4
184+
mpp_version=1.0.0
186185
# grgit-service https://github.com/ajoberstar/grgit/releases
187186
grgitservice_version=5.3.2
188-
# licenser https://plugins.gradle.org/plugin/org.cadixdev.licenser
189-
licenser_version=0.6.1
187+
# licenser https://maven.neoforged.net/#/releases/net/neoforged/licenser/net.neoforged.licenser.gradle.plugin
188+
licenser_version=0.7.5
190189
# foojay-resolver-convention https://plugins.gradle.org/plugin/org.gradle.toolchains.foojay-resolver-convention
191190
foojay_version=1.0.0
192191

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.2-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)