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

Rebase translation work for easier rebasing

Browse Source
This commit is contained in:
Matthew Miller
2019-10-13 21:47:26 +10:00
parent 77ef0ae417
commit 96e56bdd0c
80 changed files with 1155 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/CommandAdapter.java
View File

@ -54,17 +54,17 @@ public abstract class CommandAdapter implements CommandCallable {
@Override
public Optional<Text> getShortDescription(CommandSource source) {
return Optional.of(command.getDescription())
.map(SpongeTextAdapter::convert);
.map(desc -> SpongeTextAdapter.convert(desc, source.getLocale()));
}
@Override
public Optional<Text> getHelp(CommandSource source) {
return Optional.of(command.getFullHelp())
.map(SpongeTextAdapter::convert);
.map(help -> SpongeTextAdapter.convert(help, source.getLocale()));
}
@Override
public Text getUsage(CommandSource source) {
return convert(command.getUsage());
return convert(command.getUsage(), source.getLocale());
}
}

8
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeCommandSender.java
View File

@ -37,6 +37,7 @@ import org.spongepowered.api.text.format.TextColors;
import org.spongepowered.api.text.serializer.TextSerializers;
import java.io.File;
import java.util.Locale;
import java.util.UUID;
import javax.annotation.Nullable;
@ -94,7 +95,7 @@ public class SpongeCommandSender implements Actor {
@Override
public void print(Component component) {
TextAdapter.sendComponent(sender, WorldEditText.format(component));
TextAdapter.sendComponent(sender, WorldEditText.format(component, getLocale()));
}
private void sendColorized(String msg, TextColor formatting) {
@ -141,6 +142,11 @@ public class SpongeCommandSender implements Actor {
public void dispatchCUIEvent(CUIEvent event) {
}
@Override
public Locale getLocale() {
return Locale.US;
}
@Override
public SessionKey getSessionKey() {
return new SessionKey() {

8
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java
View File

@ -51,6 +51,7 @@ import org.spongepowered.api.text.serializer.TextSerializers;
import org.spongepowered.api.world.World;
import java.nio.charset.StandardCharsets;
import java.util.Locale;
import java.util.Optional;
import java.util.UUID;
@ -154,7 +155,7 @@ public class SpongePlayer extends AbstractPlayerActor {
@Override
public void print(Component component) {
TextAdapter.sendComponent(player, WorldEditText.format(component));
TextAdapter.sendComponent(player, WorldEditText.format(component, getLocale()));
}
private void sendColorized(String msg, TextColor formatting) {
@ -231,6 +232,11 @@ public class SpongePlayer extends AbstractPlayerActor {
}
}
@Override
public Locale getLocale() {
return player.getLocale();
}
@Override
public SessionKey getSessionKey() {
return new SessionKeyImpl(player.getUniqueId(), player.getName());

6
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeTextAdapter.java
View File

@ -25,10 +25,12 @@ import com.sk89q.worldedit.util.formatting.text.serializer.gson.GsonComponentSer
import org.spongepowered.api.text.Text;
import org.spongepowered.api.text.serializer.TextSerializers;
import java.util.Locale;
public class SpongeTextAdapter {
public static Text convert(Component component) {
component = WorldEditText.format(component);
public static Text convert(Component component, Locale locale) {
component = WorldEditText.format(component, locale);
return TextSerializers.JSON.deserialize(GsonComponentSerializer.INSTANCE.serialize(component));
}