From bceabefc7baf7795b906190dc8c275fbfecec08d Mon Sep 17 00:00:00 2001 From: OptimusZeGaming Date: Tue, 28 May 2024 09:52:46 +0200 Subject: [PATCH] build: update mixin 8.3 to 8.5 :arrow_up: --- build.gradle | 83 +--------------------------------------------------- 1 file changed, 1 insertion(+), 82 deletions(-) diff --git a/build.gradle b/build.gradle index bc1f619f..5dc71fe0 100644 --- a/build.gradle +++ b/build.gradle @@ -8,10 +8,7 @@ buildscript { classpath "org.spongepowered:mixingradle:0.7.+" } } -plugins { - id "com.matthewprenger.cursegradle" version "1.4.0" - id "com.modrinth.minotaur" version "2.+" -} + apply plugin: "net.minecraftforge.gradle" apply plugin: "eclipse" apply plugin: "org.spongepowered.mixin" @@ -28,9 +25,6 @@ println("Java: " + System.getProperty("java.version") + " JVM: " + System.getPro compileJava.options.compilerArgs.add '-parameters' repositories { - maven { - url "https://www.cursemaven.com" - } maven { url = "https://repo.spongepowered.org/maven" } @@ -209,73 +203,6 @@ tasks.whenTaskAdded { it.dependsOn "prepareDataResources" } -// CurseGradle settings for uploading to CurseForge -curseforge { - project { - // Get the CurseForge token from the environment variables - apiKey = System.getenv("CURSEFORGE_TOKEN") - // Copy settings from gradle.properties - id = project.curseforge_project_id - releaseType = project.curseforge_release_type - project.curseforge_game_versions.split(" ").each it::addGameVersion - addGameVersion("Forge") - addGameVersion("NeoForge") - // Point to 'changelog' setting to a the changelog file - changelog = file("changelog.md") - changelogType = "markdown" - if (!project.curseforge_required_dependency_ids.isEmpty() || !project.curseforge_optional_dependency_ids.isEmpty()) { - relations { - // Required dependencies - if (!project.curseforge_required_dependency_ids.isEmpty()) - project.curseforge_required_dependency_ids.split(" ").each it::requiredDependency - // Optional dependencies - if (!project.curseforge_optional_dependency_ids.isEmpty()) - project.curseforge_optional_dependency_ids.split(" ").each it::optionalDependency - } - } - - mainArtifact(file('build/renamedLibs/_' + jar.getArchiveFileName().get())) { - displayName = "${project.mod_name} ${project.mod_version} for Forge ${project.minecraft_suffix.substring(2)}" - } - } - options { - // Don't add project Java version - javaVersionAutoDetect = false - } -} - -// Move CurseGradle's tasks from 'upload' to 'publishing' -project.gradle.taskGraph.whenReady { - tasks.stream().filter(task -> task.group.equals "upload").each { task -> task.group = "publishing" } -} - -// Minotaur settings for uploading to Modrinth -modrinth { - // Get the Modrinth token from the environment variables - token = System.getenv("MODRINTH_TOKEN") - // Copy settings from gradle.properties - projectId = project.modrinth_project_id - versionNumber = version - versionType = project.modrinth_release_type // Can be either 'release', 'alpha', or 'beta' - versionName = "${project.mod_name} ${project.mod_version}" - gameVersions = project.modrinth_game_versions.split(" ") as List - // Convert the changelog file to text - changelog = file("changelog.md").text - uploadFile = file('build/renamedLibs/_' + jar.getArchiveFileName().get()) - // With Loom, this MUST be set to `remapJar` instead of `jar`! - loaders = ["forge", "neoforge"] - if (!project.modrinth_required_dependency_ids.isEmpty() || !project.modrinth_optional_dependency_ids.isEmpty()) { - dependencies { - // Required dependencies - if (!project.modrinth_required_dependency_ids.isEmpty()) - project.modrinth_required_dependency_ids.split(" ").each required::project - // Optional dependencies - if (!project.modrinth_optional_dependency_ids.isEmpty()) - project.modrinth_optional_dependency_ids.split(" ").each optional::project - } - } -} - // Create task which copies from 'jar', but renames the file tasks.register('renameJar', Copy) { dependsOn build @@ -284,11 +211,3 @@ tasks.register('renameJar', Copy) { rename "_"::concat } jar.finalizedBy renameJar - -// Create a task to upload to both CurseForge and Modrinth -task publishAll { - group "publishing" - dependsOn("curseforge", "modrinth") - // Also build the file so I have a copy locally - dependsOn "build" -}