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

Cleanup

Browse Source
This commit is contained in:
Anuken
2019-06-04 23:30:07 -04:00
parent 39acb224d1
commit 80bdaa1edc
356 changed files with 5519 additions and 5576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,8 +10,7 @@ import io.anuke.mindustry.ImagePacker.GenRegion;
import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Block.Icon;
import io.anuke.mindustry.world.blocks.Floor;
import io.anuke.mindustry.world.blocks.OreBlock;
import io.anuke.mindustry.world.blocks.*;
import java.io.IOException;
import java.nio.file.Files;
@@ -283,7 +282,7 @@ public class Generators{
});
ImagePacker.generate("edges", () -> {
content.blocks().<Floor>each(b -> b instanceof Floor, floor -> {
content.blocks().<Floor>each(b -> b instanceof Floor && !(b instanceof OverlayFloor), floor -> {
if(ImagePacker.has(floor.name + "-edge") || floor.blendGroup != floor){
return;