refactor: remove bonfire state-logic in favor of ItemModel stuff

Boy0000 · Boy0000 · commit 12fe2edbcd19 · 2025-05-14T16:04:57.000+02:00
diff --git a/src/main/kotlin/com/mineinabyss/bonfire/BonfireCommands.kt b/src/main/kotlin/com/mineinabyss/bonfire/BonfireCommands.kt
@@ -4,7 +4,6 @@ import com.mineinabyss.blocky.helpers.GenericHelpers.toBlockCenterLocation
 import com.mineinabyss.bonfire.components.Bonfire
 import com.mineinabyss.bonfire.components.BonfireDebug
 import com.mineinabyss.bonfire.components.BonfireRespawn
-import com.mineinabyss.bonfire.extensions.BonfirePacketHelpers
 import com.mineinabyss.bonfire.extensions.updateBonfireState
 import com.mineinabyss.geary.papermc.datastore.decode
 import com.mineinabyss.geary.papermc.datastore.encode
@@ -16,7 +15,6 @@ import com.mineinabyss.geary.papermc.tracking.entities.toGearyOrNull
 import com.mineinabyss.geary.papermc.withGeary
 import com.mineinabyss.geary.serialization.setPersisting
 import com.mineinabyss.idofront.commands.brigadier.commands
-import com.mineinabyss.idofront.commands.brigadier.context.IdoCommandContext
 import com.mineinabyss.idofront.commands.brigadier.executes
 import com.mineinabyss.idofront.commands.brigadier.playerExecutes
 import com.mineinabyss.idofront.messaging.error
@@ -29,8 +27,6 @@ import com.mineinabyss.idofront.util.to
 import com.mojang.brigadier.arguments.StringArgumentType
 import io.papermc.paper.command.brigadier.argument.ArgumentTypes
 import org.bukkit.Bukkit
-import org.bukkit.Location
-import org.bukkit.OfflinePlayer
 import org.bukkit.entity.ItemDisplay
 import org.bukkit.entity.Player
 
@@ -125,7 +121,6 @@ object BonfireCommands {
                                             }
                                             bonfire.bonfirePlayers += offlinePlayer.uniqueId
                                             bonfireEntity.updateBonfireState()
-                                            BonfirePacketHelpers.sendAddonPacket(bonfireEntity)
                                             sender.success("Set respawn point for ${offlinePlayer.name} to $x $y $z in ${player.world.name}")
                                         }
                                     }
diff --git a/src/main/kotlin/com/mineinabyss/bonfire/components/Bonfire.kt b/src/main/kotlin/com/mineinabyss/bonfire/components/Bonfire.kt
@@ -1,18 +1,10 @@
 package com.mineinabyss.bonfire.components
 
-import com.charleskorn.kaml.YamlComment
 import com.mineinabyss.bonfire.bonfire
-import com.mineinabyss.geary.papermc.tracking.items.ItemTrackingModule
-import com.mineinabyss.geary.prefabs.PrefabKey
-import com.mineinabyss.geary.prefabs.serializers.PrefabKeySerializer
 import com.mineinabyss.idofront.serialization.DurationSerializer
 import com.mineinabyss.idofront.serialization.UUIDSerializer
-import io.papermc.paper.datacomponent.DataComponentTypes
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import net.kyori.adventure.key.Key
-import org.bukkit.Material
-import org.bukkit.inventory.ItemStack
 import java.util.*
 import kotlin.time.Duration
 
