Skip to content

Feat/some new nice to have things #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
twisti-dev merged 7 commits into from
Mar 16, 2026
Merged

Feat/some new nice to have things #251

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9250db7
feat: add action bar support and new packet sending utilities
TheBjoRedCraft Mar 16, 2026
85d3475
chore: bump version to 1.21.11-2.67.1 in gradle.properties
TheBjoRedCraft Mar 16, 2026
c4b38f6
Potential fix for pull request finding
TheBjoRedCraft Mar 16, 2026
002924b
Potential fix for pull request finding
TheBjoRedCraft Mar 16, 2026
44c9a5b
feat: enhance packet sending utilities with UUID support and improve …
twisti-dev Mar 16, 2026
ef2c591
Update ABI reference
twisti-dev Mar 16, 2026
ed01f8a
chore: bump version to 1.21.11-2.68.0 in gradle.properties
twisti-dev Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
javaVersion=25
mcVersion=1.21.11
group=dev.slne.surf
version=1.21.11-2.67.0
version=1.21.11-2.67.1
relocationPrefix=dev.slne.surf.surfapi.libs
snapshot=false
11 changes: 10 additions & 1 deletion ...it-api/src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/inventory/framework/extensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@

package dev.slne.surf.surfapi.bukkit.api.inventory.framework

import dev.slne.surf.surfapi.bukkit.api.builder.buildItem
import dev.slne.surf.surfapi.bukkit.api.builder.displayName
import dev.slne.surf.surfapi.bukkit.api.inventory.framework.view.InventoryFrameworkDSL
import dev.slne.surf.surfapi.core.api.messages.builder.SurfComponentBuilder
import me.devnatan.inventoryframework.View
import me.devnatan.inventoryframework.ViewConfigBuilder
import me.devnatan.inventoryframework.context.OpenContext
import net.kyori.adventure.text.Component
import org.bukkit.Material
import org.bukkit.entity.Player

/**
Expand Down Expand Up @@ -142,4 +146,9 @@ inline fun ViewConfigBuilder.titleBuilder(title: @InventoryFrameworkDSL SurfComp
* @param modifier DSL block applied to the [ViewConfigBuilder]
*/
inline fun OpenContext.modifyConfig(modifier: @InventoryFrameworkDSL ViewConfigBuilder.() -> Unit) =
this.modifyConfig().apply(modifier)
this.modifyConfig().apply(modifier)

val View.outlineItem
get() = buildItem(Material.GRAY_STAINED_GLASS_PANE) {
displayName(Component.empty())
}
Comment thread
TheBjoRedCraft marked this conversation as resolved.
17 changes: 17 additions & 0 deletions .../surf-api-bukkit-api/src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/util/bukkit-util.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

package dev.slne.surf.surfapi.bukkit.api.util

import com.github.retrooper.packetevents.PacketEvents
import com.github.retrooper.packetevents.wrapper.PacketWrapper
import com.github.shynixn.mccoroutine.folia.SuspendingPlugin
import com.github.shynixn.mccoroutine.folia.entityDispatcher
import com.github.shynixn.mccoroutine.folia.regionDispatcher
Expand Down Expand Up @@ -281,3 +283,18 @@ suspend fun World.getBlockAtAsync(pos: BlockPosition): Block {
)
}
}

fun PacketWrapper<*>.sendPacket(uuid: UUID) {
val player = Bukkit.getPlayer(uuid) ?: return
val packetPlayer = PacketEvents.getAPI().playerManager.getUser(player) ?: return

packetPlayer.sendPacket(this)
Comment thread
TheBjoRedCraft marked this conversation as resolved.
Outdated
}

fun PacketWrapper<*>.sendPacket(player: Player) =
PacketEvents.getAPI().playerManager.getUser(player)?.sendPacket(this)
Comment thread
TheBjoRedCraft marked this conversation as resolved.
Outdated

fun Location.readableString(showRotation: Boolean) =
"${world?.name ?: "null"}: (${x.toInt()}, ${y.toInt()}, ${z.toInt()})" + if (showRotation) " (yaw: ${yaw.toInt()}, pitch: ${pitch.toInt()})" else ""
Comment thread
TheBjoRedCraft marked this conversation as resolved.
Outdated

