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

liquid type support?

Browse Source
This commit is contained in:
Anuken
2022-06-11 11:20:15 -04:00
parent 4c8471c4a7
commit 523f94db98
3 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/mindustry/mod/ContentParser.java
View File

@@ -524,7 +524,20 @@ public class ContentParser{
return item;
},
ContentType.item, parser(ContentType.item, Item::new),
ContentType.liquid, parser(ContentType.liquid, Liquid::new),
ContentType.liquid, (TypeParser<Liquid>)(mod, name, value) -> {
Liquid liquid;
if(locate(ContentType.liquid, name) != null){
liquid = locate(ContentType.liquid, name);
readBundle(ContentType.liquid, name, value);
}else{
readBundle(ContentType.liquid, name, value);
liquid = make(resolve(value.getString("type", null), Liquid.class), mod + "-" + name);
value.remove("type");
}
currentContent = liquid;
read(() -> readFields(liquid, value));
return liquid;
},
ContentType.status, parser(ContentType.status, StatusEffect::new),
ContentType.sector, (TypeParser<SectorPreset>)(mod, name, value) -> {
if(value.isString()){