Rename plugin group

* Use myers diff algorithm

This is the default Git diff algorithm and by specifying this explicitly we prevent git configs from overriding this setting. As Paper relies on patches generated with Myers, and breaks with other algorithms, it doesn't make sense to allow users to configure this.

* Add diff algorithm in generatePatches

* Also add to isUnfinishedPatch

buildSrc/src/main/kotlin/config-publish.gradle.kts

@@ -35,7 +35,7 @@ fun ShadowJar.configureStandard() {
 
 val sourcesJar by tasks.existing(AbstractArchiveTask::class) {
     from(
-        zipTree(project(":paperweight-lib").tasks
+        zipTree(project(":nugget-lib").tasks
             .named("sourcesJar", AbstractArchiveTask::class)
             .flatMap { it.archiveFile })
     ) {
@@ -43,15 +43,15 @@ val sourcesJar by tasks.existing(AbstractArchiveTask::class) {
     }
 }
 
-val prefix = project.name.substringAfter("paperweight-")
+val prefix = project.name.substringAfter("nugget-")
 
 gradlePlugin {
-    website.set("https://github.com/PaperMC/paperweight")
-    vcsUrl.set("https://github.com/PaperMC/paperweight")
-    plugins.create("paperweight-$prefix") {
+    website.set("https://git.zontreck.com/ObsidianMC/nugget")
+    vcsUrl.set("https://git.zontreck.com/ObsidianMC/nugget")
+    plugins.create("nugget-$prefix") {
         id = "io.papermc.paperweight." + prefix
-        displayName = "paperweight $prefix"
-        tags.set(listOf("paper", "minecraft"))
+        displayName = "nugget $prefix"
+        tags.set(listOf("obsidian", "minecraft"))
     }
 }
 
@@ -64,7 +64,7 @@ val shadowJar by tasks.existing(ShadowJar::class) {
         return@existing
     }
 
-    val prefix = "paper.libs"
+    val prefix = "obsidian.libs"
     listOf(
         "com.github.salomonbrys.kotson",
         "com.google.errorprone.annotations",
@@ -91,11 +91,21 @@ val shadowJar by tasks.existing(ShadowJar::class) {
     }
 }
 
+
+val MAVEN_PASSWORD = "AriasCreationsMavenPassword"
+val MAVEN_USER = "AriasCreationsMavenUser"
+
+
 publishing {
     repositories {
-        maven("https://repo.papermc.io/repository/maven-snapshots/") {
-            credentials(PasswordCredentials::class)
-            name = "paper"
+        maven {
+            url = uri("https://git.zontreck.com/api/packages/ObsidianMC/maven")
+            name = "obsidian"
+
+            credentials {
+                username = project.findProperty(MAVEN_USER)?.toString()
+                password = project.findProperty(MAVEN_PASSWORD)?.toString()
+            }
         }
     }
 
@@ -109,11 +119,11 @@ publishing {
 }
 
 fun MavenPom.pomConfig() {
-    val repoPath = "PaperMC/paperweight"
-    val repoUrl = "https://github.com/$repoPath"
+    val repoPath = "ObsidianMC/nugget"
+    val repoUrl = "https://git.zontreck.com/$repoPath"
 
-    name.set("paperweight")
-    description.set("Gradle plugin for the PaperMC project")
+    name.set("nugget")
+    description.set("Gradle plugin for the ObsidianMC project")
     url.set(repoUrl)
     inceptionYear.set("2020")
 

gradle.properties

@@ -1,5 +1,5 @@
-group = io.papermc.paperweight
-version = 1.7.2-SNAPSHOT
+group = com.zontreck.nugget
+version = 1.7.4-SNAPSHOT
 
 org.gradle.caching = true
 org.gradle.parallel = true

nugget-core/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    shade(projects.paperweightLib)
+    shade(projects.nuggetLib)
 
     implementation(libs.bundles.kotson)
 }

nugget-core/src/main/kotlin/io/papermc/paperweight/core/PaperweightCore.kt

@@ -49,7 +49,7 @@ class PaperweightCore : Plugin<Project> {
     override fun apply(target: Project) {
         checkJavaVersion()
         Git.checkForGit()
-        printId<PaperweightCore>("paperweight-core", target.gradle)
+        printId<PaperweightCore>("nugget-core", target.gradle)
 
         val ext = target.extensions.create(PAPERWEIGHT_EXTENSION, PaperweightCoreExtension::class, target)
 
@@ -70,7 +70,7 @@ class PaperweightCore : Plugin<Project> {
         target.configurations.create(DECOMPILER_CONFIG)
         target.configurations.create(PAPERCLIP_CONFIG)
 
-        if (target.providers.gradleProperty("paperweight.dev").orNull == "true") {
+        if (target.providers.gradleProperty("nugget.dev").orNull == "true") {
             target.tasks.register<CreateDiffOutput>("diff") {
                 inputDir.convention(ext.paper.paperServerDir.map { it.dir("src/main/java") })
                 val prop = target.providers.gradleProperty("paperweight.diff.output")

nugget-lib/src/main/kotlin/io/papermc/paperweight/tasks/RebuildGitPatches.kt

@@ -97,7 +97,7 @@ abstract class RebuildGitPatches : ControllableOutputTask() {
         git("fetch", "--all", "--prune").runSilently(silenceErr = true)
         git(
             "format-patch",
-            "--zero-commit", "--full-index", "--no-signature", "--no-stat", "-N",
+            "--diff-algorithm=myers", "--zero-commit", "--full-index", "--no-signature", "--no-stat", "-N",
             "-o", patchFolder.absolutePathString(),
             baseRef.get()
         ).executeSilently()
@@ -131,7 +131,7 @@ abstract class RebuildGitPatches : ControllableOutputTask() {
         try {
             for (patch in patchFiles) {
                 futures += executor.submit {
-                    val hasNoChanges = git("diff", "--staged", patch.name).getText().lineSequence()
+                    val hasNoChanges = git("diff", "--diff-algorithm=myers", "--staged", patch.name).getText().lineSequence()
                         .filter { it.startsWith('+') || it.startsWith('-') }
                         .filterNot { it.startsWith("+++") || it.startsWith("---") }
                         .all { it.startsWith("+index") || it.startsWith("-index") }

nugget-lib/src/main/kotlin/io/papermc/paperweight/tasks/RemapJar.kt

@@ -76,6 +76,13 @@ abstract class RemapJar : JavaLauncherTask() {
 
     @TaskAction
     fun run() {
+        if (inputJar.path.absolute().normalize() == outputJar.path.absolute().normalize()) {
+            throw PaperweightException(
+                "Invalid configuration, inputJar and outputJar point to the same path: ${inputJar.path}\n" +
+                    "Consider removing customization of output locations, following the default Gradle conventions."
+            )
+        }
+
         if (toNamespace.get() != fromNamespace.get()) {
             val logFile = layout.cache.resolve(paperTaskOutput("log"))
             TinyRemapper.run(

nugget-lib/src/main/kotlin/io/papermc/paperweight/tasks/patchremap/PatchApplier.kt

@@ -103,7 +103,7 @@ class PatchApplier(
         target.createDirectories()
         git("checkout", remappedBranch).executeSilently()
         git(
-            "format-patch", "--zero-commit", "--full-index", "--no-signature", "--no-stat", "-N", "-o",
+            "format-patch", "--diff-algorith=myers", "--zero-commit", "--full-index", "--no-signature", "--no-stat", "-N", "-o",
             target.absolutePathString(), remappedBaseTag
         ).executeOut()
     }
@@ -114,7 +114,7 @@ class PatchApplier(
         }
 
         git("update-index", "--refresh").executeSilently()
-        if (git("diff-index", "--quiet", "HEAD", "--").runSilently() == 0) {
+        if (git("diff-index", "--diff-algorithm=myers", "--quiet", "HEAD", "--").runSilently() == 0) {
             return git("log", unmappedBranch, "-1", "--pretty=%B").getText().trim() !=
                 git("log", remappedBranch, "-1", "--pretty=%B").getText().trim()
         }