Upgrade paperweight with bundler jar updates

This allows creating paperclip jars pre-patch (only the reobf'd jar for
now).

Paper-MojangAPI/build.gradle.kts

@@ -1,5 +1,3 @@
-import java.util.Locale
-
 plugins {
     `java-library`
     `maven-publish`
@@ -16,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    implementation(project(":Paper-API"))
+    implementation(project(":paper-api"))
     api("com.mojang:brigadier:1.0.18")
 
     compileOnly("it.unimi.dsi:fastutil:8.2.2")
@@ -29,7 +27,6 @@ dependencies {
 
 configure<PublishingExtension> {
     publications.create<MavenPublication>("maven") {
-        artifactId = project.name.toLowerCase(Locale.ENGLISH)
         from(components["java"])
     }
 }

build.gradle.kts

@@ -49,12 +49,12 @@ dependencies {
     paramMappings("net.fabricmc:yarn:1.18-pre8+build.4:mergedv2")
     remapper("net.fabricmc:tiny-remapper:0.7.0:fat")
     decompiler("net.minecraftforge:forgeflower:1.5.498.22")
-    paperclip("io.papermc:paperclip:2.0.1")
+    paperclip("io.papermc:paperclip:3.0.0-SNAPSHOT")
 }
 
 paperweight {
     minecraftVersion.set(providers.gradleProperty("mcVersion"))
-    serverProject.set(project(":Paper-Server"))
+    serverProject.set(project(":paper-server"))
 
     paramMappingsRepo.set("https://maven.fabricmc.net/")
     remapRepo.set("https://maven.fabricmc.net/")

patches/api/Convert-project-to-Gradle.patch

@@ -31,8 +31,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- /dev/null
 +++ b/build.gradle.kts
 @@ -0,0 +0,0 @@
-+import java.util.Locale
-+
 +plugins {
 +    `java-library`
 +    `maven-publish`
@@ -66,7 +64,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +configure<PublishingExtension> {
 +    publications.create<MavenPublication>("maven") {
-+        artifactId = project.name.toLowerCase(Locale.ENGLISH)
 +        from(components["java"])
 +    }
 +}
@@ -82,7 +79,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +tasks.jar {
 +    from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
-+        into("META-INF/maven/${project.group}/${project.name.toLowerCase(Locale.ENGLISH)}")
++        into("META-INF/maven/${project.group}/${project.name}")
 +    }
 +    manifest {
 +        attributes(

patches/server/Build-system-changes.patch

@@ -10,7 +10,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/build.gradle.kts
 @@ -0,0 +0,0 @@ repositories {
  dependencies {
-     implementation(project(":Paper-API"))
+     implementation(project(":paper-api"))
      implementation("jline:jline:2.12.1")
 -    implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") {
 -        exclude(group = "org.apache.logging.log4j", module = "log4j-api")

patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch

@@ -13,9 +13,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import io.papermc.paperweight.tasks.BaseTask
  import io.papermc.paperweight.util.*
 +import java.nio.file.Files
- import java.util.Locale
  
  plugins {
+     java
 @@ -0,0 +0,0 @@ plugins {
  
  repositories {

patches/server/Implement-Brigadier-Mojang-API.patch

@@ -16,8 +16,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ repositories {
  
  dependencies {
-     implementation(project(":Paper-API"))
+     implementation(project(":paper-api"))
-+    implementation(project(":Paper-MojangAPI"))
++    implementation(project(":paper-mojangapi"))
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")

patches/server/Setup-Gradle-project.patch

@@ -33,7 +33,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/build.gradle.kts
 @@ -0,0 +0,0 @@
 +import io.papermc.paperweight.util.*
-+import java.util.Locale
 +
 +plugins {
 +    java
@@ -46,7 +45,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +}
 +
 +dependencies {
-+    implementation(project(":Paper-API"))
++    implementation(project(":paper-api"))
 +    implementation("jline:jline:2.12.1")
 +    implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") {
 +        exclude(group = "org.apache.logging.log4j", module = "log4j-api")
@@ -92,7 +91,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +publishing {
 +    publications.create<MavenPublication>("maven") {
-+        artifactId = rootProject.name.toLowerCase(Locale.ENGLISH)
 +        artifact(tasks.reobfJar) {
 +            classifier = null
 +        }

patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch

@@ -25,7 +25,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ repositories {
  
  dependencies {
-     implementation(project(":Paper-API"))
+     implementation(project(":paper-api"))
 -    implementation("jline:jline:2.12.1")
 +    // Paper start
 +    implementation("org.jline:jline-terminal-jansi:3.21.0")

patches/server/Use-Velocity-compression-and-cipher-natives.patch

@@ -12,7 +12,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
  
      implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
-+    implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") // Paper
++    // Paper start - Use Velocity cipher
++    implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") {
++        isTransitive = false
++    }
++    // Paper end
  
      testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("junit:junit:4.13.1")

settings.gradle.kts

@@ -1,3 +1,5 @@
+import java.util.Locale
+
 pluginManagement {
     repositories {
         gradlePluginPortal()
@@ -7,11 +9,11 @@ pluginManagement {
 
 rootProject.name = "Paper"
 
-include(
+for (name in listOf("Paper-API", "Paper-Server", "Paper-MojangAPI")) {
-    "Paper-API",
+    val projName = name.toLowerCase(Locale.ENGLISH)
-    "Paper-Server",
+    include(projName)
-    "Paper-MojangAPI",
+    findProject(":$projName")!!.projectDir = file(name)
-)
+}
 
 val testPlugin = file("test-plugin.settings.gradle.kts")
 if (testPlugin.exists()) {