mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-06 07:30:35 +07:00
Code Issues Packages Projects Releases Wiki Activity

canWithdraw() + changes to displayable() (#6902)

Browse Source 
* `shouldDiplay()` + `canWithdraw()`

* Better implementation of `displayable()`
This commit is contained in:
MEEPofFaith 2022-06-08 06:17:30 -07:00 committed by GitHub
parent 968651d9ed
commit 5cc314672f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/mindustry/entities/comp/BuildingComp.java
View File

@ -613,6 +613,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
Fx.unitDrop.at(unit);
}
public boolean canWithdraw(){
return true;
}
public boolean canUnload(){
return block.unloadable;
}
@ -1342,11 +1346,6 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
public ItemModule flowItems(){
return items;
}
public boolean displayable(){
return true;
}
@Override
public void display(Table table){
//display the block stuff

4
core/src/mindustry/ui/Displayable.java
View File

@ -4,5 +4,9 @@ import arc.scene.ui.layout.*;
/** An interface for things that can be displayed when hovered over. */
public interface Displayable{
default boolean displayable(){
return true;
}
void display(Table table);
}

2
core/src/mindustry/ui/fragments/BlockInventoryFragment.java
View File

@ -70,6 +70,8 @@ public class BlockInventoryFragment{
}
private void takeItem(int requested){
if(!build.canWithdraw()) return;
//take everything
int amount = Math.min(requested, player.unit().maxAccepted(lastItem));

2
core/src/mindustry/ui/fragments/PlacementFragment.java
View File

@ -577,7 +577,7 @@ public class PlacementFragment{
if(Core.scene.hasMouse() || topTable.hit(v.x, v.y, false) != null) return null;
//check for a unit
Unit unit = Units.closestOverlap(player.team(), Core.input.mouseWorldX(), Core.input.mouseWorldY(), 5f, u -> !u.isLocal());
Unit unit = Units.closestOverlap(player.team(), Core.input.mouseWorldX(), Core.input.mouseWorldY(), 5f, u -> !u.isLocal() && u.displayable());
//if cursor has a unit, display it
if(unit != null) return unit;