Even more renames, start hiding some API internals

build-logic/src/main/kotlin/velocity-init-manifest.gradle.kts

@@ -1,5 +1,4 @@
 import org.gradle.jvm.tasks.Jar
-import org.gradle.kotlin.dsl.withType
 import java.io.ByteArrayOutputStream
 
 val currentShortRevision = ByteArrayOutputStream().use {
@@ -15,15 +14,15 @@ tasks.withType<Jar> {
     manifest {
         val buildNumber = System.getenv("BUILD_NUMBER")
         val velocityHumanVersion: String =
-            if (project.version.toString().endsWith("-SNAPSHOT")) {
-                if (buildNumber == null) {
-                    "${project.version} (git-$currentShortRevision)"
+                if (project.version.toString().endsWith("-SNAPSHOT")) {
+                    if (buildNumber == null) {
+                        "${project.version} (git-$currentShortRevision)"
+                    } else {
+                        "${project.version} (git-$currentShortRevision-b$buildNumber)"
+                    }
                 } else {
-                    "${project.version} (git-$currentShortRevision-b$buildNumber)"
+                    "${project.version}"
                 }
-            } else {
-                "${project.version}"
-            }
         attributes["Implementation-Version"] = velocityHumanVersion
     }
 }

build-logic/src/main/kotlin/velocity-spotless.gradle.kts

@@ -10,6 +10,7 @@ extensions.configure<SpotlessExtension> {
         } else {
             licenseHeaderFile(rootProject.file("HEADER.txt"))
         }
+        importOrder()
         removeUnusedImports()
     }
 }