feat(bukkit): add support for 1.20.6

Syrent · Jun 4, 2024 · 4755dd6 · 4755dd6
1 parent f665849
commit 4755dd6
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 23 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
     kotlin("jvm") version "2.0.0"
     `java-library`
     `maven-publish`
-    id("io.github.goooler.shadow") version "8.1.7"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
     id("io.papermc.hangar-publish-plugin") version "0.1.2"
     id("com.modrinth.minotaur") version "2.8.7"
 }
@@ -52,7 +52,7 @@ allprojects {
     plugins.apply("java-library")
     plugins.apply("maven-publish")
     plugins.apply("kotlin")
-    plugins.apply("io.github.goooler.shadow")
+    plugins.apply("com.github.johnrengelman.shadow")
 
     repositories {
         mavenCentral()
@@ -77,7 +77,7 @@ subprojects {
     java {
         withSourcesJar()
 
-        toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+        disableAutoTargetJvm()
     }
 
     dependencies {
@@ -89,10 +89,6 @@ subprojects {
             archiveClassifier.set("unshaded")
         }
 
-        kotlin {
-            jvmToolchain(17)
-        }
-
         build {
             dependsOn(shadowJar)
         }

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -13,8 +13,8 @@ repositories {
 
 dependencies {
     implementation(gradleApi())
-    implementation("com.github.johnrengelman:shadow:8.1.1")
-//    implementation("io.github.goooler.shadow:shadow-gradle-plugin:8.1.7")
+//    implementation("com.github.johnrengelman:shadow:8.1.1")
+    implementation("io.github.goooler.shadow:shadow-gradle-plugin:8.1.7")
 }
 
 val properties = Properties().also { props ->

diff --git a/buildSrc/src/main/kotlin/org/sayandev/Repositories.kt b/buildSrc/src/main/kotlin/org/sayandev/Repositories.kt
@@ -1,5 +1,14 @@
 package org.sayandev
 
+val paperApi = Dependency(
+    group = "io.papermc.paper",
+    artifact = "paper-api",
+    version = "1.20.6-R0.1-SNAPSHOT",
+    relocation = null,
+    type = Dependency.Type.COMPILE_ONLY,
+    modules = listOf(Module.BUKKIT)
+)
+
 val foliaAPI = Dependency(
     group = "dev.folia",
     artifact = "folia-api",
@@ -194,6 +203,7 @@ val repositories = listOf(
         id = "papermc",
         repos = listOf("https://repo.papermc.io/repository/maven-public/"),
         dependencies = listOf(
+            paperApi,
             foliaAPI,
             velocityAPI,
             velocityAPIAnnotation,

diff --git a/gradle.properties b/gradle.properties
@@ -30,4 +30,4 @@ description=A modular vanish system for Minecraft servers
 website=https://sayandev.org
 author=Syrent
 
-version=1.0.0-rc.8-SNAPSHOT
+version=1.0.0-rc.8
diff --git a/sayanvanish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/SayanVanish.kt b/sayanvanish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/SayanVanish.kt
@@ -2,15 +2,12 @@ package org.sayandev.sayanvanish.bukkit
 
 import com.alessiodp.libby.BukkitLibraryManager
 import com.alessiodp.libby.Library
-import org.bukkit.configuration.file.YamlConfiguration
 import org.bukkit.plugin.java.JavaPlugin
 import org.sayandev.sayanvanish.BuildConstants
 import org.sayandev.sayanvanish.api.Platform
 import org.sayandev.sayanvanish.api.database.DatabaseMethod
 import org.sayandev.sayanvanish.api.database.databaseConfig
 import org.sayandev.sayanvanish.api.database.sql.SQLConfig
-import org.sayandev.sayanvanish.api.feature.Features
-import org.sayandev.sayanvanish.api.feature.RegisteredFeatureHandler
 import org.sayandev.sayanvanish.bukkit.api.SayanVanishBukkitAPI
 import org.sayandev.sayanvanish.bukkit.command.SayanVanishCommand
 import org.sayandev.sayanvanish.bukkit.config.LanguageConfig
@@ -20,8 +17,6 @@ import org.sayandev.stickynote.bukkit.StickyNote
 import org.sayandev.stickynote.bukkit.WrappedStickyNotePlugin
 import org.sayandev.stickynote.bukkit.pluginDirectory
 import org.sayandev.stickynote.bukkit.runAsync
-import org.sayandev.stickynote.core.configuration.Config
-import java.io.File
 
 open class SayanVanish : JavaPlugin() {
 

diff --git a/...nish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/command/SayanVanishCommand.kt b/...nish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/command/SayanVanishCommand.kt
@@ -18,7 +18,7 @@ import org.sayandev.sayanvanish.bukkit.config.language
 import org.sayandev.sayanvanish.bukkit.config.settings
 import org.sayandev.sayanvanish.bukkit.utils.ServerUtils
 import org.sayandev.stickynote.bukkit.command.StickyCommand
-import org.sayandev.stickynote.bukkit.command.interfaces.SenderExtension
+import org.sayandev.stickynote.bukkit.command.StickySender
 import org.sayandev.stickynote.bukkit.pluginDirectory
 import org.sayandev.stickynote.bukkit.runAsync
 import org.sayandev.stickynote.bukkit.runSync
@@ -41,13 +41,13 @@ class SayanVanishCommand : StickyCommand("sayanvanish", "vanish", "v") {
         .permission(constructBasePermission("vanish"))
         .optional("player", OfflinePlayerParser.offlinePlayerParser())
         .flag(
-            CommandFlag.builder<SenderExtension?>("state").withComponent(
-                CommandComponent.builder<SenderExtension, String>("state", StringParser.stringParser())
+            CommandFlag.builder<StickySender>("state").withComponent(
+                CommandComponent.builder<StickySender, String>("state", StringParser.stringParser())
                     .suggestionProvider { _, _ ->
                         CompletableFuture.completedFuture(listOf("on", "off").map { Suggestion.suggestion(it) })
                     })
         )
-        .flag(CommandFlag.builder<SenderExtension?>("silent").withAliases("s"))
+        .flag(CommandFlag.builder<StickySender?>("silent").withAliases("s"))
         .handler { context ->
             val sender = context.sender().bukkitSender()
             val target = context.optional<OfflinePlayer>("player")
@@ -194,7 +194,7 @@ class SayanVanishCommand : StickyCommand("sayanvanish", "vanish", "v") {
             .permission(constructBasePermission("feature"))
             .required(
                 "feature",
-                CommandComponent.builder<SenderExtension, String>("state", StringParser.stringParser())
+                CommandComponent.builder<StickySender, String>("state", StringParser.stringParser())
                     .suggestionProvider { _, _ ->
                         CompletableFuture.completedFuture(Features.features.map { Suggestion.suggestion(it.id) })
                     }
@@ -269,14 +269,14 @@ class SayanVanishCommand : StickyCommand("sayanvanish", "vanish", "v") {
             .permission(constructBasePermission("feature.update"))
             .required(
                 "option",
-                CommandComponent.builder<SenderExtension, String>("state", StringParser.stringParser())
+                CommandComponent.builder<StickySender, String>("state", StringParser.stringParser())
                     .suggestionProvider { context, _ ->
                         val feature = Features.features.find { it.id == context.get<String>("feature") } ?: return@suggestionProvider CompletableFuture.completedFuture(emptyList())
                         CompletableFuture.completedFuture(feature::class.java.declaredFields.filter { it.isAnnotationPresent(Configurable::class.java) }.map { Suggestion.suggestion(it.name) })
                     }
             )
             .required("value",
-                CommandComponent.builder<SenderExtension, String>("value", StringParser.stringParser(StringParser.StringMode.QUOTED))
+                CommandComponent.builder<StickySender, String>("value", StringParser.stringParser(StringParser.StringMode.QUOTED))
                     .suggestionProvider { context, _ ->
                         val feature = Features.features.find { it.id == context.get<String>("feature") } ?: let {
                             return@suggestionProvider CompletableFuture.completedFuture(emptyList())

diff --git a/...-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/feature/features/FeatureEffect.kt b/...-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/feature/features/FeatureEffect.kt
@@ -1,5 +1,7 @@
 package org.sayandev.sayanvanish.bukkit.feature.features
 
+import net.minecraft.core.Holder
+import net.minecraft.core.Holder.Direct
 import org.bukkit.event.EventHandler
 import org.bukkit.potion.PotionEffect
 import org.bukkit.potion.PotionEffectType
@@ -9,6 +11,7 @@ import org.sayandev.sayanvanish.bukkit.api.event.BukkitUserVanishEvent
 import org.sayandev.sayanvanish.bukkit.feature.ListenedFeature
 import org.sayandev.stickynote.bukkit.NMSUtils
 import org.sayandev.stickynote.bukkit.PacketUtils
+import org.sayandev.stickynote.bukkit.runSync
 import org.sayandev.stickynote.bukkit.utils.ServerVersion
 import org.sayandev.stickynote.lib.spongepowered.configurate.ConfigurationNode
 import org.sayandev.stickynote.lib.spongepowered.configurate.objectmapping.ConfigSerializable
@@ -56,7 +59,7 @@ class FeatureEffect(
         val player = event.user.player() ?: return
         for (effect in effects) {
             if (effect.usePacket) {
-                NMSUtils.sendPacket(player,PacketUtils.getUpdateMobEffectPacket(player, effect.toPotionEffect()))
+                NMSUtils.sendPacket(player, PacketUtils.getUpdateMobEffectPacket(player, effect.toPotionEffect()))
             } else {
                 player.addPotionEffect(effect.toPotionEffect())
             }