mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-28 07:22:21 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Anuken 2023-09-20 21:55:18 -04:00
commit fccf6847c1
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/src/mindustry/world/draw/DrawBlock.java
View file

@ -44,7 +44,7 @@ public abstract class DrawBlock{
/** @return the generated icons to be used for this block. */
public TextureRegion[] icons(Block block){
return new TextureRegion[]{block.region};
return new TextureRegion[]{};
}
public final TextureRegion[] finalIcons(Block block){
@ -55,7 +55,8 @@ public abstract class DrawBlock{
}
return out;
}
return icons(block);
TextureRegion[] icons = icons(block);
return icons.length == 0 ? new TextureRegion[]{Core.atlas.find("error")} : icons;
}
public GenericCrafter expectCrafter(Block block){

5
core/src/mindustry/world/draw/DrawDefault.java
View file

@ -17,4 +17,9 @@ public class DrawDefault extends DrawBlock{
public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){
block.drawDefaultPlanRegion(plan, list);
}
@Override
public TextureRegion[] icons(Block block){
return new TextureRegion[]{block.region};
}
}

6
core/src/mindustry/world/draw/DrawLiquidOutputs.java
View file

@ -53,10 +53,4 @@ public class DrawLiquidOutputs extends DrawBlock{
}
}
}
//can't display these properly
@Override
public TextureRegion[] icons(Block block){
return new TextureRegion[]{};
}
}