From 6b3ff59c8af0a3883f058b0a1f9566da2a257352 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 28 Apr 2025 13:50:46 -0400
Subject: [PATCH] Implementation of #10738

---
 core/src/mindustry/core/Renderer.java   | 2 +-
 core/src/mindustry/game/Saves.java      | 4 ++--
 core/src/mindustry/game/Schematics.java | 8 +++++---
 core/src/mindustry/maps/Maps.java       | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index f990c4d1ac..3afdb57201 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -233,7 +233,7 @@ public class Renderer implements ApplicationListener{
                     case Gl.invalidFramebufferOperation -> "invalid framebuffer operation";
                     case Gl.invalidEnum -> "invalid enum";
                     case Gl.outOfMemory -> "out of memory";
-                    default -> "unknown error " + (error);
+                    default -> "unknown error (" + error + ")";
                 };
 
                 Log.err("[GL] Error: @", message);
diff --git a/core/src/mindustry/game/Saves.java b/core/src/mindustry/game/Saves.java
index 575c8bb697..b14dd4cd78 100644
--- a/core/src/mindustry/game/Saves.java
+++ b/core/src/mindustry/game/Saves.java
@@ -51,7 +51,7 @@ public class Saves{
         //read saves in parallel
         Seq<Future<SaveSlot>> futures = new Seq<>();
 
-        for(Fi file : saveDirectory.list()){
+        saveDirectory.walk(file -> {
             if(!file.name().contains("backup") && SaveIO.isSaveValid(file)){
                 futures.add(mainExecutor.submit(() -> {
                     SaveSlot slot = new SaveSlot(file);
@@ -59,7 +59,7 @@ public class Saves{
                     return slot;
                 }));
             }
-        }
+        });
 
         for(var future : futures){
             try{
diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java
index 2db321df7e..620434d144 100644
--- a/core/src/mindustry/game/Schematics.java
+++ b/core/src/mindustry/game/Schematics.java
@@ -80,9 +80,11 @@ public class Schematics implements Loadable{
 
         loadLoadouts();
 
-        for(Fi file : schematicDirectory.list()){
-            loadFile(file);
-        }
+        schematicDirectory.walk(file -> {
+            if(file.extEquals(schematicExtension)){
+                loadFile(file);
+            }
+        });
 
         platform.getWorkshopContent(Schematic.class).each(this::loadFile);
 
diff --git a/core/src/mindustry/maps/Maps.java b/core/src/mindustry/maps/Maps.java
index 101a7447d7..69398741ca 100644
--- a/core/src/mindustry/maps/Maps.java
+++ b/core/src/mindustry/maps/Maps.java
@@ -134,7 +134,7 @@ public class Maps{
         }
 
         //custom
-        for(Fi file : customMapDirectory.list()){
+        customMapDirectory.walk(file -> {
             try{
                 if(file.extension().equalsIgnoreCase(mapExtension)){
                     loadMap(file, true);
@@ -143,7 +143,7 @@ public class Maps{
                 Log.err("Failed to load custom map file '@'!", file);
                 Log.err(e);
             }
-        }
+        });
 
         //workshop
         for(Fi file : platform.getWorkshopContent(Map.class)){