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

Added json comments

Browse Source
This commit is contained in:
Anuken
2019-11-08 14:40:15 -05:00
parent effd4e959a
commit e9f9194f73
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/io/anuke/mindustry/mod/ContentParser.java
View File

@@ -341,6 +341,7 @@ public class ContentParser{
if(contentTypes.isEmpty()){ if(contentTypes.isEmpty()){
init(); init();
} }
json = json.replaceAll("#.*?\n","\n");
JsonValue value = parser.fromJson(null, json); JsonValue value = parser.fromJson(null, json);
if(!parsers.containsKey(type)){ if(!parsers.containsKey(type)){

3
core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
View File

@@ -164,7 +164,8 @@ public class MenuFragment extends Fragment{
), ),
new Buttoni("$editor", Icon.editorSmall, ui.maps::show), steam ? new Buttoni("$workshop", Icon.saveSmall, platform::openWorkshop) : null, new Buttoni("$editor", Icon.editorSmall, ui.maps::show), steam ? new Buttoni("$workshop", Icon.saveSmall, platform::openWorkshop) : null,
new Buttoni(Core.bundle.get("mods") + "\n" + Core.bundle.get("mods.alpha"), Icon.wikiSmall, ui.mods::show), new Buttoni(Core.bundle.get("mods") + "\n" + Core.bundle.get("mods.alpha"), Icon.wikiSmall, ui.mods::show),
new Buttoni("$schematics", Icon.pasteSmall, ui.schematics::show), //not enough space for this button
//new Buttoni("$schematics", Icon.pasteSmall, ui.schematics::show),
new Buttoni("$settings", Icon.toolsSmall, ui.settings::show), new Buttoni("$settings", Icon.toolsSmall, ui.settings::show),
new Buttoni("$about.button", Icon.infoSmall, ui.about::show), new Buttoni("$about.button", Icon.infoSmall, ui.about::show),
new Buttoni("$quit", Icon.exitSmall, Core.app::exit) new Buttoni("$quit", Icon.exitSmall, Core.app::exit)