feat(version-support): add 1.16.5 support & fix 1.21.4 paperweight is…

…sues

api/build.gradle.kts

@@ -14,8 +14,9 @@ version = versionVar
 dependencies {
     compileOnly("org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT")
     implementation(project(":common"))
+    implementation(project(":v1_16_5"))
     implementation(project(":v1_17"))
-    implementation(project(":v1_17_1:", "reobf"))
+    implementation(project(":v1_17_1"))
     implementation(project(":v1_18_1"))
     implementation(project(":v1_18_2"))
     implementation(project(":v1_19_2"))
@@ -30,14 +31,18 @@ dependencies {
     implementation(project(":v1_21_1"))
     implementation(project(":v1_21_3"))
     implementation(project(":v1_21_4"))
+    implementation(kotlin("reflect"))
 }
 
 tasks {
     compileKotlin {
-        kotlinOptions.jvmTarget = "16"
+        kotlinOptions.jvmTarget = "1.8"
+    }
+    compileJava {
+        options.release.set(8)
     }
 }
 
 kotlin {
-    jvmToolchain(16)
+    jvmToolchain(21)
 }

api/src/main/kotlin/com/undefined/stellar/StellarCommand.kt

@@ -4,6 +4,7 @@ import com.undefined.stellar.data.events.StellarCommandRegisterEvent
 import com.undefined.stellar.data.requirement.PermissionStellarRequirement
 import com.undefined.stellar.exception.UnsupportedVersionException
 import com.undefined.stellar.manager.CommandManager
+import com.undefined.stellar.registrar.AbstractCommandRegistrar
 import com.undefined.stellar.util.NMSVersion
 import org.bukkit.Bukkit
 import org.bukkit.command.CommandSender
@@ -25,17 +26,17 @@ class StellarCommand(name: String, permissions: List<String> = listOf()) : Abstr
         registered = true
         StellarCommands.commands.add(this)
         CommandManager.initialize(plugin)
-        val registrar = CommandManager.registrars[NMSVersion.version] ?: throw UnsupportedVersionException()
-        registrar.register(this, plugin)
+        val registrar = (CommandManager.registrars[NMSVersion.version] ?: throw UnsupportedVersionException()).objectInstance
+        registrar?.register(this, plugin)
         for (execution in this.registerExecutions) execution()
         Bukkit.getPluginManager().callEvent(StellarCommandRegisterEvent(this))
     }
 
     companion object {
         @ApiStatus.Internal
         fun parseAndReturnCancelled(sender: CommandSender, input: String): Boolean {
-            val registrar = CommandManager.registrars[NMSVersion.version] ?: throw UnsupportedVersionException()
-            return registrar.handleCommandFailure(sender, input)
+            val registrar = (CommandManager.registrars[NMSVersion.version] ?: throw UnsupportedVersionException()).objectInstance
+            return registrar?.handleCommandFailure(sender, input) ?: false
         }
     }
 

api/src/main/kotlin/com/undefined/stellar/manager/CommandManager.kt

@@ -5,32 +5,34 @@ import com.undefined.stellar.registrar.AbstractCommandRegistrar
 import org.bukkit.Bukkit
 import org.bukkit.plugin.java.JavaPlugin
 import org.jetbrains.annotations.ApiStatus
