From 5c8b3db81f366105e58eb4de533ccddeb57f8168 Mon Sep 17 00:00:00 2001
From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com>
Date: Sun, 14 Jul 2024 15:08:35 +0800
Subject: [PATCH 1/3] move Base apparel to patch

For Some Reason the Defs won't load, but to move to patch works
---
 .../Defs/JDS EFT Apparel/Apparel_Base.xml     |  98 -----------------
 .../Patches/JDS EFT Apparel/Apparel_Armor.xml | 100 ++++++++++++++++++
 2 files changed, 100 insertions(+), 98 deletions(-)
 delete mode 100644 ModPatches/JDS EFT Apparel/Defs/JDS EFT Apparel/Apparel_Base.xml

diff --git a/ModPatches/JDS EFT Apparel/Defs/JDS EFT Apparel/Apparel_Base.xml b/ModPatches/JDS EFT Apparel/Defs/JDS EFT Apparel/Apparel_Base.xml
deleted file mode 100644
index 088fac5122..0000000000
--- a/ModPatches/JDS EFT Apparel/Defs/JDS EFT Apparel/Apparel_Base.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Defs>
-
-	<!-- === Helmets - Face Shield / Eye Shield Base === -->
-
-	<ThingDef Name="EFTHeadgearShield" ParentName="JDSFrontierHeadgearBase" Abstract="True">
-		<apparel Inherit="False">
-			<bodyPartGroups>
-				<li>FullHead</li>
-			</bodyPartGroups>
-			<layers>
-				<li>Overhead</li>
-			</layers>
-			<tags>
-				<li>MilitaryHeadgear</li>
-			</tags>
-			<defaultOutfitTags>
-				<li>Soldier</li>
-			</defaultOutfitTags>
-			<useDeflectMetalEffect>true</useDeflectMetalEffect>
-		</apparel>
-	</ThingDef>
-
-	<ThingDef Name="EFTHeadgearEyeShield" ParentName="JDSFrontierHeadgearBase" Abstract="True">
-		<apparel Inherit="False">
-			<bodyPartGroups>
-				<li>UpperHead</li>
-				<li>Eyes</li>
-			</bodyPartGroups>
-			<layers>
-				<li>Overhead</li>
-			</layers>
-			<tags>
-				<li>MilitaryHeadgear</li>
-			</tags>
-			<defaultOutfitTags>
-				<li>Soldier</li>
-			</defaultOutfitTags>
-			<useDeflectMetalEffect>true</useDeflectMetalEffect>
-		</apparel>
-	</ThingDef>
-
-	<!-- === Caps / Ushanka / Beanie  ===  -->
-
-	<ThingDef Name="EFTHeadgearCaps" ParentName="JDSFrontierFaceMaskBase" Abstract="True">
-		<apparel Inherit="False">
-			<bodyPartGroups>
-				<li>UpperHead</li>
-			</bodyPartGroups>
-			<layers>
-				<li>Overhead</li>
-			</layers>
-			<tags>
-				<li>MilitaryHeadgear</li>
-			</tags>
-			<defaultOutfitTags>
-				<li>Soldier</li>
-			</defaultOutfitTags>
-		</apparel>
-	</ThingDef>
-
-	<ThingDef Name="EFTHeadgearBeanie" ParentName="JDSFrontierFaceMaskBase" Abstract="True">
-		<apparel Inherit="False">
-			<bodyPartGroups>
-				<li>UpperHead</li>
-			</bodyPartGroups>
-			<layers>
-				<li>OnHead</li>
-			</layers>
-			<tags>
-				<li>MilitaryHeadgear</li>
-			</tags>
-			<defaultOutfitTags>
-				<li>Soldier</li>
-			</defaultOutfitTags>
-		</apparel>
-	</ThingDef>
-
-	<!-- === Webbing === -->
-
-	<ThingDef Name="EFTWebbingBase" ParentName="JDSFrontierChestRigBase" Abstract="True">
-		<apparel Inherit="False">
-			<bodyPartGroups>
-				<li>Shoulders</li>
-			</bodyPartGroups>
-			<layers>
-				<li>Webbing</li>
-			</layers>
-			<tags>
-				<li>MilitaryArmor</li>
-			</tags>
-			<defaultOutfitTags>
-				<li>Soldier</li>
-			</defaultOutfitTags>
-		</apparel>
-	</ThingDef>
-
-</Defs>
\ No newline at end of file
diff --git a/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml b/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml
index c5d49fb680..bc2ad6e657 100644
--- a/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml	
+++ b/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml	
@@ -1,5 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
+	<!-- === For Some Reason the Defs won't load, but to move to patch works === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs</xpath>
+		<value>
+			<!-- === Helmets - Face Shield / Eye Shield Base === -->
+
+			<ThingDef Name="EFTHeadgearShield" ParentName="JDSFrontierHeadgearBase" Abstract="True">
+				<apparel Inherit="False">
+					<bodyPartGroups>
+						<li>FullHead</li>
+					</bodyPartGroups>
+					<layers>
+						<li>Overhead</li>
+					</layers>
+					<tags>
+						<li>MilitaryHeadgear</li>
+					</tags>
+					<defaultOutfitTags>
+						<li>Soldier</li>
+					</defaultOutfitTags>
+					<useDeflectMetalEffect>true</useDeflectMetalEffect>
+				</apparel>
+			</ThingDef>
+
+			<ThingDef Name="EFTHeadgearEyeShield" ParentName="JDSFrontierHeadgearBase" Abstract="True">
+				<apparel Inherit="False">
+					<bodyPartGroups>
+						<li>UpperHead</li>
+						<li>Eyes</li>
+					</bodyPartGroups>
+					<layers>
+						<li>Overhead</li>
+					</layers>
+					<tags>
+						<li>MilitaryHeadgear</li>
+					</tags>
+					<defaultOutfitTags>
+						<li>Soldier</li>
+					</defaultOutfitTags>
+					<useDeflectMetalEffect>true</useDeflectMetalEffect>
+				</apparel>
+			</ThingDef>
+
+			<!-- === Caps / Ushanka / Beanie === -->
+
+			<ThingDef Name="EFTHeadgearCaps" ParentName="JDSFrontierFaceMaskBase" Abstract="True">
+				<apparel Inherit="False">
+					<bodyPartGroups>
+						<li>UpperHead</li>
+					</bodyPartGroups>
+					<layers>
+						<li>Overhead</li>
+					</layers>
+					<tags>
+						<li>MilitaryHeadgear</li>
+					</tags>
+					<defaultOutfitTags>
+						<li>Soldier</li>
+					</defaultOutfitTags>
+				</apparel>
+			</ThingDef>
+
+			<ThingDef Name="EFTHeadgearBeanie" ParentName="JDSFrontierFaceMaskBase" Abstract="True">
+				<apparel Inherit="False">
+					<bodyPartGroups>
+						<li>UpperHead</li>
+					</bodyPartGroups>
+					<layers>
+						<li>OnHead</li>
+					</layers>
+					<tags>
+						<li>MilitaryHeadgear</li>
+					</tags>
+					<defaultOutfitTags>
+						<li>Soldier</li>
+					</defaultOutfitTags>
+				</apparel>
+			</ThingDef>
+
+			<!-- === Webbing === -->
+
+			<ThingDef Name="EFTWebbingBase" ParentName="JDSFrontierChestRigBase" Abstract="True">
+				<apparel Inherit="False">
+					<bodyPartGroups>
+						<li>Shoulders</li>
+					</bodyPartGroups>
+					<layers>
+						<li>Webbing</li>
+					</layers>
+					<tags>
+						<li>MilitaryArmor</li>
+					</tags>
+					<defaultOutfitTags>
+						<li>Soldier</li>
+					</defaultOutfitTags>
+				</apparel>
+			</ThingDef>
+		</value>
+	</Operation>
 
 	<!-- === Class 2 === -->
 
