Move vars and keywords to extension for easier access from IDE plugin

Author: Johni0702

src/main/kotlin/com/replaymod/gradle/preprocess/PreprocessExtension.kt

@@ -0,0 +1,18 @@
+package com.replaymod.gradle.preprocess
+
+import org.gradle.api.model.ObjectFactory
+import org.gradle.kotlin.dsl.mapProperty
+
+open class PreprocessExtension(objects: ObjectFactory, val mcVersion: Int) {
+    val vars = objects.mapProperty<String, Int>().convention(mutableMapOf(
+            "MC" to mcVersion
+    ))
+    val keywords = objects.mapProperty<String, Keywords>().convention(mutableMapOf(
+            ".java" to PreprocessTask.DEFAULT_KEYWORDS,
+            ".kt" to PreprocessTask.DEFAULT_KEYWORDS,
+            ".gradle" to PreprocessTask.DEFAULT_KEYWORDS,
+            ".json" to PreprocessTask.DEFAULT_KEYWORDS,
+            ".mcmeta" to PreprocessTask.DEFAULT_KEYWORDS,
+            ".cfg" to PreprocessTask.CFG_KEYWORDS
+    ))
+}

src/main/kotlin/com/replaymod/gradle/preprocess/PreprocessPlugin.kt

@@ -23,6 +23,8 @@ class PreprocessPlugin : Plugin<Project> {
         val coreVersion = coreVersionFile.readText().toInt()
         val mcVersion = project.getMcVersion()
         project.extra["mcVersion"] = mcVersion
+        val ext = project.extensions.create("preprocess", PreprocessExtension::class, project.objects, mcVersion)
+
         if (coreVersion == mcVersion) {
             project.the<SourceSetContainer>().configureEach {
                 java.setSrcDirs(listOf(parent.file("src/$name/java")))
@@ -83,7 +85,8 @@ class PreprocessPlugin : Plugin<Project> {
                     }
                     mapping = mappingFile
                     reverseMapping = coreVersion < mcVersion
-                    vars = mutableMapOf("MC" to mcVersion)
+                    vars.convention(ext.vars)
+                    keywords.convention(ext.keywords)
                 }
                 val sourceJavaTask = project.tasks.findByName("source${name.capitalize()}Java")
                 (sourceJavaTask ?: project.tasks["compile${cName}Java"]).dependsOn(preprocessJava)
@@ -96,7 +99,8 @@ class PreprocessPlugin : Plugin<Project> {
                         compileTask(inherited.tasks["compile${cName}Kotlin"] as AbstractCompile)
                         mapping = mappingFile
                         reverseMapping = coreVersion < mcVersion
-                        vars = mutableMapOf("MC" to mcVersion)
+                        vars.convention(ext.vars)
+                        keywords.convention(ext.keywords)
                     }
                     val kotlinConsumerTask = project.tasks.findByName("source${name.capitalize()}Kotlin")
                             ?: project.tasks["compile${cName}Kotlin"]
@@ -108,7 +112,8 @@ class PreprocessPlugin : Plugin<Project> {
                 val preprocessResources = project.tasks.register<PreprocessTask>("preprocess${cName}Resources") {
                     source = inherited.file(inheritedSourceSet.resources.srcDirs.first())
                     generated = preprocessedResources
-                    vars = mutableMapOf("MC" to mcVersion)
+                    vars.convention(ext.vars)
+                    keywords.convention(ext.keywords)
                 }
                 project.tasks["process${cName}Resources"].dependsOn(preprocessResources)
                 resources.setSrcDirs(listOf(preprocessedResources))

src/main/kotlin/com/replaymod/gradle/preprocess/PreprocessTask.kt

@@ -8,6 +8,7 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.file.FileCollection
 import org.gradle.api.tasks.*
 import org.gradle.api.tasks.compile.AbstractCompile
+import org.gradle.kotlin.dsl.mapProperty
 import org.jetbrains.kotlin.backend.common.peek
 import org.jetbrains.kotlin.backend.common.pop
 import org.jetbrains.kotlin.backend.common.push
@@ -73,17 +74,10 @@ open class PreprocessTask : DefaultTask() {
     var classpath: FileCollection? = null
 
     @Input
-    var vars: MutableMap<String, Int> = mutableMapOf()
+    val vars = project.objects.mapProperty<String, Int>()
 
     @Input
-    var keywords: MutableMap<String, Keywords> = mutableMapOf(
-            ".java" to DEFAULT_KEYWORDS,
-            ".kt" to DEFAULT_KEYWORDS,
-            ".gradle" to DEFAULT_KEYWORDS,
-            ".json" to DEFAULT_KEYWORDS,
-            ".mcmeta" to DEFAULT_KEYWORDS,
-            ".cfg" to CFG_KEYWORDS
-    )
+    val keywords = project.objects.mapProperty<String, Keywords>()
 
     fun source(file: Any) {
         source = project.file(file)
@@ -103,18 +97,6 @@ open class PreprocessTask : DefaultTask() {
         classpath = task.classpath + project.files(task.destinationDir)
     }
 
-    fun `var`(name: String, value: Int) {
-        vars[name] = value
-    }
-
-    fun `var`(map: Map<String, Int>) {
-        vars.putAll(map)
-    }
-
-    fun keywords(extension: String, map: Keywords) {
-        keywords[extension] = map
-    }
-
     @TaskAction
     fun preprocess() {
         val source = source!!
@@ -159,11 +141,11 @@ open class PreprocessTask : DefaultTask() {
             mappedSources = javaTransformer.remap(sources)
         }
 
-        val commentPreprocessor = CommentPreprocessor(vars)
+        val commentPreprocessor = CommentPreprocessor(vars.get())
         project.fileTree(source).forEach { file ->
             val relPath = inPath.relativize(file.toPath())
             val outFile = outPath.resolve(relPath).toFile()
-            val kws = keywords.entries.find { (ext, _) -> file.name.endsWith(ext) }
+            val kws = keywords.get().entries.find { (ext, _) -> file.name.endsWith(ext) }
             if (kws != null) {
                 val javaTransform = { lines: List<String> ->
                     mappedSources?.get(relPath.toString())?.lines() ?: lines