From 0569f181aea94bfca2f1ca30d98e993b176a7924 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Sun, 25 Jan 2026 03:32:07 +0100 Subject: More publishing suffering --- Fabric/build.gradle | 16 +++++++++++++--- Forge/build.gradle | 34 +++++++++++++++------------------- Forge/settings.gradle | 6 ++++++ 3 files changed, 34 insertions(+), 22 deletions(-) create mode 100644 Forge/settings.gradle diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 66c12f9..701031a 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'net.fabricmc.fabric-loom-remap' version "${loom_version}" + id 'fabric-loom' version "${loom_version}" id 'maven-publish' id "com.modrinth.minotaur" version "2.+" id "com.matthewprenger.cursegradle" version "1.4.0" @@ -66,6 +66,7 @@ curseforge { releaseType = 'release' changelogType = 'markdown' changelog = file('../CHANGELOG.md') + mainArtifact(remapJar) addGameVersion '1.16.4' addGameVersion '1.16.5' @@ -82,10 +83,10 @@ modrinth { token = findProperty('modrinthKey') ?: '0' projectId = "z440MEwJ" versionNumber = project.version - versionName = "No Chat Restrictions v" + project.version + versionName = "No Chat Restrictions " + project.version versionType = "release" changelog = rootProject.file("../CHANGELOG.md").text - uploadFile = jar + uploadFile = remapJar gameVersions = [ '1.16.4', '1.16.5' ] loaders = [ 'fabric' ] @@ -94,6 +95,15 @@ modrinth { } } +afterEvaluate { + tasks.named('modrinth') { + dependsOn(remapJar) + } + tasks.named('curseforge') { + dependsOn(remapJar) + } +} + task upload { dependsOn('modrinth') dependsOn('curseforge') diff --git a/Forge/build.gradle b/Forge/build.gradle index 1d19fe8..ed1b867 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -1,28 +1,30 @@ +import com.modrinth.minotaur.TaskModrinthUpload + buildscript { repositories { - maven { url "file:///${project.projectDir}/deps/" } + maven { url = uri("${rootDir}/deps") } maven { url = 'https://files.minecraftforge.net/maven' } maven { url = 'https://repo.spongepowered.org/repository/maven-public/' } - maven { url 'https://plugins.gradle.org/m2/' } + maven { url "https://plugins.gradle.org/m2/" } + gradlePluginPortal() mavenCentral() jcenter() } dependencies { classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true + classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.4.0' + classpath 'com.modrinth.minotaur:com.modrinth.minotaur.gradle.plugin:1.2.0' classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT' } } -plugins { - id "com.modrinth.minotaur" version "2.+" - id "com.matthewprenger.cursegradle" version "1.4.0" -} - apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'idea' apply plugin: 'maven-publish' apply plugin: 'org.spongepowered.mixin' +apply plugin: "com.modrinth.minotaur" +apply plugin: "com.matthewprenger.cursegradle" mixin { add sourceSets.main, "nochatrestrictions.refmap.json" @@ -119,29 +121,23 @@ curseforge { addGameVersion '1.16.5' addGameVersion 'Forge' addGameVersion 'Java 8' - - relations { - //requiredDependency 'fabric-api' - } } } -modrinth { +task publishModrinth (type: TaskModrinthUpload){ token = findProperty('modrinthKey') ?: '0' projectId = "z440MEwJ" versionNumber = project.version - versionName = "No Chat Restrictions v" + project.version + versionName = "No Chat Restrictions " + project.version versionType = "release" changelog = rootProject.file("../CHANGELOG.md").text uploadFile = jar - gameVersions = [ '1.16.4', '1.16.5' ] - loaders = [ 'forge' ] - dependencies { - //required.project "P7dR8mSH" - } + addGameVersion('1.16.4') + addGameVersion('1.16.6') + addLoader('forge') } task upload { - dependsOn('modrinth') + dependsOn('publishModrinth') dependsOn('curseforge') } \ No newline at end of file diff --git a/Forge/settings.gradle b/Forge/settings.gradle new file mode 100644 index 0000000..3b3befd --- /dev/null +++ b/Forge/settings.gradle @@ -0,0 +1,6 @@ +pluginManagement { + repositories { + maven { url "https://plugins.gradle.org/m2/" } + gradlePluginPortal() + } +} \ No newline at end of file -- cgit v1.2.3