✨ Add Sync Passenger Rotation Locator config option

This commit only contains UI and internal changes. The MCB file changes will be in a future commit

Author: SnaveSutit

src/blueprintFormat.ts

@@ -44,6 +44,7 @@ export interface IBlueprintBoneConfigJSON {
 export interface IBlueprintLocatorConfigJSON {
 	use_entity?: LocatorConfig['useEntity']
 	entity_type?: LocatorConfig['entityType']
+	sync_passenger_rotation?: LocatorConfig['syncPassengerRotation']
 	summon_commands?: LocatorConfig['_summonCommands']
 	ticking_commands?: LocatorConfig['tickingCommands']
 }

src/components/locatorConfigDialog.svelte

@@ -1,18 +1,16 @@
-<script lang="ts" , context="module">
-	import CodeInput from './dialogItems/codeInput.svelte'
-	import CheckBox from './dialogItems/checkbox.svelte'
-	import LineInput from './dialogItems/lineInput.svelte'
+<script lang="ts">
+	const pluginModeEnabled = !!Project?.animated_java?.enable_plugin_mode
 
+	import { MINECRAFT_REGISTRY } from '../systems/minecraft/registryManager'
 	import { Valuable } from '../util/stores'
 	import { translate } from '../util/translation'
-	import { MINECRAFT_REGISTRY } from '../systems/minecraft/registryManager'
-</script>
-
-<script lang="ts">
-	const pluginModeEnabled = !!Project?.animated_java?.enable_plugin_mode
+	import CheckBox from './dialogItems/checkbox.svelte'
+	import CodeInput from './dialogItems/codeInput.svelte'
+	import LineInput from './dialogItems/lineInput.svelte'
 
 	export let useEntity: Valuable<boolean>
 	export let entityType: Valuable<string>
+	export let syncPassengerRotation: Valuable<boolean>
 	export let summonCommands: Valuable<string>
 	export let tickingCommands: Valuable<string>
 
@@ -59,6 +57,13 @@
 				defaultValue="minecraft:item_display"
 			/>
 
+			<CheckBox
+				label={translate('dialog.locator_config.sync_passenger_rotation.title')}
+				tooltip={translate('dialog.locator_config.sync_passenger_rotation.description')}
+				bind:checked={syncPassengerRotation}
+				defaultValue={false}
+			/>
+
 			<CodeInput
 				label={translate('dialog.locator_config.summon_commands.title')}
 				tooltip={translate('dialog.locator_config.summon_commands.description')}

src/interface/dialog/locatorConfig.ts

@@ -1,7 +1,7 @@
 import { BLUEPRINT_FORMAT } from '../../blueprintFormat'
-import { LocatorConfig } from '../../nodeConfigs'
 import LocatorConfigDialog from '../../components/locatorConfigDialog.svelte'
 import { PACKAGE } from '../../constants'
+import { LocatorConfig } from '../../nodeConfigs'
 import { createAction } from '../../util/moddingTools'
 import { Valuable } from '../../util/stores'
 import { SvelteDialog } from '../../util/svelteDialog'
@@ -13,6 +13,7 @@ export function openLocatorConfigDialog(locator: Locator) {
 
 	const useEntity = new Valuable(locatorConfig.useEntity)
 	const entityType = new Valuable(locatorConfig.entityType)
+	const syncPassengerRotation = new Valuable(locatorConfig.syncPassengerRotation)
 	const summonCommands = new Valuable(locatorConfig.summonCommands)
 	const tickingCommands = new Valuable(locatorConfig.tickingCommands)
 
@@ -24,13 +25,15 @@ export function openLocatorConfigDialog(locator: Locator) {
 		props: {
 			useEntity,
 			entityType,
+			syncPassengerRotation,
 			summonCommands,
 			tickingCommands,
 		},
 		preventKeybinds: true,
 		onConfirm() {
 			locatorConfig.useEntity = useEntity.get()
 			locatorConfig.entityType = entityType.get()
+			locatorConfig.syncPassengerRotation = syncPassengerRotation.get()
 			locatorConfig.summonCommands = summonCommands.get()
 			locatorConfig.tickingCommands = tickingCommands.get()
 

src/lang/en.yml

@@ -303,6 +303,9 @@ animated_java.dialog.locator_config.entity_type.description: The type of entity
 animated_java.dialog.locator_config.entity_type.error.empty: Entity Type cannot be empty!
 animated_java.dialog.locator_config.entity_type.warning.invalid: The selected entity type doesn't exist in Minecraft {0}
 
+animated_java.dialog.locator_config.sync_passenger_rotation.title: Sync Passenger Rotation
+animated_java.dialog.locator_config.sync_passenger_rotation.description: Automatically sync the rotation of the Locator's passenger entities.
+
 animated_java.dialog.locator_config.summon_commands.title: On-Summon Commands
 animated_java.dialog.locator_config.summon_commands.description: |-
     Commands to run as the Locator's entity when summoned.

src/nodeConfigs.ts

@@ -346,13 +346,15 @@ export class BoneConfig {
 export class LocatorConfig {
 	private _useEntity?: boolean
 	private _entityType?: string
+	private _syncPassengerRotation?: boolean
 	private _summonCommands?: string
 	private _tickingCommands?: string
 
 	getDefault(): LocatorConfig {
 		return LocatorConfig.fromJSON({
 			use_entity: false,
 			entity_type: 'minecraft:pig',
+			sync_passenger_rotation: false,
 			summon_commands: '',
 			ticking_commands: '',
 		})
@@ -376,6 +378,15 @@ export class LocatorConfig {
 		this._entityType = value
 	}
 
+	get syncPassengerRotation(): NonNullable<LocatorConfig['_syncPassengerRotation']> {
+		if (this._syncPassengerRotation !== undefined) return this._syncPassengerRotation
+		const defaultConfig = this.getDefault()
+		return defaultConfig.syncPassengerRotation
+	}
+	set syncPassengerRotation(value: NonNullable<LocatorConfig['_syncPassengerRotation']>) {
+		this._syncPassengerRotation = value
+	}
+
 	get summonCommands(): NonNullable<LocatorConfig['_summonCommands']> {
 		if (this._summonCommands !== undefined) return this._summonCommands
 		const defaultConfig = this.getDefault()
@@ -398,6 +409,7 @@ export class LocatorConfig {
 		return {
 			use_entity: this._useEntity,
 			entity_type: this._entityType,
+			sync_passenger_rotation: this._syncPassengerRotation,
 			summon_commands: this._summonCommands,
 			ticking_commands: this._tickingCommands,
 		}
@@ -407,6 +419,8 @@ export class LocatorConfig {
 		const config = new LocatorConfig()
 		if (json.use_entity !== undefined) config._useEntity = json.use_entity
 		if (json.entity_type !== undefined) config._entityType = json.entity_type
+		if (json.sync_passenger_rotation !== undefined)
+			config._syncPassengerRotation = json.sync_passenger_rotation
 		if (json.summon_commands !== undefined) config._summonCommands = json.summon_commands
 		if (json.ticking_commands !== undefined) config._tickingCommands = json.ticking_commands
 		return config
@@ -420,6 +434,7 @@ export class LocatorConfig {
 		return (
 			this.useEntity === other.useEntity &&
 			this.entityType === other.entityType &&
+			this.syncPassengerRotation === other.syncPassengerRotation &&
 			this.summonCommands === other.summonCommands &&
 			this.tickingCommands === other.tickingCommands
 		)