Skip to content

Commit ed15da0

Browse files
committed
Sync with Framework, close #6
1 parent 4091dc7 commit ed15da0

File tree

17 files changed

+348
-221
lines changed

17 files changed

+348
-221
lines changed

.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ ij_xml_block_comment_at_first_column = true
460460
ij_xml_keep_indents_on_empty_lines = false
461461
ij_xml_line_comment_at_first_column = true
462462

463-
[{*.yml,*.yaml}]
463+
[{*.yml,*.yaml,*.toml}]
464464
indent_size = 2
465465
ij_yaml_keep_indents_on_empty_lines = false
466466
ij_yaml_keep_line_breaks = true

.github/workflows/check-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Builds the project on Linux and Windows as a partial defence against bad commits
1+
# Builds the project on Linux and Windows as a partial defense against bad commits
22
name: Check Build
33

44
on:

.github/workflows/release.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
# Builds the project and publishes the artifacts to GitHub and Modrinth
2-
# Requires GITHUB_TOKEN to have write permissions; if not, replace it with a custom token
3-
# Requires a Modrinth PAT MODRINTH_TOKEN
1+
# Builds the project and publishes the artifacts to GitHub, Modrinth and CurseForge
2+
# Modrinth publishing requires a Modrinth PAT MODRINTH_TOKEN
3+
# Will skip without error if not present
4+
# CurseForge publishing requires a CurseForge API token CURSEFORGE_TOKEN
5+
# Will skip without error if not present
46
name: Release
57

6-
on: [workflow_dispatch]
8+
on:
9+
workflow_dispatch:
710

811
permissions:
912
contents: write

