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

Heat conductor + phase heater

Browse Source
This commit is contained in:
Anuken
2021-12-10 11:31:32 -05:00
parent 761ee12e6f
commit 3e9747c59c
31 changed files with 143 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/io/JsonIO.java
View File

@@ -225,10 +225,10 @@ 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.getByName(ContentType.item, str);
Liquid liquid = Vars.content.getByName(ContentType.liquid, str);
Block block = Vars.content.getByName(ContentType.block, str);
UnitType unit = Vars.content.getByName(ContentType.unit, str);
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 :