Merge pull request #60 from YakFromStateFarm/magic-items-2-fix

Fixing issues with magic items not displaying
Larkinabout · Aug 9, 2023 · 3069358 · 3069358
2 parents b667f10 + eece0bc
commit 3069358
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,5 +12,6 @@
     "eslint-plugin-promise": "^6.1.0",
     "rollup": "^2.56.3",
     "rollup-plugin-terser": "^7.0.2"
-  }
+  },
+  "type": "module"
 }
diff --git a/scripts/system-manager.js b/scripts/system-manager.js
@@ -18,7 +18,7 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
         /** @override */
         doGetActionHandler (categoryManager) {
             const actionHandler = new ActionHandler(categoryManager)
-            if (coreModule.api.Utils.isModuleActive('magicitems')) { actionHandler.addFurtherActionHandler(new MagicItemActionListExtender(actionHandler)) }
+            if (coreModule.api.Utils.isModuleActive('magic-items-2') || coreModule.api.Utils.isModuleActive('magicitems')) { actionHandler.addFurtherActionHandler(new MagicItemActionListExtender(actionHandler)) }
             return actionHandler
         }
 
@@ -59,7 +59,7 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
         async doRegisterDefaultFlags () {
             const defaults = DEFAULTS
             // If the 'Magic Items' module is active, then add a group for it
-            if (game.modules.get('magicitems')?.active) {
+            if (game.modules.get('magicitems')?.active || game.modules.get('magic-items-2')?.active) {
                 const name = coreModule.api.Utils.i18n('tokenActionHud.dnd5e.magicItems')
                 defaults.groups.push(
                     {

diff --git a/scripts/token-action-hud-dnd5e.min.js b/scripts/token-action-hud-dnd5e.min.js