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

Actual JSON weather (?)

Browse Source
This commit is contained in:
Anuken
2021-03-05 23:20:19 -05:00
parent 07d11f02d8
commit 5c85ba84db
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,16 +92,6 @@ public class ContentParser{
readFields(result, data);
return result;
});
put(Weather.class, (type, data) -> {
if(data.isString()){
return field(Weathers.class, data);
}
var bc = resolve(data.getString("type", ""), ParticleWeather.class);
data.remove("type");
Weather result = make(bc);
readFields(result, data);
return result;
});
put(DrawBlock.class, (type, data) -> {
if(data.isString()){
//try to instantiate
@@ -327,7 +317,7 @@ public class ContentParser{
readBundle(ContentType.weather, name, value);
}else{
readBundle(ContentType.weather, name, value);
item = make(resolve(getType(value), ParticleWeather.class));
item = make(resolve(getType(value), ParticleWeather.class), name);
}
currentContent = item;
read(() -> readFields(item, value));