remove something extra from clientstate

src/ReplicatedStorage/ecs/components/types.d.ts

@@ -51,7 +51,8 @@ export interface Damage {
 export interface PlayerCharacter {
 	character: CharacterRigR6,
 	humanoid: Humanoid,
-	player: Player
+	player: Player,
+	equippedTool?: Tool
 }
 
 /**

src/ReplicatedStorage/ecs/state.ts

@@ -14,6 +14,7 @@ export class ClientState {
 		debugEnabled: boolean,
 		isRunning: boolean,
 		backpack: Backpack,
+		// equippedTool: Tool,
 		// lastProcessedCommand: Inputkind,
 
 		logger: Logger
@@ -23,6 +24,7 @@ export class ClientState {
 		this.debugEnabled = debugEnabled
 		this.isRunning = isRunning
 		this.backpack = backpack
+		// this.equippedTool = equippedTool
 		// this.lastProcessedCommand = lastProcessedCommand
 	
 		this.logger = logger
@@ -33,6 +35,7 @@ export class ClientState {
 	debugEnabled: boolean
 	isRunning: boolean
 	backpack: Backpack
+
 	lastProcessedCommand?: InputKind
 
 	logger: Logger

src/ReplicatedStorage/ecs/systems/client/toolHandler.ts

@@ -0,0 +1,22 @@
+import { World, useEvent } from "@rbxts/matter"
+import { PlayerCharacter } from "ReplicatedStorage/ecs/components"
+import { getEvent } from "ReplicatedStorage/remotes"
+
+function toolHandler(world: World): void {
+    const activateToolEvent = getEvent("activateToolEvent")
+    const equipToolEvent = getEvent("equipToolEvent")
+    
+    for (const [_, character] of world.query(PlayerCharacter)) {
+		if (!character.equippedTool) continue
+
+        for (const [_] of useEvent(character.equippedTool, "Activated")) {
+            activateToolEvent.FireServer()
+        }
+
+        for (const [_, mouse] of useEvent(character.equippedTool, "Equipped")) {
+            equipToolEvent.FireServer(mouse)
+        }
+	}
+}
+
+export = toolHandler

src/ServerScriptService/ecs/systems/server/playerCharacterToolIsTool.ts

@@ -0,0 +1,37 @@
+import { None, useEvent, World } from "@rbxts/matter"
+import { PlayerCharacter } from "ReplicatedStorage/ecs/components"
+
+/**
+ * Equipped tool is replicated into the ECS.
+ */
+function playerCharacterToolIsTool(world: World): void {
+	for (const [id, character] of world.query(PlayerCharacter)) {
+        for (const [_, toolInstance] of useEvent(character.character, "ChildAdded")) {
+            if (!classIs(toolInstance, "Tool")) continue
+
+            world.insert(
+                id,
+                character.patch({
+                    equippedTool: toolInstance
+                })
+            )
+        }
+
+        for (const [_, toolInstance] of useEvent(character.character, "ChildRemoved")) {
+            // classIs more like classWas
+            if (!classIs(toolInstance, "Tool")) continue
+
+            // could also be swapping tools
+            const swappedTool = character.character.FindFirstChildOfClass("Tool")
+
+            world.insert(
+                id,
+                character.patch({
+                    equippedTool: swappedTool ? swappedTool : None
+                })
+            )
+        }
+	}
+}
+
+export = playerCharacterToolIsTool

src/ServerScriptService/ecs/systems/server/replication.ts

@@ -9,7 +9,8 @@ type ComponentConstructor = (typeof Components)[ComponentName]
 
 const REPLICATED_COMPONENT_NAMES: readonly ComponentName[] = [
 	"Model",
-	"Transform"
+	"Transform",
+	"PlayerCharacter"
 ]
 
 const replicatedComponents: ReadonlySet<ComponentConstructor> = REPLICATED_COMPONENT_NAMES.reduce(

src/ServerScriptService/ecs/systems/server/toolHandler.ts

@@ -0,0 +1,23 @@
+import { World, useEvent } from "@rbxts/matter"
+import { PlayerCharacter } from "ReplicatedStorage/ecs/components"
+import { ServerState } from "ReplicatedStorage/ecs/state"
+import { getEvent } from "ReplicatedStorage/remotes"
+
+function toolHandler(world: World, state: ServerState): void {
+    const activateToolEvent = getEvent("activateToolEvent")
+    const equipToolEvent = getEvent("equipToolEvent")
+
+    for (const [_, character] of world.query(PlayerCharacter)) {
+        for (const [_, player] of useEvent(activateToolEvent, "OnServerEvent")) {
+            state.logger.Info("{@player} activated the tool {@tool}", player, character.equippedTool)
+            if (character.player !== player) continue
+        }
+
+        for (const [_, player] of useEvent(equipToolEvent, "OnServerEvent")) {
+            state.logger.Info("{@player} equipped the tool {@tool}", player, character.equippedTool)
+            if (character.player !== player) continue
+        }
+    }
+}
+
+export = toolHandler