From c12524b7aaf7057c331446581675505232866e4b Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 22 Jun 2021 12:30:45 +0200 Subject: [PATCH] [norelease] Switch to loom 0.9, crane and quiltflower (I can't believe that ALL of these work out of the box) --- build.gradle | 12 +++++++++++- common/build.gradle | 2 -- fabric/build.gradle | 2 -- forge/build.gradle | 2 -- settings.gradle | 1 + testmod-common/build.gradle | 2 -- testmod-fabric/build.gradle | 2 -- testmod-forge/build.gradle | 2 -- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 24c4d968..930c9aa1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ plugins { id "architectury-plugin" version "3.2-SNAPSHOT" - id "dev.architectury.loom" version "0.8.0-SNAPSHOT" apply false + id "dev.architectury.loom" version "0.9.0-SNAPSHOT" apply false + id 'io.github.juuxel.loom-quiltflower' version '1.1.1' apply false id "org.cadixdev.licenser" version "0.5.0" id "com.matthewprenger.cursegradle" version "1.4.0" apply false id "maven-publish" @@ -12,11 +13,20 @@ architectury { subprojects { apply plugin: "dev.architectury.loom" + apply plugin: "io.github.juuxel.loom-quiltflower" loom { silentMojangMappingsLicense() useFabricMixin = true } + + dependencies { + minecraft "com.mojang:minecraft:${rootProject.architectury.minecraft}" + mappings loom.layered { + officialMojangMappings() + crane("dev.architectury:crane:1.17+build.9") + } + } } allprojects { diff --git a/common/build.gradle b/common/build.gradle index 95feb644..9d8c393f 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -3,8 +3,6 @@ loom { } dependencies { - minecraft "com.mojang:minecraft:${rootProject.architectury.minecraft}" - mappings minecraft.officialMojangMappings() // We depend on fabric loader here to use the fabric @Environment annotations // Do NOT use other classes from fabric loader modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" diff --git a/fabric/build.gradle b/fabric/build.gradle index 4a78d6a1..f9323da7 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -26,8 +26,6 @@ repositories { } dependencies { - minecraft "com.mojang:minecraft:${rootProject.architectury.minecraft}" - mappings minecraft.officialMojangMappings() modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" modCompileOnly("com.terraformersmc:modmenu:${rootProject.mod_menu_version}") { transitive false } diff --git a/forge/build.gradle b/forge/build.gradle index d1826df5..2da96d75 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -22,8 +22,6 @@ architectury { } dependencies { - minecraft "com.mojang:minecraft:${rootProject.architectury.minecraft}" - mappings loom.officialMojangMappings() forge "net.minecraftforge:forge:${rootProject.architectury.minecraft}-${rootProject.forge_version}" implementation(project(path: ":common")) { diff --git a/settings.gradle b/settings.gradle index 68e8d9ef..c224a3c0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,6 +3,7 @@ pluginManagement { maven { url "https://maven.fabricmc.net/" } maven { url "https://maven.architectury.dev/" } maven { url "https://files.minecraftforge.net/maven/" } + maven { url "https://server.bbkr.space/artifactory/libs-release/" } gradlePluginPortal() } } diff --git a/testmod-common/build.gradle b/testmod-common/build.gradle index 3184d07f..c5f93dd9 100644 --- a/testmod-common/build.gradle +++ b/testmod-common/build.gradle @@ -1,6 +1,4 @@ dependencies { - minecraft "com.mojang:minecraft:${rootProject.architectury.minecraft}" - mappings loom.officialMojangMappings() // We depend on fabric loader here to use the fabric @Environment annotations // Do NOT use other classes from fabric loader modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" diff --git a/testmod-fabric/build.gradle b/testmod-fabric/build.gradle index db0868a4..69ac61d8 100644 --- a/testmod-fabric/build.gradle +++ b/testmod-fabric/build.gradle @@ -9,8 +9,6 @@ architectury { } dependencies { - minecraft "com.mojang:minecraft:${rootProject.architectury.minecraft}" - mappings loom.officialMojangMappings() modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" diff --git a/testmod-forge/build.gradle b/testmod-forge/build.gradle index 15622a85..2c72f883 100644 --- a/testmod-forge/build.gradle +++ b/testmod-forge/build.gradle @@ -17,8 +17,6 @@ architectury { } dependencies { - minecraft "com.mojang:minecraft:${gradle.rootProject.architectury.minecraft}" - mappings loom.officialMojangMappings() forge "net.minecraftforge:forge:${gradle.rootProject.architectury.minecraft}-${rootProject.forge_version}" implementation project(path: ":forge", configuration: "dev")