Fixed duplicating paintjobs.

MagicLibStarsector · Feb 14, 2024 · e6f5830 · e6f5830
1 parent 24d8def
commit e6f5830
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/CHANGELOGS.md b/CHANGELOGS.md
@@ -1,3 +1,8 @@
+Version 1.3.11
+
+**MagicPaintjobs**
+- Fixed paintjobs duplicating in the selector every save load (reported by Galaga Galaxian).
+
 Version 1.3.10
 
 **MagicBounty**

diff --git a/jars/MagicLib.jar b/jars/MagicLib.jar
diff --git a/magiclib.version b/magiclib.version
@@ -8,6 +8,6 @@
     {
       "major": "1",
       "minor": "3",
-      "patch": "10"
+      "patch": "11"
     }
 }
diff --git a/mod_info.json b/mod_info.json
@@ -4,7 +4,7 @@
   "author": "Modding Community: Dark.Revenant, LazyWizard, Nicke, Originem, Rubi, Schaf-Unschaf, Snrasha, Tartiflette, Wisp, Wyvern...",
   "utility": "true",
   # Using the long version format lets the game correctly compare major/minor/patch versions.
-  "version": { "major": '1', "minor": '3', "patch": '10' },
+  "version": { "major": '1', "minor": '3', "patch": '11' },
   "description": "A collection of classes to aid modding. Not a mod in itself, but required by other mods.",
   "gameVersion": "0.97a-RC6",
   "dependencies": [

diff --git a/src/org/magiclib/paintjobs/MagicPaintjobManager.kt b/src/org/magiclib/paintjobs/MagicPaintjobManager.kt
@@ -85,6 +85,7 @@ object MagicPaintjobManager {
             })
         }
 
+        paintjobsInner.clear()
         paintjobsInner.addAll(loadPaintjobs().values)
     }
 
@@ -157,21 +158,18 @@ object MagicPaintjobManager {
                         // Just a blank row, no need to warn.
 //                        logger.warn("Paintjob #$i in ${mod.id} by '${mod.author}' has no id, skipping.")
                         skip = true
-                    }
-                    if (hullIds.isEmpty()) {
+                    } else if (hullIds.isEmpty()) {
                         logger.warn("Paintjob $id in ${mod.id} by '${mod.author}' has no hullIds, skipping.")
                         skip = true
-                    }
-                    if (name.isBlank()) {
+                    } else if (name.isBlank()) {
                         logger.warn("Paintjob $id in ${mod.id} by '${mod.author}' has no name, skipping.")
                         skip = true
-                    }
-                    if (spriteId.isBlank()) {
+                    } else if (spriteId.isBlank()) {
                         logger.warn("Paintjob $id in ${mod.id} by '${mod.author}' has no spriteId, skipping.")
                         skip = true
-                    }
-                    if (hullIds.none {
-                            kotlin.runCatching { Global.getSettings().getHullSpec(it) }.getOrNull() != null
+                    } else if (hullIds.none {
+                            kotlin.runCatching { Global.getSettings().getHullSpec(it) }
+                                .getOrNull() != null
                         }) {
                         logger.warn("Paintjob $id in ${mod.id} by '${mod.author}' has no valid hullIds, skipping.")
                         skip = true