Merge pull request #198 from DockyardMC/misc/optimizations

miscellaneous optimizations (optimizing at 3am is addicting)

Author: LukynkaCZE

.idea/inspectionProfiles/Project_Default.xml

@@ -40,6 +40,7 @@ dependencies {
     implementation("com.akuleshov7:ktoml-core:0.5.1")
     implementation("com.akuleshov7:ktoml-file:0.5.1")
     implementation("net.bytebuddy:byte-buddy-agent:1.14.12")
+    implementation("org.jctools:jctools-core:4.0.5")
 
     api("io.github.dockyardmc:bytesocks-client-java:1.0-SNAPSHOT") {
         exclude(module = "slf4j-api")

build.gradle.kts

@@ -97,7 +97,7 @@ class DockyardServer(configBuilder: Config.() -> Unit) {
                 if (ConfigManager.config.implementationConfig.applyBlockPlacementRules) DefaultBlockHandlers().register()
             }
 
-            NetworkCompression.compressionThreshold = ConfigManager.config.networkCompressionThreshold
+            NetworkCompression.COMPRESSION_THRESHOLD = ConfigManager.config.networkCompressionThreshold
             WorldManager.loadDefaultWorld()
 
             Events.dispatch(ServerFinishLoadEvent(this))

src/main/kotlin/io/github/dockyardmc/DockyardServer.kt

@@ -63,8 +63,8 @@ class Hologram(spawnLocation: Location, builder: HologramBuilder) : Entity(spawn
     }
 
     fun addStaticLine(line: StaticContentLine) {
-        val lineIndex = lines.size
         lines.add(line)
+        if (viewers.isEmpty()) return
         viewers.forEach(::updateFull)
     }
 
@@ -73,8 +73,8 @@ class Hologram(spawnLocation: Location, builder: HologramBuilder) : Entity(spawn
     }
 
     fun addPlayerLine(line: PlayerContentLine) {
-        val lineIndex = lines.size
         lines.add(line)
+        if (viewers.isEmpty()) return
         viewers.forEach(::updateFull)
     }
 

src/main/kotlin/io/github/dockyardmc/apis/Hologram.kt

@@ -80,12 +80,14 @@ class Sidebar(initialTitle: String, initialLines: Map<Int, SidebarLine>) : Viewa
     }
 
     fun setGlobalLine(index: Int, value: String) {
+        if (viewers.isEmpty()) return
         val before = indexToLineMap[index] as SidebarLine.Static?
         indexToLineMap[index] = SidebarLine.Static(value)
         if (before?.value != value) viewers.forEach { viewer -> sendLinePacket(viewer, index) }
     }
 
     fun setPlayerLine(index: Int, value: (Player) -> String) {
+        if (viewers.isEmpty()) return
         indexToLineMap[index] = SidebarLine.Player(value)
         viewers.forEach { viewer -> sendLinePacket(viewer, index) }
     }
@@ -116,6 +118,7 @@ class Sidebar(initialTitle: String, initialLines: Map<Int, SidebarLine>) : Viewa
 
     init {
         title.valueChanged { event ->
+            if (viewers.isEmpty()) return@valueChanged
             val packet = ClientboundScoreboardObjectivePacket(objective, ScoreboardMode.EDIT_TEXT, event.newValue, ScoreboardType.INTEGER)
             viewers.sendPacket(packet)
         }

src/main/kotlin/io/github/dockyardmc/apis/sidebar/Sidebar.kt

@@ -4,12 +4,11 @@ import io.github.dockyardmc.data.components.*
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap
-import java.util.concurrent.atomic.AtomicInteger
 import kotlin.reflect.KClass
 
 object DataComponentRegistry {
 
-    val protocolIdCounter = AtomicInteger()
+    var protocolIdCounter = 0
     val dataComponentsById = Int2ObjectOpenHashMap<KClass<out DataComponent>>()
     val dataComponentsByIdentifier = Object2ObjectOpenHashMap<String, KClass<out DataComponent>>()
 
@@ -113,13 +112,14 @@ object DataComponentRegistry {
     val SHULKER_COLOR = register("minecraft:shulker/color", ShulkerColorComponent::class)
 
     fun register(identifier: String, kclass: KClass<out DataComponent>): KClass<out DataComponent> {
-        val protocolId = protocolIdCounter.getAndIncrement()
+        val protocolId = protocolIdCounter
         dataComponentsById[protocolId] = kclass
         dataComponentsByIdReversed[kclass] = protocolId
 
         dataComponentsByIdentifier[identifier] = kclass
         dataComponentsByIdentifierReversed[kclass] = identifier
 
+        protocolIdCounter++
         return kclass
     }
 }

src/main/kotlin/io/github/dockyardmc/bindables/BindablePairMap.kt

@@ -33,7 +33,7 @@ class PotionContentsComponent(
     override fun write(buffer: ByteBuf) {
         buffer.writeOptional(potion?.getProtocolId(), ByteBuf::writeVarInt)
         buffer.writeOptional(customColor, CustomColor::writePackedInt)
-        buffer.writeList(effects, ByteBuf::writeAppliedPotionEffect)
+        buffer.writeList(effects, AppliedPotionEffect::write)
         buffer.writeOptional(customName, ByteBuf::writeString)
     }
 
@@ -42,7 +42,7 @@ class PotionContentsComponent(
             return PotionContentsComponent(
                 buffer.readOptional(ByteBuf::readVarInt)?.let { PotionTypeRegistry.getByProtocolId(it) },
                 buffer.readOptional(ByteBuf::readInt)?.let { CustomColor.fromRGBInt(it) },
-                buffer.readAppliedPotionEffectsList(),
+                buffer.readList(AppliedPotionEffect::read),
                 buffer.readOptional(ByteBuf::readString)
             )
         }

src/main/kotlin/io/github/dockyardmc/data/DataComponentHasher.kt

@@ -17,13 +17,27 @@ interface Event {
         other: Set<Any> = setOf<Any>(),
         val isGlobalEvent: Boolean = false
     ) {
-        // what the fuck
-        val players = players + entities.filterIsInstance<Player>()
-        var entities = entities + players
-        val locations = locations + this.entities.map { it.location }
-        val worlds = worlds + this.locations.map { it.world }
+        // combining sets is expensive and is done in initialization of every event.
+        // In most cases, either none or only one is accessed. Let's make them lazy so they are
+        // computed only when needed
+        val players: Set<Player> by lazy {
+            players + entities.filterIsInstance<Player>()
+        }
 
-        val other: Set<Any> = this.players + this.entities + this.worlds + this.locations + other
+        val entities: Set<Entity> by lazy {
+            entities + players
+        }
+
+        val locations: Set<Location> by lazy {
+            locations + this.entities.map { entity -> entity.location }
+        }
+        val worlds: Set<World> by lazy {
+            worlds + this.locations.map { location -> location.world }
+        }
+
+        val other: Set<Any> by lazy {
+            this.players + this.entities + this.worlds + this.locations + other
+        }
 
         operator fun contains(element: Any) = other.contains(element)