From 2038409283a45c604ac4d38898e50152084bad3e Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 18 Feb 2020 11:35:28 -0500 Subject: [PATCH] Removed schematic replacement dialog --- core/assets/bundles/bundle.properties | 1 - core/src/mindustry/input/InputHandler.java | 17 ++++------------- gradle.properties | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 08115dc3e6..7f02ce667b 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -39,7 +39,6 @@ be.check = Check for updates schematic = Schematic schematic.add = Save Schematic... schematics = Schematics -schematic.replace = A schematic by that name already exists. Replace it? schematic.import = Import Schematic... schematic.exportfile = Export File schematic.importfile = Import File diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index cd2f3d6d6b..611cec44b6 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -255,19 +255,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ if(lastSchematic == null) return; ui.showTextInput("$schematic.add", "$name", "", text -> { - Schematic replacement = schematics.all().find(s -> s.name().equals(text)); - if(replacement != null){ - ui.showConfirm("$confirm", "$schematic.replace", () -> { - schematics.overwrite(replacement, 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); - } + lastSchematic.tags.put("name", text); + schematics.add(lastSchematic); + ui.showInfoFade("$schematic.saved"); + ui.schematics.showInfo(lastSchematic); }); } diff --git a/gradle.properties b/gradle.properties index 60187da317..11145e4c88 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=0b2f044e5955ff700650eebecfb3dfcb629d7a8b +archash=d20c0312e740a9845a358fc4571926ad784c0bbc