Fixed issues brought up in review

This commit is contained in:
Matthew Miller
2019-11-18 19:50:52 +10:00
parent 625be46b30
commit ded86d4872
19 changed files with 76 additions and 41 deletions

View File

@ -21,6 +21,7 @@ package com.sk89q.worldedit.cli;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.internal.cui.CUIEvent;
import com.sk89q.worldedit.session.SessionKey;
@ -141,7 +142,7 @@ public class CLICommandSender implements Actor {
@Override
public Locale getLocale() {
return Locale.getDefault();
return WorldEdit.getInstance().getConfiguration().defaultLocale;
}
@Override

View File

@ -32,7 +32,7 @@ import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats;
import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader;
import com.sk89q.worldedit.registry.state.Property;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BlockCategory;
import com.sk89q.worldedit.world.block.BlockState;
@ -238,13 +238,13 @@ public class CLIWorldEdit {
while (scanner.hasNextLine()) {
String line = scanner.nextLine();
if (line.equals("stop")) {
commandSender.printInfo(TextComponent.of("Stopping!"));
commandSender.printInfo(TranslatableComponent.of("worldedit.cli.stopping"));
break;
}
CommandEvent event = new CommandEvent(commandSender, line);
WorldEdit.getInstance().getEventBus().post(event);
if (!event.isCancelled()) {
commandSender.printError(TextComponent.of("Unknown command!"));
commandSender.printError(TranslatableComponent.of("worldedit.cli.unknown-command"));
} else {
saveAllWorlds(false);
}