Merge pull request #10 from Code-Fixxers/fix/network-example-cleanup-101370867382778011

Fix example network client disconnect cleanup & CN_NetworkIdentity typo

Author: Donach

PR_DESCRIPTION.md

@@ -75,8 +75,8 @@ func _init() -> void:
 
 ### Components
 - `C_NetworkIdentity` - Authority and ownership tracking
-- `C_SyncEntity` - Enables continuous synchronization
-- `C_LocalAuthority` - Marker for locally controlled entities
+- `CN_SyncEntity` - Enables continuous synchronization
+- `CN_LocalAuthority` - Marker for locally controlled entities
 - `C_RemoteEntity` - Marker for remotely controlled entities
 - `C_ServerOwned` - Marker for server-owned entities
 

example_network/README.md

@@ -5,30 +5,30 @@ A minimal multiplayer example demonstrating the GECS Network addon's two synchro
 ## Features Demonstrated
 
 ### 1. Continuous Sync (Players)
-Players use `C_SyncEntity` which enables Godot's native `MultiplayerSynchronizer` for real-time position updates.
+Players use `CN_SyncEntity` which enables Godot's native `MultiplayerSynchronizer` for real-time position updates.
 
 ```gdscript
 # e_player.gd
 func define_components() -> Array:
 	return [
 		C_NetVelocity.new(),
 		C_PlayerInput.new(),
-		C_SyncEntity.new(true, true, false),  # sync position + rotation
+		CN_SyncEntity.new(true, true, false),  # sync position + rotation
 	]
 ```
 
 ### 2. Spawn-Only Sync (Projectiles)
-Projectiles do NOT have `C_SyncEntity`. The server spawns them and broadcasts component values once - then all clients simulate locally.
+Projectiles do NOT have `CN_SyncEntity`. The server spawns them and broadcasts component values once - then all clients simulate locally.
 
 ```gdscript
 # e_projectile.gd
 func define_components() -> Array:
 	return [
-		C_NetworkIdentity.new(0),  # Server-owned
+		CN_NetworkIdentity.new(0),  # Server-owned
 		C_Projectile.new(),
 		C_NetVelocity.new(),
 		C_NetPosition.new(),       # Position synced at spawn
-		# NO C_SyncEntity - spawn-only pattern
+		# NO CN_SyncEntity - spawn-only pattern
 	]
 ```
 
@@ -89,9 +89,9 @@ projectile.get_component(C_Projectile).projectile_color = color
 
 ### Local-Only Movement (Continuous Sync)
 ```gdscript
-# s_movement.gd - Query with C_LocalAuthority
+# s_movement.gd - Query with CN_LocalAuthority
 func query() -> QueryBuilder:
-	return q.with_all([C_NetVelocity, C_PlayerInput, C_LocalAuthority])...
+	return q.with_all([C_NetVelocity, C_PlayerInput, CN_LocalAuthority])...
 ```
 
 ### Middleware Visual Setup

example_network/config/example_sync_config.gd

@@ -13,6 +13,6 @@ func _init() -> void:
 	# Not using a separate transform component
 	transform_component = ""
 
-	# CRITICAL: Trigger native sync (MultiplayerSynchronizer) setup when C_NetworkIdentity is added
+	# CRITICAL: Trigger native sync (MultiplayerSynchronizer) setup when CN_NetworkIdentity is added
 	# This enables continuous position sync for players via Godot's native replication
-	model_ready_component = "C_NetworkIdentity"
+	model_ready_component = "CN_NetworkIdentity"

example_network/entities/e_player.gd

@@ -1,7 +1,7 @@
 class_name E_NetworkPlayer
 extends Entity
 ## Player entity for the network example.
-## Demonstrates continuous sync via C_SyncEntity.
+## Demonstrates continuous sync via CN_SyncEntity.
 
 ## Peer ID that owns this player (set by main.gd when spawning)
 @export var owner_peer_id: int = 0
@@ -17,14 +17,14 @@ func _enter_tree() -> void:
 
 func on_ready() -> void:
 	# Add network identity based on owner_peer_id
-	add_component(C_NetworkIdentity.new(owner_peer_id))
+	add_component(CN_NetworkIdentity.new(owner_peer_id))
 
 
 func define_components() -> Array:
 	return [
 		C_NetVelocity.new(),
 		C_PlayerInput.new(),
 		C_PlayerNumber.new(),  # Join order number (1-4) for color assignment
-		# C_SyncEntity enables native MultiplayerSynchronizer for position/rotation
-		C_SyncEntity.new(true, true, false),  # sync_position=true, sync_rotation=true
+		# CN_SyncEntity enables native MultiplayerSynchronizer for position/rotation
+		CN_SyncEntity.new(true, true, false),  # sync_position=true, sync_rotation=true
 	]

