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

Removed schematic replacement dialog

Browse Source
This commit is contained in:
Anuken
2020-02-18 11:35:28 -05:00
parent b96d5c417f
commit 2038409283
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/bundles/bundle.properties
View File

@@ -39,7 +39,6 @@ be.check = Check for updates
schematic = Schematic schematic = Schematic
schematic.add = Save Schematic... schematic.add = Save Schematic...
schematics = Schematics schematics = Schematics
schematic.replace = A schematic by that name already exists. Replace it?
schematic.import = Import Schematic... schematic.import = Import Schematic...
schematic.exportfile = Export File schematic.exportfile = Export File
schematic.importfile = Import File schematic.importfile = Import File

17
core/src/mindustry/input/InputHandler.java
View File

@@ -255,19 +255,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
if(lastSchematic == null) return; if(lastSchematic == null) return;
ui.showTextInput("$schematic.add", "$name", "", text -> { ui.showTextInput("$schematic.add", "$name", "", text -> {
Schematic replacement = schematics.all().find(s -> s.name().equals(text)); lastSchematic.tags.put("name", text);
if(replacement != null){ schematics.add(lastSchematic);
ui.showConfirm("$confirm", "$schematic.replace", () -> { ui.showInfoFade("$schematic.saved");
schematics.overwrite(replacement, lastSchematic); ui.schematics.showInfo(lastSchematic);
ui.showInfoFade("$schematic.saved");
ui.schematics.showInfo(replacement);
});
}else{
lastSchematic.tags.put("name", text);
schematics.add(lastSchematic);
ui.showInfoFade("$schematic.saved");
ui.schematics.showInfo(lastSchematic);
}
}); });
} }

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=0b2f044e5955ff700650eebecfb3dfcb629d7a8b archash=d20c0312e740a9845a358fc4571926ad784c0bbc