+import kotlin.reflect.KClass
 
 @ApiStatus.Internal
 object CommandManager {
-    val registrars: Map<String, AbstractCommandRegistrar> = mapOf(
-        "1.17" to com.undefined.stellar.v1_17.CommandRegistrar,
-        "1.17.1" to com.undefined.stellar.v1_17_1.CommandRegistrar,
-        "1.18" to com.undefined.stellar.v1_18_1.CommandRegistrar,
-        "1.18.1" to com.undefined.stellar.v1_18_1.CommandRegistrar,
-        "1.18.2" to com.undefined.stellar.v1_18_2.CommandRegistrar,
-        "1.19" to com.undefined.stellar.v1_19_2.CommandRegistrar,
-        "1.19.1" to com.undefined.stellar.v1_19_2.CommandRegistrar,
-        "1.19.2" to com.undefined.stellar.v1_19_2.CommandRegistrar,
-        "1.19.3" to com.undefined.stellar.v1_19_3.CommandRegistrar,
-        "1.19.4" to com.undefined.stellar.v1_19_4.CommandRegistrar,
-        "1.20" to com.undefined.stellar.v1_20.CommandRegistrar,
-        "1.20.1" to com.undefined.stellar.v1_20_1.CommandRegistrar,
-        "1.20.2" to com.undefined.stellar.v1_20_2.CommandRegistrar,
-        "1.20.3" to com.undefined.stellar.v1_20_2.CommandRegistrar,
-        "1.20.4" to com.undefined.stellar.v1_20_4.CommandRegistrar,
-        "1.20.5" to com.undefined.stellar.v1_20_6.CommandRegistrar,
-        "1.20.6" to com.undefined.stellar.v1_20_6.CommandRegistrar,
-        "1.21" to com.undefined.stellar.v1_21.CommandRegistrar,
-        "1.21.1" to com.undefined.stellar.v1_21_1.CommandRegistrar,
-        "1.21.2" to com.undefined.stellar.v1_21_1.CommandRegistrar,
-        "1.21.3" to com.undefined.stellar.v1_21_3.CommandRegistrar,
-        "1.21.4" to com.undefined.stellar.v1_21_4.CommandRegistrar,
+    val registrars: Map<String, KClass<out AbstractCommandRegistrar>> = mapOf(
+        "1.16.5" to com.undefined.stellar.v1_16_5.CommandRegistrar::class,
+        "1.17" to com.undefined.stellar.v1_17.CommandRegistrar::class,
+        "1.17.1" to com.undefined.stellar.v1_17_1.CommandRegistrar::class,
+        "1.18" to com.undefined.stellar.v1_18_1.CommandRegistrar::class,
+        "1.18.1" to com.undefined.stellar.v1_18_1.CommandRegistrar::class,
+        "1.18.2" to com.undefined.stellar.v1_18_2.CommandRegistrar::class,
+        "1.19" to com.undefined.stellar.v1_19_2.CommandRegistrar::class,
+        "1.19.1" to com.undefined.stellar.v1_19_2.CommandRegistrar::class,
+        "1.19.2" to com.undefined.stellar.v1_19_2.CommandRegistrar::class,
+        "1.19.3" to com.undefined.stellar.v1_19_3.CommandRegistrar::class,
+        "1.19.4" to com.undefined.stellar.v1_19_4.CommandRegistrar::class,
+        "1.20" to com.undefined.stellar.v1_20.CommandRegistrar::class,
+        "1.20.1" to com.undefined.stellar.v1_20_1.CommandRegistrar::class,
+        "1.20.2" to com.undefined.stellar.v1_20_2.CommandRegistrar::class,
+        "1.20.3" to com.undefined.stellar.v1_20_2.CommandRegistrar::class,
+        "1.20.4" to com.undefined.stellar.v1_20_4.CommandRegistrar::class,
+        "1.20.5" to com.undefined.stellar.v1_20_6.CommandRegistrar::class,
+        "1.20.6" to com.undefined.stellar.v1_20_6.CommandRegistrar::class,
+        "1.21" to com.undefined.stellar.v1_21.CommandRegistrar::class,
+        "1.21.1" to com.undefined.stellar.v1_21_1.CommandRegistrar::class,
+        "1.21.2" to com.undefined.stellar.v1_21_1.CommandRegistrar::class,
+        "1.21.3" to com.undefined.stellar.v1_21_3.CommandRegistrar::class,
+        "1.21.4" to com.undefined.stellar.v1_21_4.CommandRegistrar::class,
     )
 
     private val initializedPlugins: MutableList<JavaPlugin> = mutableListOf()

build.gradle.kts

@@ -1,10 +1,9 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
 plugins {
     java
     kotlin("jvm") version "1.9.22"
     `maven-publish`
     id("com.github.johnrengelman.shadow") version "8.1.1"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.8" apply false
 }
 
 apply(plugin = "maven-publish")
@@ -80,6 +79,7 @@ allprojects {
 dependencies {
     implementation(project(":api"))
     implementation(project(":common"))
+    implementation(project(":v1_16_5"))
     implementation(project(":v1_17"))
     implementation(project(":v1_17_1:", "reobf"))
     implementation(project(":v1_18_1:", "reobf"))
@@ -99,13 +99,8 @@ dependencies {
 }
 
 tasks {
-    withType<ShadowJar> {
-        archiveFileName.set("${project.name}-${project.version}.jar")
-        archiveClassifier.set("mapped")
-    }
-
     compileKotlin {
-        kotlinOptions.jvmTarget = "16"
+        kotlinOptions.jvmTarget = "1.8"
     }
 }
 
@@ -116,5 +111,5 @@ java {
 }
 
 kotlin {
-    jvmToolchain(16)
+    jvmToolchain(21)
 }

common/build.gradle.kts

@@ -13,10 +13,13 @@ dependencies {
 
 tasks {
     compileKotlin {
-        kotlinOptions.jvmTarget = "16"
+        kotlinOptions.jvmTarget = "1.8"
+    }
+    compileJava {
+        options.release.set(8)
     }
 }
 
 kotlin {
-    jvmToolchain(16)
+    jvmToolchain(21)
 }

common/src/main/kotlin/com/undefined/stellar/util/ReflectionUtil.kt

@@ -0,0 +1,20 @@
+@file:Suppress("UNCHECKED_CAST")
+@file:ApiStatus.Internal
+
+package com.undefined.stellar.util
+
+import org.jetbrains.annotations.ApiStatus
+
+object ReflectionUtil {
+    fun <T : Any> getPrivateField(any: Class<*>, name: String): T =
+        any::class.java.getDeclaredField(name).apply { isAccessible = true }[this] as T
+
+    inline fun <reified T : Any, R> getPrivateMethod(name: String, vararg args: Any?): R =
+        T::class.java.getDeclaredMethod(name).apply { isAccessible = true }(null, args) as R
+}
+
+fun <T : Any> Any.getPrivateField(name: String): T =
+    javaClass.getDeclaredField(name).apply { isAccessible = true }[this] as T
+
+fun <T : Any> Any.executePrivateMethod(name: String, vararg args: Any?): T =
+    javaClass.getDeclaredMethod(name).apply { isAccessible = true }(this, args) as T

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

server/build.gradle.kts

@@ -9,10 +9,11 @@ val groupIdVar = "com.undefined"
 val artifactIdVar = "stellar"
 
 dependencies {
-    compileOnly("org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT")
 
     implementation(project(":api"))
     implementation(project(":common"))
+    implementation(project(":v1_16_5"))
     implementation(project(":v1_17"))
     implementation(project(":v1_17_1:", "reobf"))
     implementation(project(":v1_18_1:", "reobf"))
@@ -29,7 +30,7 @@ dependencies {
     implementation(project(":v1_21_1:", "reobf"))
     implementation(project(":v1_21_3:", "reobf"))
     implementation(project(":v1_21_4:", "reobf"))
-    implementation(project(":v1_17"))
+    compileOnly(project(":v1_16_5"))
 }
 
 tasks {
@@ -46,7 +47,7 @@ tasks {
     }
 
     runServer {
-        minecraftVersion("1.17")
+        minecraftVersion("1.16.5")
         jvmArgs("-Xmx2G")
     }
 }

server/src/main/resources/plugin.yml

@@ -1,4 +1,4 @@
 name: Stellar
 version: '${version}'
 main: com.undefined.stellar.Main
-api-version: '1.17'
+api-version: '1.16'

settings.gradle.kts

@@ -1,2 +1,2 @@
 rootProject.name = "stellar"
-include("server", "api", "common", "v1_17", "v1_17_1", "v1_18_1", "v1_18_2", "v1_19_2", "v1_19_3", "v1_19_4", "v1_20", "v1_20_1", "v1_20_2", "v1_20_4", "v1_20_6", "v1_21", "v1_21_1", "v1_21_3", "v1_21_4")
+include("server", "api", "common", "v1_16_5", "v1_17", "v1_17_1", "v1_18_1", "v1_18_2", "v1_19_2", "v1_19_3", "v1_19_4", "v1_20", "v1_20_1", "v1_20_2", "v1_20_4", "v1_20_6", "v1_21", "v1_21_1", "v1_21_3", "v1_21_4")

v1_16_5/build.gradle.kts

@@ -0,0 +1,29 @@
+plugins {
+    kotlin("jvm") version "1.9.22"
+}
+
+repositories {
+    mavenLocal()
+}
+
+dependencies {
+    compileOnly("org.spigotmc:spigot:1.16.5-R0.1-SNAPSHOT")
+    compileOnly(project(":common"))
+}
+
+tasks {
+    compileKotlin {
+        kotlinOptions.jvmTarget = "1.8"
+    }
+    compileJava {
+        options.release.set(8)
+    }
+}
+
+java {
+    disableAutoTargetJvm()
+}
+
+kotlin {
+    jvmToolchain(21)
+}