From 8214038084dd6597a6e3fb1c203d77a8a7c429e1 Mon Sep 17 00:00:00 2001
From: Byte Dice <bytedice.official@gmail.com>
Date: Fri, 15 Nov 2024 15:58:27 +0100
Subject: [PATCH] fixed particle not spawning as correct block type

---
 .../kotlin/com/bytedice/bde_particles/Bde_particles.kt     | 6 ++----
 .../kotlin/com/bytedice/bde_particles/DisplayEntity.kt     | 2 +-
 .../kotlin/com/bytedice/bde_particles/particle/Particle.kt | 7 ++++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/kotlin/com/bytedice/bde_particles/Bde_particles.kt b/src/main/kotlin/com/bytedice/bde_particles/Bde_particles.kt
index 774fc2a..3276ce8 100644
--- a/src/main/kotlin/com/bytedice/bde_particles/Bde_particles.kt
+++ b/src/main/kotlin/com/bytedice/bde_particles/Bde_particles.kt
@@ -48,10 +48,8 @@ class Bde_particles : ModInitializer {
       onRightClick(player, world as ServerWorld, hand)
     })
 
-    ServerLifecycleEvents.SERVER_STARTED.register(ServerLifecycleEvents.ServerStarted { server: MinecraftServer ->
-
-      server.playerManager.broadcast(Text.of("BDAT - Loaded"), false)
-      print("BDAT - Loaded")
+    ServerLifecycleEvents.SERVER_STARTED.register(ServerLifecycleEvents.ServerStarted { _ ->
+      println("BDE_ParticleSys - Progress bar filled :3")
     })
   }
 }
diff --git a/src/main/kotlin/com/bytedice/bde_particles/DisplayEntity.kt b/src/main/kotlin/com/bytedice/bde_particles/DisplayEntity.kt
index 5f24eda..15b5c63 100644
--- a/src/main/kotlin/com/bytedice/bde_particles/DisplayEntity.kt
+++ b/src/main/kotlin/com/bytedice/bde_particles/DisplayEntity.kt
@@ -24,7 +24,7 @@ class DisplayEntity(val properties: DisplayEntityProperties?) {
     val e = BlockDisplayEntity(EntityType.BLOCK_DISPLAY, world)
 
     val nbt = NbtCompound().apply {
-      putString("Name", properties.blockType)
+      put("block_state", NbtCompound().apply { putString("Name", properties.blockType) })
       put("transformation", NbtCompound().apply {
         val offsetList = NbtList().apply {
           add(NbtFloat.of(properties.translation.x))
diff --git a/src/main/kotlin/com/bytedice/bde_particles/particle/Particle.kt b/src/main/kotlin/com/bytedice/bde_particles/particle/Particle.kt
index 964bcfb..15de892 100644
--- a/src/main/kotlin/com/bytedice/bde_particles/particle/Particle.kt
+++ b/src/main/kotlin/com/bytedice/bde_particles/particle/Particle.kt
@@ -28,6 +28,8 @@ class Particle(particleParams: ParticleParams) {
   var blockDisplay: DisplayEntity? = null
   val params = particleParams
 
+  var isInit = false
+
   fun init(pos: Vec3d) {
     val properties = DisplayEntityProperties(
       pos          = pos,
@@ -37,11 +39,14 @@ class Particle(particleParams: ParticleParams) {
     )
     
     blockDisplay = DisplayEntity(properties)
+
+    isInit = true
   }
 
 
   fun spawn(world: ServerWorld) {
-    blockDisplay?.spawn(world)
+    if (isInit) { blockDisplay?.spawn(world) }
+    else { error("Particle is not initialized before being spawned. Please use Particle.init() to initialize it") }
   }