Apply changes

Author: dordsor21

worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

@@ -24,6 +24,7 @@
 import com.fastasyncworldedit.core.event.extent.ActorSaveClipboardEvent;
 import com.fastasyncworldedit.core.extent.clipboard.MultiClipboardHolder;
 import com.fastasyncworldedit.core.extent.clipboard.URIClipboardHolder;
+import com.fastasyncworldedit.core.internal.exception.FaweException;
 import com.fastasyncworldedit.core.math.transform.MutatingOperationTransformHolder;
 import com.fastasyncworldedit.core.util.MainUtil;
 import com.google.common.collect.Multimap;
@@ -576,15 +577,20 @@ public void save(
         ClipboardHolder holder = session.getClipboard();
 
         SchematicSaveTask task = new SchematicSaveTask(actor, f, dir, format, holder, overwrite);
-        AsyncCommandBuilder.wrap(task, actor)
-                .registerWithSupervisor(worldEdit.getSupervisor(), "Saving schematic " + filename)
-                .setDelayMessage(Caption.of("worldedit.schematic.save.saving"))
-                .onSuccess(Caption.of("fawe.worldedit.schematic.schematic.saved", filename, (overwrite ? Caption.of("fawe.worldedit.schematic.schematic.overwritten") : ".")), null)
-                .onFailure(
-                        Caption.of("worldedit.schematic.failed-to-save"),
-                        worldEdit.getPlatformManager().getPlatformCommandManager().getExceptionConverter()
-                )
-                .buildAndExec(worldEdit.getExecutorService());
+        AsyncCommandBuilder
+            .wrap(task, actor)
+            .registerWithSupervisor(worldEdit.getSupervisor(), "Saving schematic " + filename)
+            .setDelayMessage(Caption.of("worldedit.schematic.save.saving"))
+            .onSuccess(
+                overwrite
+                    ? Caption.of("fawe.worldedit.schematic.schematic.overwritten")
+                    : Caption.of("fawe.worldedit.schematic.schematic.saved", filename), null
+            )
+            .onFailure(
+                Caption.of("worldedit.schematic.failed-to-save"),
+                worldEdit.getPlatformManager().getPlatformCommandManager().getExceptionConverter()
+            )
+            .buildAndExec(worldEdit.getExecutorService());
     }
 
     @Command(
@@ -1002,9 +1008,7 @@ public Void call() throws Exception {
 
                 if (numFiles >= limit) {
                     LOGGER.info(actor.getName() + " failed to save " + file.getCanonicalPath() + " - too many schematics!");
-                    actor.print(Caption.of("fawe.error.schematic.over.count.limit", numFiles, limit).color(TextColor.RED));
-                    throw new WorldEditException(Caption.of("fawe.error.schematic.over.limit", numFiles, limit)) {
-                    };
+                    throw new FaweException(Caption.of("fawe.error.schematic.over.limit", numFiles, limit));
                 }
             }
             //FAWE end
@@ -1043,10 +1047,12 @@ public Void call() throws Exception {
 
                         if ((curKb) > allocatedKb) {
                             file.delete();
-                            actor.print(Caption.of("fawe.error.schematic.over.disk.limit", String.format("%.1f", curKb), String.format("%dkb", allocatedKb)).color(TextColor.RED));
                             LOGGER.info(actor.getName() + " failed to save " + SCHEMATIC_NAME + " - not enough space!");
-                            throw new WorldEditException(Caption.of("fawe.error.schematic.over.disk.limit", String.format("%.1f", curKb), String.format("%dkb", allocatedKb))) {
-                            };
+                            throw new FaweException(Caption.of(
+                                    "fawe.error.schematic.over.disk.limit",
+                                    String.format("%.1f", curKb),
+                                    String.format("%dkb", allocatedKb)
+                            ));
                         }
                         if (overwrite) {
                             new File(curFilepath).delete();
@@ -1059,7 +1065,6 @@ public Void call() throws Exception {
                     }
 
                     if (Settings.settings().PATHS.PER_PLAYER_SCHEMATICS && actor.getLimit().SCHEM_FILE_NUM_LIMIT > -1) {
-
                         actor.print(Caption.of("fawe.worldedit.schematic.schematic.slots.free", (actor.getLimit().SCHEM_FILE_NUM_LIMIT - numFiles)));
                     }
                     LOGGER.info(actor.getName() + " saved " + file.getCanonicalPath());

worldedit-core/src/main/resources/lang/strings.json

@@ -67,12 +67,12 @@
   "fawe.worldedit.schematic.schematic.move.success": "{0} -> {1}",
   "fawe.worldedit.schematic.schematic.move.failed": "{0} no moved: {1}",
   "fawe.worldedit.schematic.schematic.loaded": "{0} loaded. Paste it with //paste",
-  "fawe.worldedit.schematic.schematic.saved": "{0} saved{1}",
-  "fawe.worldedit.schematic.schematic.overwritten": " (overwriting previous file)",
+  "fawe.worldedit.schematic.schematic.saved": "{0} saved.",
+  "fawe.worldedit.schematic.schematic.overwritten": "{0} saved (overwriting previous file).",
   "fawe.worldedit.schematic.schematic.none": "No files found.",
   "fawe.worldedit.schematic.schematic.load-failure": "File could not be read or it does not exist: {0}. If you are specifying a format, you may not be specifying the correct one. Sponge schematic v2 and v3 both use the .schem file extension. To allow FAWE to select the format, do not specify one. If you are using a litematica schematic, it is not supported!",
-  "fawe.worldedit.schematic.schematic.size": "{0} size {1} kb",
-  "fawe.worldedit.schematic.schematic.disk.space": "You have {0} kb left for schematics",
+  "fawe.worldedit.schematic.schematic.size": "{0} size: {1}kb",
+  "fawe.worldedit.schematic.schematic.disk.space": "You have {0}kb left for schematics.",
   "fawe.worldedit.schematic.schematic.slots.free": "You have {0} schematic file slots left.",
   "fawe.worldedit.clipboard.clipboard.uri.not.found": "You do not have {0} loaded",
   "fawe.worldedit.clipboard.clipboard.cleared": "Clipboard cleared",
@@ -130,7 +130,7 @@
   "fawe.error.invalid-boolean": "Invalid boolean {0}",
   "fawe.error.schematic.not.found": "Schematic {0} not found.",
   "fawe.error.schematic.over.count.limit": "You have {0}/{1} saved schematics. Delete some to save this one!",
-  "fawe.error.schematic.over.disk.limit": "You're about to be at {0} kb of schematics {1}  available) Delete some first to save this one!",
+  "fawe.error.schematic.over.disk.limit": "You're about to be at {0}kb of schematics ({1} available). Delete some first to save this one!",
   "fawe.error.parse.invalid-dangling-character": "Invalid dangling character {0}.",
   "fawe.error.parse.unknown-mask": "Unknown mask: {0}, See: {1}",
   "fawe.error.parse.unknown-pattern": "Unknown pattern: {0}, See: {1}",