From c61940f6577cd0bcd8b30a0a2ef228612d830a2e Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 20 Apr 2021 20:55:11 +0800 Subject: [PATCH] Add action overloads to platform methods, add TransformPlatformOnly Signed-off-by: shedaniel --- .../me/shedaniel/architect/plugin/ArchitectPlugin.kt | 2 ++ .../architect/plugin/ArchitectPluginExtension.kt | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPlugin.kt b/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPlugin.kt index 2768c08..ce9edcc 100644 --- a/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPlugin.kt +++ b/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPlugin.kt @@ -54,6 +54,7 @@ class ArchitectPlugin : Plugin { it += TransformExpectPlatform() it += RemapInjectables() it += AddRefmapName() + it += TransformPlatformOnly() } project.tasks.register("transformProductionForge", TransformingTask::class.java) { @@ -62,6 +63,7 @@ class ArchitectPlugin : Plugin { it += TransformExpectPlatform() it += RemapInjectables() it += AddRefmapName() + it += TransformPlatformOnly() it += TransformForgeAnnotations() it += TransformForgeEnvironment() diff --git a/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPluginExtension.kt b/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPluginExtension.kt index 059b954..947dde5 100644 --- a/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPluginExtension.kt +++ b/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPluginExtension.kt @@ -153,15 +153,19 @@ open class ArchitectPluginExtension(val project: Project) { return this } - fun fabric() { + @JvmOverloads + fun fabric(action: Action = Action {}) { transform("fabric", Action { it.setupFabricTransforms() + action.execute(it) }) } - fun forge() { + @JvmOverloads + fun forge(action: Action = Action {}) { transform("forge", Action { it.setupForgeTransforms() + action.execute(it) }) } @@ -275,12 +279,14 @@ data class Transform(val configName: String, val transformers: MutableList