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

Block loader/unloader progress bar changes (#4138)

Browse Source 
* Change block loader/unloader progess bar color & bundle

ammo -> items

* Make block unloader bar go down
This commit is contained in:
Patrick 'Quezler' Mounier
2020-12-28 16:44:59 +01:00
committed by GitHub
parent e714d44a0e
commit d84a36b8ee
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/world/blocks/experimental/BlockLoader.java
View File

@@ -1,5 +1,6 @@
package mindustry.world.blocks.experimental; package mindustry.world.blocks.experimental;
import arc.*;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.util.*; import arc.util.*;
import mindustry.entities.units.*; import mindustry.entities.units.*;
@@ -46,7 +47,7 @@ public class BlockLoader extends PayloadAcceptor{
public void setBars(){ public void setBars(){
super.setBars(); super.setBars();
bars.add("progress", entity -> new Bar("bar.progress", Pal.ammo, ((BlockLoaderBuild)entity)::fraction)); bars.add("progress", (BlockLoaderBuild entity) -> new Bar(() -> Core.bundle.format("bar.items", entity.payload == null ? 0 : entity.payload.build.items.total()), () -> Pal.items, entity::fraction));
} }
@Override @Override

5
core/src/mindustry/world/blocks/experimental/BlockUnloader.java
View File

@@ -54,11 +54,6 @@ public class BlockUnloader extends BlockLoader{
return items.total() >= itemCapacity; return items.total() >= itemCapacity;
} }
@Override
public float fraction(){
return payload == null ? 0f : 1f - payload.build.items.total() / (float)payload.build.block.itemCapacity;
}
@Override @Override
public boolean shouldExport(){ public boolean shouldExport(){
return payload != null && (payload.block().hasItems && payload.build.items.empty()); return payload != null && (payload.block().hasItems && payload.build.items.empty());