Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #1397

Browse Source
This commit is contained in:
Anuken
2020-01-19 14:56:12 -05:00
parent 19b8d91724
commit a797618f6c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
annotations/src/main/java/mindustry/annotations/AssetsAnnotationProcessor.java
View File

@@ -81,7 +81,7 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{
} }
Fi.get(resources).walk(p -> { Fi.get(resources).walk(p -> {
if(p.nameWithoutExtension().equals(".DS_Store")) return; if(!p.extEquals("png")) return;
String filename = p.name(); String filename = p.name();
filename = filename.substring(0, filename.indexOf(".")); filename = filename.substring(0, filename.indexOf("."));

6
core/src/mindustry/mod/Mods.java
View File

@@ -246,7 +246,7 @@ public class Mods implements Loadable{
try{ try{
LoadedMod mod = loadMod(file); LoadedMod mod = loadMod(file);
mods.add(mod); mods.add(mod);
}catch(Exception e){ }catch(Throwable e){
Log.err("Failed to load mod file {0}. Skipping.", file); Log.err("Failed to load mod file {0}. Skipping.", file);
Log.err(e); Log.err(e);
} }
@@ -258,7 +258,7 @@ public class Mods implements Loadable{
LoadedMod mod = loadMod(file); LoadedMod mod = loadMod(file);
mods.add(mod); mods.add(mod);
mod.addSteamID(file.name()); mod.addSteamID(file.name());
}catch(Exception e){ }catch(Throwable e){
Log.err("Failed to load mod workshop file {0}. Skipping.", file); Log.err("Failed to load mod workshop file {0}. Skipping.", file);
Log.err(e); Log.err(e);
} }
@@ -354,7 +354,7 @@ public class Mods implements Loadable{
for(Fi file : bundles.getOr(locale, Array::new)){ for(Fi file : bundles.getOr(locale, Array::new)){
try{ try{
PropertiesUtils.load(bundle.getProperties(), file.reader()); PropertiesUtils.load(bundle.getProperties(), file.reader());
}catch(Exception e){ }catch(Throwable e){
Log.err("Error loading bundle: " + file + "/" + locale, e); Log.err("Error loading bundle: " + file + "/" + locale, e);
} }
} }