Add Gradle property to configure default min fuzz for fuzzy DiffPatch apply

Author: jpenilla

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/patching/ApplyFilePatchesFuzzy.kt

@@ -21,15 +21,22 @@
  */
 
 package io.papermc.paperweight.core.tasks.patching
+
 import codechicken.diffpatch.util.PatchMode
+import io.papermc.paperweight.core.util.defaultMinFuzz
+import javax.inject.Inject
 import org.gradle.api.provider.Property
+import org.gradle.api.provider.ProviderFactory
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.UntrackedTask
 import org.gradle.api.tasks.options.Option
 
 @UntrackedTask(because = "Always apply patches")
 abstract class ApplyFilePatchesFuzzy : ApplyFilePatches() {
 
+    @get:Inject
+    abstract val providers: ProviderFactory
+
     @get:Input
     @get:Option(
         option = "min-fuzz",
@@ -39,7 +46,7 @@ abstract class ApplyFilePatchesFuzzy : ApplyFilePatches() {
 
     init {
         run {
-            minFuzz.convention("0.5")
+            minFuzz.convention(providers.defaultMinFuzz())
         }
     }
 

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/patching/ApplySingleFilePatches.kt

@@ -26,6 +26,7 @@ import codechicken.diffpatch.cli.PatchOperation
 import codechicken.diffpatch.util.LogLevel
 import codechicken.diffpatch.util.PatchMode
 import io.papermc.paperweight.PaperweightException
+import io.papermc.paperweight.core.util.defaultMinFuzz
 import io.papermc.paperweight.tasks.*
 import io.papermc.paperweight.util.*
 import java.io.PrintStream
@@ -37,6 +38,7 @@ import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
+import org.gradle.api.provider.ProviderFactory
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.Internal
@@ -48,6 +50,9 @@ import org.gradle.kotlin.dsl.*
 
 abstract class ApplySingleFilePatches : BaseTask() {
 
+    @get:Inject
+    abstract val providers: ProviderFactory
+
     @get:Internal
     abstract val upstream: DirectoryProperty
 
@@ -57,6 +62,9 @@ abstract class ApplySingleFilePatches : BaseTask() {
     @get:Input
     abstract val mode: Property<PatchMode>
 
+    @get:Input
+    abstract val minFuzz: Property<String>
+
     abstract class Patch @Inject constructor(
         objects: ObjectFactory,
         upstream: DirectoryProperty,
@@ -93,6 +101,7 @@ abstract class ApplySingleFilePatches : BaseTask() {
     override fun init() {
         super.init()
         mode.convention(PatchMode.EXACT)
+        minFuzz.convention(providers.defaultMinFuzz())
     }
 
     @TaskAction
@@ -118,6 +127,7 @@ abstract class ApplySingleFilePatches : BaseTask() {
                         .logTo(logOut)
                         .level(LogLevel.ALL)
                         .mode(mode.get())
+                        .minFuzz(minFuzz.get().toFloat())
                         .summary(false)
                         .basePath(tmpWork)
                         .patchesPath(tmpPatch)

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/util/utils.kt

@@ -25,6 +25,10 @@ package io.papermc.paperweight.core.util
 import io.papermc.paperweight.core.extension.PaperweightCoreExtension
 import io.papermc.paperweight.util.constants.*
 import org.gradle.api.Project
+import org.gradle.api.provider.Provider
+import org.gradle.api.provider.ProviderFactory
 
 val Project.coreExt: PaperweightCoreExtension
     get() = extensions.getByName(PAPERWEIGHT_EXTENSION) as PaperweightCoreExtension
+
+fun ProviderFactory.defaultMinFuzz(): Provider<String> = gradleProperty("paperweight.defaultMinFuzz").orElse("0.5")