Implementation of #10738
This commit is contained in:
@@ -233,7 +233,7 @@ public class Renderer implements ApplicationListener{
|
|||||||
case Gl.invalidFramebufferOperation -> "invalid framebuffer operation";
|
case Gl.invalidFramebufferOperation -> "invalid framebuffer operation";
|
||||||
case Gl.invalidEnum -> "invalid enum";
|
case Gl.invalidEnum -> "invalid enum";
|
||||||
case Gl.outOfMemory -> "out of memory";
|
case Gl.outOfMemory -> "out of memory";
|
||||||
default -> "unknown error " + (error);
|
default -> "unknown error (" + error + ")";
|
||||||
};
|
};
|
||||||
|
|
||||||
Log.err("[GL] Error: @", message);
|
Log.err("[GL] Error: @", message);
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ public class Saves{
|
|||||||
//read saves in parallel
|
//read saves in parallel
|
||||||
Seq<Future<SaveSlot>> futures = new Seq<>();
|
Seq<Future<SaveSlot>> futures = new Seq<>();
|
||||||
|
|
||||||
for(Fi file : saveDirectory.list()){
|
saveDirectory.walk(file -> {
|
||||||
if(!file.name().contains("backup") && SaveIO.isSaveValid(file)){
|
if(!file.name().contains("backup") && SaveIO.isSaveValid(file)){
|
||||||
futures.add(mainExecutor.submit(() -> {
|
futures.add(mainExecutor.submit(() -> {
|
||||||
SaveSlot slot = new SaveSlot(file);
|
SaveSlot slot = new SaveSlot(file);
|
||||||
@@ -59,7 +59,7 @@ public class Saves{
|
|||||||
return slot;
|
return slot;
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
|
|
||||||
for(var future : futures){
|
for(var future : futures){
|
||||||
try{
|
try{
|
||||||
|
|||||||
@@ -80,9 +80,11 @@ public class Schematics implements Loadable{
|
|||||||
|
|
||||||
loadLoadouts();
|
loadLoadouts();
|
||||||
|
|
||||||
for(Fi file : schematicDirectory.list()){
|
schematicDirectory.walk(file -> {
|
||||||
loadFile(file);
|
if(file.extEquals(schematicExtension)){
|
||||||
}
|
loadFile(file);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
platform.getWorkshopContent(Schematic.class).each(this::loadFile);
|
platform.getWorkshopContent(Schematic.class).each(this::loadFile);
|
||||||
|
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ public class Maps{
|
|||||||
}
|
}
|
||||||
|
|
||||||
//custom
|
//custom
|
||||||
for(Fi file : customMapDirectory.list()){
|
customMapDirectory.walk(file -> {
|
||||||
try{
|
try{
|
||||||
if(file.extension().equalsIgnoreCase(mapExtension)){
|
if(file.extension().equalsIgnoreCase(mapExtension)){
|
||||||
loadMap(file, true);
|
loadMap(file, true);
|
||||||
@@ -143,7 +143,7 @@ public class Maps{
|
|||||||
Log.err("Failed to load custom map file '@'!", file);
|
Log.err("Failed to load custom map file '@'!", file);
|
||||||
Log.err(e);
|
Log.err(e);
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
|
|
||||||
//workshop
|
//workshop
|
||||||
for(Fi file : platform.getWorkshopContent(Map.class)){
|
for(Fi file : platform.getWorkshopContent(Map.class)){
|
||||||
|
|||||||
Reference in New Issue
Block a user