Unified stat system

core/src/mindustry/ui/dialogs/ContentInfoDialog.java

@@ -1,8 +1,14 @@
 package mindustry.ui.dialogs;
 
+import arc.graphics.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
 import mindustry.ctype.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+import mindustry.world.meta.*;
 
 public class ContentInfoDialog extends BaseDialog{
 
@@ -18,11 +24,62 @@ public class ContentInfoDialog extends BaseDialog{
         Table table = new Table();
         table.margin(10);
 
-        content.displayInfo(table);
+        //initialize stats if they haven't been yet
+        content.checkStats();
+
+        table.table(title1 -> {
+            int size = 8 * 6;
+
+            title1.image(content.icon(Cicon.xlarge)).size(size).scaling(Scaling.fit);
+            title1.add("[accent]" + content.localizedName).padLeft(5);
+        });
+
+        table.row();
+
+        table.image().height(3).color(Color.lightGray).pad(8).padLeft(0).padRight(0).fillX();
+
+        table.row();
+
+        if(content.description != null){
+            table.add(content.displayDescription()).padLeft(5).padRight(5).width(400f).wrap().fillX();
+            table.row();
+
+            table.image().height(3).color(Color.lightGray).pad(8).padLeft(0).padRight(0).fillX();
+            table.row();
+        }
+
+        Stats stats = content.stats;
+
+        for(StatCat cat : stats.toMap().keys()){
+            OrderedMap<Stat, Seq<StatValue>> map = stats.toMap().get(cat);
+
+            if(map.size == 0) continue;
+
+            //TODO check
+            if(stats.useCategories){
+                table.add("@category." + cat.name()).color(Pal.accent).fillX();
+                table.row();
+            }
+
+            for(Stat stat : map.keys()){
+                table.table(inset -> {
+                    inset.left();
+                    inset.add("[lightgray]" + stat.localized() + ":[] ").left();
+                    Seq<StatValue> arr = map.get(stat);
+                    for(StatValue value : arr){
+                        value.display(inset);
+                        inset.add().size(10f);
+                    }
+
+                }).fillX().padLeft(10);
+                table.row();
+            }
+        }
 
         ScrollPane pane = new ScrollPane(table);
         cont.add(pane);
 
         show();
     }
+
 }

core/src/mindustry/ui/dialogs/GameOverDialog.java

@@ -2,7 +2,7 @@ package mindustry.ui.dialogs;
 
 import arc.*;
 import mindustry.game.EventType.*;
-import mindustry.game.Stats.*;
+import mindustry.game.GameStats.*;
 import mindustry.game.*;
 import mindustry.type.*;
 import mindustry.ui.*;