From a3d99c3076457ca63eedd21654fc8e0f06b09176 Mon Sep 17 00:00:00 2001 From: octarine-noise Date: Sun, 5 Jan 2020 16:33:12 +0100 Subject: [PATCH] [WIP] fix Mixin annotation processing --- build.gradle.kts | 9 +++++---- gradle.properties | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 505e1f6..f8827b4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,6 +3,7 @@ plugins { id("net.minecraftforge.gradle").version("3.0.157") id("org.spongepowered.mixin").version("0.7-SNAPSHOT") } +apply(plugin = "org.spongepowered.mixin") repositories { maven("http://files.minecraftforge.net/maven") @@ -14,10 +15,13 @@ dependencies { "minecraft"("net.minecraftforge:forge:${properties["mcVersion"]}-${properties["forgeVersion"]}") "implementation"("kottle:Kottle:${properties["kottleVersion"]}") + "implementation"("org.spongepowered:mixin:0.8-SNAPSHOT") + annotationProcessor("org.spongepowered:mixin:0.8-SNAPSHOT") } sourceSets { + get("main").ext["refMap"] = "betterfoliage.refmap.json" get("main").resources.srcDir("src/forge/resources") get("main").java.srcDir("src/forge/java") } @@ -25,6 +29,7 @@ kotlin.sourceSets { get("main").kotlin.srcDir("src/forge/kotlin") } + minecraft { mappings(properties["mappingsChannel"] as String, properties["mappingsVersion"] as String) accessTransformer(file("src/main/resources/META-INF/accesstransformer.cfg")) @@ -39,10 +44,6 @@ minecraft { } } -mixin { - add(sourceSets["main"], "betterfoliage.refmap.json") -} - java { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/gradle.properties b/gradle.properties index ee1f9d9..b9ccad1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,5 @@ org.gradle.jvmargs=-Xmx2G +org.gradle.daemon=false group = com.github.octarine-noise jarName = BetterFoliage-Forge