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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-08-19 10:35:28 -04:00
parent 819835fbc0 55d6a617e7
commit e81385a8e6
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -454,7 +454,7 @@ public class Mods implements Loadable{
content.setCurrentMod(null); content.setCurrentMod(null);
} }
Log.debug("Time to initialize modded scripts: @", Time.elapsed()); Log.info("Time to initialize modded scripts: @", Time.elapsed());
} }
/** Creates all the content found in mod files. */ /** Creates all the content found in mod files. */
@@ -586,6 +586,8 @@ public class Mods implements Loadable{
/** Loads a mod file+meta, but does not add it to the list. /** Loads a mod file+meta, but does not add it to the list.
* Note that directories can be loaded as mods.*/ * Note that directories can be loaded as mods.*/
private LoadedMod loadMod(Fi sourceFile) throws Exception{ private LoadedMod loadMod(Fi sourceFile) throws Exception{
Time.mark();
Fi zip = sourceFile.isDirectory() ? sourceFile : new ZipFi(sourceFile); Fi zip = sourceFile.isDirectory() ? sourceFile : new ZipFi(sourceFile);
if(zip.list().length == 1 && zip.list()[0].isDirectory()){ if(zip.list().length == 1 && zip.list()[0].isDirectory()){
zip = zip.list()[0]; zip = zip.list()[0];
@@ -637,6 +639,7 @@ public class Mods implements Loadable{
meta.hidden = true; meta.hidden = true;
} }
Log.info("Loaded mod '@' in @", meta.name, Time.elapsed());
return new LoadedMod(sourceFile, zip, mainMod, meta); return new LoadedMod(sourceFile, zip, mainMod, meta);
} }