Buildscript updates, use fabric-api dependency in fmj

This commit is contained in:
Max
2022-12-08 18:10:18 +01:00
parent b94fc210a3
commit 96f3dc6f9c
7 changed files with 16 additions and 61 deletions

View File

@@ -8,7 +8,7 @@ buildscript {
plugins { plugins {
id "architectury-plugin" version "3.4-SNAPSHOT" id "architectury-plugin" version "3.4-SNAPSHOT"
id "dev.architectury.loom" version "0.12.0-SNAPSHOT" apply false id "dev.architectury.loom" version "1.0-SNAPSHOT" apply false
id "org.cadixdev.licenser" version "0.6.1" id "org.cadixdev.licenser" version "0.6.1"
id "io.github.juuxel.loom-quiltflower" version "1.7.2" apply false id "io.github.juuxel.loom-quiltflower" version "1.7.2" apply false
id "me.shedaniel.unified-publishing" version "0.1.+" apply false id "me.shedaniel.unified-publishing" version "0.1.+" apply false
@@ -30,10 +30,6 @@ subprojects {
dependencies { dependencies {
minecraft "com.mojang:minecraft:${rootProject.architectury.minecraft}" minecraft "com.mojang:minecraft:${rootProject.architectury.minecraft}"
mappings loom.officialMojangMappings() mappings loom.officialMojangMappings()
// mappings loom.layered {
// officialMojangMappings()
// crane("dev.architectury:crane:${rootProject.crane_version}")
// }
} }
} }

View File

@@ -113,7 +113,7 @@ unifiedPublishing {
displayName = "[Fabric $rootProject.supported_version] v$project.version" displayName = "[Fabric $rootProject.supported_version] v$project.version"
releaseType = "$rootProject.artifact_type" releaseType = "$rootProject.artifact_type"
changelog = releaseChangelog() changelog = releaseChangelog()
gameVersions = ["1.19.1", "1.19.2"] gameVersions = ["1.19.2"]
gameLoaders = ["fabric", "quilt"] gameLoaders = ["fabric", "quilt"]
mainPublication renameJarForPublication mainPublication renameJarForPublication
relations { relations {
@@ -128,7 +128,7 @@ unifiedPublishing {
curseforge { curseforge {
token = CURSE_API_KEY token = CURSE_API_KEY
id = rootProject.curseforge_id id = rootProject.curseforge_id
gameVersions.addAll "Java 17", "1.19-Snapshot" gameVersions.addAll "Java 17", "1.19.2"
} }
} }

View File

@@ -34,9 +34,9 @@
}, },
"icon": "icon.png", "icon": "icon.png",
"depends": { "depends": {
"minecraft": "~1.19-", "minecraft": "~1.19.2",
"fabricloader": ">=0.13.0", "fabricloader": ">=0.14.0",
"fabric": ">=0.54.0" "fabric": ">=0.66.0"
}, },
"breaks": { "breaks": {
"optifabric": "<1.13.0" "optifabric": "<1.13.0"

View File

@@ -126,7 +126,7 @@ unifiedPublishing {
displayName = "[Forge $rootProject.supported_version] v$project.version" displayName = "[Forge $rootProject.supported_version] v$project.version"
releaseType = "$rootProject.artifact_type" releaseType = "$rootProject.artifact_type"
changelog = releaseChangelog() changelog = releaseChangelog()
gameVersions = ["1.19.1", "1.19.2"] gameVersions = ["1.19.2"]
gameLoaders = ["forge"] gameLoaders = ["forge"]
mainPublication renameJarForPublication mainPublication renameJarForPublication
@@ -135,7 +135,7 @@ unifiedPublishing {
curseforge { curseforge {
token = CURSE_API_KEY token = CURSE_API_KEY
id = rootProject.curseforge_id id = rootProject.curseforge_id
gameVersions.addAll "Java 17" gameVersions.addAll "Java 17", "1.19.2"
} }
} }
@@ -150,13 +150,3 @@ unifiedPublishing {
} }
} }
// Update mods.toml with the new versions automatically
// Not using processResources because it is easier to do this manually, and see it reflected immediately
afterEvaluate {
file("src/main/resources/META-INF/mods.toml").withOutputStream {
it << file("mods.toml").text
.replaceAll("@LOADER_MAJOR@", rootProject.required_forge_version.split("\\.")[0])
.replaceAll("@MINECRAFT_VERSION@", rootProject.required_version)
.replaceAll("@FORGE_VERSION@", rootProject.required_forge_version)
}
}

View File

@@ -1,29 +0,0 @@
modLoader = "javafml"
loaderVersion = "[@LOADER_MAJOR@,)"
issueTrackerURL = "https://github.com/shedaniel/architectury/issues"
license = "GNU LGPLv3"
[[mods]]
modId = "architectury"
version = "${version}"
displayName = "Architectury"
authors = "shedaniel"
description = '''
A intermediary api aimed to ease developing multiplatform mods.
'''
logoFile = "icon.png"
license = "LGPL-3"
[[dependencies.architectury]]
modId = "minecraft"
mandatory = true
versionRange = "[@MINECRAFT_VERSION@,)"
ordering = "NONE"
side = "BOTH"
[[dependencies.architectury]]
modId = "forge"
mandatory = true
versionRange = "[@FORGE_VERSION@,)"
ordering = "NONE"
side = "BOTH"

View File

@@ -1,5 +1,5 @@
modLoader = "javafml" modLoader = "javafml"
loaderVersion = "[42,)" loaderVersion = "[43,)"
issueTrackerURL = "https://github.com/shedaniel/architectury/issues" issueTrackerURL = "https://github.com/shedaniel/architectury/issues"
license = "GNU LGPLv3" license = "GNU LGPLv3"
@@ -17,13 +17,13 @@ license = "LGPL-3"
[[dependencies.architectury]] [[dependencies.architectury]]
modId = "minecraft" modId = "minecraft"
mandatory = true mandatory = true
versionRange = "[1.19.1,)" versionRange = "[1.19.2,)"
ordering = "NONE" ordering = "NONE"
side = "BOTH" side = "BOTH"
[[dependencies.architectury]] [[dependencies.architectury]]
modId = "forge" modId = "forge"
mandatory = true mandatory = true
versionRange = "[42.0.0,)" versionRange = "[43.2.0,)"
ordering = "NONE" ordering = "NONE"
side = "BOTH" side = "BOTH"

View File

@@ -4,22 +4,20 @@ org.gradle.daemon=false
platforms=fabric,forge platforms=fabric,forge
minecraft_version=1.19.2 minecraft_version=1.19.2
supported_version=1.19.1/2 supported_version=1.19.2
required_version=1.19.1
artifact_type=release artifact_type=release
archives_base_name=architectury archives_base_name=architectury
archives_base_name_snapshot=architectury-snapshot archives_base_name_snapshot=architectury-snapshot
base_version=6.3 base_version=6.4
maven_group=dev.architectury maven_group=dev.architectury
fabric_loader_version=0.14.9 fabric_loader_version=0.14.10
fabric_api_version=0.58.6+1.19.2 fabric_api_version=0.66.0+1.19.2
mod_menu_version=3.1.0 mod_menu_version=3.1.0
forge_version=43.0.0 forge_version=43.2.0
required_forge_version=42.0.0
curseforge_id=419699 curseforge_id=419699
modrinth_id=lhGA9TYQ modrinth_id=lhGA9TYQ