Allow research dialog to be viewed on clients

2024-10-14 00:11:05 -04:00
parent 5d4ece62d0
commit e262bb8254
6 changed files with 136 additions and 114 deletions
--- a/core/src/mindustry/io/JsonIO.java
+++ b/core/src/mindustry/io/JsonIO.java
@@ -261,15 +261,8 @@ public class JsonIO{
            public UnlockableContent read(Json json, JsonValue jsonData, Class type){
                if(jsonData.isNull()) return null;
                String str = jsonData.asString();
-                Item item = Vars.content.item(str);
-                Liquid liquid = Vars.content.liquid(str);
-                Block block = Vars.content.block(str);
-                UnitType unit = Vars.content.unit(str);
-                return
-                    item != null ? item :
-                    liquid != null ? liquid :
-                    block != null ? block :
-                    unit;
+                var map = Vars.content.byName(str);
+                return map instanceof UnlockableContent u ? u : null;
            }
        });