diff --git a/core/src/mindustry/ui/ItemImage.java b/core/src/mindustry/ui/ItemImage.java index 20829c071b..748eabbda4 100644 --- a/core/src/mindustry/ui/ItemImage.java +++ b/core/src/mindustry/ui/ItemImage.java @@ -17,19 +17,11 @@ public class ItemImage extends Stack{ add(new Table(t -> { t.left().bottom(); - //TODO outline? .style(Styles.outlineLabel) - t.add(amount > 1000 ? UI.formatAmount(amount) : amount + ""); + t.add(amount > 1000 ? UI.formatAmount(amount) : amount + "").style(Styles.outlineLabel); t.pack(); })); } - public ItemImage(TextureRegion region){ - Table t = new Table().left().bottom(); - - add(new Image(region)); - add(t); - } - public ItemImage(ItemStack stack){ add(new Table(o -> { @@ -49,4 +41,10 @@ public class ItemImage extends Stack{ public ItemImage(BlockStack stack){ this(stack.block.uiIcon, stack.amount); } + + /** @deprecated what the heck is this */ + @Deprecated + public ItemImage(TextureRegion region){ + add(new Image(region)); + } } diff --git a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java index eb5ca36d2f..76d6a8e08e 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java @@ -1,6 +1,7 @@ package mindustry.world.blocks.defense.turrets; import arc.*; +import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.io.*; @@ -61,7 +62,7 @@ public class ItemTurret extends Turret{ public void build(Building build, Table table){ MultiReqImage image = new MultiReqImage(); content.items().each(i -> filter.get(i) && i.unlockedNow(), - item -> image.add(new ReqImage(new ItemImage(item.uiIcon), + item -> image.add(new ReqImage(new Image(item.uiIcon), () -> build instanceof ItemTurretBuild it && !it.ammo.isEmpty() && ((ItemEntry)it.ammo.peek()).item == item))); table.add(image).size(8 * 4); diff --git a/core/src/mindustry/world/blocks/defense/turrets/PayloadTurret.java b/core/src/mindustry/world/blocks/defense/turrets/PayloadTurret.java index fe3ab4fffd..0ce4ea3ef4 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/PayloadTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/PayloadTurret.java @@ -1,5 +1,6 @@ package mindustry.world.blocks.defense.turrets; +import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.io.*; @@ -60,7 +61,7 @@ public class PayloadTurret extends Turret{ @Override public void build(Building build, Table table){ MultiReqImage image = new MultiReqImage(); - content.blocks().each(i -> filter.get(i) && i.unlockedNow(), block -> image.add(new ReqImage(new ItemImage(block.uiIcon), + content.blocks().each(i -> filter.get(i) && i.unlockedNow(), block -> image.add(new ReqImage(new Image(block.uiIcon), () -> build instanceof PayloadTurretBuild it && !it.blocks.isEmpty() && it.currentBlock() == block))); table.add(image).size(8 * 4);