Skip to content

Commit 3daadad

Browse files
committed
chore: replace sayanventure with adventure
1 parent de5f866 commit 3daadad

21 files changed

Lines changed: 51 additions & 55 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77

88
allprojects {
99
group = "org.sayandev"
10-
version = "1.10.6.2"
10+
version = "1.10.6.10"
1111
description = "A modular Kotlin framework for Minecraft: JE"
1212

1313
plugins.apply("maven-publish")

gradle/libs.versions.toml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ cloud = "2.0.0"
1111
cloud-platform = "2.0.0-beta.14"
1212
#cloud-minecraft = "2.0.2-SNAPSHOT"
1313
adventure = "4.26.1"
14-
sayanventure = "1.0.2"
1514
mysql-connector = "8.4.0"
1615
sqlite-jdbc = "3.46.0.0"
1716
h2 = "2.2.224"
@@ -23,7 +22,7 @@ guava = "31.1-jre"
2322
gson = "2.11.0"
2423
kotlin-reflect = "2.3.0"
2524
netty = "4.1.111.Final"
26-
exposed = "0.61.0"
25+
exposed = "1.0.0"
2726
libby = "2.0.0-SNAPSHOT"
2827
mccoroutines = "2.20.0"
2928
kotlinx-coroutines = "1.10.1"
@@ -65,7 +64,6 @@ cloud-kotlin-extensions = { group = "org.incendo", name = "cloud-kotlin-extensio
6564
adventure-api = { group = "net.kyori", name = "adventure-api", version.ref = "adventure" }
6665
adventure-text-minimessage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "adventure" }
6766
adventure-text-serializer-gson = { group = "net.kyori", name = "adventure-text-serializer-gson", version.ref = "adventure" }
68-
sayanventure-api = { group = "org.sayandev.sayanventure", name = "sayanventure", version.ref = "sayanventure" }
6967
mysql-connector = { group = "com.mysql", name = "mysql-connector-j", version.ref = "mysql-connector" }
7068
sqlite-jdbc = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite-jdbc" }
7169
h2 = { group = "com.h2database", name = "h2", version.ref = "h2" }
@@ -93,7 +91,6 @@ cloud-minecraft-extras = { group = "org.incendo", name = "cloud-minecraft-extras
9391
inventoryframework = { group = "com.github.stefvanschie.inventoryframework", name = "IF", version.ref = "inventoryframework" }
9492
xseries = { group = "com.github.cryptomorin", name = "XSeries", version.ref = "xseries" }
9593
adventure-platform-bukkit = { group = "net.kyori", name = "adventure-platform-bukkit", version.ref = "adventure-platform" }
96-
sayanventure-platform-bukkit = { group = "org.sayandev.sayanventure", name = "sayanventure-bukkit", version.ref = "sayanventure" }
9794
libby-bukkit = { group = "com.alessiodp.libby", name = "libby-bukkit", version.ref = "libby" }
9895
libby-paper = { group = "com.alessiodp.libby", name = "libby-paper", version.ref = "libby" }
9996
pathetic-pathfinder-bukkit = { group = "com.github.patheloper.pathetic", name = "pathetic-mapping", version.ref = "pathetic-pathfinder-bukkit" }
@@ -117,7 +114,7 @@ cloud-velocity = { group = "org.incendo", name = "cloud-velocity", version.ref =
117114

118115
# proxy - bungeecord
119116
bungeecord = { group = "net.md-5", name = "bungeecord-api", version.ref = "bungeecord" }
120-
sayanventure-platform-bungeecord = { group = "org.sayandev.sayanventure", name = "sayanventure-bungeecord", version.ref = "sayanventure" }
117+
adventure-platform-bungeecord = { group = "net.kyori", name = "adventure-platform-bungeecord", version.ref = "adventure-platform" }
121118
libby-bungee = { group = "com.alessiodp.libby", name = "libby-bungee", version.ref = "libby" }
122119
mccoroutines-bungeecord-api = { group = "com.github.shynixn.mccoroutine", name = "mccoroutine-bungeecord-api", version.ref = "mccoroutines" }
123120
mccoroutines-bungeecord-core = { group = "com.github.shynixn.mccoroutine", name = "mccoroutine-bungeecord-core", version.ref = "mccoroutines" }
@@ -160,7 +157,7 @@ implementation-core = [
160157
"cloud-core",
161158
"cloud-kotlin-extensions",
162159
# "cloud-kotlin-coroutines",
163-
"sayanventure-api",
160+
"adventure-api",
164161
"reflections",
165162
"kotlin-reflect",
166163
"hikari",
@@ -182,7 +179,7 @@ implementation-bukkit = [
182179
"cloud-minecraft-extras",
183180
"inventoryframework",
184181
"xseries",
185-
"sayanventure-platform-bukkit",
182+
"adventure-platform-bukkit",
186183
"pathetic-pathfinder-bukkit",
187184
"mccoroutines-bukkit-api",
188185
"mccoroutines-bukkit-core",
@@ -201,7 +198,7 @@ implementation-proxy-velocity = [
201198
"cloud-velocity"
202199
]
203200
implementation-proxy-bungeecord = [
204-
"sayanventure-platform-bungeecord",
201+
"adventure-platform-bungeecord",
205202
"mccoroutines-bungeecord-api",
206203
"mccoroutines-bungeecord-core",
207204
]

stickynote-bukkit/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dependencies {
22
api(libs.libby.bukkit)
33
api(libs.libby.paper)
4-
api(libs.sayanventure.platform.bukkit)
4+
api(libs.adventure.platform.bukkit)
55
api(libs.cloud.paper)
66
api(libs.cloud.minecraft.extras)
77
api(libs.inventoryframework)

stickynote-bukkit/src/main/kotlin/org/sayandev/stickynote/bukkit/extension/Component_.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.sayandev.stickynote.bukkit.extension
22

3-
import org.sayandev.sayanventure.adventure.platform.bukkit.MinecraftComponentSerializer
4-
import org.sayandev.sayanventure.adventure.text.Component
3+
import net.kyori.adventure.platform.bukkit.MinecraftComponentSerializer
4+
import net.kyori.adventure.text.Component
55

66
fun Component.toNmsComponent(): Any {
77
return MinecraftComponentSerializer.get().serialize(this)

stickynote-bukkit/src/main/kotlin/org/sayandev/stickynote/bukkit/extension/Player_.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package org.sayandev.stickynote.bukkit.extension
22

33
import org.bukkit.command.CommandSender
44
import org.bukkit.entity.Player
5-
import org.sayandev.sayanventure.adventure.text.Component
6-
import org.sayandev.sayanventure.adventure.text.minimessage.tag.resolver.TagResolver
5+
import net.kyori.adventure.text.Component
6+
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver
77
import org.sayandev.stickynote.bukkit.utils.AdventureUtils
88

99
fun CommandSender.sendComponent(message: String, vararg placeholder: TagResolver) {

stickynote-bukkit/src/main/kotlin/org/sayandev/stickynote/bukkit/utils/AdventureUtils.kt

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package org.sayandev.stickynote.bukkit.utils
22

3+
import net.kyori.adventure.audience.Audience
4+
import net.kyori.adventure.inventory.Book
5+
import net.kyori.adventure.platform.bukkit.BukkitAudiences
6+
import net.kyori.adventure.text.Component
7+
import net.kyori.adventure.text.format.TextDecoration
8+
import net.kyori.adventure.text.minimessage.MiniMessage
9+
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver
10+
import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer
11+
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer
12+
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer
313
import net.md_5.bungee.api.chat.BaseComponent
414
import org.bukkit.ChatColor
515
import org.bukkit.command.CommandSender
616
import org.bukkit.entity.Player
7-
import org.sayandev.sayanventure.adventure.audience.Audience
8-
import org.sayandev.sayanventure.adventure.inventory.Book
9-
import org.sayandev.sayanventure.adventure.platform.bukkit.BukkitAudiences
10-
import org.sayandev.sayanventure.adventure.text.Component
11-
import org.sayandev.sayanventure.adventure.text.format.TextDecoration
12-
import org.sayandev.sayanventure.adventure.text.minimessage.MiniMessage
13-
import org.sayandev.sayanventure.adventure.text.minimessage.tag.resolver.TagResolver
14-
import org.sayandev.sayanventure.adventure.text.serializer.bungeecord.BungeeComponentSerializer
15-
import org.sayandev.sayanventure.adventure.text.serializer.gson.GsonComponentSerializer
16-
import org.sayandev.sayanventure.adventure.text.serializer.legacy.LegacyComponentSerializer
17-
import org.sayandev.stickynote.bukkit.StickyNote
1817
import org.sayandev.stickynote.bukkit.hook.PlaceholderAPIHook
1918
import org.sayandev.stickynote.bukkit.plugin
2019

stickynote-bukkit/src/main/kotlin/org/sayandev/stickynote/bukkit/utils/ItemUtils.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ object ItemUtils {
3030
} else {
3131
if (ServerVersion.supports(16)) {
3232
this.itemMeta.let { meta ->
33-
meta.setDisplayNameComponent(displayName.component(*placeholders.map { org.sayandev.sayanventure.adventure.text.minimessage.tag.resolver.Placeholder.parsed(it.key, it.value) }.toTypedArray()).bungeeComponent())
33+
meta.setDisplayNameComponent(displayName.component(*placeholders.map { net.kyori.adventure.text.minimessage.tag.resolver.Placeholder.parsed(it.key, it.value) }.toTypedArray()).bungeeComponent())
3434
this.itemMeta = meta
3535
}
3636
} else {
@@ -53,7 +53,7 @@ object ItemUtils {
5353
} else {
5454
if (ServerVersion.supports(16)) {
5555
this.itemMeta.let { meta ->
56-
meta.loreComponents = lore.map { it.component(*placeholders.map { org.sayandev.sayanventure.adventure.text.minimessage.tag.resolver.Placeholder.parsed(it.key, it.value) }.toTypedArray()).bungeeComponent() }
56+
meta.loreComponents = lore.map { it.component(*placeholders.map { net.kyori.adventure.text.minimessage.tag.resolver.Placeholder.parsed(it.key, it.value) }.toTypedArray()).bungeeComponent() }
5757
this.itemMeta = meta
5858
}
5959
} else {

stickynote-bukkit/stickynote-bukkit-nms/src/main/kotlin/org/sayandev/stickynote/bukkit/nms/NMSUtils.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import org.bukkit.event.inventory.InventoryType
1414
import org.bukkit.inventory.Inventory
1515
import org.bukkit.inventory.ItemStack
1616
import org.jetbrains.annotations.ApiStatus
17-
import org.sayandev.sayanventure.adventure.platform.bukkit.MinecraftComponentSerializer
18-
import org.sayandev.sayanventure.adventure.text.Component
19-
import org.sayandev.sayanventure.adventure.text.format.TextDecoration
20-
import org.sayandev.sayanventure.adventure.text.serializer.gson.GsonComponentSerializer
17+
import net.kyori.adventure.platform.bukkit.MinecraftComponentSerializer
18+
import net.kyori.adventure.text.Component
19+
import net.kyori.adventure.text.format.TextDecoration
20+
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer
2121
import org.sayandev.stickynote.bukkit.nms.accessors.*
2222
import org.sayandev.stickynote.bukkit.utils.ServerVersion
2323
import org.sayandev.stickynote.core.math.Vector3

stickynote-bukkit/stickynote-bukkit-nms/src/main/kotlin/org/sayandev/stickynote/bukkit/nms/PacketUtils.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import org.bukkit.entity.Player
77
import org.bukkit.inventory.ItemStack
88
import org.bukkit.potion.PotionEffect
99
import org.bukkit.potion.PotionEffectType
10-
import org.sayandev.sayanventure.adventure.platform.bukkit.MinecraftComponentSerializer
11-
import org.sayandev.sayanventure.adventure.text.Component
10+
import net.kyori.adventure.platform.bukkit.MinecraftComponentSerializer
11+
import net.kyori.adventure.text.Component
1212
import org.sayandev.stickynote.bukkit.nms.accessors.*
1313
import org.sayandev.stickynote.bukkit.nms.enum.*
1414
import org.sayandev.stickynote.bukkit.utils.MathUtils

stickynote-bukkit/stickynote-bukkit-nms/src/main/kotlin/org/sayandev/stickynote/bukkit/nms/hologram/Hologram.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package org.sayandev.stickynote.bukkit.nms.hologram
33
import org.bukkit.Bukkit.getOnlinePlayers
44
import org.bukkit.Location
55
import org.bukkit.entity.Player
6-
import org.sayandev.sayanventure.adventure.text.Component
6+
import net.kyori.adventure.text.Component
77
import org.sayandev.stickynote.bukkit.extension.toVector3
88
import org.sayandev.stickynote.bukkit.nms.Viewable
99
import org.sayandev.stickynote.core.math.Vector3

0 commit comments

Comments
 (0)