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

Allow categorized sprite names to not be prefixed. (#9616)

Browse Source 
* Delegate more methods into Planet

* Allow categorized sprite prefixes
This commit is contained in:
GlFolker
2024-03-14 23:12:28 +07:00
committed by GitHub
parent 332d3af893
commit 3f46080f42
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

@@ -218,7 +218,10 @@ public class Mods implements Loadable{
} }
//this returns a *runnable* which actually packs the resulting pixmap; this has to be done synchronously outside the method //this returns a *runnable* which actually packs the resulting pixmap; this has to be done synchronously outside the method
return () -> { return () -> {
String fullName = (prefix ? mod.name + "-" : "") + baseName; //don't prefix with mod name if it's already prefixed by a category, e.g. `block-modname-content-full`.
int hyphen = baseName.indexOf('-');
String fullName = ((prefix && !(hyphen != -1 && baseName.substring(hyphen + 1).startsWith(mod.name + "-"))) ? mod.name + "-" : "") + baseName;
packer.add(getPage(file), fullName, new PixmapRegion(pix)); packer.add(getPage(file), fullName, new PixmapRegion(pix));
if(textureScale != 1.0f){ if(textureScale != 1.0f){
textureResize.put(fullName, textureScale); textureResize.put(fullName, textureScale);