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

Added support for export/import of all basic terrain as image

Browse Source
This commit is contained in:
Anuken
2020-02-26 19:37:22 -05:00
parent fdaac290ac
commit 1e53ea50b0
19 changed files with 154 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/mindustry/ui/dialogs/LoadDialog.java
View File

@@ -1,13 +1,12 @@
package mindustry.ui.dialogs;
import arc.*;
import arc.struct.*;
import arc.files.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.scene.style.*;
import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*;
import mindustry.core.GameState.*;
import mindustry.game.Saves.*;
@@ -15,7 +14,6 @@ import mindustry.gen.*;
import mindustry.io.*;
import mindustry.io.SaveIO.*;
import mindustry.ui.*;
import mindustry.ui.Styles;
import java.io.*;
@@ -70,6 +68,7 @@ public class LoadDialog extends FloatingDialog{
title.table(t -> {
t.right();
t.defaults().size(40f);
t.addImageButton(Icon.save, Styles.emptytogglei, () -> {
slot.setAutosave(!slot.isAutosave());
@@ -89,26 +88,7 @@ public class LoadDialog extends FloatingDialog{
});
}).right();
t.addImageButton(Icon.save, Styles.emptyi, () -> {
if(!ios){
platform.showFileChooser(false, saveExtension, file -> {
try{
slot.exportFile(file);
setup();
}catch(IOException e){
ui.showException("save.export.fail", e);
}
});
}else{
try{
Fi file = Core.files.local("save-" + slot.getName() + "." + saveExtension);
slot.exportFile(file);
platform.shareFile(file);
}catch(Exception e){
ui.showException("save.export.fail", e);
}
}
}).right();
t.addImageButton(Icon.export, Styles.emptyi, () -> platform.export("save-" + slot.getName(), saveExtension, slot::exportFile)).right();
}).padRight(-10).growX();
}).growX().colspan(2);

5
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@@ -162,11 +162,6 @@ public class PlanetDialog extends FloatingDialog{
if(true)
Draw.batch(projector, () -> {
if(hovered != null){
setPlane(hovered);
Fonts.outline.draw("" + hovered.id, 0, 0, Align.center);
}
if(selected != null){
setPlane(selected);
stable.draw();

22
core/src/mindustry/ui/dialogs/SchematicsDialog.java
View File

@@ -1,7 +1,6 @@
package mindustry.ui.dialogs;
import arc.*;
import arc.files.*;
import arc.graphics.*;
import arc.graphics.Texture.*;
import arc.graphics.g2d.*;
@@ -216,25 +215,8 @@ public class SchematicsDialog extends FloatingDialog{
}).marginLeft(12f);
t.row();
t.addImageTextButton("$schematic.exportfile", Icon.export, style, () -> {
if(!ios){
platform.showFileChooser(false, schematicExtension, file -> {
dialog.hide();
try{
Schematics.write(s, file);
}catch(Throwable e){
ui.showException(e);
}
});
}else{
dialog.hide();
try{
Fi file = Core.files.local(s.name() + "." + schematicExtension);
Schematics.write(s, file);
platform.shareFile(file);
}catch(Throwable e){
ui.showException(e);
}
}
dialog.hide();
platform.export(s.name(), schematicExtension, file -> Schematics.write(s, file));
}).marginLeft(12f);
});
});