Add prefab component first

MineInAbyss · May 4, 2022 · e76dff8 · e76dff8
1 parent d2dac43
commit e76dff8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/geary-prefabs/src/main/kotlin/com/mineinabyss/geary/prefabs/PrefabManager.kt b/geary-prefabs/src/main/kotlin/com/mineinabyss/geary/prefabs/PrefabManager.kt
@@ -58,11 +58,11 @@ class PrefabManager : GearyContext by GearyContextKoin() {
             val decoded = formats[ext]?.decodeFromFile(serializer, file.toOkioPath())
                 ?: error("Unknown file format $ext")
             val entity = writeTo ?: entity()
+            entity.set(Prefab(file))
+            entity.setRelation(Prefab::class, NoInherit)
             entity.setAll(decoded)
 
             val key = PrefabKey.of(namespace, name)
-            entity.set(Prefab(file))
-            entity.setRelation(Prefab::class, NoInherit)
             registerPrefab(key, entity)
             entity
         }.onFailure {

diff --git a/...src/main/kotlin/com/mineinabyss/geary/prefabs/configuration/systems/ParseChildOnPrefab.kt b/...src/main/kotlin/com/mineinabyss/geary/prefabs/configuration/systems/ParseChildOnPrefab.kt
@@ -34,9 +34,9 @@ class ParseChildrenOnPrefab : GearyListener() {
     private fun TargetScope.convertToRelation() {
         children.nameToComponents.forEach { (name, components) ->
             entity {
-                addParent(entity)
                 set(EntityName(name))
                 set(Prefab())
+                addParent(entity)
                 setRelation(Prefab::class, NoInherit)
                 setAll(components)
             }

diff --git a/platforms/papermc/core/src/main/kotlin/com/mineinabyss/geary/papermc/helpers/Helpers.kt b/platforms/papermc/core/src/main/kotlin/com/mineinabyss/geary/papermc/helpers/Helpers.kt
@@ -17,18 +17,17 @@ internal fun KoinComponent.debug(message: Any?) {
     if (get<GearyConfig>().debug) broadcast(message)
 }
 
-public fun Location.spawnFromPrefab(prefab: PrefabKey): Entity? {
+fun Location.spawnFromPrefab(prefab: PrefabKey): Entity? {
     val entity = globalContextMC.prefabManager[prefab] ?: return null
     return spawnFromPrefab(entity)
 }
 
-public fun Location.spawnFromPrefab(prefab: GearyEntity): Entity? {
+fun Location.spawnFromPrefab(prefab: GearyEntity): Entity? {
     val attemptSpawn = GearyAttemptMinecraftSpawnEvent(this, prefab)
     attemptSpawn.call()
-    val bukkitEntity = attemptSpawn.bukkitEntity ?: return null
 
-    return bukkitEntity
+    return attemptSpawn.bukkitEntity
 }
 
-public fun NamespacedKey.toPrefabKey(): PrefabKey = PrefabKey.of(namespace, key)
-public fun PrefabKey.toNamespacedKey(): NamespacedKey = NamespacedKey(namespace, key)
+fun NamespacedKey.toPrefabKey(): PrefabKey = PrefabKey.of(namespace, key)
+fun PrefabKey.toNamespacedKey(): NamespacedKey = NamespacedKey(namespace, key)