@@ -23,30 +15,4 @@ data class Bonfire(
     val bonfirePlayers: MutableList<@Serializable(UUIDSerializer::class) UUID> = mutableListOf(),
     val maxPlayerCount: Int = bonfire.config.maxPlayerCount,
     val bonfireExpirationTime: @Serializable(with = DurationSerializer::class) Duration = bonfire.config.bonfireExpirationTime,
-    val states: BonfireStates,
-    @YamlComment("Item to spawn in addition to bonfire, mainly for visually representing player-count")
-    val addons: List<@Serializable(PrefabKeySerializer::class) PrefabKey> = emptyList()
-) {
-    @Serializable
-    data class BonfireStates(
-        val unlit: @Serializable(PrefabKeySerializer::class) PrefabKey,
-        val lit: @Serializable(PrefabKeySerializer::class) PrefabKey,
-        val set: @Serializable(PrefabKeySerializer::class) PrefabKey,
-    ) {
-
-        fun unlitItem(itemTracking: ItemTrackingModule) = itemTracking.createItem(unlit)
-            ?: ItemStack.of(Material.PAPER).apply {
-                setData(DataComponentTypes.ITEM_MODEL, Key.key(unlit.full))
-            }
-
-        fun litItem(itemTracking: ItemTrackingModule) = itemTracking.createItem(lit)
-        ?: ItemStack.of(Material.PAPER).apply {
-            setData(DataComponentTypes.ITEM_MODEL, Key.key(lit.full))
-        }
-
-        fun setItem(itemTracking: ItemTrackingModule) = itemTracking.createItem(set)
-        ?: ItemStack.of(Material.PAPER).apply {
-            setData(DataComponentTypes.ITEM_MODEL, Key.key(set.full))
-        }
-    }
-}
+)
diff --git a/src/main/kotlin/com/mineinabyss/bonfire/extensions/BonfireHelpers.kt b/src/main/kotlin/com/mineinabyss/bonfire/extensions/BonfireHelpers.kt
@@ -9,23 +9,19 @@ import com.mineinabyss.bonfire.components.BonfireRemoved
 import com.mineinabyss.bonfire.components.BonfireRespawn
 import com.mineinabyss.geary.papermc.tracking.entities.toGeary
 import com.mineinabyss.geary.papermc.tracking.entities.toGearyOrNull
-import com.mineinabyss.geary.papermc.tracking.items.ItemTracking
 import com.mineinabyss.geary.papermc.withGeary
-import com.mineinabyss.idofront.entities.toPlayer
 import io.papermc.paper.datacomponent.DataComponentTypes
+import io.papermc.paper.datacomponent.item.CustomModelData
 import kotlinx.coroutines.delay
-import net.kyori.adventure.key.Key
 import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket
 import net.minecraft.network.syncher.EntityDataSerializers
 import net.minecraft.network.syncher.SynchedEntityData
-import org.bukkit.Material
 import org.bukkit.craftbukkit.entity.CraftPlayer
 import org.bukkit.craftbukkit.inventory.CraftItemStack
 import org.bukkit.entity.Display
 import org.bukkit.entity.Entity
 import org.bukkit.entity.ItemDisplay
 import org.bukkit.entity.Player