example_network/entities/e_projectile.gd

@@ -1,18 +1,18 @@
 class_name E_NetworkProjectile
 extends Entity
 ## Projectile entity for the network example.
-## Demonstrates spawn-only sync - NO C_SyncEntity means server broadcasts
+## Demonstrates spawn-only sync - NO CN_SyncEntity means server broadcasts
 ## spawn data once, then all clients simulate locally.
 
 
 func define_components() -> Array:
 	return [
 		# Server-owned (peer_id = 0)
-		C_NetworkIdentity.new(0),
+		CN_NetworkIdentity.new(0),
 		C_Projectile.new(),
 		C_NetVelocity.new(),
 		C_NetPosition.new(),  # Position synced at spawn
-		# NOTE: No C_SyncEntity! This enables spawn-only sync pattern.
+		# NOTE: No CN_SyncEntity! This enables spawn-only sync pattern.
 		# Server spawns and broadcasts component values at spawn time.
 		# Clients receive spawn RPC and simulate locally from there.
 	]

example_network/main.gd

@@ -177,13 +177,6 @@ func _setup_network_sync() -> void:
 func _cleanup_network() -> void:
 	_is_connected = false
 
-	# Clear spawned players
-	for peer_id in _spawned_peer_ids.keys():
-		var entity_id = _spawned_peer_ids[peer_id]
-		var entity = world.get_entity_by_id(entity_id)
-		if entity:
-			world.remove_entity(entity)
-			entity.queue_free()
 	_spawned_peer_ids.clear()
 
 	# Reset player number counter
@@ -198,6 +191,12 @@ func _cleanup_network() -> void:
 	_network_sync = null
 	_network_middleware = null
 
+	# Properly clean up all entities from the world
+	for entity in world.entities.duplicate():
+		world.remove_entity(entity)
+		if is_instance_valid(entity):
+			entity.queue_free()
+
 
 func _on_local_player_spawned(entity: Entity) -> void:
 	print("[Main] Local player spawned: %s" % entity.name)

example_network/systems/s_input.gd

@@ -1,12 +1,12 @@
 class_name S_NetworkInput
 extends System
 ## Input system - reads keyboard input, updates C_PlayerInput.
-## Only processes local player (entities with C_LocalAuthority).
+## Only processes local player (entities with CN_LocalAuthority).
 
 
 func query() -> QueryBuilder:
 	# Only process entities we have local control over
-	return q.with_all([C_PlayerInput, C_LocalAuthority]).iterate([C_PlayerInput])
+	return q.with_all([C_PlayerInput, CN_LocalAuthority]).iterate([C_PlayerInput])
 
 
 func process(entities: Array[Entity], components: Array, delta: float) -> void:

example_network/systems/s_movement.gd

@@ -1,7 +1,7 @@
 class_name S_NetworkMovement
 extends System
 ## Movement system - applies velocity to entity position.
-## Processes entities with C_LocalAuthority (local simulation).
+## Processes entities with CN_LocalAuthority (local simulation).
 ## Remote entities receive position updates via native MultiplayerSynchronizer.
 
 const MOVE_SPEED := 5.0
@@ -10,7 +10,7 @@ const ARENA_BOUND := 4.5  # Half of 10x10 arena minus player size
 
 func query() -> QueryBuilder:
 	# Only move local entities - remote positions come from network sync
-	return q.with_all([C_NetVelocity, C_PlayerInput, C_LocalAuthority]).iterate([C_NetVelocity, C_PlayerInput])
+	return q.with_all([C_NetVelocity, C_PlayerInput, CN_LocalAuthority]).iterate([C_NetVelocity, C_PlayerInput])
 
 
 func process(entities: Array[Entity], components: Array, delta: float) -> void:

project.godot

@@ -14,7 +14,7 @@ config/name="GECS"
 config/description="Godot Entity Component System - Example project and testing suite"
 config/version="5.0.0"
 run/main_scene="uid://x5ubiio43y7w"
-config/features=PackedStringArray("4.6", "Forward Plus")
+config/features=PackedStringArray("4.5", "Forward Plus")
 
 [audio]