Merge pull request #138 from DockyardMC/feature/bandwith-monitor

LukynkaCZE · web-flow · commit a1fa1aa863c2 · 2025-04-05T12:46:02.000+02:00
Add a bandwidth counter server metric
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -73,7 +73,7 @@ dependencies {
     implementation("com.google.guava:guava:33.3.1-jre")
     implementation("com.google.code.gson:gson:2.10.1")
     api("it.unimi.dsi:fastutil:8.5.13")
-    api("cz.lukynka:kotlin-bindables:1.9")
+    api("cz.lukynka:kotlin-bindables:2.0")
 
     api("io.github.dockyardmc:spark-api:1.12-SNAPSHOT")
     api("io.github.dockyardmc:spark-common:1.12-SNAPSHOT")
diff --git a/src/main/kotlin/Main.kt b/src/main/kotlin/Main.kt
@@ -7,6 +7,7 @@ import io.github.dockyardmc.events.PlayerJoinEvent
 import io.github.dockyardmc.player.Player
 import io.github.dockyardmc.player.systems.GameMode
 import io.github.dockyardmc.registry.registries.PotionEffectRegistry
+import io.github.dockyardmc.utils.DebugSidebar
 
 fun suggestPotionEffects(player: Player): List<String> {
     return PotionEffectRegistry.potionEffects.keys.toList()
@@ -25,6 +26,7 @@ fun main() {
         player.permissions.add("dockyard.admin")
         player.permissions.add("dockyard.*")
         player.gameMode.value = GameMode.CREATIVE
+        DebugSidebar.sidebar.viewers.add(player)
     }
 
     Commands.add("/interaction") {
@@ -34,15 +36,15 @@ fun main() {
             interaction.width.value = 3f
             interaction.height.value = 3f
 
-            interaction.rightClickDispatcher.register { p ->
+            interaction.rightClickDispatcher.subscribe { p ->
                 p.sendMessage("<yellow>Right Click")
             }
 
-            interaction.leftClickDispatcher.register { p ->
+            interaction.leftClickDispatcher.subscribe { p ->
                 p.sendMessage("<yellow>Left Click")
             }
 
-            interaction.middleClickDispatcher.register { p ->
+            interaction.middleClickDispatcher.subscribe { p ->
                 p.sendMessage("<yellow>Middle Click")
             }
         }
diff --git a/src/main/kotlin/io/github/dockyardmc/apis/sidebar/Sidebar.kt b/src/main/kotlin/io/github/dockyardmc/apis/sidebar/Sidebar.kt
@@ -5,13 +5,14 @@ import cz.lukynka.bindables.BindableList
 import io.github.dockyardmc.extentions.sendPacket
 import io.github.dockyardmc.player.Player
 import io.github.dockyardmc.protocol.packets.play.clientbound.*
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap
 import java.util.*
 
 class Sidebar(builder: Sidebar.() -> Unit) {
 
     val title: Bindable<String> = Bindable("")
     val viewers: BindableList<Player> = BindableList()
-    private val innerLines: MutableMap<Int, SidebarLine> = mutableMapOf()
+    private val innerLines: Int2ObjectOpenHashMap<SidebarLine> = Int2ObjectOpenHashMap()
     val lines get() = innerLines.toList()
 
     private val objective = UUID.randomUUID().toString()
@@ -35,7 +36,7 @@ class Sidebar(builder: Sidebar.() -> Unit) {
     fun setGlobalLine(line: Int, value: String) {
         val before = innerLines[line] as GlobalSidebarLine?
         innerLines[line] = GlobalSidebarLine(value)
-        if(before?.value != value) viewers.values.forEach { sendLinePacket(it, line) }
+        if (before?.value != value) viewers.values.forEach { sendLinePacket(it, line) }
     }
 
     fun setPlayerLine(line: Int, value: (Player) -> String) {
@@ -59,7 +60,7 @@ class Sidebar(builder: Sidebar.() -> Unit) {
     }
 
     private fun getLine(line: Int, player: Player): String {
-        val value = when(val it = innerLines[line]) {
+        val value = when (val it = innerLines[line]) {
             is GlobalSidebarLine -> it.value
             is PersonalizedSidebarLine -> it.getValue(player)
             else -> ""
diff --git a/src/main/kotlin/io/github/dockyardmc/entity/InteractionEntity.kt b/src/main/kotlin/io/github/dockyardmc/entity/InteractionEntity.kt
@@ -20,10 +20,10 @@ class Interaction(location: Location): Entity(location) {
     val height: Bindable<Float> = bindablePool.provideBindable(1f)
     val responsive: Bindable<Boolean> = bindablePool.provideBindable(true)
 
-    val rightClickDispatcher: BindableDispatcher<Player> = bindablePool.provideBindableListener()
-    val leftClickDispatcher: BindableDispatcher<Player> = bindablePool.provideBindableListener()
-    val middleClickDispatcher: BindableDispatcher<Player> = bindablePool.provideBindableListener()
-    val generalInteractionDispatcher: BindableDispatcher<Player> = bindablePool.provideBindableListener()
+    val rightClickDispatcher: BindableDispatcher<Player> = bindablePool.provideBindableDispatcher()
+    val leftClickDispatcher: BindableDispatcher<Player> = bindablePool.provideBindableDispatcher()
+    val middleClickDispatcher: BindableDispatcher<Player> = bindablePool.provideBindableDispatcher()
+    val generalInteractionDispatcher: BindableDispatcher<Player> = bindablePool.provideBindableDispatcher()
 
     init {
         eventPool.on<PlayerInteractWithEntityEvent> { event ->
diff --git a/src/main/kotlin/io/github/dockyardmc/entity/ai/goals/RandomWalkAroundGoal.kt b/src/main/kotlin/io/github/dockyardmc/entity/ai/goals/RandomWalkAroundGoal.kt
@@ -3,13 +3,10 @@ package io.github.dockyardmc.entity.ai.goals
 import io.github.dockyardmc.entity.Entity
 import io.github.dockyardmc.entity.ai.AIGoal
 import io.github.dockyardmc.location.Location
+import io.github.dockyardmc.maths.randomInt
 import io.github.dockyardmc.pathfinding.Navigator
 import io.github.dockyardmc.pathfinding.PatheticPlatformDockyard.toPathPosition
 import io.github.dockyardmc.pathfinding.PathfindingHelper
-import io.github.dockyardmc.registry.Sounds
-import io.github.dockyardmc.sounds.Sound
-import io.github.dockyardmc.maths.randomFloat
-import io.github.dockyardmc.maths.randomInt
 
 class RandomWalkAroundGoal(override var entity: Entity, override var priority: Int, val navigator: Navigator) : AIGoal() {
 
@@ -25,26 +22,23 @@ class RandomWalkAroundGoal(override var entity: Entity, override var priority: I
         hasFinishedWalking = false
         var locationToPathfindTo: Location? = null
         startingLocation.getBlocksInRadius(10).shuffled().forEach { location ->
-            if(!PathfindingHelper.isTraversable(location.block, location)) return@forEach
+            if (!PathfindingHelper.isTraversable(location.block, location)) return@forEach
             val start = entity.location.getBlockLocation().subtract(0, 1, 0).toPathPosition()
             val end = location.toPathPosition()
 
             navigator.pathfinder.findPath(start, end, navigator.filters).thenAccept { result ->
-                if(!result.successful()) return@thenAccept
+                if (!result.successful()) return@thenAccept
                 locationToPathfindTo = location
             }
         }
 
-        if(locationToPathfindTo == null) {
+        if (locationToPathfindTo == null) {
             hasFinishedWalking = true
             return
         }
 
         navigator.updatePathfindingPath(locationToPathfindTo!!)
-        navigator.navigationNodeStepDispatcher.register {
-            entity.playSoundToViewers(Sound(Sounds.ENTITY_RAVAGER_STEP, volume = 0.1f, pitch = randomFloat(1f, 1.3f)), entity.location)
-        }
-        navigator.navigationCompleteDispatcher.register {
+        navigator.navigationCompleteDispatcher.subscribe {
             hasFinishedWalking = true
         }
     }
diff --git a/src/main/kotlin/io/github/dockyardmc/events/system/EventSystem.kt b/src/main/kotlin/io/github/dockyardmc/events/system/EventSystem.kt
@@ -3,14 +3,15 @@ package io.github.dockyardmc.events.system
 import io.github.dockyardmc.events.*
 import io.github.dockyardmc.events.EventListener
 import io.github.dockyardmc.utils.Disposable
+import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet
 import java.util.*
 import kotlin.reflect.KClass
 
 abstract class EventSystem : Disposable {
     val eventMap = mutableMapOf<KClass<out Event>, HandlerList>()
     var filter = EventFilter.empty()
 
-    val children = mutableSetOf<EventSystem>()
+    val children = ObjectOpenHashSet<EventSystem>()
     open var parent: EventSystem? = null
         internal set // assigning to this value will fuck everything, there is no point having it public.
     open var name: String = "eventsystem-${UUID.randomUUID().toString().substring(0..7)}"
@@ -53,7 +54,7 @@ abstract class EventSystem : Disposable {
         // we create a copy of the children array before running any handlers to
         //  ensure that if any children are added in the following listeners,
         //  we don't call the newly registered events
-        val children = children.toTypedArray()
+        val children = children.clone()
         eventMap[eventType]?.let { handlers ->
             handlers.listeners.forEach { executableEvent ->
                 executableEvent.function.invoke(event)
diff --git a/src/main/kotlin/io/github/dockyardmc/maths/MathUtils.kt b/src/main/kotlin/io/github/dockyardmc/maths/MathUtils.kt
@@ -2,7 +2,7 @@ package io.github.dockyardmc.maths
 
 import com.google.common.primitives.Ints.min
 import io.github.dockyardmc.location.Location
-import io.github.dockyardmc.utils.ChunkUtils.floor
+import io.github.dockyardmc.world.chunk.ChunkUtils.floor
 import io.github.dockyardmc.maths.vectors.Vector3f
 import java.io.File
 import java.security.MessageDigest
diff --git a/src/main/kotlin/io/github/dockyardmc/protocol/decoders/PacketLengthDecoder.kt b/src/main/kotlin/io/github/dockyardmc/protocol/decoders/PacketLengthDecoder.kt
@@ -3,6 +3,8 @@ package io.github.dockyardmc.protocol.decoders
 import cz.lukynka.prettylog.LogType
 import cz.lukynka.prettylog.log
 import io.github.dockyardmc.extentions.readVarInt
+import io.github.dockyardmc.server.ServerMetrics
+import io.github.dockyardmc.utils.DataSizeCounter
 import io.netty.buffer.ByteBuf
 import io.netty.channel.ChannelHandlerContext
 import io.netty.handler.codec.ByteToMessageDecoder
@@ -23,6 +25,9 @@ class PacketLengthDecoder : ByteToMessageDecoder() {
 
         out.add(buffer.retainedSlice(buffer.readerIndex(), length))
         buffer.skipBytes(length)
+        // +1 to account for the size byte that is not counted
+        ServerMetrics.inboundBandwidth.add(length + 1, DataSizeCounter.Type.BYTE)
+        ServerMetrics.totalBandwidth.add(length + 1, DataSizeCounter.Type.BYTE)
     }
 
     override fun exceptionCaught(connection: ChannelHandlerContext, cause: Throwable) {
diff --git a/src/main/kotlin/io/github/dockyardmc/protocol/encoders/PacketLengthEncoder.kt b/src/main/kotlin/io/github/dockyardmc/protocol/encoders/PacketLengthEncoder.kt
@@ -3,6 +3,8 @@ package io.github.dockyardmc.protocol.encoders
 import cz.lukynka.prettylog.LogType
 import cz.lukynka.prettylog.log
 import io.github.dockyardmc.extentions.writeVarInt
+import io.github.dockyardmc.server.ServerMetrics
+import io.github.dockyardmc.utils.DataSizeCounter
 import io.netty.buffer.ByteBuf
 import io.netty.channel.ChannelHandlerContext
 import io.netty.handler.codec.MessageToByteEncoder
@@ -11,8 +13,13 @@ class PacketLengthEncoder: MessageToByteEncoder<ByteBuf>() {
 
     override fun encode(connection: ChannelHandlerContext, buffer: ByteBuf, out: ByteBuf) {
         try {
-            out.writeVarInt(buffer.readableBytes())
+            val size = buffer.readableBytes()
+            out.writeVarInt(size)
             out.writeBytes(buffer)
+
+            // +1 to account for the size byte that is not counted
+            ServerMetrics.outboundBandwidth.add(size + 1, DataSizeCounter.Type.BYTE)
+            ServerMetrics.totalBandwidth.add(size + 1, DataSizeCounter.Type.BYTE)
         } catch (exception: Exception) {
             log("There was an error while encoding packet length", LogType.ERROR)
             log(exception)
diff --git a/src/main/kotlin/io/github/dockyardmc/protocol/packets/play/clientbound/ClientboundChunkDataPacket.kt b/src/main/kotlin/io/github/dockyardmc/protocol/packets/play/clientbound/ClientboundChunkDataPacket.kt
@@ -2,7 +2,7 @@ package io.github.dockyardmc.protocol.packets.play.clientbound
 
 import io.github.dockyardmc.extentions.*
 import io.github.dockyardmc.protocol.packets.ClientboundPacket
-import io.github.dockyardmc.utils.ChunkUtils
+import io.github.dockyardmc.world.chunk.ChunkUtils
 import io.github.dockyardmc.utils.writeMSNBT
 import io.github.dockyardmc.world.Light
 import io.github.dockyardmc.world.block.BlockEntity
diff --git a/src/main/kotlin/io/github/dockyardmc/schematics/Schematic.kt b/src/main/kotlin/io/github/dockyardmc/schematics/Schematic.kt
@@ -4,13 +4,11 @@ package io.github.dockyardmc.schematics
 
 import cz.lukynka.prettylog.LogType
 import cz.lukynka.prettylog.log
-import io.github.dockyardmc.world.block.Block
 import io.github.dockyardmc.extentions.readVarInt
-import io.github.dockyardmc.extentions.sendPacket
 import io.github.dockyardmc.extentions.toByteBuf
 import io.github.dockyardmc.location.Location
 import io.github.dockyardmc.registry.Blocks
-import io.github.dockyardmc.utils.ChunkUtils
+import io.github.dockyardmc.world.chunk.ChunkUtils
 import io.github.dockyardmc.maths.vectors.Vector3
 import io.github.dockyardmc.world.chunk.Chunk
 import io.github.dockyardmc.world.World
diff --git a/src/main/kotlin/io/github/dockyardmc/server/ServerMetrics.kt b/src/main/kotlin/io/github/dockyardmc/server/ServerMetrics.kt
@@ -7,6 +7,7 @@ import io.github.dockyardmc.extentions.truncate
 import io.github.dockyardmc.periodic.Period
 import io.github.dockyardmc.periodic.SecondPeriod
 import io.github.dockyardmc.maths.percent
+import io.github.dockyardmc.utils.DataSizeCounter
 
 object ServerMetrics {
     var packetsSent: Int = 0
@@ -31,6 +32,10 @@ object ServerMetrics {
     val memoryRentedTruncated get() = (memoryRented.toDouble() / 1000000).truncate(1)
     val memoryAllocatedTruncated get() = (memoryAllocated.toDouble() / 1000000).truncate(1)
 
+    val outboundBandwidth: DataSizeCounter = DataSizeCounter()
+    val inboundBandwidth: DataSizeCounter = DataSizeCounter()
+    val totalBandwidth: DataSizeCounter = DataSizeCounter()
+
     init {
         var seconds = 0
         Period.on<SecondPeriod> {
diff --git a/src/main/kotlin/io/github/dockyardmc/utils/DataSizeCounter.kt b/src/main/kotlin/io/github/dockyardmc/utils/DataSizeCounter.kt
@@ -0,0 +1,31 @@
+package io.github.dockyardmc.utils
+
+import io.github.dockyardmc.extentions.truncate
+
+class DataSizeCounter(initialValue: Long = 0) {
+    private var bytes: Long = initialValue
+
+    fun add(value: Int, type: Type) {
+        bytes += value.toLong() * type.mult
+    }
+
+    fun remove(value: Int, type: Type) {
+        bytes -= value.toLong() * type.mult
+    }
+
+    fun getSize(type: Type): Double {
+        return (bytes.toDouble() / type.mult.toDouble()).truncate(2).toDouble()
+    }
+
+    fun reset() {
+        bytes = 0
+    }
+
+    enum class Type(val mult: Long) {
+        BYTE(1L),
+        KILOBYTE(1024L),
+        MEGABYTE(KILOBYTE.mult * 1024L),
+        GIGABYTE(MEGABYTE.mult * 1024L),
+        TERABYTE(GIGABYTE.mult * 1024L),
+    }
+}
diff --git a/src/main/kotlin/io/github/dockyardmc/utils/DebugSidebar.kt b/src/main/kotlin/io/github/dockyardmc/utils/DebugSidebar.kt
@@ -12,15 +12,14 @@ import java.lang.management.ManagementFactory
 object DebugSidebar {
 
     val sidebar = Sidebar {
-        setTitle("<#fc4903><bold>Debug Sidebar")
+        setTitle("<#ff641c>★ <bold>Debug Sidebar</bold> ★")
         setGlobalLine(15, "                                      ")
-        setGlobalLine(0, " ")
+        setGlobalLine(1, "    ")
     }
 
     init {
-        var tickCounter = 0
         Events.on<ServerTickEvent> {
-            val runtime = Runtime.getRuntime()
+            if(sidebar.viewers.size == 0) return@on // Do not update when noone is watching
             val globalMspt = DockyardServer.scheduler.mspt
 
             val msptColor = when {
@@ -70,14 +69,13 @@ object DebugSidebar {
             sidebar.setGlobalLine(11, " ")
             sidebar.setGlobalLine(10, " Memory: $memoryPercentColor${ServerMetrics.memoryUsagePercent.truncate(1)}%")
             sidebar.setGlobalLine(9, " ◾ Using $memoryPercentColor${ServerMetrics.memoryUsageTruncated}mb")
-            sidebar.setGlobalLine(8, " ◾ Rented <aqua>${ServerMetrics.memoryRentedTruncated}mb")
-            sidebar.setGlobalLine(7, " ◾ Allocated <aqua>${ServerMetrics.memoryAllocatedTruncated}mb")
+            sidebar.setGlobalLine(8, " ◾ Rented <#a3d7ff>${ServerMetrics.memoryRentedTruncated}mb")
+            sidebar.setGlobalLine(7, " ◾ Allocated <#a3d7ff>${ServerMetrics.memoryAllocatedTruncated}mb")
             sidebar.setGlobalLine(6, " ")
             sidebar.setGlobalLine(5, " Packets: <#cba3ff>↑${ServerMetrics.packetsSentAverage} ↓${ServerMetrics.packetsReceivedAverage}")
-            sidebar.setGlobalLine(4, " ")
-            sidebar.setGlobalLine(4, " Event Listeners: <lime>$totalEvents")
-            sidebar.setGlobalLine(2, " gc collections: <orange>${totalCollections}")
-            sidebar.setGlobalLine(1, " gc time: <orange>${totalCollectionTime}ms")
+            sidebar.setGlobalLine(4, " Bandwidth: <#d7ffa3>↑${ServerMetrics.outboundBandwidth.getSize(DataSizeCounter.Type.MEGABYTE)}mb ↓${ServerMetrics.inboundBandwidth.getSize(DataSizeCounter.Type.MEGABYTE)}mb")
+            sidebar.setGlobalLine(3, " ")
+            sidebar.setGlobalLine(2, " Event Listeners: <#fff9a3>$totalEvents")
         }
     }
 }
diff --git a/src/main/kotlin/io/github/dockyardmc/world/BiomeBuilder.kt b/src/main/kotlin/io/github/dockyardmc/world/BiomeBuilder.kt
@@ -1,4 +1,4 @@
-package io.github.dockyardmc.utils
+package io.github.dockyardmc.world
 
 import io.github.dockyardmc.extentions.fromRGBInt
 import io.github.dockyardmc.extentions.fromRGBIntOrNull
diff --git a/src/main/kotlin/io/github/dockyardmc/world/PlayerChunkViewSystem.kt b/src/main/kotlin/io/github/dockyardmc/world/PlayerChunkViewSystem.kt
@@ -5,7 +5,7 @@ import io.github.dockyardmc.events.PlayerEnterChunkEvent
 import io.github.dockyardmc.player.Player
 import io.github.dockyardmc.protocol.packets.play.clientbound.ClientboundSetCenterChunkPacket
 import io.github.dockyardmc.protocol.packets.play.clientbound.ClientboundUnloadChunkPacket
-import io.github.dockyardmc.utils.ChunkUtils
+import io.github.dockyardmc.world.chunk.ChunkUtils
 import io.github.dockyardmc.maths.chunkInSpiral
 import io.github.dockyardmc.utils.getPlayerEventContext
 import io.github.dockyardmc.world.chunk.Chunk
diff --git a/src/main/kotlin/io/github/dockyardmc/world/World.kt b/src/main/kotlin/io/github/dockyardmc/world/World.kt
@@ -34,6 +34,7 @@ import io.github.dockyardmc.world.block.BatchBlockUpdate
 import io.github.dockyardmc.world.block.Block
 import io.github.dockyardmc.world.chunk.Chunk
 import io.github.dockyardmc.world.chunk.ChunkPos
+import io.github.dockyardmc.world.chunk.ChunkUtils
 import io.github.dockyardmc.world.generators.VoidWorldGenerator
 import io.github.dockyardmc.world.generators.WorldGenerator
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap
diff --git a/src/main/kotlin/io/github/dockyardmc/world/chunk/Chunk.kt b/src/main/kotlin/io/github/dockyardmc/world/chunk/Chunk.kt
@@ -6,7 +6,6 @@ import io.github.dockyardmc.player.Player
 import io.github.dockyardmc.protocol.packets.play.clientbound.ClientboundChunkDataPacket
 import io.github.dockyardmc.protocol.packets.play.clientbound.ClientboundUnloadChunkPacket
 import io.github.dockyardmc.registry.registries.Biome
-import io.github.dockyardmc.utils.ChunkUtils
 import io.github.dockyardmc.utils.Viewable
 import io.github.dockyardmc.world.Light
 import io.github.dockyardmc.world.World
diff --git a/src/main/kotlin/io/github/dockyardmc/world/chunk/ChunkPos.kt b/src/main/kotlin/io/github/dockyardmc/world/chunk/ChunkPos.kt
@@ -1,7 +1,6 @@
 package io.github.dockyardmc.world.chunk
 
 import io.github.dockyardmc.location.Location
-import io.github.dockyardmc.utils.ChunkUtils
 
 data class ChunkPos(val x: Int, val z: Int) {
 
diff --git a/src/main/kotlin/io/github/dockyardmc/world/chunk/ChunkUtils.kt b/src/main/kotlin/io/github/dockyardmc/world/chunk/ChunkUtils.kt
@@ -1,8 +1,6 @@
-package io.github.dockyardmc.utils
+package io.github.dockyardmc.world.chunk
 
 import io.github.dockyardmc.maths.vectors.Vector3
-import io.github.dockyardmc.world.chunk.Chunk
-import io.github.dockyardmc.world.chunk.ChunkPos
 import kotlin.math.abs
 import kotlin.math.sin
 
diff --git a/src/test/kotlin/io/github/dockyard/tests/block/BlockTest.kt b/src/test/kotlin/io/github/dockyard/tests/block/BlockTest.kt
@@ -5,7 +5,7 @@ import io.github.dockyard.tests.TestServer
 import io.github.dockyardmc.world.block.Block
 import io.github.dockyardmc.registry.Blocks
 import io.github.dockyardmc.registry.registries.BlockRegistry
-import io.github.dockyardmc.utils.ChunkUtils
+import io.github.dockyardmc.world.chunk.ChunkUtils
 import io.github.dockyardmc.utils.CustomDataHolder
 import io.github.dockyardmc.world.WorldManager
 import org.junit.jupiter.api.Test
diff --git a/src/test/kotlin/io/github/dockyard/tests/utils/DataSizeCounterTest.kt b/src/test/kotlin/io/github/dockyard/tests/utils/DataSizeCounterTest.kt

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import io.github.dockyardmc.events.PlayerJoinEvent`
`7`	`7`	`import io.github.dockyardmc.player.Player`
`8`	`8`	`import io.github.dockyardmc.player.systems.GameMode`
`9`	`9`	`import io.github.dockyardmc.registry.registries.PotionEffectRegistry`
	`10`	`+import io.github.dockyardmc.utils.DebugSidebar`
`10`	`11`
`11`	`12`	`fun suggestPotionEffects(player: Player): List<String> {`
`12`	`13`	`return PotionEffectRegistry.potionEffects.keys.toList()`
`@@ -25,6 +26,7 @@ fun main() {`
`25`	`26`	`player.permissions.add("dockyard.admin")`
`26`	`27`	`player.permissions.add("dockyard.*")`
`27`	`28`	`player.gameMode.value = GameMode.CREATIVE`
	`29`	`+ DebugSidebar.sidebar.viewers.add(player)`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`Commands.add("/interaction") {`
`@@ -34,15 +36,15 @@ fun main() {`
`34`	`36`	`interaction.width.value = 3f`
`35`	`37`	`interaction.height.value = 3f`
`36`	`38`
`37`		`- interaction.rightClickDispatcher.register { p ->`
	`39`	`+ interaction.rightClickDispatcher.subscribe { p ->`
`38`	`40`	`p.sendMessage("<yellow>Right Click")`
`39`	`41`	`}`
`40`	`42`
`41`		`- interaction.leftClickDispatcher.register { p ->`
	`43`	`+ interaction.leftClickDispatcher.subscribe { p ->`
`42`	`44`	`p.sendMessage("<yellow>Left Click")`
`43`	`45`	`}`
`44`	`46`
`45`		`- interaction.middleClickDispatcher.register { p ->`
	`47`	`+ interaction.middleClickDispatcher.subscribe { p ->`
`46`	`48`	`p.sendMessage("<yellow>Middle Click")`
`47`	`49`	`}`
`48`	`50`	`}`