refactor(World): replace identifier with name for world references

Author: vadim-soude

engine/engine-core/src/main/kotlin/com/typewritermc/core/utils/point/World.kt

@@ -1,7 +1,7 @@
 package com.typewritermc.core.utils.point
 
 data class World(
-    val identifier: String,
+    val name: String,
 ) {
     companion object {
         val Empty = World("")

engine/engine-paper/src/main/kotlin/com/typewritermc/engine/paper/entry/entity/PositionProperty.kt

@@ -14,7 +14,7 @@ data class PositionProperty(
     override val pitch: Float,
 ) : EntityProperty, Point<PositionProperty>, Rotatable<PositionProperty>, WorldHolder<PositionProperty> {
     fun distanceSqrt(other: org.bukkit.Location): Double? {
-        if (world.identifier != other.world.uid.toString()) return null
+        if (world.name != other.world.name) return null
         return distanceSqrt(other.toPosition())
     }
 
@@ -70,7 +70,7 @@ data class PositionProperty(
 }
 
 fun org.bukkit.Location.toProperty(): PositionProperty {
-    return PositionProperty(World(world.uid.toString()), x, y, z, yaw, pitch)
+    return PositionProperty(World(world.name), x, y, z, yaw, pitch)
 }
 
 fun Position.toProperty(): PositionProperty {

engine/engine-paper/src/main/kotlin/com/typewritermc/engine/paper/loader/serializers/WorldSerializer.kt

@@ -9,32 +9,25 @@ import com.typewritermc.core.utils.point.World
 import com.typewritermc.engine.paper.utils.logErrorIfNull
 import com.typewritermc.engine.paper.utils.server
 import java.lang.reflect.Type
-import java.util.*
 
 class WorldSerializer : DataSerializer<World> {
     override val type: Type = World::class.java
 
     override fun serialize(src: World, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
-        return JsonPrimitive(src.identifier)
+        return JsonPrimitive(src.name)
     }
 
     override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): World {
         val world = json.asString
 
-        val uuid = try {
-            UUID.fromString(world)
-        } catch (e: IllegalArgumentException) {
-            null
-        }
-
         val bukkitWorld =
-            uuid?.let { server.getWorld(it) }
+            world?.let { server.getWorld(it) }
                 ?: server.getWorld(world)
                 ?: server.worlds.firstOrNull { it.name.equals(world, true) }
                     .logErrorIfNull("No world found for identifier '$world', possible worlds: ${server.worlds.map { it.name }}. Picking ${server.worlds.firstOrNull()?.name} as default.")
                 ?: server.worlds.firstOrNull()
                 ?: throw IllegalArgumentException("Could not find world '$world' for location, and no default world available.")
 
-        return World(bukkitWorld.uid.toString())
+        return World(bukkitWorld.name)
     }
 }

engine/engine-paper/src/main/kotlin/com/typewritermc/engine/paper/utils/Point.kt

@@ -14,7 +14,6 @@ import com.typewritermc.engine.paper.extensions.packetevents.sendPacketTo
 import io.github.retrooper.packetevents.util.SpigotConversionUtil
 import org.bukkit.Color
 import org.bukkit.entity.Player
-import java.util.*
 import kotlin.math.cos
 import kotlin.math.sin
 import kotlin.math.sqrt
@@ -28,10 +27,10 @@ fun Point<*>.toPacketVector3d() = Vector3d(x, y, z)
 fun Point<*>.toPacketVector3i() = Vector3i(blockX, blockY, blockZ)
 fun Point<*>.toBukkitVector(): org.bukkit.util.Vector = org.bukkit.util.Vector(x, y, z)
 
-fun World.toBukkitWorld(): org.bukkit.World = server.getWorld(UUID.fromString(identifier))
-    ?: throw IllegalArgumentException("Could not find world '$identifier' for location, and no default world available.")
+fun World.toBukkitWorld(): org.bukkit.World = server.getWorld(name)
+    ?: throw IllegalArgumentException("Could not find world '$name' for location, and no default world available.")
 
-fun org.bukkit.World.toWorld(): World = World(uid.toString())
+fun org.bukkit.World.toWorld(): World = World(name)
 
 fun <RWP> RWP.toBukkitLocation(): org.bukkit.Location where RWP : Point<RWP>, RWP : Rotatable<RWP>, RWP : WorldHolder<RWP> {
     return org.bukkit.Location(world.toBukkitWorld(), x, y, z, yaw, pitch)
@@ -49,7 +48,7 @@ fun <RP> RP.toPacketLocation(): Location where RP : Point<RP>, RP : Rotatable<RP
     return Location(x, y, z, yaw, pitch)
 }
 
-fun org.bukkit.Location.toPosition(): Position = Position(World(world.uid.toString()), x, y, z, yaw, pitch)
+fun org.bukkit.Location.toPosition(): Position = Position(World(world.name), x, y, z, yaw, pitch)
 fun org.bukkit.Location.toPacketLocation(): Location = SpigotConversionUtil.fromBukkitLocation(this)
 fun org.bukkit.Location.toCoordinate(): Coordinate = Coordinate(x, y, z, yaw, pitch)
 

extensions/BasicExtension/src/main/kotlin/com/typewritermc/basic/entries/cinematic/CameraCinematicEntry.kt

@@ -396,8 +396,8 @@ private class DisplayCameraAction(
     }
 
     override suspend fun switchSegment(newSegment: CameraSegment) {
-        val oldWorld = path.first().position.world.identifier
-        val newWorld = newSegment.path.first().location.get(player).world.identifier
+        val oldWorld = path.first().position.world.name
+        val newWorld = newSegment.path.first().location.get(player).world.name
 
         setupPath(newSegment)
         if (oldWorld == newWorld) {

extensions/EntityExtension/src/main/kotlin/com/typewritermc/entity/entries/activity/LookCloseActivity.kt

@@ -133,7 +133,7 @@ class LookCloseActivity(
         val shouldRefresh: Boolean
             get() {
                 if (!player.isValid) return true
-                if (player.location.world.uid.toString() != this@Target.position.world.identifier) return true
+                if (player.location.world.name != this@Target.position.world.name) return true
                 if (this@Target.position.distanceSquared(player.location.toProperty()) > playerLookCloseRange * playerLookCloseRange) return true
                 return System.currentTimeMillis() - lookupTime > 1000
             }

extensions/RoadNetworkExtension/src/main/kotlin/com/typewritermc/roadnetwork/pathfinding/PFInstanceSpace.kt

@@ -22,7 +22,6 @@ import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
 import org.bukkit.event.block.*
 import org.koin.java.KoinJavaComponent
-import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 
 class PFInstanceSpace(val world: com.typewritermc.core.utils.point.World) : IInstanceSpace {
@@ -82,15 +81,15 @@ class PFInstanceSpace(val world: com.typewritermc.core.utils.point.World) : IIns
 
 @Singleton
 class InstanceSpaceCache : Initializable, Listener {
-    private val cache = ConcurrentHashMap<UUID, PFInstanceSpace>()
+    private val cache = ConcurrentHashMap<String, PFInstanceSpace>()
     private var job: Job? = null
 
     fun instanceSpace(world: World): PFInstanceSpace {
-        return cache.computeIfAbsent(world.uid) { PFInstanceSpace(world.toWorld()) }
+        return cache.computeIfAbsent(world.name) { PFInstanceSpace(world.toWorld()) }
     }
 
     fun instanceSpace(world: com.typewritermc.core.utils.point.World): PFInstanceSpace {
-        return cache.computeIfAbsent(UUID.fromString(world.identifier)) { PFInstanceSpace(world) }
+        return cache.computeIfAbsent(world.name) { PFInstanceSpace(world) }
     }
 
     override suspend fun initialize() {
@@ -133,7 +132,7 @@ class InstanceSpaceCache : Initializable, Listener {
 
     private fun onBlockEvent(event: BlockEvent) {
         val block = event.block
-        cache[block.world.uid]?.evict(block.x shr 4, block.z shr 4)
+        cache[block.world.name]?.evict(block.x shr 4, block.z shr 4)
     }
 
     override suspend fun shutdown() {

version.txt

@@ -1 +1 @@
-0.9.0
+0.9.0-beta-170