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

Cleanup + Generic cross rendering

Browse Source
This commit is contained in:
Anuken
2021-01-15 11:34:33 -05:00
parent bceb7b5809
commit 136c8cfcd2
7 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/mindustry/world/Block.java
View File

@@ -426,9 +426,7 @@ public class Block extends UnlockableContent{
TextureRegion reg = getRequestRegion(req, list);
Draw.rect(reg, req.drawx(), req.drawy(), !rotate ? 0 : req.rotation * 90);
if(req.config != null){
drawRequestConfig(req, list);
}
drawRequestConfig(req, list);
}
public TextureRegion getRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
@@ -439,8 +437,14 @@ public class Block extends UnlockableContent{
}
public void drawRequestConfigCenter(BuildPlan req, Object content, String region){
Color color = content instanceof Item ? ((Item)content).color : content instanceof Liquid ? ((Liquid)content).color : null;
public void drawRequestConfigCenter(BuildPlan req, Object content, String region, boolean cross){
if(content == null){
if(cross){
Draw.rect("cross", req.drawx(), req.drawy());
}
return;
}
Color color = content instanceof Item i ? i.color : content instanceof Liquid l ? l.color : null;
if(color == null) return;
Draw.color(color);
@@ -448,6 +452,10 @@ public class Block extends UnlockableContent{
Draw.color();
}
public void drawRequestConfigCenter(BuildPlan req, Object content, String region){
drawRequestConfigCenter(req, content, region, false);
}
public void drawRequestConfigTop(BuildPlan req, Eachable<BuildPlan> list){
}

2
core/src/mindustry/world/blocks/distribution/ItemBridge.java
View File

@@ -176,8 +176,6 @@ public class ItemBridge extends Block{
public void playerPlaced(Object config){
super.playerPlaced(config);
if(config != null) return;
Tile link = findLink(tile.x, tile.y);
if(linkValid(tile, link) && !proximity.contains(link.build)){
link.build.configure(tile.pos());

6
core/src/mindustry/world/blocks/distribution/Sorter.java
View File

@@ -33,11 +33,7 @@ public class Sorter extends Block{
@Override
public void drawRequestConfig(BuildPlan req, Eachable<BuildPlan> list){
if(req.config == null){
Draw.rect("cross", req.drawx(), req.drawy());
}else{
drawRequestConfigCenter(req, req.config, "center");
}
drawRequestConfigCenter(req, req.config, "center", true);
}
@Override

2
core/src/mindustry/world/blocks/sandbox/ItemSource.java
View File

@@ -37,7 +37,7 @@ public class ItemSource extends Block{
@Override
public void drawRequestConfig(BuildPlan req, Eachable<BuildPlan> list){
drawRequestConfigCenter(req, req.config, "center");
drawRequestConfigCenter(req, req.config, "center", true);
}
@Override

2
core/src/mindustry/world/blocks/sandbox/LiquidSource.java
View File

@@ -41,7 +41,7 @@ public class LiquidSource extends Block{
@Override
public void drawRequestConfig(BuildPlan req, Eachable<BuildPlan> list){
drawRequestConfigCenter(req, req.config, "center");
drawRequestConfigCenter(req, req.config, "center", true);
}
public class LiquidSourceBuild extends Building{