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

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-04-26 21:59:49 -04:00
parent 1941b0fa8a
commit f6bf229b0a
21 changed files with 2997 additions and 2877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,22 +331,25 @@ public class ContentParser{
}
private void readBundle(ContentType type, String name, JsonValue value){
UnlockableContent cont = locate(type, name) instanceof UnlockableContent ?
locate(type, name) : null;
UnlockableContent cont = locate(type, name) instanceof UnlockableContent ? locate(type, name) : null;
String entryName = cont == null ? type + "." + currentMod.name + "-" + name + "." : type + "." + cont.name + ".";
I18NBundle bundle = Core.bundle;
while(bundle.getParent() != null) bundle = bundle.getParent();
if(value.has("name")){
bundle.getProperties().put(entryName + "name", value.getString("name"));
if(cont != null) cont.localizedName = value.getString("name");
if(!Core.bundle.has(entryName + "name")){
bundle.getProperties().put(entryName + "name", value.getString("name"));
if(cont != null) cont.localizedName = value.getString("name");
}
value.remove("name");
}
if(value.has("description")){
bundle.getProperties().put(entryName + "description", value.getString("description"));
if(cont != null) cont.description = value.getString("description");
if(!Core.bundle.has(entryName + "description")){
bundle.getProperties().put(entryName + "description", value.getString("description"));
if(cont != null) cont.description = value.getString("description");
}
value.remove("description");
}
}