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

ItemImage label outline

Browse Source
This commit is contained in:
Anuken
2022-02-12 16:41:20 -05:00
parent 58c044f509
commit 710ef89e36
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/mindustry/ui/ItemImage.java
View File

@@ -17,19 +17,11 @@ public class ItemImage extends Stack{
add(new Table(t -> { add(new Table(t -> {
t.left().bottom(); t.left().bottom();
//TODO outline? .style(Styles.outlineLabel) t.add(amount > 1000 ? UI.formatAmount(amount) : amount + "").style(Styles.outlineLabel);
t.add(amount > 1000 ? UI.formatAmount(amount) : amount + "");
t.pack(); t.pack();
})); }));
} }
public ItemImage(TextureRegion region){
Table t = new Table().left().bottom();
add(new Image(region));
add(t);
}
public ItemImage(ItemStack stack){ public ItemImage(ItemStack stack){
add(new Table(o -> { add(new Table(o -> {
@@ -49,4 +41,10 @@ public class ItemImage extends Stack{
public ItemImage(BlockStack stack){ public ItemImage(BlockStack stack){
this(stack.block.uiIcon, stack.amount); this(stack.block.uiIcon, stack.amount);
} }
/** @deprecated what the heck is this */
@Deprecated
public ItemImage(TextureRegion region){
add(new Image(region));
}
} }

3
core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
View File

@@ -1,6 +1,7 @@
package mindustry.world.blocks.defense.turrets; package mindustry.world.blocks.defense.turrets;
import arc.*; import arc.*;
import arc.scene.ui.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.struct.*; import arc.struct.*;
import arc.util.io.*; import arc.util.io.*;
@@ -61,7 +62,7 @@ public class ItemTurret extends Turret{
public void build(Building build, Table table){ public void build(Building build, Table table){
MultiReqImage image = new MultiReqImage(); MultiReqImage image = new MultiReqImage();
content.items().each(i -> filter.get(i) && i.unlockedNow(), 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))); () -> build instanceof ItemTurretBuild it && !it.ammo.isEmpty() && ((ItemEntry)it.ammo.peek()).item == item)));
table.add(image).size(8 * 4); table.add(image).size(8 * 4);

3
core/src/mindustry/world/blocks/defense/turrets/PayloadTurret.java
View File

@@ -1,5 +1,6 @@
package mindustry.world.blocks.defense.turrets; package mindustry.world.blocks.defense.turrets;
import arc.scene.ui.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.struct.*; import arc.struct.*;
import arc.util.io.*; import arc.util.io.*;
@@ -60,7 +61,7 @@ public class PayloadTurret extends Turret{
@Override @Override
public void build(Building build, Table table){ public void build(Building build, Table table){
MultiReqImage image = new MultiReqImage(); 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))); () -> build instanceof PayloadTurretBuild it && !it.blocks.isEmpty() && it.currentBlock() == block)));
table.add(image).size(8 * 4); table.add(image).size(8 * 4);