🐛 Fix entity counter accuracy

Author: SnaveSutit

src/dialogs/entityCount/entityCount.svelte

@@ -1,34 +1,17 @@
 <script lang="ts">
-	import { Interaction } from '../../outliner/interaction'
-	import { TextDisplay } from '../../outliner/textDisplay'
-	import { VanillaBlockDisplay } from '../../outliner/vanillaBlockDisplay'
-	import { VanillaItemDisplay } from '../../outliner/vanillaItemDisplay'
+	import { getEntityCounts } from '../../mods/entityCounter'
 	import { createScopedTranslator } from '../../util/lang'
 
 	const localize = createScopedTranslator('dialog.entity_count_dialog')
 
-	let groupEntities = $state(0)
-	let displayEntities = $state(0)
-	let locatorEntities = $state(0)
-	let cameraEntities = $state(0)
-	let interactionEntities = $state(0)
-	let totalEntities = $derived(
-		1 + groupEntities + displayEntities + locatorEntities + cameraEntities + interactionEntities
-	)
-
-	for (const group of Group.all) {
-		groupEntities += Number(group.children.some(child => child instanceof Cube))
-	}
-
-	displayEntities =
-		TextDisplay.all.length + VanillaBlockDisplay.all.length + VanillaItemDisplay.all.length
-
-	interactionEntities = Interaction.all.length
-
-	if (OutlinerElement.types.camera) {
-		// @ts-expect-error - Camera class isn't typed as a class.
-		cameraEntities = OutlinerElement.types.camera.all.length
-	}
+	const {
+		groupEntities,
+		displayEntities,
+		locatorEntities,
+		cameraEntities,
+		interactionEntities,
+		totalEntities,
+	} = getEntityCounts()
 </script>
 
 <div class="entity-count-dialog">

src/mods/entityCounter.ts

@@ -5,22 +5,39 @@ import { TextDisplay } from '../outliner/textDisplay'
 import { VanillaBlockDisplay } from '../outliner/vanillaBlockDisplay'
 import { VanillaItemDisplay } from '../outliner/vanillaItemDisplay'
 
-export function getTotalEntityCount() {
-	let count = 1 // Start with 1 for the root entity
-	for (const node of Outliner.nodes) {
-		switch (true) {
-			case node instanceof Group:
-				if (node.children.some(child => child instanceof Cube)) count++
-				break
-			case node instanceof TextDisplay:
-			case node instanceof VanillaBlockDisplay:
-			case node instanceof VanillaItemDisplay:
-			case node instanceof Interaction:
-			case node.type === 'camera':
-				count++
-		}
+export function getEntityCounts() {
+	const groupEntities = Group.all.filter(
+		group => group.export && group.children.some(child => child instanceof Cube)
+	).length
+
+	const displayEntities = [
+		...TextDisplay.all,
+		...VanillaBlockDisplay.all,
+		...VanillaItemDisplay.all,
+	].filter(display => display.export).length
+
+	const locatorEntities = Locator.all.filter(
+		locator => locator.export && locator.config?.use_entity
+	).length
+
+	const cameraEntities = OutlinerElement.types.camera
+		? // @ts-expect-error - Camera class isn't typed as a class.
+			OutlinerElement.types.camera.all.length
+		: 0
+
+	const interactionEntities = Interaction.all.filter(interaction => interaction.export).length
+
+	const totalEntities =
+		1 + groupEntities + displayEntities + locatorEntities + cameraEntities + interactionEntities
+
+	return {
+		groupEntities,
+		displayEntities,
+		locatorEntities,
+		cameraEntities,
+		interactionEntities,
+		totalEntities,
 	}
-	return count
 }
 
 registerDeletableHandlerPatch({
@@ -29,7 +46,7 @@ registerDeletableHandlerPatch({
 		const widget = new BarText(`animated_java:toolbar/entity_counter`, {
 			text: `E: 0`,
 			onUpdate() {
-				widget.set(`E: ${getTotalEntityCount()}`)
+				widget.set(`E: ${getEntityCounts().totalEntities}`)
 			},
 			click: openEntityCountDialog,
 		})