BE adapted

src/ExtraUtilities/content/EUBlocks.java

@@ -1,6 +1,7 @@
 package ExtraUtilities.content;
 
 import ExtraUtilities.graphics.MainRenderer;
+import ExtraUtilities.ui.ItemDisplay;
 import ExtraUtilities.worlds.blocks.distribution.PhaseNode;
 import ExtraUtilities.worlds.blocks.distribution.StackHelper;
 import ExtraUtilities.worlds.blocks.effect.Breaker;
@@ -66,7 +67,6 @@
 import mindustry.graphics.Pal;
 import mindustry.graphics.Trail;
 import mindustry.type.*;
-import mindustry.ui.ItemDisplay;
 import mindustry.ui.Styles;
 import mindustry.world.Block;
 import mindustry.world.blocks.defense.turrets.*;

src/ExtraUtilities/content/EUFrom.java

@@ -1,5 +1,6 @@
 package ExtraUtilities.content;
 
+import ExtraUtilities.ui.ItemImage;
 import ExtraUtilities.worlds.blocks.unit.DerivativeUnitFactory;
 import arc.Core;
 import arc.graphics.Color;
@@ -23,7 +24,6 @@
 import mindustry.graphics.Pal;
 import mindustry.type.*;
 import mindustry.ui.Fonts;
-import mindustry.ui.ItemImage;
 import mindustry.ui.Styles;
 import mindustry.world.Block;
 import mindustry.world.blocks.defense.turrets.ContinuousLiquidTurret;

src/ExtraUtilities/content/EUUnitTypes.java

@@ -34,6 +34,7 @@
 import mindustry.content.Items;
 import mindustry.content.StatusEffects;
 import mindustry.content.UnitTypes;
+import mindustry.core.Version;
 import mindustry.entities.*;
 import mindustry.entities.abilities.*;
 import mindustry.entities.bullet.*;
@@ -2512,9 +2513,11 @@ public void update(Unit unit, WeaponMount m) {
         }};
 
         narwhal = new UnitType("narwhal"){{
-            UnitCommand c = new UnitCommand("EUAssist", "defense", u -> new DefenderHealAI());
-            defaultCommand = c;
-            commands = new UnitCommand[]{UnitCommand.moveCommand, UnitCommand.assistCommand, UnitCommand.rebuildCommand, c, UnitCommand.boostCommand};
+            if(Version.build == 146){
+                UnitCommand c = new UnitCommand("EUAssist", "defense", u -> new DefenderHealAI());
+                defaultCommand = c;
+                commands = new UnitCommand[]{UnitCommand.moveCommand, UnitCommand.assistCommand, UnitCommand.rebuildCommand, c, UnitCommand.boostCommand};
+            }
             armor = 48;
             drag = 0.2f;
             flying = false;

src/ExtraUtilities/ui/ItemDisplay.java

@@ -0,0 +1,38 @@
+package ExtraUtilities.ui;
+
+import arc.scene.ui.layout.Table;
+import arc.util.Strings;
+import mindustry.type.Item;
+import mindustry.type.ItemStack;
+import mindustry.ui.Styles;
+import mindustry.world.meta.StatUnit;
+
+public class ItemDisplay extends Table {
+    public final Item item;
+    public final int amount;
+
+    public ItemDisplay(Item item){
+        this(item, 0);
+    }
+
+    public ItemDisplay(Item item, int amount, boolean showName){
+        add(new ItemImage(new ItemStack(item, amount)));
+        if(showName) add(item.localizedName).padLeft(4 + amount > 99 ? 4 : 0);
+
+        this.item = item;
+        this.amount = amount;
+    }
+
+    public ItemDisplay(Item item, int amount){
+        this(item, amount, true);
+    }
+
+    /** Displays the item with a "/sec" qualifier based on the time period, in ticks. */
+    public ItemDisplay(Item item, int amount, float timePeriod, boolean showName){
+        add(new ItemImage(item.uiIcon, amount));
+        add((showName ? item.localizedName + "\n" : "") + "[lightgray]" + Strings.autoFixed(amount / (timePeriod / 60f), 2) + StatUnit.perSecond.localized()).padLeft(2).padRight(5).style(Styles.outlineLabel);
+
+        this.item = item;
+        this.amount = amount;
+    }
+}

src/ExtraUtilities/ui/ItemImage.java

@@ -0,0 +1,38 @@
+package ExtraUtilities.ui;
+
+import arc.graphics.g2d.TextureRegion;
+import arc.scene.ui.Image;
+import arc.scene.ui.layout.Stack;
+import arc.scene.ui.layout.Table;
+import arc.util.Scaling;
+import mindustry.core.UI;
+import mindustry.type.ItemStack;
+import mindustry.type.PayloadStack;
+import mindustry.ui.Styles;
+
+public class ItemImage extends Stack {
+
+    public ItemImage(TextureRegion region, int amount){
+
+        add(new Table(o -> {
+            o.left();
+            o.add(new Image(region)).size(32f).scaling(Scaling.fit);
+        }));
+
+        if(amount != 0){
+            add(new Table(t -> {
+                t.left().bottom();
+                t.add(amount >= 1000 ? UI.formatAmount(amount) : amount + "").style(Styles.outlineLabel);
+                t.pack();
+            }));
+        }
+    }
+
+    public ItemImage(ItemStack stack){
+        this(stack.item.uiIcon, stack.amount);
+    }
+
+    public ItemImage(PayloadStack stack){
+        this(stack.item.uiIcon, stack.amount);
+    }
+}