From 6913be61f04161a2665230603fdf736ce3d59eac Mon Sep 17 00:00:00 2001
From: Michael Becker <alcexhim@gmail.com>
Date: Sat, 19 Sep 2020 23:22:38 -0400
Subject: [PATCH] combine multiple associations for the same data format into a
 single association

---
 .../FileSystem/ChaosWorksEngine.uexml         | 17 ++++++-----------
 .../PictureCollection/SPXDataFormat.uexml     | 19 ++++++++++---------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/Plugins/UniversalEditor.Plugins.ChaosWorks/Associations/FileSystem/ChaosWorksEngine.uexml b/Plugins/UniversalEditor.Plugins.ChaosWorks/Associations/FileSystem/ChaosWorksEngine.uexml
index 29f1c734..9ffd10b5 100644
--- a/Plugins/UniversalEditor.Plugins.ChaosWorks/Associations/FileSystem/ChaosWorksEngine.uexml
+++ b/Plugins/UniversalEditor.Plugins.ChaosWorks/Associations/FileSystem/ChaosWorksEngine.uexml
@@ -3,17 +3,7 @@
 	<Associations>
 		<Association>
 			<Filters>
-				<Filter Title="Chaos Works Engine volume archive, format version 1">
-					<FileNameFilters>
-						<FileNameFilter>*.vol</FileNameFilter>
-					</FileNameFilters>
-					<MagicByteSequences>
-						<MagicByteSequence Offset="-4">
-							<MagicByte Type="HexString">02420243</MagicByte>
-						</MagicByteSequence>
-					</MagicByteSequences>
-				</Filter>
-				<Filter Title="Chaos Works Engine volume archive, format version 2">
+				<Filter Title="Chaos Works Engine volume archive" ContentType="application/x-cwe-vol" HintComparison="MagicThenFilter">
 					<FileNameFilters>
 						<FileNameFilter>*.vol</FileNameFilter>
 						<FileNameFilter>*.v01</FileNameFilter>
@@ -28,6 +18,11 @@
 						<FileNameFilter>*.v10</FileNameFilter>
 					</FileNameFilters>
 					<MagicByteSequences>
+						<!-- format version 1 -->
+						<MagicByteSequence Offset="-4">
+							<MagicByte Type="HexString">02420243</MagicByte>
+						</MagicByteSequence>
+						<!-- format version 2 -->
 						<MagicByteSequence Offset="-8">
 							<MagicByte Type="String"> cweVOLF</MagicByte>
 						</MagicByteSequence>
diff --git a/Plugins/UniversalEditor.Plugins.ChaosWorks/Associations/Multimedia/PictureCollection/SPXDataFormat.uexml b/Plugins/UniversalEditor.Plugins.ChaosWorks/Associations/Multimedia/PictureCollection/SPXDataFormat.uexml
index c1d70f10..7121b989 100644
--- a/Plugins/UniversalEditor.Plugins.ChaosWorks/Associations/Multimedia/PictureCollection/SPXDataFormat.uexml
+++ b/Plugins/UniversalEditor.Plugins.ChaosWorks/Associations/Multimedia/PictureCollection/SPXDataFormat.uexml
@@ -3,20 +3,21 @@
 	<Associations>
 		<Association>
 			<Filters>
-				<Filter Title="Chaos Works Engine sprite (low-resolution)">
+				<Filter Title="Chaos Works Engine sprite" ContentType="image/x-cwe-sprite" HintComparison="MagicThenFilter">
 					<FileNameFilters>
+						<!-- low-resolution -->
 						<FileNameFilter>*.spl</FileNameFilter>
-					</FileNameFilters>
-				</Filter>
-				<Filter Title="Chaos Works Engine sprite (high-resolution)">
-					<FileNameFilters>
+						<!-- high-resolution -->
 						<FileNameFilter>*.sph</FileNameFilter>
-					</FileNameFilters>
-				</Filter>
-				<Filter Title="Chaos Works Engine sprite (XCOLOR)">
-					<FileNameFilters>
+						<!-- XCOLOR -->
 						<FileNameFilter>*.spx</FileNameFilter>
 					</FileNameFilters>
+					<MagicByteSequences>
+						<!-- format version 1 -->
+						<MagicByteSequence>
+							<MagicByte Type="String">CWE sprite</MagicByte>
+						</MagicByteSequence>
+					</MagicByteSequences>
 				</Filter>
 			</Filters>
 			<ObjectModels>