diff --git a/binaries/data/mods/mod/art/LICENSE.txt b/binaries/data/mods/mod/art/LICENSE.txt
new file mode 100644
index 0000000000..78017847c2
--- /dev/null
+++ b/binaries/data/mods/mod/art/LICENSE.txt
@@ -0,0 +1,19 @@
+The files in this directory are Copyright (C) 2014 Wildfire Games.
+
+These files are licensed under the Creative Commons Attribution-Share Alike 3.0
+(CC-by-sa) license, available at http://creativecommons.org/licenses/by-sa/3.0/
+
+Briefly, this means:
+
+* You may use, modify and distribute these files, for commercial and
+ non-commercial purposes.
+
+* If you distribute one of these files, you must include attribution (e.g.
+ in the credits screen of a game or a video, or in a text file accompanying
+ the files). The attribution must include:
+ * A link to http://creativecommons.org/licenses/by-sa/3.0/
+ * The name "Wildfire Games" as the original author
+ * A link to http://www.wildfiregames.com/
+
+* If you distribute one of these files, you must release it (and any
+ modifications you have made to it) under the CC-by-sa license.
diff --git a/binaries/data/mods/public/art/textures/cursors/test.png b/binaries/data/mods/mod/art/textures/cursors/test.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/cursors/test.png
rename to binaries/data/mods/mod/art/textures/cursors/test.png
diff --git a/binaries/data/mods/public/art/textures/cursors/test.txt b/binaries/data/mods/mod/art/textures/cursors/test.txt
similarity index 100%
rename from binaries/data/mods/public/art/textures/cursors/test.txt
rename to binaries/data/mods/mod/art/textures/cursors/test.txt
diff --git a/binaries/data/mods/mod/art/textures/texture.rnc b/binaries/data/mods/mod/art/textures/texture.rnc
new file mode 100644
index 0000000000..c5af751dfa
--- /dev/null
+++ b/binaries/data/mods/mod/art/textures/texture.rnc
@@ -0,0 +1,19 @@
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+##
+# NOTE: To modify this Relax NG grammar, edit the Relax NG Compact (.rnc) file
+# and use a converter tool like trang to generate the Relax NG XML (.rng) file
+##
+
+element Textures {
+ element File {
+ attribute pattern { text }? &
+ attribute format { "dxt1" | "dxt3" | "dxt5" | "rgba" | "alpha" }? &
+ attribute mipmap { "true" | "false" }? &
+ attribute normal { "true" | "false" }? &
+ attribute alpha { "none" | "player" | "transparency" }? &
+ attribute filter { "box" | "triangle" | "kaiser" }? &
+ attribute kaiserwidth { xsd:float }? &
+ attribute kaiseralpha { xsd:float }? &
+ attribute kaiserstretch { xsd:float }?
+ }*
+}
diff --git a/binaries/data/mods/mod/art/textures/texture.rng b/binaries/data/mods/mod/art/textures/texture.rng
new file mode 100644
index 0000000000..d9ce2d6400
--- /dev/null
+++ b/binaries/data/mods/mod/art/textures/texture.rng
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ dxt1
+ dxt3
+ dxt5
+ rgba
+ alpha
+
+
+
+
+
+
+ true
+ false
+
+
+
+
+
+
+ true
+ false
+
+
+
+
+
+
+ none
+ player
+ transparency
+
+
+
+
+
+
+ box
+ triangle
+ kaiser
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/binaries/data/mods/mod/art/textures/textures.xml b/binaries/data/mods/mod/art/textures/textures.xml
new file mode 100644
index 0000000000..9595166b64
--- /dev/null
+++ b/binaries/data/mods/mod/art/textures/textures.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/background.png b/binaries/data/mods/mod/art/textures/ui/global/modern/background.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/background.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/background.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/border.png b/binaries/data/mods/mod/art/textures/ui/global/modern/border.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/border.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/border.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-center-bottom.png b/binaries/data/mods/mod/art/textures/ui/global/modern/button/red-unselected-center-bottom.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-center-bottom.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/button/red-unselected-center-bottom.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-center-center.png b/binaries/data/mods/mod/art/textures/ui/global/modern/button/red-unselected-center-center.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-center-center.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/button/red-unselected-center-center.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-center-top.png b/binaries/data/mods/mod/art/textures/ui/global/modern/button/red-unselected-center-top.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-center-top.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/button/red-unselected-center-top.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-left-bottom.png b/binaries/data/mods/mod/art/textures/ui/global/modern/button/red-unselected-left-bottom.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-left-bottom.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/button/red-unselected-left-bottom.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-left-center.png b/binaries/data/mods/mod/art/textures/ui/global/modern/button/red-unselected-left-center.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-left-center.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/button/red-unselected-left-center.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-left-top.png b/binaries/data/mods/mod/art/textures/ui/global/modern/button/red-unselected-left-top.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-left-top.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/button/red-unselected-left-top.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-right-bottom.png b/binaries/data/mods/mod/art/textures/ui/global/modern/button/red-unselected-right-bottom.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-right-bottom.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/button/red-unselected-right-bottom.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-right-center.png b/binaries/data/mods/mod/art/textures/ui/global/modern/button/red-unselected-right-center.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-right-center.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/button/red-unselected-right-center.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-right-top.png b/binaries/data/mods/mod/art/textures/ui/global/modern/button/red-unselected-right-top.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-right-top.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/button/red-unselected-right-top.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-center-bottom.png b/binaries/data/mods/mod/art/textures/ui/global/modern/button/yellow-unselected-center-bottom.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-center-bottom.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/button/yellow-unselected-center-bottom.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-center-center.png b/binaries/data/mods/mod/art/textures/ui/global/modern/button/yellow-unselected-center-center.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-center-center.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/button/yellow-unselected-center-center.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-center-top.png b/binaries/data/mods/mod/art/textures/ui/global/modern/button/yellow-unselected-center-top.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-center-top.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/button/yellow-unselected-center-top.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-left-bottom.png b/binaries/data/mods/mod/art/textures/ui/global/modern/button/yellow-unselected-left-bottom.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-left-bottom.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/button/yellow-unselected-left-bottom.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-left-center.png b/binaries/data/mods/mod/art/textures/ui/global/modern/button/yellow-unselected-left-center.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-left-center.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/button/yellow-unselected-left-center.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-left-top.png b/binaries/data/mods/mod/art/textures/ui/global/modern/button/yellow-unselected-left-top.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-left-top.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/button/yellow-unselected-left-top.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-right-bottom.png b/binaries/data/mods/mod/art/textures/ui/global/modern/button/yellow-unselected-right-bottom.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-right-bottom.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/button/yellow-unselected-right-bottom.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-right-center.png b/binaries/data/mods/mod/art/textures/ui/global/modern/button/yellow-unselected-right-center.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-right-center.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/button/yellow-unselected-right-center.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-right-top.png b/binaries/data/mods/mod/art/textures/ui/global/modern/button/yellow-unselected-right-top.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-right-top.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/button/yellow-unselected-right-top.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/dialog-deco-bottom.png b/binaries/data/mods/mod/art/textures/ui/global/modern/dialog-deco-bottom.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/dialog-deco-bottom.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/dialog-deco-bottom.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/dialog-deco-top.png b/binaries/data/mods/mod/art/textures/ui/global/modern/dialog-deco-top.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/dialog-deco-top.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/dialog-deco-top.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/dropdown-arrow.png b/binaries/data/mods/mod/art/textures/ui/global/modern/dropdown-arrow.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/dropdown-arrow.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/dropdown-arrow.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/gear-hover.png b/binaries/data/mods/mod/art/textures/ui/global/modern/gear-hover.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/gear-hover.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/gear-hover.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/gear-press.png b/binaries/data/mods/mod/art/textures/ui/global/modern/gear-press.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/gear-press.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/gear-press.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/gear.png b/binaries/data/mods/mod/art/textures/ui/global/modern/gear.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/gear.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/gear.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/gold-separator.png b/binaries/data/mods/mod/art/textures/ui/global/modern/gold-separator.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/gold-separator.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/gold-separator.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/item-shading-left.png b/binaries/data/mods/mod/art/textures/ui/global/modern/item-shading-left.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/item-shading-left.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/item-shading-left.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/item-shading-right.png b/binaries/data/mods/mod/art/textures/ui/global/modern/item-shading-right.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/item-shading-right.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/item-shading-right.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/scrollback.png b/binaries/data/mods/mod/art/textures/ui/global/modern/scrollback.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/scrollback.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/scrollback.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/scrollbar.png b/binaries/data/mods/mod/art/textures/ui/global/modern/scrollbar.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/scrollbar.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/scrollbar.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/shadow-high.png b/binaries/data/mods/mod/art/textures/ui/global/modern/shadow-high.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/shadow-high.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/shadow-high.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/shadow-low.png b/binaries/data/mods/mod/art/textures/ui/global/modern/shadow-low.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/shadow-low.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/shadow-low.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/tick-off.png b/binaries/data/mods/mod/art/textures/ui/global/modern/tick-off.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/tick-off.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/tick-off.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/tick-on.png b/binaries/data/mods/mod/art/textures/ui/global/modern/tick-on.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/tick-on.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/tick-on.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/titlebar-left.png b/binaries/data/mods/mod/art/textures/ui/global/modern/titlebar-left.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/titlebar-left.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/titlebar-left.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/titlebar-middle.png b/binaries/data/mods/mod/art/textures/ui/global/modern/titlebar-middle.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/titlebar-middle.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/titlebar-middle.png
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/white-separator.png b/binaries/data/mods/mod/art/textures/ui/global/modern/white-separator.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/global/modern/white-separator.png
rename to binaries/data/mods/mod/art/textures/ui/global/modern/white-separator.png
diff --git a/binaries/data/mods/mod/audio/LICENSE.txt b/binaries/data/mods/mod/audio/LICENSE.txt
new file mode 100644
index 0000000000..73528165d1
--- /dev/null
+++ b/binaries/data/mods/mod/audio/LICENSE.txt
@@ -0,0 +1,19 @@
+The files in this directory are Copyright (C) 2009 Wildfire Games.
+
+These files are licensed under the Creative Commons Attribution-Share Alike 3.0
+(CC-by-sa) license, available at http://creativecommons.org/licenses/by-sa/3.0/
+
+Briefly, this means:
+
+* You may use, modify and distribute these files, for commercial and
+ non-commercial purposes.
+
+* If you distribute one of these files, you must include attribution (e.g.
+ in the credits screen of a game or a video, or in a text file accompanying
+ the files). The attribution must include:
+ * A link to http://creativecommons.org/licenses/by-sa/3.0/
+ * The name "Wildfire Games" as the original author
+ * A link to http://www.wildfiregames.com/
+
+* If you distribute one of these files, you must release it (and any
+ modifications you have made to it) under the CC-by-sa license.
diff --git a/binaries/data/mods/public/audio/interface/ui/ui_button_click.ogg b/binaries/data/mods/mod/audio/interface/ui/ui_button_click.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/interface/ui/ui_button_click.ogg
rename to binaries/data/mods/mod/audio/interface/ui/ui_button_click.ogg
diff --git a/binaries/data/mods/public/audio/interface/ui/ui_button_click.xml b/binaries/data/mods/mod/audio/interface/ui/ui_button_click.xml
similarity index 100%
rename from binaries/data/mods/public/audio/interface/ui/ui_button_click.xml
rename to binaries/data/mods/mod/audio/interface/ui/ui_button_click.xml
diff --git a/binaries/data/mods/public/audio/interface/ui/ui_button_longclick.ogg b/binaries/data/mods/mod/audio/interface/ui/ui_button_longclick.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/interface/ui/ui_button_longclick.ogg
rename to binaries/data/mods/mod/audio/interface/ui/ui_button_longclick.ogg
diff --git a/binaries/data/mods/public/audio/interface/ui/ui_button_longclick.xml b/binaries/data/mods/mod/audio/interface/ui/ui_button_longclick.xml
similarity index 100%
rename from binaries/data/mods/public/audio/interface/ui/ui_button_longclick.xml
rename to binaries/data/mods/mod/audio/interface/ui/ui_button_longclick.xml
diff --git a/binaries/data/mods/public/fonts/mono-10.fnt b/binaries/data/mods/mod/fonts/mono-10.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/mono-10.fnt
rename to binaries/data/mods/mod/fonts/mono-10.fnt
diff --git a/binaries/data/mods/public/fonts/mono-10.png b/binaries/data/mods/mod/fonts/mono-10.png
similarity index 100%
rename from binaries/data/mods/public/fonts/mono-10.png
rename to binaries/data/mods/mod/fonts/mono-10.png
diff --git a/binaries/data/mods/public/fonts/mono-stroke-10.fnt b/binaries/data/mods/mod/fonts/mono-stroke-10.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/mono-stroke-10.fnt
rename to binaries/data/mods/mod/fonts/mono-stroke-10.fnt
diff --git a/binaries/data/mods/public/fonts/mono-stroke-10.png b/binaries/data/mods/mod/fonts/mono-stroke-10.png
similarity index 100%
rename from binaries/data/mods/public/fonts/mono-stroke-10.png
rename to binaries/data/mods/mod/fonts/mono-stroke-10.png
diff --git a/binaries/data/mods/public/fonts/sans-10.fnt b/binaries/data/mods/mod/fonts/sans-10.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-10.fnt
rename to binaries/data/mods/mod/fonts/sans-10.fnt
diff --git a/binaries/data/mods/public/fonts/sans-10.png b/binaries/data/mods/mod/fonts/sans-10.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-10.png
rename to binaries/data/mods/mod/fonts/sans-10.png
diff --git a/binaries/data/mods/public/fonts/sans-12.fnt b/binaries/data/mods/mod/fonts/sans-12.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-12.fnt
rename to binaries/data/mods/mod/fonts/sans-12.fnt
diff --git a/binaries/data/mods/public/fonts/sans-12.png b/binaries/data/mods/mod/fonts/sans-12.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-12.png
rename to binaries/data/mods/mod/fonts/sans-12.png
diff --git a/binaries/data/mods/public/fonts/sans-13.fnt b/binaries/data/mods/mod/fonts/sans-13.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-13.fnt
rename to binaries/data/mods/mod/fonts/sans-13.fnt
diff --git a/binaries/data/mods/public/fonts/sans-13.png b/binaries/data/mods/mod/fonts/sans-13.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-13.png
rename to binaries/data/mods/mod/fonts/sans-13.png
diff --git a/binaries/data/mods/public/fonts/sans-14.fnt b/binaries/data/mods/mod/fonts/sans-14.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-14.fnt
rename to binaries/data/mods/mod/fonts/sans-14.fnt
diff --git a/binaries/data/mods/public/fonts/sans-14.png b/binaries/data/mods/mod/fonts/sans-14.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-14.png
rename to binaries/data/mods/mod/fonts/sans-14.png
diff --git a/binaries/data/mods/public/fonts/sans-16.fnt b/binaries/data/mods/mod/fonts/sans-16.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-16.fnt
rename to binaries/data/mods/mod/fonts/sans-16.fnt
diff --git a/binaries/data/mods/public/fonts/sans-16.png b/binaries/data/mods/mod/fonts/sans-16.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-16.png
rename to binaries/data/mods/mod/fonts/sans-16.png
diff --git a/binaries/data/mods/public/fonts/sans-9.fnt b/binaries/data/mods/mod/fonts/sans-9.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-9.fnt
rename to binaries/data/mods/mod/fonts/sans-9.fnt
diff --git a/binaries/data/mods/public/fonts/sans-9.png b/binaries/data/mods/mod/fonts/sans-9.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-9.png
rename to binaries/data/mods/mod/fonts/sans-9.png
diff --git a/binaries/data/mods/public/fonts/sans-bold-12.fnt b/binaries/data/mods/mod/fonts/sans-bold-12.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-12.fnt
rename to binaries/data/mods/mod/fonts/sans-bold-12.fnt
diff --git a/binaries/data/mods/public/fonts/sans-bold-12.png b/binaries/data/mods/mod/fonts/sans-bold-12.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-12.png
rename to binaries/data/mods/mod/fonts/sans-bold-12.png
diff --git a/binaries/data/mods/public/fonts/sans-bold-13.fnt b/binaries/data/mods/mod/fonts/sans-bold-13.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-13.fnt
rename to binaries/data/mods/mod/fonts/sans-bold-13.fnt
diff --git a/binaries/data/mods/public/fonts/sans-bold-13.png b/binaries/data/mods/mod/fonts/sans-bold-13.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-13.png
rename to binaries/data/mods/mod/fonts/sans-bold-13.png
diff --git a/binaries/data/mods/public/fonts/sans-bold-14.fnt b/binaries/data/mods/mod/fonts/sans-bold-14.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-14.fnt
rename to binaries/data/mods/mod/fonts/sans-bold-14.fnt
diff --git a/binaries/data/mods/public/fonts/sans-bold-14.png b/binaries/data/mods/mod/fonts/sans-bold-14.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-14.png
rename to binaries/data/mods/mod/fonts/sans-bold-14.png
diff --git a/binaries/data/mods/public/fonts/sans-bold-16.fnt b/binaries/data/mods/mod/fonts/sans-bold-16.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-16.fnt
rename to binaries/data/mods/mod/fonts/sans-bold-16.fnt
diff --git a/binaries/data/mods/public/fonts/sans-bold-16.png b/binaries/data/mods/mod/fonts/sans-bold-16.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-16.png
rename to binaries/data/mods/mod/fonts/sans-bold-16.png
diff --git a/binaries/data/mods/public/fonts/sans-bold-18.fnt b/binaries/data/mods/mod/fonts/sans-bold-18.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-18.fnt
rename to binaries/data/mods/mod/fonts/sans-bold-18.fnt
diff --git a/binaries/data/mods/public/fonts/sans-bold-18.png b/binaries/data/mods/mod/fonts/sans-bold-18.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-18.png
rename to binaries/data/mods/mod/fonts/sans-bold-18.png
diff --git a/binaries/data/mods/public/fonts/sans-bold-20.fnt b/binaries/data/mods/mod/fonts/sans-bold-20.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-20.fnt
rename to binaries/data/mods/mod/fonts/sans-bold-20.fnt
diff --git a/binaries/data/mods/public/fonts/sans-bold-20.png b/binaries/data/mods/mod/fonts/sans-bold-20.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-20.png
rename to binaries/data/mods/mod/fonts/sans-bold-20.png
diff --git a/binaries/data/mods/public/fonts/sans-bold-22.fnt b/binaries/data/mods/mod/fonts/sans-bold-22.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-22.fnt
rename to binaries/data/mods/mod/fonts/sans-bold-22.fnt
diff --git a/binaries/data/mods/public/fonts/sans-bold-22.png b/binaries/data/mods/mod/fonts/sans-bold-22.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-22.png
rename to binaries/data/mods/mod/fonts/sans-bold-22.png
diff --git a/binaries/data/mods/public/fonts/sans-bold-24.fnt b/binaries/data/mods/mod/fonts/sans-bold-24.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-24.fnt
rename to binaries/data/mods/mod/fonts/sans-bold-24.fnt
diff --git a/binaries/data/mods/public/fonts/sans-bold-24.png b/binaries/data/mods/mod/fonts/sans-bold-24.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-24.png
rename to binaries/data/mods/mod/fonts/sans-bold-24.png
diff --git a/binaries/data/mods/public/fonts/sans-bold-stroke-12.fnt b/binaries/data/mods/mod/fonts/sans-bold-stroke-12.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-stroke-12.fnt
rename to binaries/data/mods/mod/fonts/sans-bold-stroke-12.fnt
diff --git a/binaries/data/mods/public/fonts/sans-bold-stroke-12.png b/binaries/data/mods/mod/fonts/sans-bold-stroke-12.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-stroke-12.png
rename to binaries/data/mods/mod/fonts/sans-bold-stroke-12.png
diff --git a/binaries/data/mods/public/fonts/sans-bold-stroke-13.fnt b/binaries/data/mods/mod/fonts/sans-bold-stroke-13.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-stroke-13.fnt
rename to binaries/data/mods/mod/fonts/sans-bold-stroke-13.fnt
diff --git a/binaries/data/mods/public/fonts/sans-bold-stroke-13.png b/binaries/data/mods/mod/fonts/sans-bold-stroke-13.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-stroke-13.png
rename to binaries/data/mods/mod/fonts/sans-bold-stroke-13.png
diff --git a/binaries/data/mods/public/fonts/sans-bold-stroke-14.fnt b/binaries/data/mods/mod/fonts/sans-bold-stroke-14.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-stroke-14.fnt
rename to binaries/data/mods/mod/fonts/sans-bold-stroke-14.fnt
diff --git a/binaries/data/mods/public/fonts/sans-bold-stroke-14.png b/binaries/data/mods/mod/fonts/sans-bold-stroke-14.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-bold-stroke-14.png
rename to binaries/data/mods/mod/fonts/sans-bold-stroke-14.png
diff --git a/binaries/data/mods/public/fonts/sans-stroke-12.fnt b/binaries/data/mods/mod/fonts/sans-stroke-12.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-stroke-12.fnt
rename to binaries/data/mods/mod/fonts/sans-stroke-12.fnt
diff --git a/binaries/data/mods/public/fonts/sans-stroke-12.png b/binaries/data/mods/mod/fonts/sans-stroke-12.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-stroke-12.png
rename to binaries/data/mods/mod/fonts/sans-stroke-12.png
diff --git a/binaries/data/mods/public/fonts/sans-stroke-13.fnt b/binaries/data/mods/mod/fonts/sans-stroke-13.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-stroke-13.fnt
rename to binaries/data/mods/mod/fonts/sans-stroke-13.fnt
diff --git a/binaries/data/mods/public/fonts/sans-stroke-13.png b/binaries/data/mods/mod/fonts/sans-stroke-13.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-stroke-13.png
rename to binaries/data/mods/mod/fonts/sans-stroke-13.png
diff --git a/binaries/data/mods/public/fonts/sans-stroke-14.fnt b/binaries/data/mods/mod/fonts/sans-stroke-14.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-stroke-14.fnt
rename to binaries/data/mods/mod/fonts/sans-stroke-14.fnt
diff --git a/binaries/data/mods/public/fonts/sans-stroke-14.png b/binaries/data/mods/mod/fonts/sans-stroke-14.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-stroke-14.png
rename to binaries/data/mods/mod/fonts/sans-stroke-14.png
diff --git a/binaries/data/mods/public/fonts/sans-stroke-16.fnt b/binaries/data/mods/mod/fonts/sans-stroke-16.fnt
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-stroke-16.fnt
rename to binaries/data/mods/mod/fonts/sans-stroke-16.fnt
diff --git a/binaries/data/mods/public/fonts/sans-stroke-16.png b/binaries/data/mods/mod/fonts/sans-stroke-16.png
similarity index 100%
rename from binaries/data/mods/public/fonts/sans-stroke-16.png
rename to binaries/data/mods/mod/fonts/sans-stroke-16.png
diff --git a/binaries/data/mods/public/fonts/textures.xml b/binaries/data/mods/mod/fonts/textures.xml
similarity index 100%
rename from binaries/data/mods/public/fonts/textures.xml
rename to binaries/data/mods/mod/fonts/textures.xml
diff --git a/binaries/data/mods/public/globalscripts/l10n.js b/binaries/data/mods/mod/globalscripts/l10n.js
similarity index 100%
rename from binaries/data/mods/public/globalscripts/l10n.js
rename to binaries/data/mods/mod/globalscripts/l10n.js
diff --git a/binaries/data/mods/public/globalscripts/sprintf.js b/binaries/data/mods/mod/globalscripts/sprintf.js
similarity index 100%
rename from binaries/data/mods/public/globalscripts/sprintf.js
rename to binaries/data/mods/mod/globalscripts/sprintf.js
diff --git a/binaries/data/mods/public/gui/common/modern/setup.xml b/binaries/data/mods/mod/gui/common/modern/setup.xml
similarity index 100%
rename from binaries/data/mods/public/gui/common/modern/setup.xml
rename to binaries/data/mods/mod/gui/common/modern/setup.xml
diff --git a/binaries/data/mods/public/gui/common/modern/sprites.xml b/binaries/data/mods/mod/gui/common/modern/sprites.xml
similarity index 100%
rename from binaries/data/mods/public/gui/common/modern/sprites.xml
rename to binaries/data/mods/mod/gui/common/modern/sprites.xml
diff --git a/binaries/data/mods/public/gui/common/modern/styles.xml b/binaries/data/mods/mod/gui/common/modern/styles.xml
similarity index 100%
rename from binaries/data/mods/public/gui/common/modern/styles.xml
rename to binaries/data/mods/mod/gui/common/modern/styles.xml
diff --git a/binaries/data/mods/mod/gui/page_modmod.xml b/binaries/data/mods/mod/gui/page_modmod.xml
index 06aa9f58b4..506df7c5b9 100644
--- a/binaries/data/mods/mod/gui/page_modmod.xml
+++ b/binaries/data/mods/mod/gui/page_modmod.xml
@@ -4,18 +4,6 @@
common/modern/styles.xml
common/modern/sprites.xml
- common/setup.xml
- common/sprite1.xml
- common/styles.xml
- common/common_sprites.xml
- common/common_styles.xml
- common/init.xml
-
- pregame/sprites.xml
- pregame/styles.xml
-
modmod/styles.xml
modmod/modmod.xml
-
- common/global.xml
diff --git a/binaries/data/mods/public/hwdetect/hwdetect.js b/binaries/data/mods/mod/hwdetect/hwdetect.js
similarity index 100%
rename from binaries/data/mods/public/hwdetect/hwdetect.js
rename to binaries/data/mods/mod/hwdetect/hwdetect.js
diff --git a/binaries/data/mods/public/hwdetect/test.js b/binaries/data/mods/mod/hwdetect/test.js
similarity index 100%
rename from binaries/data/mods/public/hwdetect/test.js
rename to binaries/data/mods/mod/hwdetect/test.js
diff --git a/binaries/data/mods/public/shaders/effects/gui_add.xml b/binaries/data/mods/mod/shaders/effects/gui_add.xml
similarity index 100%
rename from binaries/data/mods/public/shaders/effects/gui_add.xml
rename to binaries/data/mods/mod/shaders/effects/gui_add.xml
diff --git a/binaries/data/mods/public/shaders/effects/gui_basic.xml b/binaries/data/mods/mod/shaders/effects/gui_basic.xml
similarity index 100%
rename from binaries/data/mods/public/shaders/effects/gui_basic.xml
rename to binaries/data/mods/mod/shaders/effects/gui_basic.xml
diff --git a/binaries/data/mods/public/shaders/effects/gui_grayscale.xml b/binaries/data/mods/mod/shaders/effects/gui_grayscale.xml
similarity index 100%
rename from binaries/data/mods/public/shaders/effects/gui_grayscale.xml
rename to binaries/data/mods/mod/shaders/effects/gui_grayscale.xml
diff --git a/binaries/data/mods/public/shaders/effects/gui_solid.xml b/binaries/data/mods/mod/shaders/effects/gui_solid.xml
similarity index 100%
rename from binaries/data/mods/public/shaders/effects/gui_solid.xml
rename to binaries/data/mods/mod/shaders/effects/gui_solid.xml
diff --git a/binaries/data/mods/public/shaders/effects/gui_text.xml b/binaries/data/mods/mod/shaders/effects/gui_text.xml
similarity index 100%
rename from binaries/data/mods/public/shaders/effects/gui_text.xml
rename to binaries/data/mods/mod/shaders/effects/gui_text.xml
diff --git a/binaries/data/mods/public/shaders/program.rng b/binaries/data/mods/mod/shaders/program.rng
similarity index 100%
rename from binaries/data/mods/public/shaders/program.rng
rename to binaries/data/mods/mod/shaders/program.rng
diff --git a/source/ps/GameSetup/GameSetup.cpp b/source/ps/GameSetup/GameSetup.cpp
index e25a13aa26..9152bb4003 100644
--- a/source/ps/GameSetup/GameSetup.cpp
+++ b/source/ps/GameSetup/GameSetup.cpp
@@ -401,6 +401,7 @@ std::vector& GetMods(const CmdLineArgs& args, int flags)
{
const bool init_mods = (flags & INIT_MODS) == INIT_MODS;
const bool add_user = !InDevelopmentCopy() && !args.Has("noUserMod");
+ const bool add_public = (flags & INIT_MODS_PUBLIC) == INIT_MODS_PUBLIC;
if (!init_mods)
{
@@ -412,8 +413,10 @@ std::vector& GetMods(const CmdLineArgs& args, int flags)
}
g_modsLoaded = args.GetMultiple("mod");
- // TODO: It would be nice to remove this hard-coding of public (remove it once mod is standalone)
- g_modsLoaded.insert(g_modsLoaded.begin(), "public");
+
+ if (add_public)
+ g_modsLoaded.insert(g_modsLoaded.begin(), "public");
+
g_modsLoaded.insert(g_modsLoaded.begin(), "mod");
// Add the user mod if not explicitly disabled or we have a dev copy so
diff --git a/source/ps/GameSetup/GameSetup.h b/source/ps/GameSetup/GameSetup.h
index 43370acd2b..098a91a400 100644
--- a/source/ps/GameSetup/GameSetup.h
+++ b/source/ps/GameSetup/GameSetup.h
@@ -49,7 +49,11 @@ enum InitFlags
INIT_HAVE_DISPLAY_ERROR = 4,
// initialize the mod folders from command line parameters
- INIT_MODS = 8
+ INIT_MODS = 8,
+
+ // mount the public mod
+ // needed by the map editor as "mod" does not provide everything it needs
+ INIT_MODS_PUBLIC = 16
};
enum ShutdownFlags
diff --git a/source/simulation2/components/tests/test_scripts.h b/source/simulation2/components/tests/test_scripts.h
index e00f0653ec..40aa26325d 100644
--- a/source/simulation2/components/tests/test_scripts.h
+++ b/source/simulation2/components/tests/test_scripts.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2014 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -25,7 +25,8 @@ public:
void setUp()
{
g_VFS = CreateVfs(20 * MiB);
- g_VFS->Mount(L"", DataDir()/"mods"/"public", VFS_MOUNT_MUST_EXIST); // ignore directory-not-found errors
+ g_VFS->Mount(L"", DataDir()/"mods"/"mod", VFS_MOUNT_MUST_EXIST);
+ g_VFS->Mount(L"", DataDir()/"mods"/"public", VFS_MOUNT_MUST_EXIST, 1); // ignore directory-not-found errors
CXeromyces::Startup();
}
diff --git a/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
index 6f3ffccaeb..8932a20944 100644
--- a/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
@@ -47,7 +47,7 @@ MESSAGEHANDLER(Init)
g_Quickstart = true;
// Mount mods if there are any specified as command line parameters
- if (!Init(g_AtlasGameLoop->args, g_InitFlags | INIT_MODS))
+ if (!Init(g_AtlasGameLoop->args, g_InitFlags | INIT_MODS|INIT_MODS_PUBLIC))
{
// There are no mods specified on the command line,
// but there are in the config file, so mount those.
diff --git a/source/tools/dist/0ad.nsi b/source/tools/dist/0ad.nsi
index 212c045b3c..d65520bf3a 100644
--- a/source/tools/dist/0ad.nsi
+++ b/source/tools/dist/0ad.nsi
@@ -111,7 +111,7 @@ Section "!Game and data files" GameSection
SetOutPath "$INSTDIR\binaries\system" ;Set working directory of shortcuts
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\0 A.D..lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" "-mod=public"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Pyrogenesis mod selector.lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" ""
- CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Map editor.lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" "-editor" "$INSTDIR\binaries\data\tools\atlas\icons\ScenarioEditor.ico"
+ CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Map editor.lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" "-mod=public -editor" "$INSTDIR\binaries\data\tools\atlas\icons\ScenarioEditor.ico"
SetOutPath "$INSTDIR"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Open logs folder.lnk" "$INSTDIR\OpenLogsFolder.bat"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"