-import org.bukkit.inventory.ItemStack
 
 fun Iterable<Entity>.forEachBonfire(action: (ItemDisplay) -> Unit) {
     for (element in this.filterIsBonfire()) action(element)
@@ -68,26 +64,30 @@ fun ItemDisplay.updateBonfireState() {
     withGeary {
         val plugin = bonfire.plugin
         val bonfire = toGearyOrNull()?.get<Bonfire>() ?: return
-        val itemTracking = getAddon(ItemTracking)
 
         when {// Set the base-furniture item to the correct state
             bonfire.bonfirePlayers.isEmpty() -> {
                 brightness = toGearyOrNull()?.get<BlockyFurniture>()?.properties?.brightness
-                setItemStack(bonfire.states.unlitItem(itemTracking))
             }
             else -> {
                 brightness = Display.Brightness(15, 15)
-                setItemStack(bonfire.states.litItem(itemTracking))
+                setItemStack(itemStack.apply {
+                    val cmd = CustomModelData.customModelData().addFloat(bonfire.bonfirePlayers.size.toFloat()).addFlag(true).addFlag(false).build()
+                    setData(DataComponentTypes.CUSTOM_MODEL_DATA, cmd)
+                })
 
                 // Set state via packets to 'set' for all online players currently at the bonfire
-                val stateItem = bonfire.states.setItem(itemTracking)
+                val stateItem = itemStack.apply {
+                    val cmd = CustomModelData.customModelData().addFloat(bonfire.bonfirePlayers.size.toFloat()).addFlag(true).addFlag(true).build()
+                    setData(DataComponentTypes.CUSTOM_MODEL_DATA, cmd)
+                }
                 val metadataPacket = ClientboundSetEntityDataPacket(entityId,
                     listOf(SynchedEntityData.DataValue(23, EntityDataSerializers.ITEM_STACK, CraftItemStack.asNMSCopy(stateItem)))
                 )
 
                 plugin.launch {
                     delay(2.ticks)
-                    bonfire.bonfirePlayers.mapNotNull { it.toPlayer()?.takeIf( { p -> p.canSee(this@updateBonfireState) }) }.forEach {
+                    this@updateBonfireState.trackedBy.filter { it.uniqueId in bonfire.bonfirePlayers }.forEach {
                         (it as CraftPlayer).handle.connection.send(metadataPacket)
                     }
                 }
diff --git a/src/main/kotlin/com/mineinabyss/bonfire/extensions/BonfirePacketHelpers.kt b/src/main/kotlin/com/mineinabyss/bonfire/extensions/BonfirePacketHelpers.kt
diff --git a/src/main/kotlin/com/mineinabyss/bonfire/listeners/BonfireListener.kt b/src/main/kotlin/com/mineinabyss/bonfire/listeners/BonfireListener.kt
@@ -7,7 +7,10 @@ import com.mineinabyss.blocky.api.events.furniture.BlockyFurnitureInteractEvent
 import com.mineinabyss.blocky.api.events.furniture.BlockyFurniturePlaceEvent
 import com.mineinabyss.bonfire.bonfire
 import com.mineinabyss.bonfire.components.*
-import com.mineinabyss.bonfire.extensions.*
+import com.mineinabyss.bonfire.extensions.canBreakBonfire
+import com.mineinabyss.bonfire.extensions.isBonfire
+import com.mineinabyss.bonfire.extensions.removeOldBonfire
+import com.mineinabyss.bonfire.extensions.updateBonfireState
 import com.mineinabyss.geary.actions.ActionGroupContext
 import com.mineinabyss.geary.actions.execute
 import com.mineinabyss.geary.helpers.with
@@ -28,7 +31,6 @@ import com.mineinabyss.idofront.messaging.error
 import com.mineinabyss.idofront.messaging.success
 import com.mineinabyss.idofront.nms.nbt.editOfflinePDC
 import com.mineinabyss.idofront.nms.nbt.getOfflinePDC
-import com.mineinabyss.idofront.plugin.Plugins
 import org.bukkit.Bukkit
 import org.bukkit.attribute.Attribute
 import org.bukkit.entity.ItemDisplay
@@ -149,7 +151,6 @@ class BonfireListener : Listener {
                 gearyPlayer.encodeComponentsTo(player)
             }
             baseEntity.updateBonfireState()
-            BonfirePacketHelpers.sendAddonPacket(baseEntity)
         }
     }
 
diff --git a/src/main/kotlin/com/mineinabyss/bonfire/listeners/PlayerListener.kt b/src/main/kotlin/com/mineinabyss/bonfire/listeners/PlayerListener.kt
@@ -5,7 +5,6 @@ import com.mineinabyss.bonfire.bonfire
 import com.mineinabyss.bonfire.components.Bonfire
 import com.mineinabyss.bonfire.components.BonfireRemoved
 import com.mineinabyss.bonfire.components.BonfireRespawn
-import com.mineinabyss.bonfire.extensions.BonfirePacketHelpers
 import com.mineinabyss.bonfire.extensions.filterIsBonfire
 import com.mineinabyss.bonfire.extensions.isBonfire
 import com.mineinabyss.bonfire.extensions.updateBonfireState
@@ -17,7 +16,6 @@ import com.mineinabyss.idofront.entities.rightClicked
 import com.mineinabyss.idofront.messaging.error
 import com.mineinabyss.idofront.messaging.info
 import io.papermc.paper.event.player.PlayerTrackEntityEvent
-import io.papermc.paper.event.player.PlayerUntrackEntityEvent
 import kotlinx.coroutines.delay
 import org.bukkit.block.Block
 import org.bukkit.block.BlockFace
@@ -88,13 +86,6 @@ class PlayerListener : Listener {
     fun PlayerTrackEntityEvent.onTrackBonfire() {
         val furniture = entity as? ItemDisplay ?: return
         furniture.updateBonfireState()
-        BonfirePacketHelpers.sendAddonPacket(furniture, player)
-    }
-
-    @EventHandler
-    fun PlayerUntrackEntityEvent.onUntrackBonfire() {
-        val furniture = entity as? ItemDisplay ?: return
-        BonfirePacketHelpers.removeAddonPacket(furniture, player)
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)
