Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2022-11-10 12:43:33 -05:00

View File

@@ -6,6 +6,7 @@ import arc.math.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.util.*; import arc.util.*;
import arc.util.io.*; import arc.util.io.*;
import mindustry.annotations.Annotations.*;
import mindustry.entities.units.*; import mindustry.entities.units.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.type.*; import mindustry.type.*;
@@ -16,6 +17,7 @@ import mindustry.world.meta.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class Sorter extends Block{ public class Sorter extends Block{
public @Load(value = "@-cross", fallback = "cross-full") TextureRegion cross;
public boolean invert; public boolean invert;
public Sorter(String name){ public Sorter(String name){
@@ -71,7 +73,7 @@ public class Sorter extends Block{
public void draw(){ public void draw(){
if(sortItem == null){ if(sortItem == null){
Draw.rect("cross-full", x, y); Draw.rect(cross, x, y);
}else{ }else{
Draw.color(sortItem.color); Draw.color(sortItem.color);
Fill.square(x, y, tilesize/2f - 0.00001f); Fill.square(x, y, tilesize/2f - 0.00001f);
@@ -162,4 +164,4 @@ public class Sorter extends Block{
} }
} }
} }
} }