typealias BukkitSound = Sound
11 changes: 9 additions & 2 deletions ...i/src/main/kotlin/dev/slne/surf/surfapi/core/api/messages/adventure/audience-extension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ inline fun Audience.sendText(block: SurfComponentBuilder.() -> Unit) {
sendMessage(SurfComponentBuilder(block))
}

inline fun Audience.sendActionBar(block: SurfComponentBuilder.() -> Unit) {
sendActionBar(SurfComponentBuilder(block))
}

inline fun Audience.openBook(block: @BookDsl Book.Builder.() -> Unit) {
openBook(Book(block))
}
Expand Down Expand Up @@ -45,8 +49,11 @@ inline fun Audience.uuid() = uuidOrNull() ?: error("Audience does not have a UUI
inline fun Audience.nameOrNull() = getPointer(Identity.NAME)
inline fun Audience.name() = nameOrNull() ?: error("Audience does not have a name pointer")
inline fun Audience.displayNameOrNull() = getPointer(Identity.DISPLAY_NAME)
inline fun Audience.displayName() = displayNameOrNull() ?: error("Audience does not have a display name pointer")
inline fun Audience.displayName() =
displayNameOrNull() ?: error("Audience does not have a display name pointer")

inline fun Audience.testPermission(permission: String) =
getPointer(PermissionChecker.POINTER)?.value(permission) ?: TriState.NOT_SET

inline fun Audience.hasPermission(permission: String) = getPointer(PermissionChecker.POINTER)?.test(permission) ?: false
inline fun Audience.hasPermission(permission: String) =
getPointer(PermissionChecker.POINTER)?.test(permission) ?: false
4 changes: 3 additions & 1 deletion ...api/src/main/kotlin/dev/slne/surf/surfapi/core/api/messages/adventure/sound-extensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,6 @@ inline fun sound(block: @SoundDsl Sound.Builder.() -> Unit): Sound {
* @param block The configuration block for building the sound.
* @return A configured [Sound] instance.
*/
inline fun Sound(block: @SoundDsl Sound.Builder.() -> Unit) = sound(block)
inline fun Sound(block: @SoundDsl Sound.Builder.() -> Unit) = sound(block)

Comment thread
TheBjoRedCraft marked this conversation as resolved.
typealias AdventureSound = Sound
10 changes: 6 additions & 4 deletions ...i/src/main/kotlin/dev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
package dev.slne.surf.surfapi.core.api.messages.builder

import dev.slne.surf.surfapi.core.api.messages.*
import dev.slne.surf.surfapi.core.api.messages.Colors.Companion.NOTE
import dev.slne.surf.surfapi.core.api.messages.Colors.Companion.PREFIX
import dev.slne.surf.surfapi.core.api.messages.Colors.Companion.SPACER
import dev.slne.surf.surfapi.core.api.messages.Colors.Companion.VARIABLE_VALUE
Comment thread
TheBjoRedCraft marked this conversation as resolved.
import dev.slne.surf.surfapi.core.api.messages.CommonComponents
import dev.slne.surf.surfapi.core.api.messages.CommonComponents.DISCONNECT_HEADER
import dev.slne.surf.surfapi.core.api.messages.CommonComponents.DISCORD_LINK
import dev.slne.surf.surfapi.core.api.messages.CommonComponents.TIME_SEPARATOR
import dev.slne.surf.surfapi.core.api.messages.NoLowercase
import dev.slne.surf.surfapi.core.api.messages.joinToComponent
import dev.slne.surf.surfapi.core.api.messages.joinToComponentNewLine
import net.kyori.adventure.key.Key
import net.kyori.adventure.text.*
import net.kyori.adventure.text.event.ClickEvent
Expand Down Expand Up @@ -83,6 +80,11 @@ interface SurfComponentBuilder : TextComponent.Builder, ComponentBuilderColors {
fun note(any: Any, vararg decoration: TextDecoration) = text(any.toString(), NOTE, *decoration)

fun ellipsis(color: TextColor? = SPACER) = append(CommonComponents.ELLIPSIS.color(color))
fun translatable(
key: String,
color: TextColor? = Colors.WHITE,
vararg decoration: TextDecoration
) = append(Component.translatable(key, color, *decoration))

fun appendDiscordLink() = append(DISCORD_LINK)
fun appendDisconnectHeader() = append(DISCONNECT_HEADER)
Expand Down
Loading