From cc3ae2c66cd963f8a136a6e237e127941f53601e Mon Sep 17 00:00:00 2001 From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Date: Wed, 15 Feb 2023 05:59:57 -0800 Subject: [PATCH] Use setBars instead of overriding displayBars (#8296) --- .../blocks/defense/turrets/ItemTurret.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java index 817d44b16f..7eb9891d8f 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java @@ -51,6 +51,19 @@ public class ItemTurret extends Turret{ stats.add(Stat.ammo, StatValues.ammo(ammoTypes)); } + @Override + public void setBars(){ + super.setBars(); + + addBar("ammo", (ItemTurretBuild entity) -> + new Bar( + "stat.ammo", + Pal.ammo, + () -> (float)entity.totalAmmo / maxAmmo + ) + ); + } + @Override public void init(){ consume(new ConsumeItemFilter(i -> ammoTypes.containsKey(i)){ @@ -100,14 +113,6 @@ public class ItemTurret extends Turret{ super.updateTile(); } - @Override - public void displayBars(Table bars){ - super.displayBars(bars); - - bars.add(new Bar("stat.ammo", Pal.ammo, () -> (float)totalAmmo / maxAmmo)).growX(); - bars.row(); - } - @Override public int acceptStack(Item item, int amount, Teamc source){ BulletType type = ammoTypes.get(item);