From 09b5c9855f279e07eaced776f8dd3d9ffaec18f6 Mon Sep 17 00:00:00 2001
From: Twan van Laarhoven <twanvl@gmail.com>
Date: Sat, 17 Nov 2018 01:31:08 +0100
Subject: [PATCH] Avoid redundant mod ids in filenames

---
 CHANGELOG.md                                 | 1 +
 src/main/java/sts_exporter/ExportHelper.java | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb43838..c7fa4db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ### v0.4.1
 * Fix file extension of creature images (#2)
+* Avoid redundant mod ids in filenames
 
 ### v0.4.0
 * No longer automatically exports on startup (can be configured).
diff --git a/src/main/java/sts_exporter/ExportHelper.java b/src/main/java/sts_exporter/ExportHelper.java
index 6e7a396..12fcaa4 100644
--- a/src/main/java/sts_exporter/ExportHelper.java
+++ b/src/main/java/sts_exporter/ExportHelper.java
@@ -118,6 +118,9 @@ String exportDir(ColorExportData color) {
     }
 
     ExportPath exportPath(ModExportData mod, String dir, String id, String suffix) {
+        if (id.startsWith(mod.id+":")) {
+            id = id.substring(mod.id.length() + 1); // strip mod ids
+        }
         String file = makeFilename(id) + suffix;
         return new ExportPath(this.dir, mod.id, dir, file);
     }