From fe2e6fd6962018d093c781416f2a075e35dddf45 Mon Sep 17 00:00:00 2001
From: Freagarach <freagarach@wildfiregames.com>
Date: Sun, 10 Jan 2021 09:41:00 +0000
Subject: [PATCH] Allow mods to insert or delete individual resource icons more
 easily.

In 52f311da2b code was made resource agnostic except a few places.
This fixes one of them.
(Notice that this approach also addresses Vladislavs recommendation to
load all textures at XML parsing time rather than at JS runtime
(D1745).)

Ticket: #3934
Patch by: @elexis
Differential revision: D2329
Reviewed by: @Freagarach, @wraitii
This was SVN commit r24531.
---
 .../mods/public/gui/common/resources/food.xml |  8 +++++
 .../public/gui/common/resources/metal.xml     |  8 +++++
 .../gui/common/resources/setup_resources.xml  | 16 ++++++++++
 .../public/gui/common/resources/stone.xml     |  8 +++++
 .../mods/public/gui/common/resources/wood.xml |  8 +++++
 .../public/gui/common/setup_resources.xml     | 32 -------------------
 .../data/mods/public/gui/page_session.xml     |  3 +-
 .../data/mods/public/gui/page_structree.xml   |  3 +-
 binaries/data/mods/public/gui/page_viewer.xml |  3 +-
 9 files changed, 54 insertions(+), 35 deletions(-)
 create mode 100644 binaries/data/mods/public/gui/common/resources/food.xml
 create mode 100644 binaries/data/mods/public/gui/common/resources/metal.xml
 create mode 100644 binaries/data/mods/public/gui/common/resources/setup_resources.xml
 create mode 100644 binaries/data/mods/public/gui/common/resources/stone.xml
 create mode 100644 binaries/data/mods/public/gui/common/resources/wood.xml
 delete mode 100644 binaries/data/mods/public/gui/common/setup_resources.xml

diff --git a/binaries/data/mods/public/gui/common/resources/food.xml b/binaries/data/mods/public/gui/common/resources/food.xml
new file mode 100644
index 0000000000..7a1b2b7e0d
--- /dev/null
+++ b/binaries/data/mods/public/gui/common/resources/food.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_food"
+		sprite="stretched:session/icons/resources/food_small.png"
+		size="16 16"
+	/>
+</setup>
diff --git a/binaries/data/mods/public/gui/common/resources/metal.xml b/binaries/data/mods/public/gui/common/resources/metal.xml
new file mode 100644
index 0000000000..a8a84f6e0e
--- /dev/null
+++ b/binaries/data/mods/public/gui/common/resources/metal.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_metal"
+		sprite="stretched:session/icons/resources/metal_small.png"
+		size="16 16"
+	/>
+</setup>
diff --git a/binaries/data/mods/public/gui/common/resources/setup_resources.xml b/binaries/data/mods/public/gui/common/resources/setup_resources.xml
new file mode 100644
index 0000000000..7f04f1c30d
--- /dev/null
+++ b/binaries/data/mods/public/gui/common/resources/setup_resources.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_population"
+		sprite="stretched:session/icons/resources/population_small.png"
+		size="16 16"
+	/>
+	<icon name="icon_time"
+		sprite="stretched:session/icons/resources/time_small.png"
+		size="16 16"
+	/>
+	<icon name="icon_xp"
+		sprite="stretched:session/icons/promote.png"
+		size="16 16"
+	/>
+</setup>
diff --git a/binaries/data/mods/public/gui/common/resources/stone.xml b/binaries/data/mods/public/gui/common/resources/stone.xml
new file mode 100644
index 0000000000..95f111770e
--- /dev/null
+++ b/binaries/data/mods/public/gui/common/resources/stone.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_stone"
+		sprite="stretched:session/icons/resources/stone_small.png"
+		size="16 16"
+	/>
+</setup>
diff --git a/binaries/data/mods/public/gui/common/resources/wood.xml b/binaries/data/mods/public/gui/common/resources/wood.xml
new file mode 100644
index 0000000000..9bde01f0f1
--- /dev/null
+++ b/binaries/data/mods/public/gui/common/resources/wood.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_wood"
+		sprite="stretched:session/icons/resources/wood_small.png"
+		size="16 16"
+	/>
+</setup>
diff --git a/binaries/data/mods/public/gui/common/setup_resources.xml b/binaries/data/mods/public/gui/common/setup_resources.xml
deleted file mode 100644
index d20789df24..0000000000
--- a/binaries/data/mods/public/gui/common/setup_resources.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<setup>
-	<icon name="icon_food"
-		sprite="stretched:session/icons/resources/food_small.png"
-		size="16 16"
-	/>
-	<icon name="icon_metal"
-		sprite="stretched:session/icons/resources/metal_small.png"
-		size="16 16"
-	/>
-	<icon name="icon_population"
-		sprite="stretched:session/icons/resources/population_small.png"
-		size="16 16"
-	/>
-	<icon name="icon_stone"
-		sprite="stretched:session/icons/resources/stone_small.png"
-		size="16 16"
-	/>
-	<icon name="icon_wood"
-		sprite="stretched:session/icons/resources/wood_small.png"
-		size="16 16"
-	/>
-	<icon name="icon_time"
-		sprite="stretched:session/icons/resources/time_small.png"
-		size="16 16"
-	/>
-	<icon name="icon_xp"
-		sprite="stretched:session/icons/promote.png"
-		size="16 16"
-	/>
-</setup>
diff --git a/binaries/data/mods/public/gui/page_session.xml b/binaries/data/mods/public/gui/page_session.xml
index 13093b6b0b..88d361219c 100644
--- a/binaries/data/mods/public/gui/page_session.xml
+++ b/binaries/data/mods/public/gui/page_session.xml
@@ -4,8 +4,9 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
+	<include>common/resources/</include>
+
 	<include>common/setup.xml</include>
-	<include>common/setup_resources.xml</include>
 	<include>common/sprites.xml</include>
 	<include>common/styles.xml</include>
 
diff --git a/binaries/data/mods/public/gui/page_structree.xml b/binaries/data/mods/public/gui/page_structree.xml
index 52943c157a..8131450292 100644
--- a/binaries/data/mods/public/gui/page_structree.xml
+++ b/binaries/data/mods/public/gui/page_structree.xml
@@ -4,7 +4,8 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
-	<include>common/setup_resources.xml</include>
+	<include>common/resources/</include>
+
 	<include>common/sprites.xml</include>
 	<include>common/styles.xml</include>
 
diff --git a/binaries/data/mods/public/gui/page_viewer.xml b/binaries/data/mods/public/gui/page_viewer.xml
index 89d23de55b..fe891f3468 100644
--- a/binaries/data/mods/public/gui/page_viewer.xml
+++ b/binaries/data/mods/public/gui/page_viewer.xml
@@ -4,7 +4,8 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
-	<include>common/setup_resources.xml</include>
+	<include>common/resources/</include>
+
 	<include>common/sprites.xml</include>
 	<include>common/styles.xml</include>