v0.11.0

.github/workflows/portal.yml

@@ -0,0 +1,20 @@
+name: Gradle Plugin Portal
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Publish with Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: "publishPlugins -Pgradle.publish.key=${{ secrets.GRADLE_PLUGIN_PUBLISHING_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PLUGIN_PUBLISHING_SECRET }}"

.github/workflows/publish.yml

@@ -4,7 +4,7 @@ on:
     branches:
       - main
 jobs:
-  build:
+  publish:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository

.github/workflows/qodona.yml

@@ -0,0 +1,16 @@
+name: Qodona
+on: [push]
+jobs:
+  scan:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+      - name: Qodana Scan
+        uses: JetBrains/qodana-action@main
+        env:
+          QODANA_TOKEN: "${{ secrets.QODANA_TOKEN }}"
+      - name: Upload CodeQL SARIF
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: "${{ runner.temp }}/qodana/results/qodana.sarif.json"

build.gradle.kts

@@ -1,13 +1,15 @@
+@file:Suppress("UnstableApiUsage")
 plugins {
   `kotlin-dsl`
-  kotlin("plugin.serialization") version "1.7.10"
 
-  id("maven-publish")
-  id("java-gradle-plugin")
+  `maven-publish`
+  `java-gradle-plugin`
+
+  id("com.gradle.plugin-publish") version "1.1.0"
 }
 
 group = "gay.pizza.foundation"
