mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-05 15:58:14 +07:00
Code Issues Packages Projects Releases Wiki Activity

Display document import errors on iOS

Browse Source
This commit is contained in:
Anuken
2019-11-09 15:30:02 -05:00
parent fb15c44383
commit c70fb5940f
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/units/lich.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
core/assets-raw/sprites/units/reaper.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 24 KiB

BIN
core/assets-raw/sprites/units/wraith.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 364 B

After

Width:  |  Height:  |  Size: 6.1 KiB

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

@ -342,7 +342,7 @@ public class ContentParser{
init(); init();
} }
//add comments starting with ##, but ignore links //add comments starting with //, but ignore links
json = json.replace("http://", "http:~~").replace("https://", "https:~~").replaceAll("//.*?\n","\n").replace("http:~~", "http://").replace("https:~~", "https://"); json = json.replace("http://", "http:~~").replace("https://", "https:~~").replaceAll("//.*?\n","\n").replace("http:~~", "http://").replace("https:~~", "https://");
JsonValue value = parser.fromJson(null, json); JsonValue value = parser.fromJson(null, json);

4
ios/src/io/anuke/mindustry/IOSLauncher.java
View File

@ -61,11 +61,15 @@ public class IOSLauncher extends IOSApplication.Delegate{
try{ try{
controller.importDocument(documentURLs.get(0), new NSURL(getDocumentsDirectory() + "/document"), UIDocumentBrowserImportMode.Copy, (url, error) -> { controller.importDocument(documentURLs.get(0), new NSURL(getDocumentsDirectory() + "/document"), UIDocumentBrowserImportMode.Copy, (url, error) -> {
if(error != null){
ui.showErrorMessage("Import error.\n" + error.getLocalizedFailureReason() + "\n" + error.getLocalizedDescription());
}else{
try{ try{
cons.get(Core.files.absolute(url.getPath())); cons.get(Core.files.absolute(url.getPath()));
}catch(Throwable t){ }catch(Throwable t){
ui.showException(t); ui.showException(t);
} }
}
}); });
}catch(Throwable t){ }catch(Throwable t){
ui.showException(t); ui.showException(t);