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

Misc preparations for unified packing

Browse Source
This commit is contained in:
Anuken
2022-06-12 23:04:26 -04:00
parent 1a63a2726e
commit 0dface7cc1
10 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,7 +190,7 @@ public class Mods implements Loadable{
continue;
//(horrible code below)
}else if(prefix && name.endsWith("-outline") && file.path().contains("units") && !file.path().contains("blocks")){
}else if(prefix && !mod.meta.keepOutlines && name.endsWith("-outline") && file.path().contains("units") && !file.path().contains("blocks")){
Log.warn("Sprite '@' in mod '@' is likely to be an unnecessary unit outline. These should not be separate sprites. Ignoring.", name, mod.name);
//TODO !!! document this on the wiki !!!
//do not allow packing standard outline sprites for now, they are no longer necessary and waste space!
@@ -336,7 +336,9 @@ public class Mods implements Loadable{
if(c instanceof UnlockableContent u && c.minfo.mod != null){
u.load();
u.loadIcon();
u.createIcons(packer);
if(u.generateIcons){
u.createIcons(packer);
}
}
});
}
@@ -1137,6 +1139,8 @@ public class Mods implements Loadable{
public boolean hidden;
/** If true, this mod should be loaded as a Java class mod. This is technically optional, but highly recommended. */
public boolean java;
/** If true, -outline regions for units are kept when packing. Only use if you know exactly what you are doing. */
public boolean keepOutlines;
public String displayName(){
return displayName == null ? name : displayName;