From d0ba1ebf99e5d41220fa934d62745947772cddcc Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Tue, 30 Sep 2025 02:03:02 +0200 Subject: [PATCH] utilisation de renderTemplate "interne" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Import de foundry.applications.handlebars.renderTemplate au travers d'une constante pour éliminer les warnings --- module/achat-vente/chat-vente.js | 2 +- module/achat-vente/dialog-item-achat.js | 1 + module/achat-vente/dialog-item-vente.js | 1 + module/actor.js | 2 +- module/actor/base-actor-reve.js | 2 +- module/actor/base-actor.js | 4 ++-- module/apps/textroll/text-roll-formatter.js | 1 + module/chat-utility.js | 4 ++-- module/coeur/rdd-coeur.js | 1 + module/constants.js | 2 ++ module/dialog-choix-xp-carac.js | 1 + module/dialog-chronologie.js | 2 +- module/dialog-create-signedraconique.js | 1 + module/dialog-fabriquer-potion.js | 1 + module/dialog-item-consommer.js | 1 + module/dialog-select.js | 1 + module/dialog-split-item.js | 2 +- module/dialog-validation-encaissement.js | 2 +- module/enchantement/dialog-enchanter.js | 2 +- module/item.js | 2 +- module/rdd-combat.js | 2 +- module/rdd-commands.js | 1 + module/rdd-empoignade.js | 2 +- module/rdd-meteo.js | 1 + module/rdd-namegen.js | 1 + module/rdd-resolution-table.js | 3 ++- module/rdd-roll-encaisser.js | 2 +- module/rdd-roll-resolution-table.js | 1 + module/rdd-roll-result.js | 3 ++- module/rdd-roll.js | 7 +++---- module/rdd-tmr-dialog.js | 6 +++--- module/rdd-token-hud.js | 3 ++- module/roll/chat-roll-result.mjs | 3 ++- module/roll/roll-dialog.mjs | 3 ++- module/settings/system-compendiums.js | 2 +- module/sommeil/dialog-chateau-dormant.js | 3 ++- module/sommeil/dialog-repos.js | 1 + module/sommeil/dialog-stress.js | 1 + module/time/rdd-calendrier.js | 2 +- module/tirage/fenetre-recherche-tirage.js | 1 + module/tmr-rencontres.js | 3 ++- module/tmr/effets-rencontres.js | 1 + module/voyage/dialog-fatigue-voyage.js | 2 +- 43 files changed, 57 insertions(+), 32 deletions(-) diff --git a/module/achat-vente/chat-vente.js b/module/achat-vente/chat-vente.js index a921a356..66a0f2a9 100644 --- a/module/achat-vente/chat-vente.js +++ b/module/achat-vente/chat-vente.js @@ -1,4 +1,4 @@ -import { SYSTEM_RDD } from "../constants.js"; +import { renderTemplate, SYSTEM_RDD } from "../constants.js"; import { RdDUtility } from "../rdd-utility.js"; const DETAIL_VENTE = 'detailVente'; diff --git a/module/achat-vente/dialog-item-achat.js b/module/achat-vente/dialog-item-achat.js index 58992d7e..09b686ff 100644 --- a/module/achat-vente/dialog-item-achat.js +++ b/module/achat-vente/dialog-item-achat.js @@ -1,3 +1,4 @@ +import { renderTemplate } from "../constants.js"; import { Misc } from "../misc.js"; import { RdDUtility } from "../rdd-utility.js"; import { ChatVente } from "./chat-vente.js"; diff --git a/module/achat-vente/dialog-item-vente.js b/module/achat-vente/dialog-item-vente.js index 64a2166e..13c3f448 100644 --- a/module/achat-vente/dialog-item-vente.js +++ b/module/achat-vente/dialog-item-vente.js @@ -1,3 +1,4 @@ +import { renderTemplate } from "../constants.js"; import { HtmlUtility } from "../html-utility.js"; import { RdDUtility } from "../rdd-utility.js"; import { ChatVente } from "./chat-vente.js"; diff --git a/module/actor.js b/module/actor.js index e683cdf5..ec22cebe 100644 --- a/module/actor.js +++ b/module/actor.js @@ -19,7 +19,7 @@ import { DialogConsommer } from "./dialog-item-consommer.js"; import { DialogFabriquerPotion } from "./dialog-fabriquer-potion.js"; import { RollDataAjustements } from "./rolldata-ajustements.js"; import { RdDPossession } from "./rdd-possession.js"; -import { ACTOR_TYPES, SHOW_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js"; +import { ACTOR_TYPES, renderTemplate, SHOW_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js"; import { RdDConfirm } from "./rdd-confirm.js"; import { DialogRepos } from "./sommeil/dialog-repos.js"; import { RdDBaseActor } from "./actor/base-actor.js"; diff --git a/module/actor/base-actor-reve.js b/module/actor/base-actor-reve.js index 9207ade4..6e5ab325 100644 --- a/module/actor/base-actor-reve.js +++ b/module/actor/base-actor-reve.js @@ -1,4 +1,4 @@ -import { ENTITE_INCARNE, SHOW_DICE, SYSTEM_RDD } from "../constants.js"; +import { ENTITE_INCARNE, renderTemplate, SHOW_DICE, SYSTEM_RDD } from "../constants.js"; import { Grammar } from "../grammar.js"; import { Misc } from "../misc.js"; import { RdDResolutionTable } from "../rdd-resolution-table.js"; diff --git a/module/actor/base-actor.js b/module/actor/base-actor.js index b12edb50..2d3ca6f9 100644 --- a/module/actor/base-actor.js +++ b/module/actor/base-actor.js @@ -1,6 +1,6 @@ import { ChatVente } from "../achat-vente/chat-vente.js"; import { ChatUtility } from "../chat-utility.js"; -import { SYSTEM_SOCKET_ID } from "../constants.js"; +import { renderTemplate, SYSTEM_SOCKET_ID } from "../constants.js"; import { Grammar } from "../grammar.js"; import { Monnaie } from "../item-monnaie.js"; import { ITEM_TYPES } from "../constants.js"; @@ -738,7 +738,7 @@ export class RdDBaseActor extends Actor { name: this.getAlias(), system: { description: this.system.description } } - foundry.applications.handlebars.renderTemplate('systems/foundryvtt-reve-de-dragon/templates/post-actor.hbs', chatData) + renderTemplate('systems/foundryvtt-reve-de-dragon/templates/post-actor.hbs', chatData) .then(html => ChatMessage.create(RdDUtility.chatDataSetup(html, modeOverride))); } diff --git a/module/apps/textroll/text-roll-formatter.js b/module/apps/textroll/text-roll-formatter.js index 7e0dbc05..73015c97 100644 --- a/module/apps/textroll/text-roll-formatter.js +++ b/module/apps/textroll/text-roll-formatter.js @@ -1,3 +1,4 @@ +import { renderTemplate } from "../../constants.js"; export class TextRollManager { diff --git a/module/chat-utility.js b/module/chat-utility.js index c1649e3c..a1c9e1d9 100644 --- a/module/chat-utility.js +++ b/module/chat-utility.js @@ -1,5 +1,5 @@ import { Misc } from "./misc.js"; -import { SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js"; +import { renderTemplate, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js"; import { RdDTimestamp } from "./time/rdd-timestamp.js"; import { RdDTextEditor } from "./apps/rdd-text-roll-editor.js"; @@ -190,7 +190,7 @@ export class ChatUtility { if (rddTimestamp) { const timestamp = new RdDTimestamp(rddTimestamp); const timestampData = timestamp.toCalendrier(); - const dateHeure = await foundry.applications.handlebars.renderTemplate('systems/foundryvtt-reve-de-dragon/templates/common/date-heure.hbs', timestampData); + const dateHeure = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/common/date-heure.hbs', timestampData); $(html).find('header.message-header .message-sender').after(dateHeure) } } diff --git a/module/coeur/rdd-coeur.js b/module/coeur/rdd-coeur.js index d96b2e7f..4954f725 100644 --- a/module/coeur/rdd-coeur.js +++ b/module/coeur/rdd-coeur.js @@ -1,5 +1,6 @@ import { RdDBaseActor } from "../actor/base-actor.js"; import { ChatUtility } from "../chat-utility.js"; +import { renderTemplate } from "../constants.js"; const INFO_COEUR = 'info-coeur'; diff --git a/module/constants.js b/module/constants.js index 6b013361..201cd882 100644 --- a/module/constants.js +++ b/module/constants.js @@ -9,6 +9,8 @@ export const ENTITE_INCARNE = 'incarne' export const ENTITE_NONINCARNE = 'nonincarne' export const ENTITE_BLURETTE = 'blurette' +export const renderTemplate = foundry.applications.handlebars.renderTemplate + export const RDD_CONFIG = { niveauEthylisme : [ {value: "1", label: "Aucun"}, diff --git a/module/dialog-choix-xp-carac.js b/module/dialog-choix-xp-carac.js index 9afdda88..9ed6d428 100644 --- a/module/dialog-choix-xp-carac.js +++ b/module/dialog-choix-xp-carac.js @@ -1,3 +1,4 @@ +import { renderTemplate } from "./constants.js" export class DialogChoixXpCarac extends Dialog { diff --git a/module/dialog-chronologie.js b/module/dialog-chronologie.js index f67e7793..e53eb6c1 100644 --- a/module/dialog-chronologie.js +++ b/module/dialog-chronologie.js @@ -1,4 +1,4 @@ -import { SYSTEM_RDD } from "./constants.js"; +import { renderTemplate, SYSTEM_RDD } from "./constants.js"; import { Grammar } from "./grammar.js"; import { HtmlUtility } from "./html-utility.js"; import { RdDTimestamp } from "./time/rdd-timestamp.js"; diff --git a/module/dialog-create-signedraconique.js b/module/dialog-create-signedraconique.js index 60b67b01..92a5e873 100644 --- a/module/dialog-create-signedraconique.js +++ b/module/dialog-create-signedraconique.js @@ -1,4 +1,5 @@ import { ChatUtility } from "./chat-utility.js"; +import { renderTemplate } from "./constants.js"; import { HtmlUtility } from "./html-utility.js"; import { RdDItemSigneDraconique } from "./item/signedraconique.js"; import { TMRUtility } from "./tmr-utility.js"; diff --git a/module/dialog-fabriquer-potion.js b/module/dialog-fabriquer-potion.js index 24a157d9..6e88092d 100644 --- a/module/dialog-fabriquer-potion.js +++ b/module/dialog-fabriquer-potion.js @@ -1,3 +1,4 @@ +import { renderTemplate } from "./constants.js"; import { Misc } from "./misc.js"; import { RdDUtility } from "./rdd-utility.js"; diff --git a/module/dialog-item-consommer.js b/module/dialog-item-consommer.js index a71ffaeb..ac15e261 100644 --- a/module/dialog-item-consommer.js +++ b/module/dialog-item-consommer.js @@ -1,3 +1,4 @@ +import { renderTemplate } from "./constants.js"; import { Misc } from "./misc.js"; export class DialogConsommer extends Dialog { diff --git a/module/dialog-select.js b/module/dialog-select.js index 4107d5c0..33253e2a 100644 --- a/module/dialog-select.js +++ b/module/dialog-select.js @@ -1,3 +1,4 @@ +import { renderTemplate } from "./constants.js" export class DialogSelect extends Dialog { static extractIdNameImg(it) { return { id: it.id, name: it.name, img: it.img } } diff --git a/module/dialog-split-item.js b/module/dialog-split-item.js index 79c5404c..2f4419aa 100644 --- a/module/dialog-split-item.js +++ b/module/dialog-split-item.js @@ -1,4 +1,4 @@ -import { Misc } from "./misc.js"; +import { renderTemplate } from "./constants.js"; export class DialogSplitItem extends Dialog { diff --git a/module/dialog-validation-encaissement.js b/module/dialog-validation-encaissement.js index 825b4c06..90bbf91d 100644 --- a/module/dialog-validation-encaissement.js +++ b/module/dialog-validation-encaissement.js @@ -1,4 +1,4 @@ -import { HIDE_DICE, SHOW_DICE } from "./constants.js"; +import { HIDE_DICE, renderTemplate, SHOW_DICE } from "./constants.js"; import { RdDUtility } from "./rdd-utility.js"; /** diff --git a/module/enchantement/dialog-enchanter.js b/module/enchantement/dialog-enchanter.js index 15e1c431..a64533bf 100644 --- a/module/enchantement/dialog-enchanter.js +++ b/module/enchantement/dialog-enchanter.js @@ -1,4 +1,4 @@ -import { ITEM_TYPES } from "../constants.js" +import { ITEM_TYPES, renderTemplate } from "../constants.js" import { RdDItemSort } from "../item-sort.js" import { Misc } from "../misc.js" diff --git a/module/item.js b/module/item.js index 5df8e478..44829cd2 100644 --- a/module/item.js +++ b/module/item.js @@ -1,4 +1,4 @@ -import { ITEM_TYPES } from "./constants.js"; +import { ITEM_TYPES, renderTemplate } from "./constants.js"; import { BASE_CORPS_A_CORPS, BASE_ESQUIVE, CATEGORIES_COMPETENCES, CATEGORIES_COMPETENCES_CREATURES } from "./item/base-items.js"; import { ITEM_ACTIONS, DEFAULT_ACTIONS, COMMON_ACTIONS } from "./item/item-actions.js"; diff --git a/module/rdd-combat.js b/module/rdd-combat.js index 76a27948..ef5a4bc1 100644 --- a/module/rdd-combat.js +++ b/module/rdd-combat.js @@ -1,5 +1,5 @@ import { ChatUtility } from "./chat-utility.js"; -import { ENTITE_BLURETTE, HIDE_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js"; +import { ENTITE_BLURETTE, HIDE_DICE, renderTemplate, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js"; import { Grammar } from "./grammar.js"; import { Misc } from "./misc.js"; import { RdDBonus } from "./rdd-bonus.js"; diff --git a/module/rdd-commands.js b/module/rdd-commands.js index 158bc946..762f8d23 100644 --- a/module/rdd-commands.js +++ b/module/rdd-commands.js @@ -19,6 +19,7 @@ import { TMRUtility } from "./tmr-utility.js"; import { DialogFatigueVoyage } from "./voyage/dialog-fatigue-voyage.js"; import { ChatUtility } from "./chat-utility.js"; import { RdDRollResult } from "./rdd-roll-result.js"; +import { renderTemplate } from "./constants.js"; const rddRollNumeric = /^(\d+)\s*([\+\-]?\d+)?\s*(s)?/; diff --git a/module/rdd-empoignade.js b/module/rdd-empoignade.js index f7fce4a0..475c6147 100644 --- a/module/rdd-empoignade.js +++ b/module/rdd-empoignade.js @@ -1,5 +1,5 @@ import { STATUSES } from "./settings/status-effects.js"; -import { ITEM_TYPES } from "./constants.js"; +import { ITEM_TYPES, renderTemplate } from "./constants.js"; import { ChatUtility } from "./chat-utility.js"; import { RdDRollResult } from "./rdd-roll-result.js"; import { RdDRoll } from "./rdd-roll.js"; diff --git a/module/rdd-meteo.js b/module/rdd-meteo.js index e3512f22..d1cfb738 100644 --- a/module/rdd-meteo.js +++ b/module/rdd-meteo.js @@ -1,4 +1,5 @@ import { ChatUtility } from "./chat-utility.js" +import { renderTemplate } from "./constants.js" const vents = [ { min: 0, max: 0, valeur: 'Calme' }, diff --git a/module/rdd-namegen.js b/module/rdd-namegen.js index f0768cf7..9429e6fe 100644 --- a/module/rdd-namegen.js +++ b/module/rdd-namegen.js @@ -1,5 +1,6 @@ import { RdDBaseActor } from "./actor/base-actor.js"; import { ChatUtility } from "./chat-utility.js"; +import { renderTemplate } from "./constants.js"; import { Misc } from "./misc.js"; import { RdDDice } from "./rdd-dice.js"; diff --git a/module/rdd-resolution-table.js b/module/rdd-resolution-table.js index 99d51688..896b41b0 100644 --- a/module/rdd-resolution-table.js +++ b/module/rdd-resolution-table.js @@ -1,3 +1,4 @@ +import { renderTemplate } from "./constants.js"; import { Misc } from "./misc.js"; import { RdDDice } from "./rdd-dice.js"; import { ReglesOptionnelles } from "./settings/regles-optionnelles.js"; @@ -236,7 +237,7 @@ export class RdDResolutionTable { maxCarac = Math.min(maxCarac, minCarac + 20); minLevel = Math.max(minLevel, -10); maxLevel = Math.max(Math.min(maxLevel, 30), minLevel + colonnes); - return await foundry.applications.handlebars.renderTemplate('systems/foundryvtt-reve-de-dragon/templates/resolution-table.hbs', { + return await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/resolution-table.hbs', { carac: carac, difficulte: level, min: minLevel, diff --git a/module/rdd-roll-encaisser.js b/module/rdd-roll-encaisser.js index e11b3a23..058c93ff 100644 --- a/module/rdd-roll-encaisser.js +++ b/module/rdd-roll-encaisser.js @@ -1,4 +1,4 @@ -import { ENTITE_BLURETTE, ENTITE_INCARNE } from "./constants.js"; +import { ENTITE_BLURETTE, ENTITE_INCARNE, renderTemplate } from "./constants.js"; import { RdDUtility } from "./rdd-utility.js"; /** diff --git a/module/rdd-roll-resolution-table.js b/module/rdd-roll-resolution-table.js index 6901c523..df19358b 100644 --- a/module/rdd-roll-resolution-table.js +++ b/module/rdd-roll-resolution-table.js @@ -1,3 +1,4 @@ +import { renderTemplate } from "./constants.js"; import { Misc } from "./misc.js"; import { RdDResolutionTable } from "./rdd-resolution-table.js"; diff --git a/module/rdd-roll-result.js b/module/rdd-roll-result.js index 3087ff2f..2495e366 100644 --- a/module/rdd-roll-result.js +++ b/module/rdd-roll-result.js @@ -1,4 +1,5 @@ import { ChatUtility } from "./chat-utility.js"; +import { renderTemplate } from "./constants.js"; export class RdDRollResult { @@ -13,6 +14,6 @@ export class RdDRollResult { static async buildRollDataHtml(rollData, template = 'chat-resultat-general.hbs') { rollData.show = rollData.show || {}; - return await foundry.applications.handlebars.renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/${template}`, rollData); + return await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/${template}`, rollData); } } diff --git a/module/rdd-roll.js b/module/rdd-roll.js index 7ae8900d..12fc6af9 100644 --- a/module/rdd-roll.js +++ b/module/rdd-roll.js @@ -8,8 +8,7 @@ import { RdDCarac } from "./rdd-carac.js"; import { RdDResolutionTable } from "./rdd-resolution-table.js"; import { ReglesOptionnelles } from "./settings/regles-optionnelles.js"; import { Grammar } from "./grammar.js"; -import { ACTOR_TYPES } from "./constants.js"; -import { RdDUtility } from "./rdd-utility.js"; +import { ACTOR_TYPES, renderTemplate } from "./constants.js"; /** * Extend the base Dialog entity to select roll parameters @@ -23,7 +22,7 @@ export class RdDRoll extends Dialog { RdDRoll._ensureCorrectAction(action); RdDRoll._setDefaultOptions(actor, rollData); - const html = await foundry.applications.handlebars.renderTemplate(dialogConfig.html, rollData); + const html = await renderTemplate(dialogConfig.html, rollData); let options = { classes: ["rdd-roll-dialog"], width: 650, height: 'fit-content', 'z-index': 99999, close: html => { } }; if (dialogConfig.close) { @@ -345,7 +344,7 @@ export class RdDRoll extends Dialog { /* -------------------------------------------- */ async buildAjustements(rollData) { - return await foundry.applications.handlebars.renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/partial-roll-ajustements.hbs`, rollData); + return await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/partial-roll-ajustements.hbs`, rollData); } /* -------------------------------------------- */ diff --git a/module/rdd-tmr-dialog.js b/module/rdd-tmr-dialog.js index dbf635f5..d6c77a4a 100644 --- a/module/rdd-tmr-dialog.js +++ b/module/rdd-tmr-dialog.js @@ -1,4 +1,4 @@ -import { SHOW_DICE, SYSTEM_RDD } from "./constants.js"; +import { renderTemplate, SHOW_DICE, SYSTEM_RDD } from "./constants.js"; import { RollDataAjustements } from "./rolldata-ajustements.js"; import { RdDUtility } from "./rdd-utility.js"; import { COORD_TMR_INCONNU, TMRUtility } from "./tmr-utility.js"; @@ -47,7 +47,7 @@ export class RdDTMRDialog extends Dialog { static async create(actor, tmrData) { await PixiTMR.init() - let html = await foundry.applications.handlebars.renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-tmr.hbs', tmrData); + let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-tmr.hbs', tmrData); if (tmrData.mode != 'visu' && !game.user.isGM) { ChatMessage.create({ content: actor.name + " est monté dans les TMR en mode : " + tmrData.mode, whisper: ChatUtility.getGMs() }); } @@ -508,7 +508,7 @@ export class RdDTMRDialog extends Dialog { ChatMessage.create({ whisper: ChatUtility.getOwners(this.actor), - content: await foundry.applications.handlebars.renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-rencontre-tmr.hbs`, rencData) + content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-rencontre-tmr.hbs`, rencData) }); this.$updateValuesDisplay(); diff --git a/module/rdd-token-hud.js b/module/rdd-token-hud.js index ac6bacaf..9fa182b3 100644 --- a/module/rdd-token-hud.js +++ b/module/rdd-token-hud.js @@ -1,4 +1,5 @@ /* -------------------------------------------- */ +import { renderTemplate } from "./constants.js"; import { HtmlUtility } from "./html-utility.js"; import { RdDCombatManager } from "./rdd-combat.js"; import { Targets } from "./targets.js"; @@ -132,7 +133,7 @@ export class RdDTokenHud { /* -------------------------------------------- */ static async _configureSubMenu(insertMethod, template, hudData, onMenuItem) { - const hud = $(await foundry.applications.handlebars.renderTemplate(template, hudData)); + const hud = $(await renderTemplate(template, hudData)); const list = hud.find('div.rdd-hud-list'); RdDTokenHud._toggleHudListActive(hud, list); diff --git a/module/roll/chat-roll-result.mjs b/module/roll/chat-roll-result.mjs index 7c22ad21..e30f1e72 100644 --- a/module/roll/chat-roll-result.mjs +++ b/module/roll/chat-roll-result.mjs @@ -4,6 +4,7 @@ import { RdDCarac } from "../rdd-carac.js" import { RdDCombat } from "../rdd-combat.js" import { ROLL_TYPE_ATTAQUE, ROLL_TYPE_DEFENSE } from "./roll-constants.mjs" import { RdDResolutionTable } from "../rdd-resolution-table.js" +import { RDD_CONFIG, renderTemplate } from "../constants.js" export default class ChatRollResult { static init() { @@ -76,7 +77,7 @@ export default class ChatRollResult { async buildRollHtml(roll) { const template = `systems/foundryvtt-reve-de-dragon/templates/roll/result/chat-${roll.type.current}.hbs` - return await foundry.applications.handlebars.renderTemplate(template, roll) + return await renderTemplate(template, roll) } async chatListeners(html) { diff --git a/module/roll/roll-dialog.mjs b/module/roll/roll-dialog.mjs index 2ecc326e..6a243ad9 100644 --- a/module/roll/roll-dialog.mjs +++ b/module/roll/roll-dialog.mjs @@ -39,6 +39,7 @@ import { RollDialogAdapter } from "./roll-dialog-adapter.mjs"; import { ROLLDIALOG_SECTION } from "./roll-part.mjs"; import { ROLL_TYPE_COMP } from "./roll-constants.mjs"; import ChatRollResult from "./chat-roll-result.mjs"; +import { renderTemplate } from "../constants.js"; const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api @@ -368,7 +369,7 @@ export default class RollDialog extends HandlebarsApplicationMixin(ApplicationV2 } async buildHTMLTable(carac, diff) { - return await foundry.applications.handlebars.renderTemplate('roll-table', { carac, diff }) + return await renderTemplate('roll-table', { carac, diff }) } async _prepareContext() { diff --git a/module/settings/system-compendiums.js b/module/settings/system-compendiums.js index fe782aaf..f602b80a 100644 --- a/module/settings/system-compendiums.js +++ b/module/settings/system-compendiums.js @@ -1,5 +1,5 @@ import { ChatUtility } from "../chat-utility.js"; -import { HIDE_DICE, SYSTEM_RDD } from "../constants.js"; +import { HIDE_DICE, renderTemplate, SYSTEM_RDD } from "../constants.js"; import { Grammar } from "../grammar.js"; import { RdDItem } from "../item.js"; import { Misc } from "../misc.js"; diff --git a/module/sommeil/dialog-chateau-dormant.js b/module/sommeil/dialog-chateau-dormant.js index c01075dc..64218b62 100644 --- a/module/sommeil/dialog-chateau-dormant.js +++ b/module/sommeil/dialog-chateau-dormant.js @@ -1,3 +1,4 @@ +import { renderTemplate } from "../constants.js"; export class DialogChateauDormant extends Dialog { @@ -9,7 +10,7 @@ export class DialogChateauDormant extends Dialog { motifStress: `Nuit du ${date}`, finChateauDormant: game.system.rdd.calendrier.getTimestampFinChateauDormant() }; - const html = await foundry.applications.handlebars.renderTemplate("systems/foundryvtt-reve-de-dragon/templates/sommeil/dialog-chateau-dormant.hbs", + const html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/sommeil/dialog-chateau-dormant.hbs", dialogData); new DialogChateauDormant(dialogData, html) diff --git a/module/sommeil/dialog-repos.js b/module/sommeil/dialog-repos.js index 7374a520..a7267e51 100644 --- a/module/sommeil/dialog-repos.js +++ b/module/sommeil/dialog-repos.js @@ -1,3 +1,4 @@ +import { renderTemplate } from "../constants.js"; import { ReglesOptionnelles } from "../settings/regles-optionnelles.js"; import { EffetsDraconiques } from "../tmr/effets-draconiques.js"; diff --git a/module/sommeil/dialog-stress.js b/module/sommeil/dialog-stress.js index 0b30c323..cdf7928e 100644 --- a/module/sommeil/dialog-stress.js +++ b/module/sommeil/dialog-stress.js @@ -1,3 +1,4 @@ +import { renderTemplate } from "../constants.js"; export class DialogStress extends Dialog { diff --git a/module/time/rdd-calendrier.js b/module/time/rdd-calendrier.js index 1c1671c5..83eeee3a 100644 --- a/module/time/rdd-calendrier.js +++ b/module/time/rdd-calendrier.js @@ -4,7 +4,7 @@ import { RdDResolutionTable } from "../rdd-resolution-table.js"; import { RdDDice } from "../rdd-dice.js"; import { Misc } from "../misc.js"; import { DialogChronologie } from "../dialog-chronologie.js"; -import { HIDE_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "../constants.js"; +import { HIDE_DICE, renderTemplate, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "../constants.js"; import { ReglesOptionnelles } from "../settings/regles-optionnelles.js"; import { DialogChateauDormant } from "../sommeil/dialog-chateau-dormant.js"; import { APP_ASTROLOGIE_REFRESH, AppAstrologie } from "../sommeil/app-astrologie.js"; diff --git a/module/tirage/fenetre-recherche-tirage.js b/module/tirage/fenetre-recherche-tirage.js index 932778d0..c72ee938 100644 --- a/module/tirage/fenetre-recherche-tirage.js +++ b/module/tirage/fenetre-recherche-tirage.js @@ -4,6 +4,7 @@ import { Misc } from "../misc.js"; import { CompendiumTableHelpers } from '../settings/system-compendiums.js'; import { RdDRaretes } from '../item/raretes.js'; import { Grammar } from '../grammar.js'; +import { renderTemplate } from '../constants.js'; const FILTER_GROUPS = [ { group: 'type', label: "Type d'objet" }, diff --git a/module/tmr-rencontres.js b/module/tmr-rencontres.js index 684fdf85..2281517e 100644 --- a/module/tmr-rencontres.js +++ b/module/tmr-rencontres.js @@ -1,3 +1,4 @@ +import { renderTemplate } from "./constants.js"; import { Grammar } from "./grammar.js"; import { Misc } from "./misc.js"; import { RdDDice } from "./rdd-dice.js"; @@ -102,7 +103,7 @@ export class TMRRencontres { /* -------------------------------------------- */ async $chatRolledRencontre(row, rencontre, tmr) { - const flavorContent = await foundry.applications.handlebars.renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-compendium-table-roll-rencontre.hbs', + const flavorContent = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-compendium-table-roll-rencontre.hbs', { roll: row.roll, rencontre, diff --git a/module/tmr/effets-rencontres.js b/module/tmr/effets-rencontres.js index 183c876c..675218a4 100644 --- a/module/tmr/effets-rencontres.js +++ b/module/tmr/effets-rencontres.js @@ -1,5 +1,6 @@ import { ExperienceLog, XP_TOPIC } from "../actor/experience-log.js"; import { ChatUtility } from "../chat-utility.js"; +import { renderTemplate } from "../constants.js"; import { Poetique } from "../poetique.js"; import { RdDDice } from "../rdd-dice.js"; import { ReglesOptionnelles } from "../settings/regles-optionnelles.js"; diff --git a/module/voyage/dialog-fatigue-voyage.js b/module/voyage/dialog-fatigue-voyage.js index 18c96e41..d1adce19 100644 --- a/module/voyage/dialog-fatigue-voyage.js +++ b/module/voyage/dialog-fatigue-voyage.js @@ -1,4 +1,4 @@ -import { ITEM_TYPES } from "../constants.js" +import { ITEM_TYPES, renderTemplate } from "../constants.js" import { RdDItemCompetence } from "../item-competence.js" import { ChatUtility } from "../chat-utility.js" import { Misc } from "../misc.js"