.github/workflows/sync-labels.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Synchronizes the repo's labels with labels.yml
1+
# Synchronizes the repo's labels with a centralized labels.yml
22
# Requires GITHUB_TOKEN to have write permissions; if not, replace it with a custom token
33
name: Sync Labels
44

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ A powerful command macro mod.
1010
[![Latest Minecraft](https://img.shields.io/modrinth/game-versions/65UyswbY?label=Latest%20Minecraft&color=%2300AF5C&logo=data:image/png;base64,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)](https://modrinth.com/mod/65UyswbY/versions)
1111

1212
[![Loader](https://img.shields.io/badge/Available%20for-Fabric-dbd0b4?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAcBAMAAACNPbLgAAABhGlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9TpX5UHMwgIpihOtlFRRxLFYtgobQVWnUwufQLmjQkKS6OgmvBwY/FqoOLs64OroIg+AHi6uKk6CIl/i8ptIj14Lgf7+497t4BQr3MNKsrAmi6bSZjUSmTXZUCr+iHiADG0Cszy4inFtPoOL7u4ePrXZhndT735xhQcxYDfBJxhBmmTbxBPLtpG5z3iUVWlFXic+JJky5I/Mh1xeM3zgWXBZ4pmunkPLFILBXaWGljVjQ14hnikKrplC9kPFY5b3HWylXWvCd/YTCnr6S4TnMUMSwhjgQkKKiihDJshGnVSbGQpP1oB/+I60+QSyFXCYwcC6hAg+z6wf/gd7dWfnrKSwpGge4Xx/kYBwK7QKPmON/HjtM4AfzPwJXe8lfqwNwn6bWWFjoCBreBi+uWpuwBlzvA8JMhm7Ir+WkK+TzwfkbflAWGboG+Na+35j5OH4A0dbV8AxwcAhMFyl7v8O6e9t7+PdPs7wd+dXKrd9SjeQAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAAd0SU1FB+cLFAcgIbOcUjoAAAAbUExURQAAAB0tQTg0KoB6bZqSfq6mlLyynMa8pdvQtJRJT6UAAAABdFJOUwBA5thmAAAAAWJLR0QB/wIt3gAAAF5JREFUGNN10FENwCAMhOFqOQuzMAtYOAtYqGw6mkEvhL59yR9Ca5YDqyOC465eKYqQm6LoCkVwnwQOBYKdeA5l51zhFtrsnPmg6m3Z2akk15dFH1lWFQVxlUFv+2sAJlA9O7NwQRQAAAAASUVORK5CYII=)](https://fabricmc.net/)
13-
[![Loader](https://img.shields.io/badge/Available%20for-Quilt-9115ff?logo=data:image/png;base64,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)](https://quiltmc.org/)
1413
[![Loader](https://img.shields.io/badge/Available%20for-NeoForge-f16436?logo=data:image/png;base64,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)](https://neoforged.net/)
1514

1615
[![Download on Modrinth](https://img.shields.io/modrinth/dt/65UyswbY?label=Download%20on%20Modrinth&logo=modrinth&logoColor=%2300AF5C)](https://modrinth.com/mod/65UyswbY)

build.gradle

+7-107
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
plugins {
2-
id("java")
3-
id("java-library")
4-
id("idea")
5-
id("maven-publish")
6-
id("org.jetbrains.gradle.plugin.idea-ext") version("${ideaext_version}") // Required for NeoGradle
2+
id("fabric-loom") version("${loom_version}") apply(false)
3+
id("net.neoforged.moddev") version("${moddev_version}") apply(false)
74
id("com.modrinth.minotaur") version("${minotaur_version}")
85
id("net.darkhax.curseforgegradle") version("${curseforgegradle_version}")
96
id("com.github.breadmoirai.github-release") version("${githubrelease_version}")
@@ -14,106 +11,14 @@ subprojects {
1411
version = mod_version
1512
group = mod_group
1613

17-
apply(plugin: "java")
18-
apply(plugin: "java-library")
19-
apply(plugin: "idea")
20-
apply(plugin: "maven-publish")
21-
22-
if (project.name != "common") {
14+
// Publishing
15+
if (name != "common") {
2316
apply(plugin: "com.modrinth.minotaur")
17+
apply(plugin: "net.darkhax.curseforgegradle")
2418
apply(plugin: "com.github.breadmoirai.github-release")
2519
apply(plugin: "org.ajoberstar.grgit.service")
26-
}
27-
28-
java.toolchain.languageVersion = JavaLanguageVersion.of(Integer.valueOf(java_version))
29-
30-
jar {
31-
from(rootProject.file("LICENSE")) {
32-
rename { "${it}_${mod_name}" }
33-
}
34-
manifest {
35-
attributes([
36-
"Specification-Title" : mod_name,
37-
"Specification-Vendor" : mod_owner,
38-
"Specification-Version" : project.jar.archiveVersion,
39-
"Implementation-Title" : project.name,
40-
"Implementation-Version" : project.jar.archiveVersion,
41-
"Implementation-Vendor" : mod_owner,
42-
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
43-
"Timestamp" : System.currentTimeMillis(),
44-
"Built-On-Java" : "${System.getProperty('java.vm.version')} (${System.getProperty('java.vm.vendor')})",
45-
"Built-On-Minecraft" : minecraft_version
46-
])
47-
}
48-
}
49-
java.withSourcesJar()
50-
sourcesJar {
51-
from(rootProject.file("LICENSE")) {
52-
rename { "${it}_${mod_name}" }
53-
}
54-
}
55-
56-
repositories {
57-
maven {
58-
name = "Modrinth"
59-
url = "https://api.modrinth.com/maven"
60-
}
61-
}
62-
63-
tasks.withType(JavaCompile).configureEach {
64-
it.options.encoding = "UTF-8"
65-
it.options.getRelease().set(Integer.valueOf(java_version))
66-
}
6720

68-
processResources {
69-
def expandProps = [
70-
"project_group": project.group,
71-
"mod_version": mod_version,
72-
"mod_group": mod_group,
73-
"mod_id": mod_id,
74-
"mod_name": mod_name,
75-
"mod_description": mod_description,
76-
"mod_icon": "assets/" + mod_id + "/icon.png",
77-
"mod_owner": mod_owner,
78-
"mod_authors_list": asJsonList(mod_authors),
79-
"mod_contributors_list": asJsonList(mod_contributors),
80-
"mod_authors_string": mod_authors.replace(",", ", "),
81-
"mod_contributors_string": mod_contributors.replace(",", ", "),
82-
"mod_license": mod_license,
83-
"mod_environment": mod_environment,
84-
"java_version": java_version,
85-
"java_versions_fabric_list": asJsonList(java_versions_fabric),
86-
"java_versions_neoforge": java_versions_neoforge,
87-
"minecraft_version": minecraft_version,
88-
"minecraft_versions_fabric_list": asJsonList(minecraft_versions_fabric),
89-
"minecraft_versions_neoforge": minecraft_versions_neoforge,
90-
"fabric_loader_version": fabric_loader_version,
91-
"fabric_loader_versions_list": asJsonList(fabric_loader_versions),
92-
"fabric_api_version": fabric_api_version,
93-
"fabric_api_versions_list": asJsonList(fabric_api_versions),
94-
"neoforge_loader_versions": neoforge_loader_versions,
95-
"neoforge_version": neoforge_version,
96-
"neoforge_versions": neoforge_versions,
97-
"modmenu_version": modmenu_version,
98-
"modmenu_versions_list": asJsonList(modmenu_versions),
99-
"homepage_url": homepage_url,
100-
"sources_url": sources_url,
101-
"issues_url": issues_url,
102-
"contact_url": contact_url
103-
]
104-
105-
filesMatching(["pack.mcmeta", "*.mod.json", "META-INF/*mods.toml", "*.mixins.json"]) {
106-
expand expandProps
107-
}
108-
inputs.properties(expandProps)
109-
}
110-
111-
tasks.withType(GenerateModuleMetadata).configureEach {
112-
enabled = false
113-
}
114-
115-
afterEvaluate {
116-
if (name != "common") {
21+
afterEvaluate {
11722
modrinth {
11823
token = System.getenv().MODRINTH_TOKEN ? System.getenv().MODRINTH_TOKEN : "empty"
11924
projectId = modrinth_id
@@ -149,8 +54,7 @@ subprojects {
14954
tasks.modrinthSyncBody.onlyIf { System.getenv().MODRINTH_TOKEN }
15055

15156
task curseforge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) {
152-
apiToken = System.getenv().CURSEFORGE_TOKEN ? System.getenv().CURSEFORGE_TOKEN : ""
153-
if (apiToken.isBlank()) return
57+
apiToken = System.getenv().CURSEFORGE_TOKEN ? System.getenv().CURSEFORGE_TOKEN : "empty"
15458

15559
disableVersionDetection()
15660
String module = project.name
@@ -205,10 +109,6 @@ subprojects {
205109
}
206110
}
207111

208-
static asJsonList(String versions) {
209-
return versions.split(",").collect { "\"$it\"" }.join(',')
210-
}
211-
212112
static String capsLoader(String loader) {
213113
switch(loader) {
214114
case "fabric": return "Fabric"

buildSrc/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
plugins {
2+
id("groovy-gradle-plugin")
3+
}

0 commit comments

Comments
 (0)