-version = "0.6.0"
+version = "0.11.0"
 
 repositories {
   mavenCentral()
@@ -15,8 +17,8 @@ repositories {
 }
 
 dependencies {
-  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
-  implementation("org.jetbrains.kotlin:kotlin-serialization:1.7.10")
+  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
+  implementation("org.jetbrains.kotlin:kotlin-serialization:1.8.10")
   implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
   implementation("com.google.code.gson:gson:2.10.1")
 
@@ -25,29 +27,56 @@ dependencies {
 }
 
 gradlePlugin {
+  website.set("https://github.com/GayPizzaSpecifications/concrete")
+  vcsUrl.set("https://github.com/GayPizzaSpecifications/concrete")
+
   plugins {
     create("concrete-root") {
       id = "gay.pizza.foundation.concrete-root"
       implementationClass = "gay.pizza.foundation.concrete.ConcreteRootPlugin"
+
+      displayName = "Concrete Root"
+      description = "Concrete project root."
     }
 
     create("concrete-base") {
       id = "gay.pizza.foundation.concrete-base"
       implementationClass = "gay.pizza.foundation.concrete.ConcreteBasePlugin"
+
+      displayName = "Concrete Base"
+      description = "Concrete project base."
     }
 
     create("concrete-library") {
       id = "gay.pizza.foundation.concrete-library"
       implementationClass = "gay.pizza.foundation.concrete.ConcreteLibraryPlugin"
+
+      displayName = "Concrete Library"
+      description = "Concrete project library."
     }
 
     create("concrete-plugin") {
       id = "gay.pizza.foundation.concrete-plugin"
       implementationClass = "gay.pizza.foundation.concrete.ConcretePluginPlugin"
+
+      displayName = "Concrete Library"
+      description = "Concrete project plugin."
+    }
+
+    forEach { declaration ->
+      declaration.tags.set(listOf("foundation-concrete", "minecraft-bukkit"))
     }
   }
 }
 
+val gradlePublishingKey: String? = System.getenv("GRADLE_PLUGIN_PUBLISHING_KEY")
+val gradlePublishingSecret: String? = System.getenv("GRADLE_PLUGIN_PUBLISHING_SECRET")
+
+if (gradlePublishingKey != null && gradlePublishingSecret != null) {
+  project.setProperty("gradle.publish.key", gradlePublishingKey.toString())
+  project.setProperty("gradle.publish.secret", gradlePublishingSecret.toString())
+}
+
 java {
   val version = JavaVersion.toVersion("17")
   sourceCompatibility = version
@@ -100,5 +129,8 @@ publishing {
 
 tasks.withType<Wrapper> {
   gradleVersion = "7.6"
-  distributionType = Wrapper.DistributionType.ALL
+}
+
+java {
+  withSourcesJar()
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

src/main/kotlin/gay/pizza/foundation/concrete/ConcreteBasePlugin.kt

@@ -12,6 +12,8 @@ open class ConcreteBasePlugin : Plugin<Project> {
   override fun apply(project: Project) {
     val versionWithBuild = if (System.getenv("CI_PIPELINE_IID") != null) {
       project.rootProject.version.toString() + ".${System.getenv("CI_PIPELINE_IID")}"
+    } else if (System.getenv("CONCRETE_BUILD_NUMBER") != null) {
+      project.rootProject.version.toString() + ".${System.getenv("CONCRETE_BUILD_NUMBER")}"
     } else {
       "DEV"
     }

src/main/kotlin/gay/pizza/foundation/concrete/ConcretePluginPlugin.kt

@@ -11,12 +11,16 @@ class ConcretePluginPlugin : ConcreteBaseBukkitPlugin() {
 
     project.plugins.apply("com.github.johnrengelman.shadow")
 
-    project.tasks.find<ProcessResources>("processResources")!!.apply {
-      val props = mapOf("version" to project.version.toString())
-      inputs.properties(props)
-      filteringCharset = "UTF-8"
-      filesMatching("plugin.yml") {
-        expand(props)
+    // During IDEA project import, if this code is active, it will print warnings.
+    // This will make the VERSION field unexpanded if you run using the IntelliJ build system.
+    if (!project.properties.containsKey("idea.gradle.do.not.build.tasks")) {
+      project.tasks.find<ProcessResources>("processResources")!!.apply {
+        val props = mapOf("version" to project.version.toString())
+        inputs.properties(props)
+        filteringCharset = "UTF-8"
+        filesMatching("plugin.yml") {
+          expand(props)
+        }
       }
     }
 
@@ -27,5 +31,7 @@ class ConcretePluginPlugin : ConcreteBaseBukkitPlugin() {
     project.tasks.addTaskDependency("assemble", "shadowJar")
 
     project.concreteRootProject.tasks["setupPaperServer"].dependsOn(project.tasks["shadowJar"])
+    project.concreteRootProject.tasks.find<SetupLocalMinecraftServer>("setupLocalMinecraftServer")
+      ?.dependsOn(project.tasks["shadowJar"])
   }
 }

src/main/kotlin/gay/pizza/foundation/concrete/ConcreteRootPlugin.kt

@@ -4,6 +4,7 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.create
+import java.nio.file.Paths
 
 class ConcreteRootPlugin : Plugin<Project> {
   override fun apply(project: Project) {
@@ -13,6 +14,21 @@ class ConcreteRootPlugin : Plugin<Project> {
     val runPaperServer = project.tasks.create<RunPaperServer>("runPaperServer")
     runPaperServer.dependsOn(setupPaperServer)
 
+    val maybeLocalServerPathString = project.properties["localMinecraftServerPath"]?.toString()
+
+    if (maybeLocalServerPathString != null) {
+      val localServerJarFileName = project.properties["localMinecraftServerJarFileName"]?.toString() ?: "server.jar"
+      val currentWorkingDirectory = System.getProperty("user.dir")
+      val localServerDirectory = Paths.get(currentWorkingDirectory).resolve(maybeLocalServerPathString).toFile()
+      val setupLocalMinecraftServer = project.tasks.create<SetupLocalMinecraftServer>("setupLocalMinecraftServer")
+      val runLocalMinecraftServer = project.tasks.create<RunLocalMinecraftServer>("runLocalMinecraftServer")
+      runLocalMinecraftServer.dependsOn(setupLocalMinecraftServer)
+
+      setupLocalMinecraftServer.minecraftServerDirectory = localServerDirectory
+      runLocalMinecraftServer.minecraftServerDirectory = localServerDirectory
+      runLocalMinecraftServer.serverJarFileName = localServerJarFileName
+    }
+
     val updateManifests = project.tasks.create<UpdateManifestTask>("updateManifests")
     project.tasks.getByName("assemble").dependsOn(updateManifests)
   }

src/main/kotlin/gay/pizza/foundation/concrete/RunLocalMinecraftServer.kt

@@ -0,0 +1,18 @@
+package gay.pizza.foundation.concrete
+
+import org.gradle.api.tasks.Internal
+import java.io.File
+
+open class RunLocalMinecraftServer : RunMinecraftServer() {
+  @Internal
+  lateinit var minecraftServerDirectory: File
+
+  @Internal
+  lateinit var serverJarFileName: String
+
+  @Internal
+  override fun getServerDirectory(): File = minecraftServerDirectory
+
+  @Internal
+  override fun getServerJarName(): String = serverJarFileName
+}

src/main/kotlin/gay/pizza/foundation/concrete/RunMinecraftServer.kt

@@ -0,0 +1,51 @@
+package gay.pizza.foundation.concrete
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.TaskAction
+import java.io.File
+import java.util.jar.JarFile
+
+abstract class RunMinecraftServer : DefaultTask() {
+  init {
+    outputs.upToDateWhen { false }
+  }
+
+  @get:Input
+  var additionalServerArguments = mutableListOf<String>()
+
+  @get:Input
+  var disableServerGui = true
+
+  @TaskAction
+  fun runMinecraftServer() {
+    val minecraftServerDirectory = getServerDirectory()
+    val serverJarFile = minecraftServerDirectory.resolve(getServerJarName())
+    val mainClassName = readMainClass(serverJarFile)
+
+    project.javaexec {
+      classpath(serverJarFile.absolutePath)
+      workingDir(minecraftServerDirectory)
+
+      val allServerArguments = mutableListOf<String>()
+      allServerArguments.addAll(additionalServerArguments)
+      if (disableServerGui) {
+        allServerArguments.add("nogui")
+      }
+
+      args(allServerArguments)
+      mainClass.set(mainClassName)
+    }
+  }
+
+  private fun readMainClass(file: File): String = JarFile(file).use { jar ->
+    jar.manifest.mainAttributes.getValue("Main-Class")!!
+  }
+
+  @Internal
+  abstract fun getServerDirectory(): File
+
+  @Internal
+  abstract fun getServerJarName(): String
+}

src/main/kotlin/gay/pizza/foundation/concrete/RunPaperServer.kt

@@ -1,47 +1,20 @@
 package gay.pizza.foundation.concrete
 
-import org.gradle.api.DefaultTask
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.Internal
 import org.gradle.kotlin.dsl.getByType
 import java.io.File
-import java.util.jar.JarFile
 
-open class RunPaperServer : DefaultTask() {
+open class RunPaperServer : RunMinecraftServer() {
   init {
     outputs.upToDateWhen { false }
   }
 
-  @get:Input
-  var additionalServerArguments = mutableListOf<String>()
-
-  @get:Input
-  var disableServerGui = true
-
-  @TaskAction
-  fun runPaperServer() {
+  @Internal
+  override fun getServerDirectory(): File {
     val concrete = project.extensions.getByType<ConcreteExtension>()
-
-    val minecraftServerDirectory = project.file(concrete.minecraftServerPath.get())
-    val paperJarFile = minecraftServerDirectory.resolve("paper.jar")
-    val mainClassName = readMainClass(paperJarFile)
-
-    project.javaexec {
-      classpath(paperJarFile.absolutePath)
-      workingDir(minecraftServerDirectory)
-
-      val allServerArguments = mutableListOf<String>()
-      allServerArguments.addAll(additionalServerArguments)
-      if (disableServerGui) {
-        allServerArguments.add("nogui")
-      }
-
-      args(allServerArguments)
-      mainClass.set(mainClassName)
-    }
+    return project.file(concrete.minecraftServerPath.get())
   }
 
-  private fun readMainClass(file: File): String = JarFile(file).use { jar ->
-    jar.manifest.mainAttributes.getValue("Main-Class")!!
-  }
+  @Internal
+  override fun getServerJarName(): String = "paper.jar"
 }

src/main/kotlin/gay/pizza/foundation/concrete/SetupLocalMinecraftServer.kt

@@ -0,0 +1,12 @@
+package gay.pizza.foundation.concrete
+
+import org.gradle.api.tasks.Internal
+import java.io.File
+
+open class SetupLocalMinecraftServer : SetupMinecraftServer() {
+  @Internal
+  lateinit var minecraftServerDirectory: File
+
+  @Internal
+  override fun getServerDirectory(): File = minecraftServerDirectory
+}

src/main/kotlin/gay/pizza/foundation/concrete/SetupMinecraftServer.kt

@@ -0,0 +1,49 @@
+package gay.pizza.foundation.concrete
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.TaskAction
+import org.gradle.kotlin.dsl.getByType
+import java.io.File
+import java.nio.file.Files
+import java.util.*
+
+abstract class SetupMinecraftServer : DefaultTask() {
+  init {
+    outputs.upToDateWhen { false }
+  }
+
+  @TaskAction
+  fun setupMinecraftAction() {
+    val minecraftServerDirectory = getServerDirectory()
+    if (!minecraftServerDirectory.exists()) {
+      minecraftServerDirectory.mkdirs()
+    }
+
+    val serverPluginsDirectory = minecraftServerDirectory.resolve("plugins")
+
+    if (!serverPluginsDirectory.exists()) {
+      serverPluginsDirectory.mkdirs()
+    }
+
+    for (project in project.findPluginProjects()) {
+      val task = project.shadowJarTask!!
+      val pluginJarFile = task.outputs.files.first()
+      val pluginLinkFile = serverPluginsDirectory.resolve("${project.name}.jar")
+      pluginLinkFile.delete()
+      Files.createSymbolicLink(pluginLinkFile.toPath(), pluginJarFile.toPath())
+    }
+
+    val concrete = project.extensions.getByType<ConcreteExtension>()
+    if (concrete.acceptServerEula.isPresent && concrete.acceptServerEula.get()) {
+      val writer = minecraftServerDirectory.resolve("eula.txt").bufferedWriter()
+      val properties = Properties()
+      properties.setProperty("eula", "true")
+      properties.store(writer, "Written by Concrete")
+      writer.close()
+    }
+  }
+
+  @Internal
+  abstract fun getServerDirectory(): File
+}

src/main/kotlin/gay/pizza/foundation/concrete/SetupPaperServer.kt

@@ -1,15 +1,13 @@
 package gay.pizza.foundation.concrete
 
-import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.options.Option
 import org.gradle.kotlin.dsl.getByType
 import java.io.File
-import java.nio.file.Files
-import java.util.Properties
 
-open class SetupPaperServer : DefaultTask() {
+open class SetupPaperServer : SetupMinecraftServer() {
   init {
     outputs.upToDateWhen { false }
   }
@@ -18,46 +16,18 @@ open class SetupPaperServer : DefaultTask() {
   @set:Option(option = "update", description = "Update Paper Server")
   var shouldUpdatePaperServer = true
 
-  private val paperVersionClient = PaperVersionClient()
-
   @TaskAction
-  fun downloadPaperTask() {
+  fun setupPaperServer() {
     val concrete = project.extensions.getByType<ConcreteExtension>()
-    val minecraftServerDirectory = project.file(concrete.minecraftServerPath.get())
-
-    if (!minecraftServerDirectory.exists()) {
-      minecraftServerDirectory.mkdirs()
-    }
-
-    val paperJarFile = project.file("${concrete.minecraftServerPath.get()}/paper.jar")
+    val minecraftServerDirectory = getServerDirectory()
+    val paperJarFile = project.file("${minecraftServerDirectory}/paper.jar")
     if (!paperJarFile.exists() || shouldUpdatePaperServer) {
       downloadLatestBuild(concrete.paperServerVersionGroup.get(), paperJarFile)
     }
-
-    val paperPluginsDirectory = minecraftServerDirectory.resolve("plugins")
-
-    if (!paperPluginsDirectory.exists()) {
-      paperPluginsDirectory.mkdirs()
-    }
-
-    for (project in project.findPluginProjects()) {
-      val task = project.shadowJarTask!!
-      val pluginJarFile = task.outputs.files.first()
-      val pluginLinkFile = paperPluginsDirectory.resolve("${project.name}.jar")
-      pluginLinkFile.delete()
-      Files.createSymbolicLink(pluginLinkFile.toPath(), pluginJarFile.toPath())
-    }
-
-    if (concrete.acceptServerEula.isPresent && concrete.acceptServerEula.get()) {
-      val writer = minecraftServerDirectory.resolve("eula.txt").bufferedWriter()
-      val properties = Properties()
-      properties.setProperty("eula", "true")
-      properties.store(writer, "Written by Concrete")
-      writer.close()
-    }
   }
 
   private fun downloadLatestBuild(paperVersionGroup: String, paperJarFile: File) {
+    val paperVersionClient = PaperVersionClient()
     if (project.gradle.startParameter.isOffline) {
       if (!paperJarFile.exists()) {
         throw RuntimeException("Offline mode is enabled and Paper has not been downloaded.")
@@ -77,4 +47,10 @@ open class SetupPaperServer : DefaultTask() {
       logger.lifecycle("Paper Server ${build.version} build ${build.build} is up-to-date")
     }
   }
+
+  @Internal
+  override fun getServerDirectory(): File {
+    val concrete = project.extensions.getByType<ConcreteExtension>()
+    return project.file(concrete.minecraftServerPath.get())
+  }
 }

src/main/kotlin/gay/pizza/foundation/concrete/UpdateManifestTask.kt

@@ -8,7 +8,7 @@ import java.nio.file.Path
 open class UpdateManifestTask : DefaultTask() {
   @TaskAction
   fun update() {
-    val manifestsDir = ensureManifestsDir()
+    val manifestsDir = ensureManifestsDirectory()
     val updateFile = manifestsDir.resolve("update.json")
     val rootPath = project.rootProject.rootDir.toPath()
     val updateManifest = project.findPluginProjects().mapNotNull { project ->
@@ -24,7 +24,7 @@ open class UpdateManifestTask : DefaultTask() {
     Files.writeString(updateFile, Globals.gson.toJson(updateManifest))
   }
 
-  private fun ensureManifestsDir(): Path {
+  private fun ensureManifestsDirectory(): Path {
     val manifestsDir = project.buildDir.resolve("manifests")
     manifestsDir.mkdirs()
     return manifestsDir.toPath()

tools/ensure-new-lines.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -e
+
+git ls-files -z | while IFS= read -rd '' f
+do
+  if file --mime-encoding "$f" | grep -qv binary
+  then
+    tail -c1 < "$f" | read -r _ || echo >> "$f"
+  fi
+done