From d84a36b8ee353e427bb63a3833a57fddcf7943a0 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Mon, 28 Dec 2020 16:44:59 +0100
Subject: [PATCH] Block loader/unloader progress bar changes (#4138)

* Change block loader/unloader progess bar color & bundle

ammo -> items

* Make block unloader bar go down
---
 .../src/mindustry/world/blocks/experimental/BlockLoader.java | 3 ++-
 .../mindustry/world/blocks/experimental/BlockUnloader.java   | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/world/blocks/experimental/BlockLoader.java b/core/src/mindustry/world/blocks/experimental/BlockLoader.java
index fcac9ae455..34c210af04 100644
--- a/core/src/mindustry/world/blocks/experimental/BlockLoader.java
+++ b/core/src/mindustry/world/blocks/experimental/BlockLoader.java
@@ -1,5 +1,6 @@
 package mindustry.world.blocks.experimental;
 
+import arc.*;
 import arc.graphics.g2d.*;
 import arc.util.*;
 import mindustry.entities.units.*;
@@ -46,7 +47,7 @@ public class BlockLoader extends PayloadAcceptor{
     public void 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
diff --git a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java b/core/src/mindustry/world/blocks/experimental/BlockUnloader.java
index 12b5e856dd..cdb3681ae9 100644
--- a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java
+++ b/core/src/mindustry/world/blocks/experimental/BlockUnloader.java
@@ -54,11 +54,6 @@ public class BlockUnloader extends BlockLoader{
             return items.total() >= itemCapacity;
         }
 
-        @Override
-        public float fraction(){
-            return payload == null ? 0f : 1f - payload.build.items.total() / (float)payload.build.block.itemCapacity;
-        }
-
         @Override
         public boolean shouldExport(){
             return payload != null && (payload.block().hasItems && payload.build.items.empty());