From 96f3dc6f9c5939ea58a9217380ed366291c4d44b Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 8 Dec 2022 18:10:18 +0100 Subject: [PATCH] Buildscript updates, use fabric-api dependency in fmj --- build.gradle | 6 +---- fabric/build.gradle | 4 +-- fabric/src/main/resources/fabric.mod.json | 6 ++--- forge/build.gradle | 14 ++-------- forge/mods.toml | 29 --------------------- forge/src/main/resources/META-INF/mods.toml | 6 ++--- gradle.properties | 12 ++++----- 7 files changed, 16 insertions(+), 61 deletions(-) delete mode 100644 forge/mods.toml diff --git a/build.gradle b/build.gradle index c9ceabb5..fc0116eb 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { plugins { 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 "io.github.juuxel.loom-quiltflower" version "1.7.2" apply false id "me.shedaniel.unified-publishing" version "0.1.+" apply false @@ -30,10 +30,6 @@ subprojects { dependencies { minecraft "com.mojang:minecraft:${rootProject.architectury.minecraft}" mappings loom.officialMojangMappings() -// mappings loom.layered { -// officialMojangMappings() -// crane("dev.architectury:crane:${rootProject.crane_version}") -// } } } diff --git a/fabric/build.gradle b/fabric/build.gradle index f09d313a..71eebbf9 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -113,7 +113,7 @@ unifiedPublishing { displayName = "[Fabric $rootProject.supported_version] v$project.version" releaseType = "$rootProject.artifact_type" changelog = releaseChangelog() - gameVersions = ["1.19.1", "1.19.2"] + gameVersions = ["1.19.2"] gameLoaders = ["fabric", "quilt"] mainPublication renameJarForPublication relations { @@ -128,7 +128,7 @@ unifiedPublishing { curseforge { token = CURSE_API_KEY id = rootProject.curseforge_id - gameVersions.addAll "Java 17", "1.19-Snapshot" + gameVersions.addAll "Java 17", "1.19.2" } } diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 13a1e039..c0e70d69 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -34,9 +34,9 @@ }, "icon": "icon.png", "depends": { - "minecraft": "~1.19-", - "fabricloader": ">=0.13.0", - "fabric": ">=0.54.0" + "minecraft": "~1.19.2", + "fabricloader": ">=0.14.0", + "fabric": ">=0.66.0" }, "breaks": { "optifabric": "<1.13.0" diff --git a/forge/build.gradle b/forge/build.gradle index f47891e8..b783abf2 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -126,7 +126,7 @@ unifiedPublishing { displayName = "[Forge $rootProject.supported_version] v$project.version" releaseType = "$rootProject.artifact_type" changelog = releaseChangelog() - gameVersions = ["1.19.1", "1.19.2"] + gameVersions = ["1.19.2"] gameLoaders = ["forge"] mainPublication renameJarForPublication @@ -135,7 +135,7 @@ unifiedPublishing { curseforge { token = CURSE_API_KEY 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) - } -} diff --git a/forge/mods.toml b/forge/mods.toml deleted file mode 100644 index 16817649..00000000 --- a/forge/mods.toml +++ /dev/null @@ -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" diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 34cb57b6..921c3a3f 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[42,)" +loaderVersion = "[43,)" issueTrackerURL = "https://github.com/shedaniel/architectury/issues" license = "GNU LGPLv3" @@ -17,13 +17,13 @@ license = "LGPL-3" [[dependencies.architectury]] modId = "minecraft" mandatory = true -versionRange = "[1.19.1,)" +versionRange = "[1.19.2,)" ordering = "NONE" side = "BOTH" [[dependencies.architectury]] modId = "forge" mandatory = true -versionRange = "[42.0.0,)" +versionRange = "[43.2.0,)" ordering = "NONE" side = "BOTH" diff --git a/gradle.properties b/gradle.properties index db782afa..20e4a532 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,22 +4,20 @@ org.gradle.daemon=false platforms=fabric,forge minecraft_version=1.19.2 -supported_version=1.19.1/2 -required_version=1.19.1 +supported_version=1.19.2 artifact_type=release archives_base_name=architectury archives_base_name_snapshot=architectury-snapshot -base_version=6.3 +base_version=6.4 maven_group=dev.architectury -fabric_loader_version=0.14.9 -fabric_api_version=0.58.6+1.19.2 +fabric_loader_version=0.14.10 +fabric_api_version=0.66.0+1.19.2 mod_menu_version=3.1.0 -forge_version=43.0.0 -required_forge_version=42.0.0 +forge_version=43.2.0 curseforge_id=419699 modrinth_id=lhGA9TYQ