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

Name fixes

Browse Source
This commit is contained in:
Anuken
2020-09-06 19:09:41 -04:00
parent 1d191f1914
commit 010a1594fa
22 changed files with 51 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/src/mindustry/tools/Generators.java
View File

@@ -126,7 +126,7 @@ public class Generators{
Image colors = new Image(content.blocks().size, 1);
for(Block block : content.blocks()){
if(block.isAir() || block instanceof BuildBlock || block instanceof OreBlock || block instanceof LegacyBlock) continue;
if(block.isAir() || block instanceof ConstructBlock || block instanceof OreBlock || block instanceof LegacyBlock) continue;
block.load();

2
tools/src/mindustry/tools/ImagePacker.java
View File

@@ -123,7 +123,7 @@ public class ImagePacker{
map.each((key, val) -> content2id.put(val.split("\\|")[0], key));
Seq<UnlockableContent> cont = Seq.withArrays(Vars.content.blocks(), Vars.content.items(), Vars.content.liquids(), Vars.content.units());
cont.removeAll(u -> u instanceof BuildBlock || u == Blocks.air);
cont.removeAll(u -> u instanceof ConstructBlock || u == Blocks.air);
int minid = 0xF8FF;
for(String key : map.keys()){