Skip to content

Enhance PacketLoreListener with improved lore and snapshot management #249

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 5 commits into from
Mar 15, 2026
Merged

Enhance PacketLoreListener with improved lore and snapshot management #249

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a9e8bc
feat: enhance PacketLoreListener with improved lore handling and snap…
twisti-dev Mar 15, 2026
3e5c9b6
feat: enhance PacketLoreListener with plugin disable handling and opt…
twisti-dev Mar 15, 2026
6724ad3
chore: update version to 1.21.11-2.66.0 and bump abi
twisti-dev Mar 15, 2026
a5501ad
feat: optimize matching keyed handlers resolution in PacketLoreListener
twisti-dev Mar 15, 2026
ac53c1c
feat: update SurfBukkitPacketApi to prefer explicit plugin parameter …
twisti-dev Mar 15, 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
19 changes: 18 additions & 1 deletion ...bukkit-api/src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/packet/SurfBukkitPacketApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package dev.slne.surf.surfapi.bukkit.api.packet

import dev.slne.surf.surfapi.bukkit.api.packet.lore.SurfBukkitPacketLoreHandler
import dev.slne.surf.surfapi.bukkit.api.packet.lore.SurfBukkitPacketLoreHandlerSimple
import dev.slne.surf.surfapi.bukkit.api.util.getCallingPlugin
import dev.slne.surf.surfapi.core.api.util.requiredService
import org.bukkit.NamespacedKey
import org.bukkit.plugin.Plugin
Expand Down Expand Up @@ -35,6 +36,14 @@ interface SurfBukkitPacketApi {
fun registerPacketLoreListener(
identifier: NamespacedKey,
listener: SurfBukkitPacketLoreHandler
) {
registerPacketLoreListener(getCallingPlugin(), identifier, listener)
Comment thread
twisti-dev marked this conversation as resolved.
Outdated
}

fun registerPacketLoreListener(
plugin: Plugin,
identifier: NamespacedKey,
listener: SurfBukkitPacketLoreHandler
)

/**
Expand All @@ -49,7 +58,15 @@ interface SurfBukkitPacketApi {
identifier: NamespacedKey,
listener: SurfBukkitPacketLoreHandlerSimple
) {
registerPacketLoreListener(identifier, listener as SurfBukkitPacketLoreHandler)
registerPacketLoreListener(getCallingPlugin(), identifier, listener)
}

fun registerPacketLoreListener(
plugin: Plugin,
identifier: NamespacedKey,
listener: SurfBukkitPacketLoreHandlerSimple
) {
registerPacketLoreListener(plugin, identifier, listener as SurfBukkitPacketLoreHandler)
}

/**
Expand Down
3 changes: 2 additions & 1 deletion ...rc/main/kotlin/dev/slne/surf/surfapi/bukkit/server/impl/packet/SurfBukkitPacketApiImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ class SurfBukkitPacketApiImpl : SurfBukkitPacketApi {
}

override fun registerPacketLoreListener(
plugin: Plugin,
identifier: NamespacedKey,
listener: SurfBukkitPacketLoreHandler
) {
PacketLoreListener.register(identifier, listener)
PacketLoreListener.register(plugin, identifier, listener)
}

override fun registerPacketLoreListenerGlobal(
Expand Down
5 changes: 5 additions & 0 deletions ...kkit-server/src/main/kotlin/dev/slne/surf/surfapi/bukkit/server/packet/PacketApiLoader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package dev.slne.surf.surfapi.bukkit.server.packet

import com.github.retrooper.packetevents.PacketEvents
import dev.slne.surf.surfapi.bukkit.api.event.register
import dev.slne.surf.surfapi.bukkit.api.event.unregister
import dev.slne.surf.surfapi.bukkit.api.nms.NmsUseWithCaution
import dev.slne.surf.surfapi.bukkit.api.packet.listener.packetListenerApi
import dev.slne.surf.surfapi.bukkit.server.impl.glow.GlowingPacketListener
import dev.slne.surf.surfapi.bukkit.server.packet.listener.PlayerChannelInjector
import dev.slne.surf.surfapi.bukkit.server.packet.lore.PacketLoreListener
import dev.slne.surf.surfapi.bukkit.server.packet.lore.PluginDisablePacketLoreListener
import dev.slne.surf.surfapi.bukkit.server.plugin
import dev.slne.surf.surfapi.core.api.extensions.packetEvents
import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder
Expand All @@ -23,12 +26,14 @@ object PacketApiLoader {
packetListenerApi.registerListeners(GlowingPacketListener)

PlayerChannelInjector.register()
PluginDisablePacketLoreListener.register()
}

@OptIn(NmsUseWithCaution::class)
fun onDisable() {
packetEvents.terminate()
packetListenerApi.unregisterListeners(PacketLoreListener)
PluginDisablePacketLoreListener.unregister()
}

private fun setupPacketEvents() {
Expand Down
Loading
Loading