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

More mod content support

Browse Source
This commit is contained in:
Anuken
2019-10-04 19:14:45 -04:00
parent df3f23731b
commit edb0ece03b
18 changed files with 190 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/build.gradle
View File

@@ -320,7 +320,7 @@ task pack(dependsOn: classes){
//antialias everything except UI elements
fileTree(dir: '../core/assets-raw/sprites_out/', include: "**/*.png").visit{ file ->
if(file.isDirectory() || file.toString().replace("\\", "/").contains("zones/") || (file.toString().replace("\\", "/").contains("/ui/") && !file.toString().contains("icon-small") && !file.toString().contains("icon-medium") && !file.toString().contains("icon-large"))) return
if(file.isDirectory() || file.toString().replace("\\", "/").contains("zones/") || (file.toString().replace("\\", "/").contains("/ui/") && file.toString().startsWith("icon-"))) return
antialias(file.file)
}

3
tools/src/io/anuke/mindustry/Generators.java
View File

@@ -68,7 +68,6 @@ public class Generators{
ImagePacker.generate("block-icons", () -> {
Image colors = new Image(content.blocks().size, 1);
Color outlineColor = Color.valueOf("404049");
for(Block block : content.blocks()){
TextureRegion[] regions = block.getGeneratedIcons();
@@ -114,7 +113,7 @@ public class Generators{
}
}
if(found){
out.draw(x, y, outlineColor);
out.draw(x, y, block.outlineColor);
}
}
}