Fix more deprecation warnings.

Wibble199 · Feb 24, 2025 · a1f15fa · a1f15fa
1 parent 20fe5e5
commit a1f15fa
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/module/applications/terrain-types-config.mjs b/module/applications/terrain-types-config.mjs
@@ -54,7 +54,7 @@ export class TerrainTypesConfig extends FormApplication {
 		const formData = super._getSubmitData(updateData);
 
 		/** @type {(TerrainType & { isZone: boolean; })[]} */
-		const terrainTypes = Object.entries(expandObject(formData))
+		const terrainTypes = Object.entries(foundry.utils.expandObject(formData))
 			.sort((a, b) => a[0] - b[0])
 			.map(([_, value]) => value);
 
@@ -135,7 +135,11 @@ export class TerrainTypesConfig extends FormApplication {
 		this.sync();
 		const { terrainTypeId } = event.currentTarget.closest("[data-terrain-type-id]").dataset;
 		const existingTerrainType = this.object.find(t => t.id === terrainTypeId);
-		const newTerrainType = { ...existingTerrainType, id: randomID(), name: existingTerrainType.name + " (2)" };
+		const newTerrainType = {
+			...existingTerrainType,
+			id: foundry.utils.randomID(),
+			name: existingTerrainType.name + " (2)"
+		};
 		this.object.push(newTerrainType);
 		this._expandedTypes[newTerrainType.id] = true;
 		this.render();

diff --git a/module/utils/terrain-types.mjs b/module/utils/terrain-types.mjs
@@ -36,7 +36,7 @@ import { alphaToHex } from "./misc-utils.mjs";
  */
 export function createDefaultTerrainType(id = undefined) {
 	return {
-		id: id ?? randomID(),
+		id: id ?? foundry.utils.randomID(),
 		name: "New Terrain Type",
 		usesHeight: true,
 		isSolid: true,

diff --git a/styles/main.css b/styles/main.css
@@ -299,6 +299,10 @@ ul.terrain-type-palette li .terrain-type-name {
 	font-family: Consolas, Courier New, Courier, monaco, monospace;
 }
 
+#tht_terrainTypesConfig file-picker {
+	align-items: stretch;
+}
+
 
 /* --------------------------- */
 /* Terrain Types Import/Export */

diff --git a/templates/terrain-types-config.hbs b/templates/terrain-types-config.hbs
@@ -50,7 +50,7 @@
 
 						<div class="form-group-stacked">
 							<label>{{localize "DRAWING.StrokeColor"}}</label>
-							{{colorPicker name=(concat idx ".lineColor") value=terrainType.lineColor}}
+							<color-picker name="{{idx}}.lineColor" value="{{terrainType.lineColor}}" />
 						</div>
 
 						<div class="form-group-stacked">
@@ -84,7 +84,7 @@
 
 						<div class="form-group-stacked">
 							<label>{{localize "DRAWING.FillColor"}}</label>
-							{{colorPicker name=(concat idx ".fillColor") value=terrainType.fillColor}}
+							<color-picker name="{{idx}}.fillColor" value="{{terrainType.fillColor}}" />
 						</div>
 
 						<div class="form-group-stacked">
@@ -97,8 +97,7 @@
 						<div class="form-group-stacked">
 							<label>{{localize "DRAWING.FillTexture"}}</label>
 							<div class="form-group">
-								{{filePicker target=(concat idx ".fillTexture") type="image"}}
-								<input class="image" type="text" name="{{idx}}.fillTexture" placeholder="path/image.png" value="{{terrainType.fillTexture}}"/>
+								<file-picker name="{{idx}}.fillTexture" type="image" value="{{terrainType.fillTexture}}"></file-picker>
 							</div>
 						</div>
 
@@ -153,7 +152,7 @@
 
 						<div class="form-group-stacked">
 							<label>{{localize "DRAWING.TextColor"}}</label>
-							{{colorPicker name=(concat idx ".textColor") value=terrainType.textColor}}
+							<color-picker name="{{idx}}.textColor" value="{{terrainType.textColor}}" />
 						</div>
 
 						<div class="form-group-stacked">