From 28a70e728838187333a9eaf210b7c8fe8aa3f797 Mon Sep 17 00:00:00 2001 From: WBHarry Date: Fri, 4 Jul 2025 20:50:40 +0200 Subject: [PATCH] Mvoed config out form under application --- daggerheart.mjs | 2 +- module/applications/_module.mjs | 2 +- module/applications/characterCreation/characterCreation.mjs | 4 ++-- module/applications/dialogs/beastformDialog.mjs | 2 +- module/applications/levelup/characterLevelup.mjs | 4 ++-- module/applications/levelup/companionLevelup.mjs | 2 +- module/applications/levelup/levelup.mjs | 4 ++-- .../applications/settings/components/settingsActionsView.mjs | 2 +- module/applications/sheets/actors/adversary.mjs | 2 +- module/applications/sheets/actors/character.mjs | 4 ++-- module/applications/sheets/api/base-item.mjs | 2 +- .../applications/sheets/applications/adversary-settings.mjs | 2 +- .../applications/sheets/applications/environment-settings.mjs | 2 +- module/applications/sheets/items/class.mjs | 2 +- module/applications/sheets/items/subclass.mjs | 2 +- module/applications/ui/countdowns.mjs | 2 +- module/{applications => }/config/Action.mjs | 2 +- module/{applications => }/config/_module.mjs | 0 module/{applications => }/config/actionConfig.mjs | 0 module/{applications => }/config/actorConfig.mjs | 0 module/{applications => }/config/domainConfig.mjs | 0 module/{applications => }/config/effectConfig.mjs | 0 module/{applications => }/config/flagsConfig.mjs | 0 module/{applications => }/config/generalConfig.mjs | 0 module/{applications => }/config/hooksConfig.mjs | 0 module/{applications => }/config/itemConfig.mjs | 0 module/{applications => }/config/settingsConfig.mjs | 0 module/{applications => }/config/system.mjs | 0 module/data/actor/character.mjs | 2 +- module/data/actor/environment.mjs | 2 +- module/data/countdowns.mjs | 2 +- module/data/item/armor.mjs | 2 +- module/data/item/weapon.mjs | 2 +- module/data/levelup.mjs | 2 +- module/data/settings/Appearance.mjs | 2 +- module/data/settings/Homebrew.mjs | 2 +- module/enrichers/DualityRollEnricher.mjs | 2 +- module/enrichers/TemplateEnricher.mjs | 2 +- module/helpers/utils.mjs | 2 +- 39 files changed, 32 insertions(+), 32 deletions(-) rename module/{applications => }/config/Action.mjs (99%) rename module/{applications => }/config/_module.mjs (100%) rename module/{applications => }/config/actionConfig.mjs (100%) rename module/{applications => }/config/actorConfig.mjs (100%) rename module/{applications => }/config/domainConfig.mjs (100%) rename module/{applications => }/config/effectConfig.mjs (100%) rename module/{applications => }/config/flagsConfig.mjs (100%) rename module/{applications => }/config/generalConfig.mjs (100%) rename module/{applications => }/config/hooksConfig.mjs (100%) rename module/{applications => }/config/itemConfig.mjs (100%) rename module/{applications => }/config/settingsConfig.mjs (100%) rename module/{applications => }/config/system.mjs (100%) diff --git a/daggerheart.mjs b/daggerheart.mjs index 09736c12..80822e19 100644 --- a/daggerheart.mjs +++ b/daggerheart.mjs @@ -1,4 +1,4 @@ -import { SYSTEM } from './module/applications/config/system.mjs'; +import { SYSTEM } from './module/config/system.mjs'; import * as applications from './module/applications/_module.mjs'; import * as models from './module/data/_module.mjs'; import * as documents from './module/documents/_module.mjs'; diff --git a/module/applications/_module.mjs b/module/applications/_module.mjs index 72412f95..286ad8bf 100644 --- a/module/applications/_module.mjs +++ b/module/applications/_module.mjs @@ -16,7 +16,7 @@ export { default as DhActiveEffectConfig } from './sheets/activeEffectConfig.mjs export { default as DhContextMenu } from './ux/contextMenu.mjs'; export { default as DhBeastform } from './sheets/items/beastform.mjs'; -export * as config from './config/_module.mjs'; +export * as config from '../config/_module.mjs'; export * as api from './sheets/api/_modules.mjs'; export * as ui from './ui/_module.mjs'; export * as ux from './ux/_module.mjs'; diff --git a/module/applications/characterCreation/characterCreation.mjs b/module/applications/characterCreation/characterCreation.mjs index 9ff64e09..1dabc8c2 100644 --- a/module/applications/characterCreation/characterCreation.mjs +++ b/module/applications/characterCreation/characterCreation.mjs @@ -1,5 +1,5 @@ -import { abilities } from '../config/actorConfig.mjs'; -import { burden } from '../config/generalConfig.mjs'; +import { abilities } from '../../config/actorConfig.mjs'; +import { burden } from '../../config/generalConfig.mjs'; const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api; diff --git a/module/applications/dialogs/beastformDialog.mjs b/module/applications/dialogs/beastformDialog.mjs index 04fbe2fc..51abe0bb 100644 --- a/module/applications/dialogs/beastformDialog.mjs +++ b/module/applications/dialogs/beastformDialog.mjs @@ -1,4 +1,4 @@ -import { tiers } from '../config/generalConfig.mjs'; +import { tiers } from '../../config/generalConfig.mjs'; const { ApplicationV2, HandlebarsApplicationMixin } = foundry.applications.api; diff --git a/module/applications/levelup/characterLevelup.mjs b/module/applications/levelup/characterLevelup.mjs index b9f36e0c..5c32f929 100644 --- a/module/applications/levelup/characterLevelup.mjs +++ b/module/applications/levelup/characterLevelup.mjs @@ -1,7 +1,7 @@ import LevelUpBase from './levelup.mjs'; import { DhLevelup } from '../../data/levelup.mjs'; -import { domains } from '../../applications/config/domainConfig.mjs'; -import { abilities } from '../../applications/config/actorConfig.mjs'; +import { domains } from '../../config/domainConfig.mjs'; +import { abilities } from '../../config/actorConfig.mjs'; export default class DhCharacterLevelUp extends LevelUpBase { constructor(actor) { diff --git a/module/applications/levelup/companionLevelup.mjs b/module/applications/levelup/companionLevelup.mjs index e041e1a6..64cbef82 100644 --- a/module/applications/levelup/companionLevelup.mjs +++ b/module/applications/levelup/companionLevelup.mjs @@ -1,7 +1,7 @@ import BaseLevelUp from './levelup.mjs'; import { defaultCompanionTier, LevelOptionType } from '../../data/levelTier.mjs'; import { DhLevelup } from '../../data/levelup.mjs'; -import { diceTypes, range } from '../../applications/config/generalConfig.mjs'; +import { diceTypes, range } from '../../config/generalConfig.mjs'; export default class DhCompanionLevelUp extends BaseLevelUp { constructor(actor) { diff --git a/module/applications/levelup/levelup.mjs b/module/applications/levelup/levelup.mjs index fd2c8034..1d9731a2 100644 --- a/module/applications/levelup/levelup.mjs +++ b/module/applications/levelup/levelup.mjs @@ -1,5 +1,5 @@ -import { abilities, subclassFeatureLabels } from '../../applications/config/actorConfig.mjs'; -import { domains } from '../../applications/config/domainConfig.mjs'; +import { abilities, subclassFeatureLabels } from '../../config/actorConfig.mjs'; +import { domains } from '../../config/domainConfig.mjs'; import { getDeleteKeys, tagifyElement } from '../../helpers/utils.mjs'; const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api; diff --git a/module/applications/settings/components/settingsActionsView.mjs b/module/applications/settings/components/settingsActionsView.mjs index b8cc8fbd..7d103432 100644 --- a/module/applications/settings/components/settingsActionsView.mjs +++ b/module/applications/settings/components/settingsActionsView.mjs @@ -1,5 +1,5 @@ import { actionsTypes } from '../../../data/_module.mjs'; -import DHActionConfig from '../../config/Action.mjs'; +import DHActionConfig from '../../../config/Action.mjs'; const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api; diff --git a/module/applications/sheets/actors/adversary.mjs b/module/applications/sheets/actors/adversary.mjs index 9ea04f9f..acc364bb 100644 --- a/module/applications/sheets/actors/adversary.mjs +++ b/module/applications/sheets/actors/adversary.mjs @@ -1,4 +1,4 @@ -import DHActionConfig from '../../config/Action.mjs'; +import DHActionConfig from '../../../config/Action.mjs'; import DaggerheartSheet from '../daggerheart-sheet.mjs'; import DHAdversarySettings from '../applications/adversary-settings.mjs'; diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs index d1766844..c4896f28 100644 --- a/module/applications/sheets/actors/character.mjs +++ b/module/applications/sheets/actors/character.mjs @@ -2,11 +2,11 @@ import { capitalize } from '../../../helpers/utils.mjs'; import DhpDeathMove from '../../dialogs/deathMove.mjs'; import DhpDowntime from '../../dialogs/downtime.mjs'; import DaggerheartSheet from '.././daggerheart-sheet.mjs'; -import { abilities } from '../../../applications/config/actorConfig.mjs'; +import { abilities } from '../../../config/actorConfig.mjs'; import DhCharacterlevelUp from '../../levelup/characterLevelup.mjs'; import DhCharacterCreation from '../../characterCreation/characterCreation.mjs'; import FilterMenu from '../../ux/filter-menu.mjs'; -import DHActionConfig from '../../config/Action.mjs'; +import DHActionConfig from '../../../config/Action.mjs'; const { ActorSheetV2 } = foundry.applications.sheets; const { TextEditor } = foundry.applications.ux; diff --git a/module/applications/sheets/api/base-item.mjs b/module/applications/sheets/api/base-item.mjs index 18edaf79..b9db8f0e 100644 --- a/module/applications/sheets/api/base-item.mjs +++ b/module/applications/sheets/api/base-item.mjs @@ -1,6 +1,6 @@ import DHApplicationMixin from './application-mixin.mjs'; import { actionsTypes } from '../../../data/_module.mjs'; -import DHActionConfig from '../../config/Action.mjs'; +import DHActionConfig from '../../../config/Action.mjs'; const { ItemSheetV2 } = foundry.applications.sheets; diff --git a/module/applications/sheets/applications/adversary-settings.mjs b/module/applications/sheets/applications/adversary-settings.mjs index 755fb5d3..826a738e 100644 --- a/module/applications/sheets/applications/adversary-settings.mjs +++ b/module/applications/sheets/applications/adversary-settings.mjs @@ -1,4 +1,4 @@ -import DHActionConfig from '../../config/Action.mjs'; +import DHActionConfig from '../../../config/Action.mjs'; import DHBaseItemSheet from '../api/base-item.mjs'; import { actionsTypes } from '../../../data/_module.mjs'; diff --git a/module/applications/sheets/applications/environment-settings.mjs b/module/applications/sheets/applications/environment-settings.mjs index 24098ba9..f7954954 100644 --- a/module/applications/sheets/applications/environment-settings.mjs +++ b/module/applications/sheets/applications/environment-settings.mjs @@ -1,4 +1,4 @@ -import DHActionConfig from '../../config/Action.mjs'; +import DHActionConfig from '../../../config/Action.mjs'; import DHBaseItemSheet from '../api/base-item.mjs'; import { actionsTypes } from '../../../data/_module.mjs'; diff --git a/module/applications/sheets/items/class.mjs b/module/applications/sheets/items/class.mjs index a9308718..98af93ea 100644 --- a/module/applications/sheets/items/class.mjs +++ b/module/applications/sheets/items/class.mjs @@ -1,6 +1,6 @@ import DHBaseItemSheet from '../api/base-item.mjs'; import { actionsTypes } from '../../../data/_module.mjs'; -import DHActionConfig from '../../config/Action.mjs'; +import DHActionConfig from '../../../config/Action.mjs'; const { TextEditor } = foundry.applications.ux; diff --git a/module/applications/sheets/items/subclass.mjs b/module/applications/sheets/items/subclass.mjs index 6e330767..9c17a7e0 100644 --- a/module/applications/sheets/items/subclass.mjs +++ b/module/applications/sheets/items/subclass.mjs @@ -1,6 +1,6 @@ import DHBaseItemSheet from '../api/base-item.mjs'; import { actionsTypes } from '../../../data/_module.mjs'; -import DHActionConfig from '../../config/Action.mjs'; +import DHActionConfig from '../../../config/Action.mjs'; export default class SubclassSheet extends DHBaseItemSheet { /**@inheritdoc */ diff --git a/module/applications/ui/countdowns.mjs b/module/applications/ui/countdowns.mjs index 4011889d..627eac75 100644 --- a/module/applications/ui/countdowns.mjs +++ b/module/applications/ui/countdowns.mjs @@ -1,4 +1,4 @@ -import { countdownTypes } from '../config/generalConfig.mjs'; +import { countdownTypes } from '../../config/generalConfig.mjs'; import { GMUpdateEvent, RefreshType, socketEvent } from '../../systemRegistration/socket.mjs'; import constructHTMLButton from '../../helpers/utils.mjs'; import OwnershipSelection from '../dialogs/ownershipSelection.mjs'; diff --git a/module/applications/config/Action.mjs b/module/config/Action.mjs similarity index 99% rename from module/applications/config/Action.mjs rename to module/config/Action.mjs index 61ce3fd7..edb3f0d0 100644 --- a/module/applications/config/Action.mjs +++ b/module/config/Action.mjs @@ -1,4 +1,4 @@ -import DaggerheartSheet from '../sheets/daggerheart-sheet.mjs'; +import DaggerheartSheet from '../applications/sheets/daggerheart-sheet.mjs'; const { ApplicationV2 } = foundry.applications.api; export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) { diff --git a/module/applications/config/_module.mjs b/module/config/_module.mjs similarity index 100% rename from module/applications/config/_module.mjs rename to module/config/_module.mjs diff --git a/module/applications/config/actionConfig.mjs b/module/config/actionConfig.mjs similarity index 100% rename from module/applications/config/actionConfig.mjs rename to module/config/actionConfig.mjs diff --git a/module/applications/config/actorConfig.mjs b/module/config/actorConfig.mjs similarity index 100% rename from module/applications/config/actorConfig.mjs rename to module/config/actorConfig.mjs diff --git a/module/applications/config/domainConfig.mjs b/module/config/domainConfig.mjs similarity index 100% rename from module/applications/config/domainConfig.mjs rename to module/config/domainConfig.mjs diff --git a/module/applications/config/effectConfig.mjs b/module/config/effectConfig.mjs similarity index 100% rename from module/applications/config/effectConfig.mjs rename to module/config/effectConfig.mjs diff --git a/module/applications/config/flagsConfig.mjs b/module/config/flagsConfig.mjs similarity index 100% rename from module/applications/config/flagsConfig.mjs rename to module/config/flagsConfig.mjs diff --git a/module/applications/config/generalConfig.mjs b/module/config/generalConfig.mjs similarity index 100% rename from module/applications/config/generalConfig.mjs rename to module/config/generalConfig.mjs diff --git a/module/applications/config/hooksConfig.mjs b/module/config/hooksConfig.mjs similarity index 100% rename from module/applications/config/hooksConfig.mjs rename to module/config/hooksConfig.mjs diff --git a/module/applications/config/itemConfig.mjs b/module/config/itemConfig.mjs similarity index 100% rename from module/applications/config/itemConfig.mjs rename to module/config/itemConfig.mjs diff --git a/module/applications/config/settingsConfig.mjs b/module/config/settingsConfig.mjs similarity index 100% rename from module/applications/config/settingsConfig.mjs rename to module/config/settingsConfig.mjs diff --git a/module/applications/config/system.mjs b/module/config/system.mjs similarity index 100% rename from module/applications/config/system.mjs rename to module/config/system.mjs diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs index 231a8795..d9ea6eef 100644 --- a/module/data/actor/character.mjs +++ b/module/data/actor/character.mjs @@ -1,4 +1,4 @@ -import { burden } from '../../applications/config/generalConfig.mjs'; +import { burden } from '../../config/generalConfig.mjs'; import ActionField from '../fields/actionField.mjs'; import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs'; import DhLevelData from '../levelData.mjs'; diff --git a/module/data/actor/environment.mjs b/module/data/actor/environment.mjs index f7bfbc78..d7a8b4b0 100644 --- a/module/data/actor/environment.mjs +++ b/module/data/actor/environment.mjs @@ -1,4 +1,4 @@ -import { environmentTypes } from '../../applications/config/actorConfig.mjs'; +import { environmentTypes } from '../../config/actorConfig.mjs'; import BaseDataActor from './base.mjs'; import ActionField from '../fields/actionField.mjs'; import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs'; diff --git a/module/data/countdowns.mjs b/module/data/countdowns.mjs index 620904e0..fd26ebda 100644 --- a/module/data/countdowns.mjs +++ b/module/data/countdowns.mjs @@ -1,4 +1,4 @@ -import { countdownTypes } from '../applications/config/generalConfig.mjs'; +import { countdownTypes } from '../config/generalConfig.mjs'; import { RefreshType, socketEvent } from '../systemRegistration/socket.mjs'; export default class DhCountdowns extends foundry.abstract.DataModel { diff --git a/module/data/item/armor.mjs b/module/data/item/armor.mjs index b6c814de..4e5a26e6 100644 --- a/module/data/item/armor.mjs +++ b/module/data/item/armor.mjs @@ -1,6 +1,6 @@ import BaseDataItem from './base.mjs'; import ActionField from '../fields/actionField.mjs'; -import { armorFeatures } from '../../applications/config/itemConfig.mjs'; +import { armorFeatures } from '../../config/itemConfig.mjs'; export default class DHArmor extends BaseDataItem { /** @inheritDoc */ diff --git a/module/data/item/weapon.mjs b/module/data/item/weapon.mjs index adf89155..07730711 100644 --- a/module/data/item/weapon.mjs +++ b/module/data/item/weapon.mjs @@ -1,6 +1,6 @@ import BaseDataItem from './base.mjs'; import ActionField from '../fields/actionField.mjs'; -import { weaponFeatures } from '../../applications/config/itemConfig.mjs'; +import { weaponFeatures } from '../../config/itemConfig.mjs'; import { actionsTypes } from '../action/_module.mjs'; export default class DHWeapon extends BaseDataItem { diff --git a/module/data/levelup.mjs b/module/data/levelup.mjs index a5b5455f..0f248f45 100644 --- a/module/data/levelup.mjs +++ b/module/data/levelup.mjs @@ -1,4 +1,4 @@ -import { abilities } from '../applications/config/actorConfig.mjs'; +import { abilities } from '../config/actorConfig.mjs'; import { chunkify } from '../helpers/utils.mjs'; import { LevelOptionType } from './levelTier.mjs'; diff --git a/module/data/settings/Appearance.mjs b/module/data/settings/Appearance.mjs index eede8b91..6382b613 100644 --- a/module/data/settings/Appearance.mjs +++ b/module/data/settings/Appearance.mjs @@ -1,4 +1,4 @@ -import { fearDisplay } from '../../applications/config/generalConfig.mjs'; +import { fearDisplay } from '../../config/generalConfig.mjs'; export default class DhAppearance extends foundry.abstract.DataModel { static defineSchema() { diff --git a/module/data/settings/Homebrew.mjs b/module/data/settings/Homebrew.mjs index b7320070..d26de253 100644 --- a/module/data/settings/Homebrew.mjs +++ b/module/data/settings/Homebrew.mjs @@ -1,4 +1,4 @@ -import { defaultRestOptions } from '../../applications/config/generalConfig.mjs'; +import { defaultRestOptions } from '../../config/generalConfig.mjs'; export default class DhHomebrew extends foundry.abstract.DataModel { static LOCALIZATION_PREFIXES = ['DAGGERHEART.Settings.Homebrew']; // Doesn't work for some reason diff --git a/module/enrichers/DualityRollEnricher.mjs b/module/enrichers/DualityRollEnricher.mjs index a1a1bb4c..54fe2a1a 100644 --- a/module/enrichers/DualityRollEnricher.mjs +++ b/module/enrichers/DualityRollEnricher.mjs @@ -1,4 +1,4 @@ -import { abilities } from '../applications/config/actorConfig.mjs'; +import { abilities } from '../config/actorConfig.mjs'; import { getCommandTarget, rollCommandToJSON } from '../helpers/utils.mjs'; export default function DhDualityRollEnricher(match, _options) { diff --git a/module/enrichers/TemplateEnricher.mjs b/module/enrichers/TemplateEnricher.mjs index 790e295d..33061151 100644 --- a/module/enrichers/TemplateEnricher.mjs +++ b/module/enrichers/TemplateEnricher.mjs @@ -1,4 +1,4 @@ -import { range as configRange } from '../applications/config/generalConfig.mjs'; +import { range as configRange } from '../config/generalConfig.mjs'; export default function DhTemplateEnricher(match, _options) { const parts = match[1].split('|').map(x => x.trim()); diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs index 9c19f229..72a8a95d 100644 --- a/module/helpers/utils.mjs +++ b/module/helpers/utils.mjs @@ -1,4 +1,4 @@ -import { diceTypes, getDiceSoNicePresets, range } from '../applications/config/generalConfig.mjs'; +import { diceTypes, getDiceSoNicePresets, range } from '../config/generalConfig.mjs'; import Tagify from '@yaireo/tagify'; export const loadCompendiumOptions = async compendiums => {