Updated minimum to v12

JPMeehan · Aug 4, 2024 · 36a30b2 · 36a30b2
1 parent 5627d30
commit 36a30b2
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 117 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.3.0
+
+- Updated minimum version to v12 and resolved related deprecations
+
 ## 1.2.3
 
 - Warfare token sheets now provide the appropriate options for attribute bars and single values again (#18)

diff --git a/module.json b/module.json
@@ -4,17 +4,17 @@
   "description": "Warfare Units and Organizations from MCDM's Kingdoms &amp; Warfare as actor types for the dnd5e system using v11 Module subtypes",
   "version": "#{VERSION}#",
   "compatibility": {
-    "minimum": "11",
-    "verified": "12.324"
+    "minimum": "12",
+    "verified": "12.330"
   },
   "relationships": {
     "systems": [
       {
         "id": "dnd5e",
         "type": "system",
         "compatibility": {
-          "minimum": "3.1",
-          "verified": "3.2.0"
+          "minimum": "3.2",
+          "verified": "3.3.1"
         }
       }
     ]

diff --git a/src/module/sheets/warfareSheet.mjs b/src/module/sheets/warfareSheet.mjs
@@ -214,9 +214,8 @@ export default class WarfareSheet extends ActorSheet {
    */
   async #handleEmbeddedDocumentCreate(event) {
     const documentClass = getDocumentClass(event.data.className);
-    const imageProp = event.data.className === 'ActiveEffect' ? 'icon' : 'img';
     documentClass.createDialog(
-      { [imageProp]: 'icons/svg/aura.svg' },
+      { img: 'icons/svg/aura.svg' },
       { parent: this.actor }
     );
   }

diff --git a/templates/warfare-sheet.hbs b/templates/warfare-sheet.hbs
@@ -5,18 +5,8 @@
     </div>
     <div class='description flexcol'>
       <div class='id flexrow'>
-        <img
-          class='profile'
-          src='{{actor.img}}'
-          data-tooltip='{{actor.name}}'
-          data-edit='img'
-        />
-        <input
-          type='text'
-          name='name'
-          value='{{actor.name}}'
-          placeholder='{{localize "DND5E.Name"}}'
-        />
+        <img class='profile' src='{{actor.img}}' data-tooltip='{{actor.name}}' data-edit='img' />
+        <input type='text' name='name' value='{{actor.name}}' placeholder='{{localize "DND5E.Name"}}' />
       </div>
       <div class='tags flexcol'>
         <div class='commander'>
@@ -32,27 +22,22 @@
         <div class='modifiers flexrow'>
           <select class='experience' name='system.experience'>
             {{selectOptions
-              choices.EXPERIENCE
-              selected=system.experience
-              localize=true
+            choices.EXPERIENCE
+            selected=system.experience
+            localize=true
             }}
           </select>
           <select class='gear' name='system.gear'>
             {{selectOptions choices.GEAR selected=system.gear localize=true}}
           </select>
-          <input
-            class='ancestry'
-            type='text'
-            name='system.ancestry'
-            value='{{system.ancestry}}'
-            placeholder='{{localize "KNW.Warfare.Ancestry"}}'
-          />
+          <input class='ancestry' type='text' name='system.ancestry' value='{{system.ancestry}}'
+            placeholder='{{localize "KNW.Warfare.Ancestry"}}' />
           <select class='type' name='system.type'>
             {{selectOptions
-              choices.TYPE
-              labelAttr='label'
-              selected=system.type
-              localize=true
+            choices.TYPE
+            labelAttr='label'
+            selected=system.type
+            localize=true
             }}
           </select>
         </div>
@@ -68,28 +53,20 @@
     </div>
   </div>
   <div class='statistics flexrow'>
-    <div
-      class='attacks'
-      data-tooltip='{{localize "KNW.Warfare.Statistics.attacks.long"}}'
-    >
+    <div class='attacks' data-tooltip='{{localize "KNW.Warfare.Statistics.attacks.long"}}'>
       {{numberInput system.attacks name='system.attacks' min=0}}
     </div>
     {{#each coreStats}}
-      <div class='coreStat flexcol'>
-        <div class='label {{this.rollable}}' data-target='{{@key}}'>
-          {{#if this.rollable}}<a>{{this.label}}</a>
-          {{else}}{{this.label}}
-          {{/if}}
-        </div>
-        <div class='value'>
-          <input
-            type='text'
-            name='system.{{@key}}'
-            value={{this.value}}
-            data-dtype='Number'
-          />
-        </div>
+    <div class='coreStat flexcol'>
+      <div class='label {{this.rollable}}' data-target='{{@key}}'>
+        {{#if this.rollable}}<a>{{this.label}}</a>
+        {{else}}{{this.label}}
+        {{/if}}
+      </div>
+      <div class='value'>
+        <input type='text' name='system.{{@key}}' value={{this.value}} data-dtype='Number' />
       </div>
+    </div>
     {{/each}}
   </div>
   <div class='footer flexrow'>
@@ -117,85 +94,62 @@
         <div class='tab' data-group='primary' data-tab='traits'>
           <ul class='traitList'>
             {{#each traits as |trait|}}
-              <li>{{trait}}</li>
+            <li>{{trait}}</li>
             {{/each}}
           </ul>
         </div>
         <div class='tab' data-group='primary' data-tab='items'>
           <ul class='itemList'>
             {{#each items as |item|}}
-              <li class='item flexrow' data-item-id='{{item._id}}'>
-                <div class='item-name flexrow'>
-                  <img class='item-image' src='{{item.img}}' />
-                  <h4
-                    data-tooltip='{{{item.system.description.value}}}'
-                  >{{item.name}}</h4>
-                </div>
-                <div class='item-controls flexrow'>
-                  <a
-                    class='item-control'
-                    data-action='edit'
-                    data-tooltip='DND5E.ItemEdit'
-                  >
-                    <i class='fas fa-edit'></i>
-                  </a>
-                  <a
-                    class='item-control'
-                    data-action='delete'
-                    data-tooltip='DND5E.ItemDelete'
-                  >
-                    <i class='fas fa-trash'></i>
-                  </a>
-                </div>
-              </li>
+            <li class='item flexrow' data-item-id='{{item._id}}'>
+              <div class='item-name flexrow'>
+                <img class='item-image' src='{{item.img}}' />
+                <h4 data-tooltip='{{{item.system.description.value}}}'>{{item.name}}</h4>
+              </div>
+              <div class='item-controls flexrow'>
+                <a class='item-control' data-action='edit' data-tooltip='DND5E.ItemEdit'>
+                  <i class='fas fa-edit'></i>
+                </a>
+                <a class='item-control' data-action='delete' data-tooltip='DND5E.ItemDelete'>
+                  <i class='fas fa-trash'></i>
+                </a>
+              </div>
+            </li>
             {{/each}}
           </ul>
         </div>
         <div class='tab' data-group='primary' data-tab='effects'>
           <ul class='effectList'>
             {{#each effects as |effect|}}
-              <li class='effect flexrow' data-effect-id='{{effect._id}}'>
-                <div class='effect-name flexrow'>
-                  <!-- TODO: v12 update to effect.img -->
-                  <img class='effect-image' src='{{effect.icon}}' />
-                  <h4 data-tooltip='{{{effect.description}}}'>
-                    {{#unless effect.disabled}}
-                      <strong>
-                        {{effect.name}}
-                      </strong>
-                    {{else}}
-                      {{effect.name}}
-                    {{/unless}}
-                  </h4>
-                </div>
-                <div class='effect-controls flexrow'>
-                  <a
-                    class='effect-control'
-                    data-action='toggle'
-                    data-tooltip='DND5E.EffectToggle'
-                  >
-                    {{#if effect.disabled}}
-                      <i class='fas fa-check'></i>
-                    {{else}}
-                      <i class='fas fa-times'></i>
-                    {{/if}}
-                  </a>
-                  <a
-                    class='effect-control'
-                    data-action='edit'
-                    data-tooltip='DND5E.EffectEdit'
-                  >
-                    <i class='fas fa-edit'></i>
-                  </a>
-                  <a
-                    class='effect-control'
-                    data-action='delete'
-                    data-tooltip='DND5E.EffectDelete'
-                  >
-                    <i class='fas fa-trash'></i>
-                  </a>
-                </div>
-              </li>
+            <li class='effect flexrow' data-effect-id='{{effect._id}}'>
+              <div class='effect-name flexrow'>
+                <img class='effect-image' src='{{effect.img}}' />
+                <h4 data-tooltip='{{{effect.description}}}'>
+                  {{#unless effect.disabled}}
+                  <strong>
+                    {{effect.name}}
+                  </strong>
+                  {{else}}
+                  {{effect.name}}
+                  {{/unless}}
+                </h4>
+              </div>
+              <div class='effect-controls flexrow'>
+                <a class='effect-control' data-action='toggle' data-tooltip='DND5E.EffectToggle'>
+                  {{#if effect.disabled}}
+                  <i class='fas fa-check'></i>
+                  {{else}}
+                  <i class='fas fa-times'></i>
+                  {{/if}}
+                </a>
+                <a class='effect-control' data-action='edit' data-tooltip='DND5E.EffectEdit'>
+                  <i class='fas fa-edit'></i>
+                </a>
+                <a class='effect-control' data-action='delete' data-tooltip='DND5E.EffectDelete'>
+                  <i class='fas fa-trash'></i>
+                </a>
+              </div>
+            </li>
             {{/each}}
             <li class='effect flexrow create'>
               <a class='effect-create' data-tooltip='DND5E.EffectCreate'>