fixed small bug related to saving

MineChemGroup · Apr 9, 2023 · 3cebe70 · 3cebe70
1 parent 0a270d6
commit 3cebe70
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 26 deletions.
diff --git a/src/main/kotlin/actions/ListActions.kt b/src/main/kotlin/actions/ListActions.kt
@@ -25,9 +25,11 @@ class ListActions : ListSelectionListener {
 
         //this part is due to list selecting last value even tho it is hidden
         if (Inst.right.text.isNotBlank()) {
-            if (!Inst.right.list.selectedValue.contains(Inst.right.text, true)) {
-                Inst.right.list.selectedIndex = -1
-                return
+            if (Inst.right.list.selectedValue != null) {
+                if (!Inst.right.list.selectedValue.contains(Inst.right.text, true)) {
+                    Inst.right.list.selectedIndex = -1
+                    return
+                }
             }
         }
 

diff --git a/src/main/kotlin/misc/Saver.kt b/src/main/kotlin/misc/Saver.kt
@@ -14,6 +14,7 @@ import java.nio.file.Path
 import java.nio.file.Paths
 import javax.swing.JOptionPane
 import javax.swing.SwingUtilities
+import kotlin.io.path.isDirectory
 
 
 object Saver {
@@ -109,29 +110,14 @@ object Saver {
         Files.walk(Paths.get(Inst.loader.recipeFolder.path)).use {
                 paths -> paths.filter { Files.isRegularFile(it) }
             .forEach {
-                val recipeName = it.fileName.toString().split(".chemrecipe")[0]
-                Inst.right.demoList.addElement(recipeName)
-                compoundLoadCheck(it)
-                /*
-                val cLine : String = Files.lines(it).use { lines -> lines.skip(10).findFirst().get() }
-                if (cLine == "S:")
-                    return@forEach
-
-                val parts = cLine.split(":")
-                if (!parts[1].contains("Compound"))
-                    return@forEach
-
-                if (recipeName.contains("New Recipe"))
-                    return@forEach
-
-                for (compound in Inst.left.listchemassets)
-                    if (compound.info == parts[1])
-                        compound.toolTipText = recipeName
-
-                for (compound in Inst.left.chemassetpanel.components)
-                    if ((compound as CustomLabel).info == parts[1])
-                        compound.toolTipText = recipeName
-                */
+
+                if (it.fileName.toString().endsWith(".chemrecipe", true)) {
+
+                    val recipeName = it.fileName.toString().split(".chemrecipe")[0]
+                    Inst.right.demoList.addElement(recipeName)
+                    compoundLoadCheck(it)
+
+                }
             }
         }
         SwingUtilities.updateComponentTreeUI(Inst.right.list)