diff --git a/buildSrc/src/main/kotlin/ToothpickExtension.kt b/buildSrc/src/main/kotlin/ToothpickExtension.kt index ff8e264f..87ab20d3 100644 --- a/buildSrc/src/main/kotlin/ToothpickExtension.kt +++ b/buildSrc/src/main/kotlin/ToothpickExtension.kt @@ -90,14 +90,4 @@ open class ToothpickExtension(objects: ObjectFactory) { } return upstreamArray.stream().sorted { upstream1, upstream2 -> upstream1.id - upstream2.id}.collect(Collectors.toList()) } - - internal val mavenCommand: String by lazy { - if (exitsSuccessfully("mvn", "-v")) { - return@lazy "mvn" - } - if (exitsSuccessfully("mvn.cmd", "-v")) { - return@lazy "mvn.cmd" - } - error("Unable to locate maven. Please ensure you have maven installed and on your path.") - } } diff --git a/buildSrc/src/main/kotlin/task/Paperclip.kt b/buildSrc/src/main/kotlin/task/Paperclip.kt index 40f67149..a9f82332 100644 --- a/buildSrc/src/main/kotlin/task/Paperclip.kt +++ b/buildSrc/src/main/kotlin/task/Paperclip.kt @@ -22,11 +22,12 @@ internal fun Project.createPaperclipTask( val patchedJarPath = inputs.files.singleFile.absolutePath logger.lifecycle(">>> Building paperclip") val paperclipCmd = arrayListOf( - toothpick.mavenCommand, "-T", "2C", "clean", "package", + "mvn", "-T", "2C", "clean", "package", "-Dmcver=${toothpick.minecraftVersion}", "-Dpaperjar=$patchedJarPath", "-Dvanillajar=$vanillaJarPath" ) + if (System.getProperty("os.name").startsWith("Windows")) paperclipCmd[0] = "mvn.cmd" if (jenkins) paperclipCmd.add("-Dstyle.color=never") ensureSuccess(cmd(*paperclipCmd.toTypedArray(), dir = paperclipDir, printOut = true)) val paperClip = paperclipDir.resolve("assembly/target/paperclip-${toothpick.minecraftVersion}.jar")