feat(version-support): add 1.18.1 and 1.18.2 support

UndefinedCreations · Dec 21, 2024 · 05dc7b7 · 05dc7b7
1 parent 06720a9
commit 05dc7b7
Show file tree

Hide file tree

Showing 43 changed files with 1,738 additions and 40 deletions.
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -14,6 +14,8 @@ version = versionVar
 dependencies {
     compileOnly("org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT")
     implementation(project(":common"))
+    implementation(project(":v1_18_1"))
+    implementation(project(":v1_18_2"))
     implementation(project(":v1_19_2"))
     implementation(project(":v1_19_3"))
     implementation(project(":v1_19_4"))

diff --git a/api/src/main/kotlin/com/undefined/stellar/StellarCommand.kt b/api/src/main/kotlin/com/undefined/stellar/StellarCommand.kt
@@ -26,7 +26,7 @@ class StellarCommand(name: String, permissions: List<String> = listOf()) : Abstr
         StellarCommands.commands.add(this)
         CommandManager.initialize(plugin)
         val registrar = CommandManager.registrars[NMSVersion.version] ?: throw UnsupportedVersionException()
-        registrar.register(this)
+        registrar.register(this, plugin)
         for (execution in this.registerExecutions) execution()
         Bukkit.getPluginManager().callEvent(StellarCommandRegisterEvent(this))
     }

diff --git a/api/src/main/kotlin/com/undefined/stellar/manager/CommandManager.kt b/api/src/main/kotlin/com/undefined/stellar/manager/CommandManager.kt
@@ -9,6 +9,11 @@ import org.jetbrains.annotations.ApiStatus
 @ApiStatus.Internal
 object CommandManager {
     val registrars: Map<String, AbstractCommandRegistrar> = mapOf(
+        "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,

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -48,6 +48,8 @@ allprojects {
     apply(plugin = "java-library")
     apply(plugin = "maven-publish")
 
+    version = projectVersion
+
     repositories {
         mavenCentral()
         maven("https://repo.papermc.io/repository/maven-public/")
@@ -77,6 +79,9 @@ allprojects {
 dependencies {
     implementation(project(":api"))
     implementation(project(":common"))
+    implementation(project(":v1_18_1:", "reobf"))
+    implementation(project(":v1_18_2:", "reobf"))
+    implementation(project(":v1_19_2:", "reobf"))
     implementation(project(":v1_19_3:", "reobf"))
     implementation(project(":v1_19_4:", "reobf"))
     implementation(project(":v1_20", "reobf"))

diff --git a/common/src/main/kotlin/com/undefined/stellar/registrar/AbstractCommandRegistrar.kt b/common/src/main/kotlin/com/undefined/stellar/registrar/AbstractCommandRegistrar.kt
@@ -2,8 +2,9 @@ package com.undefined.stellar.registrar
 
 import com.undefined.stellar.AbstractStellarCommand
 import org.bukkit.command.CommandSender
+import org.bukkit.plugin.java.JavaPlugin
 
 interface AbstractCommandRegistrar {
-    fun register(command: AbstractStellarCommand<*>)
+    fun register(command: AbstractStellarCommand<*>, plugin: JavaPlugin)
     fun handleCommandFailure(sender: CommandSender, input: String): Boolean
 }
diff --git a/.../com/undefined/stellar/util/NMSVersion.kt → .../com/undefined/stellar/util/NMSVersion.kt b/.../com/undefined/stellar/util/NMSVersion.kt → .../com/undefined/stellar/util/NMSVersion.kt
@@ -6,4 +6,4 @@ import org.jetbrains.annotations.ApiStatus
 @ApiStatus.Internal
 object NMSVersion {
     val version by lazy { Bukkit.getBukkitVersion().split("-")[0] }
-}
+}
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
@@ -9,10 +9,12 @@ val groupIdVar = "com.undefined"
 val artifactIdVar = "stellar"
 
 dependencies {
-    compileOnly("org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.18.1-R0.1-SNAPSHOT")
 
     implementation(project(":api"))
     implementation(project(":common"))
+    implementation(project(":v1_18_1:", "reobf"))
+    implementation(project(":v1_18_2:", "reobf"))
     implementation(project(":v1_19_2:", "reobf"))
     implementation(project(":v1_19_3:", "reobf"))
     implementation(project(":v1_19_4:", "reobf"))
@@ -25,7 +27,7 @@ dependencies {
     implementation(project(":v1_21_1:", "reobf"))
     implementation(project(":v1_21_3:", "reobf"))
     implementation(project(":v1_21_4:", "reobf"))
-    implementation(project(":v1_20"))
+    implementation(project(":v1_18_1"))
 }
 
 tasks {
@@ -42,7 +44,7 @@ tasks {
     }
 
     runServer {
-        minecraftVersion("1.20")
+        minecraftVersion("1.18.1")
         jvmArgs("-Xmx2G")
     }
 }

diff --git a/server/src/main/kotlin/com/undefined/stellar/Main.kt b/server/src/main/kotlin/com/undefined/stellar/Main.kt
@@ -1,5 +1,7 @@
 package com.undefined.stellar
 
+import net.kyori.adventure.text.format.Style
+import org.bukkit.Color
 import org.bukkit.Material
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
@@ -9,11 +11,10 @@ import java.util.function.Predicate
 class Main : JavaPlugin() {
 
     override fun onEnable() {
-        StellarCommand("isItem")
-            .addItemArgument(name = "item")
+        StellarCommand("test")
+            .addColorArgument(name = "item")
             .addExecution<Player> {
-                val predicate = getArgument<Predicate<ItemStack>>("item")
-                sender.inventory.setItem()
+                sender.sendMessage(getArgument<Style>("item").toString())
             }
             .register(this)
     }

diff --git a/server/src/main/resources/plugin.yml b/server/src/main/resources/plugin.yml
@@ -1,4 +1,4 @@
 name: Stellar
 version: '${version}'
 main: com.undefined.stellar.Main
-api-version: '1.20'
+api-version: '1.18'
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,2 +1,2 @@
 rootProject.name = "stellar"
-include("server", "api", "common", "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_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")
diff --git a/v1_18_1/build.gradle.kts b/v1_18_1/build.gradle.kts
@@ -0,0 +1,26 @@
+plugins {
+    kotlin("jvm") version "1.9.22"
+    id("io.papermc.paperweight.userdev") version "1.7.1"
+}
+
+paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.REOBF_PRODUCTION
+
+dependencies {
+    paperweight.paperDevBundle("1.18.1-R0.1-SNAPSHOT")
+//    pluginRemapper("net.fabricmc:tiny-remapper:0.10.3:fat")
+    compileOnly(project(":common"))
+}
+
+tasks {
+    compileKotlin {
+        kotlinOptions.jvmTarget = "17"
+    }
+}
+
+java {
+    disableAutoTargetJvm()
+}
+
+kotlin {
+    jvmToolchain(17)
+}