Merge branch 'refs/heads/1.21' into 1.21-neo

# Conflicts: # build.gradle # libs.versions.toml # src/main/resources/META-INF/neoforge.mods.toml
ModFest · Aug 10, 2024 · 2d1fcac · 2d1fcac
2 parents 4ea59ad + 4c01b7a
commit 2d1fcac
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -45,14 +45,19 @@ processResources {
 		issues        : issues,
 		sources       : sources,
 		license       : license,
-		authors       : "${authors}. Contributions by ${contributors}",
+		authors       : authors.split(", ").join("\",\n    \""),
+		contributors  : contributors.split(", ").join("\",\n    \""),
+		members       : "${authors}. Contributions by ${contributors}",
 		mc            : libs.versions.mc.get(),
-		neo           : libs.versions.neo.get(),
+		fl            : libs.versions.fl.get(),
 		fapi          : libs.versions.fapi.get(),
-		placeholder   : libs.versions.placeholder.get()
+		neo           : libs.versions.neo.get(),
+		placeholder   : libs.versions.placeholder.get(),
+		polydex       : libs.versions.polydex.get()
 	]
 	inputs.properties meta
-	filesMatching("META-INF/neoforge.mods.toml") { expand meta }
+	filesMatching("*.mod.json") { expand(meta) }
+	filesMatching("META-INF/*mods.toml") { expand(meta) }
 }
 
 tasks.withType(JavaCompile).configureEach {
@@ -81,10 +86,12 @@ publishing {
 
 modrinth {
 	token = System.getenv("MODRINTH_TOKEN")
-	projectId = 'glowcase'
+	projectId = "glowcase"
+	loaders = ["fabric", "neoforge"] // remove once modrinth can detect fabric+neo from jar
 	dependencies {
 		required.version "fabric-api", libs.versions.fapi.get()
 		embedded.version "placeholder-api", libs.versions.placeholder.get()
+		optional.version "polydex", libs.versions.polydex.get()
 	}
 	changelog = System.getenv("CHANGELOG")
 	syncBodyFrom = "<!--DO NOT EDIT MANUALLY: synced from gh readme-->\n" + rootProject.file("README.md").text

diff --git a/libs.versions.toml b/libs.versions.toml
@@ -5,12 +5,15 @@ minotaur = "2.+"
 mc = "1.21"
 yarn = "1.21+build.9"
 
-neoYarn = "1.21+build.4"
-neo = "21.0.133-beta"
+fl = "0.15.11"
 fapi = "0.100.7+1.21"
 ffapi = "0.100.7+2.0.8+1.21"
 
+neoYarn = "1.21+build.4"
+neo = "21.0.133-beta"
+
 placeholder = "2.4.1+1.21-neo"
+polydex = "1.2.2+1.21"
 
 [plugins]
 loom = { id = "dev.architectury.loom", version.ref = "loom" }
@@ -20,8 +23,12 @@ minotaur = { id = "com.modrinth.minotaur", version.ref = "minotaur" }
 mc = { group = "mojang", name = "minecraft", version.ref = "mc" }
 yarn = { group = "net.fabricmc", name = "yarn", version.ref = "yarn" }
 
+fl = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fl" }
+fapi = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fapi" }
+
 neoYarn = { group = "dev.architectury", name = "yarn-mappings-patch-neoforge", version.ref = "neoYarn" }
 neo = { group = "net.neoforged", name = "neoforge", version.ref = "neo" }
 ffapi = { group = "org.sinytra.forgified-fabric-api", name = "forgified-fabric-api", version.ref = "ffapi" }
 
 placeholder = { group = "folk.sisby", name = "TextPlaceholderAPI", version.ref = "placeholder" }
+polydex = { group = "eu.pb4", name = "polydex", version.ref = "polydex" }
diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml
@@ -9,7 +9,7 @@ version = "${version}"
 displayName = "${modName}"
 displayURL = "${homepage}"
 logoFile = "assets/glowcase/icon.png"
-authors = "${authors}"
+authors = "${members}"
 description = '''${modDescription}'''
 
 [[mixins]]
@@ -35,10 +35,3 @@ type = "required"
 versionRange = "[${fapi},)"
 ordering = "NONE"
 side = "BOTH"
-
-[[dependencies.${ modId }]]
-modId = "placeholder_api"
-type = "required"
-versionRange = "[${placeholder},)"
-ordering = "NONE"
-side = "BOTH"