Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-11 20:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/feature/translatable-text' into i18n-merge

Browse Source
This commit is contained in:
Jesse Boyd
2019-11-21 13:50:05 +00:00
parent 37b6c406ac ded86d4872
commit 66744bfaa4
102 changed files with 1606 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLICommandSender.java
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;
@ -32,6 +33,7 @@ import com.sk89q.worldedit.util.formatting.text.serializer.plain.PlainComponentS
import org.slf4j.Logger;
import java.io.File;
import java.util.Locale;
import java.util.UUID;
public class CLICommandSender implements Actor {
@ -97,7 +99,7 @@ public class CLICommandSender implements Actor {
@Override
public void print(Component component) {
print(PlainComponentSerializer.INSTANCE.serialize(WorldEditText.format(component)));
print(PlainComponentSerializer.INSTANCE.serialize(WorldEditText.format(component, getLocale())));
}
@Override
@ -138,6 +140,11 @@ public class CLICommandSender implements Actor {
public void dispatchCUIEvent(CUIEvent event) {
}
@Override
public Locale getLocale() {
return WorldEdit.getInstance().getConfiguration().defaultLocale;
}
@Override
public SessionKey getSessionKey() {
return new SessionKey() {

5
worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java
View File

@ -32,6 +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.TranslatableComponent;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BlockCategory;
import com.sk89q.worldedit.world.block.BlockState;
@ -237,13 +238,13 @@ public class CLIWorldEdit {
while (scanner.hasNextLine()) {
String line = scanner.nextLine();
if (line.equals("stop")) {
commandSender.print("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("Unknown command!");
commandSender.printError(TranslatableComponent.of("worldedit.cli.unknown-command"));
} else {
saveAllWorlds(false);
}