@@ -322,4 +421,5 @@
 		</value>
 	</Operation>
 
+
 </Patch>
\ No newline at end of file

From 93ee5bbf60e9ef07e41a1d22975ff77fd7be5682 Mon Sep 17 00:00:00 2001
From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com>
Date: Sun, 14 Jul 2024 15:13:26 +0800
Subject: [PATCH 2/3] Update Apparel_Armor.xml

---
 .../JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml b/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml
index bc2ad6e657..4eea6778e1 100644
--- a/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml	
+++ b/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml	
@@ -421,5 +421,4 @@
 		</value>
 	</Operation>
 
-
 </Patch>
\ No newline at end of file

From 2145000f5bd33f1947e82da2f9b74b1c6370299e Mon Sep 17 00:00:00 2001
From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com>
Date: Sun, 14 Jul 2024 15:18:40 +0800
Subject: [PATCH 3/3] Update Apparel_Armor.xml

---
 .../JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml b/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml
index 4eea6778e1..456fa2cad1 100644
--- a/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml	
+++ b/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml	
@@ -2,7 +2,7 @@
 <Patch>
 	<!-- === For Some Reason the Defs won't load, but to move to patch works === -->
 	<Operation Class="PatchOperationAdd">
-		<xpath>/Defs</xpath>
+		<xpath>Defs</xpath>
 		<value>
 			<!-- === Helmets - Face Shield / Eye Shield Base === -->